From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9074D606A320 for ; Wed, 18 Nov 2026 10:19:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=uzVy1gn+; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=ip+HGtYQ DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:Cc:To:From: Subject:Message-ID:References:Mime-Version:In-Reply-To:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Unsubscribe-Post:List-Owner; bh=aIQPF6ydugV2EGXv5JJhtxIj0diRuKvsDMJ8C4tUohY=; b=uzVy1gn+9nFEBqgIcO7SOjakkJ CPdosfoxQekzftsO8wjcqqjFC+XtM5hHfUOxIYofPt5v52vfHRKl4ta6EiT8hisuxG3ylGylrfUx3 svF+n/0/GanFUpTLnOZFZyDNh3X3hdcQKoLoz4nM2Hb4H/Fegswda7ZxzRRj5w9hg0l2XVZPWJnr0 OucNGnnuV6AkgiTICXtQvMJqBMovWXsfucelis7dr+xCu1j9lhx7kio/NAW3uIOYTT7ms56tM2PGK zVOsgDzu7OZz2NINn5S/90BM1TzPUa+QfyrZg4y457qS6S5SrI9WuE2/lvlzCSaUXJrh9Lbp7pSHZ 8qxJcVDw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.100.1 #2 (Red Hat Linux)) id 1xTclS-00000008XiU-2HcI; Wed, 18 Nov 2026 10:19:42 +0000 Received: from mail-pf1-x445.google.com ([2607:f8b0:4864:20::445]) by bombadil.infradead.org with esmtps (Exim 4.100.1 #2 (Red Hat Linux)) id 1xTclP-00000008XhN-3Ey6 for linux-arm-kernel@lists.infradead.org; Wed, 18 Nov 2026 10:19:41 +0000 Received: by mail-pf1-x445.google.com with SMTP id d2e1a72fcca58-8b647bbf87aso686528b3a.2 for ; Wed, 18 Nov 2026 02:19:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20260707; t=1794997179; x=1795601979; darn=lists.infradead.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=aIQPF6ydugV2EGXv5JJhtxIj0diRuKvsDMJ8C4tUohY=; b=ip+HGtYQI7e7+fMDtFk2guZLObZ/9JkpeZPxdG82RPToqiFveqzNB0nrxmCCg/KbJL I3GZlsvNhX9Dy7w9s+Kj4vhFs8IDk+5jwJtwM2zUgsVnTEL09Blb4U6HLJeEH9fy+Tfi AGKD4M3MG0eikGWdX4bdVcVpEF/XjC+8PPCwpIiEDcX4UnWj/j2+b5G/fw74F1TltfAf u5XL8zJJIC75ijMgW6SYg+XXWvTqIkHLrtsr1/8NE7fl3fmOE8saiv/jFGZ5BKoEcqUg GPWpBzkl1A46AJjo2s6r6E+y55taypGyQFEhTkAuzEVjdJKfQpB+YWvIcTQnIfQIDmhp Z7wA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794997179; x=1795601979; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=aIQPF6ydugV2EGXv5JJhtxIj0diRuKvsDMJ8C4tUohY=; b=wXKaprWxc0+e5fajtFvKifBMtIV6Rb7i1jPlrWenDu83Z4aaPteRR2KdqPk69UrL7O 5o9ZyZLEIbUPlJ59x3NTVMPrgiu/tYkMGofapBxrztB9RnbOCFuS3ZRHkL8UuGAku++o WN2/7oprxmCsXGH0l3hxT1GmhbB1U86jPksyaA10Yaxjo7vwsLZQsKgm6Q/p+CLXCicq Qq3N0Bju0yWbAy7HwspBMqwgKLIFvWxVr4ePw6cm5pSOfTSHdk552xJ1LqWrFEcS3Lo/ cR9w+XpoJpA0bJk/1M5QlttiGv1qix/1thxg4mozcA5bRgKW5jB86FzfU6gO5xvbEQSB A/tg== X-Gm-Message-State: APuU4Z+Bw7nTea+ksM93+EqHFtMS2BwWBjz01q/2pAVZ9V+pAB5B79hq PETIl+bMDEAswKs51w7WI+MwRTwdp3KDvjUWAqspEse4fR3Jatsnv78Uv3KzxzUHeI1YEwM7fA1 zl3drlU8OZ90byX1cSnwdUdnOgw== X-Received: from pffm11-n1.prod.google.com ([2002:a05:6a00:c30b:10b0:8c5:614:d2c8]) (user=amitamishra job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:f08:b0:899:465d:c8ef with SMTP id d2e1a72fcca58-8c5d268fcfamr1976341b3a.14.1794997178562; Wed, 18 Nov 2026 02:19:38 -0800 (PST) Date: Wed, 18 Nov 2026 10:19:13 +0000 In-Reply-To: <20261118101913.3135869-1-amitamishra@google.com> X-Archived-By: Mime-Version: 1.0 References: <20261118101913.3135869-1-amitamishra@google.com> X-Mailer: git-send-email 2.56.1.703.gf848ed807c-goog Message-ID: <20261118101913.3135869-3-amitamishra@google.com> Subject: [PATCH 2/2] perf/smmuv3: Add runtime PM support From: Amita Mishra To: Will Deacon , Mark Rutland , Robin Murphy , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, amitamishra@google.com Content-Type: text/plain; charset="UTF-8" X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20261118_021939_823535_78473296 X-CRM114-Status: GOOD ( 27.93 ) X-Spam-Score: -9.5 (---------) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" X-Spam-Status: No, score=-26.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIMWL_WL_MED,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on aws-us-west-2-korg-listserv-alma10-1 On SoCs where an SMMUv3 PMCG resides in a switchable power domain, probing the PMCG attaches and powers on the domain, but without runtime PM support the domain remains permanently powered on even when no perf events are active. Add runtime PM support for PMCG devices attached to a PM domain: - Enable runtime PM while holding a reference before setting up the IRQ and registering the PMU, then drop the reference once probe completes so an idle PMCG can suspend. - Resume and hold a runtime PM reference in smmu_pmu_event_init() for each active event and release it in event->destroy(). - Register runtime PM callbacks to disable the PMU on suspend and reset it on resume. - Guard smmu_pmu_enable(), smmu_pmu_disable(), and smmu_pmu_handle_irq() with smmu_pmu_in_use() because perf_ctx_enable()/perf_ctx_disable() and shared or late IRQs can still run after the last event is removed and the PMCG is powered off. Keep unconditional register disable in __smmu_pmu_disable() for reset, runtime suspend, and active shutdown. Signed-off-by: Amita Mishra --- drivers/perf/arm_smmuv3_pmu.c | 134 +++++++++++++++++++++++++++++----- 1 file changed, 115 insertions(+), 19 deletions(-) diff --git a/drivers/perf/arm_smmuv3_pmu.c b/drivers/perf/arm_smmuv3_pmu.c index 97440b6233c6..e9da99b4a086 100644 --- a/drivers/perf/arm_smmuv3_pmu.c +++ b/drivers/perf/arm_smmuv3_pmu.c @@ -50,6 +50,7 @@ #include #include #include +#include #include #include #include @@ -151,15 +152,33 @@ SMMU_PMU_EVENT_ATTR_EXTRACTOR(filter_stream_id, config1, 0, 31); SMMU_PMU_EVENT_ATTR_EXTRACTOR(filter_span, config1, 32, 32); SMMU_PMU_EVENT_ATTR_EXTRACTOR(filter_enable, config1, 33, 33); -static inline void smmu_pmu_enable(struct pmu *pmu) +static inline void __smmu_pmu_enable(struct smmu_pmu *smmu_pmu) { - struct smmu_pmu *smmu_pmu = to_smmu_pmu(pmu); - writel(SMMU_PMCG_IRQ_CTRL_IRQEN, smmu_pmu->reg_base + SMMU_PMCG_IRQ_CTRL); writel(SMMU_PMCG_CR_ENABLE, smmu_pmu->reg_base + SMMU_PMCG_CR); } +/* + * perf keeps calling ->pmu_enable()/->pmu_disable() for a PMU in a CPU context + * after its last event there is gone, and a shared or late interrupt can call + * the IRQ handler. Without counters in use, no event holds a runtime PM + * reference and the PMCG may be powered off, so its registers must not be + * touched. used_counters only changes in ->add()/->del() on the event's CPU. + */ +static inline bool smmu_pmu_in_use(struct smmu_pmu *smmu_pmu) +{ + return !bitmap_empty(smmu_pmu->used_counters, smmu_pmu->num_counters); +} + +static inline void smmu_pmu_enable(struct pmu *pmu) +{ + struct smmu_pmu *smmu_pmu = to_smmu_pmu(pmu); + + if (smmu_pmu_in_use(smmu_pmu)) + __smmu_pmu_enable(smmu_pmu); +} + static int smmu_pmu_apply_event_filter(struct smmu_pmu *smmu_pmu, struct perf_event *event, int idx); @@ -174,12 +193,18 @@ static inline void smmu_pmu_enable_quirk_hip08_09(struct pmu *pmu) smmu_pmu_enable(pmu); } +static inline void __smmu_pmu_disable(struct smmu_pmu *smmu_pmu) +{ + writel(0, smmu_pmu->reg_base + SMMU_PMCG_CR); + writel(0, smmu_pmu->reg_base + SMMU_PMCG_IRQ_CTRL); +} + static inline void smmu_pmu_disable(struct pmu *pmu) { struct smmu_pmu *smmu_pmu = to_smmu_pmu(pmu); - writel(0, smmu_pmu->reg_base + SMMU_PMCG_CR); - writel(0, smmu_pmu->reg_base + SMMU_PMCG_IRQ_CTRL); + if (smmu_pmu_in_use(smmu_pmu)) + __smmu_pmu_disable(smmu_pmu); } static inline void smmu_pmu_disable_quirk_hip08_09(struct pmu *pmu) @@ -392,6 +417,14 @@ static bool smmu_pmu_events_compatible(struct perf_event *curr, * the core perf events code. */ +static void smmu_pmu_event_destroy(struct perf_event *event) +{ + struct smmu_pmu *smmu_pmu = to_smmu_pmu(event->pmu); + + /* Only set when smmu_pmu_event_init() took a reference. */ + pm_runtime_put(smmu_pmu->dev); +} + static int smmu_pmu_event_init(struct perf_event *event) { struct hw_perf_event *hwc = &event->hw; @@ -439,18 +472,26 @@ static int smmu_pmu_event_init(struct perf_event *event) hwc->idx = -1; - if (event->group_leader == event) - return 0; + if (event->group_leader != event) { + for_each_sibling_event(sibling, event->group_leader) { + if (is_software_event(sibling)) + continue; - for_each_sibling_event(sibling, event->group_leader) { - if (is_software_event(sibling)) - continue; + if (!smmu_pmu_events_compatible(sibling, event)) + return -EINVAL; - if (!smmu_pmu_events_compatible(sibling, event)) - return -EINVAL; + if (++group_num_events > smmu_pmu->num_counters) + return -EINVAL; + } + } - if (++group_num_events > smmu_pmu->num_counters) - return -EINVAL; + /* The same condition smmu_pmu_probe() enables runtime PM on. */ + if (dev->pm_domain) { + int ret = pm_runtime_resume_and_get(dev); + + if (ret < 0) + return ret; + event->destroy = smmu_pmu_event_destroy; } return 0; @@ -692,6 +733,9 @@ static irqreturn_t smmu_pmu_handle_irq(int irq_num, void *data) u64 ovsr; unsigned int idx; + if (!smmu_pmu_in_use(smmu_pmu)) + return IRQ_NONE; + ovsr = readq(smmu_pmu->reloc_base + SMMU_PMCG_OVSSET0); if (!ovsr) return IRQ_NONE; @@ -779,7 +823,7 @@ static void smmu_pmu_reset(struct smmu_pmu *smmu_pmu) { u64 counter_present_mask = GENMASK_ULL(smmu_pmu->num_counters - 1, 0); - smmu_pmu_disable(&smmu_pmu->pmu); + __smmu_pmu_disable(smmu_pmu); /* Disable counter and interrupt */ writeq_relaxed(counter_present_mask, @@ -910,10 +954,21 @@ static int smmu_pmu_probe(struct platform_device *pdev) smmu_pmu_reset(smmu_pmu); + /* + * Runtime PM must be enabled before the IRQ handler and the PMU go + * live: from then on ->event_init() takes a reference for each event. + * Hold one until probe is done. + */ + if (dev->pm_domain) { + pm_runtime_get_noresume(dev); + pm_runtime_set_active(dev); + pm_runtime_enable(dev); + } + err = smmu_pmu_setup_irq(smmu_pmu); if (err) { dev_err(dev, "Setup irq failed, PMU @%pa\n", &res_0->start); - return err; + goto out_rpm; } smmu_pmu_get_iidr(smmu_pmu); @@ -922,7 +977,8 @@ static int smmu_pmu_probe(struct platform_device *pdev) (res_0->start) >> SMMU_PMCG_PA_SHIFT); if (!name) { dev_err(dev, "Create name failed, PMU @%pa\n", &res_0->start); - return -EINVAL; + err = -EINVAL; + goto out_rpm; } if (!dev->of_node) @@ -947,7 +1003,7 @@ static int smmu_pmu_probe(struct platform_device *pdev) if (err) { dev_err(dev, "Error %d registering hotplug, PMU @%pa\n", err, &res_0->start); - return err; + goto out_rpm; } err = perf_pmu_register(&smmu_pmu->pmu, name, -1); @@ -962,10 +1018,19 @@ static int smmu_pmu_probe(struct platform_device *pdev) smmu_pmu->global_filter ? "Global(Counter0)" : "Individual"); + if (dev->pm_domain) + pm_runtime_put_sync(dev); + return 0; out_unregister: cpuhp_state_remove_instance_nocalls(cpuhp_state_num, &smmu_pmu->node); +out_rpm: + if (dev->pm_domain) { + pm_runtime_disable(dev); + pm_runtime_set_suspended(dev); + pm_runtime_put_noidle(dev); + } return err; } @@ -975,15 +1040,45 @@ static void smmu_pmu_remove(struct platform_device *pdev) perf_pmu_unregister(&smmu_pmu->pmu); cpuhp_state_remove_instance_nocalls(cpuhp_state_num, &smmu_pmu->node); + if (pdev->dev.pm_domain) + pm_runtime_disable(&pdev->dev); } static void smmu_pmu_shutdown(struct platform_device *pdev) { struct smmu_pmu *smmu_pmu = platform_get_drvdata(pdev); - smmu_pmu_disable(&smmu_pmu->pmu); + if (pdev->dev.pm_domain) { + if (pm_runtime_get_if_active(&pdev->dev) <= 0) + return; + __smmu_pmu_disable(smmu_pmu); + pm_runtime_put(&pdev->dev); + return; + } + + __smmu_pmu_disable(smmu_pmu); +} + +static int smmu_pmu_runtime_suspend(struct device *dev) +{ + struct smmu_pmu *smmu_pmu = dev_get_drvdata(dev); + + __smmu_pmu_disable(smmu_pmu); + return 0; } +static int smmu_pmu_runtime_resume(struct device *dev) +{ + struct smmu_pmu *smmu_pmu = dev_get_drvdata(dev); + + smmu_pmu_reset(smmu_pmu); + return 0; +} + +static const struct dev_pm_ops smmu_pmu_pm_ops = { + RUNTIME_PM_OPS(smmu_pmu_runtime_suspend, smmu_pmu_runtime_resume, NULL) +}; + #ifdef CONFIG_OF static const struct of_device_id smmu_pmu_of_match[] = { { .compatible = "arm,smmu-v3-pmcg" }, @@ -996,6 +1091,7 @@ static struct platform_driver smmu_pmu_driver = { .driver = { .name = "arm-smmu-v3-pmcg", .of_match_table = of_match_ptr(smmu_pmu_of_match), + .pm = pm_ptr(&smmu_pmu_pm_ops), .suppress_bind_attrs = true, }, .probe = smmu_pmu_probe, -- 2.56.1.703.gf848ed807c-goog