From patchwork Mon Jun 15 15:20:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 187947 Delivered-To: patch@linaro.org Received: by 2002:a54:30ca:0:0:0:0:0 with SMTP id e10csp2633532ecs; Mon, 15 Jun 2020 08:21:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzOkZE5GWlMJgER6Emw9xfoguSBieLNGvD3/QOUpPy3psKrbYbvHA8and7B6hhY8P99Q2AZ X-Received: by 2002:a17:906:264a:: with SMTP id i10mr26010080ejc.210.1592234468569; Mon, 15 Jun 2020 08:21:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592234468; cv=none; d=google.com; s=arc-20160816; b=OOfDgH9PFr3MYqaXSqazo1s1pOknPdgYpgqu3wJ00KLDe5N5Q99nnqtItSfbJojYGM 9SEL3cWD/nhXsxoYzjmFR5uKM192moHh8pXh+JoigEuK4JGt8Pm30/8cHVjj7lkETw3h 4NxdRm0bKL+pUB5b4OyjIlBfOnrVnlIdI9w9BRyRuYzvDsNRSK8vFRM01kplwGX2Qb0l r6UL7aUzVeSb7G5Z0BicadcAOVJftFJPcavYFyIEhmm4tu2Bvua8SUT0rG91yNiEA3VZ C+MbK5sEpdCnGADZNeHIMQ44GQvo8+HmL5vCLsBVHGbG06EAFwZl8x7jjT0PcPSpgkvH xq3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=1DzsoTjhcIMb9+A4N/cXj76UygN5PXLTTjiX9hXk5EQ=; b=X+SZnzbHHkjLCyGxTFZcH6IwuSeC5pQGkXQM/pcVHhQpLi7rTlNZVcmBhCNdbw0N4x Qfr76qrzH2VXL8uq9L9BW78a5a9nnvJQqaErw01bm74Q76yu4Hoe/+iKIRODZCUlZZPY aLME+KsR1/o2PtsdgPnUBGUSXW+7boL0j+f7s8PCiNqwFGvYZDao4TVSjMV3SkU5JvLd VS3/q+X1th2RL8zSKq7GZGDS1OfB9r+q1JC/jvkpB+Ad+oDlUg6oiHpwmFsyNDx2rplu MIZbsrLbK51fV42LenkVKwpT9Bj/pjjKV1FhqPezu739SZzOytzwcSVOZFF5/EoMaXDb Vvyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="R0/G6JK8"; spf=pass (google.com: domain of linux-pm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n4si9550427ejz.569.2020.06.15.08.21.08; Mon, 15 Jun 2020 08:21:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-pm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="R0/G6JK8"; spf=pass (google.com: domain of linux-pm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730276AbgFOPVH (ORCPT + 10 others); Mon, 15 Jun 2020 11:21:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46008 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730189AbgFOPVG (ORCPT ); Mon, 15 Jun 2020 11:21:06 -0400 Received: from mail-lj1-x241.google.com (mail-lj1-x241.google.com [IPv6:2a00:1450:4864:20::241]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 165F0C061A0E for ; Mon, 15 Jun 2020 08:21:06 -0700 (PDT) Received: by mail-lj1-x241.google.com with SMTP id a9so19694908ljn.6 for ; Mon, 15 Jun 2020 08:21:06 -0700 (PDT) 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=1DzsoTjhcIMb9+A4N/cXj76UygN5PXLTTjiX9hXk5EQ=; b=R0/G6JK86gTEe2vWg8LbA/u3P1xlSlDzO2cBwJ+jyc0Eyl/SwAQQeoz0nmHzEM9rYG a8C5hk3FatI1oDaBKtXmf3+5kDyy62EmcpnoKxRHDDReh/iU/lkb0M3PLXDf8aINzQh4 QI1dTzd06nIDvJMSyEZdHKFqHbdjdupZB6AUPdAPLN5I0c3AP6Os0XceOiYbeQCb3ilZ y51fAxDJmGo9fXYkYBbpYfTFG7x2KSFGUIUHwflaE6Geg2EOtDrjONRn4up1dxpUweV4 NCX0O91K4uoulbUiz6v+9NZzVzAsyYPHg+B170chZGL7TCwEPmyZFsymoEGalxo25AbC MwhQ== 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=1DzsoTjhcIMb9+A4N/cXj76UygN5PXLTTjiX9hXk5EQ=; b=thXTz71mFZ3XERckR1GiCHhd4719RLJdc7LOGWs6PbObIEB42IgN5hXUn1tB1fdWcT xVtaHai9IMQX37aMH3feP7oHboJtsIwHINwlaaFMpBV5AiTcJEVxxucMqXXZBxzgGwem GMjdJZyhm/oQa/wA+DuNPfTmNDy+ILd5pImmiC4bekkuRwJovytbYj34hRLEo6A+5M0T AlcRBQjLJE9mAbFH9X2VuHhCe6FG9SRIdconyGzzZcQIO+A2G/9BwZ+sU5xkNgv9OERt fFj2Cm2jT4NKIy9XrBj5H+qbh+45KyoCQEZ7oJfvt9nl9wSfQbxOk8H4nlM8VjFP/Ixl Cm8Q== X-Gm-Message-State: AOAM533a0cvo6/tSwljXYDYj7mXN69eWg12Ierlzlaa3o+0kbNlLPwdA iNTecBAtCzizWaeNEQr+hwsFNA== X-Received: by 2002:a2e:7016:: with SMTP id l22mr14031408ljc.284.1592234464325; Mon, 15 Jun 2020 08:21:04 -0700 (PDT) Received: from localhost.localdomain (h-98-128-181-7.NA.cust.bahnhof.se. [98.128.181.7]) by smtp.gmail.com with ESMTPSA id r13sm507045lfp.80.2020.06.15.08.21.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2020 08:21:03 -0700 (PDT) From: Ulf Hansson To: Sudeep Holla , Lorenzo Pieralisi , Saravana Kannan , linux-pm@vger.kernel.org Cc: "Rafael J . Wysocki" , Daniel Lezcano , Lina Iyer , Vincent Guittot , Stephen Boyd , Bjorn Andersson , Benjamin Gaignard , Ulf Hansson , linux-arm-kernel@lists.infradead.org Subject: [PATCH 3/5] cpuidle: psci: Split into two separate build objects Date: Mon, 15 Jun 2020 17:20:52 +0200 Message-Id: <20200615152054.6819-4-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200615152054.6819-1-ulf.hansson@linaro.org> References: <20200615152054.6819-1-ulf.hansson@linaro.org> MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org 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. 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 Reviewed-by: Lina Iyer Reviewed-by: Sudeep Holla 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 0690d66df829..d8e925e84c27 100644 --- a/drivers/cpuidle/cpuidle-psci.h +++ b/drivers/cpuidle/cpuidle-psci.h @@ -9,7 +9,7 @@ struct device_node; void psci_set_domain_state(u32 state); int 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 *psci_dt_attach_cpu(int cpu); void psci_dt_detach_cpu(struct device *dev); #else