From patchwork Wed Oct 3 14:38:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 148062 Delivered-To: patches@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp6557654lji; Wed, 3 Oct 2018 07:38:52 -0700 (PDT) X-Received: by 2002:a2e:908:: with SMTP id 8-v6mr1328242ljj.1.1538577532271; Wed, 03 Oct 2018 07:38:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538577532; cv=none; d=google.com; s=arc-20160816; b=K2THMQrHKKdJugs+1150NoMghn/ppyb85gONzL+HZRts0kid4d3Vie1zxjA0wW6oMe DoJekEu7oyXAjFJPnjzJ1kTk55m4htgm93dcNVL7RbSVdXnMkcdCMAqbKkN7SJF4gAz/ WYvzase294qk3XO9bvX2i319WR+9pjNqyK0xCSB2L7GqJsYicIP+TzuR4Xjt/2efpyVk eM1l09bZTPIQzPK7RAhAwUPqGg1QrZbP/ZnH1gj4J4PLuAO6hajTX8zvrcOvp9al8G83 XUiBfO33G0luEXbQ0N4sNDe/CRT17tWRwFm/Ci0MUlOex2ZgXxU7TRijmvk6oDECjffL F/Qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=24N1Dc3/4aVSfatj0cCLPTM9sDMCdxo5zYgoCR5YTHc=; b=mYvaF56JqUPNv+BgTsfUnnm1DcfAevbMyy9HAwk18ttvI4wO6+7q2VNoghcHtu3f/X Bhq6OudaM/eCqTCR8KXEO2EyWD7ReeorCfFaUhM3/XiRBooW+MLMxSacfoF+6GYqQC4+ oRKTmZJsexotKAtAMWlEOociuM1PKW8i3B0iQgTUGg8jz3tAQ+dwNgNSzvaTvxVp8VUl dU1CGqeq1PjHjsi9nECPi6swmSK5iu82RC7ZvOjzYv+JoxdSuUUMGqdzlddjcbIdTKw3 iZadPQWLuKWjsCOMqHO1B+KEMC35XP3sQ3/m3duR+0av5a7908ljYqn0bItBFRE5Pok4 N+pg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XjLORK1O; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id 84-v6sor966529ljc.24.2018.10.03.07.38.52 for (Google Transport Security); Wed, 03 Oct 2018 07:38:52 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XjLORK1O; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=24N1Dc3/4aVSfatj0cCLPTM9sDMCdxo5zYgoCR5YTHc=; b=XjLORK1OYwzVBRY8kPy7QP/UtnW4VxCS18LStrS5+NaSElLf53WYhSsAeOpJRZ878b VqSg3YrZ+3izUx8IHKra0aZC8NThLEYOzlsrPV1UKUz850Cj11Hr//MXWdQh2hoGNqL3 G9+bkTyfOZHm7ZpL8euDuDaqLQg9V8vs/pk+A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=24N1Dc3/4aVSfatj0cCLPTM9sDMCdxo5zYgoCR5YTHc=; b=O1m7rbx20KeJkfiPcybxTwwe/e/z+2eGxIJQpzvM0MzUwIbX/a9tMMnz7Kme/04fke o2wPME9wnxcci8jgUUESQ9gUhGPVjc5kcIQyG1OSRwHARaMMoMqPGucOCexGlTfAa/dk oXMWNEfZpxorZY6Ck1vhMy7pUfT2Ww7Ma+3vWBZw4moiOniy3uyq+lVZKZEUUscKlGWO dK2rN6ixz+aDUuUO8rLu5sczTJ+VvAwe3GKKg967feYPHQCa6PjRhyt83j/fHiCqPRij mu+SfmFHy6lflp+60GiAn4k4jSIA7df50rMJfPKXJIAQs4wv77My64EjY7Ej2N/9ubdi rVKA== X-Gm-Message-State: ABuFfoj3pldKu/Z0E77y0E3REW7PpgjBc4+GNt7HHqVF0kx+fiiu75o4 BWjhULpx1P2Lp1hrZc3IsXx6KB0f X-Google-Smtp-Source: ACcGV60MQ4bvS0UIONM4xmbNp7c8w3D3iNVTmeIbx24qsydvm8zeVD1SDHaFgQtHq/VCA7CWpui8zQ== X-Received: by 2002:a2e:90d8:: with SMTP id o24-v6mr1361712ljg.97.1538577532011; Wed, 03 Oct 2018 07:38:52 -0700 (PDT) Return-Path: Received: from localhost.localdomain (h-158-174-22-210.NA.cust.bahnhof.se. [158.174.22.210]) by smtp.gmail.com with ESMTPSA id 18-v6sm380867ljo.74.2018.10.03.07.38.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Oct 2018 07:38:51 -0700 (PDT) From: Ulf Hansson To: "Rafael J . Wysocki" , Sudeep Holla , Lorenzo Pieralisi , Mark Rutland , Daniel Lezcano , linux-pm@vger.kernel.org Cc: Tony Lindgren , Kevin Hilman , Lina Iyer , Ulf Hansson , Rob Herring , Viresh Kumar , Vincent Guittot , Geert Uytterhoeven , linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v9 07/11] drivers: firmware: psci: Move psci to separate directory Date: Wed, 3 Oct 2018 16:38:20 +0200 Message-Id: <20181003143824.13059-8-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181003143824.13059-1-ulf.hansson@linaro.org> References: <20181003143824.13059-1-ulf.hansson@linaro.org> 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 Signed-off-by: Ulf Hansson --- 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%) -- 2.17.1 diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig index 6e83880046d7..923c42d5a2e6 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 @@ -286,6 +272,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 e18a041cfc53..ea284e551dc8 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 @@ -26,6 +24,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