Changeset 5f97ef44 in mainline for uspace/drv/bus/usb

Timestamp:

2018-07-13T14:10:15Z (7 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e3787a0

Parents:

9912f49

git-author:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-07-13 14:08:57)

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-07-13 14:10:15)

Message:

Sleep is more natural as part of the fibril API.
(the implementation will move later)

Location:

uspace/drv/bus/usb

Files:

• ehci/ehci_rh.c (modified) (3 diffs)
• ehci/hc.c (modified) (2 diffs)
• ehci/res.c (modified) (1 diff)
• ohci/hc.c (modified) (4 diffs)
• uhci/hc.c (modified) (4 diffs)
• uhci/uhci_rh.c (modified) (2 diffs)
• vhc/hub/hub.c (modified) (1 diff)
• vhc/transfer.c (modified) (2 diffs)
• xhci/hc.c (modified) (1 diff)
• xhci/hw_struct/common.h (modified) (1 diff)

uspace/drv/bus/usb/ehci/ehci_rh.c

@@ -334 +334 @@
 {
         ehci_rh_job_t *job = arg;
-        async_usleep(50000);
+        fibril_usleep(50000);
         usb_log_debug("RH(%p-%u): Clearing reset", job->hub, job->port);
         EHCI_CLR(job->hub->registers->portsc[job->port],
@@ -341 +341 @@
         while (EHCI_RD(job->hub->registers->portsc[job->port]) &
             USB_PORTSC_PORT_RESET_FLAG) {
-                async_usleep(1);
+                fibril_usleep(1);
         }
         usb_log_debug("RH(%p-%u): Reset complete", job->hub, job->port);
@@ -365 +365 @@
 {
         ehci_rh_job_t *job = arg;
-        async_usleep(20000);
+        fibril_usleep(20000);
         usb_log_debug("RH(%p-%u): Stopping resume", job->hub, job->port);
         EHCI_CLR(job->hub->registers->portsc[job->port],

uspace/drv/bus/usb/ehci/hc.c

@@ -408 +408 @@
                 /* Wait until hc is halted */
                 while ((EHCI_RD(instance->registers->usbsts) & USB_STS_HC_HALTED_FLAG) == 0) {
-                        async_usleep(1);
+                        fibril_usleep(1);
                 }
                 usb_log_info("HC(%p): EHCI turned off.", instance);
@@ -419 +419 @@
         usb_log_info("HC(%p): Waiting for HW reset.", instance);
         while (EHCI_RD(instance->registers->usbcmd) & USB_CMD_HC_RESET_FLAG) {
-                async_usleep(1);
+                fibril_usleep(1);
         }
         usb_log_debug("HC(%p): HW reset OK.", instance);

uspace/drv/bus/usb/ehci/res.c

@@ -99 +99 @@
         while ((ret == EOK) && (wait < DEFAULT_WAIT) &&
             (usblegsup & USBLEGSUP_BIOS_CONTROL)) {
-                async_usleep(WAIT_STEP);
+                fibril_usleep(WAIT_STEP);
                 ret = pci_config_space_read_32(parent_sess,
                     eecp + USBLEGSUP_OFFSET, &usblegsup);

uspace/drv/bus/usb/ohci/hc.c

@@ -425 +425 @@
                 /* Hope that SMM actually knows its stuff or we can hang here */
                 while (OHCI_RD(instance->registers->control) & C_IR) {
-                        async_usleep(1000);
+                        fibril_usleep(1000);
                 }
                 usb_log_info("SMM driver: Ownership taken.");
                 C_HCFS_SET(instance->registers->control, C_HCFS_RESET);
-                async_usleep(50000);
+                fibril_usleep(50000);
                 return EOK;
         }
@@ -443 +443 @@
                 /* HC is suspended assert resume for 20ms */
                 C_HCFS_SET(instance->registers->control, C_HCFS_RESUME);
-                async_usleep(20000);
+                fibril_usleep(20000);
                 usb_log_info("BIOS driver: HC resumed.");
                 return EOK;
@@ -453 +453 @@
          */
         usb_log_debug("Host controller found in reset state.");
-        async_usleep(50000);
+        fibril_usleep(50000);
         return EOK;
 }
@@ -479 +479 @@
         OHCI_WR(instance->registers->command_status, CS_HCR);
         while (OHCI_RD(instance->registers->command_status) & CS_HCR) {
-                async_usleep(10);
+                fibril_usleep(10);
                 time += 10;
         }

uspace/drv/bus/usb/uhci/hc.c

@@ -280 +280 @@
         /* Reset everything, who knows what touched it before us */
         pio_write_16(&registers->usbcmd, UHCI_CMD_GLOBAL_RESET);
-        async_usleep(50000); /* 50ms according to USB spec(root hub reset) */
+        fibril_usleep(50000); /* 50ms according to USB spec(root hub reset) */
         pio_write_16(&registers->usbcmd, 0);
 
@@ -286 +286 @@
         pio_write_16(&registers->usbcmd, UHCI_CMD_HCRESET);
         do {
-                async_usleep(10);
+                fibril_usleep(10);
         } while ((pio_read_16(&registers->usbcmd) & UHCI_CMD_HCRESET) != 0);
 
@@ -405 +405 @@
          * the buffers.
          */
-        async_usleep(20000);
+        fibril_usleep(20000);
         batch->base.error = EINTR;
         batch->base.transferred_size = 0;
@@ -660 +660 @@
                             (void *) expected_pa, (void *) real_pa);
                 }
-                async_usleep(UHCI_DEBUGER_TIMEOUT);
+                fibril_usleep(UHCI_DEBUGER_TIMEOUT);
         }
         return EOK;

uspace/drv/bus/usb/uhci/uhci_rh.c

@@ -110 +110 @@
                     batch->dma_buffer.virt, batch->size, &batch->transferred_size);
                 if (batch->error == ENAK)
-                        async_usleep(instance->base.endpoint_descriptor.poll_interval * 1000);
+                        fibril_usleep(instance->base.endpoint_descriptor.poll_interval * 1000);
                 //TODO This is flimsy, but we can't exit early because
                 //ENAK is technically an error condition
@@ -147 +147 @@
         port_status |= STATUS_IN_RESET;
         pio_write_16(port, port_status);
-        async_usleep(50000);
+        fibril_usleep(50000);
         port_status = pio_read_16(port);
         port_status &= ~STATUS_IN_RESET;

uspace/drv/bus/usb/vhc/hub/hub.c

@@ -465 +465 @@
             (struct delay_port_state_change *) arg;
 
-        async_usleep(change->delay);
+        fibril_usleep(change->delay);
 
         hub_acquire(change->hub);

uspace/drv/bus/usb/vhc/transfer.c

@@ -242 +242 @@
                 if (list_empty(&dev->transfer_queue)) {
                         fibril_mutex_unlock(&dev->guard);
-                        async_usleep(10 * 1000);
+                        fibril_usleep(10 * 1000);
                         fibril_mutex_lock(&dev->guard);
                         continue;
@@ -290 +290 @@
                 }
 
-                async_usleep(1000 * 100);
+                fibril_usleep(1000 * 100);
                 fibril_mutex_lock(&dev->guard);
         }

uspace/drv/bus/usb/xhci/hc.c

@@ -430 +430 @@
                         return XHCI_REG_RD(hc->legsup, XHCI_LEGSUP_SEM_OS) == 1 ? EOK : EIO;
                 }
-                async_usleep(XHCI_LEGSUP_POLLING_DELAY_1MS);
+                fibril_usleep(XHCI_LEGSUP_POLLING_DELAY_1MS);
         }
         usb_log_error("BIOS did not release XHCI legacy hold!");

uspace/drv/bus/usb/xhci/hw_struct/common.h

@@ -103 +103 @@
 
         for (; retries > 0 && value != expected; --retries) {
-                async_usleep(10000);
+                fibril_usleep(10000);
                 value = *reg & mask;
         }