Re: [PATCH v6 5/8] hwmon: (k10temp) Stop matching Hygon devices

[Guenter Roeck]

On Mon, Sep 21, 2026 at 01:56:00PM +0800, Lin Wang wrote:
> k10temp matches the Hygon F3 device, but derives the node passed to
> amd_smn_read() from the F3 PCI slot using the AMD fixed-slot mapping
> (slot - 0x18). Hygon PCI slots do not encode DF node identity, and
> their SMN roots are grouped by socket.
> 
> The derived node number therefore cannot identify a valid Hygon SMN
> target or provide usable temperature monitoring. Removing the match
> does not disable a working monitoring path.
> 
> Remove the Hygon PCI match and Family 0x18 branch. Hygon temperature
> monitoring will use the Hygon node and SMN interfaces in a separate
> series.
> 
> Signed-off-by: Lin Wang <wanglin@xxxxxxxxxxxxxx>

Applied.

Thanks,
Guenter

> ---
>  Documentation/hwmon/k10temp.rst | 8 +++-----
>  drivers/hwmon/k10temp.c         | 5 ++---
>  2 files changed, 5 insertions(+), 8 deletions(-)
> 
> diff --git a/Documentation/hwmon/k10temp.rst b/Documentation/hwmon/k10temp.rst
> index 91b99adc6c48..9680c4f3383c 100644
> --- a/Documentation/hwmon/k10temp.rst
> +++ b/Documentation/hwmon/k10temp.rst
> @@ -28,8 +28,6 @@ Supported chips:
>  
>  * AMD Family 17h processors: "Zen", "Zen 2"
>  
> -* AMD Family 18h processors: "Hygon Dhyana"
> -
>  * AMD Family 19h processors: "Zen 3"
>  
>    Prefix: 'k10temp'
> @@ -128,7 +126,7 @@ it.
>  Models from 17h family report relative temperature, the driver aims to
>  compensate and report the real temperature.
>  
> -On Family 17h and Family 18h CPUs, additional temperature sensors may report
> -Core Complex Die (CCD) temperatures. Up to 8 such temperatures are reported
> -as temp{3..10}_input, labeled Tccd{1..8}. Actual support depends on the CPU
> +On Family 17h CPUs, additional temperature sensors may report Core Complex
> +Die (CCD) temperatures. Up to 8 such temperatures are reported as
> +temp{3..10}_input, labeled Tccd{1..8}. Actual support depends on the CPU
>  variant.
> diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c
> index 3e7e63edc6a3..e0a7211a513c 100644
> --- a/drivers/hwmon/k10temp.c
> +++ b/drivers/hwmon/k10temp.c
> @@ -64,7 +64,7 @@ MODULE_PARM_DESC(force, "force loading on processors with erratum 319");
>  #define F15H_M60H_HARDWARE_TEMP_CTRL_OFFSET	0xd8200c64
>  #define F15H_M60H_REPORTED_TEMP_CTRL_OFFSET	0xd8200ca4
>  
> -/* Common for Zen CPU families (Family 17h and 18h and 19h and 1Ah) */
> +/* Common for Zen CPU families (Family 17h, 19h and 1Ah) */
>  #define ZEN_REPORTED_TEMP_CTRL_BASE		0x00059800
>  
>  #define ZEN_CCD_TEMP(offset, x)			(ZEN_REPORTED_TEMP_CTRL_BASE + \
> @@ -475,7 +475,7 @@ static int k10temp_probe(struct pci_dev *pdev, const struct pci_device_id *id)
>  		data->read_tempreg = read_tempreg_pci;
>  	}
>  
> -	if (boot_cpu_data.x86 == 0x17 || boot_cpu_data.x86 == 0x18) {
> +	if (boot_cpu_data.x86 == 0x17) {
>  		switch (boot_cpu_data.x86_model) {
>  		case 0x1:	/* Zen */
>  		case 0x8:	/* Zen+ */
> @@ -583,7 +583,6 @@ static const struct pci_device_id k10temp_id_table[] = {
>  	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_1AH_M60H_DF_F3) },
>  	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_1AH_M70H_DF_F3) },
>  	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_1AH_M90H_DF_F3) },
> -	{ PCI_VDEVICE(HYGON, PCI_DEVICE_ID_AMD_17H_DF_F3) },
>  	{}
>  };
>  MODULE_DEVICE_TABLE(pci, k10temp_id_table);