Skip to contentSkip to conversation

hwmon: (nct6775) Directly call ASUS ACPI WMI method

PATCH In review Denis Pauk 4 participants 7 messages Jan 11, 2023 – Jun 6, 2023 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore

Denis Pauk

author
#0 lore raw

PATCH v4 1/2 hwmon: (nct6775) Directly call ASUS ACPI WMI method

New ASUS B650/B660/X670 boards firmware have not exposed WMI monitoring GUID and entrypoint method WMBD could be implemented for different device UID.

Implement the direct call to entrypoint method for monitoring the device UID of B550/X570 boards.

---
Changes:
v2:
Rename each_port_arg to each_device_arg
Rename nct6775_find_asus_acpi to nct6775_asuswmi_device_match Remove unrequired return -EEXIST, and iterate whole list of devices Make asus_acpi_dev static
v3:
Restore break iteration logic in nct6775_asuswmi_device_match Add config check if ACPI disabled and acpi_device_* are undefined Pass device_id as data parameter of acpi_bus_for_each_dev
v4:
Hide asus_acpi_dev definition inside ifdef ACPI

@all
Could someone please test updated patch with B550/X570 boards?

@Guenter Roeck

Quoted 8 lines

0-day reported various errors. I suspect those are seen with CONFIG_ACPI=n. Have you tried the build reported as problematic ?

I get

drivers/hwmon/nct6775-platform.c:122:28: error: ‘asus_acpi_dev’ defined
but not used [-Werror=unused-variable]

Quoted 6 lines

122 | static struct acpi_device *asus_acpi_dev;

if I try to build nct6775-platform.o with W=1 and CONFIG_ACPI=n.

Overall the #ifdefs in the driver get a bit out of hand. I think it may be time to consolidate that. Not necessarily now, but sometime soon.

Thank you, I have missed it, I have rechecked with:
make W=1 CONFIG_ACPI=n CONFIG_SENSORS_NCT6775=m drivers/hwmon/

 drivers/hwmon/Kconfig            |  2 +-
 drivers/hwmon/nct6775-platform.c | 99 ++++++++++++++++++++++----------
 2 files changed, 71 insertions(+), 30 deletions(-)
drivers/hwmon/Kconfig +1 -1
index 3176c33af6c6..300ce8115ce4 100644
@@ -1516,7 +1516,7 @@ config SENSORS_NCT6775_CORE
 config SENSORS_NCT6775
 	tristate "Platform driver for Nuvoton NCT6775F and compatibles"
 	depends on !PPC
-	depends on ACPI_WMI || ACPI_WMI=n
+	depends on ACPI || ACPI=n
 	select HWMON_VID
 	select SENSORS_NCT6775_CORE
 	help
drivers/hwmon/nct6775-platform.c +70 -29

145 lines not on this page · raw message

base-commit: b0587c87abc891e313d63946ff8c9f4939d1ea1a

Signature · 1 line
2.39.0
author
#1 lore raw

PATCH v4 2/2 hwmon: (nct6775) B650/B660/X670 ASUS boards support

Boards such as:
"EX-B660M-V5 PRO D4",
"PRIME B650-PLUS",
"PRIME B650M-A",
"PRIME B650M-A AX",
"PRIME B650M-A II",
"PRIME B650M-A WIFI",
"PRIME B650M-A WIFI II",
"PRIME B660M-A D4",
"PRIME B660M-A WIFI D4",
"PRIME X670-P",
"PRIME X670-P WIFI",
"PRIME X670E-PRO WIFI",
"Pro B660M-C-D4",
"ProArt B660-CREATOR D4",
"ProArt X670E-CREATOR WIFI",
"ROG CROSSHAIR X670E EXTREME",
"ROG CROSSHAIR X670E GENE",
"ROG CROSSHAIR X670E HERO",
"ROG MAXIMUS XIII EXTREME GLACIAL",
"ROG MAXIMUS Z690 EXTREME",
"ROG MAXIMUS Z690 EXTREME GLACIAL",
"ROG STRIX B650-A GAMING WIFI",
"ROG STRIX B650E-E GAMING WIFI",
"ROG STRIX B650E-F GAMING WIFI",
"ROG STRIX B650E-I GAMING WIFI",
"ROG STRIX B660-A GAMING WIFI D4",
"ROG STRIX B660-F GAMING WIFI",
"ROG STRIX B660-G GAMING WIFI",
"ROG STRIX B660-I GAMING WIFI",
"ROG STRIX X670E-A GAMING WIFI",
"ROG STRIX X670E-E GAMING WIFI",
"ROG STRIX X670E-F GAMING WIFI",
"ROG STRIX X670E-I GAMING WIFI",
"ROG STRIX Z590-A GAMING WIFI II",
"ROG STRIX Z690-A GAMING WIFI D4",
"TUF GAMING B650-PLUS",
"TUF GAMING B650-PLUS WIFI",
"TUF GAMING B650M-PLUS",
"TUF GAMING B650M-PLUS WIFI",
"TUF GAMING B660M-PLUS WIFI",
"TUF GAMING X670E-PLUS",
"TUF GAMING X670E-PLUS WIFI",
"TUF GAMING Z590-PLUS WIFI",
have got a NCT6799D chip, but by default there's no use of it because of resource conflict with WMI method.

This commit adds such boards to the monitoring list with new ACPI device UID.

---
Changes:
v2: no changes
v3: no changes
v4: no changes

 drivers/hwmon/nct6775-platform.c | 52 ++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
drivers/hwmon/nct6775-platform.c +52 -0
index e3c3b35c8138..baac0d569a4d 100644
@@ -114,6 +114,7 @@ struct nct6775_sio_data {
 #define ASUSWMI_UNSUPPORTED_METHOD	0xFFFFFFFE
 #define ASUSWMI_DEVICE_HID		"PNP0C14"
 #define ASUSWMI_DEVICE_UID		"ASUSWMI"
+#define ASUSMSI_DEVICE_UID		"AsusMbSwInterface"
 
 #if IS_ENABLED(CONFIG_ACPI)
 /*
@@ -1108,6 +1109,52 @@ static const char * const asus_wmi_boards[] = {
 	"TUF GAMING Z490-PLUS (WI-FI)",
 };
 
+static const char * const asus_msi_boards[] = {
+	"EX-B660M-V5 PRO D4",
+	"PRIME B650-PLUS",
+	"PRIME B650M-A",
+	"PRIME B650M-A AX",
+	"PRIME B650M-A II",
+	"PRIME B650M-A WIFI",
+	"PRIME B650M-A WIFI II",
+	"PRIME B660M-A D4",
+	"PRIME B660M-A WIFI D4",
+	"PRIME X670-P",
+	"PRIME X670-P WIFI",
+	"PRIME X670E-PRO WIFI",
+	"Pro B660M-C-D4",
+	"ProArt B660-CREATOR D4",
+	"ProArt X670E-CREATOR WIFI",
+	"ROG CROSSHAIR X670E EXTREME",
+	"ROG CROSSHAIR X670E GENE",
+	"ROG CROSSHAIR X670E HERO",
+	"ROG MAXIMUS XIII EXTREME GLACIAL",
+	"ROG MAXIMUS Z690 EXTREME",
+	"ROG MAXIMUS Z690 EXTREME GLACIAL",
+	"ROG STRIX B650-A GAMING WIFI",
+	"ROG STRIX B650E-E GAMING WIFI",
+	"ROG STRIX B650E-F GAMING WIFI",
+	"ROG STRIX B650E-I GAMING WIFI",
+	"ROG STRIX B660-A GAMING WIFI D4",
+	"ROG STRIX B660-F GAMING WIFI",
+	"ROG STRIX B660-G GAMING WIFI",
+	"ROG STRIX B660-I GAMING WIFI",
+	"ROG STRIX X670E-A GAMING WIFI",
+	"ROG STRIX X670E-E GAMING WIFI",
+	"ROG STRIX X670E-F GAMING WIFI",
+	"ROG STRIX X670E-I GAMING WIFI",
+	"ROG STRIX Z590-A GAMING WIFI II",
+	"ROG STRIX Z690-A GAMING WIFI D4",
+	"TUF GAMING B650-PLUS",
+	"TUF GAMING B650-PLUS WIFI",
+	"TUF GAMING B650M-PLUS",
+	"TUF GAMING B650M-PLUS WIFI",
+	"TUF GAMING B660M-PLUS WIFI",
+	"TUF GAMING X670E-PLUS",
+	"TUF GAMING X670E-PLUS WIFI",
+	"TUF GAMING Z590-PLUS WIFI",
+};
+
 #if IS_ENABLED(CONFIG_ACPI)
 /*
  * Callback for acpi_bus_for_each_dev() to find the right device
@@ -1172,6 +1219,11 @@ static int __init sensors_nct6775_platform_init(void)
 				   board_name);
 		if (err >= 0)
 			access = nct6775_determine_access(ASUSWMI_DEVICE_UID);
+
+		err = match_string(asus_msi_boards, ARRAY_SIZE(asus_msi_boards),
+				   board_name);
+		if (err >= 0)
+			access = nct6775_determine_access(ASUSMSI_DEVICE_UID);
 	}
 
 	/*
Signature · 1 line
2.39.0

A message that is not in the archive (sent off-list or not yet received): [email protected]

#3 lore raw

Re: [PATCH v4 2/2] hwmon: (nct6775) B650/B660/X670 ASUS boards support

Is it just me, or is the support for my mainboard "TUF GAMING X670E-PLUS WIFI" now implemented into the latest "linux-next" kernel (I verified this by looking at the source code at /drivers/hwmon/nct6775-core.c), but the actual patch that contains the NCT6799D driver is still missing?

I had to patch my linux-next kernel with the patch from https://patchwork.kernel.org/project/linux-hwmon/patch/[email protected]/ to get it working.

Otherwise the nct6775 module refuses to recognize my sensor chip.

Thanks,
Sebastian

Am 15.01.23 um 17:12 schrieb Guenter Roeck:

Quoted 61 lines · Denis Pauk
Quoted 50 lines

Boards such as:
"EX-B660M-V5 PRO D4",
"PRIME B650-PLUS",
"PRIME B650M-A",
"PRIME B650M-A AX",
"PRIME B650M-A II",
"PRIME B650M-A WIFI",
"PRIME B650M-A WIFI II",
"PRIME B660M-A D4",
"PRIME B660M-A WIFI D4",
"PRIME X670-P",
"PRIME X670-P WIFI",
"PRIME X670E-PRO WIFI",
"Pro B660M-C-D4",
"ProArt B660-CREATOR D4",
"ProArt X670E-CREATOR WIFI",
"ROG CROSSHAIR X670E EXTREME",
"ROG CROSSHAIR X670E GENE",
"ROG CROSSHAIR X670E HERO",
"ROG MAXIMUS XIII EXTREME GLACIAL",
"ROG MAXIMUS Z690 EXTREME",
"ROG MAXIMUS Z690 EXTREME GLACIAL",
"ROG STRIX B650-A GAMING WIFI",
"ROG STRIX B650E-E GAMING WIFI",
"ROG STRIX B650E-F GAMING WIFI",
"ROG STRIX B650E-I GAMING WIFI",
"ROG STRIX B660-A GAMING WIFI D4",
"ROG STRIX B660-F GAMING WIFI",
"ROG STRIX B660-G GAMING WIFI",
"ROG STRIX B660-I GAMING WIFI",
"ROG STRIX X670E-A GAMING WIFI",
"ROG STRIX X670E-E GAMING WIFI",
"ROG STRIX X670E-F GAMING WIFI",
"ROG STRIX X670E-I GAMING WIFI",
"ROG STRIX Z590-A GAMING WIFI II",
"ROG STRIX Z690-A GAMING WIFI D4",
"TUF GAMING B650-PLUS",
"TUF GAMING B650-PLUS WIFI",
"TUF GAMING B650M-PLUS",
"TUF GAMING B650M-PLUS WIFI",
"TUF GAMING B660M-PLUS WIFI",
"TUF GAMING X670E-PLUS",
"TUF GAMING X670E-PLUS WIFI",
"TUF GAMING Z590-PLUS WIFI",
have got a NCT6799D chip, but by default there's no use of it because of resource conflict with WMI method.

This commit adds such boards to the monitoring list with new ACPI device UID.

Quoted 6 lines

Applied to hwmon-next.

Thanks,
Guenter

maintainer
#4 lore raw

Re: [PATCH v4 2/2] hwmon: (nct6775) B650/B660/X670 ASUS boards support

Quoted 4 lines · Sebastian Arnhold

Is it just me, or is the support for my mainboard "TUF GAMING X670E-PLUS WIFI" now implemented into the latest "linux-next" kernel (I verified this by looking at the source code at /drivers/hwmon/nct6775-core.c), but the actual patch that contains the NCT6799D driver is still missing?

I had to patch my linux-next kernel with the patch from https://patchwork.kernel.org/project/linux-hwmon/patch/[email protected]/ to get it working.

Well, yes, I do have day-to-day work that I am getting paid for, and I did not have time to resubmit the patch adding support for NCT6799.

Guenter

#5 lore raw

Re: [PATCH v4 2/2] hwmon: (nct6775) B650/B660/X670 ASUS boards support

Sorry, I didn't want to annoy you! Just wondered why it didn't work and whether I made a mistake, or if it really wasn't included in linux-next.

Thanks for all your amazing work in making this chip function properly and bringing fan control to many of the latest AM5 boards! :)

Kind regards,
Sebastian

Am 20.01.23 um 21:28 schrieb Guenter Roeck:

Quoted 12 lines · Sebastian Arnhold
Quoted 4 lines

Is it just me, or is the support for my mainboard "TUF GAMING X670E-PLUS WIFI" now implemented into the latest "linux-next" kernel (I verified this by looking at the source code at /drivers/hwmon/nct6775-core.c), but the actual patch that contains the NCT6799D driver is still missing?

I had to patch my linux-next kernel with the patch from https://patchwork.kernel.org/project/linux-hwmon/patch/[email protected]/ to get it working.

Well, yes, I do have day-to-day work that I am getting paid for, and I did not have time to resubmit the patch adding support for NCT6799.

Guenter

#6 lore raw
In reply to Denis Pauk

Hi Denis,

Quoted 11 lines · Denis Pauk

New ASUS B650/B660/X670 boards firmware have not exposed WMI monitoring GUID and entrypoint method WMBD could be implemented for different device UID.

Implement the direct call to entrypoint method for monitoring the device UID of B550/X570 boards.

Thanks for your patch, which is now commit c3b3747d02f571da ("hwmon:
(nct6775) Directly call ASUS ACPI WMI method") in v6.3-rc1.

drivers/hwmon/Kconfig config SENSORS_NCT6775_CORE · line 1522

Quoted 11 lines
drivers/hwmon/Kconfig +1 -1
@@ -1516,7 +1516,7 @@ config SENSORS_NCT6775_CORE
 config SENSORS_NCT6775
        tristate "Platform driver for Nuvoton NCT6775F and compatibles"
        depends on !PPC
-       depends on ACPI_WMI || ACPI_WMI=n
+       depends on ACPI || ACPI=n
        select HWMON_VID
        select SENSORS_NCT6775_CORE
        help

The recent patches to add support for ACPI on RISC-V caused me to see a question about this driver again when running "make oldconfig", and I had a closer look at the driver...
Unless I am missing something, this is a really dangerous driver which just bangs blindly into I/O space without doing any platform checks, which could cause a crash or system lock-up?

Does the SENSORS_NCT6775 symbol need a better platform dependenc than !PPC?

Gr{oetje,eeting}s,

Geert

Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
maintainer
#7 lore raw
Quoted 37 lines · Geert Uytterhoeven

Hi Denis,

Quoted 11 lines · Denis Pauk

New ASUS B650/B660/X670 boards firmware have not exposed WMI monitoring GUID and entrypoint method WMBD could be implemented for different device UID.

Implement the direct call to entrypoint method for monitoring the device UID of B550/X570 boards.

Thanks for your patch, which is now commit c3b3747d02f571da ("hwmon:
(nct6775) Directly call ASUS ACPI WMI method") in v6.3-rc1.

drivers/hwmon/Kconfig config SENSORS_NCT6775_CORE · line 1522

Quoted 11 lines
drivers/hwmon/Kconfig +1 -1
@@ -1516,7 +1516,7 @@ config SENSORS_NCT6775_CORE
  config SENSORS_NCT6775
         tristate "Platform driver for Nuvoton NCT6775F and compatibles"
         depends on !PPC
-       depends on ACPI_WMI || ACPI_WMI=n
+       depends on ACPI || ACPI=n
         select HWMON_VID
         select SENSORS_NCT6775_CORE
         help

The recent patches to add support for ACPI on RISC-V caused me to see a question about this driver again when running "make oldconfig", and I had a closer look at the driver...
Unless I am missing something, this is a really dangerous driver which just bangs blindly into I/O space without doing any platform checks, which could cause a crash or system lock-up?

Quoted 3 lines

Does the SENSORS_NCT6775 symbol need a better platform dependenc than !PPC?

This is no different than all the other SuperIO drivers.

Guenter