PCI: hv: Turn on the host bridge probing on ARM64
authorBoqun Feng <boqun.feng@gmail.com>
Mon, 26 Jul 2021 18:06:57 +0000 (02:06 +0800)
committerLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Mon, 23 Aug 2021 09:59:27 +0000 (10:59 +0100)
Now we have everything we need, just provide a proper sysdata type for
the bus to use on ARM64 and everything else works.

Link: https://lore.kernel.org/r/20210726180657.142727-9-boqun.feng@gmail.com
Signed-off-by: Boqun Feng <boqun.feng@gmail.com>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
drivers/pci/controller/pci-hyperv.c

index e6276aaa46595ceaec51e51f66728b74b6881e68..62dbe98d1fe193f85474f0047bc9331ea26cb895 100644 (file)
@@ -40,6 +40,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/pci.h>
+#include <linux/pci-ecam.h>
 #include <linux/delay.h>
 #include <linux/semaphore.h>
 #include <linux/irqdomain.h>
@@ -448,7 +449,11 @@ enum hv_pcibus_state {
 };
 
 struct hv_pcibus_device {
+#ifdef CONFIG_X86
        struct pci_sysdata sysdata;
+#elif defined(CONFIG_ARM64)
+       struct pci_config_window sysdata;
+#endif
        struct pci_host_bridge *bridge;
        struct fwnode_handle *fwnode;
        /* Protocol version negotiated with the host */
@@ -3075,7 +3080,9 @@ static int hv_pci_probe(struct hv_device *hdev,
                         dom_req, dom);
 
        hbus->bridge->domain_nr = dom;
+#ifdef CONFIG_X86
        hbus->sysdata.domain = dom;
+#endif
 
        hbus->hdev = hdev;
        INIT_LIST_HEAD(&hbus->children);