niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

usb: cdns3: gadget: using correct sg operations

Browse source 
It needs to use request->num_mapped_sgs to indicate mapped sg number,
the request->num_sgs is the sg number before the mapping. These two
entries have different values for the platforms which iommu or
swiotlb is used. Besides, it needs to use correct sg APIs for
mapped sg list for TRB assignment.

Signed-off-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Felipe Balbi <balbi@kernel.org>
This commit is contained in:
Peter Chen 2020-09-10 17:11:23 +08:00 • committed by Felipe Balbi
parent 31b5de5f37
commit abc6b57904
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/usb/cdns3/gadget.c
View file

@ -1098,11 +1098,13 @@ static int cdns3_ep_run_transfer(struct cdns3_endpoint *priv_ep,
u32 control; u32 control;
int pcs; int pcs;
u16 total_tdl = 0; u16 total_tdl = 0;
struct scatterlist *s = NULL;
bool sg_supported = !!(request->num_mapped_sgs);
if (priv_ep->type == USB_ENDPOINT_XFER_ISOC) if (priv_ep->type == USB_ENDPOINT_XFER_ISOC)
num_trb = priv_ep->interval; num_trb = priv_ep->interval;
else else
num_trb = request->num_sgs ? request->num_sgs : 1; num_trb = sg_supported ? request->num_mapped_sgs : 1;
if (num_trb > priv_ep->free_trbs) { if (num_trb > priv_ep->free_trbs) {
priv_ep->flags |= EP_RING_FULL; priv_ep->flags |= EP_RING_FULL;
@ -1162,6 +1164,9 @@ static int cdns3_ep_run_transfer(struct cdns3_endpoint *priv_ep,
if (priv_dev->dev_ver <= DEV_VER_V2) if (priv_dev->dev_ver <= DEV_VER_V2)
togle_pcs = cdns3_wa1_update_guard(priv_ep, trb); togle_pcs = cdns3_wa1_update_guard(priv_ep, trb);
if (sg_supported)
s = request->sg;
/* set incorrect Cycle Bit for first trb*/ /* set incorrect Cycle Bit for first trb*/
control = priv_ep->pcs ? 0 : TRB_CYCLE; control = priv_ep->pcs ? 0 : TRB_CYCLE;
@ -1171,13 +1176,13 @@ static int cdns3_ep_run_transfer(struct cdns3_endpoint *priv_ep,
/* fill TRB */ /* fill TRB */
control |= TRB_TYPE(TRB_NORMAL); control |= TRB_TYPE(TRB_NORMAL);
trb->buffer = cpu_to_le32(TRB_BUFFER(request->num_sgs == 0 if (sg_supported) {
? trb_dma : request->sg[sg_iter].dma_address)); trb->buffer = cpu_to_le32(TRB_BUFFER(sg_dma_address(s)));
length = sg_dma_len(s);
if (likely(!request->num_sgs)) } else {
trb->buffer = cpu_to_le32(TRB_BUFFER(trb_dma));
length = request->length; length = request->length;
else }
length = request->sg[sg_iter].length;
if (likely(priv_dev->dev_ver >= DEV_VER_V2)) if (likely(priv_dev->dev_ver >= DEV_VER_V2))
td_size = DIV_ROUND_UP(length, td_size = DIV_ROUND_UP(length,
@ -1215,6 +1220,9 @@ static int cdns3_ep_run_transfer(struct cdns3_endpoint *priv_ep,
else else
priv_req->trb->control = cpu_to_le32(control); priv_req->trb->control = cpu_to_le32(control);
if (sg_supported)
s = sg_next(s);
control = 0; control = 0;
++sg_iter; ++sg_iter;
priv_req->end_trb = priv_ep->enqueue; priv_req->end_trb = priv_ep->enqueue;