Attachment 254112 Details for Bug 281962 – Patch for amdsmn.c and amdtemp.c to support AMD Ryzen 7 "Rembrandt"

[patch] Patch for amdsmn.c and amdtemp.c to support AMD Ryzen 7 "Rembrandt"

patch (text/plain), 2.18 KB, created by Matthias Lanter on 2024-10-09 15:06:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Lanter

Created: 2024-10-09 15:06:17 UTC

Size: 2.18 KB

patch

obsolete

>diff --git a/sys/dev/amdsmn/amdsmn.c b/sys/dev/amdsmn/amdsmn.c
>index 9a0428608a27..111c3cc8e7c1 100644
>--- a/sys/dev/amdsmn/amdsmn.c
>+++ b/sys/dev/amdsmn/amdsmn.c
>@@ -59,6 +59,7 @@
> #define	PCI_DEVICE_ID_AMD_17H_M30H_ROOT		0x1480	/* Also M70H, F19H M00H/M20H */
> #define	PCI_DEVICE_ID_AMD_17H_M60H_ROOT		0x1630
> #define	PCI_DEVICE_ID_AMD_19H_M10H_ROOT		0x14a4
>+#define	PCI_DEVICE_ID_AMD_19H_M40H_ROOT		0x14b5
> #define	PCI_DEVICE_ID_AMD_19H_M60H_ROOT		0x14d8
> #define	PCI_DEVICE_ID_AMD_19H_M70H_ROOT		0x14e8
> 
>@@ -110,6 +111,12 @@ static const struct pciid {
> 		.amdsmn_addr_reg = F17H_SMN_ADDR_REG,
> 		.amdsmn_data_reg = F17H_SMN_DATA_REG,
> 	},
>+	{
>+		.amdsmn_vendorid = CPU_VENDOR_AMD,
>+		.amdsmn_deviceid = PCI_DEVICE_ID_AMD_19H_M40H_ROOT,
>+		.amdsmn_addr_reg = F17H_SMN_ADDR_REG,
>+		.amdsmn_data_reg = F17H_SMN_DATA_REG,
>+	},
> 	{
> 		.amdsmn_vendorid = CPU_VENDOR_AMD,
> 		.amdsmn_deviceid = PCI_DEVICE_ID_AMD_19H_M60H_ROOT,
>diff --git a/sys/dev/amdtemp/amdtemp.c b/sys/dev/amdtemp/amdtemp.c
>index ff9866c6221b..431890dfce20 100644
>--- a/sys/dev/amdtemp/amdtemp.c
>+++ b/sys/dev/amdtemp/amdtemp.c
>@@ -114,6 +114,7 @@ struct amdtemp_softc {
> #define	DEVICEID_AMD_HOSTB17H_M30H_ROOT	0x1480	/* Also M70H, F19H M00H/M20H */
> #define	DEVICEID_AMD_HOSTB17H_M60H_ROOT	0x1630
> #define	DEVICEID_AMD_HOSTB19H_M10H_ROOT	0x14a4
>+#define	DEVICEID_AMD_HOSTB19H_M40H_ROOT	0x14b5
> #define	DEVICEID_AMD_HOSTB19H_M60H_ROOT	0x14d8
> #define	DEVICEID_AMD_HOSTB19H_M70H_ROOT	0x14e8
> 
>@@ -141,6 +142,7 @@ static const struct amdtemp_product {
> 	{ VENDORID_AMD,	DEVICEID_AMD_HOSTB17H_M30H_ROOT, false },
> 	{ VENDORID_AMD,	DEVICEID_AMD_HOSTB17H_M60H_ROOT, false },
> 	{ VENDORID_AMD,	DEVICEID_AMD_HOSTB19H_M10H_ROOT, false },
>+	{ VENDORID_AMD, DEVICEID_AMD_HOSTB19H_M40H_ROOT, false },
> 	{ VENDORID_AMD,	DEVICEID_AMD_HOSTB19H_M60H_ROOT, false },
> 	{ VENDORID_AMD,	DEVICEID_AMD_HOSTB19H_M70H_ROOT, false },
> };
>@@ -874,6 +876,7 @@ amdtemp_probe_ccd_sensors19h(device_t dev, uint32_t model)
> 		maxreg = 12;
> 		_Static_assert((int)NUM_CCDS >= 12, "");
> 		break;
>+	case 0x40 ... 0x4f: /* Zen3+ Ryzen "Rembrandt" */
> 	case 0x60 ... 0x6f: /* Zen4 Ryzen "Raphael" */
> 	case 0x70 ... 0x7f: /* Zen4 Ryzen "Phoenix" */
> 		sc->sc_temp_base = AMDTEMP_ZEN4_CCD_TMP_BASE;

Actions: View | Diff

Attachments on bug 281962: 254112