Merge pull request torvalds#487 from liva/x86

add PCI device interface and a vfio backend driver

.circleci/config.yml

@@ -56,8 +56,8 @@ do_steps: &do_steps
       command: |
         if [[ $CROSS_COMPILE == *android* ]]; then
           emulator -avd Nexus5_API24 -no-window -no-audio -no-boot-anim;
-        elif [[ $CROSS_COMPILE == *freebsd* ]]; then
-          cd /home/ubuntu && $QEMU
+        elif [[ $CROSS_COMPILE == *freebsd* ]] || [[ -n "$LKL_QEMU_TEST" ]]; then
+          cd /home/ubuntu && eval $QEMU
         fi
       background: true
   - run: cd tools/lkl && make -j8 ${MKARG}
@@ -71,7 +71,7 @@ do_steps: &do_steps
       command: |
         if [[ $CROSS_COMPILE == *android* ]]; then
           /home/ubuntu/circle-android.sh wait-for-boot;
-        elif [[ $CROSS_COMPILE == *freebsd* ]]; then
+        elif [[ $CROSS_COMPILE == *freebsd* ]] || [[ -n "$LKL_QEMU_TEST" ]]; then
           while ! $MYSSH -o ConnectTimeout=1 exit 2> /dev/null
           do
              sleep 5
@@ -147,6 +147,15 @@ jobs:
      VALGRIND: 1
    <<: *do_steps
 
+  x86_64_qemu:
+   docker:
+     - image: lkldocker/circleci-qemu-x86_64:v1.1
+   environment:
+     CROSS_COMPILE: ""
+     MKARG: "dpdk=no"
+     LKL_QEMU_TEST: 1
+   <<: *do_steps
+
   checkpatch:
    docker:
      - image: lkldocker/circleci:0.5
@@ -167,6 +176,7 @@ workflows:
   build:
     jobs:
      - x86_64
+     - x86_64_qemu
      - mingw32
      - android-arm32
      - android-aarch64

arch/lkl/Kconfig

@@ -36,6 +36,7 @@ config LKL
        select ARCH_NO_COHERENT_DMA_MMAP
        select HAVE_MEMBLOCK
        select NO_BOOTMEM
+       select BLK_DEV_NVME
 
 config OUTPUT_FORMAT
        string "Output format"
@@ -93,4 +94,8 @@ config CONSOLE_LOGLEVEL_QUIET
 	  will be used as the loglevel. IOW passing "quiet" will be the
 	  equivalent of passing "loglevel=<CONSOLE_LOGLEVEL_QUIET>"
 
-
+config PCI
+	bool "PCI support"
+	select NO_GENERIC_PCI_IOPORT_MAP
+	select GENERIC_PCI_IOMAP
+	default y

arch/lkl/Makefile

@@ -36,6 +36,7 @@ endif
 
 core-y += arch/lkl/kernel/
 core-y += arch/lkl/mm/
+core-y += arch/lkl/drivers/
 
 all: lkl.o
 

arch/lkl/drivers/Makefile

@@ -0,0 +1,2 @@
+
+obj-y = pci.o

arch/lkl/drivers/pci.c

@@ -0,0 +1,271 @@
+// SPDX-License-Identifier: GPL-2.0
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/pci.h>
+#include <linux/slab.h>
+#include <linux/interrupt.h>
+#include <linux/types.h>
+#include <linux/io.h>
+#include <linux/platform_device.h>
+#include <linux/dma-mapping.h>
+#include <linux/scatterlist.h>
+#include <linux/mm.h>
+#include <asm/host_ops.h>
+
+static int lkl_pci_generic_read(struct pci_bus *bus, unsigned int devfn,
+				int where, int size, u32 *val)
+{
+	if (devfn == 0 &&
+	    lkl_ops->pci_ops->read(bus->sysdata, where, size, val) == size)
+		return PCIBIOS_SUCCESSFUL;
+	else
+		return PCIBIOS_FUNC_NOT_SUPPORTED;
+}
+
+static int lkl_pci_generic_write(struct pci_bus *bus, unsigned int devfn,
+				 int where, int size, u32 val)
+{
+	if (devfn == 0 &&
+	    lkl_ops->pci_ops->write(bus->sysdata, where, size, &val) == size)
+		return PCIBIOS_SUCCESSFUL;
+	else
+		return PCIBIOS_FUNC_NOT_SUPPORTED;
+}
+
+void __iomem *__pci_ioport_map(struct pci_dev *dev, unsigned long port,
+			       unsigned int nr)
+{
+	panic("%s is not supported\n", __func__);
+	return NULL;
+}
+
+static int lkl_pci_override_resource(struct pci_dev *dev, void *data)
+{
+	int i;
+	struct resource *r;
+	resource_size_t start, size;
+	void *remapped_start = NULL;
+
+	if (dev->devfn != 0)
+		return 0;
+
+	for (i = 0; i < PCI_NUM_RESOURCES; i++) {
+		r = &dev->resource[i];
+
+		if (!r->parent && r->start && r->flags) {
+			dev_info(&dev->dev, "claiming resource %s/%d\n",
+				 pci_name(dev), i);
+			if (pci_claim_resource(dev, i)) {
+				dev_err(&dev->dev,
+					"Could not claim resource %s/%d!",
+					pci_name(dev), i);
+			}
+
+			size = pci_resource_len(dev, i);
+
+			if (pci_resource_flags(dev, i) & IORESOURCE_MEM) {
+				remapped_start =
+					lkl_ops->pci_ops->resource_alloc(
+						dev->sysdata, size, i);
+			}
+
+			if (remapped_start) {
+				/* override values */
+				start = (resource_size_t)remapped_start;
+				pci_resource_start(dev, i) = start;
+				pci_resource_end(dev, i) = start + size - 1;
+			} else {
+				/*
+				 * A host library or the application could
+				 * not handle the resource. Disable it
+				 * not to be touched by drivers.
+				 */
+				pci_resource_flags(dev, i) |=
+					IORESOURCE_DISABLED;
+			}
+		}
+	}
+
+	dev->irq = lkl_get_free_irq("pci");
+
+	if (lkl_ops->pci_ops->irq_init(dev->sysdata, dev->irq) < 0)
+		return -ENOMEM;
+
+	return 0;
+}
+
+static int lkl_pci_remove_devices(struct pci_dev *dev, void *data)
+{
+	lkl_ops->pci_ops->remove(dev->sysdata);
+	return 0;
+}
+
+static struct pci_ops lkl_pci_root_ops = {
+	.read = lkl_pci_generic_read,
+	.write = lkl_pci_generic_write,
+};
+
+static void *lkl_dma_alloc(struct device *dev, size_t size,
+			   dma_addr_t *dma_handle, gfp_t gfp,
+			   unsigned long attrs)
+{
+	void *vaddr = page_to_virt(alloc_pages(gfp, get_order(size)));
+	*dma_handle = (dma_addr_t)lkl_ops->pci_ops->map_page(
+		to_pci_dev(dev)->sysdata, vaddr, size);
+	return vaddr;
+}
+
+static void lkl_dma_free(struct device *dev, size_t size, void *cpu_addr,
+			 dma_addr_t dma_addr, unsigned long attrs)
+{
+	lkl_ops->pci_ops->unmap_page(to_pci_dev(dev)->sysdata, dma_addr, size);
+	__free_pages(cpu_addr, get_order(size));
+}
+
+static dma_addr_t lkl_dma_map_page(struct device *dev, struct page *page,
+				   unsigned long offset, size_t size,
+				   enum dma_data_direction dir,
+				   unsigned long attrs)
+{
+	dma_addr_t dma_handle = (dma_addr_t)lkl_ops->pci_ops->map_page(
+		to_pci_dev(dev)->sysdata, page_to_virt(page) + offset, size);
+	if (dma_handle == 0)
+		return DMA_MAPPING_ERROR;
+
+	return dma_handle;
+}
+
+static void lkl_dma_unmap_page(struct device *dev, dma_addr_t dma_addr,
+			       size_t size, enum dma_data_direction dir,
+			       unsigned long attrs)
+{
+	lkl_ops->pci_ops->unmap_page(to_pci_dev(dev)->sysdata, dma_addr, size);
+}
+
+static int lkl_dma_map_sg(struct device *dev, struct scatterlist *sgl,
+			  int nents, enum dma_data_direction dir,
+			  unsigned long attrs)
+{
+	int i;
+	struct scatterlist *sg;
+
+	for_each_sg(sgl, sg, nents, i) {
+		void *va;
+
+		WARN_ON(!sg_page(sg));
+		va = sg_virt(sg);
+		sg_dma_address(sg) = (dma_addr_t)lkl_dma_map_page(
+			dev, sg_page(sg), sg->offset, sg->length, dir, attrs);
+		sg_dma_len(sg) = sg->length;
+	}
+	return nents;
+}
+
+static void lkl_dma_unmap_sg(struct device *dev, struct scatterlist *sgl,
+			     int nents, enum dma_data_direction dir,
+			     unsigned long attrs)
+{
+	int i;
+	struct scatterlist *sg;
+
+	for_each_sg(sgl, sg, nents, i)
+		lkl_dma_unmap_page(dev, sg_dma_address(sg), sg_dma_len(sg), dir,
+				   attrs);
+}
+
+static int lkl_dma_supported(struct device *dev, u64 mask)
+{
+	return 1;
+}
+
+static char *pcidev_name;
+
+static int __init setup_pci_device(char *str)
+{
+	if (pcidev_name) {
+		pr_info("The PCI driver supports only one PCI device.");
+		pr_info("'%s' will be discarded.", str);
+		return -1;
+	}
+	pcidev_name = str;
+	return 0;
+}
+
+early_param("lkl_pci", setup_pci_device);
+
+const struct dma_map_ops lkl_dma_ops = {
+	.alloc = lkl_dma_alloc,
+	.free = lkl_dma_free,
+	.map_sg = lkl_dma_map_sg,
+	.unmap_sg = lkl_dma_unmap_sg,
+	.map_page = lkl_dma_map_page,
+	.unmap_page = lkl_dma_unmap_page,
+	.dma_supported = lkl_dma_supported,
+};
+
+static int lkl_pci_probe(struct platform_device *pdev)
+{
+	struct lkl_pci_dev *dev;
+	struct pci_bus *bus;
+
+	if (!lkl_ops->pci_ops || !pcidev_name)
+		return -1;
+
+	dev = lkl_ops->pci_ops->add(pcidev_name, (void *)memory_start,
+				    memory_end - memory_start);
+	if (!dev)
+		return -1;
+
+	bus = pci_scan_bus(0, &lkl_pci_root_ops, (void *)dev);
+	if (!bus) {
+		lkl_ops->pci_ops->remove(dev);
+		return -1;
+	}
+	pci_walk_bus(bus, lkl_pci_override_resource, NULL);
+	pci_bus_add_devices(bus);
+	dev_set_drvdata(&pdev->dev, bus);
+
+	return 0;
+}
+
+static void lkl_pci_shutdown(struct platform_device *pdev)
+{
+	struct pci_bus *bus = (struct pci_bus *)dev_get_drvdata(&pdev->dev);
+
+	if (bus)
+		pci_walk_bus(bus, lkl_pci_remove_devices, NULL);
+}
+
+static struct platform_driver lkl_pci_driver = {
+	.driver = {
+		.name = "lkl_pci",
+	},
+	.probe = lkl_pci_probe,
+	.shutdown = lkl_pci_shutdown,
+};
+
+static int __init lkl_pci_init(void)
+{
+	int ret;
+	struct platform_device *dev;
+
+	/*register a platform driver*/
+	ret = platform_driver_register(&lkl_pci_driver);
+	if (ret != 0)
+		return ret;
+
+	dev = platform_device_alloc("lkl_pci", -1);
+	if (!dev)
+		return -ENOMEM;
+
+	ret = platform_device_add(dev);
+	if (ret != 0)
+		goto error;
+
+	return 0;
+error:
+	platform_device_put(dev);
+	return ret;
+}
+
+subsys_initcall(lkl_pci_init);

arch/lkl/include/asm/Kbuild

@@ -14,8 +14,6 @@ generic-y += current.h
 generic-y += delay.h
 generic-y += device.h
 generic-y += div64.h
-generic-y += dma.h
-generic-y += dma-mapping.h
 generic-y += emergency-restart.h
 generic-y += errno.h
 generic-y += extable.h
@@ -42,7 +40,7 @@ generic-y += module.h
 generic-y += msgbuf.h
 generic-y += param.h
 generic-y += parport.h
-generic-y += pci.h
+generic-y += pci_iomap.h
 generic-y += percpu.h
 generic-y += pgalloc.h
 generic-y += poll.h
@@ -75,5 +73,6 @@ generic-y += topology.h
 generic-y += trace_clock.h
 generic-y += unaligned.h
 generic-y += user.h
+generic-y += vga.h
 generic-y += word-at-a-time.h
 generic-y += kprobes.h

arch/lkl/include/asm/dma-mapping.h

@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _ASM_LKL_DMA_MAPPING_H
+#define _ASM_LKL_DMA_MAPPING_H
+
+extern const struct dma_map_ops lkl_dma_ops;
+
+static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)
+{
+	return &lkl_dma_ops;
+}
+
+#endif

arch/lkl/include/asm/dma.h

@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _ASM_LKL_DMA_H
+#define _ASM_LKL_DMA_H
+
+#include <asm-generic/dma.h>
+
+#ifdef CONFIG_PCI
+extern int isa_dma_bridge_buggy;
+#else
+#define isa_dma_bridge_buggy (0)
+#endif
+
+#endif /* _ASM_LKL_DMA_H */