Skip to content

Commit 97ce0fe

Browse files
jwrdegoedegregkh
authored andcommitted
mei: vsc: Cast tx_buf to (__be32 *) when passed to cpu_to_be32_array()
Commit f88c0c7 ("mei: vsc: Use struct vsc_tp_packet as vsc-tp tx_buf and rx_buf type") changed the type of tx_buf from "void *" to "struct vsc_tp_packet *" and added a cast to (u32 *) when passing it to cpu_to_be32_array() and the same change was made for rx_buf. This triggers the type-check warning in sparse: vsc-tp.c:327:28: sparse: expected restricted __be32 [usertype] *dst vsc-tp.c:327:28: sparse: got unsigned int [usertype] * vsc-tp.c:343:42: sparse: expected restricted __be32 const [usertype] *src vsc-tp.c:343:42: sparse: got unsigned int [usertype] * Fix this by casting to (__be32 *) instead. Note actually changing the type of the buffers to "be32 *" is not an option this buffer does actually contain a "struct vsc_tp_packet" and is used as such most of the time. vsc_tp_rom_xfer() re-uses the buffers as just dumb arrays of 32 bit words to talk to the device before the firmware has booted, to avoid needing to allocate a separate buffer. Fixes: f88c0c7 ("mei: vsc: Use struct vsc_tp_packet as vsc-tp tx_buf and rx_buf type") Reported-by: kernel test robot <[email protected]> Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/ Signed-off-by: Hans de Goede <[email protected]> Reviewed-by: Sakari Ailus <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 46a4d12 commit 97ce0fe

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/misc/mei/vsc-tp.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ int vsc_tp_rom_xfer(struct vsc_tp *tp, const void *obuf, void *ibuf, size_t len)
324324
guard(mutex)(&tp->mutex);
325325

326326
/* rom xfer is big endian */
327-
cpu_to_be32_array((u32 *)tp->tx_buf, obuf, words);
327+
cpu_to_be32_array((__be32 *)tp->tx_buf, obuf, words);
328328

329329
ret = read_poll_timeout(gpiod_get_value_cansleep, ret,
330330
!ret, VSC_TP_ROM_XFER_POLL_DELAY_US,
@@ -340,7 +340,7 @@ int vsc_tp_rom_xfer(struct vsc_tp *tp, const void *obuf, void *ibuf, size_t len)
340340
return ret;
341341

342342
if (ibuf)
343-
be32_to_cpu_array(ibuf, (u32 *)tp->rx_buf, words);
343+
be32_to_cpu_array(ibuf, (__be32 *)tp->rx_buf, words);
344344

345345
return ret;
346346
}

0 commit comments

Comments
 (0)