78 lines
2.6 KiB
Diff
78 lines
2.6 KiB
Diff
From b9b81d118d52e5e673b0fdecaf93adbde0beebd8 Mon Sep 17 00:00:00 2001
|
|
From: Sascha Hauer <s.hauer@pengutronix.de>
|
|
Date: Wed, 24 May 2023 10:31:41 +0200
|
|
Subject: [PATCH 401/414] PM / devfreq: rockchip-dfi: Pass private data struct
|
|
to internal functions
|
|
|
|
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>
|
|
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
|
|
---
|
|
drivers/devfreq/event/rockchip-dfi.c | 15 ++++++---------
|
|
1 file changed, 6 insertions(+), 9 deletions(-)
|
|
|
|
--- a/drivers/devfreq/event/rockchip-dfi.c
|
|
+++ b/drivers/devfreq/event/rockchip-dfi.c
|
|
@@ -72,9 +72,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_
|
|
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 d
|
|
{
|
|
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 de
|
|
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
|
|
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++) {
|