lkml.org 
[lkml]   [2017]   [Nov]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 12/12] x86/jailhouse: Initialize PCI support
    Date
    From: Jan Kiszka <jan.kiszka@siemens.com>

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

    Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
    ---
    arch/x86/kernel/jailhouse.c | 17 +++++++++++++++++
    1 file changed, 17 insertions(+)

    diff --git a/arch/x86/kernel/jailhouse.c b/arch/x86/kernel/jailhouse.c
    index 8ff21e1534de..70b857d4b1f5 100644
    --- a/arch/x86/kernel/jailhouse.c
    +++ b/arch/x86/kernel/jailhouse.c
    @@ -18,6 +18,7 @@
    #include <asm/hypervisor.h>
    #include <asm/i8259.h>
    #include <asm/irqdomain.h>
    +#include <asm/pci_x86.h>
    #include <asm/reboot.h>
    #include <asm/setup.h>

    @@ -108,6 +109,19 @@ static void jailhouse_no_restart(void)
    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)
    {
    u64 pa_data = boot_params.hdr.setup_data;
    @@ -117,6 +131,7 @@ static void __init jailhouse_init_platform(void)
    x86_init.irqs.pre_vector_init = x86_init_noop;
    x86_init.timers.timer_init = jailhouse_timer_init;
    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_tsc = jailhouse_get_tsc;
    @@ -159,6 +174,8 @@ static void __init jailhouse_init_platform(void)

    precalibrated_tsc_khz = setup_data.tsc_khz;

    + pci_probe = 0;
    +
    /*
    * Avoid that the kernel complains about missing ACPI tables - there
    * are none in a non-root cell.
    --
    2.12.3
    \
     
     \ /
      Last update: 2017-11-27 09:13    [W:4.031 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site