From patchwork Fri Mar 3 09:23:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cheng-Jui Wang X-Patchwork-Id: 63835 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp314868wrd; Fri, 3 Mar 2023 01:33:03 -0800 (PST) X-Google-Smtp-Source: AK7set9jXJabgG2UMJbtrE7dY1JVM3EHLFME9Yw25XxnLCF0uqKAAzqg92HdndzjoaELOrU4hHPb X-Received: by 2002:a17:906:6bc1:b0:8b1:304e:58a3 with SMTP id t1-20020a1709066bc100b008b1304e58a3mr867650ejs.52.1677835983075; Fri, 03 Mar 2023 01:33:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677835983; cv=none; d=google.com; s=arc-20160816; b=LosQaWKPXisoauagVi08ba2am4b+ojt6rsRVignbjoiEsZSAY8PDdQ+XrkfIvJsyYx 7b6p5uWe+7q0X25+cA1ax3GUuZuTngiPOJet+9f1zAtBUSQ7X+ksR3kZDLTqvd8gcqga ln0WLgOdEaQOqsENO9Njd4shnDFNn/slTBBsRWT6JJs0V3J+qbr9KZljLPr+SD/jViUy 9Q82D+xrjygkqfn8ibwbzlZqpdIxWeV6+wHBjHKOMpaEUL8ifbPg7ApjmIYRBNn0rOxu WeZlxjyR9/snm0ypqKWpMCTb/F6tQsLLJprVolFJedv1b5Ryai6k+YfzzEyKzWY1CT+j xCSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=ksYXpcLRpyhSF2BCe6z2U0gcUedKGDwO8T2OIU6P68o=; b=lGFStd3wSYvDdNe+o/BYjWOxpuIoT87nr3wMgqdVHkXflGsPGz9iE/ZbNEAPH3hFAB 5+mgCIJJvA/BtGm9iWVuWrK8R22jcSS7ezYKQFlT/ymRaQmeQq/1kyn1REBEXby3HFr1 o5EkJ7k0PVO2qKJicpvAcwc5y+CklIOae1cTyYRFkDGQvmW0bjJJ83Wz+wmy5JELkLfQ arv2yDv8wA0AvY92j2f1+4GKI5a4WzevGJcJMDe+kv4VKCWRAg1sUlQ6jlndx2Eoi+Z/ YknXou20GZatRZPJCr9DjXql4P9eQQ5vaD9gffAVMFSy92ghWqvQtjfb4WbACmpZiGXs fAMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mediatek.com header.s=dk header.b=nZkwvpzB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mediatek.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w8-20020a170906184800b008b17b235680si1875861eje.131.2023.03.03.01.32.40; Fri, 03 Mar 2023 01:33:03 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@mediatek.com header.s=dk header.b=nZkwvpzB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mediatek.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230407AbjCCJ0A (ORCPT + 99 others); Fri, 3 Mar 2023 04:26:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52430 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231201AbjCCJZj (ORCPT ); Fri, 3 Mar 2023 04:25:39 -0500 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 02FE657D24; Fri, 3 Mar 2023 01:25:17 -0800 (PST) X-UUID: 4be222acb9a511ed945fc101203acc17-20230303 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=ksYXpcLRpyhSF2BCe6z2U0gcUedKGDwO8T2OIU6P68o=; b=nZkwvpzBLeBHTWsRQGIM2m0jnQeaCbo/drr3iLgfi6ylcl5lvp6/HCCB/Z9+pLkH2JeQtZL0D0jDqIB/9RJ0XNp5pX2QrCSzSsw4tOz1Wd1mrKLIAzRucVV6i9Sw8lj2/fAE1xALggFOOJzGs6V4CTr8cx1UFslxo9sBmprh2E8=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.20,REQID:729e9142-281b-4380-bde8-04e35560c591,IP:0,U RL:0,TC:0,Content:-25,EDM:0,RT:0,SF:53,FILE:0,BULK:0,RULE:Release_Ham,ACTI ON:release,TS:28 X-CID-INFO: VERSION:1.1.20,REQID:729e9142-281b-4380-bde8-04e35560c591,IP:0,URL :0,TC:0,Content:-25,EDM:0,RT:0,SF:53,FILE:0,BULK:0,RULE:Release_Ham,ACTION :release,TS:28 X-CID-META: VersionHash:25b5999,CLOUDID:ef273d27-564d-42d9-9875-7c868ee415ec,B ulkID:2303031725130DEM1UT0,BulkQuantity:0,Recheck:0,SF:38|29|28|100|17|19| 48|101|102,TC:nil,Content:0,EDM:-3,IP:nil,URL:1,File:nil,Bulk:nil,QS:nil,B EC:nil,COL:0,OSI:0,OSA:0,AV:0 X-CID-BVR: 0,NGT X-UUID: 4be222acb9a511ed945fc101203acc17-20230303 Received: from mtkmbs10n1.mediatek.inc [(172.21.101.34)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 860502259; Fri, 03 Mar 2023 17:25:11 +0800 Received: from mtkmbs11n1.mediatek.inc (172.21.101.186) by mtkmbs13n1.mediatek.inc (172.21.101.193) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.25; Fri, 3 Mar 2023 17:25:10 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkmbs11n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1118.25 via Frontend Transport; Fri, 3 Mar 2023 17:25:09 +0800 From: Cheng-Jui Wang To: , Anup Patel , "Rafael J. Wysocki" , Daniel Lezcano , Paul Walmsley , Palmer Dabbelt , Albert Ou , Matthias Brugger CC: Peter Zijlstra , Ingo Molnar , Suren Baghdasaryan , Cheng-Jui Wang , , , , , Subject: [PATCH 02/10] cpuidle, riscv: Push RCU-idle into driver Date: Fri, 3 Mar 2023 17:23:24 +0800 Message-ID: <20230303092347.4825-3-cheng-jui.wang@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20230303092347.4825-1-cheng-jui.wang@mediatek.com> References: <20230303092347.4825-1-cheng-jui.wang@mediatek.com> MIME-Version: 1.0 X-MTK: N X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, SPF_PASS,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759338543589206384?= X-GMAIL-MSGID: =?utf-8?q?1759338543589206384?= From: Peter Zijlstra commit 8e9ab9e8da1eae61fdff35690d998eaf8cd527dc upstream. Doing RCU-idle outside the driver, only to then temporarily enable it again, at least twice, before going idle is suboptimal. That is, once implicitly through the cpu_pm_*() calls and once explicitly doing ct_irq_*_irqon(). Signed-off-by: Peter Zijlstra (Intel) Signed-off-by: Ingo Molnar Tested-by: Tony Lindgren Tested-by: Ulf Hansson Reviewed-by: Anup Patel Reviewed-by: Frederic Weisbecker Acked-by: Rafael J. Wysocki Link: https://lore.kernel.org/r/20230112195539.637185846@infradead.org Signed-off-by: Suren Baghdasaryan Signed-off-by: Cheng-Jui Wang --- drivers/cpuidle/cpuidle-riscv-sbi.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/cpuidle/cpuidle-riscv-sbi.c b/drivers/cpuidle/cpuidle-riscv-sbi.c index 05fe2902df9a..cbdbb11b972b 100644 --- a/drivers/cpuidle/cpuidle-riscv-sbi.c +++ b/drivers/cpuidle/cpuidle-riscv-sbi.c @@ -121,12 +121,12 @@ static int __sbi_enter_domain_idle_state(struct cpuidle_device *dev, return -1; /* Do runtime PM to manage a hierarchical CPU toplogy. */ - ct_irq_enter_irqson(); if (s2idle) dev_pm_genpd_suspend(pd_dev); else pm_runtime_put_sync_suspend(pd_dev); - ct_irq_exit_irqson(); + + ct_idle_enter(); if (sbi_is_domain_state_available()) state = sbi_get_domain_state(); @@ -135,12 +135,12 @@ static int __sbi_enter_domain_idle_state(struct cpuidle_device *dev, ret = sbi_suspend(state) ? -1 : idx; - ct_irq_enter_irqson(); + ct_idle_exit(); + if (s2idle) dev_pm_genpd_resume(pd_dev); else pm_runtime_get_sync(pd_dev); - ct_irq_exit_irqson(); cpu_pm_exit(); @@ -251,6 +251,7 @@ static int sbi_dt_cpu_init_topology(struct cpuidle_driver *drv, * of a shared state for the domain, assumes the domain states are all * deeper states. */ + drv->states[state_count - 1].flags |= CPUIDLE_FLAG_RCU_IDLE; drv->states[state_count - 1].enter = sbi_enter_domain_idle_state; drv->states[state_count - 1].enter_s2idle = sbi_enter_s2idle_domain_idle_state;