SeaBIOS October 2011

seabios@seabios.org

33 participants
56 discussions

by Kevin O'Connor

On Thu, Oct 13, 2011 at 03:56:48PM +0200, Wolfgang Kamp - datakamp wrote: > > Hi, > > is there any solution for the usb boot issue of the AMD SB800 Persimmon platform > with SeaBIOS 1.6.3 and actual Coreboot version? I'm unfamiliar with the issue. Can you post the SeaBIOS debug output along with a description of the issue you are seeing? -Kevin

8 years, 10 months

Re: [SeaBIOS] [SeaBIOS PATCH v2] hotplug: Add device per func in ACPI DSDT tables

by Michael S. Tsirkin

On Wed, Sep 21, 2011 at 01:39:22AM -0400, Amos Kong wrote: > ----- Original Message ----- > > On Tue, Sep 20, 2011 at 06:45:57AM -0400, Amos Kong wrote: > > > From 48ea1c9188334b89a60b4f9e853e86fc04fda4a5 Mon Sep 17 00:00:00 > > > 2001 > > > From: Amos Kong <akong(a)redhat.com> > > > Date: Tue, 20 Sep 2011 15:38:43 +0800 > > > Subject: [SeaBIOS PATCH v2] hotplug: Add device per func in ACPI > > > DSDT tables > > > > > > Only func 0 is registered to guest driver (we can > > > only found func 0 in slot->funcs list of driver), > > > the other functions could not be cleaned when > > > hot-removing the whole slot. This patch adds > > > device per function in ACPI DSDT tables. > > > > > > Have tested with linux/winxp/win7, hot-adding/hot-remving, > > > single/multiple function device, they are all fine. > > > --- > > > Changes from v1: > > > - cleanup the macros, bios.bin gets back to 128K > > > - notify only when func0 is added and removed > > > > How about moving code into functions so that it isn't duplicated for > > each PCI device. See the patch below as an example (100% untested). Hmm, I sent patches that did a similar thing but in a slightly more compact way. Message ids: 20110919092932.GB4501(a)redhat.com 20110919093644.GC4501(a)redhat.com 20110919100434.GA6764(a)redhat.com Did they not reach you or something's wrong with them? > > Tested, it works as my original patch-v2. > > > The CPU hotplug stuff works this way, except it run-time generates > > the > > equivalent of "Device(S???)" and "PCNT". (It may make sense to > > run-time generate the PCI hotplug as well - it consumes about 10K of > > space to statically generate the 31 devices.) > > I'm ok with the new version. > > Acked-by: Amos Kong <akong(a)redhat.com> > > > -Kevin > > > > > > diff --git a/src/acpi-dsdt.dsl b/src/acpi-dsdt.dsl > > index 08412e2..31ac5eb 100644 > > --- a/src/acpi-dsdt.dsl > > +++ b/src/acpi-dsdt.dsl > > @@ -128,48 +128,6 @@ DefinitionBlock ( > > PCRM, 32, > > } > > > > -#define hotplug_slot(name, nr) \ > > - Device (S##name) { \ > > - Name (_ADR, nr##0000) \ > > - Method (_EJ0,1) { \ > > - Store(ShiftLeft(1, nr), B0EJ) \ > > - Return (0x0) \ > > - } \ > > - Name (_SUN, name) \ > > - } > > - > > - hotplug_slot(1, 0x0001) > > - hotplug_slot(2, 0x0002) > > - hotplug_slot(3, 0x0003) > > - hotplug_slot(4, 0x0004) > > - hotplug_slot(5, 0x0005) > > - hotplug_slot(6, 0x0006) > > - hotplug_slot(7, 0x0007) > > - hotplug_slot(8, 0x0008) > > - hotplug_slot(9, 0x0009) > > - hotplug_slot(10, 0x000a) > > - hotplug_slot(11, 0x000b) > > - hotplug_slot(12, 0x000c) > > - hotplug_slot(13, 0x000d) > > - hotplug_slot(14, 0x000e) > > - hotplug_slot(15, 0x000f) > > - hotplug_slot(16, 0x0010) > > - hotplug_slot(17, 0x0011) > > - hotplug_slot(18, 0x0012) > > - hotplug_slot(19, 0x0013) > > - hotplug_slot(20, 0x0014) > > - hotplug_slot(21, 0x0015) > > - hotplug_slot(22, 0x0016) > > - hotplug_slot(23, 0x0017) > > - hotplug_slot(24, 0x0018) > > - hotplug_slot(25, 0x0019) > > - hotplug_slot(26, 0x001a) > > - hotplug_slot(27, 0x001b) > > - hotplug_slot(28, 0x001c) > > - hotplug_slot(29, 0x001d) > > - hotplug_slot(30, 0x001e) > > - hotplug_slot(31, 0x001f) > > - > > Name (_CRS, ResourceTemplate () > > { > > WordBusNumber (ResourceProducer, MinFixed, MaxFixed, > > PosDecode, > > @@ -762,6 +720,119 @@ DefinitionBlock ( > > Zero /* reserved */ > > }) > > > > + /* PCI hotplug */ > > + Scope(\_SB.PCI0) { > > + /* Methods called by bulk generated PCI devices below */ > > + Method (PCEJ, 1, NotSerialized) { > > + // _EJ0 method - eject callback > > + Store(ShiftLeft(1, Arg0), B0EJ) > > + Return (0x0) > > + } > > + > > + /* Bulk generated PCI hotplug devices */ > > +#define hotplug_func(nr, fn) \ > > + Device (S##nr##fn) { \ > > + Name (_ADR, 0x##nr##000##fn) \ > > + Method (_EJ0, 1) { Return(PCEJ(0x##nr)) } \ > > + Name (_SUN, 0x##nr) \ > > + } The fundamental question is still why would we have _EJ0 methods in functions >0 when they are not individually hotpluggable. I think only function 0 should have _EJ0. > > + > > +#define hotplug_slot(nr) \ > > + hotplug_func(nr, 0) \ > > + hotplug_func(nr, 1) \ > > + hotplug_func(nr, 2) \ > > + hotplug_func(nr, 3) \ > > + hotplug_func(nr, 4) \ > > + hotplug_func(nr, 5) \ > > + hotplug_func(nr, 6) \ > > + hotplug_func(nr, 7) > > + > > + hotplug_slot(01) > > + hotplug_slot(02) > > + hotplug_slot(03) > > + hotplug_slot(04) > > + hotplug_slot(05) > > + hotplug_slot(06) > > + hotplug_slot(07) > > + hotplug_slot(08) > > + hotplug_slot(09) > > + hotplug_slot(0a) > > + hotplug_slot(0b) > > + hotplug_slot(0c) > > + hotplug_slot(0d) > > + hotplug_slot(0e) > > + hotplug_slot(0f) > > + hotplug_slot(10) > > + hotplug_slot(11) > > + hotplug_slot(12) > > + hotplug_slot(13) > > + hotplug_slot(14) > > + hotplug_slot(15) > > + hotplug_slot(16) > > + hotplug_slot(17) > > + hotplug_slot(18) > > + hotplug_slot(19) > > + hotplug_slot(1a) > > + hotplug_slot(1b) > > + hotplug_slot(1c) > > + hotplug_slot(1d) > > + hotplug_slot(1e) > > + hotplug_slot(1f) > > + > > + /* PCI hotplug notify method */ > > + Method(PCNF, 0) { > > + // Local0 = iterator > > + Store (Zero, Local0) > > + While (LLess(Local0, 31)) { > > + Increment(Local0) > > + If (And(PCIU, ShiftLeft(1, Local0))) { > > + PCNT(Local0, 1) > > + } > > + If (And(PCID, ShiftLeft(1, Local0))) { > > + PCNT(Local0, 3) > > + } > > + } > > + Return(One) > > + } > > + > > +#define hotplug_notify(nr) \ > > + If (LEqual(Arg0, 0x##nr)) {Notify(S##nr##0, Arg1)} > > + > > + Method(PCNT, 2) { > > + hotplug_notify(01) > > + hotplug_notify(02) > > + hotplug_notify(03) > > + hotplug_notify(04) > > + hotplug_notify(05) > > + hotplug_notify(06) > > + hotplug_notify(07) > > + hotplug_notify(08) > > + hotplug_notify(09) > > + hotplug_notify(0a) > > + hotplug_notify(0b) > > + hotplug_notify(0c) > > + hotplug_notify(0d) > > + hotplug_notify(0e) > > + hotplug_notify(0f) > > + hotplug_notify(10) > > + hotplug_notify(11) > > + hotplug_notify(12) > > + hotplug_notify(13) > > + hotplug_notify(14) > > + hotplug_notify(15) > > + hotplug_notify(16) > > + hotplug_notify(17) > > + hotplug_notify(18) > > + hotplug_notify(19) > > + hotplug_notify(1a) > > + hotplug_notify(1b) > > + hotplug_notify(1c) > > + hotplug_notify(1d) > > + hotplug_notify(1e) > > + hotplug_notify(1f) > > + } > > + } > > + > > /* CPU hotplug */ > > Scope(\_SB) { > > /* Objects filled in by run-time generated SSDT */ > > @@ -842,49 +913,9 @@ DefinitionBlock ( > > Return(0x01) > > } > > > > -#define gen_pci_hotplug(nr) \ > > - If (And(\_SB.PCI0.PCIU, ShiftLeft(1, nr))) { \ > > - Notify(\_SB.PCI0.S##nr, 1) \ > > - } \ > > - If (And(\_SB.PCI0.PCID, ShiftLeft(1, nr))) { \ > > - Notify(\_SB.PCI0.S##nr, 3) \ > > - } > > - > > Method(_L01) { > > - gen_pci_hotplug(1) > > - gen_pci_hotplug(2) > > - gen_pci_hotplug(3) > > - gen_pci_hotplug(4) > > - gen_pci_hotplug(5) > > - gen_pci_hotplug(6) > > - gen_pci_hotplug(7) > > - gen_pci_hotplug(8) > > - gen_pci_hotplug(9) > > - gen_pci_hotplug(10) > > - gen_pci_hotplug(11) > > - gen_pci_hotplug(12) > > - gen_pci_hotplug(13) > > - gen_pci_hotplug(14) > > - gen_pci_hotplug(15) > > - gen_pci_hotplug(16) > > - gen_pci_hotplug(17) > > - gen_pci_hotplug(18) > > - gen_pci_hotplug(19) > > - gen_pci_hotplug(20) > > - gen_pci_hotplug(21) > > - gen_pci_hotplug(22) > > - gen_pci_hotplug(23) > > - gen_pci_hotplug(24) > > - gen_pci_hotplug(25) > > - gen_pci_hotplug(26) > > - gen_pci_hotplug(27) > > - gen_pci_hotplug(28) > > - gen_pci_hotplug(29) > > - gen_pci_hotplug(30) > > - gen_pci_hotplug(31) > > - > > - Return (0x01) > > - > > + // PCI hotplug event > > + Return(\_SB.PCI0.PCNF()) > > } > > Method(_L02) { > > // CPU hotplug event > >

8 years, 10 months

Booting from USB cdrom device doesn't work

by Sven Schnelle

Hi List, i have seabios running on a Thinkpad T60 with coreboot and seabios as Payload. When trying to boot from a USB cdrom, i get the following errors: Booting from DVD/CD... wait_td error - status=184007ff uhci_send_bulk failed USB transmission failed wait_td error - status=184007ff uhci_send_bulk failed USB transmission failed WARNING - Timeout at wait_td:427! uhci_send_bulk failed USB transmission failed WARNING - Timeout at wait_td:427! uhci_send_bulk failed USB transmission failed read capacity failed atapi_is_ready returned -1 WARNING - Timeout at wait_td:427! uhci_send_bulk failed USB transmission failed Boot failed: Could not read from CDROM (code 0003) I have no knowledge about USB, so if anybody could help me in interpreting those messages, or has an other idea what the problem is, that would be great. Thanks, Sven

8 years, 11 months

[PATCH] USB-MSC: Support multiple LUN devices

by Sven Schnelle

Add suport for using USB storage devices with multiple LUNs. One example for such a device is the HAGIWARA UDRW stick, which has one LUN that simulates a cdrom device, and one that acts like a disk device. Signed-off-by: Sven Schnelle <svens(a)stackframe.org> --- src/usb-msc.c | 146 +++++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 101 insertions(+), 45 deletions(-) diff --git a/src/usb-msc.c b/src/usb-msc.c index deccf35..bf5dce8 100644 --- a/src/usb-msc.c +++ b/src/usb-msc.c @@ -16,6 +16,7 @@ struct usbdrive_s { struct drive_s drive; struct usb_pipe *bulkin, *bulkout; + int lun; }; @@ -53,14 +54,32 @@ usb_cmd_data(struct disk_op_s *op, void *cdbcmd, u16 blocksize) if (!CONFIG_USB_MSC) return 0; -restart: - dprintf(16, "usb_cmd_data id=%p write=%d count=%d bs=%d buf=%p\n" - , op->drive_g, 0, op->count, blocksize, op->buf_fl); struct usbdrive_s *udrive_g = container_of( op->drive_g, struct usbdrive_s, drive); struct usb_pipe *bulkin = GET_GLOBAL(udrive_g->bulkin); struct usb_pipe *bulkout = GET_GLOBAL(udrive_g->bulkout); struct cdbres_request_sense sense; + int lun = GET_GLOBAL(udrive_g->lun); + unsigned char *data = (unsigned char *)cdbcmd; + +restart: + dprintf(16, "usb_cmd_data lun=%d id=%p write=%d count=%d bs=%d buf=%p\n" + , lun, op->drive_g, 0, op->count, blocksize, op->buf_fl); + + /* some SCSI commands have the LUN in CDB */ + if (data[0] == 0x08 || // READ(6) + data[0] == 0x12 || // INQUIRY + data[0] == 0x15 || // MODE SELECT(6) + data[0] == 0x55 || // MODE SELECT(10) + data[0] == 0x1A || // MODE SENSE(6) + data[0] == 0x28 || // READ(10) + data[0] == 0x1B || // START STOP UNIT(6) + data[0] == 0x25 || // READ CAPACITY + data[0] == 0x03 // REQUEST SENSE + ) { + data[1] &= ~0x10; + data[1] |= (lun & 7) << 5; + } // Setup command block wrapper. u32 bytes = blocksize * op->count; @@ -70,7 +89,7 @@ restart: cbw.dCBWTag = 999; // XXX cbw.dCBWDataTransferLength = bytes; cbw.bmCBWFlags = USB_DIR_IN; // XXX - cbw.bCBWLUN = 0; // XXX + cbw.bCBWLUN = lun; cbw.bCBWCBLength = USB_CDB_SIZE; memcpy(cbw.CBWCB, cdbcmd, USB_CDB_SIZE); @@ -199,44 +218,36 @@ setup_drive_hd(struct disk_op_s *op, char *desc) return 0; } -// Configure a usb msc device. -int -usb_msc_init(struct usb_pipe *pipe - , struct usb_interface_descriptor *iface, int imax) +static int +usb_msc_maxlun(struct usb_pipe *pipe, unsigned char *maxlun) { - if (!CONFIG_USB_MSC) - return -1; - - // Verify right kind of device - if ((iface->bInterfaceSubClass != US_SC_SCSI && - iface->bInterfaceSubClass != US_SC_ATAPI_8070 && - iface->bInterfaceSubClass != US_SC_ATAPI_8020) - || iface->bInterfaceProtocol != US_PR_BULK) { - dprintf(1, "Unsupported MSC USB device (subclass=%02x proto=%02x)\n" - , iface->bInterfaceSubClass, iface->bInterfaceProtocol); - return -1; - } + struct usb_ctrlrequest req; + req.bRequestType = USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE; + req.bRequest = 0xfe; + req.wValue = 0; + req.wIndex = 0; + req.wLength = 1; + return send_default_control(pipe, &req, maxlun); +} +static int usb_msc_init_lun(struct usb_pipe *inpipe, + struct usb_pipe *outpipe, + struct usb_interface_descriptor *iface, + int lun) +{ // Allocate drive structure. struct usbdrive_s *udrive_g = malloc_fseg(sizeof(*udrive_g)); if (!udrive_g) { - warn_noalloc(); - goto fail; + warn_noalloc(); + return -1; } + memset(udrive_g, 0, sizeof(*udrive_g)); udrive_g->drive.type = DTYPE_USB; + udrive_g->lun = lun; - // Find bulk in and bulk out endpoints. - struct usb_endpoint_descriptor *indesc = findEndPointDesc( - iface, imax, USB_ENDPOINT_XFER_BULK, USB_DIR_IN); - struct usb_endpoint_descriptor *outdesc = findEndPointDesc( - iface, imax, USB_ENDPOINT_XFER_BULK, USB_DIR_OUT); - if (!indesc || !outdesc) - goto fail; - udrive_g->bulkin = alloc_bulk_pipe(pipe, indesc); - udrive_g->bulkout = alloc_bulk_pipe(pipe, outdesc); - if (!udrive_g->bulkin || !udrive_g->bulkout) - goto fail; + udrive_g->bulkin = inpipe; + udrive_g->bulkout = outpipe; // Validate drive and find block size and sector count. struct disk_op_s dop; @@ -245,10 +256,10 @@ usb_msc_init(struct usb_pipe *pipe struct cdbres_inquiry data; int ret = cdb_get_inquiry(&dop, &data); if (ret) - goto fail; + goto fail; if (cdb_start_stop_unit(&dop, 0, 1)) - goto fail; + goto fail; char vendor[sizeof(data.vendor)+1], product[sizeof(data.product)+1]; char rev[sizeof(data.rev)+1]; @@ -261,24 +272,69 @@ usb_msc_init(struct usb_pipe *pipe int pdt = data.pdt & 0x1f; int removable = !!(data.removable & 0x80); dprintf(1, "USB MSC vendor='%s' product='%s' rev='%s' type=%d removable=%d\n" - , vendor, product, rev, pdt, removable); + , vendor, product, rev, pdt, removable); udrive_g->drive.removable = removable; if (pdt == USB_MSC_TYPE_CDROM) { - char *desc = znprintf(MAXDESCSIZE, "DVD/CD [USB Drive %s %s %s]" - , vendor, product, rev); - ret = setup_drive_cdrom(&dop, desc); + char *desc = znprintf(MAXDESCSIZE, "DVD/CD [USB Drive %s %s %s]" + , vendor, product, rev); + ret = setup_drive_cdrom(&dop, desc); } else { - char *desc = znprintf(MAXDESCSIZE, "USB Drive %s %s %s" - , vendor, product, rev); - ret = setup_drive_hd(&dop, desc); + char *desc = znprintf(MAXDESCSIZE, "USB Drive %s %s %s" + , vendor, product, rev); + ret = setup_drive_hd(&dop, desc); } if (ret) - goto fail; + goto fail; return 0; -fail: - dprintf(1, "Unable to configure USB MSC device.\n"); + fail: free(udrive_g); return -1; } + +// Configure a usb msc device. +int +usb_msc_init(struct usb_pipe *pipe + , struct usb_interface_descriptor *iface, int imax) +{ + unsigned char maxlun, lun; + + if (!CONFIG_USB_MSC) + return -1; + + // Verify right kind of device + if ((iface->bInterfaceSubClass != US_SC_SCSI && + iface->bInterfaceSubClass != US_SC_ATAPI_8070 && + iface->bInterfaceSubClass != US_SC_ATAPI_8020) + || iface->bInterfaceProtocol != US_PR_BULK) { + dprintf(1, "Unsupported MSC USB device (subclass=%02x proto=%02x)\n" + , iface->bInterfaceSubClass, iface->bInterfaceProtocol); + return -1; + } + + // Find bulk in and bulk out endpoints. + struct usb_endpoint_descriptor *indesc = findEndPointDesc( + iface, imax, USB_ENDPOINT_XFER_BULK, USB_DIR_IN); + struct usb_endpoint_descriptor *outdesc = findEndPointDesc( + iface, imax, USB_ENDPOINT_XFER_BULK, USB_DIR_OUT); + + if (!indesc || !outdesc) + return -1; + + struct usb_pipe *inpipe = alloc_bulk_pipe(pipe, indesc); + if (!inpipe) + return -1; + + struct usb_pipe *outpipe = alloc_bulk_pipe(pipe, outdesc); + if (!outpipe) + return -1; + + if (usb_msc_maxlun(pipe, &maxlun)) + maxlun = 0; + + for (lun = 0; lun < maxlun+1; lun++) + usb_msc_init_lun(inpipe, outpipe, iface, lun); + + return 0; +} -- 1.7.7

8 years, 11 months

[PATCH] i8042_flush change

by John Baboval

When using seabios with Xen and qemu, I frequently get the following message: WARNING - Timeout at i8042_flush:69! I do have a slightly unusual configuration compared to the typical Xen configuration. We are running with no hvmloader. However I don't think that's related to this issue.... The flush routine attempts to read the queue depth's worth of data from the port and then checks to see if the queue is empty. There are two issues with this. First is that qemu and seabios disagree about the queue depth. Qemu's ps2 buffer has 256 entries, and I8042_BUFFER_SIZE is 16 for seabios. The second is that a command may arrive between the start of the flush loop and the completion. I believe a more robust way to do this would be to first issue a RESET command, and then flush. That resolves the issue that I am seeing. Signed-off By: John Baboval <john.baboval(a)virtualcomputer.com> --- diff --git a/src/ps2port.c b/src/ps2port.c index 58335af..4ed25bf 100644 --- a/src/ps2port.c +++ b/src/ps2port.c @@ -20,7 +20,7 @@ // Timeout value. #define I8042_CTL_TIMEOUT 10000 -#define I8042_BUFFER_SIZE 16 +#define I8042_BUFFER_SIZE 256 static int i8042_wait_read(void) @@ -391,7 +391,7 @@ handle_09(void) } v = inb(PORT_PS2_DATA); - if (!(GET_EBDA(ps2ctr) & I8042_CTR_KBDINT)) + if (!(GET_EBDA(ps2ctr) & I8042_CTR_KBDINT)) // Interrupts not enabled. goto done; @@ -409,13 +409,17 @@ done: static void keyboard_init(void *data) { + int ret; + u8 param[2]; /* flush incoming keys */ - int ret = i8042_flush(); + ret = ps2_kbd_command(ATKBD_CMD_RESET_BAT, param); + if (ret) + return; + ret = i8042_flush(); if (ret) return; // Controller self-test. - u8 param[2]; ret = i8042_command(I8042_CMD_CTL_TEST, param); if (ret) return;

8 years, 11 months

Re: [SeaBIOS] [Qemu-devel] [PATCH 1/2] seabios: Add Local APIC NMI Structure to ACPI MADT

by Kenji Kaneshige

(2011/10/28 21:48), Jun Koi wrote: > 2011/10/28 Kenji Kaneshige<kaneshige.kenji(a)jp.fujitsu.com>: >> Avi, Jan, >> >> Could you comment on these patches? >> >> Inject-NMI doesn't work on Windows guest without these patches. > > sorry but i am really curious here: why Windows still works well even > if it desnt see the inject-NMI? > or there are still invisible side-effects that we are not awere of??? Without this patch, LVT LINT1 is not configured by Windows guest because seabios MADT has no ACPI NMI structure which is used by Windows to setup LVT. So NMI interrupt would not be sent to CPUs when NMI signal happens on LINT1. But qemu/kvm inject-nmi feature had a bug that it sent NMI to CPUs without emulating LAPIC LVT. As a result, NMI interrupt is sent to all the CPUs even though LVT LINT1 is not configured. This is why inject-nmi behaves as if it works well on Windows guest. Regards, Kenji Kaneshige

8 years, 11 months

Re: [SeaBIOS] POST Memory Manager emulation in SeaBIOS

by Kevin O'Connor

On Sat, Oct 22, 2011 at 01:40:08AM +0700, Darmawan Salihun wrote: > Hi Kevin, > > >> The log for my target option ROM was inadvertently not included. > >> Here it is: > >> ------------ > > [...] > >> pnp call arg1=50 > >> -------------- > > > > Hrmm - the PNP support in SeaBIOS is really just a stub. The 0x50 > > function isn't supported (it looks to be an smbios call). > > > > -Kevin > > > > Is there another file besides pnpbios.c which implement the stub? > I grep-ed through the SeaBIOS source but that's the only one I found. The PNP stuff is entirely in pnpbios.c. The only call supported is 0x60 - which is needed to convince gPXE to relocate itself to high memory. -Kevin

8 years, 11 months

[PATCH 2/2] seabios: fix mptable nmi entry (was: Re: [Qemu-devel] [PATCH] qemu: Fix inject-nmi)

by Lai Jiangshan

From: Kenji Kaneshige <kaneshige.kenji(a)jp.fujitsu.com> In the current seabios MP table description, NMI is connected only to BSP's LINT1. But usually NMI is connected to all the CPUs' LINT1 as indicated in MP specification. This patch changes seabios MP table to describe NMI is connected to all the CPUs' LINT1. Signed-off-by: Kenji Kaneshige <kaneshige.kenji(a)jp.fujitsu.com> Reviewed-by: Lai Jiangshan <laijs(a)cn.fujitsu.com> --- src/mptable.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: seabios/src/mptable.c =================================================================== --- seabios.orig/src/mptable.c +++ seabios/src/mptable.c @@ -169,7 +169,7 @@ mptable_init(void) intsrc->irqflag = 0; /* PO, EL default */ intsrc->srcbus = isabusid; /* ISA */ intsrc->srcbusirq = 0; - intsrc->dstapic = 0; /* BSP == APIC #0 */ + intsrc->dstapic = 0xff; /* to all local APICs */ intsrc->dstirq = 1; /* LINTIN1 */ intsrc++; entrycount += intsrc - intsrcs;

8 years, 11 months

[PATCH RFC] acpi: extract aml from .lst

by Michael S. Tsirkin

Add ACPI_EXTRACT_ALL_CODE directive, to support extracting AML code from listing into a named array. Use that instead including C file generated by iasl, this makes it possible to include multiple AML tables without resorting to preprocessor tricks. Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com> --- Kevin, you suggested something like the below, I think? Seems to work but RFC since I didn't have time to test this properly. diff --git a/Makefile b/Makefile index 91d9b77..200a07a 100644 --- a/Makefile +++ b/Makefile @@ -198,7 +198,7 @@ src/%.hex: src/%.dsl ./tools/acpi_extract_preprocess.py ./tools/acpi_extract.py $(Q)./tools/acpi_extract_preprocess.py $(OUT)$*.dsl.i.orig > $(OUT)$*.dsl.i $(Q)iasl -l -tc -p $(OUT)$* $(OUT)$*.dsl.i $(Q)./tools/acpi_extract.py $(OUT)$*.lst > $(OUT)$*.off - $(Q)cat $(OUT)$*.hex $(OUT)$*.off > $@ + $(Q)cat $(OUT)$*.off > $@ $(OUT)ccode32flat.o: src/acpi-dsdt.hex src/ssdt-proc.hex diff --git a/src/acpi-dsdt.dsl b/src/acpi-dsdt.dsl index a5f0a4d..b9b06f2 100644 --- a/src/acpi-dsdt.dsl +++ b/src/acpi-dsdt.dsl @@ -16,6 +16,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + +ACPI_EXTRACT_ALL_CODE AmlCode + DefinitionBlock ( "acpi-dsdt.aml", // Output Filename "DSDT", // Signature diff --git a/src/acpi.c b/src/acpi.c index 27a939e..f743bdd 100644 --- a/src/acpi.c +++ b/src/acpi.c @@ -366,9 +366,7 @@ encodeLen(u8 *ssdt_ptr, int length, int bytes) return ssdt_ptr + bytes; } -#define AmlCode static ssdp_proc_aml #include "ssdt-proc.hex" -#undef AmlCode /* 0x5B 0x83 ProcessorOp PkgLength NameString ProcID */ #define SD_OFFSET_CPUHEX (*ssdt_proc_name - *ssdt_proc_start + 2) diff --git a/src/ssdt-proc.dsl b/src/ssdt-proc.dsl index a461636..0339422 100644 --- a/src/ssdt-proc.dsl +++ b/src/ssdt-proc.dsl @@ -14,6 +14,9 @@ * and a CPON array with the list of active and inactive cpus: * Name(CPON, Package() { One, One, ..., Zero, Zero, ... }) */ + +ACPI_EXTRACT_ALL_CODE ssdp_proc_aml + DefinitionBlock ("ssdt-proc.aml", "SSDT", 0x01, "BXPC", "BXSSDT", 0x1) { ACPI_EXTRACT_PROCESSOR_START ssdt_proc_start diff --git a/tools/acpi_extract.py b/tools/acpi_extract.py index 9083cff..5f613e4 100755 --- a/tools/acpi_extract.py +++ b/tools/acpi_extract.py @@ -29,6 +29,8 @@ # ACPI_EXTRACT_PROCESSOR_START - start of Processor() block # ACPI_EXTRACT_PROCESSOR_STRING - extract a NameString from Processor() # ACPI_EXTRACT_PROCESSOR_END - offset at last byte of Processor() + 1 +# +# ACPI_EXTRACT_ALL_CODE - create an array storing the generated AML bytecode # # ACPI_EXTRACT is not allowed anywhere else in code, except in comments. @@ -240,6 +242,11 @@ for i in range(len(asl)): array = mext.group(2) offset = asl[i].aml_offset + if (directive == "ACPI_EXTRACT_ALL_CODE"): + if array in output: + die("%s directive used more than once" % directive) + output[array] = aml + continue if (directive == "ACPI_EXTRACT_NAME_DWORD_CONST"): offset = aml_name_dword_const(offset) elif (directive == "ACPI_EXTRACT_NAME_WORD_CONST"): @@ -261,21 +268,25 @@ for i in range(len(asl)): if array not in output: output[array] = [] - output[array].append("0x%x" % offset) + output[array].append(offset) debug = "at end of file" -#Use type large enough to fit the table -if (len(aml) >= 0x10000): - offsettype = "int" -elif (len(aml) >= 0x100): - offsettype = "short" -else: - offsettype = "char" +def get_value_type(maxvalue): + #Use type large enough to fit the table + if (maxvalue >= 0x10000): + return "int" + elif (maxvalue >= 0x100): + return "short" + else: + return "char" # Pretty print output for array in output.keys(): - - sys.stdout.write("static unsigned %s %s[] = {\n" % (offsettype, array)) - sys.stdout.write(",\n".join(output[array])) + otype = get_value_type(max(output[array])) + odata = [] + for value in output[array]: + odata.append("0x%x" % value) + sys.stdout.write("static unsigned %s %s[] = {\n" % (otype, array)) + sys.stdout.write(",\n".join(odata)) sys.stdout.write('\n};\n');

8 years, 11 months

[PATCH 0/2] allow loading of ACPI DSDT from qemu fw_cfg api

by Isaku Yamahata

This patch allows loading ACPI DSDT from qemu via fw_cfg interface. So this patch makes it easy for users to replace existing DSDT embed in seabios binary. Isaku Yamahata (2): util: add le32_to_cpu() seabios: acpi: allow qemu to load dsdt as external acpi table. src/acpi.c | 47 +++++++++++++++++++++++++++++++++++++++-------- src/util.h | 5 +++++ 2 files changed, 44 insertions(+), 8 deletions(-)

8 years, 11 months

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS October 2011