From: Sascha Hauer <s.hauer@pengutronix.de>
To: linux-rockchip@lists.infradead.org
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org,
Heiko Stuebner <heiko@sntech.de>,
Kyungmin Park <kyungmin.park@samsung.com>,
MyungJoo Ham <myungjoo.ham@samsung.com>,
Will Deacon <will@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
kernel@pengutronix.de,
Michael Riesch <michael.riesch@wolfvision.net>,
Robin Murphy <robin.murphy@arm.com>,
Vincent Legoll <vincent.legoll@gmail.com>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Conor Dooley <conor+dt@kernel.org>,
devicetree@vger.kernel.org, Sascha Hauer <s.hauer@pengutronix.de>,
Jonathan Cameron <Jonathan.Cameron@huawei.com>
Subject: [PATCH v5 14/25] PM / devfreq: rockchip-dfi: Prepare for multiple users
Date: Wed, 24 May 2023 10:31:42 +0200 [thread overview]
Message-ID: <20230524083153.2046084-15-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20230524083153.2046084-1-s.hauer@pengutronix.de>
When adding perf support later the DFI must be enabled when
either of devfreq-event or perf is active. Prepare for that
by adding a usage counter for the DFI. Also move enabling
and disabling of the clock away from the devfreq-event specific
functions to which the perf specific part won't have access.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
---
drivers/devfreq/event/rockchip-dfi.c | 57 +++++++++++++++++++---------
1 file changed, 40 insertions(+), 17 deletions(-)
diff --git a/drivers/devfreq/event/rockchip-dfi.c b/drivers/devfreq/event/rockchip-dfi.c
index d39db5de7f19c..8a7af7c32ae0d 100644
--- a/drivers/devfreq/event/rockchip-dfi.c
+++ b/drivers/devfreq/event/rockchip-dfi.c
@@ -68,13 +68,28 @@ struct rockchip_dfi {
void __iomem *regs;
struct regmap *regmap_pmu;
struct clk *clk;
+ int usecount;
+ struct mutex mutex;
u32 ddr_type;
unsigned int channel_mask;
};
-static void rockchip_dfi_start_hardware_counter(struct rockchip_dfi *dfi)
+static int rockchip_dfi_enable(struct rockchip_dfi *dfi)
{
void __iomem *dfi_regs = dfi->regs;
+ int ret = 0;
+
+ mutex_lock(&dfi->mutex);
+
+ dfi->usecount++;
+ if (dfi->usecount > 1)
+ goto out;
+
+ ret = clk_prepare_enable(dfi->clk);
+ if (ret) {
+ dev_err(&dfi->edev->dev, "failed to enable dfi clk: %d\n", ret);
+ goto out;
+ }
/* clear DDRMON_CTRL setting */
writel_relaxed(HIWORD_UPDATE(0, DDRMON_CTRL_TIMER_CNT_EN | DDRMON_CTRL_SOFTWARE_EN |
@@ -99,14 +114,30 @@ static void rockchip_dfi_start_hardware_counter(struct rockchip_dfi *dfi)
/* enable count, use software mode */
writel_relaxed(HIWORD_UPDATE(DDRMON_CTRL_SOFTWARE_EN, DDRMON_CTRL_SOFTWARE_EN),
dfi_regs + DDRMON_CTRL);
+out:
+ mutex_unlock(&dfi->mutex);
+
+ return ret;
}
-static void rockchip_dfi_stop_hardware_counter(struct rockchip_dfi *dfi)
+static void rockchip_dfi_disable(struct rockchip_dfi *dfi)
{
void __iomem *dfi_regs = dfi->regs;
+ mutex_lock(&dfi->mutex);
+
+ dfi->usecount--;
+
+ WARN_ON_ONCE(dfi->usecount < 0);
+
+ if (dfi->usecount > 0)
+ goto out;
+
writel_relaxed(HIWORD_UPDATE(0, DDRMON_CTRL_SOFTWARE_EN),
dfi_regs + DDRMON_CTRL);
+ clk_disable_unprepare(dfi->clk);
+out:
+ mutex_unlock(&dfi->mutex);
}
static void rockchip_dfi_read_counters(struct rockchip_dfi *dfi, struct dmc_count *count)
@@ -124,29 +155,20 @@ static void rockchip_dfi_read_counters(struct rockchip_dfi *dfi, struct dmc_coun
}
}
-static int rockchip_dfi_disable(struct devfreq_event_dev *edev)
+static int rockchip_dfi_event_disable(struct devfreq_event_dev *edev)
{
struct rockchip_dfi *dfi = devfreq_event_get_drvdata(edev);
- rockchip_dfi_stop_hardware_counter(dfi);
- clk_disable_unprepare(dfi->clk);
+ rockchip_dfi_disable(dfi);
return 0;
}
-static int rockchip_dfi_enable(struct devfreq_event_dev *edev)
+static int rockchip_dfi_event_enable(struct devfreq_event_dev *edev)
{
struct rockchip_dfi *dfi = devfreq_event_get_drvdata(edev);
- int ret;
-
- ret = clk_prepare_enable(dfi->clk);
- if (ret) {
- dev_err(&edev->dev, "failed to enable dfi clk: %d\n", ret);
- return ret;
- }
- rockchip_dfi_start_hardware_counter(dfi);
- return 0;
+ return rockchip_dfi_enable(dfi);
}
static int rockchip_dfi_set_event(struct devfreq_event_dev *edev)
@@ -190,8 +212,8 @@ static int rockchip_dfi_get_event(struct devfreq_event_dev *edev,
}
static const struct devfreq_event_ops rockchip_dfi_ops = {
- .disable = rockchip_dfi_disable,
- .enable = rockchip_dfi_enable,
+ .disable = rockchip_dfi_event_disable,
+ .enable = rockchip_dfi_event_enable,
.get_event = rockchip_dfi_get_event,
.set_event = rockchip_dfi_set_event,
};
@@ -272,6 +294,7 @@ static int rockchip_dfi_probe(struct platform_device *pdev)
return PTR_ERR(dfi->regmap_pmu);
dfi->dev = dev;
+ mutex_init(&dfi->mutex);
desc = &dfi->desc;
desc->ops = &rockchip_dfi_ops;
--
2.39.2
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
next prev parent reply other threads:[~2023-05-24 8:54 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-24 8:31 [PATCH v5 00/25] Add perf support to the rockchip-dfi driver Sascha Hauer
2023-05-24 8:31 ` [PATCH v5 01/25] PM / devfreq: rockchip-dfi: Make pmu regmap mandatory Sascha Hauer
2023-06-13 16:21 ` Sebastian Reichel
2023-05-24 8:31 ` [PATCH v5 02/25] PM / devfreq: rockchip-dfi: Embed desc into private data struct Sascha Hauer
2023-06-13 16:22 ` Sebastian Reichel
2023-05-24 8:31 ` [PATCH v5 03/25] PM / devfreq: rockchip-dfi: use consistent name for " Sascha Hauer
2023-06-13 16:23 ` Sebastian Reichel
2023-05-24 8:31 ` [PATCH v5 04/25] PM / devfreq: rockchip-dfi: Add SoC specific init function Sascha Hauer
2023-06-13 16:26 ` Sebastian Reichel
2023-05-24 8:31 ` [PATCH v5 05/25] PM / devfreq: rockchip-dfi: dfi store raw values in counter struct Sascha Hauer
2023-06-13 16:28 ` Sebastian Reichel
2023-05-24 8:31 ` [PATCH v5 06/25] PM / devfreq: rockchip-dfi: Use free running counter Sascha Hauer
2023-06-13 16:32 ` Sebastian Reichel
2023-05-24 8:31 ` [PATCH v5 07/25] PM / devfreq: rockchip-dfi: introduce channel mask Sascha Hauer
2023-06-13 16:34 ` Sebastian Reichel
2023-05-24 8:31 ` [PATCH v5 08/25] PM / devfreq: rk3399_dmc,dfi: generalize DDRTYPE defines Sascha Hauer
2023-06-13 16:39 ` Sebastian Reichel
2023-05-24 8:31 ` [PATCH v5 09/25] PM / devfreq: rockchip-dfi: Clean up DDR type register defines Sascha Hauer
2023-06-13 16:46 ` Sebastian Reichel
2023-05-24 8:31 ` [PATCH v5 10/25] PM / devfreq: rockchip-dfi: Add RK3568 support Sascha Hauer
2023-05-24 8:31 ` [PATCH v5 11/25] PM / devfreq: rockchip-dfi: Handle LPDDR2 correctly Sascha Hauer
2023-06-13 16:47 ` Sebastian Reichel
2023-05-24 8:31 ` [PATCH v5 12/25] PM / devfreq: rockchip-dfi: Handle LPDDR4X Sascha Hauer
2023-06-13 16:48 ` Sebastian Reichel
2023-05-24 8:31 ` [PATCH v5 13/25] PM / devfreq: rockchip-dfi: Pass private data struct to internal functions Sascha Hauer
2023-06-13 17:08 ` Sebastian Reichel
2023-05-24 8:31 ` Sascha Hauer [this message]
2023-06-13 17:15 ` [PATCH v5 14/25] PM / devfreq: rockchip-dfi: Prepare for multiple users Sebastian Reichel
2023-05-24 8:31 ` [PATCH v5 15/25] PM / devfreq: rockchip-dfi: give variable a better name Sascha Hauer
2023-06-13 17:16 ` Sebastian Reichel
2023-05-24 8:31 ` [PATCH v5 16/25] PM / devfreq: rockchip-dfi: Add perf support Sascha Hauer
2023-06-14 13:29 ` Sebastian Reichel
2023-06-15 13:13 ` Sascha Hauer
2023-05-24 8:31 ` [PATCH v5 17/25] PM / devfreq: rockchip-dfi: make register stride SoC specific Sascha Hauer
2023-06-13 17:17 ` Sebastian Reichel
2023-05-24 8:31 ` [PATCH v5 18/25] PM / devfreq: rockchip-dfi: account for multiple DDRMON_CTRL registers Sascha Hauer
2023-06-13 17:24 ` Sebastian Reichel
2023-05-24 8:31 ` [PATCH v5 19/25] PM / devfreq: rockchip-dfi: add support for RK3588 Sascha Hauer
2023-06-13 16:16 ` Sebastian Reichel
2023-05-24 8:31 ` [PATCH v5 20/25] dt-bindings: devfreq: event: convert Rockchip DFI binding to yaml Sascha Hauer
2023-06-13 23:39 ` Sebastian Reichel
2023-05-24 8:31 ` [PATCH v5 21/25] dt-bindings: devfreq: event: rockchip,dfi: Add rk3568 support Sascha Hauer
2023-05-24 19:42 ` Conor Dooley
2023-05-24 8:31 ` [PATCH v5 22/25] dt-bindings: devfreq: event: rockchip,dfi: Add rk3588 support Sascha Hauer
2023-05-24 19:37 ` Conor Dooley
2023-06-08 20:07 ` Rob Herring
2023-05-24 8:31 ` [PATCH v5 23/25] arm64: dts: rockchip: rk3399: Enable DFI Sascha Hauer
2023-05-24 8:31 ` [PATCH v5 24/25] arm64: dts: rockchip: rk356x: Add DFI Sascha Hauer
2023-05-24 8:31 ` [PATCH v5 25/25] arm64: dts: rockchip: rk3588s: " Sascha Hauer
2023-06-13 16:19 ` Sebastian Reichel
2023-06-14 13:40 ` [PATCH v5 00/25] Add perf support to the rockchip-dfi driver Sebastian Reichel
2023-06-14 14:19 ` Vincent Legoll
2023-06-14 15:27 ` Sebastian Reichel
2023-06-14 19:51 ` Vincent Legoll
2023-06-14 22:18 ` Sebastian Reichel
2023-06-15 6:56 ` Sascha Hauer
2023-06-15 13:27 ` Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230524083153.2046084-15-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=Jonathan.Cameron@huawei.com \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=heiko@sntech.de \
--cc=kernel@pengutronix.de \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=kyungmin.park@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=mark.rutland@arm.com \
--cc=michael.riesch@wolfvision.net \
--cc=myungjoo.ham@samsung.com \
--cc=robh+dt@kernel.org \
--cc=robin.murphy@arm.com \
--cc=vincent.legoll@gmail.com \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).