hwmon: (occ) Delay hwmon registration until user request
cover hwmon: (occ) Delay hwmon registration until user request
These two patches have been accepted in linux-next.
Eddie James (2):
hwmon: (occ) Delay hwmon registration until user request
hwmon: (occ) Lock mutex in shutdown to prevent race with occ_active
drivers/hwmon/occ/common.c | 105 ++++++++++++++++++++-------- drivers/hwmon/occ/common.h | 5 +- drivers/hwmon/occ/p8_i2c.c | 2 +- drivers/hwmon/occ/p9_sbe.c | 2 +- drivers/hwmon/occ/sysfs.c | 137 ++++++++++++++++++++++--------------- 5 files changed, 161 insertions(+), 90 deletions(-)
Signature · 1 line
2.31.1
PATCH 1/2 hwmon: (occ) Delay hwmon registration until user request
Instead of registering the hwmon device at probe time, use the existing "occ_active" sysfs file to control when the driver polls the OCC for sensor data and registers with hwmon. The reason for this change is that the SBE, which is the device by which the driver communicates with the OCC, cannot handle communications during certain system state transitions, resulting in unrecoverable system errors.
--- drivers/hwmon/occ/common.c | 100 +++++++++++++++++++-------- drivers/hwmon/occ/common.h | 5 +- drivers/hwmon/occ/p8_i2c.c | 2 +- drivers/hwmon/occ/p9_sbe.c | 2 +- drivers/hwmon/occ/sysfs.c | 137 ++++++++++++++++++++++--------------- 5 files changed, 156 insertions(+), 90 deletions(-)
drivers/hwmon/occ/common.c +70 -30
@@ -1149,44 +1149,75 @@ static void occ_parse_poll_response(struct occ *occ) sizeof(*header), size + sizeof(*header)); } -int occ_setup (struct occ *occ,const char *name) +int occ_active (struct occ *occ,bool active) { -int rc; - -mutex_init (&occ->lock); - occ->groups[0 ] = &occ->group; +int rc =mutex_lock_interruptible (&occ->lock); -/* no need to lock */ - rc =occ_poll (occ); -if (rc == -ESHUTDOWN ) { -dev_info (occ->bus_dev,"host is not ready\n" ); -return rc; - }else if (rc <0 ) { -dev_err (occ->bus_dev, -"failed to get OCC poll response=%02x: %d\n" , - occ->resp.return_status, rc); +if (rc)return rc; - } - occ->next_update = jiffies +OCC_UPDATE_FREQUENCY ; -occ_parse_poll_response (occ); +if (active) { +if (occ->active) { + rc = -EALREADY ; + goto unlock; + } - rc =occ_setup_sensor_attrs (occ); -if (rc) { -dev_err (occ->bus_dev,"failed to setup sensor attrs: %d\n" , - rc); -return rc; - } + occ->error_count =0 ; + occ->last_safe =0 ; - occ->hwmon =devm_hwmon_device_register_with_groups (occ->bus_dev, name, - occ, occ->groups); -if (IS_ERR (occ->hwmon)) { - rc =PTR_ERR (occ->hwmon); -dev_err (occ->bus_dev,"failed to register hwmon device: %d\n" , - rc); -return rc; + rc =occ_poll (occ); +if (rc <0 ) { +dev_err (occ->bus_dev, +"failed to get OCC poll response=%02x: %d\n" , + occ->resp.return_status, rc); + goto unlock; + } + + occ->active = true; + occ->next_update = jiffies +OCC_UPDATE_FREQUENCY ; +occ_parse_poll_response (occ); + + rc =occ_setup_sensor_attrs (occ); +if (rc) { +dev_err (occ->bus_dev, +"failed to setup sensor attrs: %d\n" , rc); + goto unlock; + } + + occ->hwmon =hwmon_device_register_with_groups (occ->bus_dev, +"occ" , occ, + occ->groups); +if (IS_ERR (occ->hwmon)) { + rc =PTR_ERR (occ->hwmon); + occ->hwmon =NULL ; +dev_err (occ->bus_dev, +"failed to register hwmon device: %d\n" , rc); + goto unlock; + } + }else { +if (!occ->active) { + rc = -EALREADY ; + goto unlock; + } + +if (occ->hwmon) +hwmon_device_unregister (occ->hwmon); + occ->active = false; + occ->hwmon =NULL ; } +unlock: +mutex_unlock (&occ->lock); +return rc; +} + +int occ_setup (struct occ *occ) +{ +int rc; + +mutex_init (&occ->lock); + occ->groups[0 ] = &occ->group; + rc =occ_setup_sysfs (occ);if (rc)dev_err (occ->bus_dev,"failed to setup sysfs: %d\n" , rc);
@@ -1195,6 +1226,15 @@ int occ_setup(struct occ *occ, const char *name) }EXPORT_SYMBOL_GPL (occ_setup); +void occ_shutdown (struct occ *occ) +{ +occ_shutdown_sysfs (occ); + +if (occ->hwmon) +hwmon_device_unregister (occ->hwmon); +} +EXPORT_SYMBOL_GPL (occ_shutdown); +MODULE_AUTHOR ("Eddie James <[email protected]>" );MODULE_DESCRIPTION ("Common OCC hwmon code" );MODULE_LICENSE ("GPL" );
drivers/hwmon/occ/common.h +4 -1
@@ -106,6 +106,7 @@ struct occ {struct attribute_group group;const struct attribute_group *groups[2 ]; +bool active;int error;/* final transfer error after retry */ int last_error;/* latest transfer error */ unsigned int error_count;/* number of xfr errors observed */
@@ -123,9 +124,11 @@ struct occ {u8 prev_mode; }; -int occ_setup (struct occ *occ,const char *name); +int occ_active (struct occ *occ,bool active); +int occ_setup (struct occ *occ);int occ_setup_sysfs (struct occ *occ);void occ_shutdown (struct occ *occ); +void occ_shutdown_sysfs (struct occ *occ);void occ_sysfs_poll_done (struct occ *occ);int occ_update_response (struct occ *occ);
drivers/hwmon/occ/p8_i2c.c +1 -1
@@ -223,7 +223,7 @@ static int p8_i2c_occ_probe(struct i2c_client *client) occ->poll_cmd_data =0x10 ;/* P8 OCC poll data */ occ->send_cmd = p8_i2c_occ_send_cmd; -return occ_setup (occ,"p8_occ" ); +return occ_setup (occ); }static int p8_i2c_occ_remove (struct i2c_client *client)
drivers/hwmon/occ/p9_sbe.c +1 -1
@@ -151,7 +151,7 @@ static int p9_sbe_occ_probe(struct platform_device *pdev) occ->poll_cmd_data =0x20 ;/* P9 OCC poll data */ occ->send_cmd = p9_sbe_occ_send_cmd; - rc =occ_setup (occ,"p9_occ" ); + rc =occ_setup (occ);if (rc == -ESHUTDOWN ) rc = -ENODEV ;/* Host is shutdown, don't spew errors */
drivers/hwmon/occ/sysfs.c +80 -57
187 lines not on this page · raw message
Signature · 1 line
2.31.1
PATCH 2/2 hwmon: (occ) Lock mutex in shutdown to prevent race with occ_active
In reply to Eddie JamesUnbinding the driver or removing the parent device at the same time as using the OCC active sysfs file can cause the driver to unregister the hwmon device twice. Prevent this by locking the occ mutex in the shutdown function.
--- drivers/hwmon/occ/common.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/hwmon/occ/common.c +5 -0
@@ -1228,10 +1228,15 @@ EXPORT_SYMBOL_GPL(occ_setup);void occ_shutdown (struct occ *occ) { +mutex_lock (&occ->lock); +occ_shutdown_sysfs (occ);if (occ->hwmon)hwmon_device_unregister (occ->hwmon); + occ->hwmon =NULL ; + +mutex_unlock (&occ->lock); }EXPORT_SYMBOL_GPL (occ_shutdown);
Signature · 1 line
2.31.1