Module Name: src
Committed By: msaitoh
Date: Sat Jan 28 12:36:52 UTC 2023
Modified Files:
src/sys/arch/x86/pci: amdsmn.c amdzentemp.c
Log Message:
amdsmn(4),amdzentemp(4): Add Zen3+ Rembrandt(19h/4xh) & Zen4 Genoa(19h/1xh).
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/x86/pci/amdsmn.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/x86/pci/amdzentemp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/pci/amdsmn.c
diff -u src/sys/arch/x86/pci/amdsmn.c:1.15 src/sys/arch/x86/pci/amdsmn.c:1.16
--- src/sys/arch/x86/pci/amdsmn.c:1.15 Sun Dec 18 15:50:32 2022
+++ src/sys/arch/x86/pci/amdsmn.c Sat Jan 28 12:36:52 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: amdsmn.c,v 1.15 2022/12/18 15:50:32 reinoud Exp $ */
+/* $NetBSD: amdsmn.c,v 1.16 2023/01/28 12:36:52 msaitoh Exp $ */
/*-
* Copyright (c) 2017, 2019 Conrad Meyer <c...@freebsd.org>
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdsmn.c,v 1.15 2022/12/18 15:50:32 reinoud Exp $ ");
+__KERNEL_RCSID(0, "$NetBSD: amdsmn.c,v 1.16 2023/01/28 12:36:52 msaitoh Exp $ ");
/*
* Driver for the AMD Family 15h (model 60+) and 17h CPU
@@ -93,7 +93,17 @@ static const struct pciid {
.amdsmn_data_reg = F17H_SMN_DATA_REG,
},
{
- .amdsmn_deviceid = PCI_PRODUCT_AMD_F17_7X_RC,
+ .amdsmn_deviceid = PCI_PRODUCT_AMD_F17_7X_RC, /* or F19_0X */
+ .amdsmn_addr_reg = F17H_SMN_ADDR_REG,
+ .amdsmn_data_reg = F17H_SMN_DATA_REG,
+ },
+ {
+ .amdsmn_deviceid = PCI_PRODUCT_AMD_F17_AX_RC, /* or F19_4X */
+ .amdsmn_addr_reg = F17H_SMN_ADDR_REG,
+ .amdsmn_data_reg = F17H_SMN_DATA_REG,
+ },
+ {
+ .amdsmn_deviceid = PCI_PRODUCT_AMD_F19_1X_RC,
.amdsmn_addr_reg = F17H_SMN_ADDR_REG,
.amdsmn_data_reg = F17H_SMN_DATA_REG,
},
Index: src/sys/arch/x86/pci/amdzentemp.c
diff -u src/sys/arch/x86/pci/amdzentemp.c:1.17 src/sys/arch/x86/pci/amdzentemp.c:1.18
--- src/sys/arch/x86/pci/amdzentemp.c:1.17 Sat Jan 28 07:45:21 2023
+++ src/sys/arch/x86/pci/amdzentemp.c Sat Jan 28 12:36:52 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: amdzentemp.c,v 1.17 2023/01/28 07:45:21 msaitoh Exp $ */
+/* $NetBSD: amdzentemp.c,v 1.18 2023/01/28 12:36:52 msaitoh Exp $ */
/* $OpenBSD: kate.c,v 1.2 2008/03/27 04:52:03 cnst Exp $ */
/*
@@ -53,7 +53,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdzentemp.c,v 1.17 2023/01/28 07:45:21 msaitoh Exp $ ");
+__KERNEL_RCSID(0, "$NetBSD: amdzentemp.c,v 1.18 2023/01/28 12:36:52 msaitoh Exp $ ");
#include <sys/param.h>
#include <sys/bus.h>
@@ -121,6 +121,10 @@ enum {
CCD5,
CCD6,
CCD7,
+ CCD8,
+ CCD9,
+ CCD10,
+ CCD11,
CCD_MAX,
NUM_CCDS = CCD_MAX - CCD_BASE
};
@@ -402,6 +406,14 @@ amdzentemp_probe_ccd_sensors19h(struct a
sc->sc_ccd_offset = 0x308;
maxreg = 8;
break;
+ case 0x40 ... 0x4f: /* Zen3+ "Rembrandt" */
+ sc->sc_ccd_offset = 0x300;
+ maxreg = 8;
+ break;
+ case 0x10 ... 0x1f: /* Zen4 "Genoa" */
+ sc->sc_ccd_offset = 0x300;
+ maxreg = 12;
+ break;
default:
aprint_error_dev(sc->sc_dev,
"Unrecognized Family 19h Model: %02xh\n", model);
