From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 09C8DC433FF for ; Tue, 6 Aug 2019 16:16:41 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CC042208C3 for ; Tue, 6 Aug 2019 16:16:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="tt6yTpCb" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CC042208C3 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=N2EYCsgZPQ1XVseN9ZELFWMX5BVuAdfLB9pU10CHfZc=; b=tt6yTpCbYnRSIS KY2iiBWHvQiNzDgzf0L/ISk1o13tb+BO35Tg4eLl2oF5cneYAl0LU5raGFUxrwDZTJBh4uLX0iCpx FKa3LRAWDmtXHZA+N+yA+rMxcV/647yUJ8VaNOcusx7LhXW01Id2OYdSWhLaExqzgKZ4dvdFupiR+ iifZxTODBHoRBgKf52UT7vzN5Fn9GZQ+fk8d+IZC561ISkIZtP1qxg24CRO8T0JQ0bW3zxoBElxMq 850t2MpfeoAE8YzEfbfnftgTmRCUaL37cKcXx9qRXAJ/pOixDfNnJaHUMj4fXs6Sy0EYY/IWlZnSQ bvbPlSr17YPgaORXkPhw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hv28W-0004Tp-Vj; Tue, 06 Aug 2019 16:16:32 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hv28S-0004St-Ok for linux-arm-kernel@lists.infradead.org; Tue, 06 Aug 2019 16:16:31 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 45872344; Tue, 6 Aug 2019 09:16:28 -0700 (PDT) Received: from e107155-lin (e107155-lin.cambridge.arm.com [10.1.196.42]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id E4CA63F575; Tue, 6 Aug 2019 09:16:26 -0700 (PDT) Date: Tue, 6 Aug 2019 17:16:24 +0100 From: Sudeep Holla To: Lorenzo Pieralisi Subject: Re: [PATCH 5/6] ARM: psci: cpuidle: Enable PSCI CPUidle driver Message-ID: <20190806161624.GE16546@e107155-lin> References: <20190722153745.32446-1-lorenzo.pieralisi@arm.com> <20190722153745.32446-6-lorenzo.pieralisi@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20190722153745.32446-6-lorenzo.pieralisi@arm.com> User-Agent: Mutt/1.9.4 (2018-02-28) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190806_091629_778212_D9012890 X-CRM114-Status: GOOD ( 22.13 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Ulf Hansson , linux-pm@vger.kernel.org, Catalin Marinas , Daniel Lezcano , "Rafael J. Wysocki" , LKML , Will Deacon , LAKML Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Jul 22, 2019 at 04:37:44PM +0100, Lorenzo Pieralisi wrote: > Allow selection of the PSCI CPUidle in the kernel by adding > the required Kconfig options. > > Remove PSCI callbacks from ARM/ARM64 generic CPU ops > to prevent the PSCI idle driver from clashing with the generic > ARM CPUidle driver initialization, that relies on CPU ops > to initialize and enter idle states. > > Update the affected defconfig files to guarantee seamingless > transition from the generic ARM CPUidle to the PSCI CPUidle > driver on arch/platforms using it. > > Signed-off-by: Lorenzo Pieralisi > Cc: Will Deacon > Cc: Ulf Hansson > Cc: Sudeep Holla > Cc: Daniel Lezcano > Cc: Catalin Marinas > Cc: Mark Rutland > Cc: "Rafael J. Wysocki" > --- > arch/arm/configs/imx_v6_v7_defconfig | 1 + > arch/arm64/configs/defconfig | 1 + Better to keep above you as separate patch, though it may cause minor issues from bisectibility. It may be needed anyway for merging. > arch/arm64/kernel/cpuidle.c | 7 ++++--- > arch/arm64/kernel/psci.c | 4 ---- > drivers/cpuidle/Kconfig.arm | 8 ++++++-- > drivers/firmware/psci/psci.c | 9 --------- > 6 files changed, 12 insertions(+), 18 deletions(-) > > diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig > index a53b29251ed4..4174fd1b79e7 100644 > --- a/arch/arm/configs/imx_v6_v7_defconfig > +++ b/arch/arm/configs/imx_v6_v7_defconfig > @@ -60,6 +60,7 @@ CONFIG_ARM_IMX6Q_CPUFREQ=y > CONFIG_ARM_IMX_CPUFREQ_DT=y > CONFIG_CPU_IDLE=y > CONFIG_ARM_CPUIDLE=y > +CONFIG_ARM_PSCI_CPUIDLE=y > CONFIG_VFP=y > CONFIG_NEON=y > CONFIG_PM_DEBUG=y > diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig > index 0e58ef02880c..c0a7cfe3aebd 100644 > --- a/arch/arm64/configs/defconfig > +++ b/arch/arm64/configs/defconfig > @@ -72,6 +72,7 @@ CONFIG_RANDOMIZE_BASE=y > CONFIG_HIBERNATION=y > CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y > CONFIG_ARM_CPUIDLE=y > +CONFIG_ARM_PSCI_CPUIDLE=y > CONFIG_CPU_FREQ=y > CONFIG_CPU_FREQ_STAT=y > CONFIG_CPU_FREQ_GOV_POWERSAVE=m > diff --git a/arch/arm64/kernel/cpuidle.c b/arch/arm64/kernel/cpuidle.c > index d1048173fd8a..4bcd1bca0dfc 100644 > --- a/arch/arm64/kernel/cpuidle.c > +++ b/arch/arm64/kernel/cpuidle.c > @@ -11,6 +11,7 @@ > #include > #include > #include > +#include > > #include > #include > @@ -48,15 +49,15 @@ int arm_cpuidle_suspend(int index) > > int acpi_processor_ffh_lpi_probe(unsigned int cpu) > { > - return arm_cpuidle_init(cpu); > + return psci_acpi_cpu_init_idle(cpu); This will break build as psci_acpi_cpu_init_idle is introduced in next patch. You can simply move it to next patch I assume. > } > > int acpi_processor_ffh_lpi_enter(struct acpi_lpi_state *lpi) > { > if (ARM64_LPI_IS_RETENTION_STATE(lpi->arch_flags)) > - return CPU_PM_CPU_IDLE_ENTER_RETENTION(arm_cpuidle_suspend, > + return CPU_PM_CPU_IDLE_ENTER_RETENTION(psci_cpu_suspend_enter, > lpi->index); > else > - return CPU_PM_CPU_IDLE_ENTER(arm_cpuidle_suspend, lpi->index); > + return CPU_PM_CPU_IDLE_ENTER(psci_cpu_suspend_enter, lpi->index); > } > #endif > diff --git a/arch/arm64/kernel/psci.c b/arch/arm64/kernel/psci.c > index 85ee7d07889e..a543ab7e007c 100644 > --- a/arch/arm64/kernel/psci.c > +++ b/arch/arm64/kernel/psci.c > @@ -105,10 +105,6 @@ static int cpu_psci_cpu_kill(unsigned int cpu) > > const struct cpu_operations cpu_psci_ops = { > .name = "psci", > -#ifdef CONFIG_CPU_IDLE > - .cpu_init_idle = psci_cpu_init_idle, > - .cpu_suspend = psci_cpu_suspend_enter, > -#endif > .cpu_init = cpu_psci_cpu_init, > .cpu_prepare = cpu_psci_cpu_prepare, > .cpu_boot = cpu_psci_cpu_boot, > diff --git a/drivers/cpuidle/Kconfig.arm b/drivers/cpuidle/Kconfig.arm > index 929b57424ea4..b9c56c60ab98 100644 > --- a/drivers/cpuidle/Kconfig.arm > +++ b/drivers/cpuidle/Kconfig.arm > @@ -14,8 +14,12 @@ config ARM_CPUIDLE > provided by architecture code. > > config ARM_PSCI_CPUIDLE > - bool > - > + bool "PSCI CPU idle Driver" As mentioned in previous patch, do you see issues having just above change in this patch and the below ones moved to the previous. > + depends on ARM_PSCI_FW > + select DT_IDLE_STATES > + select CPU_IDLE_MULTIPLE_DRIVERS > + help > + Select this to enable PSCI firmware based CPUidle driver for ARM. You need extra blank line here. -- Regards, Sudeep _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel