X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=drivers%2Fpci%2Fpci_rom.c;h=37450c8e31112ebea2012c606d715a7b67d2eca0;hb=5afeb4bb456de129a88f38fae1573564cd53fc41;hp=eb7659177b42310656486d3c911379fe4e151ed1;hpb=4a2708a097eacd7aa3d10ccf26a70a467fa69217;p=u-boot

diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c
index eb7659177b..37450c8e31 100644
--- a/drivers/pci/pci_rom.c
+++ b/drivers/pci/pci_rom.c
@@ -67,6 +67,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;
@@ -98,7 +99,7 @@ static int pci_rom_probe(pci_dev_t dev, uint class,
 			       rom_address | PCI_ROM_ADDRESS_ENABLE);
 #endif
 	debug("Option ROM address %x\n", rom_address);
-	rom_header = (struct pci_rom_header *)rom_address;
+	rom_header = (struct pci_rom_header *)(unsigned long)rom_address;
 
 	debug("PCI expansion ROM, signature %#04x, INIT size %#04x, data ptr %#04x\n",
 	      le16_to_cpu(rom_header->signature),
@@ -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;
@@ -228,20 +229,22 @@ 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)
+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 +253,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 +265,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 +300,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 +307,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);