pci: Disable expansion ROM address decoding when signature check fails

[karo-tx-uboot.git] / drivers / pci / pci_rom.c

diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c
index 5729a152e5bb00ed759dfe90bd7750f10b7e20b7..a33efae2636a4593fdb366bd5c62a91e58cb506b 100644 (file)
--- a/drivers/pci/pci_rom.c
+++ b/drivers/pci/pci_rom.c
@@ -31,6 +31,7 @@
 #include <pci_rom.h>
 #include <vbe.h>
 #include <video_fb.h>
+#include <linux/screen_info.h>
 
 #ifdef CONFIG_HAVE_ACPI_RESUME
 #include <asm/acpi.h>
@@ -67,6 +68,7 @@ static int pci_rom_probe(pci_dev_t dev, uint class,
        struct pci_rom_data *rom_data;
        u16 vendor, device;
        u16 rom_vendor, rom_device;
+       u32 rom_class;
        u32 vendev;
        u32 mapped_vendev;
        u32 rom_address;
@@ -78,15 +80,10 @@ static int pci_rom_probe(pci_dev_t dev, uint class,
        if (vendev != mapped_vendev)
                debug("Device ID mapped to %#08x\n", mapped_vendev);
 
-#ifdef CONFIG_X86_OPTION_ROM_ADDR
-       rom_address = CONFIG_X86_OPTION_ROM_ADDR;
+#ifdef CONFIG_VGA_BIOS_ADDR
+       rom_address = CONFIG_VGA_BIOS_ADDR;
 #else
 
-       if (pciauto_setup_rom(pci_bus_to_hose(PCI_BUS(dev)), dev)) {
-               debug("Cannot find option ROM\n");
-               return -ENOENT;
-       }
-
        pci_read_config_dword(dev, PCI_ROM_ADDRESS, &rom_address);
        if (rom_address == 0x00000000 || rom_address == 0xffffffff) {
                debug("%s: rom_address=%x\n", __func__, rom_address);
@@ -107,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;
        }
 
@@ -125,20 +126,20 @@ static int pci_rom_probe(pci_dev_t dev, uint class,
                /* Continue anyway */
        }
 
-       debug("PCI ROM image, Class Code %04x%02x, Code Type %02x\n",
-             rom_data->class_hi, rom_data->class_lo, rom_data->type);
+       rom_class = (le16_to_cpu(rom_data->class_hi) << 8) | rom_data->class_lo;
+       debug("PCI ROM image, Class Code %06x, Code Type %02x\n",
+             rom_class, rom_data->type);
 
-       if (class != ((rom_data->class_hi << 8) | rom_data->class_lo)) {
-               debug("Class Code mismatch ROM %08x, dev %08x\n",
-                     (rom_data->class_hi << 8) | rom_data->class_lo,
-                     class);
+       if (class != rom_class) {
+               debug("Class Code mismatch ROM %06x, dev %06x\n",
+                     rom_class, class);
        }
        *hdrp = rom_header;
 
        return 0;
 }
 
-int pci_rom_load(uint16_t class, struct pci_rom_header *rom_header,
+int pci_rom_load(struct pci_rom_header *rom_header,
                 struct pci_rom_header **ram_headerp)
 {
        struct pci_rom_data *rom_data;
@@ -202,6 +203,7 @@ int vbe_get_video_info(struct graphic_device *gdev)
        gdev->gdfBytesPP = vesa->bits_per_pixel / 8;
 
        switch (vesa->bits_per_pixel) {
+       case 32:
        case 24:
                gdev->gdfIndex = GDF_32BIT_X888RGB;
                break;
@@ -228,20 +230,49 @@ int vbe_get_video_info(struct graphic_device *gdev)
 #endif
 }
 
-int pci_run_vga_bios(pci_dev_t dev, int (*int15_handler)(void), bool emulate)
+void setup_video(struct screen_info *screen_info)
+{
+#ifdef CONFIG_FRAMEBUFFER_SET_VESA_MODE
+       struct vesa_mode_info *vesa = &mode_info.vesa;
+
+       screen_info->orig_video_isVGA = VIDEO_TYPE_VLFB;
+
+       screen_info->lfb_width = vesa->x_resolution;
+       screen_info->lfb_height = vesa->y_resolution;
+       screen_info->lfb_depth = vesa->bits_per_pixel;
+       screen_info->lfb_linelength = vesa->bytes_per_scanline;
+       screen_info->lfb_base = vesa->phys_base_ptr;
+       screen_info->lfb_size =
+               ALIGN(screen_info->lfb_linelength * screen_info->lfb_height,
+                     65536);
+       screen_info->lfb_size >>= 16;
+       screen_info->red_size = vesa->red_mask_size;
+       screen_info->red_pos = vesa->red_mask_pos;
+       screen_info->green_size = vesa->green_mask_size;
+       screen_info->green_pos = vesa->green_mask_pos;
+       screen_info->blue_size = vesa->blue_mask_size;
+       screen_info->blue_pos = vesa->blue_mask_pos;
+       screen_info->rsvd_size = vesa->reserved_mask_size;
+       screen_info->rsvd_pos = vesa->reserved_mask_pos;
+#endif
+}
+
+int pci_run_vga_bios(pci_dev_t dev, int (*int15_handler)(void), int exec_method)
 {
        struct pci_rom_header *rom, *ram;
        int vesa_mode = -1;
-       uint16_t class;
+       uint class;
+       bool emulate;
        int ret;
 
        /* Only execute VGA ROMs */
-       pci_read_config_word(dev, PCI_CLASS_DEVICE, &class);
-       if ((class ^ PCI_CLASS_DISPLAY_VGA) & 0xff00) {
+       pci_read_config_dword(dev, PCI_REVISION_ID, &class);
+       if (((class >> 16) ^ PCI_CLASS_DISPLAY_VGA) & 0xff00) {
                debug("%s: Class %#x, should be %#x\n", __func__, class,
                      PCI_CLASS_DISPLAY_VGA);
                return -ENODEV;
        }
+       class >>= 8;
 
        if (!should_load_oprom(dev))
                return -ENXIO;
@@ -250,7 +281,7 @@ int pci_run_vga_bios(pci_dev_t dev, int (*int15_handler)(void), bool emulate)
        if (ret)
                return ret;
 
-       ret = pci_rom_load(class, rom, &ram);
+       ret = pci_rom_load(rom, &ram);
        if (ret)
                return ret;
 
@@ -262,6 +293,29 @@ int pci_run_vga_bios(pci_dev_t dev, int (*int15_handler)(void), bool emulate)
        vesa_mode = CONFIG_FRAMEBUFFER_VESA_MODE;
 #endif
        debug("Selected vesa mode %#x\n", vesa_mode);
+
+       if (exec_method & PCI_ROM_USE_NATIVE) {
+#ifdef CONFIG_X86
+               emulate = false;
+#else
+               if (!(exec_method & PCI_ROM_ALLOW_FALLBACK)) {
+                       printf("BIOS native execution is only available on x86\n");
+                       return -ENOSYS;
+               }
+               emulate = true;
+#endif
+       } else {
+#ifdef CONFIG_BIOSEMU
+               emulate = true;
+#else
+               if (!(exec_method & PCI_ROM_ALLOW_FALLBACK)) {
+                       printf("BIOS emulation not available - see CONFIG_BIOSEMU\n");
+                       return -ENOSYS;
+               }
+               emulate = false;
+#endif
+       }
+
        if (emulate) {
 #ifdef CONFIG_BIOSEMU
                BE_VGAInfo *info;
@@ -274,9 +328,6 @@ int pci_run_vga_bios(pci_dev_t dev, int (*int15_handler)(void), bool emulate)
                                  vesa_mode, &mode_info);
                if (ret)
                        return ret;
-#else
-               printf("BIOS emulation not available - see CONFIG_BIOSEMU\n");
-               return -ENOSYS;
 #endif
        } else {
 #ifdef CONFIG_X86
@@ -284,9 +335,6 @@ int pci_run_vga_bios(pci_dev_t dev, int (*int15_handler)(void), bool emulate)
 
                bios_run_on_x86(dev, (unsigned long)ram, vesa_mode,
                                &mode_info);
-#else
-               printf("BIOS native execution is only available on x86\n");
-               return -ENOSYS;
 #endif
        }
        debug("Final vesa mode %#x\n", mode_info.video_mode);