/*
- * OHCI HCD (Host Controller Driver) for USB.
+ * ADM5120 HCD (Host Controller Driver) for USB
*
- * (C) Copyright 1999 Roman Weissgaerber <weissg@vienna.at>
- * (C) Copyright 2000-2002 David Brownell <dbrownell@users.sourceforge.net>
+ * Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * This file was derived from: drivers/usb/host/ohci-mem.c
+ * (C) Copyright 1999 Roman Weissgaerber <weissg@vienna.at>
+ * (C) Copyright 2000-2002 David Brownell <dbrownell@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
*
- * This file is licenced under the GPL.
*/
/*-------------------------------------------------------------------------*/
{
ahcd->next_statechange = jiffies;
spin_lock_init(&ahcd->lock);
- spin_lock_init(&ahcd->dma_lock);
+ INIT_LIST_HEAD(&ahcd->pending);
}
/*-------------------------------------------------------------------------*/
/*-------------------------------------------------------------------------*/
+/* ahcd "done list" processing needs this mapping */
+static inline struct td *dma_to_td(struct admhcd *ahcd, dma_addr_t td_dma)
+{
+ struct td *td;
+
+ td_dma &= TD_MASK;
+ td = ahcd->td_hash[TD_HASH_FUNC(td_dma)];
+ while (td && td->td_dma != td_dma)
+ td = td->td_hash;
+
+ return td;
+}
+
/* TDs ... */
static struct td *td_alloc(struct admhcd *ahcd, gfp_t mem_flags)
{
/* in case ahcd fetches it, make it look dead */
memset(td, 0, sizeof *td);
+ td->hwNextTD = cpu_to_hc32(ahcd, dma);
td->td_dma = dma;
+ /* hashed in td_fill */
return td;
}
static void td_free(struct admhcd *ahcd, struct td *td)
{
+ struct td **prev = &ahcd->td_hash[TD_HASH_FUNC(td->td_dma)];
+
+ while (*prev && *prev != td)
+ prev = &(*prev)->td_hash;
+ if (*prev)
+ *prev = td->td_hash;
+#if 0
+ /* TODO: remove */
+ else if ((td->hwINFO & cpu_to_hc32(ahcd, TD_DONE)) != 0)
+ admhc_dbg (ahcd, "no hash for td %p\n", td);
+#else
+ else if ((td->flags & TD_FLAG_DONE) != 0)
+ admhc_dbg (ahcd, "no hash for td %p\n", td);
+#endif
dma_pool_free(ahcd->td_cache, td, td->td_dma);
}
memset(ed, 0, sizeof(*ed));
ed->dma = dma;
- INIT_LIST_HEAD(&ed->urb_pending);
+ INIT_LIST_HEAD(&ed->td_list);
+ INIT_LIST_HEAD(&ed->urb_list);
return ed;
}
if (urb_priv->td[i])
td_free(ahcd, urb_priv->td[i]);
+ list_del(&urb_priv->pending);
kfree(urb_priv);
}
gfp_t mem_flags)
{
struct urb_priv *priv;
- int i;
/* allocate the private part of the URB */
priv = kzalloc(sizeof(*priv) + sizeof(struct td) * num_tds, mem_flags);
goto err;
/* allocate the TDs (deferring hash chain updates) */
- for (i = 0; i < num_tds; i++) {
- priv->td[i] = td_alloc(ahcd, mem_flags);
- if (priv->td[i] == NULL)
+ for (priv->td_cnt = 0; priv->td_cnt < num_tds; priv->td_cnt++) {
+ priv->td[priv->td_cnt] = td_alloc(ahcd, mem_flags);
+ if (priv->td[priv->td_cnt] == NULL)
goto err_free;
- priv->td[i]->index = i;
}
INIT_LIST_HEAD(&priv->pending);
- priv->td_cnt = num_tds;
return priv;