From patchwork Wed Mar 13 08:36:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 160207 Delivered-To: patches@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp14045710jad; Wed, 13 Mar 2019 01:37:07 -0700 (PDT) X-Received: by 2002:ac2:548a:: with SMTP id t10mr13958680lfk.115.1552466227030; Wed, 13 Mar 2019 01:37:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552466227; cv=none; d=google.com; s=arc-20160816; b=lRViILUlZKK+hiebl32TTmKfM7czzRVGEWaR1NGe/IQQNj5p1Q07IeYXiDlfBQY4/e CRs1334EK7eaPfmBUGXT3WIggLvaj9eQ5zbZZ7p4Jx61V5k9kHZ1brBTi9wag1pymA1v fiyLJKhnPcBoc2f78qM0QUag09Y//WMuG0OsZtNAUOwzWDjFEqse8ZcizjWjMRtgYQE/ Zx5xPhkKztKqbCoEDqkFBJbbPqvh1mxW3P6+m2owzO8dhoJnspjtTrwff9qmzMuQarWL +nsEwLT5Bov7saenLBBxLXi+aZ8FDpNC6M/V/bdKuqx1LnXEqxjvKRvCQrlOYsXZLYuI Pe6w== 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=LNxQpIwxT1JmfOXeE0uJOYnKkmng1Hu5UTgquERxi8o=; b=ljr9GkgOK1ENLhqOlHOtWSRdniYFcRhlVbg+Ws5izZFweOYDSFGYxas0d2BsHPa0R/ 6OJBGsyL/3HvCAUF3v0rM0CJ5VyLVebece+Kbcj9A7Q3D/wSWoArhHfgCBBiwyWpAc5e oQJiR5a6PmrZnlsdJsw1HcgmHQ5FeipKGFB3y7x3vzs1Ar4dY683eYzi9HYqS3ept3vI Gi+5bw4IedEUiR1T4hoW80ALuy5ygjTpb8qVXZgpJVDfkgy/npgD+SqcAj8Mt+1fG8Hs 7IdwTbggfEye7c2HJ22tWr7YMEuZG6srqx412T9br8vx0Tc+eeYTmHlJsYL6IQk9aiRb YKyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tZIJkwo0; 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 s19sor6660763ljs.28.2019.03.13.01.37.06 for (Google Transport Security); Wed, 13 Mar 2019 01:37:07 -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=tZIJkwo0; 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=LNxQpIwxT1JmfOXeE0uJOYnKkmng1Hu5UTgquERxi8o=; b=tZIJkwo07TH515pYyq6fdHyj8nNsF8M7volhDW+9uQJPXoCKRDiow3wgQxWyGbI/gZ bnk3xttzrBR2ClU+9V3ogfOgLSJd1LYML8VR08sqhCk6NALiUz4Vj9m5wsphnqDlarEo 8XaE2kI5j97n0znAGpiTWmDDQTgIbvEX4BMsJQH9k1DpD0pofARDiNFSwa5/N3i/V+LF UGGgy7Vsd/k3Nb2/qra1YmdkgB+MmpR11S/bEI/2fKV9NGTGY85b5bfhNebj1VRwhu8Y lp+dmpbDpNkHXHFTL3I9BLxgpbBVuiSiKP5ct6xk3ka47aUwqSYErW0XOVpggsksUQJ5 Djlg== 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=LNxQpIwxT1JmfOXeE0uJOYnKkmng1Hu5UTgquERxi8o=; b=SfI22dtFN83JFZCjcYKA+b7Ur4nvz/d4qUyamGHXaMU4UOyhd/AfpTAzQtOPTeqSxH 0acWS7qIBN2gRrEnqCEX9ruOXSKI8nUZQ7agPRVuBNYdhb1s6haCXYk+BmiCrK1tHJpB AhyFQ4ad+tuU3j1XMt2GeqB2exT+9dZsQwtdsx26hlA/zpJTw4PHFi2P9FGKWTr2Aa7r bJQW+9WZXTFGPKSwEZltkiYihtqbQuhAwgYNoby97N1vz3SiIzckwzAF38rPaybMDzNn VPiisiS5OFox+p2MEiOKyNmM7OVlxvIyBQF6BV8zwRu5mxqRPoP+d/YA9INa5gzrsxrl bl+Q== X-Gm-Message-State: APjAAAWaahfyyZLrkF+HxJFPh7iD4nQFvagp68IA1c73gbM1FTj3pSL0 ahJ5WKcHDIVzxa4n9yFoLyqSL+Na X-Google-Smtp-Source: APXvYqydQnmbrxfgJzVE90WxzKNbqOoGEA003+fAU9hhkh3M/4lap/JSdMvH1gYnL14y6xthxlUlQA== X-Received: by 2002:a2e:9dda:: with SMTP id x26mr22258657ljj.53.1552466226627; Wed, 13 Mar 2019 01:37:06 -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 a23sm1707716ljd.20.2019.03.13.01.37.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Mar 2019 01:37:06 -0700 (PDT) From: Ulf Hansson To: "Rafael J . Wysocki" , Lorenzo Pieralisi Cc: Sudeep Holla , Mark Rutland , Daniel Lezcano , Lina Iyer , Ulf Hansson , linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/5] drivers: firmware: psci: Move psci to separate directory Date: Wed, 13 Mar 2019 09:36:55 +0100 Message-Id: <20190313083659.7100-2-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190313083659.7100-1-ulf.hansson@linaro.org> References: <20190313083659.7100-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 Acked-by: Daniel Lezcano Acked-by: Mark Rutland Acked-by: Lorenzo Pieralisi --- 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 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