aboutsummaryrefslogtreecommitdiff
path: root/product/synquacer
diff options
context:
space:
mode:
authorChris Kay <chris.kay@arm.com>2020-01-10 15:08:26 +0000
committerjimqui01 <54316584+jimqui01@users.noreply.github.com>2020-03-24 17:52:55 +0000
commit33b85df623d4032e790db2f366950f713b33a4f0 (patch)
treed1e04802c7014842a8a7beb8d5dd0fe4e0b6bc17 /product/synquacer
parent819690283526d1d768dcea49b47bdb51c1de6e55 (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/synquacer')
-rw-r--r--product/synquacer/module/ccn512/src/mod_ccn512.c18
-rw-r--r--product/synquacer/module/f_i2c/src/i2c_depend.c5
-rw-r--r--product/synquacer/module/hsspi/src/hsspi_api.c3
-rw-r--r--product/synquacer/module/hsspi/src/hsspi_driver.c10
-rw-r--r--product/synquacer/module/ppu_v0_synquacer/src/mod_ppu_v0.c42
-rw-r--r--product/synquacer/module/scmi_vendor_ext/src/mod_scmi_vendor_ext.c19
-rw-r--r--product/synquacer/module/synquacer_memc/include/ddr_init.h6
-rw-r--r--product/synquacer/module/synquacer_memc/src/ddr_init.c65
-rw-r--r--product/synquacer/module/synquacer_memc/src/mod_synquacer_memc.c8
-rw-r--r--product/synquacer/module/synquacer_memc/src/synquacer_ddr.c92
-rw-r--r--product/synquacer/module/synquacer_rom/src/mod_synquacer_rom.c23
-rw-r--r--product/synquacer/module/synquacer_system/include/mod_synquacer_system.h3
-rw-r--r--product/synquacer/module/synquacer_system/src/gpio.c62
-rw-r--r--product/synquacer/module/synquacer_system/src/load_secure_fw.c29
-rw-r--r--product/synquacer/module/synquacer_system/src/mmu500.c10
-rw-r--r--product/synquacer/module/synquacer_system/src/mod_synquacer_system.c19
-rw-r--r--product/synquacer/module/synquacer_system/src/nic400.c6
-rw-r--r--product/synquacer/module/synquacer_system/src/smmu_config.c6
-rw-r--r--product/synquacer/module/synquacer_system/src/synquacer_main.c31
-rw-r--r--product/synquacer/module/synquacer_system/src/synquacer_pd_manage.c58
-rw-r--r--product/synquacer/module/synquacer_system/src/sysoc.c19
-rw-r--r--product/synquacer/module/synquacer_system/src/thermal_sensor.c15
-rw-r--r--product/synquacer/module/synquacer_system/src/transaction_sw.c11
-rw-r--r--product/synquacer/scp_ramfw/config_log_f_uart3.c5
-rw-r--r--product/synquacer/scp_ramfw/config_log_pl011.c6
-rw-r--r--product/synquacer/scp_ramfw/rtx_config.c18
-rw-r--r--product/synquacer/scp_romfw/config_log_f_uart3.c5
27 files changed, 184 insertions, 410 deletions
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 = {