usb: ums: use only 1 buffer for CI_UDC

ci_udc.c allocates only a single buffer for each endpoint, which ci_ep_alloc_request() returns as a hard-coded value rather than dynamically allocating. Consequently, storage_common.c must limit itself to using a single buffer at a time. Add a special case to the definition of FSG_NUM_BUFFERS for this. Another option would be to fix ci_ep_alloc_request() to dynamically allocate the buffers like some/all(?) other device mode drivers do. However, I don't think that ci_ep_queue() supports queueing up multiple buffers either yet, and I'm not familiar enough with the controller yet to implement that. As such, any attempt to use multiple buffers simply results in data corruption and other errors. Signed-off-by: Stephen Warren <swarren@nvidia.com>

usb: ums: use only 1 buffer for CI_UDC
ci_udc.c allocates only a single buffer for each endpoint, which ci_ep_alloc_request() returns as a hard-coded value rather than dynamically allocating. Consequently, storage_common.c must limit itself to using a single buffer at a time. Add a special case to the definition of FSG_NUM_BUFFERS for this. Another option would be to fix ci_ep_alloc_request() to dynamically allocate the buffers like some/all(?) other device mode drivers do. However, I don't think that ci_ep_queue() supports queueing up multiple buffers either yet, and I'm not familiar enough with the controller yet to implement that. As such, any attempt to use multiple buffers simply results in data corruption and other errors. Signed-off-by: Stephen Warren <swarren@nvidia.com>
Stephen Warren · Marek Vasut · Eric Lee · Eric Lee · Eric Lee · Eric Lee
1 parent fcf2ede190
Showing 1 changed file with 4 additions and 0 deletions Side-by-side Diff
drivers/usb/gadget/storage_common.c
@@ -311,7 +311,11 @@
 #define DELAYED_STATUS	(EP0_BUFSIZE + 999)	/* An impossibly large value */
  
 /* Number of buffers we will use.  2 is enough for double-buffering */
+#ifndef CONFIG_CI_UDC
 #define FSG_NUM_BUFFERS	2
+#else
+#define FSG_NUM_BUFFERS	1 /* ci_udc only allows 1 req per ep at present */
+#endif
  
 /* Default size of buffer length. */
 #define FSG_BUFLEN	((u32)16384)
...	...	@@ -311,7 +311,11 @@
311	311	#define DELAYED_STATUS (EP0_BUFSIZE + 999) /* An impossibly large value */
312	312
313	313	/* Number of buffers we will use. 2 is enough for double-buffering */
	314	+#ifndef CONFIG_CI_UDC
314	315	#define FSG_NUM_BUFFERS 2
	316	+#else
	317	+#define FSG_NUM_BUFFERS 1 /* ci_udc only allows 1 req per ep at present */
	318	+#endif
315	319
316	320	/* Default size of buffer length. */
317	321	#define FSG_BUFLEN ((u32)16384)