[PATCH v4 14/37] firmware: arm_scmi: remove legacy scmi_perf_ops protocol interface
Cristian Marussi
cristian.marussi at arm.com
Wed Jan 6 15:15:47 EST 2021
Now that all the SCMI driver users have been migrated to the new interface
remove the legacy interface and all the transient code.
Signed-off-by: Cristian Marussi <cristian.marussi at arm.com>
---
drivers/firmware/arm_scmi/perf.c | 120 -------------------------------
include/linux/scmi_protocol.h | 27 -------
2 files changed, 147 deletions(-)
diff --git a/drivers/firmware/arm_scmi/perf.c b/drivers/firmware/arm_scmi/perf.c
index 99144a70ded6..b2e1bdad2b3a 100644
--- a/drivers/firmware/arm_scmi/perf.c
+++ b/drivers/firmware/arm_scmi/perf.c
@@ -391,15 +391,6 @@ static int scmi_perf_limits_set(const struct scmi_protocol_handle *ph,
return scmi_perf_mb_limits_set(ph, domain, max_perf, min_perf);
}
-static int __scmi_perf_limits_set(const struct scmi_handle *handle,
- u32 domain, u32 max_perf, u32 min_perf)
-{
- const struct scmi_protocol_handle *ph =
- scmi_map_protocol_handle(handle, SCMI_PROTOCOL_PERF);
-
- return scmi_perf_limits_set(ph, domain, max_perf, min_perf);
-}
-
static int scmi_perf_mb_limits_get(const struct scmi_protocol_handle *ph,
u32 domain, u32 *max_perf, u32 *min_perf)
{
@@ -441,15 +432,6 @@ static int scmi_perf_limits_get(const struct scmi_protocol_handle *ph,
return scmi_perf_mb_limits_get(ph, domain, max_perf, min_perf);
}
-static int __scmi_perf_limits_get(const struct scmi_handle *handle,
- u32 domain, u32 *max_perf, u32 *min_perf)
-{
- const struct scmi_protocol_handle *ph =
- scmi_map_protocol_handle(handle, SCMI_PROTOCOL_PERF);
-
- return scmi_perf_limits_get(ph, domain, max_perf, min_perf);
-}
-
static int scmi_perf_mb_level_set(const struct scmi_protocol_handle *ph,
u32 domain, u32 level, bool poll)
{
@@ -487,15 +469,6 @@ static int scmi_perf_level_set(const struct scmi_protocol_handle *ph,
return scmi_perf_mb_level_set(ph, domain, level, poll);
}
-static int __scmi_perf_level_set(const struct scmi_handle *handle,
- u32 domain, u32 level, bool poll)
-{
- const struct scmi_protocol_handle *ph =
- scmi_map_protocol_handle(handle, SCMI_PROTOCOL_PERF);
-
- return scmi_perf_level_set(ph, domain, level, poll);
-}
-
static int scmi_perf_mb_level_get(const struct scmi_protocol_handle *ph,
u32 domain, u32 *level, bool poll)
{
@@ -532,15 +505,6 @@ static int scmi_perf_level_get(const struct scmi_protocol_handle *ph,
return scmi_perf_mb_level_get(ph, domain, level, poll);
}
-static int __scmi_perf_level_get(const struct scmi_handle *handle,
- u32 domain, u32 *level, bool poll)
-{
- const struct scmi_protocol_handle *ph =
- scmi_map_protocol_handle(handle, SCMI_PROTOCOL_PERF);
-
- return scmi_perf_level_get(ph, domain, level, poll);
-}
-
static int scmi_perf_level_limits_notify(const struct scmi_protocol_handle *ph,
u32 domain, int message_id,
bool enable)
@@ -704,15 +668,6 @@ static int scmi_dvfs_device_opps_add(const struct scmi_protocol_handle *ph,
return 0;
}
-static int __scmi_dvfs_device_opps_add(const struct scmi_handle *handle,
- struct device *dev)
-{
- const struct scmi_protocol_handle *ph =
- scmi_map_protocol_handle(handle, SCMI_PROTOCOL_PERF);
-
- return scmi_dvfs_device_opps_add(ph, dev);
-}
-
static int
scmi_dvfs_transition_latency_get(const struct scmi_protocol_handle *ph,
struct device *dev)
@@ -729,16 +684,6 @@ scmi_dvfs_transition_latency_get(const struct scmi_protocol_handle *ph,
return dom->opp[dom->opp_count - 1].trans_latency_us * 1000;
}
-static int
-__scmi_dvfs_transition_latency_get(const struct scmi_handle *handle,
- struct device *dev)
-{
- const struct scmi_protocol_handle *ph =
- scmi_map_protocol_handle(handle, SCMI_PROTOCOL_PERF);
-
- return scmi_dvfs_transition_latency_get(ph, dev);
-}
-
static int scmi_dvfs_freq_set(const struct scmi_protocol_handle *ph, u32 domain,
unsigned long freq, bool poll)
{
@@ -748,15 +693,6 @@ static int scmi_dvfs_freq_set(const struct scmi_protocol_handle *ph, u32 domain,
return scmi_perf_level_set(ph, domain, freq / dom->mult_factor, poll);
}
-static int __scmi_dvfs_freq_set(const struct scmi_handle *handle,
- u32 domain, unsigned long freq, bool poll)
-{
- const struct scmi_protocol_handle *ph =
- scmi_map_protocol_handle(handle, SCMI_PROTOCOL_PERF);
-
- return scmi_dvfs_freq_set(ph, domain, freq, poll);
-}
-
static int scmi_dvfs_freq_get(const struct scmi_protocol_handle *ph, u32 domain,
unsigned long *freq, bool poll)
{
@@ -772,15 +708,6 @@ static int scmi_dvfs_freq_get(const struct scmi_protocol_handle *ph, u32 domain,
return ret;
}
-static int __scmi_dvfs_freq_get(const struct scmi_handle *handle, u32 domain,
- unsigned long *freq, bool poll)
-{
- const struct scmi_protocol_handle *ph =
- scmi_map_protocol_handle(handle, SCMI_PROTOCOL_PERF);
-
- return scmi_dvfs_freq_get(ph, domain, freq, poll);
-}
-
static int scmi_dvfs_est_power_get(const struct scmi_protocol_handle *ph,
u32 domain, unsigned long *freq,
unsigned long *power)
@@ -809,16 +736,6 @@ static int scmi_dvfs_est_power_get(const struct scmi_protocol_handle *ph,
return ret;
}
-static int __scmi_dvfs_est_power_get(const struct scmi_handle *handle,
- u32 domain, unsigned long *freq,
- unsigned long *power)
-{
- const struct scmi_protocol_handle *ph =
- scmi_map_protocol_handle(handle, SCMI_PROTOCOL_PERF);
-
- return scmi_dvfs_est_power_get(ph, domain, freq, power);
-}
-
static bool scmi_fast_switch_possible(const struct scmi_protocol_handle *ph,
struct device *dev)
{
@@ -830,15 +747,6 @@ static bool scmi_fast_switch_possible(const struct scmi_protocol_handle *ph,
return dom->fc_info && dom->fc_info->level_set_addr;
}
-static bool __scmi_fast_switch_possible(const struct scmi_handle *handle,
- struct device *dev)
-{
- const struct scmi_protocol_handle *ph =
- scmi_map_protocol_handle(handle, SCMI_PROTOCOL_PERF);
-
- return scmi_fast_switch_possible(ph, dev);
-}
-
static bool scmi_power_scale_mw_get(const struct scmi_protocol_handle *ph)
{
struct scmi_perf_info *pi = ph->get_priv(ph);
@@ -846,29 +754,6 @@ static bool scmi_power_scale_mw_get(const struct scmi_protocol_handle *ph)
return pi->power_scale_mw;
}
-static bool __scmi_power_scale_mw_get(const struct scmi_handle *handle)
-{
- const struct scmi_protocol_handle *ph =
- scmi_map_protocol_handle(handle, SCMI_PROTOCOL_PERF);
-
- return scmi_power_scale_mw_get(ph);
-}
-
-static const struct scmi_perf_ops perf_ops = {
- .limits_set = __scmi_perf_limits_set,
- .limits_get = __scmi_perf_limits_get,
- .level_set = __scmi_perf_level_set,
- .level_get = __scmi_perf_level_get,
- .device_domain_id = scmi_dev_domain_id,
- .transition_latency_get = __scmi_dvfs_transition_latency_get,
- .device_opps_add = __scmi_dvfs_device_opps_add,
- .freq_set = __scmi_dvfs_freq_set,
- .freq_get = __scmi_dvfs_freq_get,
- .est_power_get = __scmi_dvfs_est_power_get,
- .fast_switch_possible = __scmi_fast_switch_possible,
- .power_scale_mw_get = __scmi_power_scale_mw_get,
-};
-
static const struct scmi_perf_proto_ops perf_proto_ops = {
.limits_set = scmi_perf_limits_set,
.limits_get = scmi_perf_limits_get,
@@ -991,7 +876,6 @@ static int scmi_perf_protocol_init(const struct scmi_protocol_handle *ph)
int domain;
u32 version;
struct scmi_perf_info *pinfo;
- struct scmi_handle *handle;
ph->xops->version_get(ph, &version);
@@ -1021,10 +905,6 @@ static int scmi_perf_protocol_init(const struct scmi_protocol_handle *ph)
pinfo->version = version;
- /* Transient code for legacy ops interface */
- handle = scmi_map_scmi_handle(ph);
- handle->perf_ops = &perf_ops;
-
return ph->set_priv(ph, pinfo);
}
diff --git a/include/linux/scmi_protocol.h b/include/linux/scmi_protocol.h
index 0d2138f1d9f3..642c55a108ad 100644
--- a/include/linux/scmi_protocol.h
+++ b/include/linux/scmi_protocol.h
@@ -127,31 +127,6 @@ struct scmi_perf_proto_ops {
bool (*power_scale_mw_get)(const struct scmi_protocol_handle *ph);
};
-struct scmi_perf_ops {
- int (*limits_set)(const struct scmi_handle *handle, u32 domain,
- u32 max_perf, u32 min_perf);
- int (*limits_get)(const struct scmi_handle *handle, u32 domain,
- u32 *max_perf, u32 *min_perf);
- int (*level_set)(const struct scmi_handle *handle, u32 domain,
- u32 level, bool poll);
- int (*level_get)(const struct scmi_handle *handle, u32 domain,
- u32 *level, bool poll);
- int (*device_domain_id)(struct device *dev);
- int (*transition_latency_get)(const struct scmi_handle *handle,
- struct device *dev);
- int (*device_opps_add)(const struct scmi_handle *handle,
- struct device *dev);
- int (*freq_set)(const struct scmi_handle *handle, u32 domain,
- unsigned long rate, bool poll);
- int (*freq_get)(const struct scmi_handle *handle, u32 domain,
- unsigned long *rate, bool poll);
- int (*est_power_get)(const struct scmi_handle *handle, u32 domain,
- unsigned long *rate, unsigned long *power);
- bool (*fast_switch_possible)(const struct scmi_handle *handle,
- struct device *dev);
- bool (*power_scale_mw_get)(const struct scmi_handle *handle);
-};
-
/**
* struct scmi_power_ops - represents the various operations provided
* by SCMI Power Protocol
@@ -628,7 +603,6 @@ struct scmi_notify_ops {
* @dev: pointer to the SCMI device
* @version: pointer to the structure containing SCMI version information
* @power_ops: pointer to set of power protocol operations
- * @perf_ops: pointer to set of performance protocol operations
* @clk_ops: pointer to set of clock protocol operations
* @sensor_ops: pointer to set of sensor protocol operations
* @reset_ops: pointer to set of reset protocol operations
@@ -656,7 +630,6 @@ struct scmi_notify_ops {
struct scmi_handle {
struct device *dev;
struct scmi_revision_info *version;
- const struct scmi_perf_ops *perf_ops;
const struct scmi_clk_ops *clk_ops;
const struct scmi_power_ops *power_ops;
const struct scmi_sensor_ops *sensor_ops;
--
2.17.1
More information about the linux-arm-kernel
mailing list