Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 20:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

soc: qcom: rpmpd: Expand struct definition macros

Browse Source 
Expand the struct definition macros to make things easier to see and
maintain. Now that the macros are unnecessary, remove them.

Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230313-topic-rpmpd-v3-5-06a4f448ff90@linaro.org
This commit is contained in:
Konrad Dybcio 2023-03-13 21:00:03 +01:00 committed by Bjorn Andersson
parent 1c940cc42a
commit 91c0bcef25
1 changed files with 433 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

523
drivers/soc/qcom/rpmpd.c
View File

@ -40,56 +40,6 @@
#define MAX_CORNER_RPMPD_STATE 6
#define DEFINE_RPMPD_PAIR(_name, _active, r_type, r_key, r_id) \
static struct rpmpd r_type##r_id##_##r_key##_##_active; \
static struct rpmpd r_type##r_id##_##r_key##_##_name = { \
.pd = { .name = #_name, }, \
.peer = &r_type##r_id##_##r_key##_##_active, \
.res_type = RPMPD_##r_type, \
.res_id = r_id, \
.key = KEY_##r_key, \
}; \
static struct rpmpd r_type##r_id##_##r_key##_##_active = { \
.pd = { .name = #_active, }, \
.peer = &r_type##r_id##_##r_key##_##_name, \
.active_only = true, \
.res_type = RPMPD_##r_type, \
.res_id = r_id, \
.key = KEY_##r_key, \
}
#define DEFINE_RPMPD_CORNER(_name, r_type, r_id) \
static struct rpmpd r_type##r_id##_##_name##_corner = { \
.pd = { .name = #_name, }, \
.res_type = RPMPD_##r_type, \
.res_id = r_id, \
.key = KEY_CORNER, \
}
#define DEFINE_RPMPD_LEVEL(_name, r_type, r_id) \
static struct rpmpd r_type##r_id##_##_name##_lvl = { \
.pd = { .name = #_name, }, \
.res_type = RPMPD_##r_type, \
.res_id = r_id, \
.key = KEY_LEVEL, \
}
#define DEFINE_RPMPD_VFC(_name, r_type, r_id) \
static struct rpmpd r_type##r_id##_##_name = { \
.pd = { .name = #_name, }, \
.res_type = RPMPD_##r_type, \
.res_id = r_id, \
.key = KEY_FLOOR_CORNER, \
}
#define DEFINE_RPMPD_VFL(_name, r_type, r_id) \
static struct rpmpd r_type##r_id##_##_name = { \
.pd = { .name = #_name, }, \
.res_type = RPMPD_##r_type, \
.res_id = r_id, \
.key = KEY_FLOOR_LEVEL, \
}
struct rpmpd_req {
__le32 key;
__le32 nbytes;
@ -117,54 +67,447 @@ struct rpmpd_desc {
static DEFINE_MUTEX(rpmpd_lock);
DEFINE_RPMPD_PAIR(cx, cx_ao, RWCX, LEVEL, 0);
DEFINE_RPMPD_PAIR(cx, cx_ao, SMPA, CORNER, 1);
DEFINE_RPMPD_PAIR(cx, cx_ao, SMPA, CORNER, 2);
DEFINE_RPMPD_PAIR(cx, cx_ao, SMPA, LEVEL, 2);
DEFINE_RPMPD_PAIR(cx, cx_ao, SMPA, LEVEL, 3);
DEFINE_RPMPD_VFL(cx_vfl, RWCX, 0);
DEFINE_RPMPD_VFL(cx_vfl, RWSC, 2);
DEFINE_RPMPD_VFC(cx_vfc, SMPA, 1);
DEFINE_RPMPD_VFC(cx_vfc, SMPA, 2);
DEFINE_RPMPD_VFL(cx_vfl, SMPA, 2);
DEFINE_RPMPD_VFL(cx_vfl, SMPA, 3);
/* CX */
static struct rpmpd RWCX0_LEVEL_cx_ao;
static struct rpmpd RWCX0_LEVEL_cx = {
.pd = { .name = "cx", },
.peer = &RWCX0_LEVEL_cx_ao,
.res_type = RPMPD_RWCX,
.res_id = 0,
.key = KEY_LEVEL,
};
DEFINE_RPMPD_CORNER(gfx, SMPB, 2);
DEFINE_RPMPD_VFC(gfx_vfc, SMPB, 2);
static struct rpmpd RWCX0_LEVEL_cx_ao = {
.pd = { .name = "cx_ao", },
.peer = &RWCX0_LEVEL_cx,
.active_only = true,
.res_type = RPMPD_RWCX,
.res_id = 0,
.key = KEY_LEVEL,
};
DEFINE_RPMPD_PAIR(gx, gx_ao, RWGX, LEVEL, 0);
static struct rpmpd SMPA1_CORNER_cx_ao;
static struct rpmpd SMPA1_CORNER_cx = {
.pd = { .name = "cx", },
.peer = &SMPA1_CORNER_cx_ao,
.res_type = RPMPD_SMPA,
.res_id = 1,
.key = KEY_CORNER,
};
DEFINE_RPMPD_PAIR(mx, mx_ao, LDOA, CORNER, 3);
DEFINE_RPMPD_PAIR(mx, mx_ao, LDOA, LEVEL, 12);
DEFINE_RPMPD_PAIR(mx, mx_ao, SMPA, CORNER, 2);
DEFINE_RPMPD_PAIR(mx, mx_ao, RWMX, LEVEL, 0);
DEFINE_RPMPD_PAIR(mx, mx_ao, SMPA, LEVEL, 6);
DEFINE_RPMPD_PAIR(mx, mx_ao, SMPA, LEVEL, 7);
DEFINE_RPMPD_VFL(mx_vfl, LDOA, 12);
DEFINE_RPMPD_VFL(mx_vfl, RWMX, 0);
DEFINE_RPMPD_VFL(mx_vfl, RWSM, 6);
static struct rpmpd SMPA1_CORNER_cx_ao = {
.pd = { .name = "cx_ao", },
.peer = &SMPA1_CORNER_cx,
.active_only = true,
.res_type = RPMPD_SMPA,
.res_id = 1,
.key = KEY_CORNER,
};
DEFINE_RPMPD_PAIR(md, md_ao, SMPA, CORNER, 1);
DEFINE_RPMPD_PAIR(md, md_ao, SMPA, LEVEL, 1);
DEFINE_RPMPD_VFC(md_vfc, SMPA, 1);
static struct rpmpd SMPA2_CORNER_cx_ao;
static struct rpmpd SMPA2_CORNER_cx = {
.pd = { .name = "cx", },
.peer = &SMPA2_CORNER_cx_ao,
.res_type = RPMPD_SMPA,
.res_id = 2,
.key = KEY_CORNER,
};
DEFINE_RPMPD_LEVEL(lpi_cx, RWLC, 0);
DEFINE_RPMPD_VFL(lpicx_vfl, RWLC, 0);
static struct rpmpd SMPA2_CORNER_cx_ao = {
.pd = { .name = "cx_ao", },
.peer = &SMPA2_CORNER_cx,
.active_only = true,
.res_type = RPMPD_SMPA,
.res_id = 2,
.key = KEY_CORNER,
};
DEFINE_RPMPD_LEVEL(lpi_mx, RWLM, 0);
DEFINE_RPMPD_VFL(lpimx_vfl, RWLM, 0);
static struct rpmpd SMPA2_LEVEL_cx_ao;
static struct rpmpd SMPA2_LEVEL_cx = {
.pd = { .name = "cx", },
.peer = &SMPA2_LEVEL_cx_ao,
.res_type = RPMPD_SMPA,
.res_id = 2,
.key = KEY_LEVEL,
};
DEFINE_RPMPD_CORNER(sscx, LDOA, 26);
DEFINE_RPMPD_LEVEL(ssccx, RWLC, 0);
DEFINE_RPMPD_LEVEL(ssccx, RWSC, 0);
DEFINE_RPMPD_VFC(sscx_vfc, LDOA, 26);
DEFINE_RPMPD_VFL(ssccx_vfl, RWLC, 0);
DEFINE_RPMPD_VFL(ssccx_vfl, RWSC, 0);
static struct rpmpd SMPA2_LEVEL_cx_ao = {
.pd = { .name = "cx_ao", },
.peer = &SMPA2_LEVEL_cx,
.active_only = true,
.res_type = RPMPD_SMPA,
.res_id = 2,
.key = KEY_LEVEL,
};
DEFINE_RPMPD_LEVEL(sscmx, RWLM, 0);
DEFINE_RPMPD_LEVEL(sscmx, RWSM, 0);
DEFINE_RPMPD_VFL(sscmx_vfl, RWLM, 0);
DEFINE_RPMPD_VFL(sscmx_vfl, RWSM, 0);
static struct rpmpd SMPA3_LEVEL_cx_ao;
static struct rpmpd SMPA3_LEVEL_cx = {
.pd = { .name = "cx", },
.peer = &SMPA3_LEVEL_cx_ao,
.res_type = RPMPD_SMPA,
.res_id = 3,
.key = KEY_LEVEL,
};
static struct rpmpd SMPA3_LEVEL_cx_ao = {
.pd = { .name = "cx_ao", },
.peer = &SMPA3_LEVEL_cx,
.active_only = true,
.res_type = RPMPD_SMPA,
.res_id = 3,
.key = KEY_LEVEL,
};
static struct rpmpd RWCX0_cx_vfl = {
.pd = { .name = "cx_vfl", },
.res_type = RPMPD_RWCX,
.res_id = 0,
.key = KEY_FLOOR_LEVEL,
};
static struct rpmpd RWSC2_cx_vfl = {
.pd = { .name = "cx_vfl", },
.res_type = RPMPD_RWSC,
.res_id = 2,
.key = KEY_FLOOR_LEVEL,
};
static struct rpmpd SMPA1_cx_vfc = {
.pd = { .name = "cx_vfc", },
.res_type = RPMPD_SMPA,
.res_id = 1,
.key = KEY_FLOOR_CORNER,
};
static struct rpmpd SMPA2_cx_vfc = {
.pd = { .name = "cx_vfc", },
.res_type = RPMPD_SMPA,
.res_id = 2,
.key = KEY_FLOOR_CORNER,
};
static struct rpmpd SMPA2_cx_vfl = {
.pd = { .name = "cx_vfl", },
.res_type = RPMPD_SMPA,
.res_id = 2,
.key = KEY_FLOOR_LEVEL,
};
static struct rpmpd SMPA3_cx_vfl = {
.pd = { .name = "cx_vfl", },
.res_type = RPMPD_SMPA,
.res_id = 3,
.key = KEY_FLOOR_LEVEL,
};
/* G(F)X */
static struct rpmpd SMPB2_gfx_corner = {
.pd = { .name = "gfx", },
.res_type = RPMPD_SMPB,
.res_id = 2,
.key = KEY_CORNER,
};
static struct rpmpd SMPB2_gfx_vfc = {
.pd = { .name = "gfx_vfc", },
.res_type = RPMPD_SMPB,
.res_id = 2,
.key = KEY_FLOOR_CORNER,
};
static struct rpmpd RWGX0_LEVEL_gx_ao;
static struct rpmpd RWGX0_LEVEL_gx = {
.pd = { .name = "gx", },
.peer = &RWGX0_LEVEL_gx_ao,
.res_type = RPMPD_RWGX,
.res_id = 0,
.key = KEY_LEVEL,
};
static struct rpmpd RWGX0_LEVEL_gx_ao = {
.pd = { .name = "gx_ao", },
.peer = &RWGX0_LEVEL_gx,
.active_only = true,
.res_type = RPMPD_RWGX,
.res_id = 0,
.key = KEY_LEVEL,
};
/* MX */
static struct rpmpd LDOA3_CORNER_mx_ao;
static struct rpmpd LDOA3_CORNER_mx = {
.pd = { .name = "mx", },
.peer = &LDOA3_CORNER_mx_ao,
.res_type = RPMPD_LDOA,
.res_id = 3,
.key = KEY_CORNER,
};
static struct rpmpd LDOA3_CORNER_mx_ao = {
.pd = { .name = "mx_ao", },
.peer = &LDOA3_CORNER_mx,
.active_only = true,
.res_type = RPMPD_LDOA,
.res_id = 3,
.key = KEY_CORNER,
};
static struct rpmpd LDOA12_LEVEL_mx_ao;
static struct rpmpd LDOA12_LEVEL_mx = {
.pd = { .name = "mx", },
.peer = &LDOA12_LEVEL_mx_ao,
.res_type = RPMPD_LDOA,
.res_id = 12,
.key = KEY_LEVEL,
};
static struct rpmpd LDOA12_LEVEL_mx_ao = {
.pd = { .name = "mx_ao", },
.peer = &LDOA12_LEVEL_mx,
.active_only = true,
.res_type = RPMPD_LDOA,
.res_id = 12,
.key = KEY_LEVEL,
};
static struct rpmpd SMPA2_CORNER_mx_ao;
static struct rpmpd SMPA2_CORNER_mx = {
.pd = { .name = "mx", },
.peer = &SMPA2_CORNER_mx_ao,
.res_type = RPMPD_SMPA,
.res_id = 2,
.key = KEY_CORNER,
};
static struct rpmpd SMPA2_CORNER_mx_ao = {
.pd = { .name = "mx_ao", },
.peer = &SMPA2_CORNER_mx,
.active_only = true,
.res_type = RPMPD_SMPA,
.res_id = 2,
.key = KEY_CORNER,
};
static struct rpmpd RWMX0_LEVEL_mx_ao;
static struct rpmpd RWMX0_LEVEL_mx = {
.pd = { .name = "mx", },
.peer = &RWMX0_LEVEL_mx_ao,
.res_type = RPMPD_RWMX,
.res_id = 0,
.key = KEY_LEVEL,
};
static struct rpmpd RWMX0_LEVEL_mx_ao = {
.pd = { .name = "mx_ao", },
.peer = &RWMX0_LEVEL_mx,
.active_only = true,
.res_type = RPMPD_RWMX,
.res_id = 0,
.key = KEY_LEVEL,
};
static struct rpmpd SMPA6_LEVEL_mx_ao;
static struct rpmpd SMPA6_LEVEL_mx = {
.pd = { .name = "mx", },
.peer = &SMPA6_LEVEL_mx_ao,
.res_type = RPMPD_SMPA,
.res_id = 6,
.key = KEY_LEVEL,
};
static struct rpmpd SMPA6_LEVEL_mx_ao = {
.pd = { .name = "mx_ao", },
.peer = &SMPA6_LEVEL_mx,
.active_only = true,
.res_type = RPMPD_SMPA,
.res_id = 6,
.key = KEY_LEVEL,
};
static struct rpmpd SMPA7_LEVEL_mx_ao;
static struct rpmpd SMPA7_LEVEL_mx = {
.pd = { .name = "mx", },
.peer = &SMPA7_LEVEL_mx_ao,
.res_type = RPMPD_SMPA,
.res_id = 7,
.key = KEY_LEVEL,
};
static struct rpmpd SMPA7_LEVEL_mx_ao = {
.pd = { .name = "mx_ao", },
.peer = &SMPA7_LEVEL_mx,
.active_only = true,
.res_type = RPMPD_SMPA,
.res_id = 7,
.key = KEY_LEVEL,
};
static struct rpmpd LDOA12_mx_vfl = {
.pd = { .name = "mx_vfl", },
.res_type = RPMPD_LDOA,
.res_id = 12,
.key = KEY_FLOOR_LEVEL,
};
static struct rpmpd RWMX0_mx_vfl = {
.pd = { .name = "mx_vfl", },
.res_type = RPMPD_RWMX,
.res_id = 0,
.key = KEY_FLOOR_LEVEL,
};
static struct rpmpd RWSM6_mx_vfl = {
.pd = { .name = "mx_vfl", },
.res_type = RPMPD_RWSM,
.res_id = 6,
.key = KEY_FLOOR_LEVEL,
};
/* MD */
static struct rpmpd SMPA1_CORNER_md_ao;
static struct rpmpd SMPA1_CORNER_md = {
.pd = { .name = "md", },
.peer = &SMPA1_CORNER_md_ao,
.res_type = RPMPD_SMPA,
.res_id = 1,
.key = KEY_CORNER,
};
static struct rpmpd SMPA1_CORNER_md_ao = {
.pd = { .name = "md_ao", },
.peer = &SMPA1_CORNER_md,
.active_only = true,
.res_type = RPMPD_SMPA,
.res_id = 1,
.key = KEY_CORNER,
};
static struct rpmpd SMPA1_LEVEL_md_ao;
static struct rpmpd SMPA1_LEVEL_md = {
.pd = { .name = "md", },
.peer = &SMPA1_LEVEL_md_ao,
.res_type = RPMPD_SMPA,
.res_id = 1,
.key = KEY_LEVEL,
};
static struct rpmpd SMPA1_LEVEL_md_ao = {
.pd = { .name = "md_ao", },
.peer = &SMPA1_LEVEL_md,
.active_only = true,
.res_type = RPMPD_SMPA,
.res_id = 1,
.key = KEY_LEVEL,
};
static struct rpmpd SMPA1_md_vfc = {
.pd = { .name = "md_vfc", },
.res_type = RPMPD_SMPA,
.res_id = 1,
.key = KEY_FLOOR_CORNER,
};
/* LPI_CX */
static struct rpmpd RWLC0_lpi_cx_lvl = {
.pd = { .name = "lpi_cx", },
.res_type = RPMPD_RWLC,
.res_id = 0,
.key = KEY_LEVEL,
};
static struct rpmpd RWLC0_lpicx_vfl = {
.pd = { .name = "lpicx_vfl", },
.res_type = RPMPD_RWLC,
.res_id = 0,
.key = KEY_FLOOR_LEVEL,
};
/* LPI_MX */
static struct rpmpd RWLM0_lpi_mx_lvl = {
.pd = { .name = "lpi_mx", },
.res_type = RPMPD_RWLM,
.res_id = 0,
.key = KEY_LEVEL,
};
static struct rpmpd RWLM0_lpimx_vfl = {
.pd = { .name = "lpimx_vfl", },
.res_type = RPMPD_RWLM,
.res_id = 0,
.key = KEY_FLOOR_LEVEL,
};
/* SSC_CX */
static struct rpmpd LDOA26_sscx_corner = {
.pd = { .name = "sscx", },
.res_type = RPMPD_LDOA,
.res_id = 26,
.key = KEY_CORNER,
};
static struct rpmpd RWLC0_ssccx_lvl = {
.pd = { .name = "ssccx", },
.res_type = RPMPD_RWLC,
.res_id = 0,
.key = KEY_LEVEL,
};
static struct rpmpd RWSC0_ssccx_lvl = {
.pd = { .name = "ssccx", },
.res_type = RPMPD_RWSC,
.res_id = 0,
.key = KEY_LEVEL,
};
static struct rpmpd LDOA26_sscx_vfc = {
.pd = { .name = "sscx_vfc", },
.res_type = RPMPD_LDOA,
.res_id = 26,
.key = KEY_FLOOR_CORNER,
};
static struct rpmpd RWLC0_ssccx_vfl = {
.pd = { .name = "ssccx_vfl", },
.res_type = RPMPD_RWLC,
.res_id = 0,
.key = KEY_FLOOR_LEVEL,
};
static struct rpmpd RWSC0_ssccx_vfl = {
.pd = { .name = "ssccx_vfl", },
.res_type = RPMPD_RWSC,
.res_id = 0,
.key = KEY_FLOOR_LEVEL,
};
/* SSC_MX */
static struct rpmpd RWLM0_sscmx_lvl = {
.pd = { .name = "sscmx", },
.res_type = RPMPD_RWLM,
.res_id = 0,
.key = KEY_LEVEL,
};
static struct rpmpd RWSM0_sscmx_lvl = {
.pd = { .name = "sscmx", },
.res_type = RPMPD_RWSM,
.res_id = 0,
.key = KEY_LEVEL,
};
static struct rpmpd RWLM0_sscmx_vfl = {
.pd = { .name = "sscmx_vfl", },
.res_type = RPMPD_RWLM,
.res_id = 0,
.key = KEY_FLOOR_LEVEL,
};
static struct rpmpd RWSM0_sscmx_vfl = {
.pd = { .name = "sscmx_vfl", },
.res_type = RPMPD_RWSM,
.res_id = 0,
.key = KEY_FLOOR_LEVEL,
};
/* mdm9607 RPM Power Domains */
static struct rpmpd *mdm9607_rpmpds[] = {