| Message ID | 20210519100358.64018-1-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c58bbe3477f75deb7883983e6cf428404a107555 |
| Headers | show |
| Series | [v2,1/1] usb: typec: tcpm: Use LE to CPU conversion when accessing msg->header | expand |
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); >
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
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
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);
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(-)