diff options
author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-04-14 19:08:25 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-26 17:41:04 -0400 |
commit | 5f0b2976cb2b62668a076f54419c24b8ab677167 (patch) | |
tree | da8439a413adf51359728208beab5ce9f6863ce5 /arch/x86/pci/mmconfig-shared.c | |
parent | e8ee6f0ae5cd860e8e6c02807edfa3c1fa01bcb5 (diff) |
x86: add pci=check_enable_amd_mmconf and dmi check
so will disable that feature by default, and only enable that via
pci=check_enable_amd_mmconf or for system match with dmi table.
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/pci/mmconfig-shared.c')
-rw-r--r-- | arch/x86/pci/mmconfig-shared.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c index bdf62243186a..0cfebecf2a8f 100644 --- a/arch/x86/pci/mmconfig-shared.c +++ b/arch/x86/pci/mmconfig-shared.c | |||
@@ -107,6 +107,9 @@ static const char __init *pci_mmcfg_amd_fam10h(void) | |||
107 | int i; | 107 | int i; |
108 | unsigned segnbits = 0, busnbits; | 108 | unsigned segnbits = 0, busnbits; |
109 | 109 | ||
110 | if (!(pci_probe & PCI_CHECK_ENABLE_AMD_MMCONF)) | ||
111 | return NULL; | ||
112 | |||
110 | address = MSR_FAM10H_MMIO_CONF_BASE; | 113 | address = MSR_FAM10H_MMIO_CONF_BASE; |
111 | if (rdmsr_safe(address, &low, &high)) | 114 | if (rdmsr_safe(address, &low, &high)) |
112 | return NULL; | 115 | return NULL; |