On 22-03-29 10:46:05, Pawel Laszczak wrote:
> Path fixes bug which occurs during resetting endpoint in
%s/Path/Patch, otherwise:
Acked-by: Peter Chen <peter.chen@xxxxxxxxxx>
> __cdns3_gadget_ep_clear_halt function. During resetting endpoint
> controller will change HW/DMA owned TRB. It set Abort flag in
> trb->control and will change trb->length field. If driver want
> to use the aborted trb it must update the changed field in
> TRB.
>
> Fixes: 7733f6c32e36 ("usb: cdns3: Add Cadence USB3 DRD Driver")
> cc: <stable@xxxxxxxxxxxxxxx>
> Signed-off-by: Pawel Laszczak <pawell@xxxxxxxxxxx>
> ---
> drivers/usb/cdns3/cdns3-gadget.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/usb/cdns3/cdns3-gadget.c b/drivers/usb/cdns3/cdns3-gadget.c
> index 80aaab159e58..3a9f0968fd24 100644
> --- a/drivers/usb/cdns3/cdns3-gadget.c
> +++ b/drivers/usb/cdns3/cdns3-gadget.c
> @@ -2682,6 +2682,7 @@ int __cdns3_gadget_ep_clear_halt(struct cdns3_endpoint *priv_ep)
> struct usb_request *request;
> struct cdns3_request *priv_req;
> struct cdns3_trb *trb = NULL;
> + struct cdns3_trb trb_tmp;
> int ret;
> int val;
>
> @@ -2691,8 +2692,10 @@ int __cdns3_gadget_ep_clear_halt(struct cdns3_endpoint *priv_ep)
> if (request) {
> priv_req = to_cdns3_request(request);
> trb = priv_req->trb;
> - if (trb)
> + if (trb) {
> + trb_tmp = *trb;
> trb->control = trb->control ^ cpu_to_le32(TRB_CYCLE);
> + }
> }
>
> writel(EP_CMD_CSTALL | EP_CMD_EPRST, &priv_dev->regs->ep_cmd);
> @@ -2707,7 +2710,7 @@ int __cdns3_gadget_ep_clear_halt(struct cdns3_endpoint *priv_ep)
>
> if (request) {
> if (trb)
> - trb->control = trb->control ^ cpu_to_le32(TRB_CYCLE);
> + *trb = trb_tmp;
>
> cdns3_rearm_transfer(priv_ep, 1);
> }
> --
> 2.25.1
>
--
Thanks,
Peter Chen
