Merge "usb: dwc3-msm: Rectify 64 bit dma address programming for GSI"

This commit is contained in:
qctecmdr 2020-12-20 00:48:54 -08:00 • committed by Gerrit - the friendly Code Review server
commit cf5c2893b6

View file

@ -1238,7 +1238,7 @@ static int gsi_startxfer_for_ep(struct usb_ep *ep, struct usb_gsi_request *req)
memset(&params, 0, sizeof(params));
params.param0 = GSI_TRB_ADDR_BIT_53_MASK | GSI_TRB_ADDR_BIT_55_MASK;
params.param0 |= upper_32_bits(dwc3_trb_dma_offset(dep,
&dep->trb_pool[0]) & 0xffff);
&dep->trb_pool[0])) & 0xffff;
params.param0 |= (req->ep_intr_num << 16);
params.param1 = lower_32_bits(dwc3_trb_dma_offset(dep,
&dep->trb_pool[0]));
@ -1486,7 +1486,7 @@ static int gsi_prepare_trbs(struct usb_ep *ep, struct usb_gsi_request *req)
/* Set up the Link TRB at the end */
trb->bpl = lower_32_bits(trb0_dma);
trb->bph = upper_32_bits(trb0_dma & 0xffff);
trb->bph = upper_32_bits(trb0_dma) & 0xffff;
trb->bph |= (1 << 23) | (1 << 21) | (req->ep_intr_num << 16);
trb->ctrl = DWC3_TRBCTL_LINK_TRB | DWC3_TRB_CTRL_HWO;
} else { /* OUT direction */
@ -1508,7 +1508,7 @@ static int gsi_prepare_trbs(struct usb_ep *ep, struct usb_gsi_request *req)
/* Set up the Link TRB at the end */
trb->bpl = lower_32_bits(trb0_dma);
trb->bph = upper_32_bits(trb0_dma & 0xffff);
trb->bph = upper_32_bits(trb0_dma) & 0xffff;
trb->bph |= (1 << 23) | (1 << 21) | (req->ep_intr_num << 16);
trb->ctrl = DWC3_TRBCTL_LINK_TRB | DWC3_TRB_CTRL_HWO;
}