libpayload: Remove workaround for bitfield management in EHCI driver

[coreboot.git] / payloads / libpayload / drivers / usb / ehci_rh.c

diff --git a/payloads/libpayload/drivers/usb/ehci_rh.c b/payloads/libpayload/drivers/usb/ehci_rh.c
index 5eaeeb690eeb5104601c6bb735ccb4bbd695c51a..dd073a3b99bd1fb57ccd91706c4fdee163f97732 100644 (file)
--- a/payloads/libpayload/drivers/usb/ehci_rh.c
+++ b/payloads/libpayload/drivers/usb/ehci_rh.c
@@ -53,49 +53,54 @@ ehci_rh_destroy (usbdev_t *dev)
 static void
 ehci_rh_hand_over_port (usbdev_t *dev, int port)
 {
-       volatile portsc_t *p = &(RH_INST(dev)->ports[port]);
-
-       printf("giving up port %x, it's USB1\n", port+1);
+       debug("giving up port %x, it's USB1\n", port+1);
 
        /* Lowspeed device. Hand over to companion */
-       p->port_owner = 1;
-       do {} while (!p->conn_status_change);
+       RH_INST(dev)->ports[port] |= P_PORT_OWNER;
+       do {} while (!(RH_INST(dev)->ports[port] & P_CONN_STATUS_CHANGE));
        /* RW/C register, so clear it by writing 1 */
-       p->conn_status_change = 1;
+       RH_INST(dev)->ports[port] |= P_CONN_STATUS_CHANGE;
        return;
 }
 
 static void
 ehci_rh_scanport (usbdev_t *dev, int port)
 {
-       volatile portsc_t *p = &(RH_INST(dev)->ports[port]);
        if (RH_INST(dev)->devices[port]!=-1) {
-               printf("Unregister device at port %x\n", port+1);
+               debug("Unregister device at port %x\n", port+1);
                usb_detach_device(dev->controller, RH_INST(dev)->devices[port]);
                RH_INST(dev)->devices[port]=-1;
        }
        /* device connected, handle */
-       if (p->current_conn_status) {
+       if (RH_INST(dev)->ports[port] & P_CURR_CONN_STATUS) {
                mdelay(100);
-               if (p->line_status == 0x1) {
+               if ((RH_INST(dev)->ports[port] & P_LINE_STATUS) == P_LINE_STATUS_LOWSPEED) {
                        ehci_rh_hand_over_port(dev, port);
                        return;
                }
-               p->port_enable = 0;
-               p->port_reset = 1;
+
+               /* Deassert enable, assert reset.  These must change
+                * atomically.
+                */
+               RH_INST(dev)->ports[port] = (RH_INST(dev)->ports[port] & ~P_PORT_ENABLE) | P_PORT_RESET;
+
+               /* Wait a bit while reset is active. */
                mdelay(50);
-               p->port_reset = 0;
+
+               /* Deassert reset. */
+               RH_INST(dev)->ports[port] &= ~P_PORT_RESET;
+
                /* Wait for flag change to finish. The controller might take a while */
-               while (p->port_reset) ;
-               if (!p->port_enable) {
+               while (RH_INST(dev)->ports[port] & P_PORT_RESET) ;
+               if (!(RH_INST(dev)->ports[port] & P_PORT_ENABLE)) {
                        ehci_rh_hand_over_port(dev, port);
                        return;
                }
-               printf("port %x hosts a USB2 device\n", port+1);
+               debug("port %x hosts a USB2 device\n", port+1);
                RH_INST(dev)->devices[port] = usb_attach_device(dev->controller, dev->address, port, 2);
        }
        /* RW/C register, so clear it by writing 1 */
-       p->conn_status_change = 1;
+       RH_INST(dev)->ports[port] |= P_CONN_STATUS_CHANGE;
 }
 
 static int
@@ -103,7 +108,7 @@ ehci_rh_report_port_changes (usbdev_t *dev)
 {
        int i;
        for (i=0; i<RH_INST(dev)->n_ports; i++) {
-               if (RH_INST(dev)->ports[i].conn_status_change)
+               if (RH_INST(dev)->ports[i] & P_CONN_STATUS_CHANGE)
                        return i;
        }
        return -1;
@@ -122,21 +127,21 @@ void
 ehci_rh_init (usbdev_t *dev)
 {
        int i;
-
        dev->destroy = ehci_rh_destroy;
        dev->poll = ehci_rh_poll;
 
        dev->data = malloc(sizeof(rh_inst_t));
 
-       RH_INST(dev)->n_ports = EHCI_INST(dev->controller)->capabilities->n_ports;
+       RH_INST(dev)->n_ports = EHCI_INST(dev->controller)->capabilities->hcsparams & HCS_NPORTS_MASK;
        RH_INST(dev)->ports = EHCI_INST(dev->controller)->operation->portsc;
 
-       printf("root hub has %x ports\n", RH_INST(dev)->n_ports);
+       debug("root hub has %x ports\n", RH_INST(dev)->n_ports);
 
        RH_INST(dev)->devices = malloc(RH_INST(dev)->n_ports * sizeof(int));
        for (i=0; i < RH_INST(dev)->n_ports; i++) {
                RH_INST(dev)->devices[i] = -1;
-               RH_INST(dev)->ports[i].pp = 1;
+               RH_INST(dev)->ports[i] |= P_PP;
+               ehci_rh_scanport(dev, i);
        }
 
        dev->address = 0;