Patch "usb: cdns3: Fixes for sparse warnings" has been added to the 5.10-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    usb: cdns3: Fixes for sparse warnings

to the 5.10-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     usb-cdns3-fixes-for-sparse-warnings.patch
and it can be found in the queue-5.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 2bd3a8a5cfa4b169ccf0085b39c468668cc18892
Author: Pawel Laszczak <pawell@xxxxxxxxxxx>
Date:   Mon Dec 14 12:04:33 2020 +0100

    usb: cdns3: Fixes for sparse warnings
    
    [ Upstream commit fba8701baed76eac00b84b59f09f6a077f24c534 ]
    
    Patch fixes the following warnings:
    cdns3-gadget.c:1203: sparse: warning: incorrect type
                         in assignment (different base types)
    cdns3-gadget.c:1203: sparse:  expected restricted __le32 [usertype] length
    cdns3-gadget.c:1203: sparse:  got unsigned long
    cdns3-gadget.c:1250: sparse: warning: invalid assignment: |=
    cdns3-gadget.c:1250: sparse:  left side has type restricted __le32
    cdns3-gadget.c:1250: sparse:  right side has type unsigned long
    cdns3-gadget.c:1253: sparse: warning: invalid assignment: |=
    cdns3-gadget.c:1253: sparse:  left side has type restricted __le32
    cdns3-gadget.c:1253: sparse:  right side has type unsigned long
    cdns3-ep0.c:367: sparse: warning: restricted __le16 degrades to integer
    cdns3-ep0.c:792: sparse: warning: symbol 'cdns3_gadget_ep0_ops' was not
                                      declared. Should it be static?
    
    Reported-by: kernel test robot <lkp@xxxxxxxxx>
    Signed-off-by: Pawel Laszczak <pawell@xxxxxxxxxxx>
    Signed-off-by: Peter Chen <peter.chen@xxxxxxx>
    Stable-dep-of: 1b8be5ecff26 ("usb: cdns3: fix uvc failure work since sg support enabled")
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/usb/cdns3/ep0.c b/drivers/usb/cdns3/ep0.c
index 30d3516c7f98..4241c513b9f6 100644
--- a/drivers/usb/cdns3/ep0.c
+++ b/drivers/usb/cdns3/ep0.c
@@ -364,7 +364,7 @@ static int cdns3_ep0_feature_handle_endpoint(struct cdns3_device *priv_dev,
 	if (le16_to_cpu(ctrl->wValue) != USB_ENDPOINT_HALT)
 		return -EINVAL;
 
-	if (!(ctrl->wIndex & ~USB_DIR_IN))
+	if (!(le16_to_cpu(ctrl->wIndex) & ~USB_DIR_IN))
 		return 0;
 
 	index = cdns3_ep_addr_to_index(le16_to_cpu(ctrl->wIndex));
@@ -790,7 +790,7 @@ int cdns3_gadget_ep_set_wedge(struct usb_ep *ep)
 	return 0;
 }
 
-const struct usb_ep_ops cdns3_gadget_ep0_ops = {
+static const struct usb_ep_ops cdns3_gadget_ep0_ops = {
 	.enable = cdns3_gadget_ep0_enable,
 	.disable = cdns3_gadget_ep0_disable,
 	.alloc_request = cdns3_gadget_ep_alloc_request,
diff --git a/drivers/usb/cdns3/gadget.c b/drivers/usb/cdns3/gadget.c
index 210c1d615082..82b6fd2bc890 100644
--- a/drivers/usb/cdns3/gadget.c
+++ b/drivers/usb/cdns3/gadget.c
@@ -1200,7 +1200,7 @@ static int cdns3_ep_run_transfer(struct cdns3_endpoint *priv_ep,
 		td_size = DIV_ROUND_UP(request->length,
 				       priv_ep->endpoint.maxpacket);
 		if (priv_dev->gadget.speed == USB_SPEED_SUPER)
-			trb->length = TRB_TDL_SS_SIZE(td_size);
+			trb->length = cpu_to_le32(TRB_TDL_SS_SIZE(td_size));
 		else
 			control |= TRB_TDL_HS_SIZE(td_size);
 	}
@@ -1247,10 +1247,10 @@ static int cdns3_ep_run_transfer(struct cdns3_endpoint *priv_ep,
 			priv_req->trb->control = cpu_to_le32(control);
 
 		if (sg_supported) {
-			trb->control |= TRB_ISP;
+			trb->control |= cpu_to_le32(TRB_ISP);
 			/* Don't set chain bit for last TRB */
 			if (sg_iter < num_trb - 1)
-				trb->control |= TRB_CHAIN;
+				trb->control |= cpu_to_le32(TRB_CHAIN);
 
 			s = sg_next(s);
 		}