From patchwork Thu Apr 12 11:14:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 133251 Delivered-To: patches@linaro.org Received: by 10.46.84.29 with SMTP id i29csp1573713ljb; Thu, 12 Apr 2018 04:15:01 -0700 (PDT) X-Received: by 2002:a19:11da:: with SMTP id 87-v6mr1134731lfr.125.1523531701383; Thu, 12 Apr 2018 04:15:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523531701; cv=none; d=google.com; s=arc-20160816; b=zbeGIAnrPmon2KtPdU6cdkgJVDlnVVjGfSd7fAocfjx0yr0E1FOW8vG7vXRhHViUbM iYyXiK5YinCkEvn6mz1WilyXgfXZhlxzqjGicEeMonYk471dl3+pAqIrzATHHNEH7OhJ FAiPM2W3YmlHv5FLPYHavPx4dHwTiC89hNqAPU5gmmLfRwwfZJGCzKaXG1N44WbbI+1L Jq3A1Z9EEeBTH5WEHcTveqqPfkrEm5B6wJkyA4VxlLMHmmUl4HSpixO+2NMSNqcZmEwT gP2jcz3CkeJOZEq+PAdjcVKS22SlJi6LRymAHleDaOl7uV2VWAN+hAjsUZwQfQIkRjH6 oXNw== 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=q7j10IC1zjnJs92+EIKWbkY/MkZoxDQiB++DZObbzzI=; b=rRB167PhdfnwZE+amO+i9IWW8vTrd30VrWCpOVqgFU9LhOPEjen7SZqGz66vOMsRbo PqLRDH7EFNKFz5brDJIJ9tu2UUuXaP3MpUpp5+DJdUNBVlrJdz+y6BpfoScAV7GwvJwm /x3tZVO6HGyvrp6pCppoDqexiqAc/mNR8uf6+/cuc7XPVJde8YwF3PNQfZMaFlOCYtkn DZnBn8/QC4v4GSvtu6BmoPyDtAQUlUV47c0ucpk+uxzmJw/jQqQY/iuV61bfWjufUJzo JNVWL/YWfPXug2hPD5E9BFB+xnlOzSpYEu35nY+Ld4DWi4RJTo0KXwtiLvBocMJ8jH5P C0kw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=g9JPzETf; 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 b16sor874930ljk.65.2018.04.12.04.15.01 for (Google Transport Security); Thu, 12 Apr 2018 04:15:01 -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=g9JPzETf; 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=q7j10IC1zjnJs92+EIKWbkY/MkZoxDQiB++DZObbzzI=; b=g9JPzETfdkOJnuUETtwoPLwWANLdkn/0F+9Y2jI7OFabQYJcxqyZ1p5i1otvTPBYE8 3E/+VRHT6oVmlByGQZFwzYWa1dnrU9YAW5DvA5Ki51RvtrWc7a+/PgwSCFgi5ALT2I13 Rk0IULkYa/7Uwl99/mJeoD88JPmI8RwFV/+HY= 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=q7j10IC1zjnJs92+EIKWbkY/MkZoxDQiB++DZObbzzI=; b=pJYcSD2PQbsr5nrTovLlDI3iGR8SAH+1A6iTbXSYwapOddSqiT/gA2Jb42w9oKISYI 1zJnlfBsvHIiV5n1asY5ljVhFh0ebX5zud23MYHMo++tYLHoefOeiGT4fT0zKUwvpjo8 h0aXX5RdaAhHb/rmrUwLrQiFM5QL6lFhOv+H/McpTIFP96RR6CnS/XXwhO4f43T7DFvF ihTfXyJ5UYooSbq1EIluEctllU0hbV0okRzvhKiDYQFp7QxGRN0E7nYjy1GXaH7BEHxh T1DOBWpsOqSqyNFlJ840fjgnA/43eqlMcVl/bPXiHfE08O6JBBXhPwzVyHeiFiVyPItu tNHg== X-Gm-Message-State: ALQs6tAclmfyNy3X2aQ/D0xFXTmbYEdaJgrggiYiMyePvf7k7F/cy6FA EQw0ECdLwDuxGt5xDmvsBkEE6Frl X-Google-Smtp-Source: AIpwx49laUzMVJQeR8LP7VdhgyGpGDG2yXLZKZ6L5VkNDnt4g57/zMUkaFtMk8/nptWRaXUDInIvjQ== X-Received: by 10.46.135.6 with SMTP id m6mr379811lji.124.1523531701130; Thu, 12 Apr 2018 04:15:01 -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 r29sm543187lje.72.2018.04.12.04.14.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 12 Apr 2018 04:15:00 -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 v7 13/26] drivers: firmware: psci: Move psci to separate directory Date: Thu, 12 Apr 2018 13:14:18 +0200 Message-Id: <1523531671-27491-14-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1523531671-27491-1-git-send-email-ulf.hansson@linaro.org> References: <1523531671-27491-1-git-send-email-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.7.4 diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig index 6e83880..923c42d 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 e18a041..ea284e5 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 0000000..26a3b32 --- /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 0000000..1956b88 --- /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