SeaBIOS

seabios@seabios.org

4 participants
3801 discussions

[PATCH] scsi: add AMD PCscsi driver
by Paolo Bonzini 04 Aug '12

04 Aug '12

This is a driver for an AMD PCscsi (am53c974) SCSI card. It can be used together with DOS or old operating systems such as Windows NT 3.1, Windows 3.1 or Windows 98. Cc: Hervé Poussineau <hpoussin(a)reactos.org> Signed-off-by: Paolo Bonzini <pbonzini(a)redhat.com> --- Makefile | 2 +- src/Kconfig | 6 ++ src/block.c | 1 + src/blockcmd.c | 3 + src/disk.h | 1 + src/esp-scsi.c | 231 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/post.c | 2 + 7 files changed, 245 insertions(+), 1 deletion(-) create mode 100644 src/esp-scsi.c diff --git a/Makefile b/Makefile index 1167799..4dce77b 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ SRCBOTH=misc.c stacks.c pmm.c output.c util.c block.c floppy.c ata.c mouse.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 virtio-scsi.c apm.c ahci.c \ - usb-uas.c lsi-scsi.c + usb-uas.c lsi-scsi.c esp-scsi.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 bc343ee..cee3bc5 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -119,6 +119,12 @@ menu "Hardware support" default y help Support boot from virtio-scsi storage. + config ESP_SCSI + depends on DRIVES + bool "AMD PCscsi controllers" + default y + help + Support boot from AMD PCscsi storage. config LSI_SCSI depends on DRIVES && !COREBOOT bool "lsi53c895a scsi controllers" diff --git a/src/block.c b/src/block.c index 1c200cc..243428e 100644 --- a/src/block.c +++ b/src/block.c @@ -335,6 +335,7 @@ process_op(struct disk_op_s *op) case DTYPE_UAS: case DTYPE_VIRTIO_SCSI: case DTYPE_LSI_SCSI: + case DTYPE_ESP_SCSI: return process_scsi_op(op); default: op->count = 0; diff --git a/src/blockcmd.c b/src/blockcmd.c index 4365650..97c72a6 100644 --- a/src/blockcmd.c +++ b/src/blockcmd.c @@ -15,6 +15,7 @@ #include "usb-uas.h" // usb_cmd_data #include "virtio-scsi.h" // virtio_scsi_cmd_data #include "lsi-scsi.h" // lsi_scsi_cmd_data +#include "esp-scsi.h" // esp_scsi_cmd_data #include "boot.h" // boot_add_hd // Route command to low-level handler. @@ -35,6 +36,8 @@ cdb_cmd_data(struct disk_op_s *op, void *cdbcmd, u16 blocksize) return virtio_scsi_cmd_data(op, cdbcmd, blocksize); case DTYPE_LSI_SCSI: return lsi_scsi_cmd_data(op, cdbcmd, blocksize); + case DTYPE_ESP_SCSI: + return esp_scsi_cmd_data(op, cdbcmd, blocksize); default: op->count = 0; return DISK_RET_EPARAM; diff --git a/src/disk.h b/src/disk.h index 2b2511f..3d07372 100644 --- a/src/disk.h +++ b/src/disk.h @@ -234,6 +234,7 @@ struct drive_s { #define DTYPE_USB 0x0a #define DTYPE_UAS 0x0b #define DTYPE_LSI_SCSI 0x0c +#define DTYPE_ESP_SCSI 0x0d #define MAXDESCSIZE 80 diff --git a/src/esp-scsi.c b/src/esp-scsi.c new file mode 100644 index 0000000..daafa1e --- /dev/null +++ b/src/esp-scsi.c @@ -0,0 +1,231 @@ +// AMD PCscsi boot support. +// +// Copyright (C) 2012 Red Hat Inc. +// +// Authors: +// Paolo Bonzini <pbonzini(a)redhat.com> +// +// based on lsi-scsi.c which is written by: +// Gerd Hoffman <kraxel(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 +#include "pci_regs.h" // PCI_VENDOR_ID +#include "boot.h" // bootprio_find_scsi_device +#include "blockcmd.h" // scsi_init_drive +#include "disk.h" + +#define ESP_TCLO 0x00 +#define ESP_TCMID 0x04 +#define ESP_FIFO 0x08 +#define ESP_CMD 0x0c +#define ESP_WBUSID 0x10 +#define ESP_TCHI 0x38 + +#define ESP_RSTAT 0x10 +#define ESP_RINTR 0x14 +#define ESP_RFLAGS 0x1c + +#define ESP_DMA_CMD 0x40 +#define ESP_DMA_STC 0x44 +#define ESP_DMA_SPA 0x48 +#define ESP_DMA_WBC 0x4c +#define ESP_DMA_WAC 0x50 +#define ESP_DMA_STAT 0x54 +#define ESP_DMA_SMDLA 0x58 +#define ESP_DMA_WMAC 0x58c + +#define ESP_CMD_DMA 0x80 +#define ESP_CMD_RESET 0x02 +#define ESP_CMD_TI 0x10 +#define ESP_CMD_ICCS 0x11 +#define ESP_CMD_SELATN 0x42 + +#define ESP_STAT_DI 0x01 +#define ESP_STAT_CD 0x02 +#define ESP_STAT_MSG 0x04 +#define ESP_STAT_TC 0x10 + +#define ESP_INTR_DC 0x20 + +struct esp_lun_s { + struct drive_s drive; + struct pci_device *pci; + u32 iobase; + u8 target; + u8 lun; +}; + +static void +esp_scsi_dma(u32 iobase, u32 buf, u32 len, int read) +{ + outb(len & 0xff, iobase + ESP_TCLO); + outb((len >> 8) & 0xff, iobase + ESP_TCMID); + outb((len >> 16) & 0xff, iobase + ESP_TCHI); + outl(buf, iobase + ESP_DMA_SPA); + outl(len, iobase + ESP_DMA_STC); + outb(read ? 0x83 : 0x03, iobase + ESP_DMA_CMD); +} + +static int +esp_scsi_cmd(struct esp_lun_s *llun, struct disk_op_s *op, + u8 *cdbcmd, u16 target, u16 lun, u16 blocksize) +{ + u32 iobase = GET_GLOBAL(llun->iobase); + int i, state; + u8 status; + + outb(target, iobase + ESP_WBUSID); + + /* + * We need to pass the LUN at the beginning of the command, and the FIFO + * is only 16 bytes, so we cannot support 16-byte CDBs. The alternative + * would be to use DMA for the 17-byte command too, which is quite + * overkill. + */ + outb(lun, iobase + ESP_FIFO); + cdbcmd[1] &= 0x1f; + cdbcmd[1] |= lun << 5; + for (i = 0; i < 12; i++) + outb(cdbcmd[i], iobase + ESP_FIFO); + outb(ESP_CMD_SELATN, iobase + ESP_CMD); + + for (state = 0;;) { + u8 stat = inb(iobase + ESP_RSTAT); + + /* Detect disconnected device. */ + if (state == 0 && (inb(iobase + ESP_RINTR) & ESP_INTR_DC)) { + return DISK_RET_ENOTREADY; + } + + /* HBA reads command, clears CD, sets TC -> do DMA if needed. */ + if (state == 0 && (stat & ESP_STAT_TC)) { + state++; + if (op->count && blocksize) { + /* Data phase. */ + u32 count = (u32)op->count * blocksize; + esp_scsi_dma(iobase, (u32)op->buf_fl, count, + cdb_is_read(cdbcmd, blocksize)); + outb(ESP_CMD_TI | ESP_CMD_DMA, iobase + ESP_CMD); + continue; + } + } + + /* At end of DMA TC is set again -> complete command. */ + if (state == 1 && (stat & ESP_STAT_TC)) { + state++; + outb(ESP_CMD_ICCS, iobase + ESP_CMD); + continue; + } + + /* Finally read data from the message in phase. */ + if (state == 2 && (stat & ESP_STAT_MSG)) { + state++; + status = inb(iobase + ESP_FIFO); + inb(iobase + ESP_FIFO); + break; + } + usleep(5); + } + + if (status == 0) { + return DISK_RET_SUCCESS; + } + + return DISK_RET_EBADTRACK; +} + +int +esp_scsi_cmd_data(struct disk_op_s *op, void *cdbcmd, u16 blocksize) +{ + if (!CONFIG_ESP_SCSI) + return DISK_RET_EBADTRACK; + + struct esp_lun_s *llun = + container_of(op->drive_g, struct esp_lun_s, drive); + + return esp_scsi_cmd(llun, op, cdbcmd, + GET_GLOBAL(llun->target), GET_GLOBAL(llun->lun), + blocksize); +} + +static int +esp_scsi_add_lun(struct pci_device *pci, u32 iobase, u8 target, u8 lun) +{ + struct esp_lun_s *llun = malloc_fseg(sizeof(*llun)); + if (!llun) { + warn_noalloc(); + return -1; + } + memset(llun, 0, sizeof(*llun)); + llun->drive.type = DTYPE_ESP_SCSI; + llun->drive.cntl_id = pci->bdf; + llun->pci = pci; + llun->target = target; + llun->lun = lun; + llun->iobase = iobase; + + char *name = znprintf(16, "esp %02x:%02x.%x %d:%d", + pci_bdf_to_bus(pci->bdf), pci_bdf_to_dev(pci->bdf), + pci_bdf_to_fn(pci->bdf), target, lun); + int prio = bootprio_find_scsi_device(pci, target, lun); + int ret = scsi_init_drive(&llun->drive, name, prio); + free(name); + if (ret) + goto fail; + return 0; + +fail: + free(llun); + return -1; +} + +static void +esp_scsi_scan_target(struct pci_device *pci, u32 iobase, u8 target) +{ + esp_scsi_add_lun(pci, iobase, target, 0); +} + +static void +init_esp_scsi(struct pci_device *pci) +{ + u16 bdf = pci->bdf; + u32 iobase = pci_config_readl(pci->bdf, PCI_BASE_ADDRESS_0) + & PCI_BASE_ADDRESS_IO_MASK; + + dprintf(1, "found esp at %02x:%02x.%x, io @ %x\n", + pci_bdf_to_bus(bdf), pci_bdf_to_dev(bdf), + pci_bdf_to_fn(bdf), iobase); + + // reset + outb(ESP_CMD_RESET, iobase + ESP_CMD); + + int i; + for (i = 0; i <= 7; i++) + esp_scsi_scan_target(pci, iobase, i); + + return; +} + +void +esp_scsi_setup(void) +{ + ASSERT32FLAT(); + if (!CONFIG_ESP_SCSI) + return; + + dprintf(3, "init esp\n"); + + struct pci_device *pci; + foreachpci(pci) { + if (pci->vendor != PCI_VENDOR_ID_AMD + || pci->device != PCI_DEVICE_ID_AMD_SCSI) + continue; + init_esp_scsi(pci); + } +} diff --git a/src/post.c b/src/post.c index 0f31b4c..924b311 100644 --- a/src/post.c +++ b/src/post.c @@ -28,6 +28,7 @@ #include "virtio-blk.h" // virtio_blk_setup #include "virtio-scsi.h" // virtio_scsi_setup #include "lsi-scsi.h" // lsi_scsi_setup +#include "esp-scsi.h" // esp_scsi_setup /**************************************************************** @@ -196,6 +197,7 @@ init_hw(void) virtio_blk_setup(); virtio_scsi_setup(); lsi_scsi_setup(); + esp_scsi_setup(); } // Begin the boot process by invoking an int0x19 in 16bit mode. -- 1.7.10.4

2 3

[PATCH 0/2] SCSI fixes
by Paolo Bonzini 04 Aug '12

04 Aug '12

Here are two simple fixes for the SCSI driver, so that the LSI adapter is able to boot FreeDOS. Paolo Bonzini (2): lsi: do not reset on error scsi: fix detection of QEMU src/blockcmd.c | 2 +- src/lsi-scsi.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) -- 1.7.10.4

2 3

Re: [SeaBIOS] Compiling SeaBIOS for coreboot has problems with its ACPI code
by Kevin O'Connor 04 Aug '12

04 Aug '12

On Tue, Jul 31, 2012 at 08:02:45PM +0200, Idwer Vollering wrote: > 2012/7/31 Moore, Robert <robert.moore(a)intel.com>: > > Please let me know if the -Pn option works for you. > > Thanks, > > Bob > > -Pn works for me, on acpica-20120420-64. It looks like "-Pn" only works on newer versions of iasl. Can you confirm the SeaBIOS patch below works with a newer iasl? -Kevin --- a/Makefile +++ b/Makefile @@ -221,11 +221,14 @@ $(OUT)vgabios.bin: $(OUT)vgabios.bin.raw tools/buildrom.py ################ DSDT build rules +iasl-option=$(shell if test -z "`$(1) $(2) -h 2>&1 > /dev/null" \ + ; then echo "$(2)"; else echo "$(3)"; fi ;) + $(OUT)%.hex: src/%.dsl ./tools/acpi_extract_preprocess.py ./tools/acpi_extract.py @echo " Compiling IASL $@" $(Q)cpp -P $< > $(OUT)$*.dsl.i.orig $(Q)$(PYTHON) ./tools/acpi_extract_preprocess.py $(OUT)$*.dsl.i.orig > $(OUT)$*.dsl.i - $(Q)$(IASL) -vs -l -tc -p $(OUT)$* $(OUT)$*.dsl.i + $(Q)$(IASL) $(iasl-option,$(IASL),-Pn,) -vs -l -tc -p $(OUT)$* $(OUT)$*.dsl.i $(Q)$(PYTHON) ./tools/acpi_extract.py $(OUT)$*.lst > $(OUT)$*.off $(Q)cat $(OUT)$*.off > $@

4 4

Re: [SeaBIOS] IEEE 1394 interface booting
by Peter Stuge 04 Aug '12

04 Aug '12

Fred . wrote: > Add support for booting from IEEE 1394 (aka FireWire) interface. Same here - noone is likely to do this until they want to have it themselves. When someone is doing an implementation we can talk about details. //Peter

2 1

Stance on TPM?
by Fred . 04 Aug '12

04 Aug '12

What is SeaBIOS stance on Trusted Platform Module (TPM) ?

1 0

IEEE 1394 interface booting
by Fred . 04 Aug '12

04 Aug '12

Add support for booting from IEEE 1394 (aka FireWire) interface.

1 0

Re: [SeaBIOS] Compiling SeaBIOS for coreboot has problems with its ACPI code
by Paolo Bonzini 03 Aug '12

03 Aug '12

Il 03/08/2012 05:07, Moore, Robert ha scritto: > Perhaps there is a compatibility flag (or some other flag) to disable the code that is emitted below? No, there isn't, but you can exploit the fact that only the new Bison will define a header guard (ASLCOMPILER_ASLCOMPILERPARSE_H). So you can avoid redeclaring AslCompilerparse and AslCompilerdebug if that symbol is defined. Paolo >> >-----Original Message----- >> >From: Moore, Robert >> >Sent: Tuesday, July 31, 2012 2:31 PM >> >To: Idwer Vollering >> >Cc: Michael S. Tsirkin; Kevin O'Connor; seabios(a)seabios.org; Tang, Feng >> >Subject: RE: [SeaBIOS] Compiling SeaBIOS for coreboot has problems with its >> >ACPI code >> > >> >Yes, for whatever reason, it is definitely an issue with the newer version >> >of bison. None of the code below is output with bison 2.4.2: >> > >> > >> >#if YYDEBUG >> >extern int AslCompilerdebug; >> >#endif >> > >> >#ifdef YYPARSE_PARAM >> >#if defined __STDC__ || defined __cplusplus >> >int AslCompilerparse (void *YYPARSE_PARAM); >> >#else >> >int AslCompilerparse (); >> >#endif >> >#else /* ! YYPARSE_PARAM */ >> >#if defined __STDC__ || defined __cplusplus >> >int AslCompilerparse (void); >> >#else >> >int AslCompilerparse (); >> >#endif >> >#endif /* ! YYPARSE_PARAM */

2 1

Re: [SeaBIOS] Compiling SeaBIOS for coreboot has problems with its ACPI code
by Michael S. Tsirkin 03 Aug '12

03 Aug '12

On Fri, Aug 03, 2012 at 01:32:09PM +0200, Idwer Vollering wrote: > 2012/8/2 Michael S. Tsirkin <mst(a)redhat.com>: > > On Tue, Jul 31, 2012 at 09:12:51PM -0400, Kevin O'Connor wrote: > >> On Tue, Jul 31, 2012 at 08:02:45PM +0200, Idwer Vollering wrote: > >> > 2012/7/31 Moore, Robert <robert.moore(a)intel.com>: > >> > > Please let me know if the -Pn option works for you. > >> > > Thanks, > >> > > Bob > >> > > >> > -Pn works for me, on acpica-20120420-64. > >> > >> It looks like "-Pn" only works on newer versions of iasl. Can you > >> confirm the SeaBIOS patch below works with a newer iasl? > >> > >> -Kevin > > > > It doesn't work for me. > > Can you try acpica-unix-20120215? Out of time for now. It should not matter I think - I think Kevin's patch had some bugs unrelated to acpica. > > > > BTW you can clone from: > > > > git://github.com/otcshare/acpica.git > > > > Then just cd acpica, then make and iasl will be generated in > > generate/unix/iasl/obj32/iasl > > > > The following works for me with latest iasl from git as well > > as 20100528 that Fedora 17 ships. > > > > ---> > > > > acpi: fix build with new iasl compiler > > > > iasl versions starting with 20120320 > > (git commit 7fd09d993580e22a096a1b21d2a356d89e702153) enable > > a preprocessor by default, which currently strips out > > comments from the input. Happily the next release, > > 20120420, includes an option to disable the preprocessor. > > Test and use this option when available. > > > > Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com> > > > > --- > > > > diff --git a/Makefile b/Makefile > > index dfdec5c..849824d 100644 > > --- a/Makefile > > +++ b/Makefile > > @@ -221,11 +221,14 @@ $(OUT)vgabios.bin: $(OUT)vgabios.bin.raw tools/buildrom.py > > > > ################ DSDT build rules > > > > +iasl-option=$(shell if "$(1)" "$(2)" -h > /dev/null 2>&1 \ > > + ; then echo "$(2)"; else echo "$(3)"; fi ;) > > + > > $(OUT)%.hex: src/%.dsl ./tools/acpi_extract_preprocess.py ./tools/acpi_extract.py > > @echo " Compiling IASL $@" > > $(Q)cpp -P $< > $(OUT)$*.dsl.i.orig > > $(Q)$(PYTHON) ./tools/acpi_extract_preprocess.py $(OUT)$*.dsl.i.orig > $(OUT)$*.dsl.i > > - $(Q)$(IASL) -vs -l -tc -p $(OUT)$* $(OUT)$*.dsl.i > > + $(Q)$(IASL) $(call iasl-option,$(IASL),-Pn,) -vs -l -tc -p $(OUT)$* $(OUT)$*.dsl.i > > $(Q)$(PYTHON) ./tools/acpi_extract.py $(OUT)$*.lst > $(OUT)$*.off > > $(Q)cat $(OUT)$*.off > $@ > >

1 0

Re: [SeaBIOS] [BUG] BSOD on Win2003 Server when 64bit PCI resource is present
by Paolo Bonzini 03 Aug '12

03 Aug '12

Il 26/07/2012 17:38, Alexey Korolev ha scritto: > HI, > > Current version of Seabios is causing blue screen on Windows2003 when 64bit PCI resource is present and occupies high memory. > > BSOD Error code is: 0x000000A5 (0x02, 0xFFFFfADF6A446880, 0x1, 0xFFFFFADFAA34690) > > The issue is localized, it is related to presence of 64bit resource in _CRS method. > > If we disable a 64bit region from _CRS the Win2003 load normally but this doesn't allow Windows to use 64bit resources. > > At the moment I have no idea how to fix this. Please help! I wonder if Windows 2003 does not support ConcatenateResTemplate. The patch below is obviously wrong, but should let you check if this is the issue: git diff src/acpi-dsdt.dsl diff --git a/src/acpi-dsdt.dsl b/src/acpi-dsdt.dsl index 72dc7d8..11a9c92 100644 --- a/src/acpi-dsdt.dsl +++ b/src/acpi-dsdt.dsl @@ -175,9 +175,6 @@ DefinitionBlock ( 0x00000000, // Address Translation Offset 0x1EC00000, // Address Length ,, PW32, AddressRangeMemory, TypeStatic) - }) - Name (CR64, ResourceTemplate () - { QWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite, 0x00000000, // Address Space Granularity 0x8000000000, // Address Range Minimum @@ -221,20 +218,14 @@ DefinitionBlock ( Store (P0EL, PE32) Store (P0LL, PL32) - If (LAnd(LEqual(P1SL, 0x00), LEqual(P1SH, 0x00))) { - Return (CRES) - } Else { /* fixup 64bit pci io window */ - CreateQWordField (CR64,\_SB.PCI0.PW64._MIN, PS64) - CreateQWordField (CR64,\_SB.PCI0.PW64._MAX, PE64) - CreateQWordField (CR64,\_SB.PCI0.PW64._LEN, PL64) + CreateQWordField (CRES,\_SB.PCI0.PW64._MIN, PS64) + CreateQWordField (CRES,\_SB.PCI0.PW64._MAX, PE64) + CreateQWordField (CRES,\_SB.PCI0.PW64._LEN, PL64) Store (P1S, PS64) Store (P1E, PE64) Store (P1L, PL64) - /* add window and return result */ - ConcatenateResTemplate (CRES, CR64, Local0) - Return (Local0) - } + Return (CRES) } } } Paolo

1 0

Re: [SeaBIOS] Compiling SeaBIOS for coreboot has problems with its ACPI code
by Moore, Robert 03 Aug '12

03 Aug '12

Perhaps there is a compatibility flag (or some other flag) to disable the code that is emitted below? >-----Original Message----- >From: Moore, Robert >Sent: Tuesday, July 31, 2012 2:31 PM >To: Idwer Vollering >Cc: Michael S. Tsirkin; Kevin O'Connor; seabios(a)seabios.org; Tang, Feng >Subject: RE: [SeaBIOS] Compiling SeaBIOS for coreboot has problems with its >ACPI code > >Yes, for whatever reason, it is definitely an issue with the newer version >of bison. None of the code below is output with bison 2.4.2: > > >#if YYDEBUG >extern int AslCompilerdebug; >#endif > >#ifdef YYPARSE_PARAM >#if defined __STDC__ || defined __cplusplus >int AslCompilerparse (void *YYPARSE_PARAM); >#else >int AslCompilerparse (); >#endif >#else /* ! YYPARSE_PARAM */ >#if defined __STDC__ || defined __cplusplus >int AslCompilerparse (void); >#else >int AslCompilerparse (); >#endif >#endif /* ! YYPARSE_PARAM */ > > > >> -----Original Message----- >> From: Idwer Vollering [mailto:vidwer@gmail.com] >> Sent: Tuesday, July 31, 2012 2:20 PM >> To: Moore, Robert >> Cc: Michael S. Tsirkin; Kevin O'Connor; seabios(a)seabios.org; Tang, Feng >> Subject: Re: [SeaBIOS] Compiling SeaBIOS for coreboot has problems with >> its ACPI code >> >> 2012/7/31 Moore, Robert <robert.moore(a)intel.com>: >> > And, could you please send the bison output file "aslcompilerparse.h" >> > >> > Thanks, >> > Bob >> >> Attached.

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS