upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-09 00:32:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

pci: Don't try to read cfg registers of non-existing devices

Browse source 
Instead of returning 0xffs some controllers, such as Layerscape generate
an external exception when someone attempts to read any register
of config space of a non-existing device other than PCIR_VENDOR.
This causes a kernel panic.
Fix it by bailing during device enumeration if a device vendor register
returns invalid value. (0xffff)
Use this opportunity to replace some hardcoded values with a macro.

I believe that this change won't have any unintended side-effects since
it is safe to assume that vendor == 0xffff -> hdr_type == 0xffff.

Sponsored by:		Alstom
Obtained from:		Semihalf
Reviewed by:		jhb
MFC after:		2 weeks
Differential revision:	https://reviews.freebsd.org/D33059

(cherry picked from commit 68cbe189fd)
This commit is contained in:
Kornel Duleba 2021-11-23 09:13:56 +01:00 committed by Wojciech Macek
parent 98a6200ee2
commit 77b3cf989f
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
sys/dev/pci/pci.c
View file

@ -682,11 +682,12 @@ pci_read_device(device_t pcib, device_t bus, int d, int b, int s, int f)
uint16_t vid, did;
vid = REG(PCIR_VENDOR, 2);
did = REG(PCIR_DEVICE, 2);
if (vid != 0xffff)
return (pci_fill_devinfo(pcib, bus, d, b, s, f, vid, did));
if (vid == PCIV_INVALID)
return (NULL);
return (NULL);
did = REG(PCIR_DEVICE, 2);
return (pci_fill_devinfo(pcib, bus, d, b, s, f, vid, did));
}
struct pci_devinfo *
@ -4140,6 +4141,10 @@ pci_add_children(device_t dev, int domain, int busno)
pcifunchigh = 0;
f = 0;
DELAY(1);
/* If function 0 is not present, skip to the next slot. */
if (REG(PCIR_VENDOR, 2) == PCIV_INVALID)
continue;
hdrtype = REG(PCIR_HDRTYPE, 1);
if ((hdrtype & PCIM_HDRTYPE) > PCI_MAXHDRTYPE)
continue;
@ -4181,7 +4186,7 @@ pci_rescan_method(device_t dev)
for (s = 0; s <= maxslots; s++) {
/* If function 0 is not present, skip to the next slot. */
f = 0;
if (REG(PCIR_VENDOR, 2) == 0xffff)
if (REG(PCIR_VENDOR, 2) == PCIV_INVALID)
continue;
pcifunchigh = 0;
hdrtype = REG(PCIR_HDRTYPE, 1);
@ -4190,7 +4195,7 @@ pci_rescan_method(device_t dev)
if (hdrtype & PCIM_MFDEV)
pcifunchigh = PCIB_MAXFUNCS(pcib);
for (f = 0; f <= pcifunchigh; f++) {
if (REG(PCIR_VENDOR, 2) == 0xffff)
if (REG(PCIR_VENDOR, 2) == PCIV_INVALID)
continue;
/*