Skip to content

Commit

Permalink
MFC r350624 (by cem):
Browse files Browse the repository at this point in the history
amdtemp(4), amdsmn(4): Attach to Ryzen 3 (Zen 2) hostbridges

PR:	239607
  • Loading branch information
amotin authored and fichtner committed May 25, 2020
1 parent d53ad73 commit 530dab5
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 0 deletions.
7 changes: 7 additions & 0 deletions sys/dev/amdsmn/amdsmn.c
Expand Up @@ -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 {
Expand Down Expand Up @@ -90,6 +91,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_17H_M30H_ROOT,
.amdsmn_addr_reg = F17H_SMN_ADDR_REG,
.amdsmn_data_reg = F17H_SMN_DATA_REG,
},
};

/*
Expand Down
2 changes: 2 additions & 0 deletions sys/dev/amdtemp/amdtemp.c
Expand Up @@ -96,6 +96,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;
Expand All @@ -118,6 +119,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 },
};

/*
Expand Down

0 comments on commit 530dab5

Please sign in to comment.