From: Denis Pauk <pauk.denis@gmail.com>
To: unlisted-recipients:; (no To-header on input)
Cc: ahmad@khalifa.ws, chunkeey@gmail.com, greg@krypto.org,
hubert.banas@gmail.com, igor@svelig.com, jaap.dehaan@freenet.de,
jdelvare@suse.com, jeroen@beerstra.org, jonfarr87@gmail.com,
jwp@redhat.com, kdudka@redhat.com, kernel@melin.net,
kpietrzak@disroot.org, linux-hwmon@vger.kernel.org,
linux-kernel@vger.kernel.org, linux@roeck-us.net, me@rebtoor.com,
metalcaedes@gmail.com, michael@theoddone.net,
mikhail.v.gavrilov@gmail.com, mundanedefoliation@gmail.com,
nephartyz@gmail.com, oleksandr@natalenko.name,
pauk.denis@gmail.com, pehlm@pekholm.org, renedis@hotmail.com,
robert@swiecki.net, sahan.h.fernando@gmail.com,
sebastian.arnhold@posteo.de, sefoci9222@rerunway.com,
sst@poczta.fm, to.eivind@gmail.com, torvic9@mailbox.org
Subject: [PATCH 2/2] hwmon: (nct6775) B650/B660/X670 ASUS boards support
Date: Mon, 9 Jan 2023 15:35:36 +0200 [thread overview]
Message-ID: <20230109133536.5720-2-pauk.denis@gmail.com> (raw)
In-Reply-To: <20230109133536.5720-1-pauk.denis@gmail.com>
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 nct6775 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.
BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=204807
Signed-off-by: Denis Pauk <pauk.denis@gmail.com>
Co-developed-by: Ahmad Khalifa <ahmad@khalifa.ws>
Signed-off-by: Ahmad Khalifa <ahmad@khalifa.ws>
Tested-by: Jeroen Beerstra <jeroen@beerstra.org>
Tested-by: Slawomir Stepien <sst@poczta.fm>
---
B650/B660/X670 boards use NCT6799D and code is checked with
https://patchwork.kernel.org/project/linux-hwmon/patch/20221228135744.281752-1-linux@roeck-us.net/
Feedback form Jeroen Beerstra https://bugzilla.kernel.org/show_bug.cgi?id=204807#c282
nct6799-isa-0290
Adapter: ISA adapter
in0: 1.37 V (min = +0.00 V, max = +1.74 V)
in1: 1000.00 mV (min = +0.00 V, max = +0.00 V) ALARM
in2: 3.39 V (min = +0.00 V, max = +0.00 V) ALARM
in3: 3.34 V (min = +0.00 V, max = +0.00 V) ALARM
in4: 1.02 V (min = +0.00 V, max = +0.00 V) ALARM
in5: 1.03 V (min = +0.00 V, max = +0.00 V) ALARM
in6: 752.00 mV (min = +0.00 V, max = +0.00 V) ALARM
in7: 3.39 V (min = +0.00 V, max = +0.00 V) ALARM
in8: 3.30 V (min = +0.00 V, max = +0.00 V) ALARM
in9: 1.67 V (min = +0.00 V, max = +0.00 V) ALARM
in10: 560.00 mV (min = +0.00 V, max = +0.00 V) ALARM
in11: 560.00 mV (min = +0.00 V, max = +0.00 V) ALARM
in12: 1.03 V (min = +0.00 V, max = +0.00 V) ALARM
in13: 496.00 mV (min = +0.00 V, max = +0.00 V) ALARM
in14: 424.00 mV (min = +0.00 V, max = +0.00 V) ALARM
fan1: 755 RPM (min = 0 RPM)
fan2: 819 RPM (min = 0 RPM)
fan3: 712 RPM (min = 0 RPM)
fan4: 0 RPM (min = 0 RPM)
fan5: 674 RPM (min = 0 RPM)
fan7: 0 RPM (min = 0 RPM)
SYSTIN: +31.0°C (high = +80.0°C, hyst = +75.0°C) sensor = thermistor
CPUTIN: +36.5°C (high = +80.0°C, hyst = +75.0°C) sensor = thermistor
AUXTIN0: +39.5°C sensor = thermistor
AUXTIN1: +19.0°C sensor = thermistor
AUXTIN2: +20.0°C sensor = thermistor
AUXTIN3: +73.0°C sensor = thermistor
PECI Agent 0 Calibration: +54.0°C
PCH_CHIP_CPU_MAX_TEMP: +0.0°C
PCH_CHIP_TEMP: +0.0°C
PCH_CPU_TEMP: +0.0°C
TSI0_TEMP: +64.5°C
intrusion0: ALARM
intrusion1: ALARM
beep_enable: disabled
---
drivers/hwmon/nct6775-platform.c | 52 ++++++++++++++++++++++++++++++++
1 file changed, 52 insertions(+)
diff --git a/drivers/hwmon/nct6775-platform.c b/drivers/hwmon/nct6775-platform.c
index 7f5b430e1e2c..b0c6958809b9 100644
--- a/drivers/hwmon/nct6775-platform.c
+++ b/drivers/hwmon/nct6775-platform.c
@@ -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"
struct acpi_device *asus_acpi_dev;
@@ -1102,6 +1103,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",
+};
+
struct each_port_arg {
struct acpi_device *adev;
const char *match;
@@ -1173,6 +1220,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);
}
/*
--
2.39.0
next prev parent reply other threads:[~2023-01-09 13:39 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-09 13:35 [PATCH 1/2] hwmon: (nct6775) Directly call ASUS ACPI WMI method Denis Pauk
2023-01-09 13:35 ` Denis Pauk [this message]
2023-01-09 16:22 ` Guenter Roeck
2023-01-09 20:41 ` kernel test robot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230109133536.5720-2-pauk.denis@gmail.com \
--to=pauk.denis@gmail.com \
--cc=ahmad@khalifa.ws \
--cc=chunkeey@gmail.com \
--cc=greg@krypto.org \
--cc=hubert.banas@gmail.com \
--cc=igor@svelig.com \
--cc=jaap.dehaan@freenet.de \
--cc=jdelvare@suse.com \
--cc=jeroen@beerstra.org \
--cc=jonfarr87@gmail.com \
--cc=jwp@redhat.com \
--cc=kdudka@redhat.com \
--cc=kernel@melin.net \
--cc=kpietrzak@disroot.org \
--cc=linux-hwmon@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=me@rebtoor.com \
--cc=metalcaedes@gmail.com \
--cc=michael@theoddone.net \
--cc=mikhail.v.gavrilov@gmail.com \
--cc=mundanedefoliation@gmail.com \
--cc=nephartyz@gmail.com \
--cc=oleksandr@natalenko.name \
--cc=pehlm@pekholm.org \
--cc=renedis@hotmail.com \
--cc=robert@swiecki.net \
--cc=sahan.h.fernando@gmail.com \
--cc=sebastian.arnhold@posteo.de \
--cc=sefoci9222@rerunway.com \
--cc=sst@poczta.fm \
--cc=to.eivind@gmail.com \
--cc=torvic9@mailbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®