Page MenuHomeFreeBSD
Files F175124405

D15567.id42974.diff
No OneTemporary
Actions

D15567.id42974.diff
View Options

Index: sys/dev/amdsmn/amdsmn.c
===================================================================
--- sys/dev/amdsmn/amdsmn.c
+++ sys/dev/amdsmn/amdsmn.c
@@ -53,14 +53,24 @@
#define SMN_ADDR_REG 0x60
#define SMN_DATA_REG 0x64
+#define VENDORID_AMD 0x1022
+#define PCI_DEVICE_ID_AMD_17H_ROOT 0x1450
+#define PCI_DEVICE_ID_AMD_17H_ROOT_DF_F3 0x1463
+#define PCI_DEVICE_ID_AMD_17H_M10H_ROOT 0x15d0
+#define PCI_DEVICE_ID_AMD_17H_M10H_ROOT_DF_F3 0x15eb
+
struct amdsmn_softc {
struct mtx smn_lock;
};
static struct pciid {
- uint32_t device_id;
+ uint16_t amdsmn_vendorid;
+ uint16_t amdsmn_deviceid;
} amdsmn_ids[] = {
- { 0x14501022 },
+ { VENDORID_AMD, PCI_DEVICE_ID_AMD_17H_ROOT },
+ { VENDORID_AMD, PCI_DEVICE_ID_AMD_17H_M10H_ROOT },
+ /* { VENDORID_AMD, DEVICEID_AMD_HOSTB17H_DF_F3 }, */
+ /* { VENDORID_AMD, DEVICEID_AMD_HOSTB17H_M10H_DF_F3 }, */
};
/*
@@ -89,18 +99,21 @@
static devclass_t amdsmn_devclass;
DRIVER_MODULE(amdsmn, hostb, amdsmn_driver, amdsmn_devclass, NULL, NULL);
MODULE_VERSION(amdsmn, 1);
-MODULE_PNP_INFO("W32:vendor/device", pci, amdsmn, amdsmn_ids,
+MODULE_PNP_INFO("U16:vendor;U16:device", pci, amdsmn, amdsmn_ids,
sizeof(amdsmn_ids[0]), nitems(amdsmn_ids));
static bool
amdsmn_match(device_t parent)
{
- uint32_t devid;
+ uint16_t vendor, devid;
size_t i;
- devid = pci_get_devid(parent);
+ vendor = pci_get_vendor(parent);
+ devid = pci_get_device(parent);
+
for (i = 0; i < nitems(amdsmn_ids); i++)
- if (amdsmn_ids[i].device_id == devid)
+ if (vendor == amdsmn_ids[i].amdsmn_vendorid &&
+ devid == amdsmn_ids[i].amdsmn_deviceid)
return (true);
return (false);
}
Index: sys/dev/amdtemp/amdtemp.c
===================================================================
--- sys/dev/amdtemp/amdtemp.c
+++ sys/dev/amdtemp/amdtemp.c
@@ -86,7 +86,10 @@
#define DEVICEID_AMD_MISC16 0x1533
#define DEVICEID_AMD_MISC16_M30H 0x1583
#define DEVICEID_AMD_MISC17 0x141d
-#define DEVICEID_AMD_HOSTB17H 0x1450
+#define DEVICEID_AMD_HOSTB17H_ROOT 0x1450
+#define DEVICEID_AMD_HOSTB17H_DF_F3 0x1463
+#define DEVICEID_AMD_HOSTB17H_M10H_ROOT 0x15d0
+#define DEVICEID_AMD_HOSTB17H_M10H_DF_F3 0x15eb
static struct amdtemp_product {
uint16_t amdtemp_vendorid;
@@ -101,7 +104,10 @@
{ VENDORID_AMD, DEVICEID_AMD_MISC16 },
{ VENDORID_AMD, DEVICEID_AMD_MISC16_M30H },
{ VENDORID_AMD, DEVICEID_AMD_MISC17 },
- { VENDORID_AMD, DEVICEID_AMD_HOSTB17H },
+ { VENDORID_AMD, DEVICEID_AMD_HOSTB17H_ROOT },
+ { VENDORID_AMD, DEVICEID_AMD_HOSTB17H_M10H_ROOT },
+ /* { VENDORID_AMD, DEVICEID_AMD_HOSTB17H_DF_F3 }, */
+ /* { VENDORID_AMD, DEVICEID_AMD_HOSTB17H_M10H_DF_F3 }, */
};
/*

File Metadata

Mime Type
text/plain
Expires
Fri, Oct 9, 10:56 AM (44 m, 17 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
40481826
Default Alt Text
D15567.id42974.diff (2 KB)

Event Timeline