October 2013 - SeaBIOS - mail.coreboot.org

[PATCH v2] pvscsi boot support
by Evgeny Budilovsky Oct. 7, 2013

Oct. 7, 2013

Signed-off-by: Evgeny Budilovsky <evgeny.budilovsky(a)ravellosystems.com> --- Makefile | 2 +- src/Kconfig | 6 + src/block.c | 1 + src/block.h | 1 + src/hw/blockcmd.c | 3 + src/hw/pci_ids.h | 3 + src/hw/pvscsi.c | 365 +++++++++++++++++++++++++++++++++++++++++++++++++++++ src/hw/pvscsi.h | 8 ++ src/post.c | 2 + 9 files changed, 390 insertions(+), 1 deletion(-) create mode 100644 src/hw/pvscsi.c create mode 100644 src/hw/pvscsi.h diff --git a/Makefile b/Makefile index 3218970..6c6302e 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ SRCBOTH=misc.c stacks.c output.c string.c x86.c block.c cdrom.c mouse.c kbd.c \ hw/usb-hid.c hw/usb-msc.c hw/usb-uas.c \ hw/blockcmd.c hw/floppy.c hw/ata.c hw/ahci.c hw/ramdisk.c \ hw/virtio-ring.c hw/virtio-pci.c hw/virtio-blk.c hw/virtio-scsi.c \ - hw/lsi-scsi.c hw/esp-scsi.c hw/megasas.c + hw/lsi-scsi.c hw/esp-scsi.c hw/megasas.c hw/pvscsi.c SRC16=$(SRCBOTH) system.c disk.c font.c SRC32FLAT=$(SRCBOTH) post.c memmap.c malloc.c pmm.c romfile.c optionroms.c \ boot.c bootsplash.c jpeg.c bmp.c \ diff --git a/src/Kconfig b/src/Kconfig index c40cc61..308fd06 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -161,6 +161,12 @@ menu "Hardware support" default y help Support boot from virtio-scsi storage. + config PVSCSI + depends on DRIVES && QEMU_HARDWARE + bool "pvscsi controllers" + default y + help + Support boot from Paravirtualized SCSI storage. config ESP_SCSI depends on DRIVES && QEMU_HARDWARE bool "AMD PCscsi controllers" diff --git a/src/block.c b/src/block.c index cbcf9e1..2d01f6a 100644 --- a/src/block.c +++ b/src/block.c @@ -373,6 +373,7 @@ process_op(struct disk_op_s *op) case DTYPE_LSI_SCSI: case DTYPE_ESP_SCSI: case DTYPE_MEGASAS: + case DTYPE_PVSCSI: return process_scsi_op(op); default: op->count = 0; diff --git a/src/block.h b/src/block.h index 3492806..aea6a71 100644 --- a/src/block.h +++ b/src/block.h @@ -83,6 +83,7 @@ struct drive_s { #define DTYPE_LSI_SCSI 0x0c #define DTYPE_ESP_SCSI 0x0d #define DTYPE_MEGASAS 0x0e +#define DTYPE_PVSCSI 0x0f #define MAXDESCSIZE 80 diff --git a/src/hw/blockcmd.c b/src/hw/blockcmd.c index 7bdcf38..39d3caa 100644 --- a/src/hw/blockcmd.c +++ b/src/hw/blockcmd.c @@ -14,6 +14,7 @@ #include "esp-scsi.h" // esp_scsi_cmd_data #include "lsi-scsi.h" // lsi_scsi_cmd_data #include "megasas.h" // megasas_cmd_data +#include "pvscsi.h" // pvscsi_cmd_data #include "output.h" // dprintf #include "std/disk.h" // DISK_RET_EPARAM #include "string.h" // memset @@ -44,6 +45,8 @@ cdb_cmd_data(struct disk_op_s *op, void *cdbcmd, u16 blocksize) return esp_scsi_cmd_data(op, cdbcmd, blocksize); case DTYPE_MEGASAS: return megasas_cmd_data(op, cdbcmd, blocksize); + case DTYPE_PVSCSI: + return pvscsi_cmd_data(op, cdbcmd, blocksize); default: op->count = 0; return DISK_RET_EPARAM; diff --git a/src/hw/pci_ids.h b/src/hw/pci_ids.h index 322d156..1cd4f72 100644 --- a/src/hw/pci_ids.h +++ b/src/hw/pci_ids.h @@ -2618,3 +2618,6 @@ #define PCI_VENDOR_ID_REDHAT_QUMRANET 0x1af4 #define PCI_DEVICE_ID_VIRTIO_BLK 0x1001 #define PCI_DEVICE_ID_VIRTIO_SCSI 0x1004 + +#define PCI_VENDOR_ID_VMWARE 0x15ad +#define PCI_DEVICE_ID_VMWARE_PVSCSI 0x07C0 diff --git a/src/hw/pvscsi.c b/src/hw/pvscsi.c new file mode 100644 index 0000000..df5faeb --- /dev/null +++ b/src/hw/pvscsi.c @@ -0,0 +1,365 @@ +// QEMU VMWARE Paravirtualized SCSI boot support. +// +// Copyright (c) 2013 Ravello Systems LTD (http://ravellosystems.com) +// +// Authors: +// Evgeny Budilovsky <evgeny.budilovsky(a)ravellosystems.com> +// +// This file may be distributed under the terms of the GNU LGPLv3 license. + +#include "biosvar.h" // GET_GLOBAL +#include "block.h" // struct drive_s +#include "blockcmd.h" // scsi_drive_setup +#include "config.h" // CONFIG_* +#include "malloc.h" // free +#include "output.h" // dprintf +#include "pci.h" // foreachpci +#include "pci_ids.h" // PCI_DEVICE_ID_VMWARE_PVSCSI +#include "pci_regs.h" // PCI_VENDOR_ID +#include "std/disk.h" // DISK_RET_SUCCESS +#include "string.h" // memset +#include "util.h" // usleep +#include "pvscsi.h" +#include "virtio-ring.h" // PAGE_SHIFT, virt_to_phys + +#define MASK(n) ((1 << (n)) - 1) + +#define SIMPLE_QUEUE_TAG 0x20 + +#define PVSCSI_INTR_CMPL_0 (1 << 0) +#define PVSCSI_INTR_CMPL_1 (1 << 1) +#define PVSCSI_INTR_CMPL_MASK MASK(2) + +#define PVSCSI_INTR_MSG_0 (1 << 2) +#define PVSCSI_INTR_MSG_1 (1 << 3) +#define PVSCSI_INTR_MSG_MASK (MASK(2) << 2) +#define PVSCSI_INTR_ALL_SUPPORTED MASK(4) + +#define PVSCSI_FLAG_CMD_WITH_SG_LIST (1 << 0) +#define PVSCSI_FLAG_CMD_OUT_OF_BAND_CDB (1 << 1) +#define PVSCSI_FLAG_CMD_DIR_NONE (1 << 2) +#define PVSCSI_FLAG_CMD_DIR_TOHOST (1 << 3) +#define PVSCSI_FLAG_CMD_DIR_TODEVICE (1 << 4) + +enum PVSCSIRegOffset { + PVSCSI_REG_OFFSET_COMMAND = 0x0, + PVSCSI_REG_OFFSET_COMMAND_DATA = 0x4, + PVSCSI_REG_OFFSET_COMMAND_STATUS = 0x8, + PVSCSI_REG_OFFSET_LAST_STS_0 = 0x100, + PVSCSI_REG_OFFSET_LAST_STS_1 = 0x104, + PVSCSI_REG_OFFSET_LAST_STS_2 = 0x108, + PVSCSI_REG_OFFSET_LAST_STS_3 = 0x10c, + PVSCSI_REG_OFFSET_INTR_STATUS = 0x100c, + PVSCSI_REG_OFFSET_INTR_MASK = 0x2010, + PVSCSI_REG_OFFSET_KICK_NON_RW_IO = 0x3014, + PVSCSI_REG_OFFSET_DEBUG = 0x3018, + PVSCSI_REG_OFFSET_KICK_RW_IO = 0x4018, +}; + +enum PVSCSICommands { + PVSCSI_CMD_FIRST = 0, + PVSCSI_CMD_ADAPTER_RESET = 1, + PVSCSI_CMD_ISSUE_SCSI = 2, + PVSCSI_CMD_SETUP_RINGS = 3, + PVSCSI_CMD_RESET_BUS = 4, + PVSCSI_CMD_RESET_DEVICE = 5, + PVSCSI_CMD_ABORT_CMD = 6, + PVSCSI_CMD_CONFIG = 7, + PVSCSI_CMD_SETUP_MSG_RING = 8, + PVSCSI_CMD_DEVICE_UNPLUG = 9, + PVSCSI_CMD_LAST = 10 +}; + +#define PVSCSI_SETUP_RINGS_MAX_NUM_PAGES 32 +struct PVSCSICmdDescSetupRings { + u32 reqRingNumPages; + u32 cmpRingNumPages; + u64 ringsStatePPN; + u64 reqRingPPNs[PVSCSI_SETUP_RINGS_MAX_NUM_PAGES]; + u64 cmpRingPPNs[PVSCSI_SETUP_RINGS_MAX_NUM_PAGES]; +} PACKED; + +struct PVSCSIRingCmpDesc { + u64 context; + u64 dataLen; + u32 senseLen; + u16 hostStatus; + u16 scsiStatus; + u32 pad[2]; +} PACKED; + +struct PVSCSIRingsState { + u32 reqProdIdx; + u32 reqConsIdx; + u32 reqNumEntriesLog2; + + u32 cmpProdIdx; + u32 cmpConsIdx; + u32 cmpNumEntriesLog2; + + u8 pad[104]; + + u32 msgProdIdx; + u32 msgConsIdx; + u32 msgNumEntriesLog2; +} PACKED; + +struct PVSCSIRingReqDesc { + u64 context; + u64 dataAddr; + u64 dataLen; + u64 senseAddr; + u32 senseLen; + u32 flags; + u8 cdb[16]; + u8 cdbLen; + u8 lun[8]; + u8 tag; + u8 bus; + u8 target; + u8 vcpuHint; + u8 unused[59]; +} PACKED; + +struct pvscsi_ring_dsc_s { + struct PVSCSIRingsState *ring_state; + struct PVSCSIRingReqDesc *ring_reqs; + struct PVSCSIRingCmpDesc *ring_cmps; +}; + +struct pvscsi_lun_s { + struct drive_s drive; + struct pci_device *pci; + u32 iobase; + u8 target; + u8 lun; + struct pvscsi_ring_dsc_s *ring_dsc; +}; + +static void +pvscsi_write_cmd_desc(u32 iobase, u32 cmd, const void *desc, size_t len) +{ + const u32 *ptr = desc; + size_t i; + + len /= sizeof(*ptr); + pci_writel(iobase + PVSCSI_REG_OFFSET_COMMAND, cmd); + for (i = 0; i < len; i++) + pci_writel(iobase + PVSCSI_REG_OFFSET_COMMAND_DATA, ptr[i]); +} + +static void +pvscsi_kick_rw_io(u32 iobase) +{ + pci_writel(iobase + PVSCSI_REG_OFFSET_KICK_RW_IO, 0); +} + +static void +pvscsi_wait_intr_cmpl(u32 iobase) +{ + while (!(pci_readl(iobase + PVSCSI_REG_OFFSET_INTR_STATUS) & PVSCSI_INTR_CMPL_MASK)) + usleep(5); + pci_writel(iobase + PVSCSI_REG_OFFSET_INTR_STATUS, PVSCSI_INTR_CMPL_MASK); + +} + +static void +pvscsi_init_rings(u32 iobase, struct pvscsi_ring_dsc_s **ring_dsc) +{ + struct PVSCSICmdDescSetupRings cmd = {0,}; + + struct pvscsi_ring_dsc_s *dsc = memalign_low(sizeof(*dsc), PAGE_SIZE); + if (!dsc) { + warn_noalloc(); + return; + } + + memset(dsc, 0, sizeof(*dsc)); + + dsc->ring_state = + (struct PVSCSIRingsState *)memalign_low(PAGE_SIZE, PAGE_SIZE); + dsc->ring_reqs = + (struct PVSCSIRingReqDesc *)memalign_low(PAGE_SIZE, PAGE_SIZE); + dsc->ring_cmps = + (struct PVSCSIRingCmpDesc *)memalign_low(PAGE_SIZE, PAGE_SIZE); + if (!dsc->ring_state || !dsc->ring_reqs || !dsc->ring_cmps) { + warn_noalloc(); + return; + } + memset(dsc->ring_state, 0, PAGE_SIZE); + memset(dsc->ring_reqs, 0, PAGE_SIZE); + memset(dsc->ring_cmps, 0, PAGE_SIZE); + + cmd.reqRingNumPages = 1; + cmd.cmpRingNumPages = 1; + cmd.ringsStatePPN = virt_to_phys(dsc->ring_state) >> PAGE_SHIFT; + cmd.reqRingPPNs[0] = virt_to_phys(dsc->ring_reqs) >> PAGE_SHIFT;; + cmd.cmpRingPPNs[0] = virt_to_phys(dsc->ring_cmps) >> PAGE_SHIFT;; + + pvscsi_write_cmd_desc(iobase, PVSCSI_CMD_SETUP_RINGS, + &cmd, sizeof(cmd)); + *ring_dsc = dsc; +} + +static void pvscsi_fill_req(struct PVSCSIRingsState *s, + struct PVSCSIRingReqDesc *req, + u16 target, u16 lun, void *cdbcmd, u16 blocksize, + struct disk_op_s *op) +{ + SET_LOWFLAT(req->bus, 0); + SET_LOWFLAT(req->target, target); + memset(LOWFLAT2LOW(&req->lun[0]), 0, sizeof(req->lun)); + SET_LOWFLAT(req->lun[1], lun); + SET_LOWFLAT(req->senseLen, 0); + SET_LOWFLAT(req->senseAddr, 0); + SET_LOWFLAT(req->cdbLen, 16); + SET_LOWFLAT(req->vcpuHint, 0); + memcpy(LOWFLAT2LOW(&req->cdb[0]), cdbcmd, 16); + SET_LOWFLAT(req->tag, SIMPLE_QUEUE_TAG); + SET_LOWFLAT(req->flags, + cdb_is_read(cdbcmd, blocksize) ? + PVSCSI_FLAG_CMD_DIR_TOHOST : PVSCSI_FLAG_CMD_DIR_TODEVICE); + + SET_LOWFLAT(req->dataLen, op->count * blocksize); + SET_LOWFLAT(req->dataAddr, (u32)op->buf_fl); + SET_LOWFLAT(s->reqProdIdx, GET_LOWFLAT(s->reqProdIdx) + 1); + +} + +static u32 +pvscsi_get_rsp(struct PVSCSIRingsState *s, + struct PVSCSIRingCmpDesc *rsp) +{ + u32 status = GET_LOWFLAT(rsp->hostStatus); + SET_LOWFLAT(s->cmpConsIdx, GET_LOWFLAT(s->cmpConsIdx)+1); + return status; +} + +static int +pvscsi_cmd(struct pvscsi_lun_s *plun, struct disk_op_s *op, + void *cdbcmd, u16 target, u16 lun, u16 blocksize) +{ + struct pvscsi_ring_dsc_s *ring_dsc = GET_GLOBAL(plun->ring_dsc); + struct PVSCSIRingsState *s = GET_LOWFLAT(ring_dsc->ring_state); + u32 req_entries = GET_LOWFLAT(s->reqNumEntriesLog2); + u32 cmp_entries = GET_LOWFLAT(s->cmpNumEntriesLog2); + struct PVSCSIRingReqDesc *req; + struct PVSCSIRingCmpDesc *rsp; + u32 status; + + if (GET_LOWFLAT(s->reqProdIdx) - GET_LOWFLAT(s->cmpConsIdx) >= 1 << req_entries) { + dprintf(1, "pvscsi: ring full: reqProdIdx=%d cmpConsIdx=%d\n", + GET_LOWFLAT(s->reqProdIdx), GET_LOWFLAT(s->cmpConsIdx)); + return DISK_RET_EBADTRACK; + } + + req = GET_LOWFLAT(ring_dsc->ring_reqs) + (GET_LOWFLAT(s->reqProdIdx) & MASK(req_entries)); + pvscsi_fill_req(s, req, target, lun, cdbcmd, blocksize, op); + + pvscsi_kick_rw_io(GET_GLOBAL(plun->iobase)); + pvscsi_wait_intr_cmpl(GET_GLOBAL(plun->iobase)); + + rsp = GET_LOWFLAT(ring_dsc->ring_cmps) + (GET_LOWFLAT(s->cmpConsIdx) & MASK(cmp_entries)); + status = pvscsi_get_rsp(s, rsp); + + return status == 0 ? DISK_RET_SUCCESS : DISK_RET_EBADTRACK; +} + +int +pvscsi_cmd_data(struct disk_op_s *op, void *cdbcmd, u16 blocksize) +{ + if (!CONFIG_PVSCSI) + return DISK_RET_EBADTRACK; + + struct pvscsi_lun_s *plun = + container_of(op->drive_g, struct pvscsi_lun_s, drive); + + return pvscsi_cmd(plun, op, cdbcmd, + GET_GLOBAL(plun->target), GET_GLOBAL(plun->lun), + blocksize); + +} + +static int +pvscsi_add_lun(struct pci_device *pci, u32 iobase, + struct pvscsi_ring_dsc_s *ring_dsc, u8 target, u8 lun) +{ + struct pvscsi_lun_s *plun = malloc_fseg(sizeof(*plun)); + if (!plun) { + warn_noalloc(); + return -1; + } + memset(plun, 0, sizeof(*plun)); + plun->drive.type = DTYPE_PVSCSI; + plun->drive.cntl_id = pci->bdf; + plun->pci = pci; + plun->target = target; + plun->lun = lun; + plun->iobase = iobase; + plun->ring_dsc = ring_dsc; + + char *name = znprintf(16, "pvscsi %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_drive_setup(&plun->drive, name, prio); + free(name); + if (ret) + goto fail; + return 0; + +fail: + free(plun); + return -1; +} + +static void +pvscsi_scan_target(struct pci_device *pci, u32 iobase, + struct pvscsi_ring_dsc_s *ring_dsc, u8 target) +{ + /* TODO: send REPORT LUNS. For now, only LUN 0 is recognized. */ + pvscsi_add_lun(pci, iobase, ring_dsc, target, 0); +} + +static void +init_pvscsi(struct pci_device *pci) +{ + struct pvscsi_ring_dsc_s *ring_dsc = NULL; + int i; + u16 bdf = pci->bdf; + u32 iobase = pci_config_readl(pci->bdf, PCI_BASE_ADDRESS_0) + & PCI_BASE_ADDRESS_MEM_MASK; + + pci_config_maskw(bdf, PCI_COMMAND, 0, PCI_COMMAND_MASTER); + + dprintf(1, "found pvscsi at %02x:%02x.%x, io @ %x\n", + pci_bdf_to_bus(bdf), pci_bdf_to_dev(bdf), + pci_bdf_to_fn(bdf), iobase); + + pvscsi_write_cmd_desc(iobase, PVSCSI_CMD_ADAPTER_RESET, NULL, 0); + + pvscsi_init_rings(iobase, &ring_dsc); + for (i = 0; i < 7; i++) + pvscsi_scan_target(pci, iobase, ring_dsc, i); + + return; + +} + +void +pvscsi_setup(void) +{ + ASSERT32FLAT(); + if (! CONFIG_PVSCSI) + return; + + dprintf(3, "init pvscsi\n"); + + struct pci_device *pci; + foreachpci(pci) { + if (pci->vendor != PCI_VENDOR_ID_VMWARE + || pci->device != PCI_DEVICE_ID_VMWARE_PVSCSI) + continue; + init_pvscsi(pci); + } +} diff --git a/src/hw/pvscsi.h b/src/hw/pvscsi.h new file mode 100644 index 0000000..fde9f0b --- /dev/null +++ b/src/hw/pvscsi.h @@ -0,0 +1,8 @@ +#ifndef _PVSCSI_H_ +#define _PVSCSI_H_ + +struct disk_op_s; +int pvscsi_cmd_data(struct disk_op_s *op, void *cdbcmd, u16 blocksize); +void pvscsi_setup(void); + +#endif /* _PVSCSI_H_ */ diff --git a/src/post.c b/src/post.c index acd2362..b634686 100644 --- a/src/post.c +++ b/src/post.c @@ -15,6 +15,7 @@ #include "hw/esp-scsi.h" // esp_scsi_setup #include "hw/lsi-scsi.h" // lsi_scsi_setup #include "hw/megasas.h" // megasas_setup +#include "hw/pvscsi.h" // pvscsi_setup #include "hw/pic.h" // pic_setup #include "hw/ps2port.h" // ps2port_setup #include "hw/rtc.h" // rtc_write @@ -147,6 +148,7 @@ device_hardware_setup(void) lsi_scsi_setup(); esp_scsi_setup(); megasas_setup(); + pvscsi_setup(); } static void -- 1.7.9.5

1 0

Re: [SeaBIOS] [PATCH] pvscsi boot support
by Paul Menzel Oct. 7, 2013

Oct. 7, 2013

Dear Evgeny, thank you for the patch! Am Sonntag, den 06.10.2013, 14:14 +0300 schrieb Evgeny Budilovsky: Is this version 2 of the patch from »Sun, 6 Oct 2013 13:23:26 +0300«? Did you just remove the first Signed-off-by line? (Please mark different iterations in the subject line, like »[PATCH v3]«. See `--subject-prefix=Subject-Prefix` in `git help format-patch`.) > Signed-off-by: Evgeny Budilovsky <evgeny.budilovsky(a)ravellosystems.com> > --- > Makefile | 2 +- > src/Kconfig | 6 + > src/block.c | 1 + > src/block.h | 1 + > src/hw/blockcmd.c | 3 + > src/hw/pci_ids.h | 3 + > src/hw/pvscsi.c | 365 +++++++++++++++++++++++++++++++++++++++++++++++++++++ > src/hw/pvscsi.h | 8 ++ > src/post.c | 2 + > 9 files changed, 390 insertions(+), 1 deletion(-) > create mode 100644 src/hw/pvscsi.c > create mode 100644 src/hw/pvscsi.h How did you test this? Does everything work? > diff --git a/Makefile b/Makefile > index 3218970..6c6302e 100644 > --- a/Makefile > +++ b/Makefile > @@ -34,7 +34,7 @@ SRCBOTH=misc.c stacks.c output.c string.c x86.c block.c cdrom.c mouse.c kbd.c \ > hw/usb-hid.c hw/usb-msc.c hw/usb-uas.c \ > hw/blockcmd.c hw/floppy.c hw/ata.c hw/ahci.c hw/ramdisk.c \ > hw/virtio-ring.c hw/virtio-pci.c hw/virtio-blk.c hw/virtio-scsi.c \ > - hw/lsi-scsi.c hw/esp-scsi.c hw/megasas.c > + hw/lsi-scsi.c hw/esp-scsi.c hw/megasas.c hw/pvscsi.c > SRC16=$(SRCBOTH) system.c disk.c font.c > SRC32FLAT=$(SRCBOTH) post.c memmap.c malloc.c pmm.c romfile.c optionroms.c \ > boot.c bootsplash.c jpeg.c bmp.c \ > diff --git a/src/Kconfig b/src/Kconfig > index c40cc61..e4967d2 100644 > --- a/src/Kconfig > +++ b/src/Kconfig > @@ -161,6 +161,12 @@ menu "Hardware support" > default y > help > Support boot from virtio-scsi storage. > + config PVSCSI > + depends on DRIVES && QEMU_HARDWARE > + bool "pvscsi controllers" > + default y > + help > + Support boot from pvscsi storage. Could you at list write »Paravirtualized SCSI« out once, please? So people grepping for that can find it too. Not sure if if the abbreviation should be written all upper case like in the Wiki [1]. I do not know if that is the official spelling. […] Thanks, Paul [1] http://wiki.xen.org/wiki/Paravirtualized_SCSI

2 1

[PATCH] pvscsi boot support
by Evgeny Budilovsky Oct. 6, 2013

Oct. 6, 2013

Signed-off-by: Evgeny Budilovsky <evgeny.budilovsky(a)ravellosystems.com> --- Makefile | 2 +- src/Kconfig | 6 + src/block.c | 1 + src/block.h | 1 + src/hw/blockcmd.c | 3 + src/hw/pci_ids.h | 3 + src/hw/pvscsi.c | 365 +++++++++++++++++++++++++++++++++++++++++++++++++++++ src/hw/pvscsi.h | 8 ++ src/post.c | 2 + 9 files changed, 390 insertions(+), 1 deletion(-) create mode 100644 src/hw/pvscsi.c create mode 100644 src/hw/pvscsi.h diff --git a/Makefile b/Makefile index 3218970..6c6302e 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ SRCBOTH=misc.c stacks.c output.c string.c x86.c block.c cdrom.c mouse.c kbd.c \ hw/usb-hid.c hw/usb-msc.c hw/usb-uas.c \ hw/blockcmd.c hw/floppy.c hw/ata.c hw/ahci.c hw/ramdisk.c \ hw/virtio-ring.c hw/virtio-pci.c hw/virtio-blk.c hw/virtio-scsi.c \ - hw/lsi-scsi.c hw/esp-scsi.c hw/megasas.c + hw/lsi-scsi.c hw/esp-scsi.c hw/megasas.c hw/pvscsi.c SRC16=$(SRCBOTH) system.c disk.c font.c SRC32FLAT=$(SRCBOTH) post.c memmap.c malloc.c pmm.c romfile.c optionroms.c \ boot.c bootsplash.c jpeg.c bmp.c \ diff --git a/src/Kconfig b/src/Kconfig index c40cc61..e4967d2 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -161,6 +161,12 @@ menu "Hardware support" default y help Support boot from virtio-scsi storage. + config PVSCSI + depends on DRIVES && QEMU_HARDWARE + bool "pvscsi controllers" + default y + help + Support boot from pvscsi storage. config ESP_SCSI depends on DRIVES && QEMU_HARDWARE bool "AMD PCscsi controllers" diff --git a/src/block.c b/src/block.c index cbcf9e1..2d01f6a 100644 --- a/src/block.c +++ b/src/block.c @@ -373,6 +373,7 @@ process_op(struct disk_op_s *op) case DTYPE_LSI_SCSI: case DTYPE_ESP_SCSI: case DTYPE_MEGASAS: + case DTYPE_PVSCSI: return process_scsi_op(op); default: op->count = 0; diff --git a/src/block.h b/src/block.h index 3492806..aea6a71 100644 --- a/src/block.h +++ b/src/block.h @@ -83,6 +83,7 @@ struct drive_s { #define DTYPE_LSI_SCSI 0x0c #define DTYPE_ESP_SCSI 0x0d #define DTYPE_MEGASAS 0x0e +#define DTYPE_PVSCSI 0x0f #define MAXDESCSIZE 80 diff --git a/src/hw/blockcmd.c b/src/hw/blockcmd.c index 7bdcf38..39d3caa 100644 --- a/src/hw/blockcmd.c +++ b/src/hw/blockcmd.c @@ -14,6 +14,7 @@ #include "esp-scsi.h" // esp_scsi_cmd_data #include "lsi-scsi.h" // lsi_scsi_cmd_data #include "megasas.h" // megasas_cmd_data +#include "pvscsi.h" // pvscsi_cmd_data #include "output.h" // dprintf #include "std/disk.h" // DISK_RET_EPARAM #include "string.h" // memset @@ -44,6 +45,8 @@ cdb_cmd_data(struct disk_op_s *op, void *cdbcmd, u16 blocksize) return esp_scsi_cmd_data(op, cdbcmd, blocksize); case DTYPE_MEGASAS: return megasas_cmd_data(op, cdbcmd, blocksize); + case DTYPE_PVSCSI: + return pvscsi_cmd_data(op, cdbcmd, blocksize); default: op->count = 0; return DISK_RET_EPARAM; diff --git a/src/hw/pci_ids.h b/src/hw/pci_ids.h index 322d156..1cd4f72 100644 --- a/src/hw/pci_ids.h +++ b/src/hw/pci_ids.h @@ -2618,3 +2618,6 @@ #define PCI_VENDOR_ID_REDHAT_QUMRANET 0x1af4 #define PCI_DEVICE_ID_VIRTIO_BLK 0x1001 #define PCI_DEVICE_ID_VIRTIO_SCSI 0x1004 + +#define PCI_VENDOR_ID_VMWARE 0x15ad +#define PCI_DEVICE_ID_VMWARE_PVSCSI 0x07C0 diff --git a/src/hw/pvscsi.c b/src/hw/pvscsi.c new file mode 100644 index 0000000..3355e28 --- /dev/null +++ b/src/hw/pvscsi.c @@ -0,0 +1,365 @@ +// QEMU VMWARE PVSCSI boot support. +// +// Copyright (c) 2013 Ravello Systems LTD (http://ravellosystems.com) +// +// Authors: +// Evgeny Budilovsky <evgeny.budilovsky(a)ravellosystems.com> +// +// This file may be distributed under the terms of the GNU LGPLv3 license. + +#include "biosvar.h" // GET_GLOBAL +#include "block.h" // struct drive_s +#include "blockcmd.h" // scsi_drive_setup +#include "config.h" // CONFIG_* +#include "malloc.h" // free +#include "output.h" // dprintf +#include "pci.h" // foreachpci +#include "pci_ids.h" // PCI_DEVICE_ID_VMWARE_PVSCSI +#include "pci_regs.h" // PCI_VENDOR_ID +#include "std/disk.h" // DISK_RET_SUCCESS +#include "string.h" // memset +#include "util.h" // usleep +#include "pvscsi.h" +#include "virtio-ring.h" // PAGE_SHIFT, virt_to_phys + +#define MASK(n) ((1 << (n)) - 1) + +#define SIMPLE_QUEUE_TAG 0x20 + +#define PVSCSI_INTR_CMPL_0 (1 << 0) +#define PVSCSI_INTR_CMPL_1 (1 << 1) +#define PVSCSI_INTR_CMPL_MASK MASK(2) + +#define PVSCSI_INTR_MSG_0 (1 << 2) +#define PVSCSI_INTR_MSG_1 (1 << 3) +#define PVSCSI_INTR_MSG_MASK (MASK(2) << 2) +#define PVSCSI_INTR_ALL_SUPPORTED MASK(4) + +#define PVSCSI_FLAG_CMD_WITH_SG_LIST (1 << 0) +#define PVSCSI_FLAG_CMD_OUT_OF_BAND_CDB (1 << 1) +#define PVSCSI_FLAG_CMD_DIR_NONE (1 << 2) +#define PVSCSI_FLAG_CMD_DIR_TOHOST (1 << 3) +#define PVSCSI_FLAG_CMD_DIR_TODEVICE (1 << 4) + +enum PVSCSIRegOffset { + PVSCSI_REG_OFFSET_COMMAND = 0x0, + PVSCSI_REG_OFFSET_COMMAND_DATA = 0x4, + PVSCSI_REG_OFFSET_COMMAND_STATUS = 0x8, + PVSCSI_REG_OFFSET_LAST_STS_0 = 0x100, + PVSCSI_REG_OFFSET_LAST_STS_1 = 0x104, + PVSCSI_REG_OFFSET_LAST_STS_2 = 0x108, + PVSCSI_REG_OFFSET_LAST_STS_3 = 0x10c, + PVSCSI_REG_OFFSET_INTR_STATUS = 0x100c, + PVSCSI_REG_OFFSET_INTR_MASK = 0x2010, + PVSCSI_REG_OFFSET_KICK_NON_RW_IO = 0x3014, + PVSCSI_REG_OFFSET_DEBUG = 0x3018, + PVSCSI_REG_OFFSET_KICK_RW_IO = 0x4018, +}; + +enum PVSCSICommands { + PVSCSI_CMD_FIRST = 0, + PVSCSI_CMD_ADAPTER_RESET = 1, + PVSCSI_CMD_ISSUE_SCSI = 2, + PVSCSI_CMD_SETUP_RINGS = 3, + PVSCSI_CMD_RESET_BUS = 4, + PVSCSI_CMD_RESET_DEVICE = 5, + PVSCSI_CMD_ABORT_CMD = 6, + PVSCSI_CMD_CONFIG = 7, + PVSCSI_CMD_SETUP_MSG_RING = 8, + PVSCSI_CMD_DEVICE_UNPLUG = 9, + PVSCSI_CMD_LAST = 10 +}; + +#define PVSCSI_SETUP_RINGS_MAX_NUM_PAGES 32 +struct PVSCSICmdDescSetupRings { + u32 reqRingNumPages; + u32 cmpRingNumPages; + u64 ringsStatePPN; + u64 reqRingPPNs[PVSCSI_SETUP_RINGS_MAX_NUM_PAGES]; + u64 cmpRingPPNs[PVSCSI_SETUP_RINGS_MAX_NUM_PAGES]; +} PACKED; + +struct PVSCSIRingCmpDesc { + u64 context; + u64 dataLen; + u32 senseLen; + u16 hostStatus; + u16 scsiStatus; + u32 pad[2]; +} PACKED; + +struct PVSCSIRingsState { + u32 reqProdIdx; + u32 reqConsIdx; + u32 reqNumEntriesLog2; + + u32 cmpProdIdx; + u32 cmpConsIdx; + u32 cmpNumEntriesLog2; + + u8 pad[104]; + + u32 msgProdIdx; + u32 msgConsIdx; + u32 msgNumEntriesLog2; +} PACKED; + +struct PVSCSIRingReqDesc { + u64 context; + u64 dataAddr; + u64 dataLen; + u64 senseAddr; + u32 senseLen; + u32 flags; + u8 cdb[16]; + u8 cdbLen; + u8 lun[8]; + u8 tag; + u8 bus; + u8 target; + u8 vcpuHint; + u8 unused[59]; +} PACKED; + +struct pvscsi_ring_dsc_s { + struct PVSCSIRingsState *ring_state; + struct PVSCSIRingReqDesc *ring_reqs; + struct PVSCSIRingCmpDesc *ring_cmps; +}; + +struct pvscsi_lun_s { + struct drive_s drive; + struct pci_device *pci; + u32 iobase; + u8 target; + u8 lun; + struct pvscsi_ring_dsc_s *ring_dsc; +}; + +static void +pvscsi_write_cmd_desc(u32 iobase, u32 cmd, const void *desc, size_t len) +{ + const u32 *ptr = desc; + size_t i; + + len /= sizeof(*ptr); + pci_writel(iobase + PVSCSI_REG_OFFSET_COMMAND, cmd); + for (i = 0; i < len; i++) + pci_writel(iobase + PVSCSI_REG_OFFSET_COMMAND_DATA, ptr[i]); +} + +static void +pvscsi_kick_rw_io(u32 iobase) +{ + pci_writel(iobase + PVSCSI_REG_OFFSET_KICK_RW_IO, 0); +} + +static void +pvscsi_wait_intr_cmpl(u32 iobase) +{ + while (!(pci_readl(iobase + PVSCSI_REG_OFFSET_INTR_STATUS) & PVSCSI_INTR_CMPL_MASK)) + usleep(5); + pci_writel(iobase + PVSCSI_REG_OFFSET_INTR_STATUS, PVSCSI_INTR_CMPL_MASK); + +} + +static void +pvscsi_init_rings(u32 iobase, struct pvscsi_ring_dsc_s **ring_dsc) +{ + struct PVSCSICmdDescSetupRings cmd = {0,}; + + struct pvscsi_ring_dsc_s *dsc = memalign_low(sizeof(*dsc), PAGE_SIZE); + if (!dsc) { + warn_noalloc(); + return; + } + + memset(dsc, 0, sizeof(*dsc)); + + dsc->ring_state = + (struct PVSCSIRingsState *)memalign_low(PAGE_SIZE, PAGE_SIZE); + dsc->ring_reqs = + (struct PVSCSIRingReqDesc *)memalign_low(PAGE_SIZE, PAGE_SIZE); + dsc->ring_cmps = + (struct PVSCSIRingCmpDesc *)memalign_low(PAGE_SIZE, PAGE_SIZE); + if (!dsc->ring_state || !dsc->ring_reqs || !dsc->ring_cmps) { + warn_noalloc(); + return; + } + memset(dsc->ring_state, 0, PAGE_SIZE); + memset(dsc->ring_reqs, 0, PAGE_SIZE); + memset(dsc->ring_cmps, 0, PAGE_SIZE); + + cmd.reqRingNumPages = 1; + cmd.cmpRingNumPages = 1; + cmd.ringsStatePPN = virt_to_phys(dsc->ring_state) >> PAGE_SHIFT; + cmd.reqRingPPNs[0] = virt_to_phys(dsc->ring_reqs) >> PAGE_SHIFT;; + cmd.cmpRingPPNs[0] = virt_to_phys(dsc->ring_cmps) >> PAGE_SHIFT;; + + pvscsi_write_cmd_desc(iobase, PVSCSI_CMD_SETUP_RINGS, + &cmd, sizeof(cmd)); + *ring_dsc = dsc; +} + +static void pvscsi_fill_req(struct PVSCSIRingsState *s, + struct PVSCSIRingReqDesc *req, + u16 target, u16 lun, void *cdbcmd, u16 blocksize, + struct disk_op_s *op) +{ + SET_LOWFLAT(req->bus, 0); + SET_LOWFLAT(req->target, target); + memset(LOWFLAT2LOW(&req->lun[0]), 0, sizeof(req->lun)); + SET_LOWFLAT(req->lun[1], lun); + SET_LOWFLAT(req->senseLen, 0); + SET_LOWFLAT(req->senseAddr, 0); + SET_LOWFLAT(req->cdbLen, 16); + SET_LOWFLAT(req->vcpuHint, 0); + memcpy(LOWFLAT2LOW(&req->cdb[0]), cdbcmd, 16); + SET_LOWFLAT(req->tag, SIMPLE_QUEUE_TAG); + SET_LOWFLAT(req->flags, + cdb_is_read(cdbcmd, blocksize) ? + PVSCSI_FLAG_CMD_DIR_TOHOST : PVSCSI_FLAG_CMD_DIR_TODEVICE); + + SET_LOWFLAT(req->dataLen, op->count * blocksize); + SET_LOWFLAT(req->dataAddr, (u32)op->buf_fl); + SET_LOWFLAT(s->reqProdIdx, GET_LOWFLAT(s->reqProdIdx) + 1); + +} + +static u32 +pvscsi_get_rsp(struct PVSCSIRingsState *s, + struct PVSCSIRingCmpDesc *rsp) +{ + u32 status = GET_LOWFLAT(rsp->hostStatus); + SET_LOWFLAT(s->cmpConsIdx, GET_LOWFLAT(s->cmpConsIdx)+1); + return status; +} + +static int +pvscsi_cmd(struct pvscsi_lun_s *plun, struct disk_op_s *op, + void *cdbcmd, u16 target, u16 lun, u16 blocksize) +{ + struct pvscsi_ring_dsc_s *ring_dsc = GET_GLOBAL(plun->ring_dsc); + struct PVSCSIRingsState *s = GET_LOWFLAT(ring_dsc->ring_state); + u32 req_entries = GET_LOWFLAT(s->reqNumEntriesLog2); + u32 cmp_entries = GET_LOWFLAT(s->cmpNumEntriesLog2); + struct PVSCSIRingReqDesc *req; + struct PVSCSIRingCmpDesc *rsp; + u32 status; + + if (GET_LOWFLAT(s->reqProdIdx) - GET_LOWFLAT(s->cmpConsIdx) >= 1 << req_entries) { + dprintf(1, "pvscsi: ring full: reqProdIdx=%d cmpConsIdx=%d\n", + GET_LOWFLAT(s->reqProdIdx), GET_LOWFLAT(s->cmpConsIdx)); + return DISK_RET_EBADTRACK; + } + + req = GET_LOWFLAT(ring_dsc->ring_reqs) + (GET_LOWFLAT(s->reqProdIdx) & MASK(req_entries)); + pvscsi_fill_req(s, req, target, lun, cdbcmd, blocksize, op); + + pvscsi_kick_rw_io(GET_GLOBAL(plun->iobase)); + pvscsi_wait_intr_cmpl(GET_GLOBAL(plun->iobase)); + + rsp = GET_LOWFLAT(ring_dsc->ring_cmps) + (GET_LOWFLAT(s->cmpConsIdx) & MASK(cmp_entries)); + status = pvscsi_get_rsp(s, rsp); + + return status == 0 ? DISK_RET_SUCCESS : DISK_RET_EBADTRACK; +} + +int +pvscsi_cmd_data(struct disk_op_s *op, void *cdbcmd, u16 blocksize) +{ + if (!CONFIG_PVSCSI) + return DISK_RET_EBADTRACK; + + struct pvscsi_lun_s *plun = + container_of(op->drive_g, struct pvscsi_lun_s, drive); + + return pvscsi_cmd(plun, op, cdbcmd, + GET_GLOBAL(plun->target), GET_GLOBAL(plun->lun), + blocksize); + +} + +static int +pvscsi_add_lun(struct pci_device *pci, u32 iobase, + struct pvscsi_ring_dsc_s *ring_dsc, u8 target, u8 lun) +{ + struct pvscsi_lun_s *plun = malloc_fseg(sizeof(*plun)); + if (!plun) { + warn_noalloc(); + return -1; + } + memset(plun, 0, sizeof(*plun)); + plun->drive.type = DTYPE_PVSCSI; + plun->drive.cntl_id = pci->bdf; + plun->pci = pci; + plun->target = target; + plun->lun = lun; + plun->iobase = iobase; + plun->ring_dsc = ring_dsc; + + char *name = znprintf(16, "pvscsi %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_drive_setup(&plun->drive, name, prio); + free(name); + if (ret) + goto fail; + return 0; + +fail: + free(plun); + return -1; +} + +static void +pvscsi_scan_target(struct pci_device *pci, u32 iobase, + struct pvscsi_ring_dsc_s *ring_dsc, u8 target) +{ + /* TODO: send REPORT LUNS. For now, only LUN 0 is recognized. */ + pvscsi_add_lun(pci, iobase, ring_dsc, target, 0); +} + +static void +init_pvscsi(struct pci_device *pci) +{ + struct pvscsi_ring_dsc_s *ring_dsc = NULL; + int i; + u16 bdf = pci->bdf; + u32 iobase = pci_config_readl(pci->bdf, PCI_BASE_ADDRESS_0) + & PCI_BASE_ADDRESS_MEM_MASK; + + pci_config_maskw(bdf, PCI_COMMAND, 0, PCI_COMMAND_MASTER); + + dprintf(1, "found pvscsi at %02x:%02x.%x, io @ %x\n", + pci_bdf_to_bus(bdf), pci_bdf_to_dev(bdf), + pci_bdf_to_fn(bdf), iobase); + + pvscsi_write_cmd_desc(iobase, PVSCSI_CMD_ADAPTER_RESET, NULL, 0); + + pvscsi_init_rings(iobase, &ring_dsc); + for (i = 0; i < 7; i++) + pvscsi_scan_target(pci, iobase, ring_dsc, i); + + return; + +} + +void +pvscsi_setup(void) +{ + ASSERT32FLAT(); + if (! CONFIG_PVSCSI) + return; + + dprintf(3, "init pvscsi\n"); + + struct pci_device *pci; + foreachpci(pci) { + if (pci->vendor != PCI_VENDOR_ID_VMWARE + || pci->device != PCI_DEVICE_ID_VMWARE_PVSCSI) + continue; + init_pvscsi(pci); + } +} diff --git a/src/hw/pvscsi.h b/src/hw/pvscsi.h new file mode 100644 index 0000000..fde9f0b --- /dev/null +++ b/src/hw/pvscsi.h @@ -0,0 +1,8 @@ +#ifndef _PVSCSI_H_ +#define _PVSCSI_H_ + +struct disk_op_s; +int pvscsi_cmd_data(struct disk_op_s *op, void *cdbcmd, u16 blocksize); +void pvscsi_setup(void); + +#endif /* _PVSCSI_H_ */ diff --git a/src/post.c b/src/post.c index acd2362..b634686 100644 --- a/src/post.c +++ b/src/post.c @@ -15,6 +15,7 @@ #include "hw/esp-scsi.h" // esp_scsi_setup #include "hw/lsi-scsi.h" // lsi_scsi_setup #include "hw/megasas.h" // megasas_setup +#include "hw/pvscsi.h" // pvscsi_setup #include "hw/pic.h" // pic_setup #include "hw/ps2port.h" // ps2port_setup #include "hw/rtc.h" // rtc_write @@ -147,6 +148,7 @@ device_hardware_setup(void) lsi_scsi_setup(); esp_scsi_setup(); megasas_setup(); + pvscsi_setup(); } static void -- 1.7.9.5

1 0

[PATCH] pvscsi boot support
by Evgeny Budilovsky Oct. 6, 2013

Oct. 6, 2013

From: Evgeny Budilovsky <budevg(a)gmail.com> Signed-off-by: Evgeny Budilovsky <budevg(a)gmail.com> Signed-off-by: Evgeny Budilovsky <evgeny.budilovsky(a)ravellosystems.com> --- Makefile | 2 +- src/Kconfig | 6 + src/block.c | 1 + src/block.h | 1 + src/hw/blockcmd.c | 3 + src/hw/pci_ids.h | 3 + src/hw/pvscsi.c | 365 +++++++++++++++++++++++++++++++++++++++++++++++++++++ src/hw/pvscsi.h | 8 ++ src/post.c | 2 + 9 files changed, 390 insertions(+), 1 deletion(-) create mode 100644 src/hw/pvscsi.c create mode 100644 src/hw/pvscsi.h diff --git a/Makefile b/Makefile index 3218970..6c6302e 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ SRCBOTH=misc.c stacks.c output.c string.c x86.c block.c cdrom.c mouse.c kbd.c \ hw/usb-hid.c hw/usb-msc.c hw/usb-uas.c \ hw/blockcmd.c hw/floppy.c hw/ata.c hw/ahci.c hw/ramdisk.c \ hw/virtio-ring.c hw/virtio-pci.c hw/virtio-blk.c hw/virtio-scsi.c \ - hw/lsi-scsi.c hw/esp-scsi.c hw/megasas.c + hw/lsi-scsi.c hw/esp-scsi.c hw/megasas.c hw/pvscsi.c SRC16=$(SRCBOTH) system.c disk.c font.c SRC32FLAT=$(SRCBOTH) post.c memmap.c malloc.c pmm.c romfile.c optionroms.c \ boot.c bootsplash.c jpeg.c bmp.c \ diff --git a/src/Kconfig b/src/Kconfig index c40cc61..e4967d2 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -161,6 +161,12 @@ menu "Hardware support" default y help Support boot from virtio-scsi storage. + config PVSCSI + depends on DRIVES && QEMU_HARDWARE + bool "pvscsi controllers" + default y + help + Support boot from pvscsi storage. config ESP_SCSI depends on DRIVES && QEMU_HARDWARE bool "AMD PCscsi controllers" diff --git a/src/block.c b/src/block.c index cbcf9e1..2d01f6a 100644 --- a/src/block.c +++ b/src/block.c @@ -373,6 +373,7 @@ process_op(struct disk_op_s *op) case DTYPE_LSI_SCSI: case DTYPE_ESP_SCSI: case DTYPE_MEGASAS: + case DTYPE_PVSCSI: return process_scsi_op(op); default: op->count = 0; diff --git a/src/block.h b/src/block.h index 3492806..aea6a71 100644 --- a/src/block.h +++ b/src/block.h @@ -83,6 +83,7 @@ struct drive_s { #define DTYPE_LSI_SCSI 0x0c #define DTYPE_ESP_SCSI 0x0d #define DTYPE_MEGASAS 0x0e +#define DTYPE_PVSCSI 0x0f #define MAXDESCSIZE 80 diff --git a/src/hw/blockcmd.c b/src/hw/blockcmd.c index 7bdcf38..39d3caa 100644 --- a/src/hw/blockcmd.c +++ b/src/hw/blockcmd.c @@ -14,6 +14,7 @@ #include "esp-scsi.h" // esp_scsi_cmd_data #include "lsi-scsi.h" // lsi_scsi_cmd_data #include "megasas.h" // megasas_cmd_data +#include "pvscsi.h" // pvscsi_cmd_data #include "output.h" // dprintf #include "std/disk.h" // DISK_RET_EPARAM #include "string.h" // memset @@ -44,6 +45,8 @@ cdb_cmd_data(struct disk_op_s *op, void *cdbcmd, u16 blocksize) return esp_scsi_cmd_data(op, cdbcmd, blocksize); case DTYPE_MEGASAS: return megasas_cmd_data(op, cdbcmd, blocksize); + case DTYPE_PVSCSI: + return pvscsi_cmd_data(op, cdbcmd, blocksize); default: op->count = 0; return DISK_RET_EPARAM; diff --git a/src/hw/pci_ids.h b/src/hw/pci_ids.h index 322d156..1cd4f72 100644 --- a/src/hw/pci_ids.h +++ b/src/hw/pci_ids.h @@ -2618,3 +2618,6 @@ #define PCI_VENDOR_ID_REDHAT_QUMRANET 0x1af4 #define PCI_DEVICE_ID_VIRTIO_BLK 0x1001 #define PCI_DEVICE_ID_VIRTIO_SCSI 0x1004 + +#define PCI_VENDOR_ID_VMWARE 0x15ad +#define PCI_DEVICE_ID_VMWARE_PVSCSI 0x07C0 diff --git a/src/hw/pvscsi.c b/src/hw/pvscsi.c new file mode 100644 index 0000000..3355e28 --- /dev/null +++ b/src/hw/pvscsi.c @@ -0,0 +1,365 @@ +// QEMU VMWARE PVSCSI boot support. +// +// Copyright (c) 2013 Ravello Systems LTD (http://ravellosystems.com) +// +// Authors: +// Evgeny Budilovsky <evgeny.budilovsky(a)ravellosystems.com> +// +// This file may be distributed under the terms of the GNU LGPLv3 license. + +#include "biosvar.h" // GET_GLOBAL +#include "block.h" // struct drive_s +#include "blockcmd.h" // scsi_drive_setup +#include "config.h" // CONFIG_* +#include "malloc.h" // free +#include "output.h" // dprintf +#include "pci.h" // foreachpci +#include "pci_ids.h" // PCI_DEVICE_ID_VMWARE_PVSCSI +#include "pci_regs.h" // PCI_VENDOR_ID +#include "std/disk.h" // DISK_RET_SUCCESS +#include "string.h" // memset +#include "util.h" // usleep +#include "pvscsi.h" +#include "virtio-ring.h" // PAGE_SHIFT, virt_to_phys + +#define MASK(n) ((1 << (n)) - 1) + +#define SIMPLE_QUEUE_TAG 0x20 + +#define PVSCSI_INTR_CMPL_0 (1 << 0) +#define PVSCSI_INTR_CMPL_1 (1 << 1) +#define PVSCSI_INTR_CMPL_MASK MASK(2) + +#define PVSCSI_INTR_MSG_0 (1 << 2) +#define PVSCSI_INTR_MSG_1 (1 << 3) +#define PVSCSI_INTR_MSG_MASK (MASK(2) << 2) +#define PVSCSI_INTR_ALL_SUPPORTED MASK(4) + +#define PVSCSI_FLAG_CMD_WITH_SG_LIST (1 << 0) +#define PVSCSI_FLAG_CMD_OUT_OF_BAND_CDB (1 << 1) +#define PVSCSI_FLAG_CMD_DIR_NONE (1 << 2) +#define PVSCSI_FLAG_CMD_DIR_TOHOST (1 << 3) +#define PVSCSI_FLAG_CMD_DIR_TODEVICE (1 << 4) + +enum PVSCSIRegOffset { + PVSCSI_REG_OFFSET_COMMAND = 0x0, + PVSCSI_REG_OFFSET_COMMAND_DATA = 0x4, + PVSCSI_REG_OFFSET_COMMAND_STATUS = 0x8, + PVSCSI_REG_OFFSET_LAST_STS_0 = 0x100, + PVSCSI_REG_OFFSET_LAST_STS_1 = 0x104, + PVSCSI_REG_OFFSET_LAST_STS_2 = 0x108, + PVSCSI_REG_OFFSET_LAST_STS_3 = 0x10c, + PVSCSI_REG_OFFSET_INTR_STATUS = 0x100c, + PVSCSI_REG_OFFSET_INTR_MASK = 0x2010, + PVSCSI_REG_OFFSET_KICK_NON_RW_IO = 0x3014, + PVSCSI_REG_OFFSET_DEBUG = 0x3018, + PVSCSI_REG_OFFSET_KICK_RW_IO = 0x4018, +}; + +enum PVSCSICommands { + PVSCSI_CMD_FIRST = 0, + PVSCSI_CMD_ADAPTER_RESET = 1, + PVSCSI_CMD_ISSUE_SCSI = 2, + PVSCSI_CMD_SETUP_RINGS = 3, + PVSCSI_CMD_RESET_BUS = 4, + PVSCSI_CMD_RESET_DEVICE = 5, + PVSCSI_CMD_ABORT_CMD = 6, + PVSCSI_CMD_CONFIG = 7, + PVSCSI_CMD_SETUP_MSG_RING = 8, + PVSCSI_CMD_DEVICE_UNPLUG = 9, + PVSCSI_CMD_LAST = 10 +}; + +#define PVSCSI_SETUP_RINGS_MAX_NUM_PAGES 32 +struct PVSCSICmdDescSetupRings { + u32 reqRingNumPages; + u32 cmpRingNumPages; + u64 ringsStatePPN; + u64 reqRingPPNs[PVSCSI_SETUP_RINGS_MAX_NUM_PAGES]; + u64 cmpRingPPNs[PVSCSI_SETUP_RINGS_MAX_NUM_PAGES]; +} PACKED; + +struct PVSCSIRingCmpDesc { + u64 context; + u64 dataLen; + u32 senseLen; + u16 hostStatus; + u16 scsiStatus; + u32 pad[2]; +} PACKED; + +struct PVSCSIRingsState { + u32 reqProdIdx; + u32 reqConsIdx; + u32 reqNumEntriesLog2; + + u32 cmpProdIdx; + u32 cmpConsIdx; + u32 cmpNumEntriesLog2; + + u8 pad[104]; + + u32 msgProdIdx; + u32 msgConsIdx; + u32 msgNumEntriesLog2; +} PACKED; + +struct PVSCSIRingReqDesc { + u64 context; + u64 dataAddr; + u64 dataLen; + u64 senseAddr; + u32 senseLen; + u32 flags; + u8 cdb[16]; + u8 cdbLen; + u8 lun[8]; + u8 tag; + u8 bus; + u8 target; + u8 vcpuHint; + u8 unused[59]; +} PACKED; + +struct pvscsi_ring_dsc_s { + struct PVSCSIRingsState *ring_state; + struct PVSCSIRingReqDesc *ring_reqs; + struct PVSCSIRingCmpDesc *ring_cmps; +}; + +struct pvscsi_lun_s { + struct drive_s drive; + struct pci_device *pci; + u32 iobase; + u8 target; + u8 lun; + struct pvscsi_ring_dsc_s *ring_dsc; +}; + +static void +pvscsi_write_cmd_desc(u32 iobase, u32 cmd, const void *desc, size_t len) +{ + const u32 *ptr = desc; + size_t i; + + len /= sizeof(*ptr); + pci_writel(iobase + PVSCSI_REG_OFFSET_COMMAND, cmd); + for (i = 0; i < len; i++) + pci_writel(iobase + PVSCSI_REG_OFFSET_COMMAND_DATA, ptr[i]); +} + +static void +pvscsi_kick_rw_io(u32 iobase) +{ + pci_writel(iobase + PVSCSI_REG_OFFSET_KICK_RW_IO, 0); +} + +static void +pvscsi_wait_intr_cmpl(u32 iobase) +{ + while (!(pci_readl(iobase + PVSCSI_REG_OFFSET_INTR_STATUS) & PVSCSI_INTR_CMPL_MASK)) + usleep(5); + pci_writel(iobase + PVSCSI_REG_OFFSET_INTR_STATUS, PVSCSI_INTR_CMPL_MASK); + +} + +static void +pvscsi_init_rings(u32 iobase, struct pvscsi_ring_dsc_s **ring_dsc) +{ + struct PVSCSICmdDescSetupRings cmd = {0,}; + + struct pvscsi_ring_dsc_s *dsc = memalign_low(sizeof(*dsc), PAGE_SIZE); + if (!dsc) { + warn_noalloc(); + return; + } + + memset(dsc, 0, sizeof(*dsc)); + + dsc->ring_state = + (struct PVSCSIRingsState *)memalign_low(PAGE_SIZE, PAGE_SIZE); + dsc->ring_reqs = + (struct PVSCSIRingReqDesc *)memalign_low(PAGE_SIZE, PAGE_SIZE); + dsc->ring_cmps = + (struct PVSCSIRingCmpDesc *)memalign_low(PAGE_SIZE, PAGE_SIZE); + if (!dsc->ring_state || !dsc->ring_reqs || !dsc->ring_cmps) { + warn_noalloc(); + return; + } + memset(dsc->ring_state, 0, PAGE_SIZE); + memset(dsc->ring_reqs, 0, PAGE_SIZE); + memset(dsc->ring_cmps, 0, PAGE_SIZE); + + cmd.reqRingNumPages = 1; + cmd.cmpRingNumPages = 1; + cmd.ringsStatePPN = virt_to_phys(dsc->ring_state) >> PAGE_SHIFT; + cmd.reqRingPPNs[0] = virt_to_phys(dsc->ring_reqs) >> PAGE_SHIFT;; + cmd.cmpRingPPNs[0] = virt_to_phys(dsc->ring_cmps) >> PAGE_SHIFT;; + + pvscsi_write_cmd_desc(iobase, PVSCSI_CMD_SETUP_RINGS, + &cmd, sizeof(cmd)); + *ring_dsc = dsc; +} + +static void pvscsi_fill_req(struct PVSCSIRingsState *s, + struct PVSCSIRingReqDesc *req, + u16 target, u16 lun, void *cdbcmd, u16 blocksize, + struct disk_op_s *op) +{ + SET_LOWFLAT(req->bus, 0); + SET_LOWFLAT(req->target, target); + memset(LOWFLAT2LOW(&req->lun[0]), 0, sizeof(req->lun)); + SET_LOWFLAT(req->lun[1], lun); + SET_LOWFLAT(req->senseLen, 0); + SET_LOWFLAT(req->senseAddr, 0); + SET_LOWFLAT(req->cdbLen, 16); + SET_LOWFLAT(req->vcpuHint, 0); + memcpy(LOWFLAT2LOW(&req->cdb[0]), cdbcmd, 16); + SET_LOWFLAT(req->tag, SIMPLE_QUEUE_TAG); + SET_LOWFLAT(req->flags, + cdb_is_read(cdbcmd, blocksize) ? + PVSCSI_FLAG_CMD_DIR_TOHOST : PVSCSI_FLAG_CMD_DIR_TODEVICE); + + SET_LOWFLAT(req->dataLen, op->count * blocksize); + SET_LOWFLAT(req->dataAddr, (u32)op->buf_fl); + SET_LOWFLAT(s->reqProdIdx, GET_LOWFLAT(s->reqProdIdx) + 1); + +} + +static u32 +pvscsi_get_rsp(struct PVSCSIRingsState *s, + struct PVSCSIRingCmpDesc *rsp) +{ + u32 status = GET_LOWFLAT(rsp->hostStatus); + SET_LOWFLAT(s->cmpConsIdx, GET_LOWFLAT(s->cmpConsIdx)+1); + return status; +} + +static int +pvscsi_cmd(struct pvscsi_lun_s *plun, struct disk_op_s *op, + void *cdbcmd, u16 target, u16 lun, u16 blocksize) +{ + struct pvscsi_ring_dsc_s *ring_dsc = GET_GLOBAL(plun->ring_dsc); + struct PVSCSIRingsState *s = GET_LOWFLAT(ring_dsc->ring_state); + u32 req_entries = GET_LOWFLAT(s->reqNumEntriesLog2); + u32 cmp_entries = GET_LOWFLAT(s->cmpNumEntriesLog2); + struct PVSCSIRingReqDesc *req; + struct PVSCSIRingCmpDesc *rsp; + u32 status; + + if (GET_LOWFLAT(s->reqProdIdx) - GET_LOWFLAT(s->cmpConsIdx) >= 1 << req_entries) { + dprintf(1, "pvscsi: ring full: reqProdIdx=%d cmpConsIdx=%d\n", + GET_LOWFLAT(s->reqProdIdx), GET_LOWFLAT(s->cmpConsIdx)); + return DISK_RET_EBADTRACK; + } + + req = GET_LOWFLAT(ring_dsc->ring_reqs) + (GET_LOWFLAT(s->reqProdIdx) & MASK(req_entries)); + pvscsi_fill_req(s, req, target, lun, cdbcmd, blocksize, op); + + pvscsi_kick_rw_io(GET_GLOBAL(plun->iobase)); + pvscsi_wait_intr_cmpl(GET_GLOBAL(plun->iobase)); + + rsp = GET_LOWFLAT(ring_dsc->ring_cmps) + (GET_LOWFLAT(s->cmpConsIdx) & MASK(cmp_entries)); + status = pvscsi_get_rsp(s, rsp); + + return status == 0 ? DISK_RET_SUCCESS : DISK_RET_EBADTRACK; +} + +int +pvscsi_cmd_data(struct disk_op_s *op, void *cdbcmd, u16 blocksize) +{ + if (!CONFIG_PVSCSI) + return DISK_RET_EBADTRACK; + + struct pvscsi_lun_s *plun = + container_of(op->drive_g, struct pvscsi_lun_s, drive); + + return pvscsi_cmd(plun, op, cdbcmd, + GET_GLOBAL(plun->target), GET_GLOBAL(plun->lun), + blocksize); + +} + +static int +pvscsi_add_lun(struct pci_device *pci, u32 iobase, + struct pvscsi_ring_dsc_s *ring_dsc, u8 target, u8 lun) +{ + struct pvscsi_lun_s *plun = malloc_fseg(sizeof(*plun)); + if (!plun) { + warn_noalloc(); + return -1; + } + memset(plun, 0, sizeof(*plun)); + plun->drive.type = DTYPE_PVSCSI; + plun->drive.cntl_id = pci->bdf; + plun->pci = pci; + plun->target = target; + plun->lun = lun; + plun->iobase = iobase; + plun->ring_dsc = ring_dsc; + + char *name = znprintf(16, "pvscsi %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_drive_setup(&plun->drive, name, prio); + free(name); + if (ret) + goto fail; + return 0; + +fail: + free(plun); + return -1; +} + +static void +pvscsi_scan_target(struct pci_device *pci, u32 iobase, + struct pvscsi_ring_dsc_s *ring_dsc, u8 target) +{ + /* TODO: send REPORT LUNS. For now, only LUN 0 is recognized. */ + pvscsi_add_lun(pci, iobase, ring_dsc, target, 0); +} + +static void +init_pvscsi(struct pci_device *pci) +{ + struct pvscsi_ring_dsc_s *ring_dsc = NULL; + int i; + u16 bdf = pci->bdf; + u32 iobase = pci_config_readl(pci->bdf, PCI_BASE_ADDRESS_0) + & PCI_BASE_ADDRESS_MEM_MASK; + + pci_config_maskw(bdf, PCI_COMMAND, 0, PCI_COMMAND_MASTER); + + dprintf(1, "found pvscsi at %02x:%02x.%x, io @ %x\n", + pci_bdf_to_bus(bdf), pci_bdf_to_dev(bdf), + pci_bdf_to_fn(bdf), iobase); + + pvscsi_write_cmd_desc(iobase, PVSCSI_CMD_ADAPTER_RESET, NULL, 0); + + pvscsi_init_rings(iobase, &ring_dsc); + for (i = 0; i < 7; i++) + pvscsi_scan_target(pci, iobase, ring_dsc, i); + + return; + +} + +void +pvscsi_setup(void) +{ + ASSERT32FLAT(); + if (! CONFIG_PVSCSI) + return; + + dprintf(3, "init pvscsi\n"); + + struct pci_device *pci; + foreachpci(pci) { + if (pci->vendor != PCI_VENDOR_ID_VMWARE + || pci->device != PCI_DEVICE_ID_VMWARE_PVSCSI) + continue; + init_pvscsi(pci); + } +} diff --git a/src/hw/pvscsi.h b/src/hw/pvscsi.h new file mode 100644 index 0000000..fde9f0b --- /dev/null +++ b/src/hw/pvscsi.h @@ -0,0 +1,8 @@ +#ifndef _PVSCSI_H_ +#define _PVSCSI_H_ + +struct disk_op_s; +int pvscsi_cmd_data(struct disk_op_s *op, void *cdbcmd, u16 blocksize); +void pvscsi_setup(void); + +#endif /* _PVSCSI_H_ */ diff --git a/src/post.c b/src/post.c index acd2362..b634686 100644 --- a/src/post.c +++ b/src/post.c @@ -15,6 +15,7 @@ #include "hw/esp-scsi.h" // esp_scsi_setup #include "hw/lsi-scsi.h" // lsi_scsi_setup #include "hw/megasas.h" // megasas_setup +#include "hw/pvscsi.h" // pvscsi_setup #include "hw/pic.h" // pic_setup #include "hw/ps2port.h" // ps2port_setup #include "hw/rtc.h" // rtc_write @@ -147,6 +148,7 @@ device_hardware_setup(void) lsi_scsi_setup(); esp_scsi_setup(); megasas_setup(); + pvscsi_setup(); } static void -- 1.7.9.5

1 0

[PATCH] tools/kconfig/{m,n}conf.c: Fix typo »This interface let*s*«
by Paul Menzel Oct. 3, 2013

Oct. 3, 2013

Date: Mon, 4 Mar 2013 12:56:56 +0100 When Kconfig was introduced in SeaBIOS with commit a4c5daf0e2545361fadcad3015e10f8b23e53926 Author: Kevin O'Connor <kevin(a)koconnor.net> Date: Mon Jan 24 22:13:58 2011 -0500 Initial commit of Kconfig build tool. this typo was copied from Kconfig in Linux v2.6.38-rc2. In the meantime Linux commit »kconfig: nconf: rewrite help texts« (0b616500) [1] rewrote the texts for `nconf.c` – which might be ported too to SeaBIOS – and the typo was fixed there. But it is still present in `mconf.c` as of Linux 3.8. [1] http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=0… --- tools/kconfig/mconf.c | 2 +- tools/kconfig/nconf.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/kconfig/mconf.c b/tools/kconfig/mconf.c index d433c7a..2a24c42 100644 --- a/tools/kconfig/mconf.c +++ b/tools/kconfig/mconf.c @@ -25,7 +25,7 @@ static const char mconf_readme[] = N_( "Overview\n" "--------\n" -"This interface let you select features and parameters for the build.\n" +"This interface lets you select features and parameters for the build.\n" "Features can either be built-in, modularized, or ignored. Parameters\n" "must be entered in as decimal or hexadecimal numbers or text.\n" "\n" diff --git a/tools/kconfig/nconf.c b/tools/kconfig/nconf.c index db56377..bb797c9 100644 --- a/tools/kconfig/nconf.c +++ b/tools/kconfig/nconf.c @@ -15,7 +15,7 @@ static const char nconf_readme[] = N_( "Overview\n" "--------\n" -"This interface let you select features and parameters for the build.\n" +"This interface lets you select features and parameters for the build.\n" "Features can either be built-in, modularized, or ignored. Parameters\n" "must be entered in as decimal or hexadecimal numbers or text.\n" "\n" -- 1.7.10.4

2 2

[PATCH 6/6] Run ahci code entirely in 32bit mode.
by Kevin O'Connor Oct. 3, 2013

Oct. 3, 2013

The ahci driver needs to jump into 32bit mode in order to access portions of the ahci controllers PCI config space. Instead of jumping into 32bit mode just to toggle the ahci registers, jump into 32bit mode for all of the driver interactions. This shrinks the size of the overall code and can lead to further cleanups. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- Makefile | 4 ++-- src/block.c | 13 ++++++++++--- src/hw/ahci.c | 15 ++++----------- src/hw/blockcmd.c | 5 +++-- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index 3218970..baa0be2 100644 --- a/Makefile +++ b/Makefile @@ -32,13 +32,13 @@ SRCBOTH=misc.c stacks.c output.c string.c x86.c block.c cdrom.c mouse.c kbd.c \ hw/pci.c hw/timer.c hw/rtc.c hw/dma.c hw/pic.c hw/ps2port.c \ hw/usb.c hw/usb-uhci.c hw/usb-ohci.c hw/usb-ehci.c hw/usb-xhci.c \ hw/usb-hid.c hw/usb-msc.c hw/usb-uas.c \ - hw/blockcmd.c hw/floppy.c hw/ata.c hw/ahci.c hw/ramdisk.c \ + hw/blockcmd.c hw/floppy.c hw/ata.c hw/ramdisk.c \ hw/virtio-ring.c hw/virtio-pci.c hw/virtio-blk.c hw/virtio-scsi.c \ hw/lsi-scsi.c hw/esp-scsi.c hw/megasas.c SRC16=$(SRCBOTH) system.c disk.c font.c SRC32FLAT=$(SRCBOTH) post.c memmap.c malloc.c pmm.c romfile.c optionroms.c \ boot.c bootsplash.c jpeg.c bmp.c \ - hw/usb-hub.c \ + hw/ahci.c hw/usb-hub.c \ fw/coreboot.c fw/lzmadecode.c fw/csm.c fw/biostables.c \ fw/paravirt.c fw/shadow.c fw/pciinit.c fw/smm.c fw/mtrr.c fw/xen.c \ fw/acpi.c fw/mptable.c fw/pirtable.c fw/smbios.c diff --git a/src/block.c b/src/block.c index 55d15d2..a41e662 100644 --- a/src/block.c +++ b/src/block.c @@ -333,7 +333,7 @@ process_scsi_op(struct disk_op_s *op) } } -static int +int VISIBLE32FLAT process_atapi_op(struct disk_op_s *op) { switch (op->command) { @@ -363,10 +363,17 @@ process_op(struct disk_op_s *op) case DTYPE_VIRTIO_BLK: return process_virtio_blk_op(op); case DTYPE_AHCI: - return process_ahci_op(op); + op->drive_g = (void*)op->drive_g + BUILD_BIOS_ADDR; + extern void _cfunc32flat_process_ahci_op(void); + return call32(_cfunc32flat_process_ahci_op + , (u32)MAKE_FLATPTR(GET_SEG(SS), op), DISK_RET_EPARAM); case DTYPE_ATA_ATAPI: - case DTYPE_AHCI_ATAPI: return process_atapi_op(op); + case DTYPE_AHCI_ATAPI: + op->drive_g = (void*)op->drive_g + BUILD_BIOS_ADDR; + extern void _cfunc32flat_process_atapi_op(void); + return call32(_cfunc32flat_process_atapi_op + , (u32)MAKE_FLATPTR(GET_SEG(SS), op), DISK_RET_EPARAM); case DTYPE_USB: case DTYPE_UAS: case DTYPE_VIRTIO_SCSI: diff --git a/src/hw/ahci.c b/src/hw/ahci.c index 9c2b390..82a6194 100644 --- a/src/hw/ahci.c +++ b/src/hw/ahci.c @@ -23,10 +23,6 @@ #define AHCI_RESET_TIMEOUT 500 // 500 miliseconds #define AHCI_LINK_TIMEOUT 10 // 10 miliseconds -/**************************************************************** - * these bits must run in both 16bit and 32bit modes - ****************************************************************/ - // prepare sata command fis static void sata_prep_simple(struct sata_cmd_fis *fis, u8 command) { @@ -76,13 +72,13 @@ static void sata_prep_atapi(struct sata_cmd_fis *fis, u16 blocksize) static u32 ahci_ctrl_readl(struct ahci_ctrl_s *ctrl, u32 reg) { u32 addr = GET_GLOBALFLAT(ctrl->iobase) + reg; - return pci_readl(addr); + return readl((void*)addr); } static void ahci_ctrl_writel(struct ahci_ctrl_s *ctrl, u32 reg, u32 val) { u32 addr = GET_GLOBALFLAT(ctrl->iobase) + reg; - pci_writel(addr, val); + writel((void*)addr, val); } static u32 ahci_port_to_ctrl(u32 pnr, u32 port_reg) @@ -300,7 +296,8 @@ ahci_disk_readwrite(struct disk_op_s *op, int iswrite) } // command demuxer -int process_ahci_op(struct disk_op_s *op) +int VISIBLE32FLAT +process_ahci_op(struct disk_op_s *op) { if (!CONFIG_AHCI) return 0; @@ -322,10 +319,6 @@ int process_ahci_op(struct disk_op_s *op) } } -/**************************************************************** - * everything below is pure 32bit code - ****************************************************************/ - static void ahci_port_reset(struct ahci_ctrl_s *ctrl, u32 pnr) { diff --git a/src/hw/blockcmd.c b/src/hw/blockcmd.c index 635954d..90b8cf3 100644 --- a/src/hw/blockcmd.c +++ b/src/hw/blockcmd.c @@ -34,8 +34,6 @@ cdb_cmd_data(struct disk_op_s *op, void *cdbcmd, u16 blocksize) return usb_cmd_data(op, cdbcmd, blocksize); case DTYPE_UAS: return uas_cmd_data(op, cdbcmd, blocksize); - case DTYPE_AHCI_ATAPI: - return ahci_cmd_data(op, cdbcmd, blocksize); case DTYPE_VIRTIO_SCSI: return virtio_scsi_cmd_data(op, cdbcmd, blocksize); case DTYPE_LSI_SCSI: @@ -44,6 +42,9 @@ cdb_cmd_data(struct disk_op_s *op, void *cdbcmd, u16 blocksize) return esp_scsi_cmd_data(op, cdbcmd, blocksize); case DTYPE_MEGASAS: return megasas_cmd_data(op, cdbcmd, blocksize); + case DTYPE_AHCI_ATAPI: + if (!MODESEGMENT) + return ahci_cmd_data(op, cdbcmd, blocksize); default: op->count = 0; return DISK_RET_EPARAM; -- 1.8.3.1

1 0

[PATCH 5/6] Support call16() calls after entering 32bit mode from call32().
by Kevin O'Connor Oct. 3, 2013

Oct. 3, 2013

When transitioning to 32bit via call32() track the stack segment register and support restoring it on call16() requests. This permits call16() to work properly. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- src/romlayout.S | 16 +++++++++++++++- src/stacks.c | 20 ++++++++++++++------ 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/src/romlayout.S b/src/romlayout.S index 8415c9f..9de91a2 100644 --- a/src/romlayout.S +++ b/src/romlayout.S @@ -146,9 +146,23 @@ __call16big: // Make call. .code16gcc -1: popl %ecx +1: movl $_zonelow_seg, %edx // Adjust %ds, %ss, and %esp + movl %edx, %ds + movzwl StackSeg, %edx + movl %edx, %ecx + shll $4, %ecx + movl %edx, %ss + subl %ecx, %esp + movl %edx, %ds + + popl %ecx // Call function popl %edx calll *%ecx + + movl %ss, %edx // Readjust %esp + shll $4, %edx + addl %edx, %esp + // Return via transition32 movl $(2f + BUILD_BIOS_ADDR), %edx jmp transition32 diff --git a/src/stacks.c b/src/stacks.c index 563ce1c..78ad65c 100644 --- a/src/stacks.c +++ b/src/stacks.c @@ -13,6 +13,8 @@ #include "stacks.h" // struct mutex_s #include "util.h" // useRTC +#define MAIN_STACK_MAX (1024*1024) + /**************************************************************** * Extra 16bit stack @@ -107,6 +109,8 @@ static inline void lgdt(struct descloc_s *desc) { asm("lgdtl %0" : : "m"(*desc) : "memory"); } +u16 StackSeg VARLOW; + // Call a 32bit SeaBIOS function from a 16bit SeaBIOS function. u32 VISIBLE16 call32(void *func, u32 eax, u32 errret) @@ -127,6 +131,8 @@ call32(void *func, u32 eax, u32 errret) struct descloc_s gdt; sgdt(&gdt); + u16 oldstackseg = GET_LOW(StackSeg); + SET_LOW(StackSeg, GET_SEG(SS)); u32 bkup_ss, bkup_esp; asm volatile( // Backup ss/esp / set esp to flat stack location @@ -153,6 +159,8 @@ call32(void *func, u32 eax, u32 errret) : "r" (func) : "ecx", "edx", "cc", "memory"); + SET_LOW(StackSeg, oldstackseg); + // Restore gdt and fs/gs lgdt(&gdt); SET_SEG(FS, fs); @@ -169,7 +177,7 @@ static inline u32 call16(u32 eax, u32 edx, void *func) { ASSERT32FLAT(); - if (getesp() > BUILD_STACK_ADDR) + if (getesp() > MAIN_STACK_MAX) panic("call16 with invalid stack\n"); extern u32 __call16(u32 eax, u32 edx, void *func); return __call16(eax, edx, func - BUILD_BIOS_ADDR); @@ -179,7 +187,7 @@ static inline u32 call16big(u32 eax, u32 edx, void *func) { ASSERT32FLAT(); - if (getesp() > BUILD_STACK_ADDR) + if (getesp() > MAIN_STACK_MAX) panic("call16big with invalid stack\n"); extern u32 __call16big(u32 eax, u32 edx, void *func); return __call16big(eax, edx, func - BUILD_BIOS_ADDR); @@ -214,14 +222,14 @@ farcall16(struct bregs *callregs) return; } extern void _cfunc16__farcall16(void); - call16((u32)callregs, 0, _cfunc16__farcall16); + call16((u32)callregs - StackSeg * 16, StackSeg, _cfunc16__farcall16); } inline void farcall16big(struct bregs *callregs) { extern void _cfunc16__farcall16(void); - call16big((u32)callregs, 0, _cfunc16__farcall16); + call16big((u32)callregs - StackSeg * 16, StackSeg, _cfunc16__farcall16); } // Invoke a 16bit software interrupt. @@ -265,7 +273,7 @@ struct thread_info * getCurThread(void) { u32 esp = getesp(); - if (esp <= BUILD_STACK_ADDR) + if (esp <= MAIN_STACK_MAX) return &MainThread; return (void*)ALIGN_DOWN(esp, THREADSTACKSIZE); } @@ -477,7 +485,7 @@ int wait_preempt(void) { if (MODESEGMENT || !CONFIG_THREAD_OPTIONROMS || !CanPreempt - || getesp() < 1024*1024) + || getesp() < MAIN_STACK_MAX) return 0; while (CanPreempt) yield(); -- 1.8.3.1

1 0

[PATCH 4/6] Update _farcall16() to pass segment of callregs explicitly.
by Kevin O'Connor Oct. 3, 2013

Oct. 3, 2013

Don't use implicit passing of %es for the segment of the callregs pointer. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- src/romlayout.S | 59 +++++++++++++++++++++++++++++---------------------------- src/stacks.c | 13 ++++++------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/romlayout.S b/src/romlayout.S index 652992f..8415c9f 100644 --- a/src/romlayout.S +++ b/src/romlayout.S @@ -161,32 +161,33 @@ __call16big: ****************************************************************/ // Far call a 16bit function from 16bit mode with a specified cpu register state -// %es:%eax = address of struct bregs -// Clobbers: %e[bcd]x, %e[ds]i, flags +// %eax = address of struct bregs, %edx = segment of struct bregs +// Clobbers: %e[bc]x, %e[ds]i, flags .code16gcc DECLFUNC __farcall16 __farcall16: - // Save %eax, %ebp + // Save %edx/%eax, %ebp pushl %ebp pushl %eax - pushl %es + pushl %edx // Setup for iretw call + movl %edx, %ds pushw %cs pushw $1f // return point - pushw %es:BREGS_flags(%eax) // flags - pushl %es:BREGS_code(%eax) // CS:IP + pushw BREGS_flags(%eax) // flags + pushl BREGS_code(%eax) // CS:IP // Load calling registers. - movl %es:BREGS_edi(%eax), %edi - movl %es:BREGS_esi(%eax), %esi - movl %es:BREGS_ebp(%eax), %ebp - movl %es:BREGS_ebx(%eax), %ebx - movl %es:BREGS_edx(%eax), %edx - movl %es:BREGS_ecx(%eax), %ecx - movw %es:BREGS_ds(%eax), %ds - pushl %es:BREGS_eax(%eax) - movw %es:BREGS_es(%eax), %es + movl BREGS_edi(%eax), %edi + movl BREGS_esi(%eax), %esi + movl BREGS_ebp(%eax), %ebp + movl BREGS_ebx(%eax), %ebx + movl BREGS_edx(%eax), %edx + movl BREGS_ecx(%eax), %ecx + movw BREGS_es(%eax), %es + pushl BREGS_eax(%eax) + movw BREGS_ds(%eax), %ds popl %eax // Invoke call @@ -196,27 +197,27 @@ __farcall16: pushfw cli cld - pushw %es + pushw %ds pushl %eax - movw 0x08(%esp), %es + movw 0x08(%esp), %ds movl 0x0c(%esp), %eax - popl %es:BREGS_eax(%eax) - popw %es:BREGS_es(%eax) - popw %es:BREGS_flags(%eax) + popl BREGS_eax(%eax) + popw BREGS_es(%eax) + popw BREGS_flags(%eax) // Store remaining registers - movl %edi, %es:BREGS_edi(%eax) - movl %esi, %es:BREGS_esi(%eax) - movl %ebp, %es:BREGS_ebp(%eax) - movl %ebx, %es:BREGS_ebx(%eax) - movl %edx, %es:BREGS_edx(%eax) - movl %ecx, %es:BREGS_ecx(%eax) - movw %ds, %es:BREGS_ds(%eax) + movl %edi, BREGS_edi(%eax) + movl %esi, BREGS_esi(%eax) + movl %ebp, BREGS_ebp(%eax) + movl %ebx, BREGS_ebx(%eax) + movl %edx, BREGS_edx(%eax) + movl %ecx, BREGS_ecx(%eax) + movw %es, BREGS_ds(%eax) movw %ss, %cx movw %cx, %ds // Restore %ds == %ss - // Remove %es/%eax, restore %ebp - popl %eax + // Remove %edx/%eax, restore %ebp + popl %edx popl %eax popl %ebp diff --git a/src/stacks.c b/src/stacks.c index ad615d2..563ce1c 100644 --- a/src/stacks.c +++ b/src/stacks.c @@ -192,26 +192,25 @@ call16big(u32 eax, u32 edx, void *func) // Far call 16bit code with a specified register state. void VISIBLE16 -_farcall16(struct bregs *callregs) +_farcall16(struct bregs *callregs, u16 callregseg) { ASSERT16(); if (on_extra_stack()) { - stack_hop_back((u32)callregs, 0, _farcall16); + stack_hop_back((u32)callregs, callregseg, _farcall16); return; } asm volatile( "calll __farcall16\n" - : "+a" (callregs), "+m" (*callregs) - : "m" (__segment_ES) - : "ebx", "ecx", "edx", "esi", "edi", "cc", "memory"); + : "+a" (callregs), "+m" (*callregs), "+d" (callregseg) + : + : "ebx", "ecx", "esi", "edi", "cc", "memory"); } inline void farcall16(struct bregs *callregs) { if (MODE16) { - SET_SEG(ES, GET_SEG(SS)); - _farcall16(callregs); + _farcall16(callregs, GET_SEG(SS)); return; } extern void _cfunc16__farcall16(void); -- 1.8.3.1

1 0

[PATCH 3/6] Make __call16 use C calling convention and support two passed parameters.
by Kevin O'Connor Oct. 3, 2013

Oct. 3, 2013

Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- src/romlayout.S | 10 ++++++++-- src/stacks.c | 30 +++++++++++------------------- 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/src/romlayout.S b/src/romlayout.S index 2a5ddff..652992f 100644 --- a/src/romlayout.S +++ b/src/romlayout.S @@ -128,21 +128,27 @@ transition16big: jmpl *%edx // Call a 16bit SeaBIOS function from SeaBIOS 32bit C code. -// %ebx = calling function +// %ecx = calling function // Clobbers: %ecx, %edx, flags, segment registers, idt/gdt DECLFUNC __call16 .global __call16big .code32 __call16: + pushl %edx + pushl %ecx movl $1f, %edx jmp transition16 __call16big: + pushl %edx + pushl %ecx movl $1f, %edx jmp transition16big // Make call. .code16gcc -1: calll *%ebx +1: popl %ecx + popl %edx + calll *%ecx // Return via transition32 movl $(2f + BUILD_BIOS_ADDR), %edx jmp transition32 diff --git a/src/stacks.c b/src/stacks.c index 6e6a7b3..ad615d2 100644 --- a/src/stacks.c +++ b/src/stacks.c @@ -166,31 +166,23 @@ call32(void *func, u32 eax, u32 errret) // Call a 16bit SeaBIOS function from a 32bit SeaBIOS function. static inline u32 -call16(u32 eax, void *func) +call16(u32 eax, u32 edx, void *func) { ASSERT32FLAT(); if (getesp() > BUILD_STACK_ADDR) panic("call16 with invalid stack\n"); - asm volatile( - "calll __call16" - : "+a" (eax) - : "b" ((u32)func - BUILD_BIOS_ADDR) - : "ecx", "edx", "cc", "memory"); - return eax; + extern u32 __call16(u32 eax, u32 edx, void *func); + return __call16(eax, edx, func - BUILD_BIOS_ADDR); } static inline u32 -call16big(u32 eax, void *func) +call16big(u32 eax, u32 edx, void *func) { ASSERT32FLAT(); if (getesp() > BUILD_STACK_ADDR) panic("call16big with invalid stack\n"); - asm volatile( - "calll __call16big" - : "+a" (eax) - : "b" ((u32)func - BUILD_BIOS_ADDR) - : "ecx", "edx", "cc", "memory"); - return eax; + extern u32 __call16big(u32 eax, u32 edx, void *func); + return __call16big(eax, edx, func - BUILD_BIOS_ADDR); } @@ -223,14 +215,14 @@ farcall16(struct bregs *callregs) return; } extern void _cfunc16__farcall16(void); - call16((u32)callregs, _cfunc16__farcall16); + call16((u32)callregs, 0, _cfunc16__farcall16); } inline void farcall16big(struct bregs *callregs) { extern void _cfunc16__farcall16(void); - call16big((u32)callregs, _cfunc16__farcall16); + call16big((u32)callregs, 0, _cfunc16__farcall16); } // Invoke a 16bit software interrupt. @@ -380,13 +372,13 @@ yield(void) } extern void _cfunc16_check_irqs(void); if (!CONFIG_THREADS) { - call16big(0, _cfunc16_check_irqs); + call16big(0, 0, _cfunc16_check_irqs); return; } struct thread_info *cur = getCurThread(); if (cur == &MainThread) // Permit irqs to fire - call16big(0, _cfunc16_check_irqs); + call16big(0, 0, _cfunc16_check_irqs); // Switch to the next thread switch_next(cur); @@ -416,7 +408,7 @@ yield_toirq(void) return; } extern void _cfunc16_wait_irq(void); - call16big(0, _cfunc16_wait_irq); + call16big(0, 0, _cfunc16_wait_irq); } // Wait for all threads (other than the main thread) to complete. -- 1.8.3.1

1 0

[PATCH 2/6] Minor - move call16 assembler in romlayout.S.
by Kevin O'Connor Oct. 3, 2013

Oct. 3, 2013

Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- src/romlayout.S | 53 +++++++++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 24 deletions(-) diff --git a/src/romlayout.S b/src/romlayout.S index 37a0264..2a5ddff 100644 --- a/src/romlayout.S +++ b/src/romlayout.S @@ -14,7 +14,7 @@ /**************************************************************** - * Call trampolines + * 16bit / 32bit call trampolines ****************************************************************/ // Place CPU into 32bit mode from 16bit mode. @@ -127,9 +127,37 @@ transition16big: movl %ecx, %eax jmpl *%edx +// Call a 16bit SeaBIOS function from SeaBIOS 32bit C code. +// %ebx = calling function +// Clobbers: %ecx, %edx, flags, segment registers, idt/gdt + DECLFUNC __call16 + .global __call16big + .code32 +__call16: + movl $1f, %edx + jmp transition16 +__call16big: + movl $1f, %edx + jmp transition16big + + // Make call. + .code16gcc +1: calll *%ebx + // Return via transition32 + movl $(2f + BUILD_BIOS_ADDR), %edx + jmp transition32 + .code32 +2: retl + + +/**************************************************************** + * External calling trampolines + ****************************************************************/ + // Far call a 16bit function from 16bit mode with a specified cpu register state // %es:%eax = address of struct bregs // Clobbers: %e[bcd]x, %e[ds]i, flags + .code16gcc DECLFUNC __farcall16 __farcall16: // Save %eax, %ebp @@ -188,29 +216,6 @@ __farcall16: retl -// Call a 16bit SeaBIOS function from SeaBIOS 32bit C code. -// %ebx = calling function -// Clobbers: %ecx, %edx, flags, segment registers, idt/gdt - DECLFUNC __call16 - .global __call16big - .code32 -__call16: - movl $1f, %edx - jmp transition16 -__call16big: - movl $1f, %edx - jmp transition16big - - // Make call. - .code16gcc -1: calll *%ebx - // Return via transition32 - movl $(2f + BUILD_BIOS_ADDR), %edx - jmp transition32 - .code32 -2: retl - - .code16gcc // IRQ trampolines .macro IRQ_TRAMPOLINE num DECLFUNC irq_trampoline_0x\num -- 1.8.3.1

1 0