From 3855507210ecc6e073e3d048f52f2f5c42a46654 Mon Sep 17 00:00:00 2001 From: Noe Galea-Sevilla Date: Thu, 14 Nov 2024 14:43:56 +0000 Subject: [PATCH 1/2] tc4: Simplify enum names Some enum names have redundant prefixes. This commit simplifies enum names. Signed-off-by: Noe Galea-Sevilla --- product/totalcompute/tc4/include/clock_soc.h | 6 +++--- product/totalcompute/tc4/scp_css/config_clock.c | 6 +++--- product/totalcompute/tc4/scp_css/config_dvfs.c | 6 +++--- product/totalcompute/tc4/scp_css/config_gtimer.c | 2 +- product/totalcompute/tc4/scp_css/config_sds.c | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/product/totalcompute/tc4/include/clock_soc.h b/product/totalcompute/tc4/include/clock_soc.h index 7cb6897e9..7e74999be 100644 --- a/product/totalcompute/tc4/include/clock_soc.h +++ b/product/totalcompute/tc4/include/clock_soc.h @@ -88,9 +88,9 @@ enum clock_css_idx { * Clock indexes. */ enum clock_idx { - CLOCK_IDX_CPU_GROUP_GROUP_LITTLE, - CLOCK_IDX_CPU_GROUP_GROUP_MID, - CLOCK_IDX_CPU_GROUP_GROUP_BIG, + CLOCK_IDX_CPU_GROUP_LITTLE, + CLOCK_IDX_CPU_GROUP_MID, + CLOCK_IDX_CPU_GROUP_BIG, CLOCK_IDX_DPU, CLOCK_IDX_PIXEL_0, CLOCK_IDX_PIXEL_1, diff --git a/product/totalcompute/tc4/scp_css/config_clock.c b/product/totalcompute/tc4/scp_css/config_clock.c index 0254fdbbf..3618130bc 100644 --- a/product/totalcompute/tc4/scp_css/config_clock.c +++ b/product/totalcompute/tc4/scp_css/config_clock.c @@ -20,7 +20,7 @@ #include static const struct fwk_element clock_dev_desc_table[CLOCK_IDX_COUNT + 1] = { - [CLOCK_IDX_CPU_GROUP_GROUP_LITTLE] = + [CLOCK_IDX_CPU_GROUP_LITTLE] = { .name = "CPU_GROUP_" TC4_GROUP_LITTLE_NAME, .data = &((struct mod_clock_dev_config){ @@ -32,7 +32,7 @@ static const struct fwk_element clock_dev_desc_table[CLOCK_IDX_COUNT + 1] = { MOD_CSS_CLOCK_API_TYPE_CLOCK), }), }, - [CLOCK_IDX_CPU_GROUP_GROUP_MID] = + [CLOCK_IDX_CPU_GROUP_MID] = { .name = "CPU_GROUP_" TC4_GROUP_MID_NAME, .data = &((struct mod_clock_dev_config){ @@ -44,7 +44,7 @@ static const struct fwk_element clock_dev_desc_table[CLOCK_IDX_COUNT + 1] = { MOD_CSS_CLOCK_API_TYPE_CLOCK), }), }, - [CLOCK_IDX_CPU_GROUP_GROUP_BIG] = + [CLOCK_IDX_CPU_GROUP_BIG] = { .name = "CPU_GROUP_" TC4_GROUP_BIG_NAME, .data = &((struct mod_clock_dev_config){ diff --git a/product/totalcompute/tc4/scp_css/config_dvfs.c b/product/totalcompute/tc4/scp_css/config_dvfs.c index 95446dfe6..908cb91b7 100644 --- a/product/totalcompute/tc4/scp_css/config_dvfs.c +++ b/product/totalcompute/tc4/scp_css/config_dvfs.c @@ -167,7 +167,7 @@ static const struct mod_dvfs_domain_config cpu_group_little = { FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PSU, PSU_ELEMENT_IDX_GROUP_LITTLE), .clock_id = FWK_ID_ELEMENT_INIT( FWK_MODULE_IDX_CLOCK, - CLOCK_IDX_CPU_GROUP_GROUP_LITTLE), + CLOCK_IDX_CPU_GROUP_LITTLE), .alarm_id = FWK_ID_SUB_ELEMENT_INIT( FWK_MODULE_IDX_TIMER, 0, @@ -183,7 +183,7 @@ static const struct mod_dvfs_domain_config cpu_group_mid = { FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PSU, PSU_ELEMENT_IDX_GROUP_MID), .clock_id = FWK_ID_ELEMENT_INIT( FWK_MODULE_IDX_CLOCK, - CLOCK_IDX_CPU_GROUP_GROUP_MID), + CLOCK_IDX_CPU_GROUP_MID), .alarm_id = FWK_ID_SUB_ELEMENT_INIT( FWK_MODULE_IDX_TIMER, 0, @@ -199,7 +199,7 @@ static const struct mod_dvfs_domain_config cpu_group_big = { FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PSU, PSU_ELEMENT_IDX_GROUP_BIG), .clock_id = FWK_ID_ELEMENT_INIT( FWK_MODULE_IDX_CLOCK, - CLOCK_IDX_CPU_GROUP_GROUP_BIG), + CLOCK_IDX_CPU_GROUP_BIG), .alarm_id = FWK_ID_SUB_ELEMENT_INIT( FWK_MODULE_IDX_TIMER, 0, diff --git a/product/totalcompute/tc4/scp_css/config_gtimer.c b/product/totalcompute/tc4/scp_css/config_gtimer.c index 017807973..f4d4faacf 100644 --- a/product/totalcompute/tc4/scp_css/config_gtimer.c +++ b/product/totalcompute/tc4/scp_css/config_gtimer.c @@ -28,7 +28,7 @@ static const struct fwk_element gtimer_dev_table[2] = { .frequency = CLOCK_RATE_GTCLK, .clock_id = FWK_ID_ELEMENT_INIT( FWK_MODULE_IDX_CLOCK, - CLOCK_IDX_CPU_GROUP_GROUP_LITTLE), + CLOCK_IDX_CPU_GROUP_LITTLE), }), }, [1] = { 0 }, diff --git a/product/totalcompute/tc4/scp_css/config_sds.c b/product/totalcompute/tc4/scp_css/config_sds.c index 99df859e4..ad16c548e 100644 --- a/product/totalcompute/tc4/scp_css/config_sds.c +++ b/product/totalcompute/tc4/scp_css/config_sds.c @@ -41,7 +41,7 @@ const struct mod_sds_config sds_module_config = { .region_count = TC_SDS_REGION_COUNT, .clock_id = FWK_ID_ELEMENT_INIT( FWK_MODULE_IDX_CLOCK, - CLOCK_IDX_CPU_GROUP_GROUP_LITTLE) + CLOCK_IDX_CPU_GROUP_LITTLE) }; static struct fwk_element sds_element_table[3] = { -- GitLab From e497fe0e93c3c8bf14338e054658d94725923c61 Mon Sep 17 00:00:00 2001 From: Noe Galea-Sevilla Date: Tue, 19 Nov 2024 20:34:18 +0000 Subject: [PATCH 2/2] tc4: Set core names Generic names are used instead of the core names. This commit replaces generic core names by those present in TC4. Signed-off-by: Noe Galea-Sevilla --- product/totalcompute/tc4/include/tc4_core.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/product/totalcompute/tc4/include/tc4_core.h b/product/totalcompute/tc4/include/tc4_core.h index e55eeb0a1..b253dd8ae 100644 --- a/product/totalcompute/tc4/include/tc4_core.h +++ b/product/totalcompute/tc4/include/tc4_core.h @@ -10,9 +10,9 @@ #include -#define TC4_GROUP_LITTLE_NAME "GROUP_LITTLE" -#define TC4_GROUP_MID_NAME "GROUP_MID" -#define TC4_GROUP_BIG_NAME "GROUP_BIG" +#define TC4_GROUP_LITTLE_NAME "NEVIS" +#define TC4_GROUP_MID_NAME "GELAS" +#define TC4_GROUP_BIG_NAME "TRAVIS" #define TC4_CORES_PER_CLUSTER (8) #define TC4_CMES_PER_CLUSTER (2) -- GitLab