usb: renesas_usbhs: fix __le16 warnings
PATCH 1/1 usb: renesas_usbhs: fix __le16 warnings
Fix the warnings generated by casting to/from __le16 without using the correct functions.
Fixes the following sparse warnings:
drivers/usb/renesas_usbhs/common.c:165:25: warning: incorrect type in assignment (different base types)drivers/usb/renesas_usbhs/common.c:165:25: expected restricted __le16 [usertype] wValuedrivers/usb/renesas_usbhs/common.c:165:25: got unsigned shortdrivers/usb/renesas_usbhs/common.c:166:25: warning: incorrect type in assignment (different base types)drivers/usb/renesas_usbhs/common.c:166:25: expected restricted __le16 [usertype] wIndexdrivers/usb/renesas_usbhs/common.c:166:25: got unsigned shortdrivers/usb/renesas_usbhs/common.c:167:25: warning: incorrect type in assignment (different base types)drivers/usb/renesas_usbhs/common.c:167:25: expected restricted __le16 [usertype] wLengthdrivers/usb/renesas_usbhs/common.c:167:25: got unsigned shortdrivers/usb/renesas_usbhs/common.c:173:39: warning: incorrect type in argument 3 (different base types)drivers/usb/renesas_usbhs/common.c:173:39: expected unsigned short [usertype] datadrivers/usb/renesas_usbhs/common.c:173:39: got restricted __le16 [usertype] wValuedrivers/usb/renesas_usbhs/common.c:174:39: warning: incorrect type in argument 3 (different base types)drivers/usb/renesas_usbhs/common.c:174:39: expected unsigned short [usertype] datadrivers/usb/renesas_usbhs/common.c:174:39: got restricted __le16 [usertype] wIndexdrivers/usb/renesas_usbhs/common.c:175:39: warning: incorrect type in argument 3 (different base types)drivers/usb/renesas_usbhs/common.c:175:39: expected unsigned short [usertype] data
Note. I belive this to be correct, and should be a no-op on arm.
---
Cc: Greg Kroah-Hartman <[email protected]>
Cc: Yoshihiro Shimoda <[email protected]>
Cc: Simon Horman <[email protected]>
Cc: Geert Uytterhoeven <[email protected]>
Cc: [email protected]
Cc: [email protected]
--- drivers/usb/renesas_usbhs/common.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/usb/renesas_usbhs/common.c +6 -6
@@ -162,17 +162,17 @@ void usbhs_usbreq_get_val(struct usbhs_priv *priv, struct usb_ctrlrequest *req) req->bRequest = (val >>8 ) &0xFF ; req->bRequestType = (val >>0 ) &0xFF ; - req->wValue =usbhs_read (priv,USBVAL ); - req->wIndex =usbhs_read (priv,USBINDX ); - req->wLength =usbhs_read (priv,USBLENG ); + req->wValue =cpu_to_le16 (usbhs_read (priv,USBVAL )); + req->wIndex =cpu_to_le16 (usbhs_read (priv,USBINDX )); + req->wLength =cpu_to_le16 (usbhs_read (priv,USBLENG )); }void usbhs_usbreq_set_val (struct usbhs_priv *priv,struct usb_ctrlrequest *req) {usbhs_write (priv,USBREQ , (req->bRequest <<8 ) | req->bRequestType); -usbhs_write (priv,USBVAL , req->wValue); -usbhs_write (priv,USBINDX , req->wIndex); -usbhs_write (priv,USBLENG , req->wLength); +usbhs_write (priv,USBVAL ,le16_to_cpu (req->wValue)); +usbhs_write (priv,USBINDX ,le16_to_cpu (req->wIndex)); +usbhs_write (priv,USBLENG ,le16_to_cpu (req->wLength));usbhs_bset (priv,DCPCTR ,SUREQ ,SUREQ ); }
Signature · 1 line
2.23.0
Quoted 23 lines · Ben Dooks (Codethink)
Fix the warnings generated by casting to/from
__le16without using the correct functions.Fixes the following sparse warnings:
drivers/usb/renesas_usbhs/common.c:165:25: warning: incorrect type in assignment (different base types)drivers/usb/renesas_usbhs/common.c:165:25: expected restricted__le16[usertype] wValuedrivers/usb/renesas_usbhs/common.c:165:25: got unsigned shortdrivers/usb/renesas_usbhs/common.c:166:25: warning: incorrect type in assignment (different base types)drivers/usb/renesas_usbhs/common.c:166:25: expected restricted__le16[usertype] wIndexdrivers/usb/renesas_usbhs/common.c:166:25: got unsigned shortdrivers/usb/renesas_usbhs/common.c:167:25: warning: incorrect type in assignment (different base types)drivers/usb/renesas_usbhs/common.c:167:25: expected restricted__le16[usertype] wLengthdrivers/usb/renesas_usbhs/common.c:167:25: got unsigned shortdrivers/usb/renesas_usbhs/common.c:173:39: warning: incorrect type in argument 3 (different base types)drivers/usb/renesas_usbhs/common.c:173:39: expected unsigned short [usertype] datadrivers/usb/renesas_usbhs/common.c:173:39: got restricted__le16[usertype] wValuedrivers/usb/renesas_usbhs/common.c:174:39: warning: incorrect type in argument 3 (different base types)drivers/usb/renesas_usbhs/common.c:174:39: expected unsigned short [usertype] datadrivers/usb/renesas_usbhs/common.c:174:39: got restricted__le16[usertype] wIndexdrivers/usb/renesas_usbhs/common.c:175:39: warning: incorrect type in argument 3 (different base types)drivers/usb/renesas_usbhs/common.c:175:39: expected unsigned short [usertype] data
Quoted 1 line
Note. I belive this to be correct, and should be a no-op on arm.
Yep, the affected platforms are little-endian.
Quoted 1 line
Signed-off-by Ben Dooks <[email protected]>
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Hi Ben,
Quoted 25 lines
From: Ben Dooks (Codethink), Sent: Wednesday, October 16, 2019 12:51 AM
Fix the warnings generated by casting to/from
__le16without using the correct functions.Fixes the following sparse warnings:
drivers/usb/renesas_usbhs/common.c:165:25: warning: incorrect type in assignment (different base types)drivers/usb/renesas_usbhs/common.c:165:25: expected restricted__le16[usertype] wValuedrivers/usb/renesas_usbhs/common.c:165:25: got unsigned shortdrivers/usb/renesas_usbhs/common.c:166:25: warning: incorrect type in assignment (different base types)drivers/usb/renesas_usbhs/common.c:166:25: expected restricted__le16[usertype] wIndexdrivers/usb/renesas_usbhs/common.c:166:25: got unsigned shortdrivers/usb/renesas_usbhs/common.c:167:25: warning: incorrect type in assignment (different base types)drivers/usb/renesas_usbhs/common.c:167:25: expected restricted__le16[usertype] wLengthdrivers/usb/renesas_usbhs/common.c:167:25: got unsigned shortdrivers/usb/renesas_usbhs/common.c:173:39: warning: incorrect type in argument 3 (different base types)drivers/usb/renesas_usbhs/common.c:173:39: expected unsigned short [usertype] datadrivers/usb/renesas_usbhs/common.c:173:39: got restricted__le16[usertype] wValuedrivers/usb/renesas_usbhs/common.c:174:39: warning: incorrect type in argument 3 (different base types)drivers/usb/renesas_usbhs/common.c:174:39: expected unsigned short [usertype] datadrivers/usb/renesas_usbhs/common.c:174:39: got restricted__le16[usertype] wIndexdrivers/usb/renesas_usbhs/common.c:175:39: warning: incorrect type in argument 3 (different base types)drivers/usb/renesas_usbhs/common.c:175:39: expected unsigned short [usertype] data
Quoted 3 lines
Note. I belive this to be correct, and should be a no-op on arm.
Signed-off-by Ben Dooks <[email protected]>
Thank you for the patch!
Best regards,
Yoshihiro Shimoda
Quoted 42 lines · Ben Dooks (Codethink)
Fix the warnings generated by casting to/from
__le16without using the correct functions.Fixes the following sparse warnings:
drivers/usb/renesas_usbhs/common.c:165:25: warning: incorrect type in assignment (different base types)drivers/usb/renesas_usbhs/common.c:165:25: expected restricted__le16[usertype] wValuedrivers/usb/renesas_usbhs/common.c:165:25: got unsigned shortdrivers/usb/renesas_usbhs/common.c:166:25: warning: incorrect type in assignment (different base types)drivers/usb/renesas_usbhs/common.c:166:25: expected restricted__le16[usertype] wIndexdrivers/usb/renesas_usbhs/common.c:166:25: got unsigned shortdrivers/usb/renesas_usbhs/common.c:167:25: warning: incorrect type in assignment (different base types)drivers/usb/renesas_usbhs/common.c:167:25: expected restricted__le16[usertype] wLengthdrivers/usb/renesas_usbhs/common.c:167:25: got unsigned shortdrivers/usb/renesas_usbhs/common.c:173:39: warning: incorrect type in argument 3 (different base types)drivers/usb/renesas_usbhs/common.c:173:39: expected unsigned short [usertype] datadrivers/usb/renesas_usbhs/common.c:173:39: got restricted__le16[usertype] wValuedrivers/usb/renesas_usbhs/common.c:174:39: warning: incorrect type in argument 3 (different base types)drivers/usb/renesas_usbhs/common.c:174:39: expected unsigned short [usertype] datadrivers/usb/renesas_usbhs/common.c:174:39: got restricted__le16[usertype] wIndexdrivers/usb/renesas_usbhs/common.c:175:39: warning: incorrect type in argument 3 (different base types)drivers/usb/renesas_usbhs/common.c:175:39: expected unsigned short [usertype] dataNote. I belive this to be correct, and should be a no-op on arm.
Signed-off-by Ben Dooks <[email protected]>---
Cc: Greg Kroah-Hartman <[email protected]>
Cc: Yoshihiro Shimoda <[email protected]>
Cc: Simon Horman <[email protected]>
Cc: Geert Uytterhoeven <[email protected]>
Cc: [email protected]
Cc: [email protected]--- drivers/usb/renesas_usbhs/common.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)drivers/usb/renesas_usbhs/common.c +0
-0
drivers/usb/renesas_usbhs/common.c void usbhs_usbreq_get_val(struct usbhs_priv *priv, struct usb_ctrlrequest *req) · line 167
Quoted 9 lines
drivers/usb/renesas_usbhs/common.c +3
-3@@ -162,17 +162,17 @@ void usbhs_usbreq_get_val(struct usbhs_priv *priv, struct usb_ctrlrequest *req) req->bRequest = (val >>8 ) &0xFF ; req->bRequestType = (val >>0 ) &0xFF ; - req->wValue =usbhs_read (priv,USBVAL ); - req->wIndex =usbhs_read (priv,USBINDX ); - req->wLength =usbhs_read (priv,USBLENG ); + req->wValue =cpu_to_le16 (usbhs_read (priv,USBVAL )); + req->wIndex =cpu_to_le16 (usbhs_read (priv,USBINDX )); + req->wLength =cpu_to_le16 (usbhs_read (priv,USBLENG ));
usbhs_read is backed by readl which performs
a le->cpu conversion. Rather than have a double conversion perhaps it would be nicer to introduce usbhs_read_le. Likewise for write.
Quoted 17 lines
drivers/usb/renesas_usbhs/common.c +3
-3}void usbhs_usbreq_set_val (struct usbhs_priv *priv,struct usb_ctrlrequest *req) {usbhs_write (priv,USBREQ , (req->bRequest <<8 ) | req->bRequestType); -usbhs_write (priv,USBVAL , req->wValue); -usbhs_write (priv,USBINDX , req->wIndex); -usbhs_write (priv,USBLENG , req->wLength); +usbhs_write (priv,USBVAL ,le16_to_cpu (req->wValue)); +usbhs_write (priv,USBINDX ,le16_to_cpu (req->wIndex)); +usbhs_write (priv,USBLENG ,le16_to_cpu (req->wLength));usbhs_bset (priv,DCPCTR ,SUREQ ,SUREQ ); }Signature · 1 line
2.23.0
Hi Simon-san,
Quoted 1 line
From: Simon Horman, Sent: Wednesday, October 16, 2019 9:27 PM
<snip>
Quoted 8 lines
Quoted 8 lines
drivers/usb/renesas_usbhs/common.c +0
-0@@ -162,17 +162,17 @@ void usbhs_usbreq_get_val(struct usbhs_priv *priv, struct usb_ctrlrequest *req) req->bRequest = (val >>8 ) &0xFF ; req->bRequestType = (val >>0 ) &0xFF ;
Quoted 11 lines
drivers/usb/renesas_usbhs/common.c void usbhs_usbreq_get_val(struct usbhs_priv *priv, struct usb_ctrlrequest *req) · line 167
Quoted 6 lines
drivers/usb/renesas_usbhs/common.c +3
-3- req->wValue =usbhs_read (priv,USBVAL ); - req->wIndex =usbhs_read (priv,USBINDX ); - req->wLength =usbhs_read (priv,USBLENG ); + req->wValue =cpu_to_le16 (usbhs_read (priv,USBVAL )); + req->wIndex =cpu_to_le16 (usbhs_read (priv,USBINDX )); + req->wLength =cpu_to_le16 (usbhs_read (priv,USBLENG ));
usbhs_readis backed by readl which performs
ale->cpuconversion. Rather than have a double conversion perhaps it would be nicer to introduceusbhs_read_le. Likewise for write.
I'm afraid but, I could not understand these comments. At the moment, the usbhs_{read,write}() call io{read,write}16(), not {read,write}l().
Best regards,
Yoshihiro Shimoda
Quoted 18 lines
Quoted 18 lines
drivers/usb/renesas_usbhs/common.c +3
-4}void usbhs_usbreq_set_val (struct usbhs_priv *priv,struct usb_ctrlrequest *req) {usbhs_write (priv,USBREQ , (req->bRequest <<8 ) | req->bRequestType); -usbhs_write (priv,USBVAL , req->wValue); -usbhs_write (priv,USBINDX , req->wIndex); -usbhs_write (priv,USBLENG , req->wLength); +usbhs_write (priv,USBVAL ,le16_to_cpu (req->wValue)); +usbhs_write (priv,USBINDX ,le16_to_cpu (req->wIndex)); +usbhs_write (priv,USBLENG ,le16_to_cpu (req->wLength));usbhs_bset (priv,DCPCTR ,SUREQ ,SUREQ ); } --2.23.0
Hi Shimoda-san, Simon,
Quoted 22 lines · Yoshihiro Shimoda
Quoted 1 line
From: Simon Horman, Sent: Wednesday, October 16, 2019 9:27 PM
<snip>
Quoted 8 lines
Quoted 8 lines
drivers/usb/renesas_usbhs/common.c +0
-0@@ -162,17 +162,17 @@ void usbhs_usbreq_get_val(struct usbhs_priv *priv, struct usb_ctrlrequest *req) req->bRequest = (val >>8 ) &0xFF ; req->bRequestType = (val >>0 ) &0xFF ;Quoted 11 lines
drivers/usb/renesas_usbhs/common.c void usbhs_usbreq_get_val(struct usbhs_priv *priv, struct usb_ctrlrequest *req) · line 167
Quoted 6 lines
drivers/usb/renesas_usbhs/common.c +3
-3- req->wValue =usbhs_read (priv,USBVAL ); - req->wIndex =usbhs_read (priv,USBINDX ); - req->wLength =usbhs_read (priv,USBLENG ); + req->wValue =cpu_to_le16 (usbhs_read (priv,USBVAL )); + req->wIndex =cpu_to_le16 (usbhs_read (priv,USBINDX )); + req->wLength =cpu_to_le16 (usbhs_read (priv,USBLENG ));
usbhs_readis backed by readl which performs
ale->cpuconversion. Rather than have a double conversion perhaps it would be nicer to introduceusbhs_read_le. Likewise for write.
Quoted 5 lines
I'm afraid but, I could not understand these comments. At the moment, the usbhs_{read,write}() call io{read,write}16(), not {read,write}l().
ioread16() and readw() don't do byteswapping on ARM, as ARM is little-endian. Likewise, cpu_to_le16() is a no-op on ARM.
Double swapping would matter only on a big-endian platform, and could indeed be avoided by introducing usbhs_read_le*() functions that are just wrappers around __raw_read16() on big-endian. However, until the Renesas USBHS IP core ends up on a big-endian platform, it's not worth doing that, IMHO.
Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
drivers/usb/renesas_usbhs/common.c +3
-3}void usbhs_usbreq_set_val (struct usbhs_priv *priv,struct usb_ctrlrequest *req) {usbhs_write (priv,USBREQ , (req->bRequest <<8 ) | req->bRequestType); -usbhs_write (priv,USBVAL , req->wValue); -usbhs_write (priv,USBINDX , req->wIndex); -usbhs_write (priv,USBLENG , req->wLength); +usbhs_write (priv,USBVAL ,le16_to_cpu (req->wValue)); +usbhs_write (priv,USBINDX ,le16_to_cpu (req->wIndex)); +usbhs_write (priv,USBLENG ,le16_to_cpu (req->wLength));
Quoted 2 lines
Quoted 2 lines
drivers/usb/renesas_usbhs/common.c void usbhs_usbreq_get_val(struct usbhs_priv *priv, struct usb_ctrlrequest *req) · line 178
Quoted 2 lines
drivers/usb/renesas_usbhs/common.c +0
-0usbhs_bset (priv,DCPCTR ,SUREQ ,SUREQ ); }
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Quoted 32 lines · Geert Uytterhoeven
Hi Shimoda-san, Simon,
Quoted 22 lines · Yoshihiro Shimoda
Quoted 1 line
From: Simon Horman, Sent: Wednesday, October 16, 2019 9:27 PM
<snip>
Quoted 8 lines
Quoted 8 lines
drivers/usb/renesas_usbhs/common.c +0
-0@@ -162,17 +162,17 @@ void usbhs_usbreq_get_val(struct usbhs_priv *priv, struct usb_ctrlrequest *req) req->bRequest = (val >>8 ) &0xFF ; req->bRequestType = (val >>0 ) &0xFF ;Quoted 11 lines
drivers/usb/renesas_usbhs/common.c void usbhs_usbreq_get_val(struct usbhs_priv *priv, struct usb_ctrlrequest *req) · line 167
Quoted 6 lines
drivers/usb/renesas_usbhs/common.c +3
-3- req->wValue =usbhs_read (priv,USBVAL ); - req->wIndex =usbhs_read (priv,USBINDX ); - req->wLength =usbhs_read (priv,USBLENG ); + req->wValue =cpu_to_le16 (usbhs_read (priv,USBVAL )); + req->wIndex =cpu_to_le16 (usbhs_read (priv,USBINDX )); + req->wLength =cpu_to_le16 (usbhs_read (priv,USBLENG ));
usbhs_readis backed by readl which performs
ale->cpuconversion. Rather than have a double conversion perhaps it would be nicer to introduceusbhs_read_le. Likewise for write.Quoted 5 lines
I'm afraid but, I could not understand these comments. At the moment, the usbhs_{read,write}() call io{read,write}16(), not {read,write}l().
Quoted 8 lines
ioread16()andreadw()don't do byteswapping on ARM, as ARM is little-endian. Likewise,cpu_to_le16()is a no-op on ARM.Double swapping would matter only on a big-endian platform, and could indeed be avoided by introducing usbhs_read_le*() functions that are just wrappers around
__raw_read16()on big-endian. However, until the Renesas USBHS IP core ends up on a big-endian platform, it's not worth doing that, IMHO.
Yes, that is all true.
I'm fine with this patch as it is.
Quoted 27 lines
Quoted 13 lines
Quoted 13 lines
Quoted 13 lines
drivers/usb/renesas_usbhs/common.c +3
-3}void usbhs_usbreq_set_val (struct usbhs_priv *priv,struct usb_ctrlrequest *req) {usbhs_write (priv,USBREQ , (req->bRequest <<8 ) | req->bRequestType); -usbhs_write (priv,USBVAL , req->wValue); -usbhs_write (priv,USBINDX , req->wIndex); -usbhs_write (priv,USBLENG , req->wLength); +usbhs_write (priv,USBVAL ,le16_to_cpu (req->wValue)); +usbhs_write (priv,USBINDX ,le16_to_cpu (req->wIndex)); +usbhs_write (priv,USBLENG ,le16_to_cpu (req->wLength));Quoted 2 lines
Quoted 2 lines
drivers/usb/renesas_usbhs/common.c void usbhs_usbreq_get_val(struct usbhs_priv *priv, struct usb_ctrlrequest *req) · line 178
Quoted 2 lines
drivers/usb/renesas_usbhs/common.c +0
-0usbhs_bset (priv,DCPCTR ,SUREQ ,SUREQ ); }Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds