[Xen-changelog] [xen staging] x86/mmcfg: rename pt_pci_init() and call it from acpi_mmcfg_init()

[patchbot@xxxxxxx]

commit 29fd98e425346d9e15913eae6d079ddfc835d54c
Author:     Zhenzhong Duan <zhenzhong.duan@xxxxxxxxxx>
AuthorDate: Fri Aug 17 15:04:27 2018 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Fri Aug 17 15:04:27 2018 +0200

    x86/mmcfg: rename pt_pci_init() and call it from acpi_mmcfg_init()
    
    Given what pt_pci_init() actually does, rename it properly and move its
    declaration to pci.h. Move the only call into acpi_mmcfg_init().
    
    No functional change.
    
    Signed-off-by: Zhenzhong Duan <zhenzhong.duan@xxxxxxxxxx>
    Tested-by: Gopalasetty, Manoj <manoj.gopalasetty@xxxxxxx>
    Acked-by: Jan Beulich <jbeulich@xxxxxxxx>
---
 xen/arch/x86/setup.c                  | 2 --
 xen/arch/x86/x86_64/mmconfig-shared.c | 2 ++
 xen/drivers/passthrough/pci.c         | 2 +-
 xen/include/xen/iommu.h               | 2 --
 xen/include/xen/pci.h                 | 1 +
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index 8d0f6f14e3..a22256f0cd 100644
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -1609,8 +1609,6 @@ void __init noreturn __start_xen(unsigned long mbi_p)
 
     local_irq_enable();
 
-    pt_pci_init();
-
     vesa_mtrr_init();
 
     acpi_mmcfg_init();
diff --git a/xen/arch/x86/x86_64/mmconfig-shared.c 
b/xen/arch/x86/x86_64/mmconfig-shared.c
index 4a6ca26801..8675dbd1ed 100644
--- a/xen/arch/x86/x86_64/mmconfig-shared.c
+++ b/xen/arch/x86/x86_64/mmconfig-shared.c
@@ -400,6 +400,8 @@ void __init acpi_mmcfg_init(void)
 {
     bool_t valid = 1;
 
+    pci_segments_init();
+
     /* MMCONFIG disabled */
     if ((pci_probe & PCI_PROBE_MMCONF) == 0)
         return;
diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c
index c4890a4295..d1adffa095 100644
--- a/xen/drivers/passthrough/pci.c
+++ b/xen/drivers/passthrough/pci.c
@@ -126,7 +126,7 @@ static int pci_segments_iterate(
     return rc;
 }
 
-void __init pt_pci_init(void)
+void __init pci_segments_init(void)
 {
     radix_tree_init(&pci_segments);
     if ( !alloc_pseg(0) )
diff --git a/xen/include/xen/iommu.h b/xen/include/xen/iommu.h
index 6b42e3b876..e35d941f3c 100644
--- a/xen/include/xen/iommu.h
+++ b/xen/include/xen/iommu.h
@@ -92,8 +92,6 @@ struct domain_iommu {
 #define iommu_clear_feature(d, f) clear_bit(f, dom_iommu(d)->features)
 
 #ifdef CONFIG_HAS_PCI
-void pt_pci_init(void);
-
 struct pirq;
 int hvm_do_IRQ_dpci(struct domain *, struct pirq *);
 int pt_irq_create_bind(struct domain *, const struct xen_domctl_bind_pt_irq *);
diff --git a/xen/include/xen/pci.h b/xen/include/xen/pci.h
index 4cfa774615..580e820a33 100644
--- a/xen/include/xen/pci.h
+++ b/xen/include/xen/pci.h
@@ -143,6 +143,7 @@ struct pci_dev *pci_lock_domain_pdev(
 void setup_hwdom_pci_devices(struct domain *,
                             int (*)(u8 devfn, struct pci_dev *));
 int pci_release_devices(struct domain *d);
+void pci_segments_init(void);
 int pci_add_segment(u16 seg);
 const unsigned long *pci_get_ro_map(u16 seg);
 int pci_add_device(u16 seg, u8 bus, u8 devfn,
--
generated by git-patchbot for /home/xen/git/xen.git#staging

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog