[coreboot-gerrit] Change in ...coreboot[master]: device/pci_rom: Fix on-board optionrom address

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/33908 )

Change subject: device/pci_rom: Fix on-board optionrom address
......................................................................

device/pci_rom: Fix on-board optionrom address

The function pci_rom_probe() may be called multiple times
for a device. For cases where CBFS does not contain optionrom
file, only the first time probing for the on-board ROM
chip worked.

PCI_ROM_ADDRESS_ENABLE is set on the first run. Mask out all
the reserved bits of PCI_ROM_ADDRESS register to get correct
physical address for rom_header.

Change-Id: I14374954af09201494bf2f13e5a6e4dc640c05ee
Signed-off-by: Kyösti Mälkki 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/33908
Tested-by: build bot (Jenkins) 
Reviewed-by: Patrick Rudolph 
Reviewed-by: Mike Banon 
---
M src/device/pci_rom.c
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Patrick Rudolph: Looks good to me, approved
  Mike Banon: Looks good to me, approved

diff --git a/src/device/pci_rom.c b/src/device/pci_rom.c
index 3160c20..7322e57 100644
--- a/src/device/pci_rom.c
+++ b/src/device/pci_rom.c
@@ -77,6 +77,8 @@
    				   rom_address|PCI_ROM_ADDRESS_ENABLE);
    	}

+		rom_address &= PCI_ROM_ADDRESS_MASK;
+
    	printk(BIOS_DEBUG, "Option ROM address for %s = %lx\n",
    	       dev_path(dev), (unsigned long)rom_address);
    	rom_header = (struct rom_header *)rom_address;