[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[UNIKRAFT PATCH RFCv4 18/35] plat/pci_bus: Pass memory allocation parameter to arch_pci_probe



 On Arm, arch_pci_probe will use it when probing the pci device.
 But it is useless on X86, set it as __unused.

 Signed-off-by: Jia He <justin.he@xxxxxxx>
---
 plat/common/pci_bus.c         | 4 ++--
 plat/common/x86/pci_bus_x86.c | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/plat/common/pci_bus.c b/plat/common/pci_bus.c
index 7446bbe..629c1f2 100644
--- a/plat/common/pci_bus.c
+++ b/plat/common/pci_bus.c
@@ -58,7 +58,7 @@
 #include <uk/plat/common/cpu.h>
 #include <pci/pci_bus.h>
 
-extern int arch_pci_probe(void);
+extern int arch_pci_probe(struct uk_alloc *pha);
 
 static inline int pci_device_id_match(const struct pci_device_id *id0,
                                        const struct pci_device_id *id1)
@@ -121,7 +121,7 @@ struct pci_driver *pci_find_driver(struct pci_device_id *id)
 
 static int pci_probe(void)
 {
-       return arch_pci_probe();
+       return arch_pci_probe(ph.a);
 }
 
 
diff --git a/plat/common/x86/pci_bus_x86.c b/plat/common/x86/pci_bus_x86.c
index b6d4ec6..64f6a7f 100644
--- a/plat/common/x86/pci_bus_x86.c
+++ b/plat/common/x86/pci_bus_x86.c
@@ -55,6 +55,7 @@
 #include <string.h>
 #include <uk/print.h>
 #include <uk/plat/common/cpu.h>
+#include <uk/essentials.h>
 #include <pci/pci_bus.h>
 
 #define PCI_CONF_READ(type, ret, a, s)                                 \
@@ -207,7 +208,7 @@ static void probe_bus(uint32_t bus)
        }
 }
 
-int arch_pci_probe(void)
+int arch_pci_probe(struct uk_alloc *pha __unused)
 {
        uint32_t config_addr, function, header_type, vendor_id;
 
-- 
2.17.1




 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.