From patchwork Wed Sep 13 02:05:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 138698 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp937836vqx; Wed, 13 Sep 2023 01:39:02 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFfKm2zaSoyvKmTw/zz4bPYOIxm7vrDKO1EAmn6p2ZWj3lhbragVOlxYZ5Nw3wnxGVP3n0p X-Received: by 2002:a05:6a21:3d86:b0:154:3f13:1bb7 with SMTP id bj6-20020a056a213d8600b001543f131bb7mr1339274pzc.49.1694594341900; Wed, 13 Sep 2023 01:39:01 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1694594341; cv=pass; d=google.com; s=arc-20160816; b=UdXkiKabi5QPpeU9XYn4WJ86La6Qg6arENhn7CN2ICm0Vzum+feWzogfQjqnSOfVxY 117dsMxsDW2rREVpU5hUIC5AtM0KVPMII9Lg87QmFISyf1qiWnsa5y7PAhqMgQoepY5a SQxNB4HR+zNTa4qJsEi0lVdGXeN11R3vbrSvZNiaUadss4M16w/G3MA8uut+ztNpGXlD fJs3pqPcwpWxoN1bBVOxg2jfoaqLIKYha9vaWXdHqA+ET0XNQVR2skoPf1rCmPoqyWKB wjPJ6H8dlWuWEHat2ixywtU1QojLxVjCm3w2M0cwk8oes9qwAJDkAZ0pKSmX9AToXLt5 rCuQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:cc:to:in-reply-to:references :message-id:content-transfer-encoding:subject:date:from :dkim-signature; bh=6CphTRmQFp4aKG1R6ujHLI+fgirNZKeqT8MlKcLFtWE=; fh=gDYD2MyBIg6g39oVdQ2jvEGWNH5X2VPuEabY2w0P9ho=; b=ybHp0sKRM0nm5PzOZFAAbVZLQwtgH4y+t1kYfH4/ZWfE2892VpB+ki9VvhzsJY/hEF kaGOun8vQ9lDCCGR6MmR1RadwqF1qvpIa9bcPUAxbBfnuuoRgJMXkoyj/8scgQSWadi1 BC8ge5AP+7YNTDTOay7WqXyeZgwJqnWmABRiI6Ock90vChrl2lZS3uY9DKpermf3deaq XtmvDBI+J/7y04+WR0aMtyqz168WUaeretG23j7qCTZ5m8/6ybPIvOqV15w2JSPEiGHB Y4tdAUfB8b5DnJKv+kOvVUQ4H4lyuUpL4eI/6FzUcsNEXa+lN5n2/B79onEJKAi+Rpzl uV4A== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@NXP1.onmicrosoft.com header.s=selector2-NXP1-onmicrosoft-com header.b=EBxKJmUr; arc=pass (i=1 spf=pass spfdomain=oss.nxp.com dkim=pass dkdomain=oss.nxp.com dmarc=pass fromdomain=oss.nxp.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id s4-20020a62e704000000b0068e2566615esi9412056pfh.379.2023.09.13.01.38.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 01:39:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@NXP1.onmicrosoft.com header.s=selector2-NXP1-onmicrosoft-com header.b=EBxKJmUr; arc=pass (i=1 spf=pass spfdomain=oss.nxp.com dkim=pass dkdomain=oss.nxp.com dmarc=pass fromdomain=oss.nxp.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 946C5828E858; Tue, 12 Sep 2023 19:01:21 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236021AbjIMCBU (ORCPT + 36 others); Tue, 12 Sep 2023 22:01:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52514 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235255AbjIMCBS (ORCPT ); Tue, 12 Sep 2023 22:01:18 -0400 Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2083.outbound.protection.outlook.com [40.107.249.83]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 11C181706; Tue, 12 Sep 2023 19:01:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=L1SAju/jrQkvjYEDffv0FVKoqUl1T26rPbqzTqtO6ZrAdjdTOzXboaFg8gKhBYligXQrtpzQjhGNv9tQAm1xq0SwbfSm0VC0CyoS5JPmL69EUtndLUzpSeHgTQ9HeavEWQz8tny/9IiN8AlTsVbfA2KJCGTQTEOO6z7w9OaM9+M0fo1eu3RZdPIbatdc9JGsKGpE84mFpIX96nugTTEsAOcGfUywHsMiKTSTp/lPrB069f2MbAhKalDsBvH2mQFupeznRCK8B39zX1fKbvKPRhVqodB2MsbV1IDwgTIKBGSfd8H8M66sgwmWWv1NKWGkRUfVf8uBHXwlgPE3NZFnsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=6CphTRmQFp4aKG1R6ujHLI+fgirNZKeqT8MlKcLFtWE=; b=UIRTA0qEkMc0wYXHSsOtrpBmUmLhMsZUeq7Qnj/n3U+pzFF20xCwwohpvfDKfJOBlH8FLUe3Pl+RjoOQ0SiPLi2CtXIiqOmhZa4EzF13VpAPsumRvzsInBFGlft9LWk7bPmz1VoJPufaekJ1ttDC9b+XGMJGJbgOAdI44u/F1nE+KGmNKD17/uBKHwx6zfxumkMg0K9snyNZjCSl3x9QpO4UUPJ/9/oyuUTpMswiEo2BSDmyWh+NP9akQ9Ohhk3Q63nigxUon6e4fZzzwDebr13D5DmdROGYQxPMVCH8Wl2hTMFQKBozzj4Jr4fva6scXRp0iyoNKYgCzVSyDbS2QA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6CphTRmQFp4aKG1R6ujHLI+fgirNZKeqT8MlKcLFtWE=; b=EBxKJmUrSfmUiXXko7IjW9RnFq3ylLfW+pbb4qyviC7DnATxMUkIHytk0XoQLcfVnNFS3K2dAKa3uYK59C+3NrZWUj4dhBQhqTkdlmqJAlfzE6ImdGgw7vmNmKZrH4mgg5cS43Pl148mIllZbzeQB+88Oes74FevqGyZCuFesIQ= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by PAXPR04MB8894.eurprd04.prod.outlook.com (2603:10a6:102:20d::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.37; Wed, 13 Sep 2023 02:01:11 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::2b3:d8de:95c8:b28b]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::2b3:d8de:95c8:b28b%3]) with mapi id 15.20.6768.029; Wed, 13 Sep 2023 02:01:10 +0000 From: "Peng Fan (OSS)" Date: Wed, 13 Sep 2023 10:05:36 +0800 Subject: [PATCH 1/3] PM / Domains: Support enter deepest state for multiple states domains Message-Id: <20230913-multiple-state-scu-v1-1-9d91c6904ffa@nxp.com> References: <20230913-multiple-state-scu-v1-0-9d91c6904ffa@nxp.com> In-Reply-To: <20230913-multiple-state-scu-v1-0-9d91c6904ffa@nxp.com> To: "Rafael J. Wysocki" , Kevin Hilman , Ulf Hansson , Len Brown , Pavel Machek , Greg Kroah-Hartman , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Dong Aisheng , Peng Fan X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1694570751; l=2848; i=peng.fan@nxp.com; s=20230812; h=from:subject:message-id; bh=WzVpFHVCTbI8zhHb0izO8j6+hEmyN9JYHoZIs2nN/00=; b=x5MB0kWQ+YlcRxwsvZKSgszc3sxU43xTKgNHYIqa2Qd+X1abSo1zjvXi84fnR87XcfTLtL7zF 5pIJ+jVPPWrBmMDHDznqPVnlbo5lUIu9oJbeHQ5T6ATqEr8wsFpkmn7 X-Developer-Key: i=peng.fan@nxp.com; a=ed25519; pk=I4sJg7atIT1g63H7bb5lDRGR2gJW14RKDD0wFL8TT1g= X-ClientProxiedBy: SI2PR02CA0015.apcprd02.prod.outlook.com (2603:1096:4:194::16) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0PR04MB9417:EE_|PAXPR04MB8894:EE_ X-MS-Office365-Filtering-Correlation-Id: 8e91393e-1fa2-4cb1-4932-08dbb3fd4c23 X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9pCkJXy1V3cjkeC/UI9vwlWFveOiHWxHNz9qegFHluc4rXomXp9iLDVkRKZ40CJVBvagZ0OdeFJawLbOpaTP4caicOo2MnfpSA9o1MyO4XXXNx12fTaDFP0wuPdR/BCIHW2qvABkDjNGvU3RJUUAjm/brnYNLG3ZGgxFStbgysHewmwwO23KBHuEDf9tCJnZkAj6UcUUGu6sPBe5yT4yZIkF7hgsIeraXCbtg8LSg20nD2A55Sp4cvPWWOcYW/qPlexn7Z0cohdZGzBb495C9Y925lffEdBudjdKLqLTfUJLWI5fkd0doIyhSY3cdOJ14wbaAqKTBuV7VqGMRiLaZ1n0+oe1k/UULycJoJ/8vMzmrRid9NZ37QMVfn5kWNy3KhqbkZm2zHeBJWei/y/sxTxZodU8hEL/RgQtnh4UQxdhEoqd1O2wqLspFyhAz23YnB0wa74e058f1gyE6xKmqE3emorBnchepWOEEyIZ+U60kZGQh77qVQ9qPcBet1KMxu1yhdd4XokU+tgUNS/YCq3wbNxyPnfRDbWuZP8p5WAFOwfLU+3t79AAfB3PkGgHja+qIszLDJMdy2TGJHT+LofSX2FhsIC1Q1xiJAspTYLOEIyvIh4P3tgpw18doug7ur0/ThfgGsRafGHnD+2Yow== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU0PR04MB9417.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376002)(39860400002)(396003)(366004)(346002)(136003)(186009)(451199024)(1800799009)(9686003)(6512007)(7416002)(5660300002)(6666004)(52116002)(6486002)(6506007)(26005)(478600001)(2906002)(83380400001)(8936002)(8676002)(4326008)(66946007)(921005)(41300700001)(316002)(54906003)(110136005)(38100700002)(36756003)(38350700002)(86362001)(66556008)(66476007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?EdN4iNwSpWbz/u/b15RNGXUJRxVh?= =?utf-8?q?1PTN+SECpiPNlRtTvFwZBe7o5Hgb3HJGf4j69w1oKKY1DfRUnEHoXG9KXKCSiGG/z?= =?utf-8?q?wBQpE9jC2EUVyHGEeb9/q1QYWdKIiWBtRnxvLshfojw8S0bYuQvAoLsPE7hwYWsEn?= =?utf-8?q?qjsBnhl6nVThcjJmC/3q4DRs7k7TYdvx8DGYsKr3YN/UmMBDVV95S63w5ILkwJavN?= =?utf-8?q?G/18zO+ALppbpvaUnFNRK9zDThG5b3hALZGaw7AitDZWw95z36XkAh8bBwTInCdTq?= =?utf-8?q?x6Rytpz+Ch2b83x/WqszL5bQUUb29xWmwOyAQtsbfXJrs+5c+pxg3IlI6kVk71n3T?= =?utf-8?q?KYfD/OrVR4LXoqxLBdoZzTgSAmI5nmaATonIJp6GEOK18zmvbTlcGzK7jxMHsCELZ?= =?utf-8?q?fJnL1UtTlHagYhrhWGShqSv4YoJaHlblMff7Jgs2nGFpF/VOcpe329gxP5xC3Qm+/?= =?utf-8?q?Bh3jW+BC2+OizvjiCsevlXbS1uZbLFOxgYBWeFqH6klE/deDW7NOwcipVP2t6PKs4?= =?utf-8?q?W++E9qiz48fJwLHYL3lOmKzVtzZ9RjlLt4JcRMa12a/CkvVm2+gslBUvKmrSe5URH?= =?utf-8?q?mLMzZEdcbyLBJLSVpEdleW47JkO/mkv3tq0PRtruHBdHADy8yR2ksqeVU08chxtBO?= =?utf-8?q?qITF1zIxjzW/FyDz3RJONZVc/En1jhqjVfloKF6nYCckPDRvJzviYIKvtT6ZCWA1/?= =?utf-8?q?M1hoGHQ1tFly9ZUntSXKvhpCLqaONvCF0mCWyAOjrPu3rHfR7JxdFTy3qyXWZnj/k?= =?utf-8?q?ltLcDLwUG4mbNzbZgKZGobv+pFnFffBkwNvQVpWZrmsSG/pS2e9lsjW1P2XlJI/4J?= =?utf-8?q?8V65TF77nz81n0PHffMS01J6v/DvplUQ0GErlR1RrhvS+OQBnhjrJuHRGYZjib/L2?= =?utf-8?q?eUo17NTcRdE5LUVBzmuVt6KdeZgmzzT8uYrXYq0BoHHE0XhaDBtek0NU0OJofSKKL?= =?utf-8?q?hc11tNW/s3y3zJZOCKE//6qkbxgf0WxzV4Yq7og2UhQYOkLQEp/iPRoRZiMKlywwg?= =?utf-8?q?95QuPPa2CBp0JU588qQqE3IgKBXxyLmgfQKrWO6XtAQyexdFURNqzbvnzVmDcpqDh?= =?utf-8?q?l+F0uiFUjax3aGFKzt61dNe27g4vdxMvmNbtnkev3d1qc1YBzttcUzN7YiOXnmdC2?= =?utf-8?q?2FjJbY7x9pBP/eziJoSVUBzq+AMR00v8ob4NxyCwta1MgAbVuI5U4+BtfWL6Ig/4p?= =?utf-8?q?ePdGFtYorxdva/lo1bJe4cRbI68wHm3n59jIIfsatyVnb8rxx5zL3ZW431PN0ltQm?= =?utf-8?q?Ji8//+ZYvQnEru8Kg+Isd663jbFndqWxaESBAfLpfdRekUc9kkUcj4Cs3dx+v0YQj?= =?utf-8?q?rivKfgLBSYPL7XTnb/ezgJasXY5apZCFuXhH0DtzYolxG19IjbuXHWkaJh3McCUd/?= =?utf-8?q?MbU4HJ+yBM+tb9DDpLk7VYGLB1jrk+JP2oO/NPLMfskmXLQ6tca3iOXK9OccZQ4qQ?= =?utf-8?q?RniP2Xjxd1/498YUPAoZw11lHnwsen9LQ2d/GlkhtDY1mVoBm63gJnRryrHZUzQNG?= =?utf-8?q?lmFbMRHVRXWw?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8e91393e-1fa2-4cb1-4932-08dbb3fd4c23 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2023 02:01:10.9312 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ggCCo251r+V5bjg8O79a9aQAABb7kEbfnaDWFNm1hmPWAYpxGfpKqJWJ8w/c1d3yISU7hU6MGq6dEh7AblB/zg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8894 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Tue, 12 Sep 2023 19:01:21 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776910956502358246 X-GMAIL-MSGID: 1776910956502358246 From: Dong Aisheng Currently the generic power domain will power off the domain if all devices in it have been stopped during system suspend. It is done by checking if the domain is active in genpd_sync_power_off, then disable it. However, for power domains supporting multiple low power states, it may have already entered an intermediate low power state by runtime PM before system suspend and the status is already GPD_STATE_POWER_OFF which results in then the power domain stay at an intermediate low power state during system suspend. Then genpd_sync_power_off will keep it at the low power state instead of completely gate off it. Let's give the power domain a chance to switch to the deepest state in case it's already off but in an intermediate low power state. Signed-off-by: Dong Aisheng Signed-off-by: Peng Fan --- drivers/base/power/domain.c | 18 +++++++++++++++++- include/linux/pm_domain.h | 1 + 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 5cb2023581d4..22cfa3020b18 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -1124,7 +1124,17 @@ static void genpd_sync_power_off(struct generic_pm_domain *genpd, bool use_lock, { struct gpd_link *link; - if (!genpd_status_on(genpd) || genpd_is_always_on(genpd)) + /* + * Give the power domain a chance to switch to the deepest state in + * case it's already off but in an intermediate low power state. + */ + genpd->state_idx_saved = genpd->state_idx; + + if (genpd_is_always_on(genpd)) + return; + + if (!genpd_status_on(genpd) && + genpd->state_idx == (genpd->state_count - 1)) return; if (genpd->suspended_count != genpd->device_count @@ -1143,6 +1153,9 @@ static void genpd_sync_power_off(struct generic_pm_domain *genpd, bool use_lock, if (_genpd_power_off(genpd, false)) return; + if (genpd->status == GENPD_STATE_OFF) + return; + genpd->status = GENPD_STATE_OFF; list_for_each_entry(link, &genpd->child_links, child_node) { @@ -1189,6 +1202,9 @@ static void genpd_sync_power_on(struct generic_pm_domain *genpd, bool use_lock, } _genpd_power_on(genpd, false); + /* restore save power domain state after resume */ + genpd->state_idx = genpd->state_idx_saved; + genpd->status = GENPD_STATE_ON; } diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h index f776fb93eaa0..bbd08115a1fc 100644 --- a/include/linux/pm_domain.h +++ b/include/linux/pm_domain.h @@ -167,6 +167,7 @@ struct generic_pm_domain { }; }; + unsigned int state_idx_saved; /* saved power state for recovery after system suspend/resume */ }; static inline struct generic_pm_domain *pd_to_genpd(struct dev_pm_domain *pd)