Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drivers: firmware: psci: Move psci to separate directory

Some following changes extends the PSCI driver with some additional
files. Avoid to continue cluttering the toplevel firmware directory
and first move the PSCI files into a PSCI sub-directory.

Suggested-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

authored by

Ulf Hansson and committed by
Rafael J. Wysocki
e720a6c8 15ade5d2

+19 -16
+1 -14
drivers/firmware/Kconfig
··· 5 5 6 6 menu "Firmware Drivers" 7 7 8 - config ARM_PSCI_FW 9 - bool 10 - 11 - config ARM_PSCI_CHECKER 12 - bool "ARM PSCI checker" 13 - depends on ARM_PSCI_FW && HOTPLUG_CPU && CPU_IDLE && !TORTURE_TEST 14 - help 15 - Run the PSCI checker during startup. This checks that hotplug and 16 - suspend operations work correctly when using PSCI. 17 - 18 - The torture tests may interfere with the PSCI checker by turning CPUs 19 - on and off through hotplug, so for now torture tests and PSCI checker 20 - are mutually exclusive. 21 - 22 8 config ARM_SCMI_PROTOCOL 23 9 bool "ARM System Control and Management Interface (SCMI) Message Protocol" 24 10 depends on ARM || ARM64 || COMPILE_TEST ··· 256 270 config HAVE_ARM_SMCCC 257 271 bool 258 272 273 + source "drivers/firmware/psci/Kconfig" 259 274 source "drivers/firmware/broadcom/Kconfig" 260 275 source "drivers/firmware/google/Kconfig" 261 276 source "drivers/firmware/efi/Kconfig"
+1 -2
drivers/firmware/Makefile
··· 2 2 # 3 3 # Makefile for the linux kernel. 4 4 # 5 - obj-$(CONFIG_ARM_PSCI_FW) += psci.o 6 - obj-$(CONFIG_ARM_PSCI_CHECKER) += psci_checker.o 7 5 obj-$(CONFIG_ARM_SCPI_PROTOCOL) += arm_scpi.o 8 6 obj-$(CONFIG_ARM_SCPI_POWER_DOMAIN) += scpi_pm_domain.o 9 7 obj-$(CONFIG_ARM_SDE_INTERFACE) += arm_sdei.o ··· 23 25 obj-$(CONFIG_TI_SCI_PROTOCOL) += ti_sci.o 24 26 25 27 obj-$(CONFIG_ARM_SCMI_PROTOCOL) += arm_scmi/ 28 + obj-y += psci/ 26 29 obj-y += broadcom/ 27 30 obj-y += meson/ 28 31 obj-$(CONFIG_GOOGLE_FIRMWARE) += google/
drivers/firmware/psci.c drivers/firmware/psci/psci.c
+13
drivers/firmware/psci/Kconfig
··· 1 + config ARM_PSCI_FW 2 + bool 3 + 4 + config ARM_PSCI_CHECKER 5 + bool "ARM PSCI checker" 6 + depends on ARM_PSCI_FW && HOTPLUG_CPU && CPU_IDLE && !TORTURE_TEST 7 + help 8 + Run the PSCI checker during startup. This checks that hotplug and 9 + suspend operations work correctly when using PSCI. 10 + 11 + The torture tests may interfere with the PSCI checker by turning CPUs 12 + on and off through hotplug, so for now torture tests and PSCI checker 13 + are mutually exclusive.
+4
drivers/firmware/psci/Makefile
··· 1 + # SPDX-License-Identifier: GPL-2.0 2 + # 3 + obj-$(CONFIG_ARM_PSCI_FW) += psci.o 4 + obj-$(CONFIG_ARM_PSCI_CHECKER) += psci_checker.o
drivers/firmware/psci_checker.c drivers/firmware/psci/psci_checker.c