hwmon: (smsc47m1) Use request_muxed_region for Super-IO accesses
Guenter Roeck
maintainerPATCH v2 1/1 hwmon: (smsc47m1) Use request_muxed_region for Super-IO accesses
Super-IO accesses may fail on a system with no or unmapped LPC bus.
Also, other drivers may attempt to access the LPC bus at the same time, resulting in undefined behavior.
Use request_muxed_region() to ensure that IO access on the requested address space is supported, and to ensure that access by multiple drivers is synchronized.
---
v2: Fix subject, handle error in smsc47m1_restore()
drivers/hwmon/smsc47m1.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-)
drivers/hwmon/smsc47m1.c +19 -9
@@ -73,16 +73,21 @@ superio_inb(int reg)/* logical device for fans is 0x0A */ #define superio_select () superio_outb(0x07, 0x0A) -static inline void +static inline int superio_enter (void ) { +if (!request_muxed_region (REG ,2 ,DRVNAME )) +return -EBUSY ; +outb (0x55 ,REG ); +return 0 ; }static inline void superio_exit (void ) {outb (0xAA ,REG ); +release_region (REG ,2 ); }#define SUPERIO_REG_ACT 0x30
@@ -535,8 +540,12 @@ static int __init smsc47m1_find(struct smsc47m1_sio_data *sio_data) {u8 val;unsigned short addr; +int err; + + err =superio_enter (); +if (err) +return err; -superio_enter (); val = force_id ? force_id :superio_inb (SUPERIO_REG_DEVID );/*
@@ -612,13 +621,14 @@ static int __init smsc47m1_find(struct smsc47m1_sio_data *sio_data)static void smsc47m1_restore (const struct smsc47m1_sio_data *sio_data) {if ((sio_data->activate &0x01 ) ==0 ) { -superio_enter (); -superio_select (); - -pr_info ("Disabling device\n" ); -superio_outb (SUPERIO_REG_ACT , sio_data->activate); - -superio_exit (); +if (!superio_enter ()) { +superio_select (); +pr_info ("Disabling device\n" ); +superio_outb (SUPERIO_REG_ACT , sio_data->activate); +superio_exit (); + }else { +pr_warn ("Failed to disable device\n" ); + } } }
Signature · 1 line
2.7.4
Quoted 5 lines · Guenter Roeck
Super-IO accesses may fail on a system with no or unmapped LPC bus.
Also, other drivers may attempt to access the LPC bus at the same time, resulting in undefined behavior.
Quoted 8 lines
Use
request_muxed_region()to ensure that IO access on the requested address space is supported, and to ensure that access by multiple drivers is synchronized.Fixes 8d5d45fb1468 ("I2C: Move hwmon drivers (2/3)")Reported-by Kefeng Wang <[email protected]>Reported-by John Garry <[email protected]>Cc John Garry <[email protected]>
Quoted 12 lines
Signed-off-by Guenter Roeck <[email protected]>---
v2: Fix subject, handle error insmsc47m1_restore()drivers/hwmon/smsc47m1.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-)drivers/hwmon/smsc47m1.c +0
-0
drivers/hwmon/smsc47m1.c superio_inb(int reg) · line 79
Quoted 8 lines
drivers/hwmon/smsc47m1.c +2
-1@@ -73,16 +73,21 @@ superio_inb(int reg)/* logical device for fans is 0x0A */ #define superio_select () superio_outb(0x07, 0x0A) -static inline void +static inline int superio_enter (void ) { +if (!request_muxed_region (REG ,2 ,DRVNAME ))
I note that some other drivers give an error message here.
drivers/hwmon/smsc47m1.c superio_inb(int reg) · line 84
Quoted 5 lines
drivers/hwmon/smsc47m1.c +3
-0+return -EBUSY ; +outb (0x55 ,REG ); +return 0 ; }
Maybe this can be factored out later into a common helper, as there does seem to be a bit duplication in kernel drivers (including gpio and wdt also)
But I'm not sure if it's worth it now.
Thanks,
Quoted 45 lines
drivers/hwmon/smsc47m1.c +14
-8static inline void superio_exit (void ) {outb (0xAA ,REG ); +release_region (REG ,2 ); }#define SUPERIO_REG_ACT 0x30@@ -535,8 +540,12 @@ static int __init smsc47m1_find(struct smsc47m1_sio_data *sio_data) {u8 val;unsigned short addr; +int err; + + err =superio_enter (); +if (err) +return err; -superio_enter (); val = force_id ? force_id :superio_inb (SUPERIO_REG_DEVID );/* @@ -612,13 +621,14 @@ static int __init smsc47m1_find(struct smsc47m1_sio_data *sio_data)static void smsc47m1_restore (const struct smsc47m1_sio_data *sio_data) {if ((sio_data->activate &0x01 ) ==0 ) { -superio_enter (); -superio_select (); - -pr_info ("Disabling device\n" ); -superio_outb (SUPERIO_REG_ACT , sio_data->activate); - -superio_exit (); +if (!superio_enter ()) { +superio_select (); +pr_info ("Disabling device\n" ); +superio_outb (SUPERIO_REG_ACT , sio_data->activate); +superio_exit (); + }else { +pr_warn ("Failed to disable device\n" ); + } } }