linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2 1/1] usb: typec: tcpm: Use LE to CPU conversion when accessing msg->header
@ 2021-05-19 10:03 Andy Shevchenko
  2021-05-19 19:05 ` Guenter Roeck
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Andy Shevchenko @ 2021-05-19 10:03 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>
---
v2: fixed subject prefix
 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] 4+ messages in thread
* Re: [PATCH v2 1/1] usb: typec: tcpm: Use LE to CPU conversion when accessing msg->header
  2021-05-19 10:03 [PATCH v2 1/1] usb: typec: tcpm: Use LE to CPU conversion when accessing msg->header Andy Shevchenko
@ 2021-05-19 19:05 ` Guenter Roeck
  2021-05-20  9:27 ` Heikki Krogerus
  2021-05-21  8:44 ` Adam Thomson
  2 siblings, 0 replies; 4+ messages in thread
From: Guenter Roeck @ 2021-05-19 19:05 UTC (permalink / raw)
  To: Andy Shevchenko, Greg Kroah-Hartman, Heikki Krogerus, linux-usb,
	linux-kernel
  Cc: Adam Thomson

On 5/19/21 3:03 AM, 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
> 
> 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>

Reviewed-by: Guenter Roeck <linux@roeck-us.net>

> ---
> v2: fixed subject prefix
>   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);
> 


^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH v2 1/1] usb: typec: tcpm: Use LE to CPU conversion when accessing msg->header
  2021-05-19 10:03 [PATCH v2 1/1] usb: typec: tcpm: Use LE to CPU conversion when accessing msg->header Andy Shevchenko
  2021-05-19 19:05 ` Guenter Roeck
@ 2021-05-20  9:27 ` Heikki Krogerus
  2021-05-21  8:44 ` Adam Thomson
  2 siblings, 0 replies; 4+ messages in thread
From: Heikki Krogerus @ 2021-05-20  9:27 UTC (permalink / raw)
  To: Andy Shevchenko
  Cc: Greg Kroah-Hartman, linux-usb, linux-kernel, Guenter Roeck, Adam Thomson

On Wed, May 19, 2021 at 01:03:58PM +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
> 
> 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>

Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>

> ---
> v2: fixed subject prefix
>  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

-- 
heikki

^ permalink raw reply	[flat|nested] 4+ messages in thread
* RE: [PATCH v2 1/1] usb: typec: tcpm: Use LE to CPU conversion when accessing msg->header
  2021-05-19 10:03 [PATCH v2 1/1] usb: typec: tcpm: Use LE to CPU conversion when accessing msg->header Andy Shevchenko
  2021-05-19 19:05 ` Guenter Roeck
  2021-05-20  9:27 ` Heikki Krogerus
@ 2021-05-21  8:44 ` Adam Thomson
  2 siblings, 0 replies; 4+ messages in thread
From: Adam Thomson @ 2021-05-21  8:44 UTC (permalink / raw)
  To: Andy Shevchenko, Greg Kroah-Hartman, Heikki Krogerus, linux-usb,
	linux-kernel
  Cc: Guenter Roeck, Adam Thomson

On 19 May 2021 11:04, 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
> 
> 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>

Reviewed-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>

> ---
> v2: fixed subject prefix
>  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	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-05-21  8:44 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-19 10:03 [PATCH v2 1/1] usb: typec: tcpm: Use LE to CPU conversion when accessing msg->header Andy Shevchenko
2021-05-19 19:05 ` Guenter Roeck
2021-05-20  9:27 ` Heikki Krogerus
2021-05-21  8:44 ` Adam Thomson

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).