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

Commit d3ccaff8 authored by Bob Moore's avatar Bob Moore Committed by Len Brown
Browse files

ACPICA: Add override for dynamic tables 



Add a call to acpi_os_table_override during the installation of a
dynamic table (loaded via the Load or LoadTable AML operators).

Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarLin Ming <ming.m.lin@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 97cbb7d1

drivers/acpi/acpica/tbinstal.c

+27 −1
Original line number Diff line number Diff line
@@ -103,7 +103,9 @@ acpi_status acpi_tb_verify_table(struct acpi_table_desc *table_desc) 
 *

 * RETURN:      Status

 *

 * DESCRIPTION: This function is called to add the ACPI table

 * DESCRIPTION: This function is called to add an ACPI table. It is used to

 *              dynamically load tables via the Load and load_table AML

 *              operators.

 *

 ******************************************************************************/
@@ -112,6 +114,7 @@ acpi_tb_add_table(struct acpi_table_desc *table_desc, u32 *table_index) 
{

	u32 i;

	acpi_status status = AE_OK;

	struct acpi_table_header *override_table = NULL;



	ACPI_FUNCTION_TRACE(tb_add_table);
@@ -201,6 +204,29 @@ acpi_tb_add_table(struct acpi_table_desc *table_desc, u32 *table_index) 
		}

	}



	/*

	 * ACPI Table Override:

	 * Allow the host to override dynamically loaded tables.

	 */

	status = acpi_os_table_override(table_desc->pointer, &override_table);

	if (ACPI_SUCCESS(status) && override_table) {

		ACPI_INFO((AE_INFO,

			   "%4.4s @ 0x%p Table override, replaced with:",

			   table_desc->pointer->signature,

			   ACPI_CAST_PTR(void, table_desc->address)));



		/* We can delete the table that was passed as a parameter */



		acpi_tb_delete_table(table_desc);



		/* Setup descriptor for the new table */



		table_desc->address = ACPI_PTR_TO_PHYSADDR(override_table);

		table_desc->pointer = override_table;

		table_desc->length = override_table->length;

		table_desc->flags = ACPI_TABLE_ORIGIN_OVERRIDE;

	}



	/* Add the table to the global root table list */



	status = acpi_tb_store_table(table_desc->address, table_desc->pointer,