Skip to content

Commit a7ac371

Browse files
Eddie Jamesgroeck
authored andcommitted
hwmon: (pmbus/core) Add lock and unlock functions
Debugfs operations may set the page number, which must be done atomically with the subsequent i2c operation. Lock the update_lock in the debugfs functions and provide a function for pmbus drivers to lock and unlock the update_lock. Signed-off-by: Eddie James <eajames@linux.ibm.com> Link: https://lore.kernel.org/r/20230412161526.252294-2-eajames@linux.ibm.com Signed-off-by: Guenter Roeck <linux@roeck-us.net>
1 parent ab3e004 commit a7ac371

2 files changed

Lines changed: 32 additions & 0 deletions

File tree

drivers/hwmon/pmbus/pmbus.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -505,6 +505,8 @@ int pmbus_get_fan_rate_device(struct i2c_client *client, int page, int id,
505505
enum pmbus_fan_mode mode);
506506
int pmbus_get_fan_rate_cached(struct i2c_client *client, int page, int id,
507507
enum pmbus_fan_mode mode);
508+
int pmbus_lock_interruptible(struct i2c_client *client);
509+
void pmbus_unlock(struct i2c_client *client);
508510
int pmbus_update_fan(struct i2c_client *client, int page, int id,
509511
u8 config, u8 mask, u16 command);
510512
struct dentry *pmbus_get_debugfs_dir(struct i2c_client *client);

drivers/hwmon/pmbus/pmbus_core.c

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3263,8 +3263,13 @@ static int pmbus_debugfs_get(void *data, u64 *val)
32633263
{
32643264
int rc;
32653265
struct pmbus_debugfs_entry *entry = data;
3266+
struct pmbus_data *pdata = i2c_get_clientdata(entry->client);
32663267

3268+
rc = mutex_lock_interruptible(&pdata->update_lock);
3269+
if (rc)
3270+
return rc;
32673271
rc = _pmbus_read_byte_data(entry->client, entry->page, entry->reg);
3272+
mutex_unlock(&pdata->update_lock);
32683273
if (rc < 0)
32693274
return rc;
32703275

@@ -3281,7 +3286,11 @@ static int pmbus_debugfs_get_status(void *data, u64 *val)
32813286
struct pmbus_debugfs_entry *entry = data;
32823287
struct pmbus_data *pdata = i2c_get_clientdata(entry->client);
32833288

3289+
rc = mutex_lock_interruptible(&pdata->update_lock);
3290+
if (rc)
3291+
return rc;
32843292
rc = pdata->read_status(entry->client, entry->page);
3293+
mutex_unlock(&pdata->update_lock);
32853294
if (rc < 0)
32863295
return rc;
32873296

@@ -3297,10 +3306,15 @@ static ssize_t pmbus_debugfs_mfr_read(struct file *file, char __user *buf,
32973306
{
32983307
int rc;
32993308
struct pmbus_debugfs_entry *entry = file->private_data;
3309+
struct pmbus_data *pdata = i2c_get_clientdata(entry->client);
33003310
char data[I2C_SMBUS_BLOCK_MAX + 2] = { 0 };
33013311

3312+
rc = mutex_lock_interruptible(&pdata->update_lock);
3313+
if (rc)
3314+
return rc;
33023315
rc = pmbus_read_block_data(entry->client, entry->page, entry->reg,
33033316
data);
3317+
mutex_unlock(&pdata->update_lock);
33043318
if (rc < 0)
33053319
return rc;
33063320

@@ -3638,6 +3652,22 @@ struct dentry *pmbus_get_debugfs_dir(struct i2c_client *client)
36383652
}
36393653
EXPORT_SYMBOL_NS_GPL(pmbus_get_debugfs_dir, PMBUS);
36403654

3655+
int pmbus_lock_interruptible(struct i2c_client *client)
3656+
{
3657+
struct pmbus_data *data = i2c_get_clientdata(client);
3658+
3659+
return mutex_lock_interruptible(&data->update_lock);
3660+
}
3661+
EXPORT_SYMBOL_NS_GPL(pmbus_lock_interruptible, PMBUS);
3662+
3663+
void pmbus_unlock(struct i2c_client *client)
3664+
{
3665+
struct pmbus_data *data = i2c_get_clientdata(client);
3666+
3667+
mutex_unlock(&data->update_lock);
3668+
}
3669+
EXPORT_SYMBOL_NS_GPL(pmbus_unlock, PMBUS);
3670+
36413671
static int __init pmbus_core_init(void)
36423672
{
36433673
pmbus_debugfs_dir = debugfs_create_dir("pmbus", NULL);

0 commit comments

Comments
 (0)