Skip to content

Commit e8ef4bb

Browse files
cris-masudeep-holla
authored andcommitted
firmware: arm_scmi: Use xa_insert() to store opps
When storing opps by level or index use xa_insert() instead of xa_store() and add error-checking to spot bad duplicates indexes possibly wrongly provided by the platform firmware. Fixes: 31c7c13 ("firmware: arm_scmi: Add v3.2 perf level indexing mode support") Signed-off-by: Cristian Marussi <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Sudeep Holla <[email protected]>
1 parent 0726fcc commit e8ef4bb

File tree

1 file changed

+18
-5
lines changed
  • drivers/firmware/arm_scmi

1 file changed

+18
-5
lines changed

drivers/firmware/arm_scmi/perf.c

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -350,8 +350,8 @@ process_response_opp(struct scmi_opp *opp, unsigned int loop_idx,
350350
}
351351

352352
static inline void
353-
process_response_opp_v4(struct perf_dom_info *dom, struct scmi_opp *opp,
354-
unsigned int loop_idx,
353+
process_response_opp_v4(struct device *dev, struct perf_dom_info *dom,
354+
struct scmi_opp *opp, unsigned int loop_idx,
355355
const struct scmi_msg_resp_perf_describe_levels_v4 *r)
356356
{
357357
opp->perf = le32_to_cpu(r->opp[loop_idx].perf_val);
@@ -362,10 +362,23 @@ process_response_opp_v4(struct perf_dom_info *dom, struct scmi_opp *opp,
362362
/* Note that PERF v4 reports always five 32-bit words */
363363
opp->indicative_freq = le32_to_cpu(r->opp[loop_idx].indicative_freq);
364364
if (dom->level_indexing_mode) {
365+
int ret;
366+
365367
opp->level_index = le32_to_cpu(r->opp[loop_idx].level_index);
366368

367-
xa_store(&dom->opps_by_idx, opp->level_index, opp, GFP_KERNEL);
368-
xa_store(&dom->opps_by_lvl, opp->perf, opp, GFP_KERNEL);
369+
ret = xa_insert(&dom->opps_by_idx, opp->level_index, opp,
370+
GFP_KERNEL);
371+
if (ret)
372+
dev_warn(dev,
373+
"Failed to add opps_by_idx at %d - ret:%d\n",
374+
opp->level_index, ret);
375+
376+
ret = xa_insert(&dom->opps_by_lvl, opp->perf, opp, GFP_KERNEL);
377+
if (ret)
378+
dev_warn(dev,
379+
"Failed to add opps_by_lvl at %d - ret:%d\n",
380+
opp->perf, ret);
381+
369382
hash_add(dom->opps_by_freq, &opp->hash, opp->indicative_freq);
370383
}
371384
}
@@ -382,7 +395,7 @@ iter_perf_levels_process_response(const struct scmi_protocol_handle *ph,
382395
if (PROTOCOL_REV_MAJOR(p->version) <= 0x3)
383396
process_response_opp(opp, st->loop_idx, response);
384397
else
385-
process_response_opp_v4(p->perf_dom, opp, st->loop_idx,
398+
process_response_opp_v4(ph->dev, p->perf_dom, opp, st->loop_idx,
386399
response);
387400
p->perf_dom->opp_count++;
388401

0 commit comments

Comments
 (0)