From: Sascha Hauer <s.hauer@pengutronix.de>
To: linux-pm@vger.kernel.org
Cc: linux-rockchip@lists.infradead.org,
linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.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>,
Sascha Hauer <s.hauer@pengutronix.de>
Subject: [PATCH v3 13/19] PM / devfreq: rockchip-dfi: Pass private data struct to internal functions
Date: Thu, 16 Feb 2023 11:36:18 +0100 [thread overview]
Message-ID: <20230216103624.591901-14-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20230216103624.591901-1-s.hauer@pengutronix.de>
The internal functions do not need the struct devfreq_event_dev *,
so pass them the struct rockchip_dfi *. This is a preparation for
adding perf support later which doesn't have a struct devfreq_event_dev *.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
drivers/devfreq/event/rockchip-dfi.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/drivers/devfreq/event/rockchip-dfi.c b/drivers/devfreq/event/rockchip-dfi.c
index dc48d9c26f599..c0b7b1e9805e9 100644
--- a/drivers/devfreq/event/rockchip-dfi.c
+++ b/drivers/devfreq/event/rockchip-dfi.c
@@ -73,9 +73,8 @@ struct rockchip_dfi {
unsigned int channel_mask;
};
-static void rockchip_dfi_start_hardware_counter(struct devfreq_event_dev *edev)
+static void rockchip_dfi_start_hardware_counter(struct rockchip_dfi *dfi)
{
- struct rockchip_dfi *dfi = devfreq_event_get_drvdata(edev);
void __iomem *dfi_regs = dfi->regs;
/* clear DDRMON_CTRL setting */
@@ -102,18 +101,16 @@ static void rockchip_dfi_start_hardware_counter(struct devfreq_event_dev *edev)
dfi_regs + DDRMON_CTRL);
}
-static void rockchip_dfi_stop_hardware_counter(struct devfreq_event_dev *edev)
+static void rockchip_dfi_stop_hardware_counter(struct rockchip_dfi *dfi)
{
- struct rockchip_dfi *dfi = devfreq_event_get_drvdata(edev);
void __iomem *dfi_regs = dfi->regs;
writel_relaxed(HIWORD_UPDATE(0, DDRMON_CTRL_SOFTWARE_EN),
dfi_regs + DDRMON_CTRL);
}
-static void rockchip_dfi_read_counters(struct devfreq_event_dev *edev, struct dmc_count *count)
+static void rockchip_dfi_read_counters(struct rockchip_dfi *dfi, struct dmc_count *count)
{
- struct rockchip_dfi *dfi = devfreq_event_get_drvdata(edev);
u32 i;
void __iomem *dfi_regs = dfi->regs;
@@ -131,7 +128,7 @@ static int rockchip_dfi_disable(struct devfreq_event_dev *edev)
{
struct rockchip_dfi *dfi = devfreq_event_get_drvdata(edev);
- rockchip_dfi_stop_hardware_counter(edev);
+ rockchip_dfi_stop_hardware_counter(dfi);
clk_disable_unprepare(dfi->clk);
return 0;
@@ -148,7 +145,7 @@ static int rockchip_dfi_enable(struct devfreq_event_dev *edev)
return ret;
}
- rockchip_dfi_start_hardware_counter(edev);
+ rockchip_dfi_start_hardware_counter(dfi);
return 0;
}
@@ -166,7 +163,7 @@ static int rockchip_dfi_get_event(struct devfreq_event_dev *edev,
u32 access = 0, total = 0;
int i;
- rockchip_dfi_read_counters(edev, &count);
+ rockchip_dfi_read_counters(dfi, &count);
/* We can only report one channel, so find the busiest one */
for (i = 0; i < DMC_MAX_CHANNELS; i++) {
--
2.30.2
next prev parent reply other threads:[~2023-02-16 10:37 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-16 10:36 [PATCH v3 00/19] Add perf support to the rockchip-dfi driver Sascha Hauer
2023-02-16 10:36 ` [PATCH v3 01/19] PM / devfreq: rockchip-dfi: Embed desc into private data struct Sascha Hauer
2023-02-16 10:36 ` [PATCH v3 02/19] PM / devfreq: rockchip-dfi: use consistent name for " Sascha Hauer
2023-02-16 10:36 ` [PATCH v3 03/19] PM / devfreq: rockchip-dfi: Make pmu regmap mandatory Sascha Hauer
2023-02-16 10:36 ` [PATCH v3 04/19] PM / devfreq: rockchip-dfi: Add SoC specific init function Sascha Hauer
2023-02-16 10:36 ` [PATCH v3 05/19] PM / devfreq: rockchip-dfi: dfi store raw values in counter struct Sascha Hauer
2023-02-16 10:36 ` [PATCH v3 06/19] PM / devfreq: rockchip-dfi: Use free running counter Sascha Hauer
2023-02-16 10:36 ` [PATCH v3 07/19] PM / devfreq: rockchip-dfi: introduce channel mask Sascha Hauer
2023-02-16 10:36 ` [PATCH v3 08/19] PM / devfreq: rk3399_dmc,dfi: generalize DDRTYPE defines Sascha Hauer
2023-02-16 10:36 ` [PATCH v3 09/19] PM / devfreq: rockchip-dfi: Clean up DDR type register defines Sascha Hauer
2023-02-16 10:36 ` [PATCH v3 10/19] PM / devfreq: rockchip-dfi: Add RK3568 support Sascha Hauer
2023-02-16 10:36 ` [PATCH v3 11/19] PM / devfreq: rockchip-dfi: Handle LPDDR2 correctly Sascha Hauer
2023-02-16 10:36 ` [PATCH v3 12/19] PM / devfreq: rockchip-dfi: Handle LPDDR4X Sascha Hauer
2023-02-16 10:36 ` Sascha Hauer [this message]
2023-02-16 10:36 ` [PATCH v3 14/19] PM / devfreq: rockchip-dfi: Prepare for multiple users Sascha Hauer
2023-02-16 10:36 ` [PATCH v3 15/19] PM / devfreq: rockchip-dfi: Add perf support Sascha Hauer
2023-02-16 10:36 ` [PATCH v3 16/19] arm64: dts: rockchip: rk3399: Enable DFI Sascha Hauer
2023-02-16 10:36 ` [PATCH v3 17/19] arm64: dts: rockchip: rk356x: Add DFI Sascha Hauer
2023-02-16 10:36 ` [PATCH v3 18/19] dt-bindings: devfreq: event: convert Rockchip DFI binding to yaml Sascha Hauer
2023-02-16 10:36 ` [PATCH v3 19/19] dt-bindings: devfreq: event: rockchip,dfi: Add rk3568 support Sascha Hauer
2023-03-06 13:25 ` [PATCH v3 00/19] Add perf support to the rockchip-dfi driver 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=20230216103624.591901-14-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--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-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=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).