Until we have logic to determine which devices share the same TT let's
add logic to assume that all devices on a given dwc2 controller are on
one single_tt hub. This is better than the previous code that assumed
that all devices were on one multi_tt hub, since single_tt hubs
appear (in my experience) to be much more common and any schedule that
would work on a single_tt hub will also work on a multi_tt hub. This
will prevent more than 8 total low/full speed devices to be on the bus
at one time, but that's a reasonable restriction until we've made things
smarter.
Signed-off-by: Douglas Anderson <dianders@xxxxxxxxxxxx>
---
Changes in v3:
- Assuming single_tt is new for v3; not terribly well tested (yet).
Changes in v2: None
drivers/usb/dwc2/core.h | 1 +
drivers/usb/dwc2/hcd_queue.c | 40 +++++++++++++++++++++++++++++++++++++++-
2 files changed, 40 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h
index 567ee2c9e69f..09aa2b5ae29e 100644
--- a/drivers/usb/dwc2/core.h
+++ b/drivers/usb/dwc2/core.h
@@ -782,6 +782,7 @@ struct dwc2_hsotg {
u16 periodic_usecs;
unsigned long periodic_bitmap[DIV_ROUND_UP(TOTAL_PERIODIC_USEC,
BITS_PER_LONG)];
+ bool has_split[8];
u16 frame_number;
u16 periodic_qh_count;
bool bus_suspended;
diff --git a/drivers/usb/dwc2/hcd_queue.c b/drivers/usb/dwc2/hcd_queue.c
index 4c1d9cf482d0..c5a2edb04bec 100644
--- a/drivers/usb/dwc2/hcd_queue.c
+++ b/drivers/usb/dwc2/hcd_queue.c
@@ -372,10 +372,33 @@ static int dwc2_find_single_uframe(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh)
*/
static int dwc2_find_multi_uframe(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh)
{
+ unsigned long tmp_bmp[DIV_ROUND_UP(TOTAL_PERIODIC_USEC, BITS_PER_LONG)];
+ unsigned long *bmp;
unsigned short utime = qh->usecs;
unsigned long start;
+ int i;
+
+ if (qh->do_split) {
+ /*
+ * Eventually we'll only want to exclude out microframes used by
+ * other people on the same TT as us, and then only if we're on
+ * a single_tt hub. ...but until we have that logic, just
+ * schedule everyone together.
+ */
+ bmp = tmp_bmp;
+ memcpy(bmp, hsotg->periodic_bitmap, sizeof(tmp_bmp));
+ start = 0;
+
+ for (i = 0; i < ARRAY_SIZE(max_uframe_usecs); i++) {
+ if (hsotg->has_split[i])
+ bitmap_set(bmp, start, max_uframe_usecs[i]);
+ start += max_uframe_usecs[i];
+ }
+ } else {
+ bmp = hsotg->periodic_bitmap;
+ }
- start = bitmap_find_next_zero_area(hsotg->periodic_bitmap,
+ start = bitmap_find_next_zero_area(bmp,
TOTAL_PERIODIC_USEC, 0, utime, 0);
if (start >= TOTAL_PERIODIC_USEC) {
dwc2_sch_dbg(hsotg, "%s: failed to assign %d us\n",
@@ -386,6 +409,13 @@ static int dwc2_find_multi_uframe(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh)
bitmap_set(hsotg->periodic_bitmap, start, qh->usecs);
qh->start_usecs = start;
+ if (qh->do_split) {
+ for (i = start / EARLY_FRAME_USEC;
+ i < DIV_ROUND_UP(start + utime - 1, EARLY_FRAME_USEC);
+ i++)
+ hsotg->has_split[i] = true;
+ }
+
dwc2_sch_dbg(hsotg, "%s: assigned %d us @ %d us\n",
__func__, qh->usecs, qh->start_usecs);
@@ -533,6 +563,7 @@ static void dwc2_deschedule_periodic(struct dwc2_hsotg *hsotg,
{
int start = qh->start_usecs;
int utime = qh->usecs;
+ int i;
list_del_init(&qh->qh_list_entry);
@@ -546,6 +577,13 @@ static void dwc2_deschedule_periodic(struct dwc2_hsotg *hsotg,
}
bitmap_clear(hsotg->periodic_bitmap, start, utime);
+
+ if (qh->do_split) {
+ for (i = start / EARLY_FRAME_USEC;
+ i < DIV_ROUND_UP(start + utime - 1, EARLY_FRAME_USEC);
+ i++)
+ hsotg->has_split[i] = false;
+ }
}
/**
--
2.6.0.rc2.230.g3dd15c0
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
