SeaBIOS

seabios@seabios.org

4 participants
3801 discussions

[PATCH] Don't enable thread preemption during S3 resume vga option rom execution.
by Kevin O'Connor 31 May '14

31 May '14

Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- src/stacks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stacks.c b/src/stacks.c index 6bcb319..beccc0f 100644 --- a/src/stacks.c +++ b/src/stacks.c @@ -287,7 +287,7 @@ thread_init(void) int threads_during_optionroms(void) { - return CONFIG_THREADS && ThreadControl == 2; + return CONFIG_THREADS && ThreadControl == 2 && in_post(); } // Switch to next thread stack. -- 1.9.3

1 0

[PATCH] smp: Replace QEMU SMP init assembler code with C; run only in 32bit mode.
by Kevin O'Connor 31 May '14

31 May '14

Change the multi-processor init code to trampoline into 32bit mode on each of the additional processors. Implement an atomic lock so that each processor performs its initialization serially. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- Makefile | 3 +- src/config.h | 1 + src/fw/smp.c | 101 ++++++++++++++++++++++++++++---------------------------- src/romlayout.S | 23 +++++++++++++ src/util.h | 1 - 5 files changed, 75 insertions(+), 54 deletions(-) diff --git a/Makefile b/Makefile index 78b598e..fb4e683 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,6 @@ LD32BIT_FLAG:=-melf_i386 # Source files SRCBOTH=misc.c stacks.c output.c string.c x86.c block.c cdrom.c mouse.c kbd.c \ serial.c clock.c resume.c pnpbios.c vgahooks.c pcibios.c apm.c \ - fw/smp.c \ hw/pci.c hw/timer.c hw/rtc.c hw/dma.c hw/pic.c hw/ps2port.c hw/serialio.c \ hw/usb.c hw/usb-uhci.c hw/usb-ohci.c hw/usb-ehci.c \ hw/usb-hid.c hw/usb-msc.c hw/usb-uas.c \ @@ -41,7 +40,7 @@ SRC32FLAT=$(SRCBOTH) post.c memmap.c malloc.c pmm.c romfile.c optionroms.c \ boot.c bootsplash.c jpeg.c bmp.c \ hw/ahci.c hw/pvscsi.c hw/usb-xhci.c hw/usb-hub.c \ fw/coreboot.c fw/lzmadecode.c fw/csm.c fw/biostables.c \ - fw/paravirt.c fw/shadow.c fw/pciinit.c fw/smm.c fw/mtrr.c fw/xen.c \ + fw/paravirt.c fw/shadow.c fw/pciinit.c fw/smm.c fw/smp.c fw/mtrr.c fw/xen.c \ fw/acpi.c fw/mptable.c fw/pirtable.c fw/smbios.c fw/romfile_loader.c SRC32SEG=string.c output.c pcibios.c apm.c stacks.c hw/pci.c hw/serialio.c DIRS=src src/hw src/fw vgasrc diff --git a/src/config.h b/src/config.h index 6f1a5b9..6da067d 100644 --- a/src/config.h +++ b/src/config.h @@ -95,6 +95,7 @@ #define DEBUG_ISR_hwpic1 5 #define DEBUG_ISR_hwpic2 5 #define DEBUG_HDL_smi 9 +#define DEBUG_HDL_smp 1 #define DEBUG_HDL_pnp 1 #define DEBUG_HDL_pmm 1 #define DEBUG_HDL_pcibios 9 diff --git a/src/fw/smp.c b/src/fw/smp.c index 38fe383..c8b48b6 100644 --- a/src/fw/smp.c +++ b/src/fw/smp.c @@ -1,4 +1,4 @@ -// CPU count detection +// QEMU multi-CPU initialization code // // Copyright (C) 2008 Kevin O'Connor <kevin(a)koconnor.net> // Copyright (C) 2006 Fabrice Bellard @@ -20,8 +20,8 @@ #define APIC_ENABLED 0x0100 -struct { u32 ecx, eax, edx; } smp_mtrr[32] VARFSEG; -u32 smp_mtrr_count VARFSEG; +static struct { u32 index; u64 val; } smp_mtrr[32]; +static u32 smp_mtrr_count; void wrmsr_smp(u32 index, u64 val) @@ -31,52 +31,36 @@ wrmsr_smp(u32 index, u64 val) warn_noalloc(); return; } - smp_mtrr[smp_mtrr_count].ecx = index; - smp_mtrr[smp_mtrr_count].eax = val; - smp_mtrr[smp_mtrr_count].edx = val >> 32; + smp_mtrr[smp_mtrr_count].index = index; + smp_mtrr[smp_mtrr_count].val = val; smp_mtrr_count++; } -u32 CountCPUs VARFSEG; u32 MaxCountCPUs; +static u32 CountCPUs; +u32 SMPLock __VISIBLE; +u32 SMPStack __VISIBLE; // 256 bits for the found APIC IDs -u32 FoundAPICIDs[256/32] VARFSEG; -extern void smp_ap_boot_code(void); -ASM16( - " .global smp_ap_boot_code\n" - "smp_ap_boot_code:\n" +static u32 FoundAPICIDs[256/32]; - // Setup data segment - " movw $" __stringify(SEG_BIOS) ", %ax\n" - " movw %ax, %ds\n" +void VISIBLE32FLAT +handle_smp(void) +{ + dprintf(DEBUG_HDL_smp, "handle_smp\n"); // MTRR setup - " movl $smp_mtrr, %esi\n" - " movl smp_mtrr_count, %ebx\n" - "1:testl %ebx, %ebx\n" - " jz 2f\n" - " movl 0(%esi), %ecx\n" - " movl 4(%esi), %eax\n" - " movl 8(%esi), %edx\n" - " wrmsr\n" - " addl $12, %esi\n" - " decl %ebx\n" - " jmp 1b\n" - "2:\n" - - // get apic ID on EBX, set bit on FoundAPICIDs - " movl $1, %eax\n" - " cpuid\n" - " shrl $24, %ebx\n" - " lock btsl %ebx, FoundAPICIDs\n" - - // Increment the cpu counter - " lock incl CountCPUs\n" - - // Halt the processor. - "1:hlt\n" - " jmp 1b\n" - ); + int i; + for (i=0; i<smp_mtrr_count; i++) + wrmsr(smp_mtrr[i].index, smp_mtrr[i].val); + + // Set bit on FoundAPICIDs + u32 eax, ebx, ecx, cpuid_features; + cpuid(1, &eax, &ebx, &ecx, &cpuid_features); + u8 apic_id = ebx>>24; + FoundAPICIDs[apic_id/32] |= (1 << (apic_id % 32)); + + CountCPUs++; +} int apic_id_is_present(u8 apic_id) { @@ -104,15 +88,14 @@ smp_setup(void) // mark the BSP initial APIC ID as found, too: u8 apic_id = ebx>>24; FoundAPICIDs[apic_id/32] |= (1 << (apic_id % 32)); - - // Init the counter. - writel(&CountCPUs, 1); + CountCPUs = 1; // Setup jump trampoline to counter code. u64 old = *(u64*)BUILD_AP_BOOT_ADDR; - // ljmpw $SEG_BIOS, $(smp_ap_boot_code - BUILD_BIOS_ADDR) + // ljmpw $SEG_BIOS, $(entry_smp - BUILD_BIOS_ADDR) + extern void entry_smp(void); u64 new = (0xea | ((u64)SEG_BIOS<<24) - | (((u32)smp_ap_boot_code - BUILD_BIOS_ADDR) << 8)); + | (((u32)entry_smp - BUILD_BIOS_ADDR) << 8)); *(u64*)BUILD_AP_BOOT_ADDR = new; // enable local APIC @@ -125,6 +108,9 @@ smp_setup(void) /* Set LINT1 as NMI, level triggered */ writel(APIC_LINT1, 0x8400); + // Init the lock. + writel(&SMPLock, 1); + // broadcast SIPI barrier(); writel(APIC_ICR_LOW, 0x000C4500); @@ -132,9 +118,22 @@ smp_setup(void) writel(APIC_ICR_LOW, 0x000C4600 | sipi_vector); // Wait for other CPUs to process the SIPI. - u8 cmos_smp_count = rtc_read(CMOS_BIOS_SMP_COUNT); - while (cmos_smp_count + 1 != readl(&CountCPUs)) - yield(); + u8 cmos_smp_count = rtc_read(CMOS_BIOS_SMP_COUNT) + 1; + u32 lockval = 1; + while (cmos_smp_count != CountCPUs) + asm volatile( + // Store %esp value and unlock. + " movl %%esp, %1\n" + " movl $0, %0\n" + // Reacquire lock. + "1:rep ; nop\n" + " xorl %2, %2\n" + " lock cmpxchgl %3, %0\n" + " jnz 1b\n" + : "+m" (SMPLock), "+m" (SMPStack), "=&a" (eax) + : "r" (lockval) + : "cc", "memory"); + yield(); // Restore memory. *(u64*)BUILD_AP_BOOT_ADDR = old; @@ -143,6 +142,6 @@ smp_setup(void) if (!MaxCountCPUs || MaxCountCPUs < CountCPUs) MaxCountCPUs = CountCPUs; - dprintf(1, "Found %d cpu(s) max supported %d cpu(s)\n", readl(&CountCPUs), - MaxCountCPUs); + dprintf(1, "Found %d cpu(s) max supported %d cpu(s)\n", CountCPUs, + MaxCountCPUs); } diff --git a/src/romlayout.S b/src/romlayout.S index 0d6af39..bee3943 100644 --- a/src/romlayout.S +++ b/src/romlayout.S @@ -274,6 +274,29 @@ entry_smi: rsm .code16gcc +// Entry point for QEMU smp sipi interrupts. + DECLFUNC entry_smp +entry_smp: + // Transition to 32bit mode. + movl $1f + BUILD_BIOS_ADDR, %edx + jmp transition32 + .code32 + // Acquire lock +1: movl $1, %ecx +2: xorl %eax, %eax + lock cmpxchgl %ecx, SMPLock + jz 3f + rep nop + jmp 2b + // Setup stack and call handle_smp +3: movl SMPStack, %esp + calll _cfunc32flat_handle_smp - BUILD_BIOS_ADDR + // Release lock and halt processor. + movl $0, SMPLock +4: hlt + jmp 4b + .code16gcc + // Resume (and reboot) entry point - called from entry_post DECLFUNC entry_resume entry_resume: diff --git a/src/util.h b/src/util.h index b54271b..8c794c4 100644 --- a/src/util.h +++ b/src/util.h @@ -126,7 +126,6 @@ void smm_device_setup(void); void smm_setup(void); // fw/smp.c -extern u32 CountCPUs; extern u32 MaxCountCPUs; void wrmsr_smp(u32 index, u64 val); void smp_setup(void); -- 1.9.3

1 0

[PATCH 0/5] Convert SMM handler to C
by Kevin O'Connor 31 May '14

31 May '14

This series converts the SMM handler to C. It is based on top of Paolo's SMM patch series, which I've included here as reference. -Kevin Kevin O'Connor (2): smm: Replace SMI assembler code with C code. smm: Use a C struct to define the layout of the SMM area. Paolo Bonzini (3): piix: add and use dev-piix.h smm: complete SMM setup smm: unify SMM handlers src/config.h | 6 +-- src/fw/acpi.c | 18 +++---- src/fw/dev-piix.h | 29 +++++++++++ src/fw/dev-q35.h | 3 ++ src/fw/pciinit.c | 13 ++--- src/fw/shadow.c | 3 +- src/fw/smm.c | 141 +++++++++++++++++++++++++++++++++--------------------- src/romlayout.S | 22 +++++++-- 8 files changed, 154 insertions(+), 81 deletions(-) create mode 100644 src/fw/dev-piix.h -- 1.9.3

2 5

[PATCH 2/2] Move cdemu call interface and disk_ret helper code to disk.c.
by Kevin O'Connor 31 May '14

31 May '14

Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- src/block.c | 31 ------------------------------- src/block.h | 10 ---------- src/cdrom.c | 17 ----------------- src/disk.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++- src/util.h | 1 - 5 files changed, 52 insertions(+), 60 deletions(-) diff --git a/src/block.c b/src/block.c index aff263c..7892be5 100644 --- a/src/block.c +++ b/src/block.c @@ -7,7 +7,6 @@ #include "biosvar.h" // GET_GLOBAL #include "block.h" // process_op -#include "bregs.h" // struct bregs #include "hw/ata.h" // process_ata_op #include "hw/ahci.h" // process_ahci_op #include "hw/blockcmd.h" // cdb_* @@ -280,36 +279,6 @@ map_floppy_drive(struct drive_s *drive) /**************************************************************** - * Return status functions - ****************************************************************/ - -void -__disk_ret(struct bregs *regs, u32 linecode, const char *fname) -{ - u8 code = linecode; - if (regs->dl < EXTSTART_HD) - SET_BDA(floppy_last_status, code); - else - SET_BDA(disk_last_status, code); - if (code) - __set_code_invalid(regs, linecode, fname); - else - set_code_success(regs); -} - -void -__disk_ret_unimplemented(struct bregs *regs, u32 linecode, const char *fname) -{ - u8 code = linecode; - if (regs->dl < EXTSTART_HD) - SET_BDA(floppy_last_status, code); - else - SET_BDA(disk_last_status, code); - __set_code_unimplemented(regs, linecode, fname); -} - - -/**************************************************************** * Extended Disk Drive (EDD) get drive parameters ****************************************************************/ diff --git a/src/block.h b/src/block.h index 945e6fe..aa01ed7 100644 --- a/src/block.h +++ b/src/block.h @@ -99,20 +99,10 @@ int getDriveId(u8 exttype, struct drive_s *drive); void map_floppy_drive(struct drive_s *drive); void map_hd_drive(struct drive_s *drive); void map_cd_drive(struct drive_s *drive); -struct bregs; -void __disk_ret(struct bregs *regs, u32 linecode, const char *fname); -void __disk_ret_unimplemented(struct bregs *regs, u32 linecode - , const char *fname); struct int13dpt_s; int fill_edd(u16 seg, struct int13dpt_s *param_far, struct drive_s *drive_gf); int process_op(struct disk_op_s *op); int send_disk_op(struct disk_op_s *op); int create_bounce_buf(void); -// Helper function for setting up a return code. -#define disk_ret(regs, code) \ - __disk_ret((regs), (code) | (__LINE__ << 8), __func__) -#define disk_ret_unimplemented(regs, code) \ - __disk_ret_unimplemented((regs), (code) | (__LINE__ << 8), __func__) - #endif // block.h diff --git a/src/cdrom.c b/src/cdrom.c index f0d8a1a..86e3f0c 100644 --- a/src/cdrom.c +++ b/src/cdrom.c @@ -132,23 +132,6 @@ cdrom_prepboot(void) drive->sectors = (u64)-1; } -// ElTorito - Terminate disk emu -void -cdemu_134b(struct bregs *regs) -{ - memcpy_far(regs->ds, (void*)(regs->si+0), SEG_LOW, &CDEmu, sizeof(CDEmu)); - - // If we have to terminate emulation - if (regs->al == 0x00) { - // FIXME ElTorito Various. Should be handled accordingly to spec - SET_LOW(CDEmu.media, 0x00); // bye bye - - // XXX - update floppy/hd count. - } - - disk_ret(regs, DISK_RET_SUCCESS); -} - /**************************************************************** * CD booting diff --git a/src/disk.c b/src/disk.c index 635d7b9..2aadd8a 100644 --- a/src/disk.c +++ b/src/disk.c @@ -18,19 +18,53 @@ /**************************************************************** - * Helper functions + * Return status functions ****************************************************************/ static void +__disk_ret(struct bregs *regs, u32 linecode, const char *fname) +{ + u8 code = linecode; + if (regs->dl < EXTSTART_HD) + SET_BDA(floppy_last_status, code); + else + SET_BDA(disk_last_status, code); + if (code) + __set_code_invalid(regs, linecode, fname); + else + set_code_success(regs); +} + +static void +__disk_ret_unimplemented(struct bregs *regs, u32 linecode, const char *fname) +{ + u8 code = linecode; + if (regs->dl < EXTSTART_HD) + SET_BDA(floppy_last_status, code); + else + SET_BDA(disk_last_status, code); + __set_code_unimplemented(regs, linecode, fname); +} + +static void __disk_stub(struct bregs *regs, int lineno, const char *fname) { __warn_unimplemented(regs, lineno, fname); __disk_ret(regs, DISK_RET_SUCCESS | (lineno << 8), fname); } +#define disk_ret(regs, code) \ + __disk_ret((regs), (code) | (__LINE__ << 8), __func__) +#define disk_ret_unimplemented(regs, code) \ + __disk_ret_unimplemented((regs), (code) | (__LINE__ << 8), __func__) #define DISK_STUB(regs) \ __disk_stub((regs), __LINE__, __func__) + +/**************************************************************** + * Helper functions + ****************************************************************/ + // Get the cylinders/heads/sectors for the given drive. static struct chs_s getLCHS(struct drive_s *drive_gf) @@ -608,6 +642,23 @@ floppy_13(struct bregs *regs, struct drive_s *drive_gf) } } +// ElTorito - Terminate disk emu +static void +cdemu_134b(struct bregs *regs) +{ + memcpy_far(regs->ds, (void*)(regs->si+0), SEG_LOW, &CDEmu, sizeof(CDEmu)); + + // If we have to terminate emulation + if (regs->al == 0x00) { + // FIXME ElTorito Various. Should be handled accordingly to spec + SET_LOW(CDEmu.media, 0x00); // bye bye + + // XXX - update floppy/hd count. + } + + disk_ret(regs, DISK_RET_SUCCESS); +} + /**************************************************************** * Entry points diff --git a/src/util.h b/src/util.h index 74b58f4..493d01d 100644 --- a/src/util.h +++ b/src/util.h @@ -49,7 +49,6 @@ extern struct drive_s *cdemu_drive_gf; struct disk_op_s; int process_cdemu_op(struct disk_op_s *op); void cdrom_prepboot(void); -void cdemu_134b(struct bregs *regs); int cdrom_boot(struct drive_s *drive_g); // clock.c -- 1.9.3

1 0

[PATCH 1/2] cdemu: store internal cdemu fields in standard "el-torito" spec format.
by Kevin O'Connor 31 May '14

31 May '14

Store the fields necessary to export the "el-torito" spec information directly in an internal copy of the "el-torito" struct. This simplifies the interface and obviates the need for an internal home grown struct with the same info. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- src/block.h | 15 ------------ src/boot.c | 2 +- src/cdrom.c | 72 ++++++++++++++++++++-------------------------------------- src/disk.c | 15 ++++++------ src/std/disk.h | 8 +++---- src/util.h | 2 +- 6 files changed, 38 insertions(+), 76 deletions(-) diff --git a/src/block.h b/src/block.h index c870e13..945e6fe 100644 --- a/src/block.h +++ b/src/block.h @@ -36,21 +36,6 @@ struct chs_s { u16 pad; }; -// ElTorito Device Emulation data -struct cdemu_s { - struct drive_s *emulated_drive_gf; - u32 ilba; - u16 buffer_segment; - u16 load_segment; - u16 sector_count; - u8 active; - u8 media; - u8 emulated_extdrive; - - // Virtual device - struct chs_s lchs; -}; - struct drive_s { u8 type; // Driver type (DTYPE_*) u8 floppy_type; // Type of floppy (only for floppy drives). diff --git a/src/boot.c b/src/boot.c index 133e206..9be8b2a 100644 --- a/src/boot.c +++ b/src/boot.c @@ -643,7 +643,7 @@ boot_cdrom(struct drive_s *drive_g) return; } - u8 bootdrv = CDEmu.emulated_extdrive; + u8 bootdrv = CDEmu.emulated_drive; u16 bootseg = CDEmu.load_segment; /* Canonicalize bootseg:bootip */ u16 bootip = (bootseg & 0x0fff) << 4; diff --git a/src/cdrom.c b/src/cdrom.c index ff419c0..f0d8a1a 100644 --- a/src/cdrom.c +++ b/src/cdrom.c @@ -24,13 +24,14 @@ u8 CDRom_locks[BUILD_MAX_EXTDRIVE] VARLOW; * CD emulation ****************************************************************/ -struct cdemu_s CDEmu VARLOW; +struct eltorito_s CDEmu VARLOW = { .size=sizeof(CDEmu) }; +struct drive_s *emulated_drive_gf VARLOW; struct drive_s *cdemu_drive_gf VARFSEG; static int cdemu_read(struct disk_op_s *op) { - struct drive_s *drive_gf = GET_LOW(CDEmu.emulated_drive_gf); + struct drive_s *drive_gf = GET_LOW(emulated_drive_gf); struct disk_op_s dop; dop.drive_gf = drive_gf; dop.command = op->command; @@ -131,35 +132,16 @@ cdrom_prepboot(void) drive->sectors = (u64)-1; } -#define SET_INT13ET(regs,var,val) \ - SET_FARVAR((regs)->ds, ((struct eltorito_s*)((regs)->si+0))->var, (val)) - // ElTorito - Terminate disk emu void cdemu_134b(struct bregs *regs) { - // FIXME ElTorito Hardcoded - SET_INT13ET(regs, size, 0x13); - SET_INT13ET(regs, media, GET_LOW(CDEmu.media)); - SET_INT13ET(regs, emulated_drive, GET_LOW(CDEmu.emulated_extdrive)); - struct drive_s *drive_gf = GET_LOW(CDEmu.emulated_drive_gf); - u8 cntl_id = 0; - if (drive_gf) - cntl_id = GET_GLOBALFLAT(drive_gf->cntl_id); - SET_INT13ET(regs, controller_index, cntl_id / 2); - SET_INT13ET(regs, device_spec, cntl_id % 2); - SET_INT13ET(regs, ilba, GET_LOW(CDEmu.ilba)); - SET_INT13ET(regs, buffer_segment, GET_LOW(CDEmu.buffer_segment)); - SET_INT13ET(regs, load_segment, GET_LOW(CDEmu.load_segment)); - SET_INT13ET(regs, sector_count, GET_LOW(CDEmu.sector_count)); - SET_INT13ET(regs, cylinders, GET_LOW(CDEmu.lchs.cylinder)); - SET_INT13ET(regs, sectors, GET_LOW(CDEmu.lchs.sector)); - SET_INT13ET(regs, heads, GET_LOW(CDEmu.lchs.head)); + memcpy_far(regs->ds, (void*)(regs->si+0), SEG_LOW, &CDEmu, sizeof(CDEmu)); // If we have to terminate emulation if (regs->al == 0x00) { // FIXME ElTorito Various. Should be handled accordingly to spec - SET_LOW(CDEmu.active, 0x00); // bye bye + SET_LOW(CDEmu.media, 0x00); // bye bye // XXX - update floppy/hd count. } @@ -226,10 +208,9 @@ cdrom_boot(struct drive_s *drive) if (buffer[0x20] != 0x88) return 11; // Bootable + // Fill in el-torito cdrom emulation fields. + emulated_drive_gf = drive; u8 media = buffer[0x21]; - CDEmu.media = media; - - CDEmu.emulated_drive_gf = dop.drive_gf; u16 boot_segment = *(u16*)&buffer[0x22]; if (!boot_segment) @@ -243,6 +224,9 @@ cdrom_boot(struct drive_s *drive) lba = *(u32*)&buffer[0x28]; CDEmu.ilba = lba; + CDEmu.controller_index = drive->cntl_id / 2; + CDEmu.device_spec = drive->cntl_id % 2; + // And we read the image in memory dop.lba = lba; dop.count = DIV_ROUND_UP(nbsectors, 4); @@ -253,7 +237,7 @@ cdrom_boot(struct drive_s *drive) if (media == 0) { // No emulation requested - return success. - CDEmu.emulated_extdrive = EXTSTART_CD + cdid; + CDEmu.emulated_drive = EXTSTART_CD + cdid; return 0; } @@ -265,45 +249,39 @@ cdrom_boot(struct drive_s *drive) // number of devices if (media < 4) { // Floppy emulation - CDEmu.emulated_extdrive = 0x00; + CDEmu.emulated_drive = 0x00; // XXX - get and set actual floppy count. set_equipment_flags(0x41, 0x41); switch (media) { case 0x01: // 1.2M floppy - CDEmu.lchs.sector = 15; - CDEmu.lchs.cylinder = 80; - CDEmu.lchs.head = 2; + CDEmu.chs.sptcyl = 15; + CDEmu.chs.cyllow = 79; + CDEmu.chs.heads = 1; break; case 0x02: // 1.44M floppy - CDEmu.lchs.sector = 18; - CDEmu.lchs.cylinder = 80; - CDEmu.lchs.head = 2; + CDEmu.chs.sptcyl = 18; + CDEmu.chs.cyllow = 79; + CDEmu.chs.heads = 1; break; case 0x03: // 2.88M floppy - CDEmu.lchs.sector = 36; - CDEmu.lchs.cylinder = 80; - CDEmu.lchs.head = 2; + CDEmu.chs.sptcyl = 36; + CDEmu.chs.cyllow = 79; + CDEmu.chs.heads = 1; break; } } else { // Harddrive emulation - CDEmu.emulated_extdrive = 0x80; + CDEmu.emulated_drive = 0x80; SET_BDA(hdcount, GET_BDA(hdcount) + 1); // Peak at partition table to get chs. - struct mbr_s *mbr = (void*)0; - u8 sptcyl = GET_FARVAR(boot_segment, mbr->partitions[0].last.sptcyl); - u8 cyllow = GET_FARVAR(boot_segment, mbr->partitions[0].last.cyllow); - u8 heads = GET_FARVAR(boot_segment, mbr->partitions[0].last.heads); - - CDEmu.lchs.sector = sptcyl & 0x3f; - CDEmu.lchs.cylinder = ((sptcyl<<2)&0x300) + cyllow + 1; - CDEmu.lchs.head = heads + 1; + struct mbr_s *mbr = MAKE_FLATPTR(boot_segment, 0); + CDEmu.chs = mbr->partitions[0].last; } // everything is ok, so from now on, the emulation is active - CDEmu.active = 0x01; + CDEmu.media = media; dprintf(6, "cdemu media=%d\n", media); return 0; diff --git a/src/disk.c b/src/disk.c index 7e42103..635d7b9 100644 --- a/src/disk.c +++ b/src/disk.c @@ -41,9 +41,10 @@ getLCHS(struct drive_s *drive_gf) // populate the geometry directly in the driveid because the // geometry is only known after the bios segment is made // read-only). - res.cylinder = GET_LOW(CDEmu.lchs.cylinder); - res.head = GET_LOW(CDEmu.lchs.head); - res.sector = GET_LOW(CDEmu.lchs.sector); + u8 sptcyl = GET_LOW(CDEmu.chs.sptcyl); + res.cylinder = GET_LOW(CDEmu.chs.cyllow) + ((sptcyl << 2) & 0x300) + 1; + res.head = GET_LOW(CDEmu.chs.heads) + 1; + res.sector = sptcyl & 0x3f; return res; } res.cylinder = GET_GLOBALFLAT(drive_gf->lchs.cylinder); @@ -238,8 +239,8 @@ disk_1308(struct bregs *regs, struct drive_s *drive_gf) return; } - if (CONFIG_CDROM_EMU && GET_LOW(CDEmu.active)) { - u8 emudrive = GET_LOW(CDEmu.emulated_extdrive); + if (CONFIG_CDROM_EMU && GET_LOW(CDEmu.media)) { + u8 emudrive = GET_LOW(CDEmu.emulated_drive); if (((emudrive ^ regs->dl) & 0x80) == 0) // Note extra drive due to emulation. count++; @@ -663,8 +664,8 @@ handle_13(struct bregs *regs) cdemu_134b(regs); return; } - if (GET_LOW(CDEmu.active)) { - u8 emudrive = GET_LOW(CDEmu.emulated_extdrive); + if (GET_LOW(CDEmu.media)) { + u8 emudrive = GET_LOW(CDEmu.emulated_drive); if (extdrive == emudrive) { // Access to an emulated drive. struct drive_s *cdemu_gf = GET_GLOBAL(cdemu_drive_gf); diff --git a/src/std/disk.h b/src/std/disk.h index b2576d9..6397108 100644 --- a/src/std/disk.h +++ b/src/std/disk.h @@ -129,7 +129,7 @@ struct packed_chs_s { u8 heads; u8 sptcyl; u8 cyllow; -}; +} PACKED; struct partition_s { u8 status; @@ -169,9 +169,7 @@ struct eltorito_s { u16 buffer_segment; u16 load_segment; u16 sector_count; - u8 cylinders; - u8 sectors; - u8 heads; -}; + struct packed_chs_s chs; +} PACKED; #endif // disk.h diff --git a/src/util.h b/src/util.h index b54271b..74b58f4 100644 --- a/src/util.h +++ b/src/util.h @@ -44,7 +44,7 @@ void disable_bootsplash(void); // cdrom.c extern u8 CDRom_locks[]; -extern struct cdemu_s CDEmu; +extern struct eltorito_s CDEmu; extern struct drive_s *cdemu_drive_gf; struct disk_op_s; int process_cdemu_op(struct disk_op_s *op); -- 1.9.3

1 0

[PATCH 0/3] Extended disk drive (EDD) cleanups
by Kevin O'Connor 31 May '14

31 May '14

This series cleans up the int1348 logic a bit. It separates it out from disk.c and breaks out some of the controller specific logic. -Kevin Kevin O'Connor (3): edd: Move EDD get drive parameters (int 1348) logic from disk.c to block.c. edd: Use sectors==-1 to detect removable media. edd: Separate out ATA and virtio specific parts of fill_edd(). src/block.c | 187 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- src/block.h | 3 +- src/disk.c | 181 +--------------------------------------------------------- 3 files changed, 191 insertions(+), 180 deletions(-) -- 1.9.3

1 3

[PATCH 0/3] Run pvscsi driver entirely in 32bit mode.
by Kevin O'Connor 30 May '14

30 May '14

As with the recent change to AHCI, if the pvscsi driver needs to jump into 32bit mode to access a register, then it's better to run the pvscsi driver entirely in 32bit mode. Evgeny, can you take a look at this and give it a test? Also, what command line do you use for testing? I tried testing locally by adding: -device pvscsi,id=pvscsi0 -device scsi-disk,bus=pvscsi0.0,drive=drive0 -drive id=drive0,if=none,file=dos-drivec-new to my qemu command line (both qemu v1.6 and qemu v1.7), but it doesn't work for me even before my changes. It hangs in pvscsi_wait_intr_cmpl(). -Kevin Kevin O'Connor (3): pvscsi: Don't store reference to struct pci_device. pvscsi: Always run entirely in 32bit mode. pvscsi: Remove use of LOWFLAT and GLOBALFLAT macros. Makefile | 4 +-- src/block.c | 8 +++-- src/hw/blockcmd.c | 3 +- src/hw/pvscsi.c | 106 +++++++++++++++++++++++++----------------------------- 4 files changed, 58 insertions(+), 63 deletions(-) -- 1.8.3.1

2 6

[RFC PATCH] Add support for Intel Quark UART.
by David Woodhouse 28 May '14

28 May '14

This provides basic debug output on the Quark system, assuming that *something* (i.e. coreboot or UEFI) has set it up in advance for us. Signed-off-by: David Woodhouse <David.Woodhouse(a)intel.com> --- I looked briefly at making this part of the CONFIG_DEBUG_SERIAL code, and making that generic enough to handle I/O access *or* MMIO access depending on what's present... but in fact that's probably overkill. This isn't really limited to Quark; it would work with any 16550 device wired up as MMIO32. But we can expand it as required, I think. No point in starting off with the same functionality as the 5000-odd lines of the Linux kernel's 8250_pci.c. What do I need to do if called in 32-bit segmented mode? I'm guessing that's not going to work right now... src/Kconfig | 5 +++++ src/fw/csm.c | 2 ++ src/output.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+) diff --git a/src/Kconfig b/src/Kconfig index a42ab2d..bdc2602 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -472,6 +472,11 @@ menu "Debugging" Set to zero to disable debugging. + config DEBUG_QUARK_UART + depends on DEBUG_LEVEL != 0 + bool "Debug to Quark UART #1" + default n + config DEBUG_SERIAL depends on DEBUG_LEVEL != 0 bool "Serial port debugging" diff --git a/src/fw/csm.c b/src/fw/csm.c index dfb0d12..afd7ffe 100644 --- a/src/fw/csm.c +++ b/src/fw/csm.c @@ -280,6 +280,8 @@ handle_csm(struct bregs *regs) if (!CONFIG_CSM) return; + debug_serial_preinit(); + dprintf(3, "handle_csm regs %p AX=%04x\n", regs, regs->ax); pic_irqmask_write(PICMask); diff --git a/src/output.c b/src/output.c index b47625f..a90d350 100644 --- a/src/output.c +++ b/src/output.c @@ -17,6 +17,8 @@ #include "stacks.h" // call16_int #include "string.h" // memset #include "util.h" // ScreenAndDebug +#include "hw/pci_regs.h" // PCI_VENDOR_ID, PCI_BASE_ADDRESS_0 +#include "hw/pci.h" // pci_config_readl struct putcinfo { void (*func)(struct putcinfo *info, char c); @@ -31,9 +33,59 @@ struct putcinfo { u16 DebugOutputPort VARFSEG = 0x402; +static volatile u32 *quark_uart_addr = 0; + +extern void _cfunc32flat_quark_uart_preinit(void); +extern void _cfunc32flat_quark_uart_putc(void); +extern void _cfunc32flat_quark_uart_flush(void); + +void quark_uart_preinit(void) +{ + // debug port is bus 0, device 0x14, function 5. + u16 uart_bdf = pci_to_bdf(0, 0x14, 5); + + // If it isn't a Quark UART... + if (pci_config_readl(uart_bdf, PCI_VENDOR_ID) != 0x09368086) + return; + + u32 bar0 = pci_config_readl(uart_bdf, PCI_BASE_ADDRESS_0); + if (!(bar0 & 0xf)) + quark_uart_addr = (void *)bar0; +} + +void quark_uart_putc(char c) +{ + if (!quark_uart_addr) + return; + + int timeout = DEBUG_TIMEOUT; + while ((quark_uart_addr[SEROFF_LSR] & 0x20) != 0x20) + if (!timeout--) + // Ran out of time. + return; + quark_uart_addr[SEROFF_DATA] = c; +} + +void quark_uart_flush(void) +{ + if (!quark_uart_addr) + return; + int timeout = DEBUG_TIMEOUT; + while ((quark_uart_addr[SEROFF_LSR] & 0x60) != 0x60) + if (!timeout--) + // Ran out of time. + return; +} + void debug_serial_preinit(void) { + if (CONFIG_DEBUG_QUARK_UART) { + if (MODE16) + call32(_cfunc32flat_quark_uart_preinit, 0, 0); + else + quark_uart_preinit(); + } if (!CONFIG_DEBUG_SERIAL) return; // setup for serial logging: 8N1 @@ -54,6 +106,12 @@ debug_serial_preinit(void) static void debug_serial(char c) { + if (CONFIG_DEBUG_QUARK_UART) { + if (MODE16) + call32(_cfunc32flat_quark_uart_putc, c, 0); + else + quark_uart_putc(c); + } if (!CONFIG_DEBUG_SERIAL) return; int timeout = DEBUG_TIMEOUT; @@ -68,6 +126,12 @@ debug_serial(char c) static void debug_serial_flush(void) { + if (CONFIG_DEBUG_QUARK_UART) { + if (MODE16) + call32(_cfunc32flat_quark_uart_flush, 0, 0); + else + quark_uart_flush(); + } if (!CONFIG_DEBUG_SERIAL) return; int timeout = DEBUG_TIMEOUT; -- 1.8.3.1 -- dwmw2

2 13

[PATCH 0/5] SMM improvements
by Paolo Bonzini 28 May '14

28 May '14

Hi, these patches provide a small set of improvements and cleanups for the current SMM code, making it more consistent with the chipset's datasheets. QEMU does not yet implement most of the new registers used here, but it might soon... Paolo Bonzini (5): piix: add and use dev-piix.h smm: remove code to handle ACPI disable/enable smm: complete SMM setup smm: unify SMM handlers smm: communicate end of SMI to chipset src/fw/acpi.c | 18 ++++------ src/fw/dev-piix.h | 32 ++++++++++++++++++ src/fw/dev-q35.h | 6 ++++ src/fw/pciinit.c | 13 ++++---- src/fw/shadow.c | 3 +- src/fw/smm.c | 99 ++++++++++++++++++++++++++++--------------------------- 6 files changed, 103 insertions(+), 68 deletions(-) create mode 100644 src/fw/dev-piix.h -- 1.9.0

4 16

[PATCH] vgabios: Return from handle_1011() if handler found.
by Kevin O'Connor 28 May '14

28 May '14

Fix cut-and-paste error in handle_1011() causing spurious debug_stub() calls when CONFIG_VGA_STDVGA_PORTS is enabled. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- vgasrc/vgabios.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/vgasrc/vgabios.c b/vgasrc/vgabios.c index 400e296..e87b7eb 100644 --- a/vgasrc/vgabios.c +++ b/vgasrc/vgabios.c @@ -891,15 +891,15 @@ handle_1011(struct bregs *regs) { if (CONFIG_VGA_STDVGA_PORTS) { switch (regs->al) { - case 0x00: handle_101100(regs); break; - case 0x01: handle_101101(regs); break; - case 0x02: handle_101102(regs); break; - case 0x03: handle_101103(regs); break; - case 0x04: handle_101104(regs); break; - case 0x10: handle_101110(regs); break; - case 0x11: handle_101111(regs); break; - case 0x12: handle_101112(regs); break; - case 0x14: handle_101114(regs); break; + case 0x00: handle_101100(regs); return; + case 0x01: handle_101101(regs); return; + case 0x02: handle_101102(regs); return; + case 0x03: handle_101103(regs); return; + case 0x04: handle_101104(regs); return; + case 0x10: handle_101110(regs); return; + case 0x11: handle_101111(regs); return; + case 0x12: handle_101112(regs); return; + case 0x14: handle_101114(regs); return; } } switch (regs->al) { -- 1.9.3

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS