aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/include/asm/io.h
diff options
context:
space:
mode:
authorJohannes Berg <[email protected]>2021-03-05 12:19:58 +0000
committerRichard Weinberger <[email protected]>2021-06-17 19:45:43 +0000
commit68f5d3f3b6543266b29e047cfaf9842333019b4c (patch)
tree29590aaf2cbe0669962f23576c3a0b106327aba9 /arch/um/include/asm/io.h
parentum: irqs: allow invoking time-travel handler multiple times (diff)
downloadkernel-68f5d3f3b6543266b29e047cfaf9842333019b4c.tar.gz
kernel-68f5d3f3b6543266b29e047cfaf9842333019b4c.zip
um: add PCI over virtio emulation driver
To support testing of PCI/PCIe drivers in UML, add a PCI bus support driver. This driver uses virtio, which in UML is really just vhost-user, to talk to devices, and adds the devices to the virtual PCI bus in the system. Since virtio already allows DMA/bus mastering this really isn't all that hard, of course we need the logic_iomem infrastructure that was added by a previous patch. The protocol to talk to the device is has a few fairly simple messages for reading to/writing from config and IO spaces, and messages for the device to send the various interrupts (INT#, MSI/MSI-X and while suspended PME#). Note that currently no offical virtio device ID is assigned for this protocol, as a consequence this patch requires defining it in the Kconfig, with a default that makes the driver refuse to work at all. Finally, in order to add support for MSI/MSI-X interrupts, some small changes are needed in the UML IRQ code, it needs to have more interrupts, changing NR_IRQS from 64 to 128 if this driver is enabled, but not actually use them for anything so that the generic IRQ domain/MSI infrastructure can allocate IRQ numbers. Signed-off-by: Johannes Berg <[email protected]> Signed-off-by: Richard Weinberger <[email protected]>
Diffstat (limited to 'arch/um/include/asm/io.h')
-rw-r--r--arch/um/include/asm/io.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/um/include/asm/io.h b/arch/um/include/asm/io.h
index 6ce18d343997..9ea42cc746d9 100644
--- a/arch/um/include/asm/io.h
+++ b/arch/um/include/asm/io.h
@@ -3,16 +3,23 @@
#define _ASM_UM_IO_H
#include <linux/types.h>
+/* get emulated iomem (if desired) */
+#include <asm-generic/logic_io.h>
+
+#ifndef ioremap
#define ioremap ioremap
static inline void __iomem *ioremap(phys_addr_t offset, size_t size)
{
return NULL;
}
+#endif /* ioremap */
+#ifndef iounmap
#define iounmap iounmap
static inline void iounmap(void __iomem *addr)
{
}
+#endif /* iounmap */
#include <asm-generic/io.h>