Firmware/opensbi
8
0
Fork 0
forked from Mirrors/opensbi
Code Pull Requests Activity

lib: utils: Improve variable declarations in MPXY RPMI mailbox client

Browse Source 
The local variable declarations should be at the start of function
and preferrably organized like a inverted pyramid.

Signed-off-by: Anup Patel <apatel@ventanamicro.com>
Reviewed-by: Samuel Holland <samuel.holland@sifive.com>
This commit is contained in:
Anup Patel
2025-01-12 10:53:49 +05:30
committed by Anup Patel
parent 879ee6859c
commit 218de6ff7d
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/utils/mpxy/fdt_mpxy_rpmi_mbox.c
View File

@@ -34,8 +34,8 @@ struct mpxy_rpmi_mbox {
static const struct mpxy_rpmi_service_data *mpxy_find_rpmi_srvid(u32 message_id, static const struct mpxy_rpmi_service_data *mpxy_find_rpmi_srvid(u32 message_id,
const struct mpxy_rpmi_mbox_data *mbox_data) const struct mpxy_rpmi_mbox_data *mbox_data)
{ {
int mid = 0;
const struct mpxy_rpmi_service_data *srv = mbox_data->service_data; const struct mpxy_rpmi_service_data *srv = mbox_data->service_data;
int mid = 0;
for (mid = 0; srv[mid].id < mbox_data->num_services; mid++) { for (mid = 0; srv[mid].id < mbox_data->num_services; mid++) {
if (srv[mid].id == (u8)message_id) if (srv[mid].id == (u8)message_id)
@@ -57,12 +57,10 @@ static int mpxy_mbox_read_attributes(struct sbi_mpxy_channel *channel,
u32 *outmem, u32 base_attr_id, u32 *outmem, u32 base_attr_id,
u32 attr_count) u32 attr_count)
{ {
u32 end_id;
struct mpxy_rpmi_mbox *rmb = struct mpxy_rpmi_mbox *rmb =
container_of(channel, struct mpxy_rpmi_mbox, channel); container_of(channel, struct mpxy_rpmi_mbox, channel);
u32 *attr_array = (u32 *)&rmb->msgprot_attrs; u32 *attr_array = (u32 *)&rmb->msgprot_attrs;
u32 end_id = base_attr_id + attr_count - 1;
end_id = base_attr_id + attr_count - 1;
if (end_id >= MPXY_MSGPROT_RPMI_ATTR_MAX_ID) if (end_id >= MPXY_MSGPROT_RPMI_ATTR_MAX_ID)
return SBI_EBAD_RANGE; return SBI_EBAD_RANGE;
@@ -108,12 +106,11 @@ static int mpxy_mbox_write_attributes(struct sbi_mpxy_channel *channel,
u32 *outmem, u32 base_attr_id, u32 *outmem, u32 base_attr_id,
u32 attr_count) u32 attr_count)
{ {
int ret, mem_idx;
u32 end_id, attr_val, idx;
struct mpxy_rpmi_mbox *rmb = struct mpxy_rpmi_mbox *rmb =
container_of(channel, struct mpxy_rpmi_mbox, channel); container_of(channel, struct mpxy_rpmi_mbox, channel);
u32 end_id = base_attr_id + attr_count - 1;
end_id = base_attr_id + attr_count - 1; u32 attr_val, idx;
int ret, mem_idx;
if (end_id >= MPXY_MSGPROT_RPMI_ATTR_MAX_ID) if (end_id >= MPXY_MSGPROT_RPMI_ATTR_MAX_ID)
return SBI_EBAD_RANGE; return SBI_EBAD_RANGE;
@@ -140,15 +137,15 @@ static int __mpxy_mbox_send_message(struct sbi_mpxy_channel *channel,
void *rx, u32 rx_max_len, void *rx, u32 rx_max_len,
unsigned long *ack_len) unsigned long *ack_len)
{ {
int ret;
u32 rx_len = 0;
struct mbox_xfer xfer;
struct rpmi_message_args args = {0};
struct mpxy_rpmi_mbox *rmb = struct mpxy_rpmi_mbox *rmb =
container_of(channel, struct mpxy_rpmi_mbox, channel); container_of(channel, struct mpxy_rpmi_mbox, channel);
const struct mpxy_rpmi_mbox_data *data = rmb->mbox_data; const struct mpxy_rpmi_mbox_data *data = rmb->mbox_data;
const struct mpxy_rpmi_service_data *srv = const struct mpxy_rpmi_service_data *srv =
mpxy_find_rpmi_srvid(message_id, data); mpxy_find_rpmi_srvid(message_id, data);
struct rpmi_message_args args = {0};
struct mbox_xfer xfer;
u32 rx_len = 0;
int ret;
if (!srv) if (!srv)
return SBI_ENOTSUPP; return SBI_ENOTSUPP;
@@ -215,12 +212,12 @@ static int mpxy_mbox_send_message_withoutresp(struct sbi_mpxy_channel *channel,
int mpxy_rpmi_mbox_init(const void *fdt, int nodeoff, const struct fdt_match *match) int mpxy_rpmi_mbox_init(const void *fdt, int nodeoff, const struct fdt_match *match)
{ {
int rc, len; const struct mpxy_rpmi_mbox_data *data = match->data;
struct mpxy_rpmi_mbox *rmb;
struct mbox_chan *chan;
const fdt32_t *val; const fdt32_t *val;
u32 channel_id; u32 channel_id;
struct mbox_chan *chan; int rc, len;
struct mpxy_rpmi_mbox *rmb;
const struct mpxy_rpmi_mbox_data *data = match->data;
/* Allocate context for RPXY mbox client */ /* Allocate context for RPXY mbox client */
rmb = sbi_zalloc(sizeof(*rmb)); rmb = sbi_zalloc(sizeof(*rmb));