renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-27 16:15:54 +08:00
Code

x86/PCI: MMCONFIG: reject MMCONFIG apertures at address zero

Browse Source 
Since all MMCONFIG regions go through pci_mmconfig_add(), we can test the
address once there.  If the caller supplies an address of zero, we never
insert it in the pci_mmcfg_config[] table, so no need to test it elsewhere.

Reviewed-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
Bjorn Helgaas 2009-11-13 17:34:03 -07:00 committed by Jesse Barnes
parent 463a5df175
commit f7ca698487
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/x86/pci/mmconfig-shared.c
View File

@ -41,6 +41,9 @@ static __init struct acpi_mcfg_allocation *pci_mmconfig_add(int segment,
int new_num = pci_mmcfg_config_num + 1; int new_num = pci_mmcfg_config_num + 1;
int i = pci_mmcfg_config_num; int i = pci_mmcfg_config_num;
if (addr == 0)
return NULL;
new = kzalloc(sizeof(pci_mmcfg_config[0]) * new_num, GFP_KERNEL); new = kzalloc(sizeof(pci_mmcfg_config[0]) * new_num, GFP_KERNEL);
if (!new) if (!new)
return NULL; return NULL;
@ -471,8 +474,7 @@ static void __init pci_mmcfg_reject_broken(int early)
typeof(pci_mmcfg_config[0]) *cfg; typeof(pci_mmcfg_config[0]) *cfg;
int i; int i;
if ((pci_mmcfg_config_num == 0) || if (pci_mmcfg_config_num == 0)
(pci_mmcfg_config[0].address == 0))
return; return;
for (i = 0; i < pci_mmcfg_config_num; i++) { for (i = 0; i < pci_mmcfg_config_num; i++) {
@ -616,8 +618,7 @@ static void __init __pci_mmcfg_init(int early)
pci_mmcfg_reject_broken(early); pci_mmcfg_reject_broken(early);
if ((pci_mmcfg_config_num == 0) || if (pci_mmcfg_config_num == 0)
(pci_mmcfg_config[0].address == 0))
return; return;
if (pci_mmcfg_arch_init()) if (pci_mmcfg_arch_init())
@ -649,8 +650,7 @@ static int __init pci_mmcfg_late_insert_resources(void)
*/ */
if ((pci_mmcfg_resources_inserted == 1) || if ((pci_mmcfg_resources_inserted == 1) ||
(pci_probe & PCI_PROBE_MMCONF) == 0 || (pci_probe & PCI_PROBE_MMCONF) == 0 ||
(pci_mmcfg_config_num == 0) || (pci_mmcfg_config_num == 0))
(pci_mmcfg_config[0].address == 0))
return 1; return 1;
/* /*