| Message ID | 20250424-for-upstream-i801-spd5118-no-instantiate-v1-1-627398268a1f@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | i2c: i801: Don't instantiate spd5118 under SPD Write Disable | expand |
Hi, > @@ -44,9 +44,9 @@ static inline void i2c_free_slave_host_notify_device(struct i2c_client *client) > #endif > > #if IS_ENABLED(CONFIG_I2C_SMBUS) && IS_ENABLED(CONFIG_DMI) > -void i2c_register_spd(struct i2c_adapter *adap); > +void i2c_register_spd(struct i2c_adapter *adap, bool write_disabled); > #else > -static inline void i2c_register_spd(struct i2c_adapter *adap) { } > +static inline void i2c_register_spd(struct i2c_adapter *adap, bool write_disabled) { } > #endif Please don't add random bool flags to function parameters, especially in library functions. They add confusion and make the code harder to understand. I even dislike them when they're used inside drivers. I'd much prefer something like this: static void i2c_register_spd(struct i2c_adapter *adap, bool write_disabled) { ... } void i2c_register_spd_write_disable(struct i2c_adapter *adap) { i2c_register_spd(adap, true); } void i2c_register_spd_write_enable(struct i2c_adapter *adap) { i2c_register_spd(adap, false); } This way, we gain readability at the cost of a bit of redundancy, a trade-off I'm more than happy with. Of course, this is just my preference (even if I'm pretty strong about it, especially when it comes to libraries). Wolfram is free to override me on this. Andi
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c index 48e1af544b75..95619eb5e798 100644 --- a/drivers/i2c/busses/i2c-i801.c +++ b/drivers/i2c/busses/i2c-i801.c @@ -1180,7 +1180,8 @@ static void i801_probe_optional_targets(struct i801_priv *priv) #ifdef CONFIG_I2C_I801_MUX if (!priv->mux_pdev) #endif - i2c_register_spd(&priv->adapter); + i2c_register_spd(&priv->adapter, + !!(priv->original_hstcfg & SMBHSTCFG_SPD_WD)); } #else static void __init input_apanel_init(void) {} @@ -1283,7 +1284,8 @@ static int i801_notifier_call(struct notifier_block *nb, unsigned long action, return NOTIFY_DONE; /* Call i2c_register_spd for muxed child segments */ - i2c_register_spd(to_i2c_adapter(dev)); + i2c_register_spd(to_i2c_adapter(dev), + !!(priv->original_hstcfg & SMBHSTCFG_SPD_WD)); return NOTIFY_OK; } diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c index dd75916157f0..085d121a88f6 100644 --- a/drivers/i2c/busses/i2c-piix4.c +++ b/drivers/i2c/busses/i2c-piix4.c @@ -971,7 +971,7 @@ static int piix4_add_adapter(struct pci_dev *dev, unsigned short smba, * This would allow the ee1004 to be probed incorrectly. */ if (port == 0) - i2c_register_spd(adap); + i2c_register_spd(adap, false); *padap = adap; return 0; diff --git a/drivers/i2c/i2c-smbus.c b/drivers/i2c/i2c-smbus.c index 7d40e7aa3799..97e833895dd7 100644 --- a/drivers/i2c/i2c-smbus.c +++ b/drivers/i2c/i2c-smbus.c @@ -372,7 +372,7 @@ EXPORT_SYMBOL_GPL(i2c_free_slave_host_notify_device); * - Only works on systems with 1 to 8 memory slots */ #if IS_ENABLED(CONFIG_DMI) -void i2c_register_spd(struct i2c_adapter *adap) +void i2c_register_spd(struct i2c_adapter *adap, bool write_disabled) { int n, slot_count = 0, dimm_count = 0; u16 handle; diff --git a/include/linux/i2c-smbus.h b/include/linux/i2c-smbus.h index ced1c6ead52a..57bb3154eb47 100644 --- a/include/linux/i2c-smbus.h +++ b/include/linux/i2c-smbus.h @@ -44,9 +44,9 @@ static inline void i2c_free_slave_host_notify_device(struct i2c_client *client) #endif #if IS_ENABLED(CONFIG_I2C_SMBUS) && IS_ENABLED(CONFIG_DMI) -void i2c_register_spd(struct i2c_adapter *adap); +void i2c_register_spd(struct i2c_adapter *adap, bool write_disabled); #else -static inline void i2c_register_spd(struct i2c_adapter *adap) { } +static inline void i2c_register_spd(struct i2c_adapter *adap, bool write_disabled) { } #endif #endif /* _LINUX_I2C_SMBUS_H */
Some SMBus controllers may restrict writes to addresses where SPD sensors may reside. This may lead to some SPD sensors not functioning correctly, and might need extra handling. Pass this extra context to i2c_register_spd() so that it could be handled accordingly. Signed-off-by: Yo-Jung (Leo) Lin <leo.lin@canonical.com> --- drivers/i2c/busses/i2c-i801.c | 6 ++++-- drivers/i2c/busses/i2c-piix4.c | 2 +- drivers/i2c/i2c-smbus.c | 2 +- include/linux/i2c-smbus.h | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-)