SeaBIOS

seabios@seabios.org

5 participants
3802 discussions

Bug in SeaBIOS virtio-ring handling bug with vhost-scsi-pci
by Nicholas A. Bellinger 09 Apr '13

09 Apr '13

Hi Paolo & Co, So I've been running into another bug with SeaBIOS w/ virtio-scsi + vhost-scsi-pci code.. During the last weeks debugging on the QEMU vhost memory re-mapping bug, my seabios builds have been using a smaller target ID (16) for scanning than the default hard coded value of 256 in init_virtio_scsi(). After bumping this value back to 256 recently, a bogus out_num value from vhost_get_vq_desc() start appearing on the tcm_vhost side: [17348.044031] Invalid buffer layout out: 0 in: 2 After adding more debug output to SeaBIOS, the vring->num value appears to be reset from the expected MAX_QUEUE_NUM=128, then incremented each time after vring_more_used() is called to poll for completion.. init virtio-scsi found virtio-scsi at 0:4 vring_init Setting vr->num: 128 Calling virtio_scsi_scan_target for target: 0 Searching bootorder for: /pci@i0cf8/*@4/*@0/*@0,0 virtio_scsi_cmd, using vring_add_buf for out_num: 1 in_num: 2 virtio_scsi_cmd, using vring_add_buf vr: 0x000ed404 vr->num: 128 vring_add_buf, vr: 0x000ed404 vr->num: 128 vring_add_buf, head: 0, index: 0 vring_add_buf, setting desc[prev=2].flags vring_add_buf, setting free_head: 3 vring_add_buf, setting q->vdata[head=0] vring_add_buf, setting q->ring[av=0] virtio_scsi_cmd, after vring_add_buf vr: 0x000ed404 vr->num: 128 virtio_scsi_cmd, after vring_kick vr: 0x000ed404 vr->num: 128 virtio_scsi_cmd, after vring_more_used #4 vr: 0x000ed404 vr->num: 1 ^^^^^^^^^^^^^^^^^^^^^^^^^ Reset from 128 to 1 immediate after first vring_more_used()..? vring_get_buf last_used_idx: 0 vr: 0x000ed404 vr->num: 1 vring_get_buf checking &used->ring[0] vring_get_buf, using new last_unsed: 0 >>>>>>>>>>>>>>>>>> vring_get_buf using id: 0 from elem->id: 0x000ed004 vring_detach: vq->free_head: 3 vring_detach: Setting new vq->free_head: 0 virtio_scsi_cmd, after vring_get_buf #5 vr: 0x000ed404 vr->num: 1 Calling virtio_scsi_scan_target for target: 1 Searching bootorder for: /pci@i0cf8/*@4/*@0/*@1,0 virtio_scsi_cmd, using vring_add_buf for out_num: 1 in_num: 2 virtio_scsi_cmd, using vring_add_buf vr: 0x000ed404 vr->num: 1 vring_add_buf, vr: 0x000ed404 vr->num: 1 vring_add_buf, head: 0, index: 0 vring_add_buf, setting desc[prev=2].flags vring_add_buf, setting free_head: 3 vring_add_buf, setting q->vdata[head=0] vring_add_buf, setting q->ring[av=0] virtio_scsi_cmd, after vring_add_buf vr: 0x000ed404 vr->num: 1 virtio_scsi_cmd, after vring_kick vr: 0x000ed404 vr->num: 1 virtio_scsi_cmd, after vring_more_used #4 vr: 0x000ed404 vr->num: 2 ^^^^^^^^^^^^^^^^^^^^^^^^^ Incremented from 1 to 2 after second vring_more_used()..? vring_get_buf last_used_idx: 1 vr: 0x000ed404 vr->num: 2 vring_get_buf checking &used->ring[1] vring_get_buf, using new last_unsed: 1 >>>>>>>>>>>>>>>>>> vring_get_buf using id: 0 from elem->id: 0x000ed00c vring_detach: vq->free_head: 3 vring_detach: Setting new vq->free_head: 0 virtio_scsi_cmd, after vring_get_buf #5 vr: 0x000ed404 vr->num: 2 virtio-scsi vendor='LIO-ORG' product='RAMDISK-MCP' rev='4.0' type=0 removable=0 virtio_scsi_cmd, using vring_add_buf for out_num: 1 in_num: 1 virtio_scsi_cmd, using vring_add_buf vr: 0x000ed404 vr->num: 2 vring_add_buf, vr: 0x000ed404 vr->num: 2 vring_add_buf, head: 0, index: 0 vring_add_buf, setting desc[prev=1].flags vring_add_buf, setting free_head: 2 vring_add_buf, setting q->vdata[head=0] vring_add_buf, setting q->ring[av=0] virtio_scsi_cmd, after vring_add_buf vr: 0x000ed404 vr->num: 2 virtio_scsi_cmd, after vring_kick vr: 0x000ed404 vr->num: 2 virtio_scsi_cmd, after vring_more_used #4 vr: 0x000ed404 vr->num: 3 ^^^^^^^^^^^^^^^^^^^^^^^^^ Incremented from 2 to 3, and so on.. and this keeps happening until vr->num begins to exceed MAX_QUEUE_NUM around scanning of target ID 127: virtio_scsi_cmd, after vring_add_buf vr: 0x000ed404 vr->num: 128 virtio_scsi_cmd, after vring_kick vr: 0x000ed404 vr->num: 128 virtio_scsi_cmd, after vring_more_used #4 vr: 0x000ed404 vr->num: 129 vring_get_buf last_used_idx: 128 vr: 0x000ed404 vr->num: 129 vring_get_buf checking &used->ring[128] vring_get_buf, using new last_unsed: 128 >>>>>>>>>>>>>>>>>> vring_get_buf using id: 129 from elem->id: 0x000ed404 vring_detach: vq->free_head: 3 vring_detach: Setting new vq->free_head: 129 virtio_scsi_cmd, after vring_get_buf #5 vr: 0x000ed404 vr->num: 129 Calling virtio_scsi_scan_target for target: 127 Searching bootorder for: /pci@i0cf8/*@4/*@0/*@127,0 virtio_scsi_cmd, using vring_add_buf for out_num: 1 in_num: 2 virtio_scsi_cmd, using vring_add_buf vr: 0x000ed404 vr->num: 129 vring_add_buf, vr: 0x000ed404 vr->num: 129 vring_add_buf, head: 129, index: 0 vring_add_buf, setting desc[prev=4].flags vring_add_buf, setting free_head: 5 vring_add_buf, setting q->vdata[head=0] vring_add_buf, setting q->ring[av=129] virtio_scsi_cmd, after vring_add_buf vr: 0x000ed404 vr->num: 129 virtio_scsi_cmd, after vring_kick vr: 0x000ed404 vr->num: 129 virtio_scsi_cmd, after vring_more_used #4 vr: 0x000ed404 vr->num: 130 vring_get_buf last_used_idx: 129 vr: 0x000ed404 vr->num: 130 vring_get_buf checking &used->ring[129] vring_get_buf, using new last_unsed: 129 >>>>>>>>>>>>>>>>>> vring_get_buf using id: 968704 from elem->id: 0x000ed40c vring_detach: vq->free_head: 5 vring_detach: Setting new vq->free_head: 968704 virtio_scsi_cmd, after vring_get_buf #5 vr: 0x000ed404 vr->num: 130 Calling virtio_scsi_scan_target for target: 128 Searching bootorder for: /pci@i0cf8/*@4/*@0/*@128,0 virtio_scsi_cmd, using vring_add_buf for out_num: 1 in_num: 2 virtio_scsi_cmd, using vring_add_buf vr: 0x000ed404 vr->num: 130 vring_add_buf, vr: 0x000ed404 vr->num: 130 vring_add_buf, head: 51200, index: 0 vring_add_buf, setting desc[prev=1].flags vring_add_buf, setting free_head: 2 vring_add_buf, setting q->vdata[head=0] vring_add_buf, setting q->ring[av=51200] until '[17348.044031] Invalid buffer layout out: 0 in: 2' appears on the vhost. So it's clear this definitely is not supposed to be happening, but I've not yet been able to ascertain why it's suddenly being triggered now..? I don't recall Asias running into a similar issue during his earlier testing, but this bug is happening after every I/O in SeaBIOS with the most recent vhost-scsi-pci code. I'm using the following to work-around this issue for the moment, and would like some input from virtio / SeaBIOS folks.. WDYT..? --nab diff --git a/src/virtio-ring.c b/src/virtio-ring.c index bddb090..e046141 100644 --- a/src/virtio-ring.c +++ b/src/virtio-ring.c @@ -35,10 +35,16 @@ int vring_more_used(struct vring_virtqueue *vq) { + struct vring *vr = &vq->vring; struct vring_used *used = GET_LOWFLAT(vq->vring.used); int more = GET_LOWFLAT(vq->last_used_idx) != GET_LOWFLAT(used->idx); /* Make sure ring reads are done after idx read above. */ smp_rmb(); + + /* Huh..? vr->num is somehow changing from below us..? */ + if (GET_LOWFLAT(vr->num) != MAX_QUEUE_NUM) { + SET_LOWFLAT(vr->num, MAX_QUEUE_NUM); + } return more; }

3 4

[seabios PATCH] install the MADT from the "etc/acpi/APIC" fw_cfg file if it's available
by Laszlo Ersek 08 Apr '13

08 Apr '13

Signed-off-by: Laszlo Ersek <lersek(a)redhat.com> --- src/acpi.c | 29 ++++++++++++++++++++++++++++- 1 files changed, 28 insertions(+), 1 deletions(-) diff --git a/src/acpi.c b/src/acpi.c index bc4d8ea..9e128b2 100644 --- a/src/acpi.c +++ b/src/acpi.c @@ -393,6 +393,33 @@ build_madt(void) return madt; } +static void* +find_table(const char *sig, void *(*buildfn)(void)) +{ + char buf[] = "etc/acpi/QUUX"; + struct romfile_s *file; + + snprintf(buf + (sizeof buf - 1 - 4), 4 + 1, "%s", sig); + file = romfile_find(buf); + if (file != NULL && file->size >= sizeof(struct acpi_table_header)) { + void *table; + + table = malloc_high(file->size); + if (table == NULL) + warn_noalloc(); + else { + if ((*file->copy)(file, table, file->size) == file->size) { + dprintf(4, "ACPI %s: using fw_cfg %s\n", sig, buf); + return table; + } + free(table); + } + } + + dprintf(4, "ACPI %s: building default\n", sig); + return (*buildfn)(); +} + // Encode a hex value static inline char getHex(u32 val) { val &= 0x0f; @@ -792,7 +819,7 @@ acpi_setup(void) struct fadt_descriptor_rev1 *fadt = build_fadt(pci); ACPI_INIT_TABLE(fadt); ACPI_INIT_TABLE(build_ssdt()); - ACPI_INIT_TABLE(build_madt()); + ACPI_INIT_TABLE(find_table("APIC", build_madt)); ACPI_INIT_TABLE(build_hpet()); ACPI_INIT_TABLE(build_srat()); if (pci->device == PCI_DEVICE_ID_INTEL_ICH9_LPC) -- 1.7.1

1 0

[qemu PATCH 0/5] publish etc/acpi/APIC in fw_cfg
by Laszlo Ersek 08 Apr '13

08 Apr '13

This series exports the MADT (APIC) ACPI table under the new "etc/acpi/APIC" fw_cfg file. I sought to follow the requirements set forth in [1], the new table is only visible in the patched/patched case. I cross-tested { master, patched } qemu with { master, patched } seabios (the APIC, DSDT and RSDT tables) using guest acpidump and dmesg. The -acpitable command line option is purposely ignored based on the last paragraph of [2]; the user isn't supposed to pass APIC with that option. checkpatch.pl complains a little but (as last time) it's a false alarm. The series is bisectable. [1] http://thread.gmane.org/gmane.comp.emulators.qemu/202005/focus=202072 [2] http://thread.gmane.org/gmane.comp.bios.coreboot.seabios/5960/focus=6008 Laszlo Ersek (5): refer to FWCfgState explicitly hw/acpi: extract standard table headers as a standalone structure hw/acpi: export default ACPI headers using the type just introduced hw/acpi: export acpi_checksum() i386/pc: build ACPI MADT (APIC) for fw_cfg clients hw/acpi.h | 15 +++++ hw/loader.h | 3 +- hw/multiboot.h | 4 +- hw/pc.h | 20 ++++--- hw/acpi.c | 89 ++++++++++++++------------- hw/acpi_piix4.c | 2 +- hw/i386/multiboot.c | 2 +- hw/i386/pc.c | 166 +++++++++++++++++++++++++++++++++++++++++++++++---- hw/i386/pc_piix.c | 4 +- hw/i386/pc_q35.c | 10 ++- hw/loader.c | 2 +- hw/sparc/sun4m.c | 6 +- hw/sparc64/sun4u.c | 2 +- 13 files changed, 248 insertions(+), 77 deletions(-)

1 5

Re: [SeaBIOS] [PATCH V3 WIP 3/3] disable vhost_verify_ring_mappings check
by Nicholas A. Bellinger 03 Apr '13

03 Apr '13

On Wed, 2013-03-27 at 23:45 -0700, Nicholas A. Bellinger wrote: > On Wed, 2013-03-27 at 15:33 -0700, Nicholas A. Bellinger wrote: > > On Wed, 2013-03-27 at 23:56 +0200, Michael S. Tsirkin wrote: > > > On Wed, Mar 27, 2013 at 02:31:27PM -0700, Nicholas A. Bellinger wrote: <SNIP> Adding a bit more detailed seabios PCI setup info, and make_bios_readonly_intel() debug output for Kevin & Co to review. > > > > > I still do not understand how this happened. Somehow a memory region > > > was deleted after vhost_dev_start but before vhost_virtqueue_start was > > > called? > > > > Not sure.. > > > > To clarify, this is only happening during seabios setup+scan of > > virtio-scsi, and not during normal virtio_scsi LLD operation. > > > > > Can you set a breakpoint there and see please? > > > > > > > > > > A bit more context here.. > > After debugging seabios this evening, I've isolated the spot where > things begin to go south for vhost_verify_ring_mappings check() > > Below are logs from qemu + seabios serial output mixed to (attempt) to > demonstrate what's going on.. > > root@tifa:/usr/src# qemu-system-x86_64 -enable-kvm -smp 4 -m 2048 > -serial file:/tmp/vhost-serial.txt > -hda /usr/src/qemu-paolo.git/debian_squeeze_amd64_standard.qcow2 -device > vhost-scsi-pci,wwpn=naa.600140579ad21088 > qemu-system-x86_64: pci_add_option_rom: failed to find romfile "efi-e1000.rom" > Calling ->region_add: section.size: 655360 > vhost_set_memory: section: 0x7fff962c2580 section->size: 655360 add: 1 > Calling ->region_add: section.size: 131072 > Calling ->region_add: section.size: 131072 > vhost_set_memory: section: 0x7fff962c2580 section->size: 131072 add: 1 > Calling ->region_add: section.size: 131072 > vhost_set_memory: section: 0x7fff962c2580 section->size: 131072 add: 1 > Calling ->region_add: section.size: 2146435072 > vhost_set_memory: section: 0x7fff962c2580 section->size: 2146435072 add: 1 > Calling ->region_add: section.size: 4096 > Calling ->region_add: section.size: 1024 > Calling ->region_add: section.size: 1048576 > Calling ->region_add: section.size: 262144 > vhost_set_memory: section: 0x7fff962c2580 section->size: 262144 add: 1 > vhost_scsi_init_pci Before virtio_init_pci > virtio_init_pci: size: 60 > virtio_init_pci: new size: 64 > vhost_set_memory: section: 0x7fe2801f2b60 section->size: 131072 add: 0 > vhost_set_memory: section: 0x7fe2801f2aa0 section->size: 32768 add: 1 > vhost_set_memory: section: 0x7fe2801f2aa0 section->size: 98304 add: 1 > vhost_set_memory: section: 0x7fe2801f2b60 section->size: 32768 add: 0 > vhost_set_memory: section: 0x7fe2801f2b60 section->size: 98304 add: 0 > vhost_set_memory: section: 0x7fe2801f2aa0 section->size: 65536 add: 1 > vhost_set_memory: section: 0x7fe2801f2aa0 section->size: 65536 add: 1 > vhost_set_memory: section: 0x7fe2801f2b60 section->size: 65536 add: 0 > vhost_set_memory: section: 0x7fe2801f2b60 section->size: 65536 add: 0 > vhost_set_memory: section: 0x7fe2801f2aa0 section->size: 98304 add: 1 > vhost_set_memory: section: 0x7fe2801f2aa0 section->size: 32768 add: 1 > vhost_set_memory: section: 0x7fe2801f2b60 section->size: 98304 add: 0 > vhost_set_memory: section: 0x7fe2801f2b60 section->size: 32768 add: 0 > vhost_set_memory: section: 0x7fe2801f2aa0 section->size: 131072 add: 1 > vhost_set_memory: section: 0x7fe2801f2b60 section->size: 131072 add: 0 > vhost_set_memory: section: 0x7fe2801f2b60 section->size: 131072 add: 0 > vhost_set_memory: section: 0x7fe2801f2aa0 section->size: 163840 add: 1 > vhost_set_memory: section: 0x7fe2801f2aa0 section->size: 98304 add: 1 > vhost_set_memory: section: 0x7fe2801f2b60 section->size: 163840 add: 0 > vhost_set_memory: section: 0x7fe2801f2b60 section->size: 98304 add: 0 > vhost_set_memory: section: 0x7fe2801f2aa0 section->size: 196608 add: 1 > vhost_set_memory: section: 0x7fe2801f2aa0 section->size: 65536 add: 1 > vhost_set_memory: section: 0x7fe2801f2b60 section->size: 196608 add: 0 > vhost_set_memory: section: 0x7fe2801f2b60 section->size: 65536 add: 0 > vhost_set_memory: section: 0x7fe2801f2b60 section->size: 2146435072 add: 0 > vhost_set_memory: section: 0x7fe2801f2aa0 section->size: 2146697216 add: 1 > vhost_set_memory: section: 0x7fe2801f29f0 section->size: 65536 add: 1 > vhost_set_memory: section: 0x7fe2801f2ab0 section->size: 65536 add: 0 > vhost_set_memory: section: 0x7fe2801f2a70 section->size: 8388608 add: 1 > Entering vhost_dev_start >>>>>>>>>>>>>>>>>>>>>. > Before vhost_virtqueue_start >>>>>>>>>>>>>>>>>>>>>>>>>>. > After vhost_virtqueue_start >>>>>>>>>>>>>>>>>>>>>>>>>>. > > <Start seabios serial output from init virtio-scsi code> > === PCI device probing === PCI probe PCI device 00:00.0 (vd=8086:1237 c=0600) PCI device 00:01.0 (vd=8086:7000 c=0601) PCI device 00:01.1 (vd=8086:7010 c=0101) PCI device 00:01.3 (vd=8086:7113 c=0680) PCI device 00:02.0 (vd=1013:00b8 c=0300) PCI device 00:03.0 (vd=8086:100e c=0200) PCI device 00:04.0 (vd=1af4:1004 c=0100) Found 7 PCI devices (max PCI bus is 00) === PCI new allocation pass #1 === PCI: check devices === PCI new allocation pass #2 === PCI: map device bdf=00:03.0 bar 1, addr 0000c000, size 00000040 [io] PCI: map device bdf=00:04.0 bar 0, addr 0000c040, size 00000040 [io] PCI: map device bdf=00:01.1 bar 4, addr 0000c080, size 00000010 [io] PCI: map device bdf=00:03.0 bar 0, addr febc0000, size 00020000 [mem] PCI: map device bdf=00:02.0 bar 6, addr febe0000, size 00010000 [mem] PCI: map device bdf=00:02.0 bar 1, addr febf0000, size 00001000 [mem] PCI: map device bdf=00:04.0 bar 1, addr febf1000, size 00001000 [mem] PCI: map device bdf=00:02.0 bar 0, addr fc000000, size 02000000 [prefmem] PCI: init bdf=00:00.0 id=8086:1237 PCI: init bdf=00:01.0 id=8086:7000 PIIX3/PIIX4 init: elcr=00 0c PCI: init bdf=00:01.1 id=8086:7010 PCI: init bdf=00:01.3 id=8086:7113 Using pmtimer, ioport 0xb008, freq 3579 kHz PCI: init bdf=00:02.0 id=1013:00b8 PCI: init bdf=00:03.0 id=8086:100e PCI: init bdf=00:04.0 id=1af4:1004 > init virtio-scsi > found virtio-scsi at 0:4 init virtio-scsi found virtio-scsi at 0:4 init_virtio_scsi: ioaddr: 0xc040 > Searching bootorder for: /pci@i0cf8/*@4/*@0/*@0,0 > Entering virtio_scsi_cmd: 0x12 > |7ffdc000| ata0-0: QEMU HARDDISK ATA-7 Hard-Disk (16384 MiBytes) > |7ffdc000| Searching bootorder for: /pci@i0cf8/*@1,1/drive@0/disk@0 > |7ffdc000| Registering bootable: ata0-0: QEMU HARDDISK ATA-7 Hard-Disk (16384 MiBytes) (type:2 prio:101 data:f4ab0) > \7ffdc000/ End thread > |7ffdb000| DVD/CD [ata1-0: QEMU DVD-ROM ATAPI-4 DVD/CD] > |7ffdb000| Searching bootorder for: /pci@i0cf8/*@1,1/drive@1/disk@0 > |7ffdb000| Registering bootable: DVD/CD [ata1-0: QEMU DVD-ROM ATAPI-4 DVD/CD] (type:3 prio:103 data:f4a80) > \7ffdb000/ End thread > Searching bootorder for: /pci@i0cf8/*@4/*@0/*@1,0 > Entering virtio_scsi_cmd: 0x12 > virtio-scsi vendor='LIO-ORG' product='RAMDISK-MCP' rev='4.0' type=0 removable=0 > Entering virtio_scsi_cmd: 0x00 > Entering virtio_scsi_cmd: 0x25 > virtio-scsi blksize=512 sectors=524288 > Registering bootable: virtio-scsi Drive LIO-ORG RAMDISK-MCP 4.0 (type:2 prio:101 data:f4ae0) > Searching bootorder for: /pci@i0cf8/*@4/*@0/*@2,0 > Entering virtio_scsi_cmd: 0x12 > > <SNIP> target IDs up to 256... > > init lsi53c895a > init esp > init megasas > Scan for option roms > Attempting to init PCI bdf 00:00.0 (vd 8086:1237) > Attempting to init PCI bdf 00:01.0 (vd 8086:7000) > Attempting to init PCI bdf 00:01.3 (vd 8086:7113) > Attempting to init PCI bdf 00:03.0 (vd 8086:100e) > Attempting to init PCI bdf 00:04.0 (vd 1af4:1004) > Searching bootorder for: /rom(a)genroms/kvmvapic.bin > Registering bootable: Legacy option rom (type:129 prio:101 data:c9000003) > Before prepareboot >>>>>>>>>>>>>>>. > Searching bootorder for: HALT > Mapping hd drive 0x000f4ab0 to 0 > drive 0x000f4ab0: PCHS=16383/16/63 translation=lba LCHS=1024/255/63 s=33554432 > Mapping hd drive 0x000f4ae0 to 1 > drive 0x000f4ae0: PCHS=0/0/0 translation=lba LCHS=520/16/63 s=524288 > Running option rom at c900:0003 > Mapping floppy drive 0x000f4b40 > Mapping cd drive 0x000f4a80 > finalize PMM > malloc finalize > Space available for UMB: cb800-ec000, f4690-f4a50 > Returned 57344 bytes of ZoneHigh > e820 map has 7 items: > 0: 0000000000000000 - 000000000009fc00 = 1 RAM > 1: 000000000009fc00 - 00000000000a0000 = 2 RESERVED > 2: 00000000000f0000 - 0000000000100000 = 2 RESERVED > 3: 0000000000100000 - 000000007fffe000 = 1 RAM > 4: 000000007fffe000 - 0000000080000000 = 2 RESERVED > 5: 00000000feffc000 - 00000000ff000000 = 2 RESERVED > 6: 00000000fffc0000 - 0000000100000000 = 2 RESERVED > Before make_bios_readonly >>>>>>> > locking shadow ram > Calling pci_config_writeb(0x11): bdf: 0x0000 pam: 0x0000005a > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > locking shadow ram romend: 0x000cb800 romtop: 0x000ec000 mem: 0x000c0000, pam: 0x0000005a Calling pci_config_writeb(0x11): bdf: 0x0000 pam: 0x0000005a > <No QEMU output after pci_config_writeb(0x11) in make_bios_readonly..> > > Calling pci_config_writeb(0x31): bdf: 0x0000 pam: 0x0000005b > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > mem: 0x000c8000, pam: 0x0000005b romend: 0x000cb800 mem + 16*1024: 0x000cc000 romtop: 0x000ec000 mem + 32*1024: 0x000d0000 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> romend: 0x000cb800, mem: 0x000c8000, romtop: 0x000ec000, mem + 16*1024: 0x000cc000 Calling pci_config_writeb(0x31): bdf: 0x0000 pam: 0x0000005b > <QEMU output after pci_config_writeb(0x31) in make_bios_readonly..> > > vhost_set_memory: section: 0x7fe2801f2b60 section->size: 2146697216 add: 0 > Before vhost_verify_ring_mappings: start_addr: c0000 size: 2146697216 > Checking vq: 0 ring_phys: 0 ring_size: 1028 >>>>>>>>>>>>>>>>>>. > Got ranges_overlap for vq: 0 ring_phys: 0 ring_size: 1028 > Checking vq: 1 ring_phys: 0 ring_size: 1028 >>>>>>>>>>>>>>>>>>. > Got ranges_overlap for vq: 1 ring_phys: 0 ring_size: 1028 > Checking vq: 2 ring_phys: ed000 ring_size: 5124 >>>>>>>>>>>>>>>>>>. > Calling l: 5124 for start_addr: c0000 for vq 2 > Unable to map ring buffer for ring 2 > l: 4096 ring_size: 5124 > vhost_set_memory: section: 0x7fe2801f2aa0 section->size: 32768 add: 1 > Before vhost_verify_ring_mappings: start_addr: c0000 size: 32768 > Checking vq: 0 ring_phys: 0 ring_size: 1028 >>>>>>>>>>>>>>>>>>. > Got ranges_overlap for vq: 0 ring_phys: 0 ring_size: 1028 > Checking vq: 1 ring_phys: 0 ring_size: 1028 >>>>>>>>>>>>>>>>>>. > Got ranges_overlap for vq: 1 ring_phys: 0 ring_size: 1028 > Checking vq: 2 ring_phys: ed000 ring_size: 5124 >>>>>>>>>>>>>>>>>>. > Got ranges_overlap for vq: 2 ring_phys: ed000 ring_size: 5124 > vhost_set_memory: section: 0x7fe2801f2aa0 section->size: 2146664448 add: 1 > Before vhost_verify_ring_mappings: start_addr: c8000 size: 2146664448 > Checking vq: 0 ring_phys: 0 ring_size: 1028 >>>>>>>>>>>>>>>>>>. > Got ranges_overlap for vq: 0 ring_phys: 0 ring_size: 1028 > Checking vq: 1 ring_phys: 0 ring_size: 1028 >>>>>>>>>>>>>>>>>>. > Got ranges_overlap for vq: 1 ring_phys: 0 ring_size: 1028 > Checking vq: 2 ring_phys: ed000 ring_size: 5124 >>>>>>>>>>>>>>>>>>. > Calling l: 5124 for start_addr: c8000 for vq 2 > > <Seabios output> > > Calling pci_config_writeb(0x10): bdf: 0x0000 pam0: 0x00000059 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > > <<QEMU output for the pci_config_writeb(0x10) in make_bios_readonly..> > > vhost_set_memory: section: 0x7fe2801f2b60 section->size: 32768 add: 0 > Before vhost_verify_ring_mappings: start_addr: c0000 size: 32768 > Checking vq: 0 ring_phys: 0 ring_size: 1028 >>>>>>>>>>>>>>>>>>. > Got ranges_overlap for vq: 0 ring_phys: 0 ring_size: 1028 > Checking vq: 1 ring_phys: 0 ring_size: 1028 >>>>>>>>>>>>>>>>>>. > Got ranges_overlap for vq: 1 ring_phys: 0 ring_size: 1028 > Checking vq: 2 ring_phys: ed000 ring_size: 5124 >>>>>>>>>>>>>>>>>>. > Got ranges_overlap for vq: 2 ring_phys: ed000 ring_size: 5124 > vhost_set_memory: section: 0x7fe2801f2b60 section->size: 2146664448 add: 0 > Before vhost_verify_ring_mappings: start_addr: c8000 size: 2146664448 > Checking vq: 0 ring_phys: 0 ring_size: 1028 >>>>>>>>>>>>>>>>>>. > Got ranges_overlap for vq: 0 ring_phys: 0 ring_size: 1028 > Checking vq: 1 ring_phys: 0 ring_size: 1028 >>>>>>>>>>>>>>>>>>. > Got ranges_overlap for vq: 1 ring_phys: 0 ring_size: 1028 > Checking vq: 2 ring_phys: ed000 ring_size: 5124 >>>>>>>>>>>>>>>>>>. > Calling l: 5124 for start_addr: c8000 for vq 2 > Unable to map ring buffer for ring 2 > l: 0 ring_size: 5124 > vhost_set_memory: section: 0x7fe2801f2aa0 section->size: 36864 add: 1 > Before vhost_verify_ring_mappings: start_addr: c0000 size: 36864 > Checking vq: 0 ring_phys: 0 ring_size: 1028 >>>>>>>>>>>>>>>>>>. > Got ranges_overlap for vq: 0 ring_phys: 0 ring_size: 1028 > Checking vq: 1 ring_phys: 0 ring_size: 1028 >>>>>>>>>>>>>>>>>>. > Got ranges_overlap for vq: 1 ring_phys: 0 ring_size: 1028 > Checking vq: 2 ring_phys: ed000 ring_size: 5124 >>>>>>>>>>>>>>>>>>. > Got ranges_overlap for vq: 2 ring_phys: ed000 ring_size: 5124 > vhost_set_memory: section: 0x7fe2801f2aa0 section->size: 2146660352 add: 1 > Before vhost_verify_ring_mappings: start_addr: c9000 size: 2146660352 > Checking vq: 0 ring_phys: 0 ring_size: 1028 >>>>>>>>>>>>>>>>>>. > Got ranges_overlap for vq: 0 ring_phys: 0 ring_size: 1028 > Checking vq: 1 ring_phys: 0 ring_size: 1028 >>>>>>>>>>>>>>>>>>. > Got ranges_overlap for vq: 1 ring_phys: 0 ring_size: 1028 > Checking vq: 2 ring_phys: ed000 ring_size: 5124 >>>>>>>>>>>>>>>>>>. > Calling l: 5124 for start_addr: c9000 for vq 2 > > <Seabios calls into StartBoot, and the last bit of QEMU output> > > vhost_set_memory: section: 0x7fe2801f2b60 section->size: 2146660352 add: 0 > Before vhost_verify_ring_mappings: start_addr: c9000 size: 2146660352 > Checking vq: 0 ring_phys: 0 ring_size: 1028 >>>>>>>>>>>>>>>>>>. > Got ranges_overlap for vq: 0 ring_phys: 0 ring_size: 1028 > Checking vq: 1 ring_phys: 0 ring_size: 1028 >>>>>>>>>>>>>>>>>>. > Got ranges_overlap for vq: 1 ring_phys: 0 ring_size: 1028 > Checking vq: 2 ring_phys: ed000 ring_size: 5124 >>>>>>>>>>>>>>>>>>. > Calling l: 5124 for start_addr: c9000 for vq 2 > Unable to map ring buffer for ring 2 > l: 0 ring_size: 5124 > vhost_set_memory: section: 0x7fe2801f2aa0 section->size: 159744 add: 1 > Before vhost_verify_ring_mappings: start_addr: c9000 size: 159744 > Checking vq: 0 ring_phys: 0 ring_size: 1028 >>>>>>>>>>>>>>>>>>. > Got ranges_overlap for vq: 0 ring_phys: 0 ring_size: 1028 > Checking vq: 1 ring_phys: 0 ring_size: 1028 >>>>>>>>>>>>>>>>>>. > Got ranges_overlap for vq: 1 ring_phys: 0 ring_size: 1028 > Checking vq: 2 ring_phys: ed000 ring_size: 5124 >>>>>>>>>>>>>>>>>>. > Calling l: 5124 for start_addr: c9000 for vq 2 > vhost_set_memory: section: 0x7fe2801f2aa0 section->size: 65536 add: 1 > Before vhost_verify_ring_mappings: start_addr: f0000 size: 65536 > Checking vq: 0 ring_phys: 0 ring_size: 1028 >>>>>>>>>>>>>>>>>>. > Got ranges_overlap for vq: 0 ring_phys: 0 ring_size: 1028 > Checking vq: 1 ring_phys: 0 ring_size: 1028 >>>>>>>>>>>>>>>>>>. > Got ranges_overlap for vq: 1 ring_phys: 0 ring_size: 1028 > Checking vq: 2 ring_phys: ed000 ring_size: 5124 >>>>>>>>>>>>>>>>>>. > Got ranges_overlap for vq: 2 ring_phys: ed000 ring_size: 5124 > vhost_set_memory: section: 0x7fe2801f2aa0 section->size: 2146435072 add: 1 > Before vhost_verify_ring_mappings: start_addr: 100000 size: 2146435072 > Checking vq: 0 ring_phys: 0 ring_size: 1028 >>>>>>>>>>>>>>>>>>. > Got ranges_overlap for vq: 0 ring_phys: 0 ring_size: 1028 > Checking vq: 1 ring_phys: 0 ring_size: 1028 >>>>>>>>>>>>>>>>>>. > Got ranges_overlap for vq: 1 ring_phys: 0 ring_size: 1028 > Checking vq: 2 ring_phys: ed000 ring_size: 5124 >>>>>>>>>>>>>>>>>>. > Got ranges_overlap for vq: 2 ring_phys: ed000 ring_size: 5124 > > So not being a seabios expert, this is as far as I've gotten.. One > change that does appear to avoid this behavior is when vp_reset() is > called right after virtio_scsi_scan_target() occurs. (See below) > > Obviously this prevents virtio-scsi root device operation, but it seems > to be a hint that some left-over PCI config space is triggering the > above in vhost_verify_ring_mappings(). > > WDYT..? > > diff --git a/src/virtio-scsi.c b/src/virtio-scsi.c > index 4de1255..cafefff 100644 > --- a/src/virtio-scsi.c > +++ b/src/virtio-scsi.c > @@ -153,7 +155,10 @@ init_virtio_scsi(struct pci_device *pci) > int i, tot; > for (tot = 0, i = 0; i < 256; i++) > tot += virtio_scsi_scan_target(pci, ioaddr, vq, i); > - > +#if 1 > + /* vhost-scsi-pci needs an vp_reset here, otherwise bad things happen */ > + vp_reset(ioaddr); > +#endif > if (!tot) > goto fail; > > > -- > To unsubscribe from this list: send the line "unsubscribe target-devel" in > the body of a message to majordomo(a)vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html

3 12

Re: [SeaBIOS] [Qemu-devel] [RFC PATCH v4 00/30] ACPI memory hotplug
by liu ping fan 02 Apr '13

02 Apr '13

On Fri, Jan 11, 2013 at 2:57 AM, Vasilis Liaskovitis <vasilis.liaskovitis(a)profitbricks.com> wrote: >> > >> > IIRC q35 supports memory hotplug natively (picked up in some >> > discussion). Is that correct? >> > >> From previous discussion I also understand that q35 supports native hotplug. >> Sections 5.1 and 5.2 of the spec describe the MCH registers but the native >> memory hotplug specifics are not yet clear to me. Any pointers from the >> spec are welcome. > > Ping. Could anyone who's familiar with the q35 spec provide some pointers on > native memory hotplug details in the spec? I see pcie hotplug registers but can't > find memory hotplug interface details. If I am not mistaken, the spec is here: > http://www.intel.com/design/chipsets/datashts/316966.htm > > Is the q35 memory hotplug support supposed to be an shpc-like interface geared > towards memory slots instead of pci slots? > I think there is no dedicated pci express downstream port for memory slots, so native plug is not available. > thanks, > > - Vasilis >

1 0

[PATCH 3/3] acpi: Use cpu_to_leXX() consistently.
by Kevin O'Connor 30 Mar '13

30 Mar '13

Audit the ACPI code and ensure that all multi-byte fields do proper byte swabbing. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- src/acpi.c | 47 +++++++++++++++++++++++------------------------ src/acpi.h | 4 ++-- 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/src/acpi.c b/src/acpi.c index f8fc228..f39c232 100644 --- a/src/acpi.c +++ b/src/acpi.c @@ -21,7 +21,7 @@ static void build_header(struct acpi_table_header *h, u32 sig, int len, u8 rev) { - h->signature = sig; + h->signature = cpu_to_le32(sig); h->length = cpu_to_le32(len); h->revision = rev; memcpy(h->oem_id, BUILD_APPNAME6, 6); @@ -123,7 +123,7 @@ build_fadt(struct pci_device *pci) /* FACS */ memset(facs, 0, sizeof(*facs)); - facs->signature = FACS_SIGNATURE; + facs->signature = cpu_to_le32(FACS_SIGNATURE); facs->length = cpu_to_le32(sizeof(*facs)); /* FADT */ @@ -181,8 +181,8 @@ build_madt(void) intsrcovr->type = APIC_XRUPT_OVERRIDE; intsrcovr->length = sizeof(*intsrcovr); intsrcovr->source = 0; - intsrcovr->gsi = 2; - intsrcovr->flags = 0; /* conforms to bus specifications */ + intsrcovr->gsi = cpu_to_le32(2); + intsrcovr->flags = cpu_to_le16(0); /* conforms to bus specifications */ intsrcovr++; } for (i = 1; i < 16; i++) { @@ -193,8 +193,8 @@ build_madt(void) intsrcovr->type = APIC_XRUPT_OVERRIDE; intsrcovr->length = sizeof(*intsrcovr); intsrcovr->source = i; - intsrcovr->gsi = i; - intsrcovr->flags = 0xd; /* active high, level triggered */ + intsrcovr->gsi = cpu_to_le32(i); + intsrcovr->flags = cpu_to_le16(0xd); /* active high, level triggered */ intsrcovr++; } @@ -202,7 +202,7 @@ build_madt(void) local_nmi->type = APIC_LOCAL_NMI; local_nmi->length = sizeof(*local_nmi); local_nmi->processor_id = 0xff; /* all processors */ - local_nmi->flags = 0; + local_nmi->flags = cpu_to_le16(0); local_nmi->lint = 1; /* LINT1 */ local_nmi++; @@ -340,13 +340,14 @@ build_ssdt(void) ssdt_ptr[acpi_s4_pkg[0] + 1] = ssdt[acpi_s4_pkg[0] + 3] = sys_states[4] & 127; // store pci io windows - *(u32*)&ssdt_ptr[acpi_pci32_start[0]] = pcimem_start; - *(u32*)&ssdt_ptr[acpi_pci32_end[0]] = pcimem_end - 1; + *(u32*)&ssdt_ptr[acpi_pci32_start[0]] = cpu_to_le32(pcimem_start); + *(u32*)&ssdt_ptr[acpi_pci32_end[0]] = cpu_to_le32(pcimem_end - 1); if (pcimem64_start) { ssdt_ptr[acpi_pci64_valid[0]] = 1; - *(u64*)&ssdt_ptr[acpi_pci64_start[0]] = pcimem64_start; - *(u64*)&ssdt_ptr[acpi_pci64_end[0]] = pcimem64_end - 1; - *(u64*)&ssdt_ptr[acpi_pci64_length[0]] = pcimem64_end - pcimem64_start; + *(u64*)&ssdt_ptr[acpi_pci64_start[0]] = cpu_to_le64(pcimem64_start); + *(u64*)&ssdt_ptr[acpi_pci64_end[0]] = cpu_to_le64(pcimem64_end - 1); + *(u64*)&ssdt_ptr[acpi_pci64_length[0]] = cpu_to_le64( + pcimem64_end - pcimem64_start); } else { ssdt_ptr[acpi_pci64_valid[0]] = 0; } @@ -440,7 +441,7 @@ build_hpet(void) * emulated hpet */ hpet->timer_block_id = cpu_to_le32(0x8086a201); - hpet->addr.address = cpu_to_le32(BUILD_HPET_ADDRESS); + hpet->addr.address = cpu_to_le64(BUILD_HPET_ADDRESS); build_header((void*)hpet, HPET_SIGNATURE, sizeof(*hpet), 1); return hpet; @@ -452,13 +453,11 @@ acpi_build_srat_memory(struct srat_memory_affinity *numamem, { numamem->type = SRAT_MEMORY; numamem->length = sizeof(*numamem); - memset(numamem->proximity, 0 ,4); + memset(numamem->proximity, 0, 4); numamem->proximity[0] = node; numamem->flags = cpu_to_le32(!!enabled); - numamem->base_addr_low = base & 0xFFFFFFFF; - numamem->base_addr_high = base >> 32; - numamem->length_low = len & 0xFFFFFFFF; - numamem->length_high = len >> 32; + numamem->base_addr = cpu_to_le64(base); + numamem->range_length = cpu_to_le64(len); } static void * @@ -484,7 +483,7 @@ build_srat(void) } memset(srat, 0, srat_size); - srat->reserved1=1; + srat->reserved1=cpu_to_le32(1); struct srat_processor_affinity *core = (void*)(srat + 1); int i; u64 curnode; @@ -567,8 +566,8 @@ build_mcfg_q35(void) return NULL; } memset(mcfg, 0, len); - mcfg->allocation[0].address = Q35_HOST_BRIDGE_PCIEXBAR_ADDR; - mcfg->allocation[0].pci_segment = Q35_HOST_PCIE_PCI_SEGMENT; + mcfg->allocation[0].address = cpu_to_le64(Q35_HOST_BRIDGE_PCIEXBAR_ADDR); + mcfg->allocation[0].pci_segment = cpu_to_le16(Q35_HOST_PCIE_PCI_SEGMENT); mcfg->allocation[0].start_bus_number = Q35_HOST_PCIE_START_BUS_NUMBER; mcfg->allocation[0].end_bus_number = Q35_HOST_PCIE_END_BUS_NUMBER; @@ -605,8 +604,8 @@ acpi_setup(void) #define ACPI_INIT_TABLE(X) \ do { \ - tables[tbl_idx] = (u32)(X); \ - if (tables[tbl_idx]) \ + tables[tbl_idx] = cpu_to_le32((u32)(X)); \ + if (le32_to_cpu(tables[tbl_idx])) \ tbl_idx++; \ } while(0) @@ -675,7 +674,7 @@ acpi_setup(void) return; } memset(rsdp, 0, sizeof(*rsdp)); - rsdp->signature = RSDP_SIGNATURE; + rsdp->signature = cpu_to_le64(RSDP_SIGNATURE); memcpy(rsdp->oem_id, BUILD_APPNAME6, 6); rsdp->rsdt_physical_address = cpu_to_le32((u32)rsdt); rsdp->checksum -= checksum(rsdp, 20); diff --git a/src/acpi.h b/src/acpi.h index 43287d9..5d1e104 100644 --- a/src/acpi.h +++ b/src/acpi.h @@ -254,8 +254,8 @@ struct srat_memory_affinity ACPI_SUB_HEADER_DEF u8 proximity[4]; u16 reserved1; - u32 base_addr_low,base_addr_high; - u32 length_low,length_high; + u64 base_addr; + u64 range_length; u32 reserved2; u32 flags; u32 reserved3[2]; -- 1.7.11.7

1 0

[PATCH 2/3] acpi: Remove dead code with descriptions of bit flags.
by Kevin O'Connor 30 Mar '13

30 Mar '13

Remove dead code from acpi table definitions - the ACPI specification is the best place to get descriptions of the fields and tables anyway. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- src/acpi.h | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/src/acpi.h b/src/acpi.h index 097cc75..43287d9 100644 --- a/src/acpi.h +++ b/src/acpi.h @@ -97,20 +97,7 @@ struct fadt_descriptor_rev1 u8 reserved4; /* Reserved */ u8 reserved4a; /* Reserved */ u8 reserved4b; /* Reserved */ -#if 0 - u32 wb_invd : 1; /* The wbinvd instruction works properly */ - u32 wb_invd_flush : 1; /* The wbinvd flushes but does not invalidate */ - u32 proc_c1 : 1; /* All processors support C1 state */ - u32 plvl2_up : 1; /* C2 state works on MP system */ - u32 pwr_button : 1; /* Power button is handled as a generic feature */ - u32 sleep_button : 1; /* Sleep button is handled as a generic feature, or not present */ - u32 fixed_rTC : 1; /* RTC wakeup stat not in fixed register space */ - u32 rtcs4 : 1; /* RTC wakeup stat not possible from S4 */ - u32 tmr_val_ext : 1; /* The tmr_val width is 32 bits (0 = 24 bits) */ - u32 reserved5 : 23; /* Reserved - must be zero */ -#else u32 flags; -#endif } PACKED; struct acpi_table_header /* ACPI common table header */ @@ -140,8 +127,7 @@ struct facs_descriptor_rev1 u32 hardware_signature; /* Hardware configuration signature */ u32 firmware_waking_vector; /* ACPI OS waking vector */ u32 global_lock; /* Global Lock */ - u32 S4bios_f : 1; /* Indicates if S4BIOS support is present */ - u32 reserved1 : 31; /* Must be 0 */ + u32 flags; u8 resverved3 [40]; /* Reserved - must be zero */ } PACKED; @@ -166,12 +152,7 @@ struct multiple_apic_table { ACPI_TABLE_HEADER_DEF /* ACPI common table header */ u32 local_apic_address; /* Physical address of local APIC */ -#if 0 - u32 PCATcompat : 1; /* A one indicates system also has dual 8259s */ - u32 reserved1 : 31; -#else u32 flags; -#endif } PACKED; /* Values for Type in APIC sub-headers */ @@ -201,12 +182,7 @@ struct madt_processor_apic ACPI_SUB_HEADER_DEF u8 processor_id; /* ACPI processor id */ u8 local_apic_id; /* Processor's local APIC id */ -#if 0 - u32 processor_enabled: 1; /* Processor is usable if set */ - u32 reserved2 : 31; /* Reserved, must be zero */ -#else u32 flags; -#endif } PACKED; struct madt_io_apic -- 1.7.11.7

1 0

[PATCH 1/3] acpi: Move ACPI table definitions from acpi.c to acpi.h.
by Kevin O'Connor 30 Mar '13

30 Mar '13

Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- src/acpi.c | 188 +------------------------------------------------------------ src/acpi.h | 172 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 175 insertions(+), 185 deletions(-) diff --git a/src/acpi.c b/src/acpi.c index 55c7259..f8fc228 100644 --- a/src/acpi.c +++ b/src/acpi.c @@ -16,189 +16,6 @@ #include "paravirt.h" // RamSize #include "dev-q35.h" -/****************************************************/ -/* ACPI tables init */ - -/* Table structure from Linux kernel (the ACPI tables are under the - BSD license) */ - -struct acpi_table_header /* ACPI common table header */ -{ - ACPI_TABLE_HEADER_DEF -} PACKED; - -/* - * ACPI 1.0 Root System Description Table (RSDT) - */ -#define RSDT_SIGNATURE 0x54445352 // RSDT -struct rsdt_descriptor_rev1 -{ - ACPI_TABLE_HEADER_DEF /* ACPI common table header */ - u32 table_offset_entry[0]; /* Array of pointers to other */ - /* ACPI tables */ -} PACKED; - -/* - * ACPI 1.0 Firmware ACPI Control Structure (FACS) - */ -#define FACS_SIGNATURE 0x53434146 // FACS -struct facs_descriptor_rev1 -{ - u32 signature; /* ACPI Signature */ - u32 length; /* Length of structure, in bytes */ - u32 hardware_signature; /* Hardware configuration signature */ - u32 firmware_waking_vector; /* ACPI OS waking vector */ - u32 global_lock; /* Global Lock */ - u32 S4bios_f : 1; /* Indicates if S4BIOS support is present */ - u32 reserved1 : 31; /* Must be 0 */ - u8 resverved3 [40]; /* Reserved - must be zero */ -} PACKED; - - -/* - * Differentiated System Description Table (DSDT) - */ -#define DSDT_SIGNATURE 0x54445344 // DSDT - -/* - * MADT values and structures - */ - -/* Values for MADT PCATCompat */ - -#define DUAL_PIC 0 -#define MULTIPLE_APIC 1 - - -/* Master MADT */ - -#define APIC_SIGNATURE 0x43495041 // APIC -struct multiple_apic_table -{ - ACPI_TABLE_HEADER_DEF /* ACPI common table header */ - u32 local_apic_address; /* Physical address of local APIC */ -#if 0 - u32 PCATcompat : 1; /* A one indicates system also has dual 8259s */ - u32 reserved1 : 31; -#else - u32 flags; -#endif -} PACKED; - - -/* Values for Type in APIC sub-headers */ - -#define APIC_PROCESSOR 0 -#define APIC_IO 1 -#define APIC_XRUPT_OVERRIDE 2 -#define APIC_NMI 3 -#define APIC_LOCAL_NMI 4 -#define APIC_ADDRESS_OVERRIDE 5 -#define APIC_IO_SAPIC 6 -#define APIC_LOCAL_SAPIC 7 -#define APIC_XRUPT_SOURCE 8 -#define APIC_RESERVED 9 /* 9 and greater are reserved */ - -/* - * MADT sub-structures (Follow MULTIPLE_APIC_DESCRIPTION_TABLE) - */ -#define ACPI_SUB_HEADER_DEF /* Common ACPI sub-structure header */\ - u8 type; \ - u8 length; - -/* Sub-structures for MADT */ - -struct madt_processor_apic -{ - ACPI_SUB_HEADER_DEF - u8 processor_id; /* ACPI processor id */ - u8 local_apic_id; /* Processor's local APIC id */ -#if 0 - u32 processor_enabled: 1; /* Processor is usable if set */ - u32 reserved2 : 31; /* Reserved, must be zero */ -#else - u32 flags; -#endif -} PACKED; - -struct madt_io_apic -{ - ACPI_SUB_HEADER_DEF - u8 io_apic_id; /* I/O APIC ID */ - u8 reserved; /* Reserved - must be zero */ - u32 address; /* APIC physical address */ - u32 interrupt; /* Global system interrupt where INTI - * lines start */ -} PACKED; - -struct madt_intsrcovr { - ACPI_SUB_HEADER_DEF - u8 bus; - u8 source; - u32 gsi; - u16 flags; -} PACKED; - -struct madt_local_nmi { - ACPI_SUB_HEADER_DEF - u8 processor_id; /* ACPI processor id */ - u16 flags; /* MPS INTI flags */ - u8 lint; /* Local APIC LINT# */ -} PACKED; - - -/* - * HPET Description Table - */ -struct acpi_20_hpet { - ACPI_TABLE_HEADER_DEF /* ACPI common table header */ - u32 timer_block_id; - struct acpi_20_generic_address addr; - u8 hpet_number; - u16 min_tick; - u8 page_protect; -} PACKED; - -#define HPET_ID 0x000 -#define HPET_PERIOD 0x004 - -/* - * SRAT (NUMA topology description) table - */ - -#define SRAT_PROCESSOR 0 -#define SRAT_MEMORY 1 - -struct system_resource_affinity_table -{ - ACPI_TABLE_HEADER_DEF - u32 reserved1; - u32 reserved2[2]; -} PACKED; - -struct srat_processor_affinity -{ - ACPI_SUB_HEADER_DEF - u8 proximity_lo; - u8 local_apic_id; - u32 flags; - u8 local_sapic_eid; - u8 proximity_hi[3]; - u32 reserved; -} PACKED; - -struct srat_memory_affinity -{ - ACPI_SUB_HEADER_DEF - u8 proximity[4]; - u16 reserved1; - u32 base_addr_low,base_addr_high; - u32 length_low,length_high; - u32 reserved2; - u32 flags; - u32 reserved3[2]; -} PACKED; - #include "acpi-dsdt.hex" static void @@ -597,7 +414,9 @@ build_ssdt(void) return ssdt; } -#define HPET_SIGNATURE 0x54455048 // HPET +#define HPET_ID 0x000 +#define HPET_PERIOD 0x004 + static void* build_hpet(void) { @@ -642,7 +461,6 @@ acpi_build_srat_memory(struct srat_memory_affinity *numamem, numamem->length_high = len >> 32; } -#define SRAT_SIGNATURE 0x54415253 // SRAT static void * build_srat(void) { diff --git a/src/acpi.h b/src/acpi.h index 7fbd082..097cc75 100644 --- a/src/acpi.h +++ b/src/acpi.h @@ -113,6 +113,178 @@ struct fadt_descriptor_rev1 #endif } PACKED; +struct acpi_table_header /* ACPI common table header */ +{ + ACPI_TABLE_HEADER_DEF +} PACKED; + +/* + * ACPI 1.0 Root System Description Table (RSDT) + */ +#define RSDT_SIGNATURE 0x54445352 // RSDT +struct rsdt_descriptor_rev1 +{ + ACPI_TABLE_HEADER_DEF /* ACPI common table header */ + u32 table_offset_entry[0]; /* Array of pointers to other */ + /* ACPI tables */ +} PACKED; + +/* + * ACPI 1.0 Firmware ACPI Control Structure (FACS) + */ +#define FACS_SIGNATURE 0x53434146 // FACS +struct facs_descriptor_rev1 +{ + u32 signature; /* ACPI Signature */ + u32 length; /* Length of structure, in bytes */ + u32 hardware_signature; /* Hardware configuration signature */ + u32 firmware_waking_vector; /* ACPI OS waking vector */ + u32 global_lock; /* Global Lock */ + u32 S4bios_f : 1; /* Indicates if S4BIOS support is present */ + u32 reserved1 : 31; /* Must be 0 */ + u8 resverved3 [40]; /* Reserved - must be zero */ +} PACKED; + +/* + * Differentiated System Description Table (DSDT) + */ +#define DSDT_SIGNATURE 0x54445344 // DSDT + +/* + * MADT values and structures + */ + +/* Values for MADT PCATCompat */ + +#define DUAL_PIC 0 +#define MULTIPLE_APIC 1 + +/* Master MADT */ + +#define APIC_SIGNATURE 0x43495041 // APIC +struct multiple_apic_table +{ + ACPI_TABLE_HEADER_DEF /* ACPI common table header */ + u32 local_apic_address; /* Physical address of local APIC */ +#if 0 + u32 PCATcompat : 1; /* A one indicates system also has dual 8259s */ + u32 reserved1 : 31; +#else + u32 flags; +#endif +} PACKED; + +/* Values for Type in APIC sub-headers */ + +#define APIC_PROCESSOR 0 +#define APIC_IO 1 +#define APIC_XRUPT_OVERRIDE 2 +#define APIC_NMI 3 +#define APIC_LOCAL_NMI 4 +#define APIC_ADDRESS_OVERRIDE 5 +#define APIC_IO_SAPIC 6 +#define APIC_LOCAL_SAPIC 7 +#define APIC_XRUPT_SOURCE 8 +#define APIC_RESERVED 9 /* 9 and greater are reserved */ + +/* + * MADT sub-structures (Follow MULTIPLE_APIC_DESCRIPTION_TABLE) + */ +#define ACPI_SUB_HEADER_DEF /* Common ACPI sub-structure header */\ + u8 type; \ + u8 length; + +/* Sub-structures for MADT */ + +struct madt_processor_apic +{ + ACPI_SUB_HEADER_DEF + u8 processor_id; /* ACPI processor id */ + u8 local_apic_id; /* Processor's local APIC id */ +#if 0 + u32 processor_enabled: 1; /* Processor is usable if set */ + u32 reserved2 : 31; /* Reserved, must be zero */ +#else + u32 flags; +#endif +} PACKED; + +struct madt_io_apic +{ + ACPI_SUB_HEADER_DEF + u8 io_apic_id; /* I/O APIC ID */ + u8 reserved; /* Reserved - must be zero */ + u32 address; /* APIC physical address */ + u32 interrupt; /* Global system interrupt where INTI + * lines start */ +} PACKED; + +struct madt_intsrcovr { + ACPI_SUB_HEADER_DEF + u8 bus; + u8 source; + u32 gsi; + u16 flags; +} PACKED; + +struct madt_local_nmi { + ACPI_SUB_HEADER_DEF + u8 processor_id; /* ACPI processor id */ + u16 flags; /* MPS INTI flags */ + u8 lint; /* Local APIC LINT# */ +} PACKED; + +/* + * HPET Description Table + */ +#define HPET_SIGNATURE 0x54455048 // HPET +struct acpi_20_hpet { + ACPI_TABLE_HEADER_DEF /* ACPI common table header */ + u32 timer_block_id; + struct acpi_20_generic_address addr; + u8 hpet_number; + u16 min_tick; + u8 page_protect; +} PACKED; + +/* + * SRAT (NUMA topology description) table + */ + +#define SRAT_SIGNATURE 0x54415253 // SRAT +struct system_resource_affinity_table +{ + ACPI_TABLE_HEADER_DEF + u32 reserved1; + u32 reserved2[2]; +} PACKED; + +#define SRAT_PROCESSOR 0 +#define SRAT_MEMORY 1 + +struct srat_processor_affinity +{ + ACPI_SUB_HEADER_DEF + u8 proximity_lo; + u8 local_apic_id; + u32 flags; + u8 local_sapic_eid; + u8 proximity_hi[3]; + u32 reserved; +} PACKED; + +struct srat_memory_affinity +{ + ACPI_SUB_HEADER_DEF + u8 proximity[4]; + u16 reserved1; + u32 base_addr_low,base_addr_high; + u32 length_low,length_high; + u32 reserved2; + u32 flags; + u32 reserved3[2]; +} PACKED; + /* PCI fw r3.0 MCFG table. */ /* Subtable */ struct acpi_mcfg_allocation { -- 1.7.11.7

1 0

[PATCH] Use container_of on romfile entries.
by Kevin O'Connor 30 Mar '13

30 Mar '13

Create cbfs and fw_cfg specific romfile_s wrappers instead of using private variables directly in romfile_s. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- src/coreboot.c | 67 ++++++++++++++++++++++++++++++++++------------------------ src/paravirt.c | 29 +++++++++++++++---------- src/util.h | 5 ----- 3 files changed, 57 insertions(+), 44 deletions(-) diff --git a/src/coreboot.c b/src/coreboot.c index c9ad2a8..120bc2e 100644 --- a/src/coreboot.c +++ b/src/coreboot.c @@ -286,6 +286,13 @@ struct cbfs_file { char filename[0]; } PACKED; +struct cbfs_romfile_s { + struct romfile_s file; + struct cbfs_file *fhdr; + void *data; + u32 rawsize, flags; +}; + // Copy a file to memory (uncompressing if necessary) static int cbfs_copyfile(struct romfile_s *file, void *dst, u32 maxlen) @@ -293,9 +300,11 @@ cbfs_copyfile(struct romfile_s *file, void *dst, u32 maxlen) if (!CONFIG_COREBOOT_FLASH) return -1; - u32 size = file->rawsize; - void *src = file->data; - if (file->flags) { + struct cbfs_romfile_s *cfile; + cfile = container_of(file, struct cbfs_romfile_s, file); + u32 size = cfile->rawsize; + void *src = cfile->data; + if (cfile->flags) { // Compressed - copy to temp ram and uncompress it. void *temp = malloc_tmphigh(size); if (!temp) { @@ -333,35 +342,36 @@ coreboot_cbfs_init(void) } dprintf(1, "Found CBFS header at %p\n", hdr); - struct cbfs_file *cfile = (void *)(0 - be32_to_cpu(hdr->romsize) - + be32_to_cpu(hdr->offset)); + struct cbfs_file *fhdr = (void *)(0 - be32_to_cpu(hdr->romsize) + + be32_to_cpu(hdr->offset)); for (;;) { - if (cfile < (struct cbfs_file *)(0xFFFFFFFF - be32_to_cpu(hdr->romsize))) + if (fhdr < (struct cbfs_file *)(0xFFFFFFFF - be32_to_cpu(hdr->romsize))) break; - u64 magic = cfile->magic; + u64 magic = fhdr->magic; if (magic != CBFS_FILE_MAGIC) break; - struct romfile_s *file = malloc_tmp(sizeof(*file)); - if (!file) { + struct cbfs_romfile_s *cfile = malloc_tmp(sizeof(*cfile)); + if (!cfile) { warn_noalloc(); break; } - memset(file, 0, sizeof(*file)); - strtcpy(file->name, cfile->filename, sizeof(file->name)); - file->size = file->rawsize = be32_to_cpu(cfile->len); - file->id = (u32)cfile; - file->copy = cbfs_copyfile; - file->data = (void*)cfile + be32_to_cpu(cfile->offset); - int len = strlen(file->name); - if (len > 5 && strcmp(&file->name[len-5], ".lzma") == 0) { + memset(cfile, 0, sizeof(*cfile)); + strtcpy(cfile->file.name, fhdr->filename, sizeof(cfile->file.name)); + cfile->file.size = cfile->rawsize = be32_to_cpu(fhdr->len); + cfile->fhdr = fhdr; + cfile->file.copy = cbfs_copyfile; + cfile->data = (void*)fhdr + be32_to_cpu(fhdr->offset); + int len = strlen(cfile->file.name); + if (len > 5 && strcmp(&cfile->file.name[len-5], ".lzma") == 0) { // Using compression. - file->flags = 1; - file->name[len-5] = '\0'; - file->size = *(u32*)(file->data + LZMA_PROPERTIES_SIZE); + cfile->flags = 1; + cfile->file.name[len-5] = '\0'; + cfile->file.size = *(u32*)(cfile->data + LZMA_PROPERTIES_SIZE); } - romfile_add(file); + romfile_add(&cfile->file); - cfile = (void*)ALIGN((u32)file->data + file->size, be32_to_cpu(hdr->align)); + fhdr = (void*)ALIGN((u32)cfile->data + cfile->file.size + , be32_to_cpu(hdr->align)); } } @@ -385,12 +395,12 @@ struct cbfs_payload { }; void -cbfs_run_payload(struct cbfs_file *file) +cbfs_run_payload(struct cbfs_file *fhdr) { - if (!CONFIG_COREBOOT_FLASH || !file) + if (!CONFIG_COREBOOT_FLASH || !fhdr) return; - dprintf(1, "Run %s\n", file->filename); - struct cbfs_payload *pay = (void*)file + be32_to_cpu(file->offset); + dprintf(1, "Run %s\n", fhdr->filename); + struct cbfs_payload *pay = (void*)fhdr + be32_to_cpu(fhdr->offset); struct cbfs_payload_segment *seg = pay->segments; for (;;) { void *src = (void*)pay + be32_to_cpu(seg->offset); @@ -445,9 +455,10 @@ cbfs_payload_setup(void) file = romfile_findprefix("img/", file); if (!file) break; + struct cbfs_romfile_s *cfile; + cfile = container_of(file, struct cbfs_romfile_s, file); const char *filename = file->name; char *desc = znprintf(MAXDESCSIZE, "Payload [%s]", &filename[4]); - boot_add_cbfs((void*)file->id, desc - , bootprio_find_named_rom(filename, 0)); + boot_add_cbfs(cfile->fhdr, desc, bootprio_find_named_rom(filename, 0)); } } diff --git a/src/paravirt.c b/src/paravirt.c index ee6a86e..e5027d0 100644 --- a/src/paravirt.c +++ b/src/paravirt.c @@ -166,13 +166,20 @@ qemu_cfg_read_entry(void *buf, int e, int len) qemu_cfg_read(buf, len); } +struct qemu_romfile_s { + struct romfile_s file; + int select, skip; +}; + static int qemu_cfg_read_file(struct romfile_s *file, void *dst, u32 maxlen) { if (file->size > maxlen) return -1; - qemu_cfg_select(file->id); - qemu_cfg_skip(file->rawsize); + struct qemu_romfile_s *qfile; + qfile = container_of(file, struct qemu_romfile_s, file); + qemu_cfg_select(qfile->select); + qemu_cfg_skip(qfile->skip); qemu_cfg_read(dst, file->size); return file->size; } @@ -180,18 +187,18 @@ qemu_cfg_read_file(struct romfile_s *file, void *dst, u32 maxlen) static void qemu_romfile_add(char *name, int select, int skip, int size) { - struct romfile_s *file = malloc_tmp(sizeof(*file)); - if (!file) { + struct qemu_romfile_s *qfile = malloc_tmp(sizeof(*qfile)); + if (!qfile) { warn_noalloc(); return; } - memset(file, 0, sizeof(*file)); - strtcpy(file->name, name, sizeof(file->name)); - file->id = select; - file->rawsize = skip; // Use rawsize to indicate skip length. - file->size = size; - file->copy = qemu_cfg_read_file; - romfile_add(file); + memset(qfile, 0, sizeof(*qfile)); + strtcpy(qfile->file.name, name, sizeof(qfile->file.name)); + qfile->file.size = size; + qfile->select = select; + qfile->skip = skip; + qfile->file.copy = qemu_cfg_read_file; + romfile_add(&qfile->file); } struct e820_reservation { diff --git a/src/util.h b/src/util.h index 99aff78..996c29a 100644 --- a/src/util.h +++ b/src/util.h @@ -436,11 +436,6 @@ struct romfile_s { char name[128]; u32 size; int (*copy)(struct romfile_s *file, void *dest, u32 maxlen); - - u32 id; - u32 rawsize; - u32 flags; - void *data; }; void romfile_add(struct romfile_s *file); struct romfile_s *romfile_findprefix(const char *prefix, struct romfile_s *prev); -- 1.7.11.7

1 0

[Fwd: Re: [PATCH V3 WIP 3/3] disable vhost_verify_ring_mappings check]
by Nicholas A. Bellinger 28 Mar '13

28 Mar '13

Forwarding to Kevin + seabios for their comments.. Thanks, --nab

3 3

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS