by Kevin O'Connor
This patch series extends the proliferation of 'struct pci_device'
which was introduced in the last patch series.
The objective of this series is to ensure that ATA devices configured
to use the native ATA driver don't attempt to run an option rom on the
device. This can become complex when a device that isn't identified
as a PCI_CLASS_STORAGE_IDE uses the native ATA driver. So, a bit in
the 'struct pci_device' now notes when a native driver is in use and
the option rom code checks for it.
Gerd - this patch series (and the previous one) may conflict with your
work.
Kevin O'Connor (4):
Use manual PCI search when making bios ram writable.
Move pci_probe() call into pciinit() code.
Convert pci_init_device to use 'struct pci_device'.
Use 'struct pci_device' to note which devices have native drivers.
src/acpi.c | 16 ++++++------
src/ata.c | 14 ++++++----
src/optionroms.c | 4 +--
src/pci.c | 33 +++++++++++---------------
src/pci.h | 11 ++++++--
src/pciinit.c | 69 ++++++++++++++++++++++++++++++++----------------------
src/post.c | 1 -
src/shadow.c | 41 ++++++++++++++------------------
src/smm.c | 6 ++--
9 files changed, 101 insertions(+), 94 deletions(-)
--
1.7.4.4
by Wayne Xia
Patch description:
There are 2 patches, patch 1 would add a bmp decoder to enable
seabios show bmp file, patch 2 will make the splash time configurable.
Main purpose of this patch is:
1 Enable seabios showing a logo picture when start up without menu
option.
2 Added a bmp showing module to show 24bpp bmp file as an option,
for better visual effect than old jpeg decoder.
3 Make the showing time configurable by qemu, when it equals 0,
directly boot up.
4 added a function to adjust data format, both used by jpeg decoder
and bmp module.
Currently I passed the variable Splash_time from a romfile, named
"qemu_extra_params_fw.cfg", I think more variable could be simply
packed inside this file in the future, not only for the splash_time
value.
--
Best Regards
Wayne Xia
mail:xiawenc@linux.vnet.ibm.com
tel:86-010-82450803
by Wayne Xia
Signed-off-by: Wayne Xia <xiawenc(a)linux.vnet.ibm.com>
---
src/boot.c | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/src/boot.c b/src/boot.c
index 9a67916..cca60bc 100644
--- a/src/boot.c
+++ b/src/boot.c
@@ -372,8 +372,32 @@ boot_add_cbfs(void *data, const char *desc, int prio)
static void
interactive_bootmenu(void)
{
- if (! CONFIG_BOOTMENU || ! qemu_cfg_show_boot_menu())
+ int filecfg_size;
+ u8 *filecfg_p = romfile_loadfile("qemu_extra_params_fw.cfg", &filecfg_size);
+ u16 splash_time = 0;
+
+ if (filecfg_p != NULL && filecfg_size >= 2) {
+ splash_time = *(filecfg_p+0)+(*(filecfg_p+1)<<8); /* little endian */
+ free(filecfg_p);
+ }
+
+ /* the user do not want to show the menu, so normally bootup */
+ if (!qemu_cfg_show_boot_menu()) {
+ if (splash_time > 0) {
+ while (get_keystroke(0) >= 0)
+ ;
+ enable_bootsplash();
+ get_keystroke(splash_time);
+ disable_bootsplash();
+ }
return;
+ } else {
+ /* user want to show menu, check the if the bios config allow it */
+ if (!CONFIG_BOOTMENU) {
+ return;
+ }
+ }
+
while (get_keystroke(0) >= 0)
;
--
1.7.6-rc1
by Kevin O'Connor
---
src/boot.c | 39 ++++++++++++++++++++++++---------------
src/pci.c | 30 ------------------------------
src/pci.h | 5 -----
src/post.c | 1 -
4 files changed, 24 insertions(+), 51 deletions(-)
diff --git a/src/boot.c b/src/boot.c
index 9a67916..f3c165c 100644
--- a/src/boot.c
+++ b/src/boot.c
@@ -98,24 +98,33 @@ find_prio(const char *glob)
#define FW_PCI_DOMAIN "/pci@i0cf8"
+static struct pci_device *
+find_pci(u16 bdf)
+{
+ struct pci_device *pci;
+ foreachpci(pci) {
+ if (pci->bdf == bdf)
+ return pci;
+ }
+ return NULL;
+}
+
static char *
-build_pci_path(char *buf, int max, const char *devname, int bdf)
+build_pci_path(char *buf, int max, const char *devname, struct pci_device *pci)
{
+ if (!pci)
+ return buf;
// Build the string path of a bdf - for example: /pci@i0cf8/isa@1,2
char *p = buf;
- int parent = pci_bdf_to_bus(bdf);
- if (PCIpaths)
- parent = PCIpaths[parent];
- int parentdev = parent & 0xffff;
- if (parent & PP_PCIBRIDGE) {
- p = build_pci_path(p, max, "pci-bridge", parentdev);
+ if (pci->parent) {
+ p = build_pci_path(p, max, "pci-bridge", pci->parent);
} else {
- if (parentdev)
- p += snprintf(p, max, "/pci-root@%x", parentdev);
+ if (pci->rootbus)
+ p += snprintf(p, max, "/pci-root@%x", pci->rootbus);
p += snprintf(p, buf+max-p, "%s", FW_PCI_DOMAIN);
}
- int dev = pci_bdf_to_dev(bdf), fn = pci_bdf_to_fn(bdf);
+ int dev = pci_bdf_to_dev(pci->bdf), fn = pci_bdf_to_fn(pci->bdf);
p += snprintf(p, buf+max-p, "/%s@%x", devname, dev);
if (fn)
p += snprintf(p, buf+max-p, ",%x", fn);
@@ -128,7 +137,7 @@ int bootprio_find_pci_device(int bdf)
return -1;
// Find pci device - for example: /pci@i0cf8/ethernet@5
char desc[256];
- build_pci_path(desc, sizeof(desc), "*", bdf);
+ build_pci_path(desc, sizeof(desc), "*", find_pci(bdf));
return find_prio(desc);
}
@@ -141,7 +150,7 @@ int bootprio_find_ata_device(int bdf, int chanid, int slave)
return -1;
// Find ata drive - for example: /pci@i0cf8/ide@1,1/drive@1/disk@0
char desc[256], *p;
- p = build_pci_path(desc, sizeof(desc), "*", bdf);
+ p = build_pci_path(desc, sizeof(desc), "*", find_pci(bdf));
snprintf(p, desc+sizeof(desc)-p, "/drive@%x/disk@%x", chanid, slave);
return find_prio(desc);
}
@@ -155,7 +164,7 @@ int bootprio_find_fdc_device(int bdf, int port, int fdid)
return -1;
// Find floppy - for example: /pci@i0cf8/isa@1/fdc@03f1/floppy@0
char desc[256], *p;
- p = build_pci_path(desc, sizeof(desc), "isa", bdf);
+ p = build_pci_path(desc, sizeof(desc), "isa", find_pci(bdf));
snprintf(p, desc+sizeof(desc)-p, "/fdc@%04x/floppy@%x", port, fdid);
return find_prio(desc);
}
@@ -166,7 +175,7 @@ int bootprio_find_pci_rom(int bdf, int instance)
return -1;
// Find pci rom - for example: /pci@i0cf8/scsi@3:rom2
char desc[256], *p;
- p = build_pci_path(desc, sizeof(desc), "*", bdf);
+ p = build_pci_path(desc, sizeof(desc), "*", find_pci(bdf));
if (instance)
snprintf(p, desc+sizeof(desc)-p, ":rom%d", instance);
return find_prio(desc);
@@ -191,7 +200,7 @@ int bootprio_find_usb(int bdf, u64 path)
// Find usb - for example: /pci@i0cf8/usb@1,2/hub@1/network@0/ethernet@0
int i;
char desc[256], *p;
- p = build_pci_path(desc, sizeof(desc), "usb", bdf);
+ p = build_pci_path(desc, sizeof(desc), "usb", find_pci(bdf));
for (i=56; i>0; i-=8) {
int port = (path >> i) & 0xff;
if (port != 0xff)
diff --git a/src/pci.c b/src/pci.c
index 9a696b9..eaf434a 100644
--- a/src/pci.c
+++ b/src/pci.c
@@ -190,36 +190,6 @@ pci_find_class(u16 classid)
return -1;
}
-int *PCIpaths;
-
-// Build the PCI path designations.
-void
-pci_path_setup(void)
-{
- PCIpaths = malloc_tmp(sizeof(*PCIpaths) * 256);
- if (!PCIpaths)
- return;
- memset(PCIpaths, 0, sizeof(*PCIpaths) * 256);
-
- int roots = 0;
- int bdf, max;
- foreachbdf(bdf, max) {
- int bus = pci_bdf_to_bus(bdf);
- if (! PCIpaths[bus])
- PCIpaths[bus] = (roots++) | PP_ROOT;
-
- // Check if found device is a bridge.
- u32 v = pci_config_readb(bdf, PCI_HEADER_TYPE);
- v &= 0x7f;
- if (v == PCI_HEADER_TYPE_BRIDGE || v == PCI_HEADER_TYPE_CARDBUS) {
- v = pci_config_readl(bdf, PCI_PRIMARY_BUS);
- int childbus = (v >> 8) & 0xff;
- if (childbus > bus)
- PCIpaths[childbus] = bdf | PP_PCIBRIDGE;
- }
- }
-}
-
int pci_init_device(const struct pci_device_id *ids, u16 bdf, void *arg)
{
u16 vendor_id = pci_config_readw(bdf, PCI_VENDOR_ID);
diff --git a/src/pci.h b/src/pci.h
index 7aa2dfe..70339cd 100644
--- a/src/pci.h
+++ b/src/pci.h
@@ -59,11 +59,6 @@ static inline u32 pci_classprog(struct pci_device *pci) {
#define foreachpci(PCI) \
for (PCI=PCIDevices; PCI; PCI=PCI->next)
-#define PP_ROOT (1<<17)
-#define PP_PCIBRIDGE (1<<18)
-extern int *PCIpaths;
-void pci_path_setup(void);
-
int pci_next(int bdf, int *pmax);
#define foreachbdf(BDF, MAX) \
for (MAX=0x0100, BDF=pci_next(0, &MAX) \
diff --git a/src/post.c b/src/post.c
index d8f4acf..7618b17 100644
--- a/src/post.c
+++ b/src/post.c
@@ -225,7 +225,6 @@ maininit(void)
// Initialize pci
pci_setup();
pci_probe();
- pci_path_setup();
smm_init();
// Initialize internal tables
--
1.7.4.4
by Kevin O'Connor
---
src/pci.h | 3 +++
src/usb.c | 41 ++++++++++++++++++-----------------------
2 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/src/pci.h b/src/pci.h
index a214bb1..7aa2dfe 100644
--- a/src/pci.h
+++ b/src/pci.h
@@ -52,6 +52,9 @@ struct pci_device {
extern struct pci_device *PCIDevices;
extern int MaxPCIBus;
void pci_probe(void);
+static inline u32 pci_classprog(struct pci_device *pci) {
+ return (pci->class << 8) | pci->prog_if;
+}
#define foreachpci(PCI) \
for (PCI=PCIDevices; PCI; PCI=PCI->next)
diff --git a/src/usb.c b/src/usb.c
index 454e2d4..26d1017 100644
--- a/src/usb.c
+++ b/src/usb.c
@@ -5,7 +5,7 @@
// This file may be distributed under the terms of the GNU LGPLv3 license.
#include "util.h" // dprintf
-#include "pci.h" // foreachbdf
+#include "pci.h" // foreachpci
#include "config.h" // CONFIG_*
#include "pci_regs.h" // PCI_CLASS_REVISION
#include "pci_ids.h" // PCI_CLASS_SERIAL_USB_UHCI
@@ -428,46 +428,41 @@ usb_setup(void)
dprintf(3, "init usb\n");
// Look for USB controllers
- int ehcibdf = -1;
int count = 0;
- int bdf, max;
- foreachbdf(bdf, max) {
- u32 code = pci_config_readl(bdf, PCI_CLASS_REVISION) >> 8;
-
- if (code >> 8 != PCI_CLASS_SERIAL_USB)
+ struct pci_device *ehcipci = PCIDevices;
+ struct pci_device *pci;
+ foreachpci(pci) {
+ if (pci->class != PCI_CLASS_SERIAL_USB)
continue;
- if (bdf > ehcibdf) {
+ if (pci->bdf >= ehcipci->bdf) {
// Check to see if this device has an ehci controller
- ehcibdf = bdf;
- u32 ehcicode = code;
int found = 0;
+ ehcipci = pci;
for (;;) {
- if (ehcicode == PCI_CLASS_SERIAL_USB_EHCI) {
+ if (pci_classprog(ehcipci) == PCI_CLASS_SERIAL_USB_EHCI) {
// Found an ehci controller.
- int ret = ehci_init(ehcibdf, count++, bdf);
+ int ret = ehci_init(ehcipci->bdf, count++, pci->bdf);
if (ret)
// Error
break;
count += found;
- bdf = ehcibdf;
- code = 0;
+ pci = ehcipci;
break;
}
- if (ehcicode >> 8 == PCI_CLASS_SERIAL_USB)
+ if (ehcipci->class == PCI_CLASS_SERIAL_USB)
found++;
- ehcibdf = pci_next(ehcibdf+1, &max);
- if (ehcibdf < 0
- || pci_bdf_to_busdev(ehcibdf) != pci_bdf_to_busdev(bdf))
+ ehcipci = ehcipci->next;
+ if (!ehcipci || (pci_bdf_to_busdev(ehcipci->bdf)
+ != pci_bdf_to_busdev(pci->bdf)))
// No ehci controller found.
break;
- ehcicode = pci_config_readl(ehcibdf, PCI_CLASS_REVISION) >> 8;
}
}
- if (code == PCI_CLASS_SERIAL_USB_UHCI)
- uhci_init(bdf, count++);
- else if (code == PCI_CLASS_SERIAL_USB_OHCI)
- ohci_init(bdf, count++);
+ if (pci_classprog(pci) == PCI_CLASS_SERIAL_USB_UHCI)
+ uhci_init(pci->bdf, count++);
+ else if (pci_classprog(pci) == PCI_CLASS_SERIAL_USB_OHCI)
+ ohci_init(pci->bdf, count++);
}
}
--
1.7.4.4
by Kevin O'Connor
---
src/ahci.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/ahci.c b/src/ahci.c
index b28597a..fb4b70c 100644
--- a/src/ahci.c
+++ b/src/ahci.c
@@ -8,7 +8,7 @@
#include "ioport.h" // inb
#include "util.h" // dprintf
#include "biosvar.h" // GET_EBDA
-#include "pci.h" // foreachbdf
+#include "pci.h" // foreachpci
#include "pci_ids.h" // PCI_CLASS_STORAGE_OTHER
#include "pci_regs.h" // PCI_INTERRUPT_LINE
#include "boot.h" // add_bcv_hd
@@ -462,13 +462,13 @@ static void
ahci_init(void)
{
// Scan PCI bus for ATA adapters
- int bdf, max;
- foreachbdf(bdf, max) {
- if (pci_config_readw(bdf, PCI_CLASS_DEVICE) != PCI_CLASS_STORAGE_SATA)
+ struct pci_device *pci;
+ foreachpci(pci) {
+ if (pci->class != PCI_CLASS_STORAGE_SATA)
continue;
- if (pci_config_readb(bdf, PCI_CLASS_PROG) != 1 /* AHCI rev 1 */)
+ if (pci->prog_if != 1 /* AHCI rev 1 */)
continue;
- ahci_init_controller(bdf);
+ ahci_init_controller(pci->bdf);
}
}
--
1.7.4.4
by Kevin O'Connor
---
src/virtio-blk.c | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/virtio-blk.c b/src/virtio-blk.c
index ad80c24..4e3ef06 100644
--- a/src/virtio-blk.c
+++ b/src/virtio-blk.c
@@ -8,7 +8,7 @@
// This file may be distributed under the terms of the GNU LGPLv3 license.
#include "util.h" // dprintf
-#include "pci.h" // foreachbdf
+#include "pci.h" // foreachpci
#include "config.h" // CONFIG_*
#include "biosvar.h" // GET_GLOBAL
#include "pci_ids.h" // PCI_DEVICE_ID_VIRTIO_BLK
@@ -173,12 +173,11 @@ virtio_blk_setup(void)
dprintf(3, "init virtio-blk\n");
- int bdf, max;
- u32 id = PCI_VENDOR_ID_REDHAT_QUMRANET | (PCI_DEVICE_ID_VIRTIO_BLK << 16);
- foreachbdf(bdf, max) {
- u32 v = pci_config_readl(bdf, PCI_VENDOR_ID);
- if (v != id)
+ struct pci_device *pci;
+ foreachpci(pci) {
+ if (pci->vendor != PCI_VENDOR_ID_REDHAT_QUMRANET
+ || pci->device != PCI_DEVICE_ID_VIRTIO_BLK)
continue;
- init_virtio_blk(bdf);
+ init_virtio_blk(pci->bdf);
}
}
--
1.7.4.4
by Kevin O'Connor
---
src/mptable.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/mptable.c b/src/mptable.c
index d7cab03..3100c9a 100644
--- a/src/mptable.c
+++ b/src/mptable.c
@@ -68,9 +68,10 @@ mptable_init(void)
// PCI buses
struct mpt_bus *buses = (void*)cpu, *bus = buses;
- int bdf, max, lastbus = -1;
- foreachbdf(bdf, max) {
- int curbus = pci_bdf_to_bus(bdf);
+ int lastbus = -1;
+ struct pci_device *pci;
+ foreachpci(pci) {
+ int curbus = pci_bdf_to_bus(pci->bdf);
if (curbus == lastbus)
continue;
lastbus = curbus;
@@ -106,7 +107,8 @@ mptable_init(void)
int dev = -1;
unsigned short mask = 0, pinmask = 0;
- foreachbdf(bdf, max) {
+ foreachpci(pci) {
+ u16 bdf = pci->bdf;
int pin = pci_config_readb(bdf, PCI_INTERRUPT_PIN);
int irq = pci_config_readb(bdf, PCI_INTERRUPT_LINE);
if (pin == 0)
--
1.7.4.4
by Kevin O'Connor
---
src/ata.c | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/ata.c b/src/ata.c
index 2630431..e07aabe 100644
--- a/src/ata.c
+++ b/src/ata.c
@@ -11,7 +11,7 @@
#include "cmos.h" // inb_cmos
#include "pic.h" // enable_hwirq
#include "biosvar.h" // GET_EBDA
-#include "pci.h" // foreachbdf
+#include "pci.h" // foreachpci
#include "pci_ids.h" // PCI_CLASS_STORAGE_OTHER
#include "pci_regs.h" // PCI_INTERRUPT_LINE
#include "boot.h" // boot_add_hd
@@ -1032,21 +1032,20 @@ static const struct pci_device_id pci_ata_tbl[] = {
static void
ata_init(void)
{
- // Scan PCI bus for ATA adapters
- int pcicount=0;
- int bdf, max;
- foreachbdf(bdf, max) {
- pcicount++;
- pci_init_device(pci_ata_tbl, bdf, NULL);
- }
-
- if (!CONFIG_COREBOOT && !pcicount) {
+ if (!CONFIG_COREBOOT && !PCIDevices) {
// No PCI devices found - probably a QEMU "-M isapc" machine.
// Try using ISA ports for ATA controllers.
init_controller(-1, IRQ_ATA1
, PORT_ATA1_CMD_BASE, PORT_ATA1_CTRL_BASE, 0);
init_controller(-1, IRQ_ATA2
, PORT_ATA2_CMD_BASE, PORT_ATA2_CTRL_BASE, 0);
+ return;
+ }
+
+ // Scan PCI bus for ATA adapters
+ struct pci_device *pci;
+ foreachpci(pci) {
+ pci_init_device(pci_ata_tbl, pci->bdf, NULL);
}
}
--
1.7.4.4
by Kevin O'Connor
---
src/optionroms.c | 86 ++++++++++++++++++++++++++++++++++-------------------
src/pci.c | 55 ----------------------------------
src/pci.h | 11 -------
3 files changed, 55 insertions(+), 97 deletions(-)
diff --git a/src/optionroms.c b/src/optionroms.c
index a612f3c..b2415cc 100644
--- a/src/optionroms.c
+++ b/src/optionroms.c
@@ -9,7 +9,7 @@
#include "farptr.h" // FLATPTR_TO_SEG
#include "config.h" // CONFIG_*
#include "util.h" // dprintf
-#include "pci.h" // foreachbdf
+#include "pci.h" // foreachpci
#include "pci_regs.h" // PCI_ROM_ADDRESS
#include "pci_ids.h" // PCI_CLASS_DISPLAY_VGA
#include "boot.h" // IPL
@@ -163,10 +163,10 @@ get_pnp_next(struct rom_header *rom, struct pnp_data *pnp)
static struct pci_data *
get_pci_rom(struct rom_header *rom)
{
- struct pci_data *pci = (void*)((u32)rom + rom->pcioffset);
- if (pci->signature != PCI_ROM_SIGNATURE)
+ struct pci_data *pd = (void*)((u32)rom + rom->pcioffset);
+ if (pd->signature != PCI_ROM_SIGNATURE)
return NULL;
- return pci;
+ return pd;
}
// Return start of code in 0xc0000-0xf0000 space.
@@ -238,11 +238,11 @@ getRomPriority(u64 *sources, struct rom_header *rom, int instance)
// Check if an option rom is at a hardcoded location or in CBFS.
static struct rom_header *
-lookup_hardcode(u32 vendev)
+lookup_hardcode(struct pci_device *pci)
{
char fname[17];
snprintf(fname, sizeof(fname), "pci%04x,%04x.rom"
- , pci_vd_to_ven(vendev), pci_vd_to_dev(vendev));
+ , pci->vendor, pci->device);
int ret = romfile_copy(romfile_find(fname), (void*)RomEnd
, max_rom() - RomEnd);
if (ret <= 0)
@@ -273,16 +273,35 @@ run_file_roms(const char *prefix, int isvga, u64 *sources)
* PCI roms
****************************************************************/
+// Verify device is a vga device with legacy address decoding enabled.
+static int
+is_pci_vga(struct pci_device *pci)
+{
+ if (pci->class != PCI_CLASS_DISPLAY_VGA)
+ return 0;
+ u16 cmd = pci_config_readw(pci->bdf, PCI_COMMAND);
+ if (!(cmd & PCI_COMMAND_IO && cmd & PCI_COMMAND_MEMORY))
+ return 0;
+ while (pci->parent) {
+ pci = pci->parent;
+ u32 ctrl = pci_config_readb(pci->bdf, PCI_BRIDGE_CONTROL);
+ if (!(ctrl & PCI_BRIDGE_CTL_VGA))
+ return 0;
+ }
+ return 1;
+}
+
// Map the option rom of a given PCI device.
static struct rom_header *
-map_pcirom(u16 bdf, u32 vendev)
+map_pcirom(struct pci_device *pci)
{
+ u16 bdf = pci->bdf;
dprintf(6, "Attempting to map option rom on dev %02x:%02x.%x\n"
, pci_bdf_to_bus(bdf), pci_bdf_to_dev(bdf), pci_bdf_to_fn(bdf));
- u8 htype = pci_config_readb(bdf, PCI_HEADER_TYPE);
- if ((htype & 0x7f) != PCI_HEADER_TYPE_NORMAL) {
- dprintf(6, "Skipping non-normal pci device (type=%x)\n", htype);
+ if ((pci->header_type & 0x7f) != PCI_HEADER_TYPE_NORMAL) {
+ dprintf(6, "Skipping non-normal pci device (type=%x)\n"
+ , pci->header_type);
return NULL;
}
@@ -309,29 +328,29 @@ map_pcirom(u16 bdf, u32 vendev)
for (;;) {
dprintf(5, "Inspecting possible rom at %p (vd=%04x:%04x"
" bdf=%02x:%02x.%x)\n"
- , rom, pci_vd_to_ven(vendev), pci_vd_to_dev(vendev)
+ , rom, pci->vendor, pci->device
, pci_bdf_to_bus(bdf), pci_bdf_to_dev(bdf), pci_bdf_to_fn(bdf));
if (rom->signature != OPTION_ROM_SIGNATURE) {
dprintf(6, "No option rom signature (got %x)\n", rom->signature);
goto fail;
}
- struct pci_data *pci = get_pci_rom(rom);
- if (! pci) {
+ struct pci_data *pd = get_pci_rom(rom);
+ if (! pd) {
dprintf(6, "No valid pci signature found\n");
goto fail;
}
- u32 vd = pci_vd(pci->vendor, pci->device);
- if (vd == vendev && pci->type == PCIROM_CODETYPE_X86)
+ if (pd->vendor == pci->vendor && pd->device == pci->device
+ && pd->type == PCIROM_CODETYPE_X86)
// A match
break;
- dprintf(6, "Didn't match dev/ven (got %08x) or type (got %d)\n"
- , vd, pci->type);
- if (pci->indicator & 0x80) {
+ dprintf(6, "Didn't match dev/ven (got %04x:%04x) or type (got %d)\n"
+ , pd->vendor, pd->device, pd->type);
+ if (pd->indicator & 0x80) {
dprintf(6, "No more images left\n");
goto fail;
}
- rom = (void*)((u32)rom + pci->ilen * 512);
+ rom = (void*)((u32)rom + pd->ilen * 512);
}
rom = copy_rom(rom);
@@ -345,15 +364,15 @@ fail:
// Attempt to map and initialize the option rom on a given PCI device.
static int
-init_pcirom(u16 bdf, int isvga, u64 *sources)
+init_pcirom(struct pci_device *pci, int isvga, u64 *sources)
{
- u32 vendev = pci_config_readl(bdf, PCI_VENDOR_ID);
+ u16 bdf = pci->bdf;
dprintf(4, "Attempting to init PCI bdf %02x:%02x.%x (vd %04x:%04x)\n"
, pci_bdf_to_bus(bdf), pci_bdf_to_dev(bdf), pci_bdf_to_fn(bdf)
- , pci_vd_to_ven(vendev), pci_vd_to_dev(vendev));
- struct rom_header *rom = lookup_hardcode(vendev);
+ , pci->vendor, pci->device);
+ struct rom_header *rom = lookup_hardcode(pci);
if (! rom)
- rom = map_pcirom(bdf, vendev);
+ rom = map_pcirom(pci);
if (! rom)
// No ROM present.
return -1;
@@ -389,13 +408,13 @@ optionrom_setup(void)
}
} else {
// Find and deploy PCI roms.
- int bdf, max;
- foreachbdf(bdf, max) {
- u16 v = pci_config_readw(bdf, PCI_CLASS_DEVICE);
+ struct pci_device *pci;
+ foreachpci(pci) {
+ u16 v = pci->class;
if (v == 0x0000 || v == 0xffff || v == PCI_CLASS_DISPLAY_VGA
|| (CONFIG_ATA && v == PCI_CLASS_STORAGE_IDE))
continue;
- init_pcirom(bdf, 0, sources);
+ init_pcirom(pci, 0, sources);
}
// Find and deploy CBFS roms not associated with a device.
@@ -458,9 +477,14 @@ vga_setup(void)
memset((void*)RomEnd, 0, _max_rom() - RomEnd);
// Find and deploy PCI VGA rom.
- int bdf = VGAbdf = pci_find_vga();
- if (bdf >= 0)
- init_pcirom(bdf, 1, NULL);
+ struct pci_device *pci;
+ foreachpci(pci) {
+ if (!is_pci_vga(pci))
+ continue;
+ VGAbdf = pci->bdf;
+ init_pcirom(pci, 1, NULL);
+ break;
+ }
// Find and deploy CBFS vga-style roms not associated with a device.
run_file_roms("vgaroms/", 1, NULL);
diff --git a/src/pci.c b/src/pci.c
index f0953e9..9a696b9 100644
--- a/src/pci.c
+++ b/src/pci.c
@@ -163,61 +163,6 @@ pci_probe(void)
}
}
-// Find a vga device with legacy address decoding enabled.
-int
-pci_find_vga(void)
-{
- int bdf = 0x0000, max = 0x0100;
- for (;;) {
- if (bdf >= max) {
- if (CONFIG_PCI_ROOT1 && bdf <= (CONFIG_PCI_ROOT1 << 8))
- bdf = CONFIG_PCI_ROOT1 << 8;
- else if (CONFIG_PCI_ROOT2 && bdf <= (CONFIG_PCI_ROOT2 << 8))
- bdf = CONFIG_PCI_ROOT2 << 8;
- else
- return -1;
- max = bdf + 0x0100;
- }
-
- u16 cls = pci_config_readw(bdf, PCI_CLASS_DEVICE);
- if (cls == 0x0000 || cls == 0xffff) {
- // Device not present.
- if (pci_bdf_to_fn(bdf) == 0)
- bdf += 8;
- else
- bdf += 1;
- continue;
- }
- if (cls == PCI_CLASS_DISPLAY_VGA) {
- u16 cmd = pci_config_readw(bdf, PCI_COMMAND);
- if (cmd & PCI_COMMAND_IO && cmd & PCI_COMMAND_MEMORY)
- // Found active vga card
- return bdf;
- }
-
- // Check if device is a bridge.
- u8 hdr = pci_config_readb(bdf, PCI_HEADER_TYPE);
- u8 ht = hdr & 0x7f;
- if (ht == PCI_HEADER_TYPE_BRIDGE || ht == PCI_HEADER_TYPE_CARDBUS) {
- u32 ctrl = pci_config_readb(bdf, PCI_BRIDGE_CONTROL);
- if (ctrl & PCI_BRIDGE_CTL_VGA) {
- // Found a VGA enabled bridge.
- u32 pbus = pci_config_readl(bdf, PCI_PRIMARY_BUS);
- bdf = (pbus & 0xff00);
- max = bdf + 0x100;
- continue;
- }
- }
-
- if (pci_bdf_to_fn(bdf) == 0 && (hdr & 0x80) == 0)
- // Last found device wasn't a multi-function device - skip to
- // the next device.
- bdf += 8;
- else
- bdf += 1;
- }
-}
-
// Search for a device with the specified vendor and device ids.
int
pci_find_device(u16 vendid, u16 devid)
diff --git a/src/pci.h b/src/pci.h
index f1d84ed..a214bb1 100644
--- a/src/pci.h
+++ b/src/pci.h
@@ -25,16 +25,6 @@ static inline u16 pci_bus_devfn_to_bdf(int bus, u16 devfn) {
return (bus << 8) | devfn;
}
-static inline u32 pci_vd(u16 vendor, u16 device) {
- return (device << 16) | vendor;
-}
-static inline u16 pci_vd_to_ven(u32 vd) {
- return vd & 0xffff;
-}
-static inline u16 pci_vd_to_dev(u32 vd) {
- return vd >> 16;
-}
-
void pci_config_writel(u16 bdf, u32 addr, u32 val);
void pci_config_writew(u16 bdf, u32 addr, u16 val);
void pci_config_writeb(u16 bdf, u32 addr, u8 val);
@@ -43,7 +33,6 @@ u16 pci_config_readw(u16 bdf, u32 addr);
u8 pci_config_readb(u16 bdf, u32 addr);
void pci_config_maskw(u16 bdf, u32 addr, u16 off, u16 on);
-int pci_find_vga(void);
int pci_find_device(u16 vendid, u16 devid);
int pci_find_class(u16 classid);
--
1.7.4.4
