arm64: mpam: Select ARCH_HAS_CPU_RESCTRL

Enough MPAM support is present to enable ARCH_HAS_CPU_RESCTRL.  Let it
rip^Wlink!

ARCH_HAS_CPU_RESCTRL indicates resctrl can be enabled. It is enabled by the
arch code simply because it has 'arch' in its name.

This removes ARM_CPU_RESCTRL as a mimic of X86_CPU_RESCTRL.  While here,
move the ACPI dependency to the driver's Kconfig file.

Tested-by: Gavin Shan <gshan@redhat.com>
Tested-by: Shaopeng Tan <tan.shaopeng@jp.fujitsu.com>
Tested-by: Peter Newman <peternewman@google.com>
Tested-by: Zeng Heng <zengheng4@huawei.com>
Tested-by: Punit Agrawal <punit.agrawal@oss.qualcomm.com>
Tested-by: Jesse Chick <jessechick@os.amperecomputing.com>
Reviewed-by: Zeng Heng <zengheng4@huawei.com>
Reviewed-by: Shaopeng Tan <tan.shaopeng@jp.fujitsu.com>
Reviewed-by: Jonathan Cameron <jonathan.cameron@huawei.com>
Reviewed-by: Gavin Shan <gshan@redhat.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Co-developed-by: Ben Horgan <ben.horgan@arm.com>
Signed-off-by: Ben Horgan <ben.horgan@arm.com>
Signed-off-by: James Morse <james.morse@arm.com>

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 3170c67464fbdc8a66822f41b558e6b5c71cf545..41a5b4ef86b415e907f1486cc50b38e7fe52b4cf 100644 (file)
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -2017,7 +2017,7 @@ config ARM64_TLB_RANGE
 config ARM64_MPAM
        bool "Enable support for MPAM"
        select ARM64_MPAM_DRIVER
-       select ACPI_MPAM if ACPI
+       select ARCH_HAS_CPU_RESCTRL
        help
          Memory System Resource Partitioning and Monitoring (MPAM) is an
          optional extension to the Arm architecture that allows each

diff --git a/arch/arm64/include/asm/resctrl.h b/arch/arm64/include/asm/resctrl.h
new file mode 100644 (file)
index 0000000..b506e95
--- /dev/null
+++ b/arch/arm64/include/asm/resctrl.h
@@ -0,0 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#include <linux/arm_mpam.h>

diff --git a/drivers/resctrl/Kconfig b/drivers/resctrl/Kconfig
index c34e059c6e41f4b9efdde6073a128a1243dcc2b0..672abea3b03ccbeb4532832dd18e5cb80e90ff5b 100644 (file)
--- a/drivers/resctrl/Kconfig
+++ b/drivers/resctrl/Kconfig
@@ -1,6 +1,7 @@
 menuconfig ARM64_MPAM_DRIVER
        bool "MPAM driver"
        depends on ARM64 && ARM64_MPAM
+       select ACPI_MPAM if ACPI
        help
          Memory System Resource Partitioning and Monitoring (MPAM) driver for
          System IP, e.g. caches and memory controllers.
@@ -22,3 +23,9 @@ config MPAM_KUNIT_TEST
          If unsure, say N.
 
 endif
+
+config ARM64_MPAM_RESCTRL_FS
+       bool
+       default y if ARM64_MPAM_DRIVER && RESCTRL_FS
+       select RESCTRL_RMID_DEPENDS_ON_CLOSID
+       select RESCTRL_ASSIGN_FIXED

diff --git a/drivers/resctrl/Makefile b/drivers/resctrl/Makefile
index 40beaf999582cfa77799f404b500061ec4da3de2..4f6d0e81f9b8f34bd8842fdb13be69da72515b79 100644 (file)
--- a/drivers/resctrl/Makefile
+++ b/drivers/resctrl/Makefile
@@ -1,5 +1,5 @@
 obj-$(CONFIG_ARM64_MPAM_DRIVER)                        += mpam.o
 mpam-y                                         += mpam_devices.o
-mpam-$(CONFIG_ARM_CPU_RESCTRL)                 += mpam_resctrl.o
+mpam-$(CONFIG_ARM64_MPAM_RESCTRL_FS)           += mpam_resctrl.o
 
 ccflags-$(CONFIG_ARM64_MPAM_DRIVER_DEBUG)      += -DDEBUG