GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pciexp_device: Fix offset handling for extended capabilities 

The PCIe spec explicitly states that the bottom-two bits of the next
offset are reserved for future use and should be masked. We can also
change the loop condition to avoid wrong offsets below 0x100 (exten-
ded capabilities always reside in the extended config space).

The whole patch series was tested on Google Samus and keeps the L1ss
configuration of the WiFi device in tact.

Change-Id: I0b622a0ce0a4a1127d266226ade0ec1e66e9fb79
Signed-off-by: Nico Huber <nico.h@gmx.de>
Tested-by: Patrick Georgi <patrick@coreboot.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/66459
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Nico Huber 2022-08-05 14:50:06 +02:00 committed by Felix Held
parent 077dc2eca2
commit 5f7cfb388e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/device/pciexp_device.c
View File

@ -16,7 +16,7 @@ static unsigned int ext_cap_id(unsigned int cap)
static unsigned int ext_cap_next_offset(unsigned int cap) static unsigned int ext_cap_next_offset(unsigned int cap)
{ {
return cap >> 20; return cap >> 20 & 0xffc;
} }
static unsigned int find_ext_cap_offset(const struct device *dev, unsigned int cap_id, static unsigned int find_ext_cap_offset(const struct device *dev, unsigned int cap_id,
@ -24,7 +24,7 @@ static unsigned int find_ext_cap_offset(const struct device *dev, unsigned int c
{ {
unsigned int this_cap_offset = offset; unsigned int this_cap_offset = offset;
while (this_cap_offset != 0) { while (this_cap_offset >= PCIE_EXT_CAP_OFFSET) {
const unsigned int this_cap = pci_read_config32(dev, this_cap_offset); const unsigned int this_cap = pci_read_config32(dev, this_cap_offset);
/* Bail out when this request is unsupported */ /* Bail out when this request is unsupported */