[PATCH v8 08/23] firmware: arm_scmi: Add Telemetry configuration operations
Cristian Marussi <[email protected]>
| Newsgroups | org.kernel.vger.arm-scmi,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-doc,org.kernel.vger.linux-kernel |
|---|---|
| Message-ID | <[email protected]> |
Add support for basic Telemetry configuration operations to selectively enable or disable DataEvents monitoring. Signed-off-by: Cristian Marussi <[email protected]> --- v7 --> v8 - Fixes for some Sashiko issues on v7 - re-add functions unused in previous patch - add proper barriers to TDE/UUID binding process - update tde->sid on SCAN_UPDATE too - check wrap-arounds on shmti_de_offset manipulation - fix GROUP enable pollutes status update (was polluting global state) - remove .all_disable telemetry_operation since unused - add WARN on if a valid SHMTI ID is reported on enabling a FastChannel/DE v6 --> v7 - expose per-DE tracked sid/offset/UUIDs - trigger a full SHMTI scan when a SHMTI-based is enabled and it still has NO associated UUID v5 --> v6 - constify a few booleans used as inpurt in telemetry_operations - fixes (some) Sashiko reviews https://sashiko.dev/#/patchset/20260703123601.381275-1-cristian.marussi%40arm.com?part=9 - underflow on de_offs - SHMTI overflow checks - bail out on failed group scan - unlink comprising DEs on group disable - add boudnary check on message response parsing v4 --> v5 - use renamed grp_id instead of old id in group descriptors - remove useless grp_ignore param from collection_configure - fixes sparse warnings v3 --> v4 - track configured Telemetry DE states - add aggregate Telemetry state query v2 --> v3 - split from monolithic Telemetry patch - simplify clenaup with scmi_telemetry_de_unlink --- drivers/firmware/arm_scmi/telemetry.c | 479 +++++++++++++++++++++++++- include/linux/scmi_protocol.h | 17 + 2 files changed, 494 insertions(+), 2 deletions(-) diff --git a/drivers/firmware/arm_scmi/telemetry.c b/drivers/firmware/arm_scmi/telemetry.c index 3641d2ad2f99..4dbe796fc07b 100644 --- a/drivers/firmware/arm_scmi/telemetry.c +++ b/drivers/firmware/arm_scmi/telemetry.c @@ -1386,7 +1386,8 @@ static void scmi_telemetry_uuid_unlink(struct telemetry_de *tde) return; scmi_telemetry_line_put(&tde->uuid->line, tde->uuid); - tde->uuid = NULL; + /* Ensure UUID is visible once nullified */ + smp_store_release(&tde->uuid, NULL); trace_scmi_tlm_access(tde->de.info->id, "UUID_UNLINK", 0, 0); } @@ -1577,6 +1578,42 @@ static void scmi_telemetry_tdcf_uuid_parse(struct telemetry_info *ti, *active_uuid = uuid; } +static struct payload __iomem * +scmi_telemetry_nearest_line_by_type(struct telemetry_shmti *shmti, + void __iomem *last, enum tdcf_line_types ltype) +{ + struct tdcf __iomem *tdcf = shmti->base; + void __iomem *next, *found = NULL; + + /* Scan from start of TDCF payloads up to last_payld */ + next = tdcf->payld; + while (next < last) { + if (LINE_TYPE((struct payload __iomem *)next) == ltype) + found = next; + + next += LINE_LENGTH_BYTES((struct payload __iomem *)next); + } + + return found; +} + +static struct telemetry_block_ts * +scmi_telemetry_blkts_bind(struct telemetry_info *ti, struct telemetry_shmti *shmti, + struct payload __iomem *payld, + struct payload __iomem *bts_payld) +{ + /* Trigger a manual search when no BLK_TS payload offset was provided */ + if (!bts_payld) { + /* Find the BLK_TS immediately preceding this DE payld */ + bts_payld = scmi_telemetry_nearest_line_by_type(shmti, payld, + TDCF_BLK_TS_LINE); + if (!bts_payld) + return NULL; + } + + return scmi_telemetry_blkts_get_or_create(ti, bts_payld); +} + /** * scmi_telemetry_tdcf_blkts_parse - A BLK_TS line parser * @@ -1687,11 +1724,25 @@ static inline void scmi_telemetry_uuid_link(struct telemetry_de *tde, return; refcount_inc(&uuid->line.users); - tde->uuid = uuid; + /* Ensure UUDI association is visible */ + smp_store_release(&tde->uuid, uuid); trace_scmi_tlm_access(tde->de.info->id, "UUID_LINK", 0, 0); } +static struct telemetry_uuid * +scmi_telemetry_uuid_bind(struct telemetry_info *ti, struct telemetry_shmti *shmti, + struct payload __iomem *payld) +{ + struct payload __iomem *uuid; + + uuid = scmi_telemetry_nearest_line_by_type(shmti, payld, TDCF_UUID_LINE); + if (!uuid) + return NULL; + + return scmi_telemetry_uuid_get_or_create(ti, uuid); +} + /** * scmi_telemetry_tdcf_data_parse - TDCF DataLine parsing * @ti: A reference to the telemetry info descriptor @@ -1775,6 +1826,7 @@ static void scmi_telemetry_tdcf_data_parse(struct telemetry_info *ti, /* Update DE location refs if requested: normally done only on enable */ if (mode >= SCAN_UPDATE) { + tde->sid = shmti->info.sid; tde->base = shmti->base; tde->eplg = SHMTI_EPLG(shmti); tde->offset = (void __iomem *)payld - (void __iomem *)shmti->base; @@ -1922,10 +1974,433 @@ static int scmi_telemetry_shmti_scan(struct telemetry_info *ti, return 0; } +static int scmi_telemetry_group_state_update(struct telemetry_info *ti, + struct scmi_telemetry_group *grp, + const bool *enable, const bool *tstamp) +{ + struct scmi_telemetry_res_info *rinfo; + + rinfo = ti->res_get(ti); + for (int i = 0; i < grp->info->num_des; i++) { + struct scmi_telemetry_de *de = rinfo->des[grp->des[i]]; + + if (enable) + scmi_telemetry_de_state_update(ti, ENA_STATE, + &de->enabled, *enable); + + if (tstamp && de->tstamp_support) + scmi_telemetry_de_state_update(ti, ENA_TSTAMP, + &de->tstamp_enabled, *tstamp); + } + + return 0; +} + +static void scmi_telemetry_group_unlink(struct telemetry_info *ti, + struct scmi_telemetry_group *grp) +{ + struct scmi_telemetry_res_info *rinfo; + + rinfo = ti->res_get(ti); + /* Unlink the related BLK_TS/UUID lines of DEs composing the group */ + for (int i = 0; i < grp->info->num_des; i++) { + struct telemetry_de *tde = to_tde(rinfo->des[grp->des[i]]); + + scmi_telemetry_blkts_unlink(tde); + } +} + +static int +scmi_telemetry_state_set_resp_process(struct telemetry_info *ti, void *obj, + void *r, bool is_group) +{ + struct scmi_msg_resp_telemetry_de_configure *resp = r; + u32 sid = le32_to_cpu(resp->shmti_id); + + /* Update DE SHMTI and offset, if applicable */ + if (IS_SHMTI_ID_VALID(sid)) { + if (sid >= ti->num_shmti) + return -EPROTO; + + /* + * Update SHMTI/offset while skipping non-SHMTI-DEs like + * FCs and notif-only. + */ + if (!is_group) { + struct telemetry_de *tde; + struct payload __iomem *payld; + struct scmi_telemetry_de *de = obj; + struct telemetry_shmti *shmti; + u32 de_offs, de_end; + + /* + * By the spec a FastChannel DE MUST return an INVALID + * SHMTI ID on enable. + */ + if (WARN_ON((de->fc_support))) + return -EPROTO; + + de_offs = le32_to_cpu(resp->shmti_de_offset); + + shmti = &ti->shmti[sid]; + payld = shmti->base; + de_end = de_offs + LINE_LENGTH_BYTES(payld); + /* Check wraparounds and boundary first... */ + if (de_end <= de_offs || de_end >= shmti->info.len) + return -EPROTO; + + tde = to_tde(de); + /*...then assign */ + tde->sid = sid; + tde->base = payld; + tde->offset = de_offs; + /* A handy reference to the Epilogue updated */ + tde->eplg = SHMTI_EPLG(shmti); + + payld = tde->base + tde->offset; + + /* + * On enable if a UUID was NOT already assigned scan + * looking for possible Secondary UUID to bind: if NO + * secondary could be found embedded in the preceding + * SHMTI lines, install the primary UUID for this DE. + */ + if (!tde->uuid) { + struct telemetry_uuid *uuid; + + uuid = scmi_telemetry_uuid_bind(ti, shmti, payld); + if (uuid) + /*Ensure UUID association is visible*/ + smp_store_release(&tde->uuid, uuid); + else + scmi_telemetry_uuid_link(tde, ti->primary_uuid); + } + + if (USE_BLK_TS(payld) && !tde->bts) { + struct payload __iomem *bts_payld; + u32 bts_offs; + + bts_offs = le32_to_cpu(resp->blk_ts_offset); + bts_payld = (bts_offs) ? tde->base + bts_offs : NULL; + + /* Check SHMTI overflow on returned offset */ + if (bts_payld && SHMTI_OVERFLOWS(bts_payld, shmti)) + return -ENOSPC; + + tde->bts = scmi_telemetry_blkts_bind(ti, shmti, + payld, bts_payld); + if (WARN_ON(!tde->bts)) + return -EPROTO; + } + } else { + int ret; + + /* + * A full SHMTI scan is needed when enabling a + * group or its timestamps in order to retrieve + * offsets: note that when group-timestamp is + * enabled for composing DEs a re-scan is needed + * since some DEs could have been relocated due + * to lack of space in the TDCF. + */ + ret = scmi_telemetry_shmti_scan(ti, sid, SCAN_UPDATE); + if (ret) { + dev_err(ti->ph->dev, + "Failed group-scan of SHMTI ID:%d - ret:%d\n", + sid, ret); + return ret; + } + } + } else { + /* Unlink the related BLK_TS/UUID lines on disable */ + if (!is_group) { + struct scmi_telemetry_de *de = obj; + struct telemetry_de *tde = to_tde(de); + + tde->sid = SHMTI_ID_INVALID; + /* UUID is never unlinked once discovered */ + scmi_telemetry_blkts_unlink(tde); + } else { + scmi_telemetry_group_unlink(ti, obj); + } + } + + return 0; +} + +static int __scmi_telemetry_state_set(const struct scmi_protocol_handle *ph, + bool is_group, const bool *enable, + bool *enabled_state, const bool *tstamp, + bool *tstamp_enabled_state, void *obj) +{ + struct scmi_msg_resp_telemetry_de_configure *resp; + struct scmi_msg_telemetry_de_configure *msg; + struct telemetry_info *ti = ph->get_priv(ph); + struct scmi_telemetry_de *de = !is_group ? obj : NULL; + struct scmi_telemetry_group *grp = is_group ? obj : NULL; + unsigned int obj_id = !is_group ? de->info->id : grp->info->grp_id; + struct scmi_xfer *t; + int ret; + + if (!enabled_state || !tstamp_enabled_state) + return -EINVAL; + + /* Is anything to do at all on this DE ? */ + if (!is_group && (!enable || *enable == *enabled_state) && + (!tstamp || *tstamp == *tstamp_enabled_state)) + return 0; + + /* + * DE is currently disabled AND no enable state change was requested, + * while timestamp is being changed: update only local state...no need + * to send a message. + */ + if (!is_group && !enable && !*enabled_state) { + if (de->tstamp_support) + scmi_telemetry_de_state_update(ti, ENA_TSTAMP, + tstamp_enabled_state, + *tstamp); + + return 0; + } + + ret = ph->xops->xfer_get_init(ph, TELEMETRY_DE_CONFIGURE, + sizeof(*msg), sizeof(*resp), &t); + if (ret) + return ret; + + msg = t->tx.buf; + /* Note that BOTH DE and GROUPS have a first ID field.. */ + msg->id = cpu_to_le32(obj_id); + /* Default to disable mode for one DE */ + msg->flags = DE_DISABLE_ONE; + msg->flags |= cpu_to_le32(FIELD_PREP(GENMASK(3, 3), + is_group ? EVENT_GROUP : EVENT_DE)); + + if ((!enable && *enabled_state) || (enable && *enable)) { + /* Already enabled but tstamp_enabled state changed */ + if (tstamp) { + /* Here, tstamp cannot be NULL too */ + msg->flags |= cpu_to_le32(*tstamp ? + DE_ENABLE_WTH_TSTAMP : DE_ENABLE_NO_TSTAMP); + } else { + msg->flags |= cpu_to_le32(*tstamp_enabled_state ? + DE_ENABLE_WTH_TSTAMP : DE_ENABLE_NO_TSTAMP); + } + } + + resp = t->rx.buf; + ret = ph->xops->do_xfer(ph, t); + if (!ret) { + ret = scmi_telemetry_state_set_resp_process(ti, obj, resp, is_group); + if (!ret) { + /* Update cached state on success */ + if (enable) { + if (!is_group) + scmi_telemetry_de_state_update(ti, ENA_STATE, + enabled_state, + *enable); + else + *enabled_state = *enable; + } + if (tstamp) { + if (!is_group) { + if (de->tstamp_support) + scmi_telemetry_de_state_update(ti, ENA_TSTAMP, + tstamp_enabled_state, + *tstamp); + } else { + *tstamp_enabled_state = *tstamp; + } + } + + if (is_group) + scmi_telemetry_group_state_update(ti, grp, enable, + tstamp); + } + } + + ph->xops->xfer_put(ph, t); + + return ret; +} + +static int scmi_telemetry_state_get(const struct scmi_protocol_handle *ph, + const u32 *id, bool *enabled, bool *tstamp_enabled, + u32 *sid, u32 *offset, uuid_t *uuid) +{ + struct telemetry_info *ti = ph->get_priv(ph); + struct scmi_telemetry_de *de; + struct telemetry_de *tde; + + if (!enabled || !tstamp_enabled) + return -EINVAL; + + if (!id) { + /* Returning the all_des_* state */ + *enabled = + (atomic_read(&ti->des_enabled[ENA_STATE]) == ti->info.base.num_des); + *tstamp_enabled = + (atomic_read(&ti->des_enabled[ENA_TSTAMP]) == ti->num_des_tstamp); + + return 0; + } + + de = xa_load(&ti->xa_des, *id); + if (!de) + return -ENODEV; + + *enabled = de->enabled; + *tstamp_enabled = de->tstamp_enabled; + + tde = to_tde(de); + if (sid) + *sid = tde->sid; + if (offset) + *offset = tde->offset; + if (uuid && tde->uuid) + uuid_copy(uuid, &tde->uuid->uuid); + + return 0; +} + +static int scmi_telemetry_state_set(const struct scmi_protocol_handle *ph, + bool is_group, u32 id, const bool *enable, + const bool *tstamp, u32 *sid, u32 *offset, + uuid_t *uuid) +{ + struct telemetry_info *ti = ph->get_priv(ph); + bool *enabled_state, *tstamp_enabled_state; + struct scmi_telemetry_res_info *rinfo; + void *obj; + int ret; + + rinfo = ti->res_get(ti); + if (!is_group) { + struct scmi_telemetry_de *de; + + de = xa_load(&ti->xa_des, id); + if (!de) + return -ENODEV; + + enabled_state = &de->enabled; + tstamp_enabled_state = &de->tstamp_enabled; + obj = de; + } else { + struct scmi_telemetry_group *grp; + + if (id >= ti->info.base.num_groups) + return -EINVAL; + + grp = &rinfo->grps[id]; + + enabled_state = &grp->enabled; + tstamp_enabled_state = &grp->tstamp_enabled; + obj = grp; + } + + ret = __scmi_telemetry_state_set(ph, is_group, enable, enabled_state, + tstamp, tstamp_enabled_state, obj); + if (ret) + return ret; + + if (!is_group) { + struct telemetry_de *tde; + + tde = to_tde(obj); + if (sid) + *sid = tde->sid; + if (offset) + *offset = tde->offset; + if (uuid && tde->uuid) + uuid_copy(uuid, &tde->uuid->uuid); + } + + return 0; +} + +static int +scmi_telemetry_collection_configure(const struct scmi_protocol_handle *ph, + unsigned int res_id, const bool *enable, + const unsigned int *update_interval_ms, + const enum scmi_telemetry_collection *mode) +{ + enum scmi_telemetry_collection *current_mode, next_mode; + struct telemetry_info *ti = ph->get_priv(ph); + struct scmi_msg_telemetry_config_set *msg; + bool tlm_enable, *current_state, is_group; + unsigned int *active_update_interval; + struct scmi_xfer *t; + __le32 interval; + u32 control; + int ret; + + if (mode && *mode == SCMI_TLM_NOTIFICATION && + !ti->info.continuos_update_support) + return -EINVAL; + + is_group = res_id != SCMI_TLM_GRP_INVALID; + if (is_group && res_id >= ti->info.base.num_groups) + return -EINVAL; + + if (!is_group) { + active_update_interval = &ti->info.active_update_interval; + current_mode = &ti->info.current_mode; + current_state = &ti->info.enabled; + } else { + struct scmi_telemetry_res_info *rinfo; + + rinfo = ti->res_get(ti); + active_update_interval = + &rinfo->grps[res_id].active_update_interval; + current_mode = &rinfo->grps[res_id].current_mode; + current_state = &rinfo->grps[res_id].enabled; + } + + if (!enable && !update_interval_ms && (!mode || *mode == *current_mode)) + return 0; + + ret = ph->xops->xfer_get_init(ph, TELEMETRY_CONFIG_SET, + sizeof(*msg), 0, &t); + if (ret) + return ret; + + if (!update_interval_ms) + interval = cpu_to_le32(*active_update_interval); + else + interval = cpu_to_le32(*update_interval_ms); + + tlm_enable = enable ? *enable : *current_state; + next_mode = mode ? *mode : *current_mode; + + msg = t->tx.buf; + msg->grp_id = cpu_to_le32(res_id); + control = tlm_enable ? TELEMETRY_ENABLE : 0; + control |= !is_group ? TELEMETRY_SET_SELECTOR_ALL : TELEMETRY_SET_SELECTOR_GROUP; + control |= TELEMETRY_MODE_SET(next_mode); + msg->control = cpu_to_le32(control); + msg->sampling_rate = interval; + ret = ph->xops->do_xfer(ph, t); + if (!ret) { + *current_state = tlm_enable; + *current_mode = next_mode; + ti->info.notif_enabled = *current_mode == SCMI_TLM_NOTIFICATION; + if (update_interval_ms) + *active_update_interval = le32_to_cpu(interval); + } + + ph->xops->xfer_put(ph, t); + + return ret; +} + static const struct scmi_telemetry_proto_ops tlm_proto_ops = { .info_get = scmi_telemetry_info_get, .de_lookup = scmi_telemetry_de_lookup, .res_get = scmi_telemetry_resources_get, + .state_get = scmi_telemetry_state_get, + .state_set = scmi_telemetry_state_set, + .collection_configure = scmi_telemetry_collection_configure, }; /** diff --git a/include/linux/scmi_protocol.h b/include/linux/scmi_protocol.h index 2850b018da0d..15a0aa3d9e3a 100644 --- a/include/linux/scmi_protocol.h +++ b/include/linux/scmi_protocol.h @@ -994,6 +994,12 @@ struct scmi_telemetry_info { * @info_get: get the general Telemetry information. * @de_lookup: get a specific DE descriptor from the DE id. * @res_get: get a reference to the Telemetry resources descriptor. + * @state_get: retrieve the specific DE or GROUP state, if NULL returns the + * cumulative state of all DEs. + * @state_set: enable/disable the specific DE or GROUP with or without timestamps. + * @collection_configure: choose a sampling rate and enable SHMTI/FC sampling + * for on demand collection via @de_data_read or async + * notificatioins for all the enabled DEs. */ struct scmi_telemetry_proto_ops { const struct scmi_telemetry_info __must_check *(*info_get) @@ -1002,6 +1008,17 @@ struct scmi_telemetry_proto_ops { (const struct scmi_protocol_handle *ph, u32 id); const struct scmi_telemetry_res_info __must_check *(*res_get) (const struct scmi_protocol_handle *ph); + int (*state_get)(const struct scmi_protocol_handle *ph, + const u32 *id, bool *enabled, bool *tstamp_enabled, + u32 *sid, u32 *offset, uuid_t *uuid); + int (*state_set)(const struct scmi_protocol_handle *ph, + bool is_group, u32 id, const bool *enable, + const bool *tstamp, u32 *sid, u32 *offset, + uuid_t *uuid); + int (*collection_configure)(const struct scmi_protocol_handle *ph, + unsigned int res_id, const bool *enable, + const unsigned int *update_interval_ms, + const enum scmi_telemetry_collection *mode); }; /** -- 2.54.0