diff options
| author | Minas Harutyunyan | 2018-05-23 14:24:44 +0200 |
|---|---|---|
| committer | Felipe Balbi | 2018-06-19 11:48:14 +0200 |
| commit | 1d8e5c00275825fc42aaa5597dab1d0b5b26bb64 (patch) | |
| tree | b69606da10d7d91038ca216b907f6296b6619f1a /drivers/usb/dwc2 | |
| parent | usb: gadget: dwc2: fix memory leak in gadget_init() (diff) | |
| download | kernel-qcow2-linux-1d8e5c00275825fc42aaa5597dab1d0b5b26bb64.tar.gz kernel-qcow2-linux-1d8e5c00275825fc42aaa5597dab1d0b5b26bb64.tar.xz kernel-qcow2-linux-1d8e5c00275825fc42aaa5597dab1d0b5b26bb64.zip | |
dwc2: gadget: Fix ISOC IN DDMA PID bitfield value calculation
PID bitfield in descriptor should be set based on particular request
length, not based on EP's mc value. PID value can't be set to 0 even
request length is 0.
Signed-off-by: Minas Harutyunyan <hminas@synopsys.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Diffstat (limited to 'drivers/usb/dwc2')
| -rw-r--r-- | drivers/usb/dwc2/gadget.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c index 76e4f2e7d947..a0f82cca2d9a 100644 --- a/drivers/usb/dwc2/gadget.c +++ b/drivers/usb/dwc2/gadget.c @@ -812,6 +812,7 @@ static int dwc2_gadget_fill_isoc_desc(struct dwc2_hsotg_ep *hs_ep, u32 index; u32 maxsize = 0; u32 mask = 0; + u8 pid = 0; maxsize = dwc2_gadget_get_desc_params(hs_ep, &mask); @@ -840,7 +841,11 @@ static int dwc2_gadget_fill_isoc_desc(struct dwc2_hsotg_ep *hs_ep, ((len << DEV_DMA_NBYTES_SHIFT) & mask)); if (hs_ep->dir_in) { - desc->status |= ((hs_ep->mc << DEV_DMA_ISOC_PID_SHIFT) & + if (len) + pid = DIV_ROUND_UP(len, hs_ep->ep.maxpacket); + else + pid = 1; + desc->status |= ((pid << DEV_DMA_ISOC_PID_SHIFT) & DEV_DMA_ISOC_PID_MASK) | ((len % hs_ep->ep.maxpacket) ? DEV_DMA_SHORT : 0) | |