ddr: marvell: a38x: debug: Allow compiling with immutable debug settings to reduce binary size

Allow compiling with immutable debug settings:
- DEBUG_LEVEL is always set to DEBUG_LEVEL_ERROR
- register dumps are disabled

This can save around 10 KiB of space in the resulting binary, which is a
lot in U-Boot SPL.

Signed-off-by: Marek Behún <kabel@kernel.org>
This commit is contained in:
Marek Behún 2024-06-18 17:34:28 +02:00 committed by Stefan Roese
parent 411e71f7df
commit 259556e5aa
4 changed files with 53 additions and 11 deletions

View file

@ -250,6 +250,16 @@ config DDR_LOG_LEVEL
At level 3, rovides the windows margin of each DQ as a results of At level 3, rovides the windows margin of each DQ as a results of
DQS centeralization. DQS centeralization.
config DDR_IMMUTABLE_DEBUG_SETTINGS
bool "Immutable DDR debug level (always DEBUG_LEVEL_ERROR)"
depends on ARMADA_38X
help
Makes the DDR training code debug level settings immutable.
The debug level setting from board topology definition is ignored.
The debug level is always set to DEBUG_LEVEL_ERROR and register
dumps are disabled.
This can save around 10 KiB of space in SPL binary.
config DDR_RESET_ON_TRAINING_FAILURE config DDR_RESET_ON_TRAINING_FAILURE
bool "Reset the board on DDR training failure instead of hanging" bool "Reset the board on DDR training failure instead of hanging"
depends on ARMADA_38X || ARMADA_XP depends on ARMADA_38X || ARMADA_XP

View file

@ -7,18 +7,21 @@
#include "mv_ddr_training_db.h" #include "mv_ddr_training_db.h"
#include "mv_ddr_regs.h" #include "mv_ddr_regs.h"
#if !defined(CONFIG_DDR_IMMUTABLE_DEBUG_SETTINGS)
u8 is_reg_dump = 0; u8 is_reg_dump = 0;
u8 debug_pbs = DEBUG_LEVEL_ERROR; u8 debug_pbs = DEBUG_LEVEL_ERROR;
#endif
/* /*
* API to change flags outside of the lib * API to change flags outside of the lib
*/ */
#if defined(SILENT_LIB) #if defined(SILENT_LIB) || defined(CONFIG_DDR_IMMUTABLE_DEBUG_SETTINGS)
void ddr3_hws_set_log_level(enum ddr_lib_debug_block block, u8 level) void ddr3_hws_set_log_level(enum ddr_lib_debug_block block, u8 level)
{ {
/* do nothing */ /* do nothing */
} }
#else /* SILENT_LIB */ #else /* !SILENT_LIB && !CONFIG_DDR_IMMUTABLE_DEBUG_SETTINGS */
/* Debug flags for other Training modules */ /* Debug flags for other Training modules */
u8 debug_training_static = DEBUG_LEVEL_ERROR; u8 debug_training_static = DEBUG_LEVEL_ERROR;
u8 debug_training = DEBUG_LEVEL_ERROR; u8 debug_training = DEBUG_LEVEL_ERROR;
@ -104,7 +107,7 @@ void ddr3_hws_set_log_level(enum ddr_lib_debug_block block, u8 level)
#endif /* CONFIG_DDR4 */ #endif /* CONFIG_DDR4 */
} }
} }
#endif /* SILENT_LIB */ #endif /* !SILENT_LIB && !CONFIG_DDR_IMMUTABLE_DEBUG_SETTINGS */
#if defined(DDR_VIEWER_TOOL) #if defined(DDR_VIEWER_TOOL)
static char *convert_freq(enum mv_ddr_freq freq); static char *convert_freq(enum mv_ddr_freq freq);

View file

@ -41,7 +41,8 @@ int ddr3_init(void)
mv_ddr_pre_training_soc_config(ddr_type); mv_ddr_pre_training_soc_config(ddr_type);
/* Set log level for training library */ /* Set log level for training library */
mv_ddr_user_log_level_set(DEBUG_BLOCK_ALL); if (!IS_ENABLED(CONFIG_DDR_IMMUTABLE_DEBUG_SETTINGS))
mv_ddr_user_log_level_set(DEBUG_BLOCK_ALL);
mv_ddr_early_init(); mv_ddr_early_init();

View file

@ -45,15 +45,46 @@ enum log_level {
#define MISL_PHY_ODT_N_OFFS 0x0 #define MISL_PHY_ODT_N_OFFS 0x0
/* Globals */ /* Globals */
extern u8 debug_training, debug_calibration, debug_ddr4_centralization, #if defined(CONFIG_DDR_IMMUTABLE_DEBUG_SETTINGS)
debug_tap_tuning, debug_dm_tuning; static const u8 is_reg_dump = 0;
static const u8 debug_training_static = DEBUG_LEVEL_ERROR;
static const u8 debug_training = DEBUG_LEVEL_ERROR;
static const u8 debug_leveling = DEBUG_LEVEL_ERROR;
static const u8 debug_centralization = DEBUG_LEVEL_ERROR;
static const u8 debug_training_ip = DEBUG_LEVEL_ERROR;
static const u8 debug_training_bist = DEBUG_LEVEL_ERROR;
static const u8 debug_training_hw_alg = DEBUG_LEVEL_ERROR;
static const u8 debug_training_access = DEBUG_LEVEL_ERROR;
static const u8 debug_training_device = DEBUG_LEVEL_ERROR;
static const u8 debug_pbs = DEBUG_LEVEL_ERROR;
static const u8 debug_tap_tuning = DEBUG_LEVEL_ERROR;
static const u8 debug_calibration = DEBUG_LEVEL_ERROR;
static const u8 debug_ddr4_centralization = DEBUG_LEVEL_ERROR;
static const u8 debug_dm_tuning = DEBUG_LEVEL_ERROR;
#else /* !CONFIG_DDR_IMMUTABLE_DEBUG_SETTINGS */
extern u8 is_reg_dump; extern u8 is_reg_dump;
extern u8 debug_training_static;
extern u8 debug_training;
extern u8 debug_leveling;
extern u8 debug_centralization;
extern u8 debug_training_ip;
extern u8 debug_training_bist;
extern u8 debug_training_hw_alg;
extern u8 debug_training_access;
extern u8 debug_training_device;
extern u8 debug_pbs;
extern u8 debug_tap_tuning;
extern u8 debug_calibration;
extern u8 debug_ddr4_centralization;
extern u8 debug_dm_tuning;
#endif /* !CONFIG_DDR_IMMUTABLE_DEBUG_SETTINGS */
extern u8 generic_init_controller; extern u8 generic_init_controller;
/* list of allowed frequency listed in order of enum mv_ddr_freq */ /* list of allowed frequency listed in order of enum mv_ddr_freq */
extern u32 is_pll_old; extern u32 is_pll_old;
extern struct pattern_info pattern_table[]; extern struct pattern_info pattern_table[];
extern u8 debug_centralization, debug_training_ip, debug_training_bist,
debug_pbs, debug_training_static, debug_leveling;
extern struct hws_tip_config_func_db config_func_info[]; extern struct hws_tip_config_func_db config_func_info[];
extern u8 twr_mask_table[]; extern u8 twr_mask_table[];
extern u8 cl_mask_table[]; extern u8 cl_mask_table[];
@ -76,7 +107,6 @@ extern u32 g_rtt_nom;
extern u32 g_rtt_wr; extern u32 g_rtt_wr;
extern u32 g_rtt_park; extern u32 g_rtt_park;
extern u8 debug_training_access;
extern u32 first_active_if; extern u32 first_active_if;
extern u32 delay_enable, ck_delay, ca_delay; extern u32 delay_enable, ck_delay, ca_delay;
extern u32 mask_tune_func; extern u32 mask_tune_func;
@ -122,8 +152,6 @@ extern u32 effective_cs;
extern int ddr3_tip_centr_skip_min_win_check; extern int ddr3_tip_centr_skip_min_win_check;
extern u32 *dq_map_table; extern u32 *dq_map_table;
extern u8 debug_training_hw_alg;
extern u32 start_xsb_offset; extern u32 start_xsb_offset;
extern u32 odt_config; extern u32 odt_config;