Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc156adf authored by Lv Zheng's avatar Lv Zheng Committed by Rafael J. Wysocki
Browse files

ACPICA: Tables: Fix the issues in handling virtual addressed tables. 



When table is overridden or reloaded, acpi_tb_delete_table() is called where
struct acpi_table_desc.Pointer will be NULL.  It thus is impossible for virtual
addressed tables to obtain the .Pointer again in acpi_tb_verify_table().

This patch stores virtual table addresses  (ACPI_TABLE_ORIGIN_ALLOCATED,
ACPI_TABLE_ORIGIN_UNKNOWN, ACPI_TABLE_ORIGIN_OVERRIDE) in the
struct acpi_table_desc.Address field and refills the struct acpi_table_desc.Pointer
using these addresses in acpi_tb_verify_table(). Note that if a table with
ACPI_TABLE_ORIGIN_ALLOCATED set is actually freed, the .Address field
should be invalidated and thus must be replaced with NULL to avoid wrong
future validations occuring in acpi_tb_verify_table().

Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 5582982d

drivers/acpi/acpica/exconfig.c

+2 −2
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc, 
			return_ACPI_STATUS(status);

		}



		table_desc.address = obj_desc->region.address;

		table_desc.address = ACPI_PTR_TO_PHYSADDR(table_desc.pointer);

		break;



	case ACPI_TYPE_BUFFER:	/* Buffer or resolved region_field */
@@ -476,7 +476,7 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc, 
		}



		ACPI_MEMCPY(table_desc.pointer, table, length);

		table_desc.address = ACPI_TO_INTEGER(table_desc.pointer);

		table_desc.address = ACPI_PTR_TO_PHYSADDR(table_desc.pointer);

		break;



	default:

drivers/acpi/acpica/tbinstal.c

+18 −2
Original line number Diff line number Diff line
@@ -69,11 +69,26 @@ acpi_status acpi_tb_verify_table(struct acpi_table_desc *table_desc) 
	/* Map the table if necessary */



	if (!table_desc->pointer) {

		if ((table_desc->flags & ACPI_TABLE_ORIGIN_MASK) ==

		    ACPI_TABLE_ORIGIN_MAPPED) {

		switch (table_desc->flags & ACPI_TABLE_ORIGIN_MASK) {

		case ACPI_TABLE_ORIGIN_MAPPED:



			table_desc->pointer =

			    acpi_os_map_memory(table_desc->address,

					       table_desc->length);

			break;



		case ACPI_TABLE_ORIGIN_ALLOCATED:

		case ACPI_TABLE_ORIGIN_UNKNOWN:

		case ACPI_TABLE_ORIGIN_OVERRIDE:



			table_desc->pointer =

			    ACPI_CAST_PTR(struct acpi_table_header,

					  table_desc->address);

			break;



		default:



			break;

		}



		if (!table_desc->pointer) {
@@ -476,6 +491,7 @@ void acpi_tb_delete_table(struct acpi_table_desc *table_desc) 
	case ACPI_TABLE_ORIGIN_ALLOCATED:



		ACPI_FREE(table_desc->pointer);

		table_desc->address = ACPI_PTR_TO_PHYSADDR(NULL);

		break;



		/* Not mapped or allocated, there is nothing we can do */

drivers/acpi/acpica/tbutils.c

+1 −0
Original line number Diff line number Diff line
@@ -179,6 +179,7 @@ struct acpi_table_header *acpi_tb_copy_dsdt(u32 table_index) 


	ACPI_MEMCPY(new_table, table_desc->pointer, table_desc->length);

	acpi_tb_delete_table(table_desc);

	table_desc->address = ACPI_PTR_TO_PHYSADDR(new_table);

	table_desc->pointer = new_table;

	table_desc->flags = ACPI_TABLE_ORIGIN_ALLOCATED;