From: Mark Rutland <mark.rutland@arm.com>
To: Ulf Hansson <ulf.hansson@linaro.org>
Cc: "Rafael J . Wysocki" <rjw@rjwysocki.net>,
Sudeep Holla <sudeep.holla@arm.com>,
Lorenzo Pieralisi <Lorenzo.Pieralisi@arm.com>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Lina Iyer <ilina@codeaurora.org>,
linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/7] drivers: firmware: psci: Move psci to separate directory
Date: Fri, 1 Mar 2019 17:03:54 +0000 [thread overview]
Message-ID: <20190301170354.GO15517@lakrids.cambridge.arm.com> (raw)
In-Reply-To: <20190228135919.3747-2-ulf.hansson@linaro.org>
On Thu, Feb 28, 2019 at 02:59:13PM +0100, Ulf Hansson wrote:
> Some following changes extends the PSCI driver with some additional new
> files. Let's 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: Mark Rutland <mark.rutland@arm.com>
Mark.
> ---
> drivers/firmware/Kconfig | 15 +--------------
> drivers/firmware/Makefile | 3 +--
> drivers/firmware/psci/Kconfig | 13 +++++++++++++
> drivers/firmware/psci/Makefile | 4 ++++
> drivers/firmware/{ => psci}/psci.c | 0
> drivers/firmware/{ => psci}/psci_checker.c | 0
> 6 files changed, 19 insertions(+), 16 deletions(-)
> create mode 100644 drivers/firmware/psci/Kconfig
> create mode 100644 drivers/firmware/psci/Makefile
> rename drivers/firmware/{ => psci}/psci.c (100%)
> rename drivers/firmware/{ => psci}/psci_checker.c (100%)
>
> diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
> index f754578414f0..e1385f47d4ac 100644
> --- a/drivers/firmware/Kconfig
> +++ b/drivers/firmware/Kconfig
> @@ -5,20 +5,6 @@
>
> menu "Firmware Drivers"
>
> -config ARM_PSCI_FW
> - bool
> -
> -config ARM_PSCI_CHECKER
> - bool "ARM PSCI checker"
> - depends on ARM_PSCI_FW && HOTPLUG_CPU && CPU_IDLE && !TORTURE_TEST
> - help
> - Run the PSCI checker during startup. This checks that hotplug and
> - suspend operations work correctly when using PSCI.
> -
> - The torture tests may interfere with the PSCI checker by turning CPUs
> - on and off through hotplug, so for now torture tests and PSCI checker
> - are mutually exclusive.
> -
> config ARM_SCMI_PROTOCOL
> bool "ARM System Control and Management Interface (SCMI) Message Protocol"
> depends on ARM || ARM64 || COMPILE_TEST
> @@ -270,6 +256,7 @@ config TI_SCI_PROTOCOL
> config HAVE_ARM_SMCCC
> bool
>
> +source "drivers/firmware/psci/Kconfig"
> source "drivers/firmware/broadcom/Kconfig"
> source "drivers/firmware/google/Kconfig"
> source "drivers/firmware/efi/Kconfig"
> diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile
> index 80feb635120f..9a3909a22682 100644
> --- a/drivers/firmware/Makefile
> +++ b/drivers/firmware/Makefile
> @@ -2,8 +2,6 @@
> #
> # Makefile for the linux kernel.
> #
> -obj-$(CONFIG_ARM_PSCI_FW) += psci.o
> -obj-$(CONFIG_ARM_PSCI_CHECKER) += psci_checker.o
> obj-$(CONFIG_ARM_SCPI_PROTOCOL) += arm_scpi.o
> obj-$(CONFIG_ARM_SCPI_POWER_DOMAIN) += scpi_pm_domain.o
> obj-$(CONFIG_ARM_SDE_INTERFACE) += arm_sdei.o
> @@ -25,6 +23,7 @@ CFLAGS_qcom_scm-32.o :=$(call as-instr,.arch armv7-a\n.arch_extension sec,-DREQU
> obj-$(CONFIG_TI_SCI_PROTOCOL) += ti_sci.o
>
> obj-$(CONFIG_ARM_SCMI_PROTOCOL) += arm_scmi/
> +obj-y += psci/
> obj-y += broadcom/
> obj-y += meson/
> obj-$(CONFIG_GOOGLE_FIRMWARE) += google/
> diff --git a/drivers/firmware/psci/Kconfig b/drivers/firmware/psci/Kconfig
> new file mode 100644
> index 000000000000..26a3b32bf7ab
> --- /dev/null
> +++ b/drivers/firmware/psci/Kconfig
> @@ -0,0 +1,13 @@
> +config ARM_PSCI_FW
> + bool
> +
> +config ARM_PSCI_CHECKER
> + bool "ARM PSCI checker"
> + depends on ARM_PSCI_FW && HOTPLUG_CPU && CPU_IDLE && !TORTURE_TEST
> + help
> + Run the PSCI checker during startup. This checks that hotplug and
> + suspend operations work correctly when using PSCI.
> +
> + The torture tests may interfere with the PSCI checker by turning CPUs
> + on and off through hotplug, so for now torture tests and PSCI checker
> + are mutually exclusive.
> diff --git a/drivers/firmware/psci/Makefile b/drivers/firmware/psci/Makefile
> new file mode 100644
> index 000000000000..1956b882470f
> --- /dev/null
> +++ b/drivers/firmware/psci/Makefile
> @@ -0,0 +1,4 @@
> +# SPDX-License-Identifier: GPL-2.0
> +#
> +obj-$(CONFIG_ARM_PSCI_FW) += psci.o
> +obj-$(CONFIG_ARM_PSCI_CHECKER) += psci_checker.o
> diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci/psci.c
> similarity index 100%
> rename from drivers/firmware/psci.c
> rename to drivers/firmware/psci/psci.c
> diff --git a/drivers/firmware/psci_checker.c b/drivers/firmware/psci/psci_checker.c
> similarity index 100%
> rename from drivers/firmware/psci_checker.c
> rename to drivers/firmware/psci/psci_checker.c
> --
> 2.17.1
>
next prev parent reply other threads:[~2019-03-01 17:04 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-28 13:59 [PATCH 0/7] drivers: firmware: psci: Some cleanup and refactoring Ulf Hansson
2019-02-28 13:59 ` [PATCH 1/7] drivers: firmware: psci: Move psci to separate directory Ulf Hansson
2019-02-28 14:34 ` Daniel Lezcano
2019-03-01 17:03 ` Mark Rutland [this message]
2019-02-28 13:59 ` [PATCH 2/7] MAINTAINERS: Update files for PSCI Ulf Hansson
2019-02-28 14:35 ` Daniel Lezcano
2019-03-01 17:04 ` Mark Rutland
2019-02-28 13:59 ` [PATCH 3/7] drivers: firmware: psci: Split psci_dt_cpu_init_idle() Ulf Hansson
2019-02-28 14:42 ` Daniel Lezcano
2019-02-28 22:13 ` Ulf Hansson
2019-03-01 17:07 ` Mark Rutland
2019-02-28 13:59 ` [PATCH 4/7] ARM/ARM64: cpuidle: Let back-end init ops take the driver as input Ulf Hansson
2019-02-28 15:30 ` Daniel Lezcano
2019-03-01 17:31 ` Mark Rutland
2019-02-28 13:59 ` [PATCH 5/7] drivers: firmware: psci: Simplify state node parsing Ulf Hansson
2019-02-28 15:40 ` Daniel Lezcano
2019-02-28 22:26 ` Ulf Hansson
2019-02-28 22:41 ` Daniel Lezcano
2019-03-01 17:28 ` Mark Rutland
2019-03-04 10:14 ` Ulf Hansson
2019-03-06 18:15 ` Lorenzo Pieralisi
2019-03-08 10:36 ` Ulf Hansson
2019-03-08 11:49 ` Lorenzo Pieralisi
2019-03-08 13:07 ` Ulf Hansson
2019-03-08 13:17 ` Lorenzo Pieralisi
2019-03-08 13:23 ` Ulf Hansson
2019-03-08 13:31 ` Lorenzo Pieralisi
2019-03-08 13:43 ` Ulf Hansson
2019-02-28 13:59 ` [PATCH 6/7] drivers: firmware: psci: Simplify error path of psci_dt_init() Ulf Hansson
2019-02-28 13:59 ` [PATCH 7/7] drivers: firmware: psci: Announce support for OS initiated suspend mode Ulf Hansson
2019-03-01 17:28 ` Stephen Boyd
2019-03-04 10:25 ` Ulf Hansson
2019-03-01 17:32 ` Mark Rutland
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190301170354.GO15517@lakrids.cambridge.arm.com \
--to=mark.rutland@arm.com \
--cc=Lorenzo.Pieralisi@arm.com \
--cc=daniel.lezcano@linaro.org \
--cc=ilina@codeaurora.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--cc=sudeep.holla@arm.com \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).