* [PATCH 0/5] hwmon: (nct6775) Add i2c support
@ 2022-02-26 13:30 Zev Weiss
2022-02-26 13:30 ` [PATCH 1/5] hwmon: (nct6775) Rearrange attr-group initialization Zev Weiss
` (7 more replies)
0 siblings, 8 replies; 19+ messages in thread
From: Zev Weiss @ 2022-02-26 13:30 UTC (permalink / raw)
To: linux-hwmon, Guenter Roeck, Jean Delvare
Cc: devicetree, Zev Weiss, openbmc, linux-kernel, Renze Nicolai, Rob Herring
Hello,
This patch series augments the existing nct6775 driver with support
for the hardware's i2c interface.
Thus far the nct6775 driver has only supported the LPC interface,
which is the main interface by which the Super-I/O chip is typically
connected to the host (x86) processor.
However, these chips also provide an i2c interface, which can provide
a way for a BMC to also monitor sensor readings from them. On some
systems (such as the ASRock Rack ROMED8HM3 and X570-D4U) this may be
the only way for the BMC to monitor host CPU temperatures (e.g. to
indirectly access a TSI interface); this functionality is thus an
important component of enabling OpenBMC to support such systems.
In such an arrangement the Super-I/O chip is simultaneously controlled
by two independent processors (the host and the BMC) which typically
do not coordinate their accesses with each other. In order to avoid
conflicts between the two, the i2c driver avoids all writes to the
device, since the BMC's needs with the hardware are merely that it be
able to retrieve sensor readings. This allows the host processor to
remain ultimately in control of the chip and unaware of the BMC's use
of it at all.
The sole exception to the "no writes" rule for the i2c driver is for
the bank-select register -- while I haven't been able to find any
explicit statement in the Nuvoton datasheets guaranteeing this, all
experiments I've done have indicated that, as one might hope, the i2c
interface has its own bank-select register independent of the one used
by the LPC interface.
In terms of code structure, the approach taken in this series is to
split the LPC-specific parts of the driver out into a separate module
(called nct6775-platform), leaving the interface-independent parts in
a generic driver (called nct6775-core). The nct6775-i2c driver is
then added as an additional consumer of the nct6775-core module's
functionality.
The first two patches make some relatively small infrastructural
changes to the nct6775 driver; the bulk of the core/platform driver
split is in the third patch. The final two patches add DT bindings
and the i2c driver itself.
I've tested the nct6775-platform and nct6775-i2c drivers with the
NCT6779D in an ASRock ROMED8HM3 system (the latter driver on its
AST2500 BMC); both seem to work as expected. Broader testing would of
course be welcome though, as is review feedback.
Thanks,
Zev
Zev Weiss (5):
hwmon: (nct6775) Rearrange attr-group initialization
hwmon: (nct6775) Add read-only mode
hwmon: (nct6775) Split core and platform driver
dt-bindings: hwmon: Add nuvoton,nct6775
hwmon: (nct6775) Add i2c driver
.../bindings/hwmon/nuvoton,nct6775.yaml | 48 +
MAINTAINERS | 12 +-
drivers/hwmon/Kconfig | 32 +-
drivers/hwmon/Makefile | 4 +-
drivers/hwmon/{nct6775.c => nct6775-core.c} | 1464 +----------------
drivers/hwmon/nct6775-i2c.c | 191 +++
drivers/hwmon/nct6775-platform.c | 1185 +++++++++++++
drivers/hwmon/nct6775.h | 233 +++
8 files changed, 1763 insertions(+), 1406 deletions(-)
create mode 100644 Documentation/devicetree/bindings/hwmon/nuvoton,nct6775.yaml
rename drivers/hwmon/{nct6775.c => nct6775-core.c} (75%)
create mode 100644 drivers/hwmon/nct6775-i2c.c
create mode 100644 drivers/hwmon/nct6775-platform.c
create mode 100644 drivers/hwmon/nct6775.h
--
2.35.1
^ permalink raw reply [flat|nested] 19+ messages in thread* [PATCH 1/5] hwmon: (nct6775) Rearrange attr-group initialization
2022-02-26 13:30 [PATCH 0/5] hwmon: (nct6775) Add i2c support Zev Weiss
@ 2022-02-26 13:30 ` Zev Weiss
2022-02-27 15:01 ` Guenter Roeck
2022-02-26 13:30 ` [PATCH 2/5] hwmon: (nct6775) Add read-only mode Zev Weiss
` (6 subsequent siblings)
7 siblings, 1 reply; 19+ messages in thread
From: Zev Weiss @ 2022-02-26 13:30 UTC (permalink / raw)
To: linux-hwmon, Guenter Roeck, Jean Delvare
Cc: openbmc, linux-kernel, Zev Weiss, Renze Nicolai
We now track the number of attribute groups in nct6775_data, as a
measure to simplify handling differences in the set of enabled
attribute groups between nct6775 drivers (platform & i2c). As a side
effect, we also reduce the amount of IS_ERR()/PTR_ERR() boilerplate a
bit.
Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
---
drivers/hwmon/nct6775.c | 84 ++++++++++++++++++++---------------------
1 file changed, 42 insertions(+), 42 deletions(-)
diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
index 2b91f7e05126..139b2fe5ca4d 100644
--- a/drivers/hwmon/nct6775.c
+++ b/drivers/hwmon/nct6775.c
@@ -1198,6 +1198,7 @@ struct nct6775_data {
const char *name;
const struct attribute_group *groups[7];
+ u8 num_groups;
u16 reg_temp[5][NUM_TEMP]; /* 0=temp, 1=temp_over, 2=temp_hyst,
* 3=temp_crit, 4=temp_lcrit
@@ -1405,10 +1406,18 @@ struct sensor_template_group {
int base;
};
-static struct attribute_group *
-nct6775_create_attr_group(struct device *dev,
- const struct sensor_template_group *tg,
- int repeat)
+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 */
+ if (WARN_ON(data->num_groups == ARRAY_SIZE(data->groups) - 1))
+ return -ENOSPC;
+
+ data->groups[data->num_groups++] = group;
+ return 0;
+}
+
+static int nct6775_add_template_attr_group(struct device *dev, struct nct6775_data *data,
+ const struct sensor_template_group *tg, int repeat)
{
struct attribute_group *group;
struct sensor_device_attr_u *su;
@@ -1419,28 +1428,28 @@ nct6775_create_attr_group(struct device *dev,
int i, count;
if (repeat <= 0)
- return ERR_PTR(-EINVAL);
+ return -EINVAL;
t = tg->templates;
for (count = 0; *t; t++, count++)
;
if (count == 0)
- return ERR_PTR(-EINVAL);
+ return -EINVAL;
group = devm_kzalloc(dev, sizeof(*group), GFP_KERNEL);
if (group == NULL)
- return ERR_PTR(-ENOMEM);
+ return -ENOMEM;
attrs = devm_kcalloc(dev, repeat * count + 1, sizeof(*attrs),
GFP_KERNEL);
if (attrs == NULL)
- return ERR_PTR(-ENOMEM);
+ return -ENOMEM;
su = devm_kzalloc(dev, array3_size(repeat, count, sizeof(*su)),
GFP_KERNEL);
if (su == NULL)
- return ERR_PTR(-ENOMEM);
+ return -ENOMEM;
group->attrs = attrs;
group->is_visible = tg->is_visible;
@@ -1478,7 +1487,7 @@ nct6775_create_attr_group(struct device *dev,
}
}
- return group;
+ return nct6775_add_attr_group(data, group);
}
static bool is_word_sized(struct nct6775_data *data, u16 reg)
@@ -4020,10 +4029,8 @@ static int nct6775_probe(struct platform_device *pdev)
const u16 *reg_temp_crit_l = NULL, *reg_temp_crit_h = NULL;
int num_reg_temp, num_reg_temp_mon, num_reg_tsi_temp;
u8 cr2a;
- struct attribute_group *group;
struct device *hwmon_dev;
struct sensor_template_group tsi_temp_tg;
- int num_attr_groups = 0;
if (sio_data->access == access_direct) {
res = platform_get_resource(pdev, IORESOURCE_IO, 0);
@@ -4844,46 +4851,39 @@ static int nct6775_probe(struct platform_device *pdev)
nct6775_init_fan_common(dev, data);
/* Register sysfs hooks */
- group = nct6775_create_attr_group(dev, &nct6775_pwm_template_group,
- data->pwm_num);
- if (IS_ERR(group))
- return PTR_ERR(group);
-
- data->groups[num_attr_groups++] = group;
-
- group = nct6775_create_attr_group(dev, &nct6775_in_template_group,
- fls(data->have_in));
- if (IS_ERR(group))
- return PTR_ERR(group);
-
- data->groups[num_attr_groups++] = group;
-
- group = nct6775_create_attr_group(dev, &nct6775_fan_template_group,
- fls(data->has_fan));
- if (IS_ERR(group))
- return PTR_ERR(group);
+ err = nct6775_add_template_attr_group(dev, data, &nct6775_pwm_template_group,
+ data->pwm_num);
+ if (err)
+ return err;
- data->groups[num_attr_groups++] = group;
+ err = nct6775_add_template_attr_group(dev, data, &nct6775_in_template_group,
+ fls(data->have_in));
+ if (err)
+ return err;
- group = nct6775_create_attr_group(dev, &nct6775_temp_template_group,
- fls(data->have_temp));
- if (IS_ERR(group))
- return PTR_ERR(group);
+ err = nct6775_add_template_attr_group(dev, data, &nct6775_fan_template_group,
+ fls(data->has_fan));
+ if (err)
+ return err;
- data->groups[num_attr_groups++] = group;
+ err = nct6775_add_template_attr_group(dev, data, &nct6775_temp_template_group,
+ fls(data->have_temp));
+ if (err)
+ return err;
if (data->have_tsi_temp) {
tsi_temp_tg.templates = nct6775_tsi_temp_template;
tsi_temp_tg.is_visible = nct6775_tsi_temp_is_visible;
tsi_temp_tg.base = fls(data->have_temp) + 1;
- group = nct6775_create_attr_group(dev, &tsi_temp_tg, fls(data->have_tsi_temp));
- if (IS_ERR(group))
- return PTR_ERR(group);
-
- data->groups[num_attr_groups++] = group;
+ err = nct6775_add_template_attr_group(dev, data, &tsi_temp_tg,
+ fls(data->have_tsi_temp));
+ if (err)
+ return err;
}
- data->groups[num_attr_groups++] = &nct6775_group_other;
+ err = nct6775_add_attr_group(data, &nct6775_group_other);
+ if (err)
+ return err;
hwmon_dev = devm_hwmon_device_register_with_groups(dev, data->name,
data, data->groups);
--
2.35.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [PATCH 1/5] hwmon: (nct6775) Rearrange attr-group initialization
2022-02-26 13:30 ` [PATCH 1/5] hwmon: (nct6775) Rearrange attr-group initialization Zev Weiss
@ 2022-02-27 15:01 ` Guenter Roeck
2022-02-28 8:24 ` Zev Weiss
0 siblings, 1 reply; 19+ messages in thread
From: Guenter Roeck @ 2022-02-27 15:01 UTC (permalink / raw)
To: Zev Weiss, linux-hwmon, Jean Delvare; +Cc: openbmc, linux-kernel, Renze Nicolai
On 2/26/22 05:30, Zev Weiss wrote:
> We now track the number of attribute groups in nct6775_data, as a
> measure to simplify handling differences in the set of enabled
> attribute groups between nct6775 drivers (platform & i2c). As a side
> effect, we also reduce the amount of IS_ERR()/PTR_ERR() boilerplate a
> bit.
>
> Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
> ---
> drivers/hwmon/nct6775.c | 84 ++++++++++++++++++++---------------------
> 1 file changed, 42 insertions(+), 42 deletions(-)
>
> diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
> index 2b91f7e05126..139b2fe5ca4d 100644
> --- a/drivers/hwmon/nct6775.c
> +++ b/drivers/hwmon/nct6775.c
> @@ -1198,6 +1198,7 @@ struct nct6775_data {
> const char *name;
>
> const struct attribute_group *groups[7];
> + u8 num_groups;
>
> u16 reg_temp[5][NUM_TEMP]; /* 0=temp, 1=temp_over, 2=temp_hyst,
> * 3=temp_crit, 4=temp_lcrit
> @@ -1405,10 +1406,18 @@ struct sensor_template_group {
> int base;
> };
>
> -static struct attribute_group *
> -nct6775_create_attr_group(struct device *dev,
> - const struct sensor_template_group *tg,
> - int repeat)
> +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 */
> + if (WARN_ON(data->num_groups == ARRAY_SIZE(data->groups) - 1))
> + return -ENOSPC;
> +
At work we are struggling with a whopping 500,000+ (!) WARN backtraces
_each day_. I would be happy if you send me patches removing some of
those, but I am not inclined to accept patches adding them. If people
don't notice that the driver doesn't load, they won't notice the warning
either, and it will just add to all the other warning backtrace noise.
Guenter
> + data->groups[data->num_groups++] = group;
> + return 0;
> +}
> +
> +static int nct6775_add_template_attr_group(struct device *dev, struct nct6775_data *data,
> + const struct sensor_template_group *tg, int repeat)
> {
> struct attribute_group *group;
> struct sensor_device_attr_u *su;
> @@ -1419,28 +1428,28 @@ nct6775_create_attr_group(struct device *dev,
> int i, count;
>
> if (repeat <= 0)
> - return ERR_PTR(-EINVAL);
> + return -EINVAL;
>
> t = tg->templates;
> for (count = 0; *t; t++, count++)
> ;
>
> if (count == 0)
> - return ERR_PTR(-EINVAL);
> + return -EINVAL;
>
> group = devm_kzalloc(dev, sizeof(*group), GFP_KERNEL);
> if (group == NULL)
> - return ERR_PTR(-ENOMEM);
> + return -ENOMEM;
>
> attrs = devm_kcalloc(dev, repeat * count + 1, sizeof(*attrs),
> GFP_KERNEL);
> if (attrs == NULL)
> - return ERR_PTR(-ENOMEM);
> + return -ENOMEM;
>
> su = devm_kzalloc(dev, array3_size(repeat, count, sizeof(*su)),
> GFP_KERNEL);
> if (su == NULL)
> - return ERR_PTR(-ENOMEM);
> + return -ENOMEM;
>
> group->attrs = attrs;
> group->is_visible = tg->is_visible;
> @@ -1478,7 +1487,7 @@ nct6775_create_attr_group(struct device *dev,
> }
> }
>
> - return group;
> + return nct6775_add_attr_group(data, group);
> }
>
> static bool is_word_sized(struct nct6775_data *data, u16 reg)
> @@ -4020,10 +4029,8 @@ static int nct6775_probe(struct platform_device *pdev)
> const u16 *reg_temp_crit_l = NULL, *reg_temp_crit_h = NULL;
> int num_reg_temp, num_reg_temp_mon, num_reg_tsi_temp;
> u8 cr2a;
> - struct attribute_group *group;
> struct device *hwmon_dev;
> struct sensor_template_group tsi_temp_tg;
> - int num_attr_groups = 0;
>
> if (sio_data->access == access_direct) {
> res = platform_get_resource(pdev, IORESOURCE_IO, 0);
> @@ -4844,46 +4851,39 @@ static int nct6775_probe(struct platform_device *pdev)
> nct6775_init_fan_common(dev, data);
>
> /* Register sysfs hooks */
> - group = nct6775_create_attr_group(dev, &nct6775_pwm_template_group,
> - data->pwm_num);
> - if (IS_ERR(group))
> - return PTR_ERR(group);
> -
> - data->groups[num_attr_groups++] = group;
> -
> - group = nct6775_create_attr_group(dev, &nct6775_in_template_group,
> - fls(data->have_in));
> - if (IS_ERR(group))
> - return PTR_ERR(group);
> -
> - data->groups[num_attr_groups++] = group;
> -
> - group = nct6775_create_attr_group(dev, &nct6775_fan_template_group,
> - fls(data->has_fan));
> - if (IS_ERR(group))
> - return PTR_ERR(group);
> + err = nct6775_add_template_attr_group(dev, data, &nct6775_pwm_template_group,
> + data->pwm_num);
> + if (err)
> + return err;
>
> - data->groups[num_attr_groups++] = group;
> + err = nct6775_add_template_attr_group(dev, data, &nct6775_in_template_group,
> + fls(data->have_in));
> + if (err)
> + return err;
>
> - group = nct6775_create_attr_group(dev, &nct6775_temp_template_group,
> - fls(data->have_temp));
> - if (IS_ERR(group))
> - return PTR_ERR(group);
> + err = nct6775_add_template_attr_group(dev, data, &nct6775_fan_template_group,
> + fls(data->has_fan));
> + if (err)
> + return err;
>
> - data->groups[num_attr_groups++] = group;
> + err = nct6775_add_template_attr_group(dev, data, &nct6775_temp_template_group,
> + fls(data->have_temp));
> + if (err)
> + return err;
>
> if (data->have_tsi_temp) {
> tsi_temp_tg.templates = nct6775_tsi_temp_template;
> tsi_temp_tg.is_visible = nct6775_tsi_temp_is_visible;
> tsi_temp_tg.base = fls(data->have_temp) + 1;
> - group = nct6775_create_attr_group(dev, &tsi_temp_tg, fls(data->have_tsi_temp));
> - if (IS_ERR(group))
> - return PTR_ERR(group);
> -
> - data->groups[num_attr_groups++] = group;
> + err = nct6775_add_template_attr_group(dev, data, &tsi_temp_tg,
> + fls(data->have_tsi_temp));
> + if (err)
> + return err;
> }
>
> - data->groups[num_attr_groups++] = &nct6775_group_other;
> + err = nct6775_add_attr_group(data, &nct6775_group_other);
> + if (err)
> + return err;
>
> hwmon_dev = devm_hwmon_device_register_with_groups(dev, data->name,
> data, data->groups);
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PATCH 1/5] hwmon: (nct6775) Rearrange attr-group initialization
2022-02-27 15:01 ` Guenter Roeck
@ 2022-02-28 8:24 ` Zev Weiss
2022-02-28 15:16 ` Guenter Roeck
0 siblings, 1 reply; 19+ messages in thread
From: Zev Weiss @ 2022-02-28 8:24 UTC (permalink / raw)
To: Guenter Roeck
Cc: linux-hwmon, openbmc, Jean Delvare, linux-kernel, Renze Nicolai
On Sun, Feb 27, 2022 at 07:01:32AM PST, Guenter Roeck wrote:
>On 2/26/22 05:30, Zev Weiss wrote:
>>We now track the number of attribute groups in nct6775_data, as a
>>measure to simplify handling differences in the set of enabled
>>attribute groups between nct6775 drivers (platform & i2c). As a side
>>effect, we also reduce the amount of IS_ERR()/PTR_ERR() boilerplate a
>>bit.
>>
>>Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
>>---
>> drivers/hwmon/nct6775.c | 84 ++++++++++++++++++++---------------------
>> 1 file changed, 42 insertions(+), 42 deletions(-)
>>
>>diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
>>index 2b91f7e05126..139b2fe5ca4d 100644
>>--- a/drivers/hwmon/nct6775.c
>>+++ b/drivers/hwmon/nct6775.c
>>@@ -1198,6 +1198,7 @@ struct nct6775_data {
>> const char *name;
>> const struct attribute_group *groups[7];
>>+ u8 num_groups;
>> u16 reg_temp[5][NUM_TEMP]; /* 0=temp, 1=temp_over, 2=temp_hyst,
>> * 3=temp_crit, 4=temp_lcrit
>>@@ -1405,10 +1406,18 @@ struct sensor_template_group {
>> int base;
>> };
>>-static struct attribute_group *
>>-nct6775_create_attr_group(struct device *dev,
>>- const struct sensor_template_group *tg,
>>- int repeat)
>>+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 */
>>+ if (WARN_ON(data->num_groups == ARRAY_SIZE(data->groups) - 1))
>>+ return -ENOSPC;
>>+
>
>At work we are struggling with a whopping 500,000+ (!) WARN backtraces
>_each day_. I would be happy if you send me patches removing some of
>those, but I am not inclined to accept patches adding them. If people
>don't notice that the driver doesn't load, they won't notice the warning
>either, and it will just add to all the other warning backtrace noise.
>
Okay, I can remove that -- I mostly just added it out of concern that
"no space left on device" would be a fairly confusing error for someone
to potentially end up with modprobe reporting, and some further
indication of what went wrong could perhaps make it less mystifying
(though yes, with any luck it can hopefully remain unreachable in
practice as long as data->groups gets expanded when needed).
I'd certainly also be open to suggestions of a more appropriate errno
value to return in that case, though I couldn't find one that seemed
clearly better to me. ENOMEM seemed vaguely more appropriate in some
ways given that it's an in-memory array that's full rather than a
storage device, but it's also definitely not the usual ENOMEM meaning of
a dynamic allocation failure due to memory pressure, so...(shrug). I
think FreedBSD's got an EDOOFUS errno value, but as far as I can see
Linux doesn't have one for indicating a purely internal error like this.
Thanks,
Zev
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PATCH 1/5] hwmon: (nct6775) Rearrange attr-group initialization
2022-02-28 8:24 ` Zev Weiss
@ 2022-02-28 15:16 ` Guenter Roeck
0 siblings, 0 replies; 19+ messages in thread
From: Guenter Roeck @ 2022-02-28 15:16 UTC (permalink / raw)
To: Zev Weiss; +Cc: linux-hwmon, openbmc, Jean Delvare, linux-kernel, Renze Nicolai
On 2/28/22 00:24, Zev Weiss wrote:
> On Sun, Feb 27, 2022 at 07:01:32AM PST, Guenter Roeck wrote:
>> On 2/26/22 05:30, Zev Weiss wrote:
>>> We now track the number of attribute groups in nct6775_data, as a
>>> measure to simplify handling differences in the set of enabled
>>> attribute groups between nct6775 drivers (platform & i2c). As a side
>>> effect, we also reduce the amount of IS_ERR()/PTR_ERR() boilerplate a
>>> bit.
>>>
>>> Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
>>> ---
>>> drivers/hwmon/nct6775.c | 84 ++++++++++++++++++++---------------------
>>> 1 file changed, 42 insertions(+), 42 deletions(-)
>>>
>>> diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
>>> index 2b91f7e05126..139b2fe5ca4d 100644
>>> --- a/drivers/hwmon/nct6775.c
>>> +++ b/drivers/hwmon/nct6775.c
>>> @@ -1198,6 +1198,7 @@ struct nct6775_data {
>>> const char *name;
>>> const struct attribute_group *groups[7];
>>> + u8 num_groups;
>>> u16 reg_temp[5][NUM_TEMP]; /* 0=temp, 1=temp_over, 2=temp_hyst,
>>> * 3=temp_crit, 4=temp_lcrit
>>> @@ -1405,10 +1406,18 @@ struct sensor_template_group {
>>> int base;
>>> };
>>> -static struct attribute_group *
>>> -nct6775_create_attr_group(struct device *dev,
>>> - const struct sensor_template_group *tg,
>>> - int repeat)
>>> +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 */
>>> + if (WARN_ON(data->num_groups == ARRAY_SIZE(data->groups) - 1))
>>> + return -ENOSPC;
>>> +
>>
>> At work we are struggling with a whopping 500,000+ (!) WARN backtraces
>> _each day_. I would be happy if you send me patches removing some of
>> those, but I am not inclined to accept patches adding them. If people
>> don't notice that the driver doesn't load, they won't notice the warning
>> either, and it will just add to all the other warning backtrace noise.
>>
>
> Okay, I can remove that -- I mostly just added it out of concern that "no space left on device" would be a fairly confusing error for someone to potentially end up with modprobe reporting, and some further indication of what went wrong could perhaps make it less mystifying (though yes, with any luck it can hopefully remain unreachable in practice as long as data->groups gets expanded when needed).
>
> I'd certainly also be open to suggestions of a more appropriate errno value to return in that case, though I couldn't find one that seemed clearly better to me. ENOMEM seemed vaguely more appropriate in some ways given that it's an in-memory array that's full rather than a storage device, but it's also definitely not the usual ENOMEM meaning of a dynamic allocation failure due to memory pressure, so...(shrug). I think FreedBSD's got an EDOOFUS errno value, but as far as I can see Linux doesn't have one for indicating a purely internal error like this.
>
If this is encountered, it would indicate a severe programming error.
What _user_ do you expect to see that error message ? If this makes it
into a release, it only means that the code was not tested well enough,
since any even casual testing should have exposed it.
I'd even argue that the check is unnecessary to start with because
the number of required groups is well known in advance.
Anyway, if you don't like ENOSPC, there is also ENOBUFS as possible
alternative.
Guenter
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 2/5] hwmon: (nct6775) Add read-only mode
2022-02-26 13:30 [PATCH 0/5] hwmon: (nct6775) Add i2c support Zev Weiss
2022-02-26 13:30 ` [PATCH 1/5] hwmon: (nct6775) Rearrange attr-group initialization Zev Weiss
@ 2022-02-26 13:30 ` Zev Weiss
2022-02-26 13:30 ` [PATCH 3/5] hwmon: (nct6775) Split core and platform driver Zev Weiss
` (5 subsequent siblings)
7 siblings, 0 replies; 19+ messages in thread
From: Zev Weiss @ 2022-02-26 13:30 UTC (permalink / raw)
To: linux-hwmon, Guenter Roeck, Jean Delvare
Cc: openbmc, linux-kernel, Zev Weiss, Renze Nicolai
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 | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
index 139b2fe5ca4d..c5b28a693461 100644
--- a/drivers/hwmon/nct6775.c
+++ b/drivers/hwmon/nct6775.c
@@ -1349,6 +1349,8 @@ struct nct6775_data {
/* nct6775_*() callbacks */
u16 (*read_value)(struct nct6775_data *data, u16 reg);
int (*write_value)(struct nct6775_data *data, u16 reg, u16 value);
+
+ bool read_only;
};
struct sensor_device_template {
@@ -1406,6 +1408,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 */
@@ -2246,7 +2253,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);
@@ -2464,7 +2471,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);
@@ -2665,7 +2672,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);
@@ -2736,7 +2743,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;
}
/*
@@ -3509,7 +3516,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,
@@ -3704,7 +3711,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
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 3/5] hwmon: (nct6775) Split core and platform driver
2022-02-26 13:30 [PATCH 0/5] hwmon: (nct6775) Add i2c support Zev Weiss
2022-02-26 13:30 ` [PATCH 1/5] hwmon: (nct6775) Rearrange attr-group initialization Zev Weiss
2022-02-26 13:30 ` [PATCH 2/5] hwmon: (nct6775) Add read-only mode Zev Weiss
@ 2022-02-26 13:30 ` Zev Weiss
2022-02-26 13:30 ` [PATCH 4/5] dt-bindings: hwmon: Add nuvoton,nct6775 Zev Weiss
` (4 subsequent siblings)
7 siblings, 0 replies; 19+ messages in thread
From: Zev Weiss @ 2022-02-26 13:30 UTC (permalink / raw)
To: linux-hwmon, Guenter Roeck, Jean Delvare
Cc: openbmc, linux-kernel, Zev Weiss, Renze Nicolai
This splits the nct6775 driver into an interface-independent core and
a separate platform driver that wraps inb/outb port I/O (or asuswmi
methods) around that core.
Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
---
MAINTAINERS | 6 +-
drivers/hwmon/Kconfig | 15 +-
drivers/hwmon/Makefile | 3 +-
drivers/hwmon/{nct6775.c => nct6775-core.c} | 1405 +------------------
drivers/hwmon/nct6775-platform.c | 1185 ++++++++++++++++
drivers/hwmon/nct6775.h | 233 +++
6 files changed, 1467 insertions(+), 1380 deletions(-)
rename drivers/hwmon/{nct6775.c => nct6775-core.c} (76%)
create mode 100644 drivers/hwmon/nct6775-platform.c
create mode 100644 drivers/hwmon/nct6775.h
diff --git a/MAINTAINERS b/MAINTAINERS
index 3dc7c8d21fd6..d318a5580df9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -13284,12 +13284,14 @@ M: Samuel Mendoza-Jonas <sam@mendozajonas.com>
S: Maintained
F: net/ncsi/
-NCT6775 HARDWARE MONITOR DRIVER
+NCT6775 HARDWARE MONITOR DRIVER - CORE & PLATFORM DRIVER
M: Guenter Roeck <linux@roeck-us.net>
L: linux-hwmon@vger.kernel.org
S: Maintained
F: Documentation/hwmon/nct6775.rst
-F: drivers/hwmon/nct6775.c
+F: drivers/hwmon/nct6775-core.c
+F: drivers/hwmon/nct6775-platform.c
+F: drivers/hwmon/nct6775.h
NETDEVSIM
M: Jakub Kicinski <kuba@kernel.org>
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 463d5b110a85..11822e8a2cda 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -1458,9 +1458,20 @@ config SENSORS_NCT6683
will be called nct6683.
config SENSORS_NCT6775
- tristate "Nuvoton NCT6775F and compatibles"
+ tristate
+ help
+ This module contains common code shared by the platform and
+ i2c versions of the nct6775 driver; it is not useful on its
+ own.
+
+ If built as a module, the module will be called
+ nct6775-core.
+
+config SENSORS_NCT6775_PLATFORM
+ tristate "Platform driver for Nuvoton NCT6775F and compatibles"
depends on !PPC
depends on ACPI_WMI || ACPI_WMI=n
+ select SENSORS_NCT6775
select HWMON_VID
help
If you say yes here you get support for the hardware monitoring
@@ -1470,7 +1481,7 @@ config SENSORS_NCT6775
NCT6775F and NCT6776F.
This driver can also be built as a module. If so, the module
- will be called nct6775.
+ will be called nct6775-platform.
config SENSORS_NCT7802
tristate "Nuvoton NCT7802Y"
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
index 7bba3415ca3d..5f37b2c0f79a 100644
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@ -154,7 +154,8 @@ obj-$(CONFIG_SENSORS_MLXREG_FAN) += mlxreg-fan.o
obj-$(CONFIG_SENSORS_MENF21BMC_HWMON) += menf21bmc_hwmon.o
obj-$(CONFIG_SENSORS_MR75203) += mr75203.o
obj-$(CONFIG_SENSORS_NCT6683) += nct6683.o
-obj-$(CONFIG_SENSORS_NCT6775) += nct6775.o
+obj-$(CONFIG_SENSORS_NCT6775) += nct6775-core.o
+obj-$(CONFIG_SENSORS_NCT6775_PLATFORM) += nct6775-platform.o
obj-$(CONFIG_SENSORS_NCT7802) += nct7802.o
obj-$(CONFIG_SENSORS_NCT7904) += nct7904.o
obj-$(CONFIG_SENSORS_NPCM7XX) += npcm750-pwm-fan.o
diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775-core.c
similarity index 76%
rename from drivers/hwmon/nct6775.c
rename to drivers/hwmon/nct6775-core.c
index c5b28a693461..095e9eced752 100644
--- a/drivers/hwmon/nct6775.c
+++ b/drivers/hwmon/nct6775-core.c
@@ -44,25 +44,17 @@
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
-#include <linux/platform_device.h>
#include <linux/hwmon.h>
#include <linux/hwmon-sysfs.h>
-#include <linux/hwmon-vid.h>
#include <linux/err.h>
#include <linux/mutex.h>
-#include <linux/acpi.h>
#include <linux/bitops.h>
-#include <linux/dmi.h>
-#include <linux/io.h>
#include <linux/nospec.h>
-#include <linux/wmi.h>
#include "lm75.h"
+#include "nct6775.h"
#define USE_ALTERNATE
-enum kinds { nct6106, nct6116, nct6775, nct6776, nct6779, nct6791, nct6792,
- nct6793, nct6795, nct6796, nct6797, nct6798 };
-
/* used to set data->name = nct6775_device_names[data->sio_kind] */
static const char * const nct6775_device_names[] = {
"nct6106",
@@ -79,242 +71,6 @@ static const char * const nct6775_device_names[] = {
"nct6798",
};
-static const char * const nct6775_sio_names[] __initconst = {
- "NCT6106D",
- "NCT6116D",
- "NCT6775F",
- "NCT6776D/F",
- "NCT6779D",
- "NCT6791D",
- "NCT6792D",
- "NCT6793D",
- "NCT6795D",
- "NCT6796D",
- "NCT6797D",
- "NCT6798D",
-};
-
-static unsigned short force_id;
-module_param(force_id, ushort, 0);
-MODULE_PARM_DESC(force_id, "Override the detected device ID");
-
-static unsigned short fan_debounce;
-module_param(fan_debounce, ushort, 0);
-MODULE_PARM_DESC(fan_debounce, "Enable debouncing for fan RPM signal");
-
-#define DRVNAME "nct6775"
-
-/*
- * Super-I/O constants and functions
- */
-
-#define NCT6775_LD_ACPI 0x0a
-#define NCT6775_LD_HWM 0x0b
-#define NCT6775_LD_VID 0x0d
-#define NCT6775_LD_12 0x12
-
-#define SIO_REG_LDSEL 0x07 /* Logical device select */
-#define SIO_REG_DEVID 0x20 /* Device ID (2 bytes) */
-#define SIO_REG_ENABLE 0x30 /* Logical device enable */
-#define SIO_REG_ADDR 0x60 /* Logical device address (2 bytes) */
-
-#define SIO_NCT6106_ID 0xc450
-#define SIO_NCT6116_ID 0xd280
-#define SIO_NCT6775_ID 0xb470
-#define SIO_NCT6776_ID 0xc330
-#define SIO_NCT6779_ID 0xc560
-#define SIO_NCT6791_ID 0xc800
-#define SIO_NCT6792_ID 0xc910
-#define SIO_NCT6793_ID 0xd120
-#define SIO_NCT6795_ID 0xd350
-#define SIO_NCT6796_ID 0xd420
-#define SIO_NCT6797_ID 0xd450
-#define SIO_NCT6798_ID 0xd428
-#define SIO_ID_MASK 0xFFF8
-
-enum pwm_enable { off, manual, thermal_cruise, speed_cruise, sf3, sf4 };
-enum sensor_access { access_direct, access_asuswmi };
-
-struct nct6775_sio_data {
- int sioreg;
- int ld;
- enum kinds kind;
- enum sensor_access access;
-
- /* superio_() callbacks */
- void (*sio_outb)(struct nct6775_sio_data *sio_data, int reg, int val);
- int (*sio_inb)(struct nct6775_sio_data *sio_data, int reg);
- void (*sio_select)(struct nct6775_sio_data *sio_data, int ld);
- int (*sio_enter)(struct nct6775_sio_data *sio_data);
- void (*sio_exit)(struct nct6775_sio_data *sio_data);
-};
-
-#define ASUSWMI_MONITORING_GUID "466747A0-70EC-11DE-8A39-0800200C9A66"
-#define ASUSWMI_METHODID_RSIO 0x5253494F
-#define ASUSWMI_METHODID_WSIO 0x5753494F
-#define ASUSWMI_METHODID_RHWM 0x5248574D
-#define ASUSWMI_METHODID_WHWM 0x5748574D
-#define ASUSWMI_UNSUPPORTED_METHOD 0xFFFFFFFE
-
-static int nct6775_asuswmi_evaluate_method(u32 method_id, u8 bank, u8 reg, u8 val, u32 *retval)
-{
-#if IS_ENABLED(CONFIG_ACPI_WMI)
- u32 args = bank | (reg << 8) | (val << 16);
- struct acpi_buffer input = { (acpi_size) sizeof(args), &args };
- struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };
- acpi_status status;
- union acpi_object *obj;
- u32 tmp = ASUSWMI_UNSUPPORTED_METHOD;
-
- status = wmi_evaluate_method(ASUSWMI_MONITORING_GUID, 0,
- method_id, &input, &output);
-
- if (ACPI_FAILURE(status))
- return -EIO;
-
- obj = output.pointer;
- if (obj && obj->type == ACPI_TYPE_INTEGER)
- tmp = obj->integer.value;
-
- if (retval)
- *retval = tmp;
-
- kfree(obj);
-
- if (tmp == ASUSWMI_UNSUPPORTED_METHOD)
- return -ENODEV;
- return 0;
-#else
- return -EOPNOTSUPP;
-#endif
-}
-
-static inline int nct6775_asuswmi_write(u8 bank, u8 reg, u8 val)
-{
- return nct6775_asuswmi_evaluate_method(ASUSWMI_METHODID_WHWM, bank,
- reg, val, NULL);
-}
-
-static inline int nct6775_asuswmi_read(u8 bank, u8 reg, u8 *val)
-{
- u32 ret, tmp = 0;
-
- ret = nct6775_asuswmi_evaluate_method(ASUSWMI_METHODID_RHWM, bank,
- reg, 0, &tmp);
- *val = tmp;
- return ret;
-}
-
-static int superio_wmi_inb(struct nct6775_sio_data *sio_data, int reg)
-{
- int tmp = 0;
-
- nct6775_asuswmi_evaluate_method(ASUSWMI_METHODID_RSIO, sio_data->ld,
- reg, 0, &tmp);
- return tmp;
-}
-
-static void superio_wmi_outb(struct nct6775_sio_data *sio_data, int reg, int val)
-{
- nct6775_asuswmi_evaluate_method(ASUSWMI_METHODID_WSIO, sio_data->ld,
- reg, val, NULL);
-}
-
-static void superio_wmi_select(struct nct6775_sio_data *sio_data, int ld)
-{
- sio_data->ld = ld;
-}
-
-static int superio_wmi_enter(struct nct6775_sio_data *sio_data)
-{
- return 0;
-}
-
-static void superio_wmi_exit(struct nct6775_sio_data *sio_data)
-{
-}
-
-static void superio_outb(struct nct6775_sio_data *sio_data, int reg, int val)
-{
- int ioreg = sio_data->sioreg;
-
- outb(reg, ioreg);
- outb(val, ioreg + 1);
-}
-
-static int superio_inb(struct nct6775_sio_data *sio_data, int reg)
-{
- int ioreg = sio_data->sioreg;
-
- outb(reg, ioreg);
- return inb(ioreg + 1);
-}
-
-static void superio_select(struct nct6775_sio_data *sio_data, int ld)
-{
- int ioreg = sio_data->sioreg;
-
- outb(SIO_REG_LDSEL, ioreg);
- outb(ld, ioreg + 1);
-}
-
-static int superio_enter(struct nct6775_sio_data *sio_data)
-{
- int ioreg = sio_data->sioreg;
-
- /*
- * Try to reserve <ioreg> and <ioreg + 1> for exclusive access.
- */
- if (!request_muxed_region(ioreg, 2, DRVNAME))
- return -EBUSY;
-
- outb(0x87, ioreg);
- outb(0x87, ioreg);
-
- return 0;
-}
-
-static void superio_exit(struct nct6775_sio_data *sio_data)
-{
- int ioreg = sio_data->sioreg;
-
- outb(0xaa, ioreg);
- outb(0x02, ioreg);
- outb(0x02, ioreg + 1);
- release_region(ioreg, 2);
-}
-
-/*
- * ISA constants
- */
-
-#define IOREGION_ALIGNMENT (~7)
-#define IOREGION_OFFSET 5
-#define IOREGION_LENGTH 2
-#define ADDR_REG_OFFSET 0
-#define DATA_REG_OFFSET 1
-
-#define NCT6775_REG_BANK 0x4E
-#define NCT6775_REG_CONFIG 0x40
-#define NCT6775_PORT_CHIPID 0x58
-
-/*
- * Not currently used:
- * REG_MAN_ID has the value 0x5ca3 for all supported chips.
- * REG_CHIP_ID == 0x88/0xa1/0xc1 depending on chip model.
- * REG_MAN_ID is at port 0x4f
- * REG_CHIP_ID is at port 0x58
- */
-
-#define NUM_TEMP 10 /* Max number of temp attribute sets w/ limits*/
-#define NUM_TEMP_FIXED 6 /* Max number of fixed temp attribute sets */
-#define NUM_TSI_TEMP 8 /* Max number of TSI temp register pairs */
-
-#define NUM_REG_ALARM 7 /* Max number of alarm registers */
-#define NUM_REG_BEEP 5 /* Max number of beep registers */
-
-#define NUM_FAN 7
-
/* Common and NCT6775 specific data */
/* Voltage min/max registers for nr=7..14 are in bank 5 */
@@ -333,11 +89,6 @@ static const u16 NCT6775_REG_IN[] = {
#define NCT6775_REG_DIODE 0x5E
#define NCT6775_DIODE_MASK 0x02
-#define NCT6775_REG_FANDIV1 0x506
-#define NCT6775_REG_FANDIV2 0x507
-
-#define NCT6775_REG_CR_FAN_DEBOUNCE 0xf0
-
static const u16 NCT6775_REG_ALARM[NUM_REG_ALARM] = { 0x459, 0x45A, 0x45B };
/* 0..15 voltages, 16..23 fans, 24..29 temperatures, 30..31 intrusion */
@@ -351,10 +102,6 @@ static const s8 NCT6775_ALARM_BITS[] = {
4, 5, 13, -1, -1, -1, /* temp1..temp6 */
12, -1 }; /* intrusion0, intrusion1 */
-#define FAN_ALARM_BASE 16
-#define TEMP_ALARM_BASE 24
-#define INTRUSION_ALARM_BASE 30
-
static const u16 NCT6775_REG_BEEP[NUM_REG_BEEP] = { 0x56, 0x57, 0x453, 0x4e };
/*
@@ -370,11 +117,6 @@ static const s8 NCT6775_BEEP_BITS[] = {
4, 5, 13, -1, -1, -1, /* temp1..temp6 */
12, -1 }; /* intrusion0, intrusion1 */
-#define BEEP_ENABLE_BASE 15
-
-static const u8 NCT6775_REG_CR_CASEOPEN_CLR[] = { 0xe6, 0xee };
-static const u8 NCT6775_CR_CASEOPEN_CLR_MASK[] = { 0x20, 0x01 };
-
/* DC or PWM output fan configuration */
static const u8 NCT6775_REG_PWM_MODE[] = { 0x04, 0x04, 0x12 };
static const u8 NCT6775_PWM_MODE_MASK[] = { 0x01, 0x02, 0x01 };
@@ -690,8 +432,6 @@ static const u16 NCT6779_REG_TEMP_CRIT[32] = {
/* NCT6791 specific data */
-#define NCT6791_REG_HM_IO_SPACE_LOCK_ENABLE 0x28
-
static const u16 NCT6791_REG_WEIGHT_TEMP_SEL[NUM_FAN] = { 0, 0x239 };
static const u16 NCT6791_REG_WEIGHT_TEMP_STEP[NUM_FAN] = { 0, 0x23a };
static const u16 NCT6791_REG_WEIGHT_TEMP_STEP_TOL[NUM_FAN] = { 0, 0x23b };
@@ -1191,168 +931,6 @@ static inline unsigned int tsi_temp_from_reg(unsigned int reg)
* Data structures and manipulation thereof
*/
-struct nct6775_data {
- int addr; /* IO base of hw monitor block */
- struct nct6775_sio_data *sio_data;
- enum kinds kind;
- const char *name;
-
- const struct attribute_group *groups[7];
- u8 num_groups;
-
- u16 reg_temp[5][NUM_TEMP]; /* 0=temp, 1=temp_over, 2=temp_hyst,
- * 3=temp_crit, 4=temp_lcrit
- */
- u8 temp_src[NUM_TEMP];
- u16 reg_temp_config[NUM_TEMP];
- const char * const *temp_label;
- u32 temp_mask;
- u32 virt_temp_mask;
-
- u16 REG_CONFIG;
- u16 REG_VBAT;
- u16 REG_DIODE;
- u8 DIODE_MASK;
-
- const s8 *ALARM_BITS;
- const s8 *BEEP_BITS;
-
- const u16 *REG_VIN;
- const u16 *REG_IN_MINMAX[2];
-
- const u16 *REG_TARGET;
- const u16 *REG_FAN;
- const u16 *REG_FAN_MODE;
- const u16 *REG_FAN_MIN;
- const u16 *REG_FAN_PULSES;
- const u16 *FAN_PULSE_SHIFT;
- const u16 *REG_FAN_TIME[3];
-
- const u16 *REG_TOLERANCE_H;
-
- const u8 *REG_PWM_MODE;
- const u8 *PWM_MODE_MASK;
-
- const u16 *REG_PWM[7]; /* [0]=pwm, [1]=pwm_start, [2]=pwm_floor,
- * [3]=pwm_max, [4]=pwm_step,
- * [5]=weight_duty_step, [6]=weight_duty_base
- */
- const u16 *REG_PWM_READ;
-
- const u16 *REG_CRITICAL_PWM_ENABLE;
- u8 CRITICAL_PWM_ENABLE_MASK;
- const u16 *REG_CRITICAL_PWM;
-
- const u16 *REG_AUTO_TEMP;
- const u16 *REG_AUTO_PWM;
-
- const u16 *REG_CRITICAL_TEMP;
- const u16 *REG_CRITICAL_TEMP_TOLERANCE;
-
- const u16 *REG_TEMP_SOURCE; /* temp register sources */
- const u16 *REG_TEMP_SEL;
- const u16 *REG_WEIGHT_TEMP_SEL;
- const u16 *REG_WEIGHT_TEMP[3]; /* 0=base, 1=tolerance, 2=step */
-
- const u16 *REG_TEMP_OFFSET;
-
- const u16 *REG_ALARM;
- const u16 *REG_BEEP;
-
- const u16 *REG_TSI_TEMP;
-
- unsigned int (*fan_from_reg)(u16 reg, unsigned int divreg);
- unsigned int (*fan_from_reg_min)(u16 reg, unsigned int divreg);
-
- struct mutex update_lock;
- bool valid; /* true if following fields are valid */
- unsigned long last_updated; /* In jiffies */
-
- /* Register values */
- u8 bank; /* current register bank */
- u8 in_num; /* number of in inputs we have */
- u8 in[15][3]; /* [0]=in, [1]=in_max, [2]=in_min */
- unsigned int rpm[NUM_FAN];
- u16 fan_min[NUM_FAN];
- u8 fan_pulses[NUM_FAN];
- u8 fan_div[NUM_FAN];
- u8 has_pwm;
- u8 has_fan; /* some fan inputs can be disabled */
- u8 has_fan_min; /* some fans don't have min register */
- bool has_fan_div;
-
- u8 num_temp_alarms; /* 2, 3, or 6 */
- u8 num_temp_beeps; /* 2, 3, or 6 */
- u8 temp_fixed_num; /* 3 or 6 */
- u8 temp_type[NUM_TEMP_FIXED];
- s8 temp_offset[NUM_TEMP_FIXED];
- s16 temp[5][NUM_TEMP]; /* 0=temp, 1=temp_over, 2=temp_hyst,
- * 3=temp_crit, 4=temp_lcrit */
- s16 tsi_temp[NUM_TSI_TEMP];
- u64 alarms;
- u64 beeps;
-
- u8 pwm_num; /* number of pwm */
- u8 pwm_mode[NUM_FAN]; /* 0->DC variable voltage,
- * 1->PWM variable duty cycle
- */
- enum pwm_enable pwm_enable[NUM_FAN];
- /* 0->off
- * 1->manual
- * 2->thermal cruise mode (also called SmartFan I)
- * 3->fan speed cruise mode
- * 4->SmartFan III
- * 5->enhanced variable thermal cruise (SmartFan IV)
- */
- u8 pwm[7][NUM_FAN]; /* [0]=pwm, [1]=pwm_start, [2]=pwm_floor,
- * [3]=pwm_max, [4]=pwm_step,
- * [5]=weight_duty_step, [6]=weight_duty_base
- */
-
- u8 target_temp[NUM_FAN];
- u8 target_temp_mask;
- u32 target_speed[NUM_FAN];
- u32 target_speed_tolerance[NUM_FAN];
- u8 speed_tolerance_limit;
-
- u8 temp_tolerance[2][NUM_FAN];
- u8 tolerance_mask;
-
- u8 fan_time[3][NUM_FAN]; /* 0 = stop_time, 1 = step_up, 2 = step_down */
-
- /* Automatic fan speed control registers */
- int auto_pwm_num;
- u8 auto_pwm[NUM_FAN][7];
- u8 auto_temp[NUM_FAN][7];
- u8 pwm_temp_sel[NUM_FAN];
- u8 pwm_weight_temp_sel[NUM_FAN];
- u8 weight_temp[3][NUM_FAN]; /* 0->temp_step, 1->temp_step_tol,
- * 2->temp_base
- */
-
- u8 vid;
- u8 vrm;
-
- bool have_vid;
-
- u16 have_temp;
- u16 have_temp_fixed;
- u16 have_tsi_temp;
- u16 have_in;
-
- /* Remember extra register values over suspend/resume */
- u8 vbat;
- u8 fandiv1;
- u8 fandiv2;
- u8 sio_reg_enable;
-
- /* nct6775_*() callbacks */
- u16 (*read_value)(struct nct6775_data *data, u16 reg);
- int (*write_value)(struct nct6775_data *data, u16 reg, u16 value);
-
- bool read_only;
-};
-
struct sensor_device_template {
struct device_attribute dev_attr;
union {
@@ -1408,21 +986,6 @@ 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 */
- if (WARN_ON(data->num_groups == ARRAY_SIZE(data->groups) - 1))
- return -ENOSPC;
-
- data->groups[data->num_groups++] = group;
- return 0;
-}
-
static int nct6775_add_template_attr_group(struct device *dev, struct nct6775_data *data,
const struct sensor_template_group *tg, int repeat)
{
@@ -1497,7 +1060,7 @@ static int nct6775_add_template_attr_group(struct device *dev, struct nct6775_da
return nct6775_add_attr_group(data, group);
}
-static bool is_word_sized(struct nct6775_data *data, u16 reg)
+bool nct6775_reg_is_word_sized(struct nct6775_data *data, u16 reg)
{
switch (data->kind) {
case nct6106:
@@ -1554,101 +1117,7 @@ static bool is_word_sized(struct nct6775_data *data, u16 reg)
}
return false;
}
-
-static inline void nct6775_wmi_set_bank(struct nct6775_data *data, u16 reg)
-{
- u8 bank = reg >> 8;
-
- data->bank = bank;
-}
-
-static u16 nct6775_wmi_read_value(struct nct6775_data *data, u16 reg)
-{
- int res, err, word_sized = is_word_sized(data, reg);
- u8 tmp = 0;
-
- nct6775_wmi_set_bank(data, reg);
-
- err = nct6775_asuswmi_read(data->bank, reg & 0xff, &tmp);
- if (err)
- return 0;
-
- res = tmp;
- if (word_sized) {
- err = nct6775_asuswmi_read(data->bank, (reg & 0xff) + 1, &tmp);
- if (err)
- return 0;
-
- res = (res << 8) + tmp;
- }
- return res;
-}
-
-static int nct6775_wmi_write_value(struct nct6775_data *data, u16 reg, u16 value)
-{
- int res, word_sized = is_word_sized(data, reg);
-
- nct6775_wmi_set_bank(data, reg);
-
- if (word_sized) {
- res = nct6775_asuswmi_write(data->bank, reg & 0xff, value >> 8);
- if (res)
- return res;
-
- res = nct6775_asuswmi_write(data->bank, (reg & 0xff) + 1, value);
- } else {
- res = nct6775_asuswmi_write(data->bank, reg & 0xff, value);
- }
-
- return res;
-}
-
-/*
- * On older chips, only registers 0x50-0x5f are banked.
- * On more recent chips, all registers are banked.
- * Assume that is the case and set the bank number for each access.
- * Cache the bank number so it only needs to be set if it changes.
- */
-static inline void nct6775_set_bank(struct nct6775_data *data, u16 reg)
-{
- u8 bank = reg >> 8;
-
- if (data->bank != bank) {
- outb_p(NCT6775_REG_BANK, data->addr + ADDR_REG_OFFSET);
- outb_p(bank, data->addr + DATA_REG_OFFSET);
- data->bank = bank;
- }
-}
-
-static u16 nct6775_read_value(struct nct6775_data *data, u16 reg)
-{
- int res, word_sized = is_word_sized(data, reg);
-
- nct6775_set_bank(data, reg);
- outb_p(reg & 0xff, data->addr + ADDR_REG_OFFSET);
- res = inb_p(data->addr + DATA_REG_OFFSET);
- if (word_sized) {
- outb_p((reg & 0xff) + 1,
- data->addr + ADDR_REG_OFFSET);
- res = (res << 8) + inb_p(data->addr + DATA_REG_OFFSET);
- }
- return res;
-}
-
-static int nct6775_write_value(struct nct6775_data *data, u16 reg, u16 value)
-{
- int word_sized = is_word_sized(data, reg);
-
- nct6775_set_bank(data, reg);
- outb_p(reg & 0xff, data->addr + ADDR_REG_OFFSET);
- if (word_sized) {
- outb_p(value >> 8, data->addr + DATA_REG_OFFSET);
- outb_p((reg & 0xff) + 1,
- data->addr + ADDR_REG_OFFSET);
- }
- outb_p(value & 0xff, data->addr + DATA_REG_OFFSET);
- return 0;
-}
+EXPORT_SYMBOL_GPL(nct6775_reg_is_word_sized);
/* We left-align 8-bit temperature values to make the code simpler */
static u16 nct6775_read_temp(struct nct6775_data *data, u16 reg)
@@ -1656,18 +1125,19 @@ static u16 nct6775_read_temp(struct nct6775_data *data, u16 reg)
u16 res;
res = data->read_value(data, reg);
- if (!is_word_sized(data, reg))
+ if (!nct6775_reg_is_word_sized(data, reg))
res <<= 8;
return res;
}
-static int nct6775_write_temp(struct nct6775_data *data, u16 reg, u16 value)
+int nct6775_write_temp(struct nct6775_data *data, u16 reg, u16 value)
{
- if (!is_word_sized(data, reg))
+ if (!nct6775_reg_is_word_sized(data, reg))
value >>= 8;
return data->write_value(data, reg, value);
}
+EXPORT_SYMBOL_GPL(nct6775_write_temp);
/* This function assumes that the caller holds data->update_lock */
static void nct6775_write_fan_div(struct nct6775_data *data, int nr)
@@ -1960,7 +1430,7 @@ static void nct6775_update_pwm_limits(struct device *dev)
}
}
-static struct nct6775_data *nct6775_update_device(struct device *dev)
+struct nct6775_data *nct6775_update_device(struct device *dev)
{
struct nct6775_data *data = dev_get_drvdata(dev);
int i, j;
@@ -2062,6 +1532,7 @@ static struct nct6775_data *nct6775_update_device(struct device *dev)
mutex_unlock(&data->update_lock);
return data;
}
+EXPORT_SYMBOL_GPL(nct6775_update_device);
/*
* Sysfs callback functions
@@ -2099,8 +1570,8 @@ store_in_reg(struct device *dev, struct device_attribute *attr, const char *buf,
return count;
}
-static ssize_t
-show_alarm(struct device *dev, struct device_attribute *attr, char *buf)
+ssize_t
+nct6775_show_alarm(struct device *dev, struct device_attribute *attr, char *buf)
{
struct nct6775_data *data = nct6775_update_device(dev);
struct sensor_device_attribute *sattr = to_sensor_dev_attr(attr);
@@ -2109,6 +1580,7 @@ show_alarm(struct device *dev, struct device_attribute *attr, char *buf)
return sprintf(buf, "%u\n",
(unsigned int)((data->alarms >> nr) & 0x01));
}
+EXPORT_SYMBOL_GPL(nct6775_show_alarm);
static int find_temp_source(struct nct6775_data *data, int index, int count)
{
@@ -2147,8 +1619,8 @@ show_temp_alarm(struct device *dev, struct device_attribute *attr, char *buf)
return sprintf(buf, "%u\n", alarm);
}
-static ssize_t
-show_beep(struct device *dev, struct device_attribute *attr, char *buf)
+ssize_t
+nct6775_show_beep(struct device *dev, struct device_attribute *attr, char *buf)
{
struct sensor_device_attribute *sattr = to_sensor_dev_attr(attr);
struct nct6775_data *data = nct6775_update_device(dev);
@@ -2157,10 +1629,10 @@ show_beep(struct device *dev, struct device_attribute *attr, char *buf)
return sprintf(buf, "%u\n",
(unsigned int)((data->beeps >> nr) & 0x01));
}
+EXPORT_SYMBOL_GPL(nct6775_show_beep);
-static ssize_t
-store_beep(struct device *dev, struct device_attribute *attr, const char *buf,
- size_t count)
+ssize_t
+nct6775_store_beep(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{
struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr);
struct nct6775_data *data = dev_get_drvdata(dev);
@@ -2185,6 +1657,7 @@ store_beep(struct device *dev, struct device_attribute *attr, const char *buf,
mutex_unlock(&data->update_lock);
return count;
}
+EXPORT_SYMBOL_GPL(nct6775_store_beep);
static ssize_t
show_temp_beep(struct device *dev, struct device_attribute *attr, char *buf)
@@ -2257,9 +1730,8 @@ static umode_t nct6775_in_is_visible(struct kobject *kobj,
}
SENSOR_TEMPLATE_2(in_input, "in%d_input", S_IRUGO, show_in_reg, NULL, 0, 0);
-SENSOR_TEMPLATE(in_alarm, "in%d_alarm", S_IRUGO, show_alarm, NULL, 0);
-SENSOR_TEMPLATE(in_beep, "in%d_beep", S_IWUSR | S_IRUGO, show_beep, store_beep,
- 0);
+SENSOR_TEMPLATE(in_alarm, "in%d_alarm", S_IRUGO, nct6775_show_alarm, NULL, 0);
+SENSOR_TEMPLATE(in_beep, "in%d_beep", S_IWUSR | S_IRUGO, nct6775_show_beep, nct6775_store_beep, 0);
SENSOR_TEMPLATE_2(in_min, "in%d_min", S_IWUSR | S_IRUGO, show_in_reg,
store_in_reg, 0, 1);
SENSOR_TEMPLATE_2(in_max, "in%d_max", S_IWUSR | S_IRUGO, show_in_reg,
@@ -2475,10 +1947,10 @@ static umode_t nct6775_fan_is_visible(struct kobject *kobj,
}
SENSOR_TEMPLATE(fan_input, "fan%d_input", S_IRUGO, show_fan, NULL, 0);
-SENSOR_TEMPLATE(fan_alarm, "fan%d_alarm", S_IRUGO, show_alarm, NULL,
+SENSOR_TEMPLATE(fan_alarm, "fan%d_alarm", S_IRUGO, nct6775_show_alarm, NULL,
FAN_ALARM_BASE);
-SENSOR_TEMPLATE(fan_beep, "fan%d_beep", S_IWUSR | S_IRUGO, show_beep,
- store_beep, FAN_ALARM_BASE);
+SENSOR_TEMPLATE(fan_beep, "fan%d_beep", S_IWUSR | S_IRUGO, nct6775_show_beep,
+ nct6775_store_beep, FAN_ALARM_BASE);
SENSOR_TEMPLATE(fan_pulses, "fan%d_pulses", S_IWUSR | S_IRUGO, show_fan_pulses,
store_fan_pulses, 0);
SENSOR_TEMPLATE(fan_min, "fan%d_min", S_IWUSR | S_IRUGO, show_fan_min,
@@ -3628,113 +3100,6 @@ static const struct sensor_template_group nct6775_pwm_template_group = {
.base = 1,
};
-static ssize_t
-cpu0_vid_show(struct device *dev, struct device_attribute *attr, char *buf)
-{
- struct nct6775_data *data = dev_get_drvdata(dev);
-
- return sprintf(buf, "%d\n", vid_from_reg(data->vid, data->vrm));
-}
-
-static DEVICE_ATTR_RO(cpu0_vid);
-
-/* Case open detection */
-
-static ssize_t
-clear_caseopen(struct device *dev, struct device_attribute *attr,
- const char *buf, size_t count)
-{
- struct nct6775_data *data = dev_get_drvdata(dev);
- struct nct6775_sio_data *sio_data = data->sio_data;
- int nr = to_sensor_dev_attr(attr)->index - INTRUSION_ALARM_BASE;
- unsigned long val;
- u8 reg;
- int ret;
-
- if (kstrtoul(buf, 10, &val) || val != 0)
- return -EINVAL;
-
- mutex_lock(&data->update_lock);
-
- /*
- * Use CR registers to clear caseopen status.
- * The CR registers are the same for all chips, and not all chips
- * support clearing the caseopen status through "regular" registers.
- */
- ret = sio_data->sio_enter(sio_data);
- if (ret) {
- count = ret;
- goto error;
- }
-
- sio_data->sio_select(sio_data, NCT6775_LD_ACPI);
- reg = sio_data->sio_inb(sio_data, NCT6775_REG_CR_CASEOPEN_CLR[nr]);
- reg |= NCT6775_CR_CASEOPEN_CLR_MASK[nr];
- sio_data->sio_outb(sio_data, NCT6775_REG_CR_CASEOPEN_CLR[nr], reg);
- reg &= ~NCT6775_CR_CASEOPEN_CLR_MASK[nr];
- sio_data->sio_outb(sio_data, NCT6775_REG_CR_CASEOPEN_CLR[nr], reg);
- sio_data->sio_exit(sio_data);
-
- data->valid = false; /* Force cache refresh */
-error:
- mutex_unlock(&data->update_lock);
- return count;
-}
-
-static SENSOR_DEVICE_ATTR(intrusion0_alarm, S_IWUSR | S_IRUGO, show_alarm,
- clear_caseopen, INTRUSION_ALARM_BASE);
-static SENSOR_DEVICE_ATTR(intrusion1_alarm, S_IWUSR | S_IRUGO, show_alarm,
- clear_caseopen, INTRUSION_ALARM_BASE + 1);
-static SENSOR_DEVICE_ATTR(intrusion0_beep, S_IWUSR | S_IRUGO, show_beep,
- store_beep, INTRUSION_ALARM_BASE);
-static SENSOR_DEVICE_ATTR(intrusion1_beep, S_IWUSR | S_IRUGO, show_beep,
- store_beep, INTRUSION_ALARM_BASE + 1);
-static SENSOR_DEVICE_ATTR(beep_enable, S_IWUSR | S_IRUGO, show_beep,
- store_beep, BEEP_ENABLE_BASE);
-
-static umode_t nct6775_other_is_visible(struct kobject *kobj,
- struct attribute *attr, int index)
-{
- struct device *dev = kobj_to_dev(kobj);
- struct nct6775_data *data = dev_get_drvdata(dev);
-
- if (index == 0 && !data->have_vid)
- return 0;
-
- if (index == 1 || index == 2) {
- if (data->ALARM_BITS[INTRUSION_ALARM_BASE + index - 1] < 0)
- return 0;
- }
-
- if (index == 3 || index == 4) {
- if (data->BEEP_BITS[INTRUSION_ALARM_BASE + index - 3] < 0)
- return 0;
- }
-
- return nct6775_attr_mode(data, attr);
-}
-
-/*
- * nct6775_other_is_visible uses the index into the following array
- * to determine if attributes should be created or not.
- * Any change in order or content must be matched.
- */
-static struct attribute *nct6775_attributes_other[] = {
- &dev_attr_cpu0_vid.attr, /* 0 */
- &sensor_dev_attr_intrusion0_alarm.dev_attr.attr, /* 1 */
- &sensor_dev_attr_intrusion1_alarm.dev_attr.attr, /* 2 */
- &sensor_dev_attr_intrusion0_beep.dev_attr.attr, /* 3 */
- &sensor_dev_attr_intrusion1_beep.dev_attr.attr, /* 4 */
- &sensor_dev_attr_beep_enable.dev_attr.attr, /* 5 */
-
- NULL
-};
-
-static const struct attribute_group nct6775_group_other = {
- .attrs = nct6775_attributes_other,
- .is_visible = nct6775_other_is_visible,
-};
-
static inline void nct6775_init_device(struct nct6775_data *data)
{
int i;
@@ -3777,227 +3142,6 @@ static inline void nct6775_init_device(struct nct6775_data *data)
}
}
-static void
-nct6775_check_fan_inputs(struct nct6775_data *data, struct nct6775_sio_data *sio_data)
-{
- bool fan3pin = false, fan4pin = false, fan4min = false;
- bool fan5pin = false, fan6pin = false, fan7pin = false;
- bool pwm3pin = false, pwm4pin = false, pwm5pin = false;
- bool pwm6pin = false, pwm7pin = false;
-
- /* Store SIO_REG_ENABLE for use during resume */
- sio_data->sio_select(sio_data, NCT6775_LD_HWM);
- data->sio_reg_enable = sio_data->sio_inb(sio_data, SIO_REG_ENABLE);
-
- /* fan4 and fan5 share some pins with the GPIO and serial flash */
- if (data->kind == nct6775) {
- int cr2c = sio_data->sio_inb(sio_data, 0x2c);
-
- fan3pin = cr2c & BIT(6);
- pwm3pin = cr2c & BIT(7);
-
- /* On NCT6775, fan4 shares pins with the fdc interface */
- fan4pin = !(sio_data->sio_inb(sio_data, 0x2A) & 0x80);
- } else if (data->kind == nct6776) {
- bool gpok = sio_data->sio_inb(sio_data, 0x27) & 0x80;
- const char *board_vendor, *board_name;
-
- board_vendor = dmi_get_system_info(DMI_BOARD_VENDOR);
- board_name = dmi_get_system_info(DMI_BOARD_NAME);
-
- if (board_name && board_vendor &&
- !strcmp(board_vendor, "ASRock")) {
- /*
- * Auxiliary fan monitoring is not enabled on ASRock
- * Z77 Pro4-M if booted in UEFI Ultra-FastBoot mode.
- * Observed with BIOS version 2.00.
- */
- if (!strcmp(board_name, "Z77 Pro4-M")) {
- if ((data->sio_reg_enable & 0xe0) != 0xe0) {
- data->sio_reg_enable |= 0xe0;
- sio_data->sio_outb(sio_data, SIO_REG_ENABLE,
- data->sio_reg_enable);
- }
- }
- }
-
- if (data->sio_reg_enable & 0x80)
- fan3pin = gpok;
- else
- fan3pin = !(sio_data->sio_inb(sio_data, 0x24) & 0x40);
-
- if (data->sio_reg_enable & 0x40)
- fan4pin = gpok;
- else
- fan4pin = sio_data->sio_inb(sio_data, 0x1C) & 0x01;
-
- if (data->sio_reg_enable & 0x20)
- fan5pin = gpok;
- else
- fan5pin = sio_data->sio_inb(sio_data, 0x1C) & 0x02;
-
- fan4min = fan4pin;
- pwm3pin = fan3pin;
- } else if (data->kind == nct6106) {
- int cr24 = sio_data->sio_inb(sio_data, 0x24);
-
- fan3pin = !(cr24 & 0x80);
- pwm3pin = cr24 & 0x08;
- } else if (data->kind == nct6116) {
- int cr1a = sio_data->sio_inb(sio_data, 0x1a);
- int cr1b = sio_data->sio_inb(sio_data, 0x1b);
- int cr24 = sio_data->sio_inb(sio_data, 0x24);
- int cr2a = sio_data->sio_inb(sio_data, 0x2a);
- int cr2b = sio_data->sio_inb(sio_data, 0x2b);
- int cr2f = sio_data->sio_inb(sio_data, 0x2f);
-
- fan3pin = !(cr2b & 0x10);
- fan4pin = (cr2b & 0x80) || // pin 1(2)
- (!(cr2f & 0x10) && (cr1a & 0x04)); // pin 65(66)
- fan5pin = (cr2b & 0x80) || // pin 126(127)
- (!(cr1b & 0x03) && (cr2a & 0x02)); // pin 94(96)
-
- pwm3pin = fan3pin && (cr24 & 0x08);
- pwm4pin = fan4pin;
- pwm5pin = fan5pin;
- } else {
- /*
- * NCT6779D, NCT6791D, NCT6792D, NCT6793D, NCT6795D, NCT6796D,
- * NCT6797D, NCT6798D
- */
- int cr1a = sio_data->sio_inb(sio_data, 0x1a);
- int cr1b = sio_data->sio_inb(sio_data, 0x1b);
- int cr1c = sio_data->sio_inb(sio_data, 0x1c);
- int cr1d = sio_data->sio_inb(sio_data, 0x1d);
- int cr2a = sio_data->sio_inb(sio_data, 0x2a);
- int cr2b = sio_data->sio_inb(sio_data, 0x2b);
- int cr2d = sio_data->sio_inb(sio_data, 0x2d);
- int cr2f = sio_data->sio_inb(sio_data, 0x2f);
- bool dsw_en = cr2f & BIT(3);
- bool ddr4_en = cr2f & BIT(4);
- int cre0;
- int creb;
- int cred;
-
- sio_data->sio_select(sio_data, NCT6775_LD_12);
- cre0 = sio_data->sio_inb(sio_data, 0xe0);
- creb = sio_data->sio_inb(sio_data, 0xeb);
- cred = sio_data->sio_inb(sio_data, 0xed);
-
- fan3pin = !(cr1c & BIT(5));
- fan4pin = !(cr1c & BIT(6));
- fan5pin = !(cr1c & BIT(7));
-
- pwm3pin = !(cr1c & BIT(0));
- pwm4pin = !(cr1c & BIT(1));
- pwm5pin = !(cr1c & BIT(2));
-
- switch (data->kind) {
- case nct6791:
- fan6pin = cr2d & BIT(1);
- pwm6pin = cr2d & BIT(0);
- break;
- case nct6792:
- fan6pin = !dsw_en && (cr2d & BIT(1));
- pwm6pin = !dsw_en && (cr2d & BIT(0));
- break;
- case nct6793:
- fan5pin |= cr1b & BIT(5);
- fan5pin |= creb & BIT(5);
-
- fan6pin = !dsw_en && (cr2d & BIT(1));
- fan6pin |= creb & BIT(3);
-
- pwm5pin |= cr2d & BIT(7);
- pwm5pin |= (creb & BIT(4)) && !(cr2a & BIT(0));
-
- pwm6pin = !dsw_en && (cr2d & BIT(0));
- pwm6pin |= creb & BIT(2);
- break;
- case nct6795:
- fan5pin |= cr1b & BIT(5);
- fan5pin |= creb & BIT(5);
-
- fan6pin = (cr2a & BIT(4)) &&
- (!dsw_en || (cred & BIT(4)));
- fan6pin |= creb & BIT(3);
-
- pwm5pin |= cr2d & BIT(7);
- pwm5pin |= (creb & BIT(4)) && !(cr2a & BIT(0));
-
- pwm6pin = (cr2a & BIT(3)) && (cred & BIT(2));
- pwm6pin |= creb & BIT(2);
- break;
- case nct6796:
- fan5pin |= cr1b & BIT(5);
- fan5pin |= (cre0 & BIT(3)) && !(cr1b & BIT(0));
- fan5pin |= creb & BIT(5);
-
- fan6pin = (cr2a & BIT(4)) &&
- (!dsw_en || (cred & BIT(4)));
- fan6pin |= creb & BIT(3);
-
- fan7pin = !(cr2b & BIT(2));
-
- pwm5pin |= cr2d & BIT(7);
- pwm5pin |= (cre0 & BIT(4)) && !(cr1b & BIT(0));
- pwm5pin |= (creb & BIT(4)) && !(cr2a & BIT(0));
-
- pwm6pin = (cr2a & BIT(3)) && (cred & BIT(2));
- pwm6pin |= creb & BIT(2);
-
- pwm7pin = !(cr1d & (BIT(2) | BIT(3)));
- break;
- case nct6797:
- fan5pin |= !ddr4_en && (cr1b & BIT(5));
- fan5pin |= creb & BIT(5);
-
- fan6pin = cr2a & BIT(4);
- fan6pin |= creb & BIT(3);
-
- fan7pin = cr1a & BIT(1);
-
- pwm5pin |= (creb & BIT(4)) && !(cr2a & BIT(0));
- pwm5pin |= !ddr4_en && (cr2d & BIT(7));
-
- pwm6pin = creb & BIT(2);
- pwm6pin |= cred & BIT(2);
-
- pwm7pin = cr1d & BIT(4);
- break;
- case nct6798:
- fan6pin = !(cr1b & BIT(0)) && (cre0 & BIT(3));
- fan6pin |= cr2a & BIT(4);
- fan6pin |= creb & BIT(5);
-
- fan7pin = cr1b & BIT(5);
- fan7pin |= !(cr2b & BIT(2));
- fan7pin |= creb & BIT(3);
-
- pwm6pin = !(cr1b & BIT(0)) && (cre0 & BIT(4));
- pwm6pin |= !(cred & BIT(2)) && (cr2a & BIT(3));
- pwm6pin |= (creb & BIT(4)) && !(cr2a & BIT(0));
-
- pwm7pin = !(cr1d & (BIT(2) | BIT(3)));
- pwm7pin |= cr2d & BIT(7);
- pwm7pin |= creb & BIT(2);
- break;
- default: /* NCT6779D */
- break;
- }
-
- fan4min = fan4pin;
- }
-
- /* fan 1 and 2 (0x03) are always present */
- data->has_fan = 0x03 | (fan3pin << 2) | (fan4pin << 3) |
- (fan5pin << 4) | (fan6pin << 5) | (fan7pin << 6);
- data->has_fan_min = 0x03 | (fan3pin << 2) | (fan4min << 3) |
- (fan5pin << 4) | (fan6pin << 5) | (fan7pin << 6);
- data->has_pwm = 0x03 | (pwm3pin << 2) | (pwm4pin << 3) |
- (pwm5pin << 4) | (pwm6pin << 5) | (pwm7pin << 6);
-}
-
static void add_temp_sensors(struct nct6775_data *data, const u16 *regp,
int *available, int *mask)
{
@@ -4023,50 +3167,20 @@ static void add_temp_sensors(struct nct6775_data *data, const u16 *regp,
}
}
-static int nct6775_probe(struct platform_device *pdev)
+int nct6775_probe(struct device *dev, struct nct6775_data *data)
{
- struct device *dev = &pdev->dev;
- struct nct6775_sio_data *sio_data = dev_get_platdata(dev);
- struct nct6775_data *data;
- struct resource *res;
int i, s, err = 0;
int src, mask, available;
const u16 *reg_temp, *reg_temp_over, *reg_temp_hyst, *reg_temp_config;
const u16 *reg_temp_mon, *reg_temp_alternate, *reg_temp_crit;
const u16 *reg_temp_crit_l = NULL, *reg_temp_crit_h = NULL;
int num_reg_temp, num_reg_temp_mon, num_reg_tsi_temp;
- u8 cr2a;
struct device *hwmon_dev;
struct sensor_template_group tsi_temp_tg;
- if (sio_data->access == access_direct) {
- res = platform_get_resource(pdev, IORESOURCE_IO, 0);
- if (!devm_request_region(&pdev->dev, res->start, IOREGION_LENGTH,
- DRVNAME))
- return -EBUSY;
- }
-
- data = devm_kzalloc(&pdev->dev, sizeof(struct nct6775_data),
- GFP_KERNEL);
- if (!data)
- return -ENOMEM;
-
- data->kind = sio_data->kind;
- data->sio_data = sio_data;
-
- if (sio_data->access == access_direct) {
- data->addr = res->start;
- data->read_value = nct6775_read_value;
- data->write_value = nct6775_write_value;
- } else {
- data->read_value = nct6775_wmi_read_value;
- data->write_value = nct6775_wmi_write_value;
- }
-
mutex_init(&data->update_lock);
data->name = nct6775_device_names[data->kind];
data->bank = 0xff; /* Force initial bank selection */
- platform_set_drvdata(pdev, data);
switch (data->kind) {
case nct6106:
@@ -4781,79 +3895,12 @@ static int nct6775_probe(struct platform_device *pdev)
/* Initialize the chip */
nct6775_init_device(data);
- err = sio_data->sio_enter(sio_data);
- if (err)
- return err;
-
- cr2a = sio_data->sio_inb(sio_data, 0x2a);
- switch (data->kind) {
- case nct6775:
- data->have_vid = (cr2a & 0x40);
- break;
- case nct6776:
- data->have_vid = (cr2a & 0x60) == 0x40;
- break;
- case nct6106:
- case nct6116:
- case nct6779:
- case nct6791:
- case nct6792:
- case nct6793:
- case nct6795:
- case nct6796:
- case nct6797:
- case nct6798:
- break;
- }
-
- /*
- * Read VID value
- * We can get the VID input values directly at logical device D 0xe3.
- */
- if (data->have_vid) {
- sio_data->sio_select(sio_data, NCT6775_LD_VID);
- data->vid = sio_data->sio_inb(sio_data, 0xe3);
- data->vrm = vid_which_vrm();
- }
-
- if (fan_debounce) {
- u8 tmp;
-
- sio_data->sio_select(sio_data, NCT6775_LD_HWM);
- tmp = sio_data->sio_inb(sio_data,
- NCT6775_REG_CR_FAN_DEBOUNCE);
- switch (data->kind) {
- case nct6106:
- case nct6116:
- tmp |= 0xe0;
- break;
- case nct6775:
- tmp |= 0x1e;
- break;
- case nct6776:
- case nct6779:
- tmp |= 0x3e;
- break;
- case nct6791:
- case nct6792:
- case nct6793:
- case nct6795:
- case nct6796:
- case nct6797:
- case nct6798:
- tmp |= 0x7e;
- break;
- }
- sio_data->sio_outb(sio_data, NCT6775_REG_CR_FAN_DEBOUNCE,
- tmp);
- dev_info(&pdev->dev, "Enabled fan debounce for chip %s\n",
- data->name);
+ if (data->driver_init) {
+ err = data->driver_init(data);
+ if (err)
+ return err;
}
- nct6775_check_fan_inputs(data, sio_data);
-
- sio_data->sio_exit(sio_data);
-
/* Read fan clock dividers immediately */
nct6775_init_fan_common(dev, data);
@@ -4888,404 +3935,12 @@ static int nct6775_probe(struct platform_device *pdev)
return err;
}
- err = nct6775_add_attr_group(data, &nct6775_group_other);
- if (err)
- return err;
-
hwmon_dev = devm_hwmon_device_register_with_groups(dev, data->name,
data, data->groups);
return PTR_ERR_OR_ZERO(hwmon_dev);
}
-
-static void nct6791_enable_io_mapping(struct nct6775_sio_data *sio_data)
-{
- int val;
-
- val = sio_data->sio_inb(sio_data, NCT6791_REG_HM_IO_SPACE_LOCK_ENABLE);
- if (val & 0x10) {
- pr_info("Enabling hardware monitor logical device mappings.\n");
- sio_data->sio_outb(sio_data, NCT6791_REG_HM_IO_SPACE_LOCK_ENABLE,
- val & ~0x10);
- }
-}
-
-static int __maybe_unused nct6775_suspend(struct device *dev)
-{
- struct nct6775_data *data = nct6775_update_device(dev);
-
- mutex_lock(&data->update_lock);
- data->vbat = data->read_value(data, data->REG_VBAT);
- if (data->kind == nct6775) {
- data->fandiv1 = data->read_value(data, NCT6775_REG_FANDIV1);
- data->fandiv2 = data->read_value(data, NCT6775_REG_FANDIV2);
- }
- mutex_unlock(&data->update_lock);
-
- return 0;
-}
-
-static int __maybe_unused nct6775_resume(struct device *dev)
-{
- struct nct6775_data *data = dev_get_drvdata(dev);
- struct nct6775_sio_data *sio_data = dev_get_platdata(dev);
- int i, j, err = 0;
- u8 reg;
-
- mutex_lock(&data->update_lock);
- data->bank = 0xff; /* Force initial bank selection */
-
- err = sio_data->sio_enter(sio_data);
- if (err)
- goto abort;
-
- sio_data->sio_select(sio_data, NCT6775_LD_HWM);
- reg = sio_data->sio_inb(sio_data, SIO_REG_ENABLE);
- if (reg != data->sio_reg_enable)
- sio_data->sio_outb(sio_data, SIO_REG_ENABLE, data->sio_reg_enable);
-
- if (data->kind == nct6791 || data->kind == nct6792 ||
- data->kind == nct6793 || data->kind == nct6795 ||
- data->kind == nct6796 || data->kind == nct6797 ||
- data->kind == nct6798)
- nct6791_enable_io_mapping(sio_data);
-
- sio_data->sio_exit(sio_data);
-
- /* Restore limits */
- for (i = 0; i < data->in_num; i++) {
- if (!(data->have_in & BIT(i)))
- continue;
-
- data->write_value(data, data->REG_IN_MINMAX[0][i],
- data->in[i][1]);
- data->write_value(data, data->REG_IN_MINMAX[1][i],
- data->in[i][2]);
- }
-
- for (i = 0; i < ARRAY_SIZE(data->fan_min); i++) {
- if (!(data->has_fan_min & BIT(i)))
- continue;
-
- data->write_value(data, data->REG_FAN_MIN[i],
- data->fan_min[i]);
- }
-
- for (i = 0; i < NUM_TEMP; i++) {
- if (!(data->have_temp & BIT(i)))
- continue;
-
- for (j = 1; j < ARRAY_SIZE(data->reg_temp); j++)
- if (data->reg_temp[j][i])
- nct6775_write_temp(data, data->reg_temp[j][i],
- data->temp[j][i]);
- }
-
- /* Restore other settings */
- data->write_value(data, data->REG_VBAT, data->vbat);
- if (data->kind == nct6775) {
- data->write_value(data, NCT6775_REG_FANDIV1, data->fandiv1);
- data->write_value(data, NCT6775_REG_FANDIV2, data->fandiv2);
- }
-
-abort:
- /* Force re-reading all values */
- data->valid = false;
- mutex_unlock(&data->update_lock);
-
- return err;
-}
-
-static SIMPLE_DEV_PM_OPS(nct6775_dev_pm_ops, nct6775_suspend, nct6775_resume);
-
-static struct platform_driver nct6775_driver = {
- .driver = {
- .name = DRVNAME,
- .pm = &nct6775_dev_pm_ops,
- },
- .probe = nct6775_probe,
-};
-
-/* nct6775_find() looks for a '627 in the Super-I/O config space */
-static int __init nct6775_find(int sioaddr, struct nct6775_sio_data *sio_data)
-{
- u16 val;
- int err;
- int addr;
-
- sio_data->access = access_direct;
- sio_data->sioreg = sioaddr;
-
- err = sio_data->sio_enter(sio_data);
- if (err)
- return err;
-
- val = (sio_data->sio_inb(sio_data, SIO_REG_DEVID) << 8) |
- sio_data->sio_inb(sio_data, SIO_REG_DEVID + 1);
- if (force_id && val != 0xffff)
- val = force_id;
-
- switch (val & SIO_ID_MASK) {
- case SIO_NCT6106_ID:
- sio_data->kind = nct6106;
- break;
- case SIO_NCT6116_ID:
- sio_data->kind = nct6116;
- break;
- case SIO_NCT6775_ID:
- sio_data->kind = nct6775;
- break;
- case SIO_NCT6776_ID:
- sio_data->kind = nct6776;
- break;
- case SIO_NCT6779_ID:
- sio_data->kind = nct6779;
- break;
- case SIO_NCT6791_ID:
- sio_data->kind = nct6791;
- break;
- case SIO_NCT6792_ID:
- sio_data->kind = nct6792;
- break;
- case SIO_NCT6793_ID:
- sio_data->kind = nct6793;
- break;
- case SIO_NCT6795_ID:
- sio_data->kind = nct6795;
- break;
- case SIO_NCT6796_ID:
- sio_data->kind = nct6796;
- break;
- case SIO_NCT6797_ID:
- sio_data->kind = nct6797;
- break;
- case SIO_NCT6798_ID:
- sio_data->kind = nct6798;
- break;
- default:
- if (val != 0xffff)
- pr_debug("unsupported chip ID: 0x%04x\n", val);
- sio_data->sio_exit(sio_data);
- return -ENODEV;
- }
-
- /* We have a known chip, find the HWM I/O address */
- sio_data->sio_select(sio_data, NCT6775_LD_HWM);
- val = (sio_data->sio_inb(sio_data, SIO_REG_ADDR) << 8)
- | sio_data->sio_inb(sio_data, SIO_REG_ADDR + 1);
- addr = val & IOREGION_ALIGNMENT;
- if (addr == 0) {
- pr_err("Refusing to enable a Super-I/O device with a base I/O port 0\n");
- sio_data->sio_exit(sio_data);
- return -ENODEV;
- }
-
- /* Activate logical device if needed */
- val = sio_data->sio_inb(sio_data, SIO_REG_ENABLE);
- if (!(val & 0x01)) {
- pr_warn("Forcibly enabling Super-I/O. Sensor is probably unusable.\n");
- sio_data->sio_outb(sio_data, SIO_REG_ENABLE, val | 0x01);
- }
-
- if (sio_data->kind == nct6791 || sio_data->kind == nct6792 ||
- sio_data->kind == nct6793 || sio_data->kind == nct6795 ||
- sio_data->kind == nct6796 || sio_data->kind == nct6797 ||
- sio_data->kind == nct6798)
- nct6791_enable_io_mapping(sio_data);
-
- sio_data->sio_exit(sio_data);
- pr_info("Found %s or compatible chip at %#x:%#x\n",
- nct6775_sio_names[sio_data->kind], sioaddr, addr);
-
- return addr;
-}
-
-/*
- * when Super-I/O functions move to a separate file, the Super-I/O
- * bus will manage the lifetime of the device and this module will only keep
- * track of the nct6775 driver. But since we use platform_device_alloc(), we
- * must keep track of the device
- */
-static struct platform_device *pdev[2];
-
-static const char * const asus_wmi_boards[] = {
- "ProArt X570-CREATOR WIFI",
- "Pro B550M-C",
- "Pro WS X570-ACE",
- "PRIME B360-PLUS",
- "PRIME B460-PLUS",
- "PRIME B550-PLUS",
- "PRIME B550M-A",
- "PRIME B550M-A (WI-FI)",
- "PRIME X570-P",
- "PRIME X570-PRO",
- "ROG CROSSHAIR VIII DARK HERO",
- "ROG CROSSHAIR VIII FORMULA",
- "ROG CROSSHAIR VIII HERO",
- "ROG CROSSHAIR VIII IMPACT",
- "ROG STRIX B550-A GAMING",
- "ROG STRIX B550-E GAMING",
- "ROG STRIX B550-F GAMING",
- "ROG STRIX B550-F GAMING (WI-FI)",
- "ROG STRIX B550-F GAMING WIFI II",
- "ROG STRIX B550-I GAMING",
- "ROG STRIX B550-XE GAMING (WI-FI)",
- "ROG STRIX X570-E GAMING",
- "ROG STRIX X570-F GAMING",
- "ROG STRIX X570-I GAMING",
- "ROG STRIX Z390-E GAMING",
- "ROG STRIX Z390-F GAMING",
- "ROG STRIX Z390-H GAMING",
- "ROG STRIX Z390-I GAMING",
- "ROG STRIX Z490-A GAMING",
- "ROG STRIX Z490-E GAMING",
- "ROG STRIX Z490-F GAMING",
- "ROG STRIX Z490-G GAMING",
- "ROG STRIX Z490-G GAMING (WI-FI)",
- "ROG STRIX Z490-H GAMING",
- "ROG STRIX Z490-I GAMING",
- "TUF GAMING B550M-PLUS",
- "TUF GAMING B550M-PLUS (WI-FI)",
- "TUF GAMING B550-PLUS",
- "TUF GAMING B550-PRO",
- "TUF GAMING X570-PLUS",
- "TUF GAMING X570-PLUS (WI-FI)",
- "TUF GAMING X570-PRO (WI-FI)",
- "TUF GAMING Z490-PLUS",
- "TUF GAMING Z490-PLUS (WI-FI)",
-};
-
-static int __init sensors_nct6775_init(void)
-{
- int i, err;
- bool found = false;
- int address;
- struct resource res;
- struct nct6775_sio_data sio_data;
- int sioaddr[2] = { 0x2e, 0x4e };
- enum sensor_access access = access_direct;
- const char *board_vendor, *board_name;
- u8 tmp;
-
- err = platform_driver_register(&nct6775_driver);
- if (err)
- return err;
-
- board_vendor = dmi_get_system_info(DMI_BOARD_VENDOR);
- board_name = dmi_get_system_info(DMI_BOARD_NAME);
-
- if (board_name && board_vendor &&
- !strcmp(board_vendor, "ASUSTeK COMPUTER INC.")) {
- err = match_string(asus_wmi_boards, ARRAY_SIZE(asus_wmi_boards),
- board_name);
- if (err >= 0) {
- /* if reading chip id via WMI succeeds, use WMI */
- if (!nct6775_asuswmi_read(0, NCT6775_PORT_CHIPID, &tmp) && tmp) {
- pr_info("Using Asus WMI to access %#x chip.\n", tmp);
- access = access_asuswmi;
- } else {
- pr_err("Can't read ChipID by Asus WMI.\n");
- }
- }
- }
-
- /*
- * initialize sio_data->kind and sio_data->sioreg.
- *
- * when Super-I/O functions move to a separate file, the Super-I/O
- * driver will probe 0x2e and 0x4e and auto-detect the presence of a
- * nct6775 hardware monitor, and call probe()
- */
- for (i = 0; i < ARRAY_SIZE(pdev); i++) {
- sio_data.sio_outb = superio_outb;
- sio_data.sio_inb = superio_inb;
- sio_data.sio_select = superio_select;
- sio_data.sio_enter = superio_enter;
- sio_data.sio_exit = superio_exit;
-
- address = nct6775_find(sioaddr[i], &sio_data);
- if (address <= 0)
- continue;
-
- found = true;
-
- sio_data.access = access;
-
- if (access == access_asuswmi) {
- sio_data.sio_outb = superio_wmi_outb;
- sio_data.sio_inb = superio_wmi_inb;
- sio_data.sio_select = superio_wmi_select;
- sio_data.sio_enter = superio_wmi_enter;
- sio_data.sio_exit = superio_wmi_exit;
- }
-
- pdev[i] = platform_device_alloc(DRVNAME, address);
- if (!pdev[i]) {
- err = -ENOMEM;
- goto exit_device_unregister;
- }
-
- err = platform_device_add_data(pdev[i], &sio_data,
- sizeof(struct nct6775_sio_data));
- if (err)
- goto exit_device_put;
-
- if (sio_data.access == access_direct) {
- memset(&res, 0, sizeof(res));
- res.name = DRVNAME;
- res.start = address + IOREGION_OFFSET;
- res.end = address + IOREGION_OFFSET + IOREGION_LENGTH - 1;
- res.flags = IORESOURCE_IO;
-
- err = acpi_check_resource_conflict(&res);
- if (err) {
- platform_device_put(pdev[i]);
- pdev[i] = NULL;
- continue;
- }
-
- err = platform_device_add_resources(pdev[i], &res, 1);
- if (err)
- goto exit_device_put;
- }
-
- /* platform_device_add calls probe() */
- err = platform_device_add(pdev[i]);
- if (err)
- goto exit_device_put;
- }
- if (!found) {
- err = -ENODEV;
- goto exit_unregister;
- }
-
- return 0;
-
-exit_device_put:
- platform_device_put(pdev[i]);
-exit_device_unregister:
- while (--i >= 0) {
- if (pdev[i])
- platform_device_unregister(pdev[i]);
- }
-exit_unregister:
- platform_driver_unregister(&nct6775_driver);
- return err;
-}
-
-static void __exit sensors_nct6775_exit(void)
-{
- int i;
-
- for (i = 0; i < ARRAY_SIZE(pdev); i++) {
- if (pdev[i])
- platform_device_unregister(pdev[i]);
- }
- platform_driver_unregister(&nct6775_driver);
-}
+EXPORT_SYMBOL_GPL(nct6775_probe);
MODULE_AUTHOR("Guenter Roeck <linux@roeck-us.net>");
-MODULE_DESCRIPTION("Driver for NCT6775F and compatible chips");
+MODULE_DESCRIPTION("Core driver for NCT6775F and compatible chips");
MODULE_LICENSE("GPL");
-
-module_init(sensors_nct6775_init);
-module_exit(sensors_nct6775_exit);
diff --git a/drivers/hwmon/nct6775-platform.c b/drivers/hwmon/nct6775-platform.c
new file mode 100644
index 000000000000..9bc794ba69e2
--- /dev/null
+++ b/drivers/hwmon/nct6775-platform.c
@@ -0,0 +1,1185 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * nct6775-platform - Platform driver for the hardware monitoring
+ * functionality of Nuvoton NCT677x Super-I/O chips
+ *
+ * Copyright (C) 2012 Guenter Roeck <linux@roeck-us.net>
+ */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/hwmon-vid.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/io.h>
+#include <linux/acpi.h>
+#include <linux/dmi.h>
+#include <linux/wmi.h>
+
+#include "nct6775.h"
+
+enum sensor_access { access_direct, access_asuswmi };
+
+static const char * const nct6775_sio_names[] __initconst = {
+ "NCT6106D",
+ "NCT6116D",
+ "NCT6775F",
+ "NCT6776D/F",
+ "NCT6779D",
+ "NCT6791D",
+ "NCT6792D",
+ "NCT6793D",
+ "NCT6795D",
+ "NCT6796D",
+ "NCT6797D",
+ "NCT6798D",
+};
+
+static unsigned short force_id;
+module_param(force_id, ushort, 0);
+MODULE_PARM_DESC(force_id, "Override the detected device ID");
+
+static unsigned short fan_debounce;
+module_param(fan_debounce, ushort, 0);
+MODULE_PARM_DESC(fan_debounce, "Enable debouncing for fan RPM signal");
+
+#define DRVNAME "nct6775-platform"
+
+#define NCT6775_PORT_CHIPID 0x58
+
+/*
+ * ISA constants
+ */
+
+#define IOREGION_ALIGNMENT (~7)
+#define IOREGION_OFFSET 5
+#define IOREGION_LENGTH 2
+#define ADDR_REG_OFFSET 0
+#define DATA_REG_OFFSET 1
+
+/*
+ * Super-I/O constants and functions
+ */
+
+#define NCT6775_LD_ACPI 0x0a
+#define NCT6775_LD_HWM 0x0b
+#define NCT6775_LD_VID 0x0d
+#define NCT6775_LD_12 0x12
+
+#define SIO_REG_LDSEL 0x07 /* Logical device select */
+#define SIO_REG_DEVID 0x20 /* Device ID (2 bytes) */
+#define SIO_REG_ENABLE 0x30 /* Logical device enable */
+#define SIO_REG_ADDR 0x60 /* Logical device address (2 bytes) */
+
+#define SIO_NCT6106_ID 0xc450
+#define SIO_NCT6116_ID 0xd280
+#define SIO_NCT6775_ID 0xb470
+#define SIO_NCT6776_ID 0xc330
+#define SIO_NCT6779_ID 0xc560
+#define SIO_NCT6791_ID 0xc800
+#define SIO_NCT6792_ID 0xc910
+#define SIO_NCT6793_ID 0xd120
+#define SIO_NCT6795_ID 0xd350
+#define SIO_NCT6796_ID 0xd420
+#define SIO_NCT6797_ID 0xd450
+#define SIO_NCT6798_ID 0xd428
+#define SIO_ID_MASK 0xFFF8
+
+/*
+ * Control registers
+ */
+#define NCT6775_REG_CR_FAN_DEBOUNCE 0xf0
+
+struct nct6775_sio_data {
+ int sioreg;
+ int ld;
+ enum kinds kind;
+ enum sensor_access access;
+
+ /* superio_() callbacks */
+ void (*sio_outb)(struct nct6775_sio_data *sio_data, int reg, int val);
+ int (*sio_inb)(struct nct6775_sio_data *sio_data, int reg);
+ void (*sio_select)(struct nct6775_sio_data *sio_data, int ld);
+ int (*sio_enter)(struct nct6775_sio_data *sio_data);
+ void (*sio_exit)(struct nct6775_sio_data *sio_data);
+};
+
+#define ASUSWMI_MONITORING_GUID "466747A0-70EC-11DE-8A39-0800200C9A66"
+#define ASUSWMI_METHODID_RSIO 0x5253494F
+#define ASUSWMI_METHODID_WSIO 0x5753494F
+#define ASUSWMI_METHODID_RHWM 0x5248574D
+#define ASUSWMI_METHODID_WHWM 0x5748574D
+#define ASUSWMI_UNSUPPORTED_METHOD 0xFFFFFFFE
+
+static int nct6775_asuswmi_evaluate_method(u32 method_id, u8 bank, u8 reg, u8 val, u32 *retval)
+{
+#if IS_ENABLED(CONFIG_ACPI_WMI)
+ u32 args = bank | (reg << 8) | (val << 16);
+ struct acpi_buffer input = { (acpi_size) sizeof(args), &args };
+ struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };
+ acpi_status status;
+ union acpi_object *obj;
+ u32 tmp = ASUSWMI_UNSUPPORTED_METHOD;
+
+ status = wmi_evaluate_method(ASUSWMI_MONITORING_GUID, 0,
+ method_id, &input, &output);
+
+ if (ACPI_FAILURE(status))
+ return -EIO;
+
+ obj = output.pointer;
+ if (obj && obj->type == ACPI_TYPE_INTEGER)
+ tmp = obj->integer.value;
+
+ if (retval)
+ *retval = tmp;
+
+ kfree(obj);
+
+ if (tmp == ASUSWMI_UNSUPPORTED_METHOD)
+ return -ENODEV;
+ return 0;
+#else
+ return -EOPNOTSUPP;
+#endif
+}
+
+static inline int nct6775_asuswmi_write(u8 bank, u8 reg, u8 val)
+{
+ return nct6775_asuswmi_evaluate_method(ASUSWMI_METHODID_WHWM, bank,
+ reg, val, NULL);
+}
+
+static inline int nct6775_asuswmi_read(u8 bank, u8 reg, u8 *val)
+{
+ u32 ret, tmp = 0;
+
+ ret = nct6775_asuswmi_evaluate_method(ASUSWMI_METHODID_RHWM, bank,
+ reg, 0, &tmp);
+ *val = tmp;
+ return ret;
+}
+
+static int superio_wmi_inb(struct nct6775_sio_data *sio_data, int reg)
+{
+ int tmp = 0;
+
+ nct6775_asuswmi_evaluate_method(ASUSWMI_METHODID_RSIO, sio_data->ld,
+ reg, 0, &tmp);
+ return tmp;
+}
+
+static void superio_wmi_outb(struct nct6775_sio_data *sio_data, int reg, int val)
+{
+ nct6775_asuswmi_evaluate_method(ASUSWMI_METHODID_WSIO, sio_data->ld,
+ reg, val, NULL);
+}
+
+static void superio_wmi_select(struct nct6775_sio_data *sio_data, int ld)
+{
+ sio_data->ld = ld;
+}
+
+static int superio_wmi_enter(struct nct6775_sio_data *sio_data)
+{
+ return 0;
+}
+
+static void superio_wmi_exit(struct nct6775_sio_data *sio_data)
+{
+}
+
+static void superio_outb(struct nct6775_sio_data *sio_data, int reg, int val)
+{
+ int ioreg = sio_data->sioreg;
+
+ outb(reg, ioreg);
+ outb(val, ioreg + 1);
+}
+
+static int superio_inb(struct nct6775_sio_data *sio_data, int reg)
+{
+ int ioreg = sio_data->sioreg;
+
+ outb(reg, ioreg);
+ return inb(ioreg + 1);
+}
+
+static void superio_select(struct nct6775_sio_data *sio_data, int ld)
+{
+ int ioreg = sio_data->sioreg;
+
+ outb(SIO_REG_LDSEL, ioreg);
+ outb(ld, ioreg + 1);
+}
+
+static int superio_enter(struct nct6775_sio_data *sio_data)
+{
+ int ioreg = sio_data->sioreg;
+
+ /*
+ * Try to reserve <ioreg> and <ioreg + 1> for exclusive access.
+ */
+ if (!request_muxed_region(ioreg, 2, DRVNAME))
+ return -EBUSY;
+
+ outb(0x87, ioreg);
+ outb(0x87, ioreg);
+
+ return 0;
+}
+
+static void superio_exit(struct nct6775_sio_data *sio_data)
+{
+ int ioreg = sio_data->sioreg;
+
+ outb(0xaa, ioreg);
+ outb(0x02, ioreg);
+ outb(0x02, ioreg + 1);
+ release_region(ioreg, 2);
+}
+
+static inline void nct6775_wmi_set_bank(struct nct6775_data *data, u16 reg)
+{
+ u8 bank = reg >> 8;
+
+ data->bank = bank;
+}
+
+static u16 nct6775_wmi_read_value(struct nct6775_data *data, u16 reg)
+{
+ int res, err, word_sized = nct6775_reg_is_word_sized(data, reg);
+ u8 tmp = 0;
+
+ nct6775_wmi_set_bank(data, reg);
+
+ err = nct6775_asuswmi_read(data->bank, reg & 0xff, &tmp);
+ if (err)
+ return 0;
+
+ res = tmp;
+ if (word_sized) {
+ err = nct6775_asuswmi_read(data->bank, (reg & 0xff) + 1, &tmp);
+ if (err)
+ return 0;
+
+ res = (res << 8) + tmp;
+ }
+ return res;
+}
+
+static int nct6775_wmi_write_value(struct nct6775_data *data, u16 reg, u16 value)
+{
+ int res, word_sized = nct6775_reg_is_word_sized(data, reg);
+
+ nct6775_wmi_set_bank(data, reg);
+
+ if (word_sized) {
+ res = nct6775_asuswmi_write(data->bank, reg & 0xff, value >> 8);
+ if (res)
+ return res;
+
+ res = nct6775_asuswmi_write(data->bank, (reg & 0xff) + 1, value);
+ } else {
+ res = nct6775_asuswmi_write(data->bank, reg & 0xff, value);
+ }
+
+ return res;
+}
+
+/*
+ * On older chips, only registers 0x50-0x5f are banked.
+ * On more recent chips, all registers are banked.
+ * Assume that is the case and set the bank number for each access.
+ * Cache the bank number so it only needs to be set if it changes.
+ */
+static inline void nct6775_set_bank(struct nct6775_data *data, u16 reg)
+{
+ u8 bank = reg >> 8;
+
+ if (data->bank != bank) {
+ outb_p(NCT6775_REG_BANK, data->addr + ADDR_REG_OFFSET);
+ outb_p(bank, data->addr + DATA_REG_OFFSET);
+ data->bank = bank;
+ }
+}
+
+static u16 nct6775_read_value(struct nct6775_data *data, u16 reg)
+{
+ int res, word_sized = nct6775_reg_is_word_sized(data, reg);
+
+ nct6775_set_bank(data, reg);
+ outb_p(reg & 0xff, data->addr + ADDR_REG_OFFSET);
+ res = inb_p(data->addr + DATA_REG_OFFSET);
+ if (word_sized) {
+ outb_p((reg & 0xff) + 1,
+ data->addr + ADDR_REG_OFFSET);
+ res = (res << 8) + inb_p(data->addr + DATA_REG_OFFSET);
+ }
+ return res;
+}
+
+static int nct6775_write_value(struct nct6775_data *data, u16 reg, u16 value)
+{
+ int word_sized = nct6775_reg_is_word_sized(data, reg);
+
+ nct6775_set_bank(data, reg);
+ outb_p(reg & 0xff, data->addr + ADDR_REG_OFFSET);
+ if (word_sized) {
+ outb_p(value >> 8, data->addr + DATA_REG_OFFSET);
+ outb_p((reg & 0xff) + 1,
+ data->addr + ADDR_REG_OFFSET);
+ }
+ outb_p(value & 0xff, data->addr + DATA_REG_OFFSET);
+ return 0;
+}
+
+static void nct6791_enable_io_mapping(struct nct6775_sio_data *sio_data)
+{
+ int val;
+
+ val = sio_data->sio_inb(sio_data, NCT6791_REG_HM_IO_SPACE_LOCK_ENABLE);
+ if (val & 0x10) {
+ pr_info("Enabling hardware monitor logical device mappings.\n");
+ sio_data->sio_outb(sio_data, NCT6791_REG_HM_IO_SPACE_LOCK_ENABLE,
+ val & ~0x10);
+ }
+}
+
+static int __maybe_unused nct6775_suspend(struct device *dev)
+{
+ struct nct6775_data *data = nct6775_update_device(dev);
+
+ mutex_lock(&data->update_lock);
+ data->vbat = data->read_value(data, data->REG_VBAT);
+ if (data->kind == nct6775) {
+ data->fandiv1 = data->read_value(data, NCT6775_REG_FANDIV1);
+ data->fandiv2 = data->read_value(data, NCT6775_REG_FANDIV2);
+ }
+ mutex_unlock(&data->update_lock);
+
+ return 0;
+}
+
+static int __maybe_unused nct6775_resume(struct device *dev)
+{
+ struct nct6775_data *data = dev_get_drvdata(dev);
+ struct nct6775_sio_data *sio_data = dev_get_platdata(dev);
+ int i, j, err = 0;
+ u8 reg;
+
+ mutex_lock(&data->update_lock);
+ data->bank = 0xff; /* Force initial bank selection */
+
+ err = sio_data->sio_enter(sio_data);
+ if (err)
+ goto abort;
+
+ sio_data->sio_select(sio_data, NCT6775_LD_HWM);
+ reg = sio_data->sio_inb(sio_data, SIO_REG_ENABLE);
+ if (reg != data->sio_reg_enable)
+ sio_data->sio_outb(sio_data, SIO_REG_ENABLE, data->sio_reg_enable);
+
+ if (data->kind == nct6791 || data->kind == nct6792 ||
+ data->kind == nct6793 || data->kind == nct6795 ||
+ data->kind == nct6796 || data->kind == nct6797 ||
+ data->kind == nct6798)
+ nct6791_enable_io_mapping(sio_data);
+
+ sio_data->sio_exit(sio_data);
+
+ /* Restore limits */
+ for (i = 0; i < data->in_num; i++) {
+ if (!(data->have_in & BIT(i)))
+ continue;
+
+ data->write_value(data, data->REG_IN_MINMAX[0][i],
+ data->in[i][1]);
+ data->write_value(data, data->REG_IN_MINMAX[1][i],
+ data->in[i][2]);
+ }
+
+ for (i = 0; i < ARRAY_SIZE(data->fan_min); i++) {
+ if (!(data->has_fan_min & BIT(i)))
+ continue;
+
+ data->write_value(data, data->REG_FAN_MIN[i],
+ data->fan_min[i]);
+ }
+
+ for (i = 0; i < NUM_TEMP; i++) {
+ if (!(data->have_temp & BIT(i)))
+ continue;
+
+ for (j = 1; j < ARRAY_SIZE(data->reg_temp); j++)
+ if (data->reg_temp[j][i])
+ nct6775_write_temp(data, data->reg_temp[j][i],
+ data->temp[j][i]);
+ }
+
+ /* Restore other settings */
+ data->write_value(data, data->REG_VBAT, data->vbat);
+ if (data->kind == nct6775) {
+ data->write_value(data, NCT6775_REG_FANDIV1, data->fandiv1);
+ data->write_value(data, NCT6775_REG_FANDIV2, data->fandiv2);
+ }
+
+abort:
+ /* Force re-reading all values */
+ data->valid = false;
+ mutex_unlock(&data->update_lock);
+
+ return err;
+}
+
+static SIMPLE_DEV_PM_OPS(nct6775_dev_pm_ops, nct6775_suspend, nct6775_resume);
+
+static void
+nct6775_check_fan_inputs(struct nct6775_data *data, struct nct6775_sio_data *sio_data)
+{
+ bool fan3pin = false, fan4pin = false, fan4min = false;
+ bool fan5pin = false, fan6pin = false, fan7pin = false;
+ bool pwm3pin = false, pwm4pin = false, pwm5pin = false;
+ bool pwm6pin = false, pwm7pin = false;
+
+ /* Store SIO_REG_ENABLE for use during resume */
+ sio_data->sio_select(sio_data, NCT6775_LD_HWM);
+ data->sio_reg_enable = sio_data->sio_inb(sio_data, SIO_REG_ENABLE);
+
+ /* fan4 and fan5 share some pins with the GPIO and serial flash */
+ if (data->kind == nct6775) {
+ int cr2c = sio_data->sio_inb(sio_data, 0x2c);
+
+ fan3pin = cr2c & BIT(6);
+ pwm3pin = cr2c & BIT(7);
+
+ /* On NCT6775, fan4 shares pins with the fdc interface */
+ fan4pin = !(sio_data->sio_inb(sio_data, 0x2A) & 0x80);
+ } else if (data->kind == nct6776) {
+ bool gpok = sio_data->sio_inb(sio_data, 0x27) & 0x80;
+ const char *board_vendor, *board_name;
+
+ board_vendor = dmi_get_system_info(DMI_BOARD_VENDOR);
+ board_name = dmi_get_system_info(DMI_BOARD_NAME);
+
+ if (board_name && board_vendor &&
+ !strcmp(board_vendor, "ASRock")) {
+ /*
+ * Auxiliary fan monitoring is not enabled on ASRock
+ * Z77 Pro4-M if booted in UEFI Ultra-FastBoot mode.
+ * Observed with BIOS version 2.00.
+ */
+ if (!strcmp(board_name, "Z77 Pro4-M")) {
+ if ((data->sio_reg_enable & 0xe0) != 0xe0) {
+ data->sio_reg_enable |= 0xe0;
+ sio_data->sio_outb(sio_data, SIO_REG_ENABLE,
+ data->sio_reg_enable);
+ }
+ }
+ }
+
+ if (data->sio_reg_enable & 0x80)
+ fan3pin = gpok;
+ else
+ fan3pin = !(sio_data->sio_inb(sio_data, 0x24) & 0x40);
+
+ if (data->sio_reg_enable & 0x40)
+ fan4pin = gpok;
+ else
+ fan4pin = sio_data->sio_inb(sio_data, 0x1C) & 0x01;
+
+ if (data->sio_reg_enable & 0x20)
+ fan5pin = gpok;
+ else
+ fan5pin = sio_data->sio_inb(sio_data, 0x1C) & 0x02;
+
+ fan4min = fan4pin;
+ pwm3pin = fan3pin;
+ } else if (data->kind == nct6106) {
+ int cr24 = sio_data->sio_inb(sio_data, 0x24);
+
+ fan3pin = !(cr24 & 0x80);
+ pwm3pin = cr24 & 0x08;
+ } else if (data->kind == nct6116) {
+ int cr1a = sio_data->sio_inb(sio_data, 0x1a);
+ int cr1b = sio_data->sio_inb(sio_data, 0x1b);
+ int cr24 = sio_data->sio_inb(sio_data, 0x24);
+ int cr2a = sio_data->sio_inb(sio_data, 0x2a);
+ int cr2b = sio_data->sio_inb(sio_data, 0x2b);
+ int cr2f = sio_data->sio_inb(sio_data, 0x2f);
+
+ fan3pin = !(cr2b & 0x10);
+ fan4pin = (cr2b & 0x80) || // pin 1(2)
+ (!(cr2f & 0x10) && (cr1a & 0x04)); // pin 65(66)
+ fan5pin = (cr2b & 0x80) || // pin 126(127)
+ (!(cr1b & 0x03) && (cr2a & 0x02)); // pin 94(96)
+
+ pwm3pin = fan3pin && (cr24 & 0x08);
+ pwm4pin = fan4pin;
+ pwm5pin = fan5pin;
+ } else {
+ /*
+ * NCT6779D, NCT6791D, NCT6792D, NCT6793D, NCT6795D, NCT6796D,
+ * NCT6797D, NCT6798D
+ */
+ int cr1a = sio_data->sio_inb(sio_data, 0x1a);
+ int cr1b = sio_data->sio_inb(sio_data, 0x1b);
+ int cr1c = sio_data->sio_inb(sio_data, 0x1c);
+ int cr1d = sio_data->sio_inb(sio_data, 0x1d);
+ int cr2a = sio_data->sio_inb(sio_data, 0x2a);
+ int cr2b = sio_data->sio_inb(sio_data, 0x2b);
+ int cr2d = sio_data->sio_inb(sio_data, 0x2d);
+ int cr2f = sio_data->sio_inb(sio_data, 0x2f);
+ bool dsw_en = cr2f & BIT(3);
+ bool ddr4_en = cr2f & BIT(4);
+ int cre0;
+ int creb;
+ int cred;
+
+ sio_data->sio_select(sio_data, NCT6775_LD_12);
+ cre0 = sio_data->sio_inb(sio_data, 0xe0);
+ creb = sio_data->sio_inb(sio_data, 0xeb);
+ cred = sio_data->sio_inb(sio_data, 0xed);
+
+ fan3pin = !(cr1c & BIT(5));
+ fan4pin = !(cr1c & BIT(6));
+ fan5pin = !(cr1c & BIT(7));
+
+ pwm3pin = !(cr1c & BIT(0));
+ pwm4pin = !(cr1c & BIT(1));
+ pwm5pin = !(cr1c & BIT(2));
+
+ switch (data->kind) {
+ case nct6791:
+ fan6pin = cr2d & BIT(1);
+ pwm6pin = cr2d & BIT(0);
+ break;
+ case nct6792:
+ fan6pin = !dsw_en && (cr2d & BIT(1));
+ pwm6pin = !dsw_en && (cr2d & BIT(0));
+ break;
+ case nct6793:
+ fan5pin |= cr1b & BIT(5);
+ fan5pin |= creb & BIT(5);
+
+ fan6pin = !dsw_en && (cr2d & BIT(1));
+ fan6pin |= creb & BIT(3);
+
+ pwm5pin |= cr2d & BIT(7);
+ pwm5pin |= (creb & BIT(4)) && !(cr2a & BIT(0));
+
+ pwm6pin = !dsw_en && (cr2d & BIT(0));
+ pwm6pin |= creb & BIT(2);
+ break;
+ case nct6795:
+ fan5pin |= cr1b & BIT(5);
+ fan5pin |= creb & BIT(5);
+
+ fan6pin = (cr2a & BIT(4)) &&
+ (!dsw_en || (cred & BIT(4)));
+ fan6pin |= creb & BIT(3);
+
+ pwm5pin |= cr2d & BIT(7);
+ pwm5pin |= (creb & BIT(4)) && !(cr2a & BIT(0));
+
+ pwm6pin = (cr2a & BIT(3)) && (cred & BIT(2));
+ pwm6pin |= creb & BIT(2);
+ break;
+ case nct6796:
+ fan5pin |= cr1b & BIT(5);
+ fan5pin |= (cre0 & BIT(3)) && !(cr1b & BIT(0));
+ fan5pin |= creb & BIT(5);
+
+ fan6pin = (cr2a & BIT(4)) &&
+ (!dsw_en || (cred & BIT(4)));
+ fan6pin |= creb & BIT(3);
+
+ fan7pin = !(cr2b & BIT(2));
+
+ pwm5pin |= cr2d & BIT(7);
+ pwm5pin |= (cre0 & BIT(4)) && !(cr1b & BIT(0));
+ pwm5pin |= (creb & BIT(4)) && !(cr2a & BIT(0));
+
+ pwm6pin = (cr2a & BIT(3)) && (cred & BIT(2));
+ pwm6pin |= creb & BIT(2);
+
+ pwm7pin = !(cr1d & (BIT(2) | BIT(3)));
+ break;
+ case nct6797:
+ fan5pin |= !ddr4_en && (cr1b & BIT(5));
+ fan5pin |= creb & BIT(5);
+
+ fan6pin = cr2a & BIT(4);
+ fan6pin |= creb & BIT(3);
+
+ fan7pin = cr1a & BIT(1);
+
+ pwm5pin |= (creb & BIT(4)) && !(cr2a & BIT(0));
+ pwm5pin |= !ddr4_en && (cr2d & BIT(7));
+
+ pwm6pin = creb & BIT(2);
+ pwm6pin |= cred & BIT(2);
+
+ pwm7pin = cr1d & BIT(4);
+ break;
+ case nct6798:
+ fan6pin = !(cr1b & BIT(0)) && (cre0 & BIT(3));
+ fan6pin |= cr2a & BIT(4);
+ fan6pin |= creb & BIT(5);
+
+ fan7pin = cr1b & BIT(5);
+ fan7pin |= !(cr2b & BIT(2));
+ fan7pin |= creb & BIT(3);
+
+ pwm6pin = !(cr1b & BIT(0)) && (cre0 & BIT(4));
+ pwm6pin |= !(cred & BIT(2)) && (cr2a & BIT(3));
+ pwm6pin |= (creb & BIT(4)) && !(cr2a & BIT(0));
+
+ pwm7pin = !(cr1d & (BIT(2) | BIT(3)));
+ pwm7pin |= cr2d & BIT(7);
+ pwm7pin |= creb & BIT(2);
+ break;
+ default: /* NCT6779D */
+ break;
+ }
+
+ fan4min = fan4pin;
+ }
+
+ /* fan 1 and 2 (0x03) are always present */
+ data->has_fan = 0x03 | (fan3pin << 2) | (fan4pin << 3) |
+ (fan5pin << 4) | (fan6pin << 5) | (fan7pin << 6);
+ data->has_fan_min = 0x03 | (fan3pin << 2) | (fan4min << 3) |
+ (fan5pin << 4) | (fan6pin << 5) | (fan7pin << 6);
+ data->has_pwm = 0x03 | (pwm3pin << 2) | (pwm4pin << 3) |
+ (pwm5pin << 4) | (pwm6pin << 5) | (pwm7pin << 6);
+}
+
+static ssize_t
+cpu0_vid_show(struct device *dev, struct device_attribute *attr, char *buf)
+{
+ struct nct6775_data *data = dev_get_drvdata(dev);
+
+ return sprintf(buf, "%d\n", vid_from_reg(data->vid, data->vrm));
+}
+
+static DEVICE_ATTR_RO(cpu0_vid);
+
+/* Case open detection */
+
+static const u8 NCT6775_REG_CR_CASEOPEN_CLR[] = { 0xe6, 0xee };
+static const u8 NCT6775_CR_CASEOPEN_CLR_MASK[] = { 0x20, 0x01 };
+
+static ssize_t
+clear_caseopen(struct device *dev, struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ struct nct6775_data *data = dev_get_drvdata(dev);
+ struct nct6775_sio_data *sio_data = data->driver_data;
+ int nr = to_sensor_dev_attr(attr)->index - INTRUSION_ALARM_BASE;
+ unsigned long val;
+ u8 reg;
+ int ret;
+
+ if (kstrtoul(buf, 10, &val) || val != 0)
+ return -EINVAL;
+
+ mutex_lock(&data->update_lock);
+
+ /*
+ * Use CR registers to clear caseopen status.
+ * The CR registers are the same for all chips, and not all chips
+ * support clearing the caseopen status through "regular" registers.
+ */
+ ret = sio_data->sio_enter(sio_data);
+ if (ret) {
+ count = ret;
+ goto error;
+ }
+
+ sio_data->sio_select(sio_data, NCT6775_LD_ACPI);
+ reg = sio_data->sio_inb(sio_data, NCT6775_REG_CR_CASEOPEN_CLR[nr]);
+ reg |= NCT6775_CR_CASEOPEN_CLR_MASK[nr];
+ sio_data->sio_outb(sio_data, NCT6775_REG_CR_CASEOPEN_CLR[nr], reg);
+ reg &= ~NCT6775_CR_CASEOPEN_CLR_MASK[nr];
+ sio_data->sio_outb(sio_data, NCT6775_REG_CR_CASEOPEN_CLR[nr], reg);
+ sio_data->sio_exit(sio_data);
+
+ data->valid = false; /* Force cache refresh */
+error:
+ mutex_unlock(&data->update_lock);
+ return count;
+}
+
+static SENSOR_DEVICE_ATTR(intrusion0_alarm, S_IWUSR | S_IRUGO, nct6775_show_alarm,
+ clear_caseopen, INTRUSION_ALARM_BASE);
+static SENSOR_DEVICE_ATTR(intrusion1_alarm, S_IWUSR | S_IRUGO, nct6775_show_alarm,
+ clear_caseopen, INTRUSION_ALARM_BASE + 1);
+static SENSOR_DEVICE_ATTR(intrusion0_beep, S_IWUSR | S_IRUGO, nct6775_show_beep,
+ nct6775_store_beep, INTRUSION_ALARM_BASE);
+static SENSOR_DEVICE_ATTR(intrusion1_beep, S_IWUSR | S_IRUGO, nct6775_show_beep,
+ nct6775_store_beep, INTRUSION_ALARM_BASE + 1);
+static SENSOR_DEVICE_ATTR(beep_enable, S_IWUSR | S_IRUGO, nct6775_show_beep,
+ nct6775_store_beep, BEEP_ENABLE_BASE);
+
+static umode_t nct6775_other_is_visible(struct kobject *kobj,
+ struct attribute *attr, int index)
+{
+ struct device *dev = kobj_to_dev(kobj);
+ struct nct6775_data *data = dev_get_drvdata(dev);
+
+ if (index == 0 && !data->have_vid)
+ return 0;
+
+ if (index == 1 || index == 2) {
+ if (data->ALARM_BITS[INTRUSION_ALARM_BASE + index - 1] < 0)
+ return 0;
+ }
+
+ if (index == 3 || index == 4) {
+ if (data->BEEP_BITS[INTRUSION_ALARM_BASE + index - 3] < 0)
+ return 0;
+ }
+
+ return nct6775_attr_mode(data, attr);
+}
+
+/*
+ * nct6775_other_is_visible uses the index into the following array
+ * to determine if attributes should be created or not.
+ * Any change in order or content must be matched.
+ */
+static struct attribute *nct6775_attributes_other[] = {
+ &dev_attr_cpu0_vid.attr, /* 0 */
+ &sensor_dev_attr_intrusion0_alarm.dev_attr.attr, /* 1 */
+ &sensor_dev_attr_intrusion1_alarm.dev_attr.attr, /* 2 */
+ &sensor_dev_attr_intrusion0_beep.dev_attr.attr, /* 3 */
+ &sensor_dev_attr_intrusion1_beep.dev_attr.attr, /* 4 */
+ &sensor_dev_attr_beep_enable.dev_attr.attr, /* 5 */
+
+ NULL
+};
+
+static const struct attribute_group nct6775_group_other = {
+ .attrs = nct6775_attributes_other,
+ .is_visible = nct6775_other_is_visible,
+};
+
+static int nct6775_platform_probe_init(struct nct6775_data *data)
+{
+ int err;
+ u8 cr2a;
+ struct nct6775_sio_data *sio_data = data->driver_data;
+
+ err = sio_data->sio_enter(sio_data);
+ if (err)
+ return err;
+
+ cr2a = sio_data->sio_inb(sio_data, 0x2a);
+ switch (data->kind) {
+ case nct6775:
+ data->have_vid = (cr2a & 0x40);
+ break;
+ case nct6776:
+ data->have_vid = (cr2a & 0x60) == 0x40;
+ break;
+ case nct6106:
+ case nct6116:
+ case nct6779:
+ case nct6791:
+ case nct6792:
+ case nct6793:
+ case nct6795:
+ case nct6796:
+ case nct6797:
+ case nct6798:
+ break;
+ }
+
+ /*
+ * Read VID value
+ * We can get the VID input values directly at logical device D 0xe3.
+ */
+ if (data->have_vid) {
+ sio_data->sio_select(sio_data, NCT6775_LD_VID);
+ data->vid = sio_data->sio_inb(sio_data, 0xe3);
+ data->vrm = vid_which_vrm();
+ }
+
+ if (fan_debounce) {
+ u8 tmp;
+
+ sio_data->sio_select(sio_data, NCT6775_LD_HWM);
+ tmp = sio_data->sio_inb(sio_data,
+ NCT6775_REG_CR_FAN_DEBOUNCE);
+ switch (data->kind) {
+ case nct6106:
+ case nct6116:
+ tmp |= 0xe0;
+ break;
+ case nct6775:
+ tmp |= 0x1e;
+ break;
+ case nct6776:
+ case nct6779:
+ tmp |= 0x3e;
+ break;
+ case nct6791:
+ case nct6792:
+ case nct6793:
+ case nct6795:
+ case nct6796:
+ case nct6797:
+ case nct6798:
+ tmp |= 0x7e;
+ break;
+ }
+ sio_data->sio_outb(sio_data, NCT6775_REG_CR_FAN_DEBOUNCE,
+ tmp);
+ pr_info("Enabled fan debounce for chip %s\n", data->name);
+ }
+
+ nct6775_check_fan_inputs(data, sio_data);
+
+ sio_data->sio_exit(sio_data);
+
+ return nct6775_add_attr_group(data, &nct6775_group_other);
+}
+
+static int nct6775_platform_probe(struct platform_device *pdev)
+{
+ struct device *dev = &pdev->dev;
+ struct nct6775_sio_data *sio_data = dev_get_platdata(dev);
+ struct nct6775_data *data;
+ struct resource *res;
+
+ if (sio_data->access == access_direct) {
+ res = platform_get_resource(pdev, IORESOURCE_IO, 0);
+ if (!devm_request_region(&pdev->dev, res->start, IOREGION_LENGTH, DRVNAME))
+ return -EBUSY;
+ }
+
+ data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
+ if (!data)
+ return -ENOMEM;
+
+ data->kind = sio_data->kind;
+ data->sioreg = sio_data->sioreg;
+
+ if (sio_data->access == access_direct) {
+ data->addr = res->start;
+ data->read_value = nct6775_read_value;
+ data->write_value = nct6775_write_value;
+ } else {
+ data->read_value = nct6775_wmi_read_value;
+ data->write_value = nct6775_wmi_write_value;
+ }
+
+ platform_set_drvdata(pdev, data);
+
+ data->driver_data = sio_data;
+ data->driver_init = nct6775_platform_probe_init;
+
+ return nct6775_probe(&pdev->dev, data);
+}
+
+static struct platform_driver nct6775_driver = {
+ .driver = {
+ .name = DRVNAME,
+ .pm = &nct6775_dev_pm_ops,
+ },
+ .probe = nct6775_platform_probe,
+};
+
+/* nct6775_find() looks for a '627 in the Super-I/O config space */
+static int __init nct6775_find(int sioaddr, struct nct6775_sio_data *sio_data)
+{
+ u16 val;
+ int err;
+ int addr;
+
+ sio_data->access = access_direct;
+ sio_data->sioreg = sioaddr;
+
+ err = sio_data->sio_enter(sio_data);
+ if (err)
+ return err;
+
+ val = (sio_data->sio_inb(sio_data, SIO_REG_DEVID) << 8) |
+ sio_data->sio_inb(sio_data, SIO_REG_DEVID + 1);
+ if (force_id && val != 0xffff)
+ val = force_id;
+
+ switch (val & SIO_ID_MASK) {
+ case SIO_NCT6106_ID:
+ sio_data->kind = nct6106;
+ break;
+ case SIO_NCT6116_ID:
+ sio_data->kind = nct6116;
+ break;
+ case SIO_NCT6775_ID:
+ sio_data->kind = nct6775;
+ break;
+ case SIO_NCT6776_ID:
+ sio_data->kind = nct6776;
+ break;
+ case SIO_NCT6779_ID:
+ sio_data->kind = nct6779;
+ break;
+ case SIO_NCT6791_ID:
+ sio_data->kind = nct6791;
+ break;
+ case SIO_NCT6792_ID:
+ sio_data->kind = nct6792;
+ break;
+ case SIO_NCT6793_ID:
+ sio_data->kind = nct6793;
+ break;
+ case SIO_NCT6795_ID:
+ sio_data->kind = nct6795;
+ break;
+ case SIO_NCT6796_ID:
+ sio_data->kind = nct6796;
+ break;
+ case SIO_NCT6797_ID:
+ sio_data->kind = nct6797;
+ break;
+ case SIO_NCT6798_ID:
+ sio_data->kind = nct6798;
+ break;
+ default:
+ if (val != 0xffff)
+ pr_debug("unsupported chip ID: 0x%04x\n", val);
+ sio_data->sio_exit(sio_data);
+ return -ENODEV;
+ }
+
+ /* We have a known chip, find the HWM I/O address */
+ sio_data->sio_select(sio_data, NCT6775_LD_HWM);
+ val = (sio_data->sio_inb(sio_data, SIO_REG_ADDR) << 8)
+ | sio_data->sio_inb(sio_data, SIO_REG_ADDR + 1);
+ addr = val & IOREGION_ALIGNMENT;
+ if (addr == 0) {
+ pr_err("Refusing to enable a Super-I/O device with a base I/O port 0\n");
+ sio_data->sio_exit(sio_data);
+ return -ENODEV;
+ }
+
+ /* Activate logical device if needed */
+ val = sio_data->sio_inb(sio_data, SIO_REG_ENABLE);
+ if (!(val & 0x01)) {
+ pr_warn("Forcibly enabling Super-I/O. Sensor is probably unusable.\n");
+ sio_data->sio_outb(sio_data, SIO_REG_ENABLE, val | 0x01);
+ }
+
+ if (sio_data->kind == nct6791 || sio_data->kind == nct6792 ||
+ sio_data->kind == nct6793 || sio_data->kind == nct6795 ||
+ sio_data->kind == nct6796 || sio_data->kind == nct6797 ||
+ sio_data->kind == nct6798)
+ nct6791_enable_io_mapping(sio_data);
+
+ sio_data->sio_exit(sio_data);
+ pr_info("Found %s or compatible chip at %#x:%#x\n",
+ nct6775_sio_names[sio_data->kind], sioaddr, addr);
+
+ return addr;
+}
+
+/*
+ * when Super-I/O functions move to a separate file, the Super-I/O
+ * bus will manage the lifetime of the device and this module will only keep
+ * track of the nct6775 driver. But since we use platform_device_alloc(), we
+ * must keep track of the device
+ */
+static struct platform_device *pdev[2];
+
+static const char * const asus_wmi_boards[] = {
+ "ProArt X570-CREATOR WIFI",
+ "Pro B550M-C",
+ "Pro WS X570-ACE",
+ "PRIME B360-PLUS",
+ "PRIME B460-PLUS",
+ "PRIME B550-PLUS",
+ "PRIME B550M-A",
+ "PRIME B550M-A (WI-FI)",
+ "PRIME X570-P",
+ "PRIME X570-PRO",
+ "ROG CROSSHAIR VIII DARK HERO",
+ "ROG CROSSHAIR VIII FORMULA",
+ "ROG CROSSHAIR VIII HERO",
+ "ROG CROSSHAIR VIII IMPACT",
+ "ROG STRIX B550-A GAMING",
+ "ROG STRIX B550-E GAMING",
+ "ROG STRIX B550-F GAMING",
+ "ROG STRIX B550-F GAMING (WI-FI)",
+ "ROG STRIX B550-F GAMING WIFI II",
+ "ROG STRIX B550-I GAMING",
+ "ROG STRIX B550-XE GAMING (WI-FI)",
+ "ROG STRIX X570-E GAMING",
+ "ROG STRIX X570-F GAMING",
+ "ROG STRIX X570-I GAMING",
+ "ROG STRIX Z390-E GAMING",
+ "ROG STRIX Z390-F GAMING",
+ "ROG STRIX Z390-H GAMING",
+ "ROG STRIX Z390-I GAMING",
+ "ROG STRIX Z490-A GAMING",
+ "ROG STRIX Z490-E GAMING",
+ "ROG STRIX Z490-F GAMING",
+ "ROG STRIX Z490-G GAMING",
+ "ROG STRIX Z490-G GAMING (WI-FI)",
+ "ROG STRIX Z490-H GAMING",
+ "ROG STRIX Z490-I GAMING",
+ "TUF GAMING B550M-PLUS",
+ "TUF GAMING B550M-PLUS (WI-FI)",
+ "TUF GAMING B550-PLUS",
+ "TUF GAMING B550-PRO",
+ "TUF GAMING X570-PLUS",
+ "TUF GAMING X570-PLUS (WI-FI)",
+ "TUF GAMING X570-PRO (WI-FI)",
+ "TUF GAMING Z490-PLUS",
+ "TUF GAMING Z490-PLUS (WI-FI)",
+};
+
+static int __init sensors_nct6775_platform_init(void)
+{
+ int i, err;
+ bool found = false;
+ int address;
+ struct resource res;
+ struct nct6775_sio_data sio_data;
+ int sioaddr[2] = { 0x2e, 0x4e };
+ enum sensor_access access = access_direct;
+ const char *board_vendor, *board_name;
+ u8 tmp;
+
+ err = platform_driver_register(&nct6775_driver);
+ if (err)
+ return err;
+
+ board_vendor = dmi_get_system_info(DMI_BOARD_VENDOR);
+ board_name = dmi_get_system_info(DMI_BOARD_NAME);
+
+ if (board_name && board_vendor &&
+ !strcmp(board_vendor, "ASUSTeK COMPUTER INC.")) {
+ err = match_string(asus_wmi_boards, ARRAY_SIZE(asus_wmi_boards),
+ board_name);
+ if (err >= 0) {
+ /* if reading chip id via WMI succeeds, use WMI */
+ if (!nct6775_asuswmi_read(0, NCT6775_PORT_CHIPID, &tmp) && tmp) {
+ pr_info("Using Asus WMI to access %#x chip.\n", tmp);
+ access = access_asuswmi;
+ } else {
+ pr_err("Can't read ChipID by Asus WMI.\n");
+ }
+ }
+ }
+
+ /*
+ * initialize sio_data->kind and sio_data->sioreg.
+ *
+ * when Super-I/O functions move to a separate file, the Super-I/O
+ * driver will probe 0x2e and 0x4e and auto-detect the presence of a
+ * nct6775 hardware monitor, and call probe()
+ */
+ for (i = 0; i < ARRAY_SIZE(pdev); i++) {
+ sio_data.sio_outb = superio_outb;
+ sio_data.sio_inb = superio_inb;
+ sio_data.sio_select = superio_select;
+ sio_data.sio_enter = superio_enter;
+ sio_data.sio_exit = superio_exit;
+
+ address = nct6775_find(sioaddr[i], &sio_data);
+ if (address <= 0)
+ continue;
+
+ found = true;
+
+ sio_data.access = access;
+
+ if (access == access_asuswmi) {
+ sio_data.sio_outb = superio_wmi_outb;
+ sio_data.sio_inb = superio_wmi_inb;
+ sio_data.sio_select = superio_wmi_select;
+ sio_data.sio_enter = superio_wmi_enter;
+ sio_data.sio_exit = superio_wmi_exit;
+ }
+
+ pdev[i] = platform_device_alloc(DRVNAME, address);
+ if (!pdev[i]) {
+ err = -ENOMEM;
+ goto exit_device_unregister;
+ }
+
+ err = platform_device_add_data(pdev[i], &sio_data,
+ sizeof(struct nct6775_sio_data));
+ if (err)
+ goto exit_device_put;
+
+ if (sio_data.access == access_direct) {
+ memset(&res, 0, sizeof(res));
+ res.name = DRVNAME;
+ res.start = address + IOREGION_OFFSET;
+ res.end = address + IOREGION_OFFSET + IOREGION_LENGTH - 1;
+ res.flags = IORESOURCE_IO;
+
+ err = acpi_check_resource_conflict(&res);
+ if (err) {
+ platform_device_put(pdev[i]);
+ pdev[i] = NULL;
+ continue;
+ }
+
+ err = platform_device_add_resources(pdev[i], &res, 1);
+ if (err)
+ goto exit_device_put;
+ }
+
+ /* platform_device_add calls probe() */
+ err = platform_device_add(pdev[i]);
+ if (err)
+ goto exit_device_put;
+ }
+ if (!found) {
+ err = -ENODEV;
+ goto exit_unregister;
+ }
+
+ return 0;
+
+exit_device_put:
+ platform_device_put(pdev[i]);
+exit_device_unregister:
+ while (--i >= 0) {
+ if (pdev[i])
+ platform_device_unregister(pdev[i]);
+ }
+exit_unregister:
+ platform_driver_unregister(&nct6775_driver);
+ return err;
+}
+
+static void __exit sensors_nct6775_platform_exit(void)
+{
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(pdev); i++) {
+ if (pdev[i])
+ platform_device_unregister(pdev[i]);
+ }
+ platform_driver_unregister(&nct6775_driver);
+}
+
+MODULE_AUTHOR("Guenter Roeck <linux@roeck-us.net>");
+MODULE_DESCRIPTION("Platform driver for NCT6775F and compatible chips");
+MODULE_LICENSE("GPL");
+
+/*
+ * For module-name compatibility with the original version of this driver
+ * prior to the core/platform/i2c split
+ */
+MODULE_ALIAS("nct6775");
+
+module_init(sensors_nct6775_platform_init);
+module_exit(sensors_nct6775_platform_exit);
diff --git a/drivers/hwmon/nct6775.h b/drivers/hwmon/nct6775.h
new file mode 100644
index 000000000000..1cb754a2284b
--- /dev/null
+++ b/drivers/hwmon/nct6775.h
@@ -0,0 +1,233 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+#ifndef __HWMON_NCT6775_H__
+#define __HWMON_NCT6775_H__
+
+#include <linux/types.h>
+
+enum kinds { nct6106, nct6116, nct6775, nct6776, nct6779, nct6791, nct6792,
+ nct6793, nct6795, nct6796, nct6797, nct6798 };
+enum pwm_enable { off, manual, thermal_cruise, speed_cruise, sf3, sf4 };
+
+#define NUM_TEMP 10 /* Max number of temp attribute sets w/ limits*/
+#define NUM_TEMP_FIXED 6 /* Max number of fixed temp attribute sets */
+#define NUM_TSI_TEMP 8 /* Max number of TSI temp register pairs */
+
+#define NUM_REG_ALARM 7 /* Max number of alarm registers */
+#define NUM_REG_BEEP 5 /* Max number of beep registers */
+
+#define NUM_FAN 7
+
+struct nct6775_data {
+ int addr; /* IO base of hw monitor block */
+ int sioreg; /* SIO register address */
+ enum kinds kind;
+ const char *name;
+
+ const struct attribute_group *groups[7];
+ u8 num_groups;
+
+ u16 reg_temp[5][NUM_TEMP]; /* 0=temp, 1=temp_over, 2=temp_hyst,
+ * 3=temp_crit, 4=temp_lcrit
+ */
+ u8 temp_src[NUM_TEMP];
+ u16 reg_temp_config[NUM_TEMP];
+ const char * const *temp_label;
+ u32 temp_mask;
+ u32 virt_temp_mask;
+
+ u16 REG_CONFIG;
+ u16 REG_VBAT;
+ u16 REG_DIODE;
+ u8 DIODE_MASK;
+
+ const s8 *ALARM_BITS;
+ const s8 *BEEP_BITS;
+
+ const u16 *REG_VIN;
+ const u16 *REG_IN_MINMAX[2];
+
+ const u16 *REG_TARGET;
+ const u16 *REG_FAN;
+ const u16 *REG_FAN_MODE;
+ const u16 *REG_FAN_MIN;
+ const u16 *REG_FAN_PULSES;
+ const u16 *FAN_PULSE_SHIFT;
+ const u16 *REG_FAN_TIME[3];
+
+ const u16 *REG_TOLERANCE_H;
+
+ const u8 *REG_PWM_MODE;
+ const u8 *PWM_MODE_MASK;
+
+ const u16 *REG_PWM[7]; /* [0]=pwm, [1]=pwm_start, [2]=pwm_floor,
+ * [3]=pwm_max, [4]=pwm_step,
+ * [5]=weight_duty_step, [6]=weight_duty_base
+ */
+ const u16 *REG_PWM_READ;
+
+ const u16 *REG_CRITICAL_PWM_ENABLE;
+ u8 CRITICAL_PWM_ENABLE_MASK;
+ const u16 *REG_CRITICAL_PWM;
+
+ const u16 *REG_AUTO_TEMP;
+ const u16 *REG_AUTO_PWM;
+
+ const u16 *REG_CRITICAL_TEMP;
+ const u16 *REG_CRITICAL_TEMP_TOLERANCE;
+
+ const u16 *REG_TEMP_SOURCE; /* temp register sources */
+ const u16 *REG_TEMP_SEL;
+ const u16 *REG_WEIGHT_TEMP_SEL;
+ const u16 *REG_WEIGHT_TEMP[3]; /* 0=base, 1=tolerance, 2=step */
+
+ const u16 *REG_TEMP_OFFSET;
+
+ const u16 *REG_ALARM;
+ const u16 *REG_BEEP;
+
+ const u16 *REG_TSI_TEMP;
+
+ unsigned int (*fan_from_reg)(u16 reg, unsigned int divreg);
+ unsigned int (*fan_from_reg_min)(u16 reg, unsigned int divreg);
+
+ struct mutex update_lock;
+ bool valid; /* true if following fields are valid */
+ unsigned long last_updated; /* In jiffies */
+
+ /* Register values */
+ u8 bank; /* current register bank */
+ u8 in_num; /* number of in inputs we have */
+ u8 in[15][3]; /* [0]=in, [1]=in_max, [2]=in_min */
+ unsigned int rpm[NUM_FAN];
+ u16 fan_min[NUM_FAN];
+ u8 fan_pulses[NUM_FAN];
+ u8 fan_div[NUM_FAN];
+ u8 has_pwm;
+ u8 has_fan; /* some fan inputs can be disabled */
+ u8 has_fan_min; /* some fans don't have min register */
+ bool has_fan_div;
+
+ u8 num_temp_alarms; /* 2, 3, or 6 */
+ u8 num_temp_beeps; /* 2, 3, or 6 */
+ u8 temp_fixed_num; /* 3 or 6 */
+ u8 temp_type[NUM_TEMP_FIXED];
+ s8 temp_offset[NUM_TEMP_FIXED];
+ s16 temp[5][NUM_TEMP]; /* 0=temp, 1=temp_over, 2=temp_hyst,
+ * 3=temp_crit, 4=temp_lcrit */
+ s16 tsi_temp[NUM_TSI_TEMP];
+ u64 alarms;
+ u64 beeps;
+
+ u8 pwm_num; /* number of pwm */
+ u8 pwm_mode[NUM_FAN]; /* 0->DC variable voltage,
+ * 1->PWM variable duty cycle
+ */
+ enum pwm_enable pwm_enable[NUM_FAN];
+ /* 0->off
+ * 1->manual
+ * 2->thermal cruise mode (also called SmartFan I)
+ * 3->fan speed cruise mode
+ * 4->SmartFan III
+ * 5->enhanced variable thermal cruise (SmartFan IV)
+ */
+ u8 pwm[7][NUM_FAN]; /* [0]=pwm, [1]=pwm_start, [2]=pwm_floor,
+ * [3]=pwm_max, [4]=pwm_step,
+ * [5]=weight_duty_step, [6]=weight_duty_base
+ */
+
+ u8 target_temp[NUM_FAN];
+ u8 target_temp_mask;
+ u32 target_speed[NUM_FAN];
+ u32 target_speed_tolerance[NUM_FAN];
+ u8 speed_tolerance_limit;
+
+ u8 temp_tolerance[2][NUM_FAN];
+ u8 tolerance_mask;
+
+ u8 fan_time[3][NUM_FAN]; /* 0 = stop_time, 1 = step_up, 2 = step_down */
+
+ /* Automatic fan speed control registers */
+ int auto_pwm_num;
+ u8 auto_pwm[NUM_FAN][7];
+ u8 auto_temp[NUM_FAN][7];
+ u8 pwm_temp_sel[NUM_FAN];
+ u8 pwm_weight_temp_sel[NUM_FAN];
+ u8 weight_temp[3][NUM_FAN]; /* 0->temp_step, 1->temp_step_tol,
+ * 2->temp_base
+ */
+
+ u8 vid;
+ u8 vrm;
+
+ bool have_vid;
+
+ u16 have_temp;
+ u16 have_temp_fixed;
+ u16 have_tsi_temp;
+ u16 have_in;
+
+ /* Remember extra register values over suspend/resume */
+ u8 vbat;
+ u8 fandiv1;
+ u8 fandiv2;
+ u8 sio_reg_enable;
+
+ /* nct6775_*() callbacks */
+ u16 (*read_value)(struct nct6775_data *data, u16 reg);
+ int (*write_value)(struct nct6775_data *data, u16 reg, u16 value);
+
+ /* driver-specific (platform, i2c) initialization hook and data */
+ int (*driver_init)(struct nct6775_data *data);
+ void *driver_data;
+
+ bool read_only;
+};
+
+bool nct6775_reg_is_word_sized(struct nct6775_data *data, u16 reg);
+int nct6775_probe(struct device *dev, struct nct6775_data *data);
+struct nct6775_data *nct6775_update_device(struct device *dev);
+int nct6775_write_temp(struct nct6775_data *data, u16 reg, u16 value);
+
+ssize_t nct6775_show_alarm(struct device *dev, struct device_attribute *attr, char *buf);
+ssize_t nct6775_show_beep(struct device *dev, struct device_attribute *attr, char *buf);
+ssize_t nct6775_store_beep(struct device *dev, struct device_attribute *attr, const char *buf,
+ size_t count);
+
+static inline umode_t nct6775_attr_mode(struct nct6775_data *data, struct attribute *attr)
+{
+ return data->read_only ? (attr->mode & ~0222) : attr->mode;
+}
+
+static inline 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 */
+ if (WARN_ON(data->num_groups == ARRAY_SIZE(data->groups) - 1))
+ return -ENOSPC;
+
+ data->groups[data->num_groups++] = group;
+ return 0;
+}
+
+#define NCT6775_REG_BANK 0x4E
+#define NCT6775_REG_CONFIG 0x40
+
+#define NCT6775_REG_FANDIV1 0x506
+#define NCT6775_REG_FANDIV2 0x507
+
+#define NCT6791_REG_HM_IO_SPACE_LOCK_ENABLE 0x28
+
+#define FAN_ALARM_BASE 16
+#define TEMP_ALARM_BASE 24
+#define INTRUSION_ALARM_BASE 30
+#define BEEP_ENABLE_BASE 15
+
+/*
+ * Not currently used:
+ * REG_MAN_ID has the value 0x5ca3 for all supported chips.
+ * REG_CHIP_ID == 0x88/0xa1/0xc1 depending on chip model.
+ * REG_MAN_ID is at port 0x4f
+ * REG_CHIP_ID is at port 0x58
+ */
+
+#endif /* __HWMON_NCT6775_H__ */
--
2.35.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 4/5] dt-bindings: hwmon: Add nuvoton,nct6775
2022-02-26 13:30 [PATCH 0/5] hwmon: (nct6775) Add i2c support Zev Weiss
` (2 preceding siblings ...)
2022-02-26 13:30 ` [PATCH 3/5] hwmon: (nct6775) Split core and platform driver Zev Weiss
@ 2022-02-26 13:30 ` Zev Weiss
2022-02-27 10:58 ` Krzysztof Kozlowski
2022-02-26 13:30 ` [PATCH 5/5] hwmon: (nct6775) Add i2c driver Zev Weiss
` (3 subsequent siblings)
7 siblings, 1 reply; 19+ messages in thread
From: Zev Weiss @ 2022-02-26 13:30 UTC (permalink / raw)
To: linux-hwmon, Rob Herring, devicetree, Guenter Roeck, Jean Delvare
Cc: openbmc, linux-kernel, Zev Weiss, Renze Nicolai
These Super I/O chips have an i2c interface that some systems expose
to a BMC; the BMC's device tree can now describe that via this
binding.
Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
---
.../bindings/hwmon/nuvoton,nct6775.yaml | 48 +++++++++++++++++++
1 file changed, 48 insertions(+)
create mode 100644 Documentation/devicetree/bindings/hwmon/nuvoton,nct6775.yaml
diff --git a/Documentation/devicetree/bindings/hwmon/nuvoton,nct6775.yaml b/Documentation/devicetree/bindings/hwmon/nuvoton,nct6775.yaml
new file mode 100644
index 000000000000..7b1054db46b3
--- /dev/null
+++ b/Documentation/devicetree/bindings/hwmon/nuvoton,nct6775.yaml
@@ -0,0 +1,48 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+
+$id: http://devicetree.org/schemas/hwmon/nuvoton,nct6775.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Nuvoton NCT6775 and compatible Super I/O chips
+
+maintainers:
+ - Zev Weiss <zev@bewilderbeest.net>
+
+properties:
+ compatible:
+ enum:
+ - nuvoton,nct6106
+ - nuvoton,nct6116
+ - nuvoton,nct6775
+ - nuvoton,nct6776
+ - nuvoton,nct6779
+ - nuvoton,nct6791
+ - nuvoton,nct6792
+ - nuvoton,nct6793
+ - nuvoton,nct6795
+ - nuvoton,nct6796
+ - nuvoton,nct6797
+ - nuvoton,nct6798
+
+ reg:
+ maxItems: 1
+
+required:
+ - compatible
+ - reg
+
+additionalProperties: false
+
+examples:
+ - |
+ i2c {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ superio@4d {
+ compatible = "nuvoton,nct6779";
+ reg = <0x4d>;
+ };
+ };
--
2.35.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [PATCH 4/5] dt-bindings: hwmon: Add nuvoton,nct6775
2022-02-26 13:30 ` [PATCH 4/5] dt-bindings: hwmon: Add nuvoton,nct6775 Zev Weiss
@ 2022-02-27 10:58 ` Krzysztof Kozlowski
0 siblings, 0 replies; 19+ messages in thread
From: Krzysztof Kozlowski @ 2022-02-27 10:58 UTC (permalink / raw)
To: Zev Weiss, linux-hwmon, Rob Herring, devicetree, Guenter Roeck,
Jean Delvare
Cc: openbmc, linux-kernel, Renze Nicolai
On 26/02/2022 14:30, Zev Weiss wrote:
> These Super I/O chips have an i2c interface that some systems expose
> to a BMC; the BMC's device tree can now describe that via this
> binding.
>
> Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
> ---
> .../bindings/hwmon/nuvoton,nct6775.yaml | 48 +++++++++++++++++++
> 1 file changed, 48 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/hwmon/nuvoton,nct6775.yaml
>
Bindings should be the first patch in a series.
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 5/5] hwmon: (nct6775) Add i2c driver
2022-02-26 13:30 [PATCH 0/5] hwmon: (nct6775) Add i2c support Zev Weiss
` (3 preceding siblings ...)
2022-02-26 13:30 ` [PATCH 4/5] dt-bindings: hwmon: Add nuvoton,nct6775 Zev Weiss
@ 2022-02-26 13:30 ` Zev Weiss
2022-02-26 22:47 ` [PATCH 0/5] hwmon: (nct6775) Add i2c support Zev Weiss
` (2 subsequent siblings)
7 siblings, 0 replies; 19+ messages in thread
From: Zev Weiss @ 2022-02-26 13:30 UTC (permalink / raw)
To: linux-hwmon, Guenter Roeck, Jean Delvare
Cc: openbmc, linux-kernel, Zev Weiss, Renze Nicolai
This driver provides an i2c I/O mechanism for the core nct6775 driver,
as might be used by a BMC. Because the Super I/O chip is shared with
the host CPU in such a scenario (and the host should ultimately be in
control of it), the i2c driver is strictly read-only to avoid
interfering with any usage by the host (aside from the bank-select
register, which seems to be replicated for the i2c interface).
Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
---
MAINTAINERS | 6 ++
drivers/hwmon/Kconfig | 17 ++++
drivers/hwmon/Makefile | 1 +
drivers/hwmon/nct6775-i2c.c | 191 ++++++++++++++++++++++++++++++++++++
4 files changed, 215 insertions(+)
create mode 100644 drivers/hwmon/nct6775-i2c.c
diff --git a/MAINTAINERS b/MAINTAINERS
index d318a5580df9..d8a1f8f65df1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -13293,6 +13293,12 @@ F: drivers/hwmon/nct6775-core.c
F: drivers/hwmon/nct6775-platform.c
F: drivers/hwmon/nct6775.h
+NCT6775 HARDWARE MONITOR DRIVER - I2C DRIVER
+M: Zev Weiss <zev@bewilderbeest.net>
+L: linux-hwmon@vger.kernel.org
+S: Maintained
+F: drivers/hwmon/nct6775-i2c.c
+
NETDEVSIM
M: Jakub Kicinski <kuba@kernel.org>
S: Maintained
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 11822e8a2cda..1c0bd536b9b3 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -1483,6 +1483,23 @@ config SENSORS_NCT6775_PLATFORM
This driver can also be built as a module. If so, the module
will be called nct6775-platform.
+config SENSORS_NCT6775_I2C
+ tristate "I2C driver for Nuvoton NCT6775F and compatibles"
+ depends on I2C
+ select REGMAP_I2C
+ select SENSORS_NCT6775
+ help
+ If you say yes here you get support for the hardware monitoring
+ functionality of the Nuvoton NCT6106D, NCT6775F, NCT6776F, NCT6779D,
+ NCT6791D, NCT6792D, NCT6793D, NCT6795D, NCT6796D, and compatible
+ Super-I/O chips via their I2C interface.
+
+ If you're not building a kernel for a BMC, this is probably
+ not the driver you want (see CONFIG_SENSORS_NCT6775_PLATFORM).
+
+ This driver can also be built as a module. If so, the module
+ will be called nct6775-i2c.
+
config SENSORS_NCT7802
tristate "Nuvoton NCT7802Y"
depends on I2C
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
index 5f37b2c0f79a..385b211471e4 100644
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@ -156,6 +156,7 @@ obj-$(CONFIG_SENSORS_MR75203) += mr75203.o
obj-$(CONFIG_SENSORS_NCT6683) += nct6683.o
obj-$(CONFIG_SENSORS_NCT6775) += nct6775-core.o
obj-$(CONFIG_SENSORS_NCT6775_PLATFORM) += nct6775-platform.o
+obj-$(CONFIG_SENSORS_NCT6775_I2C) += nct6775-i2c.o
obj-$(CONFIG_SENSORS_NCT7802) += nct7802.o
obj-$(CONFIG_SENSORS_NCT7904) += nct7904.o
obj-$(CONFIG_SENSORS_NPCM7XX) += npcm750-pwm-fan.o
diff --git a/drivers/hwmon/nct6775-i2c.c b/drivers/hwmon/nct6775-i2c.c
new file mode 100644
index 000000000000..efee78cb16f3
--- /dev/null
+++ b/drivers/hwmon/nct6775-i2c.c
@@ -0,0 +1,191 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * nct6775-i2c - I2C driver for the hardware monitoring functionality of
+ * Nuvoton NCT677x Super-I/O chips
+ *
+ * Copyright (C) 2021 Zev Weiss <zev@bewilderbeest.net>
+ *
+ * This driver interacts with the chip via it's "back door" i2c interface, as
+ * is often exposed to a BMC. Because the host may still be operating the
+ * chip via the ("front door") LPC interface, this driver cannot assume that
+ * it actually has full control of the chip, and in particular must avoid
+ * making any changes that could confuse the host's LPC usage of it. It thus
+ * operates in a strictly read-only fashion, with the only exception being the
+ * bank-select register (which seems, thankfully, to be replicated for the i2c
+ * interface so it doesn't affect the LPC interface).
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/i2c.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/err.h>
+#include <linux/of_device.h>
+#include <linux/regmap.h>
+#include "nct6775.h"
+
+static u16 nct6775_i2c_read_value(struct nct6775_data *data, u16 reg)
+{
+ int ret;
+ u32 tmp, val;
+ u8 bank = reg >> 8;
+ struct regmap *regmap = data->driver_data;
+ struct device *dev = regmap_get_device(regmap);
+
+ if (bank != data->bank) {
+ ret = regmap_write(regmap, NCT6775_REG_BANK, bank);
+ if (ret) {
+ dev_warn_ratelimited(dev, "bank %02x select regmap_write() failed: %d\n",
+ bank, ret);
+ return 0;
+ }
+ data->bank = bank;
+ }
+
+ ret = regmap_read(regmap, reg & 0xff, &val);
+ if (ret) {
+ dev_warn_ratelimited(dev, "regmap_read(%03x) failed: %d\n", reg, ret);
+ return 0;
+ }
+
+ if (nct6775_reg_is_word_sized(data, reg)) {
+ ret = regmap_read(regmap, (reg & 0xff) + 1, &tmp);
+ if (ret) {
+ dev_warn_ratelimited(dev, "second-byte regmap_read(%03x) failed: %d\n",
+ reg, ret);
+ return 0;
+ }
+ val = (val << 8) | tmp;
+ }
+
+ return val;
+}
+
+/*
+ * The write operation is a dummy so as not to disturb anything being done
+ * with the chip via LPC.
+ */
+static int nct6775_i2c_write_value(struct nct6775_data *data, u16 reg, u16 value)
+{
+ struct device *dev = regmap_get_device(data->driver_data);
+
+ dev_dbg(dev, "skipping attempted write: %02x -> %03x\n", value, reg);
+
+ /*
+ * This is a lie, but writing anything but the bank-select register is
+ * something this driver shouldn't be doing. (Though at least at time
+ * of writing no callers actually check this return value anyway.)
+ */
+ return 0;
+}
+
+static const struct regmap_config nct6775_i2c_regmap_config = {
+ .reg_bits = 8,
+ .val_bits = 8,
+};
+
+static const struct of_device_id __maybe_unused nct6775_i2c_of_match[] = {
+ { .compatible = "nuvoton,nct6106", .data = (void *)nct6106, },
+ { .compatible = "nuvoton,nct6116", .data = (void *)nct6116, },
+ { .compatible = "nuvoton,nct6775", .data = (void *)nct6775, },
+ { .compatible = "nuvoton,nct6776", .data = (void *)nct6776, },
+ { .compatible = "nuvoton,nct6779", .data = (void *)nct6779, },
+ { .compatible = "nuvoton,nct6791", .data = (void *)nct6791, },
+ { .compatible = "nuvoton,nct6792", .data = (void *)nct6792, },
+ { .compatible = "nuvoton,nct6793", .data = (void *)nct6793, },
+ { .compatible = "nuvoton,nct6795", .data = (void *)nct6795, },
+ { .compatible = "nuvoton,nct6796", .data = (void *)nct6796, },
+ { .compatible = "nuvoton,nct6797", .data = (void *)nct6797, },
+ { .compatible = "nuvoton,nct6798", .data = (void *)nct6798, },
+ { },
+};
+MODULE_DEVICE_TABLE(of, nct6775_i2c_of_match);
+
+static const struct i2c_device_id nct6775_i2c_id[] = {
+ { "nct6106", nct6106 },
+ { "nct6116", nct6116 },
+ { "nct6775", nct6775 },
+ { "nct6776", nct6776 },
+ { "nct6779", nct6779 },
+ { "nct6791", nct6791 },
+ { "nct6792", nct6792 },
+ { "nct6793", nct6793 },
+ { "nct6795", nct6795 },
+ { "nct6796", nct6796 },
+ { "nct6797", nct6797 },
+ { "nct6798", nct6798 },
+ { }
+};
+MODULE_DEVICE_TABLE(i2c, nct6775_i2c_id);
+
+static int nct6775_i2c_probe_init(struct nct6775_data *data)
+{
+ /*
+ * The i2c interface doesn't provide access to the control registers
+ * needed to determine the presence of other fans, but fans 1 and 2
+ * are (in principle) always there.
+ *
+ * In practice this is perhaps a little silly, because the system
+ * using this driver is mostly likely a BMC, and hence probably has
+ * totally separate fan tachs & pwms of its own that are actually
+ * controlling/monitoring the fans -- these are thus unlikely to be
+ * doing anything actually useful.
+ */
+ data->has_fan = 0x03;
+ data->has_fan_min = 0x03;
+ data->has_pwm = 0x03;
+ return 0;
+}
+
+static int nct6775_i2c_probe(struct i2c_client *client)
+{
+ struct nct6775_data *data;
+ const struct of_device_id *of_id;
+ const struct i2c_device_id *i2c_id;
+ struct regmap *regmap;
+ struct device *dev = &client->dev;
+
+ of_id = of_match_device(nct6775_i2c_of_match, dev);
+ i2c_id = i2c_match_id(nct6775_i2c_id, client);
+
+ if (of_id && (unsigned long)of_id->data != i2c_id->driver_data)
+ dev_notice(dev, "Device mismatch: %s in device tree, %s detected\n",
+ of_id->name, i2c_id->name);
+
+ regmap = devm_regmap_init_i2c(client, &nct6775_i2c_regmap_config);
+ if (IS_ERR(regmap)) {
+ dev_err(dev, "failed to init regmap\n");
+ return PTR_ERR(regmap);
+ }
+
+ data = devm_kzalloc(&client->dev, sizeof(*data), GFP_KERNEL);
+ if (!data)
+ return -ENOMEM;
+
+ data->kind = i2c_id->driver_data;
+ data->read_value = nct6775_i2c_read_value;
+ data->write_value = nct6775_i2c_write_value;
+
+ data->read_only = true;
+ data->driver_data = regmap;
+ data->driver_init = nct6775_i2c_probe_init;
+
+ return nct6775_probe(dev, data);
+}
+
+static struct i2c_driver nct6775_i2c_driver = {
+ .class = I2C_CLASS_HWMON,
+ .driver = {
+ .name = "nct6775-i2c",
+ .of_match_table = of_match_ptr(nct6775_i2c_of_match),
+ },
+ .probe_new = nct6775_i2c_probe,
+ .id_table = nct6775_i2c_id,
+};
+
+module_i2c_driver(nct6775_i2c_driver);
+
+MODULE_AUTHOR("Zev Weiss <zev@bewilderbeest.net>");
+MODULE_DESCRIPTION("I2C driver for NCT6775F and compatible chips");
+MODULE_LICENSE("GPL");
--
2.35.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [PATCH 0/5] hwmon: (nct6775) Add i2c support
2022-02-26 13:30 [PATCH 0/5] hwmon: (nct6775) Add i2c support Zev Weiss
` (4 preceding siblings ...)
2022-02-26 13:30 ` [PATCH 5/5] hwmon: (nct6775) Add i2c driver Zev Weiss
@ 2022-02-26 22:47 ` Zev Weiss
2022-02-26 23:54 ` Guenter Roeck
2022-02-27 0:14 ` Oleksandr Natalenko
7 siblings, 0 replies; 19+ messages in thread
From: Zev Weiss @ 2022-02-26 22:47 UTC (permalink / raw)
To: linux-hwmon, Guenter Roeck, Jean Delvare
Cc: devicetree, openbmc, Rob Herring, linux-kernel, Renze Nicolai
On Sat, Feb 26, 2022 at 05:30:42AM PST, Zev Weiss wrote:
>Hello,
>
>This patch series augments the existing nct6775 driver with support
>for the hardware's i2c interface.
>
> <snip>
>
>I've tested the nct6775-platform and nct6775-i2c drivers with the
>NCT6779D in an ASRock ROMED8HM3 system (the latter driver on its
>AST2500 BMC); both seem to work as expected. Broader testing would of
>course be welcome though, as is review feedback.
>
Also, for the sake of anyone testing or otherwise applying these patches
I should mention that the series is based on Guenter's hwmon-next tree
(commit 9db3b740a801).
Zev
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PATCH 0/5] hwmon: (nct6775) Add i2c support
2022-02-26 13:30 [PATCH 0/5] hwmon: (nct6775) Add i2c support Zev Weiss
` (5 preceding siblings ...)
2022-02-26 22:47 ` [PATCH 0/5] hwmon: (nct6775) Add i2c support Zev Weiss
@ 2022-02-26 23:54 ` Guenter Roeck
2022-02-27 12:25 ` Zev Weiss
2022-02-27 0:14 ` Oleksandr Natalenko
7 siblings, 1 reply; 19+ messages in thread
From: Guenter Roeck @ 2022-02-26 23:54 UTC (permalink / raw)
To: Zev Weiss, linux-hwmon, Jean Delvare
Cc: devicetree, openbmc, Rob Herring, linux-kernel, Renze Nicolai
On 2/26/22 05:30, Zev Weiss wrote:
> Hello,
>
> This patch series augments the existing nct6775 driver with support
> for the hardware's i2c interface.
>
> Thus far the nct6775 driver has only supported the LPC interface,
> which is the main interface by which the Super-I/O chip is typically
> connected to the host (x86) processor.
>
> However, these chips also provide an i2c interface, which can provide
> a way for a BMC to also monitor sensor readings from them. On some
> systems (such as the ASRock Rack ROMED8HM3 and X570-D4U) this may be
> the only way for the BMC to monitor host CPU temperatures (e.g. to
> indirectly access a TSI interface); this functionality is thus an
> important component of enabling OpenBMC to support such systems.
>
> In such an arrangement the Super-I/O chip is simultaneously controlled
> by two independent processors (the host and the BMC) which typically
> do not coordinate their accesses with each other. In order to avoid
> conflicts between the two, the i2c driver avoids all writes to the
> device, since the BMC's needs with the hardware are merely that it be
> able to retrieve sensor readings. This allows the host processor to
> remain ultimately in control of the chip and unaware of the BMC's use
> of it at all.
>
> The sole exception to the "no writes" rule for the i2c driver is for
> the bank-select register -- while I haven't been able to find any
> explicit statement in the Nuvoton datasheets guaranteeing this, all
> experiments I've done have indicated that, as one might hope, the i2c
> interface has its own bank-select register independent of the one used
> by the LPC interface.
>
That will a more detailed confirmation. Please explain in detail
the experiments you have done.
Other chips (specifically those served by the it87 driver) have the
same problem, and there it was never really solved. That resulted
in random crashes. I don't want to end up in the same situation.
> In terms of code structure, the approach taken in this series is to
> split the LPC-specific parts of the driver out into a separate module
> (called nct6775-platform), leaving the interface-independent parts in
> a generic driver (called nct6775-core). The nct6775-i2c driver is
> then added as an additional consumer of the nct6775-core module's
> functionality.
>
How about wmi ? Shouldn't that be separated as well ?
Guenter
> The first two patches make some relatively small infrastructural
> changes to the nct6775 driver; the bulk of the core/platform driver
> split is in the third patch. The final two patches add DT bindings
> and the i2c driver itself.
>
> I've tested the nct6775-platform and nct6775-i2c drivers with the
> NCT6779D in an ASRock ROMED8HM3 system (the latter driver on its
> AST2500 BMC); both seem to work as expected. Broader testing would of
> course be welcome though, as is review feedback.
>
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PATCH 0/5] hwmon: (nct6775) Add i2c support
2022-02-26 23:54 ` Guenter Roeck
@ 2022-02-27 12:25 ` Zev Weiss
0 siblings, 0 replies; 19+ messages in thread
From: Zev Weiss @ 2022-02-27 12:25 UTC (permalink / raw)
To: Guenter Roeck
Cc: linux-hwmon, devicetree, Jean Delvare, openbmc, linux-kernel,
Renze Nicolai, Denis Pauk, Rob Herring
[Adding Denis re: wmi discussion below...]
On Sat, Feb 26, 2022 at 03:54:42PM PST, Guenter Roeck wrote:
>On 2/26/22 05:30, Zev Weiss wrote:
>>Hello,
>>
>>This patch series augments the existing nct6775 driver with support
>>for the hardware's i2c interface.
>>
>>Thus far the nct6775 driver has only supported the LPC interface,
>>which is the main interface by which the Super-I/O chip is typically
>>connected to the host (x86) processor.
>>
>>However, these chips also provide an i2c interface, which can provide
>>a way for a BMC to also monitor sensor readings from them. On some
>>systems (such as the ASRock Rack ROMED8HM3 and X570-D4U) this may be
>>the only way for the BMC to monitor host CPU temperatures (e.g. to
>>indirectly access a TSI interface); this functionality is thus an
>>important component of enabling OpenBMC to support such systems.
>>
>>In such an arrangement the Super-I/O chip is simultaneously controlled
>>by two independent processors (the host and the BMC) which typically
>>do not coordinate their accesses with each other. In order to avoid
>>conflicts between the two, the i2c driver avoids all writes to the
>>device, since the BMC's needs with the hardware are merely that it be
>>able to retrieve sensor readings. This allows the host processor to
>>remain ultimately in control of the chip and unaware of the BMC's use
>>of it at all.
>>
>>The sole exception to the "no writes" rule for the i2c driver is for
>>the bank-select register -- while I haven't been able to find any
>>explicit statement in the Nuvoton datasheets guaranteeing this, all
>>experiments I've done have indicated that, as one might hope, the i2c
>>interface has its own bank-select register independent of the one used
>>by the LPC interface.
>>
>
>That will a more detailed confirmation. Please explain in detail
>the experiments you have done.
>
>Other chips (specifically those served by the it87 driver) have the
>same problem, and there it was never really solved. That resulted
>in random crashes. I don't want to end up in the same situation.
>
On an ASRock Rack ROMED8HM3, I used the following program to manually
peek and poke device registers from the host:
host# cat port.c
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <sys/io.h>
int main(int argc, char** argv)
{
unsigned long addr, val;
if (iopl(3)) {
perror("iopl");
exit(1);
}
if (argc == 3 && !strcmp(argv[1], "r")) {
addr = strtoul(argv[2], NULL, 0);
printf("%03lx: %02x\n", addr, inb(addr));
} else if (argc == 4 && !strcmp(argv[1], "w")) {
addr = strtoul(argv[2], NULL, 0);
val = strtoul(argv[3], NULL, 0);
printf("%03lx <- %02lx\n", addr, val);
outb(val, addr);
} else {
fprintf(stderr, "Usage: %s [rw] ADDR [VALUE]\n", argv[0]);
exit(1);
}
return 0;
}
host# cc -o port port.c
At the same time, I used i2cget & i2cset to do the same from the BMC
(the nct6779 is at address 0x2d on bus 1).
Interleaving some shell transcripts chronologically (no drivers bound on
either processor):
host# ./port w 0x295 0x4e && ./port r 0x296
295 <- 4e
296: 08
bmc# i2cget -y 1 0x2d 0x4e
0x02
bmc# i2cset -y 1 0x2d 0x4e 0x01
bmc# i2cget -y 1 0x2d 0x4e
0x01
host# ./port w 0x295 0x4e && ./port r 0x296
295 <- 4e
296: 08
So, starting from an initial state where the two sides were reporting
different values for the bank select register, a write to the bank
select register via the BMC's i2c interface is seen by a subsequent read
over that same interface, but the host still sees the same value it saw
initially.
Reversing the roles (host writing the bank-select register), the BMC is
likewise unaffected:
bmc# i2cget -y 1 0x2d 0x4e
0x01
host# ./port w 0x295 0x4e && ./port r 0x296
295 <- 4e
296: 08
host# ./port w 0x295 0x4e && ./port w 0x296 0x06
295 <- 4e
296 <- 06
host# ./port w 0x295 0x4e && ./port r 0x296
295 <- 4e
296: 06
bmc# i2cget -y 1 0x2d 0x4e
0x01
In contrast, looking at a different read/write register (the config
register at 0x40 in bank 0, for example), writes from each side are seen
by the other:
host# ./port w 0x295 0x4e && ./port w 0x296 0x00
295 <- 4e
296 <- 00
host# ./port w 0x295 0x40 && ./port r 0x296
295 <- 40
296: 03
bmc# i2cset -y 1 0x2d 0x4e 0x00
bmc# i2cget -y 1 0x2d 0x40
0x03
bmc# i2cset -y 1 0x2d 0x40 0x01
bmc# i2cget -y 1 0x2d 0x40
0x01
host# ./port w 0x295 0x40 && ./port r 0x296
295 <- 40
296: 01
host# ./port w 0x295 0x40 && ./port w 0x296 0x03
295 <- 40
296 <- 03
host# ./port w 0x295 0x40 && ./port r 0x296
295 <- 40
296: 03
bmc# i2cget -y 1 0x2d 0x40
0x03
To be cautious we could perhaps trim down the list of supported chips in
the i2c driver to include only the models that are known to pass tests
like the above; I can certainly make that change if that would be
preferred.
>>In terms of code structure, the approach taken in this series is to
>>split the LPC-specific parts of the driver out into a separate module
>>(called nct6775-platform), leaving the interface-independent parts in
>>a generic driver (called nct6775-core). The nct6775-i2c driver is
>>then added as an additional consumer of the nct6775-core module's
>>functionality.
>>
>
>How about wmi ? Shouldn't that be separated as well ?
>
I admittedly don't know much about wmi, but from what I could see in the
code it looked to me like it essentially just acts as an alternate
software/firmware path to the same underlying LPC interface, so I
figured it would make sense to leave it integrated with the rest of the
platform driver as it is currently. If there's a particular benefit to
be gained from splitting it out as well I can look into doing so, but
from my current understanding it seems like it would lead to either:
- duplication between the wmi and bare inb/outb versions of the
platform driver, or
- to eliminate the duplication, a third (intermediate) module
containing the code that was common to the two of them, leaving the
two platform driver modules as little else than the bare register I/O
routines (superio_[wmi_]inb, nct6775_[wmi_]read_value, etc.), i.e.
the differences that are already handled via the indirection of the
function pointers Denis added recently.
I suppose the hypothetical intermediate module in the second scenario
above could also be integrated back into nct6775-core, though that part
of it would then be needless dead weight for the typically more
resource-constrained systems (e.g. BMCs) that are only going to use the
i2c driver.
Anyway, none of the above possibilities seemed terribly appealing to me,
but if there's something I've misunderstood or factors I haven't taken
into account please let me know.
Thanks,
Zev
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 0/5] hwmon: (nct6775) Add i2c support
2022-02-26 13:30 [PATCH 0/5] hwmon: (nct6775) Add i2c support Zev Weiss
` (6 preceding siblings ...)
2022-02-26 23:54 ` Guenter Roeck
@ 2022-02-27 0:14 ` Oleksandr Natalenko
2022-02-27 0:27 ` Zev Weiss
7 siblings, 1 reply; 19+ messages in thread
From: Oleksandr Natalenko @ 2022-02-27 0:14 UTC (permalink / raw)
To: linux-hwmon, Guenter Roeck, Jean Delvare, Zev Weiss
Cc: devicetree, openbmc, Rob Herring, linux-kernel, Renze Nicolai
Hello.
On sobota 26. února 2022 14:30:42 CET Zev Weiss wrote:
> Hello,
>
> This patch series augments the existing nct6775 driver with support
> for the hardware's i2c interface.
Is it something I can test on my ASUS Pro WS X570-ACE board as an ordinary user, and if so, how?
Thanks.
> Thus far the nct6775 driver has only supported the LPC interface,
> which is the main interface by which the Super-I/O chip is typically
> connected to the host (x86) processor.
>
> However, these chips also provide an i2c interface, which can provide
> a way for a BMC to also monitor sensor readings from them. On some
> systems (such as the ASRock Rack ROMED8HM3 and X570-D4U) this may be
> the only way for the BMC to monitor host CPU temperatures (e.g. to
> indirectly access a TSI interface); this functionality is thus an
> important component of enabling OpenBMC to support such systems.
>
> In such an arrangement the Super-I/O chip is simultaneously controlled
> by two independent processors (the host and the BMC) which typically
> do not coordinate their accesses with each other. In order to avoid
> conflicts between the two, the i2c driver avoids all writes to the
> device, since the BMC's needs with the hardware are merely that it be
> able to retrieve sensor readings. This allows the host processor to
> remain ultimately in control of the chip and unaware of the BMC's use
> of it at all.
>
> The sole exception to the "no writes" rule for the i2c driver is for
> the bank-select register -- while I haven't been able to find any
> explicit statement in the Nuvoton datasheets guaranteeing this, all
> experiments I've done have indicated that, as one might hope, the i2c
> interface has its own bank-select register independent of the one used
> by the LPC interface.
>
> In terms of code structure, the approach taken in this series is to
> split the LPC-specific parts of the driver out into a separate module
> (called nct6775-platform), leaving the interface-independent parts in
> a generic driver (called nct6775-core). The nct6775-i2c driver is
> then added as an additional consumer of the nct6775-core module's
> functionality.
>
> The first two patches make some relatively small infrastructural
> changes to the nct6775 driver; the bulk of the core/platform driver
> split is in the third patch. The final two patches add DT bindings
> and the i2c driver itself.
>
> I've tested the nct6775-platform and nct6775-i2c drivers with the
> NCT6779D in an ASRock ROMED8HM3 system (the latter driver on its
> AST2500 BMC); both seem to work as expected. Broader testing would of
> course be welcome though, as is review feedback.
>
>
> Thanks,
> Zev
>
>
> Zev Weiss (5):
> hwmon: (nct6775) Rearrange attr-group initialization
> hwmon: (nct6775) Add read-only mode
> hwmon: (nct6775) Split core and platform driver
> dt-bindings: hwmon: Add nuvoton,nct6775
> hwmon: (nct6775) Add i2c driver
>
> .../bindings/hwmon/nuvoton,nct6775.yaml | 48 +
> MAINTAINERS | 12 +-
> drivers/hwmon/Kconfig | 32 +-
> drivers/hwmon/Makefile | 4 +-
> drivers/hwmon/{nct6775.c => nct6775-core.c} | 1464 +----------------
> drivers/hwmon/nct6775-i2c.c | 191 +++
> drivers/hwmon/nct6775-platform.c | 1185 +++++++++++++
> drivers/hwmon/nct6775.h | 233 +++
> 8 files changed, 1763 insertions(+), 1406 deletions(-)
> create mode 100644 Documentation/devicetree/bindings/hwmon/nuvoton,nct6775.yaml
> rename drivers/hwmon/{nct6775.c => nct6775-core.c} (75%)
> create mode 100644 drivers/hwmon/nct6775-i2c.c
> create mode 100644 drivers/hwmon/nct6775-platform.c
> create mode 100644 drivers/hwmon/nct6775.h
>
>
--
Oleksandr Natalenko (post-factum)
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PATCH 0/5] hwmon: (nct6775) Add i2c support
2022-02-27 0:14 ` Oleksandr Natalenko
@ 2022-02-27 0:27 ` Zev Weiss
2022-02-27 21:38 ` Oleksandr Natalenko
0 siblings, 1 reply; 19+ messages in thread
From: Zev Weiss @ 2022-02-27 0:27 UTC (permalink / raw)
To: Oleksandr Natalenko
Cc: linux-hwmon, devicetree, Jean Delvare, openbmc, linux-kernel,
Renze Nicolai, Rob Herring, Guenter Roeck
On Sat, Feb 26, 2022 at 04:14:12PM PST, Oleksandr Natalenko wrote:
>Hello.
>
>On sobota 26. února 2022 14:30:42 CET Zev Weiss wrote:
>> Hello,
>>
>> This patch series augments the existing nct6775 driver with support
>> for the hardware's i2c interface.
>
>Is it something I can test on my ASUS Pro WS X570-ACE board as an ordinary user, and if so, how?
>
You could certainly test that the nct6775-platform driver still works as
it did previously, which would be good to confirm -- you'll need to
enable CONFIG_SENSORS_NCT6775_PLATFORM now to build it.
From what I've been able to find about that board though it looks like
it doesn't have a BMC, so testing the i2c driver on it probably isn't
going to be possible. (Even if it does in fact have a BMC, it would
require at least a partial port of OpenBMC or similar, and re-flashing
your BMC firmware with that, and is hence a non-trivial undertaking.)
Zev
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 0/5] hwmon: (nct6775) Add i2c support
2022-02-27 0:27 ` Zev Weiss
@ 2022-02-27 21:38 ` Oleksandr Natalenko
2022-02-28 2:48 ` Zev Weiss
0 siblings, 1 reply; 19+ messages in thread
From: Oleksandr Natalenko @ 2022-02-27 21:38 UTC (permalink / raw)
To: Zev Weiss
Cc: linux-hwmon, devicetree, Jean Delvare, openbmc, linux-kernel,
Renze Nicolai, Rob Herring, Guenter Roeck
Hello.
On neděle 27. února 2022 1:27:55 CET Zev Weiss wrote:
> On Sat, Feb 26, 2022 at 04:14:12PM PST, Oleksandr Natalenko wrote:
> >Hello.
> >
> >On sobota 26. února 2022 14:30:42 CET Zev Weiss wrote:
> >> Hello,
> >>
> >> This patch series augments the existing nct6775 driver with support
> >> for the hardware's i2c interface.
> >
> >Is it something I can test on my ASUS Pro WS X570-ACE board as an ordinary user, and if so, how?
> >
>
> You could certainly test that the nct6775-platform driver still works as
> it did previously, which would be good to confirm -- you'll need to
> enable CONFIG_SENSORS_NCT6775_PLATFORM now to build it.
Ack.
> From what I've been able to find about that board though it looks like
> it doesn't have a BMC, so testing the i2c driver on it probably isn't
> going to be possible. (Even if it does in fact have a BMC, it would
> require at least a partial port of OpenBMC or similar, and re-flashing
> your BMC firmware with that, and is hence a non-trivial undertaking.)
It should have, the BMC is based on RTL8117, although I have no idea if it is something that can be called true IPMI as I've never enabled/used it.
Thanks.
>
>
> Zev
>
>
--
Oleksandr Natalenko (post-factum)
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 0/5] hwmon: (nct6775) Add i2c support
2022-02-27 21:38 ` Oleksandr Natalenko
@ 2022-02-28 2:48 ` Zev Weiss
0 siblings, 0 replies; 19+ messages in thread
From: Zev Weiss @ 2022-02-28 2:48 UTC (permalink / raw)
To: Oleksandr Natalenko
Cc: linux-hwmon, devicetree, Jean Delvare, openbmc, linux-kernel,
Renze Nicolai, Rob Herring, Guenter Roeck
On Sun, Feb 27, 2022 at 01:38:31PM PST, Oleksandr Natalenko wrote:
>Hello.
>
>On neděle 27. února 2022 1:27:55 CET Zev Weiss wrote:
>> On Sat, Feb 26, 2022 at 04:14:12PM PST, Oleksandr Natalenko wrote:
>> >Hello.
>> >
>> >On sobota 26. února 2022 14:30:42 CET Zev Weiss wrote:
>> >> Hello,
>> >>
>> >> This patch series augments the existing nct6775 driver with support
>> >> for the hardware's i2c interface.
>> >
>> >Is it something I can test on my ASUS Pro WS X570-ACE board as an ordinary user, and if so, how?
>> >
>>
>> You could certainly test that the nct6775-platform driver still works as
>> it did previously, which would be good to confirm -- you'll need to
>> enable CONFIG_SENSORS_NCT6775_PLATFORM now to build it.
>
>Ack.
>
>> From what I've been able to find about that board though it looks like
>> it doesn't have a BMC, so testing the i2c driver on it probably isn't
>> going to be possible. (Even if it does in fact have a BMC, it would
>> require at least a partial port of OpenBMC or similar, and re-flashing
>> your BMC firmware with that, and is hence a non-trivial undertaking.)
>
>It should have, the BMC is based on RTL8117, although I have no idea if it is something that can be called true IPMI as I've never enabled/used it.
>
Ah, interesting -- I hadn't heard of that chip before, and web searches
mostly seem to turn up discussions of that particular board (and sibling
models), so I guess it's probably not very widely used elsewhere. It
does appear to run an OpenWRT-based firmware with source available
(https://gitlab.com/gplmirror/rtl8117), though apparently with a rather
old (4.4) kernel (and with added fun goodies like what looks to be a
partial implementation of an in-kernel VNC server??).
So I guess in theory if you were feeling adventurous and wanted to
backport these patches to that kernel, recompile the firmware, and flash
the result onto your hardware you could *maybe* test out the i2c driver,
though it's probably a much deeper rabbit hole than is likely to be
worthwhile, and with significant risk of leaving your hardware in an
awkward (potentially bricked) state if things go awry, so it's not
something I'd recommend taking on casually. There would also still be
the process of figuring out at what i2c bus/address the Super-I/O chip
lives for the rtl8117, if its i2c interface is even attached at all,
which I don't think is guaranteed -- the rtl8117 might not need it if
it's not in charge of thermal monitoring/fan control on that board, and
even if it is handling that it might have a direct connection to the TSI
interface instead of going through the Super-I/O chip as is done on the
ASRock boards I'm familiar with.
Zev
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 3/5] hwmon: (nct6775) Split core and platform driver
@ 2022-02-27 15:44 Guenter Roeck
2022-02-28 8:32 ` Zev Weiss
0 siblings, 1 reply; 19+ messages in thread
From: Guenter Roeck @ 2022-02-27 15:44 UTC (permalink / raw)
To: Zev Weiss; +Cc: linux-hwmon, openbmc, Jean Delvare, linux-kernel, Renze Nicolai
On Sat, Feb 26, 2022 at 05:30:45AM -0800, Zev Weiss wrote:
> This splits the nct6775 driver into an interface-independent core and
> a separate platform driver that wraps inb/outb port I/O (or asuswmi
> methods) around that core.
>
> Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
I think it would be much better to convert the entire driver to regmap
and not just use regmap for i2c. This way all register read/write
operations can be hidden behind regmap, and the read/write callbacks
are unnecessary. The tmp401 driver gives an example how to do this -
essentially implement reg_read and reg_write functions in struct
regmap_config, then handle all register accesses through regmap.
Couple of additional comments inline.
Guenter
> ---
> MAINTAINERS | 6 +-
> drivers/hwmon/Kconfig | 15 +-
> drivers/hwmon/Makefile | 3 +-
> drivers/hwmon/{nct6775.c => nct6775-core.c} | 1405 +------------------
> drivers/hwmon/nct6775-platform.c | 1185 ++++++++++++++++
> drivers/hwmon/nct6775.h | 233 +++
> 6 files changed, 1467 insertions(+), 1380 deletions(-)
> rename drivers/hwmon/{nct6775.c => nct6775-core.c} (76%)
> create mode 100644 drivers/hwmon/nct6775-platform.c
> create mode 100644 drivers/hwmon/nct6775.h
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 3dc7c8d21fd6..d318a5580df9 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -13284,12 +13284,14 @@ M: Samuel Mendoza-Jonas <sam@mendozajonas.com>
> S: Maintained
> F: net/ncsi/
>
> -NCT6775 HARDWARE MONITOR DRIVER
> +NCT6775 HARDWARE MONITOR DRIVER - CORE & PLATFORM DRIVER
> M: Guenter Roeck <linux@roeck-us.net>
> L: linux-hwmon@vger.kernel.org
> S: Maintained
> F: Documentation/hwmon/nct6775.rst
> -F: drivers/hwmon/nct6775.c
> +F: drivers/hwmon/nct6775-core.c
> +F: drivers/hwmon/nct6775-platform.c
> +F: drivers/hwmon/nct6775.h
>
> NETDEVSIM
> M: Jakub Kicinski <kuba@kernel.org>
> diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
> index 463d5b110a85..11822e8a2cda 100644
> --- a/drivers/hwmon/Kconfig
> +++ b/drivers/hwmon/Kconfig
> @@ -1458,9 +1458,20 @@ config SENSORS_NCT6683
> will be called nct6683.
>
> config SENSORS_NCT6775
> - tristate "Nuvoton NCT6775F and compatibles"
> + tristate
> + help
> + This module contains common code shared by the platform and
> + i2c versions of the nct6775 driver; it is not useful on its
> + own.
> +
> + If built as a module, the module will be called
> + nct6775-core.
> +
> +config SENSORS_NCT6775_PLATFORM
> + tristate "Platform driver for Nuvoton NCT6775F and compatibles"
> depends on !PPC
> depends on ACPI_WMI || ACPI_WMI=n
> + select SENSORS_NCT6775
> select HWMON_VID
> help
> If you say yes here you get support for the hardware monitoring
> @@ -1470,7 +1481,7 @@ config SENSORS_NCT6775
> NCT6775F and NCT6776F.
>
> This driver can also be built as a module. If so, the module
> - will be called nct6775.
> + will be called nct6775-platform.
>
> config SENSORS_NCT7802
> tristate "Nuvoton NCT7802Y"
> diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
> index 7bba3415ca3d..5f37b2c0f79a 100644
> --- a/drivers/hwmon/Makefile
> +++ b/drivers/hwmon/Makefile
> @@ -154,7 +154,8 @@ obj-$(CONFIG_SENSORS_MLXREG_FAN) += mlxreg-fan.o
> obj-$(CONFIG_SENSORS_MENF21BMC_HWMON) += menf21bmc_hwmon.o
> obj-$(CONFIG_SENSORS_MR75203) += mr75203.o
> obj-$(CONFIG_SENSORS_NCT6683) += nct6683.o
> -obj-$(CONFIG_SENSORS_NCT6775) += nct6775.o
> +obj-$(CONFIG_SENSORS_NCT6775) += nct6775-core.o
> +obj-$(CONFIG_SENSORS_NCT6775_PLATFORM) += nct6775-platform.o
> obj-$(CONFIG_SENSORS_NCT7802) += nct7802.o
> obj-$(CONFIG_SENSORS_NCT7904) += nct7904.o
> obj-$(CONFIG_SENSORS_NPCM7XX) += npcm750-pwm-fan.o
> diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775-core.c
> similarity index 76%
> rename from drivers/hwmon/nct6775.c
> rename to drivers/hwmon/nct6775-core.c
> index c5b28a693461..095e9eced752 100644
> --- a/drivers/hwmon/nct6775.c
> +++ b/drivers/hwmon/nct6775-core.c
> @@ -44,25 +44,17 @@
> #include <linux/init.h>
> #include <linux/slab.h>
> #include <linux/jiffies.h>
> -#include <linux/platform_device.h>
> #include <linux/hwmon.h>
> #include <linux/hwmon-sysfs.h>
> -#include <linux/hwmon-vid.h>
> #include <linux/err.h>
> #include <linux/mutex.h>
> -#include <linux/acpi.h>
> #include <linux/bitops.h>
> -#include <linux/dmi.h>
> -#include <linux/io.h>
> #include <linux/nospec.h>
> -#include <linux/wmi.h>
> #include "lm75.h"
> +#include "nct6775.h"
>
> #define USE_ALTERNATE
>
> -enum kinds { nct6106, nct6116, nct6775, nct6776, nct6779, nct6791, nct6792,
> - nct6793, nct6795, nct6796, nct6797, nct6798 };
> -
> /* used to set data->name = nct6775_device_names[data->sio_kind] */
> static const char * const nct6775_device_names[] = {
> "nct6106",
> @@ -79,242 +71,6 @@ static const char * const nct6775_device_names[] = {
> "nct6798",
> };
>
> -static const char * const nct6775_sio_names[] __initconst = {
> - "NCT6106D",
> - "NCT6116D",
> - "NCT6775F",
> - "NCT6776D/F",
> - "NCT6779D",
> - "NCT6791D",
> - "NCT6792D",
> - "NCT6793D",
> - "NCT6795D",
> - "NCT6796D",
> - "NCT6797D",
> - "NCT6798D",
> -};
> -
> -static unsigned short force_id;
> -module_param(force_id, ushort, 0);
> -MODULE_PARM_DESC(force_id, "Override the detected device ID");
> -
> -static unsigned short fan_debounce;
> -module_param(fan_debounce, ushort, 0);
> -MODULE_PARM_DESC(fan_debounce, "Enable debouncing for fan RPM signal");
> -
> -#define DRVNAME "nct6775"
> -
> -/*
> - * Super-I/O constants and functions
> - */
> -
> -#define NCT6775_LD_ACPI 0x0a
> -#define NCT6775_LD_HWM 0x0b
> -#define NCT6775_LD_VID 0x0d
> -#define NCT6775_LD_12 0x12
> -
> -#define SIO_REG_LDSEL 0x07 /* Logical device select */
> -#define SIO_REG_DEVID 0x20 /* Device ID (2 bytes) */
> -#define SIO_REG_ENABLE 0x30 /* Logical device enable */
> -#define SIO_REG_ADDR 0x60 /* Logical device address (2 bytes) */
> -
> -#define SIO_NCT6106_ID 0xc450
> -#define SIO_NCT6116_ID 0xd280
> -#define SIO_NCT6775_ID 0xb470
> -#define SIO_NCT6776_ID 0xc330
> -#define SIO_NCT6779_ID 0xc560
> -#define SIO_NCT6791_ID 0xc800
> -#define SIO_NCT6792_ID 0xc910
> -#define SIO_NCT6793_ID 0xd120
> -#define SIO_NCT6795_ID 0xd350
> -#define SIO_NCT6796_ID 0xd420
> -#define SIO_NCT6797_ID 0xd450
> -#define SIO_NCT6798_ID 0xd428
> -#define SIO_ID_MASK 0xFFF8
> -
> -enum pwm_enable { off, manual, thermal_cruise, speed_cruise, sf3, sf4 };
> -enum sensor_access { access_direct, access_asuswmi };
> -
> -struct nct6775_sio_data {
> - int sioreg;
> - int ld;
> - enum kinds kind;
> - enum sensor_access access;
> -
> - /* superio_() callbacks */
> - void (*sio_outb)(struct nct6775_sio_data *sio_data, int reg, int val);
> - int (*sio_inb)(struct nct6775_sio_data *sio_data, int reg);
> - void (*sio_select)(struct nct6775_sio_data *sio_data, int ld);
> - int (*sio_enter)(struct nct6775_sio_data *sio_data);
> - void (*sio_exit)(struct nct6775_sio_data *sio_data);
> -};
> -
> -#define ASUSWMI_MONITORING_GUID "466747A0-70EC-11DE-8A39-0800200C9A66"
> -#define ASUSWMI_METHODID_RSIO 0x5253494F
> -#define ASUSWMI_METHODID_WSIO 0x5753494F
> -#define ASUSWMI_METHODID_RHWM 0x5248574D
> -#define ASUSWMI_METHODID_WHWM 0x5748574D
> -#define ASUSWMI_UNSUPPORTED_METHOD 0xFFFFFFFE
> -
> -static int nct6775_asuswmi_evaluate_method(u32 method_id, u8 bank, u8 reg, u8 val, u32 *retval)
> -{
> -#if IS_ENABLED(CONFIG_ACPI_WMI)
> - u32 args = bank | (reg << 8) | (val << 16);
> - struct acpi_buffer input = { (acpi_size) sizeof(args), &args };
> - struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };
> - acpi_status status;
> - union acpi_object *obj;
> - u32 tmp = ASUSWMI_UNSUPPORTED_METHOD;
> -
> - status = wmi_evaluate_method(ASUSWMI_MONITORING_GUID, 0,
> - method_id, &input, &output);
> -
> - if (ACPI_FAILURE(status))
> - return -EIO;
> -
> - obj = output.pointer;
> - if (obj && obj->type == ACPI_TYPE_INTEGER)
> - tmp = obj->integer.value;
> -
> - if (retval)
> - *retval = tmp;
> -
> - kfree(obj);
> -
> - if (tmp == ASUSWMI_UNSUPPORTED_METHOD)
> - return -ENODEV;
> - return 0;
> -#else
> - return -EOPNOTSUPP;
> -#endif
> -}
> -
> -static inline int nct6775_asuswmi_write(u8 bank, u8 reg, u8 val)
> -{
> - return nct6775_asuswmi_evaluate_method(ASUSWMI_METHODID_WHWM, bank,
> - reg, val, NULL);
> -}
> -
> -static inline int nct6775_asuswmi_read(u8 bank, u8 reg, u8 *val)
> -{
> - u32 ret, tmp = 0;
> -
> - ret = nct6775_asuswmi_evaluate_method(ASUSWMI_METHODID_RHWM, bank,
> - reg, 0, &tmp);
> - *val = tmp;
> - return ret;
> -}
> -
> -static int superio_wmi_inb(struct nct6775_sio_data *sio_data, int reg)
> -{
> - int tmp = 0;
> -
> - nct6775_asuswmi_evaluate_method(ASUSWMI_METHODID_RSIO, sio_data->ld,
> - reg, 0, &tmp);
> - return tmp;
> -}
> -
> -static void superio_wmi_outb(struct nct6775_sio_data *sio_data, int reg, int val)
> -{
> - nct6775_asuswmi_evaluate_method(ASUSWMI_METHODID_WSIO, sio_data->ld,
> - reg, val, NULL);
> -}
> -
> -static void superio_wmi_select(struct nct6775_sio_data *sio_data, int ld)
> -{
> - sio_data->ld = ld;
> -}
> -
> -static int superio_wmi_enter(struct nct6775_sio_data *sio_data)
> -{
> - return 0;
> -}
> -
> -static void superio_wmi_exit(struct nct6775_sio_data *sio_data)
> -{
> -}
> -
> -static void superio_outb(struct nct6775_sio_data *sio_data, int reg, int val)
> -{
> - int ioreg = sio_data->sioreg;
> -
> - outb(reg, ioreg);
> - outb(val, ioreg + 1);
> -}
> -
> -static int superio_inb(struct nct6775_sio_data *sio_data, int reg)
> -{
> - int ioreg = sio_data->sioreg;
> -
> - outb(reg, ioreg);
> - return inb(ioreg + 1);
> -}
> -
> -static void superio_select(struct nct6775_sio_data *sio_data, int ld)
> -{
> - int ioreg = sio_data->sioreg;
> -
> - outb(SIO_REG_LDSEL, ioreg);
> - outb(ld, ioreg + 1);
> -}
> -
> -static int superio_enter(struct nct6775_sio_data *sio_data)
> -{
> - int ioreg = sio_data->sioreg;
> -
> - /*
> - * Try to reserve <ioreg> and <ioreg + 1> for exclusive access.
> - */
> - if (!request_muxed_region(ioreg, 2, DRVNAME))
> - return -EBUSY;
> -
> - outb(0x87, ioreg);
> - outb(0x87, ioreg);
> -
> - return 0;
> -}
> -
> -static void superio_exit(struct nct6775_sio_data *sio_data)
> -{
> - int ioreg = sio_data->sioreg;
> -
> - outb(0xaa, ioreg);
> - outb(0x02, ioreg);
> - outb(0x02, ioreg + 1);
> - release_region(ioreg, 2);
> -}
> -
> -/*
> - * ISA constants
> - */
> -
> -#define IOREGION_ALIGNMENT (~7)
> -#define IOREGION_OFFSET 5
> -#define IOREGION_LENGTH 2
> -#define ADDR_REG_OFFSET 0
> -#define DATA_REG_OFFSET 1
> -
> -#define NCT6775_REG_BANK 0x4E
> -#define NCT6775_REG_CONFIG 0x40
> -#define NCT6775_PORT_CHIPID 0x58
> -
> -/*
> - * Not currently used:
> - * REG_MAN_ID has the value 0x5ca3 for all supported chips.
> - * REG_CHIP_ID == 0x88/0xa1/0xc1 depending on chip model.
> - * REG_MAN_ID is at port 0x4f
> - * REG_CHIP_ID is at port 0x58
> - */
> -
> -#define NUM_TEMP 10 /* Max number of temp attribute sets w/ limits*/
> -#define NUM_TEMP_FIXED 6 /* Max number of fixed temp attribute sets */
> -#define NUM_TSI_TEMP 8 /* Max number of TSI temp register pairs */
> -
> -#define NUM_REG_ALARM 7 /* Max number of alarm registers */
> -#define NUM_REG_BEEP 5 /* Max number of beep registers */
> -
> -#define NUM_FAN 7
> -
> /* Common and NCT6775 specific data */
>
> /* Voltage min/max registers for nr=7..14 are in bank 5 */
> @@ -333,11 +89,6 @@ static const u16 NCT6775_REG_IN[] = {
> #define NCT6775_REG_DIODE 0x5E
> #define NCT6775_DIODE_MASK 0x02
>
> -#define NCT6775_REG_FANDIV1 0x506
> -#define NCT6775_REG_FANDIV2 0x507
> -
> -#define NCT6775_REG_CR_FAN_DEBOUNCE 0xf0
> -
> static const u16 NCT6775_REG_ALARM[NUM_REG_ALARM] = { 0x459, 0x45A, 0x45B };
>
> /* 0..15 voltages, 16..23 fans, 24..29 temperatures, 30..31 intrusion */
> @@ -351,10 +102,6 @@ static const s8 NCT6775_ALARM_BITS[] = {
> 4, 5, 13, -1, -1, -1, /* temp1..temp6 */
> 12, -1 }; /* intrusion0, intrusion1 */
>
> -#define FAN_ALARM_BASE 16
> -#define TEMP_ALARM_BASE 24
> -#define INTRUSION_ALARM_BASE 30
> -
> static const u16 NCT6775_REG_BEEP[NUM_REG_BEEP] = { 0x56, 0x57, 0x453, 0x4e };
>
> /*
> @@ -370,11 +117,6 @@ static const s8 NCT6775_BEEP_BITS[] = {
> 4, 5, 13, -1, -1, -1, /* temp1..temp6 */
> 12, -1 }; /* intrusion0, intrusion1 */
>
> -#define BEEP_ENABLE_BASE 15
> -
> -static const u8 NCT6775_REG_CR_CASEOPEN_CLR[] = { 0xe6, 0xee };
> -static const u8 NCT6775_CR_CASEOPEN_CLR_MASK[] = { 0x20, 0x01 };
> -
> /* DC or PWM output fan configuration */
> static const u8 NCT6775_REG_PWM_MODE[] = { 0x04, 0x04, 0x12 };
> static const u8 NCT6775_PWM_MODE_MASK[] = { 0x01, 0x02, 0x01 };
> @@ -690,8 +432,6 @@ static const u16 NCT6779_REG_TEMP_CRIT[32] = {
>
> /* NCT6791 specific data */
>
> -#define NCT6791_REG_HM_IO_SPACE_LOCK_ENABLE 0x28
> -
> static const u16 NCT6791_REG_WEIGHT_TEMP_SEL[NUM_FAN] = { 0, 0x239 };
> static const u16 NCT6791_REG_WEIGHT_TEMP_STEP[NUM_FAN] = { 0, 0x23a };
> static const u16 NCT6791_REG_WEIGHT_TEMP_STEP_TOL[NUM_FAN] = { 0, 0x23b };
> @@ -1191,168 +931,6 @@ static inline unsigned int tsi_temp_from_reg(unsigned int reg)
> * Data structures and manipulation thereof
> */
>
> -struct nct6775_data {
> - int addr; /* IO base of hw monitor block */
> - struct nct6775_sio_data *sio_data;
> - enum kinds kind;
> - const char *name;
> -
> - const struct attribute_group *groups[7];
> - u8 num_groups;
> -
> - u16 reg_temp[5][NUM_TEMP]; /* 0=temp, 1=temp_over, 2=temp_hyst,
> - * 3=temp_crit, 4=temp_lcrit
> - */
> - u8 temp_src[NUM_TEMP];
> - u16 reg_temp_config[NUM_TEMP];
> - const char * const *temp_label;
> - u32 temp_mask;
> - u32 virt_temp_mask;
> -
> - u16 REG_CONFIG;
> - u16 REG_VBAT;
> - u16 REG_DIODE;
> - u8 DIODE_MASK;
> -
> - const s8 *ALARM_BITS;
> - const s8 *BEEP_BITS;
> -
> - const u16 *REG_VIN;
> - const u16 *REG_IN_MINMAX[2];
> -
> - const u16 *REG_TARGET;
> - const u16 *REG_FAN;
> - const u16 *REG_FAN_MODE;
> - const u16 *REG_FAN_MIN;
> - const u16 *REG_FAN_PULSES;
> - const u16 *FAN_PULSE_SHIFT;
> - const u16 *REG_FAN_TIME[3];
> -
> - const u16 *REG_TOLERANCE_H;
> -
> - const u8 *REG_PWM_MODE;
> - const u8 *PWM_MODE_MASK;
> -
> - const u16 *REG_PWM[7]; /* [0]=pwm, [1]=pwm_start, [2]=pwm_floor,
> - * [3]=pwm_max, [4]=pwm_step,
> - * [5]=weight_duty_step, [6]=weight_duty_base
> - */
> - const u16 *REG_PWM_READ;
> -
> - const u16 *REG_CRITICAL_PWM_ENABLE;
> - u8 CRITICAL_PWM_ENABLE_MASK;
> - const u16 *REG_CRITICAL_PWM;
> -
> - const u16 *REG_AUTO_TEMP;
> - const u16 *REG_AUTO_PWM;
> -
> - const u16 *REG_CRITICAL_TEMP;
> - const u16 *REG_CRITICAL_TEMP_TOLERANCE;
> -
> - const u16 *REG_TEMP_SOURCE; /* temp register sources */
> - const u16 *REG_TEMP_SEL;
> - const u16 *REG_WEIGHT_TEMP_SEL;
> - const u16 *REG_WEIGHT_TEMP[3]; /* 0=base, 1=tolerance, 2=step */
> -
> - const u16 *REG_TEMP_OFFSET;
> -
> - const u16 *REG_ALARM;
> - const u16 *REG_BEEP;
> -
> - const u16 *REG_TSI_TEMP;
> -
> - unsigned int (*fan_from_reg)(u16 reg, unsigned int divreg);
> - unsigned int (*fan_from_reg_min)(u16 reg, unsigned int divreg);
> -
> - struct mutex update_lock;
> - bool valid; /* true if following fields are valid */
> - unsigned long last_updated; /* In jiffies */
> -
> - /* Register values */
> - u8 bank; /* current register bank */
> - u8 in_num; /* number of in inputs we have */
> - u8 in[15][3]; /* [0]=in, [1]=in_max, [2]=in_min */
> - unsigned int rpm[NUM_FAN];
> - u16 fan_min[NUM_FAN];
> - u8 fan_pulses[NUM_FAN];
> - u8 fan_div[NUM_FAN];
> - u8 has_pwm;
> - u8 has_fan; /* some fan inputs can be disabled */
> - u8 has_fan_min; /* some fans don't have min register */
> - bool has_fan_div;
> -
> - u8 num_temp_alarms; /* 2, 3, or 6 */
> - u8 num_temp_beeps; /* 2, 3, or 6 */
> - u8 temp_fixed_num; /* 3 or 6 */
> - u8 temp_type[NUM_TEMP_FIXED];
> - s8 temp_offset[NUM_TEMP_FIXED];
> - s16 temp[5][NUM_TEMP]; /* 0=temp, 1=temp_over, 2=temp_hyst,
> - * 3=temp_crit, 4=temp_lcrit */
> - s16 tsi_temp[NUM_TSI_TEMP];
> - u64 alarms;
> - u64 beeps;
> -
> - u8 pwm_num; /* number of pwm */
> - u8 pwm_mode[NUM_FAN]; /* 0->DC variable voltage,
> - * 1->PWM variable duty cycle
> - */
> - enum pwm_enable pwm_enable[NUM_FAN];
> - /* 0->off
> - * 1->manual
> - * 2->thermal cruise mode (also called SmartFan I)
> - * 3->fan speed cruise mode
> - * 4->SmartFan III
> - * 5->enhanced variable thermal cruise (SmartFan IV)
> - */
> - u8 pwm[7][NUM_FAN]; /* [0]=pwm, [1]=pwm_start, [2]=pwm_floor,
> - * [3]=pwm_max, [4]=pwm_step,
> - * [5]=weight_duty_step, [6]=weight_duty_base
> - */
> -
> - u8 target_temp[NUM_FAN];
> - u8 target_temp_mask;
> - u32 target_speed[NUM_FAN];
> - u32 target_speed_tolerance[NUM_FAN];
> - u8 speed_tolerance_limit;
> -
> - u8 temp_tolerance[2][NUM_FAN];
> - u8 tolerance_mask;
> -
> - u8 fan_time[3][NUM_FAN]; /* 0 = stop_time, 1 = step_up, 2 = step_down */
> -
> - /* Automatic fan speed control registers */
> - int auto_pwm_num;
> - u8 auto_pwm[NUM_FAN][7];
> - u8 auto_temp[NUM_FAN][7];
> - u8 pwm_temp_sel[NUM_FAN];
> - u8 pwm_weight_temp_sel[NUM_FAN];
> - u8 weight_temp[3][NUM_FAN]; /* 0->temp_step, 1->temp_step_tol,
> - * 2->temp_base
> - */
> -
> - u8 vid;
> - u8 vrm;
> -
> - bool have_vid;
> -
> - u16 have_temp;
> - u16 have_temp_fixed;
> - u16 have_tsi_temp;
> - u16 have_in;
> -
> - /* Remember extra register values over suspend/resume */
> - u8 vbat;
> - u8 fandiv1;
> - u8 fandiv2;
> - u8 sio_reg_enable;
> -
> - /* nct6775_*() callbacks */
> - u16 (*read_value)(struct nct6775_data *data, u16 reg);
> - int (*write_value)(struct nct6775_data *data, u16 reg, u16 value);
> -
> - bool read_only;
> -};
> -
> struct sensor_device_template {
> struct device_attribute dev_attr;
> union {
> @@ -1408,21 +986,6 @@ 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 */
> - if (WARN_ON(data->num_groups == ARRAY_SIZE(data->groups) - 1))
> - return -ENOSPC;
> -
> - data->groups[data->num_groups++] = group;
> - return 0;
> -}
> -
> static int nct6775_add_template_attr_group(struct device *dev, struct nct6775_data *data,
> const struct sensor_template_group *tg, int repeat)
> {
> @@ -1497,7 +1060,7 @@ static int nct6775_add_template_attr_group(struct device *dev, struct nct6775_da
> return nct6775_add_attr_group(data, group);
> }
>
> -static bool is_word_sized(struct nct6775_data *data, u16 reg)
> +bool nct6775_reg_is_word_sized(struct nct6775_data *data, u16 reg)
> {
> switch (data->kind) {
> case nct6106:
> @@ -1554,101 +1117,7 @@ static bool is_word_sized(struct nct6775_data *data, u16 reg)
> }
> return false;
> }
> -
> -static inline void nct6775_wmi_set_bank(struct nct6775_data *data, u16 reg)
> -{
> - u8 bank = reg >> 8;
> -
> - data->bank = bank;
> -}
> -
> -static u16 nct6775_wmi_read_value(struct nct6775_data *data, u16 reg)
> -{
> - int res, err, word_sized = is_word_sized(data, reg);
> - u8 tmp = 0;
> -
> - nct6775_wmi_set_bank(data, reg);
> -
> - err = nct6775_asuswmi_read(data->bank, reg & 0xff, &tmp);
> - if (err)
> - return 0;
> -
> - res = tmp;
> - if (word_sized) {
> - err = nct6775_asuswmi_read(data->bank, (reg & 0xff) + 1, &tmp);
> - if (err)
> - return 0;
> -
> - res = (res << 8) + tmp;
> - }
> - return res;
> -}
> -
> -static int nct6775_wmi_write_value(struct nct6775_data *data, u16 reg, u16 value)
> -{
> - int res, word_sized = is_word_sized(data, reg);
> -
> - nct6775_wmi_set_bank(data, reg);
> -
> - if (word_sized) {
> - res = nct6775_asuswmi_write(data->bank, reg & 0xff, value >> 8);
> - if (res)
> - return res;
> -
> - res = nct6775_asuswmi_write(data->bank, (reg & 0xff) + 1, value);
> - } else {
> - res = nct6775_asuswmi_write(data->bank, reg & 0xff, value);
> - }
> -
> - return res;
> -}
> -
> -/*
> - * On older chips, only registers 0x50-0x5f are banked.
> - * On more recent chips, all registers are banked.
> - * Assume that is the case and set the bank number for each access.
> - * Cache the bank number so it only needs to be set if it changes.
> - */
> -static inline void nct6775_set_bank(struct nct6775_data *data, u16 reg)
> -{
> - u8 bank = reg >> 8;
> -
> - if (data->bank != bank) {
> - outb_p(NCT6775_REG_BANK, data->addr + ADDR_REG_OFFSET);
> - outb_p(bank, data->addr + DATA_REG_OFFSET);
> - data->bank = bank;
> - }
> -}
> -
> -static u16 nct6775_read_value(struct nct6775_data *data, u16 reg)
> -{
> - int res, word_sized = is_word_sized(data, reg);
> -
> - nct6775_set_bank(data, reg);
> - outb_p(reg & 0xff, data->addr + ADDR_REG_OFFSET);
> - res = inb_p(data->addr + DATA_REG_OFFSET);
> - if (word_sized) {
> - outb_p((reg & 0xff) + 1,
> - data->addr + ADDR_REG_OFFSET);
> - res = (res << 8) + inb_p(data->addr + DATA_REG_OFFSET);
> - }
> - return res;
> -}
> -
> -static int nct6775_write_value(struct nct6775_data *data, u16 reg, u16 value)
> -{
> - int word_sized = is_word_sized(data, reg);
> -
> - nct6775_set_bank(data, reg);
> - outb_p(reg & 0xff, data->addr + ADDR_REG_OFFSET);
> - if (word_sized) {
> - outb_p(value >> 8, data->addr + DATA_REG_OFFSET);
> - outb_p((reg & 0xff) + 1,
> - data->addr + ADDR_REG_OFFSET);
> - }
> - outb_p(value & 0xff, data->addr + DATA_REG_OFFSET);
> - return 0;
> -}
> +EXPORT_SYMBOL_GPL(nct6775_reg_is_word_sized);
Please introduce a nct6775 symbol namespace.
>
> /* We left-align 8-bit temperature values to make the code simpler */
> static u16 nct6775_read_temp(struct nct6775_data *data, u16 reg)
> @@ -1656,18 +1125,19 @@ static u16 nct6775_read_temp(struct nct6775_data *data, u16 reg)
> u16 res;
>
> res = data->read_value(data, reg);
> - if (!is_word_sized(data, reg))
> + if (!nct6775_reg_is_word_sized(data, reg))
> res <<= 8;
>
> return res;
> }
>
> -static int nct6775_write_temp(struct nct6775_data *data, u16 reg, u16 value)
> +int nct6775_write_temp(struct nct6775_data *data, u16 reg, u16 value)
> {
> - if (!is_word_sized(data, reg))
> + if (!nct6775_reg_is_word_sized(data, reg))
> value >>= 8;
> return data->write_value(data, reg, value);
> }
> +EXPORT_SYMBOL_GPL(nct6775_write_temp);
>
Questionable. It would probably be better to just re-implement in platform
driver. It would even be possible to hide the code in regmap by marking
the registers as "always treat as 16-bit" register, for example by setting
bit 15 in the register addresses.
> /* This function assumes that the caller holds data->update_lock */
> static void nct6775_write_fan_div(struct nct6775_data *data, int nr)
> @@ -1960,7 +1430,7 @@ static void nct6775_update_pwm_limits(struct device *dev)
> }
> }
>
> -static struct nct6775_data *nct6775_update_device(struct device *dev)
> +struct nct6775_data *nct6775_update_device(struct device *dev)
> {
> struct nct6775_data *data = dev_get_drvdata(dev);
> int i, j;
> @@ -2062,6 +1532,7 @@ static struct nct6775_data *nct6775_update_device(struct device *dev)
> mutex_unlock(&data->update_lock);
> return data;
> }
> +EXPORT_SYMBOL_GPL(nct6775_update_device);
Zero value. Called from suspend function in platform driver which doesn't
actually need it and could instead just use
struct nct6775_data *data = dev_get_drvdata(dev);
>
> /*
> * Sysfs callback functions
> @@ -2099,8 +1570,8 @@ store_in_reg(struct device *dev, struct device_attribute *attr, const char *buf,
> return count;
> }
>
> -static ssize_t
> -show_alarm(struct device *dev, struct device_attribute *attr, char *buf)
> +ssize_t
> +nct6775_show_alarm(struct device *dev, struct device_attribute *attr, char *buf)
> {
> struct nct6775_data *data = nct6775_update_device(dev);
> struct sensor_device_attribute *sattr = to_sensor_dev_attr(attr);
> @@ -2109,6 +1580,7 @@ show_alarm(struct device *dev, struct device_attribute *attr, char *buf)
> return sprintf(buf, "%u\n",
> (unsigned int)((data->alarms >> nr) & 0x01));
> }
> +EXPORT_SYMBOL_GPL(nct6775_show_alarm);
>
> static int find_temp_source(struct nct6775_data *data, int index, int count)
> {
> @@ -2147,8 +1619,8 @@ show_temp_alarm(struct device *dev, struct device_attribute *attr, char *buf)
> return sprintf(buf, "%u\n", alarm);
> }
>
> -static ssize_t
> -show_beep(struct device *dev, struct device_attribute *attr, char *buf)
> +ssize_t
> +nct6775_show_beep(struct device *dev, struct device_attribute *attr, char *buf)
> {
> struct sensor_device_attribute *sattr = to_sensor_dev_attr(attr);
> struct nct6775_data *data = nct6775_update_device(dev);
> @@ -2157,10 +1629,10 @@ show_beep(struct device *dev, struct device_attribute *attr, char *buf)
> return sprintf(buf, "%u\n",
> (unsigned int)((data->beeps >> nr) & 0x01));
> }
> +EXPORT_SYMBOL_GPL(nct6775_show_beep);
>
> -static ssize_t
> -store_beep(struct device *dev, struct device_attribute *attr, const char *buf,
> - size_t count)
> +ssize_t
> +nct6775_store_beep(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
> {
> struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr);
> struct nct6775_data *data = dev_get_drvdata(dev);
> @@ -2185,6 +1657,7 @@ store_beep(struct device *dev, struct device_attribute *attr, const char *buf,
> mutex_unlock(&data->update_lock);
> return count;
> }
> +EXPORT_SYMBOL_GPL(nct6775_store_beep);
>
> static ssize_t
> show_temp_beep(struct device *dev, struct device_attribute *attr, char *buf)
> @@ -2257,9 +1730,8 @@ static umode_t nct6775_in_is_visible(struct kobject *kobj,
> }
>
> SENSOR_TEMPLATE_2(in_input, "in%d_input", S_IRUGO, show_in_reg, NULL, 0, 0);
> -SENSOR_TEMPLATE(in_alarm, "in%d_alarm", S_IRUGO, show_alarm, NULL, 0);
> -SENSOR_TEMPLATE(in_beep, "in%d_beep", S_IWUSR | S_IRUGO, show_beep, store_beep,
> - 0);
> +SENSOR_TEMPLATE(in_alarm, "in%d_alarm", S_IRUGO, nct6775_show_alarm, NULL, 0);
> +SENSOR_TEMPLATE(in_beep, "in%d_beep", S_IWUSR | S_IRUGO, nct6775_show_beep, nct6775_store_beep, 0);
> SENSOR_TEMPLATE_2(in_min, "in%d_min", S_IWUSR | S_IRUGO, show_in_reg,
> store_in_reg, 0, 1);
> SENSOR_TEMPLATE_2(in_max, "in%d_max", S_IWUSR | S_IRUGO, show_in_reg,
> @@ -2475,10 +1947,10 @@ static umode_t nct6775_fan_is_visible(struct kobject *kobj,
> }
>
> SENSOR_TEMPLATE(fan_input, "fan%d_input", S_IRUGO, show_fan, NULL, 0);
> -SENSOR_TEMPLATE(fan_alarm, "fan%d_alarm", S_IRUGO, show_alarm, NULL,
> +SENSOR_TEMPLATE(fan_alarm, "fan%d_alarm", S_IRUGO, nct6775_show_alarm, NULL,
> FAN_ALARM_BASE);
> -SENSOR_TEMPLATE(fan_beep, "fan%d_beep", S_IWUSR | S_IRUGO, show_beep,
> - store_beep, FAN_ALARM_BASE);
> +SENSOR_TEMPLATE(fan_beep, "fan%d_beep", S_IWUSR | S_IRUGO, nct6775_show_beep,
> + nct6775_store_beep, FAN_ALARM_BASE);
> SENSOR_TEMPLATE(fan_pulses, "fan%d_pulses", S_IWUSR | S_IRUGO, show_fan_pulses,
> store_fan_pulses, 0);
> SENSOR_TEMPLATE(fan_min, "fan%d_min", S_IWUSR | S_IRUGO, show_fan_min,
> @@ -3628,113 +3100,6 @@ static const struct sensor_template_group nct6775_pwm_template_group = {
> .base = 1,
> };
>
> -static ssize_t
> -cpu0_vid_show(struct device *dev, struct device_attribute *attr, char *buf)
> -{
> - struct nct6775_data *data = dev_get_drvdata(dev);
> -
> - return sprintf(buf, "%d\n", vid_from_reg(data->vid, data->vrm));
> -}
> -
> -static DEVICE_ATTR_RO(cpu0_vid);
> -
> -/* Case open detection */
> -
> -static ssize_t
> -clear_caseopen(struct device *dev, struct device_attribute *attr,
> - const char *buf, size_t count)
> -{
> - struct nct6775_data *data = dev_get_drvdata(dev);
> - struct nct6775_sio_data *sio_data = data->sio_data;
> - int nr = to_sensor_dev_attr(attr)->index - INTRUSION_ALARM_BASE;
> - unsigned long val;
> - u8 reg;
> - int ret;
> -
> - if (kstrtoul(buf, 10, &val) || val != 0)
> - return -EINVAL;
> -
> - mutex_lock(&data->update_lock);
> -
> - /*
> - * Use CR registers to clear caseopen status.
> - * The CR registers are the same for all chips, and not all chips
> - * support clearing the caseopen status through "regular" registers.
> - */
> - ret = sio_data->sio_enter(sio_data);
> - if (ret) {
> - count = ret;
> - goto error;
> - }
> -
> - sio_data->sio_select(sio_data, NCT6775_LD_ACPI);
> - reg = sio_data->sio_inb(sio_data, NCT6775_REG_CR_CASEOPEN_CLR[nr]);
> - reg |= NCT6775_CR_CASEOPEN_CLR_MASK[nr];
> - sio_data->sio_outb(sio_data, NCT6775_REG_CR_CASEOPEN_CLR[nr], reg);
> - reg &= ~NCT6775_CR_CASEOPEN_CLR_MASK[nr];
> - sio_data->sio_outb(sio_data, NCT6775_REG_CR_CASEOPEN_CLR[nr], reg);
> - sio_data->sio_exit(sio_data);
> -
> - data->valid = false; /* Force cache refresh */
> -error:
> - mutex_unlock(&data->update_lock);
> - return count;
> -}
> -
> -static SENSOR_DEVICE_ATTR(intrusion0_alarm, S_IWUSR | S_IRUGO, show_alarm,
> - clear_caseopen, INTRUSION_ALARM_BASE);
> -static SENSOR_DEVICE_ATTR(intrusion1_alarm, S_IWUSR | S_IRUGO, show_alarm,
> - clear_caseopen, INTRUSION_ALARM_BASE + 1);
> -static SENSOR_DEVICE_ATTR(intrusion0_beep, S_IWUSR | S_IRUGO, show_beep,
> - store_beep, INTRUSION_ALARM_BASE);
> -static SENSOR_DEVICE_ATTR(intrusion1_beep, S_IWUSR | S_IRUGO, show_beep,
> - store_beep, INTRUSION_ALARM_BASE + 1);
> -static SENSOR_DEVICE_ATTR(beep_enable, S_IWUSR | S_IRUGO, show_beep,
> - store_beep, BEEP_ENABLE_BASE);
> -
> -static umode_t nct6775_other_is_visible(struct kobject *kobj,
> - struct attribute *attr, int index)
> -{
> - struct device *dev = kobj_to_dev(kobj);
> - struct nct6775_data *data = dev_get_drvdata(dev);
> -
> - if (index == 0 && !data->have_vid)
> - return 0;
> -
> - if (index == 1 || index == 2) {
> - if (data->ALARM_BITS[INTRUSION_ALARM_BASE + index - 1] < 0)
> - return 0;
> - }
> -
> - if (index == 3 || index == 4) {
> - if (data->BEEP_BITS[INTRUSION_ALARM_BASE + index - 3] < 0)
> - return 0;
> - }
> -
> - return nct6775_attr_mode(data, attr);
> -}
> -
> -/*
> - * nct6775_other_is_visible uses the index into the following array
> - * to determine if attributes should be created or not.
> - * Any change in order or content must be matched.
> - */
> -static struct attribute *nct6775_attributes_other[] = {
> - &dev_attr_cpu0_vid.attr, /* 0 */
> - &sensor_dev_attr_intrusion0_alarm.dev_attr.attr, /* 1 */
> - &sensor_dev_attr_intrusion1_alarm.dev_attr.attr, /* 2 */
> - &sensor_dev_attr_intrusion0_beep.dev_attr.attr, /* 3 */
> - &sensor_dev_attr_intrusion1_beep.dev_attr.attr, /* 4 */
> - &sensor_dev_attr_beep_enable.dev_attr.attr, /* 5 */
> -
> - NULL
> -};
> -
> -static const struct attribute_group nct6775_group_other = {
> - .attrs = nct6775_attributes_other,
> - .is_visible = nct6775_other_is_visible,
> -};
> -
> static inline void nct6775_init_device(struct nct6775_data *data)
> {
> int i;
> @@ -3777,227 +3142,6 @@ static inline void nct6775_init_device(struct nct6775_data *data)
> }
> }
>
> -static void
> -nct6775_check_fan_inputs(struct nct6775_data *data, struct nct6775_sio_data *sio_data)
> -{
> - bool fan3pin = false, fan4pin = false, fan4min = false;
> - bool fan5pin = false, fan6pin = false, fan7pin = false;
> - bool pwm3pin = false, pwm4pin = false, pwm5pin = false;
> - bool pwm6pin = false, pwm7pin = false;
> -
> - /* Store SIO_REG_ENABLE for use during resume */
> - sio_data->sio_select(sio_data, NCT6775_LD_HWM);
> - data->sio_reg_enable = sio_data->sio_inb(sio_data, SIO_REG_ENABLE);
> -
> - /* fan4 and fan5 share some pins with the GPIO and serial flash */
> - if (data->kind == nct6775) {
> - int cr2c = sio_data->sio_inb(sio_data, 0x2c);
> -
> - fan3pin = cr2c & BIT(6);
> - pwm3pin = cr2c & BIT(7);
> -
> - /* On NCT6775, fan4 shares pins with the fdc interface */
> - fan4pin = !(sio_data->sio_inb(sio_data, 0x2A) & 0x80);
> - } else if (data->kind == nct6776) {
> - bool gpok = sio_data->sio_inb(sio_data, 0x27) & 0x80;
> - const char *board_vendor, *board_name;
> -
> - board_vendor = dmi_get_system_info(DMI_BOARD_VENDOR);
> - board_name = dmi_get_system_info(DMI_BOARD_NAME);
> -
> - if (board_name && board_vendor &&
> - !strcmp(board_vendor, "ASRock")) {
> - /*
> - * Auxiliary fan monitoring is not enabled on ASRock
> - * Z77 Pro4-M if booted in UEFI Ultra-FastBoot mode.
> - * Observed with BIOS version 2.00.
> - */
> - if (!strcmp(board_name, "Z77 Pro4-M")) {
> - if ((data->sio_reg_enable & 0xe0) != 0xe0) {
> - data->sio_reg_enable |= 0xe0;
> - sio_data->sio_outb(sio_data, SIO_REG_ENABLE,
> - data->sio_reg_enable);
> - }
> - }
> - }
> -
> - if (data->sio_reg_enable & 0x80)
> - fan3pin = gpok;
> - else
> - fan3pin = !(sio_data->sio_inb(sio_data, 0x24) & 0x40);
> -
> - if (data->sio_reg_enable & 0x40)
> - fan4pin = gpok;
> - else
> - fan4pin = sio_data->sio_inb(sio_data, 0x1C) & 0x01;
> -
> - if (data->sio_reg_enable & 0x20)
> - fan5pin = gpok;
> - else
> - fan5pin = sio_data->sio_inb(sio_data, 0x1C) & 0x02;
> -
> - fan4min = fan4pin;
> - pwm3pin = fan3pin;
> - } else if (data->kind == nct6106) {
> - int cr24 = sio_data->sio_inb(sio_data, 0x24);
> -
> - fan3pin = !(cr24 & 0x80);
> - pwm3pin = cr24 & 0x08;
> - } else if (data->kind == nct6116) {
> - int cr1a = sio_data->sio_inb(sio_data, 0x1a);
> - int cr1b = sio_data->sio_inb(sio_data, 0x1b);
> - int cr24 = sio_data->sio_inb(sio_data, 0x24);
> - int cr2a = sio_data->sio_inb(sio_data, 0x2a);
> - int cr2b = sio_data->sio_inb(sio_data, 0x2b);
> - int cr2f = sio_data->sio_inb(sio_data, 0x2f);
> -
> - fan3pin = !(cr2b & 0x10);
> - fan4pin = (cr2b & 0x80) || // pin 1(2)
> - (!(cr2f & 0x10) && (cr1a & 0x04)); // pin 65(66)
> - fan5pin = (cr2b & 0x80) || // pin 126(127)
> - (!(cr1b & 0x03) && (cr2a & 0x02)); // pin 94(96)
> -
> - pwm3pin = fan3pin && (cr24 & 0x08);
> - pwm4pin = fan4pin;
> - pwm5pin = fan5pin;
> - } else {
> - /*
> - * NCT6779D, NCT6791D, NCT6792D, NCT6793D, NCT6795D, NCT6796D,
> - * NCT6797D, NCT6798D
> - */
> - int cr1a = sio_data->sio_inb(sio_data, 0x1a);
> - int cr1b = sio_data->sio_inb(sio_data, 0x1b);
> - int cr1c = sio_data->sio_inb(sio_data, 0x1c);
> - int cr1d = sio_data->sio_inb(sio_data, 0x1d);
> - int cr2a = sio_data->sio_inb(sio_data, 0x2a);
> - int cr2b = sio_data->sio_inb(sio_data, 0x2b);
> - int cr2d = sio_data->sio_inb(sio_data, 0x2d);
> - int cr2f = sio_data->sio_inb(sio_data, 0x2f);
> - bool dsw_en = cr2f & BIT(3);
> - bool ddr4_en = cr2f & BIT(4);
> - int cre0;
> - int creb;
> - int cred;
> -
> - sio_data->sio_select(sio_data, NCT6775_LD_12);
> - cre0 = sio_data->sio_inb(sio_data, 0xe0);
> - creb = sio_data->sio_inb(sio_data, 0xeb);
> - cred = sio_data->sio_inb(sio_data, 0xed);
> -
> - fan3pin = !(cr1c & BIT(5));
> - fan4pin = !(cr1c & BIT(6));
> - fan5pin = !(cr1c & BIT(7));
> -
> - pwm3pin = !(cr1c & BIT(0));
> - pwm4pin = !(cr1c & BIT(1));
> - pwm5pin = !(cr1c & BIT(2));
> -
> - switch (data->kind) {
> - case nct6791:
> - fan6pin = cr2d & BIT(1);
> - pwm6pin = cr2d & BIT(0);
> - break;
> - case nct6792:
> - fan6pin = !dsw_en && (cr2d & BIT(1));
> - pwm6pin = !dsw_en && (cr2d & BIT(0));
> - break;
> - case nct6793:
> - fan5pin |= cr1b & BIT(5);
> - fan5pin |= creb & BIT(5);
> -
> - fan6pin = !dsw_en && (cr2d & BIT(1));
> - fan6pin |= creb & BIT(3);
> -
> - pwm5pin |= cr2d & BIT(7);
> - pwm5pin |= (creb & BIT(4)) && !(cr2a & BIT(0));
> -
> - pwm6pin = !dsw_en && (cr2d & BIT(0));
> - pwm6pin |= creb & BIT(2);
> - break;
> - case nct6795:
> - fan5pin |= cr1b & BIT(5);
> - fan5pin |= creb & BIT(5);
> -
> - fan6pin = (cr2a & BIT(4)) &&
> - (!dsw_en || (cred & BIT(4)));
> - fan6pin |= creb & BIT(3);
> -
> - pwm5pin |= cr2d & BIT(7);
> - pwm5pin |= (creb & BIT(4)) && !(cr2a & BIT(0));
> -
> - pwm6pin = (cr2a & BIT(3)) && (cred & BIT(2));
> - pwm6pin |= creb & BIT(2);
> - break;
> - case nct6796:
> - fan5pin |= cr1b & BIT(5);
> - fan5pin |= (cre0 & BIT(3)) && !(cr1b & BIT(0));
> - fan5pin |= creb & BIT(5);
> -
> - fan6pin = (cr2a & BIT(4)) &&
> - (!dsw_en || (cred & BIT(4)));
> - fan6pin |= creb & BIT(3);
> -
> - fan7pin = !(cr2b & BIT(2));
> -
> - pwm5pin |= cr2d & BIT(7);
> - pwm5pin |= (cre0 & BIT(4)) && !(cr1b & BIT(0));
> - pwm5pin |= (creb & BIT(4)) && !(cr2a & BIT(0));
> -
> - pwm6pin = (cr2a & BIT(3)) && (cred & BIT(2));
> - pwm6pin |= creb & BIT(2);
> -
> - pwm7pin = !(cr1d & (BIT(2) | BIT(3)));
> - break;
> - case nct6797:
> - fan5pin |= !ddr4_en && (cr1b & BIT(5));
> - fan5pin |= creb & BIT(5);
> -
> - fan6pin = cr2a & BIT(4);
> - fan6pin |= creb & BIT(3);
> -
> - fan7pin = cr1a & BIT(1);
> -
> - pwm5pin |= (creb & BIT(4)) && !(cr2a & BIT(0));
> - pwm5pin |= !ddr4_en && (cr2d & BIT(7));
> -
> - pwm6pin = creb & BIT(2);
> - pwm6pin |= cred & BIT(2);
> -
> - pwm7pin = cr1d & BIT(4);
> - break;
> - case nct6798:
> - fan6pin = !(cr1b & BIT(0)) && (cre0 & BIT(3));
> - fan6pin |= cr2a & BIT(4);
> - fan6pin |= creb & BIT(5);
> -
> - fan7pin = cr1b & BIT(5);
> - fan7pin |= !(cr2b & BIT(2));
> - fan7pin |= creb & BIT(3);
> -
> - pwm6pin = !(cr1b & BIT(0)) && (cre0 & BIT(4));
> - pwm6pin |= !(cred & BIT(2)) && (cr2a & BIT(3));
> - pwm6pin |= (creb & BIT(4)) && !(cr2a & BIT(0));
> -
> - pwm7pin = !(cr1d & (BIT(2) | BIT(3)));
> - pwm7pin |= cr2d & BIT(7);
> - pwm7pin |= creb & BIT(2);
> - break;
> - default: /* NCT6779D */
> - break;
> - }
> -
> - fan4min = fan4pin;
> - }
> -
> - /* fan 1 and 2 (0x03) are always present */
> - data->has_fan = 0x03 | (fan3pin << 2) | (fan4pin << 3) |
> - (fan5pin << 4) | (fan6pin << 5) | (fan7pin << 6);
> - data->has_fan_min = 0x03 | (fan3pin << 2) | (fan4min << 3) |
> - (fan5pin << 4) | (fan6pin << 5) | (fan7pin << 6);
> - data->has_pwm = 0x03 | (pwm3pin << 2) | (pwm4pin << 3) |
> - (pwm5pin << 4) | (pwm6pin << 5) | (pwm7pin << 6);
> -}
> -
> static void add_temp_sensors(struct nct6775_data *data, const u16 *regp,
> int *available, int *mask)
> {
> @@ -4023,50 +3167,20 @@ static void add_temp_sensors(struct nct6775_data *data, const u16 *regp,
> }
> }
>
> -static int nct6775_probe(struct platform_device *pdev)
> +int nct6775_probe(struct device *dev, struct nct6775_data *data)
> {
> - struct device *dev = &pdev->dev;
> - struct nct6775_sio_data *sio_data = dev_get_platdata(dev);
> - struct nct6775_data *data;
> - struct resource *res;
> int i, s, err = 0;
> int src, mask, available;
> const u16 *reg_temp, *reg_temp_over, *reg_temp_hyst, *reg_temp_config;
> const u16 *reg_temp_mon, *reg_temp_alternate, *reg_temp_crit;
> const u16 *reg_temp_crit_l = NULL, *reg_temp_crit_h = NULL;
> int num_reg_temp, num_reg_temp_mon, num_reg_tsi_temp;
> - u8 cr2a;
> struct device *hwmon_dev;
> struct sensor_template_group tsi_temp_tg;
>
> - if (sio_data->access == access_direct) {
> - res = platform_get_resource(pdev, IORESOURCE_IO, 0);
> - if (!devm_request_region(&pdev->dev, res->start, IOREGION_LENGTH,
> - DRVNAME))
> - return -EBUSY;
> - }
> -
> - data = devm_kzalloc(&pdev->dev, sizeof(struct nct6775_data),
> - GFP_KERNEL);
> - if (!data)
> - return -ENOMEM;
> -
> - data->kind = sio_data->kind;
> - data->sio_data = sio_data;
> -
> - if (sio_data->access == access_direct) {
> - data->addr = res->start;
> - data->read_value = nct6775_read_value;
> - data->write_value = nct6775_write_value;
> - } else {
> - data->read_value = nct6775_wmi_read_value;
> - data->write_value = nct6775_wmi_write_value;
> - }
> -
> mutex_init(&data->update_lock);
> data->name = nct6775_device_names[data->kind];
> data->bank = 0xff; /* Force initial bank selection */
> - platform_set_drvdata(pdev, data);
>
> switch (data->kind) {
> case nct6106:
> @@ -4781,79 +3895,12 @@ static int nct6775_probe(struct platform_device *pdev)
> /* Initialize the chip */
> nct6775_init_device(data);
>
> - err = sio_data->sio_enter(sio_data);
> - if (err)
> - return err;
> -
> - cr2a = sio_data->sio_inb(sio_data, 0x2a);
> - switch (data->kind) {
> - case nct6775:
> - data->have_vid = (cr2a & 0x40);
> - break;
> - case nct6776:
> - data->have_vid = (cr2a & 0x60) == 0x40;
> - break;
> - case nct6106:
> - case nct6116:
> - case nct6779:
> - case nct6791:
> - case nct6792:
> - case nct6793:
> - case nct6795:
> - case nct6796:
> - case nct6797:
> - case nct6798:
> - break;
> - }
> -
> - /*
> - * Read VID value
> - * We can get the VID input values directly at logical device D 0xe3.
> - */
> - if (data->have_vid) {
> - sio_data->sio_select(sio_data, NCT6775_LD_VID);
> - data->vid = sio_data->sio_inb(sio_data, 0xe3);
> - data->vrm = vid_which_vrm();
> - }
> -
> - if (fan_debounce) {
> - u8 tmp;
> -
> - sio_data->sio_select(sio_data, NCT6775_LD_HWM);
> - tmp = sio_data->sio_inb(sio_data,
> - NCT6775_REG_CR_FAN_DEBOUNCE);
> - switch (data->kind) {
> - case nct6106:
> - case nct6116:
> - tmp |= 0xe0;
> - break;
> - case nct6775:
> - tmp |= 0x1e;
> - break;
> - case nct6776:
> - case nct6779:
> - tmp |= 0x3e;
> - break;
> - case nct6791:
> - case nct6792:
> - case nct6793:
> - case nct6795:
> - case nct6796:
> - case nct6797:
> - case nct6798:
> - tmp |= 0x7e;
> - break;
> - }
> - sio_data->sio_outb(sio_data, NCT6775_REG_CR_FAN_DEBOUNCE,
> - tmp);
> - dev_info(&pdev->dev, "Enabled fan debounce for chip %s\n",
> - data->name);
> + if (data->driver_init) {
> + err = data->driver_init(data);
> + if (err)
> + return err;
> }
>
> - nct6775_check_fan_inputs(data, sio_data);
> -
> - sio_data->sio_exit(sio_data);
> -
> /* Read fan clock dividers immediately */
> nct6775_init_fan_common(dev, data);
>
> @@ -4888,404 +3935,12 @@ static int nct6775_probe(struct platform_device *pdev)
> return err;
> }
>
> - err = nct6775_add_attr_group(data, &nct6775_group_other);
> - if (err)
> - return err;
> -
> hwmon_dev = devm_hwmon_device_register_with_groups(dev, data->name,
> data, data->groups);
> return PTR_ERR_OR_ZERO(hwmon_dev);
> }
> -
> -static void nct6791_enable_io_mapping(struct nct6775_sio_data *sio_data)
> -{
> - int val;
> -
> - val = sio_data->sio_inb(sio_data, NCT6791_REG_HM_IO_SPACE_LOCK_ENABLE);
> - if (val & 0x10) {
> - pr_info("Enabling hardware monitor logical device mappings.\n");
> - sio_data->sio_outb(sio_data, NCT6791_REG_HM_IO_SPACE_LOCK_ENABLE,
> - val & ~0x10);
> - }
> -}
> -
> -static int __maybe_unused nct6775_suspend(struct device *dev)
> -{
> - struct nct6775_data *data = nct6775_update_device(dev);
> -
> - mutex_lock(&data->update_lock);
> - data->vbat = data->read_value(data, data->REG_VBAT);
> - if (data->kind == nct6775) {
> - data->fandiv1 = data->read_value(data, NCT6775_REG_FANDIV1);
> - data->fandiv2 = data->read_value(data, NCT6775_REG_FANDIV2);
> - }
> - mutex_unlock(&data->update_lock);
> -
> - return 0;
> -}
> -
> -static int __maybe_unused nct6775_resume(struct device *dev)
> -{
> - struct nct6775_data *data = dev_get_drvdata(dev);
> - struct nct6775_sio_data *sio_data = dev_get_platdata(dev);
> - int i, j, err = 0;
> - u8 reg;
> -
> - mutex_lock(&data->update_lock);
> - data->bank = 0xff; /* Force initial bank selection */
> -
> - err = sio_data->sio_enter(sio_data);
> - if (err)
> - goto abort;
> -
> - sio_data->sio_select(sio_data, NCT6775_LD_HWM);
> - reg = sio_data->sio_inb(sio_data, SIO_REG_ENABLE);
> - if (reg != data->sio_reg_enable)
> - sio_data->sio_outb(sio_data, SIO_REG_ENABLE, data->sio_reg_enable);
> -
> - if (data->kind == nct6791 || data->kind == nct6792 ||
> - data->kind == nct6793 || data->kind == nct6795 ||
> - data->kind == nct6796 || data->kind == nct6797 ||
> - data->kind == nct6798)
> - nct6791_enable_io_mapping(sio_data);
> -
> - sio_data->sio_exit(sio_data);
> -
> - /* Restore limits */
> - for (i = 0; i < data->in_num; i++) {
> - if (!(data->have_in & BIT(i)))
> - continue;
> -
> - data->write_value(data, data->REG_IN_MINMAX[0][i],
> - data->in[i][1]);
> - data->write_value(data, data->REG_IN_MINMAX[1][i],
> - data->in[i][2]);
> - }
> -
> - for (i = 0; i < ARRAY_SIZE(data->fan_min); i++) {
> - if (!(data->has_fan_min & BIT(i)))
> - continue;
> -
> - data->write_value(data, data->REG_FAN_MIN[i],
> - data->fan_min[i]);
> - }
> -
> - for (i = 0; i < NUM_TEMP; i++) {
> - if (!(data->have_temp & BIT(i)))
> - continue;
> -
> - for (j = 1; j < ARRAY_SIZE(data->reg_temp); j++)
> - if (data->reg_temp[j][i])
> - nct6775_write_temp(data, data->reg_temp[j][i],
> - data->temp[j][i]);
> - }
> -
> - /* Restore other settings */
> - data->write_value(data, data->REG_VBAT, data->vbat);
> - if (data->kind == nct6775) {
> - data->write_value(data, NCT6775_REG_FANDIV1, data->fandiv1);
> - data->write_value(data, NCT6775_REG_FANDIV2, data->fandiv2);
> - }
> -
> -abort:
> - /* Force re-reading all values */
> - data->valid = false;
> - mutex_unlock(&data->update_lock);
> -
> - return err;
> -}
> -
> -static SIMPLE_DEV_PM_OPS(nct6775_dev_pm_ops, nct6775_suspend, nct6775_resume);
> -
> -static struct platform_driver nct6775_driver = {
> - .driver = {
> - .name = DRVNAME,
> - .pm = &nct6775_dev_pm_ops,
> - },
> - .probe = nct6775_probe,
> -};
> -
> -/* nct6775_find() looks for a '627 in the Super-I/O config space */
> -static int __init nct6775_find(int sioaddr, struct nct6775_sio_data *sio_data)
> -{
> - u16 val;
> - int err;
> - int addr;
> -
> - sio_data->access = access_direct;
> - sio_data->sioreg = sioaddr;
> -
> - err = sio_data->sio_enter(sio_data);
> - if (err)
> - return err;
> -
> - val = (sio_data->sio_inb(sio_data, SIO_REG_DEVID) << 8) |
> - sio_data->sio_inb(sio_data, SIO_REG_DEVID + 1);
> - if (force_id && val != 0xffff)
> - val = force_id;
> -
> - switch (val & SIO_ID_MASK) {
> - case SIO_NCT6106_ID:
> - sio_data->kind = nct6106;
> - break;
> - case SIO_NCT6116_ID:
> - sio_data->kind = nct6116;
> - break;
> - case SIO_NCT6775_ID:
> - sio_data->kind = nct6775;
> - break;
> - case SIO_NCT6776_ID:
> - sio_data->kind = nct6776;
> - break;
> - case SIO_NCT6779_ID:
> - sio_data->kind = nct6779;
> - break;
> - case SIO_NCT6791_ID:
> - sio_data->kind = nct6791;
> - break;
> - case SIO_NCT6792_ID:
> - sio_data->kind = nct6792;
> - break;
> - case SIO_NCT6793_ID:
> - sio_data->kind = nct6793;
> - break;
> - case SIO_NCT6795_ID:
> - sio_data->kind = nct6795;
> - break;
> - case SIO_NCT6796_ID:
> - sio_data->kind = nct6796;
> - break;
> - case SIO_NCT6797_ID:
> - sio_data->kind = nct6797;
> - break;
> - case SIO_NCT6798_ID:
> - sio_data->kind = nct6798;
> - break;
> - default:
> - if (val != 0xffff)
> - pr_debug("unsupported chip ID: 0x%04x\n", val);
> - sio_data->sio_exit(sio_data);
> - return -ENODEV;
> - }
> -
> - /* We have a known chip, find the HWM I/O address */
> - sio_data->sio_select(sio_data, NCT6775_LD_HWM);
> - val = (sio_data->sio_inb(sio_data, SIO_REG_ADDR) << 8)
> - | sio_data->sio_inb(sio_data, SIO_REG_ADDR + 1);
> - addr = val & IOREGION_ALIGNMENT;
> - if (addr == 0) {
> - pr_err("Refusing to enable a Super-I/O device with a base I/O port 0\n");
> - sio_data->sio_exit(sio_data);
> - return -ENODEV;
> - }
> -
> - /* Activate logical device if needed */
> - val = sio_data->sio_inb(sio_data, SIO_REG_ENABLE);
> - if (!(val & 0x01)) {
> - pr_warn("Forcibly enabling Super-I/O. Sensor is probably unusable.\n");
> - sio_data->sio_outb(sio_data, SIO_REG_ENABLE, val | 0x01);
> - }
> -
> - if (sio_data->kind == nct6791 || sio_data->kind == nct6792 ||
> - sio_data->kind == nct6793 || sio_data->kind == nct6795 ||
> - sio_data->kind == nct6796 || sio_data->kind == nct6797 ||
> - sio_data->kind == nct6798)
> - nct6791_enable_io_mapping(sio_data);
> -
> - sio_data->sio_exit(sio_data);
> - pr_info("Found %s or compatible chip at %#x:%#x\n",
> - nct6775_sio_names[sio_data->kind], sioaddr, addr);
> -
> - return addr;
> -}
> -
> -/*
> - * when Super-I/O functions move to a separate file, the Super-I/O
> - * bus will manage the lifetime of the device and this module will only keep
> - * track of the nct6775 driver. But since we use platform_device_alloc(), we
> - * must keep track of the device
> - */
> -static struct platform_device *pdev[2];
> -
> -static const char * const asus_wmi_boards[] = {
> - "ProArt X570-CREATOR WIFI",
> - "Pro B550M-C",
> - "Pro WS X570-ACE",
> - "PRIME B360-PLUS",
> - "PRIME B460-PLUS",
> - "PRIME B550-PLUS",
> - "PRIME B550M-A",
> - "PRIME B550M-A (WI-FI)",
> - "PRIME X570-P",
> - "PRIME X570-PRO",
> - "ROG CROSSHAIR VIII DARK HERO",
> - "ROG CROSSHAIR VIII FORMULA",
> - "ROG CROSSHAIR VIII HERO",
> - "ROG CROSSHAIR VIII IMPACT",
> - "ROG STRIX B550-A GAMING",
> - "ROG STRIX B550-E GAMING",
> - "ROG STRIX B550-F GAMING",
> - "ROG STRIX B550-F GAMING (WI-FI)",
> - "ROG STRIX B550-F GAMING WIFI II",
> - "ROG STRIX B550-I GAMING",
> - "ROG STRIX B550-XE GAMING (WI-FI)",
> - "ROG STRIX X570-E GAMING",
> - "ROG STRIX X570-F GAMING",
> - "ROG STRIX X570-I GAMING",
> - "ROG STRIX Z390-E GAMING",
> - "ROG STRIX Z390-F GAMING",
> - "ROG STRIX Z390-H GAMING",
> - "ROG STRIX Z390-I GAMING",
> - "ROG STRIX Z490-A GAMING",
> - "ROG STRIX Z490-E GAMING",
> - "ROG STRIX Z490-F GAMING",
> - "ROG STRIX Z490-G GAMING",
> - "ROG STRIX Z490-G GAMING (WI-FI)",
> - "ROG STRIX Z490-H GAMING",
> - "ROG STRIX Z490-I GAMING",
> - "TUF GAMING B550M-PLUS",
> - "TUF GAMING B550M-PLUS (WI-FI)",
> - "TUF GAMING B550-PLUS",
> - "TUF GAMING B550-PRO",
> - "TUF GAMING X570-PLUS",
> - "TUF GAMING X570-PLUS (WI-FI)",
> - "TUF GAMING X570-PRO (WI-FI)",
> - "TUF GAMING Z490-PLUS",
> - "TUF GAMING Z490-PLUS (WI-FI)",
> -};
> -
> -static int __init sensors_nct6775_init(void)
> -{
> - int i, err;
> - bool found = false;
> - int address;
> - struct resource res;
> - struct nct6775_sio_data sio_data;
> - int sioaddr[2] = { 0x2e, 0x4e };
> - enum sensor_access access = access_direct;
> - const char *board_vendor, *board_name;
> - u8 tmp;
> -
> - err = platform_driver_register(&nct6775_driver);
> - if (err)
> - return err;
> -
> - board_vendor = dmi_get_system_info(DMI_BOARD_VENDOR);
> - board_name = dmi_get_system_info(DMI_BOARD_NAME);
> -
> - if (board_name && board_vendor &&
> - !strcmp(board_vendor, "ASUSTeK COMPUTER INC.")) {
> - err = match_string(asus_wmi_boards, ARRAY_SIZE(asus_wmi_boards),
> - board_name);
> - if (err >= 0) {
> - /* if reading chip id via WMI succeeds, use WMI */
> - if (!nct6775_asuswmi_read(0, NCT6775_PORT_CHIPID, &tmp) && tmp) {
> - pr_info("Using Asus WMI to access %#x chip.\n", tmp);
> - access = access_asuswmi;
> - } else {
> - pr_err("Can't read ChipID by Asus WMI.\n");
> - }
> - }
> - }
> -
> - /*
> - * initialize sio_data->kind and sio_data->sioreg.
> - *
> - * when Super-I/O functions move to a separate file, the Super-I/O
> - * driver will probe 0x2e and 0x4e and auto-detect the presence of a
> - * nct6775 hardware monitor, and call probe()
> - */
> - for (i = 0; i < ARRAY_SIZE(pdev); i++) {
> - sio_data.sio_outb = superio_outb;
> - sio_data.sio_inb = superio_inb;
> - sio_data.sio_select = superio_select;
> - sio_data.sio_enter = superio_enter;
> - sio_data.sio_exit = superio_exit;
> -
> - address = nct6775_find(sioaddr[i], &sio_data);
> - if (address <= 0)
> - continue;
> -
> - found = true;
> -
> - sio_data.access = access;
> -
> - if (access == access_asuswmi) {
> - sio_data.sio_outb = superio_wmi_outb;
> - sio_data.sio_inb = superio_wmi_inb;
> - sio_data.sio_select = superio_wmi_select;
> - sio_data.sio_enter = superio_wmi_enter;
> - sio_data.sio_exit = superio_wmi_exit;
> - }
> -
> - pdev[i] = platform_device_alloc(DRVNAME, address);
> - if (!pdev[i]) {
> - err = -ENOMEM;
> - goto exit_device_unregister;
> - }
> -
> - err = platform_device_add_data(pdev[i], &sio_data,
> - sizeof(struct nct6775_sio_data));
> - if (err)
> - goto exit_device_put;
> -
> - if (sio_data.access == access_direct) {
> - memset(&res, 0, sizeof(res));
> - res.name = DRVNAME;
> - res.start = address + IOREGION_OFFSET;
> - res.end = address + IOREGION_OFFSET + IOREGION_LENGTH - 1;
> - res.flags = IORESOURCE_IO;
> -
> - err = acpi_check_resource_conflict(&res);
> - if (err) {
> - platform_device_put(pdev[i]);
> - pdev[i] = NULL;
> - continue;
> - }
> -
> - err = platform_device_add_resources(pdev[i], &res, 1);
> - if (err)
> - goto exit_device_put;
> - }
> -
> - /* platform_device_add calls probe() */
> - err = platform_device_add(pdev[i]);
> - if (err)
> - goto exit_device_put;
> - }
> - if (!found) {
> - err = -ENODEV;
> - goto exit_unregister;
> - }
> -
> - return 0;
> -
> -exit_device_put:
> - platform_device_put(pdev[i]);
> -exit_device_unregister:
> - while (--i >= 0) {
> - if (pdev[i])
> - platform_device_unregister(pdev[i]);
> - }
> -exit_unregister:
> - platform_driver_unregister(&nct6775_driver);
> - return err;
> -}
> -
> -static void __exit sensors_nct6775_exit(void)
> -{
> - int i;
> -
> - for (i = 0; i < ARRAY_SIZE(pdev); i++) {
> - if (pdev[i])
> - platform_device_unregister(pdev[i]);
> - }
> - platform_driver_unregister(&nct6775_driver);
> -}
> +EXPORT_SYMBOL_GPL(nct6775_probe);
>
> MODULE_AUTHOR("Guenter Roeck <linux@roeck-us.net>");
> -MODULE_DESCRIPTION("Driver for NCT6775F and compatible chips");
> +MODULE_DESCRIPTION("Core driver for NCT6775F and compatible chips");
> MODULE_LICENSE("GPL");
> -
> -module_init(sensors_nct6775_init);
> -module_exit(sensors_nct6775_exit);
> diff --git a/drivers/hwmon/nct6775-platform.c b/drivers/hwmon/nct6775-platform.c
> new file mode 100644
> index 000000000000..9bc794ba69e2
> --- /dev/null
> +++ b/drivers/hwmon/nct6775-platform.c
> @@ -0,0 +1,1185 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> +/*
> + * nct6775-platform - Platform driver for the hardware monitoring
> + * functionality of Nuvoton NCT677x Super-I/O chips
> + *
> + * Copyright (C) 2012 Guenter Roeck <linux@roeck-us.net>
> + */
> +
> +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> +
> +#include <linux/module.h>
> +#include <linux/init.h>
> +#include <linux/platform_device.h>
> +#include <linux/hwmon-vid.h>
> +#include <linux/hwmon-sysfs.h>
> +#include <linux/io.h>
> +#include <linux/acpi.h>
> +#include <linux/dmi.h>
> +#include <linux/wmi.h>
> +
> +#include "nct6775.h"
> +
> +enum sensor_access { access_direct, access_asuswmi };
> +
> +static const char * const nct6775_sio_names[] __initconst = {
> + "NCT6106D",
> + "NCT6116D",
> + "NCT6775F",
> + "NCT6776D/F",
> + "NCT6779D",
> + "NCT6791D",
> + "NCT6792D",
> + "NCT6793D",
> + "NCT6795D",
> + "NCT6796D",
> + "NCT6797D",
> + "NCT6798D",
> +};
> +
> +static unsigned short force_id;
> +module_param(force_id, ushort, 0);
> +MODULE_PARM_DESC(force_id, "Override the detected device ID");
> +
> +static unsigned short fan_debounce;
> +module_param(fan_debounce, ushort, 0);
> +MODULE_PARM_DESC(fan_debounce, "Enable debouncing for fan RPM signal");
> +
> +#define DRVNAME "nct6775-platform"
> +
> +#define NCT6775_PORT_CHIPID 0x58
> +
> +/*
> + * ISA constants
> + */
> +
> +#define IOREGION_ALIGNMENT (~7)
> +#define IOREGION_OFFSET 5
> +#define IOREGION_LENGTH 2
> +#define ADDR_REG_OFFSET 0
> +#define DATA_REG_OFFSET 1
> +
> +/*
> + * Super-I/O constants and functions
> + */
> +
> +#define NCT6775_LD_ACPI 0x0a
> +#define NCT6775_LD_HWM 0x0b
> +#define NCT6775_LD_VID 0x0d
> +#define NCT6775_LD_12 0x12
> +
> +#define SIO_REG_LDSEL 0x07 /* Logical device select */
> +#define SIO_REG_DEVID 0x20 /* Device ID (2 bytes) */
> +#define SIO_REG_ENABLE 0x30 /* Logical device enable */
> +#define SIO_REG_ADDR 0x60 /* Logical device address (2 bytes) */
> +
> +#define SIO_NCT6106_ID 0xc450
> +#define SIO_NCT6116_ID 0xd280
> +#define SIO_NCT6775_ID 0xb470
> +#define SIO_NCT6776_ID 0xc330
> +#define SIO_NCT6779_ID 0xc560
> +#define SIO_NCT6791_ID 0xc800
> +#define SIO_NCT6792_ID 0xc910
> +#define SIO_NCT6793_ID 0xd120
> +#define SIO_NCT6795_ID 0xd350
> +#define SIO_NCT6796_ID 0xd420
> +#define SIO_NCT6797_ID 0xd450
> +#define SIO_NCT6798_ID 0xd428
> +#define SIO_ID_MASK 0xFFF8
> +
> +/*
> + * Control registers
> + */
> +#define NCT6775_REG_CR_FAN_DEBOUNCE 0xf0
> +
> +struct nct6775_sio_data {
> + int sioreg;
> + int ld;
> + enum kinds kind;
> + enum sensor_access access;
> +
> + /* superio_() callbacks */
> + void (*sio_outb)(struct nct6775_sio_data *sio_data, int reg, int val);
> + int (*sio_inb)(struct nct6775_sio_data *sio_data, int reg);
> + void (*sio_select)(struct nct6775_sio_data *sio_data, int ld);
> + int (*sio_enter)(struct nct6775_sio_data *sio_data);
> + void (*sio_exit)(struct nct6775_sio_data *sio_data);
> +};
> +
> +#define ASUSWMI_MONITORING_GUID "466747A0-70EC-11DE-8A39-0800200C9A66"
> +#define ASUSWMI_METHODID_RSIO 0x5253494F
> +#define ASUSWMI_METHODID_WSIO 0x5753494F
> +#define ASUSWMI_METHODID_RHWM 0x5248574D
> +#define ASUSWMI_METHODID_WHWM 0x5748574D
> +#define ASUSWMI_UNSUPPORTED_METHOD 0xFFFFFFFE
> +
> +static int nct6775_asuswmi_evaluate_method(u32 method_id, u8 bank, u8 reg, u8 val, u32 *retval)
> +{
> +#if IS_ENABLED(CONFIG_ACPI_WMI)
> + u32 args = bank | (reg << 8) | (val << 16);
> + struct acpi_buffer input = { (acpi_size) sizeof(args), &args };
> + struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };
> + acpi_status status;
> + union acpi_object *obj;
> + u32 tmp = ASUSWMI_UNSUPPORTED_METHOD;
> +
> + status = wmi_evaluate_method(ASUSWMI_MONITORING_GUID, 0,
> + method_id, &input, &output);
> +
> + if (ACPI_FAILURE(status))
> + return -EIO;
> +
> + obj = output.pointer;
> + if (obj && obj->type == ACPI_TYPE_INTEGER)
> + tmp = obj->integer.value;
> +
> + if (retval)
> + *retval = tmp;
> +
> + kfree(obj);
> +
> + if (tmp == ASUSWMI_UNSUPPORTED_METHOD)
> + return -ENODEV;
> + return 0;
> +#else
> + return -EOPNOTSUPP;
> +#endif
> +}
> +
> +static inline int nct6775_asuswmi_write(u8 bank, u8 reg, u8 val)
> +{
> + return nct6775_asuswmi_evaluate_method(ASUSWMI_METHODID_WHWM, bank,
> + reg, val, NULL);
> +}
> +
> +static inline int nct6775_asuswmi_read(u8 bank, u8 reg, u8 *val)
> +{
> + u32 ret, tmp = 0;
> +
> + ret = nct6775_asuswmi_evaluate_method(ASUSWMI_METHODID_RHWM, bank,
> + reg, 0, &tmp);
> + *val = tmp;
> + return ret;
> +}
> +
> +static int superio_wmi_inb(struct nct6775_sio_data *sio_data, int reg)
> +{
> + int tmp = 0;
> +
> + nct6775_asuswmi_evaluate_method(ASUSWMI_METHODID_RSIO, sio_data->ld,
> + reg, 0, &tmp);
> + return tmp;
> +}
> +
> +static void superio_wmi_outb(struct nct6775_sio_data *sio_data, int reg, int val)
> +{
> + nct6775_asuswmi_evaluate_method(ASUSWMI_METHODID_WSIO, sio_data->ld,
> + reg, val, NULL);
> +}
> +
> +static void superio_wmi_select(struct nct6775_sio_data *sio_data, int ld)
> +{
> + sio_data->ld = ld;
> +}
> +
> +static int superio_wmi_enter(struct nct6775_sio_data *sio_data)
> +{
> + return 0;
> +}
> +
> +static void superio_wmi_exit(struct nct6775_sio_data *sio_data)
> +{
> +}
> +
> +static void superio_outb(struct nct6775_sio_data *sio_data, int reg, int val)
> +{
> + int ioreg = sio_data->sioreg;
> +
> + outb(reg, ioreg);
> + outb(val, ioreg + 1);
> +}
> +
> +static int superio_inb(struct nct6775_sio_data *sio_data, int reg)
> +{
> + int ioreg = sio_data->sioreg;
> +
> + outb(reg, ioreg);
> + return inb(ioreg + 1);
> +}
> +
> +static void superio_select(struct nct6775_sio_data *sio_data, int ld)
> +{
> + int ioreg = sio_data->sioreg;
> +
> + outb(SIO_REG_LDSEL, ioreg);
> + outb(ld, ioreg + 1);
> +}
> +
> +static int superio_enter(struct nct6775_sio_data *sio_data)
> +{
> + int ioreg = sio_data->sioreg;
> +
> + /*
> + * Try to reserve <ioreg> and <ioreg + 1> for exclusive access.
> + */
> + if (!request_muxed_region(ioreg, 2, DRVNAME))
> + return -EBUSY;
> +
> + outb(0x87, ioreg);
> + outb(0x87, ioreg);
> +
> + return 0;
> +}
> +
> +static void superio_exit(struct nct6775_sio_data *sio_data)
> +{
> + int ioreg = sio_data->sioreg;
> +
> + outb(0xaa, ioreg);
> + outb(0x02, ioreg);
> + outb(0x02, ioreg + 1);
> + release_region(ioreg, 2);
> +}
> +
> +static inline void nct6775_wmi_set_bank(struct nct6775_data *data, u16 reg)
> +{
> + u8 bank = reg >> 8;
> +
> + data->bank = bank;
> +}
> +
> +static u16 nct6775_wmi_read_value(struct nct6775_data *data, u16 reg)
> +{
> + int res, err, word_sized = nct6775_reg_is_word_sized(data, reg);
> + u8 tmp = 0;
> +
> + nct6775_wmi_set_bank(data, reg);
> +
> + err = nct6775_asuswmi_read(data->bank, reg & 0xff, &tmp);
> + if (err)
> + return 0;
> +
> + res = tmp;
> + if (word_sized) {
> + err = nct6775_asuswmi_read(data->bank, (reg & 0xff) + 1, &tmp);
> + if (err)
> + return 0;
> +
> + res = (res << 8) + tmp;
> + }
> + return res;
> +}
> +
> +static int nct6775_wmi_write_value(struct nct6775_data *data, u16 reg, u16 value)
> +{
> + int res, word_sized = nct6775_reg_is_word_sized(data, reg);
> +
> + nct6775_wmi_set_bank(data, reg);
> +
> + if (word_sized) {
> + res = nct6775_asuswmi_write(data->bank, reg & 0xff, value >> 8);
> + if (res)
> + return res;
> +
> + res = nct6775_asuswmi_write(data->bank, (reg & 0xff) + 1, value);
> + } else {
> + res = nct6775_asuswmi_write(data->bank, reg & 0xff, value);
> + }
> +
> + return res;
> +}
> +
> +/*
> + * On older chips, only registers 0x50-0x5f are banked.
> + * On more recent chips, all registers are banked.
> + * Assume that is the case and set the bank number for each access.
> + * Cache the bank number so it only needs to be set if it changes.
> + */
> +static inline void nct6775_set_bank(struct nct6775_data *data, u16 reg)
> +{
> + u8 bank = reg >> 8;
> +
> + if (data->bank != bank) {
> + outb_p(NCT6775_REG_BANK, data->addr + ADDR_REG_OFFSET);
> + outb_p(bank, data->addr + DATA_REG_OFFSET);
> + data->bank = bank;
> + }
> +}
> +
> +static u16 nct6775_read_value(struct nct6775_data *data, u16 reg)
> +{
> + int res, word_sized = nct6775_reg_is_word_sized(data, reg);
> +
> + nct6775_set_bank(data, reg);
> + outb_p(reg & 0xff, data->addr + ADDR_REG_OFFSET);
> + res = inb_p(data->addr + DATA_REG_OFFSET);
> + if (word_sized) {
> + outb_p((reg & 0xff) + 1,
> + data->addr + ADDR_REG_OFFSET);
> + res = (res << 8) + inb_p(data->addr + DATA_REG_OFFSET);
> + }
> + return res;
> +}
> +
> +static int nct6775_write_value(struct nct6775_data *data, u16 reg, u16 value)
> +{
> + int word_sized = nct6775_reg_is_word_sized(data, reg);
> +
> + nct6775_set_bank(data, reg);
> + outb_p(reg & 0xff, data->addr + ADDR_REG_OFFSET);
> + if (word_sized) {
> + outb_p(value >> 8, data->addr + DATA_REG_OFFSET);
> + outb_p((reg & 0xff) + 1,
> + data->addr + ADDR_REG_OFFSET);
> + }
> + outb_p(value & 0xff, data->addr + DATA_REG_OFFSET);
> + return 0;
> +}
> +
> +static void nct6791_enable_io_mapping(struct nct6775_sio_data *sio_data)
> +{
> + int val;
> +
> + val = sio_data->sio_inb(sio_data, NCT6791_REG_HM_IO_SPACE_LOCK_ENABLE);
> + if (val & 0x10) {
> + pr_info("Enabling hardware monitor logical device mappings.\n");
> + sio_data->sio_outb(sio_data, NCT6791_REG_HM_IO_SPACE_LOCK_ENABLE,
> + val & ~0x10);
> + }
> +}
> +
> +static int __maybe_unused nct6775_suspend(struct device *dev)
> +{
> + struct nct6775_data *data = nct6775_update_device(dev);
> +
> + mutex_lock(&data->update_lock);
> + data->vbat = data->read_value(data, data->REG_VBAT);
> + if (data->kind == nct6775) {
> + data->fandiv1 = data->read_value(data, NCT6775_REG_FANDIV1);
> + data->fandiv2 = data->read_value(data, NCT6775_REG_FANDIV2);
> + }
> + mutex_unlock(&data->update_lock);
> +
> + return 0;
> +}
> +
> +static int __maybe_unused nct6775_resume(struct device *dev)
> +{
> + struct nct6775_data *data = dev_get_drvdata(dev);
> + struct nct6775_sio_data *sio_data = dev_get_platdata(dev);
> + int i, j, err = 0;
> + u8 reg;
> +
> + mutex_lock(&data->update_lock);
> + data->bank = 0xff; /* Force initial bank selection */
> +
> + err = sio_data->sio_enter(sio_data);
> + if (err)
> + goto abort;
> +
> + sio_data->sio_select(sio_data, NCT6775_LD_HWM);
> + reg = sio_data->sio_inb(sio_data, SIO_REG_ENABLE);
> + if (reg != data->sio_reg_enable)
> + sio_data->sio_outb(sio_data, SIO_REG_ENABLE, data->sio_reg_enable);
> +
> + if (data->kind == nct6791 || data->kind == nct6792 ||
> + data->kind == nct6793 || data->kind == nct6795 ||
> + data->kind == nct6796 || data->kind == nct6797 ||
> + data->kind == nct6798)
> + nct6791_enable_io_mapping(sio_data);
> +
> + sio_data->sio_exit(sio_data);
> +
> + /* Restore limits */
> + for (i = 0; i < data->in_num; i++) {
> + if (!(data->have_in & BIT(i)))
> + continue;
> +
> + data->write_value(data, data->REG_IN_MINMAX[0][i],
> + data->in[i][1]);
> + data->write_value(data, data->REG_IN_MINMAX[1][i],
> + data->in[i][2]);
> + }
> +
> + for (i = 0; i < ARRAY_SIZE(data->fan_min); i++) {
> + if (!(data->has_fan_min & BIT(i)))
> + continue;
> +
> + data->write_value(data, data->REG_FAN_MIN[i],
> + data->fan_min[i]);
> + }
> +
> + for (i = 0; i < NUM_TEMP; i++) {
> + if (!(data->have_temp & BIT(i)))
> + continue;
> +
> + for (j = 1; j < ARRAY_SIZE(data->reg_temp); j++)
> + if (data->reg_temp[j][i])
> + nct6775_write_temp(data, data->reg_temp[j][i],
> + data->temp[j][i]);
> + }
> +
> + /* Restore other settings */
> + data->write_value(data, data->REG_VBAT, data->vbat);
> + if (data->kind == nct6775) {
> + data->write_value(data, NCT6775_REG_FANDIV1, data->fandiv1);
> + data->write_value(data, NCT6775_REG_FANDIV2, data->fandiv2);
> + }
> +
> +abort:
> + /* Force re-reading all values */
> + data->valid = false;
> + mutex_unlock(&data->update_lock);
> +
> + return err;
> +}
> +
> +static SIMPLE_DEV_PM_OPS(nct6775_dev_pm_ops, nct6775_suspend, nct6775_resume);
> +
> +static void
> +nct6775_check_fan_inputs(struct nct6775_data *data, struct nct6775_sio_data *sio_data)
> +{
> + bool fan3pin = false, fan4pin = false, fan4min = false;
> + bool fan5pin = false, fan6pin = false, fan7pin = false;
> + bool pwm3pin = false, pwm4pin = false, pwm5pin = false;
> + bool pwm6pin = false, pwm7pin = false;
> +
> + /* Store SIO_REG_ENABLE for use during resume */
> + sio_data->sio_select(sio_data, NCT6775_LD_HWM);
> + data->sio_reg_enable = sio_data->sio_inb(sio_data, SIO_REG_ENABLE);
> +
> + /* fan4 and fan5 share some pins with the GPIO and serial flash */
> + if (data->kind == nct6775) {
> + int cr2c = sio_data->sio_inb(sio_data, 0x2c);
> +
> + fan3pin = cr2c & BIT(6);
> + pwm3pin = cr2c & BIT(7);
> +
> + /* On NCT6775, fan4 shares pins with the fdc interface */
> + fan4pin = !(sio_data->sio_inb(sio_data, 0x2A) & 0x80);
> + } else if (data->kind == nct6776) {
> + bool gpok = sio_data->sio_inb(sio_data, 0x27) & 0x80;
> + const char *board_vendor, *board_name;
> +
> + board_vendor = dmi_get_system_info(DMI_BOARD_VENDOR);
> + board_name = dmi_get_system_info(DMI_BOARD_NAME);
> +
> + if (board_name && board_vendor &&
> + !strcmp(board_vendor, "ASRock")) {
> + /*
> + * Auxiliary fan monitoring is not enabled on ASRock
> + * Z77 Pro4-M if booted in UEFI Ultra-FastBoot mode.
> + * Observed with BIOS version 2.00.
> + */
> + if (!strcmp(board_name, "Z77 Pro4-M")) {
> + if ((data->sio_reg_enable & 0xe0) != 0xe0) {
> + data->sio_reg_enable |= 0xe0;
> + sio_data->sio_outb(sio_data, SIO_REG_ENABLE,
> + data->sio_reg_enable);
> + }
> + }
> + }
> +
> + if (data->sio_reg_enable & 0x80)
> + fan3pin = gpok;
> + else
> + fan3pin = !(sio_data->sio_inb(sio_data, 0x24) & 0x40);
> +
> + if (data->sio_reg_enable & 0x40)
> + fan4pin = gpok;
> + else
> + fan4pin = sio_data->sio_inb(sio_data, 0x1C) & 0x01;
> +
> + if (data->sio_reg_enable & 0x20)
> + fan5pin = gpok;
> + else
> + fan5pin = sio_data->sio_inb(sio_data, 0x1C) & 0x02;
> +
> + fan4min = fan4pin;
> + pwm3pin = fan3pin;
> + } else if (data->kind == nct6106) {
> + int cr24 = sio_data->sio_inb(sio_data, 0x24);
> +
> + fan3pin = !(cr24 & 0x80);
> + pwm3pin = cr24 & 0x08;
> + } else if (data->kind == nct6116) {
> + int cr1a = sio_data->sio_inb(sio_data, 0x1a);
> + int cr1b = sio_data->sio_inb(sio_data, 0x1b);
> + int cr24 = sio_data->sio_inb(sio_data, 0x24);
> + int cr2a = sio_data->sio_inb(sio_data, 0x2a);
> + int cr2b = sio_data->sio_inb(sio_data, 0x2b);
> + int cr2f = sio_data->sio_inb(sio_data, 0x2f);
> +
> + fan3pin = !(cr2b & 0x10);
> + fan4pin = (cr2b & 0x80) || // pin 1(2)
> + (!(cr2f & 0x10) && (cr1a & 0x04)); // pin 65(66)
> + fan5pin = (cr2b & 0x80) || // pin 126(127)
> + (!(cr1b & 0x03) && (cr2a & 0x02)); // pin 94(96)
> +
> + pwm3pin = fan3pin && (cr24 & 0x08);
> + pwm4pin = fan4pin;
> + pwm5pin = fan5pin;
> + } else {
> + /*
> + * NCT6779D, NCT6791D, NCT6792D, NCT6793D, NCT6795D, NCT6796D,
> + * NCT6797D, NCT6798D
> + */
> + int cr1a = sio_data->sio_inb(sio_data, 0x1a);
> + int cr1b = sio_data->sio_inb(sio_data, 0x1b);
> + int cr1c = sio_data->sio_inb(sio_data, 0x1c);
> + int cr1d = sio_data->sio_inb(sio_data, 0x1d);
> + int cr2a = sio_data->sio_inb(sio_data, 0x2a);
> + int cr2b = sio_data->sio_inb(sio_data, 0x2b);
> + int cr2d = sio_data->sio_inb(sio_data, 0x2d);
> + int cr2f = sio_data->sio_inb(sio_data, 0x2f);
> + bool dsw_en = cr2f & BIT(3);
> + bool ddr4_en = cr2f & BIT(4);
> + int cre0;
> + int creb;
> + int cred;
> +
> + sio_data->sio_select(sio_data, NCT6775_LD_12);
> + cre0 = sio_data->sio_inb(sio_data, 0xe0);
> + creb = sio_data->sio_inb(sio_data, 0xeb);
> + cred = sio_data->sio_inb(sio_data, 0xed);
> +
> + fan3pin = !(cr1c & BIT(5));
> + fan4pin = !(cr1c & BIT(6));
> + fan5pin = !(cr1c & BIT(7));
> +
> + pwm3pin = !(cr1c & BIT(0));
> + pwm4pin = !(cr1c & BIT(1));
> + pwm5pin = !(cr1c & BIT(2));
> +
> + switch (data->kind) {
> + case nct6791:
> + fan6pin = cr2d & BIT(1);
> + pwm6pin = cr2d & BIT(0);
> + break;
> + case nct6792:
> + fan6pin = !dsw_en && (cr2d & BIT(1));
> + pwm6pin = !dsw_en && (cr2d & BIT(0));
> + break;
> + case nct6793:
> + fan5pin |= cr1b & BIT(5);
> + fan5pin |= creb & BIT(5);
> +
> + fan6pin = !dsw_en && (cr2d & BIT(1));
> + fan6pin |= creb & BIT(3);
> +
> + pwm5pin |= cr2d & BIT(7);
> + pwm5pin |= (creb & BIT(4)) && !(cr2a & BIT(0));
> +
> + pwm6pin = !dsw_en && (cr2d & BIT(0));
> + pwm6pin |= creb & BIT(2);
> + break;
> + case nct6795:
> + fan5pin |= cr1b & BIT(5);
> + fan5pin |= creb & BIT(5);
> +
> + fan6pin = (cr2a & BIT(4)) &&
> + (!dsw_en || (cred & BIT(4)));
> + fan6pin |= creb & BIT(3);
> +
> + pwm5pin |= cr2d & BIT(7);
> + pwm5pin |= (creb & BIT(4)) && !(cr2a & BIT(0));
> +
> + pwm6pin = (cr2a & BIT(3)) && (cred & BIT(2));
> + pwm6pin |= creb & BIT(2);
> + break;
> + case nct6796:
> + fan5pin |= cr1b & BIT(5);
> + fan5pin |= (cre0 & BIT(3)) && !(cr1b & BIT(0));
> + fan5pin |= creb & BIT(5);
> +
> + fan6pin = (cr2a & BIT(4)) &&
> + (!dsw_en || (cred & BIT(4)));
> + fan6pin |= creb & BIT(3);
> +
> + fan7pin = !(cr2b & BIT(2));
> +
> + pwm5pin |= cr2d & BIT(7);
> + pwm5pin |= (cre0 & BIT(4)) && !(cr1b & BIT(0));
> + pwm5pin |= (creb & BIT(4)) && !(cr2a & BIT(0));
> +
> + pwm6pin = (cr2a & BIT(3)) && (cred & BIT(2));
> + pwm6pin |= creb & BIT(2);
> +
> + pwm7pin = !(cr1d & (BIT(2) | BIT(3)));
> + break;
> + case nct6797:
> + fan5pin |= !ddr4_en && (cr1b & BIT(5));
> + fan5pin |= creb & BIT(5);
> +
> + fan6pin = cr2a & BIT(4);
> + fan6pin |= creb & BIT(3);
> +
> + fan7pin = cr1a & BIT(1);
> +
> + pwm5pin |= (creb & BIT(4)) && !(cr2a & BIT(0));
> + pwm5pin |= !ddr4_en && (cr2d & BIT(7));
> +
> + pwm6pin = creb & BIT(2);
> + pwm6pin |= cred & BIT(2);
> +
> + pwm7pin = cr1d & BIT(4);
> + break;
> + case nct6798:
> + fan6pin = !(cr1b & BIT(0)) && (cre0 & BIT(3));
> + fan6pin |= cr2a & BIT(4);
> + fan6pin |= creb & BIT(5);
> +
> + fan7pin = cr1b & BIT(5);
> + fan7pin |= !(cr2b & BIT(2));
> + fan7pin |= creb & BIT(3);
> +
> + pwm6pin = !(cr1b & BIT(0)) && (cre0 & BIT(4));
> + pwm6pin |= !(cred & BIT(2)) && (cr2a & BIT(3));
> + pwm6pin |= (creb & BIT(4)) && !(cr2a & BIT(0));
> +
> + pwm7pin = !(cr1d & (BIT(2) | BIT(3)));
> + pwm7pin |= cr2d & BIT(7);
> + pwm7pin |= creb & BIT(2);
> + break;
> + default: /* NCT6779D */
> + break;
> + }
> +
> + fan4min = fan4pin;
> + }
> +
> + /* fan 1 and 2 (0x03) are always present */
> + data->has_fan = 0x03 | (fan3pin << 2) | (fan4pin << 3) |
> + (fan5pin << 4) | (fan6pin << 5) | (fan7pin << 6);
> + data->has_fan_min = 0x03 | (fan3pin << 2) | (fan4min << 3) |
> + (fan5pin << 4) | (fan6pin << 5) | (fan7pin << 6);
> + data->has_pwm = 0x03 | (pwm3pin << 2) | (pwm4pin << 3) |
> + (pwm5pin << 4) | (pwm6pin << 5) | (pwm7pin << 6);
> +}
> +
> +static ssize_t
> +cpu0_vid_show(struct device *dev, struct device_attribute *attr, char *buf)
> +{
> + struct nct6775_data *data = dev_get_drvdata(dev);
> +
> + return sprintf(buf, "%d\n", vid_from_reg(data->vid, data->vrm));
> +}
> +
> +static DEVICE_ATTR_RO(cpu0_vid);
> +
> +/* Case open detection */
> +
> +static const u8 NCT6775_REG_CR_CASEOPEN_CLR[] = { 0xe6, 0xee };
> +static const u8 NCT6775_CR_CASEOPEN_CLR_MASK[] = { 0x20, 0x01 };
> +
> +static ssize_t
> +clear_caseopen(struct device *dev, struct device_attribute *attr,
> + const char *buf, size_t count)
> +{
> + struct nct6775_data *data = dev_get_drvdata(dev);
> + struct nct6775_sio_data *sio_data = data->driver_data;
> + int nr = to_sensor_dev_attr(attr)->index - INTRUSION_ALARM_BASE;
> + unsigned long val;
> + u8 reg;
> + int ret;
> +
> + if (kstrtoul(buf, 10, &val) || val != 0)
> + return -EINVAL;
> +
> + mutex_lock(&data->update_lock);
> +
> + /*
> + * Use CR registers to clear caseopen status.
> + * The CR registers are the same for all chips, and not all chips
> + * support clearing the caseopen status through "regular" registers.
> + */
> + ret = sio_data->sio_enter(sio_data);
> + if (ret) {
> + count = ret;
> + goto error;
> + }
> +
> + sio_data->sio_select(sio_data, NCT6775_LD_ACPI);
> + reg = sio_data->sio_inb(sio_data, NCT6775_REG_CR_CASEOPEN_CLR[nr]);
> + reg |= NCT6775_CR_CASEOPEN_CLR_MASK[nr];
> + sio_data->sio_outb(sio_data, NCT6775_REG_CR_CASEOPEN_CLR[nr], reg);
> + reg &= ~NCT6775_CR_CASEOPEN_CLR_MASK[nr];
> + sio_data->sio_outb(sio_data, NCT6775_REG_CR_CASEOPEN_CLR[nr], reg);
> + sio_data->sio_exit(sio_data);
> +
> + data->valid = false; /* Force cache refresh */
> +error:
> + mutex_unlock(&data->update_lock);
> + return count;
> +}
> +
> +static SENSOR_DEVICE_ATTR(intrusion0_alarm, S_IWUSR | S_IRUGO, nct6775_show_alarm,
> + clear_caseopen, INTRUSION_ALARM_BASE);
> +static SENSOR_DEVICE_ATTR(intrusion1_alarm, S_IWUSR | S_IRUGO, nct6775_show_alarm,
> + clear_caseopen, INTRUSION_ALARM_BASE + 1);
> +static SENSOR_DEVICE_ATTR(intrusion0_beep, S_IWUSR | S_IRUGO, nct6775_show_beep,
> + nct6775_store_beep, INTRUSION_ALARM_BASE);
> +static SENSOR_DEVICE_ATTR(intrusion1_beep, S_IWUSR | S_IRUGO, nct6775_show_beep,
> + nct6775_store_beep, INTRUSION_ALARM_BASE + 1);
> +static SENSOR_DEVICE_ATTR(beep_enable, S_IWUSR | S_IRUGO, nct6775_show_beep,
> + nct6775_store_beep, BEEP_ENABLE_BASE);
> +
> +static umode_t nct6775_other_is_visible(struct kobject *kobj,
> + struct attribute *attr, int index)
> +{
> + struct device *dev = kobj_to_dev(kobj);
> + struct nct6775_data *data = dev_get_drvdata(dev);
> +
> + if (index == 0 && !data->have_vid)
> + return 0;
> +
> + if (index == 1 || index == 2) {
> + if (data->ALARM_BITS[INTRUSION_ALARM_BASE + index - 1] < 0)
> + return 0;
> + }
> +
> + if (index == 3 || index == 4) {
> + if (data->BEEP_BITS[INTRUSION_ALARM_BASE + index - 3] < 0)
> + return 0;
> + }
> +
> + return nct6775_attr_mode(data, attr);
> +}
> +
> +/*
> + * nct6775_other_is_visible uses the index into the following array
> + * to determine if attributes should be created or not.
> + * Any change in order or content must be matched.
> + */
> +static struct attribute *nct6775_attributes_other[] = {
> + &dev_attr_cpu0_vid.attr, /* 0 */
> + &sensor_dev_attr_intrusion0_alarm.dev_attr.attr, /* 1 */
> + &sensor_dev_attr_intrusion1_alarm.dev_attr.attr, /* 2 */
> + &sensor_dev_attr_intrusion0_beep.dev_attr.attr, /* 3 */
> + &sensor_dev_attr_intrusion1_beep.dev_attr.attr, /* 4 */
> + &sensor_dev_attr_beep_enable.dev_attr.attr, /* 5 */
> +
> + NULL
> +};
> +
> +static const struct attribute_group nct6775_group_other = {
> + .attrs = nct6775_attributes_other,
> + .is_visible = nct6775_other_is_visible,
> +};
> +
> +static int nct6775_platform_probe_init(struct nct6775_data *data)
> +{
> + int err;
> + u8 cr2a;
> + struct nct6775_sio_data *sio_data = data->driver_data;
> +
> + err = sio_data->sio_enter(sio_data);
> + if (err)
> + return err;
> +
> + cr2a = sio_data->sio_inb(sio_data, 0x2a);
> + switch (data->kind) {
> + case nct6775:
> + data->have_vid = (cr2a & 0x40);
> + break;
> + case nct6776:
> + data->have_vid = (cr2a & 0x60) == 0x40;
> + break;
> + case nct6106:
> + case nct6116:
> + case nct6779:
> + case nct6791:
> + case nct6792:
> + case nct6793:
> + case nct6795:
> + case nct6796:
> + case nct6797:
> + case nct6798:
> + break;
> + }
> +
> + /*
> + * Read VID value
> + * We can get the VID input values directly at logical device D 0xe3.
> + */
> + if (data->have_vid) {
> + sio_data->sio_select(sio_data, NCT6775_LD_VID);
> + data->vid = sio_data->sio_inb(sio_data, 0xe3);
> + data->vrm = vid_which_vrm();
> + }
> +
> + if (fan_debounce) {
> + u8 tmp;
> +
> + sio_data->sio_select(sio_data, NCT6775_LD_HWM);
> + tmp = sio_data->sio_inb(sio_data,
> + NCT6775_REG_CR_FAN_DEBOUNCE);
> + switch (data->kind) {
> + case nct6106:
> + case nct6116:
> + tmp |= 0xe0;
> + break;
> + case nct6775:
> + tmp |= 0x1e;
> + break;
> + case nct6776:
> + case nct6779:
> + tmp |= 0x3e;
> + break;
> + case nct6791:
> + case nct6792:
> + case nct6793:
> + case nct6795:
> + case nct6796:
> + case nct6797:
> + case nct6798:
> + tmp |= 0x7e;
> + break;
> + }
> + sio_data->sio_outb(sio_data, NCT6775_REG_CR_FAN_DEBOUNCE,
> + tmp);
> + pr_info("Enabled fan debounce for chip %s\n", data->name);
> + }
> +
> + nct6775_check_fan_inputs(data, sio_data);
> +
> + sio_data->sio_exit(sio_data);
> +
> + return nct6775_add_attr_group(data, &nct6775_group_other);
> +}
> +
> +static int nct6775_platform_probe(struct platform_device *pdev)
> +{
> + struct device *dev = &pdev->dev;
> + struct nct6775_sio_data *sio_data = dev_get_platdata(dev);
> + struct nct6775_data *data;
> + struct resource *res;
> +
> + if (sio_data->access == access_direct) {
> + res = platform_get_resource(pdev, IORESOURCE_IO, 0);
> + if (!devm_request_region(&pdev->dev, res->start, IOREGION_LENGTH, DRVNAME))
> + return -EBUSY;
> + }
> +
> + data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
> + if (!data)
> + return -ENOMEM;
> +
> + data->kind = sio_data->kind;
> + data->sioreg = sio_data->sioreg;
> +
> + if (sio_data->access == access_direct) {
> + data->addr = res->start;
> + data->read_value = nct6775_read_value;
> + data->write_value = nct6775_write_value;
> + } else {
> + data->read_value = nct6775_wmi_read_value;
> + data->write_value = nct6775_wmi_write_value;
> + }
> +
> + platform_set_drvdata(pdev, data);
> +
> + data->driver_data = sio_data;
> + data->driver_init = nct6775_platform_probe_init;
> +
> + return nct6775_probe(&pdev->dev, data);
> +}
> +
> +static struct platform_driver nct6775_driver = {
> + .driver = {
> + .name = DRVNAME,
> + .pm = &nct6775_dev_pm_ops,
> + },
> + .probe = nct6775_platform_probe,
> +};
> +
> +/* nct6775_find() looks for a '627 in the Super-I/O config space */
> +static int __init nct6775_find(int sioaddr, struct nct6775_sio_data *sio_data)
> +{
> + u16 val;
> + int err;
> + int addr;
> +
> + sio_data->access = access_direct;
> + sio_data->sioreg = sioaddr;
> +
> + err = sio_data->sio_enter(sio_data);
> + if (err)
> + return err;
> +
> + val = (sio_data->sio_inb(sio_data, SIO_REG_DEVID) << 8) |
> + sio_data->sio_inb(sio_data, SIO_REG_DEVID + 1);
> + if (force_id && val != 0xffff)
> + val = force_id;
> +
> + switch (val & SIO_ID_MASK) {
> + case SIO_NCT6106_ID:
> + sio_data->kind = nct6106;
> + break;
> + case SIO_NCT6116_ID:
> + sio_data->kind = nct6116;
> + break;
> + case SIO_NCT6775_ID:
> + sio_data->kind = nct6775;
> + break;
> + case SIO_NCT6776_ID:
> + sio_data->kind = nct6776;
> + break;
> + case SIO_NCT6779_ID:
> + sio_data->kind = nct6779;
> + break;
> + case SIO_NCT6791_ID:
> + sio_data->kind = nct6791;
> + break;
> + case SIO_NCT6792_ID:
> + sio_data->kind = nct6792;
> + break;
> + case SIO_NCT6793_ID:
> + sio_data->kind = nct6793;
> + break;
> + case SIO_NCT6795_ID:
> + sio_data->kind = nct6795;
> + break;
> + case SIO_NCT6796_ID:
> + sio_data->kind = nct6796;
> + break;
> + case SIO_NCT6797_ID:
> + sio_data->kind = nct6797;
> + break;
> + case SIO_NCT6798_ID:
> + sio_data->kind = nct6798;
> + break;
> + default:
> + if (val != 0xffff)
> + pr_debug("unsupported chip ID: 0x%04x\n", val);
> + sio_data->sio_exit(sio_data);
> + return -ENODEV;
> + }
> +
> + /* We have a known chip, find the HWM I/O address */
> + sio_data->sio_select(sio_data, NCT6775_LD_HWM);
> + val = (sio_data->sio_inb(sio_data, SIO_REG_ADDR) << 8)
> + | sio_data->sio_inb(sio_data, SIO_REG_ADDR + 1);
> + addr = val & IOREGION_ALIGNMENT;
> + if (addr == 0) {
> + pr_err("Refusing to enable a Super-I/O device with a base I/O port 0\n");
> + sio_data->sio_exit(sio_data);
> + return -ENODEV;
> + }
> +
> + /* Activate logical device if needed */
> + val = sio_data->sio_inb(sio_data, SIO_REG_ENABLE);
> + if (!(val & 0x01)) {
> + pr_warn("Forcibly enabling Super-I/O. Sensor is probably unusable.\n");
> + sio_data->sio_outb(sio_data, SIO_REG_ENABLE, val | 0x01);
> + }
> +
> + if (sio_data->kind == nct6791 || sio_data->kind == nct6792 ||
> + sio_data->kind == nct6793 || sio_data->kind == nct6795 ||
> + sio_data->kind == nct6796 || sio_data->kind == nct6797 ||
> + sio_data->kind == nct6798)
> + nct6791_enable_io_mapping(sio_data);
> +
> + sio_data->sio_exit(sio_data);
> + pr_info("Found %s or compatible chip at %#x:%#x\n",
> + nct6775_sio_names[sio_data->kind], sioaddr, addr);
> +
> + return addr;
> +}
> +
> +/*
> + * when Super-I/O functions move to a separate file, the Super-I/O
> + * bus will manage the lifetime of the device and this module will only keep
> + * track of the nct6775 driver. But since we use platform_device_alloc(), we
> + * must keep track of the device
> + */
> +static struct platform_device *pdev[2];
> +
> +static const char * const asus_wmi_boards[] = {
> + "ProArt X570-CREATOR WIFI",
> + "Pro B550M-C",
> + "Pro WS X570-ACE",
> + "PRIME B360-PLUS",
> + "PRIME B460-PLUS",
> + "PRIME B550-PLUS",
> + "PRIME B550M-A",
> + "PRIME B550M-A (WI-FI)",
> + "PRIME X570-P",
> + "PRIME X570-PRO",
> + "ROG CROSSHAIR VIII DARK HERO",
> + "ROG CROSSHAIR VIII FORMULA",
> + "ROG CROSSHAIR VIII HERO",
> + "ROG CROSSHAIR VIII IMPACT",
> + "ROG STRIX B550-A GAMING",
> + "ROG STRIX B550-E GAMING",
> + "ROG STRIX B550-F GAMING",
> + "ROG STRIX B550-F GAMING (WI-FI)",
> + "ROG STRIX B550-F GAMING WIFI II",
> + "ROG STRIX B550-I GAMING",
> + "ROG STRIX B550-XE GAMING (WI-FI)",
> + "ROG STRIX X570-E GAMING",
> + "ROG STRIX X570-F GAMING",
> + "ROG STRIX X570-I GAMING",
> + "ROG STRIX Z390-E GAMING",
> + "ROG STRIX Z390-F GAMING",
> + "ROG STRIX Z390-H GAMING",
> + "ROG STRIX Z390-I GAMING",
> + "ROG STRIX Z490-A GAMING",
> + "ROG STRIX Z490-E GAMING",
> + "ROG STRIX Z490-F GAMING",
> + "ROG STRIX Z490-G GAMING",
> + "ROG STRIX Z490-G GAMING (WI-FI)",
> + "ROG STRIX Z490-H GAMING",
> + "ROG STRIX Z490-I GAMING",
> + "TUF GAMING B550M-PLUS",
> + "TUF GAMING B550M-PLUS (WI-FI)",
> + "TUF GAMING B550-PLUS",
> + "TUF GAMING B550-PRO",
> + "TUF GAMING X570-PLUS",
> + "TUF GAMING X570-PLUS (WI-FI)",
> + "TUF GAMING X570-PRO (WI-FI)",
> + "TUF GAMING Z490-PLUS",
> + "TUF GAMING Z490-PLUS (WI-FI)",
> +};
> +
> +static int __init sensors_nct6775_platform_init(void)
> +{
> + int i, err;
> + bool found = false;
> + int address;
> + struct resource res;
> + struct nct6775_sio_data sio_data;
> + int sioaddr[2] = { 0x2e, 0x4e };
> + enum sensor_access access = access_direct;
> + const char *board_vendor, *board_name;
> + u8 tmp;
> +
> + err = platform_driver_register(&nct6775_driver);
> + if (err)
> + return err;
> +
> + board_vendor = dmi_get_system_info(DMI_BOARD_VENDOR);
> + board_name = dmi_get_system_info(DMI_BOARD_NAME);
> +
> + if (board_name && board_vendor &&
> + !strcmp(board_vendor, "ASUSTeK COMPUTER INC.")) {
> + err = match_string(asus_wmi_boards, ARRAY_SIZE(asus_wmi_boards),
> + board_name);
> + if (err >= 0) {
> + /* if reading chip id via WMI succeeds, use WMI */
> + if (!nct6775_asuswmi_read(0, NCT6775_PORT_CHIPID, &tmp) && tmp) {
> + pr_info("Using Asus WMI to access %#x chip.\n", tmp);
> + access = access_asuswmi;
> + } else {
> + pr_err("Can't read ChipID by Asus WMI.\n");
> + }
> + }
> + }
> +
> + /*
> + * initialize sio_data->kind and sio_data->sioreg.
> + *
> + * when Super-I/O functions move to a separate file, the Super-I/O
> + * driver will probe 0x2e and 0x4e and auto-detect the presence of a
> + * nct6775 hardware monitor, and call probe()
> + */
> + for (i = 0; i < ARRAY_SIZE(pdev); i++) {
> + sio_data.sio_outb = superio_outb;
> + sio_data.sio_inb = superio_inb;
> + sio_data.sio_select = superio_select;
> + sio_data.sio_enter = superio_enter;
> + sio_data.sio_exit = superio_exit;
> +
> + address = nct6775_find(sioaddr[i], &sio_data);
> + if (address <= 0)
> + continue;
> +
> + found = true;
> +
> + sio_data.access = access;
> +
> + if (access == access_asuswmi) {
> + sio_data.sio_outb = superio_wmi_outb;
> + sio_data.sio_inb = superio_wmi_inb;
> + sio_data.sio_select = superio_wmi_select;
> + sio_data.sio_enter = superio_wmi_enter;
> + sio_data.sio_exit = superio_wmi_exit;
> + }
> +
> + pdev[i] = platform_device_alloc(DRVNAME, address);
> + if (!pdev[i]) {
> + err = -ENOMEM;
> + goto exit_device_unregister;
> + }
> +
> + err = platform_device_add_data(pdev[i], &sio_data,
> + sizeof(struct nct6775_sio_data));
> + if (err)
> + goto exit_device_put;
> +
> + if (sio_data.access == access_direct) {
> + memset(&res, 0, sizeof(res));
> + res.name = DRVNAME;
> + res.start = address + IOREGION_OFFSET;
> + res.end = address + IOREGION_OFFSET + IOREGION_LENGTH - 1;
> + res.flags = IORESOURCE_IO;
> +
> + err = acpi_check_resource_conflict(&res);
> + if (err) {
> + platform_device_put(pdev[i]);
> + pdev[i] = NULL;
> + continue;
> + }
> +
> + err = platform_device_add_resources(pdev[i], &res, 1);
> + if (err)
> + goto exit_device_put;
> + }
> +
> + /* platform_device_add calls probe() */
> + err = platform_device_add(pdev[i]);
> + if (err)
> + goto exit_device_put;
> + }
> + if (!found) {
> + err = -ENODEV;
> + goto exit_unregister;
> + }
> +
> + return 0;
> +
> +exit_device_put:
> + platform_device_put(pdev[i]);
> +exit_device_unregister:
> + while (--i >= 0) {
> + if (pdev[i])
> + platform_device_unregister(pdev[i]);
> + }
> +exit_unregister:
> + platform_driver_unregister(&nct6775_driver);
> + return err;
> +}
> +
> +static void __exit sensors_nct6775_platform_exit(void)
> +{
> + int i;
> +
> + for (i = 0; i < ARRAY_SIZE(pdev); i++) {
> + if (pdev[i])
> + platform_device_unregister(pdev[i]);
> + }
> + platform_driver_unregister(&nct6775_driver);
> +}
> +
> +MODULE_AUTHOR("Guenter Roeck <linux@roeck-us.net>");
> +MODULE_DESCRIPTION("Platform driver for NCT6775F and compatible chips");
> +MODULE_LICENSE("GPL");
> +
> +/*
> + * For module-name compatibility with the original version of this driver
> + * prior to the core/platform/i2c split
> + */
> +MODULE_ALIAS("nct6775");
> +
> +module_init(sensors_nct6775_platform_init);
> +module_exit(sensors_nct6775_platform_exit);
> diff --git a/drivers/hwmon/nct6775.h b/drivers/hwmon/nct6775.h
> new file mode 100644
> index 000000000000..1cb754a2284b
> --- /dev/null
> +++ b/drivers/hwmon/nct6775.h
> @@ -0,0 +1,233 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
> +#ifndef __HWMON_NCT6775_H__
> +#define __HWMON_NCT6775_H__
> +
> +#include <linux/types.h>
> +
> +enum kinds { nct6106, nct6116, nct6775, nct6776, nct6779, nct6791, nct6792,
> + nct6793, nct6795, nct6796, nct6797, nct6798 };
> +enum pwm_enable { off, manual, thermal_cruise, speed_cruise, sf3, sf4 };
> +
> +#define NUM_TEMP 10 /* Max number of temp attribute sets w/ limits*/
> +#define NUM_TEMP_FIXED 6 /* Max number of fixed temp attribute sets */
> +#define NUM_TSI_TEMP 8 /* Max number of TSI temp register pairs */
> +
> +#define NUM_REG_ALARM 7 /* Max number of alarm registers */
> +#define NUM_REG_BEEP 5 /* Max number of beep registers */
> +
> +#define NUM_FAN 7
> +
> +struct nct6775_data {
> + int addr; /* IO base of hw monitor block */
> + int sioreg; /* SIO register address */
> + enum kinds kind;
> + const char *name;
> +
> + const struct attribute_group *groups[7];
> + u8 num_groups;
> +
> + u16 reg_temp[5][NUM_TEMP]; /* 0=temp, 1=temp_over, 2=temp_hyst,
> + * 3=temp_crit, 4=temp_lcrit
> + */
> + u8 temp_src[NUM_TEMP];
> + u16 reg_temp_config[NUM_TEMP];
> + const char * const *temp_label;
> + u32 temp_mask;
> + u32 virt_temp_mask;
> +
> + u16 REG_CONFIG;
> + u16 REG_VBAT;
> + u16 REG_DIODE;
> + u8 DIODE_MASK;
> +
> + const s8 *ALARM_BITS;
> + const s8 *BEEP_BITS;
> +
> + const u16 *REG_VIN;
> + const u16 *REG_IN_MINMAX[2];
> +
> + const u16 *REG_TARGET;
> + const u16 *REG_FAN;
> + const u16 *REG_FAN_MODE;
> + const u16 *REG_FAN_MIN;
> + const u16 *REG_FAN_PULSES;
> + const u16 *FAN_PULSE_SHIFT;
> + const u16 *REG_FAN_TIME[3];
> +
> + const u16 *REG_TOLERANCE_H;
> +
> + const u8 *REG_PWM_MODE;
> + const u8 *PWM_MODE_MASK;
> +
> + const u16 *REG_PWM[7]; /* [0]=pwm, [1]=pwm_start, [2]=pwm_floor,
> + * [3]=pwm_max, [4]=pwm_step,
> + * [5]=weight_duty_step, [6]=weight_duty_base
> + */
> + const u16 *REG_PWM_READ;
> +
> + const u16 *REG_CRITICAL_PWM_ENABLE;
> + u8 CRITICAL_PWM_ENABLE_MASK;
> + const u16 *REG_CRITICAL_PWM;
> +
> + const u16 *REG_AUTO_TEMP;
> + const u16 *REG_AUTO_PWM;
> +
> + const u16 *REG_CRITICAL_TEMP;
> + const u16 *REG_CRITICAL_TEMP_TOLERANCE;
> +
> + const u16 *REG_TEMP_SOURCE; /* temp register sources */
> + const u16 *REG_TEMP_SEL;
> + const u16 *REG_WEIGHT_TEMP_SEL;
> + const u16 *REG_WEIGHT_TEMP[3]; /* 0=base, 1=tolerance, 2=step */
> +
> + const u16 *REG_TEMP_OFFSET;
> +
> + const u16 *REG_ALARM;
> + const u16 *REG_BEEP;
> +
> + const u16 *REG_TSI_TEMP;
> +
> + unsigned int (*fan_from_reg)(u16 reg, unsigned int divreg);
> + unsigned int (*fan_from_reg_min)(u16 reg, unsigned int divreg);
> +
> + struct mutex update_lock;
> + bool valid; /* true if following fields are valid */
> + unsigned long last_updated; /* In jiffies */
> +
> + /* Register values */
> + u8 bank; /* current register bank */
> + u8 in_num; /* number of in inputs we have */
> + u8 in[15][3]; /* [0]=in, [1]=in_max, [2]=in_min */
> + unsigned int rpm[NUM_FAN];
> + u16 fan_min[NUM_FAN];
> + u8 fan_pulses[NUM_FAN];
> + u8 fan_div[NUM_FAN];
> + u8 has_pwm;
> + u8 has_fan; /* some fan inputs can be disabled */
> + u8 has_fan_min; /* some fans don't have min register */
> + bool has_fan_div;
> +
> + u8 num_temp_alarms; /* 2, 3, or 6 */
> + u8 num_temp_beeps; /* 2, 3, or 6 */
> + u8 temp_fixed_num; /* 3 or 6 */
> + u8 temp_type[NUM_TEMP_FIXED];
> + s8 temp_offset[NUM_TEMP_FIXED];
> + s16 temp[5][NUM_TEMP]; /* 0=temp, 1=temp_over, 2=temp_hyst,
> + * 3=temp_crit, 4=temp_lcrit */
> + s16 tsi_temp[NUM_TSI_TEMP];
> + u64 alarms;
> + u64 beeps;
> +
> + u8 pwm_num; /* number of pwm */
> + u8 pwm_mode[NUM_FAN]; /* 0->DC variable voltage,
> + * 1->PWM variable duty cycle
> + */
> + enum pwm_enable pwm_enable[NUM_FAN];
> + /* 0->off
> + * 1->manual
> + * 2->thermal cruise mode (also called SmartFan I)
> + * 3->fan speed cruise mode
> + * 4->SmartFan III
> + * 5->enhanced variable thermal cruise (SmartFan IV)
> + */
> + u8 pwm[7][NUM_FAN]; /* [0]=pwm, [1]=pwm_start, [2]=pwm_floor,
> + * [3]=pwm_max, [4]=pwm_step,
> + * [5]=weight_duty_step, [6]=weight_duty_base
> + */
> +
> + u8 target_temp[NUM_FAN];
> + u8 target_temp_mask;
> + u32 target_speed[NUM_FAN];
> + u32 target_speed_tolerance[NUM_FAN];
> + u8 speed_tolerance_limit;
> +
> + u8 temp_tolerance[2][NUM_FAN];
> + u8 tolerance_mask;
> +
> + u8 fan_time[3][NUM_FAN]; /* 0 = stop_time, 1 = step_up, 2 = step_down */
> +
> + /* Automatic fan speed control registers */
> + int auto_pwm_num;
> + u8 auto_pwm[NUM_FAN][7];
> + u8 auto_temp[NUM_FAN][7];
> + u8 pwm_temp_sel[NUM_FAN];
> + u8 pwm_weight_temp_sel[NUM_FAN];
> + u8 weight_temp[3][NUM_FAN]; /* 0->temp_step, 1->temp_step_tol,
> + * 2->temp_base
> + */
> +
> + u8 vid;
> + u8 vrm;
> +
> + bool have_vid;
> +
> + u16 have_temp;
> + u16 have_temp_fixed;
> + u16 have_tsi_temp;
> + u16 have_in;
> +
> + /* Remember extra register values over suspend/resume */
> + u8 vbat;
> + u8 fandiv1;
> + u8 fandiv2;
> + u8 sio_reg_enable;
> +
> + /* nct6775_*() callbacks */
> + u16 (*read_value)(struct nct6775_data *data, u16 reg);
> + int (*write_value)(struct nct6775_data *data, u16 reg, u16 value);
> +
> + /* driver-specific (platform, i2c) initialization hook and data */
> + int (*driver_init)(struct nct6775_data *data);
> + void *driver_data;
> +
> + bool read_only;
> +};
> +
> +bool nct6775_reg_is_word_sized(struct nct6775_data *data, u16 reg);
> +int nct6775_probe(struct device *dev, struct nct6775_data *data);
> +struct nct6775_data *nct6775_update_device(struct device *dev);
> +int nct6775_write_temp(struct nct6775_data *data, u16 reg, u16 value);
> +
> +ssize_t nct6775_show_alarm(struct device *dev, struct device_attribute *attr, char *buf);
> +ssize_t nct6775_show_beep(struct device *dev, struct device_attribute *attr, char *buf);
> +ssize_t nct6775_store_beep(struct device *dev, struct device_attribute *attr, const char *buf,
> + size_t count);
> +
> +static inline umode_t nct6775_attr_mode(struct nct6775_data *data, struct attribute *attr)
> +{
> + return data->read_only ? (attr->mode & ~0222) : attr->mode;
> +}
> +
> +static inline 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 */
> + if (WARN_ON(data->num_groups == ARRAY_SIZE(data->groups) - 1))
> + return -ENOSPC;
> +
> + data->groups[data->num_groups++] = group;
> + return 0;
> +}
> +
> +#define NCT6775_REG_BANK 0x4E
> +#define NCT6775_REG_CONFIG 0x40
> +
> +#define NCT6775_REG_FANDIV1 0x506
> +#define NCT6775_REG_FANDIV2 0x507
> +
> +#define NCT6791_REG_HM_IO_SPACE_LOCK_ENABLE 0x28
> +
> +#define FAN_ALARM_BASE 16
> +#define TEMP_ALARM_BASE 24
> +#define INTRUSION_ALARM_BASE 30
> +#define BEEP_ENABLE_BASE 15
> +
> +/*
> + * Not currently used:
> + * REG_MAN_ID has the value 0x5ca3 for all supported chips.
> + * REG_CHIP_ID == 0x88/0xa1/0xc1 depending on chip model.
> + * REG_MAN_ID is at port 0x4f
> + * REG_CHIP_ID is at port 0x58
> + */
> +
> +#endif /* __HWMON_NCT6775_H__ */
> --
> 2.35.1
>
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PATCH 3/5] hwmon: (nct6775) Split core and platform driver
2022-02-27 15:44 [PATCH 3/5] hwmon: (nct6775) Split core and platform driver Guenter Roeck
@ 2022-02-28 8:32 ` Zev Weiss
0 siblings, 0 replies; 19+ messages in thread
From: Zev Weiss @ 2022-02-28 8:32 UTC (permalink / raw)
To: Guenter Roeck
Cc: linux-hwmon, openbmc, Jean Delvare, linux-kernel, Renze Nicolai
On Sun, Feb 27, 2022 at 07:44:47AM PST, Guenter Roeck wrote:
>On Sat, Feb 26, 2022 at 05:30:45AM -0800, Zev Weiss wrote:
>> This splits the nct6775 driver into an interface-independent core and
>> a separate platform driver that wraps inb/outb port I/O (or asuswmi
>> methods) around that core.
>>
>> Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
>
>I think it would be much better to convert the entire driver to regmap
>and not just use regmap for i2c. This way all register read/write
>operations can be hidden behind regmap, and the read/write callbacks
>are unnecessary. The tmp401 driver gives an example how to do this -
>essentially implement reg_read and reg_write functions in struct
>regmap_config, then handle all register accesses through regmap.
>
>Couple of additional comments inline.
>
Alright, that sounds reasonable -- I'll work on an entirely regmap-based
v2 (and address the other points as well).
Thanks,
Zev
^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2022-02-28 15:16 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-26 13:30 [PATCH 0/5] hwmon: (nct6775) Add i2c support Zev Weiss
2022-02-26 13:30 ` [PATCH 1/5] hwmon: (nct6775) Rearrange attr-group initialization Zev Weiss
2022-02-27 15:01 ` Guenter Roeck
2022-02-28 8:24 ` Zev Weiss
2022-02-28 15:16 ` Guenter Roeck
2022-02-26 13:30 ` [PATCH 2/5] hwmon: (nct6775) Add read-only mode Zev Weiss
2022-02-26 13:30 ` [PATCH 3/5] hwmon: (nct6775) Split core and platform driver Zev Weiss
2022-02-26 13:30 ` [PATCH 4/5] dt-bindings: hwmon: Add nuvoton,nct6775 Zev Weiss
2022-02-27 10:58 ` Krzysztof Kozlowski
2022-02-26 13:30 ` [PATCH 5/5] hwmon: (nct6775) Add i2c driver Zev Weiss
2022-02-26 22:47 ` [PATCH 0/5] hwmon: (nct6775) Add i2c support Zev Weiss
2022-02-26 23:54 ` Guenter Roeck
2022-02-27 12:25 ` Zev Weiss
2022-02-27 0:14 ` Oleksandr Natalenko
2022-02-27 0:27 ` Zev Weiss
2022-02-27 21:38 ` Oleksandr Natalenko
2022-02-28 2:48 ` Zev Weiss
2022-02-27 15:44 [PATCH 3/5] hwmon: (nct6775) Split core and platform driver Guenter Roeck
2022-02-28 8:32 ` Zev Weiss
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).