diff options
| author | Chris Kay <chris.kay@arm.com> | 2020-01-10 15:08:26 +0000 |
|---|---|---|
| committer | jimqui01 <54316584+jimqui01@users.noreply.github.com> | 2020-03-24 17:52:55 +0000 |
| commit | 33b85df623d4032e790db2f366950f713b33a4f0 (patch) | |
| tree | d1e04802c7014842a8a7beb8d5dd0fe4e0b6bc17 /product | |
| parent | 819690283526d1d768dcea49b47bdb51c1de6e55 (diff) | |
fwk: Integrate logging functionality into the framework
This commit moves the message logging functionality, previously only
available through the logging module, into the framework as a
free-function interface.
A number of improvements to this interface have been made, owing to the
tighter integration this new interface has with the framework and its
scheduler:
- Simplistic synchronous logging can be enabled before the framework
has fully initialized
- Message logging may be filtered at preprocessing-time to reduce
the size of the code and read-only data sections in the firmware
binary
- Logging is deprioritized at runtime to reduce response latency caused
by logging to output devices
Change-Id: I5112df359df8a304a176e68994e2408d91f6ac89
Signed-off-by: Chris Kay <chris.kay@arm.com>
Diffstat (limited to 'product')
78 files changed, 542 insertions, 1342 deletions
diff --git a/product/host/fw/config_log.c b/product/host/fw/config_log.c index 80da36bd..9d3a1f36 100644 --- a/product/host/fw/config_log.c +++ b/product/host/fw/config_log.c @@ -17,13 +17,7 @@ static const struct mod_log_config log_data = { .device_id = FWK_ID_MODULE_INIT(FWK_MODULE_IDX_HOST_CONSOLE), .api_id = FWK_ID_API_INIT(FWK_MODULE_IDX_HOST_CONSOLE, 0), - .log_groups = MOD_LOG_GROUP_ERROR | - MOD_LOG_GROUP_INFO | - MOD_LOG_GROUP_WARNING | - MOD_LOG_GROUP_DEBUG, - .banner = FWK_BANNER_SCP - "Host Firmware\n" - BUILD_VERSION_DESCRIBE_STRING "\n", + .banner = FWK_BANNER_SCP "Host Firmware" BUILD_VERSION_DESCRIBE_STRING, }; const struct fwk_module_config config_log = { diff --git a/product/juno/module/juno_dmc400/src/mod_juno_dmc400.c b/product/juno/module/juno_dmc400/src/mod_juno_dmc400.c index 87612290..513b5692 100644 --- a/product/juno/module/juno_dmc400/src/mod_juno_dmc400.c +++ b/product/juno/module/juno_dmc400/src/mod_juno_dmc400.c @@ -39,7 +39,6 @@ struct juno_dmc400_ctx { const struct mod_juno_dmc400_ddr_phy_api *ddr_phy_api; const struct mod_timer_api *timer_api; unsigned int dmc_refclk_ratio; - const struct mod_log_api *log_api; }; static struct juno_dmc400_ctx ctx; @@ -614,7 +613,7 @@ static int ddr_training(fwk_id_t id) return FWK_SUCCESS; timeout: - FWK_LOG_WARN(ctx.log_api, "[DMC] Training time-out\n"); + FWK_LOG_WARN("[DMC] Training time-out"); return FWK_E_TIMEOUT; } @@ -650,7 +649,7 @@ static int ddr_retraining(fwk_id_t id) fwk_interrupt_enable(PHY_TRAINING_IRQ); - FWK_LOG_TRACE(ctx.log_api, "[DMC] Re-training done\n"); + FWK_LOG_INFO("[DMC] Re-training done"); return FWK_SUCCESS; } @@ -880,11 +879,6 @@ static int juno_dmc400_bind(fwk_id_t id, unsigned int round) module_config = fwk_module_get_data(fwk_module_id_juno_dmc400); fwk_assert(module_config != NULL); - status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_LOG), - MOD_LOG_API_ID, &ctx.log_api); - if (status != FWK_SUCCESS) - return status; - status = fwk_module_bind(module_config->ddr_phy_module_id, module_config->ddr_phy_api_id, &ctx.ddr_phy_api); if (status != FWK_SUCCESS) @@ -910,8 +904,7 @@ static int juno_dmc400_start(fwk_id_t id) return FWK_SUCCESS; if (SCC->GPR0 & SCC_GPR0_DDR_DISABLE) { - FWK_LOG_TRACE( - ctx.log_api, "[DMC] GPR_0 disable flag set: skipping init"); + FWK_LOG_INFO("[DMC] GPR_0 disable flag set: skipping init"); return FWK_SUCCESS; } @@ -927,8 +920,7 @@ static int juno_dmc400_start(fwk_id_t id) ctx.dmc_refclk_ratio = (DDR_FREQUENCY_MHZ * FWK_MHZ) / CLOCK_RATE_REFCLK; fwk_assert(ctx.dmc_refclk_ratio > 0); - FWK_LOG_TRACE( - ctx.log_api, "[DMC] Initializing DMC-400 at 0x%x\n", (uintptr_t)dmc); + FWK_LOG_INFO("[DMC] Initializing DMC-400 at 0x%x", (uintptr_t)dmc); status = ddr_clk_init(id); if (status != FWK_SUCCESS) @@ -964,7 +956,7 @@ static int juno_dmc400_start(fwk_id_t id) dmc->INTEG_CFG = 0x00000000; dmc->INTEG_OUTPUTS = 0x00000000; - FWK_LOG_TRACE(ctx.log_api, "[DMC] DDR Ready\n"); + FWK_LOG_INFO("[DMC] DDR Ready"); /* Switch to READY */ dmc->MEMC_CMD = DMC400_CMD_GO; diff --git a/product/juno/module/juno_hdlcd/src/mod_juno_hdlcd.c b/product/juno/module/juno_hdlcd/src/mod_juno_hdlcd.c index 109663ee..d720a197 100644 --- a/product/juno/module/juno_hdlcd/src/mod_juno_hdlcd.c +++ b/product/juno/module/juno_hdlcd/src/mod_juno_hdlcd.c @@ -12,15 +12,16 @@ #include <mod_clock.h> #include <mod_juno_hdlcd.h> -#include <mod_log.h> #include <fwk_assert.h> #include <fwk_id.h> +#include <fwk_log.h> #include <fwk_mm.h> #include <fwk_module.h> #include <fwk_module_idx.h> #include <fwk_status.h> +#include <inttypes.h> #include <stddef.h> #include <stdint.h> @@ -45,7 +46,6 @@ struct juno_hdlcd_dev_ctx { struct juno_hdlcd_ctx { const struct mod_juno_hdlcd_config *config; - const struct mod_log_api *log_api; /* Shared PLL rate value */ uint32_t current_pll_rate; @@ -107,8 +107,8 @@ static int round_rate(struct juno_hdlcd_dev_ctx *ctx, static void enable_pll(fwk_id_t clock_id, struct juno_hdlcd_dev_ctx *ctx) { - module_ctx.log_api->log(MOD_LOG_GROUP_INFO, - "[HDLCD%u] Setting PLL R0:0x%08x R1:0x%08x\n", + FWK_LOG_INFO( + "[HDLCD%u] Setting PLL R0:0x%" PRIX32 " R1:0x%" PRIX32, fwk_id_get_element_idx(clock_id), ctx->config->lookup_table[ctx->index].pll.REG0, ctx->config->lookup_table[ctx->index].pll.REG1); @@ -191,8 +191,9 @@ static int juno_hdlcd_set_rate(fwk_id_t clock_id, uint64_t rate, *ctx->config->scc_control &= ~SCC_HDLCD_CONTROL_PXLCLK_SEL; *ctx->config->scc_control |= SCC_HDLCD_CONTROL_PXLCLK_SEL_CLKIN; - module_ctx.log_api->log(MOD_LOG_GROUP_INFO, - "[HDLCD%u]: Request:%uHz\n", fwk_id_get_element_idx(clock_id), + FWK_LOG_INFO( + "[HDLCD%u]: Request:%" PRIu32 "Hz", + fwk_id_get_element_idx(clock_id), rounded_rate); return FWK_SUCCESS; @@ -206,8 +207,9 @@ static int juno_hdlcd_set_rate(fwk_id_t clock_id, uint64_t rate, *ctx->config->scc_control &= ~SCC_HDLCD_CONTROL_PXLCLK_SEL; *ctx->config->scc_control |= SCC_HDLCD_CONTROL_PXLCLK_SEL_PLL; - module_ctx.log_api->log(MOD_LOG_GROUP_INFO, - "[HDLCD%u]: Request:%uHz\n", fwk_id_get_element_idx(clock_id), + FWK_LOG_INFO( + "[HDLCD%u]: Request:%" PRIu32 "Hz", + fwk_id_get_element_idx(clock_id), rounded_rate); return FWK_SUCCESS; @@ -223,8 +225,10 @@ static int juno_hdlcd_set_rate(fwk_id_t clock_id, uint64_t rate, ((unsigned int)ctx->index >= ctx->config->lookup_table_count)) return FWK_E_RANGE; - module_ctx.log_api->log(MOD_LOG_GROUP_INFO, "[HDLCD%u] Entry index:%d\n", - fwk_id_get_element_idx(clock_id), ctx->index); + FWK_LOG_INFO( + "[HDLCD%u] Entry index:%d", + fwk_id_get_element_idx(clock_id), + ctx->index); /* Hold PLL in reset during the configuration process */ SCC->PLL[PLL_IDX_HDLCD].REG0 = (PLL_REG0_PLL_RESET | PLL_REG0_HARD_BYPASS); @@ -235,8 +239,7 @@ static int juno_hdlcd_set_rate(fwk_id_t clock_id, uint64_t rate, status = ctx->driver_api->set_rate_from_index(ctx->config->driver_id, ctx->index); if ((status != FWK_PENDING) && (status != FWK_SUCCESS)) { - module_ctx.log_api->log(MOD_LOG_GROUP_ERROR, - "[HDLCD] Failed to set board clock\n"); + FWK_LOG_ERR("[HDLCD] Failed to set board clock"); return FWK_E_DEVICE; } if (status == FWK_PENDING) @@ -365,15 +368,8 @@ static int juno_hdlcd_bind(fwk_id_t id, unsigned int round) if (round > 0) return FWK_SUCCESS; - if (fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) { - /* Bind to the log */ - status = fwk_module_bind(fwk_module_id_log, MOD_LOG_API_ID, - &module_ctx.log_api); - if (status != FWK_SUCCESS) - return FWK_E_HANDLER; - + if (fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) return FWK_SUCCESS; - } ctx = ctx_table + fwk_id_get_element_idx(id); diff --git a/product/juno/module/juno_ppu/src/juno_ppu.h b/product/juno/module/juno_ppu/src/juno_ppu.h index 8ee65dcd..2a239e3e 100644 --- a/product/juno/module/juno_ppu/src/juno_ppu.h +++ b/product/juno/module/juno_ppu/src/juno_ppu.h @@ -54,9 +54,6 @@ struct module_ctx { /* Table of element context structures */ struct ppu_ctx *ppu_ctx_table; - /* Log module API */ - const struct mod_log_api *log_api; - /* Timer alarm API */ const struct mod_timer_alarm_api *alarm_api; 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 92696c97..7db8d4ab 100644 --- a/product/juno/module/juno_ppu/src/mod_juno_ppu.c +++ b/product/juno/module/juno_ppu/src/mod_juno_ppu.c @@ -417,7 +417,7 @@ static int css_set_state(fwk_id_t ppu_id, unsigned int state) /* Fall through */ case MOD_SYSTEM_POWER_POWER_STATE_SLEEP0: - juno_ppu_ctx.log_api->flush(); + FWK_LOG_FLUSH(); enable_scp_remap(); @@ -833,11 +833,6 @@ static int juno_ppu_bind(fwk_id_t id, unsigned int round) return FWK_SUCCESS; if (fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) { - status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_LOG), - MOD_LOG_API_ID, &juno_ppu_ctx.log_api); - if (status != FWK_SUCCESS) - return FWK_E_HANDLER; - #if BUILD_HAS_MOD_TIMER config = fwk_module_get_data(fwk_module_id_juno_ppu); diff --git a/product/juno/module/juno_rom/src/mod_juno_rom.c b/product/juno/module/juno_rom/src/mod_juno_rom.c index 62faae77..5ca0b6ef 100644 --- a/product/juno/module/juno_rom/src/mod_juno_rom.c +++ b/product/juno/module/juno_rom/src/mod_juno_rom.c @@ -51,7 +51,6 @@ static struct { const struct mod_juno_rom_config *config; const struct mod_juno_ppu_rom_api *ppu_api; - struct mod_log_api *log_api; struct mod_bootloader_api *bootloader_api; unsigned int notification_count; unsigned int boot_map_little; @@ -183,8 +182,7 @@ static int deferred_setup(void) FWK_ARRAY_SIZE(core_ppu_table_little)); if (status != FWK_SUCCESS) { - FWK_LOG_ERR( - ctx.log_api, "[ROM] ERROR: Failed to turn on LITTLE cluster.\n"); + FWK_LOG_ERR("[ROM] ERROR: Failed to turn on LITTLE cluster."); return FWK_E_DEVICE; } @@ -195,8 +193,7 @@ static int deferred_setup(void) FWK_ARRAY_SIZE(core_ppu_table_big)); if (status != FWK_SUCCESS) { - FWK_LOG_ERR( - ctx.log_api, "[ROM] ERROR: Failed to turn on big cluster.\n"); + FWK_LOG_ERR("[ROM] ERROR: Failed to turn on big cluster."); return FWK_E_DEVICE; } @@ -220,10 +217,7 @@ static int deferred_setup(void) status = ctx.bootloader_api->load_image(); - FWK_LOG_ERR( - ctx.log_api, - "[ROM] ERROR: Failed to load RAM firmware image: %d\n", - status); + FWK_LOG_ERR("[ROM] ERROR: Failed to load RAM firmware image: %d", status); return FWK_E_DATA; } @@ -262,10 +256,6 @@ static int juno_rom_bind(fwk_id_t id, unsigned int round) if (!fwk_expect(status == FWK_SUCCESS)) return FWK_E_PANIC; - status = fwk_module_bind(fwk_module_id_log, MOD_LOG_API_ID, &ctx.log_api); - if (!fwk_expect(status == FWK_SUCCESS)) - return FWK_E_PANIC; - status = fwk_module_bind( fwk_module_id_bootloader, FWK_ID_API(FWK_MODULE_IDX_BOOTLOADER, 0), @@ -349,9 +339,8 @@ static int juno_rom_process_event( if (SCC->APP_ALT_BOOT != 0) { if ((SCC->APP_ALT_BOOT & 0x3) != 0) { FWK_LOG_ERR( - ctx.log_api, "[ROM] ERROR: Alternative AP ROM address does not have 4 byte " - "alignment\n"); + "alignment"); return FWK_E_ALIGN; } diff --git a/product/juno/module/juno_thermal/src/mod_juno_thermal.c b/product/juno/module/juno_thermal/src/mod_juno_thermal.c index 29e27a8d..3fad826b 100644 --- a/product/juno/module/juno_thermal/src/mod_juno_thermal.c +++ b/product/juno/module/juno_thermal/src/mod_juno_thermal.c @@ -34,7 +34,6 @@ enum mod_juno_thermal_event_idx { MOD_JUNO_THERMAL_EVENT_IDX_COUNT, }; -static const struct mod_log_api *log_api; static const struct mod_pd_restricted_api *pd_api; static const fwk_id_t systop_pd_id = @@ -144,14 +143,8 @@ static int juno_thermal_bind(fwk_id_t id, unsigned int round) if (fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) { /* Bind to power domain - only binding to module is allowed */ - status = fwk_module_bind( - fwk_module_id_power_domain, - mod_pd_api_id_restricted, - &pd_api); - if (status != FWK_SUCCESS) - return FWK_E_PANIC; - - return fwk_module_bind(fwk_module_id_log, MOD_LOG_API_ID, &log_api); + return fwk_module_bind( + fwk_module_id_power_domain, mod_pd_api_id_restricted, &pd_api); } ctx = &ctx_table[fwk_id_get_element_idx(id)]; @@ -204,7 +197,7 @@ static int juno_thermal_start(fwk_id_t id) static int check_threshold_breach(uint64_t temperature, uint64_t threshold) { if (temperature > threshold) { - FWK_LOG_WARN(log_api, "[THERMAL] system shutdown\n"); + FWK_LOG_WARN("[THERMAL] system shutdown"); return pd_api->system_shutdown(MOD_PD_SYSTEM_FORCED_SHUTDOWN); } diff --git a/product/juno/scp_ramfw/config_log.c b/product/juno/scp_ramfw/config_log.c index 1a7da35d..8722ffe9 100644 --- a/product/juno/scp_ramfw/config_log.c +++ b/product/juno/scp_ramfw/config_log.c @@ -50,17 +50,8 @@ struct fwk_module_config config_pl011 = { static const struct mod_log_config log_data = { .device_id = FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PL011, 0), .api_id = FWK_ID_API_INIT(FWK_MODULE_IDX_PL011, 0), - #ifdef BUILD_MODE_DEBUG - .log_groups = MOD_LOG_GROUP_ERROR | - MOD_LOG_GROUP_INFO | - MOD_LOG_GROUP_WARNING | - MOD_LOG_GROUP_DEBUG, - #else - .log_groups = MOD_LOG_GROUP_ERROR, - #endif - .banner = FWK_BANNER_SCP - FWK_BANNER_RAM_FIRMWARE - BUILD_VERSION_DESCRIBE_STRING "\n", + .banner = + FWK_BANNER_SCP FWK_BANNER_RAM_FIRMWARE BUILD_VERSION_DESCRIBE_STRING, }; struct fwk_module_config config_log = { diff --git a/product/juno/scp_romfw/config_log.c b/product/juno/scp_romfw/config_log.c index c449fde3..eb645991 100644 --- a/product/juno/scp_romfw/config_log.c +++ b/product/juno/scp_romfw/config_log.c @@ -55,17 +55,8 @@ struct fwk_module_config config_pl011 = { static const struct mod_log_config log_data = { .device_id = FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PL011, 0), .api_id = FWK_ID_API_INIT(FWK_MODULE_IDX_PL011, 0), - #ifdef BUILD_MODE_DEBUG - .log_groups = MOD_LOG_GROUP_ERROR | - MOD_LOG_GROUP_INFO | - MOD_LOG_GROUP_WARNING | - MOD_LOG_GROUP_DEBUG, - #else - .log_groups = MOD_LOG_GROUP_ERROR, - #endif - .banner = FWK_BANNER_SCP - FWK_BANNER_ROM_FIRMWARE - BUILD_VERSION_DESCRIBE_STRING "\n", + .banner = + FWK_BANNER_SCP FWK_BANNER_ROM_FIRMWARE BUILD_VERSION_DESCRIBE_STRING, }; struct fwk_module_config config_log = { diff --git a/product/juno/scp_romfw_bypass/config_log.c b/product/juno/scp_romfw_bypass/config_log.c index c449fde3..eb645991 100644 --- a/product/juno/scp_romfw_bypass/config_log.c +++ b/product/juno/scp_romfw_bypass/config_log.c @@ -55,17 +55,8 @@ struct fwk_module_config config_pl011 = { static const struct mod_log_config log_data = { .device_id = FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PL011, 0), .api_id = FWK_ID_API_INIT(FWK_MODULE_IDX_PL011, 0), - #ifdef BUILD_MODE_DEBUG - .log_groups = MOD_LOG_GROUP_ERROR | - MOD_LOG_GROUP_INFO | - MOD_LOG_GROUP_WARNING | - MOD_LOG_GROUP_DEBUG, - #else - .log_groups = MOD_LOG_GROUP_ERROR, - #endif - .banner = FWK_BANNER_SCP - FWK_BANNER_ROM_FIRMWARE - BUILD_VERSION_DESCRIBE_STRING "\n", + .banner = + FWK_BANNER_SCP FWK_BANNER_ROM_FIRMWARE BUILD_VERSION_DESCRIBE_STRING, }; struct fwk_module_config config_log = { diff --git a/product/n1sdp/mcp_ramfw/config_log.c b/product/n1sdp/mcp_ramfw/config_log.c index fb3433ea..8e8f97f2 100644 --- a/product/n1sdp/mcp_ramfw/config_log.c +++ b/product/n1sdp/mcp_ramfw/config_log.c @@ -49,13 +49,8 @@ struct fwk_module_config config_pl011 = { static const struct mod_log_config log_data = { .device_id = FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PL011, 0), .api_id = FWK_ID_API_INIT(FWK_MODULE_IDX_PL011, 0), - .log_groups = MOD_LOG_GROUP_ERROR | - MOD_LOG_GROUP_INFO | - MOD_LOG_GROUP_WARNING | - MOD_LOG_GROUP_DEBUG, - .banner = FWK_BANNER_MCP - FWK_BANNER_RAM_FIRMWARE - BUILD_VERSION_DESCRIBE_STRING "\n", + .banner = + FWK_BANNER_MCP FWK_BANNER_RAM_FIRMWARE BUILD_VERSION_DESCRIBE_STRING, }; struct fwk_module_config config_log = { diff --git a/product/n1sdp/mcp_romfw/config_log.c b/product/n1sdp/mcp_romfw/config_log.c index bf4412b0..cf000eda 100644 --- a/product/n1sdp/mcp_romfw/config_log.c +++ b/product/n1sdp/mcp_romfw/config_log.c @@ -20,7 +20,7 @@ /* * N1SDP BYPASS ROM firmware banner string. */ -#define N1SDP_BANNER_ROM_FIRMWARE "Entered BYPASS ROM Firmware\n" +#define N1SDP_BANNER_ROM_FIRMWARE "Entered BYPASS ROM Firmware" /* * PL011 module @@ -54,13 +54,8 @@ struct fwk_module_config config_pl011 = { static const struct mod_log_config log_data = { .device_id = FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PL011, 0), .api_id = FWK_ID_API_INIT(FWK_MODULE_IDX_PL011, 0), - .log_groups = MOD_LOG_GROUP_ERROR | - MOD_LOG_GROUP_INFO | - MOD_LOG_GROUP_WARNING | - MOD_LOG_GROUP_DEBUG, - .banner = FWK_BANNER_MCP - N1SDP_BANNER_ROM_FIRMWARE - BUILD_VERSION_DESCRIBE_STRING "\n", + .banner = + FWK_BANNER_MCP N1SDP_BANNER_ROM_FIRMWARE BUILD_VERSION_DESCRIBE_STRING, }; struct fwk_module_config config_log = { diff --git a/product/n1sdp/module/n1sdp_c2c/src/mod_n1sdp_c2c_i2c.c b/product/n1sdp/module/n1sdp_c2c/src/mod_n1sdp_c2c_i2c.c index 43521d81..15f56f18 100644 --- a/product/n1sdp/module/n1sdp_c2c/src/mod_n1sdp_c2c_i2c.c +++ b/product/n1sdp/module/n1sdp_c2c/src/mod_n1sdp_c2c_i2c.c @@ -87,9 +87,6 @@ struct n1sdp_c2c_ctx { /* Pointer to module configuration */ struct n1sdp_c2c_dev_config *config; - /* Log API pointer */ - const struct mod_log_api *log_api; - /* I2C Master API ID */ struct mod_n1sdp_i2c_master_api_polled *master_api; @@ -154,7 +151,7 @@ static int n1sdp_c2c_master_tx_command(uint8_t cmd) { int status; - FWK_LOG_INFO(n1sdp_c2c_ctx.log_api, "[C2C] %s in slave...", cmd_str[cmd]); + FWK_LOG_INFO("[C2C] %s in slave...", cmd_str[cmd]); n1sdp_c2c_ctx.master_tx_data[0] = cmd; status = n1sdp_c2c_ctx.master_api->write( @@ -163,10 +160,10 @@ static int n1sdp_c2c_master_tx_command(uint8_t cmd) (char *)&n1sdp_c2c_ctx.master_tx_data[0], N1SDP_C2C_DATA_SIZE, true); if (status != FWK_SUCCESS) { - FWK_LOG_INFO(n1sdp_c2c_ctx.log_api, "Error!\n"); + FWK_LOG_INFO("[C2C] Error!"); return status; } - FWK_LOG_INFO(n1sdp_c2c_ctx.log_api, "Done\n"); + FWK_LOG_INFO("Done"); return FWK_SUCCESS; } @@ -175,17 +172,16 @@ static int n1sdp_c2c_master_rx_response(void) { int status; - FWK_LOG_INFO( - n1sdp_c2c_ctx.log_api, "[C2C] Waiting for response from slave..."); + FWK_LOG_INFO("[C2C] Waiting for response from slave..."); status = n1sdp_c2c_ctx.master_api->read( n1sdp_c2c_ctx.config->i2c_id, n1sdp_c2c_ctx.config->slave_addr, (char *)&n1sdp_c2c_ctx.master_rx_data[0], N1SDP_C2C_DATA_SIZE); if (status != FWK_SUCCESS) { - FWK_LOG_INFO(n1sdp_c2c_ctx.log_api, "Error %d!\n", status); + FWK_LOG_INFO("[C2C] Error %d!", status); return status; } - FWK_LOG_INFO(n1sdp_c2c_ctx.log_api, "Received\n"); + FWK_LOG_INFO("[C2C] Received"); return FWK_SUCCESS; } @@ -209,16 +205,14 @@ static int n1sdp_c2c_check_remote(void) } n1sdp_c2c_ctx.slave_alive = true; - FWK_LOG_INFO(n1sdp_c2c_ctx.log_api, "[C2C] Slave Alive!\n"); + FWK_LOG_INFO("[C2C] Slave Alive!"); return FWK_SUCCESS; } else { status = n1sdp_c2c_ctx.slave_api->read( n1sdp_c2c_ctx.config->i2c_id, &n1sdp_c2c_ctx.slave_rx_data[0], N1SDP_C2C_DATA_SIZE); if (status != FWK_SUCCESS) { - FWK_LOG_INFO( - n1sdp_c2c_ctx.log_api, - "[C2C] Error setting up I2C for reception!\n"); + FWK_LOG_INFO("[C2C] Error setting up I2C for reception!"); return status; } } @@ -237,15 +231,14 @@ static int n1sdp_c2c_multichip_run_command(uint8_t cmd, bool run_in_slave) return status; } - FWK_LOG_INFO( - n1sdp_c2c_ctx.log_api, "[C2C] %s in master...\n", cmd_str[cmd]); + FWK_LOG_INFO("[C2C] %s in master...", cmd_str[cmd]); switch (cmd) { case N1SDP_C2C_CMD_PCIE_POWER_ON: status = n1sdp_c2c_ctx.pcie_init_api->power_on( n1sdp_c2c_ctx.config->ccix_id); if (status != FWK_SUCCESS) { - FWK_LOG_INFO(n1sdp_c2c_ctx.log_api, "Error!\n"); + FWK_LOG_INFO("[C2C] Error!"); return status; } if (run_in_slave) { @@ -253,8 +246,7 @@ static int n1sdp_c2c_multichip_run_command(uint8_t cmd, bool run_in_slave) if (status != FWK_SUCCESS) return status; if (n1sdp_c2c_ctx.master_rx_data[0] != N1SDP_C2C_SUCCESS) { - FWK_LOG_INFO( - n1sdp_c2c_ctx.log_api, "[C2C] Command failed in slave!\n"); + FWK_LOG_INFO("[C2C] Command failed in slave!"); return FWK_E_STATE; } } @@ -264,7 +256,7 @@ static int n1sdp_c2c_multichip_run_command(uint8_t cmd, bool run_in_slave) status = n1sdp_c2c_ctx.pcie_init_api->phy_init( n1sdp_c2c_ctx.config->ccix_id); if (status != FWK_SUCCESS) { - FWK_LOG_INFO(n1sdp_c2c_ctx.log_api, "Error!\n"); + FWK_LOG_INFO("[C2C] Error!"); return status; } if (run_in_slave) { @@ -272,8 +264,7 @@ static int n1sdp_c2c_multichip_run_command(uint8_t cmd, bool run_in_slave) if (status != FWK_SUCCESS) return status; if (n1sdp_c2c_ctx.master_rx_data[0] != N1SDP_C2C_SUCCESS) { - FWK_LOG_INFO( - n1sdp_c2c_ctx.log_api, "[C2C] Command failed in slave!\n"); + FWK_LOG_INFO("[C2C] Command failed in slave!"); return FWK_E_STATE; } } @@ -283,7 +274,7 @@ static int n1sdp_c2c_multichip_run_command(uint8_t cmd, bool run_in_slave) status = n1sdp_c2c_ctx.pcie_init_api->controller_init( n1sdp_c2c_ctx.config->ccix_id, false); if (status != FWK_SUCCESS) { - FWK_LOG_INFO(n1sdp_c2c_ctx.log_api, "Error!\n"); + FWK_LOG_INFO("[C2C] Error!"); return status; } if (run_in_slave) { @@ -291,8 +282,7 @@ static int n1sdp_c2c_multichip_run_command(uint8_t cmd, bool run_in_slave) if (status != FWK_SUCCESS) return status; if (n1sdp_c2c_ctx.master_rx_data[0] != N1SDP_C2C_SUCCESS) { - FWK_LOG_INFO( - n1sdp_c2c_ctx.log_api, "[C2C] Command failed in slave!\n"); + FWK_LOG_INFO("[C2C] Command failed in slave!"); return FWK_E_STATE; } } @@ -302,7 +292,7 @@ static int n1sdp_c2c_multichip_run_command(uint8_t cmd, bool run_in_slave) status = n1sdp_c2c_ctx.pcie_init_api->link_training( n1sdp_c2c_ctx.config->ccix_id, false); if (status != FWK_SUCCESS) { - FWK_LOG_INFO(n1sdp_c2c_ctx.log_api, "Error!\n"); + FWK_LOG_INFO("[C2C] Error!"); return status; } if (run_in_slave) { @@ -310,8 +300,7 @@ static int n1sdp_c2c_multichip_run_command(uint8_t cmd, bool run_in_slave) if (status != FWK_SUCCESS) return status; if (n1sdp_c2c_ctx.master_rx_data[0] != N1SDP_C2C_SUCCESS) { - FWK_LOG_INFO( - n1sdp_c2c_ctx.log_api, "[C2C] Command failed in slave!\n"); + FWK_LOG_INFO("[C2C] Command failed in slave!"); return FWK_E_STATE; } } @@ -321,7 +310,7 @@ static int n1sdp_c2c_multichip_run_command(uint8_t cmd, bool run_in_slave) status = n1sdp_c2c_ctx.pcie_init_api->rc_setup( n1sdp_c2c_ctx.config->ccix_id); if (status != FWK_SUCCESS) { - FWK_LOG_INFO(n1sdp_c2c_ctx.log_api, "Error!\n"); + FWK_LOG_INFO("[C2C] Error!"); return status; } if (run_in_slave) { @@ -329,8 +318,7 @@ static int n1sdp_c2c_multichip_run_command(uint8_t cmd, bool run_in_slave) if (status != FWK_SUCCESS) return status; if (n1sdp_c2c_ctx.master_rx_data[0] != N1SDP_C2C_SUCCESS) { - FWK_LOG_INFO( - n1sdp_c2c_ctx.log_api, "[C2C] Command failed in slave!\n"); + FWK_LOG_INFO("[C2C] Command failed in slave!"); return FWK_E_STATE; } } @@ -340,7 +328,7 @@ static int n1sdp_c2c_multichip_run_command(uint8_t cmd, bool run_in_slave) status = n1sdp_c2c_ctx.pcie_init_api->vc1_setup( n1sdp_c2c_ctx.config->ccix_id, CCIX_VC1_TC); if (status != FWK_SUCCESS) { - FWK_LOG_INFO(n1sdp_c2c_ctx.log_api, "Error!\n"); + FWK_LOG_INFO("[C2C] Error!"); return status; } if (run_in_slave) { @@ -348,8 +336,7 @@ static int n1sdp_c2c_multichip_run_command(uint8_t cmd, bool run_in_slave) if (status != FWK_SUCCESS) return status; if (n1sdp_c2c_ctx.master_rx_data[0] != N1SDP_C2C_SUCCESS) { - FWK_LOG_INFO( - n1sdp_c2c_ctx.log_api, "[C2C] Command failed in slave!\n"); + FWK_LOG_INFO("[C2C] Command failed in slave!"); return FWK_E_STATE; } } @@ -359,7 +346,7 @@ static int n1sdp_c2c_multichip_run_command(uint8_t cmd, bool run_in_slave) status = n1sdp_c2c_ctx.ccix_config_api->enable_opt_tlp( CCIX_OPT_TLP_EN); if (status != FWK_SUCCESS) { - FWK_LOG_INFO(n1sdp_c2c_ctx.log_api, "Error!\n"); + FWK_LOG_INFO("[C2C] Error!"); return status; } if (run_in_slave) { @@ -367,8 +354,7 @@ static int n1sdp_c2c_multichip_run_command(uint8_t cmd, bool run_in_slave) if (status != FWK_SUCCESS) return status; if (n1sdp_c2c_ctx.master_rx_data[0] != N1SDP_C2C_SUCCESS) { - FWK_LOG_INFO( - n1sdp_c2c_ctx.log_api, "[C2C] Command failed in slave!\n"); + FWK_LOG_INFO("[C2C] Command failed in slave!"); return FWK_E_STATE; } } @@ -392,7 +378,7 @@ static int n1sdp_c2c_multichip_run_command(uint8_t cmd, bool run_in_slave) status = n1sdp_c2c_ctx.cmn600_api->set_config(&remote_config); if (status != FWK_SUCCESS) { - FWK_LOG_INFO(n1sdp_c2c_ctx.log_api, "Error!\n"); + FWK_LOG_INFO("[C2C] Error!"); return status; } if (run_in_slave) { @@ -400,8 +386,7 @@ static int n1sdp_c2c_multichip_run_command(uint8_t cmd, bool run_in_slave) if (status != FWK_SUCCESS) return status; if (n1sdp_c2c_ctx.master_rx_data[0] != N1SDP_C2C_SUCCESS) { - FWK_LOG_INFO( - n1sdp_c2c_ctx.log_api, "[C2C] Command failed in slave!\n"); + FWK_LOG_INFO("[C2C] Command failed in slave!"); return FWK_E_STATE; } } @@ -411,7 +396,7 @@ static int n1sdp_c2c_multichip_run_command(uint8_t cmd, bool run_in_slave) status = n1sdp_c2c_ctx.cmn600_api->exchange_protocol_credit( CMN600_CCIX_LINK_ID); if (status != FWK_SUCCESS) { - FWK_LOG_INFO(n1sdp_c2c_ctx.log_api, "Error!\n"); + FWK_LOG_INFO("[C2C] Error!"); return status; } if (run_in_slave) { @@ -419,8 +404,7 @@ static int n1sdp_c2c_multichip_run_command(uint8_t cmd, bool run_in_slave) if (status != FWK_SUCCESS) return status; if (n1sdp_c2c_ctx.master_rx_data[0] != N1SDP_C2C_SUCCESS) { - FWK_LOG_INFO( - n1sdp_c2c_ctx.log_api, "[C2C] Command failed in slave!\n"); + FWK_LOG_INFO("[C2C] Command failed in slave!"); return FWK_E_STATE; } } @@ -430,7 +414,7 @@ static int n1sdp_c2c_multichip_run_command(uint8_t cmd, bool run_in_slave) status = n1sdp_c2c_ctx.cmn600_api->enter_system_coherency( CMN600_CCIX_LINK_ID); if (status != FWK_SUCCESS) { - FWK_LOG_INFO(n1sdp_c2c_ctx.log_api, "Error!\n"); + FWK_LOG_INFO("[C2C] Error!"); return status; } if (run_in_slave) { @@ -438,8 +422,7 @@ static int n1sdp_c2c_multichip_run_command(uint8_t cmd, bool run_in_slave) if (status != FWK_SUCCESS) return status; if (n1sdp_c2c_ctx.master_rx_data[0] != N1SDP_C2C_SUCCESS) { - FWK_LOG_INFO( - n1sdp_c2c_ctx.log_api, "[C2C] Command failed in slave!\n"); + FWK_LOG_INFO("[C2C] Command failed in slave!"); return FWK_E_STATE; } } @@ -449,7 +432,7 @@ static int n1sdp_c2c_multichip_run_command(uint8_t cmd, bool run_in_slave) status = n1sdp_c2c_ctx.cmn600_api->enter_dvm_domain( CMN600_CCIX_LINK_ID); if (status != FWK_SUCCESS) { - FWK_LOG_INFO(n1sdp_c2c_ctx.log_api, "Error!\n"); + FWK_LOG_INFO("[C2C] Error!"); return status; } if (run_in_slave) { @@ -457,8 +440,7 @@ static int n1sdp_c2c_multichip_run_command(uint8_t cmd, bool run_in_slave) if (status != FWK_SUCCESS) return status; if (n1sdp_c2c_ctx.master_rx_data[0] != N1SDP_C2C_SUCCESS) { - FWK_LOG_INFO( - n1sdp_c2c_ctx.log_api, "[C2C] Command failed in slave!\n"); + FWK_LOG_INFO("[C2C] Command failed in slave!"); return FWK_E_STATE; } } @@ -470,15 +452,12 @@ static int n1sdp_c2c_multichip_run_command(uint8_t cmd, bool run_in_slave) if (status != FWK_SUCCESS) return status; if (n1sdp_c2c_ctx.master_rx_data[0] != N1SDP_C2C_SUCCESS) { - FWK_LOG_INFO( - n1sdp_c2c_ctx.log_api, "[C2C] Command failed in slave!\n"); + FWK_LOG_INFO("[C2C] Command failed in slave!"); return FWK_E_STATE; } n1sdp_c2c_ctx.slave_ddr_size_gb = n1sdp_c2c_ctx.master_rx_data[1]; FWK_LOG_INFO( - n1sdp_c2c_ctx.log_api, - "[C2C] Slave DDR Size: %d GB\n", - n1sdp_c2c_ctx.slave_ddr_size_gb); + "[C2C] Slave DDR Size: %d GB", n1sdp_c2c_ctx.slave_ddr_size_gb); } break; @@ -486,7 +465,7 @@ static int n1sdp_c2c_multichip_run_command(uint8_t cmd, bool run_in_slave) status = n1sdp_c2c_ctx.tsync_api->master_sync( FWK_ID_ELEMENT(FWK_MODULE_IDX_N1SDP_TIMER_SYNC, 0)); if (status != FWK_SUCCESS) { - FWK_LOG_INFO(n1sdp_c2c_ctx.log_api, "Error!\n"); + FWK_LOG_INFO("[C2C] Error!"); return status; } if (run_in_slave) { @@ -494,15 +473,14 @@ static int n1sdp_c2c_multichip_run_command(uint8_t cmd, bool run_in_slave) if (status != FWK_SUCCESS) return status; if (n1sdp_c2c_ctx.master_rx_data[0] != N1SDP_C2C_SUCCESS) { - FWK_LOG_INFO( - n1sdp_c2c_ctx.log_api, "[C2C] Command failed in slave!\n"); + FWK_LOG_INFO("[C2C] Command failed in slave!"); return FWK_E_STATE; } } break; default: - FWK_LOG_INFO(n1sdp_c2c_ctx.log_api, "[C2C] Unsupported command\n"); + FWK_LOG_INFO("[C2C] Unsupported command"); return FWK_E_DEVICE; } @@ -592,8 +570,7 @@ static int n1sdp_c2c_wait_for_next_command(void) &n1sdp_c2c_ctx.slave_rx_data[0], N1SDP_C2C_DATA_SIZE); if (status != FWK_SUCCESS) { - FWK_LOG_INFO( - n1sdp_c2c_ctx.log_api, "[C2C] Error setting up read transfer!\n"); + FWK_LOG_INFO("[C2C] Error setting up read transfer!"); return status; } @@ -810,25 +787,21 @@ static int n1sdp_c2c_process_command(void) */ switch (rx_data[1]) { case MOD_PD_SYSTEM_SHUTDOWN: - FWK_LOG_INFO( - n1sdp_c2c_ctx.log_api, - "[C2C] Request PCC for system shutdown\n"); + FWK_LOG_INFO("[C2C] Request PCC for system shutdown"); status = n1sdp_c2c_ctx.scp2pcc_api->send(NULL, 0, SCP2PCC_TYPE_SHUTDOWN); fwk_assert(status == FWK_SUCCESS); break; case MOD_PD_SYSTEM_COLD_RESET: - FWK_LOG_INFO( - n1sdp_c2c_ctx.log_api, "[C2C] Request PCC for system reboot\n"); + FWK_LOG_INFO("[C2C] Request PCC for system reboot"); status = n1sdp_c2c_ctx.scp2pcc_api->send(NULL, 0, SCP2PCC_TYPE_REBOOT); fwk_assert(status == FWK_SUCCESS); break; default: - FWK_LOG_INFO( - n1sdp_c2c_ctx.log_api, "[C2C] Unknown shutdown command!\n"); + FWK_LOG_INFO("[C2C] Unknown shutdown command!"); status = FWK_E_PARAM; break; } @@ -836,8 +809,7 @@ static int n1sdp_c2c_process_command(void) break; default: - FWK_LOG_INFO( - n1sdp_c2c_ctx.log_api, "[C2C] Unsupported command %d\n", cmd); + FWK_LOG_INFO("[C2C] Unsupported command %d", cmd); status = FWK_E_SUPPORT; } @@ -851,8 +823,7 @@ error: n1sdp_c2c_ctx.config->i2c_id, &n1sdp_c2c_ctx.slave_tx_data[0], N1SDP_C2C_DATA_SIZE); if (status != FWK_SUCCESS) { - FWK_LOG_INFO( - n1sdp_c2c_ctx.log_api, "[C2C] Error setting up write transfer!\n"); + FWK_LOG_INFO("[C2C] Error setting up write transfer!"); return status; } @@ -920,7 +891,7 @@ static int n1sdp_c2c_pd_set_state(enum n1sdp_c2c_cmd cmd, uint8_t pd_id, return status; if (n1sdp_c2c_ctx.master_rx_data[0] != N1SDP_C2C_SUCCESS) { - FWK_LOG_INFO(n1sdp_c2c_ctx.log_api, "[C2C] PD request failed!\n"); + FWK_LOG_INFO("[C2C] PD request failed!"); return FWK_E_STATE; } @@ -963,7 +934,7 @@ static int n1sdp_c2c_pd_get_state(enum n1sdp_c2c_cmd cmd, uint8_t pd_id, * master_rx_data[1] contains the current PD state in target */ if (n1sdp_c2c_ctx.master_rx_data[0] != N1SDP_C2C_SUCCESS) { - FWK_LOG_INFO(n1sdp_c2c_ctx.log_api, "[C2C] PD request failed!\n"); + FWK_LOG_INFO("[C2C] PD request failed!"); return FWK_E_STATE; } @@ -1022,11 +993,6 @@ static int n1sdp_c2c_bind(fwk_id_t id, unsigned int round) return FWK_SUCCESS; if (round == 0) { - status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_LOG), - MOD_LOG_API_ID, &n1sdp_c2c_ctx.log_api); - if (status != FWK_SUCCESS) - return status; - status = fwk_module_bind(n1sdp_c2c_ctx.config->ccix_id, FWK_ID_API(FWK_MODULE_IDX_N1SDP_PCIE, N1SDP_PCIE_API_IDX_PCIE_INIT), 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 bc5c3e13..7b82ede5 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 @@ -22,6 +22,7 @@ #include <fwk_module_idx.h> #include <fwk_status.h> +#include <inttypes.h> #include <stdbool.h> #include <string.h> @@ -77,8 +78,6 @@ uint32_t rd_data[DCI_FIFO_SIZE]; uint8_t wrrd_passes[NUM_SLICES][NUM_BITS_PER_SLICE]; uint16_t DEFAULT_DELAY = 0x240; -static struct mod_log_api *log_api; - /* * Functions fulfilling this module's interface */ @@ -96,9 +95,8 @@ static int n1sdp_ddr_phy_config(fwk_id_t element_id, struct dimm_info *info) ddr_phy = (struct mod_n1sdp_ddr_phy_reg *)element_config->ddr; FWK_LOG_INFO( - log_api, - "[DDR-PHY] Initializing PHY at 0x%x for %d MHz speed\n", - (uintptr_t)ddr_phy, + "[DDR-PHY] Initializing PHY at 0x%p for %" PRIu16 " MHz speed", + (const void *)ddr_phy, info->speed); switch (info->speed) { @@ -112,7 +110,7 @@ static int n1sdp_ddr_phy_config(fwk_id_t element_id, struct dimm_info *info) ddr_phy_config_800(ddr_phy, info); break; default: - FWK_LOG_INFO(log_api, "[DDR-PHY] Unsupported frequency!\n"); + FWK_LOG_INFO("[DDR-PHY] Unsupported frequency!"); break; } @@ -225,7 +223,7 @@ uint32_t dci_write_dram(struct mod_dmc620_reg *dmc, uint32_t *scp_address, // Confirm that DMC is in config state if ((dmc->MEMC_STATUS & 0x7) != 0x0) { - FWK_LOG_INFO(log_api, "DMC needs to be in config state\n"); + FWK_LOG_INFO("DMC needs to be in config state"); return FWK_E_STATE; } @@ -279,7 +277,7 @@ uint32_t dci_read_dram(struct mod_dmc620_reg *dmc, uint32_t *scp_address, // Confirm that DMC is in config state if ((dmc->MEMC_STATUS & 0x7) != 0x0) { - FWK_LOG_INFO(log_api, "DMC needs to be in config state\n"); + FWK_LOG_INFO("DMC needs to be in config state"); return FWK_E_PARAM; } @@ -711,8 +709,7 @@ static int write_eye_detect(fwk_id_t element_id, struct dimm_info *info, int status = FWK_SUCCESS; if (((int)rank_sel > (info->number_of_ranks - 1)) && (rank_sel != 0xF)) { - FWK_LOG_INFO( - log_api, "[DDR-PHY] Invalid rank parameter %d\n", rank_sel); + FWK_LOG_INFO("[DDR-PHY] Invalid rank parameter %" PRIu32, rank_sel); return FWK_E_PARAM; } @@ -729,9 +726,7 @@ static int write_eye_detect(fwk_id_t element_id, struct dimm_info *info, delay_increment, vrefdq_increment, dbg_level); if (status != FWK_SUCCESS) { FWK_LOG_INFO( - log_api, - "[DDR-PHY] WET single rank failed with error %d\n", - status); + "[DDR-PHY] WET single rank failed with error %d", status); break; } } @@ -762,8 +757,7 @@ static int n1sdp_ddr_phy_post_training_configure(fwk_id_t element_id, phy_addr = (uint32_t)element_config->ddr; rddata_valid_value = 0; - FWK_LOG_INFO( - log_api, "[DDR-PHY] Post training PHY setting at 0x%x\n", phy_addr); + FWK_LOG_INFO("[DDR-PHY] Post training PHY setting at 0x%" PRIX32, phy_addr); for (i = 0; i < 9; i++) { value = *(uint32_t *)(phy_addr + (4 * (112 + (i * 256)))); @@ -827,13 +821,13 @@ static int n1sdp_ddr_phy_post_training_configure(fwk_id_t element_id, adjust_per_rank_rptr_update_value(phy_addr, info); if (info->speed >= 1333) { - FWK_LOG_INFO(log_api, "[DDR-PHY] Performing write eye training..."); + FWK_LOG_INFO("[DDR-PHY] Performing write eye training..."); status = write_eye_detect(element_id, info, 0xF, 0x4, 0x2, 0); if (status != FWK_SUCCESS) { - FWK_LOG_INFO(log_api, "FAIL!\n"); + FWK_LOG_INFO("[DDR-PHY] FAIL!"); return status; } - FWK_LOG_INFO(log_api, "PASS!\n"); + FWK_LOG_INFO("[DDR-PHY] PASS!"); } for (h = 0; h < info->number_of_ranks; h++) { @@ -885,10 +879,9 @@ static int n1sdp_verify_phy_status(fwk_id_t element_id, if (((value1 >> 16) >= 0x0200) || ((value2 & 0x0000FFFF) >= 0x200)) { FWK_LOG_INFO( - log_api, - "[DDR-PHY] PHY 0x%08x : Invalid Hard0/Hard 1 value " - "found " - "for slice %d\n", + "[DDR-PHY] PHY 0x%" PRIX32 + " : Invalid Hard0/Hard 1 " + "value found for slice %" PRIu32, phy_base, i); } @@ -906,9 +899,9 @@ static int n1sdp_verify_phy_status(fwk_id_t element_id, if ((value1 != 0x003C) && ((info->dimm_mem_width == 4) && (value1 != 0x13C))) { FWK_LOG_INFO( - log_api, - "[DDR-PHY] PHY 0x%08x : Final read gate training " - "status != 0x003C for slice %d\n", + "[DDR-PHY] PHY 0x%" PRIX32 + " : Final read gate training" + " status != 0x003C for slice %" PRIu32, phy_base, i); } @@ -933,18 +926,18 @@ static int n1sdp_verify_phy_status(fwk_id_t element_id, value1 = *(uint32_t *)(phy_base + (4 * (47 + (i * 256)))); if ((value1 & 0x0000FFFF) > 0x0180) { FWK_LOG_INFO( - log_api, - "[DDR-PHY] PHY 0x%08x : slice %d " - " phy_rdlvl_rddqs_dq_le_dly_obs_%d is > 0x180\n", + "[DDR-PHY] PHY 0x%" PRIX32 " : slice %" PRIu32 + " phy_rdlvl_rddqs_dq_le_dly_obs_%" PRIu32 + " is > 0x180", phy_base, j, i); } if ((value1 >> 16) > 0x0180) { FWK_LOG_INFO( - log_api, - "[DDR-PHY] PHY 0x%08x : slice %d " - "phy_rdlvl_rddqs_dq_te_dly_obs_%d is > 0x180\n", + "[DDR-PHY] PHY 0x%" PRIX32 " : slice %" PRIu32 + " phy_rdlvl_rddqs_dq_te_dly_obs_%" PRIu32 + " is > 0x180", phy_base, j, i); @@ -952,10 +945,10 @@ static int n1sdp_verify_phy_status(fwk_id_t element_id, value1 = *(uint32_t *)(phy_base + (4 * (49 + (i * 256)))); if ((value1 >> 16) != 0x0C00) { FWK_LOG_INFO( - log_api, - "[DDR-PHY] PHY 0x%08x : Final read data eye " + "[DDR-PHY] PHY 0x%" PRIX32 + " : Final read data eye " "training " - "status != 0x0C00 for slice %d\n", + "status != 0x0C00 for slice %" PRIu32, phy_base, i); } @@ -1149,8 +1142,6 @@ static int n1sdp_ddr_phy_element_init(fwk_id_t element_id, unsigned int unused, static int n1sdp_ddr_phy_bind(fwk_id_t id, unsigned int round) { - int status; - /* Skip the second round (rounds are zero-indexed) */ if (round == 1) return FWK_SUCCESS; @@ -1159,12 +1150,6 @@ static int n1sdp_ddr_phy_bind(fwk_id_t id, unsigned int round) if (fwk_module_is_valid_element_id(id)) return FWK_SUCCESS; - /* Bind to the log module and get a pointer to its API */ - status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_LOG), MOD_LOG_API_ID, - &log_api); - if (status != FWK_SUCCESS) - return FWK_E_HANDLER; - return FWK_SUCCESS; } diff --git a/product/n1sdp/module/n1sdp_dmc620/src/dimm_spd.c b/product/n1sdp/module/n1sdp_dmc620/src/dimm_spd.c index 5f98bb57..26577cdf 100644 --- a/product/n1sdp/module/n1sdp_dmc620/src/dimm_spd.c +++ b/product/n1sdp/module/n1sdp_dmc620/src/dimm_spd.c @@ -105,40 +105,33 @@ static int chk_ddr4_dimms(unsigned int speed, return FWK_SUCCESS; } -static void dimm_device_data(uint8_t *spd_data, - struct mod_log_api *log_api, uint8_t dimm_id) +static void dimm_device_data(uint8_t *spd_data, uint8_t dimm_id) { unsigned int i; if (spd_data[2] == 0x0C) { - FWK_LOG_INFO(log_api, " DIMM %d information:\n", dimm_id); + FWK_LOG_INFO(" DIMM %d information:", dimm_id); FWK_LOG_INFO( - log_api, - " Manufacturer ID = 0x%x 0x%x\n", - spd_data[320], - spd_data[321]); - FWK_LOG_INFO(log_api, " Module part number = "); + " Manufacturer ID = 0x%x 0x%x", spd_data[320], spd_data[321]); + FWK_LOG_INFO(" Module part number = "); for (i = 329; i <= 348; i++) - FWK_LOG_INFO(log_api, "%c", spd_data[i]); - FWK_LOG_INFO(log_api, "\n"); + FWK_LOG_INFO("%c", spd_data[i]); FWK_LOG_INFO( - log_api, - " Module serial number = 0x%x 0x%x 0x%x 0x%x\n", + " Module serial number = 0x%x 0x%x 0x%x 0x%x", spd_data[325], spd_data[326], spd_data[327], spd_data[328]); FWK_LOG_INFO( - log_api, - " Module manufacturing week %d%d year %d%d\n", + " Module manufacturing week %d%d year %d%d", 0xF & (spd_data[324] >> 4), 0xF & spd_data[324], 0xF & (spd_data[323] >> 4), 0xF & spd_data[323]); } else { - FWK_LOG_INFO(log_api, "[DDR] ERROR! DDR4 SPD EEPROM Not Detected\n"); + FWK_LOG_INFO("[DDR] ERROR! DDR4 SPD EEPROM Not Detected"); fwk_assert(false); } } @@ -462,12 +455,10 @@ int dimm_spd_init_check(struct mod_n1sdp_i2c_master_api_polled *i2c_api, return FWK_SUCCESS; } -void dimm_spd_mem_info(struct mod_log_api *log_api) +void dimm_spd_mem_info(void) { - fwk_assert(log_api != NULL); - - dimm_device_data((uint8_t *)&ddr4_dimm0, log_api, 0); - dimm_device_data((uint8_t *)&ddr4_dimm1, log_api, 1); + dimm_device_data((uint8_t *)&ddr4_dimm0, 0); + dimm_device_data((uint8_t *)&ddr4_dimm1, 1); } int dimm_spd_address_control(uint32_t *temp_reg, struct dimm_info *ddr) diff --git a/product/n1sdp/module/n1sdp_dmc620/src/dimm_spd.h b/product/n1sdp/module/n1sdp_dmc620/src/dimm_spd.h index 85afa17c..c1e5449a 100644 --- a/product/n1sdp/module/n1sdp_dmc620/src/dimm_spd.h +++ b/product/n1sdp/module/n1sdp_dmc620/src/dimm_spd.h @@ -367,11 +367,9 @@ int dimm_spd_init_check(struct mod_n1sdp_i2c_master_api_polled *i2c_api, /* * Brief - Function to print the DIMM card information * - * param - log_api - Pointer to log module APIs - * * retval - NONE */ -void dimm_spd_mem_info(struct mod_log_api *log_api); +void dimm_spd_mem_info(void); /* * Brief - Function to calculate DMC-620 ADDRESS_CONTROL register value diff --git a/product/n1sdp/module/n1sdp_dmc620/src/mod_n1sdp_dmc620.c b/product/n1sdp/module/n1sdp_dmc620/src/mod_n1sdp_dmc620.c index eab2157d..6c03bd95 100644 --- a/product/n1sdp/module/n1sdp_dmc620/src/mod_n1sdp_dmc620.c +++ b/product/n1sdp/module/n1sdp_dmc620/src/mod_n1sdp_dmc620.c @@ -28,13 +28,13 @@ #include <fwk_notification.h> #include <fwk_status.h> +#include <inttypes.h> #include <stdbool.h> #include <stddef.h> /* DMC-620 register specific definitions */ #define DDR_TRAIN_TWO_RANKS 0 -static struct mod_log_api *log_api; static struct mod_dmc_ddr_phy_api *ddr_phy_api; static struct mod_timer_api *timer_api; static struct mod_n1sdp_i2c_master_api_polled *i2c_api; @@ -53,8 +53,7 @@ void dmc620_abort_recover(struct mod_dmc620_reg *dmc) /* Make sure we don't run this from ABORT or RECOVERY states */ if (current_state > 3) { FWK_LOG_INFO( - log_api, - "[DDR] DMC generated abortable error from abort/recovery state\n"); + "[DDR] DMC generated abortable error from abort/recovery state"); return; } @@ -62,45 +61,43 @@ void dmc620_abort_recover(struct mod_dmc620_reg *dmc) dmc_abort = (uint32_t *)((uint32_t)dmc + 0x10000); /* Assert abort request */ - FWK_LOG_INFO(log_api, "[DDR] Asserting abort request\n"); + FWK_LOG_INFO("[DDR] Asserting abort request"); *dmc_abort = 0x1; /* Wait for DMC to enter aborted state */ - FWK_LOG_INFO(log_api, "[DDR] Waiting for DMC to enter abort state..."); + FWK_LOG_INFO("[DDR] Waiting for DMC to enter abort state..."); while ((dmc->MEMC_STATUS & 0x00000007) != 0x4) continue; - FWK_LOG_INFO(log_api, "DONE\n"); + FWK_LOG_INFO("[DDR] DONE"); /* Deassert abort request */ - FWK_LOG_INFO(log_api, "[DDR] Deasserting abort request\n"); + FWK_LOG_INFO("[DDR] Deasserting abort request"); *dmc_abort = 0x0; /* Send ABORT_CLR command to change to recovery mode. */ - FWK_LOG_INFO(log_api, "[DDR] Sending abort clear\n"); + FWK_LOG_INFO("[DDR] Sending abort clear"); dmc->MEMC_CMD = 0x00000006; /* Wait for state transition to complete */ - FWK_LOG_INFO(log_api, "[DDR] Waiting for DMC state transition..."); + FWK_LOG_INFO("[DDR] Waiting for DMC state transition..."); while ((dmc->MEMC_STATUS & 0x00000007) != 0x5) continue; - FWK_LOG_INFO(log_api, "DONE\n"); + FWK_LOG_INFO("[DDR] DONE"); /* Go back to pre-error state */ - FWK_LOG_INFO( - log_api, "[DDR] Initiating state transition back to normal world\n"); + FWK_LOG_INFO("[DDR] Initiating state transition back to normal world"); dmc->MEMC_CMD = current_state; /* Wait for state transition to complete */ - FWK_LOG_INFO(log_api, "[DDR] Waiting for DMC state transition..."); + FWK_LOG_INFO("[DDR] Waiting for DMC state transition..."); while ((dmc->MEMC_STATUS & 0x00000007) != current_state) continue; - FWK_LOG_INFO(log_api, "DONE\n"); + FWK_LOG_INFO("[DDR] DONE"); - FWK_LOG_INFO( - log_api, "[DDR] Resuming operation in state %d\n", current_state); + FWK_LOG_INFO("[DDR] Resuming operation in state %" PRIu32, current_state); } void dmc620_handle_interrupt(int dmc_num) @@ -118,98 +115,98 @@ void dmc620_handle_interrupt(int dmc_num) void dmc0_misc_oflow_handler(void) { - FWK_LOG_INFO(log_api, "[DDR] DMC0 MISC overflow interrupt!\n"); + FWK_LOG_INFO("[DDR] DMC0 MISC overflow interrupt!"); dmc620_handle_interrupt(0); fwk_interrupt_clear_pending(DMCS0_MISC_OFLOW_IRQ); } void dmc0_err_oflow_handler(void) { - FWK_LOG_INFO(log_api, "[DDR] DMC0 error overflow interrupt!\n"); + FWK_LOG_INFO("[DDR] DMC0 error overflow interrupt!"); dmc620_handle_interrupt(0); fwk_interrupt_clear_pending(DMCS0_ERR_OFLOW_IRQ); } void dmc0_ecc_err_handler(void) { - FWK_LOG_INFO(log_api, "[DDR] DMC0 ECC error interrupt!\n"); + FWK_LOG_INFO("[DDR] DMC0 ECC error interrupt!"); dmc620_handle_interrupt(0); fwk_interrupt_clear_pending(DMCS0_ECC_ERR_INT_IRQ); } void dmc0_misc_access_handler(void) { - FWK_LOG_INFO(log_api, "[DDR] DMC0 misc access interrupt!\n"); + FWK_LOG_INFO("[DDR] DMC0 misc access interrupt!"); dmc620_handle_interrupt(0); fwk_interrupt_clear_pending(DMCS0_MISC_ACCESS_INT_IRQ); } void dmc0_temp_event_handler(void) { - FWK_LOG_INFO(log_api, "[DDR] DMC0 temperature event interrupt!\n"); + FWK_LOG_INFO("[DDR] DMC0 temperature event interrupt!"); dmc620_handle_interrupt(0); fwk_interrupt_clear_pending(DMCS0_TEMPERATURE_EVENT_INT_IRQ); } void dmc0_failed_access_handler(void) { - FWK_LOG_INFO(log_api, "[DDR] DMC0 failed access interrupt!\n"); + FWK_LOG_INFO("[DDR] DMC0 failed access interrupt!"); dmc620_handle_interrupt(0); fwk_interrupt_clear_pending(DMCS0_FAILED_ACCESS_INT_IRQ); } void dmc0_mgr_handler(void) { - FWK_LOG_INFO(log_api, "[DDR] DMC0 mgr interrupt!\n"); + FWK_LOG_INFO("[DDR] DMC0 mgr interrupt!"); dmc620_handle_interrupt(0); fwk_interrupt_clear_pending(DMCS0_MGR_INT_IRQ); } void dmc1_misc_oflow_handler(void) { - FWK_LOG_INFO(log_api, "[DDR] DMC1 MISC overflow interrupt!\n"); + FWK_LOG_INFO("[DDR] DMC1 MISC overflow interrupt!"); dmc620_handle_interrupt(1); fwk_interrupt_clear_pending(DMCS1_MISC_OFLOW_IRQ); } void dmc1_err_oflow_handler(void) { - FWK_LOG_INFO(log_api, "[DDR] DMC1 error overflow interrupt!\n"); + FWK_LOG_INFO("[DDR] DMC1 error overflow interrupt!"); dmc620_handle_interrupt(1); fwk_interrupt_clear_pending(DMCS1_ERR_OFLOW_IRQ); } void dmc1_ecc_err_handler(void) { - FWK_LOG_INFO(log_api, "[DDR] DMC1 ECC error interrupt!\n"); + FWK_LOG_INFO("[DDR] DMC1 ECC error interrupt!"); dmc620_handle_interrupt(1); fwk_interrupt_clear_pending(DMCS1_ECC_ERR_INT_IRQ); } void dmc1_misc_access_handler(void) { - FWK_LOG_INFO(log_api, "[DDR] DMC1 misc access interrupt!\n"); + FWK_LOG_INFO("[DDR] DMC1 misc access interrupt!"); dmc620_handle_interrupt(1); fwk_interrupt_clear_pending(DMCS1_MISC_ACCESS_INT_IRQ); } void dmc1_temp_event_handler(void) { - FWK_LOG_INFO(log_api, "[DDR] DMC1 temperature event interrupt!\n"); + FWK_LOG_INFO("[DDR] DMC1 temperature event interrupt!"); dmc620_handle_interrupt(1); fwk_interrupt_clear_pending(DMCS1_TEMPERATURE_EVENT_INT_IRQ); } void dmc1_failed_access_handler(void) { - FWK_LOG_INFO(log_api, "[DDR] DMC1 failed access interrupt!\n"); + FWK_LOG_INFO("[DDR] DMC1 failed access interrupt!"); dmc620_handle_interrupt(1); fwk_interrupt_clear_pending(DMCS1_FAILED_ACCESS_INT_IRQ); } void dmc1_mgr_handler(void) { - FWK_LOG_INFO(log_api, "[DDR] DMC1 mgr interrupt!\n"); + FWK_LOG_INFO("[DDR] DMC1 mgr interrupt!"); dmc620_handle_interrupt(1); fwk_interrupt_clear_pending(DMCS1_MGR_INT_IRQ); } @@ -219,7 +216,7 @@ static int dmc620_config_interrupt(fwk_id_t ddr_id) int id; id = fwk_id_get_element_idx(ddr_id); - FWK_LOG_INFO(log_api, "[DDR] Configuring interrupts for DMC%d\n", id); + FWK_LOG_INFO("[DDR] Configuring interrupts for DMC%d", id); if (id == 0) { fwk_interrupt_set_isr(DMCS0_MISC_OFLOW_IRQ, dmc0_misc_oflow_handler); @@ -314,7 +311,7 @@ static int ddr_poll_training_status(struct mod_dmc620_reg *dmc) dmc620_wait_condition, &wait_data); if (status != FWK_SUCCESS) { - FWK_LOG_INFO(log_api, "FAIL\n"); + FWK_LOG_INFO("[DDR] FAIL"); return status; } @@ -324,11 +321,11 @@ static int ddr_poll_training_status(struct mod_dmc620_reg *dmc) dmc620_wait_condition, &wait_data); if (status != FWK_SUCCESS) { - FWK_LOG_INFO(log_api, "FAIL\n"); + FWK_LOG_INFO("[DDR] FAIL"); return status; } - FWK_LOG_INFO(log_api, "PASS\n"); + FWK_LOG_INFO("[DDR] PASS"); return FWK_SUCCESS; } @@ -353,10 +350,10 @@ static int ddr_training(struct mod_dmc620_reg *dmc, int j; int status; - FWK_LOG_INFO(log_api, "[DDR] Training DDR memories...\n"); + FWK_LOG_INFO("[DDR] Training DDR memories..."); for (i = 1; i <= ddr_info.number_of_ranks; i++) { - FWK_LOG_INFO(log_api, "[DDR] Write leveling rank %d... ", i); + FWK_LOG_INFO("[DDR] Write leveling rank %d... ", i); /* Clear interrupt status if any */ if (dmc->INTERRUPT_STATUS != 0) @@ -380,12 +377,12 @@ static int ddr_training(struct mod_dmc620_reg *dmc, } ddr_phy_api->verify_phy_status(ddr_id, DDR_ADDR_TRAIN_TYPE_WR_LVL, info); - FWK_LOG_INFO(log_api, "[DDR] Read gate training\n"); + FWK_LOG_INFO("[DDR] Read gate training"); /* Clear interrupt status if any */ if (dmc->INTERRUPT_STATUS != 0) dmc->INTERRUPT_CLR = 0xFFFFFFFF; - FWK_LOG_INFO(log_api, "[DDR] A side..."); + FWK_LOG_INFO("[DDR] A side..."); /* Set read level control parameter */ value = dmc->RDLVL_CONTROL_NEXT; @@ -413,7 +410,7 @@ static int ddr_training(struct mod_dmc620_reg *dmc, dmc->INTERRUPT_CLR = 0xFFFFFFFF; #if DDR_TRAIN_TWO_RANKS - FWK_LOG_INFO(log_api, "[DDR] B side..."); + FWK_LOG_INFO("[DDR] B side..."); /* Set write leveling parameters */ value = dmc->RDLVL_CONTROL_NEXT; @@ -436,13 +433,13 @@ static int ddr_training(struct mod_dmc620_reg *dmc, for (j = 1; j <= ddr_info.number_of_ranks; j++) ddr_phy_api->read_gate_phy_obs_regs(ddr_id, j, info); - FWK_LOG_INFO(log_api, "[DDR] Read eye training\n"); + FWK_LOG_INFO("[DDR] Read eye training"); /* Clear interrupt status if any */ if (dmc->INTERRUPT_STATUS != 0) dmc->INTERRUPT_CLR = 0xFFFFFFFF; - FWK_LOG_INFO(log_api, "[DDR] A side..."); + FWK_LOG_INFO("[DDR] A side..."); /* Set write leveling parameters */ value = dmc->RDLVL_CONTROL_NEXT; @@ -469,7 +466,7 @@ static int ddr_training(struct mod_dmc620_reg *dmc, if (dmc->INTERRUPT_STATUS != 0) dmc->INTERRUPT_CLR = 0xFFFFFFFF; - FWK_LOG_INFO(log_api, "[DDR] B side..."); + FWK_LOG_INFO("[DDR] B side..."); /* Set write leveling parameters */ value = dmc->RDLVL_CONTROL_NEXT; @@ -495,7 +492,7 @@ static int ddr_training(struct mod_dmc620_reg *dmc, if (dmc->INTERRUPT_STATUS != 0) dmc->INTERRUPT_CLR = 0xFFFFFFFF; - FWK_LOG_INFO(log_api, "[DDR] MC initiated update..."); + FWK_LOG_INFO("[DDR] MC initiated update..."); dmc->DIRECT_ADDR = 0; dmc->DIRECT_CMD = ((ddr_info.ranks_to_train << 16) | 0x000A); @@ -563,8 +560,7 @@ static void execute_ddr_cmd(struct mod_dmc620_reg *dmc, status = dmc620_poll_dmc_status(dmc); if (status != FWK_SUCCESS) { FWK_LOG_INFO( - log_api, - "[DDR] Execute command failed! ADDR: 0x%08x CMD: 0x%08x\n", + "[DDR] Execute command failed! ADDR: 0x%" PRIX32 " CMD: 0x%" PRIX32, addr, cmd); } @@ -788,9 +784,7 @@ static int direct_ddr_cmd(struct mod_dmc620_reg *dmc) status = dimm_spd_t_wtr(&addr, &ddr_info); if (status != FWK_SUCCESS) { FWK_LOG_INFO( - log_api, - "[DDR] Error code %d getting t_WTR value from SPD\n", - status); + "[DDR] Error code %d getting t_WTR value from SPD", status); return status; } dmc->T_WTR_NEXT = addr; @@ -820,19 +814,17 @@ static int dmc620_pre_init(void) int status; FWK_LOG_INFO( - log_api, - "[DDR] Starting DDR subsystem initialization at %d MHz\n", + "[DDR] Starting DDR subsystem initialization at %d MHz", ddr_info.speed); - FWK_LOG_INFO(log_api, "[DDR] Identifying connected DIMM cards...\n"); + FWK_LOG_INFO("[DDR] Identifying connected DIMM cards..."); status = dimm_spd_init_check(i2c_api, &ddr_info); if (status != FWK_SUCCESS) { - FWK_LOG_INFO( - log_api, "[DDR] Error checking DIMM SPD data: %d\n", status); + FWK_LOG_INFO("[DDR] Error checking DIMM SPD data: %d", status); return status; } - dimm_spd_mem_info(log_api); + dimm_spd_mem_info(); return FWK_SUCCESS; } @@ -852,11 +844,11 @@ static int dmc620_post_init(void) id = FWK_ID_ELEMENT(FWK_MODULE_IDX_N1SDP_DMC620, i); element_config = fwk_module_get_data(id); - FWK_LOG_INFO(log_api, "[DDR] Verifying PHY status for DMC %d...", i); + FWK_LOG_INFO("[DDR] Verifying PHY status for DMC %d...", i); status = dmc620_verify_phy_status(element_config->ddr_id); if (status != FWK_SUCCESS) return status; - FWK_LOG_INFO(log_api, "Done\n"); + FWK_LOG_INFO("[DDR] Done"); } for (i = 0; i < count; i++) { @@ -882,19 +874,17 @@ static int dmc620_config(struct mod_dmc620_reg *dmc, fwk_id_t ddr_id) return status; } - FWK_LOG_INFO( - log_api, "[DDR] Initialising DMC620 at 0x%x\n", (uintptr_t)dmc); + FWK_LOG_INFO("[DDR] Initialising DMC620 at 0x%x", (uintptr_t)dmc); dmc620_config_interrupt(ddr_id); - FWK_LOG_INFO(log_api, "[DDR] Writing functional settings\n"); + FWK_LOG_INFO("[DDR] Writing functional settings"); value = 0; status = dimm_spd_address_control(&value, &ddr_info); if (status != FWK_SUCCESS) { FWK_LOG_INFO( - log_api, - "[DDR] Error code %d getting address control value from SPD\n", + "[DDR] Error code %d getting address control value from SPD", status); return status; } @@ -905,8 +895,7 @@ static int dmc620_config(struct mod_dmc620_reg *dmc, fwk_id_t ddr_id) status = dimm_spd_format_control(&value); if (status != FWK_SUCCESS) { FWK_LOG_INFO( - log_api, - "[DDR] Error code %d getting format control value from SPD\n", + "[DDR] Error code %d getting format control value from SPD", status); return status; } @@ -937,9 +926,7 @@ static int dmc620_config(struct mod_dmc620_reg *dmc, fwk_id_t ddr_id) status = dimm_spd_memory_type(&value, &ddr_info); if (status != FWK_SUCCESS) { FWK_LOG_INFO( - log_api, - "[DDR] Error code %d getting memory type value from SPD\n", - status); + "[DDR] Error code %d getting memory type value from SPD", status); return status; } dmc->MEMORY_TYPE_NEXT = value; @@ -949,9 +936,7 @@ static int dmc620_config(struct mod_dmc620_reg *dmc, fwk_id_t ddr_id) status = dimm_spd_t_refi(&value); if (status != FWK_SUCCESS) { FWK_LOG_INFO( - log_api, - "[DDR] Error code %d getting t_REFI value from SPD\n", - status); + "[DDR] Error code %d getting t_REFI value from SPD", status); return status; } dmc->T_REFI_NEXT = value; @@ -960,9 +945,7 @@ static int dmc620_config(struct mod_dmc620_reg *dmc, fwk_id_t ddr_id) status = dimm_spd_t_rfc(&value); if (status != FWK_SUCCESS) { FWK_LOG_INFO( - log_api, - "[DDR] Error code %d getting t_RFC value from SPD\n", - status); + "[DDR] Error code %d getting t_RFC value from SPD", status); return status; } dmc->T_RFC_NEXT = value; @@ -973,9 +956,7 @@ static int dmc620_config(struct mod_dmc620_reg *dmc, fwk_id_t ddr_id) status = dimm_spd_t_rcd(&value); if (status != FWK_SUCCESS) { FWK_LOG_INFO( - log_api, - "[DDR] Error code %d getting t_RCD value from SPD\n", - status); + "[DDR] Error code %d getting t_RCD value from SPD", status); return status; } dmc->T_RCD_NEXT = value; @@ -984,9 +965,7 @@ static int dmc620_config(struct mod_dmc620_reg *dmc, fwk_id_t ddr_id) status = dimm_spd_t_ras(&value); if (status != FWK_SUCCESS) { FWK_LOG_INFO( - log_api, - "[DDR] Error code %d getting t_RAS value from SPD\n", - status); + "[DDR] Error code %d getting t_RAS value from SPD", status); return status; } dmc->T_RAS_NEXT = value; @@ -994,10 +973,7 @@ static int dmc620_config(struct mod_dmc620_reg *dmc, fwk_id_t ddr_id) value = 0; status = dimm_spd_t_rp(&value); if (status != FWK_SUCCESS) { - FWK_LOG_INFO( - log_api, - "[DDR] Error code %d getting t_RP value from SPD\n", - status); + FWK_LOG_INFO("[DDR] Error code %d getting t_RP value from SPD", status); return status; } dmc->T_RP_NEXT = value; @@ -1007,9 +983,7 @@ static int dmc620_config(struct mod_dmc620_reg *dmc, fwk_id_t ddr_id) status = dimm_spd_t_rrd(&value); if (status != FWK_SUCCESS) { FWK_LOG_INFO( - log_api, - "[DDR] Error code %d getting t_RRD value from SPD\n", - status); + "[DDR] Error code %d getting t_RRD value from SPD", status); return status; } dmc->T_RRD_NEXT = value; @@ -1018,9 +992,7 @@ static int dmc620_config(struct mod_dmc620_reg *dmc, fwk_id_t ddr_id) status = dimm_spd_t_act_window(&value); if (status != FWK_SUCCESS) { FWK_LOG_INFO( - log_api, - "[DDR] Error code %d getting t_ACT_WINDOW value from SPD\n", - status); + "[DDR] Error code %d getting t_ACT_WINDOW value from SPD", status); return status; } dmc->T_ACT_WINDOW_NEXT = value; @@ -1153,7 +1125,7 @@ static int dmc620_config(struct mod_dmc620_reg *dmc, fwk_id_t ddr_id) MOD_DMC620_MEMC_CMD_CONFIG) continue; - FWK_LOG_INFO(log_api, "[DDR] Sending direct DDR commands\n"); + FWK_LOG_INFO("[DDR] Sending direct DDR commands"); status = direct_ddr_cmd(dmc); if (status != FWK_SUCCESS) @@ -1167,20 +1139,20 @@ static int dmc620_config(struct mod_dmc620_reg *dmc, fwk_id_t ddr_id) if (status != FWK_SUCCESS) return status; - FWK_LOG_INFO(log_api, "[DDR] Enable DIMM refresh..."); + FWK_LOG_INFO("[DDR] Enable DIMM refresh..."); status = enable_dimm_refresh(dmc); if (status != FWK_SUCCESS) return status; /* Switch to READY */ - FWK_LOG_INFO(log_api, "[DDR] Setting DMC to READY mode\n"); + FWK_LOG_INFO("[DDR] Setting DMC to READY mode"); dmc->MEMC_CMD = MOD_DMC620_MEMC_CMD_GO; while ((dmc->MEMC_STATUS & MOD_DMC620_MEMC_CMD) != MOD_DMC620_MEMC_CMD_GO) continue; - FWK_LOG_INFO(log_api, "[DDR] DMC init done.\n"); + FWK_LOG_INFO("[DDR] DMC init done."); if (dmc_id == 1) { status = dmc620_post_init(); @@ -1249,11 +1221,6 @@ static int mod_dmc620_bind(fwk_id_t id, unsigned int round) module_config = fwk_module_get_data(fwk_module_id_n1sdp_dmc620); fwk_assert(module_config != NULL); - status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_LOG), - MOD_LOG_API_ID, &log_api); - if (status != FWK_SUCCESS) - return status; - status = fwk_module_bind(module_config->ddr_module_id, module_config->ddr_api_id, &ddr_phy_api); if (status != FWK_SUCCESS) 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 91f37d35..43ec75f8 100644 --- a/product/n1sdp/module/n1sdp_i2c/src/mod_n1sdp_i2c.c +++ b/product/n1sdp/module/n1sdp_i2c/src/mod_n1sdp_i2c.c @@ -18,7 +18,6 @@ #include <fwk_event.h> #include <fwk_id.h> #include <fwk_interrupt.h> -#include <fwk_log.h> #include <fwk_mm.h> #include <fwk_module.h> #include <fwk_module_idx.h> @@ -82,9 +81,6 @@ struct n1sdp_i2c_dev_ctx { struct n1sdp_i2c_ctx { /* Table of device contexts */ struct n1sdp_i2c_dev_ctx *device_ctx_table; - - /* Log API pointer */ - const struct mod_log_api *log_api; }; static struct n1sdp_i2c_ctx i2c_ctx; @@ -560,15 +556,6 @@ static int n1sdp_i2c_element_init(fwk_id_t element_id, unsigned int unused, return FWK_SUCCESS; } -static int n1sdp_i2c_bind(fwk_id_t id, unsigned int round) -{ - if ((round == 0) && (fwk_id_get_type(id) == FWK_ID_TYPE_MODULE)) { - return fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_LOG), - MOD_LOG_API_ID, &i2c_ctx.log_api); - } - return FWK_SUCCESS; -} - static int n1sdp_i2c_process_bind_request(fwk_id_t requester_id, fwk_id_t target_id, fwk_id_t api_id, const void **api) { @@ -632,7 +619,6 @@ const struct fwk_module module_n1sdp_i2c = { .notification_count = MOD_N1SDP_I2C_NOTIFICATION_COUNT, .init = n1sdp_i2c_init, .element_init = n1sdp_i2c_element_init, - .bind = n1sdp_i2c_bind, .process_bind_request = n1sdp_i2c_process_bind_request, .start = n1sdp_i2c_start, }; diff --git a/product/n1sdp/module/n1sdp_mcp_system/src/mod_n1sdp_mcp_system.c b/product/n1sdp/module/n1sdp_mcp_system/src/mod_n1sdp_mcp_system.c index f715bf15..34c1a24b 100644 --- a/product/n1sdp/module/n1sdp_mcp_system/src/mod_n1sdp_mcp_system.c +++ b/product/n1sdp/module/n1sdp_mcp_system/src/mod_n1sdp_mcp_system.c @@ -24,14 +24,11 @@ #include <fwk_status.h> #include <fwk_thread.h> +#include <inttypes.h> #include <stdint.h> /* Module context */ struct n1sdp_mcp_system_ctx { - - /* Log API pointer */ - const struct mod_log_api *log_api; - /* SCMI agent API pointer */ const struct mod_scmi_agent_api *scmi_api; @@ -60,12 +57,6 @@ static int n1sdp_mcp_system_bind(fwk_id_t id, unsigned int round) int status; if (round == 0) { - status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_LOG), - FWK_ID_API(FWK_MODULE_IDX_LOG, 0), - &n1sdp_mcp_system_ctx.log_api); - if (status != FWK_SUCCESS) - return status; - status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_SCMI_AGENT), FWK_ID_API(FWK_MODULE_IDX_SCMI_AGENT, 0), &n1sdp_mcp_system_ctx.scmi_api); @@ -115,10 +106,7 @@ static int n1sdp_mcp_system_process_event(const struct fwk_event *event, if (status != FWK_SUCCESS) return status; - FWK_LOG_TRACE( - n1sdp_mcp_system_ctx.log_api, - "[MCP SYSTEM] SCP clock status: 0x%x\n", - clock_status); + FWK_LOG_INFO("[MCP SYSTEM] SCP clock status: 0x%" PRIu32, clock_status); status = n1sdp_mcp_system_ctx.pik_coreclk_api->process_power_transition( FWK_ID_ELEMENT(FWK_MODULE_IDX_PIK_CLOCK, @@ -134,9 +122,7 @@ static int n1sdp_mcp_system_process_event(const struct fwk_event *event, if (status != FWK_SUCCESS) return FWK_SUCCESS; - FWK_LOG_TRACE( - n1sdp_mcp_system_ctx.log_api, - "[MCP SYSTEM] MCP PIK clocks configured\n"); + FWK_LOG_INFO("[MCP SYSTEM] MCP PIK clocks configured"); status = n1sdp_mcp_system_ctx.scmi_api->get_chipid_info( FWK_ID_ELEMENT(FWK_MODULE_IDX_SCMI_AGENT, 0), @@ -144,11 +130,7 @@ static int n1sdp_mcp_system_process_event(const struct fwk_event *event, if (status != FWK_SUCCESS) return status; - FWK_LOG_TRACE( - n1sdp_mcp_system_ctx.log_api, - "[MCP SYSTEM] MC Mode: 0x%x CHIPID: 0x%x\n", - mc_mode, - chipid); + FWK_LOG_INFO("[MCP SYSTEM] MC Mode: 0x%x CHIPID: 0x%x", mc_mode, chipid); return status; } diff --git a/product/n1sdp/module/n1sdp_pcie/src/mod_n1sdp_pcie.c b/product/n1sdp/module/n1sdp_pcie/src/mod_n1sdp_pcie.c index 816f8e8c..845737aa 100644 --- a/product/n1sdp/module/n1sdp_pcie/src/mod_n1sdp_pcie.c +++ b/product/n1sdp/module/n1sdp_pcie/src/mod_n1sdp_pcie.c @@ -29,6 +29,7 @@ #include <fwk_notification.h> #include <fwk_status.h> +#include <inttypes.h> #include <string.h> void pcie_bus_enumeration(struct n1sdp_pcie_dev_config *config); @@ -82,9 +83,6 @@ struct n1sdp_pcie_dev_ctx { * Module context */ struct n1sdp_pcie_ctx { - /* Log module API */ - struct mod_log_api *log_api; - /* Timer module API */ struct mod_timer_api *timer_api; @@ -130,7 +128,7 @@ static int n1sdp_pcie_ccix_enable_opt_tlp(bool enable) else value = (CCIX_CTRL_CAW | CCIX_VENDER_ID); - FWK_LOG_INFO(pcie_ctx.log_api, "[CCIX] CCIX_CONTROL: 0x%08x\n", value); + FWK_LOG_INFO("[CCIX] CCIX_CONTROL: 0x%" PRIX32, value); *(uint32_t *)(dev_ctx->lm_apb + PCIE_LM_RC_CCIX_CTRL_REG) = value; @@ -159,8 +157,7 @@ static int n1sdp_pcie_power_on(fwk_id_t id) if (dev_ctx == NULL) return FWK_E_PARAM; - FWK_LOG_INFO( - pcie_ctx.log_api, "[%s] Powering ON controller...", pcie_type[did]); + FWK_LOG_INFO("[%s] Powering ON controller...", pcie_type[did]); wait_data.ctrl_apb = NULL; if (dev_ctx->config->ccix_capable) { SCC->AXI_OVRD_CCIX = AXI_OVRD_VAL_CCIX; @@ -172,7 +169,7 @@ static int n1sdp_pcie_power_on(fwk_id_t id) pcie_wait_condition, &wait_data); if (status != FWK_SUCCESS) { - FWK_LOG_INFO(pcie_ctx.log_api, "Timeout!\n"); + FWK_LOG_INFO("[%s] Timeout!", pcie_type[did]); return status; } SCC->SYS_MAN_RESET &= ~(1 << SCC_SYS_MAN_RESET_CCIX_POS); @@ -186,12 +183,12 @@ static int n1sdp_pcie_power_on(fwk_id_t id) pcie_wait_condition, &wait_data); if (status != FWK_SUCCESS) { - FWK_LOG_INFO(pcie_ctx.log_api, "Timeout!\n"); + FWK_LOG_INFO("[%s] Timeout!", pcie_type[did]); return status; } SCC->SYS_MAN_RESET &= ~(1 << SCC_SYS_MAN_RESET_PCIE_POS); } - FWK_LOG_INFO(pcie_ctx.log_api, "Done\n"); + FWK_LOG_INFO("[%s] Done", pcie_type[did]); return FWK_SUCCESS; } @@ -210,7 +207,7 @@ static int n1sdp_pcie_phy_init(fwk_id_t id) gen_speed = dev_ctx->config->ccix_capable ? PCIE_GEN_4 : PCIE_GEN_3; - FWK_LOG_INFO(pcie_ctx.log_api, "[%s] Initializing PHY...", pcie_type[did]); + FWK_LOG_INFO("[%s] Initializing PHY...", pcie_type[did]); pcie_phy_init(dev_ctx->phy_apb); status = pcie_init(dev_ctx->ctrl_apb, @@ -218,10 +215,10 @@ static int n1sdp_pcie_phy_init(fwk_id_t id) PCIE_INIT_STAGE_PHY, gen_speed); if (status != FWK_SUCCESS) { - FWK_LOG_INFO(pcie_ctx.log_api, "Timeout!\n"); + FWK_LOG_INFO("[%s] Timeout!", pcie_type[did]); return status; } - FWK_LOG_INFO(pcie_ctx.log_api, "Done\n"); + FWK_LOG_INFO("[%s] Done", pcie_type[did]); return FWK_SUCCESS; } @@ -246,7 +243,6 @@ static int n1sdp_pcie_controller_init(fwk_id_t id, bool ep_mode) } FWK_LOG_INFO( - pcie_ctx.log_api, "[%s] Initializing controller in %s mode...", pcie_type[did], (ep_mode ? "endpoint" : "root port")); @@ -255,10 +251,10 @@ static int n1sdp_pcie_controller_init(fwk_id_t id, bool ep_mode) PCIE_INIT_STAGE_CTRL, gen_speed); if (status != FWK_SUCCESS) { - FWK_LOG_INFO(pcie_ctx.log_api, "Timeout!\n"); + FWK_LOG_INFO("[%s] Timeout!", pcie_type[did]); return status; } - FWK_LOG_INFO(pcie_ctx.log_api, "Done\n"); + FWK_LOG_INFO("[%s] Done", pcie_type[did]); return FWK_SUCCESS; } @@ -281,7 +277,6 @@ static int n1sdp_pcie_link_training(fwk_id_t id, bool ep_mode) if (gen_speed >= PCIE_GEN_3 && !ep_mode) { FWK_LOG_INFO( - pcie_ctx.log_api, "[%s] Setting TX Preset for GEN%d...", pcie_type[did], gen_speed + 1); @@ -289,48 +284,40 @@ static int n1sdp_pcie_link_training(fwk_id_t id, bool ep_mode) TX_PRESET_VALUE, gen_speed); if (status != FWK_SUCCESS) { - FWK_LOG_INFO(pcie_ctx.log_api, "Error!\n"); + FWK_LOG_INFO("[%s] Error!", pcie_type[did]); return status; } - FWK_LOG_INFO(pcie_ctx.log_api, "Done\n"); + FWK_LOG_INFO("[%s] Done", pcie_type[did]); } /* Link training */ - FWK_LOG_INFO( - pcie_ctx.log_api, "[%s] Starting link training...", pcie_type[did]); + FWK_LOG_INFO("[%s] Starting link training...", pcie_type[did]); status = pcie_init(dev_ctx->ctrl_apb, pcie_ctx.timer_api, PCIE_INIT_STAGE_LINK_TRNG, gen_speed); if (status != FWK_SUCCESS) { - FWK_LOG_INFO(pcie_ctx.log_api, "Timeout!\n"); + FWK_LOG_INFO("[%s] Timeout!", pcie_type[did]); pcie_init_bdf_table(dev_ctx->config); return status; } - FWK_LOG_INFO(pcie_ctx.log_api, "Done\n"); + FWK_LOG_INFO("[%s] Done", pcie_type[did]); neg_config = (dev_ctx->ctrl_apb->RP_CONFIG_OUT & RP_CONFIG_OUT_NEGOTIATED_SPD_MASK) >> RP_CONFIG_OUT_NEGOTIATED_SPD_POS; FWK_LOG_INFO( - pcie_ctx.log_api, - "[%s] Negotiated speed: GEN%d\n", - pcie_type[did], - neg_config + 1); + "[%s] Negotiated speed: GEN%d", pcie_type[did], neg_config + 1); neg_config = (dev_ctx->ctrl_apb->RP_CONFIG_OUT & RP_CONFIG_OUT_NEGOTIATED_LINK_WIDTH_MASK) >> RP_CONFIG_OUT_NEGOTIATED_LINK_WIDTH_POS; FWK_LOG_INFO( - pcie_ctx.log_api, - "[%s] Negotiated link width: x%d\n", + "[%s] Negotiated link width: x%d", pcie_type[did], fwk_math_pow2(neg_config)); if (gen_speed == PCIE_GEN_4) { - FWK_LOG_INFO( - pcie_ctx.log_api, - "[%s] Re-training link to GEN4 speed...", - pcie_type[did]); + FWK_LOG_INFO("[%s] Re-training link to GEN4 speed...", pcie_type[did]); /* Set GEN4 as target speed */ pcie_rp_ep_config_read_word(dev_ctx->rp_ep_config_apb, PCIE_LINK_CTRL_STATUS_2_OFFSET, ®_val); @@ -344,28 +331,22 @@ static int n1sdp_pcie_link_training(fwk_id_t id, bool ep_mode) dev_ctx->rp_ep_config_apb, pcie_ctx.timer_api); if (status != FWK_SUCCESS) { - FWK_LOG_INFO(pcie_ctx.log_api, "TIMEOUT\n"); + FWK_LOG_INFO("[%s] TIMEOUT", pcie_type[did]); return FWK_SUCCESS; } - FWK_LOG_INFO(pcie_ctx.log_api, "Done\n"); + FWK_LOG_INFO("[%s] Done", pcie_type[did]); pcie_rp_ep_config_read_word(dev_ctx->rp_ep_config_apb, PCIE_LINK_CTRL_STATUS_OFFSET, ®_val); neg_config = (reg_val >> PCIE_LINK_CTRL_NEG_SPEED_POS) & PCIE_LINK_CTRL_NEG_SPEED_MASK; FWK_LOG_INFO( - pcie_ctx.log_api, - "[%s] Re-negotiated speed: GEN%d\n", - pcie_type[did], - neg_config); + "[%s] Re-negotiated speed: GEN%d", pcie_type[did], neg_config); neg_config = (reg_val >> PCIE_LINK_CTRL_NEG_WIDTH_POS) & PCIE_LINK_CTRL_NEG_WIDTH_MASK; FWK_LOG_INFO( - pcie_ctx.log_api, - "[%s] Re-negotiated link width: x%d\n", - pcie_type[did], - neg_config); + "[%s] Re-negotiated link width: x%d", pcie_type[did], neg_config); } return FWK_SUCCESS; @@ -383,8 +364,7 @@ static int n1sdp_pcie_rc_setup(fwk_id_t id) if (dev_ctx == NULL) return FWK_E_PARAM; - FWK_LOG_INFO( - pcie_ctx.log_api, "[%s] Setup Type0 configuration...", pcie_type[did]); + FWK_LOG_INFO("[%s] Setup Type0 configuration...", pcie_type[did]); if (dev_ctx->config->ccix_capable) ecam_base_addr = dev_ctx->config->axi_slave_base32 + CCIX_AXI_ECAM_TYPE0_OFFSET; @@ -396,13 +376,12 @@ static int n1sdp_pcie_rc_setup(fwk_id_t id) __builtin_ctz(AXI_ECAM_TYPE0_SIZE), TRANS_TYPE_0_CFG); if (status != FWK_SUCCESS) { - FWK_LOG_INFO(pcie_ctx.log_api, "Error!\n"); + FWK_LOG_INFO("[%s] Error!", pcie_type[did]); return status; } - FWK_LOG_INFO(pcie_ctx.log_api, "Done\n"); + FWK_LOG_INFO("[%s] Done", pcie_type[did]); - FWK_LOG_INFO( - pcie_ctx.log_api, "[%s] Setup Type1 configuration...", pcie_type[did]); + FWK_LOG_INFO("[%s] Setup Type1 configuration...", pcie_type[did]); if (dev_ctx->config->ccix_capable) ecam_base_addr = dev_ctx->config->axi_slave_base32 + CCIX_AXI_ECAM_TYPE1_OFFSET; @@ -414,13 +393,12 @@ static int n1sdp_pcie_rc_setup(fwk_id_t id) __builtin_ctz(AXI_ECAM_TYPE1_SIZE), TRANS_TYPE_1_CFG); if (status != FWK_SUCCESS) { - FWK_LOG_INFO(pcie_ctx.log_api, "Error!\n"); + FWK_LOG_INFO("[%s] Error!", pcie_type[did]); return status; } - FWK_LOG_INFO(pcie_ctx.log_api, "Done\n"); + FWK_LOG_INFO("[%s] Done", pcie_type[did]); - FWK_LOG_INFO( - pcie_ctx.log_api, "[%s] Setup MMIO32 configuration...", pcie_type[did]); + FWK_LOG_INFO("[%s] Setup MMIO32 configuration...", pcie_type[did]); if (dev_ctx->config->ccix_capable) ecam_base_addr = dev_ctx->config->axi_slave_base32 + CCIX_AXI_MMIO32_OFFSET; @@ -432,13 +410,12 @@ static int n1sdp_pcie_rc_setup(fwk_id_t id) __builtin_ctz(AXI_MMIO32_SIZE), TRANS_TYPE_MEM_IO); if (status != FWK_SUCCESS) { - FWK_LOG_INFO(pcie_ctx.log_api, "Error!\n"); + FWK_LOG_INFO("[%s] Error!", pcie_type[did]); return status; } - FWK_LOG_INFO(pcie_ctx.log_api, "Done\n"); + FWK_LOG_INFO("[%s] Done", pcie_type[did]); - FWK_LOG_INFO( - pcie_ctx.log_api, "[%s] Setup IO configuration...", pcie_type[did]); + FWK_LOG_INFO("[%s] Setup IO configuration...", pcie_type[did]); if (dev_ctx->config->ccix_capable) ecam_base_addr = dev_ctx->config->axi_slave_base32 + CCIX_AXI_IO_OFFSET; @@ -450,72 +427,64 @@ static int n1sdp_pcie_rc_setup(fwk_id_t id) __builtin_ctz(AXI_IO_SIZE), TRANS_TYPE_IO); if (status != FWK_SUCCESS) { - FWK_LOG_INFO(pcie_ctx.log_api, "Error!\n"); + FWK_LOG_INFO("[%s] Error!", pcie_type[did]); return status; } - FWK_LOG_INFO(pcie_ctx.log_api, "Done\n"); + FWK_LOG_INFO("[%s] Done", pcie_type[did]); - FWK_LOG_INFO( - pcie_ctx.log_api, "[%s] Setup MMIO64 configuration...", pcie_type[did]); + FWK_LOG_INFO("[CCIX] [%s] Setup MMIO64 configuration...", pcie_type[did]); status = axi_outbound_region_setup(dev_ctx->rc_axi_config_apb, dev_ctx->config->axi_slave_base64, __builtin_ctz(AXI_MMIO64_SIZE), TRANS_TYPE_MEM_IO); if (status != FWK_SUCCESS) { - FWK_LOG_INFO(pcie_ctx.log_api, "Error!\n"); + FWK_LOG_INFO("[%s] Error!", pcie_type[did]); return status; } - FWK_LOG_INFO(pcie_ctx.log_api, "Done\n"); + FWK_LOG_INFO("[%s] Done", pcie_type[did]); - FWK_LOG_INFO( - pcie_ctx.log_api, "[%s] Setup RP classcode...", pcie_type[did]); + FWK_LOG_INFO("[%s] Setup RP classcode...", pcie_type[did]); status = pcie_rp_ep_config_write_word(dev_ctx->rp_ep_config_apb, PCIE_CLASS_CODE_OFFSET, PCIE_CLASS_CODE_PCI_BRIDGE); if (status != FWK_SUCCESS) { - FWK_LOG_INFO(pcie_ctx.log_api, "Error!\n"); + FWK_LOG_INFO("Error!"); return status; } - FWK_LOG_INFO(pcie_ctx.log_api, "Done\n"); + FWK_LOG_INFO("Done"); FWK_LOG_INFO( - pcie_ctx.log_api, "[%s] Enable inbound region in BAR 2...", pcie_type[did]); status = axi_inbound_region_setup(dev_ctx->rc_axi_config_apb, AXI_IB_REGION_BASE, AXI_IB_REGION_SIZE_MSB, 2); if (status != FWK_SUCCESS) { - FWK_LOG_INFO(pcie_ctx.log_api, "Error!\n"); + FWK_LOG_INFO("[%s] Error!", pcie_type[did]); return status; } - FWK_LOG_INFO(pcie_ctx.log_api, "Done\n"); + FWK_LOG_INFO("[%s] Done", pcie_type[did]); - FWK_LOG_INFO( - pcie_ctx.log_api, - "[%s] Enable Type 1 I/O configuration\n", - pcie_type[did]); + FWK_LOG_INFO("[%s] Enable Type 1 I/O configuration", pcie_type[did]); *(uint32_t *)(dev_ctx->lm_apb + PCIE_LM_RC_BAR_CONFIG_REG) = (TYPE1_PREF_MEM_BAR_ENABLE_MASK | TYPE1_PREF_MEM_BAR_SIZE_64BIT_MASK | TYPE1_PREF_IO_BAR_ENABLE_MASK | TYPE1_PREF_IO_BAR_SIZE_32BIT_MASK); - FWK_LOG_INFO( - pcie_ctx.log_api, "[%s] Skipping ATS capability...", pcie_type[did]); + FWK_LOG_INFO("[%s] Skipping ATS capability...", pcie_type[did]); status = pcie_skip_ext_cap(dev_ctx->rp_ep_config_apb, EXT_CAP_ID_ATS); if (status != FWK_SUCCESS) - FWK_LOG_INFO(pcie_ctx.log_api, "Not found!\n"); + FWK_LOG_INFO("[%s] Not found!", pcie_type[did]); else - FWK_LOG_INFO(pcie_ctx.log_api, "Done\n"); + FWK_LOG_INFO("[%s] Done", pcie_type[did]); - FWK_LOG_INFO( - pcie_ctx.log_api, "[%s] Skipping PRI capability...", pcie_type[did]); + FWK_LOG_INFO("[%s] Skipping PRI capability...", pcie_type[did]); status = pcie_skip_ext_cap(dev_ctx->rp_ep_config_apb, EXT_CAP_ID_PRI); if (status != FWK_SUCCESS) - FWK_LOG_INFO(pcie_ctx.log_api, "Not found!\n"); + FWK_LOG_INFO("[%s] Not found!", pcie_type[did]); else - FWK_LOG_INFO(pcie_ctx.log_api, "Done\n"); + FWK_LOG_INFO("[%s] Done", pcie_type[did]); /* * Wait until devices connected in downstream ports @@ -544,17 +513,15 @@ static int n1sdp_pcie_vc1_setup(fwk_id_t id, uint8_t vc1_tc) config_base_addr = dev_ctx->rp_ep_config_apb; - FWK_LOG_TRACE( - pcie_ctx.log_api, - "[CCIX] Enabling VC1 in RP 0x%08x...", - config_base_addr); + FWK_LOG_INFO( + "[CCIX] Enabling VC1 in RP 0x%" PRIX32 "...", config_base_addr); status = pcie_vc_setup(config_base_addr, vc1_tc); if (status != FWK_SUCCESS) { - FWK_LOG_TRACE(pcie_ctx.log_api, "Error!\n"); + FWK_LOG_ERR("[CCIX] Error!"); return status; } - FWK_LOG_TRACE(pcie_ctx.log_api, "Done\n"); + FWK_LOG_INFO("[CCIX] Done"); /* Set max payload size to 512 */ *(volatile uint32_t *)(config_base_addr + PCIE_DEV_CTRL_STATUS_OFFSET) |= @@ -562,17 +529,15 @@ static int n1sdp_pcie_vc1_setup(fwk_id_t id, uint8_t vc1_tc) config_base_addr = dev_ctx->config->axi_slave_base32 + 0x100000; - FWK_LOG_TRACE( - pcie_ctx.log_api, - "[CCIX] Enabling VC1 in EP 0x%08x...", - config_base_addr); + FWK_LOG_INFO( + "[CCIX] Enabling VC1 in EP 0x%" PRIX32 "...", config_base_addr); status = pcie_vc_setup(config_base_addr, vc1_tc); if (status != FWK_SUCCESS) { - FWK_LOG_TRACE(pcie_ctx.log_api, "Error!\n"); + FWK_LOG_ERR("[CCIX] Error!"); return status; } - FWK_LOG_TRACE(pcie_ctx.log_api, "Done\n"); + FWK_LOG_INFO("[CCIX] Done"); *(volatile uint32_t *)(config_base_addr + PCIE_DEV_CTRL_STATUS_OFFSET) |= (0x2 << PCIE_DEV_CTRL_MAX_PAYLOAD_SHIFT); @@ -683,11 +648,6 @@ static int n1sdp_pcie_bind(fwk_id_t id, unsigned int round) int status; if (round == 0) { - status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_LOG), - FWK_ID_API(FWK_MODULE_IDX_LOG, 0), &pcie_ctx.log_api); - if (status != FWK_SUCCESS) - return status; - status = fwk_module_bind(FWK_ID_ELEMENT(FWK_MODULE_IDX_TIMER, 0), FWK_ID_API(FWK_MODULE_IDX_TIMER, MOD_TIMER_API_IDX_TIMER), &pcie_ctx.timer_api); diff --git a/product/n1sdp/module/n1sdp_remote_pd/src/mod_n1sdp_remote_pd.c b/product/n1sdp/module/n1sdp_remote_pd/src/mod_n1sdp_remote_pd.c index 9f5bd422..6704b5cd 100644 --- a/product/n1sdp/module/n1sdp_remote_pd/src/mod_n1sdp_remote_pd.c +++ b/product/n1sdp/module/n1sdp_remote_pd/src/mod_n1sdp_remote_pd.c @@ -45,9 +45,6 @@ struct n1sdp_remote_pd_ctx { /* Total power domains */ unsigned int pd_count; - /* Log API */ - struct mod_log_api *log_api; - /* C2C power domain API */ struct n1sdp_c2c_pd_api *c2c_pd_api; @@ -129,9 +126,7 @@ static int remote_pd_set_state(fwk_id_t pd_id, unsigned int state) default: FWK_LOG_ERR( - remote_pd_ctx.log_api, - "[C2C] Requested CPU power state (%i) is not supported!\n", - state); + "[C2C] Requested CPU power state (%i) is not supported!", state); return FWK_E_PARAM; } @@ -215,11 +210,6 @@ static int remote_pd_bind(fwk_id_t id, unsigned int round) return FWK_SUCCESS; if ((round == 0) && fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) { - status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_LOG), - MOD_LOG_API_ID, &remote_pd_ctx.log_api); - if (status != FWK_SUCCESS) - return status; - status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_N1SDP_C2C), FWK_ID_API(FWK_MODULE_IDX_N1SDP_C2C, N1SDP_C2C_API_IDX_PD), diff --git a/product/n1sdp/module/n1sdp_rom/src/mod_n1sdp_rom.c b/product/n1sdp/module/n1sdp_rom/src/mod_n1sdp_rom.c index ac1f424a..2cfee498 100644 --- a/product/n1sdp/module/n1sdp_rom/src/mod_n1sdp_rom.c +++ b/product/n1sdp/module/n1sdp_rom/src/mod_n1sdp_rom.c @@ -27,9 +27,6 @@ struct mod_n1sdp_rom_ctx { /* ROM configuration structure */ const struct n1sdp_rom_config *rom_config; - /* Pointer to log API */ - struct mod_log_api *log_api; - /* Pointer to n1sdp_flash API */ struct mod_n1sdp_flash_api *flash_api; }; @@ -82,14 +79,6 @@ static int n1sdp_rom_bind(fwk_id_t id, unsigned int round) /* Use second round only (round numbering is zero-indexed) */ if (round == 1) { - /* Bind to the log component */ - status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_LOG), - FWK_ID_API(FWK_MODULE_IDX_LOG, 0), - &n1sdp_rom_ctx.log_api); - - if (status != FWK_SUCCESS) - return FWK_E_PANIC; - /* Bind to the n1sdp_flash component */ status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_N1SDP_FLASH), FWK_ID_API(FWK_MODULE_IDX_N1SDP_FLASH, 0), @@ -142,26 +131,20 @@ static int n1sdp_rom_process_event(const struct fwk_event *event, if (fip_desc->type == MOD_N1SDP_FIP_TYPE_MCP_BL2) { FWK_LOG_INFO( - n1sdp_rom_ctx.log_api, "[ROM] Found MCP RAM Firmware at address: 0x%x," - " size: %d bytes, flags: 0x%x\n", + " size: %d bytes, flags: 0x%x", fip_desc->address, fip_desc->size, fip_desc->flags); - FWK_LOG_INFO( - n1sdp_rom_ctx.log_api, - "[ROM] Copying MCP RAM Firmware to ITCRAM...!\n"); + FWK_LOG_INFO("[ROM] Copying MCP RAM Firmware to ITCRAM...!"); } else { FWK_LOG_INFO( - n1sdp_rom_ctx.log_api, "[ROM] Found SCP BL2 RAM Firmware at address: 0x%x," - " size: %d bytes, flags: 0x%x\n", + " size: %d bytes, flags: 0x%x", fip_desc->address, fip_desc->size, fip_desc->flags); - FWK_LOG_INFO( - n1sdp_rom_ctx.log_api, - "[ROM] Copying SCP RAM Firmware to ITCRAM...!\n"); + FWK_LOG_INFO("[ROM] Copying SCP RAM Firmware to ITCRAM...!"); } break; } @@ -171,9 +154,9 @@ static int n1sdp_rom_process_event(const struct fwk_event *event, memcpy((void *)n1sdp_rom_ctx.rom_config->ramfw_base, (uint8_t *)fip_desc->address, fip_desc->size); - FWK_LOG_INFO(n1sdp_rom_ctx.log_api, "[ROM] Done!\n"); + FWK_LOG_INFO("[ROM] Done!"); - FWK_LOG_INFO(n1sdp_rom_ctx.log_api, "[ROM] Jumping to RAM Firmware\n"); + FWK_LOG_INFO("[ROM] Jumping to RAM Firmware"); jump_to_ramfw(); diff --git a/product/n1sdp/module/n1sdp_scp2pcc/src/mod_n1sdp_scp2pcc.c b/product/n1sdp/module/n1sdp_scp2pcc/src/mod_n1sdp_scp2pcc.c index 9ae6ffa2..da02fad8 100644 --- a/product/n1sdp/module/n1sdp_scp2pcc/src/mod_n1sdp_scp2pcc.c +++ b/product/n1sdp/module/n1sdp_scp2pcc/src/mod_n1sdp_scp2pcc.c @@ -26,9 +26,6 @@ struct n1sdp_scp2pcc_ctx { /* Pointer to module configuration */ struct mem_msg_config_st *config; - /* Log API pointer */ - const struct mod_log_api *log_api; - /* Sequence variable */ unsigned int sequence; }; @@ -76,12 +73,12 @@ static int mem_msg_send_message(void *data, uint16_t size, uint16_t type) struct mem_msg_packet_st *packet = NULL; if (type == SCP2PCC_TYPE_SHUTDOWN) - FWK_LOG_INFO(scp2pcc_ctx.log_api, "Shutdown request to PCC\n"); + FWK_LOG_INFO("Shutdown request to PCC"); /* Check parameters. */ if ((size > MSG_PAYLOAD_SIZE) || (type == MSG_UNUSED_MESSAGE_TYPE)) { - FWK_LOG_INFO(scp2pcc_ctx.log_api, "Invalid parameters\n"); + FWK_LOG_INFO("Invalid parameters"); return FWK_E_PARAM; } @@ -144,16 +141,6 @@ static int n1sdp_scp2pcc_init(fwk_id_t module_id, unsigned int unused, return FWK_SUCCESS; } -static int n1sdp_scp2pcc_bind(fwk_id_t id, unsigned int round) -{ - if (round == 0) { - return fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_LOG), - MOD_LOG_API_ID, &scp2pcc_ctx.log_api); - } - - return FWK_SUCCESS; -} - static int n1sdp_scp2pcc_process_bind_request(fwk_id_t requester_id, fwk_id_t target_id, fwk_id_t api_id, const void **api) { @@ -175,7 +162,6 @@ const struct fwk_module module_n1sdp_scp2pcc = { .api_count = 1, .type = FWK_MODULE_TYPE_PROTOCOL, .init = n1sdp_scp2pcc_init, - .bind = n1sdp_scp2pcc_bind, .process_bind_request = n1sdp_scp2pcc_process_bind_request, .start = n1sdp_scp2pcc_start, }; diff --git a/product/n1sdp/module/n1sdp_smt/src/mod_smt.c b/product/n1sdp/module/n1sdp_smt/src/mod_smt.c index 199bed8f..81d04fe4 100644 --- a/product/n1sdp/module/n1sdp_smt/src/mod_smt.c +++ b/product/n1sdp/module/n1sdp_smt/src/mod_smt.c @@ -12,7 +12,6 @@ #include <fwk_assert.h> #include <fwk_id.h> #include <fwk_interrupt.h> -#include <fwk_log.h> #include <fwk_mm.h> #include <fwk_module.h> #include <fwk_module_idx.h> @@ -48,9 +47,6 @@ struct smt_channel_ctx { }; struct smt_ctx { - /* Log module API */ - struct mod_log_api *log_api; - /* Table of channel contexts */ struct smt_channel_ctx *channel_ctx_table; @@ -391,11 +387,8 @@ static int smt_bind(fwk_id_t id, unsigned int round) struct smt_channel_ctx *channel_ctx; if (round == 0) { - if (fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) { - return fwk_module_bind(fwk_module_id_log, - FWK_ID_API(FWK_MODULE_IDX_LOG, 0), - &smt_ctx.log_api); - } + if (fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) + return FWK_SUCCESS; channel_ctx = &smt_ctx.channel_ctx_table[fwk_id_get_element_idx(id)]; status = fwk_module_bind(channel_ctx->config->driver_id, diff --git a/product/n1sdp/module/n1sdp_system/src/mod_n1sdp_system.c b/product/n1sdp/module/n1sdp_system/src/mod_n1sdp_system.c index 722b1f41..417f8dc0 100644 --- a/product/n1sdp/module/n1sdp_system/src/mod_n1sdp_system.c +++ b/product/n1sdp/module/n1sdp_system/src/mod_n1sdp_system.c @@ -46,6 +46,7 @@ #include <fmw_cmsis.h> +#include <inttypes.h> #include <stdbool.h> #include <stdint.h> #include <string.h> @@ -122,10 +123,6 @@ static fwk_id_t sds_bl33_info_id = /* Module context */ struct n1sdp_system_ctx { - - /* Log API pointer */ - const struct mod_log_api *log_api; - /* Pointer to the Interrupt Service Routine API of the PPU_V1 module */ const struct ppu_v1_isr_api *ppu_v1_isr_api; @@ -222,23 +219,17 @@ static int n1sdp_system_shutdown( switch (system_shutdown) { case MOD_PD_SYSTEM_SHUTDOWN: - FWK_LOG_INFO( - n1sdp_system_ctx.log_api, - "[N1SDP SYSTEM] Request PCC for system shutdown\n"); + FWK_LOG_INFO("[N1SDP SYSTEM] Request PCC for system shutdown"); n1sdp_system_ctx.scp2pcc_api->send(NULL, 0, SCP2PCC_TYPE_SHUTDOWN); break; case MOD_PD_SYSTEM_COLD_RESET: - FWK_LOG_INFO( - n1sdp_system_ctx.log_api, - "[N1SDP SYSTEM] Request PCC for system reboot\n"); + FWK_LOG_INFO("[N1SDP SYSTEM] Request PCC for system reboot"); n1sdp_system_ctx.scp2pcc_api->send(NULL, 0, SCP2PCC_TYPE_REBOOT); break; default: - FWK_LOG_INFO( - n1sdp_system_ctx.log_api, - "[N1SDP SYSTEM] Unknown shutdown command!\n"); + FWK_LOG_INFO("[N1SDP SYSTEM] Unknown shutdown command!"); break; } @@ -300,26 +291,21 @@ static int n1sdp_system_copy_to_ap_sram(uint64_t sram_address, if (memcmp((void *)target_addr, (void *)spi_address, size) != 0) { FWK_LOG_INFO( - n1sdp_system_ctx.log_api, - "[N1SDP SYSTEM] Copy failed at destination address: 0x%08x\n", + "[N1SDP SYSTEM] Copy failed at destination address: 0x%" PRIX32, target_addr); return FWK_E_DATA; } FWK_LOG_INFO( - n1sdp_system_ctx.log_api, - "[N1SDP SYSTEM] Copied binary to SRAM address: 0x%08x\n", + "[N1SDP SYSTEM] Copied binary to SRAM address: 0x%" PRIX64, sram_address); return FWK_SUCCESS; } void cdbg_pwrupreq_handler(void) { - FWK_LOG_INFO( - n1sdp_system_ctx.log_api, - "[N1SDP SYSTEM] Received debug power up request interrupt\n"); + FWK_LOG_INFO("[N1SDP SYSTEM] Received debug power up request interrupt"); - FWK_LOG_INFO( - n1sdp_system_ctx.log_api, "[N1SDP SYSTEM] Power on Debug PIK\n"); + FWK_LOG_INFO("[N1SDP SYSTEM] Power on Debug PIK"); /* Clear interrupt */ PIK_DEBUG->DEBUG_CTRL |= (0x1 << 1); @@ -328,9 +314,7 @@ void cdbg_pwrupreq_handler(void) void csys_pwrupreq_handler(void) { - FWK_LOG_INFO( - n1sdp_system_ctx.log_api, - "[N1SDP SYSTEM] Received system power up request interrupt\n"); + FWK_LOG_INFO("[N1SDP SYSTEM] Received system power up request interrupt"); /* Clear interrupt */ PIK_DEBUG->DEBUG_CTRL |= (0x1 << 2); @@ -353,9 +337,7 @@ static int n1sdp_system_fill_platform_info(void) status = n1sdp_system_ctx.dmc620_api->get_mem_size_gb(&ddr_size_gb); if (status != FWK_SUCCESS) { - FWK_LOG_INFO( - n1sdp_system_ctx.log_api, - "Error calculating local DDR memory size!\n"); + FWK_LOG_INFO("Error calculating local DDR memory size!"); return status; } @@ -370,16 +352,13 @@ static int n1sdp_system_fill_platform_info(void) status = n1sdp_system_ctx.c2c_api->get_ddr_size_gb (&sds_platform_info.remote_ddr_size); if (status != FWK_SUCCESS) { - FWK_LOG_INFO( - n1sdp_system_ctx.log_api, - "Error calculating Remote DDR memory size!\n"); + FWK_LOG_INFO("Error calculating Remote DDR memory size!"); return status; } } FWK_LOG_INFO( - n1sdp_system_ctx.log_api, - " Total DDR Size: %d GB\n", + " Total DDR Size: %d GB", sds_platform_info.local_ddr_size + sds_platform_info.remote_ddr_size); return n1sdp_system_ctx.sds_api->struct_write(sds_structure_desc->id, @@ -414,8 +393,7 @@ static int n1sdp_system_init_primary_core(void) int fip_index_bl31 = -1; FWK_LOG_INFO( - n1sdp_system_ctx.log_api, - "[N1SDP SYSTEM] Setting AP Reset Address to 0x%08x\n", + "[N1SDP SYSTEM] Setting AP Reset Address to 0x%" PRIX64, AP_CORE_RESET_ADDR - AP_SCP_SRAM_OFFSET); cluster_count = n1sdp_core_get_cluster_count(); @@ -433,8 +411,7 @@ static int n1sdp_system_init_primary_core(void) if (n1sdp_get_chipid() == 0x0) { FWK_LOG_INFO( - n1sdp_system_ctx.log_api, - "[N1SDP SYSTEM] Looking for AP firmware in flash memory...\n"); + "[N1SDP SYSTEM] Looking for AP firmware in flash memory..."); status = n1sdp_system_ctx.flash_api->get_n1sdp_fip_descriptor_count( FWK_ID_MODULE(FWK_MODULE_IDX_N1SDP_SYSTEM), &fip_count); @@ -449,9 +426,8 @@ static int n1sdp_system_init_primary_core(void) for (i = 0; i < fip_count; i++) { if (fip_desc_table[i].type == MOD_N1SDP_FIP_TYPE_TF_BL31) { FWK_LOG_INFO( - n1sdp_system_ctx.log_api, "[N1SDP SYSTEM] Found BL31 at address: 0x%08x," - " size: %u, flags: 0x%x\n", + " size: %u, flags: 0x%x", fip_desc_table[i].address, fip_desc_table[i].size, fip_desc_table[i].flags); @@ -462,15 +438,13 @@ static int n1sdp_system_init_primary_core(void) if (fip_index_bl31 < 0) { FWK_LOG_INFO( - n1sdp_system_ctx.log_api, "[N1SDP SYSTEM] Error! " - "FIP does not have BL31 binary\n"); + "FIP does not have BL31 binary"); return FWK_E_PANIC; } FWK_LOG_INFO( - n1sdp_system_ctx.log_api, - "[N1SDP SYSTEM] Copying AP BL31 to address 0x%x...\n", + "[N1SDP SYSTEM] Copying AP BL31 to address 0x%" PRIX64 "...", AP_CORE_RESET_ADDR); status = n1sdp_system_copy_to_ap_sram(AP_CORE_RESET_ADDR, @@ -480,33 +454,27 @@ static int n1sdp_system_init_primary_core(void) return FWK_E_PANIC; /* Fill BL33 image information structure */ - FWK_LOG_INFO( - n1sdp_system_ctx.log_api, - "[N1SDP SYSTEM] Filling BL33 information...\n"); + FWK_LOG_INFO("[N1SDP SYSTEM] Filling BL33 information..."); status = n1sdp_system_fill_bl33_info(); if (status != FWK_SUCCESS) return status; /* Fill Platform information structure */ - FWK_LOG_INFO( - n1sdp_system_ctx.log_api, - "[N1SDP SYSTEM] Collecting Platform information...\n"); + FWK_LOG_INFO("[N1SDP SYSTEM] Collecting Platform information..."); status = n1sdp_system_fill_platform_info(); if (status != FWK_SUCCESS) return status; /* Enable non-secure CoreSight debug access */ FWK_LOG_INFO( - n1sdp_system_ctx.log_api, - "[N1SDP SYSTEM] Enabling CoreSight debug non-secure access\n"); + "[N1SDP SYSTEM] Enabling CoreSight debug non-secure access"); *(volatile uint32_t *)(AP_SCP_SRAM_OFFSET + NIC_400_SEC_0_CSAPBM_OFFSET) = 0xFFFFFFFF; mod_pd_restricted_api = n1sdp_system_ctx.mod_pd_restricted_api; - FWK_LOG_TRACE( - n1sdp_system_ctx.log_api, - "[N1SDP SYSTEM] Booting primary core at %d MHz...\n", + FWK_LOG_INFO( + "[N1SDP SYSTEM] Booting primary core at %lu MHz...", PIK_CLK_RATE_CLUS0_CPU / FWK_MHZ); status = mod_pd_restricted_api->set_composite_state_async( @@ -562,11 +530,6 @@ static int n1sdp_system_bind(fwk_id_t id, unsigned int round) if (round > 0) return FWK_SUCCESS; - status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_LOG), - FWK_ID_API(FWK_MODULE_IDX_LOG, 0), &n1sdp_system_ctx.log_api); - if (status != FWK_SUCCESS) - return status; - status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_N1SDP_FLASH), FWK_ID_API(FWK_MODULE_IDX_N1SDP_FLASH, 0), &n1sdp_system_ctx.flash_api); @@ -661,17 +624,11 @@ static int n1sdp_system_start(fwk_id_t id) CS_CNTCONTROL->CS_CNTCVLW = 0x00000000; CS_CNTCONTROL->CS_CNTCVUP = 0x0000FFFF; } else - FWK_LOG_TRACE( - n1sdp_system_ctx.log_api, - "[N1SDP SYSTEM] CSYS PWR UP REQ IRQ register failed\n"); + FWK_LOG_ERR("[N1SDP SYSTEM] CSYS PWR UP REQ IRQ register failed"); } else - FWK_LOG_TRACE( - n1sdp_system_ctx.log_api, - "[N1SDP SYSTEM] CDBG PWR UP REQ IRQ register failed\n"); + FWK_LOG_ERR("[N1SDP SYSTEM] CDBG PWR UP REQ IRQ register failed"); - FWK_LOG_TRACE( - n1sdp_system_ctx.log_api, - "[N1SDP SYSTEM] Requesting SYSTOP initialization...\n"); + FWK_LOG_INFO("[N1SDP SYSTEM] Requesting SYSTOP initialization..."); /* * Subscribe to these SCMI channels in order to know when they have all diff --git a/product/n1sdp/module/n1sdp_timer_sync/src/mod_n1sdp_timer_sync.c b/product/n1sdp/module/n1sdp_timer_sync/src/mod_n1sdp_timer_sync.c index b117698b..f711d644 100644 --- a/product/n1sdp/module/n1sdp_timer_sync/src/mod_n1sdp_timer_sync.c +++ b/product/n1sdp/module/n1sdp_timer_sync/src/mod_n1sdp_timer_sync.c @@ -17,7 +17,6 @@ #include <mod_timer.h> #include <fwk_assert.h> -#include <fwk_id.h> #include <fwk_interrupt.h> #include <fwk_log.h> #include <fwk_mm.h> @@ -27,7 +26,6 @@ #include <stdbool.h> #include <stddef.h> -#include <stdint.h> #define COUNTER_DELTA_MAX 0x100 #define INT_STATUS_TIMEOUT UINT32_C(1000) @@ -60,9 +58,6 @@ struct timer_sync_ctx { /* Table of device contexts */ struct tsync_device_ctx *device_ctx_table; - /* Log module API */ - struct mod_log_api *log_api; - /* Windowed AP memory access API */ struct mod_n1sdp_system_ap_memory_access_api *ap_mem_api; @@ -140,13 +135,13 @@ static int n1sdp_sync_master_timer(fwk_id_t id) SYNC_CHECK_INTERVAL_US); retries--; if ((retries % 10) == 0) - FWK_LOG_INFO(tsync_ctx.log_api, "."); + FWK_LOG_INFO("[N1SDP_TIMER_SYNC] Retries: %u", retries); } while (retries != 0); if ((retries == 0) && (!is_timer_synced(device_ctx))) - FWK_LOG_INFO(tsync_ctx.log_api, "Timeout!\n"); + FWK_LOG_INFO("[N1SDP_TIMER_SYNC] Timeout!"); else - FWK_LOG_INFO(tsync_ctx.log_api, "Synced\n"); + FWK_LOG_INFO("[N1SDP_TIMER_SYNC] Synced"); return FWK_SUCCESS; } @@ -223,11 +218,6 @@ static int n1sdp_timer_sync_bind(fwk_id_t id, unsigned int round) int status; if ((round == 0) && fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) { - status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_LOG), - FWK_ID_API(FWK_MODULE_IDX_LOG, 0), &tsync_ctx.log_api); - if (status != FWK_SUCCESS) - return status; - status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_N1SDP_SYSTEM), FWK_ID_API(FWK_MODULE_IDX_N1SDP_SYSTEM, MOD_N1SDP_SYSTEM_API_IDX_AP_MEMORY_ACCESS), diff --git a/product/n1sdp/module/scmi_agent/src/mod_scmi_agent.c b/product/n1sdp/module/scmi_agent/src/mod_scmi_agent.c index fdd8c1db..f87c5481 100644 --- a/product/n1sdp/module/scmi_agent/src/mod_scmi_agent.c +++ b/product/n1sdp/module/scmi_agent/src/mod_scmi_agent.c @@ -20,6 +20,7 @@ #include <fwk_status.h> #include <fwk_thread.h> +#include <inttypes.h> #include <stddef.h> #include <stdint.h> @@ -40,9 +41,6 @@ struct mod_scmi_agent_module_ctx { /* Pointer to agent configuration table */ struct scmi_agent_ctx *agent_ctx_table; - /* Log API pointer */ - const struct mod_log_api *log_api; - /* SMT API pointer */ const struct mod_scmi_agent_to_transport_api *smt_api; }; @@ -64,7 +62,7 @@ static int _scmi_agent_transact(fwk_id_t agent_id, /* Check if channel is free */ if (!ctx.smt_api->is_channel_free(agent_ctx->config->transport_id)) { - FWK_LOG_TRACE(ctx.log_api, "[SCMI AGENT] Channel Busy!\n"); + FWK_LOG_ERR("[SCMI AGENT] Channel Busy!"); return FWK_E_BUSY; } @@ -211,11 +209,9 @@ static int scmi_agent_bind(fwk_id_t id, unsigned int round) struct scmi_agent_ctx *agent_ctx; if (round == 0) { - if (fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) { - return fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_LOG), - FWK_ID_API(FWK_MODULE_IDX_LOG, 0), - &ctx.log_api); - } + if (fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) + return FWK_SUCCESS; + agent_ctx = &ctx.agent_ctx_table[fwk_id_get_element_idx(id)]; return fwk_module_bind(agent_ctx->config->transport_id, agent_ctx->config->transport_api_id, @@ -259,10 +255,8 @@ static int scmi_agent_process_event(const struct fwk_event *event, if (status != FWK_SUCCESS) return status; - FWK_LOG_TRACE( - ctx.log_api, - "[SCMI AGENT] Found management protocol version: 0x%x\n", - temp); + FWK_LOG_INFO( + "[SCMI AGENT] Found management protocol version: 0x%" PRIu32, temp); return status; } 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 7c110288..a8d46cbc 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 @@ -35,9 +35,6 @@ struct scmi_ccix_config_ctx { /* PCIe CCIX config api */ const struct n1sdp_pcie_ccix_config_api *pcie_ccix_config_api; - - /* Log module API */ - struct mod_log_api *log_api; }; static struct scmi_ccix_config_ctx scmi_ccix_config_ctx; @@ -179,10 +176,8 @@ static int scmi_ccix_config_protocol_get_handler(fwk_id_t service_id, if (sizeof(return_values) > max_payload_size) { return_values.status = SCMI_OUT_OF_RANGE; status = FWK_E_RANGE; - FWK_LOG_TRACE( - scmi_ccix_config_ctx.log_api, - "[SCMI CCIX CONFIG] max payload size is %d\n", - max_payload_size); + FWK_LOG_INFO( + "[SCMI CCIX CONFIG] max payload size is %d", max_payload_size); goto exit; } @@ -269,10 +264,8 @@ static int scmi_ccix_config_protocol_set_handler(fwk_id_t service_id, if (sizeof(*params) > max_payload_size) { return_values.status = SCMI_OUT_OF_RANGE; status = FWK_E_RANGE; - FWK_LOG_TRACE( - scmi_ccix_config_ctx.log_api, - "[SCMI CCIX CONFIG] max payload size is %d\n", - max_payload_size); + FWK_LOG_INFO( + "[SCMI CCIX CONFIG] max payload size is %d", max_payload_size); goto exit; } @@ -425,14 +418,6 @@ static int scmi_ccix_config_bind(fwk_id_t id, unsigned int round) if (round == 1) return FWK_SUCCESS; - status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_LOG), - FWK_ID_API(FWK_MODULE_IDX_LOG, 0), &scmi_ccix_config_ctx.log_api); - if (status != FWK_SUCCESS) { - /* Failed to bind to log module */ - fwk_assert(false); - return status; - } - status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_SCMI), FWK_ID_API(FWK_MODULE_IDX_SCMI, MOD_SCMI_API_IDX_PROTOCOL), &scmi_ccix_config_ctx.scmi_api); diff --git a/product/n1sdp/scp_ramfw/config_log.c b/product/n1sdp/scp_ramfw/config_log.c index 21cb3b6a..97e62c58 100644 --- a/product/n1sdp/scp_ramfw/config_log.c +++ b/product/n1sdp/scp_ramfw/config_log.c @@ -49,13 +49,8 @@ struct fwk_module_config config_pl011 = { static const struct mod_log_config log_data = { .device_id = FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PL011, 0), .api_id = FWK_ID_API_INIT(FWK_MODULE_IDX_PL011, 0), - .log_groups = MOD_LOG_GROUP_ERROR | - MOD_LOG_GROUP_INFO | - MOD_LOG_GROUP_WARNING | - MOD_LOG_GROUP_DEBUG, - .banner = FWK_BANNER_SCP - FWK_BANNER_RAM_FIRMWARE - BUILD_VERSION_DESCRIBE_STRING "\n", + .banner = + FWK_BANNER_SCP FWK_BANNER_RAM_FIRMWARE BUILD_VERSION_DESCRIBE_STRING, }; struct fwk_module_config config_log = { diff --git a/product/n1sdp/scp_romfw/config_log.c b/product/n1sdp/scp_romfw/config_log.c index 757d5fbe..d8aace73 100644 --- a/product/n1sdp/scp_romfw/config_log.c +++ b/product/n1sdp/scp_romfw/config_log.c @@ -20,7 +20,7 @@ /* * N1SDP BYPASS ROM firmware banner string. */ -#define N1SDP_BANNER_ROM_FIRMWARE "Entered BYPASS ROM Firmware\n" +#define N1SDP_BANNER_ROM_FIRMWARE "Entered BYPASS ROM Firmware" /* * PL011 module @@ -54,13 +54,8 @@ struct fwk_module_config config_pl011 = { static const struct mod_log_config log_data = { .device_id = FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PL011, 0), .api_id = FWK_ID_API_INIT(FWK_MODULE_IDX_PL011, 0), - .log_groups = MOD_LOG_GROUP_ERROR | - MOD_LOG_GROUP_INFO | - MOD_LOG_GROUP_WARNING | - MOD_LOG_GROUP_DEBUG, - .banner = FWK_BANNER_SCP - N1SDP_BANNER_ROM_FIRMWARE - BUILD_VERSION_DESCRIBE_STRING "\n", + .banner = + FWK_BANNER_SCP N1SDP_BANNER_ROM_FIRMWARE BUILD_VERSION_DESCRIBE_STRING, }; struct fwk_module_config config_log = { diff --git a/product/rddaniel/mcp_romfw/config_log.c b/product/rddaniel/mcp_romfw/config_log.c index 1924abce..59704bef 100644 --- a/product/rddaniel/mcp_romfw/config_log.c +++ b/product/rddaniel/mcp_romfw/config_log.c @@ -48,13 +48,8 @@ struct fwk_module_config config_pl011 = { static const struct mod_log_config log_data = { .device_id = FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PL011, 0), .api_id = FWK_ID_API_INIT(FWK_MODULE_IDX_PL011, 0), - .log_groups = MOD_LOG_GROUP_ERROR | - MOD_LOG_GROUP_INFO | - MOD_LOG_GROUP_WARNING | - MOD_LOG_GROUP_DEBUG, - .banner = FWK_BANNER_MCP - FWK_BANNER_ROM_FIRMWARE - BUILD_VERSION_DESCRIBE_STRING "\n", + .banner = + FWK_BANNER_MCP FWK_BANNER_ROM_FIRMWARE BUILD_VERSION_DESCRIBE_STRING, }; struct fwk_module_config config_log = { diff --git a/product/rddaniel/module/mscp_rom/src/mod_mscp_rom.c b/product/rddaniel/module/mscp_rom/src/mod_mscp_rom.c index e51fb232..554e9c88 100644 --- a/product/rddaniel/module/mscp_rom/src/mod_mscp_rom.c +++ b/product/rddaniel/module/mscp_rom/src/mod_mscp_rom.c @@ -20,7 +20,6 @@ #include <string.h> static const struct mscp_rom_config *rom_config; -static struct mod_log_api *log_api; enum rom_event { ROM_EVENT_RUN, @@ -61,24 +60,6 @@ static int mscp_rom_init(fwk_id_t module_id, unsigned int element_count, return FWK_SUCCESS; } -static int mscp_rom_bind(fwk_id_t id, unsigned int round) -{ - int status; - - /* Use second round only (round numbering is zero-indexed) */ - if (round == 1) { - /* Bind to the log component */ - status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_LOG), - FWK_ID_API(FWK_MODULE_IDX_LOG, 0), - &log_api); - - if (status != FWK_SUCCESS) - return FWK_E_PANIC; - } - - return FWK_SUCCESS; -} - static int mscp_rom_start(fwk_id_t id) { int status; @@ -96,7 +77,7 @@ static int mscp_rom_start(fwk_id_t id) static int mscp_rom_process_event(const struct fwk_event *event, struct fwk_event *resp) { - FWK_LOG_INFO(log_api, "[ROM] Loading RAM firmware\n"); + FWK_LOG_INFO("[ROM] Loading RAM firmware"); if (rom_config->ramfw_flash_size != 0) { memcpy((void *)rom_config->ramfw_ram_base, @@ -104,7 +85,7 @@ static int mscp_rom_process_event(const struct fwk_event *event, rom_config->ramfw_flash_size); } - FWK_LOG_INFO(log_api, "[ROM] Starting RAM firmware execution\n"); + FWK_LOG_INFO("[ROM] Starting RAM firmware execution"); jump_to_ramfw(); return FWK_SUCCESS; @@ -116,7 +97,6 @@ const struct fwk_module module_mscp_rom = { .type = FWK_MODULE_TYPE_SERVICE, .event_count = ROM_EVENT_COUNT, .init = mscp_rom_init, - .bind = mscp_rom_bind, .start = mscp_rom_start, .process_event = mscp_rom_process_event, }; diff --git a/product/rddaniel/module/rddaniel_system/src/mod_rddaniel_system.c b/product/rddaniel/module/rddaniel_system/src/mod_rddaniel_system.c index dfffb0c4..01ea000d 100644 --- a/product/rddaniel/module/rddaniel_system/src/mod_rddaniel_system.c +++ b/product/rddaniel/module/rddaniel_system/src/mod_rddaniel_system.c @@ -50,9 +50,6 @@ struct rddaniel_system_ctx { /* Pointer to the SCP PIK registers */ struct pik_scp_reg *pik_scp_reg; - /* Log API pointer */ - const struct mod_log_api *log_api; - /* Pointer to the Interrupt Service Routine API of the PPU_V1 module */ const struct ppu_v1_isr_api *ppu_v1_isr_api; @@ -219,11 +216,6 @@ static int rddaniel_system_bind(fwk_id_t id, unsigned int round) if (round > 0) return FWK_SUCCESS; - status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_LOG), - FWK_ID_API(FWK_MODULE_IDX_LOG, 0), &rddaniel_system_ctx.log_api); - if (status != FWK_SUCCESS) - return status; - status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_POWER_DOMAIN), FWK_ID_API(FWK_MODULE_IDX_POWER_DOMAIN, MOD_PD_API_IDX_RESTRICTED), &rddaniel_system_ctx.mod_pd_restricted_api); @@ -260,9 +252,7 @@ static int rddaniel_system_start(fwk_id_t id) if (status != FWK_SUCCESS) return status; - FWK_LOG_TRACE( - rddaniel_system_ctx.log_api, - "[RD-DANIEL SYSTEM] Requesting SYSTOP initialization...\n"); + FWK_LOG_INFO("[RD-DANIEL SYSTEM] Requesting SYSTOP initialization..."); /* * Subscribe to these SCMI channels in order to know when they have all @@ -317,9 +307,7 @@ int rddaniel_system_process_notification(const struct fwk_event *event, * time only */ if (params->new_state == MOD_CLOCK_STATE_RUNNING) { - FWK_LOG_TRACE( - rddaniel_system_ctx.log_api, - "[RD-DANIEL SYSTEM] Initializing the primary core...\n"); + FWK_LOG_INFO("[RD-DANIEL SYSTEM] Initializing the primary core..."); mod_pd_restricted_api = rddaniel_system_ctx.mod_pd_restricted_api; diff --git a/product/rddaniel/scp_ramfw/config_log.c b/product/rddaniel/scp_ramfw/config_log.c index 89d3575d..33a8b47e 100644 --- a/product/rddaniel/scp_ramfw/config_log.c +++ b/product/rddaniel/scp_ramfw/config_log.c @@ -18,13 +18,8 @@ static const struct mod_log_config log_data = { .device_id = FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PL011, 0), .api_id = FWK_ID_API_INIT(FWK_MODULE_IDX_PL011, 0), - .log_groups = MOD_LOG_GROUP_ERROR | - MOD_LOG_GROUP_INFO | - MOD_LOG_GROUP_WARNING | - MOD_LOG_GROUP_DEBUG, - .banner = FWK_BANNER_SCP - FWK_BANNER_RAM_FIRMWARE - BUILD_VERSION_DESCRIBE_STRING "\n", + .banner = + FWK_BANNER_SCP FWK_BANNER_RAM_FIRMWARE BUILD_VERSION_DESCRIBE_STRING, }; struct fwk_module_config config_log = { diff --git a/product/rddaniel/scp_romfw/config_log.c b/product/rddaniel/scp_romfw/config_log.c index a6531f24..48317aca 100644 --- a/product/rddaniel/scp_romfw/config_log.c +++ b/product/rddaniel/scp_romfw/config_log.c @@ -15,13 +15,8 @@ static const struct mod_log_config log_data = { .device_id = FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PL011, 0), .api_id = FWK_ID_API_INIT(FWK_MODULE_IDX_PL011, 0), - .log_groups = MOD_LOG_GROUP_ERROR | - MOD_LOG_GROUP_INFO | - MOD_LOG_GROUP_WARNING | - MOD_LOG_GROUP_DEBUG, - .banner = FWK_BANNER_SCP - FWK_BANNER_ROM_FIRMWARE - BUILD_VERSION_DESCRIBE_STRING "\n", + .banner = + FWK_BANNER_SCP FWK_BANNER_ROM_FIRMWARE BUILD_VERSION_DESCRIBE_STRING, }; struct fwk_module_config config_log = { diff --git a/product/rdn1e1/mcp_romfw/config_log.c b/product/rdn1e1/mcp_romfw/config_log.c index f332ccfd..d172915d 100644 --- a/product/rdn1e1/mcp_romfw/config_log.c +++ b/product/rdn1e1/mcp_romfw/config_log.c @@ -49,13 +49,8 @@ struct fwk_module_config config_pl011 = { static const struct mod_log_config log_data = { .device_id = FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PL011, 0), .api_id = FWK_ID_API_INIT(FWK_MODULE_IDX_PL011, 0), - .log_groups = MOD_LOG_GROUP_ERROR | - MOD_LOG_GROUP_INFO | - MOD_LOG_GROUP_WARNING | - MOD_LOG_GROUP_DEBUG, - .banner = FWK_BANNER_MCP - FWK_BANNER_ROM_FIRMWARE - BUILD_VERSION_DESCRIBE_STRING "\n", + .banner = + FWK_BANNER_MCP FWK_BANNER_ROM_FIRMWARE BUILD_VERSION_DESCRIBE_STRING, }; struct fwk_module_config config_log = { diff --git a/product/rdn1e1/module/rdn1e1_rom/src/mod_rdn1e1_rom.c b/product/rdn1e1/module/rdn1e1_rom/src/mod_rdn1e1_rom.c index 318f4334..ec698a50 100644 --- a/product/rdn1e1/module/rdn1e1_rom/src/mod_rdn1e1_rom.c +++ b/product/rdn1e1/module/rdn1e1_rom/src/mod_rdn1e1_rom.c @@ -20,7 +20,6 @@ #include <string.h> static const struct rdn1e1_rom_config *rom_config; -static struct mod_log_api *log_api; enum rom_event { ROM_EVENT_RUN, @@ -63,24 +62,6 @@ static int rdn1e1_rom_init(fwk_id_t module_id, unsigned int element_count, return FWK_SUCCESS; } -static int rdn1e1_rom_bind(fwk_id_t id, unsigned int round) -{ - int status; - - /* Use second round only (round numbering is zero-indexed) */ - if (round == 1) { - /* Bind to the log component */ - status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_LOG), - FWK_ID_API(FWK_MODULE_IDX_LOG, 0), - &log_api); - - if (status != FWK_SUCCESS) - return FWK_E_PANIC; - } - - return FWK_SUCCESS; -} - static int rdn1e1_rom_start(fwk_id_t id) { int status; @@ -98,7 +79,7 @@ static int rdn1e1_rom_start(fwk_id_t id) static int rdn1e1_rom_process_event(const struct fwk_event *event, struct fwk_event *resp) { - FWK_LOG_INFO(log_api, "[ROM] Launch RAM\n"); + FWK_LOG_INFO("[ROM] Launch RAM"); if (rom_config->load_ram_size != 0) { memcpy((void *)rom_config->ramfw_base, @@ -116,7 +97,6 @@ const struct fwk_module module_rdn1e1_rom = { .type = FWK_MODULE_TYPE_SERVICE, .event_count = ROM_EVENT_COUNT, .init = rdn1e1_rom_init, - .bind = rdn1e1_rom_bind, .start = rdn1e1_rom_start, .process_event = rdn1e1_rom_process_event, }; diff --git a/product/rdn1e1/module/rdn1e1_system/src/mod_rdn1e1_system.c b/product/rdn1e1/module/rdn1e1_system/src/mod_rdn1e1_system.c index 2273c014..30a1b73e 100644 --- a/product/rdn1e1/module/rdn1e1_system/src/mod_rdn1e1_system.c +++ b/product/rdn1e1/module/rdn1e1_system/src/mod_rdn1e1_system.c @@ -53,9 +53,6 @@ struct rdn1e1_system_ctx { /* Pointer to the SCP PIK registers */ struct pik_scp_reg *pik_scp_reg; - /* Log API pointer */ - const struct mod_log_api *log_api; - /* Pointer to the Interrupt Service Routine API of the PPU_V1 module */ const struct ppu_v1_isr_api *ppu_v1_isr_api; @@ -228,11 +225,6 @@ static int rdn1e1_system_bind(fwk_id_t id, unsigned int round) if (round > 0) return FWK_SUCCESS; - status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_LOG), - FWK_ID_API(FWK_MODULE_IDX_LOG, 0), &rdn1e1_system_ctx.log_api); - if (status != FWK_SUCCESS) - return status; - status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_POWER_DOMAIN), FWK_ID_API(FWK_MODULE_IDX_POWER_DOMAIN, MOD_PD_API_IDX_RESTRICTED), &rdn1e1_system_ctx.mod_pd_restricted_api); @@ -283,9 +275,7 @@ static int rdn1e1_system_start(fwk_id_t id) if (status != FWK_SUCCESS) return status; - FWK_LOG_TRACE( - rdn1e1_system_ctx.log_api, - "[RDN1E1 SYSTEM] Requesting SYSTOP initialization...\n"); + FWK_LOG_INFO("[RDN1E1 SYSTEM] Requesting SYSTOP initialization..."); /* * Subscribe to these SCMI channels in order to know when they have all @@ -367,10 +357,7 @@ int rdn1e1_system_process_notification(const struct fwk_event *event, status = rdn1e1_system_ctx.cmn600_api->set_config(&remote_config); if (status != FWK_SUCCESS) { - FWK_LOG_ERR( - rdn1e1_system_ctx.log_api, - "CCIX Setup Failed for Chip: %d!\n", - chip_id); + FWK_LOG_ERR("CCIX Setup Failed for Chip: %d!", chip_id); return status; } rdn1e1_system_ctx.cmn600_api->exchange_protocol_credit(0); @@ -383,9 +370,7 @@ int rdn1e1_system_process_notification(const struct fwk_event *event, * time only */ if (chip_id == 0) { - FWK_LOG_TRACE( - rdn1e1_system_ctx.log_api, - "[RDN1E1 SYSTEM] Initializing the primary core...\n"); + FWK_LOG_INFO("[RDN1E1 SYSTEM] Initializing the primary core..."); mod_pd_restricted_api = rdn1e1_system_ctx.mod_pd_restricted_api; @@ -397,10 +382,9 @@ int rdn1e1_system_process_notification(const struct fwk_event *event, if (status != FWK_SUCCESS) return status; } else { - FWK_LOG_TRACE( - rdn1e1_system_ctx.log_api, + FWK_LOG_INFO( "[RDN1E1 SYSTEM] Detected as slave chip %d, " - "Waiting for SCMI command\n", + "Waiting for SCMI command", chip_id); } diff --git a/product/rdn1e1/scp_ramfw/config_log.c b/product/rdn1e1/scp_ramfw/config_log.c index 981d1349..f0349a68 100644 --- a/product/rdn1e1/scp_ramfw/config_log.c +++ b/product/rdn1e1/scp_ramfw/config_log.c @@ -49,13 +49,8 @@ struct fwk_module_config config_pl011 = { static const struct mod_log_config log_data = { .device_id = FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PL011, 0), .api_id = FWK_ID_API_INIT(FWK_MODULE_IDX_PL011, 0), - .log_groups = MOD_LOG_GROUP_ERROR | - MOD_LOG_GROUP_INFO | - MOD_LOG_GROUP_WARNING | - MOD_LOG_GROUP_DEBUG, - .banner = FWK_BANNER_SCP - FWK_BANNER_RAM_FIRMWARE - BUILD_VERSION_DESCRIBE_STRING "\n", + .banner = + FWK_BANNER_SCP FWK_BANNER_RAM_FIRMWARE BUILD_VERSION_DESCRIBE_STRING, }; struct fwk_module_config config_log = { diff --git a/product/rdn1e1/scp_romfw/config_log.c b/product/rdn1e1/scp_romfw/config_log.c index 80c24694..54a43be3 100644 --- a/product/rdn1e1/scp_romfw/config_log.c +++ b/product/rdn1e1/scp_romfw/config_log.c @@ -49,13 +49,8 @@ struct fwk_module_config config_pl011 = { static const struct mod_log_config log_data = { .device_id = FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PL011, 0), .api_id = FWK_ID_API_INIT(FWK_MODULE_IDX_PL011, 0), - .log_groups = MOD_LOG_GROUP_ERROR | - MOD_LOG_GROUP_INFO | - MOD_LOG_GROUP_WARNING | - MOD_LOG_GROUP_DEBUG, - .banner = FWK_BANNER_SCP - FWK_BANNER_ROM_FIRMWARE - BUILD_VERSION_DESCRIBE_STRING "\n", + .banner = + FWK_BANNER_SCP FWK_BANNER_ROM_FIRMWARE BUILD_VERSION_DESCRIBE_STRING, }; struct fwk_module_config config_log = { diff --git a/product/sgi575/mcp_romfw/config_log.c b/product/sgi575/mcp_romfw/config_log.c index 1f9c2637..7b87a604 100644 --- a/product/sgi575/mcp_romfw/config_log.c +++ b/product/sgi575/mcp_romfw/config_log.c @@ -49,13 +49,8 @@ struct fwk_module_config config_pl011 = { static const struct mod_log_config log_data = { .device_id = FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PL011, 0), .api_id = FWK_ID_API_INIT(FWK_MODULE_IDX_PL011, 0), - .log_groups = MOD_LOG_GROUP_ERROR | - MOD_LOG_GROUP_INFO | - MOD_LOG_GROUP_WARNING | - MOD_LOG_GROUP_DEBUG, - .banner = FWK_BANNER_MCP - FWK_BANNER_ROM_FIRMWARE - BUILD_VERSION_DESCRIBE_STRING "\n", + .banner = + FWK_BANNER_MCP FWK_BANNER_ROM_FIRMWARE BUILD_VERSION_DESCRIBE_STRING, }; struct fwk_module_config config_log = { diff --git a/product/sgi575/module/sgi575_rom/src/mod_sgi575_rom.c b/product/sgi575/module/sgi575_rom/src/mod_sgi575_rom.c index b9a23486..11da29f5 100644 --- a/product/sgi575/module/sgi575_rom/src/mod_sgi575_rom.c +++ b/product/sgi575/module/sgi575_rom/src/mod_sgi575_rom.c @@ -20,7 +20,6 @@ #include <string.h> static const struct sgi575_rom_config *rom_config; -static struct mod_log_api *log_api; enum rom_event { ROM_EVENT_RUN, @@ -63,24 +62,6 @@ static int sgi575_rom_init(fwk_id_t module_id, unsigned int element_count, return FWK_SUCCESS; } -static int sgi575_rom_bind(fwk_id_t id, unsigned int round) -{ - int status; - - /* Use second round only (round numbering is zero-indexed) */ - if (round == 1) { - /* Bind to the log component */ - status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_LOG), - FWK_ID_API(FWK_MODULE_IDX_LOG, 0), - &log_api); - - if (status != FWK_SUCCESS) - return FWK_E_PANIC; - } - - return FWK_SUCCESS; -} - static int sgi575_rom_start(fwk_id_t id) { int status; @@ -98,7 +79,8 @@ static int sgi575_rom_start(fwk_id_t id) static int sgi575_rom_process_event(const struct fwk_event *event, struct fwk_event *resp) { - FWK_LOG_INFO(log_api, "[ROM] Launch RAM\n"); + FWK_LOG_INFO("[ROM] Launch RAM"); + FWK_LOG_FLUSH(); if (rom_config->load_ram_size != 0) { memcpy((void *)rom_config->ramfw_base, @@ -116,7 +98,6 @@ const struct fwk_module module_sgi575_rom = { .type = FWK_MODULE_TYPE_SERVICE, .event_count = ROM_EVENT_COUNT, .init = sgi575_rom_init, - .bind = sgi575_rom_bind, .start = sgi575_rom_start, .process_event = sgi575_rom_process_event, }; diff --git a/product/sgi575/module/sgi575_system/src/mod_sgi575_system.c b/product/sgi575/module/sgi575_system/src/mod_sgi575_system.c index b8f183fc..77ff8462 100644 --- a/product/sgi575/module/sgi575_system/src/mod_sgi575_system.c +++ b/product/sgi575/module/sgi575_system/src/mod_sgi575_system.c @@ -51,9 +51,6 @@ struct sgi575_system_ctx { /* Pointer to the SCP PIK registers */ struct pik_scp_reg *pik_scp_reg; - /* Log API pointer */ - const struct mod_log_api *log_api; - /* Pointer to the Interrupt Service Routine API of the PPU_V1 module */ const struct ppu_v1_isr_api *ppu_v1_isr_api; @@ -216,11 +213,6 @@ static int sgi575_system_bind(fwk_id_t id, unsigned int round) if (round > 0) return FWK_SUCCESS; - status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_LOG), - FWK_ID_API(FWK_MODULE_IDX_LOG, 0), &sgi575_system_ctx.log_api); - if (status != FWK_SUCCESS) - return status; - status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_POWER_DOMAIN), FWK_ID_API(FWK_MODULE_IDX_POWER_DOMAIN, MOD_PD_API_IDX_RESTRICTED), &sgi575_system_ctx.mod_pd_restricted_api); @@ -257,9 +249,7 @@ static int sgi575_system_start(fwk_id_t id) if (status != FWK_SUCCESS) return status; - FWK_LOG_TRACE( - sgi575_system_ctx.log_api, - "[SGI575 SYSTEM] Requesting SYSTOP initialization...\n"); + FWK_LOG_INFO("[SGI575 SYSTEM] Requesting SYSTOP initialization..."); /* * Subscribe to these SCMI channels in order to know when they have all @@ -314,9 +304,7 @@ int sgi575_system_process_notification(const struct fwk_event *event, * time only */ if (params->new_state == MOD_CLOCK_STATE_RUNNING) { - FWK_LOG_TRACE( - sgi575_system_ctx.log_api, - "[SGI575 SYSTEM] Initializing the primary core...\n"); + FWK_LOG_INFO("[SGI575 SYSTEM] Initializing the primary core..."); mod_pd_restricted_api = sgi575_system_ctx.mod_pd_restricted_api; diff --git a/product/sgi575/scp_ramfw/config_log.c b/product/sgi575/scp_ramfw/config_log.c index 39c86f36..ff4761eb 100644 --- a/product/sgi575/scp_ramfw/config_log.c +++ b/product/sgi575/scp_ramfw/config_log.c @@ -49,13 +49,8 @@ struct fwk_module_config config_pl011 = { static const struct mod_log_config log_data = { .device_id = FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PL011, 0), .api_id = FWK_ID_API_INIT(FWK_MODULE_IDX_PL011, 0), - .log_groups = MOD_LOG_GROUP_ERROR | - MOD_LOG_GROUP_INFO | - MOD_LOG_GROUP_WARNING | - MOD_LOG_GROUP_DEBUG, - .banner = FWK_BANNER_SCP - FWK_BANNER_RAM_FIRMWARE - BUILD_VERSION_DESCRIBE_STRING "\n", + .banner = + FWK_BANNER_SCP FWK_BANNER_RAM_FIRMWARE BUILD_VERSION_DESCRIBE_STRING, }; struct fwk_module_config config_log = { diff --git a/product/sgi575/scp_romfw/config_log.c b/product/sgi575/scp_romfw/config_log.c index e0732005..c5f89f05 100644 --- a/product/sgi575/scp_romfw/config_log.c +++ b/product/sgi575/scp_romfw/config_log.c @@ -49,13 +49,8 @@ struct fwk_module_config config_pl011 = { static const struct mod_log_config log_data = { .device_id = FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PL011, 0), .api_id = FWK_ID_API_INIT(FWK_MODULE_IDX_PL011, 0), - .log_groups = MOD_LOG_GROUP_ERROR | - MOD_LOG_GROUP_INFO | - MOD_LOG_GROUP_WARNING | - MOD_LOG_GROUP_DEBUG, - .banner = FWK_BANNER_SCP - FWK_BANNER_ROM_FIRMWARE - BUILD_VERSION_DESCRIBE_STRING "\n", + .banner = + FWK_BANNER_SCP FWK_BANNER_ROM_FIRMWARE BUILD_VERSION_DESCRIBE_STRING, }; struct fwk_module_config config_log = { 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 d12e6de9..72e91142 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 @@ -20,8 +20,6 @@ #include <stddef.h> -static struct mod_log_api *log_api; - /* * Functions fulfilling this module's interface */ @@ -34,7 +32,7 @@ static int sgm775_ddr_phy500_config(fwk_id_t element_id) ddr = (struct mod_sgm775_ddr_phy500_reg *)element_config->ddr; - FWK_LOG_TRACE(log_api, "[DDR] Initializing PHY at 0x%x\n", (uintptr_t)ddr); + FWK_LOG_INFO("[DDR] Initializing PHY at 0x%x", (uintptr_t)ddr); ddr->T_CTRL_DELAY = 0x00000000; ddr->READ_DELAY = 0x00000003; @@ -72,27 +70,6 @@ static int sgm775_ddr_phy500_element_init(fwk_id_t element_id, return FWK_SUCCESS; } -static int sgm775_ddr_phy500_bind(fwk_id_t id, unsigned int round) -{ - int status; - - /* Skip the second round */ - if (round == 1) - return FWK_SUCCESS; - - /* Nothing to be done for element-level binding */ - if (fwk_module_is_valid_element_id(id)) - return FWK_SUCCESS; - - /* Bind to the log module */ - status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_LOG), MOD_LOG_API_ID, - &log_api); - if (status != FWK_SUCCESS) - return status; - - return FWK_SUCCESS; -} - static int sgm775_ddr_phy500_process_bind_request(fwk_id_t requester_id, fwk_id_t id, fwk_id_t api_id, const void **api) { @@ -110,7 +87,6 @@ const struct fwk_module module_sgm775_ddr_phy500 = { .type = FWK_MODULE_TYPE_DRIVER, .init = sgm775_ddr_phy500_init, .element_init = sgm775_ddr_phy500_element_init, - .bind = sgm775_ddr_phy500_bind, .process_bind_request = sgm775_ddr_phy500_process_bind_request, .api_count = 1, }; diff --git a/product/sgm775/module/sgm775_dmc500/src/mod_sgm775_dmc500.c b/product/sgm775/module/sgm775_dmc500/src/mod_sgm775_dmc500.c index 8a063372..2008b909 100644 --- a/product/sgm775/module/sgm775_dmc500/src/mod_sgm775_dmc500.c +++ b/product/sgm775/module/sgm775_dmc500/src/mod_sgm775_dmc500.c @@ -32,7 +32,6 @@ /* Timeout in us */ #define TIMEOUT_DMC_INIT_US (1000 * 1000) -static struct mod_log_api *log_api; static struct mod_timer_api *timer_api; static struct mod_sgm775_dmc_ddr_phy_api *ddr_phy_api; @@ -72,12 +71,6 @@ static int mod_sgm775_dmc500_bind(fwk_id_t id, unsigned int round) module_config = fwk_module_get_data(fwk_module_id_sgm775_dmc500); fwk_assert(module_config != NULL); - /* Bind to the log module */ - status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_LOG), - MOD_LOG_API_ID, &log_api); - if (status != FWK_SUCCESS) - return status; - /* Bind to the timer */ status = fwk_module_bind(module_config->timer_id, FWK_ID_API(FWK_MODULE_IDX_TIMER, 0), &timer_api); @@ -132,8 +125,7 @@ static int sgm775_dmc500_config(struct mod_sgm775_dmc500_reg *dmc, module_config = fwk_module_get_data(fwk_module_id_sgm775_dmc500); - FWK_LOG_TRACE( - log_api, "[DDR] Initialising DMC500 at 0x%x\n", (uintptr_t)dmc); + FWK_LOG_INFO("[DDR] Initialising DMC500 at 0x%x", (uintptr_t)dmc); dmc->ADDRESS_CONTROL = ((RANK_BITS << 24) | (BANK_BITS << 16) | @@ -150,7 +142,7 @@ static int sgm775_dmc500_config(struct mod_sgm775_dmc500_reg *dmc, dmc->ODT_RD_CONTROL_31_00 = 0x00000000; dmc->ODT_TIMING = 0x10001000; - FWK_LOG_TRACE(log_api, "[DDR] Setting timing settings\n"); + FWK_LOG_INFO("[DDR] Setting timing settings"); dmc->T_REFI = 0x0000030B; dmc->T_RFC = 0x000340D0; @@ -173,11 +165,11 @@ static int sgm775_dmc500_config(struct mod_sgm775_dmc500_reg *dmc, dmc->T_ESR = 0x00000019; dmc->T_XSR = 0x00E100E1; - FWK_LOG_TRACE(log_api, "[DDR] Setting address map\n"); + FWK_LOG_INFO("[DDR] Setting address map"); dmc->ADDRESS_MAP = ((1 << 8) | (ADDR_SHUTTER)); - FWK_LOG_TRACE(log_api, "[DDR] Setting PMU settings\n"); + FWK_LOG_INFO("[DDR] Setting PMU settings"); dmc->SI0_SI_INTERRUPT_CONTROL = 0x00000000; dmc->SI0_PMU_REQ_CONTROL = 0x00000B1A; @@ -260,7 +252,7 @@ static int sgm775_dmc500_config(struct mod_sgm775_dmc500_reg *dmc, dmc->T_PHYWRLAT = 0x010F170E; dmc->ERR_RAMECC_CTLR = 0x00000000; - FWK_LOG_TRACE(log_api, "[DDR] Setting PHY-related settings\n"); + FWK_LOG_INFO("[DDR] Setting PHY-related settings"); dmc->PHY_POWER_CONTROL = 0x0000012A; dmc->T_PHY_TRAIN = 0x00F8000A; @@ -277,7 +269,7 @@ static int sgm775_dmc500_config(struct mod_sgm775_dmc500_reg *dmc, dmc->PHY_CONFIG = 0x01000000; dmc->PHY_CONFIG = 0x00000003; - FWK_LOG_TRACE(log_api, "[DDR] Doing direct DDR commands\n"); + FWK_LOG_INFO("[DDR] Doing direct DDR commands"); dmc->DIRECT_CMD_SETTINGS = 0x00C80000; dmc->DIRECT_CMD = 0x00000000; @@ -304,7 +296,7 @@ static int sgm775_dmc500_config(struct mod_sgm775_dmc500_reg *dmc, dmc->DIRECT_CMD = 0x00D60DE6; dmc->REFRESH_ENABLE = 0x00000001; - FWK_LOG_TRACE(log_api, "[DDR] Setting dmc in READY mode\n"); + FWK_LOG_INFO("[DDR] Setting dmc in READY mode"); status = timer_api->time_to_timestamp(module_config->timer_id, TIMEOUT_DMC_INIT_US, &timeout); @@ -333,7 +325,7 @@ static int sgm775_dmc500_config(struct mod_sgm775_dmc500_reg *dmc, dmc->SI0_SI_STATE_CONTROL = 0x00000000; dmc->SI1_SI_STATE_CONTROL = 0x00000000; - FWK_LOG_TRACE(log_api, "[DDR] Waiting for Queue stall = 0...\n"); + FWK_LOG_INFO("[DDR] Waiting for Queue stall = 0..."); while ((dmc->QUEUE_STATUS & MOD_DMC500_QUEUE_STATUS_STALL_ACK) != 0) { status = timer_api->remaining(module_config->timer_id, timeout, @@ -345,7 +337,7 @@ static int sgm775_dmc500_config(struct mod_sgm775_dmc500_reg *dmc, goto timeout; } - FWK_LOG_TRACE(log_api, "[DDR] Waiting for SI0 stall = 0...\n"); + FWK_LOG_INFO("[DDR] Waiting for SI0 stall = 0..."); while ((dmc->SI0_SI_STATUS & MOD_DMC500_SI_STATUS_STALL_ACK) != 0) { status = timer_api->remaining(module_config->timer_id, timeout, @@ -357,7 +349,7 @@ static int sgm775_dmc500_config(struct mod_sgm775_dmc500_reg *dmc, goto timeout; } - FWK_LOG_TRACE(log_api, "[DDR] Waiting for SI1 stall = 0...\n"); + FWK_LOG_INFO("[DDR] Waiting for SI1 stall = 0..."); while ((dmc->SI1_SI_STATUS & MOD_DMC500_SI_STATUS_STALL_ACK) != 0) { status = timer_api->remaining(module_config->timer_id, timeout, @@ -369,12 +361,12 @@ static int sgm775_dmc500_config(struct mod_sgm775_dmc500_reg *dmc, goto timeout; } - FWK_LOG_TRACE(log_api, "[DDR] DMC init done.\n"); + FWK_LOG_INFO("[DDR] DMC init done."); return FWK_SUCCESS; timeout: - FWK_LOG_ERR(log_api, "[DDR] Timed out in DMC500 init.\n"); + FWK_LOG_ERR("[DDR] Timed out in DMC500 init."); return FWK_E_TIMEOUT; } diff --git a/product/sgm775/scp_ramfw/config_log.c b/product/sgm775/scp_ramfw/config_log.c index 21f0db3a..b7ea216a 100644 --- a/product/sgm775/scp_ramfw/config_log.c +++ b/product/sgm775/scp_ramfw/config_log.c @@ -54,13 +54,8 @@ struct fwk_module_config config_pl011 = { static const struct mod_log_config log_data = { .device_id = FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PL011, 0), .api_id = FWK_ID_API_INIT(FWK_MODULE_IDX_PL011, 0), - .log_groups = MOD_LOG_GROUP_ERROR | - MOD_LOG_GROUP_INFO | - MOD_LOG_GROUP_WARNING | - MOD_LOG_GROUP_DEBUG, - .banner = FWK_BANNER_SCP - FWK_BANNER_RAM_FIRMWARE - BUILD_VERSION_DESCRIBE_STRING "\n", + .banner = + FWK_BANNER_SCP FWK_BANNER_RAM_FIRMWARE BUILD_VERSION_DESCRIBE_STRING, }; struct fwk_module_config config_log = { diff --git a/product/sgm775/scp_romfw/config_log.c b/product/sgm775/scp_romfw/config_log.c index b29e352a..eaf1c80b 100644 --- a/product/sgm775/scp_romfw/config_log.c +++ b/product/sgm775/scp_romfw/config_log.c @@ -54,13 +54,8 @@ struct fwk_module_config config_pl011 = { static const struct mod_log_config log_data = { .device_id = FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PL011, 0), .api_id = FWK_ID_API_INIT(FWK_MODULE_IDX_PL011, 0), - .log_groups = MOD_LOG_GROUP_ERROR | - MOD_LOG_GROUP_INFO | - MOD_LOG_GROUP_WARNING | - MOD_LOG_GROUP_DEBUG, - .banner = FWK_BANNER_SCP - FWK_BANNER_ROM_FIRMWARE - BUILD_VERSION_DESCRIBE_STRING "\n", + .banner = + FWK_BANNER_SCP FWK_BANNER_ROM_FIRMWARE BUILD_VERSION_DESCRIBE_STRING, }; struct fwk_module_config config_log = { diff --git a/product/sgm776/scp_ramfw/config_log.c b/product/sgm776/scp_ramfw/config_log.c index c9b92a68..c27e8769 100644 --- a/product/sgm776/scp_ramfw/config_log.c +++ b/product/sgm776/scp_ramfw/config_log.c @@ -54,13 +54,8 @@ const struct fwk_module_config config_pl011 = { static const struct mod_log_config log_data = { .device_id = FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PL011, 0), .api_id = FWK_ID_API_INIT(FWK_MODULE_IDX_PL011, 0), - .log_groups = MOD_LOG_GROUP_ERROR | - MOD_LOG_GROUP_INFO | - MOD_LOG_GROUP_WARNING | - MOD_LOG_GROUP_DEBUG, - .banner = FWK_BANNER_SCP - FWK_BANNER_RAM_FIRMWARE - BUILD_VERSION_DESCRIBE_STRING "\n", + .banner = + FWK_BANNER_SCP FWK_BANNER_ROM_FIRMWARE BUILD_VERSION_DESCRIBE_STRING, }; const struct fwk_module_config config_log = { diff --git a/product/sgm776/scp_romfw/config_log.c b/product/sgm776/scp_romfw/config_log.c index 2094d98c..9976dd5d 100644 --- a/product/sgm776/scp_romfw/config_log.c +++ b/product/sgm776/scp_romfw/config_log.c @@ -53,13 +53,8 @@ struct fwk_module_config config_pl011 = { static const struct mod_log_config log_data = { .device_id = FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PL011, 0), .api_id = FWK_ID_API_INIT(FWK_MODULE_IDX_PL011, 0), - .log_groups = MOD_LOG_GROUP_ERROR | - MOD_LOG_GROUP_INFO | - MOD_LOG_GROUP_WARNING | - MOD_LOG_GROUP_DEBUG, - .banner = FWK_BANNER_SCP - FWK_BANNER_ROM_FIRMWARE - BUILD_VERSION_DESCRIBE_STRING "\n", + .banner = + FWK_BANNER_SCP FWK_BANNER_ROM_FIRMWARE BUILD_VERSION_DESCRIBE_STRING, }; struct fwk_module_config config_log = { diff --git a/product/synquacer/module/ccn512/src/mod_ccn512.c b/product/synquacer/module/ccn512/src/mod_ccn512.c index de67d421..fb69e0c9 100644 --- a/product/synquacer/module/ccn512/src/mod_ccn512.c +++ b/product/synquacer/module/ccn512/src/mod_ccn512.c @@ -23,8 +23,6 @@ #include <stddef.h> #include <stdint.h> -static struct mod_log_api *log_api; - #define HNF_COUNT 8 #define SNF_ID_DMC1 0x8ULL #define SNF_ID_DMC3 0x1AULL @@ -143,7 +141,7 @@ void fw_ccn512_exit(void) ccn5xx_hnf_reg_t *hnf = &ccn512->HNF_ID_2; - FWK_LOG_TRACE(log_api, "[CCN512] CCN512 exit.\n"); + FWK_LOG_INFO("[CCN512] CCN512 exit."); /* exit ALL CA53 CPU SNOOP */ for (i = 0; i < HNF_COUNT; i++) @@ -152,17 +150,16 @@ void fw_ccn512_exit(void) /* Wait for write operations to finish. */ __DMB(); - FWK_LOG_TRACE(log_api, "[CCN512] CCN512 exit end.\n"); + FWK_LOG_INFO("[CCN512] CCN512 exit end."); } static int ccn512_config(ccn512_reg_t *ccn512) { - FWK_LOG_TRACE( - log_api, "[CCN512] Initialising ccn512 at 0x%x\n", (uintptr_t)ccn512); + FWK_LOG_INFO("[CCN512] Initialising ccn512 at 0x%x", (uintptr_t)ccn512); fw_ccn512_init(ccn512); - FWK_LOG_TRACE(log_api, "[CCN512] CCN512 init done.\n"); + FWK_LOG_INFO("[CCN512] CCN512 init done."); return FWK_SUCCESS; } @@ -192,8 +189,6 @@ static int mod_ccn512_element_init( static int mod_ccn512_bind(fwk_id_t id, unsigned int round) { - int status; - /* Nothing to do in the second round of calls. */ if (round == 1) return FWK_SUCCESS; @@ -202,11 +197,6 @@ static int mod_ccn512_bind(fwk_id_t id, unsigned int round) if (fwk_module_is_valid_element_id(id)) return FWK_SUCCESS; - status = fwk_module_bind( - FWK_ID_MODULE(FWK_MODULE_IDX_LOG), MOD_LOG_API_ID, &log_api); - if (status != FWK_SUCCESS) - return status; - return FWK_SUCCESS; } diff --git a/product/synquacer/module/f_i2c/src/i2c_depend.c b/product/synquacer/module/f_i2c/src/i2c_depend.c index debec8da..dfe60d32 100644 --- a/product/synquacer/module/f_i2c/src/i2c_depend.c +++ b/product/synquacer/module/f_i2c/src/i2c_depend.c @@ -92,10 +92,7 @@ void i2c_construction(void) &i2c_params[i]); if (i2c_err != I2C_ERR_OK) { SCB_Error(i2c_err); - FWK_LOG_ERR( - synquacer_system_ctx.log_api, - "[I2C] I2C ch#%d initialize error.\n", - i); + FWK_LOG_ERR("[I2C] I2C ch#%d initialize error.", i); } } } diff --git a/product/synquacer/module/hsspi/src/hsspi_api.c b/product/synquacer/module/hsspi/src/hsspi_api.c index e5b2ade5..e5a869e2 100644 --- a/product/synquacer/module/hsspi/src/hsspi_api.c +++ b/product/synquacer/module/hsspi/src/hsspi_api.c @@ -43,9 +43,8 @@ void HSSPI_init(void) model_index = CONFIG_SCB_FORCE_HSSPI_RESOURCE_ALLOCATION_MODEL; FWK_LOG_INFO( - synquacer_system_ctx.log_api, "[HS-SPI] Configuring HS-SPI controller with " - "clk_sel=%d clk_div=%d syncon=%d use_hsspi_cs1_flag=%d msel=%d\n", + "clk_sel=%d clk_div=%d syncon=%d use_hsspi_cs1_flag=%d msel=%d", clk_config.clk_sel, clk_config.clk_div, clk_config.syncon, diff --git a/product/synquacer/module/hsspi/src/hsspi_driver.c b/product/synquacer/module/hsspi/src/hsspi_driver.c index 7f0cf99c..c95ccc21 100644 --- a/product/synquacer/module/hsspi/src/hsspi_driver.c +++ b/product/synquacer/module/hsspi/src/hsspi_driver.c @@ -544,8 +544,7 @@ void hsspi_command_switch( hsspi_read_jedec_id(reg_hsspi, mem_hsspi); FWK_LOG_INFO( - synquacer_system_ctx.log_api, - "[HS-SPI] CS#0: Manufacturer ID:%02x, DeviceID:%02x%02x\n", + "[HS-SPI] CS#0: Manufacturer ID:%02x, DeviceID:%02x%02x", m_abyJEDEC_ID[0], m_abyJEDEC_ID[1], m_abyJEDEC_ID[2]); @@ -555,9 +554,8 @@ void hsspi_command_switch( if (known_jedec_id < 0) { FWK_LOG_INFO( - synquacer_system_ctx.log_api, "[HS-SPI] Unknown manufacturer ID:%02x," - " default to Dual-Output-Fast-Read mode\n", + " default to Dual-Output-Fast-Read mode", m_abyJEDEC_ID[0]); hsspi_dual_output_fast_read(reg_hsspi); @@ -566,9 +564,7 @@ void hsspi_command_switch( unCSCFG.bit.MBM = HSSPI_EN_CSCFG_MBM_DUAL; (*reg_hsspi).CSCFG.DATA = unCSCFG.DATA; } else { - FWK_LOG_INFO( - synquacer_system_ctx.log_api, - "[HS-SPI] Configuring Quad-Output-Fast-Read mode\n"); + FWK_LOG_INFO("[HS-SPI] Configuring Quad-Output-Fast-Read mode"); hsspi_quad_output_fast_read(reg_hsspi); unCSCFG.DATA = (*reg_hsspi).CSCFG.DATA; 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 04eefb48..3156460f 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 @@ -47,9 +47,6 @@ struct ppu_v0_pd_ctx { struct ppu_v0_ctx { /* Table of the power domain contexts */ struct ppu_v0_pd_ctx *pd_ctx_table; - - /* Log API */ - struct mod_log_api *log_api; }; /* @@ -89,15 +86,11 @@ static int get_state(struct ppu_v0_reg *ppu, unsigned int *state) *state = ppu_mode_to_power_state[ppu_mode]; if (*state == MODE_UNSUPPORTED) { - FWK_LOG_ERR( - ppu_v0_ctx.log_api, - "[PPUV0] Unexpected PPU mode (%i).\n", - ppu_mode); + FWK_LOG_ERR("[PPUV0] Unexpected PPU mode (%i).", ppu_mode); return FWK_E_DEVICE; } - FWK_LOG_INFO( - ppu_v0_ctx.log_api, "[PPUV0] get state reg=0x%x (0x%x)\n", ppu, *state); + FWK_LOG_INFO("[PPUV0] get state reg=0x%p (0x%x)", (void *)ppu, *state); return FWK_SUCCESS; } @@ -117,9 +110,8 @@ static int pd_set_state(fwk_id_t pd_id, unsigned int state) pd_ctx = ppu_v0_ctx.pd_ctx_table + fwk_id_get_element_idx(pd_id); FWK_LOG_INFO( - ppu_v0_ctx.log_api, - "[PPUV0] set_state start. reg=(0x%x) state=(0x%x)\n", - pd_ctx->ppu, + "[PPUV0] set_state start. reg=(0x%p) state=(0x%x)", + (void *)pd_ctx->ppu, state); switch (state) { @@ -129,9 +121,8 @@ static int pd_set_state(fwk_id_t pd_id, unsigned int state) pd_ctx->bound_id, MOD_PD_STATE_ON); FWK_LOG_INFO( - ppu_v0_ctx.log_api, - "[PPUV0] set_state end. reg=(0x%x) state=(0x%x)\n", - pd_ctx->ppu, + "[PPUV0] set_state end. reg=(0x%p) state=(0x%x)", + (void *)pd_ctx->ppu, state); assert(status == FWK_SUCCESS); @@ -140,8 +131,7 @@ static int pd_set_state(fwk_id_t pd_id, unsigned int state) case MOD_PD_STATE_OFF: if (pd_ctx->config->pd_type == MOD_PD_TYPE_SYSTEM) { FWK_LOG_INFO( - ppu_v0_ctx.log_api, - "[PPUV0] SYNQUACER SYSTEM module will shutdown the system\n"); + "[PPUV0] SYNQUACER SYSTEM module will shutdown the system"); break; } @@ -159,9 +149,8 @@ static int pd_set_state(fwk_id_t pd_id, unsigned int state) pd_ctx->bound_id, MOD_PD_STATE_OFF); FWK_LOG_INFO( - ppu_v0_ctx.log_api, - "[PPUV0] set_state end. reg=(0x%x) state=(0x%x)\n", - pd_ctx->ppu, + "[PPUV0] set_state end. reg=(0x%p) state=(0x%x)", + (void *)pd_ctx->ppu, state); assert(status == FWK_SUCCESS); @@ -169,9 +158,7 @@ static int pd_set_state(fwk_id_t pd_id, unsigned int state) default: FWK_LOG_ERR( - ppu_v0_ctx.log_api, - "[PPUV0] Requested power state (%i) is not supported.\n", - state); + "[PPUV0] Requested power state (%i) is not supported.", state); return FWK_E_PARAM; } @@ -278,13 +265,8 @@ static int ppu_v0_bind(fwk_id_t id, unsigned int round) if (round == 0) return FWK_SUCCESS; - /* In the case of the module, bind to the log component */ - if (fwk_module_is_valid_module_id(id)) { - return fwk_module_bind( - FWK_ID_MODULE(FWK_MODULE_IDX_LOG), - FWK_ID_API(FWK_MODULE_IDX_LOG, 0), - &ppu_v0_ctx.log_api); - } + if (fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) + return FWK_SUCCESS; pd_ctx = ppu_v0_ctx.pd_ctx_table + fwk_id_get_element_idx(id); 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 724526f5..6416c086 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 @@ -29,7 +29,6 @@ struct scmi_vendor_ext_ctx { const struct mod_scmi_from_protocol_api *scmi_api; const struct mod_vendor_ext_api *vendor_ext_api; - const struct mod_log_api *log_api; uint32_t vendor_ext_count; }; @@ -200,9 +199,7 @@ static int scmi_vendor_ext_protocol_memory_info_get_handler( { memset(&resp, 0, sizeof(struct scmi_vendor_ext_memory_info_get_resp)); - FWK_LOG_TRACE( - scmi_vendor_ext_ctx.log_api, - "[scmi_vendor_ext] memory info get handler.\n"); + FWK_LOG_INFO("[scmi_vendor_ext] memory info get handler."); get_memory_info(&resp.meminfo); @@ -233,8 +230,7 @@ static int scmi_vendor_ext_message_handler( { int32_t return_value; - FWK_LOG_TRACE( - scmi_vendor_ext_ctx.log_api, "[scmi_vendor_ext] message handler.\n"); + FWK_LOG_INFO("[scmi_vendor_ext] message handler."); static_assert( FWK_ARRAY_SIZE(handler_table) == FWK_ARRAY_SIZE(payload_size_table), @@ -290,13 +286,6 @@ static int scmi_vendor_ext_bind(fwk_id_t id, unsigned int round) return FWK_SUCCESS; status = fwk_module_bind( - FWK_ID_MODULE(FWK_MODULE_IDX_LOG), - FWK_ID_API(FWK_MODULE_IDX_LOG, 0), - &scmi_vendor_ext_ctx.log_api); - if (status != FWK_SUCCESS) - return status; - - status = fwk_module_bind( FWK_ID_MODULE(FWK_MODULE_IDX_SCMI), FWK_ID_API(FWK_MODULE_IDX_SCMI, MOD_SCMI_API_IDX_PROTOCOL), &scmi_vendor_ext_ctx.scmi_api); @@ -318,9 +307,7 @@ static int scmi_vendor_ext_process_bind_request( if (!fwk_id_is_equal(source_id, FWK_ID_MODULE(FWK_MODULE_IDX_SCMI))) return FWK_E_ACCESS; - FWK_LOG_TRACE( - scmi_vendor_ext_ctx.log_api, - "[scmi_vendor_ext] process bind request.\n"); + FWK_LOG_INFO("[scmi_vendor_ext] process bind request."); *api = &scmi_vendor_ext_mod_scmi_to_protocol_api; diff --git a/product/synquacer/module/synquacer_memc/include/ddr_init.h b/product/synquacer/module/synquacer_memc/include/ddr_init.h index 2bb2fccf..3327541e 100644 --- a/product/synquacer/module/synquacer_memc/include/ddr_init.h +++ b/product/synquacer/module/synquacer_memc/include/ddr_init.h @@ -25,10 +25,8 @@ #include <stdbool.h> #include <stdint.h> -#define printf(...) \ - FWK_LOG_INFO(synquacer_system_ctx.log_api, "[DDR] " __VA_ARGS__) -#define pr_err(...) \ - FWK_LOG_ERR(synquacer_system_ctx.log_api, "[DDR] " __VA_ARGS__) +#define printf(...) FWK_LOG_INFO("[DDR] " __VA_ARGS__) +#define pr_err(...) FWK_LOG_ERR("[DDR] " __VA_ARGS__) #define dmb __DMB #define usleep(usec) osDelay((usec / 1000) + 2) diff --git a/product/synquacer/module/synquacer_memc/src/ddr_init.c b/product/synquacer/module/synquacer_memc/src/ddr_init.c index ff046014..6a8d5f44 100644 --- a/product/synquacer/module/synquacer_memc/src/ddr_init.c +++ b/product/synquacer/module/synquacer_memc/src/ddr_init.c @@ -121,13 +121,13 @@ int ddr_ch0_init_mp(void) g_DDR4_DMC520_INIT_CH = 0; - printf("Initializing DDR ch0\n"); + FWK_LOG_INFO("[DDR] Initializing DDR ch0"); ddr_init_mc0_mp(REG_DMC520_0); /* allocate 60MiB secure DRAM for OP-TEE */ if (ddr_is_secure_dram_enabled()) { - printf("secure DRAM enabled\n"); + FWK_LOG_INFO("[DDR] secure DRAM enabled"); REG_DMC520_0->access_address_min0_31_00_next = 0xFC00000C; REG_DMC520_0->access_address_min0_43_32_next = 0x00000000; REG_DMC520_0->access_address_max0_31_00_next = 0xFFBF0000; @@ -136,39 +136,39 @@ int ddr_ch0_init_mp(void) status = ddr_init_phy0_mp(REG_DDRPHY_CONFIG_0, 0); if (status != 0) { - pr_err("[DDR] ch0 initialize failed. ddr_init_phy0_mp()\n"); + FWK_LOG_CRIT("[DDR] ch0 initialize failed. ddr_init_phy0_mp()"); return status; } status = ddr_init_phy1_mp(REG_DDRPHY_CONFIG_0, 0); if (status != 0) { - pr_err("[DDR] ch0 initialize failed. ddr_init_phy1_mp()\n"); + FWK_LOG_CRIT("[DDR] ch0 initialize failed. ddr_init_phy1_mp()"); return status; } status = ddr_init_sdram_mp(REG_DDRPHY_CONFIG_0, 0); if (status != 0) { - pr_err("[DDR] ch0 initialize failed. ddr_init_sdram_mp()\n"); + FWK_LOG_CRIT("[DDR] ch0 initialize failed. ddr_init_sdram_mp()"); return status; } status = ddr_init_mc1_mp(REG_DMC520_0); if (status != 0) { - pr_err("[DDR] ch0 initialize failed. ddr_init_mc1_mp()\n"); + FWK_LOG_CRIT("[DDR] ch0 initialize failed. ddr_init_mc1_mp()"); return status; } status = ddr_init_train_mp(REG_DDRPHY_CONFIG_0, 0); if (status != 0) { - pr_err("[DDR] ch0 fatal error occurred.\n"); + FWK_LOG_CRIT("[DDR] ch0 fatal error occurred."); return status; } status = ddr_init_mc2_mp(REG_DMC520_0); if (status != 0) { - pr_err("[DDR] ch0 initialize failed. ddr_init_mc1_mp()\n"); + FWK_LOG_CRIT("[DDR] ch0 initialize failed. ddr_init_mc1_mp()"); return status; } - printf("Finished initializing DDR ch0\n"); + FWK_LOG_INFO("[DDR] Finished initializing DDR ch0"); return 0; } @@ -186,51 +186,51 @@ int ddr_ch1_init_mp(void) g_DDR4_DMC520_INIT_CH = 1; - printf("Initializing DDR ch1\n"); + FWK_LOG_INFO("[DDR] Initializing DDR ch1"); status = ddr_init_mc0_mp(REG_DMC520_1); if (status != 0) { - pr_err("[DDR] ch1 initialize failed. ddr_init_mc0_mp()\n"); + FWK_LOG_CRIT("[DDR] ch1 initialize failed. ddr_init_mc0_mp()"); return status; } status = ddr_init_phy0_mp(REG_DDRPHY_CONFIG_1, 0); if (status != 0) { - pr_err("[DDR] ch1 initialize failed. ddr_init_phy0_mp()\n"); + FWK_LOG_CRIT("[DDR] ch1 initialize failed. ddr_init_phy0_mp()"); return status; } status = ddr_init_phy1_mp(REG_DDRPHY_CONFIG_1, 0); if (status != 0) { - pr_err("[DDR] ch1 initialize failed. ddr_init_phy1_mp()\n"); + FWK_LOG_CRIT("[DDR] ch1 initialize failed. ddr_init_phy1_mp()"); return status; } status = ddr_init_sdram_mp(REG_DDRPHY_CONFIG_1, 0); if (status != 0) { - pr_err("[DDR] ch1 initialize failed. ddr_init_sdram_mp()\n"); + FWK_LOG_CRIT("[DDR] ch1 initialize failed. ddr_init_sdram_mp()"); return status; } status = ddr_init_mc1_mp(REG_DMC520_1); if (status != 0) { - pr_err("[DDR] ch1 initialize failed. ddr_init_mc1_mp()\n"); + FWK_LOG_CRIT("[DDR] ch1 initialize failed. ddr_init_mc1_mp()"); return status; } status = ddr_init_train_mp(REG_DDRPHY_CONFIG_1, 0); if (status != 0) { - pr_err("[DDR] ch1 fatal error occurred.\n"); + FWK_LOG_CRIT("[DDR] ch1 fatal error occurred."); return status; } status = ddr_init_mc2_mp(REG_DMC520_1); if (status != 0) { - pr_err("[DDR] ch1 initialize failed. ddr_init_mc2_mp()\n"); + FWK_LOG_CRIT("[DDR] ch1 initialize failed. ddr_init_mc2_mp()"); return status; } - printf("Finished initializing DDR ch1\n"); + FWK_LOG_INFO("[DDR] Finished initializing DDR ch1"); return 0; } @@ -1159,8 +1159,9 @@ int ddr_init_train_mp( 0x3001); if ((REG_DDRPHY_CONFIG->PGSR0 & 0x4FF80000) != 0) { - printf( - "error : Write Leveling, Gate Training, Write Leveling Adjust\n"); + FWK_LOG_CRIT( + "[DDR] error : Write Leveling, Gate Training, Write Leveling " + "Adjust"); status = 0x3002; goto ERROR_END; } @@ -1203,7 +1204,7 @@ int ddr_init_train_mp( 0x3003); if ((REG_DDRPHY_CONFIG->PGSR0 & 0x4FF80000) != 0) { - printf("error : Data Bit Deskew, Data Eye, Static Read\n"); + FWK_LOG_CRIT("[DDR] error : Data Bit Deskew, Data Eye, Static Read"); status = 0x3004; goto ERROR_END; } @@ -1231,7 +1232,7 @@ int ddr_init_train_mp( 0x3005); if ((REG_DDRPHY_CONFIG->PGSR0 & 0x4FF80000) != 0) { - printf("error : VREF Training\n"); + FWK_LOG_CRIT("[DDR] error : VREF Training"); status = 0x3006; goto ERROR_END; } @@ -1246,43 +1247,43 @@ ERROR_END: ///////////////////////////////////////////////////////////////////// phy_status_0 = REG_DDRPHY_CONFIG->PGSR0; if (((phy_status_0 >> 19) & 0x1) == 0x1) { - pr_err("%s VREF Training Error\n", __func__); + FWK_LOG_CRIT("[DDR] %s VREF Training Error", __func__); status = 0x3010; } if (((phy_status_0 >> 20) & 0x1) == 0x1) { - pr_err("%s Impedance Calibration Error\n", __func__); + FWK_LOG_CRIT("[DDR] %s Impedance Calibration Error", __func__); status = 0x3011; } if (((phy_status_0 >> 21) & 0x1) == 0x1) { - pr_err("%s Write Leveling Error\n", __func__); + FWK_LOG_CRIT("[DDR] %s Write Leveling Error", __func__); status = 0x3012; } if (((phy_status_0 >> 22) & 0x1) == 0x1) { - pr_err("%s DQS Gate Training Error\n", __func__); + FWK_LOG_CRIT("[DDR] %s DQS Gate Training Error", __func__); status = 0x3013; } if (((phy_status_0 >> 23) & 0x1) == 0x1) { - pr_err("%s Write Leveling Adjustment Error\n", __func__); + FWK_LOG_CRIT("[DDR] %s Write Leveling Adjustment Error", __func__); status = 0x3014; } if (((phy_status_0 >> 24) & 0x1) == 0x1) { - pr_err("%s Read Bit Deskew Error\n", __func__); + FWK_LOG_CRIT("[DDR] %s Read Bit Deskew Error", __func__); status = 0x3015; } if (((phy_status_0 >> 25) & 0x1) == 0x1) { - pr_err("%s Write Bit Deskew Error\n", __func__); + FWK_LOG_CRIT("[DDR] %s Write Bit Deskew Error", __func__); status = 0x3016; } if (((phy_status_0 >> 26) & 0x1) == 0x1) { - pr_err("%s Read Eye Training Error\n", __func__); + FWK_LOG_CRIT("[DDR] %s Read Eye Training Error", __func__); status = 0x3017; } if (((phy_status_0 >> 27) & 0x1) == 0x1) { - pr_err("%s Write Eye Training Error\n", __func__); + FWK_LOG_CRIT("[DDR] %s Write Eye Training Error", __func__); status = 0x3018; } if (((phy_status_0 >> 30) & 0x1) == 0x1) { - pr_err("%s Static Read Error\n", __func__); + FWK_LOG_CRIT("[DDR] %s Static Read Error", __func__); status = 0x3019; } diff --git a/product/synquacer/module/synquacer_memc/src/mod_synquacer_memc.c b/product/synquacer/module/synquacer_memc/src/mod_synquacer_memc.c index 0345e863..5e8fbb09 100644 --- a/product/synquacer/module/synquacer_memc/src/mod_synquacer_memc.c +++ b/product/synquacer/module/synquacer_memc/src/mod_synquacer_memc.c @@ -16,7 +16,6 @@ #include <fwk_status.h> const struct mod_f_i2c_api *f_i2c_api; -static struct mod_log_api *log_api; static int synquacer_memc_config(void); /* Framework API */ @@ -49,11 +48,6 @@ static int mod_synquacer_memc_bind(fwk_id_t id, unsigned int round) return FWK_SUCCESS; status = fwk_module_bind( - FWK_ID_MODULE(FWK_MODULE_IDX_LOG), MOD_LOG_API_ID, &log_api); - if (status != FWK_SUCCESS) - return status; - - status = fwk_module_bind( FWK_ID_MODULE(FWK_MODULE_IDX_F_I2C), FWK_ID_API(FWK_MODULE_IDX_F_I2C, 0), &f_i2c_api); @@ -73,7 +67,7 @@ static int synquacer_memc_config(void) { fw_ddr_init(); - FWK_LOG_INFO(log_api, "[SYNQUACER MEMC] DMC init done.\n"); + FWK_LOG_INFO("[SYNQUACER MEMC] DMC init done."); return FWK_SUCCESS; } diff --git a/product/synquacer/module/synquacer_memc/src/synquacer_ddr.c b/product/synquacer/module/synquacer_memc/src/synquacer_ddr.c index 5aabfcfc..c59005b7 100644 --- a/product/synquacer/module/synquacer_memc/src/synquacer_ddr.c +++ b/product/synquacer/module/synquacer_memc/src/synquacer_ddr.c @@ -26,6 +26,7 @@ #include <fwk_log.h> #include <fwk_status.h> +#include <inttypes.h> #include <stdbool.h> #include <stdint.h> #include <string.h> @@ -113,19 +114,16 @@ void fw_ddr_init(void) if (result != 0) { /* Tentative workaround. Need to implement retrying. */ do { - FWK_LOG_ERR( - synquacer_system_ctx.log_api, - "DDR Initialize Failed.(0x%x)\n", - result); + FWK_LOG_ERR("DDR Initialize Failed.(0x%x)", result); osDelay(10000); } while (1); } if (fw_get_ddr4_sdram_ecc_available() && dram_ecc_is_enabled()) { - FWK_LOG_INFO(synquacer_system_ctx.log_api, "[DDR] DRAM ECC enabled\n"); + FWK_LOG_INFO("[DDR] DRAM ECC enabled"); dram_init_for_ecc(); } else { - FWK_LOG_INFO(synquacer_system_ctx.log_api, "[DDR] DRAM ECC disabled\n"); + FWK_LOG_INFO("[DDR] DRAM ECC disabled"); } /* @@ -143,28 +141,27 @@ static void fw_ddr_change_freq(ddr_freq_t freq) switch (freq) { case DDR_FREQ_1333: - FWK_LOG_INFO(synquacer_system_ctx.log_api, "[DDR] 1333MHz\n"); + FWK_LOG_INFO("[DDR] 1333MHz"); value = 0x00000027U; /* 1333MHz */ break; case DDR_FREQ_1600: - FWK_LOG_INFO(synquacer_system_ctx.log_api, "[DDR] 1600MHz\n"); + FWK_LOG_INFO("[DDR] 1600MHz"); value = 0x0000002FU; /* 1600MHz */ break; case DDR_FREQ_1800: - FWK_LOG_INFO(synquacer_system_ctx.log_api, "[DDR] 1800MHz\n"); + FWK_LOG_INFO("[DDR] 1800MHz"); value = 0x00000035U; /* 1800MHz */ break; case DDR_FREQ_1866: - FWK_LOG_INFO(synquacer_system_ctx.log_api, "[DDR] 1866MHz\n"); + FWK_LOG_INFO("[DDR] 1866MHz"); value = 0x00000037U; /* 1866MHz */ break; case DDR_FREQ_2133: - FWK_LOG_INFO(synquacer_system_ctx.log_api, "[DDR] 2133MHz\n"); + FWK_LOG_INFO("[DDR] 2133MHz"); value = 0x0000003FU; /* 2133MHz */ break; default: - FWK_LOG_INFO( - synquacer_system_ctx.log_api, "[DDR] Invalid DDR frequency\n"); + FWK_LOG_INFO("[DDR] Invalid DDR frequency"); assert(false); } @@ -235,17 +232,13 @@ static spd_read_err_code_t read_spd( i2c_err = f_i2c_api->recv_data( I2C_EN_CH0, i2c_slave_addr_read_spd, 0, dst, read_len); if (i2c_err == I2C_ERR_UNAVAILABLE) { - FWK_LOG_TRACE( - synquacer_system_ctx.log_api, - "[SYSTEM] slot DIMM%d: not detected\n", - slot); + FWK_LOG_INFO("[SYSTEM] slot DIMM%" PRIu32 ": not detected", slot); return SPD_READ_SLOT_NONE; } if (i2c_err != I2C_ERR_OK) { FWK_LOG_INFO( - synquacer_system_ctx.log_api, "[SYSTEM] Error detected while reading the first byte of SPD. " - "slave_addr:0x%02x, errror code = %d\n", + "slave_addr:0x%02" PRIx32 ", errror code = %d", i2c_slave_addr_read_spd, i2c_err); return SPD_READ_ERROR; @@ -294,8 +287,7 @@ bool fw_spd_ddr_info_get(spd_ddr_info_t *spd_ddr_info_p) if ((spd_ddr_info_p->base_module_type != 0) && (spd_ddr_info_p->base_module_type != (buf[3] & 0x0F))) { /* error! mixed base module memory */ - FWK_LOG_ERR( - synquacer_system_ctx.log_api, "[ERROR] use same sdram type!\n"); + FWK_LOG_ERR("[ERROR] use same sdram type!"); error_flag = true; return error_flag; } else { @@ -327,9 +319,7 @@ bool fw_spd_ddr_info_get(spd_ddr_info_t *spd_ddr_info_p) /* DDR4 package Type check */ if ((buf[6] & 0x3) == 0x02 || (buf[6] & 0x3) == 0x03) { - FWK_LOG_ERR( - synquacer_system_ctx.log_api, - "[ERROR] not support sdram type!\n"); + FWK_LOG_ERR("[ERROR] not support sdram type!"); error_flag = true; return error_flag; } @@ -349,8 +339,7 @@ bool fw_spd_ddr_info_get(spd_ddr_info_t *spd_ddr_info_p) << 8; spd_ddr_info_p->slot_bitmap |= (1 << check_dimm_slot); FWK_LOG_INFO( - synquacer_system_ctx.log_api, - "[SYSTEM] slot DIMM%d: %dMB %s %s\n", + "[SYSTEM] slot DIMM%d: %" PRIu32 "MB %s %s", check_dimm_slot, spd_ddr_info_p->sdram_slot_total[check_dimm_slot], dimm_module_type[spd_ddr_info_p->base_module_type], @@ -419,9 +408,7 @@ bool fw_spd_rdimm_support_check(spd_ddr_info_t *spd_ddr_info_p) /* non support dimm slot layout! */ default: - FWK_LOG_ERR( - synquacer_system_ctx.log_api, - "[ERROR] read spd at sdram non support dimm slot layout!\n"); + FWK_LOG_ERR("[ERROR] read spd at sdram non support dimm slot layout!"); error_flag = true; return error_flag; } @@ -443,9 +430,7 @@ bool fw_spd_udimm_support_check(spd_ddr_info_t *spd_ddr_info_p) break; default: - FWK_LOG_ERR( - synquacer_system_ctx.log_api, - "[ERROR] non support capability dimm!\n"); + FWK_LOG_ERR("[ERROR] non support capability dimm!"); error_flag = true; return error_flag; } @@ -468,9 +453,7 @@ bool fw_spd_udimm_support_check(spd_ddr_info_t *spd_ddr_info_p) /* non support dimm slot layout! */ default: - FWK_LOG_ERR( - synquacer_system_ctx.log_api, - "[ERROR] read spd at sdram non support dimm slot layout!\n"); + FWK_LOG_ERR("[ERROR] read spd at sdram non support dimm slot layout!"); error_flag = true; return error_flag; } @@ -491,9 +474,7 @@ bool fw_spd_72bitsoudimm_support_check(spd_ddr_info_t *spd_ddr_info_p) break; default: - FWK_LOG_ERR( - synquacer_system_ctx.log_api, - "[ERROR] non support capability dimm!\n"); + FWK_LOG_ERR("[ERROR] non support capability dimm!"); error_flag = true; return error_flag; } @@ -517,9 +498,7 @@ bool fw_spd_72bitsoudimm_support_check(spd_ddr_info_t *spd_ddr_info_p) /* non support dimm slot layout! */ default: error_flag = true; - FWK_LOG_ERR( - synquacer_system_ctx.log_api, - "[ERROR] read spd at sdram non support dimm slot layout!\n"); + FWK_LOG_ERR("[ERROR] read spd at sdram non support dimm slot layout!"); } return error_flag; @@ -538,9 +517,7 @@ bool fw_spd_read_dimm_capacity_check(spd_ddr_info_t *spd_ddr_info_p) if ((spd_ddr_info_p->per_slot_dimm_size != 0) && (spd_ddr_info_p->per_slot_dimm_size != spd_ddr_info_p->sdram_slot_total[i])) { - FWK_LOG_ERR( - synquacer_system_ctx.log_api, - "[ERROR] Please use same capacity DDR memory!\n"); + FWK_LOG_ERR("[ERROR] Please use same capacity DDR memory!"); error_flag = true; return error_flag; } @@ -575,9 +552,7 @@ bool fw_spd_read_dimm_kinds_check(spd_ddr_info_t *spd_ddr_info_p) /* other type memory module */ default: - FWK_LOG_ERR( - synquacer_system_ctx.log_api, - "[ERROR] sdram other type memory module\n"); + FWK_LOG_ERR("[ERROR] sdram other type memory module"); error_flag = true; return error_flag; } @@ -592,8 +567,7 @@ bool fw_spd_read_dimm_kinds_check(spd_ddr_info_t *spd_ddr_info_p) int fw_ddr_spd_param_check(void) { - FWK_LOG_INFO( - synquacer_system_ctx.log_api, "[SYSTEM] Starting check DRAM\n"); + FWK_LOG_INFO("[SYSTEM] Starting check DRAM"); if (fw_spd_ddr_info_get(&spd_ddr_info)) return FWK_E_SUPPORT; @@ -605,8 +579,7 @@ int fw_ddr_spd_param_check(void) return FWK_E_SUPPORT; FWK_LOG_INFO( - synquacer_system_ctx.log_api, - "[SYSTEM] Finished check DRAM memory total %dGB\n", + "[SYSTEM] Finished check DRAM memory total %" PRIu32 "GB", (config_ddr4_sdram_total_size / 1024)); return FWK_SUCCESS; @@ -688,8 +661,7 @@ static void dma330_zero_clear( REG_DMA330_S->INTEN = 0xffffffffU; while (REG_DMA330_S->DBGSTATUS != 0) { - FWK_LOG_INFO( - synquacer_system_ctx.log_api, "[SYSTEM] Wait DMA330 busy.\n"); + FWK_LOG_INFO("[SYSTEM] Wait DMA330 busy."); osDelay(10); } @@ -841,9 +813,7 @@ static void dram_init_for_ecc(void) dram_size = (uint64_t)config_ddr4_sdram_total_size * 1024 * 1024; - FWK_LOG_INFO( - synquacer_system_ctx.log_api, - "[DDR] Initializing DRAM for ECC\nNow Initializing["); + FWK_LOG_INFO("[DDR] Initializing DRAM for ECC\nNow Initializing["); dma330_wrapper_init(); @@ -852,7 +822,7 @@ static void dram_init_for_ecc(void) (dst_ddr_addr < DRAM_AREA_1_END_ADDR) && (dram_size != 0); dma_dst_addr += DMA330_ERASE_BLOCK_SIZE) { if ((dst_ddr_addr & 0x3fffffffULL) == 0) - FWK_LOG_INFO(synquacer_system_ctx.log_api, "+"); + FWK_LOG_INFO("[DDR] +"); dma330_zero_clear(0xce000000U, dma_dst_addr); dst_ddr_addr += DMA330_ERASE_BLOCK_SIZE; @@ -864,7 +834,7 @@ static void dram_init_for_ecc(void) (dst_ddr_addr < DRAM_AREA_2_END_ADDR) && (dram_size != 0); dma_dst_addr += DMA330_ERASE_BLOCK_SIZE) { if ((dst_ddr_addr & 0x3fffffffULL) == 0) - FWK_LOG_INFO(synquacer_system_ctx.log_api, "-"); + FWK_LOG_INFO("[DDR] -"); if ((dst_ddr_addr & 0x1fffffffULL) == 0) { dmab_mmu500_init(dst_ddr_addr); @@ -881,7 +851,7 @@ static void dram_init_for_ecc(void) (dst_ddr_addr < DRAM_AREA_3_END_ADDR) && (dram_size != 0); dma_dst_addr += DMA330_ERASE_BLOCK_SIZE) { if ((dst_ddr_addr & 0x3fffffffULL) == 0) - FWK_LOG_INFO(synquacer_system_ctx.log_api, "x"); + FWK_LOG_INFO("[DDR] x"); if ((dst_ddr_addr & 0x1fffffffULL) == 0) { dmab_mmu500_init(dst_ddr_addr); @@ -893,9 +863,7 @@ static void dram_init_for_ecc(void) dram_size -= DMA330_ERASE_BLOCK_SIZE; } - FWK_LOG_INFO( - synquacer_system_ctx.log_api, - "]\n[DDR] Finished initializing DRAM for ECC\n"); + FWK_LOG_INFO("[DDR] Finished initializing DRAM for ECC"); (void)addr_trans(0x00800U, TEST_SIZE, false); (void)addr_trans(0x008ffU, TEST_SIZE, false); diff --git a/product/synquacer/module/synquacer_rom/src/mod_synquacer_rom.c b/product/synquacer/module/synquacer_rom/src/mod_synquacer_rom.c index 48104288..17e94ad4 100644 --- a/product/synquacer/module/synquacer_rom/src/mod_synquacer_rom.c +++ b/product/synquacer/module/synquacer_rom/src/mod_synquacer_rom.c @@ -22,7 +22,6 @@ void synquacer_system_init(void); static const struct synquacer_rom_config *rom_config; -static struct mod_log_api *log_api; enum rom_event { ROM_EVENT_RUN, ROM_EVENT_COUNT }; @@ -66,25 +65,6 @@ static int synquacer_rom_init( return FWK_SUCCESS; } -static int synquacer_rom_bind(fwk_id_t id, unsigned int round) -{ - int status; - - /* Use second round only (round numbering is zero-indexed) */ - if (round == 1) { - /* Bind to the log component */ - status = fwk_module_bind( - FWK_ID_MODULE(FWK_MODULE_IDX_LOG), - FWK_ID_API(FWK_MODULE_IDX_LOG, 0), - &log_api); - - if (status != FWK_SUCCESS) - return FWK_E_PANIC; - } - - return FWK_SUCCESS; -} - static int synquacer_rom_start(fwk_id_t id) { int status; @@ -103,7 +83,7 @@ static int synquacer_rom_process_event( const struct fwk_event *event, struct fwk_event *resp) { - FWK_LOG_INFO(log_api, "[scp_romfw] Launch scp_ramfw\n"); + FWK_LOG_INFO("[scp_romfw] Launch scp_ramfw"); if (rom_config->load_ram_size != 0) { memcpy( @@ -123,7 +103,6 @@ const struct fwk_module module_synquacer_rom = { .type = FWK_MODULE_TYPE_SERVICE, .event_count = ROM_EVENT_COUNT, .init = synquacer_rom_init, - .bind = synquacer_rom_bind, .start = synquacer_rom_start, .process_event = synquacer_rom_process_event, }; diff --git a/product/synquacer/module/synquacer_system/include/mod_synquacer_system.h b/product/synquacer/module/synquacer_system/include/mod_synquacer_system.h index a9a36619..694c8a9f 100644 --- a/product/synquacer/module/synquacer_system/include/mod_synquacer_system.h +++ b/product/synquacer/module/synquacer_system/include/mod_synquacer_system.h @@ -59,9 +59,6 @@ enum mod_synquacer_system_api_idx { * \brief Module Context */ struct synquacer_system_ctx { - /*! pointer to the log module. */ - const struct mod_log_api *log_api; - /*! pointer to the power domain module. */ const struct mod_pd_restricted_api *mod_pd_restricted_api; diff --git a/product/synquacer/module/synquacer_system/src/gpio.c b/product/synquacer/module/synquacer_system/src/gpio.c index 6c496c0b..eb4a0ffd 100644 --- a/product/synquacer/module/synquacer_system/src/gpio.c +++ b/product/synquacer/module/synquacer_system/src/gpio.c @@ -17,6 +17,7 @@ #include <fwk_log.h> #include <fwk_macros.h> +#include <inttypes.h> #include <stddef.h> #include <stdint.h> @@ -27,11 +28,7 @@ static const uint8_t gpio_function[] = CONFIG_SCB_GPIO_FUNCTION; void prmux_set_pingrp(void *prmux_base_addr, uint32_t idx, uint32_t pingrp) { if (idx > PRMUX_MAX_IDX) { - FWK_LOG_ERR( - synquacer_system_ctx.log_api, - "Error@%s idx(%d) too big\n", - __func__, - idx); + FWK_LOG_ERR("Error@%s idx(%" PRIu32 ") too big", __func__, idx); return; } @@ -41,11 +38,7 @@ void prmux_set_pingrp(void *prmux_base_addr, uint32_t idx, uint32_t pingrp) void gpio_set_data(void *gpio_base_addr, uint32_t idx, uint8_t value) { if (idx > GPIO_MAX_IDX) { - FWK_LOG_ERR( - synquacer_system_ctx.log_api, - "Error@%s idx(%d) too big\n", - __func__, - idx); + FWK_LOG_ERR("Error@%s idx(%" PRIu32 ") too big", __func__, idx); return; } @@ -55,11 +48,7 @@ void gpio_set_data(void *gpio_base_addr, uint32_t idx, uint8_t value) uint8_t gpio_get_data(void *gpio_base_addr, uint32_t idx) { if (idx > GPIO_MAX_IDX) { - FWK_LOG_ERR( - synquacer_system_ctx.log_api, - "Error@%s idx(%d) too big\n", - __func__, - idx); + FWK_LOG_ERR("Error@%s idx(%" PRIu32 ") too big", __func__, idx); return 0; } @@ -69,11 +58,7 @@ uint8_t gpio_get_data(void *gpio_base_addr, uint32_t idx) void gpio_set_direction(void *gpio_base_addr, uint32_t idx, uint8_t value) { if (idx > GPIO_MAX_IDX) { - FWK_LOG_ERR( - synquacer_system_ctx.log_api, - "Error@%s idx(%d) too big\n", - __func__, - idx); + FWK_LOG_ERR("Error@%s idx(%" PRIu32 ") too big", __func__, idx); return; } @@ -83,11 +68,7 @@ void gpio_set_direction(void *gpio_base_addr, uint32_t idx, uint8_t value) uint8_t gpio_get_direction(void *gpio_base_addr, uint32_t idx) { if (idx > GPIO_MAX_IDX) { - FWK_LOG_ERR( - synquacer_system_ctx.log_api, - "Error@%s idx(%d) too big\n", - __func__, - idx); + FWK_LOG_ERR("Error@%s idx(%" PRIu32 ") too big", __func__, idx); return 0; } @@ -97,11 +78,7 @@ uint8_t gpio_get_direction(void *gpio_base_addr, uint32_t idx) void gpio_set_function(void *gpio_base_addr, uint32_t idx, uint8_t value) { if (idx > GPIO_MAX_IDX) { - FWK_LOG_ERR( - synquacer_system_ctx.log_api, - "Error@%s idx(%d) too big\n", - __func__, - idx); + FWK_LOG_ERR("Error@%s idx(%" PRIu32 ") too big", __func__, idx); return; } @@ -111,11 +88,7 @@ void gpio_set_function(void *gpio_base_addr, uint32_t idx, uint8_t value) uint8_t gpio_get_function(void *gpio_base_addr, uint32_t idx) { if (idx > GPIO_MAX_IDX) { - FWK_LOG_ERR( - synquacer_system_ctx.log_api, - "Error@%s idx(%d) too big\n", - __func__, - idx); + FWK_LOG_ERR("Error@%s idx(%" PRIu32 ") too big", __func__, idx); return 0; } @@ -130,15 +103,14 @@ void fw_gpio_init(void) uint32_t gpio_desc_num; const struct sysdef_option_gpio_desc *gpio_desc_p; - FWK_LOG_INFO(synquacer_system_ctx.log_api, "[SYSTEM] Setting up PRMUX\n"); + FWK_LOG_INFO("[SYSTEM] Setting up PRMUX"); for (i = 0; i < FWK_ARRAY_SIZE(prmux_pingrp); i++) { prmux_set_pingrp( (void *)CONFIG_SOC_PRMUX_BASE_ADDR, i, prmux_pingrp[i]); } - FWK_LOG_INFO( - synquacer_system_ctx.log_api, "[SYSTEM] Finished setting up PRMUX\n"); + FWK_LOG_INFO("[SYSTEM] Finished setting up PRMUX"); - FWK_LOG_INFO(synquacer_system_ctx.log_api, "[SYSTEM] Setting up GPIO\n"); + FWK_LOG_INFO("[SYSTEM] Setting up GPIO"); for (i = 0; i < FWK_ARRAY_SIZE(gpio_function); i++) gpio_set_function((void *)CONFIG_SOC_AP_GPIO_BASE, i, gpio_function[i]); @@ -146,8 +118,7 @@ void fw_gpio_init(void) gpio_set_direction( (void *)CONFIG_SOC_AP_GPIO_BASE, i, gpio_direction[i]); - FWK_LOG_INFO( - synquacer_system_ctx.log_api, "[SYSTEM] Finished setting up GPIO\n"); + FWK_LOG_INFO("[SYSTEM] Finished setting up GPIO"); gpio_initial_values = (gpio_get_data((void *)CONFIG_SOC_AP_GPIO_BASE, 3) << 24) | @@ -156,8 +127,7 @@ void fw_gpio_init(void) gpio_get_data((void *)CONFIG_SOC_AP_GPIO_BASE, 0); FWK_LOG_INFO( - synquacer_system_ctx.log_api, - "[SYSTEM] Initial GPIO input values = 0x%08x: ", + "[SYSTEM] Initial GPIO input values = 0x%08" PRIx32 ": ", gpio_initial_values); gpio_desc_num = sysdef_option_get_gpio_desc(&gpio_desc_p); @@ -165,10 +135,8 @@ void fw_gpio_init(void) if (((gpio_initial_values >> gpio_desc_p->pin_no) & 0x1) == (gpio_desc_p->inv ? 1 : 0)) { /* prepend "!" if the target signal is not asserted */ - FWK_LOG_INFO(synquacer_system_ctx.log_api, "!"); + FWK_LOG_INFO("!"); } - FWK_LOG_INFO(synquacer_system_ctx.log_api, "%s ", gpio_desc_p->str); + FWK_LOG_INFO("%s ", gpio_desc_p->str); } - - FWK_LOG_INFO(synquacer_system_ctx.log_api, "\n"); } diff --git a/product/synquacer/module/synquacer_system/src/load_secure_fw.c b/product/synquacer/module/synquacer_system/src/load_secure_fw.c index 4eded931..54949044 100644 --- a/product/synquacer/module/synquacer_system/src/load_secure_fw.c +++ b/product/synquacer/module/synquacer_system/src/load_secure_fw.c @@ -13,6 +13,7 @@ #include <fwk_log.h> #include <fwk_macros.h> +#include <inttypes.h> #include <stdint.h> #include <string.h> @@ -80,13 +81,11 @@ static void fw_fip_load_bl32(void) (void *)bl32_uuid, (void *)fip_package_p->fip_toc_entry[BL32_TOC_ENTRY_INDEX].uuid, sizeof(bl32_uuid)) != 0) { - FWK_LOG_ERR( - synquacer_system_ctx.log_api, - "[FIP] BL32 UUID is wrong, skip loading\n"); + FWK_LOG_ERR("[FIP] BL32 UUID is wrong, skip loading"); return; } - FWK_LOG_ERR(synquacer_system_ctx.log_api, "[FIP] load BL32\n"); + FWK_LOG_ERR("[FIP] load BL32"); /* enable DRAM access by configuring address trans register */ trans_addr_39_20 = @@ -105,7 +104,7 @@ static void fw_fip_load_bl32(void) *((volatile uint32_t *)(REG_ASH_SCP_POW_CTL + ADDR_TRANS_OFFSET)) = trans_addr_39_20; - FWK_LOG_ERR(synquacer_system_ctx.log_api, "[FIP] BL32 is loaded\n"); + FWK_LOG_ERR("[FIP] BL32 is loaded"); } void fw_fip_load_arm_tf(void) @@ -128,27 +127,23 @@ void fw_fip_load_arm_tf(void) "sizeof(arm_tf_fip_package_t) is wrong"); for (i = 0; i < FWK_ARRAY_SIZE(arm_tf_dst_addr); i++) { - FWK_LOG_TRACE( - synquacer_system_ctx.log_api, - "[FIP] fip_toc_entry[%d] offset_addr %lx\n", + FWK_LOG_INFO( + "[FIP] fip_toc_entry[%" PRIu32 "] offset_addr %" PRIx64, i, fip_package_p->fip_toc_entry[i].offset_addr); - FWK_LOG_TRACE( - synquacer_system_ctx.log_api, - "[FIP] fip_toc_entry[%d] size %lu\n", + FWK_LOG_INFO( + "[FIP] fip_toc_entry[%" PRIu32 "] size %" PRIu64, i, fip_package_p->fip_toc_entry[i].size); - FWK_LOG_TRACE( - synquacer_system_ctx.log_api, - "[FIP] dst addr[%d] %x\n", + FWK_LOG_INFO( + "[FIP] dst addr[%" PRIu32 "] %" PRIx32, i, arm_tf_dst_addr[i]); - FWK_LOG_TRACE( - synquacer_system_ctx.log_api, - "[FIP] src addr[%d] %x\n", + FWK_LOG_INFO( + "[FIP] src addr[%" PRIu32 "] %" PRIx32, i, ((uint32_t)fip_package_p + (uint32_t)fip_package_p->fip_toc_entry[i].offset_addr)); diff --git a/product/synquacer/module/synquacer_system/src/mmu500.c b/product/synquacer/module/synquacer_system/src/mmu500.c index 4232fcfa..e612aba9 100644 --- a/product/synquacer/module/synquacer_system/src/mmu500.c +++ b/product/synquacer/module/synquacer_system/src/mmu500.c @@ -11,6 +11,8 @@ #include <fwk_log.h> +#include <inttypes.h> + void SMMU_setup_PMU(MMU500_Type_t *SMMU) { volatile uint32_t *pmu_regs; @@ -31,10 +33,10 @@ void SMMU_setup_PMU(MMU500_Type_t *SMMU) pmu_regs[0x0800 / 4] = 0x00000800U; /* PMCGCR0: enable=1, global_basis */ pmu_regs[0x0e04 / 4] = 0x00000003U; /* PMCR: enable=1, reset=1 */ - FWK_LOG_TRACE( - synquacer_system_ctx.log_api, - "[MMU500] setup PMU for MMU-500@0x%08x. page_size=%d." - "0x%08x(access), 0x%08x(read), 0x%08x(write).\n", + FWK_LOG_INFO( + "[MMU500] setup PMU for MMU-500@0x%08" PRIx32 + ". page_size=%d. 0x%08" PRIx32 "(access), 0x%08" PRIx32 + "(read), 0x%08" PRIx32 "(write).", (uint32_t)SMMU, page_size, (uint32_t)&pmu_regs[0], diff --git a/product/synquacer/module/synquacer_system/src/mod_synquacer_system.c b/product/synquacer/module/synquacer_system/src/mod_synquacer_system.c index 1d4b1f22..7591d772 100644 --- a/product/synquacer/module/synquacer_system/src/mod_synquacer_system.c +++ b/product/synquacer/module/synquacer_system/src/mod_synquacer_system.c @@ -40,9 +40,7 @@ int synquacer_main(void); static int synquacer_system_shutdown( enum mod_pd_system_shutdown system_shutdown) { - FWK_LOG_TRACE( - synquacer_system_ctx.log_api, - "[SYNQUACER SYSTEM] requesting synquacer system_shutdown\n"); + FWK_LOG_INFO("[SYNQUACER SYSTEM] requesting synquacer system_shutdown"); reboot_chip(); @@ -72,13 +70,6 @@ static int synquacer_system_bind(fwk_id_t id, unsigned int round) if (round == 0) { status = fwk_module_bind( - FWK_ID_MODULE(FWK_MODULE_IDX_LOG), - FWK_ID_API(FWK_MODULE_IDX_LOG, 0), - &synquacer_system_ctx.log_api); - if (status != FWK_SUCCESS) - return status; - - status = fwk_module_bind( FWK_ID_MODULE(FWK_MODULE_IDX_CCN512), FWK_ID_API(FWK_MODULE_IDX_CCN512, 0), &synquacer_system_ctx.ccn512_api); @@ -127,9 +118,7 @@ static int synquacer_system_start(fwk_id_t id) main_initialize(); - FWK_LOG_TRACE( - synquacer_system_ctx.log_api, - "[SYNQUACER SYSTEM] Request system initialization.\n"); + FWK_LOG_INFO("[SYNQUACER SYSTEM] Request system initialization."); status = fwk_thread_create(FWK_ID_MODULE(FWK_MODULE_IDX_SYNQUACER_SYSTEM)); if (status != FWK_SUCCESS) @@ -155,9 +144,7 @@ int synquacer_process_event( struct fwk_event *resp) { if (fwk_id_get_event_idx(event->id) == SYNQUACER_SYSTEM_EVENT_START) { - FWK_LOG_TRACE( - synquacer_system_ctx.log_api, - "[SYNQUACER SYSTEM] Process system start event.\n"); + FWK_LOG_INFO("[SYNQUACER SYSTEM] Process system start event."); synquacer_main(); } diff --git a/product/synquacer/module/synquacer_system/src/nic400.c b/product/synquacer/module/synquacer_system/src/nic400.c index d3d959c2..a982a8db 100644 --- a/product/synquacer/module/synquacer_system/src/nic400.c +++ b/product/synquacer/module/synquacer_system/src/nic400.c @@ -17,6 +17,7 @@ #include <fwk_log.h> #include <fwk_macros.h> +#include <inttypes.h> #include <stdint.h> #define NIC_TOP_ADDR_SEC_REG (0x00000008) @@ -27,9 +28,8 @@ static void nic_sec_slave_security( uint32_t slave_index, uint32_t value) { - FWK_LOG_TRACE( - synquacer_system_ctx.log_api, - "%s addr 0x%08x value 0x%08x\n", + FWK_LOG_INFO( + "%s addr 0x%08" PRIx32 " value 0x%08" PRIx32, __func__, (nic_top_addr + NIC_TOP_ADDR_SEC_REG + NIC_SEC_REG_OFFSET * slave_index), diff --git a/product/synquacer/module/synquacer_system/src/smmu_config.c b/product/synquacer/module/synquacer_system/src/smmu_config.c index 3df6856d..6b91bba3 100644 --- a/product/synquacer/module/synquacer_system/src/smmu_config.c +++ b/product/synquacer/module/synquacer_system/src/smmu_config.c @@ -101,14 +101,12 @@ uint64_t smmu_convert_to_axi_addr(void *addr_cm3view) void smmu_wrapper_initialize(void) { - FWK_LOG_INFO( - synquacer_system_ctx.log_api, "Configure System MMUs starts\n"); + FWK_LOG_INFO("Configure System MMUs starts"); /* Basic Configuration */ smmu_wrapper_pcie(); - FWK_LOG_INFO( - synquacer_system_ctx.log_api, "Configure System MMUs finished\n"); + FWK_LOG_INFO("Configure System MMUs finished"); } void smmu_wrapper_pcie(void) diff --git a/product/synquacer/module/synquacer_system/src/synquacer_main.c b/product/synquacer/module/synquacer_system/src/synquacer_main.c index eb040c06..2fd768cb 100644 --- a/product/synquacer/module/synquacer_system/src/synquacer_main.c +++ b/product/synquacer/module/synquacer_system/src/synquacer_main.c @@ -268,11 +268,9 @@ static void fw_system_reset(void) int reboot_chip(void) { - FWK_LOG_INFO( - synquacer_system_ctx.log_api, "[SYNQUACER SYSTEM] HSSPI exit start.\n"); + FWK_LOG_INFO("[SYNQUACER SYSTEM] HSSPI exit start."); synquacer_system_ctx.hsspi_api->hsspi_exit(); - FWK_LOG_INFO( - synquacer_system_ctx.log_api, "[SYNQUACER SYSTEM] HSSPI exit end.\n"); + FWK_LOG_INFO("[SYNQUACER SYSTEM] HSSPI exit end."); __disable_fault_irq(); @@ -304,8 +302,7 @@ void main_initialize(void) fw_clear_clkforce(sysdef_option_get_clear_clkforce()); FWK_LOG_INFO( - synquacer_system_ctx.log_api, - "[SYNQUACER SYSTEM] chip version %s.\n", + "[SYNQUACER SYSTEM] chip version %s.", sysdef_option_get_chip_version()); power_domain_coldboot(); @@ -336,15 +333,10 @@ static void fw_wakeup_ap(void) ap_dev_init(); synquacer_system_ctx.hsspi_api->hsspi_init(); - FWK_LOG_INFO( - synquacer_system_ctx.log_api, - "[SYNQUACER SYSTEM] Finished initializing HS-SPI controller.\n"); - FWK_LOG_INFO( - synquacer_system_ctx.log_api, - "[SYNQUACER SYSTEM] Arm tf load start.\n"); + FWK_LOG_INFO("[SYNQUACER SYSTEM] Finished initializing HS-SPI controller."); + FWK_LOG_INFO("[SYNQUACER SYSTEM] Arm tf load start."); fw_fip_load_arm_tf(); - FWK_LOG_INFO( - synquacer_system_ctx.log_api, "[SYNQUACER SYSTEM] Arm tf load end.\n"); + FWK_LOG_INFO("[SYNQUACER SYSTEM] Arm tf load end."); } int synquacer_main(void) @@ -355,8 +347,7 @@ int synquacer_main(void) pcie_wrapper_configure(); fw_wakeup_ap(); - FWK_LOG_INFO( - synquacer_system_ctx.log_api, "[SYNQUACER SYSTEM] powering up AP\n"); + FWK_LOG_INFO("[SYNQUACER SYSTEM] powering up AP"); status = synquacer_system_ctx.mod_pd_restricted_api->set_composite_state_async( FWK_ID_ELEMENT(FWK_MODULE_IDX_POWER_DOMAIN, 0), @@ -369,14 +360,10 @@ int synquacer_main(void) MOD_PD_STATE_ON)); if (status == FWK_SUCCESS) - FWK_LOG_INFO( - synquacer_system_ctx.log_api, - "[SYNQUACER SYSTEM] finished powering up AP\n"); + FWK_LOG_INFO("[SYNQUACER SYSTEM] finished powering up AP"); else FWK_LOG_ERR( - synquacer_system_ctx.log_api, - "[SYNQUACER SYSTEM] failed to power up AP. status=%d\n", - status); + "[SYNQUACER SYSTEM] failed to power up AP. status=%d", status); return status; } diff --git a/product/synquacer/module/synquacer_system/src/synquacer_pd_manage.c b/product/synquacer/module/synquacer_system/src/synquacer_pd_manage.c index 0b521294..35a802c5 100644 --- a/product/synquacer/module/synquacer_system/src/synquacer_pd_manage.c +++ b/product/synquacer/module/synquacer_system/src/synquacer_pd_manage.c @@ -21,6 +21,7 @@ #include <fwk_log.h> #include <fwk_macros.h> +#include <inttypes.h> #include <stdbool.h> #include <stdint.h> @@ -156,9 +157,7 @@ static void sni_power_domain_workaround_mp(void) uint32_t i, j; int r; - FWK_LOG_INFO( - synquacer_system_ctx.log_api, - "[PowerDomain] Socionext-PPU initialize .\n"); + FWK_LOG_INFO("[PowerDomain] Socionext-PPU initialize ."); /* ppu off */ for (i = 0; i < FWK_ARRAY_SIZE(sni_ppu_info); i++) { @@ -169,8 +168,8 @@ static void sni_power_domain_workaround_mp(void) sni_ppu_info[i].no, PPU_PP_OFF, 0, hwcsysreqen, 0); if (r != 0) { FWK_LOG_ERR( - synquacer_system_ctx.log_api, - "[PPU] powerdomain workaround error. sni-ppu%d off-process.\n", + "[PPU] powerdomain workaround error. sni-ppu%" PRIu32 + " off-process.", sni_ppu_info[i].no); } } @@ -186,9 +185,8 @@ static void sni_power_domain_workaround_mp(void) } if (j >= PD_TIMEOUT_COUNT) { FWK_LOG_ERR( - synquacer_system_ctx.log_api, - "[PPU] powerdomain workaround error. sni-ppu%d " - "status timeout\n", + "[PPU] powerdomain workaround error. sni-ppu%" PRIu32 + "status timeout", sni_ppu_info[i].no); } } @@ -204,9 +202,7 @@ static void sni_power_domain_workaround_mp(void) lpcm_sysoc_reset(RST_TYPE_BUS, RST_PCIE_TOP); lpcm_sysoc_reset(RST_TYPE_BUS, RST_DMA); - FWK_LOG_INFO( - synquacer_system_ctx.log_api, - "[PowerDomain] Socionext-PPU initialize end .\n"); + FWK_LOG_INFO("[PowerDomain] Socionext-PPU initialize end ."); } static void sni_power_domain_on_mp(uint32_t dev_bitmap) @@ -215,9 +211,7 @@ static void sni_power_domain_on_mp(uint32_t dev_bitmap) uint32_t pmu_bitmap; uint32_t transw_reg_bitmap[TRANSW_REG_NUM] = { 0 }; - FWK_LOG_INFO( - synquacer_system_ctx.log_api, - "[PowerDomain] PowerDomain All-ON start.\n"); + FWK_LOG_INFO("[PowerDomain] PowerDomain All-ON start."); /* pmu cycle time */ FOR_EACH_PMU_INFO(i) @@ -265,8 +259,8 @@ static void sni_power_domain_on_mp(uint32_t dev_bitmap) r = pmu_wait(pmu_bitmap, true); if (r != 0) FWK_LOG_ERR( - synquacer_system_ctx.log_api, - "[PPU] sni-pmu timeout expected:(0x%08x) result: (0x%08x).\n", + "[PPU] sni-pmu timeout expected:(0x%08" PRIx32 + ") result: (0x%08" PRIx32 ").", pmu_bitmap, pmu_read_pd_power_status()); @@ -296,31 +290,20 @@ static void sni_power_domain_on_mp(uint32_t dev_bitmap) lpcm_sysoc_reset_clear(RST_TYPE_ALL, RST_DDR); /* set TransactionSW */ - FWK_LOG_INFO( - synquacer_system_ctx.log_api, - "[PowerDomain] Opening transaction switch\n"); + FWK_LOG_INFO("[PowerDomain] Opening transaction switch"); FOR_EACH_TRANSW_REG(i) { - FWK_LOG_TRACE( - synquacer_system_ctx.log_api, - "[PowerDomain] Opening transaction switch + %d\n", - i); + FWK_LOG_INFO("[PowerDomain] Opening transaction switch + %" PRIu32, i); set_transactionsw_off(TRANSW_ADDR(i), transw_reg_bitmap[i]); - FWK_LOG_TRACE( - synquacer_system_ctx.log_api, - "[PowerDomain] Finished opening transaction switch + %d\n", - i); + FWK_LOG_INFO( + "[PowerDomain] Finished opening transaction switch + %" PRIu32, i); } - FWK_LOG_INFO( - synquacer_system_ctx.log_api, - "[PowerDomain] Finished transaction switch\n"); + FWK_LOG_INFO("[PowerDomain] Finished transaction switch"); - FWK_LOG_INFO( - synquacer_system_ctx.log_api, - "[PowerDomain] PowerDomain All-ON finished.\n"); + FWK_LOG_INFO("[PowerDomain] PowerDomain All-ON finished."); /* sni-ppu all on */ FOR_EACH_PPU_INFO(i) @@ -331,8 +314,7 @@ static void sni_power_domain_on_mp(uint32_t dev_bitmap) r = change_power_state(sni_ppu_info[i].no, PPU_PP_ON, 1, 1, 0); if (r != 0) { FWK_LOG_ERR( - synquacer_system_ctx.log_api, - "[PPU] powerdomain error. sni-ppu%d on-process.\n", + "[PPU] powerdomain error. sni-ppu%" PRIu32 " on-process.", sni_ppu_info[i].no); } } @@ -352,8 +334,7 @@ static void sni_power_domain_on_mp(uint32_t dev_bitmap) } if (j >= PD_TIMEOUT_COUNT) { FWK_LOG_ERR( - synquacer_system_ctx.log_api, - "[PPU] powerdomain error. sni-ppu%d status timeout.\n", + "[PPU] powerdomain error. sni-ppu%" PRIu32 " status timeout.", sni_ppu_info[i].no); } } @@ -381,8 +362,7 @@ static void power_domain_on(uint32_t dev_bitmap) void power_domain_coldboot(void) { - FWK_LOG_INFO( - synquacer_system_ctx.log_api, "[SYSTEM] Initializing power domain\n"); + FWK_LOG_INFO("[SYSTEM] Initializing power domain"); sni_power_domain_workaround_mp(); power_domain_on(PD_PRESET_COLDBOOT); } diff --git a/product/synquacer/module/synquacer_system/src/sysoc.c b/product/synquacer/module/synquacer_system/src/sysoc.c index af41610c..75d34010 100644 --- a/product/synquacer/module/synquacer_system/src/sysoc.c +++ b/product/synquacer/module/synquacer_system/src/sysoc.c @@ -20,6 +20,7 @@ #include <fwk_macros.h> #include <fwk_status.h> +#include <inttypes.h> #include <stdbool.h> #include <stddef.h> #include <stdint.h> @@ -204,8 +205,7 @@ void lpcm_sysoc_reset(RST_TYPE_t type, RST_BLOCK block) } if (i == status_check_num) { FWK_LOG_ERR( - synquacer_system_ctx.log_api, - "[LPCM] Reset timeout.(%dms, %08x)\n", + "[LPCM] Reset timeout.(%dms, %08" PRIx32 ")", RESET_TIMEOUT_MS, reset_info[block].addr_lpcm); } @@ -222,8 +222,7 @@ void lpcm_sysoc_reset(RST_TYPE_t type, RST_BLOCK block) } if (i == status_check_num) { FWK_LOG_ERR( - synquacer_system_ctx.log_api, - "[SYSOC] Reset timeout.(%dms, %08x)\n", + "[SYSOC] Reset timeout.(%dms, %08" PRIx32 ")", RESET_TIMEOUT_MS, reset_info[block].addr_sysoc_bus); } @@ -240,8 +239,7 @@ void lpcm_sysoc_reset(RST_TYPE_t type, RST_BLOCK block) } if (i == status_check_num) { FWK_LOG_ERR( - synquacer_system_ctx.log_api, - "[SYSOC] Reset timeout.(%dms, %08x)\n", + "[SYSOC] Reset timeout.(%dms, %08" PRIx32 ")", RESET_TIMEOUT_MS, reset_info[block].addr_sysoc_blk); } @@ -288,8 +286,7 @@ void lpcm_sysoc_reset_clear(RST_TYPE_t type, RST_BLOCK block) } if (i == status_check_num) { FWK_LOG_ERR( - synquacer_system_ctx.log_api, - "[SYSOC] Reset clear timeout.(%dms, %08x)\n", + "[SYSOC] Reset clear timeout.(%dms, %08" PRIx32 ")", RESET_TIMEOUT_MS, reset_info[block].addr_sysoc_blk); } @@ -306,8 +303,7 @@ void lpcm_sysoc_reset_clear(RST_TYPE_t type, RST_BLOCK block) } if (i == status_check_num) { FWK_LOG_ERR( - synquacer_system_ctx.log_api, - "[SYSOC] Reset clear timeout.(%dms, %08x)\n", + "[SYSOC] Reset clear timeout.(%dms, %08" PRIx32 ")", RESET_TIMEOUT_MS, reset_info[block].addr_sysoc_bus); } @@ -323,8 +319,7 @@ void lpcm_sysoc_reset_clear(RST_TYPE_t type, RST_BLOCK block) } if (i == status_check_num) { FWK_LOG_ERR( - synquacer_system_ctx.log_api, - "[LPCM] Reset clear timeout.(%dms, %08x)\n", + "[LPCM] Reset clear timeout.(%dms, %08" PRIx32 ")", RESET_TIMEOUT_MS, reset_info[block].addr_lpcm); } diff --git a/product/synquacer/module/synquacer_system/src/thermal_sensor.c b/product/synquacer/module/synquacer_system/src/thermal_sensor.c index 12aee5e0..ce788438 100644 --- a/product/synquacer/module/synquacer_system/src/thermal_sensor.c +++ b/product/synquacer/module/synquacer_system/src/thermal_sensor.c @@ -17,6 +17,7 @@ #include <fwk_log.h> #include <fwk_status.h> +#include <inttypes.h> #include <stdint.h> #define DELAY_COUNTER 10 @@ -26,8 +27,7 @@ int thermal_enable(void) int32_t sensor_num = sysdef_option_get_sensor_num(); int32_t i = 0; - FWK_LOG_INFO( - synquacer_system_ctx.log_api, "[THERMAL] Thermal enable start\n"); + FWK_LOG_INFO("[THERMAL] Thermal enable start"); writel(THERMAL_BASE_ADDRESS + THERMAL_ALLCONFIG_OFFSET, 0); for (i = 0; i < sensor_num; i++) { uint32_t sensor_offset = THERMAL_SENSOR_BASE(i); @@ -35,18 +35,14 @@ int thermal_enable(void) writel(sensor_offset + THERMAL_TS_EN_OFFSET, THERMAL_ENABLE); if (readl(sensor_offset + THERMAL_TS_EN_OFFSET) == 0) { FWK_LOG_INFO( - synquacer_system_ctx.log_api, - "[THERMAL] Enable individual sensor #%x fail\n", - i); + "[THERMAL] Enable individual sensor #%" PRIx32 " fail", i); return FWK_E_DEVICE; } writel(sensor_offset + THERMAL_TS_RESET_OFFSET, THERMAL_ENABLE); if (readl(sensor_offset + THERMAL_TS_RESET_OFFSET) == 0) { FWK_LOG_INFO( - synquacer_system_ctx.log_api, - "[THERMAL] Reset individual sensor #%x fail\n", - i); + "[THERMAL] Reset individual sensor #%" PRIx32 " fail", i); return FWK_E_DEVICE; } } @@ -63,7 +59,6 @@ int thermal_enable(void) } } - FWK_LOG_INFO( - synquacer_system_ctx.log_api, "[THERMAL] Thermal enable end\n"); + FWK_LOG_INFO("[THERMAL] Thermal enable end"); return FWK_SUCCESS; } diff --git a/product/synquacer/module/synquacer_system/src/transaction_sw.c b/product/synquacer/module/synquacer_system/src/transaction_sw.c index 9864be7c..2398b008 100644 --- a/product/synquacer/module/synquacer_system/src/transaction_sw.c +++ b/product/synquacer/module/synquacer_system/src/transaction_sw.c @@ -14,6 +14,7 @@ #include <fwk_log.h> +#include <inttypes.h> #include <stdint.h> #define STATUS_ADDR 4 @@ -25,10 +26,7 @@ void set_transactionsw_off( unsigned int intsts; uint32_t value; - FWK_LOG_TRACE( - synquacer_system_ctx.log_api, - " traSW disable_bit = %08x\n", - disable_bit); + FWK_LOG_INFO(" traSW disable_bit = %08" PRIx32, disable_bit); DI(intsts); @@ -53,10 +51,7 @@ void set_transactionsw_on(uint32_t transactionsw_reg_addr, uint32_t enable_bit) unsigned int intsts; uint32_t value; - FWK_LOG_TRACE( - synquacer_system_ctx.log_api, - " traSW enable_bit = %08x\n", - enable_bit); + FWK_LOG_INFO(" traSW enable_bit = %08" PRIx32, enable_bit); DI(intsts); diff --git a/product/synquacer/scp_ramfw/config_log_f_uart3.c b/product/synquacer/scp_ramfw/config_log_f_uart3.c index 8e62dd32..24f70400 100644 --- a/product/synquacer/scp_ramfw/config_log_f_uart3.c +++ b/product/synquacer/scp_ramfw/config_log_f_uart3.c @@ -49,11 +49,8 @@ struct fwk_module_config config_f_uart3 = { static const struct mod_log_config log_data = { .device_id = FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_F_UART3, 0), .api_id = FWK_ID_API_INIT(FWK_MODULE_IDX_F_UART3, 0), - .log_groups = MOD_LOG_GROUP_ERROR | MOD_LOG_GROUP_INFO | - MOD_LOG_GROUP_WARNING | MOD_LOG_GROUP_DEBUG, .banner = - FWK_BANNER_SCP FWK_BANNER_RAM_FIRMWARE BUILD_VERSION_DESCRIBE_STRING - "\n", + FWK_BANNER_SCP FWK_BANNER_RAM_FIRMWARE BUILD_VERSION_DESCRIBE_STRING, }; struct fwk_module_config config_log = { diff --git a/product/synquacer/scp_ramfw/config_log_pl011.c b/product/synquacer/scp_ramfw/config_log_pl011.c index 81392a59..e072b3dc 100644 --- a/product/synquacer/scp_ramfw/config_log_pl011.c +++ b/product/synquacer/scp_ramfw/config_log_pl011.c @@ -7,6 +7,7 @@ #include "synquacer_mmap.h" +#include <mod_log.h> #include <mod_pl011.h> #include <fwk_banner.h> @@ -47,11 +48,8 @@ struct fwk_module_config config_pl011 = { static const struct mod_log_config log_data = { .device_id = FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PL011, 0), .api_id = FWK_ID_API_INIT(FWK_MODULE_IDX_PL011, 0), - .log_groups = MOD_LOG_GROUP_ERROR | MOD_LOG_GROUP_INFO | - MOD_LOG_GROUP_WARNING | MOD_LOG_GROUP_DEBUG, .banner = - FWK_BANNER_SCP FWK_BANNER_RAM_FIRMWARE BUILD_VERSION_DESCRIBE_STRING - "\n", + FWK_BANNER_SCP FWK_BANNER_RAM_FIRMWARE BUILD_VERSION_DESCRIBE_STRING, }; struct fwk_module_config config_log = { diff --git a/product/synquacer/scp_ramfw/rtx_config.c b/product/synquacer/scp_ramfw/rtx_config.c index 21df4f08..cb7fc7bd 100644 --- a/product/synquacer/scp_ramfw/rtx_config.c +++ b/product/synquacer/scp_ramfw/rtx_config.c @@ -48,9 +48,7 @@ uint32_t osRtxErrorNotify(uint32_t code, void *object_id) * Stack underflow detected for thread * thread_id=object_id */ - FWK_LOG_ERR( - synquacer_system_ctx.log_api, - "[SYSTEM] osRtxErrorStackUnderflow.\n"); + FWK_LOG_ERR("[SYSTEM] osRtxErrorStackUnderflow."); break; case osRtxErrorISRQueueOverflow: @@ -58,9 +56,7 @@ uint32_t osRtxErrorNotify(uint32_t code, void *object_id) * ISR Queue overflow detected when inserting object * object_id */ - FWK_LOG_ERR( - synquacer_system_ctx.log_api, - "[SYSTEM] osRtxErrorISRQueueOverflow.\n"); + FWK_LOG_ERR("[SYSTEM] osRtxErrorISRQueueOverflow."); break; case osRtxErrorTimerQueueOverflow: @@ -68,9 +64,7 @@ uint32_t osRtxErrorNotify(uint32_t code, void *object_id) * User Timer Callback Queue overflow detected for timer * timer_id=object_id */ - FWK_LOG_ERR( - synquacer_system_ctx.log_api, - "[SYSTEM] osRtxErrorTimerQueueOverflow.\n"); + FWK_LOG_ERR("[SYSTEM] osRtxErrorTimerQueueOverflow."); break; case osRtxErrorClibSpace: @@ -78,16 +72,14 @@ uint32_t osRtxErrorNotify(uint32_t code, void *object_id) * Standard C/C++ library libspace not available: * increase OS_THREAD_LIBSPACE_NUM */ - FWK_LOG_ERR( - synquacer_system_ctx.log_api, "[SYSTEM] osRtxErrorClibSpace.\n"); + FWK_LOG_ERR("[SYSTEM] osRtxErrorClibSpace."); break; case osRtxErrorClibMutex: /* * Standard C/C++ library mutex initialization failed */ - FWK_LOG_ERR( - synquacer_system_ctx.log_api, "[SYSTEM] oosRtxErrorClibMutex.\n"); + FWK_LOG_ERR("[SYSTEM] oosRtxErrorClibMutex."); break; default: diff --git a/product/synquacer/scp_romfw/config_log_f_uart3.c b/product/synquacer/scp_romfw/config_log_f_uart3.c index 95f00784..7aefe1b4 100644 --- a/product/synquacer/scp_romfw/config_log_f_uart3.c +++ b/product/synquacer/scp_romfw/config_log_f_uart3.c @@ -49,11 +49,8 @@ struct fwk_module_config config_f_uart3 = { static const struct mod_log_config log_data = { .device_id = FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_F_UART3, 0), .api_id = FWK_ID_API_INIT(FWK_MODULE_IDX_F_UART3, 0), - .log_groups = MOD_LOG_GROUP_ERROR | MOD_LOG_GROUP_INFO | - MOD_LOG_GROUP_WARNING | MOD_LOG_GROUP_DEBUG, .banner = - FWK_BANNER_SCP FWK_BANNER_ROM_FIRMWARE BUILD_VERSION_DESCRIBE_STRING - "\n", + FWK_BANNER_SCP FWK_BANNER_ROM_FIRMWARE BUILD_VERSION_DESCRIBE_STRING, }; struct fwk_module_config config_log = { |