usb: ehci: fully align interrupt QHs/QTDs

These data structures are passed to cache-flushing routines, and hence must be conform to both the USB the cache-flusing alignment requirements. That means aligning to USB_DMA_MINALIGN. This is important on systems where cache lines are >32 bytes. Signed-off-by: Stephen Warren <swarren@nvidia.com>

usb: ehci: fully align interrupt QHs/QTDs
These data structures are passed to cache-flushing routines, and hence must be conform to both the USB the cache-flusing alignment requirements. That means aligning to USB_DMA_MINALIGN. This is important on systems where cache lines are >32 bytes. Signed-off-by: Stephen Warren <swarren@nvidia.com>
Stephen Warren · Marek Vasut
1 parent 2456b97f0c
Showing 1 changed file with 4 additions and 2 deletions Side-by-side Diff
drivers/usb/host/ehci-hcd.c
@@ -1162,14 +1162,16 @@
 		debug("ehci intr queue: out of memory\n");
 		goto fail1;
 	}
-	result->first = memalign(32, sizeof(struct QH) * queuesize);
+	result->first = memalign(USB_DMA_MINALIGN,
+				 sizeof(struct QH) * queuesize);
 	if (!result->first) {
 		debug("ehci intr queue: out of memory\n");
 		goto fail2;
 	}
 	result->current = result->first;
 	result->last = result->first + queuesize - 1;
-	result->tds = memalign(32, sizeof(struct qTD) * queuesize);
+	result->tds = memalign(USB_DMA_MINALIGN,
+			       sizeof(struct qTD) * queuesize);
 	if (!result->tds) {
 		debug("ehci intr queue: out of memory\n");
 		goto fail3;
...	...	@@ -1162,14 +1162,16 @@
1162	1162	debug("ehci intr queue: out of memory\n");
1163	1163	goto fail1;
1164	1164	}
1165		- result->first = memalign(32, sizeof(struct QH) * queuesize);
	1165	+ result->first = memalign(USB_DMA_MINALIGN,
	1166	+ sizeof(struct QH) * queuesize);
1166	1167	if (!result->first) {
1167	1168	debug("ehci intr queue: out of memory\n");
1168	1169	goto fail2;
1169	1170	}
1170	1171	result->current = result->first;
1171	1172	result->last = result->first + queuesize - 1;
1172		- result->tds = memalign(32, sizeof(struct qTD) * queuesize);
	1173	+ result->tds = memalign(USB_DMA_MINALIGN,
	1174	+ sizeof(struct qTD) * queuesize);
1173	1175	if (!result->tds) {
1174	1176	debug("ehci intr queue: out of memory\n");
1175	1177	goto fail3;