Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pci: Option rom class is a 24-bit number

Browse Source 
We should pass a u32 class number to pci_rom_probe() instead of a u16.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
master
Bin Meng 9 years ago committed by Simon Glass
parent afbf1404c1
commit d57c2f24fc
1 changed files with 11 additions and 9 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 20
      drivers/pci/pci_rom.c

20
drivers/pci/pci_rom.c
Unescape View File

@ -67,6 +67,7 @@ static int pci_rom_probe(pci_dev_t dev, uint class,
struct pci_rom_data *rom_data; struct pci_rom_data *rom_data;
u16 vendor, device; u16 vendor, device;
u16 rom_vendor, rom_device; u16 rom_vendor, rom_device;
u32 rom_class;
u32 vendev; u32 vendev;
u32 mapped_vendev; u32 mapped_vendev;
u32 rom_address; u32 rom_address;
@ -125,13 +126,13 @@ static int pci_rom_probe(pci_dev_t dev, uint class,
/* Continue anyway */ /* Continue anyway */
} }
debug("PCI ROM image, Class Code %04x%02x, Code Type %02x\n", rom_class = (le16_to_cpu(rom_data->class_hi) << 8) | rom_data->class_lo;
rom_data->class_hi, rom_data->class_lo, rom_data->type); 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)) { if (class != rom_class) {
debug("Class Code mismatch ROM %08x, dev %08x\n", debug("Class Code mismatch ROM %06x, dev %06x\n",
(rom_data->class_hi << 8) | rom_data->class_lo, rom_class, class);
class);
} }
*hdrp = rom_header; *hdrp = rom_header;
@ -232,17 +233,18 @@ int pci_run_vga_bios(pci_dev_t dev, int (*int15_handler)(void), int exec_method)
{ {
struct pci_rom_header *rom, *ram; struct pci_rom_header *rom, *ram;
int vesa_mode = -1; int vesa_mode = -1;
uint16_t class; uint class;
bool emulate; bool emulate;
int ret; int ret;
/* Only execute VGA ROMs */ /* Only execute VGA ROMs */
pci_read_config_word(dev, PCI_CLASS_DEVICE, &class); pci_read_config_dword(dev, PCI_REVISION_ID, &class);
if ((class ^ PCI_CLASS_DISPLAY_VGA) & 0xff00) { if (((class >> 16) ^ PCI_CLASS_DISPLAY_VGA) & 0xff00) {
debug("%s: Class %#x, should be %#x\n", __func__, class, debug("%s: Class %#x, should be %#x\n", __func__, class,
PCI_CLASS_DISPLAY_VGA); PCI_CLASS_DISPLAY_VGA);
return -ENODEV; return -ENODEV;
} }
class >>= 8;
if (!should_load_oprom(dev)) if (!should_load_oprom(dev))
return -ENXIO; return -ENXIO;

Write Preview
Loading…
Cancel
Save