leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86/jailhouse: Initialize PCI support

Browse Source 
With this change, PCI devices can be detected and used inside a non-root
cell.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: jailhouse-dev@googlegroups.com
Link: https://lkml.kernel.org/r/e8d19494b96b68a749bcac514795d864ad9c28c3.1511770314.git.jan.kiszka@siemens.com
This commit is contained in:
Jan Kiszka 2017-11-27 09:11:54 +01:00 committed by Thomas Gleixner
parent cf878e169d
commit a0c01e4bb9
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arch/x86/kernel/jailhouse.c
View File

@ -16,6 +16,7 @@
#include <asm/hypervisor.h> #include <asm/hypervisor.h>
#include <asm/i8259.h> #include <asm/i8259.h>
#include <asm/irqdomain.h> #include <asm/irqdomain.h>
#include <asm/pci_x86.h>
#include <asm/reboot.h> #include <asm/reboot.h>
#include <asm/setup.h> #include <asm/setup.h>
@ -106,6 +107,19 @@ static void jailhouse_no_restart(void)
machine_halt(); machine_halt();
} }
static int __init jailhouse_pci_arch_init(void)
{
pci_direct_init(1);
/*
* There are no bridges on the virtual PCI root bus under Jailhouse,
* thus no other way to discover all devices than a full scan.
*/
pcibios_last_bus = 0xff;
return 0;
}
static void __init jailhouse_init_platform(void) static void __init jailhouse_init_platform(void)
{ {
u64 pa_data = boot_params.hdr.setup_data; u64 pa_data = boot_params.hdr.setup_data;
@ -115,6 +129,7 @@ static void __init jailhouse_init_platform(void)
x86_init.irqs.pre_vector_init = x86_init_noop; x86_init.irqs.pre_vector_init = x86_init_noop;
x86_init.timers.timer_init = jailhouse_timer_init; x86_init.timers.timer_init = jailhouse_timer_init;
x86_init.mpparse.get_smp_config = jailhouse_get_smp_config; x86_init.mpparse.get_smp_config = jailhouse_get_smp_config;
x86_init.pci.arch_init = jailhouse_pci_arch_init;
x86_platform.calibrate_cpu = jailhouse_get_tsc; x86_platform.calibrate_cpu = jailhouse_get_tsc;
x86_platform.calibrate_tsc = jailhouse_get_tsc; x86_platform.calibrate_tsc = jailhouse_get_tsc;
@ -157,6 +172,8 @@ static void __init jailhouse_init_platform(void)
precalibrated_tsc_khz = setup_data.tsc_khz; precalibrated_tsc_khz = setup_data.tsc_khz;
pci_probe = 0;
/* /*
* Avoid that the kernel complains about missing ACPI tables - there * Avoid that the kernel complains about missing ACPI tables - there
* are none in a non-root cell. * are none in a non-root cell.