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 49c118d74a59368bc3d57f1c941916418dbe5b66..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>
@@ -79,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);
@@ -108,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;
        }
 
@@ -139,7 +139,7 @@ static int pci_rom_probe(pci_dev_t dev, uint class,
        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;
@@ -203,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;
@@ -229,6 +230,33 @@ int vbe_get_video_info(struct graphic_device *gdev)
 #endif
 }
 
+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;
@@ -253,7 +281,7 @@ int pci_run_vga_bios(pci_dev_t dev, int (*int15_handler)(void), int exec_method)
        if (ret)
                return ret;
 
-       ret = pci_rom_load(class, rom, &ram);
+       ret = pci_rom_load(rom, &ram);
        if (ret)
                return ret;