v86 0.3.7 → 0.5.10

package/bios/seabios/src/hw/usb-hub.c

@@ -1,205 +0,0 @@
-// Code for handling standard USB hubs.
-//
-// Copyright (C) 2010  Kevin O'Connor <kevin@koconnor.net>
-//
-// This file may be distributed under the terms of the GNU LGPLv3 license.
-
-#include "config.h" // CONFIG_USB_HUB
-#include "output.h" // dprintf
-#include "string.h" // memset
-#include "usb.h" // struct usb_s
-#include "usb-hub.h" // struct usb_hub_descriptor
-#include "util.h" // timer_calc
-
-static int
-get_hub_desc(struct usb_pipe *pipe, struct usb_hub_descriptor *desc)
-{
-    struct usb_ctrlrequest req;
-    req.bRequestType = USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_DEVICE;
-    req.bRequest = USB_REQ_GET_DESCRIPTOR;
-    if (pipe->speed == USB_SUPERSPEED)
-        req.wValue = USB_DT_HUB3<<8;
-    else
-        req.wValue = USB_DT_HUB<<8;
-    req.wIndex = 0;
-    req.wLength = sizeof(*desc);
-    return usb_send_default_control(pipe, &req, desc);
-}
-
-static int
-set_hub_depth(struct usb_pipe *pipe, u16 depth)
-{
-    struct usb_ctrlrequest req;
-    req.bRequestType = USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_DEVICE;
-    req.bRequest = HUB_REQ_SET_HUB_DEPTH;
-    req.wValue = depth;
-    req.wIndex = 0;
-    req.wLength = 0;
-    return usb_send_default_control(pipe, &req, NULL);
-}
-
-static int
-set_port_feature(struct usbhub_s *hub, int port, int feature)
-{
-    struct usb_ctrlrequest req;
-    req.bRequestType = USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_OTHER;
-    req.bRequest = USB_REQ_SET_FEATURE;
-    req.wValue = feature;
-    req.wIndex = port + 1;
-    req.wLength = 0;
-    mutex_lock(&hub->lock);
-    int ret = usb_send_default_control(hub->usbdev->defpipe, &req, NULL);
-    mutex_unlock(&hub->lock);
-    return ret;
-}
-
-static int
-clear_port_feature(struct usbhub_s *hub, int port, int feature)
-{
-    struct usb_ctrlrequest req;
-    req.bRequestType = USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_OTHER;
-    req.bRequest = USB_REQ_CLEAR_FEATURE;
-    req.wValue = feature;
-    req.wIndex = port + 1;
-    req.wLength = 0;
-    mutex_lock(&hub->lock);
-    int ret = usb_send_default_control(hub->usbdev->defpipe, &req, NULL);
-    mutex_unlock(&hub->lock);
-    return ret;
-}
-
-static int
-get_port_status(struct usbhub_s *hub, int port, struct usb_port_status *sts)
-{
-    struct usb_ctrlrequest req;
-    req.bRequestType = USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_OTHER;
-    req.bRequest = USB_REQ_GET_STATUS;
-    req.wValue = 0;
-    req.wIndex = port + 1;
-    req.wLength = sizeof(*sts);
-    mutex_lock(&hub->lock);
-    int ret = usb_send_default_control(hub->usbdev->defpipe, &req, sts);
-    mutex_unlock(&hub->lock);
-    return ret;
-}
-
-// Check if device attached to port
-static int
-usb_hub_detect(struct usbhub_s *hub, u32 port)
-{
-    struct usb_port_status sts;
-    int ret = get_port_status(hub, port, &sts);
-    if (ret) {
-        dprintf(1, "Failure on hub port %d detect\n", port);
-        return -1;
-    }
-    return (sts.wPortStatus & USB_PORT_STAT_CONNECTION) ? 1 : 0;
-}
-
-// Disable port
-static void
-usb_hub_disconnect(struct usbhub_s *hub, u32 port)
-{
-    int ret = clear_port_feature(hub, port, USB_PORT_FEAT_ENABLE);
-    if (ret)
-        dprintf(1, "Failure on hub port %d disconnect\n", port);
-}
-
-// Reset device on port
-static int
-usb_hub_reset(struct usbhub_s *hub, u32 port)
-{
-    int ret = set_port_feature(hub, port, USB_PORT_FEAT_RESET);
-    if (ret)
-        goto fail;
-
-    // Wait for reset to complete.
-    struct usb_port_status sts;
-    u32 end = timer_calc(USB_TIME_DRST * 2);
-    for (;;) {
-        ret = get_port_status(hub, port, &sts);
-        if (ret)
-            goto fail;
-        if (!(sts.wPortStatus & USB_PORT_STAT_RESET)
-            && (hub->usbdev->speed != USB_SUPERSPEED
-                || !(sts.wPortStatus & USB_PORT_STAT_LINK_MASK)))
-            break;
-        if (timer_check(end)) {
-            warn_timeout();
-            goto fail;
-        }
-        msleep(5);
-    }
-
-    // Reset complete.
-    if (!(sts.wPortStatus & USB_PORT_STAT_CONNECTION))
-        // Device no longer present
-        return -1;
-
-    if (hub->usbdev->speed == USB_SUPERSPEED)
-        return USB_SUPERSPEED;
-    return ((sts.wPortStatus & USB_PORT_STAT_SPEED_MASK)
-            >> USB_PORT_STAT_SPEED_SHIFT);
-
-fail:
-    dprintf(1, "Failure on hub port %d reset\n", port);
-    usb_hub_disconnect(hub, port);
-    return -1;
-}
-
-static struct usbhub_op_s HubOp = {
-    .detect = usb_hub_detect,
-    .reset = usb_hub_reset,
-    .disconnect = usb_hub_disconnect,
-};
-
-// Configure a usb hub and then find devices connected to it.
-int
-usb_hub_setup(struct usbdevice_s *usbdev)
-{
-    ASSERT32FLAT();
-    if (!CONFIG_USB_HUB)
-        return -1;
-
-    struct usb_hub_descriptor desc;
-    int ret = get_hub_desc(usbdev->defpipe, &desc);
-    if (ret)
-        return ret;
-
-    struct usbhub_s hub;
-    memset(&hub, 0, sizeof(hub));
-    hub.usbdev = usbdev;
-    hub.cntl = usbdev->defpipe->cntl;
-    hub.portcount = desc.bNbrPorts;
-    hub.op = &HubOp;
-
-    if (usbdev->speed == USB_SUPERSPEED) {
-        int depth = 0;
-        struct usbdevice_s *parent = usbdev->hub->usbdev;
-        while (parent) {
-            depth++;
-            parent = parent->hub->usbdev;
-        }
-
-        ret = set_hub_depth(usbdev->defpipe, depth);
-        if (ret)
-            return ret;
-    }
-
-    // Turn on power to ports.
-    int port;
-    for (port=0; port<desc.bNbrPorts; port++) {
-        ret = set_port_feature(&hub, port, USB_PORT_FEAT_POWER);
-        if (ret)
-            return ret;
-    }
-    // Wait for port power to stabilize.
-    msleep(desc.bPwrOn2PwrGood * 2);
-
-    usb_enumerate(&hub);
-
-    dprintf(1, "Initialized USB HUB (%d ports used)\n", hub.devcount);
-    if (hub.devcount)
-        return 0;
-    return -1;
-}

package/bios/seabios/src/hw/usb-hub.h

@@ -1,64 +0,0 @@
-#ifndef __USB_HUB_H
-#define __USB_HUB_H
-
-// usb-hub.c
-struct usbdevice_s;
-int usb_hub_setup(struct usbdevice_s *usbdev);
-
-
-/****************************************************************
- * hub flags
- ****************************************************************/
-
-#define USB_DT_HUB                      (USB_TYPE_CLASS | 0x09)
-#define USB_DT_HUB3                     (USB_TYPE_CLASS | 0x0a)
-
-#define HUB_REQ_SET_HUB_DEPTH           0x0C
-
-struct usb_hub_descriptor {
-    u8  bDescLength;
-    u8  bDescriptorType;
-    u8  bNbrPorts;
-    u16 wHubCharacteristics;
-    u8  bPwrOn2PwrGood;
-    u8  bHubContrCurrent;
-    // Variable length fields for DeviceRemovable[], PortPwrCtrlMask[] follow.
-} PACKED;
-
-#define USB_PORT_FEAT_CONNECTION        0
-#define USB_PORT_FEAT_ENABLE            1
-#define USB_PORT_FEAT_SUSPEND           2
-#define USB_PORT_FEAT_OVER_CURRENT      3
-#define USB_PORT_FEAT_RESET             4
-#define USB_PORT_FEAT_POWER             8
-#define USB_PORT_FEAT_LOWSPEED          9
-#define USB_PORT_FEAT_C_CONNECTION      16
-#define USB_PORT_FEAT_C_ENABLE          17
-#define USB_PORT_FEAT_C_SUSPEND         18
-#define USB_PORT_FEAT_C_OVER_CURRENT    19
-#define USB_PORT_FEAT_C_RESET           20
-#define USB_PORT_FEAT_TEST              21
-#define USB_PORT_FEAT_INDICATOR         22
-#define USB_PORT_FEAT_C_PORT_L1         23
-
-struct usb_port_status {
-    u16 wPortStatus;
-    u16 wPortChange;
-} PACKED;
-
-#define USB_PORT_STAT_CONNECTION        0x0001
-#define USB_PORT_STAT_ENABLE            0x0002
-#define USB_PORT_STAT_SUSPEND           0x0004
-#define USB_PORT_STAT_OVERCURRENT       0x0008
-#define USB_PORT_STAT_RESET             0x0010
-#define USB_PORT_STAT_LINK_SHIFT        5
-#define USB_PORT_STAT_LINK_MASK         (0x7 << USB_PORT_STAT_LINK_SHIFT)
-#define USB_PORT_STAT_POWER             0x0100
-#define USB_PORT_STAT_SPEED_SHIFT       9
-#define USB_PORT_STAT_SPEED_MASK        (0x3 << USB_PORT_STAT_SPEED_SHIFT)
-#define USB_PORT_STAT_LOW_SPEED         0x0200
-#define USB_PORT_STAT_HIGH_SPEED        0x0400
-#define USB_PORT_STAT_TEST              0x0800
-#define USB_PORT_STAT_INDICATOR         0x1000
-
-#endif // ush-hid.h

package/bios/seabios/src/hw/usb-msc.c

@@ -1,222 +0,0 @@
-// Code for handling USB Mass Storage Controller devices.
-//
-// Copyright (C) 2010  Kevin O'Connor <kevin@koconnor.net>
-//
-// This file may be distributed under the terms of the GNU LGPLv3 license.
-
-#include "biosvar.h" // GET_GLOBALFLAT
-#include "block.h" // DTYPE_USB
-#include "blockcmd.h" // cdb_read
-#include "config.h" // CONFIG_USB_MSC
-#include "malloc.h" // free
-#include "output.h" // dprintf
-#include "std/disk.h" // DISK_RET_SUCCESS
-#include "string.h" // memset
-#include "usb.h" // struct usb_s
-#include "usb-msc.h" // usb_msc_setup
-#include "util.h" // bootprio_find_usb
-
-struct usbdrive_s {
-    struct drive_s drive;
-    struct usb_pipe *bulkin, *bulkout;
-    int lun;
-};
-
-
-/****************************************************************
- * Bulk-only drive command processing
- ****************************************************************/
-
-#define USB_CDB_SIZE 12
-
-#define CBW_SIGNATURE 0x43425355 // USBC
-
-struct cbw_s {
-    u32 dCBWSignature;
-    u32 dCBWTag;
-    u32 dCBWDataTransferLength;
-    u8 bmCBWFlags;
-    u8 bCBWLUN;
-    u8 bCBWCBLength;
-    u8 CBWCB[16];
-} PACKED;
-
-#define CSW_SIGNATURE 0x53425355 // USBS
-
-struct csw_s {
-    u32 dCSWSignature;
-    u32 dCSWTag;
-    u32 dCSWDataResidue;
-    u8 bCSWStatus;
-} PACKED;
-
-static int
-usb_msc_send(struct usbdrive_s *udrive_gf, int dir, void *buf, u32 bytes)
-{
-    struct usb_pipe *pipe;
-    if (dir == USB_DIR_OUT)
-        pipe = GET_GLOBALFLAT(udrive_gf->bulkout);
-    else
-        pipe = GET_GLOBALFLAT(udrive_gf->bulkin);
-    return usb_send_bulk(pipe, dir, buf, bytes);
-}
-
-// Low-level usb command transmit function.
-int
-usb_process_op(struct disk_op_s *op)
-{
-    if (!CONFIG_USB_MSC)
-        return 0;
-
-    dprintf(16, "usb_cmd_data id=%p write=%d count=%d buf=%p\n"
-            , op->drive_fl, 0, op->count, op->buf_fl);
-    struct usbdrive_s *udrive_gf = container_of(
-        op->drive_fl, struct usbdrive_s, drive);
-
-    // Setup command block wrapper.
-    struct cbw_s cbw;
-    memset(&cbw, 0, sizeof(cbw));
-    int blocksize = scsi_fill_cmd(op, cbw.CBWCB, USB_CDB_SIZE);
-    if (blocksize < 0)
-        return default_process_op(op);
-    u32 bytes = blocksize * op->count;
-    cbw.dCBWSignature = CBW_SIGNATURE;
-    cbw.dCBWTag = 999; // XXX
-    cbw.dCBWDataTransferLength = bytes;
-    cbw.bmCBWFlags = scsi_is_read(op) ? USB_DIR_IN : USB_DIR_OUT;
-    cbw.bCBWLUN = GET_GLOBALFLAT(udrive_gf->lun);
-    cbw.bCBWCBLength = USB_CDB_SIZE;
-
-    // Transfer cbw to device.
-    int ret = usb_msc_send(udrive_gf, USB_DIR_OUT
-                           , MAKE_FLATPTR(GET_SEG(SS), &cbw), sizeof(cbw));
-    if (ret)
-        goto fail;
-
-    // Transfer data to/from device.
-    if (bytes) {
-        ret = usb_msc_send(udrive_gf, cbw.bmCBWFlags, op->buf_fl, bytes);
-        if (ret)
-            goto fail;
-    }
-
-    // Transfer csw info.
-    struct csw_s csw;
-    ret = usb_msc_send(udrive_gf, USB_DIR_IN
-                       , MAKE_FLATPTR(GET_SEG(SS), &csw), sizeof(csw));
-    if (ret)
-        goto fail;
-
-    if (!csw.bCSWStatus)
-        return DISK_RET_SUCCESS;
-    if (csw.bCSWStatus == 2)
-        goto fail;
-
-    if (blocksize)
-        op->count -= csw.dCSWDataResidue / blocksize;
-    return DISK_RET_EBADTRACK;
-
-fail:
-    // XXX - reset connection
-    dprintf(1, "USB transmission failed\n");
-    return DISK_RET_EBADTRACK;
-}
-
-static int
-usb_msc_maxlun(struct usb_pipe *pipe)
-{
-    struct usb_ctrlrequest req;
-    req.bRequestType = USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE;
-    req.bRequest = 0xfe;
-    req.wValue = 0;
-    req.wIndex = 0;
-    req.wLength = 1;
-    unsigned char maxlun;
-    int ret = usb_send_default_control(pipe, &req, &maxlun);
-    if (ret)
-        return 0;
-    return maxlun;
-}
-
-static int
-usb_msc_lun_setup(struct usb_pipe *inpipe, struct usb_pipe *outpipe,
-                  struct usbdevice_s *usbdev, int lun)
-{
-    // Allocate drive structure.
-    struct usbdrive_s *drive = malloc_fseg(sizeof(*drive));
-    if (!drive) {
-        warn_noalloc();
-        return -1;
-    }
-    memset(drive, 0, sizeof(*drive));
-    if (usb_32bit_pipe(inpipe))
-        drive->drive.type = DTYPE_USB_32;
-    else
-        drive->drive.type = DTYPE_USB;
-    drive->bulkin = inpipe;
-    drive->bulkout = outpipe;
-    drive->lun = lun;
-
-    int prio = bootprio_find_usb(usbdev, lun);
-    int ret = scsi_drive_setup(&drive->drive, "USB MSC", prio);
-    if (ret) {
-        dprintf(1, "Unable to configure USB MSC drive.\n");
-        free(drive);
-        return -1;
-    }
-    return 0;
-}
-
-/****************************************************************
- * Setup
- ****************************************************************/
-
-// Configure a usb msc device.
-int
-usb_msc_setup(struct usbdevice_s *usbdev)
-{
-    if (!CONFIG_USB_MSC)
-        return -1;
-
-    // Verify right kind of device
-    struct usb_interface_descriptor *iface = usbdev->iface;
-    if ((iface->bInterfaceSubClass != US_SC_SCSI &&
-         iface->bInterfaceSubClass != US_SC_ATAPI_8070 &&
-         iface->bInterfaceSubClass != US_SC_ATAPI_8020)
-        || iface->bInterfaceProtocol != US_PR_BULK) {
-        dprintf(1, "Unsupported MSC USB device (subclass=%02x proto=%02x)\n"
-                , iface->bInterfaceSubClass, iface->bInterfaceProtocol);
-        return -1;
-    }
-
-    // Find bulk in and bulk out endpoints.
-    struct usb_pipe *inpipe = NULL, *outpipe = NULL;
-    struct usb_endpoint_descriptor *indesc = usb_find_desc(
-        usbdev, USB_ENDPOINT_XFER_BULK, USB_DIR_IN);
-    struct usb_endpoint_descriptor *outdesc = usb_find_desc(
-        usbdev, USB_ENDPOINT_XFER_BULK, USB_DIR_OUT);
-    if (!indesc || !outdesc)
-        goto fail;
-    inpipe = usb_alloc_pipe(usbdev, indesc);
-    outpipe = usb_alloc_pipe(usbdev, outdesc);
-    if (!inpipe || !outpipe)
-        goto fail;
-
-    int maxlun = usb_msc_maxlun(usbdev->defpipe);
-    int lun, pipesused = 0;
-    for (lun = 0; lun < maxlun + 1; lun++) {
-        int ret = usb_msc_lun_setup(inpipe, outpipe, usbdev, lun);
-        if (!ret)
-            pipesused = 1;
-    }
-
-    if (!pipesused)
-        goto fail;
-
-    return 0;
-fail:
-    dprintf(1, "Unable to configure USB MSC device.\n");
-    usb_free_pipe(usbdev, inpipe);
-    usb_free_pipe(usbdev, outpipe);
-    return -1;
-}

package/bios/seabios/src/hw/usb-msc.h

@@ -1,10 +0,0 @@
-#ifndef __USB_MSC_H
-#define __USB_MSC_H
-
-// usb-msc.c
-struct disk_op_s;
-int usb_process_op(struct disk_op_s *op);
-struct usbdevice_s;
-int usb_msc_setup(struct usbdevice_s *usbdev);
-
-#endif // ush-msc.h