Changeset fd9f4ffe in mainline

Timestamp:

2017-07-12T16:11:22Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

481af21e

Parents:

c9c0e41

Message:

The xHC now properly gets the physical addresses (with correct endianity) of its scratchpad buffers.

Location:

uspace/drv/bus/usb/xhci

Files:

• hc.c (modified) (1 diff)
• hc.h (modified) (2 diffs)
• scratchpad.c (modified) (4 diffs)
• scratchpad.h (modified) (1 diff)

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

@@ -41 +41 @@
 #include "hc.h"
 #include "hw_struct/trb.h"
-#include "scratchpad.h"
 #include "commands.h"
 

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

@@ -40 +40 @@
 #include "hw_struct/regs.h"
 #include "hw_struct/context.h"
+#include "scratchpad.h"
 #include "trb_ring.h"
 
@@ -66 +67 @@
         xhci_event_ring_t event_ring;
         xhci_device_ctx_t **dcbaa;
+        xhci_scratchpad_t *scratchpad;
 
         /* Cached capabilities */

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

@@ -54 +54 @@
 {
         unsigned num_bufs, allocated;
-        xhci_scratchpad_t *buf_array;
+        xhci_scratchpad_t *bufs;
 
         num_bufs = xhci_scratchpad_count(hc);
@@ -61 +61 @@
                 return EOK;
 
-        buf_array = malloc32(num_bufs * sizeof(xhci_scratchpad_t));
-        if (!buf_array)
+        bufs = malloc32(sizeof(xhci_scratchpad_t));
+        if (!bufs)
                 return ENOMEM;
 
-        hc->dcbaa[0] = (xhci_device_ctx_t *) buf_array;
+        allocated = 0;
 
-        allocated = 0;
+        uint64_t *phys_array = malloc32(num_bufs * sizeof(uint64_t));
+        if(phys_array == NULL)
+                goto err_phys_array;
+
+        uint64_t *virt_array = malloc32(num_bufs * sizeof(uint64_t));
+        if(virt_array == NULL)
+                goto err_virt_array;
+
         for (unsigned i = 0; i < num_bufs; ++i) {
-                buf_array[i].sp_ptr = (uint64_t) malloc32(PAGE_SIZE);
+                void *buf = malloc32(PAGE_SIZE);
+                phys_array[i] = host2xhci(64, (uint64_t) addr_to_phys(buf));
+                virt_array[i] = (uint64_t) buf;
 
-                if (buf_array[i].sp_ptr)
+                if (buf != NULL)
                         ++allocated;
                 else
                         goto err_page_alloc;
 
-                memset((void *) buf_array[i].sp_ptr, 0, PAGE_SIZE);
+                memset(buf, 0, PAGE_SIZE);
         }
+
+        bufs->phys_ptr = host2xhci(64, (uint64_t) addr_to_phys(phys_array));
+        bufs->virt_ptr = (uint64_t) virt_array;
+        bufs->phys_bck = (uint64_t) phys_array;
+
+        hc->dcbaa[0] = (xhci_device_ctx_t *) bufs->phys_ptr;
+        hc->scratchpad = bufs;
 
         usb_log_debug2("Allocated %d scratchpad buffers.", num_bufs);
@@ -85 +101 @@
 err_page_alloc:
         for (unsigned i = 0; i < allocated; ++i)
-                free32((void *) buf_array[i].sp_ptr);
+                free32((void *) virt_array[i]);
+        free32(virt_array);
+
+err_virt_array:
+        free32(phys_array);
+
+err_phys_array:
+        free32(bufs);
 
         return ENOMEM;
@@ -93 +116 @@
 {
         unsigned num_bufs;
-        xhci_scratchpad_t *buf_array;
-
+        xhci_scratchpad_t *scratchpad;
+        uint64_t *virt_array;
+        
         num_bufs = xhci_scratchpad_count(hc);
         if(!num_bufs)
                 return;
 
-        buf_array = (xhci_scratchpad_t *) hc->dcbaa[0];
+        scratchpad =  hc->scratchpad;
+        virt_array = (uint64_t *) scratchpad->virt_ptr;
 
         for (unsigned i = 0; i < num_bufs; ++i)
-                free32((void *) buf_array[i].sp_ptr);
-        free32(buf_array);
+                free32((void *) virt_array[i]);
+        free32((void *) scratchpad->virt_ptr);
+        free32((void *) scratchpad->phys_bck);
 
         hc->dcbaa[0] = NULL;

uspace/drv/bus/usb/xhci/scratchpad.h

@@ -41 +41 @@
 #define XHCI_SCRATCHPAD_H
 
+typedef struct xhci_hc xhci_hc_t;
+
 typedef struct xhci_scratchpad {
-        uint64_t sp_ptr;
+        /* Pointers to scratchpad buffers used by the xHC. */
+        uint64_t phys_ptr;
+        /* Pointers to scratchpad buffers used for deallocation. */
+        uint64_t virt_ptr;
+        /* Pointers to the scratchpad array used for deallocation. */
+        uint64_t phys_bck;
 } xhci_scratchpad_t;