svn commit: r338949 - in head/sys/dev: cxgb ida iwn ixl mfi mpr mps mvs my oce pccbb pcn ral rl
Warner Losh
imp at FreeBSD.org
Wed Sep 26 17:12:35 UTC 2018
Author: imp
Date: Wed Sep 26 17:12:30 2018
New Revision: 338949
URL: https://svnweb.freebsd.org/changeset/base/338949
Log:
Add PNP info to PCI attachments of cbb, cxgb, ida, iwn, ixl, ixlv,
mfi, mps, mpr, mvs, my, oce, pcn, ral, rl. This only labels existing
pci device tables, and has no probe / attach code changes.
Reviewed by: imp, chuck
Submitted by: Lakhan Shiva Kamireddy <lakhanshiva at gmail.com>
Sponsored by: Google, Inc. (GSoC 2018)
Approved by: re (glen)
Modified:
head/sys/dev/cxgb/cxgb_main.c
head/sys/dev/ida/ida_pci.c
head/sys/dev/iwn/if_iwn.c
head/sys/dev/ixl/if_ixl.c
head/sys/dev/ixl/if_ixlv.c
head/sys/dev/mfi/mfi_pci.c
head/sys/dev/mpr/mpr_pci.c
head/sys/dev/mps/mps_pci.c
head/sys/dev/mvs/mvs_pci.c
head/sys/dev/my/if_my.c
head/sys/dev/oce/oce_if.c
head/sys/dev/pccbb/pccbb_pci.c
head/sys/dev/pcn/if_pcn.c
head/sys/dev/ral/if_ral_pci.c
head/sys/dev/rl/if_rl.c
Modified: head/sys/dev/cxgb/cxgb_main.c
==============================================================================
--- head/sys/dev/cxgb/cxgb_main.c Wed Sep 26 17:12:14 2018 (r338948)
+++ head/sys/dev/cxgb/cxgb_main.c Wed Sep 26 17:12:30 2018 (r338949)
@@ -133,6 +133,30 @@ static void cxgb_update_mac_settings(struct port_info
static int toe_capability(struct port_info *, int);
#endif
+/* Table for probing the cards. The desc field isn't actually used */
+struct cxgb_ident {
+ uint16_t vendor;
+ uint16_t device;
+ int index;
+ char *desc;
+} cxgb_identifiers[] = {
+ {PCI_VENDOR_ID_CHELSIO, 0x0020, 0, "PE9000"},
+ {PCI_VENDOR_ID_CHELSIO, 0x0021, 1, "T302E"},
+ {PCI_VENDOR_ID_CHELSIO, 0x0022, 2, "T310E"},
+ {PCI_VENDOR_ID_CHELSIO, 0x0023, 3, "T320X"},
+ {PCI_VENDOR_ID_CHELSIO, 0x0024, 1, "T302X"},
+ {PCI_VENDOR_ID_CHELSIO, 0x0025, 3, "T320E"},
+ {PCI_VENDOR_ID_CHELSIO, 0x0026, 2, "T310X"},
+ {PCI_VENDOR_ID_CHELSIO, 0x0030, 2, "T3B10"},
+ {PCI_VENDOR_ID_CHELSIO, 0x0031, 3, "T3B20"},
+ {PCI_VENDOR_ID_CHELSIO, 0x0032, 1, "T3B02"},
+ {PCI_VENDOR_ID_CHELSIO, 0x0033, 4, "T3B04"},
+ {PCI_VENDOR_ID_CHELSIO, 0x0035, 6, "T3C10"},
+ {PCI_VENDOR_ID_CHELSIO, 0x0036, 3, "S320E-CR"},
+ {PCI_VENDOR_ID_CHELSIO, 0x0037, 7, "N320E-G2"},
+ {0, 0, 0, NULL}
+};
+
static device_method_t cxgb_controller_methods[] = {
DEVMETHOD(device_probe, cxgb_controller_probe),
DEVMETHOD(device_attach, cxgb_controller_attach),
@@ -151,6 +175,8 @@ static int cxgbc_mod_event(module_t, int, void *);
static devclass_t cxgb_controller_devclass;
DRIVER_MODULE(cxgbc, pci, cxgb_controller_driver, cxgb_controller_devclass,
cxgbc_mod_event, 0);
+MODULE_PNP_INFO("U16:vendor;U16:device", pci, cxgbc, cxgb_identifiers,
+ nitems(cxgb_identifiers) - 1);
MODULE_VERSION(cxgbc, 1);
MODULE_DEPEND(cxgbc, firmware, 1, 1, 1);
@@ -280,29 +306,6 @@ enum { FILTER_NO_VLAN_PRI = 7 };
#define PORT_MASK ((1 << MAX_NPORTS) - 1)
-/* Table for probing the cards. The desc field isn't actually used */
-struct cxgb_ident {
- uint16_t vendor;
- uint16_t device;
- int index;
- char *desc;
-} cxgb_identifiers[] = {
- {PCI_VENDOR_ID_CHELSIO, 0x0020, 0, "PE9000"},
- {PCI_VENDOR_ID_CHELSIO, 0x0021, 1, "T302E"},
- {PCI_VENDOR_ID_CHELSIO, 0x0022, 2, "T310E"},
- {PCI_VENDOR_ID_CHELSIO, 0x0023, 3, "T320X"},
- {PCI_VENDOR_ID_CHELSIO, 0x0024, 1, "T302X"},
- {PCI_VENDOR_ID_CHELSIO, 0x0025, 3, "T320E"},
- {PCI_VENDOR_ID_CHELSIO, 0x0026, 2, "T310X"},
- {PCI_VENDOR_ID_CHELSIO, 0x0030, 2, "T3B10"},
- {PCI_VENDOR_ID_CHELSIO, 0x0031, 3, "T3B20"},
- {PCI_VENDOR_ID_CHELSIO, 0x0032, 1, "T3B02"},
- {PCI_VENDOR_ID_CHELSIO, 0x0033, 4, "T3B04"},
- {PCI_VENDOR_ID_CHELSIO, 0x0035, 6, "T3C10"},
- {PCI_VENDOR_ID_CHELSIO, 0x0036, 3, "S320E-CR"},
- {PCI_VENDOR_ID_CHELSIO, 0x0037, 7, "N320E-G2"},
- {0, 0, 0, NULL}
-};
static int set_eeprom(struct port_info *pi, const uint8_t *data, int len, int offset);
Modified: head/sys/dev/ida/ida_pci.c
==============================================================================
--- head/sys/dev/ida/ida_pci.c Wed Sep 26 17:12:14 2018 (r338948)
+++ head/sys/dev/ida/ida_pci.c Wed Sep 26 17:12:30 2018 (r338949)
@@ -306,3 +306,5 @@ ida_pci_attach(device_t dev)
}
DRIVER_MODULE(ida, pci, ida_pci_driver, ida_devclass, 0, 0);
+MODULE_PNP_INFO("W32:vendor/device;D:#", pci, ida, board_id,
+ nitems(board_id) - 1);
Modified: head/sys/dev/iwn/if_iwn.c
==============================================================================
--- head/sys/dev/iwn/if_iwn.c Wed Sep 26 17:12:14 2018 (r338948)
+++ head/sys/dev/iwn/if_iwn.c Wed Sep 26 17:12:30 2018 (r338949)
@@ -372,7 +372,8 @@ static driver_t iwn_driver = {
static devclass_t iwn_devclass;
DRIVER_MODULE(iwn, pci, iwn_driver, iwn_devclass, NULL, NULL);
-
+MODULE_PNP_INFO("U16:vendor;U16:device;D:#", pci, iwn, iwn_ident_table,
+ nitems(iwn_ident_table) - 1);
MODULE_VERSION(iwn, 1);
MODULE_DEPEND(iwn, firmware, 1, 1, 1);
Modified: head/sys/dev/ixl/if_ixl.c
==============================================================================
--- head/sys/dev/ixl/if_ixl.c Wed Sep 26 17:12:14 2018 (r338948)
+++ head/sys/dev/ixl/if_ixl.c Wed Sep 26 17:12:30 2018 (r338949)
@@ -150,6 +150,7 @@ static driver_t ixl_driver = {
devclass_t ixl_devclass;
DRIVER_MODULE(ixl, pci, ixl_driver, ixl_devclass, 0, 0);
+IFLIB_PNP_INFO(pci, ixl, ixl_vendor_info_array);
MODULE_VERSION(ixl, 3);
MODULE_DEPEND(ixl, pci, 1, 1, 1);
Modified: head/sys/dev/ixl/if_ixlv.c
==============================================================================
--- head/sys/dev/ixl/if_ixlv.c Wed Sep 26 17:12:14 2018 (r338948)
+++ head/sys/dev/ixl/if_ixlv.c Wed Sep 26 17:12:30 2018 (r338949)
@@ -149,7 +149,9 @@ static driver_t ixlv_driver = {
devclass_t ixlv_devclass;
DRIVER_MODULE(ixlv, pci, ixlv_driver, ixlv_devclass, 0, 0);
-
+MODULE_PNP_INFO("U32:vendor;U32:device;U32:subvendor;U32:subdevice;U32:revision",
+ pci, ixlv, ixlv_vendor_info_array,
+ nitems(ixlv_vendor_info_array) - 1);
MODULE_DEPEND(ixlv, pci, 1, 1, 1);
MODULE_DEPEND(ixlv, ether, 1, 1, 1);
MODULE_DEPEND(ixlv, iflib, 1, 1, 1);
Modified: head/sys/dev/mfi/mfi_pci.c
==============================================================================
--- head/sys/dev/mfi/mfi_pci.c Wed Sep 26 17:12:14 2018 (r338948)
+++ head/sys/dev/mfi/mfi_pci.c Wed Sep 26 17:12:30 2018 (r338949)
@@ -106,8 +106,6 @@ static driver_t mfi_pci_driver = {
};
static devclass_t mfi_devclass;
-DRIVER_MODULE(mfi, pci, mfi_pci_driver, mfi_devclass, 0, 0);
-MODULE_VERSION(mfi, 1);
static int mfi_msi = 1;
SYSCTL_INT(_hw_mfi, OID_AUTO, msi, CTLFLAG_RDTUN, &mfi_msi, 0,
@@ -158,6 +156,11 @@ struct mfi_ident {
{0x1028, 0x0015, 0xffff, 0xffff, MFI_FLAGS_1064R, "Dell PERC 5/i"},
{0, 0, 0, 0, 0, NULL}
};
+
+DRIVER_MODULE(mfi, pci, mfi_pci_driver, mfi_devclass, 0, 0);
+MODULE_PNP_INFO("U16:vendor;U16:device;U16:subvendor;U16:subdevice", pci, mfi,
+ mfi_identifiers, nitems(mfi_identifiers) - 1);
+MODULE_VERSION(mfi, 1);
static struct mfi_ident *
mfi_find_ident(device_t dev)
Modified: head/sys/dev/mpr/mpr_pci.c
==============================================================================
--- head/sys/dev/mpr/mpr_pci.c Wed Sep 26 17:12:14 2018 (r338948)
+++ head/sys/dev/mpr/mpr_pci.c Wed Sep 26 17:12:30 2018 (r338949)
@@ -88,9 +88,6 @@ static driver_t mpr_pci_driver = {
sizeof(struct mpr_softc)
};
-static devclass_t mpr_devclass;
-DRIVER_MODULE(mpr, pci, mpr_pci_driver, mpr_devclass, 0, 0);
-MODULE_DEPEND(mpr, cam, 1, 1, 1);
struct mpr_ident {
uint16_t vendor;
@@ -153,6 +150,14 @@ struct mpr_ident {
"Avago Technologies (LSI) SAS3716" },
{ 0, 0, 0, 0, 0, NULL }
};
+
+
+static devclass_t mpr_devclass;
+DRIVER_MODULE(mpr, pci, mpr_pci_driver, mpr_devclass, 0, 0);
+MODULE_PNP_INFO("U16:vendor;U16:device;U16:subvendor;U16:subdevice;D:#", pci,
+ mpr, mpr_identifiers, nitems(mpr_identifiers) - 1);
+
+MODULE_DEPEND(mpr, cam, 1, 1, 1);
static struct mpr_ident *
mpr_find_ident(device_t dev)
Modified: head/sys/dev/mps/mps_pci.c
==============================================================================
--- head/sys/dev/mps/mps_pci.c Wed Sep 26 17:12:14 2018 (r338948)
+++ head/sys/dev/mps/mps_pci.c Wed Sep 26 17:12:30 2018 (r338949)
@@ -88,10 +88,6 @@ static driver_t mps_pci_driver = {
sizeof(struct mps_softc)
};
-static devclass_t mps_devclass;
-DRIVER_MODULE(mps, pci, mps_pci_driver, mps_devclass, 0, 0);
-MODULE_DEPEND(mps, cam, 1, 1, 1);
-
struct mps_ident {
uint16_t vendor;
uint16_t device;
@@ -147,6 +143,10 @@ struct mps_ident {
{ 0, 0, 0, 0, 0, NULL }
};
+static devclass_t mps_devclass;
+DRIVER_MODULE(mps, pci, mps_pci_driver, mps_devclass, 0, 0);
+MODULE_PNP_INFO("U16:vendor;U16:device;U16:subvendor;U16:subdevice", pci, mps,
+ mps_identifiers, nitems(mps_identifiers) - 1);
static struct mps_ident *
mps_find_ident(device_t dev)
{
Modified: head/sys/dev/mvs/mvs_pci.c
==============================================================================
--- head/sys/dev/mvs/mvs_pci.c Wed Sep 26 17:12:14 2018 (r338948)
+++ head/sys/dev/mvs/mvs_pci.c Wed Sep 26 17:12:30 2018 (r338949)
@@ -521,6 +521,8 @@ static driver_t mvs_driver = {
sizeof(struct mvs_controller)
};
DRIVER_MODULE(mvs, pci, mvs_driver, mvs_devclass, 0, 0);
+MODULE_PNP_INFO("W32:vendor/device", pci, mvs, mvs_ids,
+ nitems(mvs_ids) - 1);
MODULE_VERSION(mvs, 1);
MODULE_DEPEND(mvs, cam, 1, 1, 1);
Modified: head/sys/dev/my/if_my.c
==============================================================================
--- head/sys/dev/my/if_my.c Wed Sep 26 17:12:14 2018 (r338948)
+++ head/sys/dev/my/if_my.c Wed Sep 26 17:12:30 2018 (r338949)
@@ -163,6 +163,8 @@ static driver_t my_driver = {
static devclass_t my_devclass;
DRIVER_MODULE(my, pci, my_driver, my_devclass, 0, 0);
+MODULE_PNP_INFO("U16:vendor;U16:device;D:#", pci, my, my_devs,
+ nitems(my_devs) - 1);
MODULE_DEPEND(my, pci, 1, 1, 1);
MODULE_DEPEND(my, ether, 1, 1, 1);
Modified: head/sys/dev/oce/oce_if.c
==============================================================================
--- head/sys/dev/oce/oce_if.c Wed Sep 26 17:12:14 2018 (r338948)
+++ head/sys/dev/oce/oce_if.c Wed Sep 26 17:12:30 2018 (r338949)
@@ -214,12 +214,6 @@ static driver_t oce_driver = {
static devclass_t oce_devclass;
-DRIVER_MODULE(oce, pci, oce_driver, oce_devclass, 0, 0);
-MODULE_DEPEND(oce, pci, 1, 1, 1);
-MODULE_DEPEND(oce, ether, 1, 1, 1);
-MODULE_VERSION(oce, 1);
-
-
/* global vars */
const char component_revision[32] = {"///" COMPONENT_REVISION "///"};
@@ -241,6 +235,15 @@ static uint32_t supportedDevices[] = {
(PCI_VENDOR_EMULEX << 16) | PCI_PRODUCT_XE201_VF,
(PCI_VENDOR_EMULEX << 16) | PCI_PRODUCT_SH
};
+
+
+DRIVER_MODULE(oce, pci, oce_driver, oce_devclass, 0, 0);
+MODULE_PNP_INFO("W32:vendor/device", pci, oce, supportedDevices,
+ nitems(supportedDevices));
+MODULE_DEPEND(oce, pci, 1, 1, 1);
+MODULE_DEPEND(oce, ether, 1, 1, 1);
+MODULE_VERSION(oce, 1);
+
POCE_SOFTC softc_head = NULL;
POCE_SOFTC softc_tail = NULL;
Modified: head/sys/dev/pccbb/pccbb_pci.c
==============================================================================
--- head/sys/dev/pccbb/pccbb_pci.c Wed Sep 26 17:12:14 2018 (r338948)
+++ head/sys/dev/pccbb/pccbb_pci.c Wed Sep 26 17:12:30 2018 (r338949)
@@ -983,4 +983,6 @@ static driver_t cbb_driver = {
};
DRIVER_MODULE(cbb, pci, cbb_driver, cbb_devclass, 0, 0);
+MODULE_PNP_INFO("W32:vendor/device;D:#", pci, cbb, yc_chipsets,
+ nitems(yc_chipsets) - 1);
MODULE_DEPEND(cbb, exca, 1, 1, 1);
Modified: head/sys/dev/pcn/if_pcn.c
==============================================================================
--- head/sys/dev/pcn/if_pcn.c Wed Sep 26 17:12:14 2018 (r338948)
+++ head/sys/dev/pcn/if_pcn.c Wed Sep 26 17:12:30 2018 (r338949)
@@ -193,6 +193,8 @@ static driver_t pcn_driver = {
static devclass_t pcn_devclass;
DRIVER_MODULE(pcn, pci, pcn_driver, pcn_devclass, 0, 0);
+MODULE_PNP_INFO("U16:vendor; U16:device", pci, pcn, pcn_devs,
+ nitems(pcn_devs) - 1);
DRIVER_MODULE(miibus, pcn, miibus_driver, miibus_devclass, 0, 0);
#define PCN_CSR_SETBIT(sc, reg, x) \
Modified: head/sys/dev/ral/if_ral_pci.c
==============================================================================
--- head/sys/dev/ral/if_ral_pci.c Wed Sep 26 17:12:14 2018 (r338948)
+++ head/sys/dev/ral/if_ral_pci.c Wed Sep 26 17:12:30 2018 (r338949)
@@ -178,6 +178,8 @@ static driver_t ral_pci_driver = {
static devclass_t ral_devclass;
DRIVER_MODULE(ral, pci, ral_pci_driver, ral_devclass, NULL, NULL);
+MODULE_PNP_INFO("U16:vendor; U16:device; D:#", pci, ral, ral_pci_ids,
+ nitems(ral_pci_ids) - 1);
static int
ral_pci_probe(device_t dev)
Modified: head/sys/dev/rl/if_rl.c
==============================================================================
--- head/sys/dev/rl/if_rl.c Wed Sep 26 17:12:14 2018 (r338948)
+++ head/sys/dev/rl/if_rl.c Wed Sep 26 17:12:30 2018 (r338949)
@@ -259,6 +259,8 @@ static driver_t rl_driver = {
static devclass_t rl_devclass;
DRIVER_MODULE(rl, pci, rl_driver, rl_devclass, 0, 0);
+MODULE_PNP_INFO("U16:vendor; U16:device", pci, rl, rl_devs,
+ nitems(rl_devs) - 1);
DRIVER_MODULE(rl, cardbus, rl_driver, rl_devclass, 0, 0);
DRIVER_MODULE(miibus, rl, miibus_driver, miibus_devclass, 0, 0);
More information about the svn-src-head
mailing list