mei: vsc: Cast tx_buf to (__be32 *) when passed to cpu_to_be32_array()
Subsystems (2)
PATCH 1/1 mei: vsc: Cast tx_buf to (__be32 *) when passed to cpu_to_be32_array()
Commit f88c0c72ffb0 ("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.
--- drivers/misc/mei/vsc-tp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/misc/mei/vsc-tp.c +2 -2
@@ -324,7 +324,7 @@ int vsc_tp_rom_xfer(struct vsc_tp *tp, const void *obuf, void *ibuf, size_t len)guard (mutex)(&tp->mutex);/* rom xfer is big endian */ -cpu_to_be32_array ((u32 *)tp->tx_buf, obuf, words); +cpu_to_be32_array ((__be32 *)tp->tx_buf, obuf, words); ret = read_poll_timeout(gpiod_get_value_cansleep, ret, !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)return ret;if (ibuf) -be32_to_cpu_array (ibuf, (u32 *)tp->rx_buf, words); +be32_to_cpu_array (ibuf, (__be32 *)tp->rx_buf, words);return ret; }
Signature · 1 line
2.49.0
Hi Hans,
Quoted 21 lines · Hans de Goede
Commit
f88c0c72ffb0("mei: vsc: Use structvsc_tp_packetas vsc-tptx_bufandrx_buftype") changed the type oftx_buffrom "void *" to "structvsc_tp_packet*" and added a cast to (u32 *) when passing it tocpu_to_be32_array()and the same change was made forrx_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
__be32const [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.
Quoted 4 lines
Fixes f88c0c72ffb0 ("mei: vsc: Use struct vsc_tp_packet as vsc-tp tx_buf and rx_buf type")Reported-by kernel test robot <[email protected]>Signed-off-by Hans de Goede <[email protected]>
Thanks!
Quoted 26 lines
--- drivers/misc/mei/vsc-tp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/misc/mei/vsc-tp.c +2
-2@@ -324,7 +324,7 @@ int vsc_tp_rom_xfer(struct vsc_tp *tp, const void *obuf, void *ibuf, size_t len)guard (mutex)(&tp->mutex);/* rom xfer is big endian */ -cpu_to_be32_array ((u32 *)tp->tx_buf, obuf, words); +cpu_to_be32_array ((__be32 *)tp->tx_buf, obuf, words); ret = read_poll_timeout(gpiod_get_value_cansleep, ret, !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)return ret;if (ibuf) -be32_to_cpu_array (ibuf, (u32 *)tp->rx_buf, words); +be32_to_cpu_array (ibuf, (__be32 *)tp->rx_buf, words);return ret; }
Signature · 3 lines
Regards, Sakari Ailus