[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-6fa4a94e150be25d02547d51f03b4bc34aaec32f@git.kernel.org>
Date: Thu, 8 Mar 2018 03:35:01 -0800
From: tip-bot for Otavio Pontes <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: bhelgaas@...gle.com, andy.shevchenko@...il.com, mingo@...nel.org,
hpa@...or.com, otavio.pontes@...el.com, jan.kiszka@...mens.com,
linux-kernel@...r.kernel.org, tglx@...utronix.de
Subject: [tip:x86/platform] x86/jailhouse: Enable PCI mmconfig access in
inmates
Commit-ID: 6fa4a94e150be25d02547d51f03b4bc34aaec32f
Gitweb: https://git.kernel.org/tip/6fa4a94e150be25d02547d51f03b4bc34aaec32f
Author: Otavio Pontes <otavio.pontes@...el.com>
AuthorDate: Wed, 7 Mar 2018 08:39:14 +0100
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitDate: Thu, 8 Mar 2018 12:30:38 +0100
x86/jailhouse: Enable PCI mmconfig access in inmates
Use the PCI mmconfig base address exported by jailhouse in boot parameters
in order to access the memory mapped PCI configuration space.
[Jan: rebased, fixed !CONFIG_PCI_MMCONFIG, used pcibios_last_bus]
Signed-off-by: Otavio Pontes <otavio.pontes@...el.com>
Signed-off-by: Jan Kiszka <jan.kiszka@...mens.com>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Reviewed-by: Andy Shevchenko <andy.shevchenko@...il.com>
Cc: jailhouse-dev@...glegroups.com
Cc: linux-pci@...r.kernel.org
Cc: virtualization@...ts.linux-foundation.org
Cc: Bjorn Helgaas <bhelgaas@...gle.com>
Link: https://lkml.kernel.org/r/2ee9e4401fa22377b3965893a558120f169be82b.1520408357.git.jan.kiszka@siemens.com
---
arch/x86/include/asm/pci_x86.h | 2 ++
arch/x86/kernel/jailhouse.c | 8 ++++++++
arch/x86/pci/mmconfig-shared.c | 4 ++--
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/arch/x86/include/asm/pci_x86.h b/arch/x86/include/asm/pci_x86.h
index eb66fa9cd0fc..959d618dbb17 100644
--- a/arch/x86/include/asm/pci_x86.h
+++ b/arch/x86/include/asm/pci_x86.h
@@ -151,6 +151,8 @@ extern int pci_mmconfig_insert(struct device *dev, u16 seg, u8 start, u8 end,
phys_addr_t addr);
extern int pci_mmconfig_delete(u16 seg, u8 start, u8 end);
extern struct pci_mmcfg_region *pci_mmconfig_lookup(int segment, int bus);
+extern struct pci_mmcfg_region *__init pci_mmconfig_add(int segment, int start,
+ int end, u64 addr);
extern struct list_head pci_mmcfg_list;
diff --git a/arch/x86/kernel/jailhouse.c b/arch/x86/kernel/jailhouse.c
index b68fd895235a..fa183a131edc 100644
--- a/arch/x86/kernel/jailhouse.c
+++ b/arch/x86/kernel/jailhouse.c
@@ -124,6 +124,14 @@ static int __init jailhouse_pci_arch_init(void)
if (pcibios_last_bus < 0)
pcibios_last_bus = 0xff;
+#ifdef CONFIG_PCI_MMCONFIG
+ if (setup_data.pci_mmconfig_base) {
+ pci_mmconfig_add(0, 0, pcibios_last_bus,
+ setup_data.pci_mmconfig_base);
+ pci_mmcfg_arch_init();
+ }
+#endif
+
return 0;
}
diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c
index 0b40482578b8..7389db538c30 100644
--- a/arch/x86/pci/mmconfig-shared.c
+++ b/arch/x86/pci/mmconfig-shared.c
@@ -94,8 +94,8 @@ static struct pci_mmcfg_region *pci_mmconfig_alloc(int segment, int start,
return new;
}
-static struct pci_mmcfg_region *__init pci_mmconfig_add(int segment, int start,
- int end, u64 addr)
+struct pci_mmcfg_region *__init pci_mmconfig_add(int segment, int start,
+ int end, u64 addr)
{
struct pci_mmcfg_region *new;
Powered by blists - more mailing lists