Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 9 Dec 2019 17:14:44 +0000 (UTC)
From:      Alexander Motin <mav@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject:   svn commit: r355562 - in stable/11/sys/dev: amdsmn amdtemp
Message-ID:  <201912091714.xB9HEiMK049324@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mav
Date: Mon Dec  9 17:14:43 2019
New Revision: 355562
URL: https://svnweb.freebsd.org/changeset/base/355562

Log:
  MFC r350624 (by cem):
  amdtemp(4), amdsmn(4): Attach to Ryzen 3 (Zen 2) hostbridges
  
  PR:	239607

Modified:
  stable/11/sys/dev/amdsmn/amdsmn.c
  stable/11/sys/dev/amdtemp/amdtemp.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/amdsmn/amdsmn.c
==============================================================================
--- stable/11/sys/dev/amdsmn/amdsmn.c	Mon Dec  9 17:13:17 2019	(r355561)
+++ stable/11/sys/dev/amdsmn/amdsmn.c	Mon Dec  9 17:14:43 2019	(r355562)
@@ -59,6 +59,7 @@ __FBSDID("$FreeBSD$");
 #define	PCI_DEVICE_ID_AMD_15H_M60H_ROOT		0x1576
 #define	PCI_DEVICE_ID_AMD_17H_ROOT		0x1450
 #define	PCI_DEVICE_ID_AMD_17H_M10H_ROOT		0x15d0
+#define	PCI_DEVICE_ID_AMD_17H_M30H_ROOT		0x1480
 
 struct pciid;
 struct amdsmn_softc {
@@ -87,6 +88,12 @@ static const struct pciid {
 	{
 		.amdsmn_vendorid = CPU_VENDOR_AMD,
 		.amdsmn_deviceid = PCI_DEVICE_ID_AMD_17H_M10H_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_17H_M30H_ROOT,
 		.amdsmn_addr_reg = F17H_SMN_ADDR_REG,
 		.amdsmn_data_reg = F17H_SMN_DATA_REG,
 	},

Modified: stable/11/sys/dev/amdtemp/amdtemp.c
==============================================================================
--- stable/11/sys/dev/amdtemp/amdtemp.c	Mon Dec  9 17:13:17 2019	(r355561)
+++ stable/11/sys/dev/amdtemp/amdtemp.c	Mon Dec  9 17:14:43 2019	(r355562)
@@ -94,6 +94,7 @@ struct amdtemp_softc {
 #define	DEVICEID_AMD_MISC16_M30H	0x1583
 #define	DEVICEID_AMD_HOSTB17H_ROOT	0x1450
 #define	DEVICEID_AMD_HOSTB17H_M10H_ROOT	0x15d0
+#define	DEVICEID_AMD_HOSTB17H_M30H_ROOT	0x1480
 
 static const struct amdtemp_product {
 	uint16_t	amdtemp_vendorid;
@@ -116,6 +117,7 @@ static const struct amdtemp_product {
 	{ VENDORID_AMD,	DEVICEID_AMD_MISC16_M30H, true },
 	{ VENDORID_AMD,	DEVICEID_AMD_HOSTB17H_ROOT, false },
 	{ VENDORID_AMD,	DEVICEID_AMD_HOSTB17H_M10H_ROOT, false },
+	{ VENDORID_AMD, DEVICEID_AMD_HOSTB17H_M30H_ROOT, false },
 	{ 0, 0 }
 };
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912091714.xB9HEiMK049324>