From nobody Sun Sep 14 20:09:15 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B1874C32793 for ; Wed, 18 Jan 2023 12:17:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230173AbjARMR4 (ORCPT ); Wed, 18 Jan 2023 07:17:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230327AbjARMQW (ORCPT ); Wed, 18 Jan 2023 07:16:22 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 52DEC87676; Wed, 18 Jan 2023 03:38:05 -0800 (PST) Date: Wed, 18 Jan 2023 11:38:03 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1674041884; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BcUQYZ96tFsTx3Oz80QuQtPOfWnxr0yC84im1agAA+k=; b=BrL/+FfWHb6bHdp0UDwZkltDH7K6F9ysc9A3rMd5/OBa0EzZxnwkmPRaLaeE8sqqWI2bhm ztckiwgkOWvhzoNsFn702imTDgveIdE/fxespoy67R38DPTAzKBqMp0eROBZR4hb40FzIw Gf17766qd1zaxyQPUDtv7XxRfyFhk9ndiTwJQu1he5EeALX5KDAkqg+CL1OqfKRYnu/XXg lfLSRwJyBfmonDWOAoZUa/0cLeTTC6EvVVnmkw7PueRyNgSEn0HMtv1Fz3AeghqMF74kUn 9V294iS5SbGW+/icr0/BJ87HsxOzPLAPv075a61qcCpKoa1cFzbkUfKzgE+IHQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1674041884; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BcUQYZ96tFsTx3Oz80QuQtPOfWnxr0yC84im1agAA+k=; b=Uy83QisAqHn08tZVOI/xVxgmvPCRkFKR/ZIggtTEHMKEQJ6wxWP9ObsMMQCtvxwsKuVBIJ IrxHDiYoXkiXtqDg== From: "tip-bot2 for Arnd Bergmann" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: sched/core] cpuidle: mvebu: Fix duplicate flags assignment Cc: Arnd Bergmann , Ingo Molnar , Peter Zijlstra , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230117164642.1672784-1-arnd@kernel.org> References: <20230117164642.1672784-1-arnd@kernel.org> MIME-Version: 1.0 Message-ID: <167404188365.4906.1521700530191201209.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the sched/core branch of tip: Commit-ID: 3b8645e9ec7eb42e7df7a367d6787a3af53f37a9 Gitweb: https://git.kernel.org/tip/3b8645e9ec7eb42e7df7a367d6787a3af= 53f37a9 Author: Arnd Bergmann AuthorDate: Tue, 17 Jan 2023 17:46:35 +01:00 Committer: Ingo Molnar CommitterDate: Wed, 18 Jan 2023 12:03:54 +01:00 cpuidle: mvebu: Fix duplicate flags assignment The added '.flags' value is sometimes ignored here because it gets overwritten by another initialization: drivers/cpuidle/cpuidle-mvebu-v7.c:24:33: error: initialized field overwr= itten [-Werror=3Doverride-init] 24 | #define MVEBU_V7_FLAG_DEEP_IDLE 0x10000 | ^~~~~~~ drivers/cpuidle/cpuidle-mvebu-v7.c:69:43: note: in expansion of macro 'MV= EBU_V7_FLAG_DEEP_IDLE' ... Merge the two fields into one. Fixes: 4ce40e9dbe83 ("cpuidle, armada: Push RCU-idle into driver") Signed-off-by: Arnd Bergmann Signed-off-by: Ingo Molnar Acked-by: Peter Zijlstra Link: https://lore.kernel.org/r/20230117164642.1672784-1-arnd@kernel.org --- drivers/cpuidle/cpuidle-mvebu-v7.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/cpuidle/cpuidle-mvebu-v7.c b/drivers/cpuidle/cpuidle-m= vebu-v7.c index 114bd09..563dba6 100644 --- a/drivers/cpuidle/cpuidle-mvebu-v7.c +++ b/drivers/cpuidle/cpuidle-mvebu-v7.c @@ -52,21 +52,20 @@ static struct cpuidle_driver armadaxp_idle_driver =3D { .name =3D "armada_xp_idle", .states[0] =3D ARM_CPUIDLE_WFI_STATE, .states[1] =3D { - .flags =3D CPUIDLE_FLAG_RCU_IDLE, .enter =3D mvebu_v7_enter_idle, .exit_latency =3D 100, .power_usage =3D 50, .target_residency =3D 1000, + .flags =3D CPUIDLE_FLAG_RCU_IDLE, .name =3D "MV CPU IDLE", .desc =3D "CPU power down", }, .states[2] =3D { - .flags =3D CPUIDLE_FLAG_RCU_IDLE, .enter =3D mvebu_v7_enter_idle, .exit_latency =3D 1000, .power_usage =3D 5, .target_residency =3D 10000, - .flags =3D MVEBU_V7_FLAG_DEEP_IDLE, + .flags =3D MVEBU_V7_FLAG_DEEP_IDLE | CPUIDLE_FLAG_RCU_IDLE, .name =3D "MV CPU DEEP IDLE", .desc =3D "CPU and L2 Fabric power down", }, @@ -77,12 +76,11 @@ static struct cpuidle_driver armada370_idle_driver =3D { .name =3D "armada_370_idle", .states[0] =3D ARM_CPUIDLE_WFI_STATE, .states[1] =3D { - .flags =3D CPUIDLE_FLAG_RCU_IDLE, .enter =3D mvebu_v7_enter_idle, .exit_latency =3D 100, .power_usage =3D 5, .target_residency =3D 1000, - .flags =3D MVEBU_V7_FLAG_DEEP_IDLE, + .flags =3D MVEBU_V7_FLAG_DEEP_IDLE | CPUIDLE_FLAG_RCU_IDLE, .name =3D "Deep Idle", .desc =3D "CPU and L2 Fabric power down", }, @@ -93,11 +91,11 @@ static struct cpuidle_driver armada38x_idle_driver =3D { .name =3D "armada_38x_idle", .states[0] =3D ARM_CPUIDLE_WFI_STATE, .states[1] =3D { - .flags =3D CPUIDLE_FLAG_RCU_IDLE, .enter =3D mvebu_v7_enter_idle, .exit_latency =3D 10, .power_usage =3D 5, .target_residency =3D 100, + .flags =3D CPUIDLE_FLAG_RCU_IDLE, .name =3D "Idle", .desc =3D "CPU and SCU power down", },