Yu-Ping Wu has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/35846 )
Change subject: soc/mediatek/mt8183: Change argument type of mt_set_emi ......................................................................
soc/mediatek/mt8183: Change argument type of mt_set_emi
Since struct dramc_param has been defined, we can pass the struct directly from mt_mem_init().
BUG=b:139099592 BRANCH=none TEST=emerge-kukui coreboot
Change-Id: If7333fb579eff76dd9d1c2bf6fdfe7eccb22050f Signed-off-by: Yu-Ping Wu yupingso@chromium.org --- M src/soc/mediatek/mt8183/emi.c M src/soc/mediatek/mt8183/include/soc/emi.h M src/soc/mediatek/mt8183/memory.c 3 files changed, 11 insertions(+), 9 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/46/35846/1
diff --git a/src/soc/mediatek/mt8183/emi.c b/src/soc/mediatek/mt8183/emi.c index 3b5b2a7..52baeb1 100644 --- a/src/soc/mediatek/mt8183/emi.c +++ b/src/soc/mediatek/mt8183/emi.c @@ -14,10 +14,11 @@ */
#include <device/mmio.h> -#include <soc/emi.h> -#include <soc/infracfg.h> +#include <soc/dramc_param.h> #include <soc/dramc_pi_api.h> #include <soc/dramc_register.h> +#include <soc/emi.h> +#include <soc/infracfg.h>
static const u8 freq_shuffle[DRAM_DFS_SHUFFLE_MAX] = { [DRAM_DFS_SHUFFLE_1] = LP4X_DDR3200, @@ -355,7 +356,7 @@ dramc_runtime_config(); }
-void mt_set_emi(const struct sdram_params *freq_params) +void mt_set_emi(const struct dramc_param *dparam) { const u8 *freq_tbl; const int shuffle = DRAM_DFS_SHUFFLE_1; @@ -368,7 +369,7 @@ freq_tbl = freq_shuffle;
current_freqsel = freq_tbl[shuffle]; - params = &freq_params[shuffle]; + params = &dparam->freq_params[shuffle];
init_dram(params, current_freqsel); do_calib(params, current_freqsel); diff --git a/src/soc/mediatek/mt8183/include/soc/emi.h b/src/soc/mediatek/mt8183/include/soc/emi.h index 7957753..d9b2d94 100644 --- a/src/soc/mediatek/mt8183/include/soc/emi.h +++ b/src/soc/mediatek/mt8183/include/soc/emi.h @@ -70,6 +70,8 @@ u16 delay_cell_unit; };
+struct dramc_param; + enum { LP4X_DDR1600, LP4X_DDR2400, @@ -84,6 +86,6 @@ size_t sdram_size(void); const struct sdram_params *get_sdram_config(void); void enable_emi_dcm(void); -void mt_set_emi(const struct sdram_params *freq_params); +void mt_set_emi(const struct dramc_param *dparam);
#endif /* SOC_MEDIATEK_MT8183_EMI_H */ diff --git a/src/soc/mediatek/mt8183/memory.c b/src/soc/mediatek/mt8183/memory.c index 038424c..9d53dc8 100644 --- a/src/soc/mediatek/mt8183/memory.c +++ b/src/soc/mediatek/mt8183/memory.c @@ -125,7 +125,6 @@ void mt_mem_init(struct dramc_param_ops *dparam_ops) { struct dramc_param *dparam = &dparam_ops->param; - struct sdram_params *freq_params = dparam->freq_params;
u16 config = 0; if (CONFIG(MT8183_DRAM_EMCP)) @@ -136,7 +135,7 @@ if (dram_run_fast_calibration(dparam, config) == 0) { printk(BIOS_INFO, "DRAM calibraion params loaded from flash\n"); - mt_set_emi(freq_params); + mt_set_emi(dparam); mt_mem_test(); return; } @@ -161,7 +160,7 @@ "falling back to load default sdram param\n", err);
/* Init params from sdram configs and run partial calibration */ - init_sdram_params(freq_params, get_sdram_config()); - mt_set_emi(freq_params); + init_sdram_params(dparam->freq_params, get_sdram_config()); + mt_set_emi(dparam); mt_mem_test(); }
Hello Julius Werner, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/35846
to look at the new patch set (#3).
Change subject: soc/mediatek/mt8183: Change argument type of mt_set_emi ......................................................................
soc/mediatek/mt8183: Change argument type of mt_set_emi
Since struct dramc_param has been defined, we can pass the struct directly from mt_mem_init().
BUG=b:139099592 BRANCH=none TEST=emerge-kukui coreboot
Change-Id: If7333fb579eff76dd9d1c2bf6fdfe7eccb22050f Signed-off-by: Yu-Ping Wu yupingso@chromium.org --- M src/soc/mediatek/mt8183/emi.c M src/soc/mediatek/mt8183/include/soc/emi.h M src/soc/mediatek/mt8183/memory.c 3 files changed, 10 insertions(+), 9 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/46/35846/3
Hello Julius Werner, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/35846
to look at the new patch set (#5).
Change subject: soc/mediatek/mt8183: Change argument type of mt_set_emi ......................................................................
soc/mediatek/mt8183: Change argument type of mt_set_emi
Since struct dramc_param has been defined, we can pass the struct directly from mt_mem_init().
BUG=b:139099592 BRANCH=none TEST=emerge-kukui coreboot
Change-Id: If7333fb579eff76dd9d1c2bf6fdfe7eccb22050f Signed-off-by: Yu-Ping Wu yupingso@chromium.org --- M src/soc/mediatek/mt8183/emi.c M src/soc/mediatek/mt8183/include/soc/emi.h M src/soc/mediatek/mt8183/memory.c 3 files changed, 10 insertions(+), 9 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/46/35846/5
Hung-Te Lin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35846 )
Change subject: soc/mediatek/mt8183: Change argument type of mt_set_emi ......................................................................
Patch Set 6: Code-Review+2
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/35846 )
Change subject: soc/mediatek/mt8183: Change argument type of mt_set_emi ......................................................................
soc/mediatek/mt8183: Change argument type of mt_set_emi
Since struct dramc_param has been defined, we can pass the struct directly from mt_mem_init().
BUG=b:139099592 BRANCH=none TEST=emerge-kukui coreboot
Change-Id: If7333fb579eff76dd9d1c2bf6fdfe7eccb22050f Signed-off-by: Yu-Ping Wu yupingso@chromium.org Reviewed-on: https://review.coreboot.org/c/coreboot/+/35846 Reviewed-by: Hung-Te Lin hungte@chromium.org Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/soc/mediatek/mt8183/emi.c M src/soc/mediatek/mt8183/include/soc/emi.h M src/soc/mediatek/mt8183/memory.c 3 files changed, 10 insertions(+), 9 deletions(-)
Approvals: build bot (Jenkins): Verified Hung-Te Lin: Looks good to me, approved
diff --git a/src/soc/mediatek/mt8183/emi.c b/src/soc/mediatek/mt8183/emi.c index 3b5b2a7..52baeb1 100644 --- a/src/soc/mediatek/mt8183/emi.c +++ b/src/soc/mediatek/mt8183/emi.c @@ -14,10 +14,11 @@ */
#include <device/mmio.h> -#include <soc/emi.h> -#include <soc/infracfg.h> +#include <soc/dramc_param.h> #include <soc/dramc_pi_api.h> #include <soc/dramc_register.h> +#include <soc/emi.h> +#include <soc/infracfg.h>
static const u8 freq_shuffle[DRAM_DFS_SHUFFLE_MAX] = { [DRAM_DFS_SHUFFLE_1] = LP4X_DDR3200, @@ -355,7 +356,7 @@ dramc_runtime_config(); }
-void mt_set_emi(const struct sdram_params *freq_params) +void mt_set_emi(const struct dramc_param *dparam) { const u8 *freq_tbl; const int shuffle = DRAM_DFS_SHUFFLE_1; @@ -368,7 +369,7 @@ freq_tbl = freq_shuffle;
current_freqsel = freq_tbl[shuffle]; - params = &freq_params[shuffle]; + params = &dparam->freq_params[shuffle];
init_dram(params, current_freqsel); do_calib(params, current_freqsel); diff --git a/src/soc/mediatek/mt8183/include/soc/emi.h b/src/soc/mediatek/mt8183/include/soc/emi.h index 624c0a4..2821511 100644 --- a/src/soc/mediatek/mt8183/include/soc/emi.h +++ b/src/soc/mediatek/mt8183/include/soc/emi.h @@ -71,6 +71,7 @@ u16 delay_cell_unit; };
+struct dramc_param; struct dramc_param_ops;
enum { @@ -87,7 +88,7 @@ size_t sdram_size(void); const struct sdram_params *get_sdram_config(void); void enable_emi_dcm(void); -void mt_set_emi(const struct sdram_params *freq_params); +void mt_set_emi(const struct dramc_param *dparam); void mt_mem_init(struct dramc_param_ops *dparam_ops);
#endif /* SOC_MEDIATEK_MT8183_EMI_H */ diff --git a/src/soc/mediatek/mt8183/memory.c b/src/soc/mediatek/mt8183/memory.c index c2ddb99..19f7326 100644 --- a/src/soc/mediatek/mt8183/memory.c +++ b/src/soc/mediatek/mt8183/memory.c @@ -137,7 +137,6 @@ void mt_mem_init(struct dramc_param_ops *dparam_ops) { struct dramc_param *dparam = dparam_ops->param; - struct sdram_params *freq_params = dparam->freq_params;
u16 config = 0; if (CONFIG(MT8183_DRAM_EMCP)) @@ -148,7 +147,7 @@ if (dram_run_fast_calibration(dparam, config) == 0) { printk(BIOS_INFO, "DRAM calibraion params loaded from flash\n"); - mt_set_emi(freq_params); + mt_set_emi(dparam); mt_mem_test(); return; } @@ -174,7 +173,7 @@ "falling back to load default sdram param\n", err);
/* Init params from sdram configs and run partial calibration */ - init_sdram_params(freq_params, get_sdram_config()); - mt_set_emi(freq_params); + init_sdram_params(dparam->freq_params, get_sdram_config()); + mt_set_emi(dparam); mt_mem_test(); }
-
Hung-Te Lin (Code Review) -
Patrick Georgi (Code Review)
-
Yu-Ping Wu (Code Review)