summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2018-01-19 11:06:30 +0100
committerThomas Gleixner <tglx@linutronix.de>2018-01-20 08:15:44 +0100
commit3b42349d56c96e144401d2317d8eeb9937511423 (patch)
treee108e9fb5db5c4270a90c87366905f615478d790 /arch/x86/kernel
parent11f19ec025dd421c54978c69e42d86758fa310de (diff)
downloadlinux-3b42349d56c96e144401d2317d8eeb9937511423.tar.bz2
x86/jailhouse: Respect pci=lastbus command line settings
Limiting the scan width to the known last bus via the command line can accelerate the boot noteworthy. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Jailhouse <jailhouse-dev@googlegroups.com> Link: https://lkml.kernel.org/r/51f5fe62-ca8f-9286-5cdb-39df3fad78b4@siemens.com
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r--arch/x86/kernel/jailhouse.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/kernel/jailhouse.c b/arch/x86/kernel/jailhouse.c
index 2b7ebbe9043d..b68fd895235a 100644
--- a/arch/x86/kernel/jailhouse.c
+++ b/arch/x86/kernel/jailhouse.c
@@ -119,8 +119,10 @@ static int __init jailhouse_pci_arch_init(void)
/*
* There are no bridges on the virtual PCI root bus under Jailhouse,
* thus no other way to discover all devices than a full scan.
+ * Respect any overrides via the command line, though.
*/
- pcibios_last_bus = 0xff;
+ if (pcibios_last_bus < 0)
+ pcibios_last_bus = 0xff;
return 0;
}