4c1d13e995
Removed because it is upstream:
generic/pending-5.15/540-ksmbd-only-v2-leases-handle-the-directory.patch
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=81ea755b8fa57ce186f56f14b709cf491c2a5505
Manually Adapted the following patches:
ath79/patches-5.15/900-unaligned_access_hacks.patch
ipq806x/patches-5.15/113-v5.19-03-PM-devfreq-Rework-freq_table-to-be-local-to-devfr.patch
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
(cherry picked from commit 26d1d52403)
114 lines
3.8 KiB
Diff
114 lines
3.8 KiB
Diff
From 713472e53e6e53c985e283782b0fd76b8ecfd47e Mon Sep 17 00:00:00 2001
|
|
From: Chanwoo Choi <cw00.choi@samsung.com>
|
|
Date: Mon, 1 Mar 2021 02:07:29 +0900
|
|
Subject: [PATCH 1/5] PM / devfreq: Export devfreq_get_freq_range symbol within
|
|
devfreq
|
|
|
|
In order to get frequency range within devfreq governors,
|
|
export devfreq_get_freq_range symbol within devfreq.
|
|
|
|
Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
|
|
Tested-by: Chen-Yu Tsai <wenst@chromium.org>
|
|
Tested-by: Johnson Wang <johnson.wang@mediatek.com>
|
|
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
|
|
---
|
|
drivers/devfreq/devfreq.c | 20 ++++++++++++--------
|
|
drivers/devfreq/governor.h | 2 ++
|
|
2 files changed, 14 insertions(+), 8 deletions(-)
|
|
|
|
--- a/drivers/devfreq/devfreq.c
|
|
+++ b/drivers/devfreq/devfreq.c
|
|
@@ -112,16 +112,16 @@ static unsigned long find_available_max_
|
|
}
|
|
|
|
/**
|
|
- * get_freq_range() - Get the current freq range
|
|
+ * devfreq_get_freq_range() - Get the current freq range
|
|
* @devfreq: the devfreq instance
|
|
* @min_freq: the min frequency
|
|
* @max_freq: the max frequency
|
|
*
|
|
* This takes into consideration all constraints.
|
|
*/
|
|
-static void get_freq_range(struct devfreq *devfreq,
|
|
- unsigned long *min_freq,
|
|
- unsigned long *max_freq)
|
|
+void devfreq_get_freq_range(struct devfreq *devfreq,
|
|
+ unsigned long *min_freq,
|
|
+ unsigned long *max_freq)
|
|
{
|
|
unsigned long *freq_table = devfreq->profile->freq_table;
|
|
s32 qos_min_freq, qos_max_freq;
|
|
@@ -158,6 +158,7 @@ static void get_freq_range(struct devfre
|
|
if (*min_freq > *max_freq)
|
|
*min_freq = *max_freq;
|
|
}
|
|
+EXPORT_SYMBOL(devfreq_get_freq_range);
|
|
|
|
/**
|
|
* devfreq_get_freq_level() - Lookup freq_table for the frequency
|
|
@@ -418,7 +419,7 @@ int devfreq_update_target(struct devfreq
|
|
err = devfreq->governor->get_target_freq(devfreq, &freq);
|
|
if (err)
|
|
return err;
|
|
- get_freq_range(devfreq, &min_freq, &max_freq);
|
|
+ devfreq_get_freq_range(devfreq, &min_freq, &max_freq);
|
|
|
|
if (freq < min_freq) {
|
|
freq = min_freq;
|
|
@@ -805,6 +806,7 @@ struct devfreq *devfreq_add_device(struc
|
|
{
|
|
struct devfreq *devfreq;
|
|
struct devfreq_governor *governor;
|
|
+ unsigned long min_freq, max_freq;
|
|
int err = 0;
|
|
|
|
if (!dev || !profile || !governor_name) {
|
|
@@ -869,6 +871,8 @@ struct devfreq *devfreq_add_device(struc
|
|
goto err_dev;
|
|
}
|
|
|
|
+ devfreq_get_freq_range(devfreq, &min_freq, &max_freq);
|
|
+
|
|
devfreq->suspend_freq = dev_pm_opp_get_suspend_opp_freq(dev);
|
|
devfreq->opp_table = dev_pm_opp_get_opp_table(dev);
|
|
if (IS_ERR(devfreq->opp_table))
|
|
@@ -1580,7 +1584,7 @@ static ssize_t min_freq_show(struct devi
|
|
unsigned long min_freq, max_freq;
|
|
|
|
mutex_lock(&df->lock);
|
|
- get_freq_range(df, &min_freq, &max_freq);
|
|
+ devfreq_get_freq_range(df, &min_freq, &max_freq);
|
|
mutex_unlock(&df->lock);
|
|
|
|
return sprintf(buf, "%lu\n", min_freq);
|
|
@@ -1634,7 +1638,7 @@ static ssize_t max_freq_show(struct devi
|
|
unsigned long min_freq, max_freq;
|
|
|
|
mutex_lock(&df->lock);
|
|
- get_freq_range(df, &min_freq, &max_freq);
|
|
+ devfreq_get_freq_range(df, &min_freq, &max_freq);
|
|
mutex_unlock(&df->lock);
|
|
|
|
return sprintf(buf, "%lu\n", max_freq);
|
|
@@ -1969,7 +1973,7 @@ static int devfreq_summary_show(struct s
|
|
|
|
mutex_lock(&devfreq->lock);
|
|
cur_freq = devfreq->previous_freq;
|
|
- get_freq_range(devfreq, &min_freq, &max_freq);
|
|
+ devfreq_get_freq_range(devfreq, &min_freq, &max_freq);
|
|
timer = devfreq->profile->timer;
|
|
|
|
if (IS_SUPPORTED_ATTR(devfreq->governor->attrs, POLLING_INTERVAL))
|
|
--- a/drivers/devfreq/governor.h
|
|
+++ b/drivers/devfreq/governor.h
|
|
@@ -86,6 +86,8 @@ int devfreq_remove_governor(struct devfr
|
|
|
|
int devfreq_update_status(struct devfreq *devfreq, unsigned long freq);
|
|
int devfreq_update_target(struct devfreq *devfreq, unsigned long freq);
|
|
+void devfreq_get_freq_range(struct devfreq *devfreq, unsigned long *min_freq,
|
|
+ unsigned long *max_freq);
|
|
|
|
static inline int devfreq_update_stats(struct devfreq *df)
|
|
{
|