From patchwork Tue Jul 7 12:58:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 234992 Delivered-To: patches@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp889105ilg; Tue, 7 Jul 2020 05:58:21 -0700 (PDT) X-Received: by 2002:a2e:97ce:: with SMTP id m14mr28922496ljj.87.1594126701582; Tue, 07 Jul 2020 05:58:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594126701; cv=none; d=google.com; s=arc-20160816; b=dLlLu+9OboNrEa3fn85NL7lZ5ft3GH+yhXWMsUFDfS0q5DH6Nk4ffER1GCsR2gPNsy C1JigwIxmtVcQ5IfQxpGjZTsMBAIQmAPgCjKrr+A5THpR66s8sfjlDoOSc5PnePdgKCh 5S81QrAZPaed573Py4np9omI8iwUVAJa8oDWxennMEItqLNM0gz5s5zT14U0LWTy5YRP iAWTZoHaxl1Na64l7sN/Ab6QD7SkomtpiasRPkp5rlT5/AxDbqEMYz0rvAqdPZnz1qvF 8QHXvGQISLOXzsZcAvDiwJTBiIo7W6N4RZnYuENE2HMJE7DSu5xYHmv662gl8JtdkGBs p8Gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=JmH1BfPiU4RoSWuHQPEJ8Sx4+RN7bhXBUvJ2uLAr9qM=; b=iLpsGwaxWgFV8DrM+wpjxypwm/EJDudF5rsUyMB/BkUgU+SXBHstmhTBtvq8M5o938 bfu6oPCY25Dk+6ZzGLOYdUSSvaAntMMXXO3Vuj1QCs7FXoJBq9wYvdnXEYdTnFpmXyXY k0YMlktYM7uTFLnAHAmfrDhf70hDRx+xSkw5792xLD4vFB3tB0iFL5CdsJDXi4eu2SwY +CucKFS+Wo3ylC6ObGjI4jbT7eL72dIN7WKawezkVoIhZAsN3KJXPNVGim0T46/V/Rex gPCgv4v1yqNiNMA40O6Z+aQOWsK8LSMIHERTHl4k1PfkT2Qgt3fWmweDxEqdfG6Uvwlb YnJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ad7XXos1; 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 z11sor322570ljj.47.2020.07.07.05.58.21 for (Google Transport Security); Tue, 07 Jul 2020 05:58:21 -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=Ad7XXos1; 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 :mime-version:content-transfer-encoding; bh=JmH1BfPiU4RoSWuHQPEJ8Sx4+RN7bhXBUvJ2uLAr9qM=; b=Ad7XXos1cMmY+GKjq/D9UtSBmDNPOeVXkEk3XQ8wQl0QlkUWtCwInOmjZmoDIncBHb XK6+h7K+uqUHqZXaTO/qeFFYBZ/TGnH2PC2189v/S6CCjKuMkMGXkOhaIB+GjZsRkXGP sZlwnSie+aPey2AKnh2JAKCuFh3oGUOu0n2/RvUWQQHtCbS+yFnqUaLPv6igWPkwW4Oj 6MnRpJOehFo5cmYc6/vsfoQuy25/s4gsoreVtAlkV5pLjTpOhJxullGUTeW+KgwGcki6 vEDYWNZL4eOuJ4W7a8oOxNgk29NhvZA+uOHbJI5AmMwuTcfOIe8DqXORy5X+/1bnSSOl e8yA== 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:mime-version:content-transfer-encoding; bh=JmH1BfPiU4RoSWuHQPEJ8Sx4+RN7bhXBUvJ2uLAr9qM=; b=fqkNRzjiSRP1voc1u64r3h6nw7QmrPFNoh0QRjjT1GkBft8oyd5bkq3z7XOcHFhapU K0L89HUEqfFWUxAstfYbcrG0VJkNwlaEgV1dCK73qAD+B9O8G8Hg0iCc0tnL5gwXE9cX DKP/nPwDF7rihezNGFxavv1QWQrtS6lsPtIWInRe38sVvpY0mS8bJfRx8nAXazBxqR62 P9B9+1wNh1bEoV1ChMa16hbl03sZ3idofx5qY9IbdfVcOrpxdTXuIInrJfWEP/UMPCGq 0WSoFmxCXLs4B1NbUqt1G6YIkZKsbYjrKlITkVEYz7aSLRXIrwTBSBMgy2Z59oAe96rN mUeg== X-Gm-Message-State: AOAM531y9y5u7LNFjmKTBTxyW4zW21ymMqKyKKxj+edEW9zB0L6rssAc wBmf5A8ulamPTieWfdhSHQkn5oVs X-Google-Smtp-Source: ABdhPJzUlqKwp5fDTuJIhcklcQOJEemZfGYMUbMkILw8e1U/ymMGmHmpI3jEkHFPEWctxqwO/X56vg== X-Received: by 2002:a05:651c:21a:: with SMTP id y26mr14747466ljn.106.1594126701205; Tue, 07 Jul 2020 05:58:21 -0700 (PDT) Return-Path: Received: from localhost.localdomain (h-98-128-181-7.NA.cust.bahnhof.se. [98.128.181.7]) by smtp.gmail.com with ESMTPSA id 11sm9554395lfz.78.2020.07.07.05.58.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jul 2020 05:58:20 -0700 (PDT) From: Ulf Hansson To: Sudeep Holla , Lorenzo Pieralisi , linux-pm@vger.kernel.org Cc: "Rafael J . Wysocki" , Daniel Lezcano , Lina Iyer , Lukasz Luba , Vincent Guittot , Stephen Boyd , Bjorn Andersson , Benjamin Gaignard , Saravana Kannan , Ulf Hansson , linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 1/5] cpuidle: psci: Split into two separate build objects Date: Tue, 7 Jul 2020 14:58:00 +0200 Message-Id: <20200707125804.13030-2-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200707125804.13030-1-ulf.hansson@linaro.org> References: <20200707125804.13030-1-ulf.hansson@linaro.org> MIME-Version: 1.0 The combined build object for the PSCI cpuidle driver and the PSCI PM domain, is a bit messy. Therefore let's split it up by adding a new Kconfig ARM_PSCI_CPUIDLE_DOMAIN and convert into two separate objects. Reviewed-by: Lina Iyer Reviewed-by: Sudeep Holla Signed-off-by: Ulf Hansson --- drivers/cpuidle/Kconfig.arm | 10 ++++++++++ drivers/cpuidle/Makefile | 5 ++--- drivers/cpuidle/cpuidle-psci.h | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) -- 2.20.1 diff --git a/drivers/cpuidle/Kconfig.arm b/drivers/cpuidle/Kconfig.arm index 51a7e89085c0..0844fadc4be8 100644 --- a/drivers/cpuidle/Kconfig.arm +++ b/drivers/cpuidle/Kconfig.arm @@ -23,6 +23,16 @@ config ARM_PSCI_CPUIDLE It provides an idle driver that is capable of detecting and managing idle states through the PSCI firmware interface. +config ARM_PSCI_CPUIDLE_DOMAIN + bool "PSCI CPU idle Domain" + depends on ARM_PSCI_CPUIDLE + depends on PM_GENERIC_DOMAINS_OF + default y + help + Select this to enable the PSCI based CPUidle driver to use PM domains, + which is needed to support the hierarchical DT based layout of the + idle states. + config ARM_BIG_LITTLE_CPUIDLE bool "Support for ARM big.LITTLE processors" depends on ARCH_VEXPRESS_TC2_PM || ARCH_EXYNOS || COMPILE_TEST diff --git a/drivers/cpuidle/Makefile b/drivers/cpuidle/Makefile index f07800cbb43f..26bbc5e74123 100644 --- a/drivers/cpuidle/Makefile +++ b/drivers/cpuidle/Makefile @@ -21,9 +21,8 @@ obj-$(CONFIG_ARM_U8500_CPUIDLE) += cpuidle-ux500.o obj-$(CONFIG_ARM_AT91_CPUIDLE) += cpuidle-at91.o obj-$(CONFIG_ARM_EXYNOS_CPUIDLE) += cpuidle-exynos.o obj-$(CONFIG_ARM_CPUIDLE) += cpuidle-arm.o -obj-$(CONFIG_ARM_PSCI_CPUIDLE) += cpuidle_psci.o -cpuidle_psci-y := cpuidle-psci.o -cpuidle_psci-$(CONFIG_PM_GENERIC_DOMAINS_OF) += cpuidle-psci-domain.o +obj-$(CONFIG_ARM_PSCI_CPUIDLE) += cpuidle-psci.o +obj-$(CONFIG_ARM_PSCI_CPUIDLE_DOMAIN) += cpuidle-psci-domain.o obj-$(CONFIG_ARM_TEGRA_CPUIDLE) += cpuidle-tegra.o obj-$(CONFIG_ARM_QCOM_SPM_CPUIDLE) += cpuidle-qcom-spm.o diff --git a/drivers/cpuidle/cpuidle-psci.h b/drivers/cpuidle/cpuidle-psci.h index 7299a04dd467..ac8170684d4f 100644 --- a/drivers/cpuidle/cpuidle-psci.h +++ b/drivers/cpuidle/cpuidle-psci.h @@ -8,7 +8,7 @@ struct device_node; void psci_set_domain_state(u32 state); int __init psci_dt_parse_state_node(struct device_node *np, u32 *state); -#ifdef CONFIG_PM_GENERIC_DOMAINS_OF +#ifdef CONFIG_ARM_PSCI_CPUIDLE_DOMAIN struct device __init *psci_dt_attach_cpu(int cpu); #else static inline struct device __init *psci_dt_attach_cpu(int cpu) { return NULL; }