February 2012 - SeaBIOS - mail.coreboot.org

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

by Kevin O'Connor

On Tue, Dec 06, 2011 at 07:32:55PM -0500, Amos Kong wrote: > ----- Original Message ----- > > On Tue, Dec 06, 2011 at 01:39:35PM +0800, Amos Kong wrote: > > > 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. > > > Notify only when func0 is added and removed. > > > > > > Have tested with linux/winxp/win7, hot-adding/hot-remving, > > > single/multiple function device, they are all fine(all > > > added devices can be removed). > > > > > This includes some bits I wrote but this is not an ack > > of the patch yet :) > > > > I find it surprising that this works: a function > > has _EJ0 so would not guest expect that ejecting > > a single one will only remove it, and not all functions? > > Removing single func is not supported by specific, and current code > (qemu/kernel pci driver) process hot-remove with the whole slot. > We could not hot-remove single func with/without this patch. > > Register _EJ0() for each func, then all the funcs will be record > into the function list of the slot. Just as an update - it's not clear to me what this patch does, and it seems like Michael had some concerns. Also, it doesn't seem right to hardcode the generation of that many devices (248) in the AML code. So, unless there are further comments I'm going to hold off on this patch. -Kevin

7 years, 8 months

6
17
0 0

Re: [SeaBIOS] Boot failure with MS-Dos 6.22 (due to bad BIOS build?)

by Jan Kiszka

On 2012-02-27 10:51, Daniel P. Berrange wrote: > I'm seeing current QEMU GIT fail to boot MS-Dos 6.22 with the following > crash: > > # qemu-system-x86_64 -fda ~/MS-DOS\ 6.22.img -m 1 -curses > iPXE v1.0.0-591-g7aee315 > iPXE (http://ipxe.org) 00:03.0 C900 PCI2.10 PnP PMM+00000000+00000000 C900 > > Booting from Floppy.. > . qemu: fatal: Trying to execute code outside RAM or ROM at 0x00000001000effff > > EAX=ffffffff EBX=ffffffff ECX=0000c934 EDX=00000068 > ESI=00006801 EDI=00000000 EBP=0000002b ESP=0000fff5 > EIP=ffffffff EFL=00000002 [-------] CPL=0 II=0 A20=1 SMM=0 HLT=0 > ES =0040 00000400 0000ffff 00009300 > CS =f000 000f0000 0000ffff 00009b00 > SS =9ec4 0009ec40 0000ffff 00009300 > DS =9ec4 0009ec40 0000ffff 00009300 > FS =0000 00000000 0000ffff 00009300 > GS =0000 00000000 0000ffff 00009300 > LDT=0000 00000000 0000ffff 00008200 > TR =0000 00000000 0000ffff 00008b00 > GDT= 000fcd78 00000037 > IDT= 00000000 000003ff > CR0=00000010 CR2=00000000 CR3=00000000 CR4=00000000 > DR0=0000000000000000 DR1=0000000000000000 DR2=0000000000000000 DR3=0000000000000000 > DR6=00000000ffff0ff0 DR7=0000000000000400 > CCS=000000d0 CCD=00000068 CCO=SARL > EFER=0000000000000000 > FCW=037f FSW=0000 [ST=0] FTW=00 MXCSR=00001f80 > FPR0=0000000000000000 0000 FPR1=0000000000000000 0000 > FPR2=0000000000000000 0000 FPR3=0000000000000000 0000 > FPR4=0000000000000000 0000 FPR5=0000000000000000 0000 > FPR6=0000000000000000 0000 FPR7=0000000000000000 0000 > XMM00=00000000000000000000000000000000 XMM01=00000000000000000000000000000000 > XMM02=00000000000000000000000000000000 XMM03=00000000000000000000000000000000 > XMM04=00000000000000000000000000000000 XMM05=00000000000000000000000000000000 > XMM06=00000000000000000000000000000000 XMM07=00000000000000000000000000000000 > Aborted > > > Git bisect blames this > > commit 41bd360325168b3c1db78eb7311420a1607d521f > Author: Jan Kiszka <jan.kiszka(a)siemens.com> > Date: Sun Jan 15 17:48:25 2012 +0100 > > seabios: Update to release 1.6.3.1 > > User visible changes in seabios: > - Probe HPET existence (fix for -no-hpet) > - Probe PCI existence (fix for -machine isapc) > - usb: fix boot paths > > Signed-off-by: Jan Kiszka <jan.kiszka(a)siemens.com> > > > I tried to bisect Seabios, but every revision in Seabios upstream works > fine. > > Then I noticed, that if I rebuild the BIOS, from the exact same revision > 1.6.3.1 revision that is committed in 'seabios' submodule in QEMU, then > it works fine. So AFAICT, it is not the Seabios source code at fault, > but rather the binary build we have commited to GIT. Should/can we rebuild > the bios.bin in GIT ? Probably not without understanding what causes this strange inconsistency. If Seabios builds without errors and then later on fails, this is also a bug. Kevin, what information do you need to assess my tool chain? Jan -- Siemens AG, Corporate Technology, CT T DE IT 1 Corporate Competence Center Embedded Linux

7 years, 10 months

6
10
0 0

[PATCH v3] add virtio-scsi driver

by Paolo Bonzini

virtio-scsi is a simple HBA that talks to the host via a single vring. The implementation looks like a hybrid of usb-msc and virtio-blk. Reviewed-by: Laszlo Ersek <lersek(a)redhat.com> Signed-off-by: Paolo Bonzini <pbonzini(a)redhat.com> --- On top of your patch "Register drives directly in scsi_init_drive()". Makefile | 2 +- src/Kconfig | 6 ++ src/block.c | 3 +- src/blockcmd.c | 5 +- src/boot.c | 14 ++++ src/boot.h | 1 + src/disk.c | 3 +- src/disk.h | 1 + src/pci_ids.h | 1 + src/post.c | 2 + src/virtio-scsi.c | 177 +++++++++++++++++++++++++++++++++++++++++++++++++++++ src/virtio-scsi.h | 47 ++++++++++++++ 12 files changed, 258 insertions(+), 4 deletions(-) create mode 100644 src/virtio-scsi.c create mode 100644 src/virtio-scsi.h diff --git a/Makefile b/Makefile index 3b56225..5c2083a 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ SRCBOTH=misc.c stacks.c pmm.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 blockcmd.c \ usb.c usb-uhci.c usb-ohci.c usb-ehci.c usb-hid.c usb-msc.c \ - virtio-ring.c virtio-pci.c virtio-blk.c apm.c ahci.c + virtio-ring.c virtio-pci.c virtio-blk.c virtio-scsi.c apm.c ahci.c SRC16=$(SRCBOTH) system.c disk.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/Kconfig b/src/Kconfig index 250663a..53fda9b 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -113,6 +113,12 @@ menu "Hardware support" default y help Support boot from virtio-blk storage. + config VIRTIO_SCSI + depends on DRIVES && !COREBOOT + bool "virtio-scsi controllers" + default y + help + Support boot from virtio-scsi storage. config FLOPPY depends on DRIVES bool "Floppy controller" diff --git a/src/block.c b/src/block.c index ccf4ee6..e270cf5 100644 --- a/src/block.c +++ b/src/block.c @@ -279,7 +279,7 @@ map_floppy_drive(struct drive_s *drive_g) static int process_scsi_op(struct disk_op_s *op) { - if (!CONFIG_USB_MSC) + if (!CONFIG_VIRTIO_SCSI && !CONFIG_USB_MSC) return 0; switch (op->command) { case CMD_READ: @@ -320,6 +320,7 @@ process_op(struct disk_op_s *op) case DTYPE_AHCI: return process_ahci_op(op); case DTYPE_USB: + case DTYPE_VIRTIO_SCSI: return process_scsi_op(op); default: op->count = 0; diff --git a/src/blockcmd.c b/src/blockcmd.c index dd35501..2769573 100644 --- a/src/blockcmd.c +++ b/src/blockcmd.c @@ -12,6 +12,7 @@ #include "ata.h" // atapi_cmd_data #include "ahci.h" // atapi_cmd_data #include "usb-msc.h" // usb_cmd_data +#include "virtio-scsi.h" // virtio_scsi_cmd_data // Route command to low-level handler. static int @@ -25,6 +26,8 @@ cdb_cmd_data(struct disk_op_s *op, void *cdbcmd, u16 blocksize) return usb_cmd_data(op, cdbcmd, blocksize); case DTYPE_AHCI: return ahci_cmd_data(op, cdbcmd, blocksize); + case DTYPE_VIRTIO_SCSI: + return virtio_scsi_cmd_data(op, cdbcmd, blocksize); default: op->count = 0; return DISK_RET_EPARAM; @@ -79,7 +82,7 @@ scsi_is_ready(struct disk_op_s *op) int scsi_init_drive(struct drive_s *drive, const char *s, int prio) { - if (!CONFIG_USB_MSC) + if (!CONFIG_USB_MSC && !CONFIG_VIRTIO_SCSI) return 0; struct disk_op_s dop; diff --git a/src/boot.c b/src/boot.c index e26dad1..c737ba4 100644 --- a/src/boot.c +++ b/src/boot.c @@ -128,6 +128,20 @@ int bootprio_find_pci_device(struct pci_device *pci) return find_prio(desc); } +int bootprio_find_scsi_device(struct pci_device *pci, int target, int lun) +{ + if (!CONFIG_BOOTORDER) + return -1; + if (!pci) + // support only pci machine for now + return -1; + // Find scsi drive - for example: /pci@i0cf8/scsi@5/channel@0/disk@1,0 + char desc[256], *p; + p = build_pci_path(desc, sizeof(desc), "*", pci); + snprintf(p, desc+sizeof(desc)-p, "/*@0/*@%d,%d", target, lun); + return find_prio(desc); +} + int bootprio_find_ata_device(struct pci_device *pci, int chanid, int slave) { if (!CONFIG_BOOTORDER) diff --git a/src/boot.h b/src/boot.h index d776aa1..686f04d 100644 --- a/src/boot.h +++ b/src/boot.h @@ -14,6 +14,7 @@ void boot_add_cbfs(void *data, const char *desc, int prio); void boot_prep(void); struct pci_device; int bootprio_find_pci_device(struct pci_device *pci); +int bootprio_find_scsi_device(struct pci_device *pci, int target, int lun); int bootprio_find_ata_device(struct pci_device *pci, int chanid, int slave); int bootprio_find_fdc_device(struct pci_device *pci, int port, int fdid); int bootprio_find_pci_rom(struct pci_device *pci, int instance); diff --git a/src/disk.c b/src/disk.c index 29714d6..7a58af4 100644 --- a/src/disk.c +++ b/src/disk.c @@ -551,7 +551,8 @@ disk_1348(struct bregs *regs, struct drive_s *drive_g) SET_INT13DPT(regs, blksize, blksize); if (size < 30 || - (type != DTYPE_ATA && type != DTYPE_ATAPI && type != DTYPE_VIRTIO_BLK)) { + (type != DTYPE_ATA && type != DTYPE_ATAPI && + type != DTYPE_VIRTIO_BLK && type != DTYPE_VIRTIO_SCSI)) { disk_ret(regs, DISK_RET_SUCCESS); return; } diff --git a/src/disk.h b/src/disk.h index dd7c46a..d344399 100644 --- a/src/disk.h +++ b/src/disk.h @@ -207,6 +207,7 @@ struct drive_s { #define DTYPE_USB 0x06 #define DTYPE_VIRTIO_BLK 0x07 #define DTYPE_AHCI 0x08 +#define DTYPE_VIRTIO_SCSI 0x09 #define MAXDESCSIZE 80 diff --git a/src/pci_ids.h b/src/pci_ids.h index e1cded2..4b59585 100644 --- a/src/pci_ids.h +++ b/src/pci_ids.h @@ -2608,3 +2608,4 @@ #define PCI_VENDOR_ID_REDHAT_QUMRANET 0x1af4 #define PCI_DEVICE_ID_VIRTIO_BLK 0x1001 +#define PCI_DEVICE_ID_VIRTIO_SCSI 0x1004 diff --git a/src/post.c b/src/post.c index b4ad1fa..d7bbcdd 100644 --- a/src/post.c +++ b/src/post.c @@ -26,6 +26,7 @@ #include "xen.h" // xen_probe_hvm_info #include "ps2port.h" // ps2port_setup #include "virtio-blk.h" // virtio_blk_setup +#include "virtio-scsi.h" // virtio_scsi_setup /**************************************************************** @@ -190,6 +191,7 @@ init_hw(void) cbfs_payload_setup(); ramdisk_setup(); virtio_blk_setup(); + virtio_scsi_setup(); } // Begin the boot process by invoking an int0x19 in 16bit mode. diff --git a/src/virtio-scsi.c b/src/virtio-scsi.c new file mode 100644 index 0000000..cbe22ec --- /dev/null +++ b/src/virtio-scsi.c @@ -0,0 +1,177 @@ +// Virtio SCSI boot support. +// +// Copyright (C) 2012 Red Hat Inc. +// +// Authors: +// Paolo Bonzini <pbonzini(a)redhat.com> +// +// This file may be distributed under the terms of the GNU LGPLv3 license. + +#include "util.h" // dprintf +#include "pci.h" // foreachpci +#include "config.h" // CONFIG_* +#include "biosvar.h" // GET_GLOBAL +#include "pci_ids.h" // PCI_DEVICE_ID_VIRTIO_BLK +#include "pci_regs.h" // PCI_VENDOR_ID +#include "boot.h" // boot_add_hd +#include "virtio-pci.h" +#include "virtio-ring.h" +#include "virtio-scsi.h" +#include "disk.h" + +struct virtio_lun_s { + struct drive_s drive; + struct pci_device *pci; + struct vring_virtqueue *vq; + u16 ioaddr; + u16 target; + u16 lun; +}; + +static int +virtio_scsi_cmd(u16 ioaddr, struct vring_virtqueue *vq, struct disk_op_s *op, + void *cdbcmd, u16 target, u16 lun, u32 len) +{ + struct virtio_scsi_req_cmd req; + struct virtio_scsi_resp_cmd resp; + struct vring_list sg[3]; + + memset(&req, 0, sizeof(req)); + req.lun[0] = 1; + req.lun[1] = target; + req.lun[2] = (lun >> 8) | 0x40; + req.lun[3] = (lun & 0xff); + memcpy(req.cdb, cdbcmd, 16); + + int datain = (req.cdb[0] != CDB_CMD_WRITE_10); + int data_idx = (datain ? 2 : 1); + int out_num = (datain ? 1 : 2); + int in_num = (len ? 3 : 2) - out_num; + + sg[0].addr = MAKE_FLATPTR(GET_SEG(SS), &req); + sg[0].length = sizeof(req); + + sg[out_num].addr = MAKE_FLATPTR(GET_SEG(SS), &resp); + sg[out_num].length = sizeof(resp); + + sg[data_idx].addr = op->buf_fl; + sg[data_idx].length = len; + + /* Add to virtqueue and kick host */ + vring_add_buf(vq, sg, out_num, in_num, 0, 0); + vring_kick(ioaddr, vq, 1); + + /* Wait for reply */ + while (!vring_more_used(vq)) + usleep(5); + + /* Reclaim virtqueue element */ + vring_get_buf(vq, NULL); + + /* Clear interrupt status register. Avoid leaving interrupts stuck if + * VRING_AVAIL_F_NO_INTERRUPT was ignored and interrupts were raised. + */ + vp_get_isr(ioaddr); + + if (resp.response == VIRTIO_SCSI_S_OK && resp.status == 0) { + return DISK_RET_SUCCESS; + } + return DISK_RET_EBADTRACK; +} + +int +virtio_scsi_cmd_data(struct disk_op_s *op, void *cdbcmd, u16 blocksize) +{ + struct virtio_lun_s *vlun = + container_of(op->drive_g, struct virtio_lun_s, drive); + + return virtio_scsi_cmd(GET_GLOBAL(vlun->ioaddr), + GET_GLOBAL(vlun->vq), op, cdbcmd, + GET_GLOBAL(vlun->target), GET_GLOBAL(vlun->lun), + blocksize * op->count); +} + +static int +virtio_scsi_add_lun(struct pci_device *pci, u16 ioaddr, + struct vring_virtqueue *vq, u16 target, u16 lun) +{ + struct virtio_lun_s *vlun = malloc_fseg(sizeof(*vlun)); + if (!vlun) { + warn_noalloc(); + return -1; + } + memset(vlun, 0, sizeof(*vlun)); + vlun->drive.type = DTYPE_VIRTIO_SCSI; + vlun->drive.cntl_id = pci->bdf; + vlun->pci = pci; + vlun->ioaddr = ioaddr; + vlun->vq = vq; + vlun->target = target; + vlun->lun = lun; + + int prio = bootprio_find_scsi_device(pci, target, lun); + int ret = scsi_init_drive(&vlun->drive, "virtio-scsi", prio); + if (ret) + goto fail; + return 0; + +fail: + free(vlun); + return -1; +} + +static int +virtio_scsi_scan_target(struct pci_device *pci, u16 ioaddr, + struct vring_virtqueue *vq, u16 target) +{ + /* TODO: send REPORT LUNS. For now, only LUN 0 is recognized. */ + int ret = virtio_scsi_add_lun(pci, ioaddr, vq, target, 0); + return ret < 0 ? 0 : 1; +} + +static void +init_virtio_scsi(struct pci_device *pci) +{ + u16 bdf = pci->bdf; + dprintf(1, "found virtio-scsi at %x:%x\n", pci_bdf_to_bus(bdf), + pci_bdf_to_dev(bdf)); + struct vring_virtqueue *vq = NULL; + u16 ioaddr = vp_init_simple(bdf); + if (vp_find_vq(ioaddr, 2, &vq) < 0 ) { + dprintf(1, "fail to find vq for virtio-scsi %x:%x\n", + pci_bdf_to_bus(bdf), pci_bdf_to_dev(bdf)); + goto fail; + } + + int i, tot; + for (tot = 0, i = 0; i < 256; i++) + tot += virtio_scsi_scan_target(pci, ioaddr, vq, i); + + if (!tot) + goto fail; + + vp_set_status(ioaddr, VIRTIO_CONFIG_S_ACKNOWLEDGE | + VIRTIO_CONFIG_S_DRIVER | VIRTIO_CONFIG_S_DRIVER_OK); + return; + +fail: + free(vq); +} + +void +virtio_scsi_setup(void) +{ + ASSERT32FLAT(); + if (! CONFIG_VIRTIO_SCSI || CONFIG_COREBOOT) + return; + + dprintf(3, "init virtio-scsi\n"); + + struct pci_device *pci; + foreachpci(pci) { + if (pci->vendor != PCI_VENDOR_ID_REDHAT_QUMRANET + || pci->device != PCI_DEVICE_ID_VIRTIO_SCSI) + continue; + init_virtio_scsi(pci); + } +} diff --git a/src/virtio-scsi.h b/src/virtio-scsi.h new file mode 100644 index 0000000..bbfbf30 --- /dev/null +++ b/src/virtio-scsi.h @@ -0,0 +1,47 @@ +#ifndef _VIRTIO_SCSI_H +#define _VIRTIO_SCSI_H + +#define VIRTIO_SCSI_CDB_SIZE 32 +#define VIRTIO_SCSI_SENSE_SIZE 96 + +struct virtio_scsi_config +{ + u32 num_queues; + u32 seg_max; + u32 max_sectors; + u32 cmd_per_lun; + u32 event_info_size; + u32 sense_size; + u32 cdb_size; + u16 max_channel; + u16 max_target; + u32 max_lun; +} __attribute__((packed)); + +/* This is the first element of the "out" scatter-gather list. */ +struct virtio_scsi_req_cmd { + u8 lun[8]; + u64 id; + u8 task_attr; + u8 prio; + u8 crn; + char cdb[VIRTIO_SCSI_CDB_SIZE]; +}; + +/* This is the first element of the "in" scatter-gather list. */ +struct virtio_scsi_resp_cmd { + u32 sense_len; + u32 residual; + u16 status_qualifier; + u8 status; + u8 response; + u8 sense[VIRTIO_SCSI_SENSE_SIZE]; +}; + +#define VIRTIO_SCSI_S_OK 0 + +struct disk_op_s; +int virtio_scsi_cmd_data(struct disk_op_s *op, void *cdbcmd, u16 blocksize); +void virtio_scsi_setup(void); + +#endif /* _VIRTIO_SCSI_H */ -- 1.7.7.6

7 years, 10 months

2
1
0 0

[PATCH v2 0/6] pci: 64bit support

by Gerd Hoffmann

Hi, New revision of my 64bit pci patches. This is what I'm using to play with 64bit PCI bars (ivshmem + qxl devices) and bridge support (patches from mst). Changes in v2: * tried to reduce the stack footprint of 64bit hex number printing. * changed patch splitting to make them (hopefully) more readable. * full support for bridges with 64bit memory windows, even nested. Also availabe from: git://git.kraxel.org/seabios pci64 enjoy, Gerd Gerd Hoffmann (6): output: add 64bit hex print support pci: split device discovery into multiple steps pci: 64bit support. pci: bridges can have two regions too pci: fix bridge ressource allocation. pci: add prefmem64 src/acpi-dsdt.dsl | 7 ++ src/acpi-dsdt.hex | 72 ++++++++++++--- src/config.h | 2 + src/output.c | 23 ++++- src/pci.h | 14 ++- src/pciinit.c | 272 ++++++++++++++++++++++++++++++++++++++--------------- 6 files changed, 294 insertions(+), 96 deletions(-)

7 years, 10 months

2
8
0 0

[PATCH] seabios: acpi: Add _STA for PCI hotplug slots

by Alex Williamson

When a Status method is provided on a slot, the OSPM evaluates _STA in response to the device check notify on the slot. This allows some degree of a handshake between the platform and the OSPM that the hotplug has been acknowledged. In order to implement _STA, we need to know which slots have devices. A slot with device returns 0x0F, a slot without a device returns Zero. We get this information from Qemu using the 0xae08 I/O port register. This was previously the read-side of the register written to commit a device eject and always returned 0 on read. It now returns a bitmap of present slots, so we know that reading 0 means we have and old Qemu and dynamically modify our SSDT to rename the _STA methods. This is necessary to allow backwards compatibility. The _STA method also writes the slot identifier to I/O port register 0xae00 as an acknowledgment of the hotplug request. Signed-off-by: Alex Williamson <alex.williamson(a)redhat.com> --- src/acpi-dsdt.dsl | 36 ++- src/acpi-dsdt.hex | 124 ++++++---- src/acpi.c | 27 ++ src/ssdt-pcihp.dsl | 3 src/ssdt-pcihp.hex | 658 ++++++++++++++++++++++++++++++++++++++++++++-------- 5 files changed, 686 insertions(+), 162 deletions(-) diff --git a/src/acpi-dsdt.dsl b/src/acpi-dsdt.dsl index 7082b65..6b87086 100644 --- a/src/acpi-dsdt.dsl +++ b/src/acpi-dsdt.dsl @@ -119,17 +119,15 @@ DefinitionBlock ( prt_slot3(0x001f), }) - OperationRegion(PCST, SystemIO, 0xae00, 0x08) + OperationRegion(PCST, SystemIO, 0xae00, 0x0c) Field (PCST, DWordAcc, NoLock, WriteAsZeros) { - PCIU, 32, - PCID, 32, - } - - OperationRegion(SEJ, SystemIO, 0xae08, 0x04) - Field (SEJ, DWordAcc, NoLock, WriteAsZeros) - { - B0EJ, 32, + // PCI Up/ACK + PUPA, 32, + // PCI Down + PDWN, 32, + // PCI Present/Eject + PPEJ, 32, } Name (_CRS, ResourceTemplate () @@ -462,10 +460,20 @@ DefinitionBlock ( /* Methods called by hotplug devices */ Method (PCEJ, 1, NotSerialized) { // _EJ0 method - eject callback - Store(ShiftLeft(1, Arg0), B0EJ) + Store(ShiftLeft(1, Arg0), PPEJ) Return (0x0) } + Method (PSTA, 1, NotSerialized) { + Store(ShiftLeft(1, Arg0), PUPA) + Store(PPEJ, Local0) + If (And(Local0, ShiftLeft(1, Arg0))) { + Return(0x0F) + } Else { + Return(Zero) + } + } + /* Hotplug notification method supplied by SSDT */ External (\_SB.PCI0.PCNT, MethodObj) @@ -473,12 +481,16 @@ DefinitionBlock ( Method(PCNF, 0) { // Local0 = iterator Store (Zero, Local0) + // Local1 = slots marked "up" + Store (PUPA, Local1) + // Local2 = slots marked "down" + Store (PDWN, Local2) While (LLess(Local0, 31)) { Increment(Local0) - If (And(PCIU, ShiftLeft(1, Local0))) { + If (And(Local1, ShiftLeft(1, Local0))) { PCNT(Local0, 1) } - If (And(PCID, ShiftLeft(1, Local0))) { + If (And(Local2, ShiftLeft(1, Local0))) { PCNT(Local0, 3) } } diff --git a/src/acpi-dsdt.hex b/src/acpi-dsdt.hex index 5dc7bb4..6d99f53 100644 --- a/src/acpi-dsdt.hex +++ b/src/acpi-dsdt.hex @@ -3,12 +3,12 @@ static unsigned char AmlCode[] = { 0x53, 0x44, 0x54, -0xd3, +0xeb, 0x10, 0x0, 0x0, 0x1, -0x2d, +0x10, 0x42, 0x58, 0x50, @@ -110,16 +110,16 @@ static unsigned char AmlCode[] = { 0x47, 0x42, 0x10, -0x44, -0x81, +0x40, +0x80, 0x5f, 0x53, 0x42, 0x5f, 0x5b, 0x82, -0x4c, -0x80, +0x48, +0x7f, 0x50, 0x43, 0x49, @@ -2014,47 +2014,27 @@ static unsigned char AmlCode[] = { 0x0, 0xae, 0xa, -0x8, +0xc, 0x5b, 0x81, -0x10, +0x15, 0x50, 0x43, 0x53, 0x54, 0x43, 0x50, -0x43, -0x49, 0x55, +0x50, +0x41, 0x20, 0x50, -0x43, -0x49, 0x44, +0x57, +0x4e, 0x20, -0x5b, -0x80, -0x53, -0x45, -0x4a, -0x5f, -0x1, -0xb, -0x8, -0xae, -0xa, -0x4, -0x5b, -0x81, -0xb, -0x53, -0x45, -0x4a, -0x5f, -0x43, -0x42, -0x30, +0x50, +0x50, 0x45, 0x4a, 0x20, @@ -3039,8 +3019,8 @@ static unsigned char AmlCode[] = { 0x4a, 0x20, 0x10, -0x46, -0x5, +0x42, +0x8, 0x2e, 0x5f, 0x53, @@ -3062,14 +3042,52 @@ static unsigned char AmlCode[] = { 0x1, 0x68, 0x0, -0x42, -0x30, +0x50, +0x50, 0x45, 0x4a, 0xa4, 0x0, 0x14, -0x38, +0x25, +0x50, +0x53, +0x54, +0x41, +0x1, +0x70, +0x79, +0x1, +0x68, +0x0, +0x50, +0x55, +0x50, +0x41, +0x70, +0x50, +0x50, +0x45, +0x4a, +0x60, +0xa0, +0xb, +0x7b, +0x60, +0x79, +0x1, +0x68, +0x0, +0x0, +0xa4, +0xa, +0xf, +0xa1, +0x3, +0xa4, +0x0, +0x14, +0x3e, 0x50, 0x43, 0x4e, @@ -3078,8 +3096,20 @@ static unsigned char AmlCode[] = { 0x70, 0x0, 0x60, +0x70, +0x50, +0x55, +0x50, +0x41, +0x61, +0x70, +0x50, +0x44, +0x57, +0x4e, +0x62, 0xa2, -0x2c, +0x26, 0x95, 0x60, 0xa, @@ -3087,12 +3117,9 @@ static unsigned char AmlCode[] = { 0x75, 0x60, 0xa0, -0x11, +0xe, 0x7b, -0x50, -0x43, -0x49, -0x55, +0x61, 0x79, 0x1, 0x60, @@ -3105,12 +3132,9 @@ static unsigned char AmlCode[] = { 0x60, 0x1, 0xa0, -0x12, +0xf, 0x7b, -0x50, -0x43, -0x49, -0x44, +0x62, 0x79, 0x1, 0x60, diff --git a/src/acpi.c b/src/acpi.c index 107469f..056270b 100644 --- a/src/acpi.c +++ b/src/acpi.c @@ -486,13 +486,14 @@ build_ssdt(void) #include "ssdt-pcihp.hex" -#define PCI_RMV_BASE 0xae0c +#define PCI_HOTPLUG 0xae0c +#define PCI_PRES_EJ 0xae08 extern void link_time_assertion(void); static void* build_pcihp(void) { - u32 rmvc_pcrm; + u32 hotpluggable, present; int i; u8 *ssdt = malloc_high(sizeof ssdp_pcihp_aml); @@ -504,7 +505,7 @@ static void* build_pcihp(void) link_time_assertion(); } - rmvc_pcrm = inl(PCI_RMV_BASE); + hotpluggable = inl(PCI_HOTPLUG); for (i = 0; i < ARRAY_SIZE(aml_ej0_name); ++i) { /* Slot is in byte 2 in _ADR */ u8 slot = ssdp_pcihp_aml[aml_adr_dword[i] + 2] & 0x1F; @@ -514,11 +515,29 @@ static void* build_pcihp(void) free(ssdt); return NULL; } - if (!(rmvc_pcrm & (0x1 << slot))) { + if (!(hotpluggable & (0x1 << slot))) { memcpy(ssdt + aml_ej0_name[i], "EJ0_", 4); } } + /* Runtime patching of STA. If running on system that + * doesn't support the Present/Eject field, replace _STA + * with STA_ */ + if (ARRAY_SIZE(aml_sta_name) != ARRAY_SIZE(aml_adr_dword)) { + link_time_assertion(); + } + + present = inl(PCI_PRES_EJ); + for (i = 0; present == 0 && i < ARRAY_SIZE(aml_sta_name); ++i) { + /* Sanity check */ + if (memcmp(ssdp_pcihp_aml + aml_sta_name[i], "_STA", 4)) { + warn_internalerror(); + free(ssdt); + return NULL; + } + memcpy(ssdt + aml_sta_name[i], "STA_", 4); + } + return ssdt; } diff --git a/src/ssdt-pcihp.dsl b/src/ssdt-pcihp.dsl index 4b435b8..376476a 100644 --- a/src/ssdt-pcihp.dsl +++ b/src/ssdt-pcihp.dsl @@ -10,6 +10,7 @@ DefinitionBlock ("ssdt-pcihp.aml", "SSDT", 0x01, "BXPC", "BXSSDTPCIHP", 0x1) /* Objects supplied by DSDT */ External (\_SB.PCI0, DeviceObj) External (\_SB.PCI0.PCEJ, MethodObj) + External (\_SB.PCI0.PSTA, MethodObj) Scope(\_SB.PCI0) { /* Bulk generated PCI hotplug devices */ @@ -23,6 +24,8 @@ DefinitionBlock ("ssdt-pcihp.aml", "SSDT", 0x01, "BXPC", "BXSSDTPCIHP", 0x1) Name (_ADR, 0x##slot##0000) \ ACPI_EXTRACT_METHOD_STRING aml_ej0_name \ Method (_EJ0, 1) { Return(PCEJ(0x##slot)) } \ + ACPI_EXTRACT_METHOD_STRING aml_sta_name \ + Method (_STA, 0) { Return(PSTA(0x##slot)) } \ Name (_SUN, 0x##slot) \ } diff --git a/src/ssdt-pcihp.hex b/src/ssdt-pcihp.hex index b15ad5a..f060c94 100644 --- a/src/ssdt-pcihp.hex +++ b/src/ssdt-pcihp.hex @@ -1,80 +1,113 @@ static unsigned short aml_adr_dword[] = { 0x3e, -0x62, -0x88, -0xae, -0xd4, -0xfa, -0x120, -0x146, -0x16c, -0x192, -0x1b8, -0x1de, -0x204, -0x22a, -0x250, -0x276, -0x29c, -0x2c2, -0x2e8, -0x30e, -0x334, -0x35a, -0x380, -0x3a6, -0x3cc, -0x3f2, -0x418, -0x43e, -0x464, -0x48a, -0x4b0 +0x6f, +0xa3, +0xd7, +0x10b, +0x13f, +0x173, +0x1a7, +0x1db, +0x20f, +0x243, +0x277, +0x2ab, +0x2df, +0x313, +0x347, +0x37b, +0x3af, +0x3e3, +0x417, +0x44b, +0x47f, +0x4b3, +0x4e7, +0x51b, +0x54f, +0x583, +0x5b7, +0x5eb, +0x61f, +0x653 +}; +static unsigned short aml_sta_name[] = { +0x51, +0x83, +0xb7, +0xeb, +0x11f, +0x153, +0x187, +0x1bb, +0x1ef, +0x223, +0x257, +0x28b, +0x2bf, +0x2f3, +0x327, +0x35b, +0x38f, +0x3c3, +0x3f7, +0x42b, +0x45f, +0x493, +0x4c7, +0x4fb, +0x52f, +0x563, +0x597, +0x5cb, +0x5ff, +0x633, +0x667 }; static unsigned short aml_ej0_name[] = { 0x44, -0x68, -0x8e, -0xb4, -0xda, -0x100, -0x126, -0x14c, -0x172, -0x198, -0x1be, -0x1e4, -0x20a, -0x230, -0x256, -0x27c, -0x2a2, -0x2c8, -0x2ee, -0x314, -0x33a, -0x360, -0x386, -0x3ac, -0x3d2, -0x3f8, -0x41e, -0x444, -0x46a, -0x490, -0x4b6 +0x75, +0xa9, +0xdd, +0x111, +0x145, +0x179, +0x1ad, +0x1e1, +0x215, +0x249, +0x27d, +0x2b1, +0x2e5, +0x319, +0x34d, +0x381, +0x3b5, +0x3e9, +0x41d, +0x451, +0x485, +0x4b9, +0x4ed, +0x521, +0x555, +0x589, +0x5bd, +0x5f1, +0x625, +0x659 }; static unsigned char ssdp_pcihp_aml[] = { 0x53, 0x53, 0x44, 0x54, -0x44, -0x6, +0xf5, +0x7, 0x0, 0x0, 0x1, -0x94, +0xcd, 0x42, 0x58, 0x50, @@ -102,8 +135,8 @@ static unsigned char ssdp_pcihp_aml[] = { 0x10, 0x20, 0x10, -0x4f, -0x61, +0x40, +0x7d, 0x5c, 0x2e, 0x5f, @@ -116,7 +149,7 @@ static unsigned char ssdp_pcihp_aml[] = { 0x30, 0x5b, 0x82, -0x22, +0x2f, 0x53, 0x30, 0x31, @@ -144,6 +177,19 @@ static unsigned char ssdp_pcihp_aml[] = { 0x45, 0x4a, 0x1, +0x14, +0xc, +0x5f, +0x53, +0x54, +0x41, +0x0, +0xa4, +0x50, +0x53, +0x54, +0x41, +0x1, 0x8, 0x5f, 0x53, @@ -152,7 +198,7 @@ static unsigned char ssdp_pcihp_aml[] = { 0x1, 0x5b, 0x82, -0x24, +0x32, 0x53, 0x30, 0x32, @@ -181,6 +227,20 @@ static unsigned char ssdp_pcihp_aml[] = { 0x4a, 0xa, 0x2, +0x14, +0xd, +0x5f, +0x53, +0x54, +0x41, +0x0, +0xa4, +0x50, +0x53, +0x54, +0x41, +0xa, +0x2, 0x8, 0x5f, 0x53, @@ -190,7 +250,7 @@ static unsigned char ssdp_pcihp_aml[] = { 0x2, 0x5b, 0x82, -0x24, +0x32, 0x53, 0x30, 0x33, @@ -219,6 +279,20 @@ static unsigned char ssdp_pcihp_aml[] = { 0x4a, 0xa, 0x3, +0x14, +0xd, +0x5f, +0x53, +0x54, +0x41, +0x0, +0xa4, +0x50, +0x53, +0x54, +0x41, +0xa, +0x3, 0x8, 0x5f, 0x53, @@ -228,7 +302,7 @@ static unsigned char ssdp_pcihp_aml[] = { 0x3, 0x5b, 0x82, -0x24, +0x32, 0x53, 0x30, 0x34, @@ -257,6 +331,20 @@ static unsigned char ssdp_pcihp_aml[] = { 0x4a, 0xa, 0x4, +0x14, +0xd, +0x5f, +0x53, +0x54, +0x41, +0x0, +0xa4, +0x50, +0x53, +0x54, +0x41, +0xa, +0x4, 0x8, 0x5f, 0x53, @@ -266,7 +354,7 @@ static unsigned char ssdp_pcihp_aml[] = { 0x4, 0x5b, 0x82, -0x24, +0x32, 0x53, 0x30, 0x35, @@ -295,6 +383,20 @@ static unsigned char ssdp_pcihp_aml[] = { 0x4a, 0xa, 0x5, +0x14, +0xd, +0x5f, +0x53, +0x54, +0x41, +0x0, +0xa4, +0x50, +0x53, +0x54, +0x41, +0xa, +0x5, 0x8, 0x5f, 0x53, @@ -304,7 +406,7 @@ static unsigned char ssdp_pcihp_aml[] = { 0x5, 0x5b, 0x82, -0x24, +0x32, 0x53, 0x30, 0x36, @@ -333,6 +435,20 @@ static unsigned char ssdp_pcihp_aml[] = { 0x4a, 0xa, 0x6, +0x14, +0xd, +0x5f, +0x53, +0x54, +0x41, +0x0, +0xa4, +0x50, +0x53, +0x54, +0x41, +0xa, +0x6, 0x8, 0x5f, 0x53, @@ -342,7 +458,7 @@ static unsigned char ssdp_pcihp_aml[] = { 0x6, 0x5b, 0x82, -0x24, +0x32, 0x53, 0x30, 0x37, @@ -371,6 +487,20 @@ static unsigned char ssdp_pcihp_aml[] = { 0x4a, 0xa, 0x7, +0x14, +0xd, +0x5f, +0x53, +0x54, +0x41, +0x0, +0xa4, +0x50, +0x53, +0x54, +0x41, +0xa, +0x7, 0x8, 0x5f, 0x53, @@ -380,7 +510,7 @@ static unsigned char ssdp_pcihp_aml[] = { 0x7, 0x5b, 0x82, -0x24, +0x32, 0x53, 0x30, 0x38, @@ -409,6 +539,20 @@ static unsigned char ssdp_pcihp_aml[] = { 0x4a, 0xa, 0x8, +0x14, +0xd, +0x5f, +0x53, +0x54, +0x41, +0x0, +0xa4, +0x50, +0x53, +0x54, +0x41, +0xa, +0x8, 0x8, 0x5f, 0x53, @@ -418,7 +562,7 @@ static unsigned char ssdp_pcihp_aml[] = { 0x8, 0x5b, 0x82, -0x24, +0x32, 0x53, 0x30, 0x39, @@ -447,6 +591,20 @@ static unsigned char ssdp_pcihp_aml[] = { 0x4a, 0xa, 0x9, +0x14, +0xd, +0x5f, +0x53, +0x54, +0x41, +0x0, +0xa4, +0x50, +0x53, +0x54, +0x41, +0xa, +0x9, 0x8, 0x5f, 0x53, @@ -456,7 +614,7 @@ static unsigned char ssdp_pcihp_aml[] = { 0x9, 0x5b, 0x82, -0x24, +0x32, 0x53, 0x30, 0x41, @@ -485,6 +643,20 @@ static unsigned char ssdp_pcihp_aml[] = { 0x4a, 0xa, 0xa, +0x14, +0xd, +0x5f, +0x53, +0x54, +0x41, +0x0, +0xa4, +0x50, +0x53, +0x54, +0x41, +0xa, +0xa, 0x8, 0x5f, 0x53, @@ -494,7 +666,7 @@ static unsigned char ssdp_pcihp_aml[] = { 0xa, 0x5b, 0x82, -0x24, +0x32, 0x53, 0x30, 0x42, @@ -523,6 +695,20 @@ static unsigned char ssdp_pcihp_aml[] = { 0x4a, 0xa, 0xb, +0x14, +0xd, +0x5f, +0x53, +0x54, +0x41, +0x0, +0xa4, +0x50, +0x53, +0x54, +0x41, +0xa, +0xb, 0x8, 0x5f, 0x53, @@ -532,7 +718,7 @@ static unsigned char ssdp_pcihp_aml[] = { 0xb, 0x5b, 0x82, -0x24, +0x32, 0x53, 0x30, 0x43, @@ -561,6 +747,20 @@ static unsigned char ssdp_pcihp_aml[] = { 0x4a, 0xa, 0xc, +0x14, +0xd, +0x5f, +0x53, +0x54, +0x41, +0x0, +0xa4, +0x50, +0x53, +0x54, +0x41, +0xa, +0xc, 0x8, 0x5f, 0x53, @@ -570,7 +770,7 @@ static unsigned char ssdp_pcihp_aml[] = { 0xc, 0x5b, 0x82, -0x24, +0x32, 0x53, 0x30, 0x44, @@ -599,6 +799,20 @@ static unsigned char ssdp_pcihp_aml[] = { 0x4a, 0xa, 0xd, +0x14, +0xd, +0x5f, +0x53, +0x54, +0x41, +0x0, +0xa4, +0x50, +0x53, +0x54, +0x41, +0xa, +0xd, 0x8, 0x5f, 0x53, @@ -608,7 +822,7 @@ static unsigned char ssdp_pcihp_aml[] = { 0xd, 0x5b, 0x82, -0x24, +0x32, 0x53, 0x30, 0x45, @@ -637,6 +851,20 @@ static unsigned char ssdp_pcihp_aml[] = { 0x4a, 0xa, 0xe, +0x14, +0xd, +0x5f, +0x53, +0x54, +0x41, +0x0, +0xa4, +0x50, +0x53, +0x54, +0x41, +0xa, +0xe, 0x8, 0x5f, 0x53, @@ -646,7 +874,7 @@ static unsigned char ssdp_pcihp_aml[] = { 0xe, 0x5b, 0x82, -0x24, +0x32, 0x53, 0x30, 0x46, @@ -675,6 +903,20 @@ static unsigned char ssdp_pcihp_aml[] = { 0x4a, 0xa, 0xf, +0x14, +0xd, +0x5f, +0x53, +0x54, +0x41, +0x0, +0xa4, +0x50, +0x53, +0x54, +0x41, +0xa, +0xf, 0x8, 0x5f, 0x53, @@ -684,7 +926,7 @@ static unsigned char ssdp_pcihp_aml[] = { 0xf, 0x5b, 0x82, -0x24, +0x32, 0x53, 0x31, 0x30, @@ -713,6 +955,20 @@ static unsigned char ssdp_pcihp_aml[] = { 0x4a, 0xa, 0x10, +0x14, +0xd, +0x5f, +0x53, +0x54, +0x41, +0x0, +0xa4, +0x50, +0x53, +0x54, +0x41, +0xa, +0x10, 0x8, 0x5f, 0x53, @@ -722,7 +978,7 @@ static unsigned char ssdp_pcihp_aml[] = { 0x10, 0x5b, 0x82, -0x24, +0x32, 0x53, 0x31, 0x31, @@ -751,6 +1007,20 @@ static unsigned char ssdp_pcihp_aml[] = { 0x4a, 0xa, 0x11, +0x14, +0xd, +0x5f, +0x53, +0x54, +0x41, +0x0, +0xa4, +0x50, +0x53, +0x54, +0x41, +0xa, +0x11, 0x8, 0x5f, 0x53, @@ -760,7 +1030,7 @@ static unsigned char ssdp_pcihp_aml[] = { 0x11, 0x5b, 0x82, -0x24, +0x32, 0x53, 0x31, 0x32, @@ -789,6 +1059,20 @@ static unsigned char ssdp_pcihp_aml[] = { 0x4a, 0xa, 0x12, +0x14, +0xd, +0x5f, +0x53, +0x54, +0x41, +0x0, +0xa4, +0x50, +0x53, +0x54, +0x41, +0xa, +0x12, 0x8, 0x5f, 0x53, @@ -798,7 +1082,7 @@ static unsigned char ssdp_pcihp_aml[] = { 0x12, 0x5b, 0x82, -0x24, +0x32, 0x53, 0x31, 0x33, @@ -827,6 +1111,20 @@ static unsigned char ssdp_pcihp_aml[] = { 0x4a, 0xa, 0x13, +0x14, +0xd, +0x5f, +0x53, +0x54, +0x41, +0x0, +0xa4, +0x50, +0x53, +0x54, +0x41, +0xa, +0x13, 0x8, 0x5f, 0x53, @@ -836,7 +1134,7 @@ static unsigned char ssdp_pcihp_aml[] = { 0x13, 0x5b, 0x82, -0x24, +0x32, 0x53, 0x31, 0x34, @@ -865,6 +1163,20 @@ static unsigned char ssdp_pcihp_aml[] = { 0x4a, 0xa, 0x14, +0x14, +0xd, +0x5f, +0x53, +0x54, +0x41, +0x0, +0xa4, +0x50, +0x53, +0x54, +0x41, +0xa, +0x14, 0x8, 0x5f, 0x53, @@ -874,7 +1186,7 @@ static unsigned char ssdp_pcihp_aml[] = { 0x14, 0x5b, 0x82, -0x24, +0x32, 0x53, 0x31, 0x35, @@ -903,6 +1215,20 @@ static unsigned char ssdp_pcihp_aml[] = { 0x4a, 0xa, 0x15, +0x14, +0xd, +0x5f, +0x53, +0x54, +0x41, +0x0, +0xa4, +0x50, +0x53, +0x54, +0x41, +0xa, +0x15, 0x8, 0x5f, 0x53, @@ -912,7 +1238,7 @@ static unsigned char ssdp_pcihp_aml[] = { 0x15, 0x5b, 0x82, -0x24, +0x32, 0x53, 0x31, 0x36, @@ -941,6 +1267,20 @@ static unsigned char ssdp_pcihp_aml[] = { 0x4a, 0xa, 0x16, +0x14, +0xd, +0x5f, +0x53, +0x54, +0x41, +0x0, +0xa4, +0x50, +0x53, +0x54, +0x41, +0xa, +0x16, 0x8, 0x5f, 0x53, @@ -950,7 +1290,7 @@ static unsigned char ssdp_pcihp_aml[] = { 0x16, 0x5b, 0x82, -0x24, +0x32, 0x53, 0x31, 0x37, @@ -979,6 +1319,20 @@ static unsigned char ssdp_pcihp_aml[] = { 0x4a, 0xa, 0x17, +0x14, +0xd, +0x5f, +0x53, +0x54, +0x41, +0x0, +0xa4, +0x50, +0x53, +0x54, +0x41, +0xa, +0x17, 0x8, 0x5f, 0x53, @@ -988,7 +1342,7 @@ static unsigned char ssdp_pcihp_aml[] = { 0x17, 0x5b, 0x82, -0x24, +0x32, 0x53, 0x31, 0x38, @@ -1017,6 +1371,20 @@ static unsigned char ssdp_pcihp_aml[] = { 0x4a, 0xa, 0x18, +0x14, +0xd, +0x5f, +0x53, +0x54, +0x41, +0x0, +0xa4, +0x50, +0x53, +0x54, +0x41, +0xa, +0x18, 0x8, 0x5f, 0x53, @@ -1026,7 +1394,7 @@ static unsigned char ssdp_pcihp_aml[] = { 0x18, 0x5b, 0x82, -0x24, +0x32, 0x53, 0x31, 0x39, @@ -1055,6 +1423,20 @@ static unsigned char ssdp_pcihp_aml[] = { 0x4a, 0xa, 0x19, +0x14, +0xd, +0x5f, +0x53, +0x54, +0x41, +0x0, +0xa4, +0x50, +0x53, +0x54, +0x41, +0xa, +0x19, 0x8, 0x5f, 0x53, @@ -1064,7 +1446,7 @@ static unsigned char ssdp_pcihp_aml[] = { 0x19, 0x5b, 0x82, -0x24, +0x32, 0x53, 0x31, 0x41, @@ -1093,6 +1475,20 @@ static unsigned char ssdp_pcihp_aml[] = { 0x4a, 0xa, 0x1a, +0x14, +0xd, +0x5f, +0x53, +0x54, +0x41, +0x0, +0xa4, +0x50, +0x53, +0x54, +0x41, +0xa, +0x1a, 0x8, 0x5f, 0x53, @@ -1102,7 +1498,7 @@ static unsigned char ssdp_pcihp_aml[] = { 0x1a, 0x5b, 0x82, -0x24, +0x32, 0x53, 0x31, 0x42, @@ -1131,6 +1527,20 @@ static unsigned char ssdp_pcihp_aml[] = { 0x4a, 0xa, 0x1b, +0x14, +0xd, +0x5f, +0x53, +0x54, +0x41, +0x0, +0xa4, +0x50, +0x53, +0x54, +0x41, +0xa, +0x1b, 0x8, 0x5f, 0x53, @@ -1140,7 +1550,7 @@ static unsigned char ssdp_pcihp_aml[] = { 0x1b, 0x5b, 0x82, -0x24, +0x32, 0x53, 0x31, 0x43, @@ -1169,6 +1579,20 @@ static unsigned char ssdp_pcihp_aml[] = { 0x4a, 0xa, 0x1c, +0x14, +0xd, +0x5f, +0x53, +0x54, +0x41, +0x0, +0xa4, +0x50, +0x53, +0x54, +0x41, +0xa, +0x1c, 0x8, 0x5f, 0x53, @@ -1178,7 +1602,7 @@ static unsigned char ssdp_pcihp_aml[] = { 0x1c, 0x5b, 0x82, -0x24, +0x32, 0x53, 0x31, 0x44, @@ -1207,6 +1631,20 @@ static unsigned char ssdp_pcihp_aml[] = { 0x4a, 0xa, 0x1d, +0x14, +0xd, +0x5f, +0x53, +0x54, +0x41, +0x0, +0xa4, +0x50, +0x53, +0x54, +0x41, +0xa, +0x1d, 0x8, 0x5f, 0x53, @@ -1216,7 +1654,7 @@ static unsigned char ssdp_pcihp_aml[] = { 0x1d, 0x5b, 0x82, -0x24, +0x32, 0x53, 0x31, 0x45, @@ -1245,6 +1683,20 @@ static unsigned char ssdp_pcihp_aml[] = { 0x4a, 0xa, 0x1e, +0x14, +0xd, +0x5f, +0x53, +0x54, +0x41, +0x0, +0xa4, +0x50, +0x53, +0x54, +0x41, +0xa, +0x1e, 0x8, 0x5f, 0x53, @@ -1254,7 +1706,7 @@ static unsigned char ssdp_pcihp_aml[] = { 0x1e, 0x5b, 0x82, -0x24, +0x32, 0x53, 0x31, 0x46, @@ -1283,6 +1735,20 @@ static unsigned char ssdp_pcihp_aml[] = { 0x4a, 0xa, 0x1f, +0x14, +0xd, +0x5f, +0x53, +0x54, +0x41, +0x0, +0xa4, +0x50, +0x53, +0x54, +0x41, +0xa, +0x1f, 0x8, 0x5f, 0x53,

7 years, 10 months

4
7
0 0

Booting from USB thumbdrives, older drives boot, newer drives don't.

by Dave Frodin

I'm a new subscriber to seabios.org so feel free to straighten me out if needed. I've been debugging an problem we've been seeing with not being able to boot (Ubuntu specifically) off of a variety of "newer" USB thumb drives. I've been specifically looking at an older/newer pair of Sandisk Cruzer 4GB drives. I've been adding dprintf's to narrow down the problem to the blockcmd.c file. The function scsi_init_drive() queries the USB device to determine stuff like vendor/device/size/etc. Near the end of the function is a call to cdb_mode_sense_geom(&dop, &geomdata) to retrieve the info related to cyl/head type stuff. On the older/working thumbdrive it returns zeroes for all of the values that get used by the code. The newer/failing drive generates a "stall" on the USB bus, which it never recovers from. The cdb_mode_sense_geom() function is sending a SCSI CDB Mode Sense (CMD=0x5A) to the device. As a hack of a test, I removed the call to cdb_mode_sense_geom() and filled the buffer it should have returned with zeroes and the failing thumbdrive now boots. I have some searching I need to do to find out... 1) Is there a SCSI command to determine what protocols are supported? 2) Is there another SCSI command that might return similar required data? Has anyone out there experienced similar booting difficulties? Or does anyone have any recommendations on what approach I should take? thanks, Dave

7 years, 10 months

4
10
0 0

[PATCH RFC] seabios: add OSHP method stub

by Michael S. Tsirkin

To allow guests to load the native SHPC driver for a bridge, we must declare an OSHP method for the appropriate device which lets the OS take control of the SHPC. As we don't access SHPC at the moment, we don't need to do anything - just report success. Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com> --- diff --git a/src/ssdt-pcihp.dsl b/src/ssdt-pcihp.dsl index 442e7a8..3f50169 100644 --- a/src/ssdt-pcihp.dsl +++ b/src/ssdt-pcihp.dsl @@ -24,6 +24,7 @@ DefinitionBlock ("ssdt-pcihp.aml", "SSDT", 0x01, "BXPC", "BXSSDTPCIHP", 0x1) ACPI_EXTRACT_METHOD_STRING aml_ej0_name \ Method (_EJ0, 1) { Return(PCEJ(0x##slot)) } \ Name (_SUN, 0x##slot) \ + Method (OSHP, 1) { Return(0x0) } \ } hotplug_slot(03)

7 years, 11 months

4
9
0 0

1.6.3 stable backports

by Ian Campbell

Hi, I'm not sure what the correct procedure is for requesting these so I hope it is ok to post here. Xen is currently using the 1.6.3-stable branch of SeaBIOS, our users have requested a backport of two commits (related to building on NetBSD IIRC): 97f1ffcfac4ca382b5008a7aabfc2c300131f978 Add PYTHON definition to Makefile. 805ede2bd35243a4298bc64bd81be6db7cf57f58 Permit .rodata.__PRETTY_FUNCTION__. sections in roms. Would it be possible to backport those two? I actually already backported these to our own 1.6.3-stable-xen branch but belatedly thought I should inquire about the possibility of an upstream backport -- it would be much preferable to keep the divergence between 1.6.3-stable and -xen to a minimum. If you are happy to backport then you could (if you wanted) pull directly from the Xen branch: The following changes since commit 80d11e8577bf03e98f2eb1b0cb3a281ab2879c9e: Update version to 1.6.3.1 (2011-11-24 12:02:03 -0500) are available in the git repository at: git://xenbits.xen.org/seabios.git 1.6.3-stable-xen Kevin O'Connor (2): Add PYTHON definition to Makefile. Permit .rodata.__PRETTY_FUNCTION__. sections in roms. Makefile | 7 ++++--- tools/layoutrom.py | 12 ++++++++---- 2 files changed, 12 insertions(+), 7 deletions(-) Cheers, Ian.

7 years, 11 months

2
2
0 0

How to Debug read operation on hda

by Daniel Castro

Greeting, As part of the xen code for PV-Drivers in Seabios I am trying to boot from a PV drive. The two ends are connected, and it should be working, but when I try to boot from the harddrive it fails. Inside the code I treat the cdrom as a drive, except I register it in seabios with the cdrom function, but also it fails to boot from cdrom with Error 003. This could mean that maybe I am adding the drives incorrectly, or that my read/write opertaion is wrong. Since the operation runs in 16bit how can I debug it to see what is being done? Thanks for the answers. Daniel -- +-=====---------------------------+ | +---------------------------------+ | This space intentionally blank for notetaking. | | | Daniel Castro, | | | | Consultant/Programmer.| | | | U Andes | +-------------------------------------+

7 years, 11 months

1
0
0 0

Re: [SeaBIOS] Coreboot, Geode LX and VGA

by Nils

Op woensdag 22-02-2012 om 23:52 uur [tijdzone +0100], schreef Christian Gmeiner: > ping > -- The only thing that comes to my mind is that you could try coreboot version 4.0-1975-g1b785c7 because that's the last version that i used. According to the coreboot mailinglist there seems to be a problem in recent versions with vbios and option rom init in seabios. See 'Fix multipleVGA cards resource conflict on Windows' . Maybe it affects your board also. Greetings, Nils.

7 years, 11 months

2
1
0 0

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS February 2012