From patchwork Wed Jun 20 17:22:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 139381 Delivered-To: patches@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1050735lji; Wed, 20 Jun 2018 10:22:58 -0700 (PDT) X-Received: by 2002:a2e:944e:: with SMTP id o14-v6mr144269ljh.118.1529515378778; Wed, 20 Jun 2018 10:22:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529515378; cv=none; d=google.com; s=arc-20160816; b=USSYdrJ7yadME2GYa1Zzttwx3SivsF8BtitHdFS7NoOMA7XaBFdN91jj+pCjmXP69i NQizHj/pXxhTJrBZ48SJRQGAwngfmrh1Eh69FPIJ/p53TDw1wCON1v/ToqTAeAja/myT o4xMF+YFBgD79Hh5pgE2qG6RRHW3gc5GyickLD6OUPs9N8Apkbbw0CQ6lLl/x28nG5AQ rnRrpqjcmvsmbiXyIcZaZOR0RI8lTUxtFUhDIBDqXKnWjQyPMntDidf26QrzGSgP5A5p cDMrwHptl8Y2Oovvpk+RMa0xKIr0gflm9DB/38TLRDZzERIG8Zz6pHfBlKFidRuom57o mHLg== 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:arc-authentication-results; bh=24N1Dc3/4aVSfatj0cCLPTM9sDMCdxo5zYgoCR5YTHc=; b=wP4nxTHniBjBnCbQQoIIkOYEUPZWZijnJ96cdlhRPM1sTt+fCcy9jcR4qWJ4ZTTXEf c3qMxayIIQDg9PMyShRemrhYBdSwXp2zduDmLnWnIXfCkx1qs6KBFdi11B26OkqnH1Kt zMSHWqMaNSqhsgryX66Trg/HrOkI+yrW4kdBs+2EQgocr2xGYmSfVJcTNdvCQ1XAXALG XuFaD3k6gZBj5HzyQKR4MJanEpsnCQojV9unYBJ+gLbPu++242+p5XmpL2u0z+f6mcQ/ 7ctdNDWx+e3fJK6mIXDmSNXpo0TjHBBNG9tPeUQXmfgHsd30MlOhD69XwzG6gH3r/EDn vDQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=J+KVAB9a; 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 24-v6sor594800ljs.47.2018.06.20.10.22.58 for (Google Transport Security); Wed, 20 Jun 2018 10:22:58 -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=J+KVAB9a; 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=J+KVAB9aTvpKYALS4Wr+p8D1kMK7oRy9jJrRhoI+y086Fdf81Z8+HqPtV1GeeYQCev KBJmQpmVoALyf7MJJsszcCcX9bDGTcZhH8yNCkG5/lMXAHjHIwdCTEX+qxQfzfQVsAwh 71D19Qu7OO+blVZjgHCqMdR+Jvl2sdvOR79ks= 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=ROq7G+G2Rsjov0h+szo9qljXRCv+1i9jQvziZmgDxCqIqHJJwhnrAW5GbZa3mO9KJf 04i2dbN6FAmlLQnePcOgb9lyefGwp+wt9ctgY6DT8KUh0OkVyuj7UdWGvzYL9jUNf9J5 dURd+UUI9qteb8OiyRO1MmaOcpdLmhdZsuHM6j2SWPCIgkSX/YaEbWRnAaGG+GK9IZ+n KmA/0PecCv+EF1SpIsEEMBC5PxqNlyBs7f8OGdvIweTYP6PhTkknge6XQOs8b/q6BvLI kbClmwXbgXDGoJQJuXI5erjdfo8DuL/7bb1VyOwAKj9Ip3qBUfuyS9DI915KR7ulgPuL Fc8A== X-Gm-Message-State: APt69E29Y7dVAkte9I62P7UewgN1SwciOxMoKrJw13WsSP6GlkT7SJOW h5KXmv4V5FRMoWrNm9TLmJkhB9sr X-Google-Smtp-Source: ADUXVKKAfapQ3eKmMpfxG+iNZ+44iV9V05WmGSBlbaS5XBfzU+lIVLCKALmJEEWJDZq9Nrlj57M4OA== X-Received: by 2002:a2e:8350:: with SMTP id l16-v6mr14437649ljh.7.1529515378526; Wed, 20 Jun 2018 10:22:58 -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 b2-v6sm514441lji.85.2018.06.20.10.22.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Jun 2018 10:22:57 -0700 (PDT) From: Ulf Hansson To: "Rafael J . Wysocki" , Sudeep Holla , Lorenzo Pieralisi , Mark Rutland , linux-pm@vger.kernel.org Cc: Kevin Hilman , Lina Iyer , Lina Iyer , Ulf Hansson , Rob Herring , Daniel Lezcano , Thomas Gleixner , Vincent Guittot , Stephen Boyd , Juri Lelli , Geert Uytterhoeven , linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v8 13/26] drivers: firmware: psci: Move psci to separate directory Date: Wed, 20 Jun 2018 19:22:13 +0200 Message-Id: <20180620172226.15012-14-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180620172226.15012-1-ulf.hansson@linaro.org> References: <20180620172226.15012-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