diff mbox series

[v2,1/2] hwmon: (pmbus/core) Add lock and unlock functions

Message ID	20230412161526.252294-2-eajames@linux.ibm.com
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; From: Eddie James <eajames@linux.ibm.com> To: linux-hwmon@vger.kernel.org Cc: linux-kernel@vger.kernel.org, jdelvare@suse.com, linux@roeck-us.net, Eddie James <eajames@linux.ibm.com> Subject: [PATCH v2 1/2] hwmon: (pmbus/core) Add lock and unlock functions Date: Wed, 12 Apr 2023 11:15:25 -0500 Message-Id: <20230412161526.252294-2-eajames@linux.ibm.com> In-Reply-To: <20230412161526.252294-1-eajames@linux.ibm.com> References: <20230412161526.252294-1-eajames@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	hwmon: (pmbus/core) Add lock and unlock functions \| [v2,0/2] hwmon: (pmbus/core) Add lock and unlock functions [v2,1/2] hwmon: (pmbus/core) Add lock and unlock functions [v2,2/2] hwmon: (pmbus/ibm-cffps) Use default debugfs attributes and lock function

Commit Message

Eddie James April 12, 2023, 4:15 p.m. UTC

  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>
---
 drivers/hwmon/pmbus/pmbus.h      |  2 ++
 drivers/hwmon/pmbus/pmbus_core.c | 30 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)

Comments

Guenter Roeck April 16, 2023, 2:03 p.m. UTC | #1

On Wed, Apr 12, 2023 at 11:15:25AM -0500, Eddie James wrote:
> 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>

Applied.

Thanks,
Guenter

> ---
>  drivers/hwmon/pmbus/pmbus.h      |  2 ++
>  drivers/hwmon/pmbus/pmbus_core.c | 30 ++++++++++++++++++++++++++++++
>  2 files changed, 32 insertions(+)
> 
> diff --git a/drivers/hwmon/pmbus/pmbus.h b/drivers/hwmon/pmbus/pmbus.h
> index 11e84e141126..b0832a4c690d 100644
> --- a/drivers/hwmon/pmbus/pmbus.h
> +++ b/drivers/hwmon/pmbus/pmbus.h
> @@ -505,6 +505,8 @@ int pmbus_get_fan_rate_device(struct i2c_client *client, int page, int id,
>  			      enum pmbus_fan_mode mode);
>  int pmbus_get_fan_rate_cached(struct i2c_client *client, int page, int id,
>  			      enum pmbus_fan_mode mode);
> +int pmbus_lock_interruptible(struct i2c_client *client);
> +void pmbus_unlock(struct i2c_client *client);
>  int pmbus_update_fan(struct i2c_client *client, int page, int id,
>  		     u8 config, u8 mask, u16 command);
>  struct dentry *pmbus_get_debugfs_dir(struct i2c_client *client);
> diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c
> index ca4510e4f918..04b4c65666fd 100644
> --- a/drivers/hwmon/pmbus/pmbus_core.c
> +++ b/drivers/hwmon/pmbus/pmbus_core.c
> @@ -3212,8 +3212,13 @@ static int pmbus_debugfs_get(void *data, u64 *val)
>  {
>  	int rc;
>  	struct pmbus_debugfs_entry *entry = data;
> +	struct pmbus_data *pdata = i2c_get_clientdata(entry->client);
>  
> +	rc = mutex_lock_interruptible(&pdata->update_lock);
> +	if (rc)
> +		return rc;
>  	rc = _pmbus_read_byte_data(entry->client, entry->page, entry->reg);
> +	mutex_unlock(&pdata->update_lock);
>  	if (rc < 0)
>  		return rc;
>  
> @@ -3230,7 +3235,11 @@ static int pmbus_debugfs_get_status(void *data, u64 *val)
>  	struct pmbus_debugfs_entry *entry = data;
>  	struct pmbus_data *pdata = i2c_get_clientdata(entry->client);
>  
> +	rc = mutex_lock_interruptible(&pdata->update_lock);
> +	if (rc)
> +		return rc;
>  	rc = pdata->read_status(entry->client, entry->page);
> +	mutex_unlock(&pdata->update_lock);
>  	if (rc < 0)
>  		return rc;
>  
> @@ -3246,10 +3255,15 @@ static ssize_t pmbus_debugfs_mfr_read(struct file *file, char __user *buf,
>  {
>  	int rc;
>  	struct pmbus_debugfs_entry *entry = file->private_data;
> +	struct pmbus_data *pdata = i2c_get_clientdata(entry->client);
>  	char data[I2C_SMBUS_BLOCK_MAX + 2] = { 0 };
>  
> +	rc = mutex_lock_interruptible(&pdata->update_lock);
> +	if (rc)
> +		return rc;
>  	rc = pmbus_read_block_data(entry->client, entry->page, entry->reg,
>  				   data);
> +	mutex_unlock(&pdata->update_lock);
>  	if (rc < 0)
>  		return rc;
>  
> @@ -3587,6 +3601,22 @@ struct dentry *pmbus_get_debugfs_dir(struct i2c_client *client)
>  }
>  EXPORT_SYMBOL_NS_GPL(pmbus_get_debugfs_dir, PMBUS);
>  
> +int pmbus_lock_interruptible(struct i2c_client *client)
> +{
> +	struct pmbus_data *data = i2c_get_clientdata(client);
> +
> +	return mutex_lock_interruptible(&data->update_lock);
> +}
> +EXPORT_SYMBOL_NS_GPL(pmbus_lock_interruptible, PMBUS);
> +
> +void pmbus_unlock(struct i2c_client *client)
> +{
> +	struct pmbus_data *data = i2c_get_clientdata(client);
> +
> +	mutex_unlock(&data->update_lock);
> +}
> +EXPORT_SYMBOL_NS_GPL(pmbus_unlock, PMBUS);
> +
>  static int __init pmbus_core_init(void)
>  {
>  	pmbus_debugfs_dir = debugfs_create_dir("pmbus", NULL);

diff mbox series

Patch

diff --git a/drivers/hwmon/pmbus/pmbus.h b/drivers/hwmon/pmbus/pmbus.h
index 11e84e141126..b0832a4c690d 100644
--- a/drivers/hwmon/pmbus/pmbus.h
+++ b/drivers/hwmon/pmbus/pmbus.h
@@ -505,6 +505,8 @@  int pmbus_get_fan_rate_device(struct i2c_client *client, int page, int id,
 			      enum pmbus_fan_mode mode);
 int pmbus_get_fan_rate_cached(struct i2c_client *client, int page, int id,
 			      enum pmbus_fan_mode mode);
+int pmbus_lock_interruptible(struct i2c_client *client);
+void pmbus_unlock(struct i2c_client *client);
 int pmbus_update_fan(struct i2c_client *client, int page, int id,
 		     u8 config, u8 mask, u16 command);
 struct dentry *pmbus_get_debugfs_dir(struct i2c_client *client);
diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c
index ca4510e4f918..04b4c65666fd 100644
--- a/drivers/hwmon/pmbus/pmbus_core.c
+++ b/drivers/hwmon/pmbus/pmbus_core.c
@@ -3212,8 +3212,13 @@  static int pmbus_debugfs_get(void *data, u64 *val)
 {
 	int rc;
 	struct pmbus_debugfs_entry *entry = data;
+	struct pmbus_data *pdata = i2c_get_clientdata(entry->client);
 
+	rc = mutex_lock_interruptible(&pdata->update_lock);
+	if (rc)
+		return rc;
 	rc = _pmbus_read_byte_data(entry->client, entry->page, entry->reg);
+	mutex_unlock(&pdata->update_lock);
 	if (rc < 0)
 		return rc;
 
@@ -3230,7 +3235,11 @@  static int pmbus_debugfs_get_status(void *data, u64 *val)
 	struct pmbus_debugfs_entry *entry = data;
 	struct pmbus_data *pdata = i2c_get_clientdata(entry->client);
 
+	rc = mutex_lock_interruptible(&pdata->update_lock);
+	if (rc)
+		return rc;
 	rc = pdata->read_status(entry->client, entry->page);
+	mutex_unlock(&pdata->update_lock);
 	if (rc < 0)
 		return rc;
 
@@ -3246,10 +3255,15 @@  static ssize_t pmbus_debugfs_mfr_read(struct file *file, char __user *buf,
 {
 	int rc;
 	struct pmbus_debugfs_entry *entry = file->private_data;
+	struct pmbus_data *pdata = i2c_get_clientdata(entry->client);
 	char data[I2C_SMBUS_BLOCK_MAX + 2] = { 0 };
 
+	rc = mutex_lock_interruptible(&pdata->update_lock);
+	if (rc)
+		return rc;
 	rc = pmbus_read_block_data(entry->client, entry->page, entry->reg,
 				   data);
+	mutex_unlock(&pdata->update_lock);
 	if (rc < 0)
 		return rc;
 
@@ -3587,6 +3601,22 @@  struct dentry *pmbus_get_debugfs_dir(struct i2c_client *client)
 }
 EXPORT_SYMBOL_NS_GPL(pmbus_get_debugfs_dir, PMBUS);
 
+int pmbus_lock_interruptible(struct i2c_client *client)
+{
+	struct pmbus_data *data = i2c_get_clientdata(client);
+
+	return mutex_lock_interruptible(&data->update_lock);
+}
+EXPORT_SYMBOL_NS_GPL(pmbus_lock_interruptible, PMBUS);
+
+void pmbus_unlock(struct i2c_client *client)
+{
+	struct pmbus_data *data = i2c_get_clientdata(client);
+
+	mutex_unlock(&data->update_lock);
+}
+EXPORT_SYMBOL_NS_GPL(pmbus_unlock, PMBUS);
+
 static int __init pmbus_core_init(void)
 {
 	pmbus_debugfs_dir = debugfs_create_dir("pmbus", NULL);