Author: cem
Date: Fri Sep 25 04:16:28 2020
New Revision: 366136
URL: https://svnweb.freebsd.org/changeset/base/366136
Log:
amdtemp(4), amdsmn(4): Attach to Ryzen 4000 APU (Zen 2, "Renoir")
PR: 249864
Reported by: Florian Millet <florian.millet AT laposte.net>
Tested by: Florian Millet
Modified:
head/sys/dev/amdsmn/amdsmn.c
head/sys/dev/amdtemp/amdtemp.c
Modified: head/sys/dev/amdsmn/amdsmn.c
==============================================================================
--- head/sys/dev/amdsmn/amdsmn.c Fri Sep 25 01:16:01 2020
(r366135)
+++ head/sys/dev/amdsmn/amdsmn.c Fri Sep 25 04:16:28 2020
(r366136)
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2017-2019 Conrad Meyer <c...@freebsd.org>
+ * Copyright (c) 2017-2020 Conrad Meyer <c...@freebsd.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -60,6 +60,7 @@ __FBSDID("$FreeBSD$");
#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 /* Also M70H. */
+#define PCI_DEVICE_ID_AMD_17H_M60H_ROOT 0x1630
struct pciid;
struct amdsmn_softc {
@@ -94,6 +95,12 @@ static const struct pciid {
{
.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,
+ },
+ {
+ .amdsmn_vendorid = CPU_VENDOR_AMD,
+ .amdsmn_deviceid = PCI_DEVICE_ID_AMD_17H_M60H_ROOT,
.amdsmn_addr_reg = F17H_SMN_ADDR_REG,
.amdsmn_data_reg = F17H_SMN_DATA_REG,
},
Modified: head/sys/dev/amdtemp/amdtemp.c
==============================================================================
--- head/sys/dev/amdtemp/amdtemp.c Fri Sep 25 01:16:01 2020
(r366135)
+++ head/sys/dev/amdtemp/amdtemp.c Fri Sep 25 04:16:28 2020
(r366136)
@@ -107,6 +107,7 @@ struct amdtemp_softc {
#define DEVICEID_AMD_HOSTB17H_ROOT 0x1450
#define DEVICEID_AMD_HOSTB17H_M10H_ROOT 0x15d0
#define DEVICEID_AMD_HOSTB17H_M30H_ROOT 0x1480 /* Also M70h. */
+#define DEVICEID_AMD_HOSTB17H_M60H_ROOT 0x1630
static const struct amdtemp_product {
uint16_t amdtemp_vendorid;
@@ -130,6 +131,7 @@ static const struct amdtemp_product {
{ VENDORID_AMD, DEVICEID_AMD_HOSTB17H_ROOT, false },
{ VENDORID_AMD, DEVICEID_AMD_HOSTB17H_M10H_ROOT, false },
{ VENDORID_AMD, DEVICEID_AMD_HOSTB17H_M30H_ROOT, false },
+ { VENDORID_AMD, DEVICEID_AMD_HOSTB17H_M60H_ROOT, false },
};
/*
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
