Unverified Commit 2c6d976b authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!9947 ACPICA: Revert "ACPICA: avoid Info: mapping multiple BARs. Your kernel is fine." 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zeng Heng <zengheng4@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/2BZHMUUUBP6LH23ADIAFGBRL4I437Y5Q/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAD09L 
 
Link:https://gitee.com/openeuler/kernel/pulls/9947

 

Reviewed-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents b0c53762 ca3da634

drivers/acpi/acpica/exregion.c

+2 −21
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ acpi_ex_system_memory_space_handler(u32 function, 
	struct acpi_mem_mapping *mm = mem_info->cur_mm;

	u32 length;

	acpi_size map_length;

	acpi_size page_boundary_map_length;

#ifdef ACPI_MISALIGNMENT_NOT_SUPPORTED

	u32 remainder;

#endif
@@ -138,26 +137,8 @@ acpi_ex_system_memory_space_handler(u32 function, 
		map_length = (acpi_size)

		    ((mem_info->address + mem_info->length) - address);



		/*

		 * If mapping the entire remaining portion of the region will cross

		 * a page boundary, just map up to the page boundary, do not cross.

		 * On some systems, crossing a page boundary while mapping regions

		 * can cause warnings if the pages have different attributes

		 * due to resource management.

		 *

		 * This has the added benefit of constraining a single mapping to

		 * one page, which is similar to the original code that used a 4k

		 * maximum window.

		 */

		page_boundary_map_length = (acpi_size)

		    (ACPI_ROUND_UP(address, ACPI_DEFAULT_PAGE_SIZE) - address);

		if (page_boundary_map_length == 0) {

			page_boundary_map_length = ACPI_DEFAULT_PAGE_SIZE;

		}



		if (map_length > page_boundary_map_length) {

			map_length = page_boundary_map_length;

		}

		if (map_length > ACPI_DEFAULT_PAGE_SIZE)

			map_length = ACPI_DEFAULT_PAGE_SIZE;



		/* Create a new mapping starting at the address given */