From 78cdd7d0c8d890f35786adf568df073c62df9ace Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sat, 18 Jul 2015 05:58:44 +0200 Subject: ddr: altera: Clean up rw_mgr_mem_calibrate_vfifo_end() This function is implementing the DDR calibration Stage 3 as described in Altera EMI_RM 2015.05.04 . The main body of this function is almost identical to Stage 1.3 (DQ/DQS centering) for all but two flags -- use_read_test and update_fom. Convert this function to call rw_mgr_mem_calibrate_dq_dqs_centering() with the correct flags set to trim down the code duplication. Moreover, reorder the remnants in the function a little and convert the function to return either 0 or -EIO in case of success and failure respectively, to match the common return value convention. Signed-off-by: Marek Vasut --- drivers/ddr/altera/sequencer.c | 59 +++++++++++++++--------------------------- 1 file changed, 21 insertions(+), 38 deletions(-) diff --git a/drivers/ddr/altera/sequencer.c b/drivers/ddr/altera/sequencer.c index 6ae8a654ed..2baf77dd77 100644 --- a/drivers/ddr/altera/sequencer.c +++ b/drivers/ddr/altera/sequencer.c @@ -2788,51 +2788,34 @@ cal_done_ok: return 1; } -/* VFIFO Calibration -- Read Deskew Calibration after write deskew */ -static uint32_t rw_mgr_mem_calibrate_vfifo_end(uint32_t read_group, - uint32_t test_bgn) +/** + * rw_mgr_mem_calibrate_vfifo_end() - DQ/DQS Centering. + * @rw_group: Read/Write Group + * @test_bgn: Rank at which the test begins + * + * Stage 3: DQ/DQS Centering. + * + * This function implements UniPHY calibration Stage 3, as explained in + * detail in Altera EMI_RM 2015.05.04 , "UniPHY Calibration Stages". + */ +static int rw_mgr_mem_calibrate_vfifo_end(const u32 rw_group, + const u32 test_bgn) { - uint32_t rank_bgn, sr; - uint32_t grp_calibrated; - uint32_t write_group; - - debug("%s:%d %u %u", __func__, __LINE__, read_group, test_bgn); + int ret; - /* update info for sims */ + debug("%s:%d %u %u", __func__, __LINE__, rw_group, test_bgn); + /* Update info for sims. */ + reg_file_set_group(rw_group); reg_file_set_stage(CAL_STAGE_VFIFO_AFTER_WRITES); reg_file_set_sub_stage(CAL_SUBSTAGE_VFIFO_CENTER); - write_group = read_group; - - /* update info for sims */ - reg_file_set_group(read_group); - - grp_calibrated = 1; - /* Read per-bit deskew can be done on a per shadow register basis */ - for (rank_bgn = 0, sr = 0; rank_bgn < RW_MGR_MEM_NUMBER_OF_RANKS; - rank_bgn += NUM_RANKS_PER_SHADOW_REG, ++sr) { - /* Determine if this set of ranks should be skipped entirely */ - if (!param->skip_shadow_regs[sr]) { - /* This is the last calibration round, update FOM here */ - if (rw_mgr_mem_calibrate_vfifo_center(rank_bgn, - read_group, - test_bgn, 0, - 1)) { - grp_calibrated = 0; - } - } - } - - - if (grp_calibrated == 0) { - set_failing_group_stage(write_group, + ret = rw_mgr_mem_calibrate_dq_dqs_centering(rw_group, test_bgn, 0, 1); + if (ret) + set_failing_group_stage(rw_group, CAL_STAGE_VFIFO_AFTER_WRITES, CAL_SUBSTAGE_VFIFO_CENTER); - return 0; - } - - return 1; + return ret; } /* Calibrate LFIFO to find smallest read latency */ @@ -3483,7 +3466,7 @@ static uint32_t mem_calibrate(void) if (STATIC_CALIB_STEPS & CALIB_SKIP_WRITES) continue; - if (rw_mgr_mem_calibrate_vfifo_end(read_group, + if (!rw_mgr_mem_calibrate_vfifo_end(read_group, read_test_bgn)) continue; -- cgit