Commit 6e4a7629 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by David S. Miller

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: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 65f60925
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include <linux/list.h> #include <linux/list.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/if_arp.h> #include <linux/if_arp.h>
#include <linux/io.h>
#include <net/caif/caif_device.h> #include <net/caif/caif_device.h>
#include <net/caif/caif_shm.h> #include <net/caif/caif_shm.h>
...@@ -647,6 +648,9 @@ int caif_shmcore_probe(struct shmdev_layer *pshm_dev) ...@@ -647,6 +648,9 @@ int caif_shmcore_probe(struct shmdev_layer *pshm_dev)
if (pshm_dev->shm_loopback) if (pshm_dev->shm_loopback)
tx_buf->desc_vptr = (unsigned char *)tx_buf->phy_addr; tx_buf->desc_vptr = (unsigned char *)tx_buf->phy_addr;
else else
/*
* FIXME: the result of ioremap is not a pointer - arnd
*/
tx_buf->desc_vptr = tx_buf->desc_vptr =
ioremap(tx_buf->phy_addr, TX_BUF_SZ); ioremap(tx_buf->phy_addr, TX_BUF_SZ);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment