[PATCH 0/3] hwmon: add ASUS Pro WS X570-ACE support

[PATCH 0/3] hwmon: add ASUS Pro WS X570-ACE support

[Oleksandr Natalenko]

Based on hwmon-next + [1].

ASUS Pro WS X570-ACE board carries an nct6775 chip, which needs proper
support without kernel command line quirk. Also, the sensors of this
board can be monitored via BREC WMI method.

This submission addresses both issues.

Please review.

Thanks.

[1] https://lore.kernel.org/lkml/20211002210857.709956-1-pauk.denis@gmail.com/

Oleksandr Natalenko (3):
  hwmon: (nct6775) add Pro WS X570-ACE
  hwmon: (asus_wmi_sensors) split out T_Sensor
  hwmon: (asus_wmi_sensors) add Pro WS X570-ACE

 drivers/hwmon/asus_wmi_sensors.c | 19 ++++++++++++++++---
 drivers/hwmon/nct6775.c          |  1 +
 2 files changed, 17 insertions(+), 3 deletions(-)

-- 
2.33.0

[PATCH 1/3] hwmon: (nct6775) add Pro WS X570-ACE

[Oleksandr Natalenko]

ASUS Pro WS X570-ACE board has got an nct6775 chip, but by default
there's no use of it because of resource conflict:

```
ACPI Warning: SystemIO range 0x0000000000000295-0x0000000000000296 conflicts with OpRegion 0x0000000000000290-0x0000000000000299 (\AMW0.SHWM) (20210604/utaddress-204
)
ACPI: OSL: Resource conflict; ACPI support missing from driver?
ACPI: OSL: Resource conflict: System may be unstable or behave erratically
```

A workaround is to use `acpi_enforce_resources=lax`, but a proper
support needs to be added instead.

This commit adds Pro WS X570-ACE to the list of boards that can be monitored
using ASUS WMI.

Tested by me on this hardware:

```
Base Board Information
    Manufacturer: ASUSTeK COMPUTER INC.
    Product Name: Pro WS X570-ACE

BIOS Information
    Vendor: American Megatrends Inc.
    Version: 3801
    Release Date: 07/30/2021
```

Signed-off-by: Oleksandr Natalenko <oleksandr@natalenko.name>
---
 drivers/hwmon/nct6775.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
index ba18c1cbf572..ff28ba70a8b3 100644
--- a/drivers/hwmon/nct6775.c
+++ b/drivers/hwmon/nct6775.c
@@ -5000,6 +5000,7 @@ static int __init nct6775_find(int sioaddr, struct nct6775_sio_data *sio_data)
 static struct platform_device *pdev[2];
 
 static const char * const asus_wmi_boards[] = {
+	"Pro WS X570-ACE",
 	"PRIME B360-PLUS",
 	"PRIME B460-PLUS",
 	"PRIME X570-PRO",
-- 
2.33.0

[PATCH 2/3] hwmon: (asus_wmi_sensors) split out T_Sensor

[Oleksandr Natalenko]

Move `T_Sensor` addition into a separate `case` statement in preparation
for the next patch that introduces a board without it.

No functional change.

Signed-off-by: Oleksandr Natalenko <oleksandr@natalenko.name>
---
 drivers/hwmon/asus_wmi_sensors.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/drivers/hwmon/asus_wmi_sensors.c b/drivers/hwmon/asus_wmi_sensors.c
index 6b04fad18891..98e761861601 100644
--- a/drivers/hwmon/asus_wmi_sensors.c
+++ b/drivers/hwmon/asus_wmi_sensors.c
@@ -144,14 +144,22 @@ static void asus_wmi_ec_fill_board_sensors(struct asus_wmi_ec_info *ec, int boar
 		asus_wmi_ec_set_sensor_info(si++, "Motherboard", hwmon_temp,
 					    asus_wmi_ec_make_sensor_address(1, 0x00, 0x3C),
 					    &ec->nr_registers);
-		asus_wmi_ec_set_sensor_info(si++, "T_Sensor", hwmon_temp,
-					    asus_wmi_ec_make_sensor_address(1, 0x00, 0x3D),
-					    &ec->nr_registers);
 		asus_wmi_ec_set_sensor_info(si++, "VRM", hwmon_temp,
 					    asus_wmi_ec_make_sensor_address(1, 0x00, 0x3E),
 					    &ec->nr_registers);
 	}
 
+	switch (board) {
+	case BOARD_RS_B550_E_G:
+	case BOARD_RS_X570_E_G:
+	case BOARD_R_C8H:
+	case BOARD_R_C8DH:
+	case BOARD_R_C8F:
+		asus_wmi_ec_set_sensor_info(si++, "T_Sensor", hwmon_temp,
+					    asus_wmi_ec_make_sensor_address(1, 0x00, 0x3D),
+					    &ec->nr_registers);
+	}
+
 	switch (board) {
 	case BOARD_RS_X570_E_G:
 	case BOARD_R_C8H:
-- 
2.33.0

[PATCH 3/3] hwmon: (asus_wmi_sensors) add Pro WS X570-ACE

[Oleksandr Natalenko]

ASUS Pro WS X570-ACE also supports accessing sensor information from the
embedded controller via BREC WMI method. Hence, add it to the list.

Note `T_Sensor` is not supported by this board.

Tested by me on this hardware:

```
Base Board Information
    Manufacturer: ASUSTeK COMPUTER INC.
    Product Name: Pro WS X570-ACE

BIOS Information
    Vendor: American Megatrends Inc.
    Version: 3801
    Release Date: 07/30/2021
```

Signed-off-by: Oleksandr Natalenko <oleksandr@natalenko.name>
---
 drivers/hwmon/asus_wmi_sensors.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/hwmon/asus_wmi_sensors.c b/drivers/hwmon/asus_wmi_sensors.c
index 98e761861601..319c879624b2 100644
--- a/drivers/hwmon/asus_wmi_sensors.c
+++ b/drivers/hwmon/asus_wmi_sensors.c
@@ -35,6 +35,7 @@
 #define ASUS_EC_KNOWN_EC_REGISTERS 14
 
 enum asus_wmi_ec_board {
+	BOARD_PW_X570_A, // Pro WS X570-ACE
 	BOARD_R_C8H, // ROG Crosshair VIII Hero
 	BOARD_R_C8DH, // ROG Crosshair VIII Dark Hero
 	BOARD_R_C8F, // ROG Crosshair VIII Formula
@@ -44,6 +45,7 @@ enum asus_wmi_ec_board {
 
 /* boards with EC support */
 static const char *const asus_wmi_ec_boards_names[] = {
+	[BOARD_PW_X570_A] = "Pro WS X570-ACE",
 	[BOARD_R_C8H] = "ROG CROSSHAIR VIII HERO",
 	[BOARD_R_C8DH] = "ROG CROSSHAIR VIII DARK HERO",
 	[BOARD_R_C8F] = "ROG CROSSHAIR VIII FORMULA",
@@ -130,6 +132,7 @@ static void asus_wmi_ec_fill_board_sensors(struct asus_wmi_ec_info *ec, int boar
 	ec->nr_registers = 0;
 
 	switch (board) {
+	case BOARD_PW_X570_A:
 	case BOARD_RS_B550_E_G:
 	case BOARD_RS_X570_E_G:
 	case BOARD_R_C8H:
@@ -161,6 +164,7 @@ static void asus_wmi_ec_fill_board_sensors(struct asus_wmi_ec_info *ec, int boar
 	}
 
 	switch (board) {
+	case BOARD_PW_X570_A:
 	case BOARD_RS_X570_E_G:
 	case BOARD_R_C8H:
 	case BOARD_R_C8DH:
@@ -174,6 +178,7 @@ static void asus_wmi_ec_fill_board_sensors(struct asus_wmi_ec_info *ec, int boar
 	}
 
 	switch (board) {
+	case BOARD_PW_X570_A:
 	case BOARD_RS_X570_E_G:
 	case BOARD_R_C8H:
 	case BOARD_R_C8F:
-- 
2.33.0

Re: [PATCH 0/3] hwmon: add ASUS Pro WS X570-ACE support

[Andy Shevchenko]

On Sun, Oct 3, 2021 at 4:41 PM Oleksandr Natalenko
<oleksandr@natalenko.name> wrote:
>
> Based on hwmon-next + [1].
>
> ASUS Pro WS X570-ACE board carries an nct6775 chip, which needs proper
> support without kernel command line quirk. Also, the sensors of this
> board can be monitored via BREC WMI method.
>
> This submission addresses both issues.
>
> Please review.

All three looks good to me,
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>

> Thanks.
>
> [1] https://lore.kernel.org/lkml/20211002210857.709956-1-pauk.denis@gmail.com/
>
> Oleksandr Natalenko (3):
>   hwmon: (nct6775) add Pro WS X570-ACE
>   hwmon: (asus_wmi_sensors) split out T_Sensor
>   hwmon: (asus_wmi_sensors) add Pro WS X570-ACE
>
>  drivers/hwmon/asus_wmi_sensors.c | 19 ++++++++++++++++---
>  drivers/hwmon/nct6775.c          |  1 +
>  2 files changed, 17 insertions(+), 3 deletions(-)
>
> --
> 2.33.0
>


-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH 1/3] hwmon: (nct6775) add Pro WS X570-ACE

[Guenter Roeck]

On Sun, Oct 03, 2021 at 03:33:42PM +0200, Oleksandr Natalenko wrote:
> ASUS Pro WS X570-ACE board has got an nct6775 chip, but by default
> there's no use of it because of resource conflict:
> 
> ```
> ACPI Warning: SystemIO range 0x0000000000000295-0x0000000000000296 conflicts with OpRegion 0x0000000000000290-0x0000000000000299 (\AMW0.SHWM) (20210604/utaddress-204
> )
> ACPI: OSL: Resource conflict; ACPI support missing from driver?
> ACPI: OSL: Resource conflict: System may be unstable or behave erratically
> ```
> 
> A workaround is to use `acpi_enforce_resources=lax`, but a proper
> support needs to be added instead.
> 
> This commit adds Pro WS X570-ACE to the list of boards that can be monitored
> using ASUS WMI.
> 
> Tested by me on this hardware:
> 
> ```
> Base Board Information
>     Manufacturer: ASUSTeK COMPUTER INC.
>     Product Name: Pro WS X570-ACE
> 
> BIOS Information
>     Vendor: American Megatrends Inc.
>     Version: 3801
>     Release Date: 07/30/2021
> ```
> 
> Signed-off-by: Oleksandr Natalenko <oleksandr@natalenko.name>

Applied.

Thanks,
Guenter

> ---
>  drivers/hwmon/nct6775.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
> index ba18c1cbf572..ff28ba70a8b3 100644
> --- a/drivers/hwmon/nct6775.c
> +++ b/drivers/hwmon/nct6775.c
> @@ -5000,6 +5000,7 @@ static int __init nct6775_find(int sioaddr, struct nct6775_sio_data *sio_data)
>  static struct platform_device *pdev[2];
>  
>  static const char * const asus_wmi_boards[] = {
> +	"Pro WS X570-ACE",
>  	"PRIME B360-PLUS",
>  	"PRIME B460-PLUS",
>  	"PRIME X570-PRO",

Re: [PATCH 2/3] hwmon: (asus_wmi_sensors) split out T_Sensor

[Guenter Roeck]

On Sun, Oct 03, 2021 at 03:33:43PM +0200, Oleksandr Natalenko wrote:
> Move `T_Sensor` addition into a separate `case` statement in preparation
> for the next patch that introduces a board without it.
> 
> No functional change.
> 
> Signed-off-by: Oleksandr Natalenko <oleksandr@natalenko.name>

This patch depends on acceptance of the asus_wmi_sensors driver,
which should at least be mentioned here. The same applies to the
next patch of the series. In general, please do not send patches
for multiple drivers as single series, and please always mention
such dependencies.

Thanks,
Guenter

> ---
>  drivers/hwmon/asus_wmi_sensors.c | 14 +++++++++++---
>  1 file changed, 11 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/hwmon/asus_wmi_sensors.c b/drivers/hwmon/asus_wmi_sensors.c
> index 6b04fad18891..98e761861601 100644
> --- a/drivers/hwmon/asus_wmi_sensors.c
> +++ b/drivers/hwmon/asus_wmi_sensors.c
> @@ -144,14 +144,22 @@ static void asus_wmi_ec_fill_board_sensors(struct asus_wmi_ec_info *ec, int boar
>  		asus_wmi_ec_set_sensor_info(si++, "Motherboard", hwmon_temp,
>  					    asus_wmi_ec_make_sensor_address(1, 0x00, 0x3C),
>  					    &ec->nr_registers);
> -		asus_wmi_ec_set_sensor_info(si++, "T_Sensor", hwmon_temp,
> -					    asus_wmi_ec_make_sensor_address(1, 0x00, 0x3D),
> -					    &ec->nr_registers);
>  		asus_wmi_ec_set_sensor_info(si++, "VRM", hwmon_temp,
>  					    asus_wmi_ec_make_sensor_address(1, 0x00, 0x3E),
>  					    &ec->nr_registers);
>  	}
>  
> +	switch (board) {
> +	case BOARD_RS_B550_E_G:
> +	case BOARD_RS_X570_E_G:
> +	case BOARD_R_C8H:
> +	case BOARD_R_C8DH:
> +	case BOARD_R_C8F:
> +		asus_wmi_ec_set_sensor_info(si++, "T_Sensor", hwmon_temp,
> +					    asus_wmi_ec_make_sensor_address(1, 0x00, 0x3D),
> +					    &ec->nr_registers);
> +	}
> +
>  	switch (board) {
>  	case BOARD_RS_X570_E_G:
>  	case BOARD_R_C8H: