Commit bd8f3bff authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'i2c-for-6.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 

Pull i2c fixes from Wolfram Sang:

 - i801: drop superfluous WDT entry for Birch

 - rtl9300:
    - fix channel number check in probe
    - check data length boundaries in xfer
    - drop broken SMBus quick operation

* tag 'i2c-for-6.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: rtl9300: remove broken SMBus Quick operation support
  i2c: rtl9300: ensure data length is within supported range
  i2c: rtl9300: fix channel number bound check
  i2c: i801: Hide Intel Birch Stream SoC TCO WDT
parents 2c3bac60 d035b4ba

drivers/i2c/busses/i2c-i801.c

+1 −1
Original line number Diff line number Diff line
@@ -1052,7 +1052,7 @@ static const struct pci_device_id i801_ids[] = { 
	{ PCI_DEVICE_DATA(INTEL, METEOR_LAKE_P_SMBUS,		FEATURES_ICH5 | FEATURE_TCO_CNL) },

	{ PCI_DEVICE_DATA(INTEL, METEOR_LAKE_SOC_S_SMBUS,	FEATURES_ICH5 | FEATURE_TCO_CNL) },

	{ PCI_DEVICE_DATA(INTEL, METEOR_LAKE_PCH_S_SMBUS,	FEATURES_ICH5 | FEATURE_TCO_CNL) },

	{ PCI_DEVICE_DATA(INTEL, BIRCH_STREAM_SMBUS,		FEATURES_ICH5 | FEATURE_TCO_CNL) },

	{ PCI_DEVICE_DATA(INTEL, BIRCH_STREAM_SMBUS,		FEATURES_ICH5)			 },

	{ PCI_DEVICE_DATA(INTEL, ARROW_LAKE_H_SMBUS,		FEATURES_ICH5 | FEATURE_TCO_CNL) },

	{ PCI_DEVICE_DATA(INTEL, PANTHER_LAKE_H_SMBUS,		FEATURES_ICH5 | FEATURE_TCO_CNL) },

	{ PCI_DEVICE_DATA(INTEL, PANTHER_LAKE_P_SMBUS,		FEATURES_ICH5 | FEATURE_TCO_CNL) },

drivers/i2c/busses/i2c-rtl9300.c

+8 −14
Original line number Diff line number Diff line
@@ -99,6 +99,9 @@ static int rtl9300_i2c_config_xfer(struct rtl9300_i2c *i2c, struct rtl9300_i2c_c 
{

	u32 val, mask;



	if (len < 1 || len > 16)

		return -EINVAL;



	val = chan->bus_freq << RTL9300_I2C_MST_CTRL2_SCL_FREQ_OFS;

	mask = RTL9300_I2C_MST_CTRL2_SCL_FREQ_MASK;
@@ -222,15 +225,6 @@ static int rtl9300_i2c_smbus_xfer(struct i2c_adapter *adap, u16 addr, unsigned s 
	}



	switch (size) {

	case I2C_SMBUS_QUICK:

		ret = rtl9300_i2c_config_xfer(i2c, chan, addr, 0);

		if (ret)

			goto out_unlock;

		ret = rtl9300_i2c_reg_addr_set(i2c, 0, 0);

		if (ret)

			goto out_unlock;

		break;



	case I2C_SMBUS_BYTE:

		if (read_write == I2C_SMBUS_WRITE) {

			ret = rtl9300_i2c_config_xfer(i2c, chan, addr, 0);
@@ -312,9 +306,9 @@ static int rtl9300_i2c_smbus_xfer(struct i2c_adapter *adap, u16 addr, unsigned s 


static u32 rtl9300_i2c_func(struct i2c_adapter *a)

{

	return I2C_FUNC_SMBUS_QUICK | I2C_FUNC_SMBUS_BYTE |

	       I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_WORD_DATA |

	       I2C_FUNC_SMBUS_BLOCK_DATA;

	return I2C_FUNC_SMBUS_BYTE | I2C_FUNC_SMBUS_BYTE_DATA |

	       I2C_FUNC_SMBUS_WORD_DATA | I2C_FUNC_SMBUS_BLOCK_DATA |

	       I2C_FUNC_SMBUS_I2C_BLOCK;

}



static const struct i2c_algorithm rtl9300_i2c_algo = {
@@ -323,7 +317,7 @@ static const struct i2c_algorithm rtl9300_i2c_algo = { 
};



static struct i2c_adapter_quirks rtl9300_i2c_quirks = {

	.flags		= I2C_AQ_NO_CLK_STRETCH,

	.flags		= I2C_AQ_NO_CLK_STRETCH | I2C_AQ_NO_ZERO_LEN,

	.max_read_len	= 16,

	.max_write_len	= 16,

};
@@ -353,7 +347,7 @@ static int rtl9300_i2c_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, i2c);



	if (device_get_child_node_count(dev) >= RTL9300_I2C_MUX_NCHAN)

	if (device_get_child_node_count(dev) > RTL9300_I2C_MUX_NCHAN)

		return dev_err_probe(dev, -EINVAL, "Too many channels\n");



	device_for_each_child_node(dev, child) {