Changes in / [3e4f2e0:9212f8a] in mainline

Location:

uspace

Files:

• app/netstart/self_test.c (added)
• app/netstart/self_test.h (added)
• drv/ehci-hcd/pci.c (modified) (4 diffs)
• drv/uhci-rhd/port.c (modified) (5 diffs)
• lib/packet/include/net_byteorder.h (deleted)
• lib/packet/include/net_err.h (deleted)
• lib/packet/include/socket_errno.h (deleted)

uspace/drv/ehci-hcd/pci.c

@@ -54 +54 @@
 
 #define CMD_OFFSET 0x0
-#define CONFIGFLAG_OFFSET 0x40
+#define STS_OFFSET 0x4
+#define CFG_OFFSET 0x40
 
 #define USBCMD_RUN 1
@@ -264 +265 @@
          * It would prevent pre-OS code from interfering. */
         ret = async_req_3_0(parent_phone, DEV_IFACE_ID(PCI_DEV_IFACE),
-           IPC_M_CONFIG_SPACE_WRITE_32, eecp + USBLEGCTLSTS_OFFSET, 0);
+           IPC_M_CONFIG_SPACE_WRITE_32, eecp + USBLEGCTLSTS_OFFSET,
+           0xe0000000);
         CHECK_RET_HANGUP_RETURN(ret, "Failed(%d) zero USBLEGCTLSTS.\n", ret);
-        usb_log_debug("Zeroed USBLEGCTLSTS register.\n");
 
         /* Read again Legacy Support and Control register */
@@ -291 +292 @@
         volatile uint32_t *usbcmd =
             (uint32_t*)((uint8_t*)registers + operation_offset + CMD_OFFSET);
+        volatile uint32_t *usbsts =
+            (uint32_t*)((uint8_t*)registers + operation_offset + STS_OFFSET);
         volatile uint32_t *usbconfigured =
-            (uint32_t*)((uint8_t*)registers + operation_offset
-            + CONFIGFLAG_OFFSET);
+            (uint32_t*)((uint8_t*)registers + operation_offset + CFG_OFFSET);
         usb_log_debug("USBCMD value: %x.\n", *usbcmd);
         if (*usbcmd & USBCMD_RUN) {
                 *usbcmd = 0;
+                while (!(*usbsts & (1 << 12))); /*wait until hc is halted */
                 *usbconfigured = 0;
                 usb_log_info("EHCI turned off.\n");
@@ -302 +305 @@
                 usb_log_info("EHCI was not running.\n");
         }
+        usb_log_debug("Registers: %x(0x00080000):%x(0x00001000):%x(0x0).\n",
+            *usbcmd, *usbsts, *usbconfigured);
 
         async_hangup(parent_phone);

uspace/drv/uhci-rhd/port.c

@@ -32 +32 @@
  * @brief UHCI root hub port routines
  */
-#include <libarch/ddi.h> /* pio_read and pio_write */
+#include <libarch/ddi.h>  /* pio_read and pio_write */
+#include <fibril_synch.h> /* async_usleep */
 #include <errno.h>
 #include <str_error.h>
-#include <fibril_synch.h>
 
 #include <usb/usb.h>    /* usb_address_t */
-#include <usb/hub.h>
+#include <usb/hub.h>    /* usb_hc_new_device_wrapper */
 #include <usb/debug.h>
 
@@ -212 +212 @@
 
         /*
-         * The host then waits for at least 100 ms to allow completion of
-         * an insertion process and for power at the device to become stable.
-         */
-        async_usleep(100000);
-
-        /*
-         * Resets from root ports should be nominally 50ms
+         * Resets from root ports should be nominally 50ms (USB spec 7.1.7.3)
          */
         {
@@ -229 +223 @@
                 port_status &= ~STATUS_IN_RESET;
                 uhci_port_write_status(port, port_status);
-                usb_log_debug("%s: Reset Signal stop.\n", port->id_string);
-        }
-
-        /* the reset recovery time 10ms */
-        async_usleep(10000);
-
+                while (uhci_port_read_status(port) & STATUS_IN_RESET);
+                // TODO: find a better way to waste time (it should be less than
+                // 10ms, if we reschedule it takes too much time (random
+                // interrupts can be solved by multiple attempts).
+                usb_log_debug2("%s: Reset Signal stop.\n", port->id_string);
+        }
         /* Enable the port. */
         uhci_port_set_enabled(port, true);
+
+        /* Reset recovery period,
+         * devices do not have to respond during this period
+         */
+        async_usleep(10000);
         return EOK;
 }
@@ -255 +254 @@
         usb_log_debug("%s: Detected new device.\n", port->id_string);
 
+        int ret, count = 0;
         usb_address_t dev_addr;
-        int ret = usb_hc_new_device_wrapper(port->rh, &port->hc_connection,
-            speed, uhci_port_reset_enable, port->number, port,
-            &dev_addr, &port->attached_device, NULL, NULL, NULL);
+        do {
+                ret = usb_hc_new_device_wrapper(port->rh, &port->hc_connection,
+                    speed, uhci_port_reset_enable, port->number, port,
+                    &dev_addr, &port->attached_device, NULL, NULL, NULL);
+        } while (ret != EOK && ++count < 4);
 
         if (ret != EOK) {
@@ -313 +315 @@
         /* Wait for port to become enabled */
         do {
-                async_usleep(1000);
                 port_status = uhci_port_read_status(port);
         } while ((port_status & STATUS_CONNECTED) &&