Re: [PATCH v5 04/22] x86, ACPI: Search buffer above 4G in second try for acpi override tables
From: Toshi Kani <hidden>
Date: 2013-06-17 23:22:49
Also in:
lkml
On Fri, 2013-06-14 at 17:56 -0700, Yinghai Lu wrote:
quoted hunk ↗ jump to hunk
Now we only search buffer for override acpi table under 4G. In some case, like user use memmap to exclude all low ram, we may not find range for it under 4G. Do second try to search above 4G. Signed-off-by: Yinghai Lu <yinghai@kernel.org> Cc: "Rafael J. Wysocki" <redacted> Cc: linux-acpi@vger.kernel.org Tested-by: Thomas Renninger <redacted> Reviewed-by: Tang Chen <redacted> Tested-by: Tang Chen <redacted> --- drivers/acpi/osl.c | 4 ++++ 1 file changed, 4 insertions(+)diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 93e3194..42c48fc 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c@@ -627,6 +627,10 @@ void __init acpi_initrd_override(void *data, size_t size) /* under 4G at first, then above 4G */ acpi_tables_addr = memblock_find_in_range(0, (1ULL<<32) - 1, all_tables_size, PAGE_SIZE); + if (!acpi_tables_addr) + acpi_tables_addr = memblock_find_in_range(0, + ~(phys_addr_t)0, + all_tables_size, PAGE_SIZE);
Should this search start from 4G, instead of 0? Thanks, -Toshi
if (!acpi_tables_addr) {
WARN_ON(1);
return;