pci: Disable expansion ROM address decoding when signature check fails

We should not leave the expansion ROM address window open when there
is not a valid ROM.

Suggested-by: Matt Porter <[email protected]>
Signed-off-by: Bin Meng <[email protected]>
Tested-by: Simon Glass <[email protected]>
Acked-by: Simon Glass <[email protected]>

diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c
index aa06767d2a82d753597c719cc1d87311b69f6223..a33efae2636a4593fdb366bd5c62a91e58cb506b 100644 (file)
--- a/drivers/pci/pci_rom.c
+++ b/drivers/pci/pci_rom.c
@@ -104,6 +104,10 @@ static int pci_rom_probe(pci_dev_t dev, uint class,
        if (le16_to_cpu(rom_header->signature) != PCI_ROM_HDR) {
                printf("Incorrect expansion ROM header signature %04x\n",
                       le16_to_cpu(rom_header->signature));
+#ifndef CONFIG_VGA_BIOS_ADDR
+               /* Disable expansion ROM address decoding */
+               pci_write_config_dword(dev, PCI_ROM_ADDRESS, rom_address);
+#endif
                return -EINVAL;
        }