Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 6e4a76291ebd5c61dcaa8281cefe0bd2d883c1fd

Authored by Arnd Bergmann
Committed by David S. Miller
1 parent 65f6092517
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

caif: include linux/io.h 

The caif_shmcore requires io.h in order to use ioremap, so include that
explicitly to compile in all configurations.

Also add a note about the use of ioremap(), which is not a proper way
to map a DMA buffer into kernel space. It's not completely clear what
the intention is for using ioremap, but it is clear that the result
of ioremap must not simply be accessed using kernel pointers but
should use readl/writel or memcopy_{to,from}io. Assigning the result
of ioremap to a regular pointer that can also be set to something
else is not ok.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 4 additions and 0 deletions Side-by-side Diff

drivers/net/caif/caif_shmcore.c
Diff comments   View file @ 6e4a762
... ... @@ -13,6 +13,7 @@
13 13 #include <linux/list.h>
14 14 #include <linux/netdevice.h>
15 15 #include <linux/if_arp.h>
  16 +#include <linux/io.h>
16 17  
17 18 #include <net/caif/caif_device.h>
18 19 #include <net/caif/caif_shm.h>
... ... @@ -647,6 +648,9 @@
647 648 if (pshm_dev->shm_loopback)
648 649 tx_buf->desc_vptr = (unsigned char *)tx_buf->phy_addr;
649 650 else
  651 + /*
  652 + * FIXME: the result of ioremap is not a pointer - arnd
  653 + */
650 654 tx_buf->desc_vptr =
651 655 ioremap(tx_buf->phy_addr, TX_BUF_SZ);
652 656