* [PATCH v1 1/1] usb: typec: wcove: Use LE to CPU conversion when accessing msg->header
@ 2021-05-19 8:55 Andy Shevchenko
2021-05-20 9:26 ` Heikki Krogerus
0 siblings, 1 reply; 6+ messages in thread
From: Andy Shevchenko @ 2021-05-19 8:55 UTC (permalink / raw)
To: linux-usb, linux-kernel
Cc: Guenter Roeck, Heikki Krogerus, Greg Kroah-Hartman,
Andy Shevchenko, kernel test robot
As LKP noticed the Sparse is not happy about strict type handling:
.../typec/tcpm/wcove.c:380:50: sparse: expected unsigned short [usertype] header
.../typec/tcpm/wcove.c:380:50: sparse: got restricted __le16 const [usertype] header
Fix this by switching to use pd_header_cnt_le() instead of pd_header_cnt()
in the affected code.
Fixes: ae8a2ca8a221 ("usb: typec: Group all TCPCI/TCPM code together")
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/usb/typec/tcpm/wcove.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/usb/typec/tcpm/wcove.c b/drivers/usb/typec/tcpm/wcove.c
index 79ae63950050..5d125339687a 100644
--- a/drivers/usb/typec/tcpm/wcove.c
+++ b/drivers/usb/typec/tcpm/wcove.c
@@ -378,7 +378,7 @@ static int wcove_pd_transmit(struct tcpc_dev *tcpc,
const u8 *data = (void *)msg;
int i;
- for (i = 0; i < pd_header_cnt(msg->header) * 4 + 2; i++) {
+ for (i = 0; i < pd_header_cnt_le(msg->header) * 4 + 2; i++) {
ret = regmap_write(wcove->regmap, USBC_TX_DATA + i,
data[i]);
if (ret)
--
2.30.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v1 1/1] usb: typec: wcove: Use LE to CPU conversion when accessing msg->header
2021-05-19 8:55 [PATCH v1 1/1] usb: typec: wcove: Use LE to CPU conversion when accessing msg->header Andy Shevchenko
@ 2021-05-20 9:26 ` Heikki Krogerus
2021-06-07 15:28 ` Andy Shevchenko
0 siblings, 1 reply; 6+ messages in thread
From: Heikki Krogerus @ 2021-05-20 9:26 UTC (permalink / raw)
To: Andy Shevchenko
Cc: linux-usb, linux-kernel, Guenter Roeck, Greg Kroah-Hartman,
kernel test robot
On Wed, May 19, 2021 at 11:55:34AM +0300, Andy Shevchenko wrote:
> As LKP noticed the Sparse is not happy about strict type handling:
> .../typec/tcpm/wcove.c:380:50: sparse: expected unsigned short [usertype] header
> .../typec/tcpm/wcove.c:380:50: sparse: got restricted __le16 const [usertype] header
>
> Fix this by switching to use pd_header_cnt_le() instead of pd_header_cnt()
> in the affected code.
>
> Fixes: ae8a2ca8a221 ("usb: typec: Group all TCPCI/TCPM code together")
> Reported-by: kernel test robot <lkp@intel.com>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> ---
> drivers/usb/typec/tcpm/wcove.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/usb/typec/tcpm/wcove.c b/drivers/usb/typec/tcpm/wcove.c
> index 79ae63950050..5d125339687a 100644
> --- a/drivers/usb/typec/tcpm/wcove.c
> +++ b/drivers/usb/typec/tcpm/wcove.c
> @@ -378,7 +378,7 @@ static int wcove_pd_transmit(struct tcpc_dev *tcpc,
> const u8 *data = (void *)msg;
> int i;
>
> - for (i = 0; i < pd_header_cnt(msg->header) * 4 + 2; i++) {
> + for (i = 0; i < pd_header_cnt_le(msg->header) * 4 + 2; i++) {
> ret = regmap_write(wcove->regmap, USBC_TX_DATA + i,
> data[i]);
> if (ret)
> --
> 2.30.2
--
heikki
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v1 1/1] usb: typec: wcove: Use LE to CPU conversion when accessing msg->header
2021-05-20 9:26 ` Heikki Krogerus
@ 2021-06-07 15:28 ` Andy Shevchenko
2021-06-09 8:56 ` Greg Kroah-Hartman
0 siblings, 1 reply; 6+ messages in thread
From: Andy Shevchenko @ 2021-06-07 15:28 UTC (permalink / raw)
To: Heikki Krogerus
Cc: linux-usb, linux-kernel, Guenter Roeck, Greg Kroah-Hartman,
kernel test robot
On Thu, May 20, 2021 at 12:26:25PM +0300, Heikki Krogerus wrote:
> On Wed, May 19, 2021 at 11:55:34AM +0300, Andy Shevchenko wrote:
> > As LKP noticed the Sparse is not happy about strict type handling:
> > .../typec/tcpm/wcove.c:380:50: sparse: expected unsigned short [usertype] header
> > .../typec/tcpm/wcove.c:380:50: sparse: got restricted __le16 const [usertype] header
> >
> > Fix this by switching to use pd_header_cnt_le() instead of pd_header_cnt()
> > in the affected code.
> >
> > Fixes: ae8a2ca8a221 ("usb: typec: Group all TCPCI/TCPM code together")
> > Reported-by: kernel test robot <lkp@intel.com>
> > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
>
> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Thanks!
Greg, should I amend or resend this?
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v1 1/1] usb: typec: wcove: Use LE to CPU conversion when accessing msg->header
2021-06-07 15:28 ` Andy Shevchenko
@ 2021-06-09 8:56 ` Greg Kroah-Hartman
0 siblings, 0 replies; 6+ messages in thread
From: Greg Kroah-Hartman @ 2021-06-09 8:56 UTC (permalink / raw)
To: Andy Shevchenko
Cc: Heikki Krogerus, linux-usb, linux-kernel, Guenter Roeck,
kernel test robot
On Mon, Jun 07, 2021 at 06:28:55PM +0300, Andy Shevchenko wrote:
> On Thu, May 20, 2021 at 12:26:25PM +0300, Heikki Krogerus wrote:
> > On Wed, May 19, 2021 at 11:55:34AM +0300, Andy Shevchenko wrote:
> > > As LKP noticed the Sparse is not happy about strict type handling:
> > > .../typec/tcpm/wcove.c:380:50: sparse: expected unsigned short [usertype] header
> > > .../typec/tcpm/wcove.c:380:50: sparse: got restricted __le16 const [usertype] header
> > >
> > > Fix this by switching to use pd_header_cnt_le() instead of pd_header_cnt()
> > > in the affected code.
> > >
> > > Fixes: ae8a2ca8a221 ("usb: typec: Group all TCPCI/TCPM code together")
> > > Reported-by: kernel test robot <lkp@intel.com>
> > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> >
> > Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
>
> Thanks!
>
> Greg, should I amend or resend this?
Both please.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v1 1/1] usb: typec: wcove: Use LE to CPU conversion when accessing msg->header
2021-05-19 10:02 Andy Shevchenko
@ 2021-05-19 12:10 ` Andy Shevchenko
0 siblings, 0 replies; 6+ messages in thread
From: Andy Shevchenko @ 2021-05-19 12:10 UTC (permalink / raw)
To: Greg Kroah-Hartman, Heikki Krogerus, linux-usb, linux-kernel
Cc: Guenter Roeck, Adam Thomson
On Wed, May 19, 2021 at 01:02:12PM +0300, Andy Shevchenko wrote:
> Sparse is not happy about strict type handling:
> .../typec/tcpm/tcpm.c:2720:27: warning: restricted __le16 degrades to integer
> .../typec/tcpm/tcpm.c:2814:32: warning: restricted __le16 degrades to integer
This has wrong subject prefix, fixed in v2.
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v1 1/1] usb: typec: wcove: Use LE to CPU conversion when accessing msg->header
@ 2021-05-19 10:02 Andy Shevchenko
2021-05-19 12:10 ` Andy Shevchenko
0 siblings, 1 reply; 6+ messages in thread
From: Andy Shevchenko @ 2021-05-19 10:02 UTC (permalink / raw)
To: Greg Kroah-Hartman, Heikki Krogerus, linux-usb, linux-kernel
Cc: Guenter Roeck, Andy Shevchenko, Adam Thomson
Sparse is not happy about strict type handling:
.../typec/tcpm/tcpm.c:2720:27: warning: restricted __le16 degrades to integer
.../typec/tcpm/tcpm.c:2814:32: warning: restricted __le16 degrades to integer
Fix this by converting LE to CPU before use.
Fixes: ae8a2ca8a221 ("usb: typec: Group all TCPCI/TCPM code together")
Fixes: 64f7c494a3c0 ("typec: tcpm: Add support for sink PPS related messages")
Cc: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/usb/typec/tcpm/tcpm.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
index 64133e586c64..8fdfd7f65ad7 100644
--- a/drivers/usb/typec/tcpm/tcpm.c
+++ b/drivers/usb/typec/tcpm/tcpm.c
@@ -2717,7 +2717,7 @@ static void tcpm_pd_ext_msg_request(struct tcpm_port *port,
enum pd_ext_msg_type type = pd_header_type_le(msg->header);
unsigned int data_size = pd_ext_header_data_size_le(msg->ext_msg.header);
- if (!(msg->ext_msg.header & PD_EXT_HDR_CHUNKED)) {
+ if (!(le16_to_cpu(msg->ext_msg.header) & PD_EXT_HDR_CHUNKED)) {
tcpm_pd_handle_msg(port, PD_MSG_CTRL_NOT_SUPP, NONE_AMS);
tcpm_log(port, "Unchunked extended messages unsupported");
return;
@@ -2811,7 +2811,7 @@ static void tcpm_pd_rx_handler(struct kthread_work *work)
"Data role mismatch, initiating error recovery");
tcpm_set_state(port, ERROR_RECOVERY, 0);
} else {
- if (msg->header & PD_HEADER_EXT_HDR)
+ if (le16_to_cpu(msg->header) & PD_HEADER_EXT_HDR)
tcpm_pd_ext_msg_request(port, msg);
else if (cnt)
tcpm_pd_data_request(port, msg);
--
2.30.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-06-09 8:56 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-19 8:55 [PATCH v1 1/1] usb: typec: wcove: Use LE to CPU conversion when accessing msg->header Andy Shevchenko
2021-05-20 9:26 ` Heikki Krogerus
2021-06-07 15:28 ` Andy Shevchenko
2021-06-09 8:56 ` Greg Kroah-Hartman
2021-05-19 10:02 Andy Shevchenko
2021-05-19 12:10 ` Andy Shevchenko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).