usb: typec: tcpm: Use LE to CPU conversion when accessing msg->header

PATCH Superseded Andy Shevchenko 4 participants 4 messages May 19, 2021 – May 21, 2021

Subsystems (3)

USB USB Type-C class USB Type-C port controller drivers

lore

Share & tools

lore

Andy Shevchenko

author

2021-05-19 10:03 UTC #0 lore raw

PATCH v2 1/1 usb: typec: tcpm: Use LE to CPU conversion when accessing msg->header

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 <[email protected]>

Signed-off-by Andy Shevchenko <[email protected]>

---
v2: fixed subject prefix

 drivers/usb/typec/tcpm/tcpm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

drivers/usb/typec/tcpm/tcpm.c +2 -2

index 64133e586c64..8fdfd7f65ad7 100644
@@ -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);

Signature · 1 line

2.30.2

Guenter Roeck

Reviewed-by on v2 1/1

2021-05-19 19:05 UTC #1 lore raw

Quoted 10 lines · Andy Shevchenko

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 <[email protected]>
Signed-off-by Andy Shevchenko <[email protected]>

Reviewed-by Guenter Roeck <[email protected]>

Quoted 28 lines

---
v2: fixed subject prefix

  drivers/usb/typec/tcpm/tcpm.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

drivers/usb/typec/tcpm/tcpm.c +2 -2

index 64133e586c64..8fdfd7f65ad7 100644
@@ -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);

Heikki Krogerus

maintainer Reviewed-by on v2 1/1

2021-05-20 09:36 UTC #2 lore raw

In reply to Andy Shevchenko

Quoted 10 lines · Andy Shevchenko

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 <[email protected]>
Signed-off-by Andy Shevchenko <[email protected]>

Reviewed-by Heikki Krogerus <[email protected]>

Quoted 29 lines

---
v2: fixed subject prefix

 drivers/usb/typec/tcpm/tcpm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

drivers/usb/typec/tcpm/tcpm.c +2 -2

index 64133e586c64..8fdfd7f65ad7 100644
@@ -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);

Signature · 1 line

2.30.2

Signature · 1 line

heikki

Adam Thomson

Reviewed-by on v2 1/1

2021-05-21 08:44 UTC #3 lore raw

In reply to Andy Shevchenko

Quoted 10 lines · Andy Shevchenko

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 <[email protected]>
Signed-off-by Andy Shevchenko <[email protected]>

Reviewed-by Adam Thomson <[email protected]>

Quoted 33 lines

---
v2: fixed subject prefix

 drivers/usb/typec/tcpm/tcpm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

drivers/usb/typec/tcpm/tcpm.c +1 -1

index 64133e586c64..8fdfd7f65ad7 100644
@@ -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);

drivers/usb/typec/tcpm/tcpm.c +1 -1

 		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