Commit 044cd809 authored by Yinghai Lu's avatar Yinghai Lu Committed by Jesse Barnes

x86/PCI: don't call e820_all_mapped with -1 in the mmconfig case

e820_all_mapped need end is (addr + size) instead of (addr + size - 1)

Cc: stable@kernel.org
Acked-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 162dedd3
...@@ -375,7 +375,7 @@ static acpi_status __init check_mcfg_resource(struct acpi_resource *res, ...@@ -375,7 +375,7 @@ static acpi_status __init check_mcfg_resource(struct acpi_resource *res,
if (!fixmem32) if (!fixmem32)
return AE_OK; return AE_OK;
if ((mcfg_res->start >= fixmem32->address) && if ((mcfg_res->start >= fixmem32->address) &&
(mcfg_res->end < (fixmem32->address + (mcfg_res->end <= (fixmem32->address +
fixmem32->address_length))) { fixmem32->address_length))) {
mcfg_res->flags = 1; mcfg_res->flags = 1;
return AE_CTRL_TERMINATE; return AE_CTRL_TERMINATE;
...@@ -392,7 +392,7 @@ static acpi_status __init check_mcfg_resource(struct acpi_resource *res, ...@@ -392,7 +392,7 @@ static acpi_status __init check_mcfg_resource(struct acpi_resource *res,
return AE_OK; return AE_OK;
if ((mcfg_res->start >= address.minimum) && if ((mcfg_res->start >= address.minimum) &&
(mcfg_res->end < (address.minimum + address.address_length))) { (mcfg_res->end <= (address.minimum + address.address_length))) {
mcfg_res->flags = 1; mcfg_res->flags = 1;
return AE_CTRL_TERMINATE; return AE_CTRL_TERMINATE;
} }
...@@ -439,7 +439,7 @@ static int __init is_mmconf_reserved(check_reserved_t is_reserved, ...@@ -439,7 +439,7 @@ static int __init is_mmconf_reserved(check_reserved_t is_reserved,
u64 old_size = size; u64 old_size = size;
int valid = 0; int valid = 0;
while (!is_reserved(addr, addr + size - 1, E820_RESERVED)) { while (!is_reserved(addr, addr + size, E820_RESERVED)) {
size >>= 1; size >>= 1;
if (size < (16UL<<20)) if (size < (16UL<<20))
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment