SeaBIOS February 2010

seabios@seabios.org

11 participants
23 discussions

Re: [SeaBIOS] [gPXE] [PATCH] [pciextra] Restore the PCI COMMAND register after writing to the BARs
by Stefan Hajnoczi 16 Feb '10

16 Feb '10

Hi Kevin, I think you might have some insight from SeaBIOS into this issue. Bernhard reports that under KVM PCI device passthrough it is necessary to save the contents of PCI_COMMAND and restore it after sizing a PCI BAR. Otherwise PCI config space seems to contain junk after BAR sizing. gPXE currently has this code change applied, but I don't think it is the root cause of this issue: http://git.etherboot.org/?p=gpxe.git;a=blob;f=src/drivers/bus/pciextra.c;h=… Note that gPXE is not disabling memory decode in PCI_COMMAND during BAR sizing (and Linux doesn't either AFAIK). I'm surprised that restoring an unchanged PCI_COMMAND would have any effect at all. When gPXE is built to do Type 1 accesses (gpxe/src/arch/x86/include/gpxe/pcidirect.h) instead of PCI BIOS then this issue does not appear. Any idea what is happening? Full email thread here: http://etherboot.org/pipermail/gpxe/2010-January/000287.html Stefan

2 1

[PATCH] Initial support for USB hubs.
by Kevin O'Connor 15 Feb '10

15 Feb '10

Initial support for USB hubs. Note, I've only tested this on qemu - I don't have a real USB hub to test on. Help with testing would be appreciated. -Kevin Initial support for USB hubs. Add support for detecting, initializing, and enumerating USB hubs. diff --git a/Makefile b/Makefile index 5110267..17d4e1f 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ OUT=out/ SRCBOTH=misc.c pmm.c stacks.c output.c util.c block.c floppy.c ata.c mouse.c \ kbd.c pci.c serial.c clock.c pic.c cdrom.c ps2port.c smp.c resume.c \ pnpbios.c pirtable.c vgahooks.c ramdisk.c pcibios.c \ - usb.c usb-uhci.c usb-ohci.c usb-hid.c paravirt.c + usb.c usb-uhci.c usb-ohci.c usb-hid.c usb-hub.c paravirt.c SRC16=$(SRCBOTH) system.c disk.c apm.c font.c SRC32FLAT=$(SRCBOTH) post.c shadow.c memmap.c coreboot.c boot.c \ acpi.c smm.c mptable.c smbios.c pciinit.c optionroms.c mtrr.c \ diff --git a/src/config.h b/src/config.h index d83d6ea..c02d496 100644 --- a/src/config.h +++ b/src/config.h @@ -36,6 +36,8 @@ #define CONFIG_USB_UHCI 1 // Support USB OHCI controllers #define CONFIG_USB_OHCI 1 +// Support USB hubs +#define CONFIG_USB_HUB 1 // Support USB keyboards #define CONFIG_USB_KEYBOARD 1 // Support PS2 ports (keyboard and mouse) diff --git a/src/usb-hub.c b/src/usb-hub.c new file mode 100644 index 0000000..4ad783c --- /dev/null +++ b/src/usb-hub.c @@ -0,0 +1,136 @@ +// Code for handling standard USB hubs. +// +// Copyright (C) 2010 Kevin O'Connor <kevin(a)koconnor.net> +// +// This file may be distributed under the terms of the GNU LGPLv3 license. + +#include "util.h" // dprintf +#include "usb.h" // struct usb_s + +static int +get_hub_desc(struct usb_hub_descriptor *desc, u32 endp) +{ + struct usb_ctrlrequest req; + req.bRequestType = USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_DEVICE; + req.bRequest = USB_REQ_GET_DESCRIPTOR; + req.wValue = USB_DT_HUB<<8; + req.wIndex = 0; + req.wLength = sizeof(*desc); + return send_default_control(endp, &req, desc); +} + +static int +set_port_feature(int port, int feature, u32 endp) +{ + struct usb_ctrlrequest req; + req.bRequestType = USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_OTHER; + req.bRequest = USB_REQ_SET_FEATURE; + req.wValue = feature; + req.wIndex = port; + req.wLength = 0; + return send_default_control(endp, &req, NULL); +} + +static int +clear_port_feature(int port, int feature, u32 endp) +{ + struct usb_ctrlrequest req; + req.bRequestType = USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_OTHER; + req.bRequest = USB_REQ_CLEAR_FEATURE; + req.wValue = feature; + req.wIndex = port; + req.wLength = 0; + return send_default_control(endp, &req, NULL); +} + +static int +get_port_status(int port, struct usb_port_status *sts, u32 endp) +{ + struct usb_ctrlrequest req; + req.bRequestType = USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_OTHER; + req.bRequest = USB_REQ_GET_STATUS; + req.wValue = 0; + req.wIndex = port; + req.wLength = sizeof(*sts); + return send_default_control(endp, &req, sts); +} + +// Find any devices connected to the root hub. +int +usb_hub_init(u32 endp) +{ + if (!CONFIG_USB_HUB) + return 0; + + struct usb_hub_descriptor desc; + int ret = get_hub_desc(&desc, endp); + if (ret) + return ret; + + // Turn on power to all ports. + int i; + for (i=1; i<=desc.bNbrPorts; i++) { + ret = set_port_feature(i, USB_PORT_FEAT_POWER, endp); + if (ret) + goto fail; + } + + // Wait for port detection. + msleep(desc.bPwrOn2PwrGood * 2 + USB_TIME_SIGATT); + // XXX - should poll for ports becoming active sooner and then + // possibly wait USB_TIME_ATTDB. + + // Detect down stream devices. + struct usb_s *cntl = endp2cntl(endp); + int totalcount = 0; + for (i=1; i<=desc.bNbrPorts; i++) { + struct usb_port_status sts; + ret = get_port_status(i, &sts, endp); + if (ret) + goto fail; + if (!(sts.wPortStatus & USB_PORT_STAT_CONNECTION)) + // XXX - power down port? + continue; + + // Reset port. + ret = set_port_feature(i, USB_PORT_FEAT_RESET, endp); + if (ret) + goto fail; + + // Wait for reset to complete. + u64 end = calc_future_tsc(USB_TIME_DRST * 2); + for (;;) { + ret = get_port_status(i, &sts, endp); + if (ret) + goto fail; + if (!(sts.wPortStatus & USB_PORT_STAT_RESET)) + break; + if (check_time(end)) { + // Timeout. + warn_timeout(); + goto fail; + } + yield(); + } + if (!(sts.wPortStatus & USB_PORT_STAT_CONNECTION)) + // Device no longer present. XXX - power down port? + continue; + + // XXX - should try to parallelize configuration. + int count = configure_usb_device( + cntl, !!(sts.wPortStatus & USB_PORT_STAT_LOW_SPEED)); + if (! count) { + // Shutdown port + ret = clear_port_feature(i, USB_PORT_FEAT_ENABLE, endp); + if (ret) + goto fail; + } + totalcount += count; + } + + return totalcount; + +fail: + dprintf(1, "Failure on hub setup\n"); + return 0; +} diff --git a/src/usb-hub.h b/src/usb-hub.h new file mode 100644 index 0000000..24d8f1f --- /dev/null +++ b/src/usb-hub.h @@ -0,0 +1,57 @@ +#ifndef __USB_HUB_H +#define __USB_HUB_H + +// usb-hub.c +int usb_hub_init(u32 endp); + + +/**************************************************************** + * hub flags + ****************************************************************/ + +#define USB_DT_HUB (USB_TYPE_CLASS | 0x09) + +struct usb_hub_descriptor { + u8 bDescLength; + u8 bDescriptorType; + u8 bNbrPorts; + u16 wHubCharacteristics; + u8 bPwrOn2PwrGood; + u8 bHubContrCurrent; + // Variable length fields for DeviceRemovable[], PortPwrCtrlMask[] follow. +} PACKED; + +#define USB_PORT_FEAT_CONNECTION 0 +#define USB_PORT_FEAT_ENABLE 1 +#define USB_PORT_FEAT_SUSPEND 2 +#define USB_PORT_FEAT_OVER_CURRENT 3 +#define USB_PORT_FEAT_RESET 4 +#define USB_PORT_FEAT_POWER 8 +#define USB_PORT_FEAT_LOWSPEED 9 +#define USB_PORT_FEAT_C_CONNECTION 16 +#define USB_PORT_FEAT_C_ENABLE 17 +#define USB_PORT_FEAT_C_SUSPEND 18 +#define USB_PORT_FEAT_C_OVER_CURRENT 19 +#define USB_PORT_FEAT_C_RESET 20 +#define USB_PORT_FEAT_TEST 21 +#define USB_PORT_FEAT_INDICATOR 22 +#define USB_PORT_FEAT_C_PORT_L1 23 + +struct usb_port_status { + u16 wPortStatus; + u16 wPortChange; +} PACKED; + +#define USB_PORT_STAT_CONNECTION 0x0001 +#define USB_PORT_STAT_ENABLE 0x0002 +#define USB_PORT_STAT_SUSPEND 0x0004 +#define USB_PORT_STAT_OVERCURRENT 0x0008 +#define USB_PORT_STAT_RESET 0x0010 +#define USB_PORT_STAT_L1 0x0020 +#define USB_PORT_STAT_POWER 0x0100 +#define USB_PORT_STAT_LOW_SPEED 0x0200 +#define USB_PORT_STAT_HIGH_SPEED 0x0400 +#define USB_PORT_STAT_TEST 0x0800 +#define USB_PORT_STAT_INDICATOR 0x1000 + +#endif // ush-hid.h diff --git a/src/usb.c b/src/usb.c index 7108991..cb6f391 100644 --- a/src/usb.c +++ b/src/usb.c @@ -12,6 +12,7 @@ #include "usb-uhci.h" // uhci_init #include "usb-ohci.h" // ohci_init #include "usb-hid.h" // usb_keyboard_setup +#include "usb-hub.h" // usb_hub_init #include "usb.h" // struct usb_s #include "biosvar.h" // GET_GLOBAL @@ -171,10 +172,11 @@ configure_usb_device(struct usb_s *cntl, int lowspeed) // Determine if a driver exists for this device - only look at the // first interface of the first configuration. struct usb_interface_descriptor *iface = (void*)(&config[1]); - if (iface->bInterfaceClass != USB_CLASS_HID - || iface->bInterfaceSubClass != USB_INTERFACE_SUBCLASS_BOOT - || iface->bInterfaceProtocol != USB_INTERFACE_PROTOCOL_KEYBOARD) - // Not a "boot" keyboard + if ((iface->bInterfaceClass != USB_CLASS_HID + || iface->bInterfaceSubClass != USB_INTERFACE_SUBCLASS_BOOT + || iface->bInterfaceProtocol != USB_INTERFACE_PROTOCOL_KEYBOARD) + && (iface->bInterfaceClass != USB_CLASS_HUB)) + // Not a supported device. goto fail; // Set the address and configure device. @@ -186,6 +188,10 @@ configure_usb_device(struct usb_s *cntl, int lowspeed) goto fail; // Configure driver. + if (iface->bInterfaceClass == USB_CLASS_HUB) { + free(config); + return usb_hub_init(endp); + } ret = usb_keyboard_init(endp, iface, ((void*)config + config->wTotalLength - (void*)iface)); if (ret)

1 0

[PATCH] Improve USB reset timing
by Kevin O'Connor 15 Feb '10

15 Feb '10

This is a series of three patches (attached) that cleanup some USB timings. I've tested this on qemu (both uhci and a modified qemu with ohci), and on the uhci controller in my epia-cn. I don't have a real ohci controller - help with testing would be appreciated. -Kevin

1 0

[PATCH] Introduce standard warnings for allocation failures and timeouts.
by Kevin O'Connor 15 Feb '10

15 Feb '10

Introduce standard warnings for allocation failures and timeouts. There is no need for custom warnings for many common failures. Introduce a common warning which is consistent and more visible. diff --git a/src/acpi.c b/src/acpi.c index 651f3a2..0559443 100644 --- a/src/acpi.c +++ b/src/acpi.c @@ -303,7 +303,7 @@ build_fadt(int bdf) void *dsdt = malloc_high(sizeof(AmlCode)); if (!fadt || !facs || !dsdt) { - dprintf(1, "Not enough memory for fadt!\n"); + warn_noalloc(); return NULL; } @@ -353,7 +353,7 @@ build_madt(void) + sizeof(struct madt_intsrcovr) * 16); struct multiple_apic_table *madt = malloc_high(madt_size); if (!madt) { - dprintf(1, "Not enough memory for madt!\n"); + warn_noalloc(); return NULL; } memset(madt, 0, madt_size); @@ -418,7 +418,7 @@ build_ssdt(void) int length = sizeof(struct acpi_table_header) + 3 + cpu_length; u8 *ssdt = malloc_high(length); if (! ssdt) { - dprintf(1, "No space for ssdt!\n"); + warn_noalloc(); return NULL; } @@ -473,7 +473,7 @@ build_hpet(void) { struct acpi_20_hpet *hpet = malloc_high(sizeof(*hpet)); if (!hpet) { - dprintf(1, "Not enough memory for hpet!\n"); + warn_noalloc(); return NULL; } @@ -514,7 +514,7 @@ build_srat(void) u64 *numadata = malloc_tmphigh(sizeof(u64) * (MaxCountCPUs + nb_numa_nodes)); if (!numadata) { - dprintf(1, "Not enough memory for read numa data from VM!\n"); + warn_noalloc(); return NULL; } @@ -527,7 +527,7 @@ build_srat(void) srat = malloc_high(srat_size); if (!srat) { - dprintf(1, "Not enough memory for srat table!\n"); + warn_noalloc(); free(numadata); return NULL; } @@ -620,7 +620,7 @@ acpi_bios_init(void) // Create initial rsdt table struct rsdp_descriptor *rsdp = malloc_fseg(sizeof(*rsdp)); if (!rsdp) { - dprintf(1, "Not enough memory for acpi rsdp table!\n"); + warn_noalloc(); return; } @@ -646,13 +646,12 @@ acpi_bios_init(void) u16 len = qemu_cfg_next_acpi_table_len(); void *addr = malloc_high(len); if (!addr) { - dprintf(1, "Not enough memory for ext acpi table of size %d!\n" - , len); + warn_noalloc(); continue; } ACPI_INIT_TABLE(qemu_cfg_next_acpi_table_load(addr, len)); if (tbl_idx == MAX_ACPI_TABLES) { - dprintf(1, "Too many external tables!\n"); + warn_noalloc(); break; } } @@ -662,7 +661,7 @@ acpi_bios_init(void) rsdt = malloc_high(rsdt_len); if (!rsdt) { - dprintf(1, "Not enough memory for acpi rsdt table!\n"); + warn_noalloc(); return; } memset(rsdt, 0, rsdt_len); diff --git a/src/ata.c b/src/ata.c index ceb08f2..ed7ef28 100644 --- a/src/ata.c +++ b/src/ata.c @@ -37,7 +37,7 @@ await_ide(u8 mask, u8 flags, u16 base, u16 timeout) if ((status & mask) == flags) return status; if (check_time(end)) { - dprintf(1, "IDE time out\n"); + warn_timeout(); return -1; } yield(); @@ -109,7 +109,7 @@ ata_reset(struct drive_s *drive_g) break; // Change drive request failed to take effect - retry. if (check_time(end)) { - dprintf(1, "ata_reset slave time out\n"); + warn_timeout(); goto done; } } @@ -458,7 +458,7 @@ ata_dma_transfer(struct disk_op_s *op) // Transfer in progress if (check_time(end)) { // Timeout. - dprintf(1, "IDE DMA timeout\n"); + warn_timeout(); break; } yield(); @@ -883,7 +883,7 @@ powerup_await_non_bsy(u16 base) return orstatus; } if (check_time(SpinupEnd)) { - dprintf(1, "powerup IDE time out\n"); + warn_timeout(); return -1; } yield(); diff --git a/src/block.c b/src/block.c index 01aa84a..3a9a68d 100644 --- a/src/block.c +++ b/src/block.c @@ -224,7 +224,7 @@ static void add_ordered_drive(u8 *idmap, u8 *count, struct drive_s *drive_g) { if (*count >= ARRAY_SIZE(Drives.idmap[0])) { - dprintf(1, "No room to map drive %p\n", drive_g); + warn_noalloc(); return; } u8 *pos = &idmap[*count]; diff --git a/src/bregs.h b/src/bregs.h index 0cdd016..9a381d0 100644 --- a/src/bregs.h +++ b/src/bregs.h @@ -91,29 +91,6 @@ set_code_invalid_silent(struct bregs *regs, u8 code) set_cf(regs, 1); } -#define warn_invalid(regs) \ - __warn_invalid((regs), __LINE__, __func__) -#define set_invalid(regs) \ - __set_invalid((regs), __LINE__, __func__) -#define set_code_invalid(regs, code) \ - __set_code_invalid((regs), (code) | (__LINE__ << 8), __func__) - -#define warn_unimplemented(regs) \ - __warn_unimplemented((regs), __LINE__, __func__) -#define set_unimplemented(regs) \ - __set_unimplemented((regs), __LINE__, __func__) -#define set_code_unimplemented(regs, code) \ - __set_code_unimplemented((regs), (code) | (__LINE__ << 8), __func__) - -// output.c -void __warn_invalid(struct bregs *regs, int lineno, const char *fname); -void __warn_unimplemented(struct bregs *regs, int lineno, const char *fname); -void __set_invalid(struct bregs *regs, int lineno, const char *fname); -void __set_unimplemented(struct bregs *regs, int lineno, const char *fname); -void __set_code_invalid(struct bregs *regs, u32 linecode, const char *fname); -void __set_code_unimplemented(struct bregs *regs, u32 linecode - , const char *fname); - #endif // !__ASSEMBLY__ #endif // bregs.h diff --git a/src/coreboot.c b/src/coreboot.c index 7ad46ce..9887752 100644 --- a/src/coreboot.c +++ b/src/coreboot.c @@ -209,7 +209,7 @@ copy_pir(void *pos) return; void *newpos = malloc_fseg(p->size); if (!newpos) { - dprintf(1, "No room to copy PIR table!\n"); + warn_noalloc(); return; } dprintf(1, "Copying PIR from %p to %p\n", pos, newpos); @@ -231,7 +231,7 @@ copy_mptable(void *pos) u16 mpclength = ((struct mptable_config_s *)p->physaddr)->length; struct mptable_floating_s *newpos = malloc_fseg(length + mpclength); if (!newpos) { - dprintf(1, "No room to copy MPTABLE!\n"); + warn_noalloc(); return; } dprintf(1, "Copying MPTABLE from %p/%x to %p\n", pos, p->physaddr, newpos); @@ -259,7 +259,7 @@ copy_acpi_rsdp(void *pos) } void *newpos = malloc_fseg(length); if (!newpos) { - dprintf(1, "No room to copy ACPI RSDP table!\n"); + warn_noalloc(); return; } dprintf(1, "Copying ACPI RSDP from %p to %p\n", pos, newpos); @@ -375,8 +375,8 @@ cbfs_setup(void) CBHDR = *(void **)CBFS_HEADPTR_ADDR; if (CBHDR->magic != htonl(CBFS_HEADER_MAGIC)) { - dprintf(1, "Unable to find CBFS (got %x not %x)\n" - , CBHDR->magic, htonl(CBFS_HEADER_MAGIC)); + dprintf(1, "Unable to find CBFS (ptr=%p; got %x not %x)\n" + , CBHDR, CBHDR->magic, htonl(CBFS_HEADER_MAGIC)); CBHDR = NULL; return; } @@ -524,7 +524,7 @@ cbfs_copyfile(struct cbfs_file *file, void *dst, u32 maxlen) // Not compressed. dprintf(3, "Copying data %d@%p to %d@%p\n", size, src, maxlen, dst); if (size > maxlen) { - dprintf(1, "File too big to copy\n"); + warn_noalloc(); return -1; } iomemcpy(dst, src, size); diff --git a/src/disk.c b/src/disk.c index 4457ea9..eb68e87 100644 --- a/src/disk.c +++ b/src/disk.c @@ -88,8 +88,7 @@ basic_access(struct bregs *regs, struct drive_s *drive_g, u16 command) u16 head = regs->dh; if (count > 128 || count == 0 || sector == 0) { - dprintf(1, "int13_harddisk: function %02x, parameter out of range!\n" - , regs->ah); + warn_invalid(regs); disk_ret(regs, DISK_RET_EPARAM); return; } @@ -100,9 +99,7 @@ basic_access(struct bregs *regs, struct drive_s *drive_g, u16 command) // sanity check on cyl heads, sec if (cylinder >= nlc || head >= nlh || sector > nlspt) { - dprintf(1, "int13_harddisk: function %02x, parameters out of" - " range %04x/%04x/%04x!\n" - , regs->ah, cylinder, head, sector); + warn_invalid(regs); disk_ret(regs, DISK_RET_EPARAM); return; } @@ -130,8 +127,7 @@ extended_access(struct bregs *regs, struct drive_s *drive_g, u16 command) dop.command = command; dop.drive_g = drive_g; if (dop.lba >= GET_GLOBAL(drive_g->sectors)) { - dprintf(1, "int13_harddisk: function %02x. LBA out of range\n" - , regs->ah); + warn_invalid(regs); disk_ret(regs, DISK_RET_EPARAM); return; } diff --git a/src/memmap.c b/src/memmap.c index aa69503..8770bbc 100644 --- a/src/memmap.c +++ b/src/memmap.c @@ -27,7 +27,7 @@ static void insert_e820(int i, u64 start, u64 size, u32 type) { if (e820_count >= CONFIG_MAX_E820) { - dprintf(1, "Overflowed e820 list!\n"); + warn_noalloc(); return; } diff --git a/src/mptable.c b/src/mptable.c index 0fd4737..0e0e1a0 100644 --- a/src/mptable.c +++ b/src/mptable.c @@ -23,7 +23,7 @@ mptable_init(void) // Config structure in temp area. struct mptable_config_s *config = malloc_tmphigh(32*1024); if (!config) { - dprintf(1, "No space for temp mptable\n"); + warn_noalloc(); return; } memset(config, 0, sizeof(*config)); @@ -186,7 +186,7 @@ mptable_init(void) struct mptable_config_s *finalconfig = malloc_fseg(length); struct mptable_floating_s *floating = malloc_fseg(sizeof(*floating)); if (!finalconfig || !floating) { - dprintf(1, "No room for MPTABLE!\n"); + warn_noalloc(); free(config); free(finalconfig); free(floating); diff --git a/src/optionroms.c b/src/optionroms.c index ace0c0e..47f5808 100644 --- a/src/optionroms.c +++ b/src/optionroms.c @@ -185,7 +185,7 @@ copy_rom(struct rom_header *rom) u32 romsize = rom->size * 512; if (RomEnd + romsize > max_rom()) { // Option rom doesn't fit. - dprintf(1, "Option rom %p doesn't fit.\n", rom); + warn_noalloc(); return NULL; } dprintf(4, "Copying option rom (size %d) from %p to %x\n" diff --git a/src/output.c b/src/output.c index 3de565a..ae105fb 100644 --- a/src/output.c +++ b/src/output.c @@ -485,6 +485,21 @@ __warn_unimplemented(struct bregs *regs, int lineno, const char *fname) } } +// Report on an allocation failure. +void +__warn_noalloc(int lineno, const char *fname) +{ + dprintf(1, "WARNING - Unable to allocate resource at %s:%d!\n" + , fname, lineno); +} + +// Report on a timeout exceeded. +void +__warn_timeout(int lineno, const char *fname) +{ + dprintf(1, "WARNING - Timeout at %s:%d!\n", fname, lineno); +} + // Report a handler reporting an invalid parameter to the caller. void __set_invalid(struct bregs *regs, int lineno, const char *fname) diff --git a/src/paravirt.c b/src/paravirt.c index 7171bac..fc0cbfe 100644 --- a/src/paravirt.c +++ b/src/paravirt.c @@ -211,7 +211,7 @@ int qemu_cfg_smbios_load_external(int type, char **p, unsigned *nr_structs, } if (end - *p < sizeof(struct smbios_structure_header)) { - dprintf(1, "No more memory for additional smbios tables\n"); + warn_noalloc(); break; } @@ -233,7 +233,7 @@ int qemu_cfg_smbios_load_external(int type, char **p, unsigned *nr_structs, /* Read the rest and terminate the entry */ if (end - *p < table.header.length) { - dprintf(1, "No memory for smbios table %d\n", header->type); + warn_noalloc(); *p -= sizeof(struct smbios_structure_header); continue; } diff --git a/src/ps2port.c b/src/ps2port.c index 4cfff28..49bf551 100644 --- a/src/ps2port.c +++ b/src/ps2port.c @@ -32,7 +32,7 @@ i8042_wait_read(void) return 0; udelay(50); } - dprintf(1, "i8042 timeout on wait read\n"); + warn_timeout(); return -1; } @@ -47,7 +47,7 @@ i8042_wait_write(void) return 0; udelay(50); } - dprintf(1, "i8042 timeout on wait write\n"); + warn_timeout(); return -1; } @@ -65,7 +65,7 @@ i8042_flush(void) dprintf(7, "i8042 flushed %x (status=%x)\n", data, status); } - dprintf(1, "i8042 timeout on flush\n"); + warn_timeout(); return -1; } @@ -189,7 +189,9 @@ ps2_recvbyte(int aux, int needack, int timeout) } if (check_time(end)) { - dprintf(1, "ps2_recvbyte timeout\n"); + // Don't warn on second byte of a reset + if (timeout > 100) + warn_timeout(); return -1; } yield(); diff --git a/src/ramdisk.c b/src/ramdisk.c index 16c8b25..641d87e 100644 --- a/src/ramdisk.c +++ b/src/ramdisk.c @@ -37,7 +37,7 @@ ramdisk_setup(void) // Allocate ram for image. void *pos = memalign_tmphigh(PAGE_SIZE, size); if (!pos) { - dprintf(3, "Not enough memory for ramdisk\n"); + warn_noalloc(); return; } add_e820((u32)pos, size, E820_RESERVED); diff --git a/src/smbios.c b/src/smbios.c index 870afbe..f948d78 100644 --- a/src/smbios.c +++ b/src/smbios.c @@ -19,7 +19,7 @@ smbios_entry_point_init(u16 max_structure_size, struct smbios_entry_point *ep = malloc_fseg(sizeof(*ep)); void *finaltable = malloc_high(structure_table_length); if (!ep || !finaltable) { - dprintf(1, "No space for smbios tables!\n"); + warn_noalloc(); free(ep); free(finaltable); return; @@ -378,7 +378,7 @@ smbios_init(void) char *start = malloc_tmphigh(TEMPSMBIOSSIZE); if (! start) { - dprintf(1, "No memory for temp smbios table\n"); + warn_noalloc(); return; } diff --git a/src/usb-ohci.c b/src/usb-ohci.c index 8ebd340..421c19b 100644 --- a/src/usb-ohci.c +++ b/src/usb-ohci.c @@ -35,7 +35,7 @@ start_ohci(struct usb_s *cntl, struct ohci_hcca *hcca) if (! status & OHCI_HCR) break; if (check_time(end)) { - dprintf(1, "Timeout on ohci software reset\n"); + warn_timeout(); return -1; } } @@ -153,7 +153,7 @@ ohci_init(void *data) struct ohci_ed *intr_ed = malloc_high(sizeof(*intr_ed)); struct ohci_ed *control_ed = malloc_high(sizeof(*control_ed)); if (!hcca || !intr_ed || !control_ed) { - dprintf(1, "No ram for ohci init\n"); + warn_noalloc(); goto free; } memset(hcca, 0, sizeof(*hcca)); @@ -192,7 +192,7 @@ wait_ed(struct ohci_ed *ed) if (ed->hwHeadP == ed->hwTailP) return 0; if (check_time(end)) { - dprintf(1, "Timeout on wait_ed %p\n", ed); + warn_timeout(); return -1; } yield(); diff --git a/src/usb-uhci.c b/src/usb-uhci.c index b09b17a..b7ff394 100644 --- a/src/usb-uhci.c +++ b/src/usb-uhci.c @@ -40,12 +40,12 @@ configure_uhci(struct usb_s *cntl) struct uhci_qh *data_qh = malloc_high(sizeof(*data_qh)); struct uhci_qh *term_qh = malloc_high(sizeof(*term_qh)); if (!term_td || !fl || !intr_qh || !data_qh || !term_qh) { + warn_noalloc(); free(term_td); free(fl); free(intr_qh); free(data_qh); free(term_qh); - dprintf(1, "No ram for uhci init\n"); return; } @@ -169,6 +169,7 @@ wait_qh(struct usb_s *cntl, struct uhci_qh *qh) if (qh->element & UHCI_PTR_TERM) return 0; if (check_time(end)) { + warn_timeout(); struct uhci_td *td = (void*)(qh->element & ~UHCI_PTR_BITS); dprintf(1, "Timeout on wait_qh %p (td=%p s=%x c=%x/%x)\n" , qh, td, td->status diff --git a/src/util.h b/src/util.h index 429590c..4228904 100644 --- a/src/util.h +++ b/src/util.h @@ -203,17 +203,28 @@ void panic(const char *fmt, ...) __attribute__ ((format (printf, 1, 2))) __noreturn; void printf(const char *fmt, ...) __attribute__ ((format (printf, 1, 2))); -void __dprintf(const char *fmt, ...) - __attribute__ ((format (printf, 1, 2))); int snprintf(char *str, size_t size, const char *fmt, ...) __attribute__ ((format (printf, 3, 4))); +void __dprintf(const char *fmt, ...) + __attribute__ ((format (printf, 1, 2))); +void __debug_enter(struct bregs *regs, const char *fname); +void __debug_isr(const char *fname); +void __debug_stub(struct bregs *regs, int lineno, const char *fname); +void __warn_invalid(struct bregs *regs, int lineno, const char *fname); +void __warn_unimplemented(struct bregs *regs, int lineno, const char *fname); +void __warn_noalloc(int lineno, const char *fname); +void __warn_timeout(int lineno, const char *fname); +void __set_invalid(struct bregs *regs, int lineno, const char *fname); +void __set_unimplemented(struct bregs *regs, int lineno, const char *fname); +void __set_code_invalid(struct bregs *regs, u32 linecode, const char *fname); +void __set_code_unimplemented(struct bregs *regs, u32 linecode + , const char *fname); +void hexdump(const void *d, int len); + #define dprintf(lvl, fmt, args...) do { \ if (CONFIG_DEBUG_LEVEL && (lvl) <= CONFIG_DEBUG_LEVEL) \ __dprintf((fmt) , ##args ); \ } while (0) -void __debug_enter(struct bregs *regs, const char *fname); -void __debug_stub(struct bregs *regs, int lineno, const char *fname); -void __debug_isr(const char *fname); #define debug_enter(regs, lvl) do { \ if ((lvl) && (lvl) <= CONFIG_DEBUG_LEVEL) \ __debug_enter((regs), __func__); \ @@ -224,7 +235,22 @@ void __debug_isr(const char *fname); } while (0) #define debug_stub(regs) \ __debug_stub((regs), __LINE__, __func__) -void hexdump(const void *d, int len); +#define warn_invalid(regs) \ + __warn_invalid((regs), __LINE__, __func__) +#define warn_unimplemented(regs) \ + __warn_unimplemented((regs), __LINE__, __func__) +#define warn_noalloc() \ + __warn_noalloc(__LINE__, __func__) +#define warn_timeout() \ + __warn_timeout(__LINE__, __func__) +#define set_invalid(regs) \ + __set_invalid((regs), __LINE__, __func__) +#define set_code_invalid(regs, code) \ + __set_code_invalid((regs), (code) | (__LINE__ << 8), __func__) +#define set_unimplemented(regs) \ + __set_unimplemented((regs), __LINE__, __func__) +#define set_code_unimplemented(regs, code) \ + __set_code_unimplemented((regs), (code) | (__LINE__ << 8), __func__) // kbd.c void kbd_setup(void);

1 0

Re: [SeaBIOS] [PATCH] Seabios - read e820 reserve from qemu_cfg
by Kevin O'Connor 14 Feb '10

14 Feb '10

On Mon, Jan 25, 2010 at 05:46:42PM +0100, Jes Sorensen wrote: > Hi, > > Right now KVM/QEMU relies on hard coded values in Seabios for the > reserved area for the TSS pages and the EPT page. > > I'd like to suggest we change this to pass the value from QEMU via > qemu-cfg making it possible to move it around dynamically in the future. > > Attached is a patch to Seabios for this, which defaults to the current > hard coded value if no value is provided by qemu-cfg. We can remove > the backwards compatibility later. > > I'll post the QEMU patches for upstream QEMU and QEMU-KVM in a minute. > > Comments most welcome! I like the idea, but I think it would be better to pass a list of e820 entries explicitly. That is, pass an array of: struct e820entry { u64 start; u64 size; u32 type; }; where 'type' uses the standard e820 definitions. That way, SeaBIOS can just walk through the list and add them to its e820 map. BTW, this is what SeaBIOS does when running under coreboot (coreboot passes a memory map as part of the "coreboot tables"). SeaBIOS is already smart enough to not use any high memory addresses marked as reserved. -Kevin

4 9

[PATCH] Support USB interrupt schedules on OHCI and UHCI.
by Kevin O'Connor 14 Feb '10

14 Feb '10

Support USB interrupt schedules on OHCI and UHCI. The existing code always checks for USB "interrupt in" events every millisecond. Although that's okay, it consumes extra bandwidth. This change interrupt checks to be scheduled according to their requested interval time. diff --git a/src/clock.c b/src/clock.c index e32bf1b..5a30e35 100644 --- a/src/clock.c +++ b/src/clock.c @@ -54,8 +54,6 @@ * TSC timer ****************************************************************/ -#define PIT_TICK_RATE 1193180 // Underlying HZ of PIT -#define PIT_TICK_INTERVAL 65536 // Default interval for 18.2Hz timer #define TICKS_PER_DAY (u32)((u64)60*60*24*PIT_TICK_RATE / PIT_TICK_INTERVAL) #define CALIBRATE_COUNT 0x800 // Approx 1.7ms diff --git a/src/usb-ohci.c b/src/usb-ohci.c index 6ad1dbc..2d33fa9 100644 --- a/src/usb-ohci.c +++ b/src/usb-ohci.c @@ -149,12 +149,18 @@ ohci_init(void *data) // Allocate memory struct ohci_hcca *hcca = memalign_high(256, sizeof(*hcca)); + struct ohci_ed *intr_ed = malloc_high(sizeof(*intr_ed)); struct ohci_ed *control_ed = malloc_high(sizeof(*control_ed)); - if (!hcca || !control_ed) { + if (!hcca || !intr_ed || !control_ed) { dprintf(1, "No ram for ohci init\n"); - return; + goto free; } memset(hcca, 0, sizeof(*hcca)); + memset(intr_ed, 0, sizeof(*intr_ed)); + intr_ed->hwINFO = ED_SKIP; + int i; + for (i=0; i<ARRAY_SIZE(hcca->int_table); i++) + hcca->int_table[i] = (u32)intr_ed; memset(control_ed, 0, sizeof(*control_ed)); control_ed->hwINFO = ED_SKIP; cntl->ohci.control_ed = control_ed; @@ -170,7 +176,9 @@ ohci_init(void *data) err: stop_ohci(cntl); +free: free(hcca); + free(intr_ed); free(control_ed); } @@ -245,18 +253,21 @@ struct ohci_pipe { }; struct usb_pipe * -ohci_alloc_intr_pipe(u32 endp, int period) +ohci_alloc_intr_pipe(u32 endp, int frameexp) { if (! CONFIG_USB_OHCI) return NULL; - dprintf(7, "ohci_alloc_intr_pipe %x %d\n", endp, period); + dprintf(7, "ohci_alloc_intr_pipe %x %d\n", endp, frameexp); + if (frameexp > 5) + frameexp = 5; struct usb_s *cntl = endp2cntl(endp); int maxpacket = endp2maxsize(endp); int lowspeed = endp2speed(endp); int devaddr = endp2devaddr(endp) | (endp2ep(endp) << 7); - // XXX - just grab 20 for now. - int count = 20; + // Determine number of entries needed for 2 timer ticks. + int ms = 1<<frameexp; + int count = DIV_ROUND_UP(PIT_TICK_INTERVAL * 1000 * 2, PIT_TICK_RATE * ms); struct ohci_pipe *pipe = malloc_low(sizeof(*pipe)); struct ohci_td *tds = malloc_low(sizeof(*tds) * count); void *data = malloc_low(maxpacket * count); @@ -267,7 +278,6 @@ ohci_alloc_intr_pipe(u32 endp, int period) ed->hwHeadP = (u32)&tds[0]; ed->hwTailP = (u32)&tds[count-1]; ed->hwINFO = devaddr | (maxpacket << 16) | (lowspeed ? ED_LOWSPEED : 0); - ed->hwNextED = 0; int i; for (i=0; i<count-1; i++) { @@ -277,11 +287,20 @@ ohci_alloc_intr_pipe(u32 endp, int period) tds[i].hwBE = tds[i].hwCBP + maxpacket - 1; } - // XXX - need schedule - just add to primary list for now. + // Add to interrupt schedule. barrier(); struct ohci_hcca *hcca = (void*)cntl->ohci.regs->hcca; - for (i=0; i<ARRAY_SIZE(hcca->int_table); i++) - hcca->int_table[i] = (u32)ed; + if (frameexp == 0) { + // Add to existing interrupt entry. + struct ohci_ed *intr_ed = (void*)hcca->int_table[0]; + ed->hwNextED = intr_ed->hwNextED; + intr_ed->hwNextED = (u32)ed; + } else { + int startpos = 1<<(frameexp-1); + ed->hwNextED = hcca->int_table[startpos]; + for (i=startpos; i<ARRAY_SIZE(hcca->int_table); i+=ms) + hcca->int_table[i] = (u32)ed; + } pipe->data = data; pipe->count = count; diff --git a/src/usb-ohci.h b/src/usb-ohci.h index 5a4f735..7ff84f6 100644 --- a/src/usb-ohci.h +++ b/src/usb-ohci.h @@ -6,7 +6,7 @@ struct usb_s; void ohci_init(void *data); int ohci_control(u32 endp, int dir, const void *cmd, int cmdsize , void *data, int datasize); -struct usb_pipe *ohci_alloc_intr_pipe(u32 endp, int period); +struct usb_pipe *ohci_alloc_intr_pipe(u32 endp, int frameexp); int ohci_poll_intr(struct usb_pipe *pipe, void *data); diff --git a/src/usb-uhci.c b/src/usb-uhci.c index d98c08b..950ec6a 100644 --- a/src/usb-uhci.c +++ b/src/usb-uhci.c @@ -36,9 +36,15 @@ configure_uhci(struct usb_s *cntl) // Allocate ram for schedule storage struct uhci_td *term_td = malloc_high(sizeof(*term_td)); struct uhci_framelist *fl = memalign_high(sizeof(*fl), sizeof(*fl)); - struct uhci_qh *data_qh = malloc_low(sizeof(*data_qh)); + struct uhci_qh *intr_qh = malloc_high(sizeof(*intr_qh)); + struct uhci_qh *data_qh = malloc_high(sizeof(*data_qh)); struct uhci_qh *term_qh = malloc_high(sizeof(*term_qh)); - if (!term_td || !fl || !data_qh || !term_qh) { + if (!term_td || !fl || !intr_qh || !data_qh || !term_qh) { + free(term_td); + free(fl); + free(intr_qh); + free(data_qh); + free(term_qh); dprintf(1, "No ram for uhci init\n"); return; } @@ -58,11 +64,14 @@ configure_uhci(struct usb_s *cntl) data_qh->link = (u32)term_qh | UHCI_PTR_QH; cntl->uhci.qh = data_qh; - // Set schedule to point to primary queue head + // Set schedule to point to primary intr queue head + memset(intr_qh, 0, sizeof(*intr_qh)); + intr_qh->element = UHCI_PTR_TERM; + intr_qh->link = (u32)data_qh | UHCI_PTR_QH; int i; - for (i=0; i<ARRAY_SIZE(fl->links); i++) { - fl->links[i] = (u32)data_qh | UHCI_PTR_QH; - } + for (i=0; i<ARRAY_SIZE(fl->links); i++) + fl->links[i] = (u32)intr_qh | UHCI_PTR_QH; + cntl->uhci.framelist = fl; // Set the frame length to the default: 1 ms exactly outb(USBSOF_DEFAULT, cntl->uhci.iobase + USBSOF); @@ -229,26 +238,28 @@ uhci_control(u32 endp, int dir, const void *cmd, int cmdsize } struct usb_pipe * -uhci_alloc_intr_pipe(u32 endp, int period) +uhci_alloc_intr_pipe(u32 endp, int frameexp) { if (! CONFIG_USB_UHCI) return NULL; - dprintf(7, "uhci_alloc_intr_pipe %x %d\n", endp, period); + dprintf(7, "uhci_alloc_intr_pipe %x %d\n", endp, frameexp); + if (frameexp > 10) + frameexp = 10; struct usb_s *cntl = endp2cntl(endp); int maxpacket = endp2maxsize(endp); int lowspeed = endp2speed(endp); int devaddr = endp2devaddr(endp) | (endp2ep(endp) << 7); - // XXX - just grab 20 for now. - int count = 20; + // Determine number of entries needed for 2 timer ticks. + int ms = 1<<frameexp; + int count = DIV_ROUND_UP(PIT_TICK_INTERVAL * 1000 * 2, PIT_TICK_RATE * ms); struct uhci_qh *qh = malloc_low(sizeof(*qh)); struct uhci_td *tds = malloc_low(sizeof(*tds) * count); - if (!qh || !tds) - return NULL; - if (maxpacket > sizeof(tds[0].data)) - // XXX - free qh/tds + if (!qh || !tds || maxpacket > sizeof(tds[0].data)) { + free(qh); + free(tds); return NULL; - + } qh->element = (u32)tds; int toggle = 0; int i; @@ -266,10 +277,19 @@ uhci_alloc_intr_pipe(u32 endp, int period) qh->next_td = &tds[0]; qh->pipe.endp = endp; - // XXX - need schedule - just add to primary list for now. - struct uhci_qh *data_qh = cntl->uhci.qh; - qh->link = data_qh->link; - data_qh->link = (u32)qh | UHCI_PTR_QH; + // Add to interrupt schedule. + struct uhci_framelist *fl = cntl->uhci.framelist; + if (frameexp == 0) { + // Add to existing interrupt entry. + struct uhci_qh *intr_qh = (void*)(fl->links[0] & ~UHCI_PTR_BITS); + qh->link = intr_qh->link; + intr_qh->link = (u32)qh | UHCI_PTR_QH; + } else { + int startpos = 1<<(frameexp-1); + qh->link = fl->links[startpos]; + for (i=startpos; i<ARRAY_SIZE(fl->links); i+=ms) + fl->links[i] = (u32)qh | UHCI_PTR_QH; + } return &qh->pipe; } diff --git a/src/usb-uhci.h b/src/usb-uhci.h index 5de7da0..03ac9cd 100644 --- a/src/usb-uhci.h +++ b/src/usb-uhci.h @@ -8,7 +8,7 @@ struct usb_s; void uhci_init(void *data); int uhci_control(u32 endp, int dir, const void *cmd, int cmdsize , void *data, int datasize); -struct usb_pipe *uhci_alloc_intr_pipe(u32 endp, int period); +struct usb_pipe *uhci_alloc_intr_pipe(u32 endp, int frameexp); int uhci_poll_intr(struct usb_pipe *pipe, void *data); diff --git a/src/usb.c b/src/usb.c index 9a61f12..3d59faf 100644 --- a/src/usb.c +++ b/src/usb.c @@ -35,12 +35,16 @@ struct usb_pipe * alloc_intr_pipe(u32 endp, int period) { struct usb_s *cntl = endp2cntl(endp); + // Find the exponential period of the requested time. + if (period <= 0) + period = 1; + int frameexp = __fls(period); switch (cntl->type) { default: case USB_TYPE_UHCI: - return uhci_alloc_intr_pipe(endp, period); + return uhci_alloc_intr_pipe(endp, frameexp); case USB_TYPE_OHCI: - return ohci_alloc_intr_pipe(endp, period); + return ohci_alloc_intr_pipe(endp, frameexp); } } diff --git a/src/usb.h b/src/usb.h index cc71c31..8b9c5f1 100644 --- a/src/usb.h +++ b/src/usb.h @@ -11,7 +11,7 @@ struct usb_s { union { struct { u16 iobase; - void *qh; + void *qh, *framelist; } uhci; struct { struct ohci_regs *regs; diff --git a/src/util.h b/src/util.h index 60a7259..429590c 100644 --- a/src/util.h +++ b/src/util.h @@ -245,6 +245,8 @@ void serial_setup(void); void lpt_setup(void); // clock.c +#define PIT_TICK_RATE 1193180 // Underlying HZ of PIT +#define PIT_TICK_INTERVAL 65536 // Default interval for 18.2Hz timer static inline int check_time(u64 end) { return (s64)(rdtscll() - end) > 0; }

1 0

[PATCH] Support USB keyboard auto-repeat
by Kevin O'Connor 14 Feb '10

14 Feb '10

This patch adds auto-repeat support for USB keyboards. It also fixes handling of events where multiple keys are pressed simultaneously (which can happen when typing fast). The repeat is accomplished by using the keyboard Set_Idle command. Unfortunately, qemu doesn't implement that feature correctly. I "fixed" that in my local qemu code - I'll share the fix I used in a separate email. -Kevin commit 84a4d4b0b10c8a4e04c4e7bfd806c6c50693d945 Author: Kevin O'Connor <kevin(a)koconnor.net> Date: Thu Feb 11 22:32:12 2010 -0500 Support USB keyboard auto-repeat. Support handling of multiple keys pressed simultanously. Support auto-repeat via USB HID Set_Idle command. Also, add "noinline" directives to reduce stack usage of timer irq. diff --git a/src/biosvar.h b/src/biosvar.h index 2e43f8b..d011966 100644 --- a/src/biosvar.h +++ b/src/biosvar.h @@ -215,6 +215,17 @@ struct fdpt_s { u8 checksum; } PACKED; +struct usbkeyinfo { + union { + struct { + u8 modifiers; + u8 repeatcount; + u8 keys[6]; + }; + u64 data; + }; +}; + struct extended_bios_data_area_s { u8 size; u8 reserved1[0x21]; @@ -232,6 +243,8 @@ struct extended_bios_data_area_s { u8 other2[0xC4]; // 0x121 - Begin custom storage. + struct usbkeyinfo usbkey_last; + int RTCusers; // El Torito Emulation data diff --git a/src/mouse.c b/src/mouse.c index 888d32d..3004d78 100644 --- a/src/mouse.c +++ b/src/mouse.c @@ -269,7 +269,7 @@ handle_15c2(struct bregs *regs) } } -void +void noinline process_mouse(u8 data) { if (!CONFIG_MOUSE) diff --git a/src/usb-hid.c b/src/usb-hid.c index 7756c62..b714685 100644 --- a/src/usb-hid.c +++ b/src/usb-hid.c @@ -30,17 +30,20 @@ set_protocol(u32 endp, u16 val) } static int -set_idle(u32 endp, u8 val) +set_idle(u32 endp, int ms) { struct usb_ctrlrequest req; req.bRequestType = USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE; req.bRequest = HID_REQ_SET_IDLE; - req.wValue = val<<8; + req.wValue = (ms/4)<<8; req.wIndex = 0; req.wLength = 0; return send_default_control(endp, &req, NULL); } +#define KEYREPEATWAITMS 500 +#define KEYREPEATMS 33 + int usb_keyboard_init(u32 endp, struct usb_interface_descriptor *iface, int imax) { @@ -75,7 +78,7 @@ usb_keyboard_init(u32 endp, struct usb_interface_descriptor *iface, int imax) if (ret) return -1; // Only send reports on a new key event. - ret = set_idle(endp, 0); + ret = set_idle(endp, KEYREPEATMS); if (ret) return -1; @@ -121,6 +124,8 @@ static u16 ModifierToScanCode[] VAR16 = { 0x001d, 0x002a, 0x0038, 0xe05b, 0xe01d, 0x0036, 0xe038, 0xe05c }; +#define RELEASEBIT 0x80 + struct keyevent { u8 modifiers; u8 reserved; @@ -135,8 +140,8 @@ prockeys(u16 keys) if (key == 0xe1) { // Pause key process_key(0xe1); - process_key(0x1d | (keys & 0x80)); - process_key(0x45 | (keys & 0x80)); + process_key(0x1d | (keys & RELEASEBIT)); + process_key(0x45 | (keys & RELEASEBIT)); return; } process_key(key); @@ -145,26 +150,89 @@ prockeys(u16 keys) } static void +procscankey(u8 key, u8 flags) +{ + if (key >= ARRAY_SIZE(KeyToScanCode)) + return; + u16 keys = GET_GLOBAL(KeyToScanCode[key]); + if (keys) + prockeys(keys | flags); +} + +static void +procmodkey(u8 mods, u8 flags) +{ + int i; + for (i=0; mods; i++) + if (mods & (1<<i)) { + // Modifier key change. + prockeys(GET_GLOBAL(ModifierToScanCode[i]) | flags); + mods &= ~(1<<i); + } +} + +static void noinline handle_key(struct keyevent *data) { dprintf(5, "Got key %x %x\n", data->modifiers, data->keys[0]); - // XXX + + // Load old keys. + u16 ebda_seg = get_ebda_seg(); + struct usbkeyinfo old; + old.data = GET_EBDA2(ebda_seg, usbkey_last.data); + + // Check for keys no longer pressed. + int addpos = 0; int i; - for (i=0; i<8; i++) - if (data->modifiers & (1<<i)) - prockeys(GET_GLOBAL(ModifierToScanCode[i])); + for (i=0; i<ARRAY_SIZE(old.keys); i++) { + u8 key = old.keys[i]; + if (!key) + break; + int j; + for (j=0;; j++) { + if (j>=ARRAY_SIZE(data->keys)) { + // Key released. + procscankey(key, RELEASEBIT); + if (i+1 >= ARRAY_SIZE(old.keys) || !old.keys[i+1]) + // Last pressed key released - disable repeat. + old.repeatcount = 0xff; + break; + } + if (data->keys[j] == key) { + // Key still pressed. + data->keys[j] = 0; + old.keys[addpos++] = key; + break; + } + } + } + procmodkey(old.modifiers & ~data->modifiers, RELEASEBIT); + + // Process new keys + procmodkey(data->modifiers & ~old.modifiers, 0); + old.modifiers = data->modifiers; for (i=0; i<ARRAY_SIZE(data->keys); i++) { u8 key = data->keys[i]; - if (key >= ARRAY_SIZE(KeyToScanCode)) - continue; - key = GET_GLOBAL(KeyToScanCode[key]); if (!key) continue; - prockeys(key); + // New key pressed. + procscankey(key, 0); + old.keys[addpos++] = key; + old.repeatcount = KEYREPEATWAITMS / KEYREPEATMS + 1; } - for (i=0; i<8; i++) - if (data->modifiers & (1<<i)) - prockeys(GET_GLOBAL(ModifierToScanCode[i]) | 0x80); + if (addpos < ARRAY_SIZE(old.keys)) + old.keys[addpos] = 0; + + // Check for key repeat event. + if (addpos) { + if (!old.repeatcount) + procscankey(old.keys[addpos-1], 0); + else if (old.repeatcount != 0xff) + old.repeatcount--; + } + + // Update old keys + SET_EBDA2(ebda_seg, usbkey_last.data, old.data); } void diff --git a/src/usb.c b/src/usb.c index 2bd5832..12747db 100644 --- a/src/usb.c +++ b/src/usb.c @@ -44,7 +44,7 @@ alloc_intr_pipe(u32 endp, int period) } } -int +int noinline usb_poll_intr(struct usb_pipe *pipe, void *data) { u32 endp = GET_FLATPTR(pipe->endp);

1 0

[PATCH] mptable: Pull cpuid_signature/features setting out of loop
by Kevin O'Connor 14 Feb '10

14 Feb '10

This is a minor cleanup. -Kevin diff --git a/src/mptable.c b/src/mptable.c index 5357c03..0fd4737 100644 --- a/src/mptable.c +++ b/src/mptable.c @@ -36,7 +36,11 @@ mptable_init(void) // Detect cpu info u32 cpuid_signature, ebx, ecx, cpuid_features; cpuid(1, &cpuid_signature, &ebx, &ecx, &cpuid_features); - u8 apic_version = readl((u8*)BUILD_APIC_ADDR + 0x30) & 0xff; + if (! cpuid_signature) { + // Use default values. + cpuid_signature = 0x600; + cpuid_features = 0x201; + } int pkgcpus = 1; if (cpuid_features & (1 << 28)) { /* Only populate the MPS tables with the first logical CPU in @@ -44,6 +48,7 @@ mptable_init(void) pkgcpus = (ebx >> 16) & 0xff; pkgcpus = 1 << (__fls(pkgcpus - 1) + 1); /* round up to power of 2 */ } + u8 apic_version = readl((u8*)BUILD_APIC_ADDR + 0x30) & 0xff; // CPU definitions. struct mpt_cpu *cpus = (void*)&config[1], *cpu = cpus; @@ -55,13 +60,8 @@ mptable_init(void) cpu->apicver = apic_version; /* cpu flags: enabled, bootstrap cpu */ cpu->cpuflag = (i < CountCPUs) | ((i == 0) << 1); - if (cpuid_signature) { - cpu->cpusignature = cpuid_signature; - cpu->featureflag = cpuid_features; - } else { - cpu->cpusignature = 0x600; - cpu->featureflag = 0x201; - } + cpu->cpusignature = cpuid_signature; + cpu->featureflag = cpuid_features; cpu++; } int entrycount = cpu - cpus;

1 0

[PATCH] seabios: acpi: fix memory leak in build_srat().
by Isaku Yamahata 14 Feb '10

14 Feb '10

numadata() is allocated for temporal use, but not freed. free it. Signed-off-by: Isaku Yamahata <yamahata(a)valinux.co.jp> --- src/acpi.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/acpi.c b/src/acpi.c index dbdca79..e2a1153 100644 --- a/src/acpi.c +++ b/src/acpi.c @@ -490,6 +490,7 @@ build_srat(void) srat = malloc_high(srat_size); if (!srat) { dprintf(1, "Not enough memory for srat table!\n"); + free(numadata); return NULL; } @@ -556,6 +557,7 @@ build_srat(void) build_header((void*)srat, SRAT_SIGNATURE, srat_size, 1); + free(numadata); return srat; } -- 1.6.6.1

2 1

Re: [SeaBIOS] [PATCH] Seabios: Fix PkgLength calculation for the SSDT.
by Kevin O'Connor 09 Feb '10

09 Feb '10

On Mon, Dec 14, 2009 at 10:25:14AM +0100, Magnus Christensson wrote: >>> --- a/src/acpi.c >>> +++ b/src/acpi.c >>> @@ -464,10 +464,12 @@ build_ssdt(void) >>> // build processor scope header >>> *(ssdt_ptr++) = 0x10; // ScopeOp >>> if (cpu_length<= 0x3e) { >>> + /* Handle 1-4 CPUs with one byte encoding */ >>> *(ssdt_ptr++) = cpu_length + 1; >>> } else { >>> - *(ssdt_ptr++) = 0x7F; >>> - *(ssdt_ptr++) = (cpu_length + 2)>> 6; >>> + /* Handle 5-314 CPUs with two byte encoding */ >>> + *(ssdt_ptr++) = 0x40 | ((cpu_length + 1)& 0xf); >>> + *(ssdt_ptr++) = (cpu_length + 1)>> 4; >>> >> Should be cpu_length + 2 as far as I can tell. The current code is >> definitely broken. >> > Right. That should be cpu_length +2 in the else-part. Can you resend the patch with the change? Thanks, -Kevin

4 5

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS February 2010