From 89c631bfed12b3d57705c2b938bae083c57f6e29 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 16 Feb 2016 02:45:42 +0000 Subject: [PATCH] [i386/686-pae] PCI: Set pci=nobios by default Forwarded: not-needed CONFIG_PCI_GOBIOS results in physical addresses 640KB-1MB being mapped W+X, which is undesirable for security reasons and will result in a warning at boot now that we enable CONFIG_DEBUG_WX. This can be overridden using the kernel parameter "pci=nobios", but we want to disable W+X by default. Disable PCI BIOS probing by default; it can still be enabled using "pci=bios". Gbp-Pq: Topic debian Gbp-Pq: Name i386-686-pae-pci-set-pci-nobios-by-default.patch --- arch/x86/pci/common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c index ddb79860320..355962c0531 100644 --- a/arch/x86/pci/common.c +++ b/arch/x86/pci/common.c @@ -21,8 +21,8 @@ #include #include -unsigned int pci_probe = PCI_PROBE_BIOS | PCI_PROBE_CONF1 | PCI_PROBE_CONF2 | - PCI_PROBE_MMCONF; +unsigned int pci_probe = PCI_PROBE_CONF1 | PCI_PROBE_CONF2 | PCI_PROBE_MMCONF | + (IS_ENABLED(CONFIG_X86_64) || IS_ENABLED(CONFIG_X86_PAE) ? 0 : PCI_PROBE_BIOS); static int pci_bf_sort; int pci_routeirq; -- 2.30.2