drivers/ukbus/pci: Map PCI regions on runtime

Update the PCI driver to map PCI regions on runtime if paging is enabled. Signed-off-by: Michalis Pappas <[email protected]> Reviewed-by: Sergiu Moga <[email protected]> Reviewed-by: Razvan Deaconescu <[email protected]> Approved-by: Razvan Deaconescu <[email protected]> GitHub-Closes: unikraft#1465
cloudkernels · Aug 9, 2024 · 5369a56 · 5369a56
1 parent ad1c8e7
commit 5369a56
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/drivers/ukbus/pci/arch/arm64/pci_bus.c b/drivers/ukbus/pci/arch/arm64/pci_bus.c
@@ -51,6 +51,7 @@
  */
 
 #include <string.h>
+#include <uk/errptr.h>
 #include <uk/print.h>
 #include <uk/plat/common/cpu.h>
 #include <uk/bus/pci.h>
@@ -91,6 +92,15 @@ static int arch_pci_driver_add_device(struct pci_driver *drv,
 	memcpy(&dev->addr, addr,  sizeof(dev->addr));
 	dev->drv = drv;
 
+#if CONFIG_PAGING
+	/* TODO Properly query the BAR size */
+	base = uk_bus_pf_devmap(base, __PAGE_SIZE);
+	if (unlikely(PTRISERR(base))) {
+		uk_pr_err("Could not map device (%d)\n", PTR2ERR(base));
+		return PTR2ERR(base);
+	}
+#endif /* CONFIG_PAGING */
+
 	dev->base = base;
 	dev->irq = irq;
 	uk_pr_info("pci dev base(0x%lx) irq(%ld)\n", dev->base, dev->irq);

diff --git a/drivers/ukbus/pci/pci_ecam.c b/drivers/ukbus/pci/pci_ecam.c
@@ -32,6 +32,7 @@
 
 #include <stdbool.h>
 #include <uk/bus/platform.h>
+#include <uk/errptr.h>
 #include <uk/list.h>
 #include <uk/alloc.h>
 #include <uk/print.h>
@@ -406,6 +407,7 @@ static int gen_pci_probe(struct pf_device *pfdev __unused)
 	__u64 reg_size;
 	struct pci_range range;
 	struct pci_range_parser parser;
+	__vaddr_t vaddr __maybe_unused;
 	const char *comp;
 	int err;
 
@@ -432,10 +434,21 @@ static int gen_pci_probe(struct pf_device *pfdev __unused)
 		reg_size = reg_size << 32 | fdt32_to_cpu(prop[3]);
 	}
 
+#if CONFIG_PAGING
+	vaddr = uk_bus_pf_devmap(reg_base, reg_size);
+	if (unlikely(PTRISERR(vaddr))) {
+		uk_pr_err("Could not map MMIO region at 0x%lx - 0x%lx (%d)\n",
+			  reg_base, reg_base + reg_size, PTR2ERR(vaddr));
+		return PTR2ERR(vaddr);
+	}
+	pcw.config_base = vaddr;
+#else /* !CONFIG_PAGING */
 	pcw.config_base = reg_base;
+#endif /* !CONFIG_PAGING */
+
 	pcw.config_space_size = reg_size;
-	uk_pr_info("generic pci config base(0x%lx),size(0x%lx)\n",
-				reg_base, reg_size);
+	uk_pr_info("generic pci config base(0x%lx), size(0x%lx)\n",
+		   reg_base, reg_size);
 
 	/* 2.Get the bus range of pci controller */
 	prop = fdt_getprop(dtb, gen_pci_fdt, "bus-range", &prop_len);