* [PATCH v2 0/6] hwmon: (nct6775) Convert to regmap, add i2c support
@ 2022-03-09 0:50 Zev Weiss
2022-03-09 0:50 ` [PATCH v2 1/6] dt-bindings: hwmon: Add nuvoton,nct6775 Zev Weiss
` (7 more replies)
0 siblings, 8 replies; 15+ messages in thread
From: Zev Weiss @ 2022-03-09 0:50 UTC (permalink / raw)
To: Guenter Roeck, Jean Delvare, linux-hwmon
Cc: devicetree, Zev Weiss, Krzysztof Kozlowski, openbmc,
linux-kernel, Oleksandr Natalenko, Rob Herring, Renze Nicolai
Hello,
This is v2 of my patches to add i2c support to the nct6775 driver.
Changes since v1 [0]:
- Added preparatory patch converting driver to regmap API [Guenter]
- Replaced ENOSPC with ENOBUFS and removed WARN_ON() in
nct6775_add_attr_group() [Guenter]
- Added dedicated symbol namespace [Guenter]
- Removed nct6775_write_temp() and nct6775_update_device() symbol
exports [Guenter]
- Reordered patches to put dt-bindings patch first [Krzysztof]
The nct6775-platform and nct6775-i2c drivers have both been tested on
the NCT6779D in an ASRock ROMED8HM3 system and the NCT6798 [1] in an
ASRock X570-D4U (the latter thanks to Renze, CCed); both seem to work
as expected on both systems. I don't have access to any asuswmi
hardware, so testing of the nct6775-platform driver on that to ensure
it doesn't break there would be appreciated (Oleksandr, perhaps?).
[0] https://lore.kernel.org/linux-hwmon/20220226133047.6226-1-zev@bewilderbeest.net/
[1] Though it's physically labeled (mislabeled?) as an NCT6796, for
what that's worth.
A slightly edited version of the previous cover letter follows:
This patch series augments the existing nct6775 driver with support
for the hardware's i2c interface; along the way it converts the driver
to use the regmap API, and splits the LPC-specific platform driver
into a separate module from the interface-independent core.
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,
testing via manual register accesses (as detailed in [2]) has
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
first convert the driver's register accesses to the regmap API, and
then split the LPC-specific parts of it 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 (essentially just providing its own set of regmap
read/write callback functions).
The first patch provides DT bindings for the nct6775, the second
contains the change to convert all register accesses to use a regmap.
The third and fourth patches make some relatively small
infrastructural changes to the driver. The core/platform driver split
is in the fifth patch, and the final patch adds the i2c driver itself.
Thanks,
Zev
[2] https://lore.kernel.org/linux-hwmon/YhttzgDtGpcTniyw@hatter.bewilderbeest.net/
Zev Weiss (6):
dt-bindings: hwmon: Add nuvoton,nct6775
hwmon: (nct6775) Convert register access to regmap API
hwmon: (nct6775) Rearrange attr-group initialization
hwmon: (nct6775) Add read-only mode
hwmon: (nct6775) Split core and platform driver
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} | 2310 +++++------------
drivers/hwmon/nct6775-i2c.c | 179 ++
drivers/hwmon/nct6775-platform.c | 1232 +++++++++
drivers/hwmon/nct6775.h | 252 ++
8 files changed, 2382 insertions(+), 1687 deletions(-)
create mode 100644 Documentation/devicetree/bindings/hwmon/nuvoton,nct6775.yaml
rename drivers/hwmon/{nct6775.c => nct6775-core.c} (69%)
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] 15+ messages in thread
* [PATCH v2 1/6] dt-bindings: hwmon: Add nuvoton,nct6775
2022-03-09 0:50 [PATCH v2 0/6] hwmon: (nct6775) Convert to regmap, add i2c support Zev Weiss
@ 2022-03-09 0:50 ` Zev Weiss
2022-04-25 15:07 ` Guenter Roeck
2022-03-09 0:50 ` [PATCH v2 2/6] hwmon: (nct6775) Convert register access to regmap API Zev Weiss
` (6 subsequent siblings)
7 siblings, 1 reply; 15+ messages in thread
From: Zev Weiss @ 2022-03-09 0:50 UTC (permalink / raw)
To: Guenter Roeck, Jean Delvare, linux-hwmon, Rob Herring, devicetree
Cc: Zev Weiss, Krzysztof Kozlowski, openbmc, linux-kernel,
Oleksandr Natalenko, 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>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
---
.../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] 15+ messages in thread
* [PATCH v2 2/6] hwmon: (nct6775) Convert register access to regmap API
2022-03-09 0:50 [PATCH v2 0/6] hwmon: (nct6775) Convert to regmap, add i2c support Zev Weiss
2022-03-09 0:50 ` [PATCH v2 1/6] dt-bindings: hwmon: Add nuvoton,nct6775 Zev Weiss
@ 2022-03-09 0:50 ` Zev Weiss
2022-04-25 15:24 ` Guenter Roeck
2022-03-09 0:50 ` [PATCH v2 3/6] hwmon: (nct6775) Rearrange attr-group initialization Zev Weiss
` (5 subsequent siblings)
7 siblings, 1 reply; 15+ messages in thread
From: Zev Weiss @ 2022-03-09 0:50 UTC (permalink / raw)
To: Guenter Roeck, Jean Delvare, linux-hwmon
Cc: linux-kernel, openbmc, Oleksandr Natalenko, Zev Weiss, Renze Nicolai
This replaces the nct6775_data->{read,write}_value function pointers
with a regmap.
The major difference is that the regmap access functions may fail, and
hence require checking at each call site. While the existing WMI
register-access code had potential failure paths, they were masked by
the fact that the read_value() function returned the register value
directly, and hence squashed errors undetectably by simply returning
zero, and while the write_value() functions were capable of reporting
errors, all callers ignored them.
This improves the robustness of the existing code, and also prepares
the driver for an i2c version to be added soon, for which register
accesses are much more likely to actually fail.
The conversion of the register-access call sites is largely mechanical
(reading a register now returns the value via an out-param pointer,
and returned errors must be checked for and propagated to callers),
though the nct6775_write_fan_div() function is refactored slightly to
avoid duplicating nearly identical (and now lengthier) code in each
switch case.
Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
---
drivers/hwmon/nct6775.c | 977 +++++++++++++++++++++++++++-------------
1 file changed, 662 insertions(+), 315 deletions(-)
diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
index 2b91f7e05126..be99a1890ccd 100644
--- a/drivers/hwmon/nct6775.c
+++ b/drivers/hwmon/nct6775.c
@@ -55,6 +55,7 @@
#include <linux/dmi.h>
#include <linux/io.h>
#include <linux/nospec.h>
+#include <linux/regmap.h>
#include <linux/wmi.h>
#include "lm75.h"
@@ -1345,9 +1346,7 @@ struct nct6775_data {
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);
+ struct regmap *regmap;
};
struct sensor_device_template {
@@ -1546,30 +1545,44 @@ static inline void nct6775_wmi_set_bank(struct nct6775_data *data, u16 reg)
data->bank = bank;
}
-static u16 nct6775_wmi_read_value(struct nct6775_data *data, u16 reg)
+static int nct6775_wmi_reg_read(void *ctx, unsigned int reg, unsigned int *val)
{
- int res, err, word_sized = is_word_sized(data, reg);
+ struct nct6775_data *data = ctx;
+ int err, word_sized = is_word_sized(data, reg);
u8 tmp = 0;
+ u16 res;
nct6775_wmi_set_bank(data, reg);
err = nct6775_asuswmi_read(data->bank, reg & 0xff, &tmp);
if (err)
- return 0;
+ return err;
res = tmp;
if (word_sized) {
err = nct6775_asuswmi_read(data->bank, (reg & 0xff) + 1, &tmp);
if (err)
- return 0;
+ return err;
res = (res << 8) + tmp;
}
- return res;
+ *val = res;
+ return 0;
+}
+
+static inline int nct6775_read_value(struct nct6775_data *data, u16 reg, u16 *value)
+{
+ unsigned int tmp;
+ int ret = regmap_read(data->regmap, reg, &tmp);
+
+ if (!ret)
+ *value = tmp;
+ return ret;
}
-static int nct6775_wmi_write_value(struct nct6775_data *data, u16 reg, u16 value)
+static int nct6775_wmi_reg_write(void *ctx, unsigned int reg, unsigned int value)
{
+ struct nct6775_data *data = ctx;
int res, word_sized = is_word_sized(data, reg);
nct6775_wmi_set_bank(data, reg);
@@ -1587,6 +1600,11 @@ static int nct6775_wmi_write_value(struct nct6775_data *data, u16 reg, u16 value
return res;
}
+static inline int nct6775_write_value(struct nct6775_data *data, u16 reg, u16 value)
+{
+ return regmap_write(data->regmap, reg, value);
+}
+
/*
* On older chips, only registers 0x50-0x5f are banked.
* On more recent chips, all registers are banked.
@@ -1604,23 +1622,25 @@ static inline void nct6775_set_bank(struct nct6775_data *data, u16 reg)
}
}
-static u16 nct6775_read_value(struct nct6775_data *data, u16 reg)
+static int nct6775_reg_read(void *ctx, unsigned int reg, unsigned int *val)
{
- int res, word_sized = is_word_sized(data, reg);
+ struct nct6775_data *data = ctx;
+ int 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);
+ *val = 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);
+ *val = (*val << 8) + inb_p(data->addr + DATA_REG_OFFSET);
}
- return res;
+ return 0;
}
-static int nct6775_write_value(struct nct6775_data *data, u16 reg, u16 value)
+static int nct6775_reg_write(void *ctx, unsigned int reg, unsigned int value)
{
+ struct nct6775_data *data = ctx;
int word_sized = is_word_sized(data, reg);
nct6775_set_bank(data, reg);
@@ -1635,83 +1655,85 @@ static int nct6775_write_value(struct nct6775_data *data, u16 reg, u16 value)
}
/* We left-align 8-bit temperature values to make the code simpler */
-static u16 nct6775_read_temp(struct nct6775_data *data, u16 reg)
+static int nct6775_read_temp(struct nct6775_data *data, u16 reg, u16 *val)
{
- u16 res;
+ int err;
+
+ err = nct6775_read_value(data, reg, val);
+ if (err)
+ return err;
- res = data->read_value(data, reg);
if (!is_word_sized(data, reg))
- res <<= 8;
+ *val <<= 8;
- return res;
+ return 0;
}
static int nct6775_write_temp(struct nct6775_data *data, u16 reg, u16 value)
{
if (!is_word_sized(data, reg))
value >>= 8;
- return data->write_value(data, reg, value);
+ return nct6775_write_value(data, reg, value);
}
/* This function assumes that the caller holds data->update_lock */
-static void nct6775_write_fan_div(struct nct6775_data *data, int nr)
+static int nct6775_write_fan_div(struct nct6775_data *data, int nr)
{
- u8 reg;
+ u16 reg;
+ int err;
+ u16 fandiv_reg = nr < 2 ? NCT6775_REG_FANDIV1 : NCT6775_REG_FANDIV2;
+ unsigned int oddshift = (nr & 1) * 4; /* masks shift by four if nr is odd */
- switch (nr) {
- case 0:
- reg = (data->read_value(data, NCT6775_REG_FANDIV1) & 0x70)
- | (data->fan_div[0] & 0x7);
- data->write_value(data, NCT6775_REG_FANDIV1, reg);
- break;
- case 1:
- reg = (data->read_value(data, NCT6775_REG_FANDIV1) & 0x7)
- | ((data->fan_div[1] << 4) & 0x70);
- data->write_value(data, NCT6775_REG_FANDIV1, reg);
- break;
- case 2:
- reg = (data->read_value(data, NCT6775_REG_FANDIV2) & 0x70)
- | (data->fan_div[2] & 0x7);
- data->write_value(data, NCT6775_REG_FANDIV2, reg);
- break;
- case 3:
- reg = (data->read_value(data, NCT6775_REG_FANDIV2) & 0x7)
- | ((data->fan_div[3] << 4) & 0x70);
- data->write_value(data, NCT6775_REG_FANDIV2, reg);
- break;
- }
+ err = nct6775_read_value(data, fandiv_reg, ®);
+ if (err)
+ return err;
+ reg &= 0x70 >> oddshift;
+ reg |= data->fan_div[nr] & (0x7 << oddshift);
+ return nct6775_write_value(data, fandiv_reg, reg);
}
-static void nct6775_write_fan_div_common(struct nct6775_data *data, int nr)
+static int nct6775_write_fan_div_common(struct nct6775_data *data, int nr)
{
if (data->kind == nct6775)
- nct6775_write_fan_div(data, nr);
+ return nct6775_write_fan_div(data, nr);
+ return 0;
}
-static void nct6775_update_fan_div(struct nct6775_data *data)
+static int nct6775_update_fan_div(struct nct6775_data *data)
{
- u8 i;
+ int err;
+ u16 i;
- i = data->read_value(data, NCT6775_REG_FANDIV1);
+ err = nct6775_read_value(data, NCT6775_REG_FANDIV1, &i);
+ if (err)
+ return err;
data->fan_div[0] = i & 0x7;
data->fan_div[1] = (i & 0x70) >> 4;
- i = data->read_value(data, NCT6775_REG_FANDIV2);
+ err = nct6775_read_value(data, NCT6775_REG_FANDIV2, &i);
+ if (err)
+ return err;
data->fan_div[2] = i & 0x7;
if (data->has_fan & BIT(3))
data->fan_div[3] = (i & 0x70) >> 4;
+
+ return 0;
}
-static void nct6775_update_fan_div_common(struct nct6775_data *data)
+static int nct6775_update_fan_div_common(struct nct6775_data *data)
{
if (data->kind == nct6775)
- nct6775_update_fan_div(data);
+ return nct6775_update_fan_div(data);
+ return 0;
}
-static void nct6775_init_fan_div(struct nct6775_data *data)
+static int nct6775_init_fan_div(struct nct6775_data *data)
{
- int i;
+ int i, err;
+
+ err = nct6775_update_fan_div_common(data);
+ if (err)
+ return err;
- nct6775_update_fan_div_common(data);
/*
* For all fans, start with highest divider value if the divider
* register is not initialized. This ensures that we get a
@@ -1723,19 +1745,26 @@ static void nct6775_init_fan_div(struct nct6775_data *data)
continue;
if (data->fan_div[i] == 0) {
data->fan_div[i] = 7;
- nct6775_write_fan_div_common(data, i);
+ err = nct6775_write_fan_div_common(data, i);
+ if (err)
+ return err;
}
}
+
+ return 0;
}
-static void nct6775_init_fan_common(struct device *dev,
- struct nct6775_data *data)
+static int nct6775_init_fan_common(struct device *dev,
+ struct nct6775_data *data)
{
- int i;
- u8 reg;
+ int i, err;
+ u16 reg;
- if (data->has_fan_div)
- nct6775_init_fan_div(data);
+ if (data->has_fan_div) {
+ err = nct6775_init_fan_div(data);
+ if (err)
+ return err;
+ }
/*
* If fan_min is not set (0), set it to 0xff to disable it. This
@@ -1743,23 +1772,30 @@ static void nct6775_init_fan_common(struct device *dev,
*/
for (i = 0; i < ARRAY_SIZE(data->fan_min); i++) {
if (data->has_fan_min & BIT(i)) {
- reg = data->read_value(data, data->REG_FAN_MIN[i]);
- if (!reg)
- data->write_value(data, data->REG_FAN_MIN[i],
- data->has_fan_div ? 0xff
- : 0xff1f);
+ err = nct6775_read_value(data, data->REG_FAN_MIN[i], ®);
+ if (err)
+ return err;
+ if (!reg) {
+ err = nct6775_write_value(data, data->REG_FAN_MIN[i],
+ data->has_fan_div ? 0xff : 0xff1f);
+ if (err)
+ return err;
+ }
}
}
+
+ return 0;
}
-static void nct6775_select_fan_div(struct device *dev,
- struct nct6775_data *data, int nr, u16 reg)
+static int nct6775_select_fan_div(struct device *dev,
+ struct nct6775_data *data, int nr, u16 reg)
{
+ int err;
u8 fan_div = data->fan_div[nr];
u16 fan_min;
if (!data->has_fan_div)
- return;
+ return 0;
/*
* If we failed to measure the fan speed, or the reported value is not
@@ -1791,36 +1827,46 @@ static void nct6775_select_fan_div(struct device *dev,
}
if (fan_min != data->fan_min[nr]) {
data->fan_min[nr] = fan_min;
- data->write_value(data, data->REG_FAN_MIN[nr],
- fan_min);
+ err = nct6775_write_value(data, data->REG_FAN_MIN[nr], fan_min);
+ if (err)
+ return err;
}
}
data->fan_div[nr] = fan_div;
- nct6775_write_fan_div_common(data, nr);
+ err = nct6775_write_fan_div_common(data, nr);
+ if (err)
+ return err;
}
+
+ return 0;
}
-static void nct6775_update_pwm(struct device *dev)
+static int nct6775_update_pwm(struct device *dev)
{
struct nct6775_data *data = dev_get_drvdata(dev);
- int i, j;
- int fanmodecfg, reg;
+ int i, j, err;
+ u16 fanmodecfg, reg;
bool duty_is_dc;
for (i = 0; i < data->pwm_num; i++) {
if (!(data->has_pwm & BIT(i)))
continue;
- duty_is_dc = data->REG_PWM_MODE[i] &&
- (data->read_value(data, data->REG_PWM_MODE[i])
- & data->PWM_MODE_MASK[i]);
+ err = nct6775_read_value(data, data->REG_PWM_MODE[i], ®);
+ if (err)
+ return err;
+ duty_is_dc = data->REG_PWM_MODE[i] && (reg & data->PWM_MODE_MASK[i]);
data->pwm_mode[i] = !duty_is_dc;
- fanmodecfg = data->read_value(data, data->REG_FAN_MODE[i]);
+ err = nct6775_read_value(data, data->REG_FAN_MODE[i], &fanmodecfg);
+ if (err)
+ return err;
for (j = 0; j < ARRAY_SIZE(data->REG_PWM); j++) {
if (data->REG_PWM[j] && data->REG_PWM[j][i]) {
- data->pwm[j][i] = data->read_value(data,
- data->REG_PWM[j][i]);
+ err = nct6775_read_value(data, data->REG_PWM[j][i], ®);
+ if (err)
+ return err;
+ data->pwm[j][i] = reg;
}
}
@@ -1835,17 +1881,22 @@ static void nct6775_update_pwm(struct device *dev)
u8 t = fanmodecfg & 0x0f;
if (data->REG_TOLERANCE_H) {
- t |= (data->read_value(data,
- data->REG_TOLERANCE_H[i]) & 0x70) >> 1;
+ err = nct6775_read_value(data, data->REG_TOLERANCE_H[i], ®);
+ if (err)
+ return err;
+ t |= (reg & 0x70) >> 1;
}
data->target_speed_tolerance[i] = t;
}
- data->temp_tolerance[1][i] =
- data->read_value(data,
- data->REG_CRITICAL_TEMP_TOLERANCE[i]);
+ err = nct6775_read_value(data, data->REG_CRITICAL_TEMP_TOLERANCE[i], ®);
+ if (err)
+ return err;
+ data->temp_tolerance[1][i] = reg;
- reg = data->read_value(data, data->REG_TEMP_SEL[i]);
+ err = nct6775_read_value(data, data->REG_TEMP_SEL[i], ®);
+ if (err)
+ return err;
data->pwm_temp_sel[i] = reg & 0x1f;
/* If fan can stop, report floor as 0 */
if (reg & 0x80)
@@ -1854,7 +1905,9 @@ static void nct6775_update_pwm(struct device *dev)
if (!data->REG_WEIGHT_TEMP_SEL[i])
continue;
- reg = data->read_value(data, data->REG_WEIGHT_TEMP_SEL[i]);
+ err = nct6775_read_value(data, data->REG_WEIGHT_TEMP_SEL[i], ®);
+ if (err)
+ return err;
data->pwm_weight_temp_sel[i] = reg & 0x1f;
/* If weight is disabled, report weight source as 0 */
if (!(reg & 0x80))
@@ -1862,29 +1915,37 @@ static void nct6775_update_pwm(struct device *dev)
/* Weight temp data */
for (j = 0; j < ARRAY_SIZE(data->weight_temp); j++) {
- data->weight_temp[j][i] = data->read_value(data,
- data->REG_WEIGHT_TEMP[j][i]);
+ err = nct6775_read_value(data, data->REG_WEIGHT_TEMP[j][i], ®);
+ if (err)
+ return err;
+ data->weight_temp[j][i] = reg;
}
}
+
+ return 0;
}
-static void nct6775_update_pwm_limits(struct device *dev)
+static int nct6775_update_pwm_limits(struct device *dev)
{
struct nct6775_data *data = dev_get_drvdata(dev);
- int i, j;
- u8 reg;
- u16 reg_t;
+ int i, j, err;
+ u16 reg, reg_t;
for (i = 0; i < data->pwm_num; i++) {
if (!(data->has_pwm & BIT(i)))
continue;
for (j = 0; j < ARRAY_SIZE(data->fan_time); j++) {
- data->fan_time[j][i] =
- data->read_value(data, data->REG_FAN_TIME[j][i]);
+ err = nct6775_read_value(data, data->REG_FAN_TIME[j][i], ®);
+ if (err)
+ return err;
+ data->fan_time[j][i] = reg;
}
- reg_t = data->read_value(data, data->REG_TARGET[i]);
+ err = nct6775_read_value(data, data->REG_TARGET[i], ®_t);
+ if (err)
+ return err;
+
/* Update only in matching mode or if never updated */
if (!data->target_temp[i] ||
data->pwm_enable[i] == thermal_cruise)
@@ -1892,29 +1953,37 @@ static void nct6775_update_pwm_limits(struct device *dev)
if (!data->target_speed[i] ||
data->pwm_enable[i] == speed_cruise) {
if (data->REG_TOLERANCE_H) {
- reg_t |= (data->read_value(data,
- data->REG_TOLERANCE_H[i]) & 0x0f) << 8;
+ err = nct6775_read_value(data, data->REG_TOLERANCE_H[i], ®);
+ if (err)
+ return err;
+ reg_t |= (reg & 0x0f) << 8;
}
data->target_speed[i] = reg_t;
}
for (j = 0; j < data->auto_pwm_num; j++) {
- data->auto_pwm[i][j] =
- data->read_value(data,
- NCT6775_AUTO_PWM(data, i, j));
- data->auto_temp[i][j] =
- data->read_value(data,
- NCT6775_AUTO_TEMP(data, i, j));
+ err = nct6775_read_value(data, NCT6775_AUTO_PWM(data, i, j), ®);
+ if (err)
+ return err;
+ data->auto_pwm[i][j] = reg;
+
+ err = nct6775_read_value(data, NCT6775_AUTO_TEMP(data, i, j), ®);
+ if (err)
+ return err;
+ data->auto_temp[i][j] = reg;
}
/* critical auto_pwm temperature data */
- data->auto_temp[i][data->auto_pwm_num] =
- data->read_value(data, data->REG_CRITICAL_TEMP[i]);
+ err = nct6775_read_value(data, data->REG_CRITICAL_TEMP[i], ®);
+ if (err)
+ return err;
+ data->auto_temp[i][data->auto_pwm_num] = reg;
switch (data->kind) {
case nct6775:
- reg = data->read_value(data,
- NCT6775_REG_CRITICAL_ENAB[i]);
+ err = nct6775_read_value(data, NCT6775_REG_CRITICAL_ENAB[i], ®);
+ if (err)
+ return err;
data->auto_pwm[i][data->auto_pwm_num] =
(reg & 0x02) ? 0xff : 0x00;
break;
@@ -1931,120 +2000,158 @@ static void nct6775_update_pwm_limits(struct device *dev)
case nct6796:
case nct6797:
case nct6798:
- reg = data->read_value(data,
- data->REG_CRITICAL_PWM_ENABLE[i]);
- if (reg & data->CRITICAL_PWM_ENABLE_MASK)
- reg = data->read_value(data,
- data->REG_CRITICAL_PWM[i]);
- else
+ err = nct6775_read_value(data, data->REG_CRITICAL_PWM_ENABLE[i], ®);
+ if (err)
+ return err;
+ if (reg & data->CRITICAL_PWM_ENABLE_MASK) {
+ err = nct6775_read_value(data, data->REG_CRITICAL_PWM[i], ®);
+ if (err)
+ return err;
+ } else {
reg = 0xff;
+ }
data->auto_pwm[i][data->auto_pwm_num] = reg;
break;
}
}
+
+ return 0;
}
static struct nct6775_data *nct6775_update_device(struct device *dev)
{
struct nct6775_data *data = dev_get_drvdata(dev);
- int i, j;
+ int i, j, err = 0;
+ u16 reg;
mutex_lock(&data->update_lock);
if (time_after(jiffies, data->last_updated + HZ + HZ / 2)
|| !data->valid) {
/* Fan clock dividers */
- nct6775_update_fan_div_common(data);
+ err = nct6775_update_fan_div_common(data);
+ if (err)
+ goto out;
/* Measured voltages and limits */
for (i = 0; i < data->in_num; i++) {
if (!(data->have_in & BIT(i)))
continue;
- data->in[i][0] = data->read_value(data,
- data->REG_VIN[i]);
- data->in[i][1] = data->read_value(data,
- data->REG_IN_MINMAX[0][i]);
- data->in[i][2] = data->read_value(data,
- data->REG_IN_MINMAX[1][i]);
+ err = nct6775_read_value(data, data->REG_VIN[i], ®);
+ if (err)
+ goto out;
+ data->in[i][0] = reg;
+
+ err = nct6775_read_value(data, data->REG_IN_MINMAX[0][i], ®);
+ if (err)
+ goto out;
+ data->in[i][1] = reg;
+
+ err = nct6775_read_value(data, data->REG_IN_MINMAX[1][i], ®);
+ if (err)
+ goto out;
+ data->in[i][2] = reg;
}
/* Measured fan speeds and limits */
for (i = 0; i < ARRAY_SIZE(data->rpm); i++) {
- u16 reg;
-
if (!(data->has_fan & BIT(i)))
continue;
- reg = data->read_value(data, data->REG_FAN[i]);
+ err = nct6775_read_value(data, data->REG_FAN[i], ®);
+ if (err)
+ goto out;
data->rpm[i] = data->fan_from_reg(reg,
data->fan_div[i]);
- if (data->has_fan_min & BIT(i))
- data->fan_min[i] = data->read_value(data,
- data->REG_FAN_MIN[i]);
+ if (data->has_fan_min & BIT(i)) {
+ err = nct6775_read_value(data, data->REG_FAN_MIN[i], ®);
+ if (err)
+ goto out;
+ data->fan_min[i] = reg;
+ }
if (data->REG_FAN_PULSES[i]) {
- data->fan_pulses[i] =
- (data->read_value(data,
- data->REG_FAN_PULSES[i])
- >> data->FAN_PULSE_SHIFT[i]) & 0x03;
+ err = nct6775_read_value(data, data->REG_FAN_PULSES[i], ®);
+ if (err)
+ goto out;
+ data->fan_pulses[i] = (reg >> data->FAN_PULSE_SHIFT[i]) & 0x03;
}
- nct6775_select_fan_div(dev, data, i, reg);
+ err = nct6775_select_fan_div(dev, data, i, reg);
+ if (err)
+ goto out;
}
- nct6775_update_pwm(dev);
- nct6775_update_pwm_limits(dev);
+ err = nct6775_update_pwm(dev);
+ if (err)
+ goto out;
+
+ err = nct6775_update_pwm_limits(dev);
+ if (err)
+ goto out;
/* Measured temperatures and limits */
for (i = 0; i < NUM_TEMP; i++) {
if (!(data->have_temp & BIT(i)))
continue;
for (j = 0; j < ARRAY_SIZE(data->reg_temp); j++) {
- if (data->reg_temp[j][i])
- data->temp[j][i] = nct6775_read_temp(data,
- data->reg_temp[j][i]);
+ if (data->reg_temp[j][i]) {
+ err = nct6775_read_temp(data, data->reg_temp[j][i], ®);
+ if (err)
+ goto out;
+ data->temp[j][i] = reg;
+ }
}
if (i >= NUM_TEMP_FIXED ||
!(data->have_temp_fixed & BIT(i)))
continue;
- data->temp_offset[i] = data->read_value(data,
- data->REG_TEMP_OFFSET[i]);
+ err = nct6775_read_value(data, data->REG_TEMP_OFFSET[i], ®);
+ if (err)
+ goto out;
+ data->temp_offset[i] = reg;
}
for (i = 0; i < NUM_TSI_TEMP; i++) {
if (!(data->have_tsi_temp & BIT(i)))
continue;
- data->tsi_temp[i] = data->read_value(data, data->REG_TSI_TEMP[i]);
+ err = nct6775_read_value(data, data->REG_TSI_TEMP[i], ®);
+ if (err)
+ goto out;
+ data->tsi_temp[i] = reg;
}
data->alarms = 0;
for (i = 0; i < NUM_REG_ALARM; i++) {
- u8 alarm;
+ u16 alarm;
if (!data->REG_ALARM[i])
continue;
- alarm = data->read_value(data, data->REG_ALARM[i]);
+ err = nct6775_read_value(data, data->REG_ALARM[i], &alarm);
+ if (err)
+ goto out;
data->alarms |= ((u64)alarm) << (i << 3);
}
data->beeps = 0;
for (i = 0; i < NUM_REG_BEEP; i++) {
- u8 beep;
+ u16 beep;
if (!data->REG_BEEP[i])
continue;
- beep = data->read_value(data, data->REG_BEEP[i]);
+ err = nct6775_read_value(data, data->REG_BEEP[i], &beep);
+ if (err)
+ goto out;
data->beeps |= ((u64)beep) << (i << 3);
}
data->last_updated = jiffies;
data->valid = true;
}
-
+out:
mutex_unlock(&data->update_lock);
- return data;
+ return err ? ERR_PTR(err) : data;
}
/*
@@ -2058,6 +2165,9 @@ show_in_reg(struct device *dev, struct device_attribute *attr, char *buf)
int index = sattr->index;
int nr = sattr->nr;
+ if (IS_ERR(data))
+ return PTR_ERR(data);
+
return sprintf(buf, "%ld\n", in_from_reg(data->in[nr][index], nr));
}
@@ -2077,10 +2187,9 @@ store_in_reg(struct device *dev, struct device_attribute *attr, const char *buf,
return err;
mutex_lock(&data->update_lock);
data->in[nr][index] = in_to_reg(val, nr);
- data->write_value(data, data->REG_IN_MINMAX[index - 1][nr],
- data->in[nr][index]);
+ err = nct6775_write_value(data, data->REG_IN_MINMAX[index - 1][nr], data->in[nr][index]);
mutex_unlock(&data->update_lock);
- return count;
+ return err ? : count;
}
static ssize_t
@@ -2088,8 +2197,12 @@ 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);
- int nr = data->ALARM_BITS[sattr->index];
+ int nr;
+
+ if (IS_ERR(data))
+ return PTR_ERR(data);
+ nr = data->ALARM_BITS[sattr->index];
return sprintf(buf, "%u\n",
(unsigned int)((data->alarms >> nr) & 0x01));
}
@@ -2097,14 +2210,15 @@ show_alarm(struct device *dev, struct device_attribute *attr, char *buf)
static int find_temp_source(struct nct6775_data *data, int index, int count)
{
int source = data->temp_src[index];
- int nr;
+ int nr, err;
for (nr = 0; nr < count; nr++) {
- int src;
+ u16 src;
- src = data->read_value(data,
- data->REG_TEMP_SOURCE[nr]) & 0x1f;
- if (src == source)
+ err = nct6775_read_value(data, data->REG_TEMP_SOURCE[nr], &src);
+ if (err)
+ return err;
+ if ((src & 0x1f) == source)
return nr;
}
return -ENODEV;
@@ -2118,6 +2232,9 @@ show_temp_alarm(struct device *dev, struct device_attribute *attr, char *buf)
unsigned int alarm = 0;
int nr;
+ if (IS_ERR(data))
+ return PTR_ERR(data);
+
/*
* For temperatures, there is no fixed mapping from registers to alarm
* bits. Alarm bits are determined by the temperature source mapping.
@@ -2136,7 +2253,12 @@ 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);
- int nr = data->BEEP_BITS[sattr->index];
+ int nr;
+
+ if (IS_ERR(data))
+ return PTR_ERR(data);
+
+ nr = data->BEEP_BITS[sattr->index];
return sprintf(buf, "%u\n",
(unsigned int)((data->beeps >> nr) & 0x01));
@@ -2164,10 +2286,10 @@ store_beep(struct device *dev, struct device_attribute *attr, const char *buf,
data->beeps |= (1ULL << nr);
else
data->beeps &= ~(1ULL << nr);
- data->write_value(data, data->REG_BEEP[regindex],
- (data->beeps >> (regindex << 3)) & 0xff);
+ err = nct6775_write_value(data, data->REG_BEEP[regindex],
+ (data->beeps >> (regindex << 3)) & 0xff);
mutex_unlock(&data->update_lock);
- return count;
+ return err ? : count;
}
static ssize_t
@@ -2178,6 +2300,9 @@ show_temp_beep(struct device *dev, struct device_attribute *attr, char *buf)
unsigned int beep = 0;
int nr;
+ if (IS_ERR(data))
+ return PTR_ERR(data);
+
/*
* For temperatures, there is no fixed mapping from registers to beep
* enable bits. Beep enable bits are determined by the temperature
@@ -2220,11 +2345,11 @@ store_temp_beep(struct device *dev, struct device_attribute *attr,
data->beeps |= (1ULL << bit);
else
data->beeps &= ~(1ULL << bit);
- data->write_value(data, data->REG_BEEP[regindex],
- (data->beeps >> (regindex << 3)) & 0xff);
+ err = nct6775_write_value(data, data->REG_BEEP[regindex],
+ (data->beeps >> (regindex << 3)) & 0xff);
mutex_unlock(&data->update_lock);
- return count;
+ return err ? : count;
}
static umode_t nct6775_in_is_visible(struct kobject *kobj,
@@ -2275,6 +2400,9 @@ show_fan(struct device *dev, struct device_attribute *attr, char *buf)
struct sensor_device_attribute *sattr = to_sensor_dev_attr(attr);
int nr = sattr->index;
+ if (IS_ERR(data))
+ return PTR_ERR(data);
+
return sprintf(buf, "%d\n", data->rpm[nr]);
}
@@ -2285,6 +2413,9 @@ show_fan_min(struct device *dev, struct device_attribute *attr, char *buf)
struct sensor_device_attribute *sattr = to_sensor_dev_attr(attr);
int nr = sattr->index;
+ if (IS_ERR(data))
+ return PTR_ERR(data);
+
return sprintf(buf, "%d\n",
data->fan_from_reg_min(data->fan_min[nr],
data->fan_div[nr]));
@@ -2297,6 +2428,9 @@ show_fan_div(struct device *dev, struct device_attribute *attr, char *buf)
struct sensor_device_attribute *sattr = to_sensor_dev_attr(attr);
int nr = sattr->index;
+ if (IS_ERR(data))
+ return PTR_ERR(data);
+
return sprintf(buf, "%u\n", div_from_reg(data->fan_div[nr]));
}
@@ -2382,16 +2516,18 @@ store_fan_min(struct device *dev, struct device_attribute *attr,
nr + 1, div_from_reg(data->fan_div[nr]),
div_from_reg(new_div));
data->fan_div[nr] = new_div;
- nct6775_write_fan_div_common(data, nr);
+ err = nct6775_write_fan_div_common(data, nr);
+ if (err)
+ goto write_min;
/* Give the chip time to sample a new speed value */
data->last_updated = jiffies;
}
write_min:
- data->write_value(data, data->REG_FAN_MIN[nr], data->fan_min[nr]);
+ err = nct6775_write_value(data, data->REG_FAN_MIN[nr], data->fan_min[nr]);
mutex_unlock(&data->update_lock);
- return count;
+ return err ? : count;
}
static ssize_t
@@ -2399,8 +2535,12 @@ show_fan_pulses(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);
- int p = data->fan_pulses[sattr->index];
+ int p;
+ if (IS_ERR(data))
+ return PTR_ERR(data);
+
+ p = data->fan_pulses[sattr->index];
return sprintf(buf, "%d\n", p ? : 4);
}
@@ -2413,7 +2553,7 @@ store_fan_pulses(struct device *dev, struct device_attribute *attr,
int nr = sattr->index;
unsigned long val;
int err;
- u8 reg;
+ u16 reg;
err = kstrtoul(buf, 10, &val);
if (err < 0)
@@ -2424,13 +2564,16 @@ store_fan_pulses(struct device *dev, struct device_attribute *attr,
mutex_lock(&data->update_lock);
data->fan_pulses[nr] = val & 3;
- reg = data->read_value(data, data->REG_FAN_PULSES[nr]);
+ err = nct6775_read_value(data, data->REG_FAN_PULSES[nr], ®);
+ if (err)
+ goto out;
reg &= ~(0x03 << data->FAN_PULSE_SHIFT[nr]);
reg |= (val & 3) << data->FAN_PULSE_SHIFT[nr];
- data->write_value(data, data->REG_FAN_PULSES[nr], reg);
+ err = nct6775_write_value(data, data->REG_FAN_PULSES[nr], reg);
+out:
mutex_unlock(&data->update_lock);
- return count;
+ return err ? : count;
}
static umode_t nct6775_fan_is_visible(struct kobject *kobj,
@@ -2497,6 +2640,9 @@ show_temp_label(struct device *dev, struct device_attribute *attr, char *buf)
struct sensor_device_attribute *sattr = to_sensor_dev_attr(attr);
int nr = sattr->index;
+ if (IS_ERR(data))
+ return PTR_ERR(data);
+
return sprintf(buf, "%s\n", data->temp_label[data->temp_src[nr]]);
}
@@ -2508,6 +2654,9 @@ show_temp(struct device *dev, struct device_attribute *attr, char *buf)
int nr = sattr->nr;
int index = sattr->index;
+ if (IS_ERR(data))
+ return PTR_ERR(data);
+
return sprintf(buf, "%d\n", LM75_TEMP_FROM_REG(data->temp[index][nr]));
}
@@ -2528,10 +2677,9 @@ store_temp(struct device *dev, struct device_attribute *attr, const char *buf,
mutex_lock(&data->update_lock);
data->temp[index][nr] = LM75_TEMP_TO_REG(val);
- nct6775_write_temp(data, data->reg_temp[index][nr],
- data->temp[index][nr]);
+ err = nct6775_write_temp(data, data->reg_temp[index][nr], data->temp[index][nr]);
mutex_unlock(&data->update_lock);
- return count;
+ return err ? : count;
}
static ssize_t
@@ -2540,6 +2688,9 @@ show_temp_offset(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);
+ if (IS_ERR(data))
+ return PTR_ERR(data);
+
return sprintf(buf, "%d\n", data->temp_offset[sattr->index] * 1000);
}
@@ -2561,10 +2712,10 @@ store_temp_offset(struct device *dev, struct device_attribute *attr,
mutex_lock(&data->update_lock);
data->temp_offset[nr] = val;
- data->write_value(data, data->REG_TEMP_OFFSET[nr], val);
+ err = nct6775_write_value(data, data->REG_TEMP_OFFSET[nr], val);
mutex_unlock(&data->update_lock);
- return count;
+ return err ? : count;
}
static ssize_t
@@ -2574,6 +2725,9 @@ show_temp_type(struct device *dev, struct device_attribute *attr, char *buf)
struct sensor_device_attribute *sattr = to_sensor_dev_attr(attr);
int nr = sattr->index;
+ if (IS_ERR(data))
+ return PTR_ERR(data);
+
return sprintf(buf, "%d\n", (int)data->temp_type[nr]);
}
@@ -2586,7 +2740,11 @@ store_temp_type(struct device *dev, struct device_attribute *attr,
int nr = sattr->index;
unsigned long val;
int err;
- u8 vbat, diode, vbit, dbit;
+ u8 vbit, dbit;
+ u16 vbat, diode;
+
+ if (IS_ERR(data))
+ return PTR_ERR(data);
err = kstrtoul(buf, 10, &val);
if (err < 0)
@@ -2600,8 +2758,17 @@ store_temp_type(struct device *dev, struct device_attribute *attr,
data->temp_type[nr] = val;
vbit = 0x02 << nr;
dbit = data->DIODE_MASK << nr;
- vbat = data->read_value(data, data->REG_VBAT) & ~vbit;
- diode = data->read_value(data, data->REG_DIODE) & ~dbit;
+
+ err = nct6775_read_value(data, data->REG_VBAT, &vbat);
+ if (err)
+ goto out;
+ vbat &= ~vbit;
+
+ err = nct6775_read_value(data, data->REG_DIODE, &diode);
+ if (err)
+ goto out;
+ diode &= ~dbit;
+
switch (val) {
case 1: /* CPU diode (diode, current mode) */
vbat |= vbit;
@@ -2613,11 +2780,13 @@ store_temp_type(struct device *dev, struct device_attribute *attr,
case 4: /* thermistor */
break;
}
- data->write_value(data, data->REG_VBAT, vbat);
- data->write_value(data, data->REG_DIODE, diode);
-
+ err = nct6775_write_value(data, data->REG_VBAT, vbat);
+ if (err)
+ goto out;
+ err = nct6775_write_value(data, data->REG_DIODE, diode);
+out:
mutex_unlock(&data->update_lock);
- return count;
+ return err ? : count;
}
static umode_t nct6775_temp_is_visible(struct kobject *kobj,
@@ -2707,6 +2876,9 @@ static ssize_t show_tsi_temp(struct device *dev, struct device_attribute *attr,
struct nct6775_data *data = nct6775_update_device(dev);
struct sensor_device_attribute *sattr = to_sensor_dev_attr(attr);
+ if (IS_ERR(data))
+ return PTR_ERR(data);
+
return sysfs_emit(buf, "%u\n", tsi_temp_from_reg(data->tsi_temp[sattr->index]));
}
@@ -2746,6 +2918,9 @@ show_pwm_mode(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);
+ if (IS_ERR(data))
+ return PTR_ERR(data);
+
return sprintf(buf, "%d\n", data->pwm_mode[sattr->index]);
}
@@ -2758,7 +2933,7 @@ store_pwm_mode(struct device *dev, struct device_attribute *attr,
int nr = sattr->index;
unsigned long val;
int err;
- u8 reg;
+ u16 reg;
err = kstrtoul(buf, 10, &val);
if (err < 0)
@@ -2776,13 +2951,16 @@ store_pwm_mode(struct device *dev, struct device_attribute *attr,
mutex_lock(&data->update_lock);
data->pwm_mode[nr] = val;
- reg = data->read_value(data, data->REG_PWM_MODE[nr]);
+ err = nct6775_read_value(data, data->REG_PWM_MODE[nr], ®);
+ if (err)
+ goto out;
reg &= ~data->PWM_MODE_MASK[nr];
if (!val)
reg |= data->PWM_MODE_MASK[nr];
- data->write_value(data, data->REG_PWM_MODE[nr], reg);
+ err = nct6775_write_value(data, data->REG_PWM_MODE[nr], reg);
+out:
mutex_unlock(&data->update_lock);
- return count;
+ return err ? : count;
}
static ssize_t
@@ -2792,16 +2970,23 @@ show_pwm(struct device *dev, struct device_attribute *attr, char *buf)
struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr);
int nr = sattr->nr;
int index = sattr->index;
- int pwm;
+ int err;
+ u16 pwm;
+
+ if (IS_ERR(data))
+ return PTR_ERR(data);
/*
* For automatic fan control modes, show current pwm readings.
* Otherwise, show the configured value.
*/
- if (index == 0 && data->pwm_enable[nr] > manual)
- pwm = data->read_value(data, data->REG_PWM_READ[nr]);
- else
+ if (index == 0 && data->pwm_enable[nr] > manual) {
+ err = nct6775_read_value(data, data->REG_PWM_READ[nr], &pwm);
+ if (err)
+ return err;
+ } else {
pwm = data->pwm[index][nr];
+ }
return sprintf(buf, "%d\n", pwm);
}
@@ -2819,7 +3004,7 @@ store_pwm(struct device *dev, struct device_attribute *attr, const char *buf,
int maxval[7]
= { 255, 255, data->pwm[3][nr] ? : 255, 255, 255, 255, 255 };
int err;
- u8 reg;
+ u16 reg;
err = kstrtoul(buf, 10, &val);
if (err < 0)
@@ -2828,16 +3013,21 @@ store_pwm(struct device *dev, struct device_attribute *attr, const char *buf,
mutex_lock(&data->update_lock);
data->pwm[index][nr] = val;
- data->write_value(data, data->REG_PWM[index][nr], val);
+ err = nct6775_write_value(data, data->REG_PWM[index][nr], val);
+ if (err)
+ goto out;
if (index == 2) { /* floor: disable if val == 0 */
- reg = data->read_value(data, data->REG_TEMP_SEL[nr]);
+ err = nct6775_read_value(data, data->REG_TEMP_SEL[nr], ®);
+ if (err)
+ goto out;
reg &= 0x7f;
if (val)
reg |= 0x80;
- data->write_value(data, data->REG_TEMP_SEL[nr], reg);
+ err = nct6775_write_value(data, data->REG_TEMP_SEL[nr], reg);
}
+out:
mutex_unlock(&data->update_lock);
- return count;
+ return err ? : count;
}
/* Returns 0 if OK, -EINVAL otherwise */
@@ -2864,40 +3054,54 @@ static int check_trip_points(struct nct6775_data *data, int nr)
return 0;
}
-static void pwm_update_registers(struct nct6775_data *data, int nr)
+static int pwm_update_registers(struct nct6775_data *data, int nr)
{
- u8 reg;
+ u16 reg;
+ int err;
switch (data->pwm_enable[nr]) {
case off:
case manual:
break;
case speed_cruise:
- reg = data->read_value(data, data->REG_FAN_MODE[nr]);
+ err = nct6775_read_value(data, data->REG_FAN_MODE[nr], ®);
+ if (err)
+ return err;
reg = (reg & ~data->tolerance_mask) |
(data->target_speed_tolerance[nr] & data->tolerance_mask);
- data->write_value(data, data->REG_FAN_MODE[nr], reg);
- data->write_value(data, data->REG_TARGET[nr],
- data->target_speed[nr] & 0xff);
+ err = nct6775_write_value(data, data->REG_FAN_MODE[nr], reg);
+ if (err)
+ return err;
+ err = nct6775_write_value(data, data->REG_TARGET[nr],
+ data->target_speed[nr] & 0xff);
+ if (err)
+ return err;
if (data->REG_TOLERANCE_H) {
reg = (data->target_speed[nr] >> 8) & 0x0f;
reg |= (data->target_speed_tolerance[nr] & 0x38) << 1;
- data->write_value(data,
- data->REG_TOLERANCE_H[nr],
- reg);
+ err = nct6775_write_value(data, data->REG_TOLERANCE_H[nr], reg);
+ if (err)
+ return err;
}
break;
case thermal_cruise:
- data->write_value(data, data->REG_TARGET[nr],
- data->target_temp[nr]);
+ err = nct6775_write_value(data, data->REG_TARGET[nr], data->target_temp[nr]);
+ if (err)
+ return err;
fallthrough;
default:
- reg = data->read_value(data, data->REG_FAN_MODE[nr]);
+ err = nct6775_read_value(data, data->REG_FAN_MODE[nr], ®);
+ if (err)
+ return err;
reg = (reg & ~data->tolerance_mask) |
data->temp_tolerance[0][nr];
- data->write_value(data, data->REG_FAN_MODE[nr], reg);
+ err = nct6775_write_value(data, data->REG_FAN_MODE[nr], reg);
+ if (err)
+ return err;
break;
}
+
+ return 0;
}
static ssize_t
@@ -2906,6 +3110,9 @@ show_pwm_enable(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);
+ if (IS_ERR(data))
+ return PTR_ERR(data);
+
return sprintf(buf, "%d\n", data->pwm_enable[sattr->index]);
}
@@ -2943,15 +3150,22 @@ store_pwm_enable(struct device *dev, struct device_attribute *attr,
* turn off pwm control: select manual mode, set pwm to maximum
*/
data->pwm[0][nr] = 255;
- data->write_value(data, data->REG_PWM[0][nr], 255);
+ err = nct6775_write_value(data, data->REG_PWM[0][nr], 255);
+ if (err)
+ goto out;
}
- pwm_update_registers(data, nr);
- reg = data->read_value(data, data->REG_FAN_MODE[nr]);
+ err = pwm_update_registers(data, nr);
+ if (err)
+ goto out;
+ err = nct6775_read_value(data, data->REG_FAN_MODE[nr], ®);
+ if (err)
+ goto out;
reg &= 0x0f;
reg |= pwm_enable_to_reg(val) << 4;
- data->write_value(data, data->REG_FAN_MODE[nr], reg);
+ err = nct6775_write_value(data, data->REG_FAN_MODE[nr], reg);
+out:
mutex_unlock(&data->update_lock);
- return count;
+ return err ? : count;
}
static ssize_t
@@ -2978,6 +3192,9 @@ show_pwm_temp_sel(struct device *dev, struct device_attribute *attr, char *buf)
struct sensor_device_attribute *sattr = to_sensor_dev_attr(attr);
int index = sattr->index;
+ if (IS_ERR(data))
+ return PTR_ERR(data);
+
return show_pwm_temp_sel_common(data, buf, data->pwm_temp_sel[index]);
}
@@ -2989,7 +3206,11 @@ store_pwm_temp_sel(struct device *dev, struct device_attribute *attr,
struct sensor_device_attribute *sattr = to_sensor_dev_attr(attr);
int nr = sattr->index;
unsigned long val;
- int err, reg, src;
+ int err, src;
+ u16 reg;
+
+ if (IS_ERR(data))
+ return PTR_ERR(data);
err = kstrtoul(buf, 10, &val);
if (err < 0)
@@ -3002,13 +3223,16 @@ store_pwm_temp_sel(struct device *dev, struct device_attribute *attr,
mutex_lock(&data->update_lock);
src = data->temp_src[val - 1];
data->pwm_temp_sel[nr] = src;
- reg = data->read_value(data, data->REG_TEMP_SEL[nr]);
+ err = nct6775_read_value(data, data->REG_TEMP_SEL[nr], ®);
+ if (err)
+ goto out;
reg &= 0xe0;
reg |= src;
- data->write_value(data, data->REG_TEMP_SEL[nr], reg);
+ err = nct6775_write_value(data, data->REG_TEMP_SEL[nr], reg);
+out:
mutex_unlock(&data->update_lock);
- return count;
+ return err ? : count;
}
static ssize_t
@@ -3019,6 +3243,9 @@ show_pwm_weight_temp_sel(struct device *dev, struct device_attribute *attr,
struct sensor_device_attribute *sattr = to_sensor_dev_attr(attr);
int index = sattr->index;
+ if (IS_ERR(data))
+ return PTR_ERR(data);
+
return show_pwm_temp_sel_common(data, buf,
data->pwm_weight_temp_sel[index]);
}
@@ -3031,7 +3258,11 @@ store_pwm_weight_temp_sel(struct device *dev, struct device_attribute *attr,
struct sensor_device_attribute *sattr = to_sensor_dev_attr(attr);
int nr = sattr->index;
unsigned long val;
- int err, reg, src;
+ int err, src;
+ u16 reg;
+
+ if (IS_ERR(data))
+ return PTR_ERR(data);
err = kstrtoul(buf, 10, &val);
if (err < 0)
@@ -3047,19 +3278,24 @@ store_pwm_weight_temp_sel(struct device *dev, struct device_attribute *attr,
if (val) {
src = data->temp_src[val - 1];
data->pwm_weight_temp_sel[nr] = src;
- reg = data->read_value(data, data->REG_WEIGHT_TEMP_SEL[nr]);
+ err = nct6775_read_value(data, data->REG_WEIGHT_TEMP_SEL[nr], ®);
+ if (err)
+ goto out;
reg &= 0xe0;
reg |= (src | 0x80);
- data->write_value(data, data->REG_WEIGHT_TEMP_SEL[nr], reg);
+ err = nct6775_write_value(data, data->REG_WEIGHT_TEMP_SEL[nr], reg);
} else {
data->pwm_weight_temp_sel[nr] = 0;
- reg = data->read_value(data, data->REG_WEIGHT_TEMP_SEL[nr]);
+ err = nct6775_read_value(data, data->REG_WEIGHT_TEMP_SEL[nr], ®);
+ if (err)
+ goto out;
reg &= 0x7f;
- data->write_value(data, data->REG_WEIGHT_TEMP_SEL[nr], reg);
+ err = nct6775_write_value(data, data->REG_WEIGHT_TEMP_SEL[nr], reg);
}
+out:
mutex_unlock(&data->update_lock);
- return count;
+ return err ? : count;
}
static ssize_t
@@ -3068,6 +3304,9 @@ show_target_temp(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);
+ if (IS_ERR(data))
+ return PTR_ERR(data);
+
return sprintf(buf, "%d\n", data->target_temp[sattr->index] * 1000);
}
@@ -3090,9 +3329,9 @@ store_target_temp(struct device *dev, struct device_attribute *attr,
mutex_lock(&data->update_lock);
data->target_temp[nr] = val;
- pwm_update_registers(data, nr);
+ err = pwm_update_registers(data, nr);
mutex_unlock(&data->update_lock);
- return count;
+ return err ? : count;
}
static ssize_t
@@ -3102,6 +3341,9 @@ show_target_speed(struct device *dev, struct device_attribute *attr, char *buf)
struct sensor_device_attribute *sattr = to_sensor_dev_attr(attr);
int nr = sattr->index;
+ if (IS_ERR(data))
+ return PTR_ERR(data);
+
return sprintf(buf, "%d\n",
fan_from_reg16(data->target_speed[nr],
data->fan_div[nr]));
@@ -3127,9 +3369,9 @@ store_target_speed(struct device *dev, struct device_attribute *attr,
mutex_lock(&data->update_lock);
data->target_speed[nr] = speed;
- pwm_update_registers(data, nr);
+ err = pwm_update_registers(data, nr);
mutex_unlock(&data->update_lock);
- return count;
+ return err ? : count;
}
static ssize_t
@@ -3141,6 +3383,9 @@ show_temp_tolerance(struct device *dev, struct device_attribute *attr,
int nr = sattr->nr;
int index = sattr->index;
+ if (IS_ERR(data))
+ return PTR_ERR(data);
+
return sprintf(buf, "%d\n", data->temp_tolerance[index][nr] * 1000);
}
@@ -3165,13 +3410,11 @@ store_temp_tolerance(struct device *dev, struct device_attribute *attr,
mutex_lock(&data->update_lock);
data->temp_tolerance[index][nr] = val;
if (index)
- pwm_update_registers(data, nr);
+ err = pwm_update_registers(data, nr);
else
- data->write_value(data,
- data->REG_CRITICAL_TEMP_TOLERANCE[nr],
- val);
+ err = nct6775_write_value(data, data->REG_CRITICAL_TEMP_TOLERANCE[nr], val);
mutex_unlock(&data->update_lock);
- return count;
+ return err ? : count;
}
/*
@@ -3188,8 +3431,12 @@ show_speed_tolerance(struct device *dev, struct device_attribute *attr,
struct nct6775_data *data = nct6775_update_device(dev);
struct sensor_device_attribute *sattr = to_sensor_dev_attr(attr);
int nr = sattr->index;
- int target = data->target_speed[nr];
- int tolerance = 0;
+ int target, tolerance = 0;
+
+ if (IS_ERR(data))
+ return PTR_ERR(data);
+
+ target = data->target_speed[nr];
if (target) {
int low = target - data->target_speed_tolerance[nr];
@@ -3239,9 +3486,9 @@ store_speed_tolerance(struct device *dev, struct device_attribute *attr,
mutex_lock(&data->update_lock);
data->target_speed_tolerance[nr] = val;
- pwm_update_registers(data, nr);
+ err = pwm_update_registers(data, nr);
mutex_unlock(&data->update_lock);
- return count;
+ return err ? : count;
}
SENSOR_TEMPLATE_2(pwm, "pwm%d", S_IWUSR | S_IRUGO, show_pwm, store_pwm, 0, 0);
@@ -3268,6 +3515,9 @@ show_weight_temp(struct device *dev, struct device_attribute *attr, char *buf)
int nr = sattr->nr;
int index = sattr->index;
+ if (IS_ERR(data))
+ return PTR_ERR(data);
+
return sprintf(buf, "%d\n", data->weight_temp[index][nr] * 1000);
}
@@ -3290,9 +3540,9 @@ store_weight_temp(struct device *dev, struct device_attribute *attr,
mutex_lock(&data->update_lock);
data->weight_temp[index][nr] = val;
- data->write_value(data, data->REG_WEIGHT_TEMP[index][nr], val);
+ err = nct6775_write_value(data, data->REG_WEIGHT_TEMP[index][nr], val);
mutex_unlock(&data->update_lock);
- return count;
+ return err ? : count;
}
SENSOR_TEMPLATE(pwm_weight_temp_sel, "pwm%d_weight_temp_sel", S_IWUSR | S_IRUGO,
@@ -3316,6 +3566,9 @@ show_fan_time(struct device *dev, struct device_attribute *attr, char *buf)
int nr = sattr->nr;
int index = sattr->index;
+ if (IS_ERR(data))
+ return PTR_ERR(data);
+
return sprintf(buf, "%d\n",
step_time_from_reg(data->fan_time[index][nr],
data->pwm_mode[nr]));
@@ -3339,9 +3592,9 @@ store_fan_time(struct device *dev, struct device_attribute *attr,
val = step_time_to_reg(val, data->pwm_mode[nr]);
mutex_lock(&data->update_lock);
data->fan_time[index][nr] = val;
- data->write_value(data, data->REG_FAN_TIME[index][nr], val);
+ err = nct6775_write_value(data, data->REG_FAN_TIME[index][nr], val);
mutex_unlock(&data->update_lock);
- return count;
+ return err ? : count;
}
static ssize_t
@@ -3350,6 +3603,9 @@ show_auto_pwm(struct device *dev, struct device_attribute *attr, char *buf)
struct nct6775_data *data = nct6775_update_device(dev);
struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr);
+ if (IS_ERR(data))
+ return PTR_ERR(data);
+
return sprintf(buf, "%d\n", data->auto_pwm[sattr->nr][sattr->index]);
}
@@ -3363,7 +3619,7 @@ store_auto_pwm(struct device *dev, struct device_attribute *attr,
int point = sattr->index;
unsigned long val;
int err;
- u8 reg;
+ u16 reg;
err = kstrtoul(buf, 10, &val);
if (err < 0)
@@ -3381,21 +3637,20 @@ store_auto_pwm(struct device *dev, struct device_attribute *attr,
mutex_lock(&data->update_lock);
data->auto_pwm[nr][point] = val;
if (point < data->auto_pwm_num) {
- data->write_value(data,
- NCT6775_AUTO_PWM(data, nr, point),
- data->auto_pwm[nr][point]);
+ err = nct6775_write_value(data, NCT6775_AUTO_PWM(data, nr, point),
+ data->auto_pwm[nr][point]);
} else {
switch (data->kind) {
case nct6775:
/* disable if needed (pwm == 0) */
- reg = data->read_value(data,
- NCT6775_REG_CRITICAL_ENAB[nr]);
+ err = nct6775_read_value(data, NCT6775_REG_CRITICAL_ENAB[nr], ®);
+ if (err)
+ break;
if (val)
reg |= 0x02;
else
reg &= ~0x02;
- data->write_value(data, NCT6775_REG_CRITICAL_ENAB[nr],
- reg);
+ err = nct6775_write_value(data, NCT6775_REG_CRITICAL_ENAB[nr], reg);
break;
case nct6776:
break; /* always enabled, nothing to do */
@@ -3409,22 +3664,22 @@ store_auto_pwm(struct device *dev, struct device_attribute *attr,
case nct6796:
case nct6797:
case nct6798:
- data->write_value(data, data->REG_CRITICAL_PWM[nr],
- val);
- reg = data->read_value(data,
- data->REG_CRITICAL_PWM_ENABLE[nr]);
+ err = nct6775_write_value(data, data->REG_CRITICAL_PWM[nr], val);
+ if (err)
+ break;
+ err = nct6775_read_value(data, data->REG_CRITICAL_PWM_ENABLE[nr], ®);
+ if (err)
+ break;
if (val == 255)
reg &= ~data->CRITICAL_PWM_ENABLE_MASK;
else
reg |= data->CRITICAL_PWM_ENABLE_MASK;
- data->write_value(data,
- data->REG_CRITICAL_PWM_ENABLE[nr],
- reg);
+ err = nct6775_write_value(data, data->REG_CRITICAL_PWM_ENABLE[nr], reg);
break;
}
}
mutex_unlock(&data->update_lock);
- return count;
+ return err ? : count;
}
static ssize_t
@@ -3435,6 +3690,9 @@ show_auto_temp(struct device *dev, struct device_attribute *attr, char *buf)
int nr = sattr->nr;
int point = sattr->index;
+ if (IS_ERR(data))
+ return PTR_ERR(data);
+
/*
* We don't know for sure if the temperature is signed or unsigned.
* Assume it is unsigned.
@@ -3462,15 +3720,14 @@ store_auto_temp(struct device *dev, struct device_attribute *attr,
mutex_lock(&data->update_lock);
data->auto_temp[nr][point] = DIV_ROUND_CLOSEST(val, 1000);
if (point < data->auto_pwm_num) {
- data->write_value(data,
- NCT6775_AUTO_TEMP(data, nr, point),
- data->auto_temp[nr][point]);
+ err = nct6775_write_value(data, NCT6775_AUTO_TEMP(data, nr, point),
+ data->auto_temp[nr][point]);
} else {
- data->write_value(data, data->REG_CRITICAL_TEMP[nr],
- data->auto_temp[nr][point]);
+ err = nct6775_write_value(data, data->REG_CRITICAL_TEMP[nr],
+ data->auto_temp[nr][point]);
}
mutex_unlock(&data->update_lock);
- return count;
+ return err ? : count;
}
static umode_t nct6775_pwm_is_visible(struct kobject *kobj,
@@ -3719,16 +3976,21 @@ static const struct attribute_group nct6775_group_other = {
.is_visible = nct6775_other_is_visible,
};
-static inline void nct6775_init_device(struct nct6775_data *data)
+static inline int nct6775_init_device(struct nct6775_data *data)
{
- int i;
- u8 tmp, diode;
+ int i, err;
+ u16 tmp, diode;
/* Start monitoring if needed */
if (data->REG_CONFIG) {
- tmp = data->read_value(data, data->REG_CONFIG);
- if (!(tmp & 0x01))
- data->write_value(data, data->REG_CONFIG, tmp | 0x01);
+ err = nct6775_read_value(data, data->REG_CONFIG, &tmp);
+ if (err)
+ return err;
+ if (!(tmp & 0x01)) {
+ err = nct6775_write_value(data, data->REG_CONFIG, tmp | 0x01);
+ if (err)
+ return err;
+ }
}
/* Enable temperature sensors if needed */
@@ -3737,18 +3999,29 @@ static inline void nct6775_init_device(struct nct6775_data *data)
continue;
if (!data->reg_temp_config[i])
continue;
- tmp = data->read_value(data, data->reg_temp_config[i]);
- if (tmp & 0x01)
- data->write_value(data, data->reg_temp_config[i],
- tmp & 0xfe);
+ err = nct6775_read_value(data, data->reg_temp_config[i], &tmp);
+ if (err)
+ return err;
+ if (tmp & 0x01) {
+ err = nct6775_write_value(data, data->reg_temp_config[i], tmp & 0xfe);
+ if (err)
+ return err;
+ }
}
/* Enable VBAT monitoring if needed */
- tmp = data->read_value(data, data->REG_VBAT);
- if (!(tmp & 0x01))
- data->write_value(data, data->REG_VBAT, tmp | 0x01);
+ err = nct6775_read_value(data, data->REG_VBAT, &tmp);
+ if (err)
+ return err;
+ if (!(tmp & 0x01)) {
+ err = nct6775_write_value(data, data->REG_VBAT, tmp | 0x01);
+ if (err)
+ return err;
+ }
- diode = data->read_value(data, data->REG_DIODE);
+ err = nct6775_read_value(data, data->REG_DIODE, &diode);
+ if (err)
+ return err;
for (i = 0; i < data->temp_fixed_num; i++) {
if (!(data->have_temp_fixed & BIT(i)))
@@ -3759,6 +4032,8 @@ static inline void nct6775_init_device(struct nct6775_data *data)
else /* thermistor */
data->temp_type[i] = 4;
}
+
+ return 0;
}
static void
@@ -3982,18 +4257,20 @@ nct6775_check_fan_inputs(struct nct6775_data *data, struct nct6775_sio_data *sio
(pwm5pin << 4) | (pwm6pin << 5) | (pwm7pin << 6);
}
-static void add_temp_sensors(struct nct6775_data *data, const u16 *regp,
- int *available, int *mask)
+static int add_temp_sensors(struct nct6775_data *data, const u16 *regp,
+ int *available, int *mask)
{
- int i;
- u8 src;
+ int i, err;
+ u16 src;
for (i = 0; i < data->pwm_num && *available; i++) {
int index;
if (!regp[i])
continue;
- src = data->read_value(data, regp[i]);
+ err = nct6775_read_value(data, regp[i], &src);
+ if (err)
+ return err;
src &= 0x1f;
if (!src || (*mask & BIT(src)))
continue;
@@ -4001,12 +4278,30 @@ static void add_temp_sensors(struct nct6775_data *data, const u16 *regp,
continue;
index = __ffs(*available);
- data->write_value(data, data->REG_TEMP_SOURCE[index], src);
+ err = nct6775_write_value(data, data->REG_TEMP_SOURCE[index], src);
+ if (err)
+ return err;
*available &= ~BIT(index);
*mask |= BIT(src);
}
+
+ return 0;
}
+static const struct regmap_config nct6775_regmap_config = {
+ .reg_bits = 16,
+ .val_bits = 16,
+ .reg_read = nct6775_reg_read,
+ .reg_write = nct6775_reg_write,
+};
+
+static const struct regmap_config nct6775_wmi_regmap_config = {
+ .reg_bits = 16,
+ .val_bits = 16,
+ .reg_read = nct6775_wmi_reg_read,
+ .reg_write = nct6775_wmi_reg_write,
+};
+
static int nct6775_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
@@ -4014,7 +4309,8 @@ static int nct6775_probe(struct platform_device *pdev)
struct nct6775_data *data;
struct resource *res;
int i, s, err = 0;
- int src, mask, available;
+ int mask, available;
+ u16 src;
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;
@@ -4023,6 +4319,7 @@ static int nct6775_probe(struct platform_device *pdev)
struct attribute_group *group;
struct device *hwmon_dev;
struct sensor_template_group tsi_temp_tg;
+ const struct regmap_config *regmapcfg;
int num_attr_groups = 0;
if (sio_data->access == access_direct) {
@@ -4042,13 +4339,15 @@ static int nct6775_probe(struct platform_device *pdev)
if (sio_data->access == access_direct) {
data->addr = res->start;
- data->read_value = nct6775_read_value;
- data->write_value = nct6775_write_value;
+ regmapcfg = &nct6775_regmap_config;
} else {
- data->read_value = nct6775_wmi_read_value;
- data->write_value = nct6775_wmi_write_value;
+ regmapcfg = &nct6775_wmi_regmap_config;
}
+ data->regmap = devm_regmap_init(dev, NULL, data, regmapcfg);
+ if (IS_ERR(data->regmap))
+ return PTR_ERR(data->regmap);
+
mutex_init(&data->update_lock);
data->name = nct6775_device_names[data->kind];
data->bank = 0xff; /* Force initial bank selection */
@@ -4596,7 +4895,10 @@ static int nct6775_probe(struct platform_device *pdev)
if (reg_temp[i] == 0)
continue;
- src = data->read_value(data, data->REG_TEMP_SOURCE[i]) & 0x1f;
+ err = nct6775_read_value(data, data->REG_TEMP_SOURCE[i], &src);
+ if (err)
+ return err;
+ src &= 0x1f;
if (!src || (mask & BIT(src)))
available |= BIT(i);
@@ -4607,8 +4909,12 @@ static int nct6775_probe(struct platform_device *pdev)
* Now find unmonitored temperature registers and enable monitoring
* if additional monitoring registers are available.
*/
- add_temp_sensors(data, data->REG_TEMP_SEL, &available, &mask);
- add_temp_sensors(data, data->REG_WEIGHT_TEMP_SEL, &available, &mask);
+ err = add_temp_sensors(data, data->REG_TEMP_SEL, &available, &mask);
+ if (err)
+ return err;
+ err = add_temp_sensors(data, data->REG_WEIGHT_TEMP_SEL, &available, &mask);
+ if (err)
+ return err;
mask = 0;
s = NUM_TEMP_FIXED; /* First dynamic temperature attribute */
@@ -4616,7 +4922,10 @@ static int nct6775_probe(struct platform_device *pdev)
if (reg_temp[i] == 0)
continue;
- src = data->read_value(data, data->REG_TEMP_SOURCE[i]) & 0x1f;
+ err = nct6775_read_value(data, data->REG_TEMP_SOURCE[i], &src);
+ if (err)
+ return err;
+ src &= 0x1f;
if (!src || (mask & BIT(src)))
continue;
@@ -4676,7 +4985,10 @@ static int nct6775_probe(struct platform_device *pdev)
if (reg_temp_mon[i] == 0)
continue;
- src = data->read_value(data, data->REG_TEMP_SEL[i]) & 0x1f;
+ err = nct6775_read_value(data, data->REG_TEMP_SEL[i], &src);
+ if (err)
+ return err;
+ src &= 0x1f;
if (!src)
continue;
@@ -4760,12 +5072,19 @@ static int nct6775_probe(struct platform_device *pdev)
/* Check which TSIx_TEMP registers are active */
for (i = 0; i < num_reg_tsi_temp; i++) {
- if (data->read_value(data, data->REG_TSI_TEMP[i]))
+ u16 tmp;
+
+ err = nct6775_read_value(data, data->REG_TSI_TEMP[i], &tmp);
+ if (err)
+ return err;
+ if (tmp)
data->have_tsi_temp |= BIT(i);
}
/* Initialize the chip */
- nct6775_init_device(data);
+ err = nct6775_init_device(data);
+ if (err)
+ return err;
err = sio_data->sio_enter(sio_data);
if (err)
@@ -4841,7 +5160,9 @@ static int nct6775_probe(struct platform_device *pdev)
sio_data->sio_exit(sio_data);
/* Read fan clock dividers immediately */
- nct6775_init_fan_common(dev, data);
+ err = nct6775_init_fan_common(dev, data);
+ if (err)
+ return err;
/* Register sysfs hooks */
group = nct6775_create_attr_group(dev, &nct6775_pwm_template_group,
@@ -4904,17 +5225,33 @@ static void nct6791_enable_io_mapping(struct nct6775_sio_data *sio_data)
static int __maybe_unused nct6775_suspend(struct device *dev)
{
+ int err;
+ u16 tmp;
struct nct6775_data *data = nct6775_update_device(dev);
+ if (IS_ERR(data))
+ return PTR_ERR(data);
+
mutex_lock(&data->update_lock);
- data->vbat = data->read_value(data, data->REG_VBAT);
+ err = nct6775_read_value(data, data->REG_VBAT, &tmp);
+ if (err)
+ goto out;
+ data->vbat = tmp;
if (data->kind == nct6775) {
- data->fandiv1 = data->read_value(data, NCT6775_REG_FANDIV1);
- data->fandiv2 = data->read_value(data, NCT6775_REG_FANDIV2);
+ err = nct6775_read_value(data, NCT6775_REG_FANDIV1, &tmp);
+ if (err)
+ goto out;
+ data->fandiv1 = tmp;
+
+ err = nct6775_read_value(data, NCT6775_REG_FANDIV2, &tmp);
+ if (err)
+ goto out;
+ data->fandiv2 = tmp;
}
+out:
mutex_unlock(&data->update_lock);
- return 0;
+ return err;
}
static int __maybe_unused nct6775_resume(struct device *dev)
@@ -4949,18 +5286,21 @@ static int __maybe_unused nct6775_resume(struct device *dev)
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]);
+ err = nct6775_write_value(data, data->REG_IN_MINMAX[0][i], data->in[i][1]);
+ if (err)
+ goto abort;
+ err = nct6775_write_value(data, data->REG_IN_MINMAX[1][i], data->in[i][2]);
+ if (err)
+ goto abort;
}
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]);
+ err = nct6775_write_value(data, data->REG_FAN_MIN[i], data->fan_min[i]);
+ if (err)
+ goto abort;
}
for (i = 0; i < NUM_TEMP; i++) {
@@ -4968,16 +5308,23 @@ static int __maybe_unused nct6775_resume(struct device *dev)
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]);
+ if (data->reg_temp[j][i]) {
+ err = nct6775_write_temp(data, data->reg_temp[j][i],
+ data->temp[j][i]);
+ if (err)
+ goto abort;
+ }
}
/* Restore other settings */
- data->write_value(data, data->REG_VBAT, data->vbat);
+ err = nct6775_write_value(data, data->REG_VBAT, data->vbat);
+ if (err)
+ goto abort;
if (data->kind == nct6775) {
- data->write_value(data, NCT6775_REG_FANDIV1, data->fandiv1);
- data->write_value(data, NCT6775_REG_FANDIV2, data->fandiv2);
+ err = nct6775_write_value(data, NCT6775_REG_FANDIV1, data->fandiv1);
+ if (err)
+ goto abort;
+ err = nct6775_write_value(data, NCT6775_REG_FANDIV2, data->fandiv2);
}
abort:
--
2.35.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH v2 3/6] hwmon: (nct6775) Rearrange attr-group initialization
2022-03-09 0:50 [PATCH v2 0/6] hwmon: (nct6775) Convert to regmap, add i2c support Zev Weiss
2022-03-09 0:50 ` [PATCH v2 1/6] dt-bindings: hwmon: Add nuvoton,nct6775 Zev Weiss
2022-03-09 0:50 ` [PATCH v2 2/6] hwmon: (nct6775) Convert register access to regmap API Zev Weiss
@ 2022-03-09 0:50 ` Zev Weiss
2022-03-09 0:50 ` [PATCH v2 4/6] hwmon: (nct6775) Add read-only mode Zev Weiss
` (4 subsequent siblings)
7 siblings, 0 replies; 15+ messages in thread
From: Zev Weiss @ 2022-03-09 0:50 UTC (permalink / raw)
To: Guenter Roeck, Jean Delvare, linux-hwmon
Cc: linux-kernel, openbmc, Oleksandr Natalenko, 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 be99a1890ccd..36bdbb176601 100644
--- a/drivers/hwmon/nct6775.c
+++ b/drivers/hwmon/nct6775.c
@@ -1199,6 +1199,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
@@ -1404,10 +1405,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 (data->num_groups == ARRAY_SIZE(data->groups) - 1)
+ return -ENOBUFS;
+
+ 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;
@@ -1418,28 +1427,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;
@@ -1477,7 +1486,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)
@@ -4316,11 +4325,9 @@ 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;
const struct regmap_config *regmapcfg;
- int num_attr_groups = 0;
if (sio_data->access == access_direct) {
res = platform_get_resource(pdev, IORESOURCE_IO, 0);
@@ -5165,46 +5172,39 @@ static int nct6775_probe(struct platform_device *pdev)
return err;
/* 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] 15+ messages in thread
* [PATCH v2 4/6] hwmon: (nct6775) Add read-only mode
2022-03-09 0:50 [PATCH v2 0/6] hwmon: (nct6775) Convert to regmap, add i2c support Zev Weiss
` (2 preceding siblings ...)
2022-03-09 0:50 ` [PATCH v2 3/6] hwmon: (nct6775) Rearrange attr-group initialization Zev Weiss
@ 2022-03-09 0:50 ` Zev Weiss
2022-03-09 0:50 ` [PATCH v2 5/6] hwmon: (nct6775) Split core and platform driver Zev Weiss
` (3 subsequent siblings)
7 siblings, 0 replies; 15+ messages in thread
From: Zev Weiss @ 2022-03-09 0:50 UTC (permalink / raw)
To: Guenter Roeck, Jean Delvare, linux-hwmon
Cc: linux-kernel, openbmc, Oleksandr Natalenko, 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 | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
index 36bdbb176601..99b4e308a053 100644
--- a/drivers/hwmon/nct6775.c
+++ b/drivers/hwmon/nct6775.c
@@ -1348,6 +1348,7 @@ struct nct6775_data {
u8 sio_reg_enable;
struct regmap *regmap;
+ bool read_only;
};
struct sensor_device_template {
@@ -1405,6 +1406,11 @@ struct sensor_template_group {
int base;
};
+static inline umode_t nct6775_attr_mode(struct nct6775_data *data, struct attribute *attr)
+{
+ return data->read_only ? (attr->mode & ~0222) : attr->mode;
+}
+
static int nct6775_add_attr_group(struct nct6775_data *data, const struct attribute_group *group)
{
/* Need to leave a NULL terminator at the end of data->groups */
@@ -2371,7 +2377,7 @@ static umode_t nct6775_in_is_visible(struct kobject *kobj,
if (!(data->have_in & BIT(in)))
return 0;
- return attr->mode;
+ return nct6775_attr_mode(data, attr);
}
SENSOR_TEMPLATE_2(in_input, "in%d_input", S_IRUGO, show_in_reg, NULL, 0, 0);
@@ -2607,7 +2613,7 @@ static umode_t nct6775_fan_is_visible(struct kobject *kobj,
if (nr == 5 && data->kind != nct6775)
return 0;
- return attr->mode;
+ return nct6775_attr_mode(data, attr);
}
SENSOR_TEMPLATE(fan_input, "fan%d_input", S_IRUGO, show_fan, NULL, 0);
@@ -2834,7 +2840,7 @@ static umode_t nct6775_temp_is_visible(struct kobject *kobj,
if (nr > 7 && !(data->have_temp_fixed & BIT(temp)))
return 0;
- return attr->mode;
+ return nct6775_attr_mode(data, attr);
}
SENSOR_TEMPLATE_2(temp_input, "temp%d_input", S_IRUGO, show_temp, NULL, 0, 0);
@@ -2908,7 +2914,7 @@ static umode_t nct6775_tsi_temp_is_visible(struct kobject *kobj, struct attribut
struct nct6775_data *data = dev_get_drvdata(dev);
int temp = index / 2;
- return (data->have_tsi_temp & BIT(temp)) ? attr->mode : 0;
+ return (data->have_tsi_temp & BIT(temp)) ? nct6775_attr_mode(data, attr) : 0;
}
/*
@@ -3766,7 +3772,7 @@ static umode_t nct6775_pwm_is_visible(struct kobject *kobj,
if (api > data->auto_pwm_num)
return 0;
}
- return attr->mode;
+ return nct6775_attr_mode(data, attr);
}
SENSOR_TEMPLATE_2(pwm_stop_time, "pwm%d_stop_time", S_IWUSR | S_IRUGO,
@@ -3961,7 +3967,7 @@ static umode_t nct6775_other_is_visible(struct kobject *kobj,
return 0;
}
- return attr->mode;
+ return nct6775_attr_mode(data, attr);
}
/*
--
2.35.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH v2 5/6] hwmon: (nct6775) Split core and platform driver
2022-03-09 0:50 [PATCH v2 0/6] hwmon: (nct6775) Convert to regmap, add i2c support Zev Weiss
` (3 preceding siblings ...)
2022-03-09 0:50 ` [PATCH v2 4/6] hwmon: (nct6775) Add read-only mode Zev Weiss
@ 2022-03-09 0:50 ` Zev Weiss
2022-04-25 15:23 ` Guenter Roeck
2022-03-09 0:50 ` [PATCH v2 6/6] hwmon: (nct6775) Add i2c driver Zev Weiss
` (2 subsequent siblings)
7 siblings, 1 reply; 15+ messages in thread
From: Zev Weiss @ 2022-03-09 0:50 UTC (permalink / raw)
To: Guenter Roeck, Jean Delvare, linux-hwmon
Cc: linux-kernel, openbmc, Oleksandr Natalenko, 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>
Tested-by: Renze Nicolai <renze@rnplus.nl>
---
MAINTAINERS | 6 +-
drivers/hwmon/Kconfig | 15 +-
drivers/hwmon/Makefile | 3 +-
drivers/hwmon/{nct6775.c => nct6775-core.c} | 1465 +------------------
drivers/hwmon/nct6775-platform.c | 1232 ++++++++++++++++
drivers/hwmon/nct6775.h | 252 ++++
6 files changed, 1532 insertions(+), 1441 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 a9c9ee378f93..f093e40d2b16 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -13287,12 +13287,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 9ab4e9b3d27b..1c657100c392 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 4ed138d0621f..2453c087cf1d 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 99b4e308a053..cb3958c977fa 100644
--- a/drivers/hwmon/nct6775.c
+++ b/drivers/hwmon/nct6775-core.c
@@ -44,25 +44,20 @@
#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/regmap.h>
-#include <linux/wmi.h>
#include "lm75.h"
+#include "nct6775.h"
-#define USE_ALTERNATE
+#undef DEFAULT_SYMBOL_NAMESPACE
+#define DEFAULT_SYMBOL_NAMESPACE HWMON_NCT6775
-enum kinds { nct6106, nct6116, nct6775, nct6776, nct6779, nct6791, nct6792,
- nct6793, nct6795, nct6796, nct6797, nct6798 };
+#define USE_ALTERNATE
/* used to set data->name = nct6775_device_names[data->sio_kind] */
static const char * const nct6775_device_names[] = {
@@ -80,242 +75,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 */
@@ -334,11 +93,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 */
@@ -352,10 +106,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 };
/*
@@ -371,11 +121,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 };
@@ -691,8 +436,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 };
@@ -1192,165 +935,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;
-
- struct regmap *regmap;
- bool read_only;
-};
-
struct sensor_device_template {
struct device_attribute dev_attr;
union {
@@ -1406,21 +990,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 (data->num_groups == ARRAY_SIZE(data->groups) - 1)
- return -ENOBUFS;
-
- 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)
{
@@ -1495,7 +1064,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:
@@ -1552,122 +1121,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 int nct6775_wmi_reg_read(void *ctx, unsigned int reg, unsigned int *val)
-{
- struct nct6775_data *data = ctx;
- int err, word_sized = is_word_sized(data, reg);
- u8 tmp = 0;
- u16 res;
-
- nct6775_wmi_set_bank(data, reg);
-
- err = nct6775_asuswmi_read(data->bank, reg & 0xff, &tmp);
- if (err)
- return err;
-
- res = tmp;
- if (word_sized) {
- err = nct6775_asuswmi_read(data->bank, (reg & 0xff) + 1, &tmp);
- if (err)
- return err;
-
- res = (res << 8) + tmp;
- }
- *val = res;
- return 0;
-}
-
-static inline int nct6775_read_value(struct nct6775_data *data, u16 reg, u16 *value)
-{
- unsigned int tmp;
- int ret = regmap_read(data->regmap, reg, &tmp);
-
- if (!ret)
- *value = tmp;
- return ret;
-}
-
-static int nct6775_wmi_reg_write(void *ctx, unsigned int reg, unsigned int value)
-{
- struct nct6775_data *data = ctx;
- 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;
-}
-
-static inline int nct6775_write_value(struct nct6775_data *data, u16 reg, u16 value)
-{
- return regmap_write(data->regmap, reg, value);
-}
-
-/*
- * 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 int nct6775_reg_read(void *ctx, unsigned int reg, unsigned int *val)
-{
- struct nct6775_data *data = ctx;
- int word_sized = is_word_sized(data, reg);
-
- nct6775_set_bank(data, reg);
- outb_p(reg & 0xff, data->addr + ADDR_REG_OFFSET);
- *val = inb_p(data->addr + DATA_REG_OFFSET);
- if (word_sized) {
- outb_p((reg & 0xff) + 1,
- data->addr + ADDR_REG_OFFSET);
- *val = (*val << 8) + inb_p(data->addr + DATA_REG_OFFSET);
- }
- return 0;
-}
-
-static int nct6775_reg_write(void *ctx, unsigned int reg, unsigned int value)
-{
- struct nct6775_data *data = ctx;
- 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 int nct6775_read_temp(struct nct6775_data *data, u16 reg, u16 *val)
@@ -1678,19 +1132,12 @@ static int nct6775_read_temp(struct nct6775_data *data, u16 reg, u16 *val)
if (err)
return err;
- if (!is_word_sized(data, reg))
+ if (!nct6775_reg_is_word_sized(data, reg))
*val <<= 8;
return 0;
}
-static int nct6775_write_temp(struct nct6775_data *data, u16 reg, u16 value)
-{
- if (!is_word_sized(data, reg))
- value >>= 8;
- return nct6775_write_value(data, reg, value);
-}
-
/* This function assumes that the caller holds data->update_lock */
static int nct6775_write_fan_div(struct nct6775_data *data, int nr)
{
@@ -2207,8 +1654,8 @@ store_in_reg(struct device *dev, struct device_attribute *attr, const char *buf,
return err ? : 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);
@@ -2221,6 +1668,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)
{
@@ -2263,8 +1711,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);
@@ -2278,10 +1726,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);
@@ -2306,6 +1754,7 @@ store_beep(struct device *dev, struct device_attribute *attr, const char *buf,
mutex_unlock(&data->update_lock);
return err ? : count;
}
+EXPORT_SYMBOL_GPL(nct6775_store_beep);
static ssize_t
show_temp_beep(struct device *dev, struct device_attribute *attr, char *buf)
@@ -2381,9 +1830,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,
@@ -2617,10 +2065,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,
@@ -3884,113 +3332,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 int nct6775_init_device(struct nct6775_data *data)
{
int i, err;
@@ -4051,227 +3392,6 @@ static inline int nct6775_init_device(struct nct6775_data *data)
return 0;
}
-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 int add_temp_sensors(struct nct6775_data *data, const u16 *regp,
int *available, int *mask)
{
@@ -4303,26 +3423,9 @@ static int add_temp_sensors(struct nct6775_data *data, const u16 *regp,
return 0;
}
-static const struct regmap_config nct6775_regmap_config = {
- .reg_bits = 16,
- .val_bits = 16,
- .reg_read = nct6775_reg_read,
- .reg_write = nct6775_reg_write,
-};
-
-static const struct regmap_config nct6775_wmi_regmap_config = {
- .reg_bits = 16,
- .val_bits = 16,
- .reg_read = nct6775_wmi_reg_read,
- .reg_write = nct6775_wmi_reg_write,
-};
-
-static int nct6775_probe(struct platform_device *pdev)
+int nct6775_probe(struct device *dev, struct nct6775_data *data,
+ const struct regmap_config *regmapcfg)
{
- 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 mask, available;
u16 src;
@@ -4330,32 +3433,8 @@ static int nct6775_probe(struct platform_device *pdev)
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;
- const struct regmap_config *regmapcfg;
-
- 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;
- regmapcfg = &nct6775_regmap_config;
- } else {
- regmapcfg = &nct6775_wmi_regmap_config;
- }
data->regmap = devm_regmap_init(dev, NULL, data, regmapcfg);
if (IS_ERR(data->regmap))
@@ -4364,7 +3443,6 @@ static int nct6775_probe(struct platform_device *pdev)
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:
@@ -5099,79 +4177,12 @@ static int nct6775_probe(struct platform_device *pdev)
if (err)
return err;
- 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 */
err = nct6775_init_fan_common(dev, data);
if (err)
@@ -5208,430 +4219,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)
-{
- int err;
- u16 tmp;
- struct nct6775_data *data = nct6775_update_device(dev);
-
- if (IS_ERR(data))
- return PTR_ERR(data);
-
- mutex_lock(&data->update_lock);
- err = nct6775_read_value(data, data->REG_VBAT, &tmp);
- if (err)
- goto out;
- data->vbat = tmp;
- if (data->kind == nct6775) {
- err = nct6775_read_value(data, NCT6775_REG_FANDIV1, &tmp);
- if (err)
- goto out;
- data->fandiv1 = tmp;
-
- err = nct6775_read_value(data, NCT6775_REG_FANDIV2, &tmp);
- if (err)
- goto out;
- data->fandiv2 = tmp;
- }
-out:
- mutex_unlock(&data->update_lock);
-
- return err;
-}
-
-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;
-
- err = nct6775_write_value(data, data->REG_IN_MINMAX[0][i], data->in[i][1]);
- if (err)
- goto abort;
- err = nct6775_write_value(data, data->REG_IN_MINMAX[1][i], data->in[i][2]);
- if (err)
- goto abort;
- }
-
- for (i = 0; i < ARRAY_SIZE(data->fan_min); i++) {
- if (!(data->has_fan_min & BIT(i)))
- continue;
-
- err = nct6775_write_value(data, data->REG_FAN_MIN[i], data->fan_min[i]);
- if (err)
- goto abort;
- }
-
- 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]) {
- err = nct6775_write_temp(data, data->reg_temp[j][i],
- data->temp[j][i]);
- if (err)
- goto abort;
- }
- }
-
- /* Restore other settings */
- err = nct6775_write_value(data, data->REG_VBAT, data->vbat);
- if (err)
- goto abort;
- if (data->kind == nct6775) {
- err = nct6775_write_value(data, NCT6775_REG_FANDIV1, data->fandiv1);
- if (err)
- goto abort;
- err = nct6775_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..15d6ad376007
--- /dev/null
+++ b/drivers/hwmon/nct6775-platform.c
@@ -0,0 +1,1232 @@
+// 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/acpi.h>
+#include <linux/dmi.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/hwmon-vid.h>
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.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 int nct6775_wmi_reg_read(void *ctx, unsigned int reg, unsigned int *val)
+{
+ struct nct6775_data *data = ctx;
+ int err, word_sized = nct6775_reg_is_word_sized(data, reg);
+ u8 tmp = 0;
+ u16 res;
+
+ nct6775_wmi_set_bank(data, reg);
+
+ err = nct6775_asuswmi_read(data->bank, reg & 0xff, &tmp);
+ if (err)
+ return err;
+
+ res = tmp;
+ if (word_sized) {
+ err = nct6775_asuswmi_read(data->bank, (reg & 0xff) + 1, &tmp);
+ if (err)
+ return err;
+
+ res = (res << 8) + tmp;
+ }
+ *val = res;
+ return 0;
+}
+
+static int nct6775_wmi_reg_write(void *ctx, unsigned int reg, unsigned int value)
+{
+ struct nct6775_data *data = ctx;
+ 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 int nct6775_reg_read(void *ctx, unsigned int reg, unsigned int *val)
+{
+ struct nct6775_data *data = ctx;
+ int word_sized = nct6775_reg_is_word_sized(data, reg);
+
+ nct6775_set_bank(data, reg);
+ outb_p(reg & 0xff, data->addr + ADDR_REG_OFFSET);
+ *val = inb_p(data->addr + DATA_REG_OFFSET);
+ if (word_sized) {
+ outb_p((reg & 0xff) + 1,
+ data->addr + ADDR_REG_OFFSET);
+ *val = (*val << 8) + inb_p(data->addr + DATA_REG_OFFSET);
+ }
+ return 0;
+}
+
+static int nct6775_reg_write(void *ctx, unsigned int reg, unsigned int value)
+{
+ struct nct6775_data *data = ctx;
+ 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)
+{
+ int err;
+ u16 tmp;
+ struct nct6775_data *data = dev_get_drvdata(dev);
+
+ if (IS_ERR(data))
+ return PTR_ERR(data);
+
+ mutex_lock(&data->update_lock);
+ err = nct6775_read_value(data, data->REG_VBAT, &tmp);
+ if (err)
+ goto out;
+ data->vbat = tmp;
+ if (data->kind == nct6775) {
+ err = nct6775_read_value(data, NCT6775_REG_FANDIV1, &tmp);
+ if (err)
+ goto out;
+ data->fandiv1 = tmp;
+
+ err = nct6775_read_value(data, NCT6775_REG_FANDIV2, &tmp);
+ if (err)
+ goto out;
+ data->fandiv2 = tmp;
+ }
+out:
+ mutex_unlock(&data->update_lock);
+
+ return err;
+}
+
+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;
+
+ err = nct6775_write_value(data, data->REG_IN_MINMAX[0][i], data->in[i][1]);
+ if (err)
+ goto abort;
+ err = nct6775_write_value(data, data->REG_IN_MINMAX[1][i], data->in[i][2]);
+ if (err)
+ goto abort;
+ }
+
+ for (i = 0; i < ARRAY_SIZE(data->fan_min); i++) {
+ if (!(data->has_fan_min & BIT(i)))
+ continue;
+
+ err = nct6775_write_value(data, data->REG_FAN_MIN[i], data->fan_min[i]);
+ if (err)
+ goto abort;
+ }
+
+ 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]) {
+ err = nct6775_write_temp(data, data->reg_temp[j][i],
+ data->temp[j][i]);
+ if (err)
+ goto abort;
+ }
+ }
+
+ /* Restore other settings */
+ err = nct6775_write_value(data, data->REG_VBAT, data->vbat);
+ if (err)
+ goto abort;
+ if (data->kind == nct6775) {
+ err = nct6775_write_value(data, NCT6775_REG_FANDIV1, data->fandiv1);
+ if (err)
+ goto abort;
+ err = nct6775_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 const struct regmap_config nct6775_regmap_config = {
+ .reg_bits = 16,
+ .val_bits = 16,
+ .reg_read = nct6775_reg_read,
+ .reg_write = nct6775_reg_write,
+};
+
+static const struct regmap_config nct6775_wmi_regmap_config = {
+ .reg_bits = 16,
+ .val_bits = 16,
+ .reg_read = nct6775_wmi_reg_read,
+ .reg_write = nct6775_wmi_reg_write,
+};
+
+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;
+ const struct regmap_config *regmapcfg;
+
+ 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;
+ regmapcfg = &nct6775_regmap_config;
+ } else {
+ regmapcfg = &nct6775_wmi_regmap_config;
+ }
+
+ platform_set_drvdata(pdev, data);
+
+ data->driver_data = sio_data;
+ data->driver_init = nct6775_platform_probe_init;
+
+ return nct6775_probe(&pdev->dev, data, regmapcfg);
+}
+
+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");
+MODULE_IMPORT_NS(HWMON_NCT6775);
+
+/*
+ * 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..452a80bf0b86
--- /dev/null
+++ b/drivers/hwmon/nct6775.h
@@ -0,0 +1,252 @@
+/* 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;
+
+ struct regmap *regmap;
+ bool read_only;
+
+ /* driver-specific (platform, i2c) initialization hook and data */
+ int (*driver_init)(struct nct6775_data *data);
+ void *driver_data;
+};
+
+static inline int nct6775_read_value(struct nct6775_data *data, u16 reg, u16 *value)
+{
+ unsigned int tmp;
+ int ret = regmap_read(data->regmap, reg, &tmp);
+
+ if (!ret)
+ *value = tmp;
+ return ret;
+}
+
+static inline int nct6775_write_value(struct nct6775_data *data, u16 reg, u16 value)
+{
+ return regmap_write(data->regmap, reg, value);
+}
+
+bool nct6775_reg_is_word_sized(struct nct6775_data *data, u16 reg);
+int nct6775_probe(struct device *dev, struct nct6775_data *data,
+ const struct regmap_config *regmapcfg);
+
+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 int nct6775_write_temp(struct nct6775_data *data, u16 reg, u16 value)
+{
+ if (!nct6775_reg_is_word_sized(data, reg))
+ value >>= 8;
+ return nct6775_write_value(data, reg, value);
+}
+
+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 (data->num_groups == ARRAY_SIZE(data->groups) - 1)
+ return -ENOBUFS;
+
+ 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] 15+ messages in thread
* [PATCH v2 6/6] hwmon: (nct6775) Add i2c driver
2022-03-09 0:50 [PATCH v2 0/6] hwmon: (nct6775) Convert to regmap, add i2c support Zev Weiss
` (4 preceding siblings ...)
2022-03-09 0:50 ` [PATCH v2 5/6] hwmon: (nct6775) Split core and platform driver Zev Weiss
@ 2022-03-09 0:50 ` Zev Weiss
2022-04-25 15:37 ` Guenter Roeck
2022-03-09 8:12 ` [PATCH v2 0/6] hwmon: (nct6775) Convert to regmap, add i2c support Paul Menzel
2022-03-10 19:13 ` Guenter Roeck
7 siblings, 1 reply; 15+ messages in thread
From: Zev Weiss @ 2022-03-09 0:50 UTC (permalink / raw)
To: Guenter Roeck, Jean Delvare, linux-hwmon
Cc: linux-kernel, openbmc, Oleksandr Natalenko, 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>
Tested-by: Renze Nicolai <renze@rnplus.nl>
---
MAINTAINERS | 6 ++
drivers/hwmon/Kconfig | 17 ++++
drivers/hwmon/Makefile | 1 +
drivers/hwmon/nct6775-i2c.c | 179 ++++++++++++++++++++++++++++++++++++
4 files changed, 203 insertions(+)
create mode 100644 drivers/hwmon/nct6775-i2c.c
diff --git a/MAINTAINERS b/MAINTAINERS
index f093e40d2b16..02202555ccfe 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -13296,6 +13296,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 1c657100c392..fd2d32140066 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 2453c087cf1d..e1da423d46d5 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..e36cf814c8e9
--- /dev/null
+++ b/drivers/hwmon/nct6775-i2c.c
@@ -0,0 +1,179 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * nct6775-i2c - I2C driver for the hardware monitoring functionality of
+ * Nuvoton NCT677x Super-I/O chips
+ *
+ * Copyright (C) 2022 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 int nct6775_i2c_read(void *ctx, unsigned int reg, unsigned int *val)
+{
+ int ret;
+ u32 tmp;
+ u8 bank = reg >> 8;
+ struct nct6775_data *data = ctx;
+ struct i2c_client *client = data->driver_data;
+
+ if (bank != data->bank) {
+ ret = i2c_smbus_write_byte_data(client, NCT6775_REG_BANK, bank);
+ if (ret)
+ return ret;
+ data->bank = bank;
+ }
+
+ ret = i2c_smbus_read_byte_data(client, reg & 0xff);
+ if (ret < 0)
+ return ret;
+ tmp = ret;
+
+ if (nct6775_reg_is_word_sized(data, reg)) {
+ ret = i2c_smbus_read_byte_data(client, (reg & 0xff) + 1);
+ if (ret < 0)
+ return ret;
+ tmp = (tmp << 8) | ret;
+ }
+
+ *val = tmp;
+ return 0;
+}
+
+/*
+ * The write operation is a dummy so as not to disturb anything being done
+ * with the chip via LPC.
+ */
+static int nct6775_i2c_write(void *ctx, unsigned int reg, unsigned int value)
+{
+ struct nct6775_data *data = ctx;
+ struct i2c_client *client = data->driver_data;
+
+ dev_dbg(&client->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.
+ */
+ return 0;
+}
+
+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 const struct regmap_config nct6775_i2c_regmap_config = {
+ .reg_bits = 16,
+ .val_bits = 16,
+ .reg_read = nct6775_i2c_read,
+ .reg_write = nct6775_i2c_write,
+};
+
+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 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);
+
+ data = devm_kzalloc(&client->dev, sizeof(*data), GFP_KERNEL);
+ if (!data)
+ return -ENOMEM;
+
+ data->kind = i2c_id->driver_data;
+
+ data->read_only = true;
+ data->driver_data = client;
+ data->driver_init = nct6775_i2c_probe_init;
+
+ return nct6775_probe(dev, data, &nct6775_i2c_regmap_config);
+}
+
+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");
+MODULE_IMPORT_NS(HWMON_NCT6775);
--
2.35.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH v2 0/6] hwmon: (nct6775) Convert to regmap, add i2c support
2022-03-09 0:50 [PATCH v2 0/6] hwmon: (nct6775) Convert to regmap, add i2c support Zev Weiss
` (5 preceding siblings ...)
2022-03-09 0:50 ` [PATCH v2 6/6] hwmon: (nct6775) Add i2c driver Zev Weiss
@ 2022-03-09 8:12 ` Paul Menzel
2022-03-09 11:16 ` Zev Weiss
2022-03-10 19:13 ` Guenter Roeck
7 siblings, 1 reply; 15+ messages in thread
From: Paul Menzel @ 2022-03-09 8:12 UTC (permalink / raw)
To: Zev Weiss
Cc: linux-hwmon, devicetree, Jean Delvare, Krzysztof Kozlowski,
openbmc, linux-kernel, Oleksandr Natalenko, Rob Herring,
Renze Nicolai, Guenter Roeck
Dear Zev,
Am 09.03.22 um 01:50 schrieb Zev Weiss:
> This is v2 of my patches to add i2c support to the nct6775 driver.
>
> Changes since v1 [0]:
> - Added preparatory patch converting driver to regmap API [Guenter]
> - Replaced ENOSPC with ENOBUFS and removed WARN_ON() in
> nct6775_add_attr_group() [Guenter]
> - Added dedicated symbol namespace [Guenter]
> - Removed nct6775_write_temp() and nct6775_update_device() symbol
> exports [Guenter]
> - Reordered patches to put dt-bindings patch first [Krzysztof]
>
> The nct6775-platform and nct6775-i2c drivers have both been tested on
> the NCT6779D in an ASRock ROMED8HM3 system and the NCT6798 [1] in an
> ASRock X570-D4U (the latter thanks to Renze, CCed); both seem to work
> as expected on both systems. I don't have access to any asuswmi
> hardware, so testing of the nct6775-platform driver on that to ensure
> it doesn't break there would be appreciated (Oleksandr, perhaps?).
I have an ASUS F2A85-M PRO with that Super I/O. (It’s running coreboot
right now, but I can test with the proprietary vendor firmware, if you
tell me what and how I can test this.
Kind regards,
Paul
> [0] https://lore.kernel.org/linux-hwmon/20220226133047.6226-1-zev@bewilderbeest.net/
> [1] Though it's physically labeled (mislabeled?) as an NCT6796, for
> what that's worth.
>
> A slightly edited version of the previous cover letter follows:
[…]
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v2 0/6] hwmon: (nct6775) Convert to regmap, add i2c support
2022-03-09 8:12 ` [PATCH v2 0/6] hwmon: (nct6775) Convert to regmap, add i2c support Paul Menzel
@ 2022-03-09 11:16 ` Zev Weiss
0 siblings, 0 replies; 15+ messages in thread
From: Zev Weiss @ 2022-03-09 11:16 UTC (permalink / raw)
To: Paul Menzel
Cc: linux-hwmon, devicetree, Jean Delvare, Krzysztof Kozlowski,
openbmc, linux-kernel, Oleksandr Natalenko, Rob Herring,
Renze Nicolai, Guenter Roeck
On Wed, Mar 09, 2022 at 12:12:32AM PST, Paul Menzel wrote:
>Dear Zev,
>
>
>Am 09.03.22 um 01:50 schrieb Zev Weiss:
>
>>This is v2 of my patches to add i2c support to the nct6775 driver.
>>
>>Changes since v1 [0]:
>> - Added preparatory patch converting driver to regmap API [Guenter]
>> - Replaced ENOSPC with ENOBUFS and removed WARN_ON() in
>> nct6775_add_attr_group() [Guenter]
>> - Added dedicated symbol namespace [Guenter]
>> - Removed nct6775_write_temp() and nct6775_update_device() symbol
>> exports [Guenter]
>> - Reordered patches to put dt-bindings patch first [Krzysztof]
>>
>>The nct6775-platform and nct6775-i2c drivers have both been tested on
>>the NCT6779D in an ASRock ROMED8HM3 system and the NCT6798 [1] in an
>>ASRock X570-D4U (the latter thanks to Renze, CCed); both seem to work
>>as expected on both systems. I don't have access to any asuswmi
>>hardware, so testing of the nct6775-platform driver on that to ensure
>>it doesn't break there would be appreciated (Oleksandr, perhaps?).
>
>I have an ASUS F2A85-M PRO with that Super I/O. (It’s running coreboot
>right now, but I can test with the proprietary vendor firmware, if you
>tell me what and how I can test this.
>
Hi Paul,
Thanks for offering to test! I don't see the F2A85-M PRO listed in the
asus_wmi_boards array, so (unless there's some alternate model name it
also goes by that's in that list) I don't think it will provide coverage
for the asuswmi code, but additional testing of the platform driver
would still be good anyway.
To try it out, first apply the patch series on top of Guenter's current
hwmon-next tree (it's based on commit 5d4a2ea96b79). You'll need to
enable both the existing CONFIG_SENSORS_NCT6775 Kconfig option as well
as the new CONFIG_SENSORS_NCT6775_PLATFORM. Then compile, install, and
boot into the resulting kernel. If you set
CONFIG_SENSORS_NCT6775_PLATFORM=m (compiling it as a module) you'll need
to run 'modprobe nct6775-platform' to load the module, after which
running 'sensors' from the lm-sensors package should show sensor
readings from it -- if things are working right, it should behave pretty
much exactly as the driver did prior to these patches.
However, since posting the v2 patch series I realized I bungled
something in the regmap conversion (patch 2 of the series), so before
compiling you should also apply this small fixup (which will be included
in subsequent versions of the patchset):
diff --git a/drivers/hwmon/nct6775-core.c b/drivers/hwmon/nct6775-core.c
index cb3958c977fa..5801aa9d60ee 100644
--- a/drivers/hwmon/nct6775-core.c
+++ b/drivers/hwmon/nct6775-core.c
@@ -1150,7 +1150,7 @@ static int nct6775_write_fan_div(struct nct6775_data *data, int nr)
if (err)
return err;
reg &= 0x70 >> oddshift;
- reg |= data->fan_div[nr] & (0x7 << oddshift);
+ reg |= (data->fan_div[nr] & 0x7) << oddshift;
return nct6775_write_value(data, fandiv_reg, reg);
}
Thanks,
Zev
^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH v2 0/6] hwmon: (nct6775) Convert to regmap, add i2c support
2022-03-09 0:50 [PATCH v2 0/6] hwmon: (nct6775) Convert to regmap, add i2c support Zev Weiss
` (6 preceding siblings ...)
2022-03-09 8:12 ` [PATCH v2 0/6] hwmon: (nct6775) Convert to regmap, add i2c support Paul Menzel
@ 2022-03-10 19:13 ` Guenter Roeck
7 siblings, 0 replies; 15+ messages in thread
From: Guenter Roeck @ 2022-03-10 19:13 UTC (permalink / raw)
To: Zev Weiss
Cc: linux-hwmon, devicetree, Jean Delvare, Krzysztof Kozlowski,
openbmc, linux-kernel, Oleksandr Natalenko, Rob Herring,
Renze Nicolai
Hi,
On Tue, Mar 08, 2022 at 04:50:41PM -0800, Zev Weiss wrote:
> Hello,
>
> This is v2 of my patches to add i2c support to the nct6775 driver.
>
Just to let you know, I won't have time to review - much less test - the series
before the commit window opens. Also, it is way too late for the upcoming release;
the changes are substantial enough to warrant a large soak time in linux-next.
The series will have to wait for v5.19.
Guenter
> Changes since v1 [0]:
> - Added preparatory patch converting driver to regmap API [Guenter]
> - Replaced ENOSPC with ENOBUFS and removed WARN_ON() in
> nct6775_add_attr_group() [Guenter]
> - Added dedicated symbol namespace [Guenter]
> - Removed nct6775_write_temp() and nct6775_update_device() symbol
> exports [Guenter]
> - Reordered patches to put dt-bindings patch first [Krzysztof]
>
> The nct6775-platform and nct6775-i2c drivers have both been tested on
> the NCT6779D in an ASRock ROMED8HM3 system and the NCT6798 [1] in an
> ASRock X570-D4U (the latter thanks to Renze, CCed); both seem to work
> as expected on both systems. I don't have access to any asuswmi
> hardware, so testing of the nct6775-platform driver on that to ensure
> it doesn't break there would be appreciated (Oleksandr, perhaps?).
>
> [0] https://lore.kernel.org/linux-hwmon/20220226133047.6226-1-zev@bewilderbeest.net/
> [1] Though it's physically labeled (mislabeled?) as an NCT6796, for
> what that's worth.
>
> A slightly edited version of the previous cover letter follows:
>
>
> This patch series augments the existing nct6775 driver with support
> for the hardware's i2c interface; along the way it converts the driver
> to use the regmap API, and splits the LPC-specific platform driver
> into a separate module from the interface-independent core.
>
> 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,
> testing via manual register accesses (as detailed in [2]) has
> 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
> first convert the driver's register accesses to the regmap API, and
> then split the LPC-specific parts of it 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 (essentially just providing its own set of regmap
> read/write callback functions).
>
> The first patch provides DT bindings for the nct6775, the second
> contains the change to convert all register accesses to use a regmap.
> The third and fourth patches make some relatively small
> infrastructural changes to the driver. The core/platform driver split
> is in the fifth patch, and the final patch adds the i2c driver itself.
>
>
> Thanks,
> Zev
>
> [2] https://lore.kernel.org/linux-hwmon/YhttzgDtGpcTniyw@hatter.bewilderbeest.net/
>
> Zev Weiss (6):
> dt-bindings: hwmon: Add nuvoton,nct6775
> hwmon: (nct6775) Convert register access to regmap API
> hwmon: (nct6775) Rearrange attr-group initialization
> hwmon: (nct6775) Add read-only mode
> hwmon: (nct6775) Split core and platform driver
> 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} | 2310 +++++------------
> drivers/hwmon/nct6775-i2c.c | 179 ++
> drivers/hwmon/nct6775-platform.c | 1232 +++++++++
> drivers/hwmon/nct6775.h | 252 ++
> 8 files changed, 2382 insertions(+), 1687 deletions(-)
> create mode 100644 Documentation/devicetree/bindings/hwmon/nuvoton,nct6775.yaml
> rename drivers/hwmon/{nct6775.c => nct6775-core.c} (69%)
> 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] 15+ messages in thread
* Re: [PATCH v2 1/6] dt-bindings: hwmon: Add nuvoton,nct6775
2022-03-09 0:50 ` [PATCH v2 1/6] dt-bindings: hwmon: Add nuvoton,nct6775 Zev Weiss
@ 2022-04-25 15:07 ` Guenter Roeck
2022-04-26 1:23 ` Zev Weiss
0 siblings, 1 reply; 15+ messages in thread
From: Guenter Roeck @ 2022-04-25 15:07 UTC (permalink / raw)
To: Zev Weiss
Cc: linux-hwmon, devicetree, Jean Delvare, Krzysztof Kozlowski,
linux-kernel, openbmc, Oleksandr Natalenko, Renze Nicolai,
Rob Herring
On Tue, Mar 08, 2022 at 04:50:42PM -0800, 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>
> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
This is still waiting for DT maintainer approval.
Do you expect to add further properties along the line ?
If not, you might consider adding the chips to trivial devices instead.
Guenter
> ---
> .../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>;
> + };
> + };
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v2 5/6] hwmon: (nct6775) Split core and platform driver
2022-03-09 0:50 ` [PATCH v2 5/6] hwmon: (nct6775) Split core and platform driver Zev Weiss
@ 2022-04-25 15:23 ` Guenter Roeck
0 siblings, 0 replies; 15+ messages in thread
From: Guenter Roeck @ 2022-04-25 15:23 UTC (permalink / raw)
To: Zev Weiss
Cc: linux-hwmon, Jean Delvare, openbmc, linux-kernel,
Oleksandr Natalenko, Renze Nicolai
On Tue, Mar 08, 2022 at 04:50:46PM -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>
> Tested-by: Renze Nicolai <renze@rnplus.nl>
> ---
> MAINTAINERS | 6 +-
> drivers/hwmon/Kconfig | 15 +-
> drivers/hwmon/Makefile | 3 +-
> drivers/hwmon/{nct6775.c => nct6775-core.c} | 1465 +------------------
> drivers/hwmon/nct6775-platform.c | 1232 ++++++++++++++++
> drivers/hwmon/nct6775.h | 252 ++++
> 6 files changed, 1532 insertions(+), 1441 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 a9c9ee378f93..f093e40d2b16 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -13287,12 +13287,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 9ab4e9b3d27b..1c657100c392 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.
This is wrong. The platform driver should still be named "nct6775",
configured with SENSORS_NCT6775, with the current dependencies.
There should be a new SENSORS_NCT6775_CORE, which is auto-selected
from SENSORS_NCT6775 and can not be manually selected. The new
SENSORS_NCT6775_I2C should also auto-select SENSORS_NCT6775_CORE.
User visible options should only be SENSORS_NCT6775 and
SENSORS_NCT6775_I2C.
Guenter
>
> config SENSORS_NCT7802
> tristate "Nuvoton NCT7802Y"
> diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
> index 4ed138d0621f..2453c087cf1d 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 99b4e308a053..cb3958c977fa 100644
> --- a/drivers/hwmon/nct6775.c
> +++ b/drivers/hwmon/nct6775-core.c
> @@ -44,25 +44,20 @@
> #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/regmap.h>
> -#include <linux/wmi.h>
> #include "lm75.h"
> +#include "nct6775.h"
>
> -#define USE_ALTERNATE
> +#undef DEFAULT_SYMBOL_NAMESPACE
> +#define DEFAULT_SYMBOL_NAMESPACE HWMON_NCT6775
>
> -enum kinds { nct6106, nct6116, nct6775, nct6776, nct6779, nct6791, nct6792,
> - nct6793, nct6795, nct6796, nct6797, nct6798 };
> +#define USE_ALTERNATE
>
> /* used to set data->name = nct6775_device_names[data->sio_kind] */
> static const char * const nct6775_device_names[] = {
> @@ -80,242 +75,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 */
> @@ -334,11 +93,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 */
> @@ -352,10 +106,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 };
>
> /*
> @@ -371,11 +121,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 };
> @@ -691,8 +436,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 };
> @@ -1192,165 +935,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;
> -
> - struct regmap *regmap;
> - bool read_only;
> -};
> -
> struct sensor_device_template {
> struct device_attribute dev_attr;
> union {
> @@ -1406,21 +990,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 (data->num_groups == ARRAY_SIZE(data->groups) - 1)
> - return -ENOBUFS;
> -
> - 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)
> {
> @@ -1495,7 +1064,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:
> @@ -1552,122 +1121,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 int nct6775_wmi_reg_read(void *ctx, unsigned int reg, unsigned int *val)
> -{
> - struct nct6775_data *data = ctx;
> - int err, word_sized = is_word_sized(data, reg);
> - u8 tmp = 0;
> - u16 res;
> -
> - nct6775_wmi_set_bank(data, reg);
> -
> - err = nct6775_asuswmi_read(data->bank, reg & 0xff, &tmp);
> - if (err)
> - return err;
> -
> - res = tmp;
> - if (word_sized) {
> - err = nct6775_asuswmi_read(data->bank, (reg & 0xff) + 1, &tmp);
> - if (err)
> - return err;
> -
> - res = (res << 8) + tmp;
> - }
> - *val = res;
> - return 0;
> -}
> -
> -static inline int nct6775_read_value(struct nct6775_data *data, u16 reg, u16 *value)
> -{
> - unsigned int tmp;
> - int ret = regmap_read(data->regmap, reg, &tmp);
> -
> - if (!ret)
> - *value = tmp;
> - return ret;
> -}
> -
> -static int nct6775_wmi_reg_write(void *ctx, unsigned int reg, unsigned int value)
> -{
> - struct nct6775_data *data = ctx;
> - 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;
> -}
> -
> -static inline int nct6775_write_value(struct nct6775_data *data, u16 reg, u16 value)
> -{
> - return regmap_write(data->regmap, reg, value);
> -}
> -
> -/*
> - * 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 int nct6775_reg_read(void *ctx, unsigned int reg, unsigned int *val)
> -{
> - struct nct6775_data *data = ctx;
> - int word_sized = is_word_sized(data, reg);
> -
> - nct6775_set_bank(data, reg);
> - outb_p(reg & 0xff, data->addr + ADDR_REG_OFFSET);
> - *val = inb_p(data->addr + DATA_REG_OFFSET);
> - if (word_sized) {
> - outb_p((reg & 0xff) + 1,
> - data->addr + ADDR_REG_OFFSET);
> - *val = (*val << 8) + inb_p(data->addr + DATA_REG_OFFSET);
> - }
> - return 0;
> -}
> -
> -static int nct6775_reg_write(void *ctx, unsigned int reg, unsigned int value)
> -{
> - struct nct6775_data *data = ctx;
> - 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 int nct6775_read_temp(struct nct6775_data *data, u16 reg, u16 *val)
> @@ -1678,19 +1132,12 @@ static int nct6775_read_temp(struct nct6775_data *data, u16 reg, u16 *val)
> if (err)
> return err;
>
> - if (!is_word_sized(data, reg))
> + if (!nct6775_reg_is_word_sized(data, reg))
> *val <<= 8;
>
> return 0;
> }
>
> -static int nct6775_write_temp(struct nct6775_data *data, u16 reg, u16 value)
> -{
> - if (!is_word_sized(data, reg))
> - value >>= 8;
> - return nct6775_write_value(data, reg, value);
> -}
> -
> /* This function assumes that the caller holds data->update_lock */
> static int nct6775_write_fan_div(struct nct6775_data *data, int nr)
> {
> @@ -2207,8 +1654,8 @@ store_in_reg(struct device *dev, struct device_attribute *attr, const char *buf,
> return err ? : 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);
> @@ -2221,6 +1668,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)
> {
> @@ -2263,8 +1711,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);
> @@ -2278,10 +1726,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);
> @@ -2306,6 +1754,7 @@ store_beep(struct device *dev, struct device_attribute *attr, const char *buf,
> mutex_unlock(&data->update_lock);
> return err ? : count;
> }
> +EXPORT_SYMBOL_GPL(nct6775_store_beep);
>
> static ssize_t
> show_temp_beep(struct device *dev, struct device_attribute *attr, char *buf)
> @@ -2381,9 +1830,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,
> @@ -2617,10 +2065,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,
> @@ -3884,113 +3332,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 int nct6775_init_device(struct nct6775_data *data)
> {
> int i, err;
> @@ -4051,227 +3392,6 @@ static inline int nct6775_init_device(struct nct6775_data *data)
> return 0;
> }
>
> -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 int add_temp_sensors(struct nct6775_data *data, const u16 *regp,
> int *available, int *mask)
> {
> @@ -4303,26 +3423,9 @@ static int add_temp_sensors(struct nct6775_data *data, const u16 *regp,
> return 0;
> }
>
> -static const struct regmap_config nct6775_regmap_config = {
> - .reg_bits = 16,
> - .val_bits = 16,
> - .reg_read = nct6775_reg_read,
> - .reg_write = nct6775_reg_write,
> -};
> -
> -static const struct regmap_config nct6775_wmi_regmap_config = {
> - .reg_bits = 16,
> - .val_bits = 16,
> - .reg_read = nct6775_wmi_reg_read,
> - .reg_write = nct6775_wmi_reg_write,
> -};
> -
> -static int nct6775_probe(struct platform_device *pdev)
> +int nct6775_probe(struct device *dev, struct nct6775_data *data,
> + const struct regmap_config *regmapcfg)
> {
> - 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 mask, available;
> u16 src;
> @@ -4330,32 +3433,8 @@ static int nct6775_probe(struct platform_device *pdev)
> 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;
> - const struct regmap_config *regmapcfg;
> -
> - 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;
> - regmapcfg = &nct6775_regmap_config;
> - } else {
> - regmapcfg = &nct6775_wmi_regmap_config;
> - }
>
> data->regmap = devm_regmap_init(dev, NULL, data, regmapcfg);
> if (IS_ERR(data->regmap))
> @@ -4364,7 +3443,6 @@ static int nct6775_probe(struct platform_device *pdev)
> 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:
> @@ -5099,79 +4177,12 @@ static int nct6775_probe(struct platform_device *pdev)
> if (err)
> return err;
>
> - 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 */
> err = nct6775_init_fan_common(dev, data);
> if (err)
> @@ -5208,430 +4219,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)
> -{
> - int err;
> - u16 tmp;
> - struct nct6775_data *data = nct6775_update_device(dev);
> -
> - if (IS_ERR(data))
> - return PTR_ERR(data);
> -
> - mutex_lock(&data->update_lock);
> - err = nct6775_read_value(data, data->REG_VBAT, &tmp);
> - if (err)
> - goto out;
> - data->vbat = tmp;
> - if (data->kind == nct6775) {
> - err = nct6775_read_value(data, NCT6775_REG_FANDIV1, &tmp);
> - if (err)
> - goto out;
> - data->fandiv1 = tmp;
> -
> - err = nct6775_read_value(data, NCT6775_REG_FANDIV2, &tmp);
> - if (err)
> - goto out;
> - data->fandiv2 = tmp;
> - }
> -out:
> - mutex_unlock(&data->update_lock);
> -
> - return err;
> -}
> -
> -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;
> -
> - err = nct6775_write_value(data, data->REG_IN_MINMAX[0][i], data->in[i][1]);
> - if (err)
> - goto abort;
> - err = nct6775_write_value(data, data->REG_IN_MINMAX[1][i], data->in[i][2]);
> - if (err)
> - goto abort;
> - }
> -
> - for (i = 0; i < ARRAY_SIZE(data->fan_min); i++) {
> - if (!(data->has_fan_min & BIT(i)))
> - continue;
> -
> - err = nct6775_write_value(data, data->REG_FAN_MIN[i], data->fan_min[i]);
> - if (err)
> - goto abort;
> - }
> -
> - 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]) {
> - err = nct6775_write_temp(data, data->reg_temp[j][i],
> - data->temp[j][i]);
> - if (err)
> - goto abort;
> - }
> - }
> -
> - /* Restore other settings */
> - err = nct6775_write_value(data, data->REG_VBAT, data->vbat);
> - if (err)
> - goto abort;
> - if (data->kind == nct6775) {
> - err = nct6775_write_value(data, NCT6775_REG_FANDIV1, data->fandiv1);
> - if (err)
> - goto abort;
> - err = nct6775_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..15d6ad376007
> --- /dev/null
> +++ b/drivers/hwmon/nct6775-platform.c
> @@ -0,0 +1,1232 @@
> +// 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/acpi.h>
> +#include <linux/dmi.h>
> +#include <linux/hwmon-sysfs.h>
> +#include <linux/hwmon-vid.h>
> +#include <linux/init.h>
> +#include <linux/io.h>
> +#include <linux/module.h>
> +#include <linux/platform_device.h>
> +#include <linux/regmap.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 int nct6775_wmi_reg_read(void *ctx, unsigned int reg, unsigned int *val)
> +{
> + struct nct6775_data *data = ctx;
> + int err, word_sized = nct6775_reg_is_word_sized(data, reg);
> + u8 tmp = 0;
> + u16 res;
> +
> + nct6775_wmi_set_bank(data, reg);
> +
> + err = nct6775_asuswmi_read(data->bank, reg & 0xff, &tmp);
> + if (err)
> + return err;
> +
> + res = tmp;
> + if (word_sized) {
> + err = nct6775_asuswmi_read(data->bank, (reg & 0xff) + 1, &tmp);
> + if (err)
> + return err;
> +
> + res = (res << 8) + tmp;
> + }
> + *val = res;
> + return 0;
> +}
> +
> +static int nct6775_wmi_reg_write(void *ctx, unsigned int reg, unsigned int value)
> +{
> + struct nct6775_data *data = ctx;
> + 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 int nct6775_reg_read(void *ctx, unsigned int reg, unsigned int *val)
> +{
> + struct nct6775_data *data = ctx;
> + int word_sized = nct6775_reg_is_word_sized(data, reg);
> +
> + nct6775_set_bank(data, reg);
> + outb_p(reg & 0xff, data->addr + ADDR_REG_OFFSET);
> + *val = inb_p(data->addr + DATA_REG_OFFSET);
> + if (word_sized) {
> + outb_p((reg & 0xff) + 1,
> + data->addr + ADDR_REG_OFFSET);
> + *val = (*val << 8) + inb_p(data->addr + DATA_REG_OFFSET);
> + }
> + return 0;
> +}
> +
> +static int nct6775_reg_write(void *ctx, unsigned int reg, unsigned int value)
> +{
> + struct nct6775_data *data = ctx;
> + 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)
> +{
> + int err;
> + u16 tmp;
> + struct nct6775_data *data = dev_get_drvdata(dev);
> +
> + if (IS_ERR(data))
> + return PTR_ERR(data);
> +
> + mutex_lock(&data->update_lock);
> + err = nct6775_read_value(data, data->REG_VBAT, &tmp);
> + if (err)
> + goto out;
> + data->vbat = tmp;
> + if (data->kind == nct6775) {
> + err = nct6775_read_value(data, NCT6775_REG_FANDIV1, &tmp);
> + if (err)
> + goto out;
> + data->fandiv1 = tmp;
> +
> + err = nct6775_read_value(data, NCT6775_REG_FANDIV2, &tmp);
> + if (err)
> + goto out;
> + data->fandiv2 = tmp;
> + }
> +out:
> + mutex_unlock(&data->update_lock);
> +
> + return err;
> +}
> +
> +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;
> +
> + err = nct6775_write_value(data, data->REG_IN_MINMAX[0][i], data->in[i][1]);
> + if (err)
> + goto abort;
> + err = nct6775_write_value(data, data->REG_IN_MINMAX[1][i], data->in[i][2]);
> + if (err)
> + goto abort;
> + }
> +
> + for (i = 0; i < ARRAY_SIZE(data->fan_min); i++) {
> + if (!(data->has_fan_min & BIT(i)))
> + continue;
> +
> + err = nct6775_write_value(data, data->REG_FAN_MIN[i], data->fan_min[i]);
> + if (err)
> + goto abort;
> + }
> +
> + 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]) {
> + err = nct6775_write_temp(data, data->reg_temp[j][i],
> + data->temp[j][i]);
> + if (err)
> + goto abort;
> + }
> + }
> +
> + /* Restore other settings */
> + err = nct6775_write_value(data, data->REG_VBAT, data->vbat);
> + if (err)
> + goto abort;
> + if (data->kind == nct6775) {
> + err = nct6775_write_value(data, NCT6775_REG_FANDIV1, data->fandiv1);
> + if (err)
> + goto abort;
> + err = nct6775_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 const struct regmap_config nct6775_regmap_config = {
> + .reg_bits = 16,
> + .val_bits = 16,
> + .reg_read = nct6775_reg_read,
> + .reg_write = nct6775_reg_write,
> +};
> +
> +static const struct regmap_config nct6775_wmi_regmap_config = {
> + .reg_bits = 16,
> + .val_bits = 16,
> + .reg_read = nct6775_wmi_reg_read,
> + .reg_write = nct6775_wmi_reg_write,
> +};
> +
> +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;
> + const struct regmap_config *regmapcfg;
> +
> + 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;
> + regmapcfg = &nct6775_regmap_config;
> + } else {
> + regmapcfg = &nct6775_wmi_regmap_config;
> + }
> +
> + platform_set_drvdata(pdev, data);
> +
> + data->driver_data = sio_data;
> + data->driver_init = nct6775_platform_probe_init;
> +
> + return nct6775_probe(&pdev->dev, data, regmapcfg);
> +}
> +
> +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");
> +MODULE_IMPORT_NS(HWMON_NCT6775);
> +
> +/*
> + * 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..452a80bf0b86
> --- /dev/null
> +++ b/drivers/hwmon/nct6775.h
> @@ -0,0 +1,252 @@
> +/* 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;
> +
> + struct regmap *regmap;
> + bool read_only;
> +
> + /* driver-specific (platform, i2c) initialization hook and data */
> + int (*driver_init)(struct nct6775_data *data);
> + void *driver_data;
> +};
> +
> +static inline int nct6775_read_value(struct nct6775_data *data, u16 reg, u16 *value)
> +{
> + unsigned int tmp;
> + int ret = regmap_read(data->regmap, reg, &tmp);
> +
> + if (!ret)
> + *value = tmp;
> + return ret;
> +}
> +
> +static inline int nct6775_write_value(struct nct6775_data *data, u16 reg, u16 value)
> +{
> + return regmap_write(data->regmap, reg, value);
> +}
> +
> +bool nct6775_reg_is_word_sized(struct nct6775_data *data, u16 reg);
> +int nct6775_probe(struct device *dev, struct nct6775_data *data,
> + const struct regmap_config *regmapcfg);
> +
> +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 int nct6775_write_temp(struct nct6775_data *data, u16 reg, u16 value)
> +{
> + if (!nct6775_reg_is_word_sized(data, reg))
> + value >>= 8;
> + return nct6775_write_value(data, reg, value);
> +}
> +
> +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 (data->num_groups == ARRAY_SIZE(data->groups) - 1)
> + return -ENOBUFS;
> +
> + 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__ */
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v2 2/6] hwmon: (nct6775) Convert register access to regmap API
2022-03-09 0:50 ` [PATCH v2 2/6] hwmon: (nct6775) Convert register access to regmap API Zev Weiss
@ 2022-04-25 15:24 ` Guenter Roeck
0 siblings, 0 replies; 15+ messages in thread
From: Guenter Roeck @ 2022-04-25 15:24 UTC (permalink / raw)
To: Zev Weiss
Cc: linux-hwmon, Jean Delvare, openbmc, linux-kernel,
Oleksandr Natalenko, Renze Nicolai
On Tue, Mar 08, 2022 at 04:50:43PM -0800, Zev Weiss wrote:
> This replaces the nct6775_data->{read,write}_value function pointers
> with a regmap.
>
> The major difference is that the regmap access functions may fail, and
> hence require checking at each call site. While the existing WMI
> register-access code had potential failure paths, they were masked by
> the fact that the read_value() function returned the register value
> directly, and hence squashed errors undetectably by simply returning
> zero, and while the write_value() functions were capable of reporting
> errors, all callers ignored them.
>
> This improves the robustness of the existing code, and also prepares
> the driver for an i2c version to be added soon, for which register
> accesses are much more likely to actually fail.
>
> The conversion of the register-access call sites is largely mechanical
> (reading a register now returns the value via an out-param pointer,
> and returned errors must be checked for and propagated to callers),
> though the nct6775_write_fan_div() function is refactored slightly to
> avoid duplicating nearly identical (and now lengthier) code in each
> switch case.
>
> Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
> ---
> drivers/hwmon/nct6775.c | 977 +++++++++++++++++++++++++++-------------
Needs "select REGMAP" in Kconfig.
Guenter
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v2 6/6] hwmon: (nct6775) Add i2c driver
2022-03-09 0:50 ` [PATCH v2 6/6] hwmon: (nct6775) Add i2c driver Zev Weiss
@ 2022-04-25 15:37 ` Guenter Roeck
0 siblings, 0 replies; 15+ messages in thread
From: Guenter Roeck @ 2022-04-25 15:37 UTC (permalink / raw)
To: Zev Weiss
Cc: linux-hwmon, Jean Delvare, openbmc, linux-kernel,
Oleksandr Natalenko, Renze Nicolai
On Tue, Mar 08, 2022 at 04:50:47PM -0800, Zev Weiss wrote:
> 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>
> Tested-by: Renze Nicolai <renze@rnplus.nl>
> ---
> MAINTAINERS | 6 ++
> drivers/hwmon/Kconfig | 17 ++++
> drivers/hwmon/Makefile | 1 +
> drivers/hwmon/nct6775-i2c.c | 179 ++++++++++++++++++++++++++++++++++++
> 4 files changed, 203 insertions(+)
> create mode 100644 drivers/hwmon/nct6775-i2c.c
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index f093e40d2b16..02202555ccfe 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -13296,6 +13296,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 1c657100c392..fd2d32140066 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
This driver doesn't really use regmap, much less regmap_i2c.
The core driver should select REGMAP.
Guenter
> + 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 2453c087cf1d..e1da423d46d5 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..e36cf814c8e9
> --- /dev/null
> +++ b/drivers/hwmon/nct6775-i2c.c
> @@ -0,0 +1,179 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * nct6775-i2c - I2C driver for the hardware monitoring functionality of
> + * Nuvoton NCT677x Super-I/O chips
> + *
> + * Copyright (C) 2022 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 int nct6775_i2c_read(void *ctx, unsigned int reg, unsigned int *val)
> +{
> + int ret;
> + u32 tmp;
> + u8 bank = reg >> 8;
> + struct nct6775_data *data = ctx;
> + struct i2c_client *client = data->driver_data;
> +
> + if (bank != data->bank) {
> + ret = i2c_smbus_write_byte_data(client, NCT6775_REG_BANK, bank);
> + if (ret)
> + return ret;
> + data->bank = bank;
> + }
> +
> + ret = i2c_smbus_read_byte_data(client, reg & 0xff);
> + if (ret < 0)
> + return ret;
> + tmp = ret;
> +
> + if (nct6775_reg_is_word_sized(data, reg)) {
> + ret = i2c_smbus_read_byte_data(client, (reg & 0xff) + 1);
> + if (ret < 0)
> + return ret;
> + tmp = (tmp << 8) | ret;
> + }
> +
> + *val = tmp;
> + return 0;
> +}
> +
> +/*
> + * The write operation is a dummy so as not to disturb anything being done
> + * with the chip via LPC.
> + */
> +static int nct6775_i2c_write(void *ctx, unsigned int reg, unsigned int value)
> +{
> + struct nct6775_data *data = ctx;
> + struct i2c_client *client = data->driver_data;
> +
> + dev_dbg(&client->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.
> + */
> + return 0;
> +}
> +
> +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 const struct regmap_config nct6775_i2c_regmap_config = {
> + .reg_bits = 16,
> + .val_bits = 16,
> + .reg_read = nct6775_i2c_read,
> + .reg_write = nct6775_i2c_write,
> +};
> +
> +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 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);
> +
> + data = devm_kzalloc(&client->dev, sizeof(*data), GFP_KERNEL);
> + if (!data)
> + return -ENOMEM;
> +
> + data->kind = i2c_id->driver_data;
> +
> + data->read_only = true;
> + data->driver_data = client;
> + data->driver_init = nct6775_i2c_probe_init;
> +
> + return nct6775_probe(dev, data, &nct6775_i2c_regmap_config);
> +}
> +
> +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");
> +MODULE_IMPORT_NS(HWMON_NCT6775);
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v2 1/6] dt-bindings: hwmon: Add nuvoton,nct6775
2022-04-25 15:07 ` Guenter Roeck
@ 2022-04-26 1:23 ` Zev Weiss
0 siblings, 0 replies; 15+ messages in thread
From: Zev Weiss @ 2022-04-26 1:23 UTC (permalink / raw)
To: Guenter Roeck
Cc: linux-hwmon, devicetree, Jean Delvare, Krzysztof Kozlowski,
linux-kernel, openbmc, Oleksandr Natalenko, Renze Nicolai,
Rob Herring
On Mon, Apr 25, 2022 at 08:07:48AM PDT, Guenter Roeck wrote:
>On Tue, Mar 08, 2022 at 04:50:42PM -0800, 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>
>> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
>
>This is still waiting for DT maintainer approval.
>
>Do you expect to add further properties along the line ?
>If not, you might consider adding the chips to trivial devices instead.
>
Additional properties seem possible, though at the moment I don't know
exactly what they might be, so trivial-devices.yml probably makes more
sense.
I'll send a v3 soon with that change and the Kconfig fixes in the other
patches.
Thanks,
Zev
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2022-04-26 1:24 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-09 0:50 [PATCH v2 0/6] hwmon: (nct6775) Convert to regmap, add i2c support Zev Weiss
2022-03-09 0:50 ` [PATCH v2 1/6] dt-bindings: hwmon: Add nuvoton,nct6775 Zev Weiss
2022-04-25 15:07 ` Guenter Roeck
2022-04-26 1:23 ` Zev Weiss
2022-03-09 0:50 ` [PATCH v2 2/6] hwmon: (nct6775) Convert register access to regmap API Zev Weiss
2022-04-25 15:24 ` Guenter Roeck
2022-03-09 0:50 ` [PATCH v2 3/6] hwmon: (nct6775) Rearrange attr-group initialization Zev Weiss
2022-03-09 0:50 ` [PATCH v2 4/6] hwmon: (nct6775) Add read-only mode Zev Weiss
2022-03-09 0:50 ` [PATCH v2 5/6] hwmon: (nct6775) Split core and platform driver Zev Weiss
2022-04-25 15:23 ` Guenter Roeck
2022-03-09 0:50 ` [PATCH v2 6/6] hwmon: (nct6775) Add i2c driver Zev Weiss
2022-04-25 15:37 ` Guenter Roeck
2022-03-09 8:12 ` [PATCH v2 0/6] hwmon: (nct6775) Convert to regmap, add i2c support Paul Menzel
2022-03-09 11:16 ` Zev Weiss
2022-03-10 19:13 ` Guenter Roeck
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).