Commit c46ae1fc authored by Will Deacon's avatar Will Deacon
Browse files

Merge branch 'for-next/acpi' into for-next/core 

* for-next/acpi:
  ACPI: APMT: Fix kerneldoc and indentation
  ACPI: Enable FPDT on arm64
  arm_pmu: acpi: handle allocation failure
  arm_pmu: rework ACPI probing
  arm_pmu: factor out PMU matching
  arm_pmu: acpi: factor out PMU<->CPU association
  ACPI/IORT: Update SMMUv3 DeviceID support
  ACPI: ARM Performance Monitoring Unit Table (APMT) initial support
parents f0c4d9fc 39522031

Documentation/arm64/acpi_object_usage.rst

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ FPDT Section 5.2.23 (signature == "FPDT") 


       **Firmware Performance Data Table**



       Optional, not currently supported.

       Optional, useful for boot performance profiling.



GTDT   Section 5.2.24 (signature == "GTDT")

arch/arm64/Kconfig

+1 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

config ARM64

	def_bool y

	select ACPI_APMT if ACPI

	select ACPI_CCA_REQUIRED if ACPI

	select ACPI_GENERIC_GSI if ACPI

	select ACPI_GTDT if ACPI

drivers/acpi/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ config ACPI_SPCR_TABLE 


config ACPI_FPDT

	bool "ACPI Firmware Performance Data Table (FPDT) support"

	depends on X86_64

	depends on X86_64 || ARM64

	help

	  Enable support for the Firmware Performance Data Table (FPDT).

	  This table provides information on the timing of the system

drivers/acpi/arm64/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -18,3 +18,6 @@ config ACPI_AGDI 
	  reset command.



	  If set, the kernel parses AGDI table and listens for the command.



config ACPI_APMT

	bool

drivers/acpi/arm64/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -2,4 +2,5 @@ 
obj-$(CONFIG_ACPI_AGDI) 	+= agdi.o

obj-$(CONFIG_ACPI_IORT) 	+= iort.o

obj-$(CONFIG_ACPI_GTDT) 	+= gtdt.o

obj-$(CONFIG_ACPI_APMT) 	+= apmt.o

obj-y				+= dma.o