usb: dwc2: make casts of ep->dma_buf consistent
PATCH 1/1 usb: dwc2: make casts of ep->dma_buf consistent
In most places in the code we cast this to an unsigned long, but in one place we cast to an unsigned int. For consistency and to fix a warning on 64bit targets, always cast this to unsigned long. For the long term we should however change the declaration of dma_buf.
--- drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c +1 -1
@@ -114,7 +114,7 @@ static int setdma_rx(struct dwc2_ep *ep, struct dwc2_request *req) (unsigned long ) ep->dma_buf + ROUND(ep->len, CONFIG_SYS_CACHELINE_SIZE)); -writel ((unsigned int ) ep->dma_buf, ®->out_endp[ep_num].doepdma); +writel ((unsigned long ) ep->dma_buf, ®->out_endp[ep_num].doepdma);writel (DOEPT_SIZ_PKT_CNT (pktcnt) |DOEPT_SIZ_XFER_SIZE (length), ®->out_endp[ep_num].doeptsiz);writel (DEPCTL_EPENA |DEPCTL_CNAK |ctrl, ®->out_endp[ep_num].doepctl);
Signature · 1 line
2.7.4
PATCH 1/1 usb: dwc2: make casts of ep->dma_buf consistent
Quoted 19 lines · Tom Rini
In most places in the code we cast this to an unsigned long, but in one place we cast to an unsigned int. For consistency and to fix a warning on 64bit targets, always cast this to unsigned long. For the long term we should however change the declaration of
dma_buf.Cc Lukasz Majewski <[email protected]>Cc Marek Vasut <[email protected]>Cc Philipp Tomsich <[email protected]>Signed-off-by Tom Rini <[email protected]>--- drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c +0
-0
drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c static int setdma_rx(struct dwc2_ep *ep, struct dwc2_request *req) · line 120
Quoted 8 lines
drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c +1
-1@@ -114,7 +114,7 @@ static int setdma_rx(struct dwc2_ep *ep, struct dwc2_request *req) (unsigned long ) ep->dma_buf + ROUND(ep->len, CONFIG_SYS_CACHELINE_SIZE)); -writel ((unsigned int ) ep->dma_buf, ®->out_endp[ep_num].doepdma); +writel ((unsigned long ) ep->dma_buf, ®->out_endp[ep_num].doepdma);writel (DOEPT_SIZ_PKT_CNT (pktcnt) |DOEPT_SIZ_XFER_SIZE (length), ®->out_endp[ep_num].doeptsiz);writel (DEPCTL_EPENA |DEPCTL_CNAK |ctrl, ®->out_endp[ep_num].doepctl);
Signature · 2 lines
Best regards, Marek Vasut
PATCH 1/1 usb: dwc2: make casts of ep->dma_buf consistent
In reply to Tom RiniQuoted 24 lines · On Mon, 5 Feb 2018 09:54:51 -0500 Tom Rini <[email protected]> wrote:
In most places in the code we cast this to an unsigned long, but in one place we cast to an unsigned int. For consistency and to fix a warning on 64bit targets, always cast this to unsigned long. For the long term we should however change the declaration of
dma_buf.Cc Lukasz Majewski <[email protected]>Cc Marek Vasut <[email protected]>Cc Philipp Tomsich <[email protected]>Signed-off-by Tom Rini <[email protected]>--- drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)(quoted diff) +0
-0
b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.cindexb6164afa9245..57dbbd5ebfa1100644 ---a/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c+++b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c@@ -114,7 +114,7 @@ static intsetdma_rx(struct dwc2_ep *ep, struct dwc2_request *req)(unsigned long)ep->dma_buf+ROUND(ep->len, CONFIG_SYS_CACHELINE_SIZE));(quoted diff) +0
-1- writel((unsigned int) ep->dma_buf,®->out_endp[ep_num].doepdma);
(quoted diff) +1
-0+ writel((unsigned long) ep->dma_buf,
Quoted 4 lines
®->out_endp[ep_num].doepdma);
writel(DOEPT_SIZ_PKT_CNT(pktcnt) | DOEPT_SIZ_XFER_SIZE(length), ®->out_endp[ep_num].doeptsiz);
writel(DEPCTL_EPENA|DEPCTL_CNAK|ctrl,
®->out_endp[ep_num].doepctl);
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de -------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180205/0ba47a6f/attachment.sig>
PATCH 1/1 usb: dwc2: make casts of ep->dma_buf consistent
In reply to Tom RiniQuoted 9 lines · Tom Rini
In most places in the code we cast this to an unsigned long, but in one place we cast to an unsigned int. For consistency and to fix a warning on 64bit targets, always cast this to unsigned long. For the long term we should however change the declaration of
dma_buf.Cc Philipp Tomsich <[email protected]>Acked-by Lukasz Majewski <[email protected]>Acked-by Marek Vasut <[email protected]>Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180205/474df1a3/attachment.sig>