SeaBIOS December 2010

seabios@seabios.org

14 participants
34 discussions

parseObjDump fails when a relocation record points to a section

by Olivier Galibert

Hi, Current git fails to compile for me with: Building ld scripts (version "pre-0.6.2-20101219_191912-tata") Traceback (most recent call last): File "./tools/layoutrom.py", line 573, in <module> main() File "./tools/layoutrom.py", line 554, in main info16 = parseObjDump(infile16, '16') File "./tools/layoutrom.py", line 538, in parseObjDump reloc.symbol = symbols[symbolname] KeyError: '.rodata.__func__.2140' make: *** [out/romlayout16.lds] Error 1 The interesting parts of the associated objdump are: Sections: Idx Name Size VMA LMA File off Algn [...] 110 .rodata.__func__.2140 0000000a 00000000 00000000 000304fc 2**2 CONTENTS, ALLOC, LOAD, READONLY, DATA [...] SYMBOL TABLE: [...] 00000000 l O .rodata.__func__.2140 0000000a __func__.2140 [...] 00000000 l d .rodata.__func__.2140 00000000 [...] RELOCATION RECORDS FOR [.debug_info]: OFFSET TYPE VALUE [...] 0001419f R_386_32 .rodata.__func__.2140 [...] So the relocation record points to the section and not a symbol, and the script dies. What can I do? Best, OG. PS: binutils-2.20.1 GNU objdump 2.15.92.0.2 20040927 gcc version 4.4.3 (Gentoo 4.4.3-r2 p1.2) (on x86_64)

10 years, 3 months

[PATCH] provide full edd info for virtio disk

by Gleb Natapov

Signed-off-by: Gleb Natapov <gleb(a)redhat.com> diff --git a/src/disk.c b/src/disk.c index 242c742..56c369a 100644 --- a/src/disk.c +++ b/src/disk.c @@ -544,64 +544,78 @@ disk_1348(struct bregs *regs, struct drive_s *drive_g) } SET_INT13DPT(regs, blksize, blksize); - if (size < 30 || (type != DTYPE_ATA && type != DTYPE_ATAPI)) { + if (size < 30 || + (type != DTYPE_ATA && type != DTYPE_ATAPI && type != DTYPE_VIRTIO)) { disk_ret(regs, DISK_RET_SUCCESS); return; } // EDD 2.x - u16 ebda_seg = get_ebda_seg(); + int bdf; + u16 iobase1; + u64 device_path; SET_INT13DPT(regs, size, 30); + if (type == DTYPE_ATA || type == DTYPE_ATAPI) { + u16 ebda_seg = get_ebda_seg(); - SET_INT13DPT(regs, dpte_segment, ebda_seg); - SET_INT13DPT(regs, dpte_offset - , offsetof(struct extended_bios_data_area_s, dpte)); - - // Fill in dpte - struct atadrive_s *adrive_g = container_of( - drive_g, struct atadrive_s, drive); - struct ata_channel_s *chan_gf = GET_GLOBAL(adrive_g->chan_gf); - u8 slave = GET_GLOBAL(adrive_g->slave); - u16 iobase1 = GET_GLOBALFLAT(chan_gf->iobase1); - u16 iobase2 = GET_GLOBALFLAT(chan_gf->iobase2); - u8 irq = GET_GLOBALFLAT(chan_gf->irq); - - u16 options = 0; - if (type == DTYPE_ATA) { - u8 translation = GET_GLOBAL(drive_g->translation); - if (translation != TRANSLATION_NONE) { - options |= 1<<3; // CHS translation - if (translation == TRANSLATION_LBA) - options |= 1<<9; - if (translation == TRANSLATION_RECHS) - options |= 3<<9; + SET_INT13DPT(regs, dpte_segment, ebda_seg); + SET_INT13DPT(regs, dpte_offset + , offsetof(struct extended_bios_data_area_s, dpte)); + + // Fill in dpte + struct atadrive_s *adrive_g = container_of( + drive_g, struct atadrive_s, drive); + struct ata_channel_s *chan_gf = GET_GLOBAL(adrive_g->chan_gf); + u8 slave = GET_GLOBAL(adrive_g->slave); + u16 iobase2 = GET_GLOBALFLAT(chan_gf->iobase2); + u8 irq = GET_GLOBALFLAT(chan_gf->irq); + iobase1 = GET_GLOBALFLAT(chan_gf->iobase1); + bdf = GET_GLOBALFLAT(chan_gf->pci_bdf); + device_path = slave; + + u16 options = 0; + if (type == DTYPE_ATA) { + u8 translation = GET_GLOBAL(drive_g->translation); + if (translation != TRANSLATION_NONE) { + options |= 1<<3; // CHS translation + if (translation == TRANSLATION_LBA) + options |= 1<<9; + if (translation == TRANSLATION_RECHS) + options |= 3<<9; + } + } else { + // ATAPI + options |= 1<<5; // removable device + options |= 1<<6; // atapi device } + options |= 1<<4; // lba translation + if (CONFIG_ATA_PIO32) + options |= 1<<7; + + SET_EBDA2(ebda_seg, dpte.iobase1, iobase1); + SET_EBDA2(ebda_seg, dpte.iobase2, iobase2 + ATA_CB_DC); + SET_EBDA2(ebda_seg, dpte.prefix, ((slave ? ATA_CB_DH_DEV1 : ATA_CB_DH_DEV0) + | ATA_CB_DH_LBA)); + SET_EBDA2(ebda_seg, dpte.unused, 0xcb); + SET_EBDA2(ebda_seg, dpte.irq, irq); + SET_EBDA2(ebda_seg, dpte.blkcount, 1); + SET_EBDA2(ebda_seg, dpte.dma, 0); + SET_EBDA2(ebda_seg, dpte.pio, 0); + SET_EBDA2(ebda_seg, dpte.options, options); + SET_EBDA2(ebda_seg, dpte.reserved, 0); + SET_EBDA2(ebda_seg, dpte.revision, 0x11); + + u8 sum = checksum_far( + ebda_seg, (void*)offsetof(struct extended_bios_data_area_s, dpte), 15); + SET_EBDA2(ebda_seg, dpte.checksum, -sum); } else { - // ATAPI - options |= 1<<5; // removable device - options |= 1<<6; // atapi device + SET_INT13DPT(regs, dpte_segment, 0); + SET_INT13DPT(regs, dpte_offset, 0); + bdf = GET_GLOBAL(drive_g->cntl_id); + device_path = 0; + iobase1 = 0; } - options |= 1<<4; // lba translation - if (CONFIG_ATA_PIO32) - options |= 1<<7; - - SET_EBDA2(ebda_seg, dpte.iobase1, iobase1); - SET_EBDA2(ebda_seg, dpte.iobase2, iobase2 + ATA_CB_DC); - SET_EBDA2(ebda_seg, dpte.prefix, ((slave ? ATA_CB_DH_DEV1 : ATA_CB_DH_DEV0) - | ATA_CB_DH_LBA)); - SET_EBDA2(ebda_seg, dpte.unused, 0xcb); - SET_EBDA2(ebda_seg, dpte.irq, irq); - SET_EBDA2(ebda_seg, dpte.blkcount, 1); - SET_EBDA2(ebda_seg, dpte.dma, 0); - SET_EBDA2(ebda_seg, dpte.pio, 0); - SET_EBDA2(ebda_seg, dpte.options, options); - SET_EBDA2(ebda_seg, dpte.reserved, 0); - SET_EBDA2(ebda_seg, dpte.revision, 0x11); - - u8 sum = checksum_far( - ebda_seg, (void*)offsetof(struct extended_bios_data_area_s, dpte), 15); - SET_EBDA2(ebda_seg, dpte.checksum, -sum); if (size < 66) { disk_ret(regs, DISK_RET_SUCCESS); @@ -614,7 +628,6 @@ disk_1348(struct bregs *regs, struct drive_s *drive_g) SET_INT13DPT(regs, reserved1, 0); SET_INT13DPT(regs, reserved2, 0); - int bdf = GET_GLOBALFLAT(chan_gf->pci_bdf); if (bdf != -1) { SET_INT13DPT(regs, host_bus[0], 'P'); SET_INT13DPT(regs, host_bus[1], 'C'); @@ -634,16 +647,23 @@ disk_1348(struct bregs *regs, struct drive_s *drive_g) SET_INT13DPT(regs, iface_path, iobase1); } - SET_INT13DPT(regs, iface_type[0], 'A'); - SET_INT13DPT(regs, iface_type[1], 'T'); - SET_INT13DPT(regs, iface_type[2], 'A'); - SET_INT13DPT(regs, iface_type[3], 0); + if (type != DTYPE_VIRTIO) { + SET_INT13DPT(regs, iface_type[0], 'A'); + SET_INT13DPT(regs, iface_type[1], 'T'); + SET_INT13DPT(regs, iface_type[2], 'A'); + SET_INT13DPT(regs, iface_type[3], 0); + } else { + SET_INT13DPT(regs, iface_type[0], 'S'); + SET_INT13DPT(regs, iface_type[1], 'C'); + SET_INT13DPT(regs, iface_type[2], 'S'); + SET_INT13DPT(regs, iface_type[3], 'I'); + } SET_INT13DPT(regs, iface_type[4], 0); SET_INT13DPT(regs, iface_type[5], 0); SET_INT13DPT(regs, iface_type[6], 0); SET_INT13DPT(regs, iface_type[7], 0); - SET_INT13DPT(regs, device_path, slave); + SET_INT13DPT(regs, device_path, device_path); SET_INT13DPT(regs, checksum , -checksum_far(regs->ds, (void*)(regs->si+30), 35)); -- Gleb.

10 years, 4 months

[PATCH] Add BAID for ahci cdrom.

by Gleb Natapov

Signed-off-by: Gleb Natapov <gleb(a)redhat.com> diff --git a/src/ahci.c b/src/ahci.c index e2b2dbf..70c0f1c 100644 --- a/src/ahci.c +++ b/src/ahci.c @@ -395,8 +395,10 @@ ahci_port_init(struct ahci_ctrl_s *ctrl, u32 pnr) , (iscd ? "DVD/CD" : "Device")); // fill cdidmap - if (iscd) + if (iscd) { map_cd_drive(&port->drive); + add_baid_cdrom(&port->drive); + } } dprintf(1, "%s\n", port->drive.desc); -- Gleb.

10 years, 4 months

How to add user-defined interrupt to SeaBIOS?

by Andreas H.

Hi, as part of a small exercise project for university I have to add a custom software interrupt to the bios code which is then used by some later booting stages. I already had a close look to the sourcefiles and although I don't understand many of the stuff (I can read and understand the individual parts but don't get the real big picture) I have some anchorpoints which I think are necessary to complete my work. I'd really appreciate if someone had a quick look on those points and just confirmed or denied (maybe with other hints) them :) 1.) the IVT is set up in "post.c", to add my interrupt, I have to add a line "SET_IVT(0x60, FUNC16(entry_60));" to init_ivt() 2.) romlayout.S contains the declarations for the IRQ handler, I have to add a "DECL_IRQ_ENTRY_ARG 60" to the section "irqentryarg:" 3.) in my own .c-file I have to add a function "void VISIBLE16 handle_60(struct bregs *regs)" which receives the IRQ 4.) in this custom function I receive the set parameters from the caller in the register-structure and also set my return values in this 5.) usable registers for arguments/return values are AX, BX, CX, DX, DS, etc. I'd need DS:DX (analog to DOS) for passing a memory address and CS:CX for a buffer size. 6.) the IRQ handler has to end with "set_success(regs);" or "set_invalid(regs);" to return success/failure in CF (or should I use AX for this and just call set_success?) One last question: I chose IRQ 60 because it's stated as "user defined" in "post.c". Should I use another one to not run into issues with later stages of OS booting or will it just get overwritten at some point? Thanks in advance, Kosi

10 years, 4 months

[PATCH v2 0/4] ahci: a bunch of small fixes.

by Gerd Hoffmann

Hi, Here is a bunch of small fixes for the ahci driver which accumulated over the last week. [ v2: use pci_config_maskw, one patch updated ] cheers, Gerd Gerd Hoffmann (4): ahci: set dma feature flag ahci: enable io/mem/dma ahci: fix off-by-one in port count ahci: set controller id src/ahci.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-)

10 years, 4 months

[PATCHv2] Create separate IPL entry for each CD/DVD

by Gleb Natapov

Current code creates only one IPL entry of type IPL_TYPE_CDROM even if there are more then one CDROM drive present. If CDROM that the entry refers to is not bootable there is no way to retry boot from another CDROM. Fix this by creating IPL entry for each CDROM drive found. First CDROM will always be placed in IPL entry 3 for backwards compatibility. Signed-off-by: Gleb Natapov <gleb(a)redhat.com> diff --git a/src/ata.c b/src/ata.c index 7079bf2..bdec225 100644 --- a/src/ata.c +++ b/src/ata.c @@ -779,8 +779,10 @@ init_drive_atapi(struct atadrive_s *dummy, u16 *buffer) dprintf(1, "%s\n", adrive_g->drive.desc); // fill cdidmap - if (iscd) + if (iscd) { map_cd_drive(&adrive_g->drive); + add_baid_cdrom(&adrive_g->drive); + } return adrive_g; } diff --git a/src/block.c b/src/block.c index 818c9f9..cab503c 100644 --- a/src/block.c +++ b/src/block.c @@ -27,6 +27,16 @@ getDrive(u8 exttype, u8 extdriveoffset) return GLOBALFLAT2GLOBAL(drive_gf); } +int getDriveId(u8 exttype, struct drive_s *drive_g) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(Drives.idmap[0]); i++) + if (getDrive(exttype, i) == drive_g) + return i; + + return -1; +} /**************************************************************** * Disk geometry translation diff --git a/src/boot.c b/src/boot.c index 021b8ac..9c94439 100644 --- a/src/boot.c +++ b/src/boot.c @@ -87,6 +87,25 @@ add_bev(u16 seg, u16 bev, u16 desc) ie->description = d; } +// Add a IPL entry for BAID cdrom. +void +add_baid_cdrom(struct drive_s *drive_g) +{ + if (! CONFIG_CDROM_BOOT) + return; + + /* put first cdrom into ipl 3 for compatability with qemu */ + struct ipl_entry_s *ie = &IPL.bev[2]; + if (IPL.bevcount >= ARRAY_SIZE(IPL.bev) && ie->vector) + return; + + if (ie->vector) + ie = &IPL.bev[IPL.bevcount++]; + ie->type = IPL_TYPE_CDROM; + ie->vector = (u32)drive_g; + ie->description = "DVD/CD"; +} + // Add a bcv entry for an expansion card harddrive or legacy option rom void add_bcv(u16 seg, u16 ip, u16 desc) @@ -188,12 +207,11 @@ menu_show_harddisk(struct ipl_entry_s *ie, int menupos) static int menu_show_cdrom(struct ipl_entry_s *ie, int menupos) { - int i; - for (i = 0; i < Drives.cdcount; i++) { - struct drive_s *drive_g = getDrive(EXTTYPE_CD, i); - printf("%d. DVD/CD [%s]\n", menupos + i, drive_g->desc); - } - return Drives.cdcount; + struct drive_s *drive_g = (void*)ie->vector; + if (!ie->vector) + return 0; + printf("%d. DVD/CD [%s]\n", menupos, drive_g->desc); + return 1; } // Show coreboot-fs menu item. @@ -399,9 +417,14 @@ boot_cdrom(struct ipl_entry_s *ie) { if (! CONFIG_CDROM_BOOT) return; - int status = cdrom_boot(ie->subchoice); + + if (!ie->vector) + return; + + struct drive_s *drive_g = (void*)ie->vector; + int status = cdrom_boot(drive_g); if (status) { - printf("Boot failed: Could not read from CDROM (code %04x)\n", status); + printf("Boot failed: Could not read from CDROM %s (code %04x)\n", drive_g->desc, status); return; } diff --git a/src/boot.h b/src/boot.h index db046e3..f751d71 100644 --- a/src/boot.h +++ b/src/boot.h @@ -43,6 +43,8 @@ void add_bev(u16 seg, u16 bev, u16 desc); void add_bcv(u16 seg, u16 ip, u16 desc); struct drive_s; void add_bcv_internal(struct drive_s *drive_g); +void add_baid_cdrom(struct drive_s *drive_g); + void boot_prep(void); #endif // __BOOT_H diff --git a/src/cdrom.c b/src/cdrom.c index 349e401..31ceaaa 100644 --- a/src/cdrom.c +++ b/src/cdrom.c @@ -241,12 +241,13 @@ atapi_is_ready(struct disk_op_s *op) } int -cdrom_boot(int cdid) +cdrom_boot(struct drive_s *drive_g) { struct disk_op_s dop; + int cdid = getDriveId(EXTTYPE_CD, drive_g); memset(&dop, 0, sizeof(dop)); - dop.drive_g = getDrive(EXTTYPE_CD, cdid); - if (!dop.drive_g) + dop.drive_g = drive_g; + if (!dop.drive_g || cdid < 0) return 1; int ret = atapi_is_ready(&dop); diff --git a/src/disk.h b/src/disk.h index c1ba6ae..a598bb4 100644 --- a/src/disk.h +++ b/src/disk.h @@ -229,6 +229,7 @@ struct drives_s { // block.c extern struct drives_s Drives; struct drive_s *getDrive(u8 exttype, u8 extdriveoffset); +int getDriveId(u8 exttype, struct drive_s *drive_g); void setup_translation(struct drive_s *drive_g); void map_floppy_drive(struct drive_s *drive_g); void map_hd_drive(struct drive_s *drive_g); @@ -249,7 +250,7 @@ extern struct drive_s *cdemu_drive_gf; int process_cdemu_op(struct disk_op_s *op); void cdemu_setup(void); void cdemu_134b(struct bregs *regs); -int cdrom_boot(int cdid); +int cdrom_boot(struct drive_s *drive_g); // ramdisk.c void ramdisk_setup(void); -- Gleb.

10 years, 4 months

[PATCH 0/4] ahci: a bunch of small fixes.

by Gerd Hoffmann

Hi, Here is a bunch of small fixes for the ahci driver which accumulated over the last week. cheers, Gerd Gerd Hoffmann (4): ahci: set dma feature flag ahci: enable io/mem/dma ahci: fix off-by-one in port count ahci: set controller id src/ahci.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-)

10 years, 4 months

Re: [SeaBIOS] [PATCH 1/2] Don't pass return address to transition(32, 16, 16big) on stack.

by H. Peter Anvin

First of all, sorry for the very late reply, however, I thought I really ought to offer my perspective on this: On 11/25/2010 06:24 AM, Kevin O'Connor wrote: > It's difficult to have a uniform view of the stack when transition > modes, so pass the return address in a register. As a result, the > transition functions only access memory via the %cs selector now. I think this assertion is rather unfortunate, because my own experience with thunking is that it is actually a very useful thing to have access to the real-mode stack. This is simply accomplished by computing a 32-bit register containing the value (ss << 4) + sp, for example: movzwl %sp, %eax movl %ss, %ecx shrl $4, %ecx addl %ecx, %eax This is particularly handy if there is a push/pop of the 16-bit register set in the entry/exit sequence. Furthermore, pushing the target address onto the stack rather than stuffing it into a register allows a 32-bit routine to have full access to the 16-bit register image, whereas burning a register means that that register is going to have to be handled differently. In Syslinux I have this formalized so that the sequence: pushl $func32 callw _pm_call ... turns into the C function call: void func32(com32sys_t *regs) ... where com32sys_t is a structure which contains the 16-bit register image: typedef struct { uint16_t gs; /* Offset 0 */ uint16_t fs; /* Offset 2 */ uint16_t es; /* Offset 4 */ uint16_t ds; /* Offset 6 */ reg32_t edi; /* Offset 8 */ reg32_t esi; /* Offset 12 */ reg32_t ebp; /* Offset 16 */ reg32_t _unused_esp; /* Offset 20 */ reg32_t ebx; /* Offset 24 */ reg32_t edx; /* Offset 28 */ reg32_t ecx; /* Offset 32 */ reg32_t eax; /* Offset 36 */ reg32_t eflags; /* Offset 40 */ } com32sys_t; This is simply the image created on the stack by the sequence (in NASM syntax): _pm_call: pushfd pushad push ds push es push fs push gs This has been shown to be amazingly versatile, especially since the 16-bit register image can be not just observed but written directly. One can implement this either with or without a stack switch (to do so without a stack switch, the protected-mode ESP is computed from SS:SP). However, since real-mode stacks tend to be very small -- often only a few hundred bytes -- it is probably a bad idea. In Syslinux this is actually implemeted in form of a lower-level function which does indeed take an address in a register, so the two approaches are not mutually exclusive. The actual full implementation of the _pm_call routine looks like (note: this code assumes CS = 0). ; ; _pm_call: call PM routine in low memory from RM ; ; on stack = PM routine to call (a 32-bit address) ; ; ECX, ESI, EDI passed to the called function; ; EAX = EBP in the called function points to the stack frame ; which includes all registers (which can be changed if desired.) ; ; All registers and the flags saved/restored ; ; This routine is invoked by the pm_call macro. ; _pm_call: pushfd pushad push ds push es push fs push gs mov bp,sp mov ax,cs mov ebx,.pm mov ds,ax jmp enter_pm bits 32 section .textnr .pm: ; EAX points to the top of the RM stack, which is EFLAGS test RM_FLAGSH,02h ; RM EFLAGS.IF jz .no_sti sti .no_sti: call [ebp+4*2+9*4+2] ; Entrypoint on RM stack mov bx,.rm jmp enter_rm bits 16 section .text16 .rm: pop gs pop fs pop es pop ds popad popfd ret 4 ; Drop entrypoint The entire file including the enter_pm/enter_rm functions can be seen at: http://tinyurl.com/2cjvt4a -hpa

10 years, 4 months

[PATCH] create separate IPL entry for each CD/DVD

by Gleb Natapov

Current code creates only one IPL entry of type IPL_TYPE_CDROM even if there are more then one CDROM drive present. If CDROM that the entry refers to is not bootable there is no way to retry boot from another CDROM. Fix this by creating IPL entry for each CDROM drive found. First CDROM will always be placed in IPL entry 3 for backwards compatibility. Signed-off-by: Gleb Natapov <gleb(a)redhat.com> diff --git a/src/ata.c b/src/ata.c index 7079bf2..bdec225 100644 --- a/src/ata.c +++ b/src/ata.c @@ -779,8 +779,10 @@ init_drive_atapi(struct atadrive_s *dummy, u16 *buffer) dprintf(1, "%s\n", adrive_g->drive.desc); // fill cdidmap - if (iscd) + if (iscd) { map_cd_drive(&adrive_g->drive); + add_baid_cdrom(&adrive_g->drive); + } return adrive_g; } diff --git a/src/block.c b/src/block.c index 818c9f9..cab503c 100644 --- a/src/block.c +++ b/src/block.c @@ -27,6 +27,16 @@ getDrive(u8 exttype, u8 extdriveoffset) return GLOBALFLAT2GLOBAL(drive_gf); } +int getDriveId(u8 exttype, struct drive_s *drive_g) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(Drives.idmap[0]); i++) + if (getDrive(exttype, i) == drive_g) + return i; + + return -1; +} /**************************************************************** * Disk geometry translation diff --git a/src/boot.c b/src/boot.c index 021b8ac..5e3919f 100644 --- a/src/boot.c +++ b/src/boot.c @@ -87,6 +87,25 @@ add_bev(u16 seg, u16 bev, u16 desc) ie->description = d; } +// Add a IPL entry for BAID cdrom. +void +add_baid_cdrom(struct drive_s *drive_g) +{ + if (! CONFIG_CDROM_BOOT) + return; + + /* put first cdrom into ipl 3 for compatability with qemu */ + struct ipl_entry_s *ie = &IPL.bev[2]; + if (IPL.bevcount >= ARRAY_SIZE(IPL.bev) && ie->vector) + return; + + if (ie->vector) + ie = &IPL.bev[IPL.bevcount++]; + ie->type = IPL_TYPE_CDROM; + ie->vector = (u32)drive_g; + ie->description = "DVD/CD"; +} + // Add a bcv entry for an expansion card harddrive or legacy option rom void add_bcv(u16 seg, u16 ip, u16 desc) @@ -188,12 +207,11 @@ menu_show_harddisk(struct ipl_entry_s *ie, int menupos) static int menu_show_cdrom(struct ipl_entry_s *ie, int menupos) { - int i; - for (i = 0; i < Drives.cdcount; i++) { - struct drive_s *drive_g = getDrive(EXTTYPE_CD, i); - printf("%d. DVD/CD [%s]\n", menupos + i, drive_g->desc); - } - return Drives.cdcount; + struct drive_s *drive_g = (void*)ie->vector; + if (!ie->vector) + return 0; + printf("%d. DVD/CD [%s]\n", menupos, drive_g->desc); + return 1; } // Show coreboot-fs menu item. @@ -399,9 +417,14 @@ boot_cdrom(struct ipl_entry_s *ie) { if (! CONFIG_CDROM_BOOT) return; - int status = cdrom_boot(ie->subchoice); + + if (!ie->vector) + return; + + struct drive_s *drive_g = GLOBALFLAT2GLOBAL((void*)ie->vector); + int status = cdrom_boot(drive_g); if (status) { - printf("Boot failed: Could not read from CDROM (code %04x)\n", status); + printf("Boot failed: Could not read from CDROM %s (code %04x)\n", drive_g->desc, status); return; } diff --git a/src/boot.h b/src/boot.h index db046e3..f751d71 100644 --- a/src/boot.h +++ b/src/boot.h @@ -43,6 +43,8 @@ void add_bev(u16 seg, u16 bev, u16 desc); void add_bcv(u16 seg, u16 ip, u16 desc); struct drive_s; void add_bcv_internal(struct drive_s *drive_g); +void add_baid_cdrom(struct drive_s *drive_g); + void boot_prep(void); #endif // __BOOT_H diff --git a/src/cdrom.c b/src/cdrom.c index 349e401..31ceaaa 100644 --- a/src/cdrom.c +++ b/src/cdrom.c @@ -241,12 +241,13 @@ atapi_is_ready(struct disk_op_s *op) } int -cdrom_boot(int cdid) +cdrom_boot(struct drive_s *drive_g) { struct disk_op_s dop; + int cdid = getDriveId(EXTTYPE_CD, drive_g); memset(&dop, 0, sizeof(dop)); - dop.drive_g = getDrive(EXTTYPE_CD, cdid); - if (!dop.drive_g) + dop.drive_g = drive_g; + if (!dop.drive_g || cdid < 0) return 1; int ret = atapi_is_ready(&dop); diff --git a/src/disk.h b/src/disk.h index c1ba6ae..a598bb4 100644 --- a/src/disk.h +++ b/src/disk.h @@ -229,6 +229,7 @@ struct drives_s { // block.c extern struct drives_s Drives; struct drive_s *getDrive(u8 exttype, u8 extdriveoffset); +int getDriveId(u8 exttype, struct drive_s *drive_g); void setup_translation(struct drive_s *drive_g); void map_floppy_drive(struct drive_s *drive_g); void map_hd_drive(struct drive_s *drive_g); @@ -249,7 +250,7 @@ extern struct drive_s *cdemu_drive_gf; int process_cdemu_op(struct disk_op_s *op); void cdemu_setup(void); void cdemu_134b(struct bregs *regs); -int cdrom_boot(int cdid); +int cdrom_boot(struct drive_s *drive_g); // ramdisk.c void ramdisk_setup(void); -- Gleb.

10 years, 4 months

Re: [SeaBIOS] [Qemu-devel] [Patch] Small fix for qemu APIC for Mac OS X support

by Isaku Yamahata

On Thu, Nov 25, 2010 at 08:18:45PM +0000, adq wrote: > On 25 November 2010 11:28, Isaku Yamahata <yamahata(a)valinux.co.jp> wrote: > > On Wed, Nov 24, 2010 at 02:08:16PM +0000, adq wrote: > >> > Interesting. I was also thinking that maybe we can leverage overriding mechanisms that are already available. Maybe it's possible to squeeze the HPET node into an SSDT. Maybe we need to override the whole DSDT from the command line. > >> > >> We'll definitely need to override the DSDT for the applesmc device. I > >> was thinking something along the lines of an additional DSDT binary > >> supplied with QEMU for use when emulating apple hardware as you > >> suggest. > > > > The patches for qemu and seabios have been floating around. > > I wrote them for Q35 chipset support, but no one has gotten interested in it. > > But now, you are there. I'm willing to rebase/resend them. > > I'd definitely be interested to see those! Here is seabios part. >From 7a6e97b74bc0d25aca42a43cabcc68836edaf6c0 Mon Sep 17 00:00:00 2001 Message-Id: <7a6e97b74bc0d25aca42a43cabcc68836edaf6c0.1290774988.git.yamahata(a)valinux.co.jp> In-Reply-To: <cover.1290774988.git.yamahata(a)valinux.co.jp> References: <cover.1290774988.git.yamahata(a)valinux.co.jp> From: Isaku Yamahata <yamahata(a)valinux.co.jp> Date: Tue, 15 Jun 2010 12:41:13 +0900 Subject: [PATCH 1/1] seabios: acpi: allow qemu to load dsdt as external acpi table. allow qemu to load dsdt as external acpi table. Signed-off-by: Isaku Yamahata <yamahata(a)valinux.co.jp> --- changes v1 -> v2. - load qemu table first and they try default dsdt table if qemu doesn't supply dsdt. Thus unnecessary malloc_high()/free() is avoided. --- src/acpi.c | 44 ++++++++++++++++++++++++++++++++++++-------- 1 files changed, 36 insertions(+), 8 deletions(-) diff --git a/src/acpi.c b/src/acpi.c index 18830dc..f4e0780 100644 --- a/src/acpi.c +++ b/src/acpi.c @@ -54,6 +54,11 @@ struct facs_descriptor_rev1 /* + * Differentiated System Descrition Table (DSDT) + */ +#define DSDT_SIGNATURE 0x54445344 // DSDT + +/* * MADT values and structures */ @@ -221,14 +226,20 @@ static const struct pci_device_id fadt_init_tbl[] = { PCI_DEVICE_END }; +static void fill_dsdt(struct fadt_descriptor_rev1 *fadt, void *dsdt) +{ + fadt->dsdt = cpu_to_le32((u32)dsdt); + fadt->checksum -= checksum(fadt, sizeof(*fadt)); + dprintf(1, "ACPI DSDT=%p\n", dsdt); +} + static void* build_fadt(int bdf) { struct fadt_descriptor_rev1 *fadt = malloc_high(sizeof(*fadt)); struct facs_descriptor_rev1 *facs = memalign_high(64, sizeof(*facs)); - void *dsdt = malloc_high(sizeof(AmlCode)); - if (!fadt || !facs || !dsdt) { + if (!fadt || !facs) { warn_noalloc(); return NULL; } @@ -238,13 +249,11 @@ build_fadt(int bdf) facs->signature = FACS_SIGNATURE; facs->length = cpu_to_le32(sizeof(*facs)); - /* DSDT */ - memcpy(dsdt, AmlCode, sizeof(AmlCode)); - /* FADT */ memset(fadt, 0, sizeof(*fadt)); fadt->firmware_ctrl = cpu_to_le32((u32)facs); - fadt->dsdt = cpu_to_le32((u32)dsdt); + fadt->dsdt = 0; /* dsdt will be filled later in acpi_bios_init() + by fill_dsdt() */ fadt->model = 1; fadt->reserved1 = 0; int pm_sci_int = pci_config_readb(bdf, PCI_INTERRUPT_LINE); @@ -620,7 +629,8 @@ acpi_bios_init(void) } while(0) // Add tables - ACPI_INIT_TABLE(build_fadt(bdf)); + struct fadt_descriptor_rev1 *fadt = build_fadt(bdf); + ACPI_INIT_TABLE(fadt); ACPI_INIT_TABLE(build_ssdt()); ACPI_INIT_TABLE(build_madt()); ACPI_INIT_TABLE(build_hpet()); @@ -635,12 +645,30 @@ acpi_bios_init(void) warn_noalloc(); continue; } - ACPI_INIT_TABLE(qemu_cfg_next_acpi_table_load(addr, len)); + struct acpi_table_header *header = + qemu_cfg_next_acpi_table_load(addr, len); + if (header->signature == DSDT_SIGNATURE) { + if (fadt) { + fill_dsdt(fadt, addr); + } + } else { + ACPI_INIT_TABLE(header); + } if (tbl_idx == MAX_ACPI_TABLES) { warn_noalloc(); break; } } + if (fadt && !fadt->dsdt) { + /* default DSDT */ + void *dsdt = malloc_high(sizeof(AmlCode)); + if (!dsdt) { + warn_noalloc(); + return; + } + memcpy(dsdt, AmlCode, sizeof(AmlCode)); + fill_dsdt(fadt, dsdt); + } struct rsdt_descriptor_rev1 *rsdt; size_t rsdt_len = sizeof(*rsdt) + sizeof(u32) * tbl_idx; -- 1.7.1.1 -- yamahata

10 years, 4 months

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS December 2010