usb: ohci: Move the ohci_dev struct to inside the main ohci struct

This is a preparation patch for adding driver-model support.

Note we do keep ohci_dev as a separate struct so that we can later add
support for interrupt-queues which requires allocating a separate ohci_dev
per interrupt-queue.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Marek Vasut <marex@denx.de>

diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index 22c7b1810aea0aa49aaa9d69a1ac557bc34c24cf..745825cd3206bc27824d327df19a81f418b4fd11 100644 (file)
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -109,8 +109,6 @@ static ohci_t gohci;
 struct ohci_hcca ghcca[1];
 /* a pointer to the aligned storage */
 struct ohci_hcca *phcca;
-/* this allocates EDs for all possible endpoints */
-struct ohci_device ohci_dev;
 
 static inline u32 roothub_a(struct ohci *hc)
        { return ohci_readl(&hc->regs->roothub.a); }
@@ -389,7 +387,8 @@ static void ohci_dump(ohci_t *controller, int verbose)
 
 /* get a transfer request */
 
-int sohci_submit_job(ohci_t *ohci, urb_priv_t *urb, struct devrequest *setup)
+int sohci_submit_job(ohci_t *ohci, ohci_dev_t *ohci_dev, urb_priv_t *urb,
+                    struct devrequest *setup)
 {
        ed_t *ed;
        urb_priv_t *purb_priv = urb;
@@ -412,7 +411,7 @@ int sohci_submit_job(ohci_t *ohci, urb_priv_t *urb, struct devrequest *setup)
        urb->finished = 0;
 
        /* every endpoint has a ed, locate and fill it */
-       ed = ep_add_ed(dev, pipe, interval, 1);
+       ed = ep_add_ed(ohci_dev, dev, pipe, interval, 1);
        if (!ed) {
                err("sohci_submit_job: ENOMEM");
                return -1;
@@ -743,14 +742,14 @@ static int ep_unlink(ohci_t *ohci, ed_t *edi)
  * info fields are setted anyway even though most of them should not
  * change
  */
-static ed_t *ep_add_ed(struct usb_device *usb_dev, unsigned long pipe,
-                       int interval, int load)
+static ed_t *ep_add_ed(ohci_dev_t *ohci_dev, struct usb_device *usb_dev,
+                      unsigned long pipe, int interval, int load)
 {
        td_t *td;
        ed_t *ed_ret;
        volatile ed_t *ed;
 
-       ed = ed_ret = &ohci_dev.ed[(usb_pipeendpoint(pipe) << 1) |
+       ed = ed_ret = &ohci_dev->ed[(usb_pipeendpoint(pipe) << 1) |
                        (usb_pipecontrol(pipe)? 0: usb_pipeout(pipe))];
 
        if ((ed->state & ED_DEL) || (ed->state & ED_URB_DEL)) {
@@ -766,7 +765,7 @@ static ed_t *ep_add_ed(struct usb_device *usb_dev, unsigned long pipe,
                ed->hwHeadP = ed->hwTailP;
                ed->state = ED_UNLINK;
                ed->type = usb_pipetype(pipe);
-               ohci_dev.ed_cnt++;
+               ohci_dev->ed_cnt++;
        }
 
        ed->hwINFO = m32_swap(usb_pipedevice(pipe)
@@ -1386,7 +1385,7 @@ static int submit_common_msg(ohci_t *ohci, struct usb_device *dev,
                return -1;
        }
 
-       if (sohci_submit_job(ohci, urb, setup) < 0) {
+       if (sohci_submit_job(ohci, &ohci->ohci_dev, urb, setup) < 0) {
                err("sohci_submit_job failed");
                return -1;
        }
@@ -1763,11 +1762,6 @@ int usb_lowlevel_init(int index, enum usb_init_type init, void **controller)
        }
        phcca = &ghcca[0];
        info("aligned ghcca %p", phcca);
-       memset(&ohci_dev, 0, sizeof(struct ohci_device));
-       if ((__u32)&ohci_dev.ed[0] & 0x7) {
-               err("EDs not aligned!!");
-               return -1;
-       }
        memset(gtd, 0, sizeof(td_t) * (NUM_TD + 1));
        if ((__u32)gtd & 0x7) {
                err("TDs not aligned!!");

diff --git a/drivers/usb/host/ohci.h b/drivers/usb/host/ohci.h
index 9a4a2c24759111adf185be7cebdbffa0bd1f29b8..c3191641ce9f94c4da33bc283489360d5a2d72fa 100644 (file)
--- a/drivers/usb/host/ohci.h
+++ b/drivers/usb/host/ohci.h
@@ -408,6 +408,13 @@ typedef struct
 } urb_priv_t;
 #define URB_DEL 1
 
+#define NUM_EDS 8              /* num of preallocated endpoint descriptors */
+
+typedef struct ohci_device {
+       ed_t ed[NUM_EDS] __aligned(16);
+       int ed_cnt;
+} ohci_dev_t;
+
 /*
  * This is the full ohci controller description
  *
@@ -417,6 +424,8 @@ typedef struct
 
 
 typedef struct ohci {
+       /* this allocates EDs for all possible endpoints */
+       struct ohci_device ohci_dev __aligned(16);
        struct ohci_hcca *hcca;         /* hcca */
        /*dma_addr_t hcca_dma;*/
 
@@ -439,19 +448,12 @@ typedef struct ohci {
        const char      *slot_name;
 } ohci_t;
 
-#define NUM_EDS 8              /* num of preallocated endpoint descriptors */
-
-struct ohci_device {
-       ed_t    ed[NUM_EDS];
-       int ed_cnt;
-};
-
 /* hcd */
 /* endpoint */
 static int ep_link(ohci_t * ohci, ed_t * ed);
 static int ep_unlink(ohci_t * ohci, ed_t * ed);
-static ed_t * ep_add_ed(struct usb_device * usb_dev, unsigned long pipe,
-               int interval, int load);
+static ed_t *ep_add_ed(ohci_dev_t *ohci_dev, struct usb_device *usb_dev,
+                      unsigned long pipe, int interval, int load);
 
 /*-------------------------------------------------------------------------*/