From 4edd49f804209dd66968ff9ed504bf38183b3302 Mon Sep 17 00:00:00 2001 From: Tarek El-Sherbiny Date: Thu, 31 Oct 2019 13:32:30 +0000 Subject: [PATCH 1/6] modules: Remove calls to fwk_module_check_call This change is to reduce memory footprint. Change-Id: I1d10681b3cdf28520b45a698ed607cca4df39b65 Signed-off-by: Tarek El-Sherbiny --- module/clock/src/mod_clock.c | 6 -- module/cmn600/src/mod_cmn600.c | 41 +----------- module/css_clock/src/mod_css_clock.c | 40 ------------ module/ddr_phy500/src/mod_ddr_phy500.c | 3 - module/dvfs/src/mod_dvfs_module.c | 3 - module/dw_apb_i2c/src/mod_dw_apb_i2c.c | 6 -- module/gtimer/src/mod_gtimer.c | 29 --------- module/i2c/src/mod_i2c.c | 25 ++------ module/log/src/mod_log.c | 6 -- module/mhu/src/mod_mhu.c | 4 -- module/mhu2/src/mod_mhu2.c | 5 -- module/mock_psu/src/mod_mock_psu.c | 24 +------ module/mock_sensor/src/mod_mock_sensor.c | 10 --- module/pik_clock/src/mod_pik_clock.c | 54 +--------------- module/pl011/src/mod_pl011.c | 10 --- module/power_domain/src/mod_power_domain.c | 63 +------------------ module/ppu_v0/src/mod_ppu_v0.c | 13 ---- module/ppu_v1/src/mod_ppu_v1.c | 35 ----------- module/psu/src/mod_psu.c | 25 +------- module/reg_sensor/src/mod_reg_sensor.c | 11 ---- module/scmi/src/mod_scmi.c | 28 +-------- module/scmi_apcore/src/mod_scmi_apcore.c | 10 --- module/scmi_clock/src/mod_scmi_clock.c | 11 ---- module/scmi_perf/src/mod_scmi_perf.c | 11 ---- .../src/mod_scmi_power_domain.c | 11 ---- module/scmi_sensor/src/mod_scmi_sensor.c | 11 ---- .../src/mod_scmi_system_power.c | 10 --- module/sds/src/mod_sds.c | 15 ----- module/sensor/src/mod_sensor.c | 6 -- module/smt/src/mod_smt.c | 48 -------------- module/system_pll/src/mod_system_pll.c | 10 --- module/system_power/src/mod_system_power.c | 15 ----- module/timer/src/mod_timer.c | 43 +------------ 33 files changed, 20 insertions(+), 622 deletions(-) diff --git a/module/clock/src/mod_clock.c b/module/clock/src/mod_clock.c index 0acfb0673..b8abdde06 100644 --- a/module/clock/src/mod_clock.c +++ b/module/clock/src/mod_clock.c @@ -120,14 +120,8 @@ static int create_async_request(struct clock_dev_ctx *ctx, fwk_id_t clock_id) static int get_ctx(fwk_id_t clock_id, struct clock_dev_ctx **ctx) { - int status; - fwk_assert(fwk_module_is_valid_element_id(clock_id)); - status = fwk_module_check_call(clock_id); - if (status != FWK_SUCCESS) - return status; - *ctx = &module_ctx.dev_ctx_table[fwk_id_get_element_idx(clock_id)]; return FWK_SUCCESS; diff --git a/module/cmn600/src/mod_cmn600.c b/module/cmn600/src/mod_cmn600.c index 05db6daae..f153262a9 100644 --- a/module/cmn600/src/mod_cmn600.c +++ b/module/cmn600/src/mod_cmn600.c @@ -495,13 +495,8 @@ static int cmn600_setup(void) static int cmn600_setup_rnsam(unsigned int node_id) { - int status; unsigned int node_idx; - status = fwk_module_check_call(FWK_ID_MODULE(FWK_MODULE_IDX_CMN600)); - if (status != FWK_SUCCESS) - return status; - for (node_idx = 0; node_idx < ctx->external_rnsam_count; node_idx++) { if (ctx->external_rnsam_table[node_idx].node_id == node_id) { cmn600_setup_sam(ctx->external_rnsam_table[node_idx].node); @@ -533,11 +528,6 @@ static const struct mod_ppu_v1_power_state_observer_api cmn600_observer_api = { static int cmn600_ccix_config_get( struct mod_cmn600_ccix_host_node_config *config) { - int status; - status = fwk_module_check_call(fwk_module_id_cmn600); - if (status != FWK_SUCCESS) - return status; - if (ctx->internal_rnsam_count == 0) return FWK_E_DATA; @@ -557,9 +547,6 @@ static int cmn600_ccix_config_set( unsigned int i; int status; - status = fwk_module_check_call(fwk_module_id_cmn600); - if (status != FWK_SUCCESS) - return status; status = ccix_setup(ctx, config); if (status != FWK_SUCCESS) @@ -574,39 +561,17 @@ static int cmn600_ccix_config_set( static int cmn600_ccix_exchange_protocol_credit(uint8_t link_id) { - int status; - - status = fwk_module_check_call(fwk_module_id_cmn600); - if (status != FWK_SUCCESS) - return status; - - status = ccix_exchange_protocol_credit(ctx, link_id); - return status; + return ccix_exchange_protocol_credit(ctx, link_id); } static int cmn600_ccix_enter_system_coherency(uint8_t link_id) { - int status; - - status = fwk_module_check_call(fwk_module_id_cmn600); - if (status != FWK_SUCCESS) - return status; - - status = ccix_enter_system_coherency(ctx, link_id); - return status; + return ccix_enter_system_coherency(ctx, link_id); } static int cmn600_ccix_enter_dvm_domain(uint8_t link_id) { - int status; - - status = fwk_module_check_call(fwk_module_id_cmn600); - if (status != FWK_SUCCESS) - return status; - - status = ccix_enter_dvm_domain(ctx, link_id); - return status; - + return ccix_enter_dvm_domain(ctx, link_id); } static const struct mod_cmn600_ccix_config_api cmn600_ccix_config_api = { diff --git a/module/css_clock/src/mod_css_clock.c b/module/css_clock/src/mod_css_clock.c index be8459de7..54001d409 100644 --- a/module/css_clock/src/mod_css_clock.c +++ b/module/css_clock/src/mod_css_clock.c @@ -166,13 +166,8 @@ exit: static int css_clock_set_rate(fwk_id_t dev_id, uint64_t rate, enum mod_clock_round_mode round_mode) { - int status; struct css_clock_dev_ctx *ctx; - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; - ctx = module_ctx.dev_ctx_table + fwk_id_get_element_idx(dev_id); if (ctx->config->clock_type == MOD_CSS_CLOCK_TYPE_INDEXED) @@ -183,13 +178,8 @@ static int css_clock_set_rate(fwk_id_t dev_id, uint64_t rate, static int css_clock_get_rate(fwk_id_t dev_id, uint64_t *rate) { - int status; struct css_clock_dev_ctx *ctx; - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; - ctx = module_ctx.dev_ctx_table + fwk_id_get_element_idx(dev_id); *rate = ctx->current_rate; @@ -200,13 +190,8 @@ static int css_clock_get_rate_from_index(fwk_id_t dev_id, unsigned int rate_index, uint64_t *rate) { - int status; struct css_clock_dev_ctx *ctx; - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; - if (rate == NULL) return FWK_E_PARAM; @@ -224,12 +209,6 @@ static int css_clock_get_rate_from_index(fwk_id_t dev_id, static int css_clock_set_state(fwk_id_t dev_id, enum mod_clock_state state) { - int status; - - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; - if (state == MOD_CLOCK_STATE_RUNNING) return FWK_SUCCESS; /* CSS clocks are always running */ @@ -239,12 +218,6 @@ static int css_clock_set_state(fwk_id_t dev_id, enum mod_clock_state state) static int css_clock_get_state(fwk_id_t dev_id, enum mod_clock_state *state) { - int status; - - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; - *state = MOD_CLOCK_STATE_RUNNING; return FWK_SUCCESS; @@ -252,13 +225,8 @@ static int css_clock_get_state(fwk_id_t dev_id, enum mod_clock_state *state) static int css_clock_get_range(fwk_id_t dev_id, struct mod_clock_range *range) { - int status; struct css_clock_dev_ctx *ctx; - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; - if (range == NULL) return FWK_E_PARAM; @@ -283,10 +251,6 @@ static int css_clock_power_state_change( struct css_clock_dev_ctx *ctx; const struct mod_css_clock_dev_config *dev_config; - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; - ctx = module_ctx.dev_ctx_table + fwk_id_get_element_idx(dev_id); dev_config = ctx->config; @@ -329,10 +293,6 @@ static int css_clock_pending_power_state_change( struct css_clock_dev_ctx *ctx; const struct mod_css_clock_dev_config *dev_config; - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; - ctx = module_ctx.dev_ctx_table + fwk_id_get_element_idx(dev_id); dev_config = ctx->config; diff --git a/module/ddr_phy500/src/mod_ddr_phy500.c b/module/ddr_phy500/src/mod_ddr_phy500.c index ddb9ecb1c..230b59536 100644 --- a/module/ddr_phy500/src/mod_ddr_phy500.c +++ b/module/ddr_phy500/src/mod_ddr_phy500.c @@ -36,9 +36,6 @@ static int ddr_phy500_config(fwk_id_t element_id) const struct mod_ddr_phy500_module_config *module_config; const struct mod_ddr_phy500_element_config *element_config; - status = fwk_module_check_call(element_id); - if (status != FWK_SUCCESS) - return status; module_config = fwk_module_get_data(fwk_module_id_ddr_phy500); diff --git a/module/dvfs/src/mod_dvfs_module.c b/module/dvfs/src/mod_dvfs_module.c index f23fabbbb..e2de6a60b 100644 --- a/module/dvfs/src/mod_dvfs_module.c +++ b/module/dvfs/src/mod_dvfs_module.c @@ -216,9 +216,6 @@ static int dvfs_process_notification( struct mod_dvfs_domain_ctx *__mod_dvfs_get_valid_domain_ctx(fwk_id_t domain_id) { - if (fwk_module_check_call(domain_id) != FWK_SUCCESS) - return NULL; - return get_domain_ctx(domain_id); } diff --git a/module/dw_apb_i2c/src/mod_dw_apb_i2c.c b/module/dw_apb_i2c/src/mod_dw_apb_i2c.c index 506d37bbe..299d7e940 100644 --- a/module/dw_apb_i2c/src/mod_dw_apb_i2c.c +++ b/module/dw_apb_i2c/src/mod_dw_apb_i2c.c @@ -137,9 +137,6 @@ static int transmit_as_master(fwk_id_t dev_id, unsigned int sent_bytes; struct dw_apb_i2c_ctx *ctx; - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; if (transmit_request->transmit_byte_count > I2C_TRANSMIT_BUFFER_LENGTH) return FWK_E_SUPPORT; @@ -178,9 +175,6 @@ static int receive_as_master(fwk_id_t dev_id, unsigned int i; struct dw_apb_i2c_ctx *ctx; - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; if (receive_request->receive_byte_count > I2C_RECEIVE_BUFFER_LENGTH) return FWK_E_SUPPORT; diff --git a/module/gtimer/src/mod_gtimer.c b/module/gtimer/src/mod_gtimer.c index e4be1d4ad..edd70dfb3 100644 --- a/module/gtimer/src/mod_gtimer.c +++ b/module/gtimer/src/mod_gtimer.c @@ -41,11 +41,6 @@ static struct dev_ctx *ctx_table; static int enable(fwk_id_t dev_id) { struct dev_ctx *ctx; - int status; - - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; ctx = ctx_table + fwk_id_get_element_idx(dev_id); @@ -58,11 +53,6 @@ static int enable(fwk_id_t dev_id) static int disable(fwk_id_t dev_id) { struct dev_ctx *ctx; - int status; - - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; ctx = ctx_table + fwk_id_get_element_idx(dev_id); @@ -75,14 +65,9 @@ static int disable(fwk_id_t dev_id) static int get_counter(fwk_id_t dev_id, uint64_t *value) { const struct dev_ctx *ctx; - int status; uint32_t counter_low; uint32_t counter_high; - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; - ctx = ctx_table + fwk_id_get_element_idx(dev_id); /* @@ -107,10 +92,6 @@ static int set_timer(fwk_id_t dev_id, uint64_t timestamp) uint64_t counter; int status; - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; - status = get_counter(dev_id, &counter); if (status != FWK_SUCCESS) return status; @@ -137,14 +118,9 @@ static int set_timer(fwk_id_t dev_id, uint64_t timestamp) static int get_timer(fwk_id_t dev_id, uint64_t *timestamp) { struct dev_ctx *ctx; - int status; uint32_t counter_low; uint32_t counter_high; - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; - ctx = ctx_table + fwk_id_get_element_idx(dev_id); /* Read 64-bit timer value */ @@ -158,16 +134,11 @@ static int get_timer(fwk_id_t dev_id, uint64_t *timestamp) static int get_frequency(fwk_id_t dev_id, uint32_t *frequency) { - int status; struct dev_ctx *ctx; if (frequency == NULL) return FWK_E_PARAM; - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; - ctx = ctx_table + fwk_id_get_element_idx(dev_id); *frequency = ctx->config->frequency; diff --git a/module/i2c/src/mod_i2c.c b/module/i2c/src/mod_i2c.c index 63f23291b..c3ddc784c 100644 --- a/module/i2c/src/mod_i2c.c +++ b/module/i2c/src/mod_i2c.c @@ -44,17 +44,11 @@ static const fwk_id_t mod_i2c_event_id_request_completed = FWK_ID_EVENT_INIT( /* * Static helpers */ -static int get_ctx(fwk_id_t id, struct mod_i2c_dev_ctx **ctx) +static void get_ctx(fwk_id_t id, struct mod_i2c_dev_ctx **ctx) { - int status; - - status = fwk_module_check_call(id); - if (status != FWK_SUCCESS) - return FWK_E_PARAM; + fwk_assert(fwk_module_is_valid_element_id(id)); *ctx = ctx_table + fwk_id_get_element_idx(id); - - return FWK_SUCCESS; } static int create_i2c_request(fwk_id_t dev_id, @@ -66,11 +60,7 @@ static int create_i2c_request(fwk_id_t dev_id, struct mod_i2c_request *event_param = (struct mod_i2c_request *)event.params; - fwk_assert(fwk_module_is_valid_element_id(dev_id)); - - status = get_ctx(dev_id, &ctx); - if (status != FWK_SUCCESS) - return status; + get_ctx(dev_id, &ctx); /* The slave address should be on 7 bits */ if (!fwk_expect(request->slave_address < 0x80)) @@ -343,17 +333,14 @@ static int respond_to_caller(int event_status, static int mod_i2c_process_event(const struct fwk_event *event, struct fwk_event *resp_event) { - int status, drv_status; + int status = FWK_E_PARAM; + int drv_status; struct mod_i2c_dev_ctx *ctx; struct mod_i2c_event_param *event_param = (struct mod_i2c_event_param *)event->params; struct mod_i2c_request *request = (struct mod_i2c_request *)event->params; - fwk_assert(fwk_module_is_valid_element_id(event->target_id)); - - status = get_ctx(event->target_id, &ctx); - if (status != FWK_SUCCESS) - return status; + get_ctx(event->target_id, &ctx); switch (fwk_id_get_event_idx(event->id)) { case MOD_I2C_EVENT_IDX_REQUEST_TRANSMIT: diff --git a/module/log/src/mod_log.c b/module/log/src/mod_log.c index 60bd74bda..2c14a7f60 100644 --- a/module/log/src/mod_log.c +++ b/module/log/src/mod_log.c @@ -218,9 +218,6 @@ static int do_log(enum mod_log_group group, const char *fmt, ...) if (log_driver == NULL) return FWK_E_STATE; - status = fwk_module_check_call(FWK_ID_MODULE(FWK_MODULE_IDX_LOG)); - if (status != FWK_SUCCESS) - return status; if (!is_valid_group(group)) return FWK_E_PARAM; @@ -248,9 +245,6 @@ static int do_flush(void) if (log_driver == NULL) return FWK_E_STATE; - status = fwk_module_check_call(FWK_ID_MODULE(FWK_MODULE_IDX_LOG)); - if (status != FWK_SUCCESS) - return status; status = log_driver->flush(log_config->device_id); if (status != FWK_SUCCESS) diff --git a/module/mhu/src/mod_mhu.c b/module/mhu/src/mod_mhu.c index 3e4169eba..4666161de 100644 --- a/module/mhu/src/mod_mhu.c +++ b/module/mhu/src/mod_mhu.c @@ -107,14 +107,10 @@ static void mhu_isr(void) static int raise_interrupt(fwk_id_t slot_id) { - int status; struct mhu_device_ctx *device_ctx; unsigned int slot; struct mhu_reg *reg; - status = fwk_module_check_call(slot_id); - if (status != FWK_SUCCESS) - return status; device_ctx = &mhu_ctx.device_ctx_table[fwk_id_get_element_idx(slot_id)]; slot = fwk_id_get_sub_element_idx(slot_id); diff --git a/module/mhu2/src/mod_mhu2.c b/module/mhu2/src/mod_mhu2.c index b74037081..7e025a6ca 100644 --- a/module/mhu2/src/mod_mhu2.c +++ b/module/mhu2/src/mod_mhu2.c @@ -90,15 +90,10 @@ static void mhu2_isr(uintptr_t ctx_param) static int raise_interrupt(fwk_id_t slot_id) { - int status; unsigned int slot; struct mhu2_channel_ctx *channel_ctx; struct mhu2_send_reg *send; - status = fwk_module_check_call(slot_id); - if (status != FWK_SUCCESS) - return status; - channel_ctx = &ctx.channel_ctx_table[fwk_id_get_element_idx(slot_id)]; slot = fwk_id_get_sub_element_idx(slot_id); send = channel_ctx->send; diff --git a/module/mock_psu/src/mod_mock_psu.c b/module/mock_psu/src/mod_mock_psu.c index 09c041e0d..b43b98f2f 100644 --- a/module/mock_psu/src/mod_mock_psu.c +++ b/module/mock_psu/src/mod_mock_psu.c @@ -60,31 +60,14 @@ static struct mod_mock_psu_element_ctx *mod_mock_psu_get_ctx( return &mod_mock_psu_ctx.elements[element_idx]; } -static int mod_mock_psu_check_call(fwk_id_t element_id) -{ - int status = FWK_E_PARAM; - - if (fwk_id_get_module_idx(element_id) != FWK_MODULE_IDX_MOCK_PSU) - goto exit; - - status = fwk_module_check_call(element_id); - if (status != FWK_SUCCESS) - status = FWK_E_STATE; - -exit: - return status; -} static int mod_mock_psu_get_cfg_ctx( fwk_id_t element_id, const struct mod_mock_psu_element_cfg **cfg, struct mod_mock_psu_element_ctx **ctx) { - int status; - - status = mod_mock_psu_check_call(element_id); - if (status != FWK_SUCCESS) - goto exit; + if (fwk_id_get_module_idx(element_id) != FWK_MODULE_IDX_MOCK_PSU) + return FWK_E_PARAM; if (ctx != NULL) *ctx = mod_mock_psu_get_ctx(element_id); @@ -92,8 +75,7 @@ static int mod_mock_psu_get_cfg_ctx( if (cfg != NULL) *cfg = fwk_module_get_data(element_id); -exit: - return status; + return FWK_SUCCESS; } static void mod_mock_psu_alarm_callback(uintptr_t element_idx) diff --git a/module/mock_sensor/src/mod_mock_sensor.c b/module/mock_sensor/src/mod_mock_sensor.c index bbd72f424..3a1b65b68 100644 --- a/module/mock_sensor/src/mod_mock_sensor.c +++ b/module/mock_sensor/src/mod_mock_sensor.c @@ -39,14 +39,9 @@ static void mock_sensor_callback(uintptr_t param) static int get_value(fwk_id_t id, uint64_t *value) { - int status; unsigned int sensor_hal_idx; const struct mod_mock_sensor_dev_config *config; - status = fwk_module_check_call(id); - if (status != FWK_SUCCESS) - return status; - config = fwk_module_get_data(id); sensor_hal_idx = fwk_id_get_element_idx(config->sensor_hal_id); @@ -64,13 +59,8 @@ static int get_value(fwk_id_t id, uint64_t *value) static int get_info(fwk_id_t id, struct mod_sensor_info *info) { - int status; const struct mod_mock_sensor_dev_config *config; - status = fwk_module_check_call(id); - if (status != FWK_SUCCESS) - return status; - config = fwk_module_get_data(id); if ((info == NULL) || (config == NULL)) diff --git a/module/pik_clock/src/mod_pik_clock.c b/module/pik_clock/src/mod_pik_clock.c index 9f7a1e8f8..17689c878 100644 --- a/module/pik_clock/src/mod_pik_clock.c +++ b/module/pik_clock/src/mod_pik_clock.c @@ -337,13 +337,8 @@ exit: static int pik_clock_set_rate(fwk_id_t dev_id, uint64_t rate, enum mod_clock_round_mode round_mode) { - int status; struct pik_clock_dev_ctx *ctx; - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; - ctx = module_ctx.dev_ctx_table + fwk_id_get_element_idx(dev_id); if (!ctx->initialized) @@ -357,13 +352,8 @@ static int pik_clock_set_rate(fwk_id_t dev_id, uint64_t rate, static int pik_clock_get_rate(fwk_id_t dev_id, uint64_t *rate) { - int status; struct pik_clock_dev_ctx *ctx; - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; - if (rate == NULL) return FWK_E_PARAM; @@ -383,13 +373,8 @@ static int pik_clock_get_rate_from_index(fwk_id_t dev_id, unsigned int rate_index, uint64_t *rate) { - int status; struct pik_clock_dev_ctx *ctx; - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; - if (rate == NULL) return FWK_E_PARAM; @@ -410,9 +395,6 @@ static int pik_clock_set_state( struct pik_clock_dev_ctx *ctx; struct mod_pik_clock_rate *rate_entry; - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; ctx = module_ctx.dev_ctx_table + fwk_id_get_element_idx(dev_id); @@ -435,7 +417,7 @@ static int pik_clock_set_state( status = msclock_set_source(ctx, MOD_PIK_CLOCK_MSCLOCK_SOURCE_GATED, false); if (status == FWK_SUCCESS) - ctx->current_source = MOD_PIK_CLOCK_MSCLOCK_SOURCE_GATED; + ctx->current_source = MOD_PIK_CLOCK_MSCLOCK_SOURCE_GATED; return status; } else { @@ -454,13 +436,8 @@ static int pik_clock_set_state( static int pik_clock_get_state(fwk_id_t dev_id, enum mod_clock_state *state) { - int status; struct pik_clock_dev_ctx *ctx; - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; - ctx = module_ctx.dev_ctx_table + fwk_id_get_element_idx(dev_id); if (ctx->config->type == MOD_PIK_CLOCK_TYPE_SINGLE_SOURCE) { @@ -486,13 +463,8 @@ static int pik_clock_get_state(fwk_id_t dev_id, enum mod_clock_state *state) static int pik_clock_get_range(fwk_id_t dev_id, struct mod_clock_range *range) { - int status; struct pik_clock_dev_ctx *ctx; - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; - if (range == NULL) return FWK_E_PARAM; @@ -510,13 +482,8 @@ static int pik_clock_power_state_change( fwk_id_t dev_id, unsigned int state) { - int status; struct pik_clock_dev_ctx *ctx; - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; - ctx = module_ctx.dev_ctx_table + fwk_id_get_element_idx(dev_id); if (ctx->config->is_group_member) @@ -561,10 +528,6 @@ static int pik_clock_direct_set_div(fwk_id_t clock_id, uint32_t divider_type, int status; struct pik_clock_dev_ctx *ctx; - status = fwk_module_check_call(clock_id); - if (status != FWK_SUCCESS) - return status; - ctx = module_ctx.dev_ctx_table + fwk_id_get_element_idx(clock_id); assert(ctx->config->is_group_member); @@ -589,13 +552,8 @@ static int pik_clock_direct_set_div(fwk_id_t clock_id, uint32_t divider_type, static int pik_clock_direct_set_source(fwk_id_t clock_id, uint8_t source) { - int status; struct pik_clock_dev_ctx *ctx; - status = fwk_module_check_call(clock_id); - if (status != FWK_SUCCESS) - return status; - ctx = module_ctx.dev_ctx_table + fwk_id_get_element_idx(clock_id); assert(ctx->config->is_group_member); @@ -608,13 +566,8 @@ static int pik_clock_direct_set_source(fwk_id_t clock_id, uint8_t source) static int pik_clock_direct_set_mod(fwk_id_t clock_id, uint32_t numerator, uint32_t denominator) { - int status; struct pik_clock_dev_ctx *ctx; - status = fwk_module_check_call(clock_id); - if (status != FWK_SUCCESS) - return status; - ctx = module_ctx.dev_ctx_table + fwk_id_get_element_idx(clock_id); assert(ctx->config->is_group_member); @@ -628,13 +581,8 @@ static int pik_clock_direct_power_state_change( fwk_id_t dev_id, unsigned int state) { - int status; struct pik_clock_dev_ctx *ctx; - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; - ctx = module_ctx.dev_ctx_table + fwk_id_get_element_idx(dev_id); if (!ctx->config->is_group_member) diff --git a/module/pl011/src/mod_pl011.c b/module/pl011/src/mod_pl011.c index 837a20290..794fe0ef0 100644 --- a/module/pl011/src/mod_pl011.c +++ b/module/pl011/src/mod_pl011.c @@ -88,13 +88,8 @@ static int set_baud_rate(unsigned int baud_rate_bps, uint64_t clock_rate_hz, static int do_putchar(fwk_id_t device_id, char c) { - int status; struct pl011_reg *reg; - status = fwk_module_check_call(device_id); - if (status != FWK_SUCCESS) - return status; - reg = get_device_reg(device_id); while (reg->FR & PL011_FR_TXFF) @@ -107,13 +102,8 @@ static int do_putchar(fwk_id_t device_id, char c) static int do_flush(fwk_id_t device_id) { - int status; struct pl011_reg *reg; - status = fwk_module_check_call(device_id); - if (status != FWK_SUCCESS) - return status; - reg = get_device_reg(device_id); while (reg->FR & PL011_FR_BUSY) diff --git a/module/power_domain/src/mod_power_domain.c b/module/power_domain/src/mod_power_domain.c index 53048ebb9..2e917ba8b 100644 --- a/module/power_domain/src/mod_power_domain.c +++ b/module/power_domain/src/mod_power_domain.c @@ -1232,13 +1232,8 @@ static void process_system_shutdown_request( /* Functions common to the public and restricted API */ static int pd_get_domain_type(fwk_id_t pd_id, enum mod_pd_type *type) { - int status; struct pd_ctx *pd; - status = fwk_module_check_call(pd_id); - if (status != FWK_SUCCESS) - return status; - if (type == NULL) return FWK_E_PARAM; @@ -1254,13 +1249,8 @@ static int pd_get_domain_type(fwk_id_t pd_id, enum mod_pd_type *type) static int pd_get_domain_parent_id(fwk_id_t pd_id, fwk_id_t *parent_pd_id) { - int status; const struct pd_ctx *pd; - status = fwk_module_check_call(pd_id); - if (status != FWK_SUCCESS) - return status; - if (parent_pd_id == NULL) return FWK_E_PARAM; @@ -1288,10 +1278,6 @@ static int pd_set_state(fwk_id_t pd_id, unsigned int state) struct pd_set_state_response *resp_params = (struct pd_set_state_response *)(&resp.params); - status = fwk_module_check_call(pd_id); - if (status != FWK_SUCCESS) - return status; - pd = &mod_pd_ctx.pd_ctx_table[fwk_id_get_element_idx(pd_id)]; if (!is_valid_state(pd, state)) @@ -1317,17 +1303,12 @@ static int pd_set_state(fwk_id_t pd_id, unsigned int state) static int pd_set_state_async(fwk_id_t pd_id, bool response_requested, unsigned int state) { - int status; struct pd_ctx *pd; enum mod_pd_level level; struct fwk_event req; struct pd_set_state_request *req_params = (struct pd_set_state_request *)(&req.params); - status = fwk_module_check_call(pd_id); - if (status != FWK_SUCCESS) - return status; - pd = &mod_pd_ctx.pd_ctx_table[fwk_id_get_element_idx(pd_id)]; if (!is_valid_state(pd, state)) @@ -1359,10 +1340,6 @@ static int pd_set_composite_state(fwk_id_t pd_id, uint32_t composite_state) struct pd_set_state_response *resp_params = (struct pd_set_state_response *)(&resp.params); - status = fwk_module_check_call(pd_id); - if (status != FWK_SUCCESS) - return status; - pd = &mod_pd_ctx.pd_ctx_table[fwk_id_get_element_idx(pd_id)]; if (!is_valid_composite_state(pd, composite_state)) @@ -1387,16 +1364,11 @@ static int pd_set_composite_state_async(fwk_id_t pd_id, bool response_requested, uint32_t composite_state) { - int status; struct pd_ctx *pd; struct fwk_event req; struct pd_set_state_request *req_params = (struct pd_set_state_request *)(&req.params); - status = fwk_module_check_call(pd_id); - if (status != FWK_SUCCESS) - return status; - pd = &mod_pd_ctx.pd_ctx_table[fwk_id_get_element_idx(pd_id)]; if (!is_valid_composite_state(pd, composite_state)) @@ -1424,10 +1396,6 @@ static int pd_get_state(fwk_id_t pd_id, unsigned int *state) struct pd_get_state_response *resp_params = (struct pd_get_state_response *)(&resp.params); - status = fwk_module_check_call(pd_id); - if (status != FWK_SUCCESS) - return status; - if (state == NULL) return FWK_E_PARAM; @@ -1460,10 +1428,6 @@ static int pd_get_composite_state(fwk_id_t pd_id, unsigned int *composite_state) struct pd_get_state_response *resp_params = (struct pd_get_state_response *)(&resp.params); - status = fwk_module_check_call(pd_id); - if (status != FWK_SUCCESS) - return status; - if (composite_state == NULL) return FWK_E_PARAM; @@ -1493,10 +1457,6 @@ static int pd_reset(fwk_id_t pd_id) struct fwk_event resp; struct pd_response *resp_params = (struct pd_response *)(&resp.params); - status = fwk_module_check_call(pd_id); - if (status != FWK_SUCCESS) - return status; - req = (struct fwk_event) { .id = FWK_ID_EVENT(FWK_MODULE_IDX_POWER_DOMAIN, PD_EVENT_IDX_RESET), .target_id = pd_id, @@ -1518,10 +1478,6 @@ static int pd_system_suspend(unsigned int state) (struct pd_system_suspend_request *)(&req.params); struct pd_response *resp_params = (struct pd_response *)(&resp.params); - status = fwk_module_check_call(fwk_module_id_power_domain); - if (status != FWK_SUCCESS) - return status; - req = (struct fwk_event) { .id = FWK_ID_EVENT(FWK_MODULE_IDX_POWER_DOMAIN, PD_EVENT_IDX_SYSTEM_SUSPEND), @@ -1546,10 +1502,6 @@ static int pd_system_shutdown(enum mod_pd_system_shutdown system_shutdown) (struct pd_system_shutdown_request *)(&req.params); struct pd_response *resp_params = (struct pd_response *)(&resp.params); - status = fwk_module_check_call(fwk_module_id_power_domain); - if (status != FWK_SUCCESS) - return status; - req = (struct fwk_event) { .id = FWK_ID_EVENT(FWK_MODULE_IDX_POWER_DOMAIN, PD_EVENT_IDX_SYSTEM_SHUTDOWN), @@ -1569,14 +1521,9 @@ static int pd_system_shutdown(enum mod_pd_system_shutdown system_shutdown) static int pd_reset_async(fwk_id_t pd_id, bool response_requested) { - int status; struct fwk_event req; struct pd_ctx *pd; - status = fwk_module_check_call(pd_id); - if (status != FWK_SUCCESS) - return status; - pd = &mod_pd_ctx.pd_ctx_table[fwk_id_get_element_idx(pd_id)]; req = (struct fwk_event) { @@ -1609,14 +1556,8 @@ static int report_power_state_transition(const struct pd_ctx *pd, static int pd_report_power_state_transition(fwk_id_t pd_id, unsigned int state) { - int status; - const struct pd_ctx *pd; - - status = fwk_module_check_call(pd_id); - if (status != FWK_SUCCESS) - return status; - - pd = &mod_pd_ctx.pd_ctx_table[fwk_id_get_element_idx(pd_id)]; + const struct pd_ctx *pd = + &mod_pd_ctx.pd_ctx_table[fwk_id_get_element_idx(pd_id)]; return report_power_state_transition(pd, state); } diff --git a/module/ppu_v0/src/mod_ppu_v0.c b/module/ppu_v0/src/mod_ppu_v0.c index ac565d56f..26c8ae97f 100644 --- a/module/ppu_v0/src/mod_ppu_v0.c +++ b/module/ppu_v0/src/mod_ppu_v0.c @@ -103,10 +103,6 @@ static int pd_set_state(fwk_id_t pd_id, unsigned int state) int status; struct ppu_v0_pd_ctx *pd_ctx; - status = fwk_module_check_call(pd_id); - if (status != FWK_SUCCESS) - return status; - pd_ctx = ppu_v0_ctx.pd_ctx_table + fwk_id_get_element_idx(pd_id); fwk_assert(pd_ctx->pd_driver_input_api != NULL); @@ -137,13 +133,8 @@ static int pd_set_state(fwk_id_t pd_id, unsigned int state) static int pd_get_state(fwk_id_t pd_id, unsigned int *state) { - int status; struct ppu_v0_pd_ctx *pd_ctx; - status = fwk_module_check_call(pd_id); - if (status != FWK_SUCCESS) - return status; - pd_ctx = ppu_v0_ctx.pd_ctx_table + fwk_id_get_element_idx(pd_id); return get_state(pd_ctx->ppu, state); @@ -154,10 +145,6 @@ static int pd_reset(fwk_id_t pd_id) int status; struct ppu_v0_pd_ctx *pd_ctx; - status = fwk_module_check_call(pd_id); - if (status != FWK_SUCCESS) - return status; - pd_ctx = ppu_v0_ctx.pd_ctx_table + fwk_id_get_element_idx(pd_id); /* Model does not support warm reset at the moment. Using OFF instead. */ diff --git a/module/ppu_v1/src/mod_ppu_v1.c b/module/ppu_v1/src/mod_ppu_v1.c index 7684999b4..7a35a9b62 100644 --- a/module/ppu_v1/src/mod_ppu_v1.c +++ b/module/ppu_v1/src/mod_ppu_v1.c @@ -130,10 +130,6 @@ static int ppu_v1_pd_set_state(fwk_id_t pd_id, unsigned int state) int status; struct ppu_v1_pd_ctx *pd_ctx; - status = fwk_module_check_call(pd_id); - if (status != FWK_SUCCESS) - return status; - pd_ctx = ppu_v1_ctx.pd_ctx_table + fwk_id_get_element_idx(pd_id); switch (state) { @@ -162,13 +158,8 @@ static int ppu_v1_pd_set_state(fwk_id_t pd_id, unsigned int state) static int ppu_v1_pd_get_state(fwk_id_t pd_id, unsigned int *state) { - int status; struct ppu_v1_pd_ctx *pd_ctx; - status = fwk_module_check_call(pd_id); - if (status != FWK_SUCCESS) - return status; - pd_ctx = ppu_v1_ctx.pd_ctx_table + fwk_id_get_element_idx(pd_id); return get_state(pd_ctx->ppu, state); @@ -179,10 +170,6 @@ static int ppu_v1_pd_reset(fwk_id_t pd_id) int status; struct ppu_v1_pd_ctx *pd_ctx; - status = fwk_module_check_call(pd_id); - if (status != FWK_SUCCESS) - return status; - pd_ctx = ppu_v1_ctx.pd_ctx_table + fwk_id_get_element_idx(pd_id); /* Model does not support warm reset at the moment. Using OFF instead. */ @@ -228,10 +215,6 @@ static int ppu_v1_core_pd_set_state(fwk_id_t core_pd_id, unsigned int state) struct ppu_v1_pd_ctx *pd_ctx; struct ppu_v1_reg *ppu; - status = fwk_module_check_call(core_pd_id); - if (status != FWK_SUCCESS) - return status; - pd_ctx = ppu_v1_ctx.pd_ctx_table + fwk_id_get_element_idx(core_pd_id); ppu = pd_ctx->ppu; @@ -303,14 +286,9 @@ static int ppu_v1_core_pd_reset(fwk_id_t core_pd_id) static int ppu_v1_core_pd_prepare_for_system_suspend(fwk_id_t core_pd_id) { - int status; struct ppu_v1_pd_ctx *pd_ctx; struct ppu_v1_reg *ppu; - status = fwk_module_check_call(core_pd_id); - if (status != FWK_SUCCESS) - return status; - pd_ctx = ppu_v1_ctx.pd_ctx_table + fwk_id_get_element_idx(core_pd_id); ppu = pd_ctx->ppu; @@ -508,9 +486,6 @@ static int ppu_v1_cluster_pd_set_state(fwk_id_t cluster_pd_id, struct ppu_v1_reg *ppu; (void)ppu; - status = fwk_module_check_call(cluster_pd_id); - if (status != FWK_SUCCESS) - return status; pd_ctx = ppu_v1_ctx.pd_ctx_table + fwk_id_get_element_idx(cluster_pd_id); ppu = pd_ctx->ppu; @@ -625,13 +600,8 @@ static void ppu_interrupt_handler(uintptr_t pd_ctx_param) static void ppu_isr_api_interrupt_handler(fwk_id_t pd_id) { - int status; struct ppu_v1_pd_ctx *pd_ctx; - status = fwk_module_check_call(pd_id); - if (status != FWK_SUCCESS) - return; - if (!fwk_id_is_type(pd_id, FWK_ID_TYPE_ELEMENT)) return; @@ -645,13 +615,8 @@ static const struct ppu_v1_isr_api isr_api = { static int ppu_power_mode_on(fwk_id_t pd_id) { - int status; struct ppu_v1_pd_ctx *pd_ctx; - status = fwk_module_check_call(pd_id); - if (status != FWK_SUCCESS) - return status; - if (!fwk_id_is_type(pd_id, FWK_ID_TYPE_ELEMENT)) return FWK_E_PARAM; diff --git a/module/psu/src/mod_psu.c b/module/psu/src/mod_psu.c index 2a6837d5e..89693eb55 100644 --- a/module/psu/src/mod_psu.c +++ b/module/psu/src/mod_psu.c @@ -49,31 +49,13 @@ static struct mod_psu_element_ctx *mod_psu_get_element_ctx(fwk_id_t element_id) return &mod_psu_ctx.elements[element_idx]; } -static int mod_psu_check_call(fwk_id_t element_id) -{ - int status = FWK_E_PARAM; - - if (fwk_id_get_module_idx(element_id) != FWK_MODULE_IDX_PSU) - goto exit; - - status = fwk_module_check_call(element_id); - if (status != FWK_SUCCESS) - status = FWK_E_STATE; - -exit: - return status; -} - static int mod_psu_get_cfg_ctx( fwk_id_t element_id, const struct mod_psu_element_cfg **cfg, struct mod_psu_element_ctx **ctx) { - int status; - - status = mod_psu_check_call(element_id); - if (status != FWK_SUCCESS) - goto exit; + if (fwk_id_get_module_idx(element_id) != FWK_MODULE_IDX_PSU) + return FWK_E_PARAM; if (ctx != NULL) *ctx = mod_psu_get_element_ctx(element_id); @@ -81,8 +63,7 @@ static int mod_psu_get_cfg_ctx( if (cfg != NULL) *cfg = fwk_module_get_data(element_id); -exit: - return status; + return FWK_SUCCESS; } static int mod_psu_get_enabled(fwk_id_t element_id, bool *enabled) diff --git a/module/reg_sensor/src/mod_reg_sensor.c b/module/reg_sensor/src/mod_reg_sensor.c index 117dbf74b..58bdbbb6b 100644 --- a/module/reg_sensor/src/mod_reg_sensor.c +++ b/module/reg_sensor/src/mod_reg_sensor.c @@ -21,14 +21,8 @@ static struct mod_reg_sensor_dev_config **config_table; */ static int get_value(fwk_id_t id, uint64_t *value) { - int status; struct mod_reg_sensor_dev_config *config; - status = fwk_module_check_call(id); - if (status != FWK_SUCCESS) { - return FWK_E_STATE; - } - config = config_table[fwk_id_get_element_idx(id)]; fwk_assert(config != NULL); @@ -43,13 +37,8 @@ static int get_value(fwk_id_t id, uint64_t *value) static int get_info(fwk_id_t id, struct mod_sensor_info *info) { - int status; struct mod_reg_sensor_dev_config *config; - status = fwk_module_check_call(id); - if (status != FWK_SUCCESS) - return status; - config = config_table[fwk_id_get_element_idx(id)]; fwk_assert(config != NULL); diff --git a/module/scmi/src/mod_scmi.c b/module/scmi/src/mod_scmi.c index 11be9fe33..5b36ac2c9 100644 --- a/module/scmi/src/mod_scmi.c +++ b/module/scmi/src/mod_scmi.c @@ -149,14 +149,7 @@ static uint8_t read_protocol_id(uint32_t message_header) static int signal_message(fwk_id_t service_id) { - int32_t status; - struct fwk_event event; - - status = fwk_module_check_call(service_id); - if (status != FWK_SUCCESS) - return status; - - event = (struct fwk_event) { + struct fwk_event event = (struct fwk_event) { .id = FWK_ID_EVENT(FWK_MODULE_IDX_SCMI, 0), .source_id = FWK_ID_MODULE(FWK_MODULE_IDX_SCMI), .target_id = service_id, @@ -175,13 +168,8 @@ static const struct mod_scmi_from_transport_api mod_scmi_from_transport_api = { static int get_agent_id(fwk_id_t service_id, unsigned int *agent_id) { - int status; struct scmi_service_ctx *ctx; - status = fwk_module_check_call(service_id); - if (status != FWK_SUCCESS) - return status; - if (agent_id == NULL) return FWK_E_PARAM; @@ -207,13 +195,8 @@ static int get_agent_type(uint32_t scmi_agent_id, static int get_max_payload_size(fwk_id_t service_id, size_t *size) { - int status; struct scmi_service_ctx *ctx; - status = fwk_module_check_call(service_id); - if (status != FWK_SUCCESS) - return status; - if (size == NULL) return FWK_E_PARAM; @@ -225,13 +208,8 @@ static int get_max_payload_size(fwk_id_t service_id, size_t *size) static int write_payload(fwk_id_t service_id, size_t offset, const void *payload, size_t size) { - int status; const struct scmi_service_ctx *ctx; - status = fwk_module_check_call(service_id); - if (status != FWK_SUCCESS) - return status; - ctx = &scmi_ctx.service_ctx_table[fwk_id_get_element_idx(service_id)]; return ctx->transport_api->write_payload(ctx->transport_id, @@ -243,10 +221,6 @@ static void respond(fwk_id_t service_id, const void *payload, size_t size) int status; const struct scmi_service_ctx *ctx; - status = fwk_module_check_call(service_id); - if (status != FWK_SUCCESS) - return; - ctx = &scmi_ctx.service_ctx_table[fwk_id_get_element_idx(service_id)]; /* diff --git a/module/scmi_apcore/src/mod_scmi_apcore.c b/module/scmi_apcore/src/mod_scmi_apcore.c index fd0379c04..02b2f2408 100644 --- a/module/scmi_apcore/src/mod_scmi_apcore.c +++ b/module/scmi_apcore/src/mod_scmi_apcore.c @@ -318,12 +318,6 @@ exit: static int scmi_apcore_get_scmi_protocol_id(fwk_id_t protocol_id, uint8_t *scmi_protocol_id) { - int status; - - status = fwk_module_check_call(protocol_id); - if (status != FWK_SUCCESS) - return status; - *scmi_protocol_id = SCMI_PROTOCOL_ID_APCORE; return FWK_SUCCESS; @@ -336,7 +330,6 @@ static int scmi_apcore_message_handler( size_t payload_size, unsigned int message_id) { - int status; int32_t return_value; static_assert(FWK_ARRAY_SIZE(handler_table) == @@ -344,9 +337,6 @@ static int scmi_apcore_message_handler( "[SCMI] Core configuration protocol table sizes not consistent"); assert(payload != NULL); - status = fwk_module_check_call(protocol_id); - if (status != FWK_SUCCESS) - return status; if (message_id >= FWK_ARRAY_SIZE(handler_table)) { return_value = SCMI_NOT_SUPPORTED; diff --git a/module/scmi_clock/src/mod_scmi_clock.c b/module/scmi_clock/src/mod_scmi_clock.c index b30d9b376..b9401fc97 100644 --- a/module/scmi_clock/src/mod_scmi_clock.c +++ b/module/scmi_clock/src/mod_scmi_clock.c @@ -918,12 +918,6 @@ exit: static int scmi_clock_get_scmi_protocol_id(fwk_id_t protocol_id, uint8_t *scmi_protocol_id) { - int status; - - status = fwk_module_check_call(protocol_id); - if (status != FWK_SUCCESS) - return status; - *scmi_protocol_id = SCMI_PROTOCOL_ID_CLOCK; return FWK_SUCCESS; @@ -932,7 +926,6 @@ static int scmi_clock_get_scmi_protocol_id(fwk_id_t protocol_id, static int scmi_clock_message_handler(fwk_id_t protocol_id, fwk_id_t service_id, const uint32_t *payload, size_t payload_size, unsigned int message_id) { - int status; int32_t return_value; static_assert(FWK_ARRAY_SIZE(handler_table) == @@ -940,10 +933,6 @@ static int scmi_clock_message_handler(fwk_id_t protocol_id, fwk_id_t service_id, "[SCMI] Clock management protocol table sizes not consistent"); assert(payload != NULL); - status = fwk_module_check_call(protocol_id); - if (status != FWK_SUCCESS) - return status; - if (message_id >= FWK_ARRAY_SIZE(handler_table)) { return_value = SCMI_NOT_SUPPORTED; goto error; diff --git a/module/scmi_perf/src/mod_scmi_perf.c b/module/scmi_perf/src/mod_scmi_perf.c index 59abfcf73..9edf57860 100644 --- a/module/scmi_perf/src/mod_scmi_perf.c +++ b/module/scmi_perf/src/mod_scmi_perf.c @@ -522,12 +522,6 @@ exit: static int scmi_perf_get_scmi_protocol_id(fwk_id_t protocol_id, uint8_t *scmi_protocol_id) { - int status; - - status = fwk_module_check_call(protocol_id); - if (status != FWK_SUCCESS) - return status; - *scmi_protocol_id = SCMI_PROTOCOL_ID_PERF; return FWK_SUCCESS; @@ -536,7 +530,6 @@ static int scmi_perf_get_scmi_protocol_id(fwk_id_t protocol_id, static int scmi_perf_message_handler(fwk_id_t protocol_id, fwk_id_t service_id, const uint32_t *payload, size_t payload_size, unsigned int message_id) { - int status; int32_t return_value; static_assert(FWK_ARRAY_SIZE(handler_table) == @@ -544,10 +537,6 @@ static int scmi_perf_message_handler(fwk_id_t protocol_id, fwk_id_t service_id, "[SCMI] Performance management protocol table sizes not consistent"); assert(payload != NULL); - status = fwk_module_check_call(protocol_id); - if (status != FWK_SUCCESS) - return status; - if (message_id >= FWK_ARRAY_SIZE(handler_table)) { return_value = SCMI_NOT_SUPPORTED; goto error; diff --git a/module/scmi_power_domain/src/mod_scmi_power_domain.c b/module/scmi_power_domain/src/mod_scmi_power_domain.c index 441e9677d..4338c5149 100644 --- a/module/scmi_power_domain/src/mod_scmi_power_domain.c +++ b/module/scmi_power_domain/src/mod_scmi_power_domain.c @@ -485,12 +485,6 @@ exit: static int scmi_pd_get_scmi_protocol_id(fwk_id_t protocol_id, uint8_t *scmi_protocol_id) { - int status; - - status = fwk_module_check_call(protocol_id); - if (status != FWK_SUCCESS) - return status; - *scmi_protocol_id = SCMI_PROTOCOL_ID_POWER_DOMAIN; return FWK_SUCCESS; @@ -499,13 +493,8 @@ static int scmi_pd_get_scmi_protocol_id(fwk_id_t protocol_id, static int scmi_pd_message_handler(fwk_id_t protocol_id, fwk_id_t service_id, const uint32_t *payload, size_t payload_size, unsigned int message_id) { - int status; int32_t return_value; - status = fwk_module_check_call(protocol_id); - if (status != FWK_SUCCESS) - return status; - static_assert(FWK_ARRAY_SIZE(handler_table) == FWK_ARRAY_SIZE(payload_size_table), "[SCMI] Power domain management protocol table sizes not consistent"); diff --git a/module/scmi_sensor/src/mod_scmi_sensor.c b/module/scmi_sensor/src/mod_scmi_sensor.c index 0d0c27db7..fa1063162 100644 --- a/module/scmi_sensor/src/mod_scmi_sensor.c +++ b/module/scmi_sensor/src/mod_scmi_sensor.c @@ -399,12 +399,6 @@ exit: static int scmi_sensor_get_scmi_protocol_id(fwk_id_t protocol_id, uint8_t *scmi_protocol_id) { - int status; - - status = fwk_module_check_call(protocol_id); - if (status != FWK_SUCCESS) - return status; - *scmi_protocol_id = SCMI_PROTOCOL_ID_SENSOR; return FWK_SUCCESS; @@ -416,13 +410,8 @@ static int scmi_sensor_message_handler(fwk_id_t protocol_id, size_t payload_size, unsigned int message_id) { - int status; int32_t return_value; - status = fwk_module_check_call(protocol_id); - if (status != FWK_SUCCESS) - return status; - static_assert(FWK_ARRAY_SIZE(handler_table) == FWK_ARRAY_SIZE(payload_size_table), "[SCMI] Sensor management protocol table sizes not consistent"); diff --git a/module/scmi_system_power/src/mod_scmi_system_power.c b/module/scmi_system_power/src/mod_scmi_system_power.c index 7540c9dfb..5eea0d422 100644 --- a/module/scmi_system_power/src/mod_scmi_system_power.c +++ b/module/scmi_system_power/src/mod_scmi_system_power.c @@ -326,12 +326,6 @@ exit: static int scmi_sys_power_get_scmi_protocol_id(fwk_id_t protocol_id, uint8_t *scmi_protocol_id) { - int status; - - status = fwk_module_check_call(protocol_id); - if (status != FWK_SUCCESS) - return status; - *scmi_protocol_id = SCMI_PROTOCOL_ID_SYS_POWER; return FWK_SUCCESS; @@ -343,16 +337,12 @@ static int scmi_sys_power_handler(fwk_id_t protocol_id, size_t payload_size, unsigned int message_id) { - int status; int32_t return_value; static_assert(FWK_ARRAY_SIZE(handler_table) == FWK_ARRAY_SIZE(payload_size_table), "[SCMI] System power protocol table sizes not consistent"); - status = fwk_module_check_call(protocol_id); - if (status != FWK_SUCCESS) - return status; assert(payload != NULL); if (message_id >= FWK_ARRAY_SIZE(handler_table)) { diff --git a/module/sds/src/mod_sds.c b/module/sds/src/mod_sds.c index c7665a29c..b94570468 100644 --- a/module/sds/src/mod_sds.c +++ b/module/sds/src/mod_sds.c @@ -485,12 +485,6 @@ static int init_sds(void) static int sds_struct_write(uint32_t structure_id, unsigned int offset, const void *data, size_t size) { - int status; - - status = fwk_module_check_call(fwk_module_id_sds); - if (status != FWK_SUCCESS) - return status; - if (data == NULL) return FWK_E_PARAM; @@ -507,9 +501,6 @@ static int sds_struct_read(uint32_t structure_id, unsigned int offset, volatile char *structure_base; struct structure_header header; - status = fwk_module_check_call(fwk_module_id_sds); - if (status != FWK_SUCCESS) - return status; if (data == NULL) return FWK_E_PARAM; @@ -534,12 +525,6 @@ static int sds_struct_read(uint32_t structure_id, unsigned int offset, static int sds_struct_finalize(uint32_t structure_id) { - int status; - - status = fwk_module_check_call(fwk_module_id_sds); - if (status != FWK_SUCCESS) - return status; - return struct_finalize(structure_id); } diff --git a/module/sensor/src/mod_sensor.c b/module/sensor/src/mod_sensor.c index b5ba9b2b6..0faab78dc 100644 --- a/module/sensor/src/mod_sensor.c +++ b/module/sensor/src/mod_sensor.c @@ -21,17 +21,11 @@ static int get_ctx_if_valid_call(fwk_id_t id, void *data, struct sensor_dev_ctx **ctx) { - int status; - fwk_assert(ctx != NULL); if (!fwk_expect(data != NULL)) return FWK_E_PARAM; - status = fwk_module_check_call(id); - if (status != FWK_SUCCESS) - return status; - *ctx = ctx_table + fwk_id_get_element_idx(id); return FWK_SUCCESS; diff --git a/module/smt/src/mod_smt.c b/module/smt/src/mod_smt.c index e0e8dde6f..a97e69db3 100644 --- a/module/smt/src/mod_smt.c +++ b/module/smt/src/mod_smt.c @@ -70,15 +70,8 @@ static struct smt_ctx smt_ctx; */ static int smt_get_secure(fwk_id_t channel_id, bool *secure) { - int status; struct smt_channel_ctx *channel_ctx; - status = fwk_module_check_call(channel_id); - if (status != FWK_SUCCESS) { - assert(false); - return status; - } - if (secure == NULL) { assert(false); return FWK_E_PARAM; @@ -94,15 +87,8 @@ static int smt_get_secure(fwk_id_t channel_id, bool *secure) static int smt_get_max_payload_size(fwk_id_t channel_id, size_t *size) { - int status; struct smt_channel_ctx *channel_ctx; - status = fwk_module_check_call(channel_id); - if (status != FWK_SUCCESS) { - assert(false); - return status; - } - if (size == NULL) { assert(false); return FWK_E_PARAM; @@ -118,15 +104,8 @@ static int smt_get_max_payload_size(fwk_id_t channel_id, size_t *size) static int smt_get_message_header(fwk_id_t channel_id, uint32_t *header) { - int status; struct smt_channel_ctx *channel_ctx; - status = fwk_module_check_call(channel_id); - if (status != FWK_SUCCESS) { - assert(false); - return status; - } - if (header == NULL) { assert(false); return FWK_E_PARAM; @@ -147,15 +126,8 @@ static int smt_get_payload(fwk_id_t channel_id, const void **payload, size_t *size) { - int status; struct smt_channel_ctx *channel_ctx; - status = fwk_module_check_call(channel_id); - if (status != FWK_SUCCESS) { - assert(false); - return status; - } - if (payload == NULL) { assert(false); return FWK_E_PARAM; @@ -182,15 +154,8 @@ static int smt_write_payload(fwk_id_t channel_id, const void *payload, size_t size) { - int status; struct smt_channel_ctx *channel_ctx; - status = fwk_module_check_call(channel_id); - if (status != FWK_SUCCESS) { - assert(false); - return status; - } - channel_ctx = &smt_ctx.channel_ctx_table[fwk_id_get_element_idx(channel_id)]; @@ -215,14 +180,6 @@ static int smt_respond(fwk_id_t channel_id, const void *payload, size_t size) { struct smt_channel_ctx *channel_ctx; struct mod_smt_memory *memory; - int status; - (void)status; - - status = fwk_module_check_call(channel_id); - if (status != FWK_SUCCESS) { - assert(false); - return status; - } channel_ctx = &smt_ctx.channel_ctx_table[fwk_id_get_element_idx(channel_id)]; @@ -336,13 +293,8 @@ static int smt_slave_handler(struct smt_channel_ctx *channel_ctx) static int smt_signal_message(fwk_id_t channel_id) { - int status; struct smt_channel_ctx *channel_ctx; - status = fwk_module_check_call(channel_id); - if (status != FWK_SUCCESS) - return status; - channel_ctx = &smt_ctx.channel_ctx_table[fwk_id_get_element_idx(channel_id)]; diff --git a/module/system_pll/src/mod_system_pll.c b/module/system_pll/src/mod_system_pll.c index d2f73a233..ca3de22bf 100644 --- a/module/system_pll/src/mod_system_pll.c +++ b/module/system_pll/src/mod_system_pll.c @@ -214,14 +214,9 @@ static int system_pll_power_state_change( fwk_id_t dev_id, unsigned int state) { - int status; uint64_t rate; struct system_pll_dev_ctx *ctx; - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; - ctx = module_ctx.dev_ctx_table + fwk_id_get_element_idx(dev_id); if (state != MOD_PD_STATE_ON) @@ -246,13 +241,8 @@ static int system_pll_power_state_pending_change( unsigned int current_state, unsigned int next_state) { - int status; struct system_pll_dev_ctx *ctx; - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; - ctx = module_ctx.dev_ctx_table + fwk_id_get_element_idx(dev_id); if (next_state == MOD_PD_STATE_OFF) { diff --git a/module/system_power/src/mod_system_power.c b/module/system_power/src/mod_system_power.c index fbe980d69..7628637b7 100644 --- a/module/system_power/src/mod_system_power.c +++ b/module/system_power/src/mod_system_power.c @@ -124,10 +124,6 @@ static int system_power_set_state(fwk_id_t pd_id, unsigned int state) int status; unsigned int soc_wakeup_irq; - status = fwk_module_check_call(pd_id); - if (status != FWK_SUCCESS) - return status; - if (!fwk_expect(state < MOD_SYSTEM_POWER_POWER_STATE_COUNT)) return FWK_E_PARAM; @@ -209,12 +205,6 @@ static int system_power_set_state(fwk_id_t pd_id, unsigned int state) static int system_power_get_state(fwk_id_t pd_id, unsigned int *state) { - int status; - - status = fwk_module_check_call(pd_id); - if (status != FWK_SUCCESS) - return status; - *state = system_power_ctx.state; return FWK_SUCCESS; @@ -262,13 +252,8 @@ static const struct mod_pd_driver_api system_power_power_domain_driver_api = { static int system_power_report_power_state_transition(fwk_id_t dev_id, unsigned int state) { - int status; static unsigned int sys_ppu_transition_count = 0; - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; - sys_ppu_transition_count++; if (sys_ppu_transition_count < system_power_ctx.dev_count) diff --git a/module/timer/src/mod_timer.c b/module/timer/src/mod_timer.c index 8edd91f6e..a35d8896b 100644 --- a/module/timer/src/mod_timer.c +++ b/module/timer/src/mod_timer.c @@ -192,11 +192,6 @@ static void _insert_alarm_ctx_into_active_queue(struct dev_ctx *ctx, static int get_frequency(fwk_id_t dev_id, uint32_t *frequency) { struct dev_ctx *ctx; - int status; - - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; ctx = &ctx_table[fwk_id_get_element_idx(dev_id)]; @@ -210,13 +205,8 @@ static int time_to_timestamp(fwk_id_t dev_id, uint32_t microseconds, uint64_t *timestamp) { - int status; struct dev_ctx *ctx; - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; - if (timestamp == NULL) return FWK_E_PARAM; @@ -228,11 +218,6 @@ static int time_to_timestamp(fwk_id_t dev_id, static int get_counter(fwk_id_t dev_id, uint64_t *counter) { struct dev_ctx *ctx; - int status; - - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; ctx = &ctx_table[fwk_id_get_element_idx(dev_id)]; @@ -249,10 +234,6 @@ static int delay(fwk_id_t dev_id, uint32_t microseconds) struct dev_ctx *ctx; uint64_t counter, counter_limit; - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; - ctx = &ctx_table[fwk_id_get_element_idx(dev_id)]; status = _timestamp_from_now(ctx, microseconds, &counter_limit); @@ -277,10 +258,6 @@ static int wait(fwk_id_t dev_id, int status; uint64_t counter, counter_limit; - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; - ctx = &ctx_table[fwk_id_get_element_idx(dev_id)]; status = _timestamp_from_now(ctx, microseconds, &counter_limit); @@ -313,11 +290,6 @@ static int remaining(fwk_id_t dev_id, uint64_t *remaining_ticks) { struct dev_ctx *ctx; - int status; - - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; ctx = &ctx_table[fwk_id_get_element_idx(dev_id)]; @@ -331,15 +303,11 @@ static int get_next_alarm_remaining(fwk_id_t dev_id, bool *has_alarm, uint64_t *remaining_ticks) { - int status; + int status = FWK_E_PARAM; const struct dev_ctx *ctx; const struct alarm_ctx *alarm_ctx; const struct fwk_dlist_node *alarm_ctx_node; - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; - if (has_alarm == NULL) return FWK_E_PARAM; @@ -384,16 +352,11 @@ static const struct mod_timer_api timer_api = { static int alarm_stop(fwk_id_t alarm_id) { - int status; struct dev_ctx *ctx; struct alarm_ctx *alarm; assert(fwk_module_is_valid_sub_element_id(alarm_id)); - status = fwk_module_check_call(alarm_id); - if (status != FWK_SUCCESS) - return status; - ctx = &ctx_table[fwk_id_get_element_idx(alarm_id)]; alarm = &ctx->alarm_pool[fwk_id_get_sub_element_idx(alarm_id)]; @@ -436,10 +399,6 @@ static int alarm_start(fwk_id_t alarm_id, assert(fwk_module_is_valid_sub_element_id(alarm_id)); - status = fwk_module_check_call(alarm_id); - if (status != FWK_SUCCESS) - return status; - ctx = ctx_table + fwk_id_get_element_idx(alarm_id); alarm = &ctx->alarm_pool[fwk_id_get_sub_element_idx(alarm_id)]; -- GitLab From 96c731c0d2aac2f42d820c3cc9e9f10c523baa19 Mon Sep 17 00:00:00 2001 From: Tarek El-Sherbiny Date: Thu, 31 Oct 2019 13:54:23 +0000 Subject: [PATCH 2/6] juno/modules: Remove calls to fwk_module_check_call This change is to reduce memory footprint. Change-Id: I43073cc6a3e39205451adb6101def1ab945fd93f Signed-off-by: Tarek El-Sherbiny --- .../juno/module/juno_adc/src/mod_juno_adc.c | 10 --------- .../juno_ddr_phy400/src/mod_juno_ddr_phy400.c | 22 ------------------- .../juno/module/juno_ppu/src/mod_juno_ppu.c | 11 ---------- .../juno_xrp7724/src/mod_juno_xrp7724.c | 8 ------- 4 files changed, 51 deletions(-) diff --git a/product/juno/module/juno_adc/src/mod_juno_adc.c b/product/juno/module/juno_adc/src/mod_juno_adc.c index 6616a5a30..1c89f8af9 100644 --- a/product/juno/module/juno_adc/src/mod_juno_adc.c +++ b/product/juno/module/juno_adc/src/mod_juno_adc.c @@ -27,15 +27,10 @@ static struct mod_log_api *log_api; */ static int get_value(fwk_id_t id, uint64_t *value) { - int status; uint32_t adc_value; uint64_t adc_quantity; enum juno_adc_dev_type dev_type; - status = fwk_module_check_call(id); - if (status != FWK_SUCCESS) - return status; - fwk_assert(fwk_module_is_valid_sub_element_id(id)); fwk_assert(value != NULL); @@ -114,13 +109,8 @@ static int get_value(fwk_id_t id, uint64_t *value) static int get_info(fwk_id_t id, struct mod_sensor_info *info) { - int status; const struct mod_juno_adc_dev_config *config; - status = fwk_module_check_call(id); - if (status != FWK_SUCCESS) - return status; - fwk_assert(fwk_module_is_valid_sub_element_id(id)); config = fwk_module_get_data(id); diff --git a/product/juno/module/juno_ddr_phy400/src/mod_juno_ddr_phy400.c b/product/juno/module/juno_ddr_phy400/src/mod_juno_ddr_phy400.c index a52d83415..bf85f3a4c 100644 --- a/product/juno/module/juno_ddr_phy400/src/mod_juno_ddr_phy400.c +++ b/product/juno/module/juno_ddr_phy400/src/mod_juno_ddr_phy400.c @@ -30,16 +30,11 @@ static struct mod_timer_api *timer_api; static int juno_ddr_phy400_config_ddr(fwk_id_t element_id) { - int status; struct mod_juno_ddr_phy400_ptm_reg *phy_ptm; struct mod_juno_ddr_phy400_c3a_reg *phy_c3a; struct mod_juno_ddr_phy400_bl_reg *phy_bl0; const struct mod_juno_ddr_phy400_element_config *element_config; - status = fwk_module_check_call(element_id); - if (status != FWK_SUCCESS) - return status; - element_config = fwk_module_get_data(element_id); if (element_config == NULL) return FWK_E_DATA; @@ -146,12 +141,6 @@ static int juno_ddr_phy400_config_ddr(fwk_id_t element_id) static int juno_ddr_phy400_config_clk(fwk_id_t module_id) { - int status; - - status = fwk_module_check_call(module_id); - if (status != FWK_SUCCESS) - return status; - log_api->log(MOD_LOG_GROUP_DEBUG, "[DDR] Initializing PHY-PLL\n"); /* Complete clock settings */ @@ -171,15 +160,10 @@ static bool ddr_phy_idle_check(void *data) static int juno_ddr_phy400_config_idle(fwk_id_t element_id) { - int status; struct mod_juno_ddr_phy400_ptm_reg *phy_ptm; const struct mod_juno_ddr_phy400_element_config * element_config; const struct mod_juno_ddr_phy400_config *module_config; - status = fwk_module_check_call(element_id); - if (status != FWK_SUCCESS) - return status; - module_config = fwk_module_get_data(fwk_module_id_juno_ddr_phy400); element_config = fwk_module_get_data(element_id); @@ -196,12 +180,6 @@ static int juno_ddr_phy400_config_idle(fwk_id_t element_id) static int juno_ddr_phy400_config_retention(fwk_id_t module_id, bool enable) { - int status; - - status = fwk_module_check_call(module_id); - if (status != FWK_SUCCESS) - return status; - if (enable) { SCC->DDR_PHY0_RETNCTRL = SCC_DDR_PHY_RETNCTRL_ENABLE; SCC->DDR_PHY1_RETNCTRL = SCC_DDR_PHY_RETNCTRL_ENABLE; diff --git a/product/juno/module/juno_ppu/src/mod_juno_ppu.c b/product/juno/module/juno_ppu/src/mod_juno_ppu.c index 1aceb5108..d16294dbd 100644 --- a/product/juno/module/juno_ppu/src/mod_juno_ppu.c +++ b/product/juno/module/juno_ppu/src/mod_juno_ppu.c @@ -90,14 +90,8 @@ static bool set_power_status_check(void *data) static int get_ctx(fwk_id_t id, struct ppu_ctx **ppu_ctx) { - int status; - fwk_assert(fwk_module_is_valid_element_id(id)); - status = fwk_module_check_call(id); - if (!fwk_expect(status == FWK_SUCCESS)) - return FWK_E_ACCESS; - *ppu_ctx = juno_ppu_ctx.ppu_ctx_table + fwk_id_get_element_idx(id); return FWK_SUCCESS; @@ -503,14 +497,9 @@ static int cluster_set_state(fwk_id_t ppu_id, unsigned int state) static bool cluster_deny(fwk_id_t ppu_id, unsigned int state) { - int status; fwk_assert(fwk_module_is_valid_element_id(ppu_id)); - status = fwk_module_check_call(ppu_id); - if (!fwk_expect(status == FWK_SUCCESS)) - return FWK_E_ACCESS; - if (!fwk_expect(state < MOD_PD_STATE_COUNT)) return true; diff --git a/product/juno/module/juno_xrp7724/src/mod_juno_xrp7724.c b/product/juno/module/juno_xrp7724/src/mod_juno_xrp7724.c index 4b1b833b0..4373ad10d 100644 --- a/product/juno/module/juno_xrp7724/src/mod_juno_xrp7724.c +++ b/product/juno/module/juno_xrp7724/src/mod_juno_xrp7724.c @@ -179,9 +179,6 @@ static int juno_xrp7724_sensor_get_value(fwk_id_t id, uint64_t *value) fwk_assert(fwk_module_is_valid_element_id(id)); - status = fwk_module_check_call(id); - if (status != FWK_SUCCESS) - return status; if (module_ctx.sensor_request != JUNO_XRP7724_SENSOR_REQUEST_IDLE) return FWK_E_BUSY; @@ -208,16 +205,11 @@ static int juno_xrp7724_sensor_get_value(fwk_id_t id, uint64_t *value) static int juno_xrp7724_sensor_get_info(fwk_id_t id, struct mod_sensor_info *info) { - int status; const struct juno_xrp7724_dev_ctx *ctx; fwk_assert(fwk_module_is_valid_element_id(id)); fwk_assert(info != NULL); - status = fwk_module_check_call(id); - if (status != FWK_SUCCESS) - return status; - ctx = &ctx_table[fwk_id_get_element_idx(id)]; fwk_assert(ctx->config->type == MOD_JUNO_XRP7724_ELEMENT_TYPE_SENSOR); -- GitLab From 81396513260af6738c75c6ae97d9b5a53a4f4c28 Mon Sep 17 00:00:00 2001 From: Tarek El-Sherbiny Date: Fri, 1 Nov 2019 12:05:41 +0000 Subject: [PATCH 3/6] sgm775/modules: Remove calls to fwk_module_check_call This change is to reduce memory footprint. Change-Id: I6990cb2b55e4b6463780453f7659e550b328948b Signed-off-by: Tarek El-Sherbiny --- .../module/sgm775_ddr_phy500/src/mod_sgm775_ddr_phy500.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/product/sgm775/module/sgm775_ddr_phy500/src/mod_sgm775_ddr_phy500.c b/product/sgm775/module/sgm775_ddr_phy500/src/mod_sgm775_ddr_phy500.c index 6a6263d53..c504ad8cb 100644 --- a/product/sgm775/module/sgm775_ddr_phy500/src/mod_sgm775_ddr_phy500.c +++ b/product/sgm775/module/sgm775_ddr_phy500/src/mod_sgm775_ddr_phy500.c @@ -24,14 +24,9 @@ static struct mod_log_api *log_api; */ static int sgm775_ddr_phy500_config(fwk_id_t element_id) { - int status; struct mod_sgm775_ddr_phy500_reg *ddr; const struct mod_sgm775_ddr_phy500_element_config *element_config; - status = fwk_module_check_call(element_id); - if (status != FWK_SUCCESS) - return status; - element_config = fwk_module_get_data(element_id); ddr = (struct mod_sgm775_ddr_phy500_reg *)element_config->ddr; -- GitLab From 9af2f52fa51438624190478e40ec72ea8b7dfef9 Mon Sep 17 00:00:00 2001 From: Tarek El-Sherbiny Date: Fri, 1 Nov 2019 12:41:45 +0000 Subject: [PATCH 4/6] synquacer/modules: Remove calls to fwk_module_check_call This change is to reduce memory footprint. Change-Id: I1a6c0bd919b56e8ed4126fb27572c6c749b999a0 Signed-off-by: Tarek El-Sherbiny --- .../module/f_uart3/src/mod_f_uart3.c | 10 ---- .../module/ppu_v0_synquacer/src/mod_ppu_v0.c | 19 +------ .../scmi_vendor_ext/src/mod_scmi_vendor_ext.c | 10 ---- .../src/mod_synquacer_pik_clock.c | 53 ------------------- 4 files changed, 1 insertion(+), 91 deletions(-) diff --git a/product/synquacer/module/f_uart3/src/mod_f_uart3.c b/product/synquacer/module/f_uart3/src/mod_f_uart3.c index 5c8ae347b..c69517be9 100644 --- a/product/synquacer/module/f_uart3/src/mod_f_uart3.c +++ b/product/synquacer/module/f_uart3/src/mod_f_uart3.c @@ -80,14 +80,9 @@ void get_device_reg( static int do_putchar(fwk_id_t device_id, char c) { - int status; struct f_uart3_reg *reg; struct f_uart3_dla_reg *dla_reg; - status = fwk_module_check_call(device_id); - if (status != FWK_SUCCESS) - return status; - get_device_reg(device_id, ®, &dla_reg); if (reg != NULL) { while ((reg->LSR & F_UART3_LSR_THRE) == 0x0) { @@ -103,14 +98,9 @@ static int do_putchar(fwk_id_t device_id, char c) static int do_flush(fwk_id_t device_id) { - int status; struct f_uart3_reg *reg; struct f_uart3_dla_reg *dla_reg; - status = fwk_module_check_call(device_id); - if (status != FWK_SUCCESS) - return status; - get_device_reg(device_id, ®, &dla_reg); if (reg != NULL) { while ((reg->LSR & F_UART3_LSR_TEMT) == 0x0) { diff --git a/product/synquacer/module/ppu_v0_synquacer/src/mod_ppu_v0.c b/product/synquacer/module/ppu_v0_synquacer/src/mod_ppu_v0.c index 223147b8b..481d92b01 100644 --- a/product/synquacer/module/ppu_v0_synquacer/src/mod_ppu_v0.c +++ b/product/synquacer/module/ppu_v0_synquacer/src/mod_ppu_v0.c @@ -109,10 +109,6 @@ static int pd_set_state(fwk_id_t pd_id, unsigned int state) int status; struct ppu_v0_pd_ctx *pd_ctx; - status = fwk_module_check_call(pd_id); - if (status != FWK_SUCCESS) - return status; - pd_ctx = ppu_v0_ctx.pd_ctx_table + fwk_id_get_element_idx(pd_id); ppu_v0_ctx.log_api->log( @@ -174,18 +170,14 @@ static int pd_set_state(fwk_id_t pd_id, unsigned int state) return FWK_E_PARAM; } + (void)status; return FWK_SUCCESS; } static int pd_get_state(fwk_id_t pd_id, unsigned int *state) { - int status; struct ppu_v0_pd_ctx *pd_ctx; - status = fwk_module_check_call(pd_id); - if (status != FWK_SUCCESS) - return status; - pd_ctx = ppu_v0_ctx.pd_ctx_table + fwk_id_get_element_idx(pd_id); return get_state(pd_ctx->ppu, state); @@ -196,10 +188,6 @@ static int pd_reset(fwk_id_t pd_id) int status; struct ppu_v0_pd_ctx *pd_ctx; - status = fwk_module_check_call(pd_id); - if (status != FWK_SUCCESS) - return status; - pd_ctx = ppu_v0_ctx.pd_ctx_table + fwk_id_get_element_idx(pd_id); /* Model does not support warm reset at the moment. Using OFF instead. */ @@ -212,13 +200,8 @@ static int pd_reset(fwk_id_t pd_id) static int ppu_v0_prepare_core_for_system_suspend(fwk_id_t core_pd_id) { - int status; struct ppu_v0_pd_ctx *pd_ctx; - status = fwk_module_check_call(core_pd_id); - if (status != FWK_SUCCESS) - return status; - pd_ctx = ppu_v0_ctx.pd_ctx_table + fwk_id_get_element_idx(core_pd_id); ppu_v0_request_power_mode(pd_ctx->ppu, PPU_V0_MODE_OFF); diff --git a/product/synquacer/module/scmi_vendor_ext/src/mod_scmi_vendor_ext.c b/product/synquacer/module/scmi_vendor_ext/src/mod_scmi_vendor_ext.c index e5bf6a531..791c20aed 100644 --- a/product/synquacer/module/scmi_vendor_ext/src/mod_scmi_vendor_ext.c +++ b/product/synquacer/module/scmi_vendor_ext/src/mod_scmi_vendor_ext.c @@ -211,11 +211,6 @@ static int scmi_vendor_ext_get_scmi_protocol_id( fwk_id_t protocol_id, uint8_t *scmi_protocol_id) { - int status; - - status = fwk_module_check_call(protocol_id); - if (status != FWK_SUCCESS) - return status; *scmi_protocol_id = SCMI_PROTOCOL_ID_VENDOR_EXT; @@ -229,16 +224,11 @@ static int scmi_vendor_ext_message_handler( size_t payload_size, unsigned int message_id) { - int status; int32_t return_value; scmi_vendor_ext_ctx.log_api->log( MOD_LOG_GROUP_DEBUG, "[scmi_vendor_ext] message handler.\n"); - status = fwk_module_check_call(protocol_id); - if (status != FWK_SUCCESS) - return status; - static_assert( FWK_ARRAY_SIZE(handler_table) == FWK_ARRAY_SIZE(payload_size_table), "[SCMI] vendor_ext management protocol table sizes not consistent"); diff --git a/product/synquacer/module/synquacer_pik_clock/src/mod_synquacer_pik_clock.c b/product/synquacer/module/synquacer_pik_clock/src/mod_synquacer_pik_clock.c index d18074a97..c15d0d2ca 100644 --- a/product/synquacer/module/synquacer_pik_clock/src/mod_synquacer_pik_clock.c +++ b/product/synquacer/module/synquacer_pik_clock/src/mod_synquacer_pik_clock.c @@ -352,13 +352,8 @@ static int pik_clock_set_rate( uint64_t rate, enum mod_clock_round_mode round_mode) { - int status; struct pik_clock_dev_ctx *ctx; - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; - ctx = module_ctx.dev_ctx_table + fwk_id_get_element_idx(dev_id); if (!ctx->initialized) @@ -372,13 +367,8 @@ static int pik_clock_set_rate( static int pik_clock_get_rate(fwk_id_t dev_id, uint64_t *rate) { - int status; struct pik_clock_dev_ctx *ctx; - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; - if (rate == NULL) return FWK_E_PARAM; @@ -399,13 +389,8 @@ static int pik_clock_get_rate_from_index( unsigned int rate_index, uint64_t *rate) { - int status; struct pik_clock_dev_ctx *ctx; - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; - if (rate == NULL) return FWK_E_PARAM; @@ -426,10 +411,6 @@ static int pik_clock_set_state( struct pik_clock_dev_ctx *ctx; struct mod_pik_clock_rate *rate_entry; - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; - ctx = module_ctx.dev_ctx_table + fwk_id_get_element_idx(dev_id); if (ctx->config->type == MOD_PIK_CLOCK_TYPE_SINGLE_SOURCE) @@ -470,13 +451,8 @@ static int pik_clock_set_state( static int pik_clock_get_state(fwk_id_t dev_id, enum mod_clock_state *state) { - int status; struct pik_clock_dev_ctx *ctx; - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; - ctx = module_ctx.dev_ctx_table + fwk_id_get_element_idx(dev_id); if (ctx->config->type == MOD_PIK_CLOCK_TYPE_SINGLE_SOURCE) { @@ -502,13 +478,8 @@ static int pik_clock_get_state(fwk_id_t dev_id, enum mod_clock_state *state) static int pik_clock_get_range(fwk_id_t dev_id, struct mod_clock_range *range) { - int status; struct pik_clock_dev_ctx *ctx; - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; - if (range == NULL) return FWK_E_PARAM; @@ -524,13 +495,8 @@ static int pik_clock_get_range(fwk_id_t dev_id, struct mod_clock_range *range) static int pik_clock_power_state_change(fwk_id_t dev_id, unsigned int state) { - int status; struct pik_clock_dev_ctx *ctx; - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; - ctx = module_ctx.dev_ctx_table + fwk_id_get_element_idx(dev_id); if (ctx->config->is_group_member) @@ -577,10 +543,6 @@ static int pik_clock_direct_set_div( int status; struct pik_clock_dev_ctx *ctx; - status = fwk_module_check_call(clock_id); - if (status != FWK_SUCCESS) - return status; - ctx = module_ctx.dev_ctx_table + fwk_id_get_element_idx(clock_id); assert(ctx->config->is_group_member); @@ -608,13 +570,8 @@ static int pik_clock_direct_set_div( static int pik_clock_direct_set_source(fwk_id_t clock_id, uint8_t source) { - int status; struct pik_clock_dev_ctx *ctx; - status = fwk_module_check_call(clock_id); - if (status != FWK_SUCCESS) - return status; - ctx = module_ctx.dev_ctx_table + fwk_id_get_element_idx(clock_id); assert(ctx->config->is_group_member); @@ -629,13 +586,8 @@ static int pik_clock_direct_set_mod( uint32_t numerator, uint32_t denominator) { - int status; struct pik_clock_dev_ctx *ctx; - status = fwk_module_check_call(clock_id); - if (status != FWK_SUCCESS) - return status; - ctx = module_ctx.dev_ctx_table + fwk_id_get_element_idx(clock_id); assert(ctx->config->is_group_member); @@ -649,13 +601,8 @@ static int pik_clock_direct_power_state_change( fwk_id_t dev_id, unsigned int state) { - int status; struct pik_clock_dev_ctx *ctx; - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; - ctx = module_ctx.dev_ctx_table + fwk_id_get_element_idx(dev_id); if (!ctx->config->is_group_member) -- GitLab From 823bfc50cce487cc3c05b2e5b6643eebe8326579 Mon Sep 17 00:00:00 2001 From: Tarek El-Sherbiny Date: Fri, 1 Nov 2019 16:29:17 +0000 Subject: [PATCH 5/6] n1sdp/modules: Remove calls to fwk_module_check_call Remove fwk_module_check_call from sensor module in mod_n1sdp_sensor.a file. This change is to reduce memory footprint. Change-Id: I53da26c48e33e4b8f9591bc0e7f155f9eedf830d Signed-off-by: Tarek El-Sherbiny --- .../n1sdp_ddr_phy/src/mod_n1sdp_ddr_phy.c | 24 ------ .../module/n1sdp_flash/src/mod_n1sdp_flash.c | 16 ---- .../module/n1sdp_i2c/src/mod_n1sdp_i2c.c | 20 ----- product/n1sdp/module/n1sdp_mhu/src/mod_mhu.c | 5 -- .../module/n1sdp_pll/src/mod_n1sdp_pll.c | 43 ----------- .../n1sdp_sensor/lib/mod_n1sdp_sensor.a | Bin 5772 -> 5572 bytes product/n1sdp/module/n1sdp_smt/src/mod_smt.c | 69 ------------------ .../src/mod_n1sdp_timer_sync.c | 10 --- .../src/mod_scmi_ccix_config.c | 13 +--- .../scmi_management/src/mod_scmi_management.c | 13 ---- 10 files changed, 1 insertion(+), 212 deletions(-) diff --git a/product/n1sdp/module/n1sdp_ddr_phy/src/mod_n1sdp_ddr_phy.c b/product/n1sdp/module/n1sdp_ddr_phy/src/mod_n1sdp_ddr_phy.c index 0a937da34..3c8e5589e 100644 --- a/product/n1sdp/module/n1sdp_ddr_phy/src/mod_n1sdp_ddr_phy.c +++ b/product/n1sdp/module/n1sdp_ddr_phy/src/mod_n1sdp_ddr_phy.c @@ -81,17 +81,12 @@ static struct mod_log_api *log_api; */ static int n1sdp_ddr_phy_config(fwk_id_t element_id, struct dimm_info *info) { - int status; int element_idx; struct mod_n1sdp_ddr_phy_reg *ddr_phy; const struct mod_n1sdp_ddr_phy_element_config *element_config; fwk_assert(info != NULL); - status = fwk_module_check_call(element_id); - if (status != FWK_SUCCESS) - return status; - element_idx = fwk_id_get_element_idx(element_id); element_config = fwk_module_get_data(element_id); @@ -756,10 +751,6 @@ static int n1sdp_ddr_phy_post_training_configure(fwk_id_t element_id, fwk_assert(info != NULL); - status = fwk_module_check_call(element_id); - if (status != FWK_SUCCESS) - return status; - element_config = fwk_module_get_data(element_id); phy_addr = (uint32_t)element_config->ddr; rddata_valid_value = 0; @@ -858,7 +849,6 @@ static int n1sdp_ddr_phy_post_training_configure(fwk_id_t element_id, static int n1sdp_verify_phy_status(fwk_id_t element_id, uint8_t training_type, struct dimm_info *info) { - int status; const struct mod_n1sdp_ddr_phy_element_config *element_config; uint32_t i; uint32_t j; @@ -870,10 +860,6 @@ static int n1sdp_verify_phy_status(fwk_id_t element_id, fwk_assert(info != NULL); - status = fwk_module_check_call(element_id); - if (status != FWK_SUCCESS) - return status; - element_config = fwk_module_get_data(element_id); phy_base = (uint32_t)element_config->ddr; num_slices = 18; @@ -974,7 +960,6 @@ static int n1sdp_verify_phy_status(fwk_id_t element_id, static int n1sdp_wrlvl_phy_obs_regs(fwk_id_t element_id, uint32_t rank, struct dimm_info *info) { - int status; const struct mod_n1sdp_ddr_phy_element_config *element_config; uint32_t i; uint32_t j; @@ -986,10 +971,6 @@ static int n1sdp_wrlvl_phy_obs_regs(fwk_id_t element_id, fwk_assert(info != NULL); - status = fwk_module_check_call(element_id); - if (status != FWK_SUCCESS) - return status; - element_config = fwk_module_get_data(element_id); phy_addr = (uint32_t)element_config->ddr; @@ -1028,7 +1009,6 @@ static int n1sdp_wrlvl_phy_obs_regs(fwk_id_t element_id, static int n1sdp_read_gate_phy_obs_regs(fwk_id_t element_id, uint32_t rank, struct dimm_info *info) { - int status; const struct mod_n1sdp_ddr_phy_element_config *element_config; uint32_t i; uint32_t h; @@ -1039,10 +1019,6 @@ static int n1sdp_read_gate_phy_obs_regs(fwk_id_t element_id, fwk_assert(info != NULL); - status = fwk_module_check_call(element_id); - if (status != FWK_SUCCESS) - return status; - element_config = fwk_module_get_data(element_id); phy_addr = (uint32_t)element_config->ddr; diff --git a/product/n1sdp/module/n1sdp_flash/src/mod_n1sdp_flash.c b/product/n1sdp/module/n1sdp_flash/src/mod_n1sdp_flash.c index 09126f3b2..786c5ba48 100644 --- a/product/n1sdp/module/n1sdp_flash/src/mod_n1sdp_flash.c +++ b/product/n1sdp/module/n1sdp_flash/src/mod_n1sdp_flash.c @@ -42,10 +42,6 @@ static struct mod_n1sdp_flash_ctx n1sdp_flash_ctx; */ static int get_flash_descriptor_count(fwk_id_t id, unsigned int *count) { - int status = fwk_module_check_call(id); - if (status != FWK_SUCCESS) - return status; - if (count == NULL) return FWK_E_PARAM; @@ -58,10 +54,6 @@ static int get_flash_descriptor_table( fwk_id_t id, struct mod_n1sdp_flash_descriptor **table) { - int status = fwk_module_check_call(id); - if (status != FWK_SUCCESS) - return status; - if (table == NULL) return FWK_E_PARAM; @@ -72,10 +64,6 @@ static int get_flash_descriptor_table( static int get_n1sdp_fip_descriptor_count(fwk_id_t id, unsigned int *count) { - int status = fwk_module_check_call(id); - if (status != FWK_SUCCESS) - return status; - if (count == NULL) return FWK_E_PARAM; @@ -88,10 +76,6 @@ static int get_n1sdp_fip_descriptor_table( fwk_id_t id, struct mod_n1sdp_fip_descriptor **table) { - int status = fwk_module_check_call(id); - if (status != FWK_SUCCESS) - return status; - if (table == NULL) return FWK_E_PARAM; diff --git a/product/n1sdp/module/n1sdp_i2c/src/mod_n1sdp_i2c.c b/product/n1sdp/module/n1sdp_i2c/src/mod_n1sdp_i2c.c index 8a6c1cd83..c6cecfd19 100644 --- a/product/n1sdp/module/n1sdp_i2c/src/mod_n1sdp_i2c.c +++ b/product/n1sdp/module/n1sdp_i2c/src/mod_n1sdp_i2c.c @@ -231,13 +231,8 @@ static int i2c_master_read_polled(fwk_id_t device_id, { bool complete = false; unsigned int timeout; - int status; struct n1sdp_i2c_dev_ctx *device_ctx; - status = fwk_module_check_call(device_id); - if (status != FWK_SUCCESS) - return status; - fwk_assert(length != 0); device_ctx = &i2c_ctx.device_ctx_table[fwk_id_get_element_idx(device_id)]; @@ -308,14 +303,9 @@ static int i2c_master_write_polled(fwk_id_t device_id, uint16_t address, { bool complete = false; unsigned int timeout; - int status; struct n1sdp_i2c_dev_ctx *device_ctx; uint16_t sr, isr; - status = fwk_module_check_call(device_id); - if (status != FWK_SUCCESS) - return status; - fwk_assert(length != 0); device_ctx = &i2c_ctx.device_ctx_table[fwk_id_get_element_idx(device_id)]; @@ -402,13 +392,8 @@ static const struct mod_n1sdp_i2c_master_api_polled i2c_master_api_polled = { static int i2c_slave_write_irq(fwk_id_t device_id, uint8_t *data, uint8_t length) { - int status; struct n1sdp_i2c_dev_ctx *device_ctx; - status = fwk_module_check_call(device_id); - if (status != FWK_SUCCESS) - return status; - device_ctx = &i2c_ctx.device_ctx_table[fwk_id_get_element_idx(device_id)]; fwk_assert((length != 0) && (data != NULL)); @@ -443,13 +428,8 @@ static int i2c_slave_write_irq(fwk_id_t device_id, static int i2c_slave_read_irq(fwk_id_t device_id, uint8_t *data, uint8_t length) { - int status; struct n1sdp_i2c_dev_ctx *device_ctx; - status = fwk_module_check_call(device_id); - if (status != FWK_SUCCESS) - return status; - device_ctx = &i2c_ctx.device_ctx_table[fwk_id_get_element_idx(device_id)]; fwk_assert((length != 0) && (data != NULL)); diff --git a/product/n1sdp/module/n1sdp_mhu/src/mod_mhu.c b/product/n1sdp/module/n1sdp_mhu/src/mod_mhu.c index be5e34def..c2a6619bc 100644 --- a/product/n1sdp/module/n1sdp_mhu/src/mod_mhu.c +++ b/product/n1sdp/module/n1sdp_mhu/src/mod_mhu.c @@ -107,15 +107,10 @@ static void mhu_isr(void) static int raise_interrupt(fwk_id_t slot_id) { - int status; struct mhu_device_ctx *device_ctx; unsigned int slot; struct mhu_reg *reg; - status = fwk_module_check_call(slot_id); - if (status != FWK_SUCCESS) - return status; - device_ctx = &mhu_ctx.device_ctx_table[fwk_id_get_element_idx(slot_id)]; slot = fwk_id_get_sub_element_idx(slot_id); reg = (struct mhu_reg *)device_ctx->config->out; diff --git a/product/n1sdp/module/n1sdp_pll/src/mod_n1sdp_pll.c b/product/n1sdp/module/n1sdp_pll/src/mod_n1sdp_pll.c index 95aa06344..0e6876895 100644 --- a/product/n1sdp/module/n1sdp_pll/src/mod_n1sdp_pll.c +++ b/product/n1sdp/module/n1sdp_pll/src/mod_n1sdp_pll.c @@ -133,11 +133,6 @@ static int n1sdp_pll_set_rate(fwk_id_t dev_id, uint64_t rate, enum mod_clock_round_mode unused) { struct n1sdp_pll_dev_ctx *ctx = NULL; - int status; - - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; if (!fwk_module_is_valid_element_id(dev_id)) return FWK_E_PARAM; @@ -150,11 +145,6 @@ static int n1sdp_pll_set_rate(fwk_id_t dev_id, uint64_t rate, static int n1sdp_pll_get_rate(fwk_id_t dev_id, uint64_t *rate) { struct n1sdp_pll_dev_ctx *ctx = NULL; - int status; - - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; if ((!fwk_module_is_valid_element_id(dev_id)) || (rate == NULL)) return FWK_E_PARAM; @@ -169,24 +159,12 @@ static int n1sdp_pll_get_rate_from_index(fwk_id_t dev_id, unsigned int rate_index, uint64_t *rate) { - int status; - - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; - /* PLLs have a continuous range of rates and are not indexed */ return FWK_E_SUPPORT; } static int n1sdp_pll_set_state(fwk_id_t dev_id, enum mod_clock_state state) { - int status; - - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; - if (state == MOD_CLOCK_STATE_RUNNING) return FWK_SUCCESS; @@ -197,11 +175,6 @@ static int n1sdp_pll_set_state(fwk_id_t dev_id, enum mod_clock_state state) static int n1sdp_pll_get_state(fwk_id_t dev_id, enum mod_clock_state *state) { struct n1sdp_pll_dev_ctx *ctx = NULL; - int status; - - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; if ((!fwk_module_is_valid_element_id(dev_id)) || (state == NULL)) return FWK_E_PARAM; @@ -214,12 +187,6 @@ static int n1sdp_pll_get_state(fwk_id_t dev_id, enum mod_clock_state *state) static int n1sdp_pll_get_range(fwk_id_t dev_id, struct mod_clock_range *range) { - int status; - - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; - if ((!fwk_module_is_valid_element_id(dev_id)) || (range == NULL)) return FWK_E_PARAM; @@ -235,11 +202,6 @@ static int n1sdp_pll_power_state_change(fwk_id_t dev_id, unsigned int state) { uint64_t rate; struct n1sdp_pll_dev_ctx *ctx = NULL; - int status; - - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; if (!fwk_module_is_valid_element_id(dev_id)) return FWK_E_PARAM; @@ -269,11 +231,6 @@ static int n1sdp_pll_power_state_pending_change( unsigned int next_state) { struct n1sdp_pll_dev_ctx *ctx = NULL; - int status; - - status = fwk_module_check_call(dev_id); - if (status != FWK_SUCCESS) - return status; if (!fwk_module_is_valid_element_id(dev_id)) return FWK_E_PARAM; diff --git a/product/n1sdp/module/n1sdp_sensor/lib/mod_n1sdp_sensor.a b/product/n1sdp/module/n1sdp_sensor/lib/mod_n1sdp_sensor.a index d5372eb2cfaf135928efaf09d29d955ec7c48a90..0936001206c82f584a4ec1e8364f846ac2d5429d 100644 GIT binary patch delta 2501 zcmZ8ieN0nV6hD1!wXH3b(o$>@pHw0PC3J zvN@CKu3P;02P1zl=Q5&miOa}7B!(FOXhoALS!91rgV~62v%zfaoZI(ieK)!9ob&tL z^E>z6clvr{<#@?akEyo0y0W&)zxr6gsHpm)xT?}$RjWKJD=KPgszuRXb?jkra3T|E z7^}G{0uh#SZ{_{j*7nweqibbfAC$!6Z?r(+-Q>ub{OLKlJ@|UEaQa3Pj_wO>zVljS zg6$Vp^nY0&yxkLPebgrzXM$!Zc^JPKJ0PFFV3_&H1W)v{kUjL*oHYOV-}%7V$@}0V zPo3+YLG+<5$>&6ac=(ClIpxMWqgQ5ztM4YQztu&~27RF$NyCrler*q4n3|LS--$Cc z5q>WQ%X9@^*%Uev9{#%Tanj^;a(est{K>?iO8o6t9I`|9Hi9vimPSiEi`l_aDoD0SYolE#R zS{C`4qji+gk8ml6%Omzsf)i!&Lo$@kC6;g06_m8#d)iwZ{X;6=ctt9S70DpO@jSUG zIutg9Uc7uy7JRyb!iZ5eh$CS!B#d^C8A2(WAKf!+F*uN!lJg^8`GmsfBEG=ji4g97 z3Ok|(@rFz(Q?ip)8p9V47)5=?gbqLe1NIxhfR3Frd0akp5d|ww0Tyt|#BQ6suAss+ zamK`%MrJm9U9AcuamK=#?QD(Nn-f!*M$T9{69Bf;Twv?eQGpB&<*}3Il70~vb>d77 zJ7?4g!12^YPY+HF@6_-)8a_wEyEVLwL9}_vhrXk z4Y8wtUK3x|#8)-(q$Zxm*npGvm(>9e=V#DS2Ne)>YJ@*0bZwg0tBH#>ah(#=2PuoL zemOg1%@>xpv#{02c3T_Rb!#s3+X7-wM_13DeQj^{z6)=?v#TxE-u8A!Z(B!a$L@}< zUJRMX=4JbBRs8^cC}t@GI7GG_;6t(%07n%3bF!5HrxctvMeA3QT?J4>7T43}2(KrL zI$IR{1X`gAV2CWfgki;wlkHyuU_xQRow_;;9*uV;CQz?i{HYcr9BYB424Fj_Pvbob zUZmK7!Y`n>HnkC2zl{nCm``>wfP{7vIqeD{E0!0=L|$-pYC{&ZorKP*>I|~{xM-;g#k?`lauu}HJ%s0R%epdyY++UgTW`;0 zTdgiOk-3Y#V)tD_YGEPdTtKtK% z$IA9Pv)66HFkRt$RG3hyJ6t}u=YbXHOzB~^j?D_vm=Do9-6 zQ)JQ=ZlZ#S7%5nAstVtspRVu?Dm0S9;%|{jS9qieW+|s0vMr0<|d(JF~gmuALfm1a)_?ELXPcq^6=3-=oMc`ZG<% z^H?!}igaXZN44Swjdm$2bdmO&pA?2pO5+qV1KdkJkmi?l4IMq+u1a~>Kdu$F4GZz} dfN(y-WvnvCYkYw3w}riw<1;?Mz1%@B`#+)jqc;Em literal 5772 zcmb7He{5UT6+X{)f^pN5q%93;T3(ulrcLA8X_AJLQKw0qrfJ%&Nl~`~wqw8YtU9r= zU!WKyvVtalZcOVRWoQzNX+j%lX-6mVM+6%hnoyDAmQJNXPz_DMidfnXu*ydFo%`Oi zpC5E=M>;Zk7 zd||LWc;$<)uDF8kqjE4c;}hPZ!CJLCduZ!*XQpbOQR#eu7N4J@MYBDsBP$0-@~h-i z%l`B+HKb-Zw@>Bld@eb^(Dm+z%-eaqELd5$Bv|vRBr|)HV66gcRrUv4uX{(YHAO3G zDrf74UG)KhQp4e+BsZlyX97m6jQEs!sdFYde+_==Rpzg(>pWf|*p~|ChmS7UQBmKN zZ47g3;qcz04QfUG-Yk31hGnpFeG3bdKw3VY-}Qd}&p&x+`sq9kQ%hj}m8saSF0~;` z%?DU4+$vjPu1xL=_IdG=`NZu`<$-62?>gJ9Gnjgu#eckz0 z0Y{D+xZI^m?SYPl?9aDuJDG{^`e!y=cD`=`HD8?lUHk#{nPaZ=kGtth=R7Tb_Or{P z&)v_T!hCXnO}(`w;tY=Fo6ouA$G&u~o?G@_p5)ih|FW%X;QjoPKOElL5PUE1I``|d zTHmp`%WAQ&XZr7tQ@ylmx#|uc>6aQF&6DrB4}IHx1OCBW`1=QF-FIfkvb1jV?5=ro zN*ue`$?0^=QtX&bywvv+l-YpC9w4ITP>>1ej1{Yc-5Q&of2+s}rb(=#8< z|M<6;Xi6-~+2;dn4|;mL-#P(#U_$t>(N|kI?t@OD?2_maD(Bez7IMKagAaM>@i~=k z>bRr+(6s1fQ*^d>d+%VC`t;VZT+iUCa1JFcM~&S(w{F|@`IXG+aQ6-=*d7jS@7~!x zc}~4?V7Yq4$k!lV?plsob80bK zJ?N58s$64ET`JIXIHzB238c0?^WDFls12aZbLw#7`oLV`_sIa!lekMB#TD|%jYLoI ze4BI3^UI>?20MeO4tgz4TB<*Vv+1bknRmYee?|`02g`19tX@16yX2((mz>hNVC>R@ zN@$h7KA+_F1#(fGKMoYdrd zBXKQ0ahJS5nU?jJ0=x);IUCX9$%%RkuNFybN=%NW10&N;91Vdn_60Z{?3-WTU#bmv52Ou zl{a}edi^p-eI2c>ct4bc63HO3uY32<2F2iL+0-(Yj!a-V)5<+@G2yKp{+oT9?x1e& zdqjzh#Ywse#j>6x*5_c$&?YKhc+JqYj%wEuX{of#StH#b)k-V*Q=wE!_n(VgNOO$$ zr~@9ex}mzbZ2PsG)*``po_`0G3;d`K#&5X|@1~82GCmA-fSLJkhw9?C;XO2j1mk<5 z4)O?m0A*b~HhcwzkYN0~_;Fwq%>NVzgjCq@i|BsDIjsr&B7v6+_(e8+CH=_2r(hk} zjm)2b>cYFTC{C&t`C`QGFD|A~a?(;8eyJ_L%$8qf%h%ZQd{Tc z>k$nv2L4_|5{a=$^gt;(!!JW=h!JQ{*2%qh#nBtMKm4@ai0nuh#e%$9~iC| z$z&9e3W{-2F&U*$NZfa!cx$Xsj*U+yicV`hTXZ5Z3oJ7^W;PwqgtYroinV{Dzu)x7 ziSIuLjtcKy4{qEgZ1D>4J?CiE?@A9YwrV4e5P7gbe6LyawMM+jumL0gL-yNoPqFPF zI?Q$x(Ges53$~p^zcS)o*aM93WqUK;KeoW{Fyf%okwn~5B9mW;oC_|9rsK@7%tymXW@m9g|`6}?j=QGSc-vVsO zo4IdXi;Tf)Y2B)339qI`UOdYY@{VOPaKN&UiZ=i_!2j5v5# z$=QzJRZ#k2yh>7Ra~`AD{Khh`2_>d?DV^kb@P5-#5S&K7WMGk09F_HoB?-|No^Zdn z?VAy$V=6+i00yCPFYtj4O+?0(0*^@>O^)*|MqYe3c_W&Zj*m^^+ZRjzzY4asc*@5c98uGKQ6X zzH_(_<~RZl zZC1WK{9dRjCLiC0R=!UxeEgMQ@=c>`!Z$DGGZI&0IR=$db_;ZLD_Yc$szQ3Ss z<*UO2^0%QWX8%qiVC6duz5rs($6qOC|1P0y<$DSVo>NmyzJDNK<$D`^O^7jHCDi0w z05TqvxvvQKqNRI<@)`s=Zth#gS@){hZUaEpcK?NTeW=In;_IT&ZoiGM4SeR@0w!>5 zdu)8`F&T_wKK`0D#}PL8_^n{+0w3=!Qy2#b9kSux1}qH^prC9RtU6#_|SmQ=+8*AT7r6R}`>jg{2Q( zLnQu48d%1$urreg->GCNT_TIMEOUT = device_ctx->config->sync_timeout; @@ -136,14 +131,9 @@ static int n1sdp_sync_master_timer(fwk_id_t id) static int n1sdp_sync_slave_timer(fwk_id_t id) { - int status; struct tsync_device_ctx *device_ctx; unsigned int irq; - status = fwk_module_check_call(id); - if (status != FWK_SUCCESS) - return status; - device_ctx = &tsync_ctx.device_ctx_table[fwk_id_get_element_idx(id)]; irq = device_ctx->config->irq; diff --git a/product/n1sdp/module/scmi_ccix_config/src/mod_scmi_ccix_config.c b/product/n1sdp/module/scmi_ccix_config/src/mod_scmi_ccix_config.c index 76168143f..5fe5e31e4 100644 --- a/product/n1sdp/module/scmi_ccix_config/src/mod_scmi_ccix_config.c +++ b/product/n1sdp/module/scmi_ccix_config/src/mod_scmi_ccix_config.c @@ -343,15 +343,9 @@ static int scmi_ccix_config_protocol_enter_system_coherency( static int scmi_ccix_config_get_scmi_protocol_id(fwk_id_t protocol_id, uint8_t *scmi_protocol_id) { - int status = FWK_SUCCESS; - - status = fwk_module_check_call(protocol_id); - if (status != FWK_SUCCESS) - return status; - *scmi_protocol_id = SCMI_PROTOCOL_ID_CCIX_CONFIG; - return status; + return FWK_SUCCESS; } static int scmi_ccix_config_message_handler(fwk_id_t protocol_id, @@ -360,13 +354,8 @@ static int scmi_ccix_config_message_handler(fwk_id_t protocol_id, size_t payload_size, unsigned int message_id) { - int status; int32_t return_value; - status = fwk_module_check_call(protocol_id); - if (status != FWK_SUCCESS) - return status; - static_assert(FWK_ARRAY_SIZE(handler_table) == FWK_ARRAY_SIZE(payload_size_table), "[SCMI] CCIX_CONFIG management protocol table sizes not consistent"); diff --git a/product/n1sdp/module/scmi_management/src/mod_scmi_management.c b/product/n1sdp/module/scmi_management/src/mod_scmi_management.c index 7a27ebea6..01c3f7071 100644 --- a/product/n1sdp/module/scmi_management/src/mod_scmi_management.c +++ b/product/n1sdp/module/scmi_management/src/mod_scmi_management.c @@ -217,12 +217,6 @@ exit: static int scmi_management_get_scmi_protocol_id(fwk_id_t protocol_id, uint8_t *scmi_protocol_id) { - int status; - - status = fwk_module_check_call(protocol_id); - if (status != FWK_SUCCESS) - return status; - *scmi_protocol_id = SCMI_PROTOCOL_ID_MANAGEMENT; return FWK_SUCCESS; @@ -235,7 +229,6 @@ static int scmi_management_message_handler( size_t payload_size, unsigned int message_id) { - int status; int32_t return_value; static_assert(FWK_ARRAY_SIZE(handler_table) == @@ -243,19 +236,13 @@ static int scmi_management_message_handler( "[SCMI] Management protocol table sizes not consistent"); assert(payload != NULL); - status = fwk_module_check_call(protocol_id); - if (status != FWK_SUCCESS) - return status; - if (message_id >= FWK_ARRAY_SIZE(handler_table)) { return_value = SCMI_NOT_SUPPORTED; - status = FWK_E_RANGE; goto error; } if (payload_size != payload_size_table[message_id]) { return_value = SCMI_PROTOCOL_ERROR; - status = FWK_E_SIZE; goto error; } -- GitLab From 18256c200db4ff71cb2c67797a03ff4277b25af6 Mon Sep 17 00:00:00 2001 From: Tarek El-Sherbiny Date: Fri, 1 Nov 2019 17:13:37 +0000 Subject: [PATCH 6/6] fwk: Delete fwk_module_check_call implementation This change deletes fwk_module_check_call and related tests to reduce memory footprint. Change-Id: I55ba460e16d48fe1fd31b23a9cd9cc7b44cd9491 Signed-off-by: Tarek El-Sherbiny --- framework/include/fwk_module.h | 14 --------- framework/src/fwk_module.c | 26 ---------------- framework/test/test_fwk_module.c | 51 -------------------------------- 3 files changed, 91 deletions(-) diff --git a/framework/include/fwk_module.h b/framework/include/fwk_module.h index f1c533e78..f5bdd14d0 100644 --- a/framework/include/fwk_module.h +++ b/framework/include/fwk_module.h @@ -424,20 +424,6 @@ const char *fwk_module_get_name(fwk_id_t id); */ const void *fwk_module_get_data(fwk_id_t id); -/*! - * \brief Check whether a module or element is in a state where it can accept - * calls to one of its APIs. - * - * \param id Identifier of a module or element. - * - * \retval FWK_SUCCESS The module or element can service API calls. - * \retval FWK_E_PARAM The identifier is invalid. - * \retval FWK_E_INIT The module or element is not initialized. - * \retval FWK_E_STATE The module or element is suspended. - * - */ -int fwk_module_check_call(fwk_id_t id); - /*! * \brief Bind to an API of a module or an element. * diff --git a/framework/src/fwk_module.c b/framework/src/fwk_module.c index f42b1a29e..6e9fff23e 100644 --- a/framework/src/fwk_module.c +++ b/framework/src/fwk_module.c @@ -616,32 +616,6 @@ const void *fwk_module_get_data(fwk_id_t id) return NULL; } -int fwk_module_check_call(fwk_id_t id) -{ - int status; - enum fwk_module_state state; - - status = __fwk_module_get_state(id, &state); - if (status != FWK_SUCCESS) - goto error; - - if (state == FWK_MODULE_STATE_UNINITIALIZED) { - status = FWK_E_INIT; - goto error; - } - - if (state == FWK_MODULE_STATE_SUSPENDED) { - status = FWK_E_STATE; - goto error; - } - - return FWK_SUCCESS; - -error: - FWK_HOST_PRINT(err_msg_func, status, __func__); - return status; -} - int fwk_module_bind(fwk_id_t target_id, fwk_id_t api_id, const void *api) { int status = FWK_E_PARAM; diff --git a/framework/test/test_fwk_module.c b/framework/test/test_fwk_module.c index a3f00c4d8..2706dbe19 100644 --- a/framework/test/test_fwk_module.c +++ b/framework/test/test_fwk_module.c @@ -986,55 +986,6 @@ static void test_fwk_module_get_data(void) assert(result == NULL); } -static void test_fwk_module_check_call_failed(void) -{ - int result; - fwk_id_t id; - struct fwk_module_ctx *module_ctx; - - /* The ID is invalid, so that __fwk_module_get_state fails */ - id = FWK_ID_ELEMENT(0xEF, 0xDBE); - result = fwk_module_check_call(id); - assert(result == FWK_E_PARAM); - - /* The modules are not successfully initialized */ - init_return_val = FWK_E_PARAM; - __fwk_module_reset(); - __fwk_module_init(); - - /* Module 0 is not initialized */ - id = MODULE0_ID; - result = fwk_module_check_call(id); - assert(result == FWK_E_INIT); - - /* Force module 0 in FWK_MODULE_STATE_SUSPENDED state */ - module_ctx = __fwk_module_get_ctx(id); - module_ctx->state = FWK_MODULE_STATE_SUSPENDED; - result = fwk_module_check_call(id); - assert(result == FWK_E_STATE); -} - -static void test_fwk_module_check_call_succeed(void) -{ - int result; - fwk_id_t id; - - /* Force the modules to be initialized but not bound */ - bind_return_val = FWK_E_PARAM; - __fwk_module_reset(); - result = __fwk_module_init(); - - /* The module is initialized so the function should return successfully */ - id = MODULE0_ID; - result = fwk_module_check_call(id); - assert(result == FWK_SUCCESS); - - /* The element is initialized so the function should return successfully */ - id = ELEM0_ID; - result = fwk_module_check_call(id); - assert(result == FWK_SUCCESS); -} - static void test_fwk_module_bind_stage_failure(void) { int result; @@ -1154,8 +1105,6 @@ static const struct fwk_test_case_desc test_case_table[] = { FWK_TEST_CASE(test_fwk_module_get_sub_element_count), FWK_TEST_CASE(test_fwk_module_get_name), FWK_TEST_CASE(test_fwk_module_get_data), - FWK_TEST_CASE(test_fwk_module_check_call_failed), - FWK_TEST_CASE(test_fwk_module_check_call_succeed), FWK_TEST_CASE(test_fwk_module_bind_stage_failure), FWK_TEST_CASE(test_fwk_module_bind) }; -- GitLab