Commit 8ca572ec authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-tables', 'acpi-osl', 'acpi-misc' and 'acpi-tools' 

* acpi-tables:
  ACPI: configfs: Resolve objects on host-directed table loads
  ACPI: tables: Allow BGRT to be overridden

* acpi-osl:
  ACPI: OSL: Make a W=1 kernel-doc warning go away

* acpi-misc:
  ACPI: Make AC and battery drivers available on !X86

* acpi-tools:
  ACPI: tools: Exclude tools/* from .gitignore patterns
parents 417a564c d06c47e3 9fe51603 fb683f47 b1954bbf

drivers/acpi/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -155,7 +155,6 @@ config ACPI_EC_DEBUGFS 


config ACPI_AC

	tristate "AC Adapter"

	depends on X86

	select POWER_SUPPLY

	default y

	help
@@ -168,7 +167,6 @@ config ACPI_AC 


config ACPI_BATTERY

	tristate "Battery"

	depends on X86

	select POWER_SUPPLY

	default y

	help

drivers/acpi/acpi_configfs.c

+1 −5
Original line number Diff line number Diff line
@@ -53,11 +53,7 @@ static ssize_t acpi_table_aml_write(struct config_item *cfg, 
	if (!table->header)

		return -ENOMEM;



	ACPI_INFO(("Host-directed Dynamic ACPI Table Load:"));

	ret = acpi_tb_install_and_load_table(

			ACPI_PTR_TO_PHYSADDR(table->header),

			ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL, FALSE,

			&table->index);

	ret = acpi_load_table(table->header);

	if (ret) {

		kfree(table->header);

		table->header = NULL;

drivers/acpi/acpica/tbxfload.c

+11 −0
Original line number Diff line number Diff line
@@ -297,6 +297,17 @@ acpi_status acpi_load_table(struct acpi_table_header *table) 
	status = acpi_tb_install_and_load_table(ACPI_PTR_TO_PHYSADDR(table),

						ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL,

						FALSE, &table_index);



	if (ACPI_SUCCESS(status)) {

		/* Complete the initialization/resolution of package objects */



		status = acpi_ns_walk_namespace(ACPI_TYPE_PACKAGE,

						ACPI_ROOT_OBJECT,

						ACPI_UINT32_MAX, 0,

						acpi_ns_init_one_package,

						NULL, NULL, NULL);

	}



	return_ACPI_STATUS(status);

}

drivers/acpi/osl.c

+2 −2
Original line number Diff line number Diff line
@@ -301,8 +301,8 @@ static void acpi_unmap(acpi_physical_address pg_off, void __iomem *vaddr) 
 * During early init (when acpi_permanent_mmap has not been set yet) this

 * routine simply calls __acpi_map_table() to get the job done.

 */

void __iomem *__ref

acpi_os_map_iomem(acpi_physical_address phys, acpi_size size)

void __iomem __ref

*acpi_os_map_iomem(acpi_physical_address phys, acpi_size size)

{

	struct acpi_ioremap *map;

	void __iomem *virt;

drivers/acpi/tables.c

+11 −10
Original line number Diff line number Diff line
@@ -490,16 +490,17 @@ static u8 __init acpi_table_checksum(u8 *buffer, u32 length) 


/* All but ACPI_SIG_RSDP and ACPI_SIG_FACS: */

static const char * const table_sigs[] = {

	ACPI_SIG_BERT, ACPI_SIG_CPEP, ACPI_SIG_ECDT, ACPI_SIG_EINJ,

	ACPI_SIG_ERST, ACPI_SIG_HEST, ACPI_SIG_MADT, ACPI_SIG_MSCT,

	ACPI_SIG_SBST, ACPI_SIG_SLIT, ACPI_SIG_SRAT, ACPI_SIG_ASF,

	ACPI_SIG_BOOT, ACPI_SIG_DBGP, ACPI_SIG_DMAR, ACPI_SIG_HPET,

	ACPI_SIG_IBFT, ACPI_SIG_IVRS, ACPI_SIG_MCFG, ACPI_SIG_MCHI,

	ACPI_SIG_SLIC, ACPI_SIG_SPCR, ACPI_SIG_SPMI, ACPI_SIG_TCPA,

	ACPI_SIG_UEFI, ACPI_SIG_WAET, ACPI_SIG_WDAT, ACPI_SIG_WDDT,

	ACPI_SIG_WDRT, ACPI_SIG_DSDT, ACPI_SIG_FADT, ACPI_SIG_PSDT,

	ACPI_SIG_RSDT, ACPI_SIG_XSDT, ACPI_SIG_SSDT, ACPI_SIG_IORT,

	ACPI_SIG_NFIT, ACPI_SIG_HMAT, ACPI_SIG_PPTT, NULL };

	ACPI_SIG_BERT, ACPI_SIG_BGRT, ACPI_SIG_CPEP, ACPI_SIG_ECDT,

	ACPI_SIG_EINJ, ACPI_SIG_ERST, ACPI_SIG_HEST, ACPI_SIG_MADT,

	ACPI_SIG_MSCT, ACPI_SIG_SBST, ACPI_SIG_SLIT, ACPI_SIG_SRAT,

	ACPI_SIG_ASF,  ACPI_SIG_BOOT, ACPI_SIG_DBGP, ACPI_SIG_DMAR,

	ACPI_SIG_HPET, ACPI_SIG_IBFT, ACPI_SIG_IVRS, ACPI_SIG_MCFG,

	ACPI_SIG_MCHI, ACPI_SIG_SLIC, ACPI_SIG_SPCR, ACPI_SIG_SPMI,

	ACPI_SIG_TCPA, ACPI_SIG_UEFI, ACPI_SIG_WAET, ACPI_SIG_WDAT,

	ACPI_SIG_WDDT, ACPI_SIG_WDRT, ACPI_SIG_DSDT, ACPI_SIG_FADT,

	ACPI_SIG_PSDT, ACPI_SIG_RSDT, ACPI_SIG_XSDT, ACPI_SIG_SSDT,

	ACPI_SIG_IORT, ACPI_SIG_NFIT, ACPI_SIG_HMAT, ACPI_SIG_PPTT,

	NULL };



#define ACPI_HEADER_SIZE sizeof(struct acpi_table_header)

CRA Git | Maintained and supported by SUSTech CRA and CCSE