HID: intel-ish-hid: fix endian-conversion
Subsystems (2)
PATCH v3 1/1 HID: intel-ish-hid: fix endian-conversion
From: Arnd Bergmann <[email protected]>
The newly added file causes a ton of sparse warnings about the incorrect use of __le32 and similar types:
drivers/hid/intel-ish-hid/ishtp/loader.h:41:23: error: invalid bitfield specifier for type restricted __le32. drivers/hid/intel-ish-hid/ishtp/loader.h:42:27: error: invalid bitfield specifier for type restricted __le32. drivers/hid/intel-ish-hid/ishtp/loader.h:43:24: error: invalid bitfield specifier for type restricted __le32. drivers/hid/intel-ish-hid/ishtp/loader.h:44:24: error: invalid bitfield specifier for type restricted __le32. drivers/hid/intel-ish-hid/ishtp/loader.h:45:22: error: invalid bitfield specifier for type restricted __le32. drivers/hid/intel-ish-hid/ishtp/loader.c:172:33: warning: restricted __le32 degrades to integer drivers/hid/intel-ish-hid/ishtp/loader.c:178:50: warning: incorrect type in assignment (different base types)drivers/hid/intel-ish-hid/ishtp/loader.c:178:50: expected restricted __le32 [usertype] lengthdrivers/hid/intel-ish-hid/ishtp/loader.c:178:50: got unsigned longdrivers/hid/intel-ish-hid/ishtp/loader.c:179:50: warning: incorrect type in assignment (different base types)drivers/hid/intel-ish-hid/ishtp/loader.c:179:50: expected restricted __le32 [usertype] fw_offdrivers/hid/intel-ish-hid/ishtp/loader.c:179:50: got unsigned int [usertype] offsetdrivers/hid/intel-ish-hid/ishtp/loader.c:180:17: warning: cast from restricted __le32 drivers/hid/intel-ish-hid/ishtp/loader.c:183:24: warning: invalid assignment: +=drivers/hid/intel-ish-hid/ishtp/loader.c:183:24: left side has type unsigned intdrivers/hid/intel-ish-hid/ishtp/loader.c:183:24: right side has type restricted __le32
Add the necessary conversions and use temporary variables where appropriate to avoid converting back.
---
v3:
- Avoid kerneldoc warning
- Remove extra ';'
v2:
- fix minor issues introduced in rebasing
- rebase again on linux-next without the cache management patch
- fix up changelog text
--- drivers/hid/intel-ish-hid/ishtp/loader.c | 69 +++++++++++++----------- drivers/hid/intel-ish-hid/ishtp/loader.h | 33 +++++++----- 2 files changed, 57 insertions(+), 45 deletions(-)
drivers/hid/intel-ish-hid/ishtp/loader.c +38 -31
@@ -84,8 +84,8 @@ static int loader_write_message(struct ishtp_device *dev, void *buf, int len)static int loader_xfer_cmd (struct ishtp_device *dev,void *req,int req_len,void *resp,int resp_len) { -struct loader_msg_header *req_hdr = req; -struct loader_msg_header *resp_hdr = resp; +union loader_msg_header req_hdr; +union loader_msg_header resp_hdr;struct device *devc = dev->devc;int rv;
@@ -93,34 +93,37 @@ static int loader_xfer_cmd(struct ishtp_device *dev, void *req, int req_len, dev->fw_loader_rx_size = resp_len; rv =loader_write_message (dev, req, req_len); + req_hdr.val32 =le32_to_cpup (req); +if (rv <0 ) { -dev_err (devc,"write cmd %u failed:%d\n" , req_hdr->command, rv); +dev_err (devc,"write cmd %u failed:%d\n" , req_hdr.command, rv);return rv; }/* Wait the ACK */ wait_event_interruptible_timeout (dev->wait_loader_recvd_msg, dev->fw_loader_received,ISHTP_LOADER_TIMEOUT ); + resp_hdr.val32 =le32_to_cpup (resp); dev->fw_loader_rx_size =0 ; dev->fw_loader_rx_buf =NULL ;if (!dev->fw_loader_received) { -dev_err (devc,"wait response of cmd %u timeout\n" , req_hdr->command); +dev_err (devc,"wait response of cmd %u timeout\n" , req_hdr.command);return -ETIMEDOUT ; } -if (!resp_hdr->is_response) { -dev_err (devc,"not a response for %u\n" , req_hdr->command); +if (!resp_hdr.is_response) { +dev_err (devc,"not a response for %u\n" , req_hdr.command);return -EBADMSG ; } -if (req_hdr->command != resp_hdr->command) { -dev_err (devc,"unexpected cmd response %u:%u\n" , req_hdr->command, - resp_hdr->command); +if (req_hdr.command != resp_hdr.command) { +dev_err (devc,"unexpected cmd response %u:%u\n" , req_hdr.command, + resp_hdr.command);return -EBADMSG ; } -if (resp_hdr->status) { -dev_err (devc,"cmd %u failed %u\n" , req_hdr->command, resp_hdr->status); +if (resp_hdr.status) { +dev_err (devc,"cmd %u failed %u\n" , req_hdr.command, resp_hdr.status);return -EIO ; }
@@ -157,30 +160,33 @@ static void release_dma_bufs(struct ishtp_device *dev,* @fragment: The ISHTP firmware fragment descriptor * @dma_bufs: The array of DMA fragment buffers * @fragment_size: The size of a single DMA fragment +* @fragment_count: Number of fragments * * Return: 0 on success, negative error code on failure */ static int prepare_dma_bufs (struct ishtp_device *dev,const struct firmware *ish_fw,struct loader_xfer_dma_fragment *fragment, -void **dma_bufs,u32 fragment_size) +void **dma_bufs,u32 fragment_size,u32 fragment_count) {dma_addr_t dma_addr;u32 offset =0 ; +u32 length;int i; -for (i =0 ; i < fragment->fragment_cnt && offset < ish_fw->size; i++) { +for (i =0 ; i < fragment_count && offset < ish_fw->size; i++) { dma_bufs[i] =dma_alloc_coherent (dev->devc, fragment_size, &dma_addr,GFP_KERNEL );if (!dma_bufs[i])return -ENOMEM ; fragment->fragment_tbl[i].ddr_adrs =cpu_to_le64 (dma_addr); - fragment->fragment_tbl[i].length =clamp (ish_fw->size - offset,0 , fragment_size); - fragment->fragment_tbl[i].fw_off = offset; -memcpy (dma_bufs[i], ish_fw->data + offset, fragment->fragment_tbl[i].length); + length =clamp (ish_fw->size - offset,0 , fragment_size); + fragment->fragment_tbl[i].length =cpu_to_le32 (length); + fragment->fragment_tbl[i].fw_off =cpu_to_le32 (offset); +memcpy (dma_bufs[i], ish_fw->data + offset, length);clflush_cache_range (dma_bufs[i], fragment_size); - offset += fragment->fragment_tbl[i].length; + offset += length; }return 0 ;
@@ -208,17 +214,17 @@ void ishtp_loader_work(struct work_struct *work) { DEFINE_RAW_FLEX(struct loader_xfer_dma_fragment, fragment, fragment_tbl, FRAGMENT_MAX_NUM); struct ishtp_device *dev = container_of(work, struct ishtp_device, work_fw_loader); -struct loader_xfer_query query = { - .header.command =LOADER_CMD_XFER_QUERY , - }; -struct loader_start start = { - .header.command =LOADER_CMD_START , - }; +union loader_msg_header query_hdr = { .command =LOADER_CMD_XFER_QUERY , }; +union loader_msg_header start_hdr = { .command =LOADER_CMD_START , }; +union loader_msg_header fragment_hdr = { .command =LOADER_CMD_XFER_FRAGMENT , }; +struct loader_xfer_query query = { .header =cpu_to_le32 (query_hdr.val32), }; +struct loader_start start = { .header =cpu_to_le32 (start_hdr.val32), };union loader_recv_message recv_msg;char *filename = dev->driver_data->fw_filename;const struct firmware *ish_fw;void *dma_bufs[FRAGMENT_MAX_NUM ] = {};u32 fragment_size; +u32 fragment_count;int retry =ISHTP_LOADER_RETRY_TIMES ;int rv;
@@ -228,23 +234,24 @@ void ishtp_loader_work(struct work_struct *work)return ; } - fragment->fragment.header.command =LOADER_CMD_XFER_FRAGMENT ; - fragment->fragment.xfer_mode =LOADER_XFER_MODE_DMA ; - fragment->fragment.is_last =1 ; - fragment->fragment.size = ish_fw->size; + fragment->fragment.header =cpu_to_le32 (fragment_hdr.val32); + fragment->fragment.xfer_mode =cpu_to_le32 (LOADER_XFER_MODE_DMA ); + fragment->fragment.is_last =cpu_to_le32 (1 ); + fragment->fragment.size =cpu_to_le32 (ish_fw->size);/* Calculate the size of a single DMA fragment */ fragment_size =PFN_ALIGN (DIV_ROUND_UP (ish_fw->size,FRAGMENT_MAX_NUM ));/* Calculate the count of DMA fragments */ - fragment->fragment_cnt =DIV_ROUND_UP (ish_fw->size, fragment_size); + fragment_count =DIV_ROUND_UP (ish_fw->size, fragment_size); + fragment->fragment_cnt =cpu_to_le32 (fragment_count); - rv =prepare_dma_bufs (dev, ish_fw, fragment, dma_bufs, fragment_size); + rv =prepare_dma_bufs (dev, ish_fw, fragment, dma_bufs, fragment_size, fragment_count);if (rv) {dev_err (dev->devc,"prepare DMA buffer failed.\n" ); goto out; } do { - query.image_size = ish_fw->size; + query.image_size = cpu_to_le32(ish_fw->size); rv = loader_xfer_cmd(dev, &query, sizeof(query), recv_msg.raw_data, sizeof(struct loader_xfer_query_ack)); if (rv)
@@ -257,7 +264,7 @@ void ishtp_loader_work(struct work_struct *work) recv_msg.query_ack.version_build); rv =loader_xfer_cmd (dev, fragment, -struct_size (fragment, fragment_tbl, fragment->fragment_cnt), +struct_size (fragment, fragment_tbl, fragment_count), recv_msg.raw_data,sizeof (struct loader_xfer_fragment_ack ));if (rv)continue ;/* try again if failed */
drivers/hid/intel-ish-hid/ishtp/loader.h +19 -14
@@ -30,19 +30,23 @@ struct work_struct;#define LOADER_XFER_MODE_DMA BIT(0)/** -* struct loader_msg_header - ISHTP firmware loader message header +* union loader_msg_header - ISHTP firmware loader message header * @command: Command type * @is_response: Indicates if the message is a response * @has_next: Indicates if there is a next message * @reserved: Reserved for future use * @status: Status of the message -*/ -struct loader_msg_header { -__le32 command:7 ; -__le32 is_response:1 ; -__le32 has_next:1 ; -__le32 reserved:15 ; -__le32 status:8 ; +* @val32: entire header as a 32-bit value +*/ +union loader_msg_header { +struct { +__u32 command:7 ; +__u32 is_response:1 ; +__u32 has_next:1 ; +__u32 reserved:15 ; +__u32 status:8 ; + }; +__u32 val32; };/**
@@ -51,7 +55,7 @@ struct loader_msg_header {* @image_size: Size of the image */ struct loader_xfer_query { -struct loader_msg_header header; +__le32 header;__le32 image_size; };
@@ -103,7 +107,7 @@ struct loader_capability {* @capability: Loader capability */ struct loader_xfer_query_ack { -struct loader_msg_header header; +__le32 header;__le16 version_major;__le16 version_minor;__le16 version_hotfix;
@@ -122,7 +126,7 @@ struct loader_xfer_query_ack {* @is_last: Is last */ struct loader_xfer_fragment { -struct loader_msg_header header; +__le32 header;__le32 xfer_mode;__le32 offset;__le32 size;
@@ -134,7 +138,7 @@ struct loader_xfer_fragment {* @header: Header of the message */ struct loader_xfer_fragment_ack { -struct loader_msg_header header; +__le32 header; };/**
@@ -170,7 +174,7 @@ struct loader_xfer_dma_fragment {* @header: Header of the message */ struct loader_start { -struct loader_msg_header header; +__le32 header; };/**
@@ -178,10 +182,11 @@ struct loader_start {* @header: Header of the message */ struct loader_start_ack { -struct loader_msg_header header; +__le32 header; };union loader_recv_message { +__le32 header;struct loader_xfer_query_ack query_ack;struct loader_xfer_fragment_ack fragment_ack;struct loader_start_ack start_ack;
Signature · 1 line
2.39.2
Quoted 15 lines
-----Original Message-----
From: Arnd Bergmann <[email protected]>
Sent: Monday, June 3, 2024 3:41 PM
To: Srinivas Pandruvada <[email protected]>; Jiri Kosina <[email protected]>; Zhang, Lixu <[email protected]>
Cc: Arnd Bergmann <[email protected]>; Benjamin Tissoires <[email protected]>; [email protected]; linux- [email protected]
Subject: [PATCH] [v3] HID: intel-ish-hid: fix endian-conversionFrom: Arnd Bergmann <[email protected]>
The newly added file causes a ton of sparse warnings about the incorrect use of
__le32and similar types:
Quoted 6 lines
Add the necessary conversions and use temporary variables where appropriate to avoid converting back.
Fixes 579a267e4617 ("HID: intel-ish-hid: Implement loading firmware fromhost feature")
Signed-off-by Arnd Bergmann <[email protected]>
Thanks,
Lixu
Quoted 1 line
---
Quoted 21 lines · Lixu
Quoted 21 lines
-----Original Message-----
From: Arnd Bergmann <[email protected]>
Sent: Monday, June 3, 2024 3:41 PM
To: Srinivas Pandruvada <[email protected]>; Jiri Kosina
<[email protected]>; Zhang, Lixu <[email protected]>
Cc: Arnd Bergmann <[email protected]>; Benjamin Tissoires <[email protected]>; [email protected]; linux- [email protected]
Subject: [PATCH] [v3] HID: intel-ish-hid: fix endian-conversionFrom: Arnd Bergmann <[email protected]>
The newly added file causes a ton of sparse warnings about the incorrect use of
__le32and similar types:Add the necessary conversions and use temporary variables where appropriate
to avoid converting back.
Quoted 6 lines
Quoted 4 lines
Fixes 579a267e4617 ("HID: intel-ish-hid: Implement loadingfirmware from
host feature")Signed-off-by Arnd Bergmann <[email protected]>Reviewed-by Zhang Lixu <[email protected]>Tested-by Zhang Lixu <[email protected]>
Quoted 4 lines
Thanks,
LixuQuoted 1 line
---