d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't re-parse PCI IDs in order to set card-specific flags, use

Browse Source 
the flags field in the PCIID table.
This commit is contained in:
scottl 2017-07-31 00:05:49 +00:00
parent a426c5589e
commit 20aeddd599
1 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
sys/dev/mpr/mpr_pci.c
View File

@ -125,23 +125,32 @@ struct mpr_ident {
{ MPI2_MFGPAGE_VENDORID_LSI, MPI26_MFGPAGE_DEVID_SAS3324_2,
0xffff, 0xffff, 0, "Avago Technologies (LSI) SAS3324_2" },
{ MPI2_MFGPAGE_VENDORID_LSI, MPI26_MFGPAGE_DEVID_SAS3408,
0xffff, 0xffff, 0, "Avago Technologies (LSI) SAS3408" },
0xffff, 0xffff, MPR_FLAGS_GEN35_IOC,
"Avago Technologies (LSI) SAS3408" },
{ MPI2_MFGPAGE_VENDORID_LSI, MPI26_MFGPAGE_DEVID_SAS3416,
0xffff, 0xffff, 0, "Avago Technologies (LSI) SAS3416" },
0xffff, 0xffff, MPR_FLAGS_GEN35_IOC,
"Avago Technologies (LSI) SAS3416" },
{ MPI2_MFGPAGE_VENDORID_LSI, MPI26_MFGPAGE_DEVID_SAS3508,
0xffff, 0xffff, 0, "Avago Technologies (LSI) SAS3508" },
0xffff, 0xffff, MPR_FLAGS_GEN35_IOC,
"Avago Technologies (LSI) SAS3508" },
{ MPI2_MFGPAGE_VENDORID_LSI, MPI26_MFGPAGE_DEVID_SAS3508_1,
0xffff, 0xffff, 0, "Avago Technologies (LSI) SAS3508_1" },
0xffff, 0xffff, MPR_FLAGS_GEN35_IOC,
"Avago Technologies (LSI) SAS3508_1" },
{ MPI2_MFGPAGE_VENDORID_LSI, MPI26_MFGPAGE_DEVID_SAS3516,
0xffff, 0xffff, 0, "Avago Technologies (LSI) SAS3516" },
0xffff, 0xffff, MPR_FLAGS_GEN35_IOC,
"Avago Technologies (LSI) SAS3516" },
{ MPI2_MFGPAGE_VENDORID_LSI, MPI26_MFGPAGE_DEVID_SAS3516_1,
0xffff, 0xffff, 0, "Avago Technologies (LSI) SAS3516_1" },
0xffff, 0xffff, MPR_FLAGS_GEN35_IOC,
"Avago Technologies (LSI) SAS3516_1" },
{ MPI2_MFGPAGE_VENDORID_LSI, MPI26_MFGPAGE_DEVID_SAS3616,
0xffff, 0xffff, 0, "Avago Technologies (LSI) SAS3616" },
0xffff, 0xffff, MPR_FLAGS_GEN35_IOC,
"Avago Technologies (LSI) SAS3616" },
{ MPI2_MFGPAGE_VENDORID_LSI, MPI26_MFGPAGE_DEVID_SAS3708,
0xffff, 0xffff, 0, "Avago Technologies (LSI) SAS3708" },
0xffff, 0xffff, MPR_FLAGS_GEN35_IOC,
"Avago Technologies (LSI) SAS3708" },
{ MPI2_MFGPAGE_VENDORID_LSI, MPI26_MFGPAGE_DEVID_SAS3716,
0xffff, 0xffff, 0, "Avago Technologies (LSI) SAS3716" },
0xffff, 0xffff, MPR_FLAGS_GEN35_IOC,
"Avago Technologies (LSI) SAS3716" },
{ 0, 0, 0, 0, 0, NULL }
};
@ -197,19 +206,6 @@ mpr_pci_attach(device_t dev)
/* Twiddle basic PCI config bits for a sanity check */
pci_enable_busmaster(dev);
/* Set flag if this is a Gen3.5 IOC */
if ((m->device == MPI26_MFGPAGE_DEVID_SAS3508) ||
(m->device == MPI26_MFGPAGE_DEVID_SAS3508_1) ||
(m->device == MPI26_MFGPAGE_DEVID_SAS3408) ||
(m->device == MPI26_MFGPAGE_DEVID_SAS3516) ||
(m->device == MPI26_MFGPAGE_DEVID_SAS3516_1) ||
(m->device == MPI26_MFGPAGE_DEVID_SAS3416) ||
(m->device == MPI26_MFGPAGE_DEVID_SAS3716) ||
(m->device == MPI26_MFGPAGE_DEVID_SAS3616) ||
(m->device == MPI26_MFGPAGE_DEVID_SAS3708)) {
sc->mpr_flags |= MPR_FLAGS_GEN35_IOC;
}
for (i = 0; i < PCI_MAXMAPS_0; i++) {
sc->mpr_regs_rid = PCIR_BAR(i);