Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a133f8b6 authored by Lee Jones's avatar Lee Jones Committed by Jassi Brar
Browse files

mailbox: mailbox-test: Correctly repair Sparse warnings 



Kbuild test robot reported some Sparse warnings to the tune of:

  sparse: incorrect type in argument 6 (different address spaces)
    expected void const *buf
    got void [noderef] <asn:2>*mmio

This was due to passing variables tagged with the Sparse cookie
'__iomem' through into memcpy() and print_hex_dump() without
adequate protection or casting.  These issues were fixed in a
previous patch suppressing the warnings, but the issue is indeed
still present.

This patch fixes the warnings in the correct way, i.e. by using
the purposely authored memcpy_{from,to}io() derivatives in the
memcpy() case and casting the memory address to (void *) and
forcing Sparse to ignore to ignore it in the print_hex_dump()
case [NB: This is also what the memcpy() derivatives do].

Reported-by: default avatarPeter Griffin <peter.griffin@linaro.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarJassi Brar <jaswinder.singh@linaro.org>
parent 6c03663f

drivers/mailbox/mailbox-test.c

+6 −5
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 


#include <linux/debugfs.h>

#include <linux/err.h>

#include <linux/io.h>

#include <linux/kernel.h>

#include <linux/mailbox_client.h>

#include <linux/module.h>
@@ -30,7 +31,7 @@ static struct dentry *root_debugfs_dir; 


struct mbox_test_device {

	struct device		*dev;

	void			*mmio;

	void __iomem		*mmio;

	struct mbox_chan	*tx_channel;

	struct mbox_chan	*rx_channel;

	char			*rx_buffer;
@@ -222,8 +223,8 @@ static void mbox_test_receive_message(struct mbox_client *client, void *message) 
	if (tdev->mmio) {

		print_hex_dump(KERN_INFO, "Client: Received [MMIO]: ",

			       DUMP_PREFIX_ADDRESS, MBOX_BYTES_PER_LINE, 1,

			       tdev->mmio, MBOX_MAX_MSG_LEN, true);

		memcpy(tdev->rx_buffer, tdev->mmio, MBOX_MAX_MSG_LEN);

			       __io_virt(tdev->mmio), MBOX_MAX_MSG_LEN, true);

		memcpy_fromio(tdev->rx_buffer, tdev->mmio, MBOX_MAX_MSG_LEN);



	} else if (message) {

		print_hex_dump(KERN_INFO, "Client: Received [API]: ",
@@ -240,9 +241,9 @@ static void mbox_test_prepare_message(struct mbox_client *client, void *message) 


	if (tdev->mmio) {

		if (tdev->signal)

			memcpy(tdev->mmio, tdev->message, MBOX_MAX_MSG_LEN);

			memcpy_toio(tdev->mmio, tdev->message, MBOX_MAX_MSG_LEN);

		else

			memcpy(tdev->mmio, message, MBOX_MAX_MSG_LEN);

			memcpy_toio(tdev->mmio, message, MBOX_MAX_MSG_LEN);

	}

}