Skip to content

L
linux
Commit 1fec5e6b authored by Cristian Marussi's avatar Cristian Marussi Committed by Sudeep Holla
Browse files
Options

firmware: arm_scmi: Port perf protocol to new protocols interface 

Convert internals of protocol implementation to use protocol handles and
expose a new protocol operations interface for SCMI driver using the new
get/put common operations, while keeping the old handle->perf_ops still
around to ease transition.

Remove handle->perf_priv now unused.

Link: https://lore.kernel.org/r/20210316124903.35011-12-cristian.marussi@arm.comTested-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarCristian Marussi <cristian.marussi@arm.com>
Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
parent 8d3581c2
Hide whitespace changes
Inline Side-by-side
Showing with 258 additions and 121 deletions
drivers/firmware/arm_scmi/perf.c
View file @ 1fec5e6b
...@@ -175,21 +175,21 @@ static enum scmi_performance_protocol_cmd evt_2_cmd[] = { ...@@ -175,21 +175,21 @@ static enum scmi_performance_protocol_cmd evt_2_cmd[] = {
PERF_NOTIFY_LEVEL, PERF_NOTIFY_LEVEL,
}; };
static int scmi_perf_attributes_get(const struct scmi_handle *handle, static int scmi_perf_attributes_get(const struct scmi_protocol_handle *ph,
struct scmi_perf_info *pi) struct scmi_perf_info *pi)
{ {
int ret; int ret;
struct scmi_xfer *t; struct scmi_xfer *t;
struct scmi_msg_resp_perf_attributes *attr; struct scmi_msg_resp_perf_attributes *attr;
ret = scmi_xfer_get_init(handle, PROTOCOL_ATTRIBUTES, ret = ph->xops->xfer_get_init(ph, PROTOCOL_ATTRIBUTES, 0,
SCMI_PROTOCOL_PERF, 0, sizeof(*attr), &t); sizeof(*attr), &t);
if (ret) if (ret)
return ret; return ret;
attr = t->rx.buf; attr = t->rx.buf;
ret = scmi_do_xfer(handle, t); ret = ph->xops->do_xfer(ph, t);
if (!ret) { if (!ret) {
u16 flags = le16_to_cpu(attr->flags); u16 flags = le16_to_cpu(attr->flags);
...@@ -200,28 +200,27 @@ static int scmi_perf_attributes_get(const struct scmi_handle *handle, ...@@ -200,28 +200,27 @@ static int scmi_perf_attributes_get(const struct scmi_handle *handle,
pi->stats_size = le32_to_cpu(attr->stats_size); pi->stats_size = le32_to_cpu(attr->stats_size);
} }
scmi_xfer_put(handle, t); ph->xops->xfer_put(ph, t);
return ret; return ret;
} }
static int static int
scmi_perf_domain_attributes_get(const struct scmi_handle *handle, u32 domain, scmi_perf_domain_attributes_get(const struct scmi_protocol_handle *ph,
struct perf_dom_info *dom_info) u32 domain, struct perf_dom_info *dom_info)
{ {
int ret; int ret;
struct scmi_xfer *t; struct scmi_xfer *t;
struct scmi_msg_resp_perf_domain_attributes *attr; struct scmi_msg_resp_perf_domain_attributes *attr;
ret = scmi_xfer_get_init(handle, PERF_DOMAIN_ATTRIBUTES, ret = ph->xops->xfer_get_init(ph, PERF_DOMAIN_ATTRIBUTES,
SCMI_PROTOCOL_PERF, sizeof(domain), sizeof(domain), sizeof(*attr), &t);
sizeof(*attr), &t);
if (ret) if (ret)
return ret; return ret;
put_unaligned_le32(domain, t->tx.buf); put_unaligned_le32(domain, t->tx.buf);
attr = t->rx.buf; attr = t->rx.buf;
ret = scmi_do_xfer(handle, t); ret = ph->xops->do_xfer(ph, t);
if (!ret) { if (!ret) {
u32 flags = le32_to_cpu(attr->flags); u32 flags = le32_to_cpu(attr->flags);
...@@ -245,7 +244,7 @@ scmi_perf_domain_attributes_get(const struct scmi_handle *handle, u32 domain, ...@@ -245,7 +244,7 @@ scmi_perf_domain_attributes_get(const struct scmi_handle *handle, u32 domain,
strlcpy(dom_info->name, attr->name, SCMI_MAX_STR_SIZE); strlcpy(dom_info->name, attr->name, SCMI_MAX_STR_SIZE);
} }
scmi_xfer_put(handle, t); ph->xops->xfer_put(ph, t);
return ret; return ret;
} }
...@@ -257,7 +256,7 @@ static int opp_cmp_func(const void *opp1, const void *opp2) ...@@ -257,7 +256,7 @@ static int opp_cmp_func(const void *opp1, const void *opp2)
} }
static int static int
scmi_perf_describe_levels_get(const struct scmi_handle *handle, u32 domain, scmi_perf_describe_levels_get(const struct scmi_protocol_handle *ph, u32 domain,
struct perf_dom_info *perf_dom) struct perf_dom_info *perf_dom)
{ {
int ret, cnt; int ret, cnt;
...@@ -268,8 +267,8 @@ scmi_perf_describe_levels_get(const struct scmi_handle *handle, u32 domain, ...@@ -268,8 +267,8 @@ scmi_perf_describe_levels_get(const struct scmi_handle *handle, u32 domain,
struct scmi_msg_perf_describe_levels *dom_info; struct scmi_msg_perf_describe_levels *dom_info;
struct scmi_msg_resp_perf_describe_levels *level_info; struct scmi_msg_resp_perf_describe_levels *level_info;
ret = scmi_xfer_get_init(handle, PERF_DESCRIBE_LEVELS, ret = ph->xops->xfer_get_init(ph, PERF_DESCRIBE_LEVELS,
SCMI_PROTOCOL_PERF, sizeof(*dom_info), 0, &t); sizeof(*dom_info), 0, &t);
if (ret) if (ret)
return ret; return ret;
...@@ -281,14 +280,14 @@ scmi_perf_describe_levels_get(const struct scmi_handle *handle, u32 domain, ...@@ -281,14 +280,14 @@ scmi_perf_describe_levels_get(const struct scmi_handle *handle, u32 domain,
/* Set the number of OPPs to be skipped/already read */ /* Set the number of OPPs to be skipped/already read */
dom_info->level_index = cpu_to_le32(tot_opp_cnt); dom_info->level_index = cpu_to_le32(tot_opp_cnt);
ret = scmi_do_xfer(handle, t); ret = ph->xops->do_xfer(ph, t);
if (ret) if (ret)
break; break;
num_returned = le16_to_cpu(level_info->num_returned); num_returned = le16_to_cpu(level_info->num_returned);
num_remaining = le16_to_cpu(level_info->num_remaining); num_remaining = le16_to_cpu(level_info->num_remaining);
if (tot_opp_cnt + num_returned > MAX_OPPS) { if (tot_opp_cnt + num_returned > MAX_OPPS) {
dev_err(handle->dev, "No. of OPPs exceeded MAX_OPPS"); dev_err(ph->dev, "No. of OPPs exceeded MAX_OPPS");
break; break;
} }
...@@ -299,13 +298,13 @@ scmi_perf_describe_levels_get(const struct scmi_handle *handle, u32 domain, ...@@ -299,13 +298,13 @@ scmi_perf_describe_levels_get(const struct scmi_handle *handle, u32 domain,
opp->trans_latency_us = le16_to_cpu opp->trans_latency_us = le16_to_cpu
(level_info->opp[cnt].transition_latency_us); (level_info->opp[cnt].transition_latency_us);
dev_dbg(handle->dev, "Level %d Power %d Latency %dus\n", dev_dbg(ph->dev, "Level %d Power %d Latency %dus\n",
opp->perf, opp->power, opp->trans_latency_us); opp->perf, opp->power, opp->trans_latency_us);
} }
tot_opp_cnt += num_returned; tot_opp_cnt += num_returned;
scmi_reset_rx_to_maxsz(handle, t); ph->xops->reset_rx_to_maxsz(ph, t);
/* /*
* check for both returned and remaining to avoid infinite * check for both returned and remaining to avoid infinite
* loop due to buggy firmware * loop due to buggy firmware
...@@ -313,7 +312,7 @@ scmi_perf_describe_levels_get(const struct scmi_handle *handle, u32 domain, ...@@ -313,7 +312,7 @@ scmi_perf_describe_levels_get(const struct scmi_handle *handle, u32 domain,
} while (num_returned && num_remaining); } while (num_returned && num_remaining);
perf_dom->opp_count = tot_opp_cnt; perf_dom->opp_count = tot_opp_cnt;
scmi_xfer_put(handle, t); ph->xops->xfer_put(ph, t);
sort(perf_dom->opp, tot_opp_cnt, sizeof(*opp), opp_cmp_func, NULL); sort(perf_dom->opp, tot_opp_cnt, sizeof(*opp), opp_cmp_func, NULL);
return ret; return ret;
...@@ -353,15 +352,15 @@ static void scmi_perf_fc_ring_db(struct scmi_fc_db_info *db) ...@@ -353,15 +352,15 @@ static void scmi_perf_fc_ring_db(struct scmi_fc_db_info *db)
#endif #endif
} }
static int scmi_perf_mb_limits_set(const struct scmi_handle *handle, u32 domain, static int scmi_perf_mb_limits_set(const struct scmi_protocol_handle *ph,
u32 max_perf, u32 min_perf) u32 domain, u32 max_perf, u32 min_perf)
{ {
int ret; int ret;
struct scmi_xfer *t; struct scmi_xfer *t;
struct scmi_perf_set_limits *limits; struct scmi_perf_set_limits *limits;
ret = scmi_xfer_get_init(handle, PERF_LIMITS_SET, SCMI_PROTOCOL_PERF, ret = ph->xops->xfer_get_init(ph, PERF_LIMITS_SET,
sizeof(*limits), 0, &t); sizeof(*limits), 0, &t);
if (ret) if (ret)
return ret; return ret;
...@@ -370,16 +369,16 @@ static int scmi_perf_mb_limits_set(const struct scmi_handle *handle, u32 domain, ...@@ -370,16 +369,16 @@ static int scmi_perf_mb_limits_set(const struct scmi_handle *handle, u32 domain,
limits->max_level = cpu_to_le32(max_perf); limits->max_level = cpu_to_le32(max_perf);
limits->min_level = cpu_to_le32(min_perf); limits->min_level = cpu_to_le32(min_perf);
ret = scmi_do_xfer(handle, t); ret = ph->xops->do_xfer(ph, t);
scmi_xfer_put(handle, t); ph->xops->xfer_put(ph, t);
return ret; return ret;
} }
static int scmi_perf_limits_set(const struct scmi_handle *handle, u32 domain, static int scmi_perf_limits_set(const struct scmi_protocol_handle *ph,
u32 max_perf, u32 min_perf) u32 domain, u32 max_perf, u32 min_perf)
{ {
struct scmi_perf_info *pi = handle->perf_priv; struct scmi_perf_info *pi = ph->get_priv(ph);
struct perf_dom_info *dom = pi->dom_info + domain; struct perf_dom_info *dom = pi->dom_info + domain;
if (dom->fc_info && dom->fc_info->limit_set_addr) { if (dom->fc_info && dom->fc_info->limit_set_addr) {
...@@ -389,24 +388,33 @@ static int scmi_perf_limits_set(const struct scmi_handle *handle, u32 domain, ...@@ -389,24 +388,33 @@ static int scmi_perf_limits_set(const struct scmi_handle *handle, u32 domain,
return 0; return 0;
} }
return scmi_perf_mb_limits_set(handle, domain, max_perf, min_perf); return scmi_perf_mb_limits_set(ph, domain, max_perf, min_perf);
} }
static int scmi_perf_mb_limits_get(const struct scmi_handle *handle, u32 domain, static int __scmi_perf_limits_set(const struct scmi_handle *handle,
u32 *max_perf, u32 *min_perf) 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)
{ {
int ret; int ret;
struct scmi_xfer *t; struct scmi_xfer *t;
struct scmi_perf_get_limits *limits; struct scmi_perf_get_limits *limits;
ret = scmi_xfer_get_init(handle, PERF_LIMITS_GET, SCMI_PROTOCOL_PERF, ret = ph->xops->xfer_get_init(ph, PERF_LIMITS_GET,
sizeof(__le32), 0, &t); sizeof(__le32), 0, &t);
if (ret) if (ret)
return ret; return ret;
put_unaligned_le32(domain, t->tx.buf); put_unaligned_le32(domain, t->tx.buf);
ret = scmi_do_xfer(handle, t); ret = ph->xops->do_xfer(ph, t);
if (!ret) { if (!ret) {
limits = t->rx.buf; limits = t->rx.buf;
...@@ -414,14 +422,14 @@ static int scmi_perf_mb_limits_get(const struct scmi_handle *handle, u32 domain, ...@@ -414,14 +422,14 @@ static int scmi_perf_mb_limits_get(const struct scmi_handle *handle, u32 domain,
*min_perf = le32_to_cpu(limits->min_level); *min_perf = le32_to_cpu(limits->min_level);
} }
scmi_xfer_put(handle, t); ph->xops->xfer_put(ph, t);
return ret; return ret;
} }
static int scmi_perf_limits_get(const struct scmi_handle *handle, u32 domain, static int scmi_perf_limits_get(const struct scmi_protocol_handle *ph,
u32 *max_perf, u32 *min_perf) u32 domain, u32 *max_perf, u32 *min_perf)
{ {
struct scmi_perf_info *pi = handle->perf_priv; struct scmi_perf_info *pi = ph->get_priv(ph);
struct perf_dom_info *dom = pi->dom_info + domain; struct perf_dom_info *dom = pi->dom_info + domain;
if (dom->fc_info && dom->fc_info->limit_get_addr) { if (dom->fc_info && dom->fc_info->limit_get_addr) {
...@@ -430,18 +438,26 @@ static int scmi_perf_limits_get(const struct scmi_handle *handle, u32 domain, ...@@ -430,18 +438,26 @@ static int scmi_perf_limits_get(const struct scmi_handle *handle, u32 domain,
return 0; return 0;
} }
return scmi_perf_mb_limits_get(handle, domain, max_perf, min_perf); return scmi_perf_mb_limits_get(ph, domain, max_perf, min_perf);
} }
static int scmi_perf_mb_level_set(const struct scmi_handle *handle, u32 domain, static int __scmi_perf_limits_get(const struct scmi_handle *handle,
u32 level, bool poll) 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)
{ {
int ret; int ret;
struct scmi_xfer *t; struct scmi_xfer *t;
struct scmi_perf_set_level *lvl; struct scmi_perf_set_level *lvl;
ret = scmi_xfer_get_init(handle, PERF_LEVEL_SET, SCMI_PROTOCOL_PERF, ret = ph->xops->xfer_get_init(ph, PERF_LEVEL_SET, sizeof(*lvl), 0, &t);
sizeof(*lvl), 0, &t);
if (ret) if (ret)
return ret; return ret;
...@@ -450,16 +466,16 @@ static int scmi_perf_mb_level_set(const struct scmi_handle *handle, u32 domain, ...@@ -450,16 +466,16 @@ static int scmi_perf_mb_level_set(const struct scmi_handle *handle, u32 domain,
lvl->domain = cpu_to_le32(domain); lvl->domain = cpu_to_le32(domain);
lvl->level = cpu_to_le32(level); lvl->level = cpu_to_le32(level);
ret = scmi_do_xfer(handle, t); ret = ph->xops->do_xfer(ph, t);
scmi_xfer_put(handle, t); ph->xops->xfer_put(ph, t);
return ret; return ret;
} }
static int scmi_perf_level_set(const struct scmi_handle *handle, u32 domain, static int scmi_perf_level_set(const struct scmi_protocol_handle *ph,
u32 level, bool poll) u32 domain, u32 level, bool poll)
{ {
struct scmi_perf_info *pi = handle->perf_priv; struct scmi_perf_info *pi = ph->get_priv(ph);
struct perf_dom_info *dom = pi->dom_info + domain; struct perf_dom_info *dom = pi->dom_info + domain;
if (dom->fc_info && dom->fc_info->level_set_addr) { if (dom->fc_info && dom->fc_info->level_set_addr) {
...@@ -468,35 +484,44 @@ static int scmi_perf_level_set(const struct scmi_handle *handle, u32 domain, ...@@ -468,35 +484,44 @@ static int scmi_perf_level_set(const struct scmi_handle *handle, u32 domain,
return 0; return 0;
} }
return scmi_perf_mb_level_set(handle, domain, level, poll); 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_handle *handle, u32 domain, static int scmi_perf_mb_level_get(const struct scmi_protocol_handle *ph,
u32 *level, bool poll) u32 domain, u32 *level, bool poll)
{ {
int ret; int ret;
struct scmi_xfer *t; struct scmi_xfer *t;
ret = scmi_xfer_get_init(handle, PERF_LEVEL_GET, SCMI_PROTOCOL_PERF, ret = ph->xops->xfer_get_init(ph, PERF_LEVEL_GET,
sizeof(u32), sizeof(u32), &t); sizeof(u32), sizeof(u32), &t);
if (ret) if (ret)
return ret; return ret;
t->hdr.poll_completion = poll; t->hdr.poll_completion = poll;
put_unaligned_le32(domain, t->tx.buf); put_unaligned_le32(domain, t->tx.buf);
ret = scmi_do_xfer(handle, t); ret = ph->xops->do_xfer(ph, t);
if (!ret) if (!ret)
*level = get_unaligned_le32(t->rx.buf); *level = get_unaligned_le32(t->rx.buf);
scmi_xfer_put(handle, t); ph->xops->xfer_put(ph, t);
return ret; return ret;
} }
static int scmi_perf_level_get(const struct scmi_handle *handle, u32 domain, static int scmi_perf_level_get(const struct scmi_protocol_handle *ph,
u32 *level, bool poll) u32 domain, u32 *level, bool poll)
{ {
struct scmi_perf_info *pi = handle->perf_priv; struct scmi_perf_info *pi = ph->get_priv(ph);
struct perf_dom_info *dom = pi->dom_info + domain; struct perf_dom_info *dom = pi->dom_info + domain;
if (dom->fc_info && dom->fc_info->level_get_addr) { if (dom->fc_info && dom->fc_info->level_get_addr) {
...@@ -504,10 +529,19 @@ static int scmi_perf_level_get(const struct scmi_handle *handle, u32 domain, ...@@ -504,10 +529,19 @@ static int scmi_perf_level_get(const struct scmi_handle *handle, u32 domain,
return 0; return 0;
} }
return scmi_perf_mb_level_get(handle, domain, level, poll); 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_handle *handle, static int scmi_perf_level_limits_notify(const struct scmi_protocol_handle *ph,
u32 domain, int message_id, u32 domain, int message_id,
bool enable) bool enable)
{ {
...@@ -515,8 +549,7 @@ static int scmi_perf_level_limits_notify(const struct scmi_handle *handle, ...@@ -515,8 +549,7 @@ static int scmi_perf_level_limits_notify(const struct scmi_handle *handle,
struct scmi_xfer *t; struct scmi_xfer *t;
struct scmi_perf_notify_level_or_limits *notify; struct scmi_perf_notify_level_or_limits *notify;
ret = scmi_xfer_get_init(handle, message_id, SCMI_PROTOCOL_PERF, ret = ph->xops->xfer_get_init(ph, message_id, sizeof(*notify), 0, &t);
sizeof(*notify), 0, &t);
if (ret) if (ret)
return ret; return ret;
...@@ -524,9 +557,9 @@ static int scmi_perf_level_limits_notify(const struct scmi_handle *handle, ...@@ -524,9 +557,9 @@ static int scmi_perf_level_limits_notify(const struct scmi_handle *handle,
notify->domain = cpu_to_le32(domain); notify->domain = cpu_to_le32(domain);
notify->notify_enable = enable ? cpu_to_le32(BIT(0)) : 0; notify->notify_enable = enable ? cpu_to_le32(BIT(0)) : 0;
ret = scmi_do_xfer(handle, t); ret = ph->xops->do_xfer(ph, t);
scmi_xfer_put(handle, t); ph->xops->xfer_put(ph, t);
return ret; return ret;
} }
...@@ -540,7 +573,7 @@ static bool scmi_perf_fc_size_is_valid(u32 msg, u32 size) ...@@ -540,7 +573,7 @@ static bool scmi_perf_fc_size_is_valid(u32 msg, u32 size)
} }
static void static void
scmi_perf_domain_desc_fc(const struct scmi_handle *handle, u32 domain, scmi_perf_domain_desc_fc(const struct scmi_protocol_handle *ph, u32 domain,
u32 message_id, void __iomem **p_addr, u32 message_id, void __iomem **p_addr,
struct scmi_fc_db_info **p_db) struct scmi_fc_db_info **p_db)
{ {
...@@ -557,9 +590,8 @@ scmi_perf_domain_desc_fc(const struct scmi_handle *handle, u32 domain, ...@@ -557,9 +590,8 @@ scmi_perf_domain_desc_fc(const struct scmi_handle *handle, u32 domain,
if (!p_addr) if (!p_addr)
return; return;
ret = scmi_xfer_get_init(handle, PERF_DESCRIBE_FASTCHANNEL, ret = ph->xops->xfer_get_init(ph, PERF_DESCRIBE_FASTCHANNEL,
SCMI_PROTOCOL_PERF, sizeof(*info), sizeof(*resp), &t);
sizeof(*info), sizeof(*resp), &t);
if (ret) if (ret)
return; return;
...@@ -567,7 +599,7 @@ scmi_perf_domain_desc_fc(const struct scmi_handle *handle, u32 domain, ...@@ -567,7 +599,7 @@ scmi_perf_domain_desc_fc(const struct scmi_handle *handle, u32 domain,
info->domain = cpu_to_le32(domain); info->domain = cpu_to_le32(domain);
info->message_id = cpu_to_le32(message_id); info->message_id = cpu_to_le32(message_id);
ret = scmi_do_xfer(handle, t); ret = ph->xops->do_xfer(ph, t);
if (ret) if (ret)
goto err_xfer; goto err_xfer;
...@@ -579,20 +611,20 @@ scmi_perf_domain_desc_fc(const struct scmi_handle *handle, u32 domain, ...@@ -579,20 +611,20 @@ scmi_perf_domain_desc_fc(const struct scmi_handle *handle, u32 domain,
phys_addr = le32_to_cpu(resp->chan_addr_low); phys_addr = le32_to_cpu(resp->chan_addr_low);
phys_addr |= (u64)le32_to_cpu(resp->chan_addr_high) << 32; phys_addr |= (u64)le32_to_cpu(resp->chan_addr_high) << 32;
addr = devm_ioremap(handle->dev, phys_addr, size); addr = devm_ioremap(ph->dev, phys_addr, size);
if (!addr) if (!addr)
goto err_xfer; goto err_xfer;
*p_addr = addr; *p_addr = addr;
if (p_db && SUPPORTS_DOORBELL(flags)) { if (p_db && SUPPORTS_DOORBELL(flags)) {
db = devm_kzalloc(handle->dev, sizeof(*db), GFP_KERNEL); db = devm_kzalloc(ph->dev, sizeof(*db), GFP_KERNEL);
if (!db) if (!db)
goto err_xfer; goto err_xfer;
size = 1 << DOORBELL_REG_WIDTH(flags); size = 1 << DOORBELL_REG_WIDTH(flags);
phys_addr = le32_to_cpu(resp->db_addr_low); phys_addr = le32_to_cpu(resp->db_addr_low);
phys_addr |= (u64)le32_to_cpu(resp->db_addr_high) << 32; phys_addr |= (u64)le32_to_cpu(resp->db_addr_high) << 32;
addr = devm_ioremap(handle->dev, phys_addr, size); addr = devm_ioremap(ph->dev, phys_addr, size);
if (!addr) if (!addr)
goto err_xfer; goto err_xfer;
...@@ -605,25 +637,25 @@ scmi_perf_domain_desc_fc(const struct scmi_handle *handle, u32 domain, ...@@ -605,25 +637,25 @@ scmi_perf_domain_desc_fc(const struct scmi_handle *handle, u32 domain,
*p_db = db; *p_db = db;
} }
err_xfer: err_xfer:
scmi_xfer_put(handle, t); ph->xops->xfer_put(ph, t);
} }
static void scmi_perf_domain_init_fc(const struct scmi_handle *handle, static void scmi_perf_domain_init_fc(const struct scmi_protocol_handle *ph,
u32 domain, struct scmi_fc_info **p_fc) u32 domain, struct scmi_fc_info **p_fc)
{ {
struct scmi_fc_info *fc; struct scmi_fc_info *fc;
fc = devm_kzalloc(handle->dev, sizeof(*fc), GFP_KERNEL); fc = devm_kzalloc(ph->dev, sizeof(*fc), GFP_KERNEL);
if (!fc) if (!fc)
return; return;
scmi_perf_domain_desc_fc(handle, domain, PERF_LEVEL_SET, scmi_perf_domain_desc_fc(ph, domain, PERF_LEVEL_SET,
&fc->level_set_addr, &fc->level_set_db); &fc->level_set_addr, &fc->level_set_db);
scmi_perf_domain_desc_fc(handle, domain, PERF_LEVEL_GET, scmi_perf_domain_desc_fc(ph, domain, PERF_LEVEL_GET,
&fc->level_get_addr, NULL); &fc->level_get_addr, NULL);
scmi_perf_domain_desc_fc(handle, domain, PERF_LIMITS_SET, scmi_perf_domain_desc_fc(ph, domain, PERF_LIMITS_SET,
&fc->limit_set_addr, &fc->limit_set_db); &fc->limit_set_addr, &fc->limit_set_db);
scmi_perf_domain_desc_fc(handle, domain, PERF_LIMITS_GET, scmi_perf_domain_desc_fc(ph, domain, PERF_LIMITS_GET,
&fc->limit_get_addr, NULL); &fc->limit_get_addr, NULL);
*p_fc = fc; *p_fc = fc;
} }
...@@ -640,14 +672,14 @@ static int scmi_dev_domain_id(struct device *dev) ...@@ -640,14 +672,14 @@ static int scmi_dev_domain_id(struct device *dev)
return clkspec.args[0]; return clkspec.args[0];
} }
static int scmi_dvfs_device_opps_add(const struct scmi_handle *handle, static int scmi_dvfs_device_opps_add(const struct scmi_protocol_handle *ph,
struct device *dev) struct device *dev)
{ {
int idx, ret, domain; int idx, ret, domain;
unsigned long freq; unsigned long freq;
struct scmi_opp *opp; struct scmi_opp *opp;
struct perf_dom_info *dom; struct perf_dom_info *dom;
struct scmi_perf_info *pi = handle->perf_priv; struct scmi_perf_info *pi = ph->get_priv(ph);
domain = scmi_dev_domain_id(dev); domain = scmi_dev_domain_id(dev);
if (domain < 0) if (domain < 0)
...@@ -672,11 +704,21 @@ static int scmi_dvfs_device_opps_add(const struct scmi_handle *handle, ...@@ -672,11 +704,21 @@ static int scmi_dvfs_device_opps_add(const struct scmi_handle *handle,
return 0; return 0;
} }
static int scmi_dvfs_transition_latency_get(const struct scmi_handle *handle, static int __scmi_dvfs_device_opps_add(const struct scmi_handle *handle,
struct device *dev) 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)
{ {
struct perf_dom_info *dom; struct perf_dom_info *dom;
struct scmi_perf_info *pi = handle->perf_priv; struct scmi_perf_info *pi = ph->get_priv(ph);
int domain = scmi_dev_domain_id(dev); int domain = scmi_dev_domain_id(dev);
if (domain < 0) if (domain < 0)
...@@ -687,35 +729,63 @@ static int scmi_dvfs_transition_latency_get(const struct scmi_handle *handle, ...@@ -687,35 +729,63 @@ static int scmi_dvfs_transition_latency_get(const struct scmi_handle *handle,
return dom->opp[dom->opp_count - 1].trans_latency_us * 1000; return dom->opp[dom->opp_count - 1].trans_latency_us * 1000;
} }
static int scmi_dvfs_freq_set(const struct scmi_handle *handle, u32 domain, 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) unsigned long freq, bool poll)
{ {
struct scmi_perf_info *pi = handle->perf_priv; struct scmi_perf_info *pi = ph->get_priv(ph);
struct perf_dom_info *dom = pi->dom_info + domain; struct perf_dom_info *dom = pi->dom_info + domain;
return scmi_perf_level_set(handle, domain, freq / dom->mult_factor, return scmi_perf_level_set(ph, domain, freq / dom->mult_factor, poll);
poll);
} }
static int scmi_dvfs_freq_get(const struct scmi_handle *handle, u32 domain, 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) unsigned long *freq, bool poll)
{ {
int ret; int ret;
u32 level; u32 level;
struct scmi_perf_info *pi = handle->perf_priv; struct scmi_perf_info *pi = ph->get_priv(ph);
struct perf_dom_info *dom = pi->dom_info + domain; struct perf_dom_info *dom = pi->dom_info + domain;
ret = scmi_perf_level_get(handle, domain, &level, poll); ret = scmi_perf_level_get(ph, domain, &level, poll);
if (!ret) if (!ret)
*freq = level * dom->mult_factor; *freq = level * dom->mult_factor;
return ret; return ret;
} }
static int scmi_dvfs_est_power_get(const struct scmi_handle *handle, u32 domain, static int __scmi_dvfs_freq_get(const struct scmi_handle *handle, u32 domain,
unsigned long *freq, unsigned long *power) unsigned long *freq, bool poll)
{ {
struct scmi_perf_info *pi = handle->perf_priv; 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)
{
struct scmi_perf_info *pi = ph->get_priv(ph);
struct perf_dom_info *dom; struct perf_dom_info *dom;
unsigned long opp_freq; unsigned long opp_freq;
int idx, ret = -EINVAL; int idx, ret = -EINVAL;
...@@ -739,25 +809,67 @@ static int scmi_dvfs_est_power_get(const struct scmi_handle *handle, u32 domain, ...@@ -739,25 +809,67 @@ static int scmi_dvfs_est_power_get(const struct scmi_handle *handle, u32 domain,
return ret; return ret;
} }
static bool scmi_fast_switch_possible(const struct scmi_handle *handle, 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) struct device *dev)
{ {
struct perf_dom_info *dom; struct perf_dom_info *dom;
struct scmi_perf_info *pi = handle->perf_priv; struct scmi_perf_info *pi = ph->get_priv(ph);
dom = pi->dom_info + scmi_dev_domain_id(dev); dom = pi->dom_info + scmi_dev_domain_id(dev);
return dom->fc_info && dom->fc_info->level_set_addr; return dom->fc_info && dom->fc_info->level_set_addr;
} }
static bool scmi_power_scale_mw_get(const struct scmi_handle *handle) static bool __scmi_fast_switch_possible(const struct scmi_handle *handle,
struct device *dev)
{ {
struct scmi_perf_info *pi = handle->perf_priv; 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);
return pi->power_scale_mw; 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 = { 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_set = scmi_perf_limits_set,
.limits_get = scmi_perf_limits_get, .limits_get = scmi_perf_limits_get,
.level_set = scmi_perf_level_set, .level_set = scmi_perf_level_set,
...@@ -772,7 +884,7 @@ static const struct scmi_perf_ops perf_ops = { ...@@ -772,7 +884,7 @@ static const struct scmi_perf_ops perf_ops = {
.power_scale_mw_get = scmi_power_scale_mw_get, .power_scale_mw_get = scmi_power_scale_mw_get,
}; };
static int scmi_perf_set_notify_enabled(const void *handle, static int scmi_perf_set_notify_enabled(const void *ph,
u8 evt_id, u32 src_id, bool enable) u8 evt_id, u32 src_id, bool enable)
{ {
int ret, cmd_id; int ret, cmd_id;
...@@ -781,7 +893,7 @@ static int scmi_perf_set_notify_enabled(const void *handle, ...@@ -781,7 +893,7 @@ static int scmi_perf_set_notify_enabled(const void *handle,
return -EINVAL; return -EINVAL;
cmd_id = evt_2_cmd[evt_id]; cmd_id = evt_2_cmd[evt_id];
ret = scmi_perf_level_limits_notify(handle, src_id, cmd_id, enable); ret = scmi_perf_level_limits_notify(ph, src_id, cmd_id, enable);
if (ret) if (ret)
pr_debug("FAIL_ENABLED - evt[%X] dom[%d] - ret:%d\n", pr_debug("FAIL_ENABLED - evt[%X] dom[%d] - ret:%d\n",
evt_id, src_id, ret); evt_id, src_id, ret);
...@@ -789,7 +901,7 @@ static int scmi_perf_set_notify_enabled(const void *handle, ...@@ -789,7 +901,7 @@ static int scmi_perf_set_notify_enabled(const void *handle,
return ret; return ret;
} }
static void *scmi_perf_fill_custom_report(const void *handle, static void *scmi_perf_fill_custom_report(const void *ph,
u8 evt_id, ktime_t timestamp, u8 evt_id, ktime_t timestamp,
const void *payld, size_t payld_sz, const void *payld, size_t payld_sz,
void *report, u32 *src_id) void *report, u32 *src_id)
...@@ -837,10 +949,10 @@ static void *scmi_perf_fill_custom_report(const void *handle, ...@@ -837,10 +949,10 @@ static void *scmi_perf_fill_custom_report(const void *handle,
return rep; return rep;
} }
static int scmi_perf_get_num_sources(const void *handle) static int scmi_perf_get_num_sources(const void *ph)
{ {
struct scmi_perf_info *pi = struct scmi_perf_info *pi =
((const struct scmi_handle *)(handle))->perf_priv; ((const struct scmi_protocol_handle *)ph)->get_priv(ph);
if (!pi) if (!pi)
return -EINVAL; return -EINVAL;
...@@ -874,24 +986,25 @@ static const struct scmi_protocol_events perf_protocol_events = { ...@@ -874,24 +986,25 @@ static const struct scmi_protocol_events perf_protocol_events = {
.num_events = ARRAY_SIZE(perf_events), .num_events = ARRAY_SIZE(perf_events),
}; };
static int scmi_perf_protocol_init(struct scmi_handle *handle) static int scmi_perf_protocol_init(const struct scmi_protocol_handle *ph)
{ {
int domain; int domain;
u32 version; u32 version;
struct scmi_perf_info *pinfo; struct scmi_perf_info *pinfo;
struct scmi_handle *handle;
scmi_version_get(handle, SCMI_PROTOCOL_PERF, &version); ph->xops->version_get(ph, &version);
dev_dbg(handle->dev, "Performance Version %d.%d\n", dev_dbg(ph->dev, "Performance Version %d.%d\n",
PROTOCOL_REV_MAJOR(version), PROTOCOL_REV_MINOR(version)); PROTOCOL_REV_MAJOR(version), PROTOCOL_REV_MINOR(version));
pinfo = devm_kzalloc(handle->dev, sizeof(*pinfo), GFP_KERNEL); pinfo = devm_kzalloc(ph->dev, sizeof(*pinfo), GFP_KERNEL);
if (!pinfo) if (!pinfo)
return -ENOMEM; return -ENOMEM;
scmi_perf_attributes_get(handle, pinfo); scmi_perf_attributes_get(ph, pinfo);
pinfo->dom_info = devm_kcalloc(handle->dev, pinfo->num_domains, pinfo->dom_info = devm_kcalloc(ph->dev, pinfo->num_domains,
sizeof(*pinfo->dom_info), GFP_KERNEL); sizeof(*pinfo->dom_info), GFP_KERNEL);
if (!pinfo->dom_info) if (!pinfo->dom_info)
return -ENOMEM; return -ENOMEM;
...@@ -899,24 +1012,26 @@ static int scmi_perf_protocol_init(struct scmi_handle *handle) ...@@ -899,24 +1012,26 @@ static int scmi_perf_protocol_init(struct scmi_handle *handle)
for (domain = 0; domain < pinfo->num_domains; domain++) { for (domain = 0; domain < pinfo->num_domains; domain++) {
struct perf_dom_info *dom = pinfo->dom_info + domain; struct perf_dom_info *dom = pinfo->dom_info + domain;
scmi_perf_domain_attributes_get(handle, domain, dom); scmi_perf_domain_attributes_get(ph, domain, dom);
scmi_perf_describe_levels_get(handle, domain, dom); scmi_perf_describe_levels_get(ph, domain, dom);
if (dom->perf_fastchannels) if (dom->perf_fastchannels)
scmi_perf_domain_init_fc(handle, domain, &dom->fc_info); scmi_perf_domain_init_fc(ph, domain, &dom->fc_info);
} }
pinfo->version = version; pinfo->version = version;
/* Transient code for legacy ops interface */
handle = scmi_map_scmi_handle(ph);
handle->perf_ops = &perf_ops; handle->perf_ops = &perf_ops;
handle->perf_priv = pinfo;
return 0; return ph->set_priv(ph, pinfo);
} }
static const struct scmi_protocol scmi_perf = { static const struct scmi_protocol scmi_perf = {
.id = SCMI_PROTOCOL_PERF, .id = SCMI_PROTOCOL_PERF,
.init = &scmi_perf_protocol_init, .instance_init = &scmi_perf_protocol_init,
.ops = &perf_ops, .ops = &perf_proto_ops,
.events = &perf_protocol_events, .events = &perf_protocol_events,
}; };
......
include/linux/scmi_protocol.h
View file @ 1fec5e6b
...@@ -85,7 +85,7 @@ struct scmi_clk_ops { ...@@ -85,7 +85,7 @@ struct scmi_clk_ops {
}; };
/** /**
* struct scmi_perf_ops - represents the various operations provided * struct scmi_perf_proto_ops - represents the various operations provided
* by SCMI Performance Protocol * by SCMI Performance Protocol
* *
* @limits_set: sets limits on the performance level of a domain * @limits_set: sets limits on the performance level of a domain
...@@ -102,6 +102,31 @@ struct scmi_clk_ops { ...@@ -102,6 +102,31 @@ struct scmi_clk_ops {
* @est_power_get: gets the estimated power cost for a given performance domain * @est_power_get: gets the estimated power cost for a given performance domain
* at a given frequency * at a given frequency
*/ */
struct scmi_perf_proto_ops {
int (*limits_set)(const struct scmi_protocol_handle *ph, u32 domain,
u32 max_perf, u32 min_perf);
int (*limits_get)(const struct scmi_protocol_handle *ph, u32 domain,
u32 *max_perf, u32 *min_perf);
int (*level_set)(const struct scmi_protocol_handle *ph, u32 domain,
u32 level, bool poll);
int (*level_get)(const struct scmi_protocol_handle *ph, u32 domain,
u32 *level, bool poll);
int (*device_domain_id)(struct device *dev);
int (*transition_latency_get)(const struct scmi_protocol_handle *ph,
struct device *dev);
int (*device_opps_add)(const struct scmi_protocol_handle *ph,
struct device *dev);
int (*freq_set)(const struct scmi_protocol_handle *ph, u32 domain,
unsigned long rate, bool poll);
int (*freq_get)(const struct scmi_protocol_handle *ph, u32 domain,
unsigned long *rate, bool poll);
int (*est_power_get)(const struct scmi_protocol_handle *ph, u32 domain,
unsigned long *rate, unsigned long *power);
bool (*fast_switch_possible)(const struct scmi_protocol_handle *ph,
struct device *dev);
bool (*power_scale_mw_get)(const struct scmi_protocol_handle *ph);
};
struct scmi_perf_ops { struct scmi_perf_ops {
int (*limits_set)(const struct scmi_handle *handle, u32 domain, int (*limits_set)(const struct scmi_handle *handle, u32 domain,
u32 max_perf, u32 min_perf); u32 max_perf, u32 min_perf);
...@@ -615,8 +640,6 @@ struct scmi_notify_ops { ...@@ -615,8 +640,6 @@ struct scmi_notify_ops {
* operations and a dedicated protocol handler * operations and a dedicated protocol handler
* @devm_protocol_put: devres managed method to release a protocol * @devm_protocol_put: devres managed method to release a protocol
* @notify_ops: pointer to set of notifications related operations * @notify_ops: pointer to set of notifications related operations
* @perf_priv: pointer to private data structure specific to performance
* protocol(for internal use only)
* @clk_priv: pointer to private data structure specific to clock * @clk_priv: pointer to private data structure specific to clock
* protocol(for internal use only) * protocol(for internal use only)
* @power_priv: pointer to private data structure specific to power * @power_priv: pointer to private data structure specific to power
...@@ -647,7 +670,6 @@ struct scmi_handle { ...@@ -647,7 +670,6 @@ struct scmi_handle {
const struct scmi_notify_ops *notify_ops; const struct scmi_notify_ops *notify_ops;
/* for protocol internal use */ /* for protocol internal use */
void *perf_priv;
void *clk_priv; void *clk_priv;
void *power_priv; void *power_priv;
void *sensor_priv; void *sensor_priv;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7