From: Zev Weiss <zev@bewilderbeest.net> To: Guenter Roeck <linux@roeck-us.net>, Jean Delvare <jdelvare@suse.com>, linux-hwmon@vger.kernel.org Cc: linux-kernel@vger.kernel.org, openbmc@lists.ozlabs.org, Oleksandr Natalenko <oleksandr@natalenko.name>, Zev Weiss <zev@bewilderbeest.net>, Renze Nicolai <renze@rnplus.nl> Subject: [PATCH v2 4/6] hwmon: (nct6775) Add read-only mode Date: Tue, 8 Mar 2022 16:50:45 -0800 [thread overview] Message-ID: <20220309005047.5107-5-zev@bewilderbeest.net> (raw) In-Reply-To: <20220309005047.5107-1-zev@bewilderbeest.net> When enabled, all write bits are removed from the modes of all sysfs attribute files. This provides a bit of infrastructure for the upcoming i2c version of this driver, which should generally avoid writes to device registers so as not to interfere with simultaneous use of the device via the LPC interface. Signed-off-by: Zev Weiss <zev@bewilderbeest.net> --- drivers/hwmon/nct6775.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c index 36bdbb176601..99b4e308a053 100644 --- a/drivers/hwmon/nct6775.c +++ b/drivers/hwmon/nct6775.c @@ -1348,6 +1348,7 @@ struct nct6775_data { u8 sio_reg_enable; struct regmap *regmap; + bool read_only; }; struct sensor_device_template { @@ -1405,6 +1406,11 @@ struct sensor_template_group { int base; }; +static inline umode_t nct6775_attr_mode(struct nct6775_data *data, struct attribute *attr) +{ + return data->read_only ? (attr->mode & ~0222) : attr->mode; +} + static int nct6775_add_attr_group(struct nct6775_data *data, const struct attribute_group *group) { /* Need to leave a NULL terminator at the end of data->groups */ @@ -2371,7 +2377,7 @@ static umode_t nct6775_in_is_visible(struct kobject *kobj, if (!(data->have_in & BIT(in))) return 0; - return attr->mode; + return nct6775_attr_mode(data, attr); } SENSOR_TEMPLATE_2(in_input, "in%d_input", S_IRUGO, show_in_reg, NULL, 0, 0); @@ -2607,7 +2613,7 @@ static umode_t nct6775_fan_is_visible(struct kobject *kobj, if (nr == 5 && data->kind != nct6775) return 0; - return attr->mode; + return nct6775_attr_mode(data, attr); } SENSOR_TEMPLATE(fan_input, "fan%d_input", S_IRUGO, show_fan, NULL, 0); @@ -2834,7 +2840,7 @@ static umode_t nct6775_temp_is_visible(struct kobject *kobj, if (nr > 7 && !(data->have_temp_fixed & BIT(temp))) return 0; - return attr->mode; + return nct6775_attr_mode(data, attr); } SENSOR_TEMPLATE_2(temp_input, "temp%d_input", S_IRUGO, show_temp, NULL, 0, 0); @@ -2908,7 +2914,7 @@ static umode_t nct6775_tsi_temp_is_visible(struct kobject *kobj, struct attribut struct nct6775_data *data = dev_get_drvdata(dev); int temp = index / 2; - return (data->have_tsi_temp & BIT(temp)) ? attr->mode : 0; + return (data->have_tsi_temp & BIT(temp)) ? nct6775_attr_mode(data, attr) : 0; } /* @@ -3766,7 +3772,7 @@ static umode_t nct6775_pwm_is_visible(struct kobject *kobj, if (api > data->auto_pwm_num) return 0; } - return attr->mode; + return nct6775_attr_mode(data, attr); } SENSOR_TEMPLATE_2(pwm_stop_time, "pwm%d_stop_time", S_IWUSR | S_IRUGO, @@ -3961,7 +3967,7 @@ static umode_t nct6775_other_is_visible(struct kobject *kobj, return 0; } - return attr->mode; + return nct6775_attr_mode(data, attr); } /* -- 2.35.1
WARNING: multiple messages have this Message-ID (diff)
From: Zev Weiss <zev@bewilderbeest.net> To: Guenter Roeck <linux@roeck-us.net>, Jean Delvare <jdelvare@suse.com>, linux-hwmon@vger.kernel.org Cc: Zev Weiss <zev@bewilderbeest.net>, Renze Nicolai <renze@rnplus.nl>, Oleksandr Natalenko <oleksandr@natalenko.name>, openbmc@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 4/6] hwmon: (nct6775) Add read-only mode Date: Tue, 8 Mar 2022 16:50:45 -0800 [thread overview] Message-ID: <20220309005047.5107-5-zev@bewilderbeest.net> (raw) In-Reply-To: <20220309005047.5107-1-zev@bewilderbeest.net> When enabled, all write bits are removed from the modes of all sysfs attribute files. This provides a bit of infrastructure for the upcoming i2c version of this driver, which should generally avoid writes to device registers so as not to interfere with simultaneous use of the device via the LPC interface. Signed-off-by: Zev Weiss <zev@bewilderbeest.net> --- drivers/hwmon/nct6775.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c index 36bdbb176601..99b4e308a053 100644 --- a/drivers/hwmon/nct6775.c +++ b/drivers/hwmon/nct6775.c @@ -1348,6 +1348,7 @@ struct nct6775_data { u8 sio_reg_enable; struct regmap *regmap; + bool read_only; }; struct sensor_device_template { @@ -1405,6 +1406,11 @@ struct sensor_template_group { int base; }; +static inline umode_t nct6775_attr_mode(struct nct6775_data *data, struct attribute *attr) +{ + return data->read_only ? (attr->mode & ~0222) : attr->mode; +} + static int nct6775_add_attr_group(struct nct6775_data *data, const struct attribute_group *group) { /* Need to leave a NULL terminator at the end of data->groups */ @@ -2371,7 +2377,7 @@ static umode_t nct6775_in_is_visible(struct kobject *kobj, if (!(data->have_in & BIT(in))) return 0; - return attr->mode; + return nct6775_attr_mode(data, attr); } SENSOR_TEMPLATE_2(in_input, "in%d_input", S_IRUGO, show_in_reg, NULL, 0, 0); @@ -2607,7 +2613,7 @@ static umode_t nct6775_fan_is_visible(struct kobject *kobj, if (nr == 5 && data->kind != nct6775) return 0; - return attr->mode; + return nct6775_attr_mode(data, attr); } SENSOR_TEMPLATE(fan_input, "fan%d_input", S_IRUGO, show_fan, NULL, 0); @@ -2834,7 +2840,7 @@ static umode_t nct6775_temp_is_visible(struct kobject *kobj, if (nr > 7 && !(data->have_temp_fixed & BIT(temp))) return 0; - return attr->mode; + return nct6775_attr_mode(data, attr); } SENSOR_TEMPLATE_2(temp_input, "temp%d_input", S_IRUGO, show_temp, NULL, 0, 0); @@ -2908,7 +2914,7 @@ static umode_t nct6775_tsi_temp_is_visible(struct kobject *kobj, struct attribut struct nct6775_data *data = dev_get_drvdata(dev); int temp = index / 2; - return (data->have_tsi_temp & BIT(temp)) ? attr->mode : 0; + return (data->have_tsi_temp & BIT(temp)) ? nct6775_attr_mode(data, attr) : 0; } /* @@ -3766,7 +3772,7 @@ static umode_t nct6775_pwm_is_visible(struct kobject *kobj, if (api > data->auto_pwm_num) return 0; } - return attr->mode; + return nct6775_attr_mode(data, attr); } SENSOR_TEMPLATE_2(pwm_stop_time, "pwm%d_stop_time", S_IWUSR | S_IRUGO, @@ -3961,7 +3967,7 @@ static umode_t nct6775_other_is_visible(struct kobject *kobj, return 0; } - return attr->mode; + return nct6775_attr_mode(data, attr); } /* -- 2.35.1
next prev parent reply other threads:[~2022-03-09 0:53 UTC|newest] Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-03-09 0:50 [PATCH v2 0/6] hwmon: (nct6775) Convert to regmap, add i2c support Zev Weiss 2022-03-09 0:50 ` Zev Weiss 2022-03-09 0:50 ` [PATCH v2 1/6] dt-bindings: hwmon: Add nuvoton,nct6775 Zev Weiss 2022-03-09 0:50 ` Zev Weiss 2022-04-25 15:07 ` Guenter Roeck 2022-04-25 15:07 ` Guenter Roeck 2022-04-26 1:23 ` Zev Weiss 2022-04-26 1:23 ` Zev Weiss 2022-03-09 0:50 ` [PATCH v2 2/6] hwmon: (nct6775) Convert register access to regmap API Zev Weiss 2022-03-09 0:50 ` Zev Weiss 2022-04-25 15:24 ` Guenter Roeck 2022-04-25 15:24 ` Guenter Roeck 2022-03-09 0:50 ` [PATCH v2 3/6] hwmon: (nct6775) Rearrange attr-group initialization Zev Weiss 2022-03-09 0:50 ` Zev Weiss 2022-03-09 0:50 ` Zev Weiss [this message] 2022-03-09 0:50 ` [PATCH v2 4/6] hwmon: (nct6775) Add read-only mode Zev Weiss 2022-03-09 0:50 ` [PATCH v2 5/6] hwmon: (nct6775) Split core and platform driver Zev Weiss 2022-03-09 0:50 ` Zev Weiss 2022-04-25 15:23 ` Guenter Roeck 2022-04-25 15:23 ` Guenter Roeck 2022-03-09 0:50 ` [PATCH v2 6/6] hwmon: (nct6775) Add i2c driver Zev Weiss 2022-03-09 0:50 ` Zev Weiss 2022-04-25 15:37 ` Guenter Roeck 2022-04-25 15:37 ` Guenter Roeck 2022-03-09 8:12 ` [PATCH v2 0/6] hwmon: (nct6775) Convert to regmap, add i2c support Paul Menzel 2022-03-09 8:12 ` Paul Menzel 2022-03-09 11:16 ` Zev Weiss 2022-03-09 11:16 ` Zev Weiss 2022-03-10 19:13 ` Guenter Roeck 2022-03-10 19:13 ` Guenter Roeck
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220309005047.5107-5-zev@bewilderbeest.net \ --to=zev@bewilderbeest.net \ --cc=jdelvare@suse.com \ --cc=linux-hwmon@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux@roeck-us.net \ --cc=oleksandr@natalenko.name \ --cc=openbmc@lists.ozlabs.org \ --cc=renze@rnplus.nl \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.