Skip to content

drivers: qcom: rpmh/cmd_db: fix completion tracking and remove unused scaffolding #7958

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
zelvam95 wants to merge 4 commits into
base: master
Choose a base branch
from
+185 −1,447
Draft

drivers: qcom: rpmh/cmd_db: fix completion tracking and remove unused scaffolding #7958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2d754d8
drivers: qcom: rpmh: fix AMC completion tracking
zelvam95 Aug 27, 2026
3325887
drivers: qcom: rpmh: drop unused multi-DRV/TCS scaffolding
zelvam95 Aug 27, 2026
041063b
drivers: qcom: cmd_db: remove unused priority lookup, validate slave IDs
zelvam95 Aug 27, 2026
7fa8a6b
drivers: qcom: rpmh: move register layout to a per-platform header
zelvam95 Aug 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
153 changes: 9 additions & 144 deletions core/drivers/qcom/cmd_db/cmd_db.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,60 +26,26 @@ register_phys_mem(MEM_AREA_RAM_NSEC, AOP_CMD_DB_BASE, AOP_CMD_DB_SIZE);
#define CMD_DB_MAX_SLV_ID (CMD_DB_SLV_ID_ACTUAL + \
CMD_DB_SLV_ID_RESERVE)

#define CMD_DB_ADDR_SLV_ID_SHIFT 16
#define CMD_DB_ADDR_SLV_ID_MASK 0xf
#define CMD_DB_SLV_ID_VALID_LOW 3
#define CMD_DB_SLV_ID_VALID_HIGH 5

#define CMD_DB_RES_ID_MAX_CHARS 8
#define CMD_DB_CHAR_BITS 8

#define CMD_DB_PRIORITY_LOW_DRV_MAX 15
#define CMD_DB_PRIORITY_HIGH_DRV_MAX 31
#define CMD_DB_PRIORITY_HIGH_DRV_OFFSET 16
#define PRIORITY_BITS_PER_DRV 2
#define PRIORITY_MASK 0x3
#define MAX_DRV_ID CMD_DB_PRIORITY_HIGH_DRV_MAX

#define ADDR_SLV_ID(id) \
((enum cmd_db_slv_id_type)(((id) >> CMD_DB_ADDR_SLV_ID_SHIFT) & \
CMD_DB_ADDR_SLV_ID_MASK))

#define CMD_DB_GET_ENTRY_PTR(slv_info, idx) \
(query_db.data->data + (slv_info)->header_offset + \
sizeof(struct entry_header) * (idx))

#define CMD_DB_GET_DATA_PTR(slv_info, offset) \
(query_db.data->data + (slv_info)->data_offset + (offset))

enum cmd_db_slv_id_type {
CMD_DB_SLV_ID_INVALID = 0,
CMD_DB_SLV_ID_VALID_LOW = 3,
CMD_DB_SLV_ID_ARC = CMD_DB_SLV_ID_VALID_LOW,
CMD_DB_SLV_ID_VRM = 4,
CMD_DB_SLV_ID_BCM = 5,
CMD_DB_SLV_ID_VALID_HIGH = CMD_DB_SLV_ID_BCM,
};

enum cmd_db_query_type {
CMD_DB_QUERY_RES_ID = 0,
CMD_DB_QUERY_ADDRESS,
CMD_DB_QUERY_INVALID,
};

struct cmd_db_query_result_type {
char res_id[CMD_DB_MAX_RES_ID_LEN + 1];
uint32_t addr;
uint32_t priority[CMD_DB_DRV_ID_PRIORITY_SZ];
uint32_t len;
uint16_t version;
};

struct cmd_db_query_info {
char res_id[CMD_DB_MAX_RES_ID_LEN + 1];
uint32_t addr;
enum cmd_db_query_type type;
enum cmd_db_slv_id_type slv_id;
};

struct entry_header {
uint64_t res_id;
uint32_t priority[CMD_DB_DRV_ID_PRIORITY_SZ];
Expand Down Expand Up @@ -132,12 +98,6 @@ static uint64_t conv_str_to_uint64(const char *res_id)
return value;
}

static bool is_valid_slv_id(uint32_t slv_id)
{
return (slv_id >= CMD_DB_SLV_ID_VALID_LOW &&
slv_id <= CMD_DB_SLV_ID_VALID_HIGH);
}

static bool is_valid_res_id(const char *res_id)
{
if (!res_id || !res_id[0])
Expand Down Expand Up @@ -191,31 +151,26 @@ static TEE_Result validate_entry_bounds(struct slv_id_info *slv_info,
return TEE_SUCCESS;
}

static TEE_Result search_entry(struct cmd_db_query_info *query_info,
uint64_t res_id, uint16_t *slv_idx,
static TEE_Result search_entry(uint64_t res_id, uint16_t *slv_idx,
struct entry_header *entry)
{
struct slv_id_info *slv_info = NULL;
TEE_Result res = TEE_SUCCESS;
bool valid = false;
uint16_t i = 0;
uint16_t j = 0;

if (!query_db.data)
return TEE_ERROR_BAD_STATE;

if (query_info->type == CMD_DB_QUERY_RES_ID && !res_id)
if (!res_id)
return TEE_ERROR_BAD_PARAMETERS;

valid = is_valid_slv_id(query_info->slv_id);

for (i = 0; i < CMD_DB_MAX_SLV_ID; i++) {
slv_info = &query_db.data->slv_id_info[i];

if (valid) {
if (slv_info->slv_id != query_info->slv_id)
continue;
}
if (slv_info->slv_id < CMD_DB_SLV_ID_VALID_LOW ||
slv_info->slv_id > CMD_DB_SLV_ID_VALID_HIGH)
continue;

for (j = 0; j < slv_info->cnt; j++) {
res = validate_entry_bounds(slv_info, j);
Expand All @@ -225,12 +180,7 @@ static TEE_Result search_entry(struct cmd_db_query_info *query_info,
memcpy(entry, CMD_DB_GET_ENTRY_PTR(slv_info, j),
sizeof(*entry));

if (query_info->type == CMD_DB_QUERY_RES_ID &&
res_id == entry->res_id)
goto out_found;

if (query_info->type == CMD_DB_QUERY_ADDRESS &&
query_info->addr == entry->addr)
if (res_id == entry->res_id)
goto out_found;
}
}
Expand Down Expand Up @@ -271,7 +221,6 @@ cmd_db_get_entry_by_res_id(const char *res_id,
struct cmd_db_query_result_type *result,
uint8_t *data)
{
struct cmd_db_query_info query_info = { };
struct entry_header entry = { };
TEE_Result res = TEE_SUCCESS;
uint64_t res_id_val = 0;
Expand All @@ -284,58 +233,13 @@ cmd_db_get_entry_by_res_id(const char *res_id,
return TEE_ERROR_BAD_PARAMETERS;

res_id_val = conv_str_to_uint64(res_id);
query_info.type = CMD_DB_QUERY_RES_ID;
strlcpy(query_info.res_id, res_id, sizeof(query_info.res_id));

res = search_entry(&query_info, res_id_val, &slv_idx, &entry);
res = search_entry(res_id_val, &slv_idx, &entry);
if (res)
return res;

strlcpy(result->res_id, res_id, sizeof(result->res_id));
result->addr = entry.addr;
result->priority[0] = entry.priority[0];
result->priority[1] = entry.priority[1];
result->version = query_db.data->slv_id_info[slv_idx].version;

if (entry.len == 0)
return TEE_SUCCESS;

if (result->len == 0) {
result->len = entry.len;
return TEE_SUCCESS;
}

return copy_aux_data(slv_idx, &entry, result, data);
}

static TEE_Result
cmd_db_get_entry_by_addr(uint32_t addr, struct cmd_db_query_result_type *result,
uint8_t *data)
{
struct cmd_db_query_info query_info = { };
struct entry_header entry = { };
TEE_Result res = TEE_SUCCESS;
uint16_t slv_idx = 0;
uint32_t slv_id = 0;

if (!result || (!data && result->len > 0))
return TEE_ERROR_BAD_PARAMETERS;

slv_id = ADDR_SLV_ID(addr);
if (!is_valid_slv_id(slv_id))
return TEE_ERROR_BAD_PARAMETERS;

query_info.type = CMD_DB_QUERY_ADDRESS;
query_info.addr = addr;
query_info.slv_id = slv_id;

res = search_entry(&query_info, 0, &slv_idx, &entry);
if (res)
return res;

result->addr = entry.addr;
result->priority[0] = entry.priority[0];
result->priority[1] = entry.priority[1];
result->version = query_db.data->slv_id_info[slv_idx].version;

if (entry.len == 0)
Expand Down Expand Up @@ -372,43 +276,4 @@ TEE_Result cmd_db_get_addr(const char *res_id, uint32_t *addr)
return res;
}

static uint32_t extract_priority(struct cmd_db_query_result_type *result,
uint8_t drv_id)
{
if (drv_id <= CMD_DB_PRIORITY_LOW_DRV_MAX)
return (result->priority[0] >>
(drv_id * PRIORITY_BITS_PER_DRV)) & PRIORITY_MASK;

if (drv_id <= CMD_DB_PRIORITY_HIGH_DRV_MAX)
return (result->priority[1] >>
((drv_id - CMD_DB_PRIORITY_HIGH_DRV_OFFSET) *
PRIORITY_BITS_PER_DRV)) & PRIORITY_MASK;

return 0;
}

TEE_Result cmd_db_get_priority(uint32_t addr, uint8_t drv_id,
uint32_t *priority)
{
struct cmd_db_query_result_type result = { };
TEE_Result res = TEE_SUCCESS;

if (!priority || drv_id > MAX_DRV_ID)
return TEE_ERROR_BAD_PARAMETERS;

mutex_lock(&query_db.lock);

if (!query_db.data) {
mutex_unlock(&query_db.lock);
return TEE_ERROR_BAD_STATE;
}

res = cmd_db_get_entry_by_addr(addr, &result, NULL);
if (res == TEE_SUCCESS)
*priority = extract_priority(&result, drv_id);

mutex_unlock(&query_db.lock);
return res;
}

early_init(cmd_db_init);
4 changes: 0 additions & 4 deletions core/drivers/qcom/qfprom/kodiak/qfprom_fuse_region.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,6 @@ static TEE_Result qfprom_platform_init(void)
return TEE_ERROR_GENERIC;
}

rpmh_barrier_single(rpmh_handle, req_id);

return TEE_SUCCESS;
}

Expand Down Expand Up @@ -138,8 +136,6 @@ static TEE_Result qfprom_platform_deinit(void)
return TEE_ERROR_GENERIC;
}

rpmh_barrier_single(rpmh_handle, req_id);

return TEE_SUCCESS;
}

Expand Down
43 changes: 43 additions & 0 deletions core/drivers/qcom/rpmh/kodiak/rpmh_target.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/* SPDX-License-Identifier: BSD-2-Clause */
/*
* Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
*/

#ifndef __RPMH_TARGET_H__
#define __RPMH_TARGET_H__

#include <util.h>

#define RSC_DRV_IRQ_ENABLE 0x0d00
#define RSC_DRV_IRQ_STATUS 0x0d04
#define RSC_DRV_IRQ_CLEAR 0x0d08

#define TCS_BASE_OFFSET 0x0D10
#define TCS_STRIDE 0x2A0

#define TCS_CMD_WAIT_FOR_CMPL_OFFSET 0x00
#define TCS_CONTROL_OFFSET 0x04
#define TCS_STATUS_OFFSET 0x08
#define TCS_CMD_ENABLE_OFFSET 0x0C

#define TCS_CMD_BASE_OFFSET 0x20
#define TCS_CMDn_MSGID_OFFSET 0x00
#define TCS_CMDn_ADDR_OFFSET 0x04
#define TCS_CMDn_DATA_OFFSET 0x08
#define TCS_CMD_STRIDE 0x14

#define TCS_CONTROL_AMC_MODE_TRIGGER BIT(24)
#define TCS_CONTROL_AMC_MODE_EN BIT(16)

#define TCS_STATUS_CONTROLLER_IDLE BIT(0)

#define MSGID_READ_OR_WRITE_SHIFT 0x10
#define MSGID_RES_REQ_SHIFT 0x8
#define MSGID_MSG_LENGTH_SHIFT 0x0

#define ADDR_SLV_ID_SHIFT 0x10
#define ADDR_SLV_ID_MASK 0x7
#define ADDR_OFFSET_SHIFT 0x0
#define ADDR_OFFSET_MASK 0xFFFF

#endif /* __RPMH_TARGET_H__ */
43 changes: 43 additions & 0 deletions core/drivers/qcom/rpmh/lemans/rpmh_target.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/* SPDX-License-Identifier: BSD-2-Clause */
/*
* Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
*/

#ifndef __RPMH_TARGET_H__
#define __RPMH_TARGET_H__

#include <util.h>

#define RSC_DRV_IRQ_ENABLE 0x0d00
#define RSC_DRV_IRQ_STATUS 0x0d04
#define RSC_DRV_IRQ_CLEAR 0x0d08

#define TCS_BASE_OFFSET 0x0D10
#define TCS_STRIDE 0x2A0

#define TCS_CMD_WAIT_FOR_CMPL_OFFSET 0x00
#define TCS_CONTROL_OFFSET 0x04
#define TCS_STATUS_OFFSET 0x08
#define TCS_CMD_ENABLE_OFFSET 0x0C

#define TCS_CMD_BASE_OFFSET 0x20
#define TCS_CMDn_MSGID_OFFSET 0x00
#define TCS_CMDn_ADDR_OFFSET 0x04
#define TCS_CMDn_DATA_OFFSET 0x08
#define TCS_CMD_STRIDE 0x14

#define TCS_CONTROL_AMC_MODE_TRIGGER BIT(24)
#define TCS_CONTROL_AMC_MODE_EN BIT(16)

#define TCS_STATUS_CONTROLLER_IDLE BIT(0)

#define MSGID_READ_OR_WRITE_SHIFT 0x10
#define MSGID_RES_REQ_SHIFT 0x8
#define MSGID_MSG_LENGTH_SHIFT 0x0

#define ADDR_SLV_ID_SHIFT 0x10
#define ADDR_SLV_ID_MASK 0x7
#define ADDR_OFFSET_SHIFT 0x0
#define ADDR_OFFSET_MASK 0xFFFF

#endif /* __RPMH_TARGET_H__ */
Loading
Loading