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

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

ACPICA: Tables: Remove acpi_tb_install_fixed_table() 

ACPICA commit 42c7b848d2faa02c7691ef2c53ea741c23cd4665

acpi_tb_install_fixed_table() is now redundant as we've removed the fixed
table indexing mechanism:
  Commit: 8ec3f459
  Subject: ACPICA: Tables: Fix global table list issues by removing
           fixed table indexes
This patch cleans up the code accordingly.

No functional change. Lv Zheng.

Link: https://bugs.acpica.org/show_bug.cgi?id=1320
Link: https://github.com/acpica/acpica/commit/42c7b848


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 eacce4b6

drivers/acpi/acpica/actables.h

+1 −6
Original line number Diff line number Diff line
@@ -155,12 +155,7 @@ void 
acpi_tb_install_table_with_override(struct acpi_table_desc *new_table_desc,

				    u8 override, u32 *table_index);



acpi_status

acpi_tb_install_fixed_table(acpi_physical_address address,

			    char *signature, u32 *table_index);



acpi_status ACPI_INIT_FUNCTION

acpi_tb_parse_root_table(acpi_physical_address rsdp_address);

acpi_status acpi_tb_parse_root_table(acpi_physical_address rsdp_address);



/*

 * tbxfload

drivers/acpi/acpica/tbfadt.c

+14 −10
Original line number Diff line number Diff line
@@ -344,22 +344,26 @@ void acpi_tb_parse_fadt(void) 


	/* Obtain the DSDT and FACS tables via their addresses within the FADT */



	acpi_tb_install_fixed_table((acpi_physical_address)acpi_gbl_FADT.Xdsdt,

				    ACPI_SIG_DSDT, &acpi_gbl_dsdt_index);

	acpi_tb_install_standard_table((acpi_physical_address)acpi_gbl_FADT.

				       Xdsdt,

				       ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL,

				       FALSE, TRUE, &acpi_gbl_dsdt_index);



	/* If Hardware Reduced flag is set, there is no FACS */



	if (!acpi_gbl_reduced_hardware) {

		if (acpi_gbl_FADT.facs) {

			acpi_tb_install_fixed_table((acpi_physical_address)

			acpi_tb_install_standard_table((acpi_physical_address)

						       acpi_gbl_FADT.facs,

						    ACPI_SIG_FACS,

						       ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL,

						       FALSE, TRUE,

						       &acpi_gbl_facs_index);

		}

		if (acpi_gbl_FADT.Xfacs) {

			acpi_tb_install_fixed_table((acpi_physical_address)

			acpi_tb_install_standard_table((acpi_physical_address)

						       acpi_gbl_FADT.Xfacs,

						    ACPI_SIG_FACS,

						       ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL,

						       FALSE, TRUE,

						       &acpi_gbl_xfacs_index);

		}

	}

drivers/acpi/acpica/tbinstal.c

+1 −64
Original line number Diff line number Diff line
@@ -155,68 +155,6 @@ acpi_tb_install_table_with_override(struct acpi_table_desc *new_table_desc, 
	}

}



/*******************************************************************************

 *

 * FUNCTION:    acpi_tb_install_fixed_table

 *

 * PARAMETERS:  address                 - Physical address of DSDT or FACS

 *              signature               - Table signature, NULL if no need to

 *                                        match

 *              table_index             - Where the table index is returned

 *

 * RETURN:      Status

 *

 * DESCRIPTION: Install a fixed ACPI table (DSDT/FACS) into the global data

 *              structure.

 *

 ******************************************************************************/



acpi_status

acpi_tb_install_fixed_table(acpi_physical_address address,

			    char *signature, u32 *table_index)

{

	struct acpi_table_desc new_table_desc;

	acpi_status status;



	ACPI_FUNCTION_TRACE(tb_install_fixed_table);



	if (!address) {

		ACPI_ERROR((AE_INFO,

			    "Null physical address for ACPI table [%s]",

			    signature));

		return (AE_NO_MEMORY);

	}



	/* Fill a table descriptor for validation */



	status = acpi_tb_acquire_temp_table(&new_table_desc, address,

					    ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL);

	if (ACPI_FAILURE(status)) {

		ACPI_ERROR((AE_INFO,

			    "Could not acquire table length at %8.8X%8.8X",

			    ACPI_FORMAT_UINT64(address)));

		return_ACPI_STATUS(status);

	}



	/* Validate and verify a table before installation */



	status = acpi_tb_verify_temp_table(&new_table_desc, signature);

	if (ACPI_FAILURE(status)) {

		goto release_and_exit;

	}



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



	acpi_tb_install_table_with_override(&new_table_desc, TRUE, table_index);



release_and_exit:



	/* Release the temporary table descriptor */



	acpi_tb_release_temp_table(&new_table_desc);

	return_ACPI_STATUS(status);

}



/*******************************************************************************

 *

 * FUNCTION:    acpi_tb_install_standard_table
@@ -230,8 +168,7 @@ acpi_tb_install_fixed_table(acpi_physical_address address, 
 *

 * RETURN:      Status

 *

 * DESCRIPTION: This function is called to install an ACPI table that is

 *              neither DSDT nor FACS (a "standard" table.)

 * DESCRIPTION: This function is called to verify and install an ACPI table.

 *              When this function is called by "Load" or "LoadTable" opcodes,

 *              or by acpi_load_table() API, the "Reload" parameter is set.

 *              After sucessfully returning from this function, table is