Commit 4aab135b authored by James Morse's avatar James Morse
Browse files

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: default avatarGavin Shan <gshan@redhat.com>
Tested-by: default avatarShaopeng Tan <tan.shaopeng@jp.fujitsu.com>
Tested-by: default avatarPeter Newman <peternewman@google.com>
Tested-by: default avatarZeng Heng <zengheng4@huawei.com>
Tested-by: default avatarPunit Agrawal <punit.agrawal@oss.qualcomm.com>
Tested-by: default avatarJesse Chick <jessechick@os.amperecomputing.com>
Reviewed-by: default avatarZeng Heng <zengheng4@huawei.com>
Reviewed-by: default avatarShaopeng Tan <tan.shaopeng@jp.fujitsu.com>
Reviewed-by: default avatarJonathan Cameron <jonathan.cameron@huawei.com>
Reviewed-by: default avatarGavin Shan <gshan@redhat.com>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Co-developed-by: default avatarBen Horgan <ben.horgan@arm.com>
Signed-off-by: default avatarBen Horgan <ben.horgan@arm.com>
Signed-off-by: default avatarJames Morse <james.morse@arm.com>
parent efc775ea

arch/arm64/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/arm64/include/asm/resctrl.h

0 → 100644
+2 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#include <linux/arm_mpam.h>

drivers/resctrl/Kconfig

+7 −0
Original line number Diff line number Diff line 
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

drivers/resctrl/Makefile

+1 −1
Original line number Diff line number Diff line 
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