From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.210.200 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794997179; b=sihDMtNf57/aJv0lZVU+uceQHsJ+ScCckUykSsd6VjmXzCBJ6vxeAMmv7+XGsRsvHd+0 vXHjhLj4gIifG3UbksTebL2fpd7/htziwseHg87vgWnDyuffxKQAtcaHMEq+pVweRjdW1 OfqVduqGwNGx5fhRL4xIqLAJssn3mzjnJJfjO2u2BjqQEBcVG+k4rg4mNlKiKUrqeQ2xM S4d0nzbshHrsc43CfkfACFH7UsXAKePumSzLZ17j7eEcoEE6KXZS5liEVvpsRpzBZZ/O3 9MdfdGp2hpn5TOWg037vAxsN4Q2gqZIi+iCyfSvCLVlH+fYco8sA6UMDQIrIDKjIz0A== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794997179; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Received:Date:In-Reply-To: Mime-Version:References:X-Mailer:Message-ID:Subject:From:To:Cc: Content-Type; bh=aIQPF6ydugV2EGXv5JJhtxIj0diRuKvsDMJ8C4tUohY=; b=dbH+hGYEb17LSpUoWe4f1bhviopnJ+KY0esMwm3Kxl/86x1CYpktuXVq+YnymBLdueNX k74OPGnZXSzU+vlWYkRmO5Yw5S01tXfGxR/QRDNpyRpzhCmbZhE51liPgsFvQgRKj7VAH Txw8i/u7gNCcNORH+Ue5zxQnJurP1e4PoQH1tWHkw8v7lzSX+gFLqZztW0LeW4U5y4lRb r/o4Ww7c+f3kS1AMuvl9R7hfVXkc1pHPyCCSmdh/T08XgoGLNoKFxFRok/IDQSskR9mJY 8Lk4obWhX7QeZVSocFAD4N0ARVA7IGYEvePFnBnSzm7De5nI7xfRmbHutYrunWwq4rA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=google.com; spf=pass smtp.mailfrom=flex--amitamishra.bounces.google.com; dkim=pass header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=kGuSBzQP; arc=none smtp.remote-ip=209.85.210.200 Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 65F53606A332 for ; Wed, 18 Nov 2026 10:19:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 65F53606A332 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--amitamishra.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=kGuSBzQP Received: by mail-pf1-f200.google.com with SMTP id d2e1a72fcca58-8b7cc3f8a4aso660751b3a.3 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=vger.kernel.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=kGuSBzQPqR73UQ+SGKRjOX8oLuG9EwlBHQKV3g/DHqgxGEVHyZe/3ykcj7rzU0X0A4 boNxg91EUULSLh50irY1L+CuXQXukUWrppioiaSh/Ien7bCXwdYNa7QZW1u6ox2iKnDf gfdylC0bzajYQF4uaufCQcVl66sKKt0tFYLIBpN9Ne0UiVqFDXXTO4VmeQCyVTT3+joS fxVMul2295AjOiXonOrvQX6ku5HI631yzDCKBAXc5uvAtDOxkYmj+KqqlL02kUuVTT0f nHvLxMbdNfhuYC9OIGng2L7S76T628NcsmrysB6Ge8ZsdY4k3P5+xVuIHxNiRtS0QX+C //kQ== 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=ljSmelQdTD9Wb6ETWOVUvSSuC1/J+utn+Gg0fIAti45Xe+XD8Nfa+rufbeOuEBonrB 94Fta2+qpYEPZ1WsxBrxhumyNZFcJZPCBsftP5IFewj+WdAty2VjmOl//JzdQimS4IwA gb4lV5PGrd/TVNXP/j+Q2m4QQvjxOqkeC7/ujADwh54eamqNP3+A3NN18WRkcwOrXSSy prUTw2AdQvbuXQjF4qHISJqU/lxnHgM15BBoBzMJWwh/wpRWPMnrk4SNH7hnTERaooLJ MX6ebizqAdA3bhHEXnvnicKNTxwHH5fY3ef7Pn6SIIDVVLLQ64yfmtFEY3OI2UtCfwjT PSwg== X-Forwarded-Encrypted: i=1; AL+hErH4B864HVCKxPCUnJpsIu54wshxDW7uwLLlJFdAv5NF92TXdkr4CoUFsYYt345cpyCI2Ox0BdV/JVVc@vger.kernel.org X-Gm-Message-State: APuU4Z/XLjRZF8a0SvTytpxvr7sY3e5VGq4pHIg1r+xA4PL6XhTbRZ7h VubDk1oXC/KofKqLV/bMqkYHyZ0G/THfuYMvC7Td1iCM3DCt+AFBaiwVubkbRwGU4/uOleSMfQ1 PSdXgwUJb+gPoznMoADUeYJvqpQ== 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-Mailing-List: devicetree@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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" 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