Attachment 252943 Details for Bug 280942 – Patch for amdsmn.c and amdtemp.c to support AMD Ryzen 7 "Phoenix"

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

amdtemp.patch (text/plain), 1.72 KB, created by Oliver Fromme on 2024-08-20 10:17:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oliver Fromme

Created: 2024-08-20 10:17:21 UTC

Size: 1.72 KB

patch

obsolete

>--- src.orig/sys/dev/amdsmn/amdsmn.c	2024-08-20 11:06:34.000000000 +0200
>+++ src/sys/dev/amdsmn/amdsmn.c	2024-08-20 11:44:16.906933000 +0200
>@@ -60,6 +60,7 @@
> #define	PCI_DEVICE_ID_AMD_17H_M60H_ROOT		0x1630
> #define	PCI_DEVICE_ID_AMD_19H_M10H_ROOT		0x14a4
> #define	PCI_DEVICE_ID_AMD_19H_M60H_ROOT		0x14d8
>+#define	PCI_DEVICE_ID_AMD_19H_M70H_ROOT		0x14e8
> 
> struct pciid;
> struct amdsmn_softc {
>@@ -112,6 +113,12 @@
> 	{
> 		.amdsmn_vendorid = CPU_VENDOR_AMD,
> 		.amdsmn_deviceid = PCI_DEVICE_ID_AMD_19H_M60H_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_M70H_ROOT,
> 		.amdsmn_addr_reg = F17H_SMN_ADDR_REG,
> 		.amdsmn_data_reg = F17H_SMN_DATA_REG,
> 	},
>--- src.orig/sys/dev/amdtemp/amdtemp.c	2024-08-20 11:05:23.000000000 +0200
>+++ src/sys/dev/amdtemp/amdtemp.c	2024-08-20 11:44:45.065093000 +0200
>@@ -115,6 +115,7 @@
> #define	DEVICEID_AMD_HOSTB17H_M60H_ROOT	0x1630
> #define	DEVICEID_AMD_HOSTB19H_M10H_ROOT	0x14a4
> #define	DEVICEID_AMD_HOSTB19H_M60H_ROOT	0x14d8
>+#define	DEVICEID_AMD_HOSTB19H_M70H_ROOT	0x14e8
> 
> static const struct amdtemp_product {
> 	uint16_t	amdtemp_vendorid;
>@@ -141,6 +142,7 @@
> 	{ VENDORID_AMD,	DEVICEID_AMD_HOSTB17H_M60H_ROOT, false },
> 	{ VENDORID_AMD,	DEVICEID_AMD_HOSTB19H_M10H_ROOT, false },
> 	{ VENDORID_AMD,	DEVICEID_AMD_HOSTB19H_M60H_ROOT, false },
>+	{ VENDORID_AMD,	DEVICEID_AMD_HOSTB19H_M70H_ROOT, false },
> };
> 
> /*
>@@ -873,6 +875,7 @@
> 		_Static_assert((int)NUM_CCDS >= 12, "");
> 		break;
> 	case 0x60 ... 0x6f: /* Zen4 Ryzen "Raphael" */
>+	case 0x70 ... 0x7f: /* Zen4 Ryzen "Phoenix" */
> 		sc->sc_temp_base = AMDTEMP_ZEN4_CCD_TMP_BASE;
> 		maxreg = 8;
> 		_Static_assert((int)NUM_CCDS >= 8, "");

Actions: View | Diff

Attachments on bug 280942: 252943