Re: [SeaBIOS] [Qemu-devel] SeaBIOS error with Juniper FreeBSD kernel
by Kevin O'Connor
On Sun, Feb 21, 2010 at 04:18:38PM -0700, Brandon Bennett wrote:
> > On Sat, Feb 20, 2010 at 9:05 PM, Kevin O'Connor <kevin(a)koconnor.net> wrote:
> >> Should a kernel fail during boot, I'd suspect it doesn't like one of
> >> the apm/pcibios callbacks, or it doesn't like one of the
> >> smbios/mptable/acpi tables. You could try compiling the SeaBIOS code
> >> (see http://seabios.org/Download ) and increasing the debugging by
> >> modifying src/config.h. Specifically, you could increase
> >> CONFIG_DEBUG_LEVEL, and set DEBUG_HDL_pcibios32 and DEBUG_HDL_apm to
> >> 1. Also, you could try disabling some of the features to see if that
> >> prevents the fault (eg, disabling CONFIG_ACPI / CONFIG_SMBIOS /
> >> CONFIG_MPTABLE).
> >
>
> I have narrowed it down to SMBIOS. If I disable CONFIG_SMBIOS the
> image boots up fine.
Gleb, have you seen this thread?
Some of the recent changes to smbios that look like possible culprits
are:
Make SMBIOS table pass MS SVVP test
Use MaxCountCPUs during building of per cpu tables.
Add malloc_high/fseg() and rework bios table creation to use them.
There were other changes, but the comments indicate they were only
ports of changes already in bochs. I suppose it's also possible the
lack of smbios is turning off some other feature in the guest (eg,
acpi) that's the real culprit.
-Kevin
8 years
[PATCH] support piix PAM registers in KVM
by Gleb Natapov
Without this BIOS fails to remap 0xf0000 memory from ROM to RAM so writes
to F-segment modify ROM content instead of memory copy. Since QEMU does
not reloads ROMs during reset on next boot modified copy of BIOS is used.
Signed-off-by: Gleb Natapov <gleb(a)redhat.com>
diff --git a/hw/piix_pci.c b/hw/piix_pci.c
index 933ad86..0bf435d 100644
--- a/hw/piix_pci.c
+++ b/hw/piix_pci.c
@@ -99,10 +99,6 @@ static void i440fx_update_memory_mappings(PCII440FXState *d)
int i, r;
uint32_t smram, addr;
- if (kvm_enabled()) {
- /* FIXME: Support remappings and protection changes. */
- return;
- }
update_pam(d, 0xf0000, 0x100000, (d->dev.config[I440FX_PAM] >> 4) & 3);
for(i = 0; i < 12; i++) {
r = (d->dev.config[(i >> 1) + (I440FX_PAM + 1)] >> ((i & 1) * 4)) & 3;
--
Gleb.
8 years, 1 month
Re: [SeaBIOS] Some questions
by Kevin O'Connor
Hi Stefan,
I'm CC'ing the mailing list.
On Wed, Nov 24, 2010 at 11:45:17AM -0500, Stefan Berger wrote:
> Hi Kevin,
>
> while I am porting the BIOS code for TCG support to SeaBIOS, I am
> wondering about the following:
>
> 'When' is it recommendable to switch from 16 bit to 32bit.
To be honest, this has never really been done before in SeaBIOS, so I
think we'll have to figure this out as we go. Since you need to
access full memory, it looks like it will be required to jump into
32bit mode.
>I am
> asking because the interface I am implementing allows callers to
> pass input and output data structures using es:di and ds:si, with es
> and ds allowed to be loaded with anything possible. So my strategy
> in the Bochs BIOS was to switch to 32 bit even before calling the
> interrupt handler, there doing the case statement for branching into
> the actual functions (switch (regs->al)) and passing 32 bit pointers
> converted from es:di and ds:si to the functions doing the work and
> reading from those memory locations.
This sounds okay to me - it should be possible to implement
handle_1abb(regs) which does a call32(tcg32_1abb, regs). It's
possible to do all the pointer conversion while in 32bit mode.
>The 'thing' is also that
> several ones of the functions that can be called through the
> interrupt interface are also called from the implemented functions.
> Example:
>
> Functions A,B,C can be called via the interrupt handler.
>
> Function B also calls A.
> Function C also calls B.
This shouldn't really be an issue. The build should take care of
this.
>
> This is due to the hierarchical nature of the functions. Also, while
> for example B calls A, B fills a data structure (on the stack) that
> it passes to A. A of course can get the same data structure from the
> user calling the interrupt interface. So, by switching to 32 bit
> mode and converting to 32 bit pointers early I could previously
> avoid a lot of headaches with the segment registers in 16 bit mode
> and reading the data from wherever they may be. Would you have any
> concerns about switching to 32 bit mode early, so that the interrupt
> handler and anything subsequent runs in 32 bit mode?
I can't say for sure what will make sense without seeing the code
first, but it sounds okay to me.
-Kevin
>
> Regards,
> Stefan
>
>
>
8 years, 3 months
seabios: acpi: add _RMV control method for PCI devices
by Marcelo Tosatti
Use _RMV method to indicate whether device can be removed.
Data is retrieved from QEMU via I/O port 0xae0c.
Signed-off-by: Marcelo Tosatti <mtosatti(a)redhat.com>
Index: seabios/src/acpi-dsdt.dsl
===================================================================
--- seabios.orig/src/acpi-dsdt.dsl
+++ seabios/src/acpi-dsdt.dsl
@@ -122,6 +122,12 @@ DefinitionBlock (
B0EJ, 32,
}
+ OperationRegion(RMVC, SystemIO, 0xae0c, 0x04)
+ Field(RMVC, DWordAcc, NoLock, WriteAsZeros)
+ {
+ PCRM, 32,
+ }
+
#define hotplug_slot(name, nr) \
Device (S##name) { \
Name (_ADR, nr##0000) \
@@ -245,11 +251,14 @@ DefinitionBlock (
{
Return (0x00)
}
+ Method(_RMV) { Return (0x00) }
}
/* PIIX3 ISA bridge */
Device (ISA) {
Name (_ADR, 0x00010000)
+ Method(_RMV) { Return (0x00) }
+
/* PIIX PCI to ISA irq remapping */
OperationRegion (P40C, PCI_Config, 0x60, 0x04)
@@ -442,6 +451,49 @@ DefinitionBlock (
DRSJ, 32
}
}
+
+#define gen_pci_device(name, nr) \
+ Device(SL##name) { \
+ Name (_ADR, nr##0000) \
+ Method (_RMV) { \
+ If (And(\_SB.PCI0.PCRM, ShiftLeft(1, nr))) { \
+ Return (0x1) \
+ } \
+ Return (0x0) \
+ } \
+ Name (_SUN, name) \
+ }
+
+ /* VGA (slot 1) and ISA bus (slot 2) defined above */
+ gen_pci_device(3, 0x0003)
+ gen_pci_device(4, 0x0004)
+ gen_pci_device(5, 0x0005)
+ gen_pci_device(6, 0x0006)
+ gen_pci_device(7, 0x0007)
+ gen_pci_device(8, 0x0008)
+ gen_pci_device(9, 0x0009)
+ gen_pci_device(10, 0x000a)
+ gen_pci_device(11, 0x000b)
+ gen_pci_device(12, 0x000c)
+ gen_pci_device(13, 0x000d)
+ gen_pci_device(14, 0x000e)
+ gen_pci_device(15, 0x000f)
+ gen_pci_device(16, 0x0010)
+ gen_pci_device(17, 0x0011)
+ gen_pci_device(18, 0x0012)
+ gen_pci_device(19, 0x0013)
+ gen_pci_device(20, 0x0014)
+ gen_pci_device(21, 0x0015)
+ gen_pci_device(22, 0x0016)
+ gen_pci_device(23, 0x0017)
+ gen_pci_device(24, 0x0018)
+ gen_pci_device(25, 0x0019)
+ gen_pci_device(26, 0x001a)
+ gen_pci_device(27, 0x001b)
+ gen_pci_device(28, 0x001c)
+ gen_pci_device(29, 0x001d)
+ gen_pci_device(30, 0x001e)
+ gen_pci_device(31, 0x001f)
}
/* PCI IRQs */
8 years, 6 months
[PATCH 0/9] Misc boot related cleanups
by Kevin O'Connor
Some cleanups I came across while reviewing the boot code.
Gleb - patch 7 conflicts with your last patch - I hope it isn't a big
deal to fixup though. (I'm still reviewing your last patch.)
-Kevin
Kevin O'Connor (9):
Rename add_ordered_drive() to add_drive() and use in map_hd_drive().
Call setup_translation() from map_hd_drive().
Don't access drive_g->desc from boot_cdrom().
Remove Drives global struct in favor of independent global variables.
Move IPL.checkfloppysig to a global (CheckFloppySig) in boot.c.
Move IPL.bev to static variables in boot.c
Move IPL.fw_bootorder to static variables in boot.c.
Minor reorganization of some of the boot_xxx code in boot.c.
Remove drive->desc field.
src/ahci.c | 40 +++++++---------
src/ata.c | 41 +++++++---------
src/block.c | 64 ++++++++++++-------------
src/boot.c | 137 +++++++++++++++++++++++++++++++-----------------------
src/boot.h | 36 +-------------
src/cdrom.c | 2 +-
src/coreboot.c | 5 +--
src/disk.c | 2 +-
src/disk.h | 13 +----
src/floppy.c | 28 ++++++-----
src/output.c | 26 ++++++++++
src/ramdisk.c | 10 +++-
src/usb-msc.c | 32 ++++++-------
src/util.h | 2 +
src/virtio-blk.c | 11 ++---
15 files changed, 221 insertions(+), 228 deletions(-)
--
1.7.3.4
8 years, 6 months
[PATCH] USB boot priority
by Kevin O'Connor
This adds tracking of USB port paths, and enables searching the
bootorder file based on it. It's on top of the other patches I've
sent.
Gleb - I tried adding:
-usb -drive file=dos-drivec,if=none,id=d1 -device usb-storage,drive=d1,bootindex=1
But qemu didn't add anything to the bootorder file. (It does register
the usb drive.)
-Kevin
diff --git a/src/boot.c b/src/boot.c
index 2f9b315..4185102 100644
--- a/src/boot.c
+++ b/src/boot.c
@@ -162,6 +162,21 @@ int bootprio_find_named_rom(const char *name, int instance)
return find_prio(desc);
}
+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);
+ for (i=56; i>0; i-=8) {
+ int port = (path >> i) & 0xff;
+ if (port != 0xff)
+ p += snprintf(p, desc+sizeof(desc)-p, "/hub@%x", port);
+ }
+ snprintf(p, desc+sizeof(desc)-p, "/*@%x", (u32)(path & 0xff));
+ return find_prio(desc);
+}
+
/****************************************************************
* Boot setup
diff --git a/src/boot.h b/src/boot.h
index 8f56ccf..62f4b2b 100644
--- a/src/boot.h
+++ b/src/boot.h
@@ -15,8 +15,9 @@ void boot_add_cbfs(void *data, const char *desc, int prio);
void boot_prep(void);
int bootprio_find_pci_device(int bdf);
int bootprio_find_ata_device(int bdf, int chanid, int slave);
-int bootprio_find_fdc_device(int bfd, int port, int fdid);
+int bootprio_find_fdc_device(int bdf, int port, int fdid);
int bootprio_find_pci_rom(int bdf, int instance);
int bootprio_find_named_rom(const char *name, int instance);
+int bootprio_find_usb(int bdf, u64 path);
#endif // __BOOT_H
diff --git a/src/usb-ehci.c b/src/usb-ehci.c
index 4e228bd..f11924a 100644
--- a/src/usb-ehci.c
+++ b/src/usb-ehci.c
@@ -265,6 +265,7 @@ ehci_init(u16 bdf, int busid, int compbdf)
struct usb_ehci_s *cntl = malloc_tmphigh(sizeof(*cntl));
memset(cntl, 0, sizeof(*cntl));
cntl->usb.busid = busid;
+ cntl->usb.bdf = bdf;
cntl->usb.type = USB_TYPE_EHCI;
cntl->caps = caps;
cntl->regs = (void*)caps + readb(&caps->caplength);
diff --git a/src/usb-msc.c b/src/usb-msc.c
index d5fe7ba..58a5d14 100644
--- a/src/usb-msc.c
+++ b/src/usb-msc.c
@@ -143,7 +143,10 @@ setup_drive_cdrom(struct disk_op_s *op, char *desc)
{
op->drive_g->blksize = CDROM_SECTOR_SIZE;
op->drive_g->sectors = (u64)-1;
- boot_add_cd(op->drive_g, desc, -1);
+ struct usb_pipe *pipe = container_of(
+ op->drive_g, struct usbdrive_s, drive)->bulkout;
+ int prio = bootprio_find_usb(pipe->cntl->bdf, pipe->path);
+ boot_add_cd(op->drive_g, desc, prio);
return 0;
}
@@ -168,7 +171,10 @@ setup_drive_hd(struct disk_op_s *op, char *desc)
dprintf(1, "USB MSC blksize=%d sectors=%d\n", blksize, sectors);
// Register with bcv system.
- boot_add_hd(op->drive_g, desc, -1);
+ struct usb_pipe *pipe = container_of(
+ op->drive_g, struct usbdrive_s, drive)->bulkout;
+ int prio = bootprio_find_usb(pipe->cntl->bdf, pipe->path);
+ boot_add_hd(op->drive_g, desc, prio);
return 0;
}
diff --git a/src/usb-ohci.c b/src/usb-ohci.c
index 7e91b9f..86eba0d 100644
--- a/src/usb-ohci.c
+++ b/src/usb-ohci.c
@@ -211,6 +211,7 @@ ohci_init(u16 bdf, int busid)
struct usb_ohci_s *cntl = malloc_tmphigh(sizeof(*cntl));
memset(cntl, 0, sizeof(*cntl));
cntl->usb.busid = busid;
+ cntl->usb.bdf = bdf;
cntl->usb.type = USB_TYPE_OHCI;
u32 baseaddr = pci_config_readl(bdf, PCI_BASE_ADDRESS_0);
diff --git a/src/usb-uhci.c b/src/usb-uhci.c
index 6549808..40f83bb 100644
--- a/src/usb-uhci.c
+++ b/src/usb-uhci.c
@@ -186,6 +186,7 @@ uhci_init(u16 bdf, int busid)
struct usb_uhci_s *cntl = malloc_tmphigh(sizeof(*cntl));
memset(cntl, 0, sizeof(*cntl));
cntl->usb.busid = busid;
+ cntl->usb.bdf = bdf;
cntl->usb.type = USB_TYPE_UHCI;
cntl->iobase = (pci_config_readl(bdf, PCI_BASE_ADDRESS_4)
& PCI_BASE_ADDRESS_IO_MASK);
diff --git a/src/usb.c b/src/usb.c
index aa8d72c..a07bc1f 100644
--- a/src/usb.c
+++ b/src/usb.c
@@ -259,6 +259,7 @@ usb_set_address(struct usbhub_s *hub, int port, int speed)
dummy.cntl = cntl;
dummy.type = cntl->type;
dummy.maxpacket = 8;
+ dummy.path = (u64)-1;
cntl->defaultpipe = defpipe = alloc_default_control_pipe(&dummy);
if (!defpipe)
return NULL;
@@ -294,6 +295,9 @@ usb_set_address(struct usbhub_s *hub, int port, int speed)
defpipe->devaddr = cntl->maxaddr;
struct usb_pipe *pipe = alloc_default_control_pipe(defpipe);
defpipe->devaddr = 0;
+ if (hub->pipe)
+ pipe->path = hub->pipe->path;
+ pipe->path = (pipe->path << 8) | port;
return pipe;
}
diff --git a/src/usb.h b/src/usb.h
index f28a3a7..966e94b 100644
--- a/src/usb.h
+++ b/src/usb.h
@@ -7,6 +7,7 @@
// Information on a USB end point.
struct usb_pipe {
struct usb_s *cntl;
+ u64 path;
u8 type;
u8 ep;
u8 devaddr;
@@ -21,6 +22,7 @@ struct usb_s {
struct usb_pipe *defaultpipe;
struct mutex_s resetlock;
int busid;
+ u16 bdf;
u8 type;
u8 maxaddr;
};
8 years, 6 months
[PATCH] Use bootprio_find_named_rom() for ramdisk and cbfs payload priorities.
by Kevin O'Connor
---
src/coreboot.c | 2 +-
src/ramdisk.c | 9 +++++----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/coreboot.c b/src/coreboot.c
index b4dfd8a..c9ee082 100644
--- a/src/coreboot.c
+++ b/src/coreboot.c
@@ -605,7 +605,7 @@ register_cbfs_payload(void)
break;
const char *filename = cbfs_filename(file);
char *desc = znprintf(MAXDESCSIZE, "Payload [%s]", &filename[4]);
- boot_add_cbfs(file, desc, -1);
+ boot_add_cbfs(file, desc, bootprio_find_named_rom(filename, 0));
}
}
diff --git a/src/ramdisk.c b/src/ramdisk.c
index 5391376..bae30e2 100644
--- a/src/ramdisk.c
+++ b/src/ramdisk.c
@@ -21,8 +21,9 @@ ramdisk_setup(void)
struct cbfs_file *file = cbfs_findprefix("floppyimg/", NULL);
if (!file)
return;
+ const char *filename = cbfs_filename(file);
u32 size = cbfs_datasize(file);
- dprintf(3, "Found floppy file %s of size %d\n", cbfs_filename(file), size);
+ dprintf(3, "Found floppy file %s of size %d\n", filename, size);
int ftype = find_floppy_type(size);
if (ftype < 0) {
dprintf(3, "No floppy type found for ramdisk size\n");
@@ -45,9 +46,9 @@ ramdisk_setup(void)
if (!drive_g)
return;
drive_g->type = DTYPE_RAMDISK;
- dprintf(1, "Mapping CBFS floppy %s to addr %p\n", cbfs_filename(file), pos);
- char *desc = znprintf(MAXDESCSIZE, "Ramdisk [%s]", cbfs_filename(file));
- boot_add_floppy(drive_g, desc, -1);
+ dprintf(1, "Mapping CBFS floppy %s to addr %p\n", filename, pos);
+ char *desc = znprintf(MAXDESCSIZE, "Ramdisk [%s]", &filename[10]);
+ boot_add_floppy(drive_g, desc, bootprio_find_named_rom(filename, 0));
}
static int
--
1.7.3.4
8 years, 6 months
Re: [SeaBIOS] [PATCH 3/9] Don't access drive_g->desc from boot_cdrom().
by Kevin O'Connor
On Wed, Dec 29, 2010 at 12:47:14PM -0500, Kevin O'Connor wrote:
> The drive description is allocated with malloc_tmp() and is thus only
> available during the POST phase - boot_cdrom() is called during the
> boot phase.
Odd - two patches got merged into one here.
-Kevin
8 years, 6 months
[PATCH] fix inline build warning
by Lin Ming
# make
Working around non-functional -combine
Compiling whole program out/ccode.16.s
In file included from out/ccode.16.s.tmp.c:5:
out/../src/util.h:204: warning: ‘memcpy_fl’ declared inline after being called
out/../src/util.h:204: warning: previous declaration of ‘memcpy_fl’ was here
Compiling (16bit) out/code16.o
Compiling whole program out/ccode32flat.o
In file included from out/ccode32flat.o.tmp.c:5:
out/../src/util.h:204: warning: ‘memcpy_fl’ declared inline after being called
out/../src/util.h:204: warning: previous declaration of ‘memcpy_fl’ was here
Compiling whole program out/code32seg.o
This patch fix above warnings.
Signed-off-by: Lin Ming <ming.m.lin(a)intel.com>
---
src/util.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/util.h b/src/util.h
index f5b9446..cadebdb 100644
--- a/src/util.h
+++ b/src/util.h
@@ -201,7 +201,7 @@ void *memset(void *s, int c, size_t n);
void memset_fl(void *ptr, u8 val, size_t size);
inline void memcpy_far(u16 d_seg, void *d_far
, u16 s_seg, const void *s_far, size_t len);
-void memcpy_fl(void *d_fl, const void *s_fl, size_t len);
+inline void memcpy_fl(void *d_fl, const void *s_fl, size_t len);
void *memcpy(void *d1, const void *s1, size_t len);
#if MODESEGMENT == 0
#define memcpy __builtin_memcpy
8 years, 6 months
[PATCH 1/2] Record boot priority for each BAID/BCV/BEV.
by Gleb Natapov
For each BAID/BCV/BEV lookup its boot priority in boot order file. If
there is no entry for a device there assign it the lowest boot priority.
Signed-off-by: Gleb Natapov <gleb(a)redhat.com>
---
src/ahci.c | 4 ++--
src/ata.c | 13 ++++++++++---
src/boot.c | 47 +++++++++++++++++++++++++++++++++++------------
src/boot.h | 16 ++++++++++------
src/coreboot.c | 2 +-
src/floppy.c | 8 +++++++-
src/optionroms.c | 18 +++++++++++++++---
src/usb-msc.c | 4 ++--
src/virtio-blk.c | 2 +-
9 files changed, 83 insertions(+), 31 deletions(-)
diff --git a/src/ahci.c b/src/ahci.c
index 03e39ad..a7f458f 100644
--- a/src/ahci.c
+++ b/src/ahci.c
@@ -382,7 +382,7 @@ ahci_port_init(struct ahci_ctrl_s *ctrl, u32 pnr)
// Setup disk geometry translation.
setup_translation(&port->drive);
// Register with bcv system.
- boot_add_hd(&port->drive);
+ boot_add_hd(&port->drive, -1);
} else {
// found cdrom (atapi)
port->drive.blksize = CDROM_SECTOR_SIZE;
@@ -397,7 +397,7 @@ ahci_port_init(struct ahci_ctrl_s *ctrl, u32 pnr)
// fill cdidmap
if (iscd)
- boot_add_cd(&port->drive);
+ boot_add_cd(&port->drive, -1);
}
dprintf(1, "%s\n", port->drive.desc);
diff --git a/src/ata.c b/src/ata.c
index e01f842..872c5e3 100644
--- a/src/ata.c
+++ b/src/ata.c
@@ -783,8 +783,12 @@ init_drive_atapi(struct atadrive_s *dummy, u16 *buffer)
dprintf(1, "%s\n", adrive_g->drive.desc);
// fill cdidmap
- if (iscd)
- boot_add_cd(&adrive_g->drive);
+ if (iscd) {
+ int prio = bootprio_find_ata_device(adrive_g->chan_gf->pci_bdf,
+ adrive_g->chan_gf->chanid,
+ adrive_g->slave);
+ boot_add_cd(&adrive_g->drive, prio);
+ }
return adrive_g;
}
@@ -833,8 +837,11 @@ init_drive_ata(struct atadrive_s *dummy, u16 *buffer)
// Setup disk geometry translation.
setup_translation(&adrive_g->drive);
+ int prio = bootprio_find_ata_device(adrive_g->chan_gf->pci_bdf,
+ adrive_g->chan_gf->chanid,
+ adrive_g->slave);
// Register with bcv system.
- boot_add_hd(&adrive_g->drive);
+ boot_add_hd(&adrive_g->drive, prio);
return adrive_g;
}
diff --git a/src/boot.c b/src/boot.c
index 73ac5c8..e43d1a5 100644
--- a/src/boot.c
+++ b/src/boot.c
@@ -152,51 +152,54 @@ bootentry_add(int type, int prio, u32 data, const char *desc)
*pprev = be;
}
+#define P(P, DP) (((P) == -1) ? (DP) : (P))
+
// Add a BEV vector for a given pnp compatible option rom.
void
-boot_add_bev(u16 seg, u16 bev, u16 desc)
+boot_add_bev(u16 seg, u16 bev, u16 desc, int prio)
{
- bootentry_add(IPL_TYPE_BEV, DefaultBEVPrio, SEGOFF(seg, bev).segoff
+ bootentry_add(IPL_TYPE_BEV, P(prio, DefaultBEVPrio), SEGOFF(seg, bev).segoff
, desc ? MAKE_FLATPTR(seg, desc) : "Unknown");
DefaultBEVPrio = DEFAULT_PRIO;
}
// Add a bcv entry for an expansion card harddrive or legacy option rom
void
-boot_add_bcv(u16 seg, u16 ip, u16 desc)
+boot_add_bcv(u16 seg, u16 ip, u16 desc, int prio)
{
- bootentry_add(IPL_TYPE_BCV, DEFAULT_PRIO, SEGOFF(seg, ip).segoff
+ bootentry_add(IPL_TYPE_BCV, P(prio, DEFAULT_PRIO), SEGOFF(seg, ip).segoff
, desc ? MAKE_FLATPTR(seg, desc) : "Legacy option rom");
}
void
-boot_add_floppy(struct drive_s *drive_g)
+boot_add_floppy(struct drive_s *drive_g, int prio)
{
- bootentry_add(IPL_TYPE_FLOPPY, DefaultFloppyPrio, (u32)drive_g
+ bootentry_add(IPL_TYPE_FLOPPY, P(prio, DefaultFloppyPrio), (u32)drive_g
, drive_g->desc);
}
void
-boot_add_hd(struct drive_s *drive_g)
+boot_add_hd(struct drive_s *drive_g, int prio)
{
- bootentry_add(IPL_TYPE_HARDDISK, DefaultHDPrio, (u32)drive_g
+ bootentry_add(IPL_TYPE_HARDDISK, P(prio, DefaultHDPrio), (u32)drive_g
, drive_g->desc);
}
void
-boot_add_cd(struct drive_s *drive_g)
+boot_add_cd(struct drive_s *drive_g, int prio)
{
- bootentry_add(IPL_TYPE_CDROM, DefaultCDPrio, (u32)drive_g
+ bootentry_add(IPL_TYPE_CDROM, P(prio, DefaultCDPrio), (u32)drive_g
, drive_g->desc);
}
// Add a CBFS payload entry
void
-boot_add_cbfs(void *data, const char *desc)
+boot_add_cbfs(void *data, const char *desc, int prio)
{
- bootentry_add(IPL_TYPE_CBFS, DEFAULT_PRIO, (u32)data, desc);
+ bootentry_add(IPL_TYPE_CBFS, P(prio, DEFAULT_PRIO), (u32)data, desc);
}
+#undef P
/****************************************************************
* Boot menu and BCV execution
@@ -489,3 +492,23 @@ handle_19(void)
SET_EBDA(boot_sequence, 0);
do_boot(0);
}
+
+int bootprio_find_pci_device(int bdf)
+{
+ return -1;
+}
+
+int bootprio_find_ata_device(int bdf, int chanid, int slave)
+{
+ return -1;
+}
+
+int bootprio_find_fdc_device(int bfd, int port, int fdid)
+{
+ return -1;
+}
+
+int bootprio_find_named_rom(const char *name)
+{
+ return -1;
+}
diff --git a/src/boot.h b/src/boot.h
index f1a428e..dd3cc49 100644
--- a/src/boot.h
+++ b/src/boot.h
@@ -35,14 +35,18 @@ struct ipl_s {
// boot.c
extern struct ipl_s IPL;
void boot_setup(void);
-void boot_add_bev(u16 seg, u16 bev, u16 desc);
-void boot_add_bcv(u16 seg, u16 ip, u16 desc);
+void boot_add_bev(u16 seg, u16 bev, u16 desc, int prio);
+void boot_add_bcv(u16 seg, u16 ip, u16 desc, int prio);
struct drive_s;
-void boot_add_floppy(struct drive_s *drive_g);
-void boot_add_hd(struct drive_s *drive_g);
-void boot_add_cd(struct drive_s *drive_g);
-void boot_add_cbfs(void *data, const char *desc);
+void boot_add_floppy(struct drive_s *drive_g, int prio);
+void boot_add_hd(struct drive_s *drive_g, int prio);
+void boot_add_cd(struct drive_s *drive_g, int prio);
+void boot_add_cbfs(void *data, const char *desc, int prio);
void boot_prep(void);
+int bootprio_find_pci_device(int bdf);
+int bootprio_find_ata_device(int bdf, int chanid, int slave);
+int bootprio_find_fdc_device(int bfd, int port, int fdid);
+int bootprio_find_named_rom(const char *name);
#endif // __BOOT_H
diff --git a/src/coreboot.c b/src/coreboot.c
index dab0a54..503a6d2 100644
--- a/src/coreboot.c
+++ b/src/coreboot.c
@@ -608,7 +608,7 @@ register_cbfs_payload(void)
if (!desc)
break;
snprintf(desc, MAXDESCSIZE, "Payload [%s]", &filename[4]);
- boot_add_cbfs(file, desc);
+ boot_add_cbfs(file, desc, -1);
}
}
diff --git a/src/floppy.c b/src/floppy.c
index 8986e39..c59b2fe 100644
--- a/src/floppy.c
+++ b/src/floppy.c
@@ -14,6 +14,9 @@
#include "pic.h" // eoi_pic1
#include "bregs.h" // struct bregs
#include "boot.h" // boot_add_floppy
+#include "pci.h" // pci_to_bdf
+#include "pci_ids.h" // PCI_CLASS_BRIDGE_ISA
+
#define FLOPPY_SIZE_CODE 0x02 // 512 byte sectors
#define FLOPPY_DATALEN 0xff // Not used - because size code is 0x02
@@ -117,7 +120,10 @@ addFloppy(int floppyid, int ftype, int driver)
memcpy(&drive_g->lchs, &FloppyInfo[ftype].chs
, sizeof(FloppyInfo[ftype].chs));
- boot_add_floppy(drive_g);
+ int bdf = pci_find_class(PCI_CLASS_BRIDGE_ISA); /* isa-to-pci bridge */
+ int prio = bootprio_find_fdc_device(bdf, 0x3f0, floppyid);
+
+ boot_add_floppy(drive_g, prio);
return drive_g;
}
diff --git a/src/optionroms.c b/src/optionroms.c
index 2ac4325..87e645f 100644
--- a/src/optionroms.c
+++ b/src/optionroms.c
@@ -220,6 +220,16 @@ setRomSource(u64 *sources, struct rom_header *rom, u64 source)
sources[((u32)rom - BUILD_ROM_START) / OPTION_ROM_ALIGN] = source;
}
+static int
+getRomPriority(u64 *sources, struct rom_header *rom)
+{
+ u64 source = sources[((u32)rom - BUILD_ROM_START) / OPTION_ROM_ALIGN];
+ if (!source)
+ return -1;
+ if (source & RS_PCIROM)
+ return bootprio_find_pci_device(source);
+ return bootprio_find_named_rom(romfile_name(source));
+}
/****************************************************************
* Roms in CBFS
@@ -408,21 +418,23 @@ optionrom_setup(void)
pos += OPTION_ROM_ALIGN;
continue;
}
+ int prio = getRomPriority(sources, rom);
pos += ALIGN(rom->size * 512, OPTION_ROM_ALIGN);
struct pnp_data *pnp = get_pnp_rom(rom);
if (! pnp) {
// Legacy rom.
- boot_add_bcv(FLATPTR_TO_SEG(rom), OPTION_ROM_INITVECTOR, 0);
+ boot_add_bcv(FLATPTR_TO_SEG(rom), OPTION_ROM_INITVECTOR, 0, prio);
continue;
}
// PnP rom.
if (pnp->bev)
// Can boot system - add to IPL list.
- boot_add_bev(FLATPTR_TO_SEG(rom), pnp->bev, pnp->productname);
+ boot_add_bev(FLATPTR_TO_SEG(rom), pnp->bev, pnp->productname, prio);
else
// Check for BCV (there may be multiple).
while (pnp && pnp->bcv) {
- boot_add_bcv(FLATPTR_TO_SEG(rom), pnp->bcv, pnp->productname);
+ boot_add_bcv(FLATPTR_TO_SEG(rom), pnp->bcv, pnp->productname,
+ prio);
pnp = get_pnp_next(rom, pnp);
}
}
diff --git a/src/usb-msc.c b/src/usb-msc.c
index 378143e..2a6c31a 100644
--- a/src/usb-msc.c
+++ b/src/usb-msc.c
@@ -143,7 +143,7 @@ setup_drive_cdrom(struct disk_op_s *op)
{
op->drive_g->blksize = CDROM_SECTOR_SIZE;
op->drive_g->sectors = (u64)-1;
- boot_add_cd(op->drive_g);
+ boot_add_cd(op->drive_g, -1);
return 0;
}
@@ -171,7 +171,7 @@ setup_drive_hd(struct disk_op_s *op)
setup_translation(op->drive_g);
// Register with bcv system.
- boot_add_hd(op->drive_g);
+ boot_add_hd(op->drive_g, -1);
return 0;
}
diff --git a/src/virtio-blk.c b/src/virtio-blk.c
index def8313..834523a 100644
--- a/src/virtio-blk.c
+++ b/src/virtio-blk.c
@@ -156,7 +156,7 @@ init_virtio_blk(u16 bdf)
vdrive_g->drive.desc = desc;
setup_translation(&vdrive_g->drive);
- boot_add_hd(&vdrive_g->drive);
+ boot_add_hd(&vdrive_g->drive, bootprio_find_pci_device(bdf));
vp_set_status(ioaddr, VIRTIO_CONFIG_S_ACKNOWLEDGE |
VIRTIO_CONFIG_S_DRIVER | VIRTIO_CONFIG_S_DRIVER_OK);
--
1.7.2.3
8 years, 6 months