]> git.sur5r.net Git - u-boot/blobdiff - drivers/ddr/altera/sequencer.c
ddr: altera: Internal mem_calibrate() cleanup part 2
[u-boot] / drivers / ddr / altera / sequencer.c
index 1718ebf1c49c03e3b12c20c6667939928584b08e..e2e7184ffffcbd060967125dd7ac14a26839e3b4 100644 (file)
@@ -13,8 +13,6 @@
 #include "sequencer_auto_inst_init.h"
 #include "sequencer_defines.h"
 
-static void scc_mgr_load_dqs_for_write_group(uint32_t write_group);
-
 static struct socfpga_sdr_rw_load_manager *sdr_rw_load_mgr_regs =
        (struct socfpga_sdr_rw_load_manager *)(SDR_PHYGRP_RWMGRGRP_ADDRESS | 0x800);
 
@@ -115,10 +113,17 @@ static void reg_file_set_sub_stage(u8 set_sub_stage)
        clrsetbits_le32(&sdr_reg_file->cur_stage, 0xff00, set_sub_stage << 8);
 }
 
-static void initialize(void)
+/**
+ * phy_mgr_initialize() - Initialize PHY Manager
+ *
+ * Initialize PHY Manager.
+ */
+static void phy_mgr_initialize(void)
 {
+       u32 ratio;
+
        debug("%s:%d\n", __func__, __LINE__);
-       /* USER calibration has control over path to memory */
+       /* Calibration has control over path to memory */
        /*
         * In Hard PHY this is a 2-bit control:
         * 0: AFI Mux Select
@@ -134,49 +139,55 @@ static void initialize(void)
 
        writel(0, &phy_mgr_cfg->cal_debug_info);
 
-       if ((dyn_calib_steps & CALIB_SKIP_ALL) != CALIB_SKIP_ALL) {
-               param->read_correct_mask_vg  = ((uint32_t)1 <<
-                       (RW_MGR_MEM_DQ_PER_READ_DQS /
-                       RW_MGR_MEM_VIRTUAL_GROUPS_PER_READ_DQS)) - 1;
-               param->write_correct_mask_vg = ((uint32_t)1 <<
-                       (RW_MGR_MEM_DQ_PER_READ_DQS /
-                       RW_MGR_MEM_VIRTUAL_GROUPS_PER_READ_DQS)) - 1;
-               param->read_correct_mask     = ((uint32_t)1 <<
-                       RW_MGR_MEM_DQ_PER_READ_DQS) - 1;
-               param->write_correct_mask    = ((uint32_t)1 <<
-                       RW_MGR_MEM_DQ_PER_WRITE_DQS) - 1;
-               param->dm_correct_mask       = ((uint32_t)1 <<
-                       (RW_MGR_MEM_DATA_WIDTH / RW_MGR_MEM_DATA_MASK_WIDTH))
-                       - 1;
-       }
+       /* Init params only if we do NOT skip calibration. */
+       if ((dyn_calib_steps & CALIB_SKIP_ALL) == CALIB_SKIP_ALL)
+               return;
+
+       ratio = RW_MGR_MEM_DQ_PER_READ_DQS /
+               RW_MGR_MEM_VIRTUAL_GROUPS_PER_READ_DQS;
+       param->read_correct_mask_vg = (1 << ratio) - 1;
+       param->write_correct_mask_vg = (1 << ratio) - 1;
+       param->read_correct_mask = (1 << RW_MGR_MEM_DQ_PER_READ_DQS) - 1;
+       param->write_correct_mask = (1 << RW_MGR_MEM_DQ_PER_WRITE_DQS) - 1;
+       ratio = RW_MGR_MEM_DATA_WIDTH /
+               RW_MGR_MEM_DATA_MASK_WIDTH;
+       param->dm_correct_mask = (1 << ratio) - 1;
 }
 
-static void set_rank_and_odt_mask(uint32_t rank, uint32_t odt_mode)
+/**
+ * set_rank_and_odt_mask() - Set Rank and ODT mask
+ * @rank:      Rank mask
+ * @odt_mode:  ODT mode, OFF or READ_WRITE
+ *
+ * Set Rank and ODT mask (On-Die Termination).
+ */
+static void set_rank_and_odt_mask(const u32 rank, const u32 odt_mode)
 {
-       uint32_t odt_mask_0 = 0;
-       uint32_t odt_mask_1 = 0;
-       uint32_t cs_and_odt_mask;
+       u32 odt_mask_0 = 0;
+       u32 odt_mask_1 = 0;
+       u32 cs_and_odt_mask;
 
-       if (odt_mode == RW_MGR_ODT_MODE_READ_WRITE) {
-               if (RW_MGR_MEM_NUMBER_OF_RANKS == 1) {
-                       /*
-                        * 1 Rank
-                        * Read: ODT = 0
-                        * Write: ODT = 1
-                        */
+       if (odt_mode == RW_MGR_ODT_MODE_OFF) {
+               odt_mask_0 = 0x0;
+               odt_mask_1 = 0x0;
+       } else {        /* RW_MGR_ODT_MODE_READ_WRITE */
+               switch (RW_MGR_MEM_NUMBER_OF_RANKS) {
+               case 1: /* 1 Rank */
+                       /* Read: ODT = 0 ; Write: ODT = 1 */
                        odt_mask_0 = 0x0;
                        odt_mask_1 = 0x1;
-               } else if (RW_MGR_MEM_NUMBER_OF_RANKS == 2) {
-                       /* 2 Ranks */
+                       break;
+               case 2: /* 2 Ranks */
                        if (RW_MGR_MEM_NUMBER_OF_CS_PER_DIMM == 1) {
-                               /* - Dual-Slot , Single-Rank
-                                * (1 chip-select per DIMM)
-                                * OR
-                                * - RDIMM, 4 total CS (2 CS per DIMM)
-                                * means 2 DIMM
-                                * Since MEM_NUMBER_OF_RANKS is 2 they are
-                                * both single rank
-                                * with 2 CS each (special for RDIMM)
+                               /*
+                                * - Dual-Slot , Single-Rank (1 CS per DIMM)
+                                *   OR
+                                * - RDIMM, 4 total CS (2 CS per DIMM, 2 DIMM)
+                                *
+                                * Since MEM_NUMBER_OF_RANKS is 2, they
+                                * are both single rank with 2 CS each
+                                * (special for RDIMM).
+                                *
                                 * Read: Turn on ODT on the opposite rank
                                 * Write: Turn on ODT on all ranks
                                 */
@@ -184,19 +195,18 @@ static void set_rank_and_odt_mask(uint32_t rank, uint32_t odt_mode)
                                odt_mask_1 = 0x3;
                        } else {
                                /*
-                                * USER - Single-Slot , Dual-rank DIMMs
-                                * (2 chip-selects per DIMM)
-                                * USER Read: Turn on ODT off on all ranks
-                                * USER Write: Turn on ODT on active rank
+                                * - Single-Slot , Dual-Rank (2 CS per DIMM)
+                                *
+                                * Read: Turn on ODT off on all ranks
+                                * Write: Turn on ODT on active rank
                                 */
                                odt_mask_0 = 0x0;
                                odt_mask_1 = 0x3 & (1 << rank);
                        }
-               } else {
-                       /* 4 Ranks
-                        * Read:
+                       break;
+               case 4: /* 4 Ranks */
+                       /* Read:
                         * ----------+-----------------------+
-                        *           |                       |
                         *           |         ODT           |
                         * Read From +-----------------------+
                         *   Rank    |  3  |  2  |  1  |  0  |
@@ -209,7 +219,6 @@ static void set_rank_and_odt_mask(uint32_t rank, uint32_t odt_mode)
                         *
                         * Write:
                         * ----------+-----------------------+
-                        *           |                       |
                         *           |         ODT           |
                         * Write To  +-----------------------+
                         *   Rank    |  3  |  2  |  1  |  0  |
@@ -238,16 +247,13 @@ static void set_rank_and_odt_mask(uint32_t rank, uint32_t odt_mode)
                                odt_mask_1 = 0xA;
                                break;
                        }
+                       break;
                }
-       } else {
-               odt_mask_0 = 0x0;
-               odt_mask_1 = 0x0;
        }
 
-       cs_and_odt_mask =
-               (0xFF & ~(1 << rank)) |
-               ((0xFF & odt_mask_0) << 8) |
-               ((0xFF & odt_mask_1) << 16);
+       cs_and_odt_mask = (0xFF & ~(1 << rank)) |
+                         ((0xFF & odt_mask_0) << 8) |
+                         ((0xFF & odt_mask_1) << 16);
        writel(cs_and_odt_mask, SDR_PHYGRP_RWMGRGRP_ADDRESS |
                                RW_MGR_SET_CS_AND_ODT_MASK_OFFSET);
 }
@@ -307,7 +313,7 @@ static void scc_mgr_set_dqs_en_delay(uint32_t read_group, uint32_t delay)
        scc_mgr_set(SCC_MGR_DQS_EN_DELAY_OFFSET, read_group, delay);
 }
 
-static void scc_mgr_set_dqs_io_in_delay(uint32_t write_group, uint32_t delay)
+static void scc_mgr_set_dqs_io_in_delay(uint32_t delay)
 {
        scc_mgr_set(SCC_MGR_IO_IN_DELAY_OFFSET, RW_MGR_MEM_DQ_PER_WRITE_DQS,
                    delay);
@@ -323,8 +329,7 @@ static void scc_mgr_set_dq_out1_delay(uint32_t dq_in_group, uint32_t delay)
        scc_mgr_set(SCC_MGR_IO_OUT1_DELAY_OFFSET, dq_in_group, delay);
 }
 
-static void scc_mgr_set_dqs_out1_delay(uint32_t write_group,
-                                             uint32_t delay)
+static void scc_mgr_set_dqs_out1_delay(uint32_t delay)
 {
        scc_mgr_set(SCC_MGR_IO_OUT1_DELAY_OFFSET, RW_MGR_MEM_DQ_PER_WRITE_DQS,
                    delay);
@@ -361,77 +366,64 @@ static void scc_mgr_load_dm(uint32_t dm)
        writel(dm, &sdr_scc_mgr->dm_ena);
 }
 
-static void scc_mgr_set_dqs_en_phase_all_ranks(uint32_t read_group,
-                                              uint32_t phase)
+/**
+ * scc_mgr_set_all_ranks() - Set SCC Manager register for all ranks
+ * @off:       Base offset in SCC Manager space
+ * @grp:       Read/Write group
+ * @val:       Value to be set
+ * @update:    If non-zero, trigger SCC Manager update for all ranks
+ *
+ * This function sets the SCC Manager (Scan Chain Control Manager) register
+ * and optionally triggers the SCC update for all ranks.
+ */
+static void scc_mgr_set_all_ranks(const u32 off, const u32 grp, const u32 val,
+                                 const int update)
 {
-       uint32_t r;
+       u32 r;
 
        for (r = 0; r < RW_MGR_MEM_NUMBER_OF_RANKS;
             r += NUM_RANKS_PER_SHADOW_REG) {
-               scc_mgr_set_dqs_en_phase(read_group, phase);
-
-               /*
-                * USER although the h/w doesn't support different phases per
-                * shadow register, for simplicity our scc manager modeling
-                * keeps different phase settings per shadow reg, and it's
-                * important for us to keep them in sync to match h/w.
-                * for efficiency, the scan chain update should occur only
-                * once to sr0.
-                */
+               scc_mgr_set(off, grp, val);
 
-               if (r == 0) {
-                       writel(read_group, &sdr_scc_mgr->dqs_ena);
+               if (update || (r == 0)) {
+                       writel(grp, &sdr_scc_mgr->dqs_ena);
                        writel(0, &sdr_scc_mgr->update);
                }
        }
 }
 
+static void scc_mgr_set_dqs_en_phase_all_ranks(u32 read_group, u32 phase)
+{
+       /*
+        * USER although the h/w doesn't support different phases per
+        * shadow register, for simplicity our scc manager modeling
+        * keeps different phase settings per shadow reg, and it's
+        * important for us to keep them in sync to match h/w.
+        * for efficiency, the scan chain update should occur only
+        * once to sr0.
+        */
+       scc_mgr_set_all_ranks(SCC_MGR_DQS_EN_PHASE_OFFSET,
+                             read_group, phase, 0);
+}
+
 static void scc_mgr_set_dqdqs_output_phase_all_ranks(uint32_t write_group,
                                                     uint32_t phase)
 {
-       uint32_t r;
-
-       for (r = 0; r < RW_MGR_MEM_NUMBER_OF_RANKS;
-            r += NUM_RANKS_PER_SHADOW_REG) {
-               scc_mgr_set_dqdqs_output_phase(write_group, phase);
-
-               /*
-                * USER although the h/w doesn't support different phases per
-                * shadow register, for simplicity our scc manager modeling
-                * keeps different phase settings per shadow reg, and it's
-                * important for us to keep them in sync to match h/w.
-                * for efficiency, the scan chain update should occur only
-                * once to sr0.
-                */
-
-               if (r == 0) {
-                       writel(write_group, &sdr_scc_mgr->dqs_ena);
-                       writel(0, &sdr_scc_mgr->update);
-               }
-       }
+       /*
+        * USER although the h/w doesn't support different phases per
+        * shadow register, for simplicity our scc manager modeling
+        * keeps different phase settings per shadow reg, and it's
+        * important for us to keep them in sync to match h/w.
+        * for efficiency, the scan chain update should occur only
+        * once to sr0.
+        */
+       scc_mgr_set_all_ranks(SCC_MGR_DQDQS_OUT_PHASE_OFFSET,
+                             write_group, phase, 0);
 }
 
 static void scc_mgr_set_dqs_en_delay_all_ranks(uint32_t read_group,
                                               uint32_t delay)
 {
-       uint32_t r;
-
-       for (r = 0; r < RW_MGR_MEM_NUMBER_OF_RANKS;
-               r += NUM_RANKS_PER_SHADOW_REG) {
-               scc_mgr_set_dqs_en_delay(read_group, delay);
-
-               /*
-                * In shadow register mode, the T11 settings are stored in
-                * registers in the core, which are updated by the DQS_ENA
-                * signals. Not issuing the SCC_MGR_UPD command allows us to
-                * save lots of rank switching overhead, by calling
-                * select_shadow_regs_for_update with update_scan_chains
-                * set to 0.
-                */
-
-               writel(read_group, &sdr_scc_mgr->dqs_ena);
-               writel(0, &sdr_scc_mgr->update);
-       }
        /*
         * In shadow register mode, the T11 settings are stored in
         * registers in the core, which are updated by the DQS_ENA
@@ -440,14 +432,24 @@ static void scc_mgr_set_dqs_en_delay_all_ranks(uint32_t read_group,
         * select_shadow_regs_for_update with update_scan_chains
         * set to 0.
         */
+       scc_mgr_set_all_ranks(SCC_MGR_DQS_EN_DELAY_OFFSET,
+                             read_group, delay, 1);
        writel(0, &sdr_scc_mgr->update);
 }
 
-static void scc_mgr_set_oct_out1_delay(uint32_t write_group, uint32_t delay)
+/**
+ * scc_mgr_set_oct_out1_delay() - Set OCT output delay
+ * @write_group:       Write group
+ * @delay:             Delay value
+ *
+ * This function sets the OCT output delay in SCC manager.
+ */
+static void scc_mgr_set_oct_out1_delay(const u32 write_group, const u32 delay)
 {
-       uint32_t read_group;
-       uint32_t addr = SDR_PHYGRP_SCCGRP_ADDRESS | SCC_MGR_OCT_OUT1_DELAY_OFFSET;
-
+       const int ratio = RW_MGR_MEM_IF_READ_DQS_WIDTH /
+                         RW_MGR_MEM_IF_WRITE_DQS_WIDTH;
+       const int base = write_group * ratio;
+       int i;
        /*
         * Load the setting in the SCC manager
         * Although OCT affects only write data, the OCT delay is controlled
@@ -455,44 +457,54 @@ static void scc_mgr_set_oct_out1_delay(uint32_t write_group, uint32_t delay)
         * For protocols where a write group consists of multiple read groups,
         * the setting must be set multiple times.
         */
-       for (read_group = write_group * RW_MGR_MEM_IF_READ_DQS_WIDTH /
-            RW_MGR_MEM_IF_WRITE_DQS_WIDTH;
-            read_group < (write_group + 1) * RW_MGR_MEM_IF_READ_DQS_WIDTH /
-            RW_MGR_MEM_IF_WRITE_DQS_WIDTH; ++read_group)
-               writel(delay, addr + (read_group << 2));
+       for (i = 0; i < ratio; i++)
+               scc_mgr_set(SCC_MGR_OCT_OUT1_DELAY_OFFSET, base + i, delay);
 }
 
+/**
+ * scc_mgr_set_hhp_extras() - Set HHP extras.
+ *
+ * Load the fixed setting in the SCC manager HHP extras.
+ */
 static void scc_mgr_set_hhp_extras(void)
 {
        /*
         * Load the fixed setting in the SCC manager
-        * bits: 0:0 = 1'b1   - dqs bypass
-        * bits: 1:1 = 1'b1   - dq bypass
-        * bits: 4:2 = 3'b001   - rfifo_mode
-        * bits: 6:5 = 2'b01  - rfifo clock_select
-        * bits: 7:7 = 1'b0  - separate gating from ungating setting
-        * bits: 8:8 = 1'b0  - separate OE from Output delay setting
+        * bits: 0:0 = 1'b1     - DQS bypass
+        * bits: 1:1 = 1'b1     - DQ bypass
+        * bits: 4:2 = 3'b001   - rfifo_mode
+        * bits: 6:5 = 2'b01    - rfifo clock_select
+        * bits: 7:7 = 1'b0     - separate gating from ungating setting
+        * bits: 8:8 = 1'b0     - separate OE from Output delay setting
         */
-       uint32_t value = (0<<8) | (0<<7) | (1<<5) | (1<<2) | (1<<1) | (1<<0);
-       uint32_t addr = SDR_PHYGRP_SCCGRP_ADDRESS | SCC_MGR_HHP_GLOBALS_OFFSET;
+       const u32 value = (0 << 8) | (0 << 7) | (1 << 5) |
+                         (1 << 2) | (1 << 1) | (1 << 0);
+       const u32 addr = SDR_PHYGRP_SCCGRP_ADDRESS |
+                        SCC_MGR_HHP_GLOBALS_OFFSET |
+                        SCC_MGR_HHP_EXTRAS_OFFSET;
 
-       writel(value, addr + SCC_MGR_HHP_EXTRAS_OFFSET);
+       debug_cond(DLEVEL == 1, "%s:%d Setting HHP Extras\n",
+                  __func__, __LINE__);
+       writel(value, addr);
+       debug_cond(DLEVEL == 1, "%s:%d Done Setting HHP Extras\n",
+                  __func__, __LINE__);
 }
 
-/*
- * USER Zero all DQS config
- * TODO: maybe rename to scc_mgr_zero_dqs_config (or something)
+/**
+ * scc_mgr_zero_all() - Zero all DQS config
+ *
+ * Zero all DQS config.
  */
 static void scc_mgr_zero_all(void)
 {
-       uint32_t i, r;
+       int i, r;
 
        /*
         * USER Zero all DQS config settings, across all groups and all
         * shadow registers
         */
-       for (r = 0; r < RW_MGR_MEM_NUMBER_OF_RANKS; r +=
-            NUM_RANKS_PER_SHADOW_REG) {
+       for (r = 0; r < RW_MGR_MEM_NUMBER_OF_RANKS;
+            r += NUM_RANKS_PER_SHADOW_REG) {
                for (i = 0; i < RW_MGR_MEM_IF_READ_DQS_WIDTH; i++) {
                        /*
                         * The phases actually don't exist on a per-rank basis,
@@ -506,97 +518,102 @@ static void scc_mgr_zero_all(void)
 
                for (i = 0; i < RW_MGR_MEM_IF_WRITE_DQS_WIDTH; i++) {
                        scc_mgr_set_dqdqs_output_phase(i, 0);
-                       /* av/cv don't have out2 */
+                       /* Arria V/Cyclone V don't have out2. */
                        scc_mgr_set_oct_out1_delay(i, IO_DQS_OUT_RESERVE);
                }
        }
 
-       /* multicast to all DQS group enables */
+       /* Multicast to all DQS group enables. */
        writel(0xff, &sdr_scc_mgr->dqs_ena);
        writel(0, &sdr_scc_mgr->update);
 }
 
-static void scc_set_bypass_mode(uint32_t write_group, uint32_t mode)
+/**
+ * scc_set_bypass_mode() - Set bypass mode and trigger SCC update
+ * @write_group:       Write group
+ *
+ * Set bypass mode and trigger SCC update.
+ */
+static void scc_set_bypass_mode(const u32 write_group)
 {
-       /* mode = 0 : Do NOT bypass - Half Rate Mode */
-       /* mode = 1 : Bypass - Full Rate Mode */
-
-       /* only need to set once for all groups, pins, dq, dqs, dm */
-       if (write_group == 0) {
-               debug_cond(DLEVEL == 1, "%s:%d Setting HHP Extras\n", __func__,
-                          __LINE__);
-               scc_mgr_set_hhp_extras();
-               debug_cond(DLEVEL == 1, "%s:%d Done Setting HHP Extras\n",
-                         __func__, __LINE__);
-       }
-       /* multicast to all DQ enables */
+       /* Multicast to all DQ enables. */
        writel(0xff, &sdr_scc_mgr->dq_ena);
        writel(0xff, &sdr_scc_mgr->dm_ena);
 
-       /* update current DQS IO enable */
+       /* Update current DQS IO enable. */
        writel(0, &sdr_scc_mgr->dqs_io_ena);
 
-       /* update the DQS logic */
+       /* Update the DQS logic. */
        writel(write_group, &sdr_scc_mgr->dqs_ena);
 
-       /* hit update */
+       /* Hit update. */
        writel(0, &sdr_scc_mgr->update);
 }
 
-static void scc_mgr_load_dqs_for_write_group(uint32_t write_group)
+/**
+ * scc_mgr_load_dqs_for_write_group() - Load DQS settings for Write Group
+ * @write_group:       Write group
+ *
+ * Load DQS settings for Write Group, do not trigger SCC update.
+ */
+static void scc_mgr_load_dqs_for_write_group(const u32 write_group)
 {
-       uint32_t read_group;
-       uint32_t addr = (u32)&sdr_scc_mgr->dqs_ena;
+       const int ratio = RW_MGR_MEM_IF_READ_DQS_WIDTH /
+                         RW_MGR_MEM_IF_WRITE_DQS_WIDTH;
+       const int base = write_group * ratio;
+       int i;
        /*
+        * Load the setting in the SCC manager
         * Although OCT affects only write data, the OCT delay is controlled
         * by the DQS logic block which is instantiated once per read group.
         * For protocols where a write group consists of multiple read groups,
-        * the setting must be scanned multiple times.
+        * the setting must be set multiple times.
         */
-       for (read_group = write_group * RW_MGR_MEM_IF_READ_DQS_WIDTH /
-            RW_MGR_MEM_IF_WRITE_DQS_WIDTH;
-            read_group < (write_group + 1) * RW_MGR_MEM_IF_READ_DQS_WIDTH /
-            RW_MGR_MEM_IF_WRITE_DQS_WIDTH; ++read_group)
-               writel(read_group, addr);
+       for (i = 0; i < ratio; i++)
+               writel(base + i, &sdr_scc_mgr->dqs_ena);
 }
 
-static void scc_mgr_zero_group(uint32_t write_group, uint32_t test_begin,
-                              int32_t out_only)
+/**
+ * scc_mgr_zero_group() - Zero all configs for a group
+ *
+ * Zero DQ, DM, DQS and OCT configs for a group.
+ */
+static void scc_mgr_zero_group(const u32 write_group, const int out_only)
 {
-       uint32_t i, r;
+       int i, r;
 
-       for (r = 0; r < RW_MGR_MEM_NUMBER_OF_RANKS; r +=
-               NUM_RANKS_PER_SHADOW_REG) {
-               /* Zero all DQ config settings */
+       for (r = 0; r < RW_MGR_MEM_NUMBER_OF_RANKS;
+            r += NUM_RANKS_PER_SHADOW_REG) {
+               /* Zero all DQ config settings. */
                for (i = 0; i < RW_MGR_MEM_DQ_PER_WRITE_DQS; i++) {
                        scc_mgr_set_dq_out1_delay(i, 0);
                        if (!out_only)
                                scc_mgr_set_dq_in_delay(i, 0);
                }
 
-               /* multicast to all DQ enables */
+               /* Multicast to all DQ enables. */
                writel(0xff, &sdr_scc_mgr->dq_ena);
 
-               /* Zero all DM config settings */
-               for (i = 0; i < RW_MGR_NUM_DM_PER_WRITE_GROUP; i++) {
+               /* Zero all DM config settings. */
+               for (i = 0; i < RW_MGR_NUM_DM_PER_WRITE_GROUP; i++)
                        scc_mgr_set_dm_out1_delay(i, 0);
-               }
 
-               /* multicast to all DM enables */
+               /* Multicast to all DM enables. */
                writel(0xff, &sdr_scc_mgr->dm_ena);
 
-               /* zero all DQS io settings */
+               /* Zero all DQS IO settings. */
                if (!out_only)
-                       scc_mgr_set_dqs_io_in_delay(write_group, 0);
-               /* av/cv don't have out2 */
-               scc_mgr_set_dqs_out1_delay(write_group, IO_DQS_OUT_RESERVE);
+                       scc_mgr_set_dqs_io_in_delay(0);
+
+               /* Arria V/Cyclone V don't have out2. */
+               scc_mgr_set_dqs_out1_delay(IO_DQS_OUT_RESERVE);
                scc_mgr_set_oct_out1_delay(write_group, IO_DQS_OUT_RESERVE);
                scc_mgr_load_dqs_for_write_group(write_group);
 
-               /* multicast to all DQS IO enables (only 1) */
+               /* Multicast to all DQS IO enables (only 1 in total). */
                writel(0, &sdr_scc_mgr->dqs_io_ena);
 
-               /* hit update to zero everything */
+               /* Hit update to zero everything. */
                writel(0, &sdr_scc_mgr->update);
        }
 }
@@ -605,8 +622,7 @@ static void scc_mgr_zero_group(uint32_t write_group, uint32_t test_begin,
  * apply and load a particular input delay for the DQ pins in a group
  * group_bgn is the index of the first dq pin (in the write group)
  */
-static void scc_mgr_apply_group_dq_in_delay(uint32_t write_group,
-                                           uint32_t group_bgn, uint32_t delay)
+static void scc_mgr_apply_group_dq_in_delay(uint32_t group_bgn, uint32_t delay)
 {
        uint32_t i, p;
 
@@ -616,22 +632,24 @@ static void scc_mgr_apply_group_dq_in_delay(uint32_t write_group,
        }
 }
 
-/* apply and load a particular output delay for the DQ pins in a group */
-static void scc_mgr_apply_group_dq_out1_delay(uint32_t write_group,
-                                             uint32_t group_bgn,
-                                             uint32_t delay1)
+/**
+ * scc_mgr_apply_group_dq_out1_delay() - Apply and load an output delay for the DQ pins in a group
+ * @delay:             Delay value
+ *
+ * Apply and load a particular output delay for the DQ pins in a group.
+ */
+static void scc_mgr_apply_group_dq_out1_delay(const u32 delay)
 {
-       uint32_t i, p;
+       int i;
 
-       for (i = 0, p = group_bgn; i < RW_MGR_MEM_DQ_PER_WRITE_DQS; i++, p++) {
-               scc_mgr_set_dq_out1_delay(i, delay1);
+       for (i = 0; i < RW_MGR_MEM_DQ_PER_WRITE_DQS; i++) {
+               scc_mgr_set_dq_out1_delay(i, delay);
                scc_mgr_load_dq(i);
        }
 }
 
 /* apply and load a particular output delay for the DM pins in a group */
-static void scc_mgr_apply_group_dm_out1_delay(uint32_t write_group,
-                                             uint32_t delay1)
+static void scc_mgr_apply_group_dm_out1_delay(uint32_t delay1)
 {
        uint32_t i;
 
@@ -646,114 +664,94 @@ static void scc_mgr_apply_group_dm_out1_delay(uint32_t write_group,
 static void scc_mgr_apply_group_dqs_io_and_oct_out1(uint32_t write_group,
                                                    uint32_t delay)
 {
-       scc_mgr_set_dqs_out1_delay(write_group, delay);
+       scc_mgr_set_dqs_out1_delay(delay);
        scc_mgr_load_dqs_io();
 
        scc_mgr_set_oct_out1_delay(write_group, delay);
        scc_mgr_load_dqs_for_write_group(write_group);
 }
 
-/* apply a delay to the entire output side: DQ, DM, DQS, OCT */
-static void scc_mgr_apply_group_all_out_delay_add(uint32_t write_group,
-                                                 uint32_t group_bgn,
-                                                 uint32_t delay)
+/**
+ * scc_mgr_apply_group_all_out_delay_add() - Apply a delay to the entire output side: DQ, DM, DQS, OCT
+ * @write_group:       Write group
+ * @delay:             Delay value
+ *
+ * Apply a delay to the entire output side: DQ, DM, DQS, OCT.
+ */
+static void scc_mgr_apply_group_all_out_delay_add(const u32 write_group,
+                                                 const u32 delay)
 {
-       uint32_t i, p, new_delay;
-
-       /* dq shift */
-       for (i = 0, p = group_bgn; i < RW_MGR_MEM_DQ_PER_WRITE_DQS; i++, p++) {
-               new_delay = READ_SCC_DQ_OUT2_DELAY;
-               new_delay += delay;
-
-               if (new_delay > IO_IO_OUT2_DELAY_MAX) {
-                       debug_cond(DLEVEL == 1, "%s:%d (%u, %u, %u) DQ[%u,%u]:\
-                                  %u > %lu => %lu", __func__, __LINE__,
-                                  write_group, group_bgn, delay, i, p, new_delay,
-                                  (long unsigned int)IO_IO_OUT2_DELAY_MAX,
-                                  (long unsigned int)IO_IO_OUT2_DELAY_MAX);
-                       new_delay = IO_IO_OUT2_DELAY_MAX;
-               }
+       u32 i, new_delay;
 
+       /* DQ shift */
+       for (i = 0; i < RW_MGR_MEM_DQ_PER_WRITE_DQS; i++)
                scc_mgr_load_dq(i);
-       }
-
-       /* dm shift */
-       for (i = 0; i < RW_MGR_NUM_DM_PER_WRITE_GROUP; i++) {
-               new_delay = READ_SCC_DM_IO_OUT2_DELAY;
-               new_delay += delay;
-
-               if (new_delay > IO_IO_OUT2_DELAY_MAX) {
-                       debug_cond(DLEVEL == 1, "%s:%d (%u, %u, %u) DM[%u]:\
-                                  %u > %lu => %lu\n",  __func__, __LINE__,
-                                  write_group, group_bgn, delay, i, new_delay,
-                                  (long unsigned int)IO_IO_OUT2_DELAY_MAX,
-                                  (long unsigned int)IO_IO_OUT2_DELAY_MAX);
-                       new_delay = IO_IO_OUT2_DELAY_MAX;
-               }
 
+       /* DM shift */
+       for (i = 0; i < RW_MGR_NUM_DM_PER_WRITE_GROUP; i++)
                scc_mgr_load_dm(i);
-       }
-
-       /* dqs shift */
-       new_delay = READ_SCC_DQS_IO_OUT2_DELAY;
-       new_delay += delay;
 
+       /* DQS shift */
+       new_delay = READ_SCC_DQS_IO_OUT2_DELAY + delay;
        if (new_delay > IO_IO_OUT2_DELAY_MAX) {
-               debug_cond(DLEVEL == 1, "%s:%d (%u, %u, %u) DQS: %u > %d => %d;"
-                          " adding %u to OUT1\n", __func__, __LINE__,
-                          write_group, group_bgn, delay, new_delay,
-                          IO_IO_OUT2_DELAY_MAX, IO_IO_OUT2_DELAY_MAX,
+               debug_cond(DLEVEL == 1,
+                          "%s:%d (%u, %u) DQS: %u > %d; adding %u to OUT1\n",
+                          __func__, __LINE__, write_group, delay, new_delay,
+                          IO_IO_OUT2_DELAY_MAX,
                           new_delay - IO_IO_OUT2_DELAY_MAX);
-               scc_mgr_set_dqs_out1_delay(write_group, new_delay -
-                                          IO_IO_OUT2_DELAY_MAX);
-               new_delay = IO_IO_OUT2_DELAY_MAX;
+               new_delay -= IO_IO_OUT2_DELAY_MAX;
+               scc_mgr_set_dqs_out1_delay(new_delay);
        }
 
        scc_mgr_load_dqs_io();
 
-       /* oct shift */
-       new_delay = READ_SCC_OCT_OUT2_DELAY;
-       new_delay += delay;
-
+       /* OCT shift */
+       new_delay = READ_SCC_OCT_OUT2_DELAY + delay;
        if (new_delay > IO_IO_OUT2_DELAY_MAX) {
-               debug_cond(DLEVEL == 1, "%s:%d (%u, %u, %u) DQS: %u > %d => %d;"
-                          " adding %u to OUT1\n", __func__, __LINE__,
-                          write_group, group_bgn, delay, new_delay,
-                          IO_IO_OUT2_DELAY_MAX, IO_IO_OUT2_DELAY_MAX,
+               debug_cond(DLEVEL == 1,
+                          "%s:%d (%u, %u) DQS: %u > %d; adding %u to OUT1\n",
+                          __func__, __LINE__, write_group, delay,
+                          new_delay, IO_IO_OUT2_DELAY_MAX,
                           new_delay - IO_IO_OUT2_DELAY_MAX);
-               scc_mgr_set_oct_out1_delay(write_group, new_delay -
-                                          IO_IO_OUT2_DELAY_MAX);
-               new_delay = IO_IO_OUT2_DELAY_MAX;
+               new_delay -= IO_IO_OUT2_DELAY_MAX;
+               scc_mgr_set_oct_out1_delay(write_group, new_delay);
        }
 
        scc_mgr_load_dqs_for_write_group(write_group);
 }
 
-/*
- * USER apply a delay to the entire output side (DQ, DM, DQS, OCT)
- * and to all ranks
+/**
+ * scc_mgr_apply_group_all_out_delay_add() - Apply a delay to the entire output side to all ranks
+ * @write_group:       Write group
+ * @delay:             Delay value
+ *
+ * Apply a delay to the entire output side (DQ, DM, DQS, OCT) to all ranks.
  */
-static void scc_mgr_apply_group_all_out_delay_add_all_ranks(
-       uint32_t write_group, uint32_t group_bgn, uint32_t delay)
+static void
+scc_mgr_apply_group_all_out_delay_add_all_ranks(const u32 write_group,
+                                               const u32 delay)
 {
-       uint32_t r;
+       int r;
 
        for (r = 0; r < RW_MGR_MEM_NUMBER_OF_RANKS;
-               r += NUM_RANKS_PER_SHADOW_REG) {
-               scc_mgr_apply_group_all_out_delay_add(write_group,
-                                                     group_bgn, delay);
+            r += NUM_RANKS_PER_SHADOW_REG) {
+               scc_mgr_apply_group_all_out_delay_add(write_group, delay);
                writel(0, &sdr_scc_mgr->update);
        }
 }
 
-/* optimization used to recover some slots in ddr3 inst_rom */
-/* could be applied to other protocols if we wanted to */
+/**
+ * set_jump_as_return() - Return instruction optimization
+ *
+ * Optimization used to recover some slots in ddr3 inst_rom could be
+ * applied to other protocols if we wanted to
+ */
 static void set_jump_as_return(void)
 {
        /*
-        * to save space, we replace return with jump to special shared
+        * To save space, we replace return with jump to special shared
         * RETURN instruction so we set the counter to large value so that
-        * we always jump
+        * we always jump.
         */
        writel(0xff, &sdr_rw_load_mgr_regs->load_cntr0);
        writel(RW_MGR_RETURN, &sdr_rw_load_jump_mgr_regs->load_jump_add0);
@@ -854,12 +852,107 @@ static void delay_for_n_mem_clocks(const uint32_t clocks)
        debug("%s:%d clocks=%u ... end\n", __func__, __LINE__, clocks);
 }
 
-static void rw_mgr_mem_initialize(void)
+/**
+ * rw_mgr_mem_init_load_regs() - Load instruction registers
+ * @cntr0:     Counter 0 value
+ * @cntr1:     Counter 1 value
+ * @cntr2:     Counter 2 value
+ * @jump:      Jump instruction value
+ *
+ * Load instruction registers.
+ */
+static void rw_mgr_mem_init_load_regs(u32 cntr0, u32 cntr1, u32 cntr2, u32 jump)
 {
-       uint32_t r;
        uint32_t grpaddr = SDR_PHYGRP_RWMGRGRP_ADDRESS |
                           RW_MGR_RUN_SINGLE_GROUP_OFFSET;
 
+       /* Load counters */
+       writel(SKIP_DELAY_LOOP_VALUE_OR_ZERO(cntr0),
+              &sdr_rw_load_mgr_regs->load_cntr0);
+       writel(SKIP_DELAY_LOOP_VALUE_OR_ZERO(cntr1),
+              &sdr_rw_load_mgr_regs->load_cntr1);
+       writel(SKIP_DELAY_LOOP_VALUE_OR_ZERO(cntr2),
+              &sdr_rw_load_mgr_regs->load_cntr2);
+
+       /* Load jump address */
+       writel(jump, &sdr_rw_load_jump_mgr_regs->load_jump_add0);
+       writel(jump, &sdr_rw_load_jump_mgr_regs->load_jump_add1);
+       writel(jump, &sdr_rw_load_jump_mgr_regs->load_jump_add2);
+
+       /* Execute count instruction */
+       writel(jump, grpaddr);
+}
+
+/**
+ * rw_mgr_mem_load_user() - Load user calibration values
+ * @fin1:      Final instruction 1
+ * @fin2:      Final instruction 2
+ * @precharge: If 1, precharge the banks at the end
+ *
+ * Load user calibration values and optionally precharge the banks.
+ */
+static void rw_mgr_mem_load_user(const u32 fin1, const u32 fin2,
+                                const int precharge)
+{
+       u32 grpaddr = SDR_PHYGRP_RWMGRGRP_ADDRESS |
+                     RW_MGR_RUN_SINGLE_GROUP_OFFSET;
+       u32 r;
+
+       for (r = 0; r < RW_MGR_MEM_NUMBER_OF_RANKS; r++) {
+               if (param->skip_ranks[r]) {
+                       /* request to skip the rank */
+                       continue;
+               }
+
+               /* set rank */
+               set_rank_and_odt_mask(r, RW_MGR_ODT_MODE_OFF);
+
+               /* precharge all banks ... */
+               if (precharge)
+                       writel(RW_MGR_PRECHARGE_ALL, grpaddr);
+
+               /*
+                * USER Use Mirror-ed commands for odd ranks if address
+                * mirrorring is on
+                */
+               if ((RW_MGR_MEM_ADDRESS_MIRRORING >> r) & 0x1) {
+                       set_jump_as_return();
+                       writel(RW_MGR_MRS2_MIRR, grpaddr);
+                       delay_for_n_mem_clocks(4);
+                       set_jump_as_return();
+                       writel(RW_MGR_MRS3_MIRR, grpaddr);
+                       delay_for_n_mem_clocks(4);
+                       set_jump_as_return();
+                       writel(RW_MGR_MRS1_MIRR, grpaddr);
+                       delay_for_n_mem_clocks(4);
+                       set_jump_as_return();
+                       writel(fin1, grpaddr);
+               } else {
+                       set_jump_as_return();
+                       writel(RW_MGR_MRS2, grpaddr);
+                       delay_for_n_mem_clocks(4);
+                       set_jump_as_return();
+                       writel(RW_MGR_MRS3, grpaddr);
+                       delay_for_n_mem_clocks(4);
+                       set_jump_as_return();
+                       writel(RW_MGR_MRS1, grpaddr);
+                       set_jump_as_return();
+                       writel(fin2, grpaddr);
+               }
+
+               if (precharge)
+                       continue;
+
+               set_jump_as_return();
+               writel(RW_MGR_ZQCL, grpaddr);
+
+               /* tZQinit = tDLLK = 512 ck cycles */
+               delay_for_n_mem_clocks(512);
+       }
+}
+
+static void rw_mgr_mem_initialize(void)
+{
        debug("%s:%d\n", __func__, __LINE__);
 
        /* The reset / cke part of initialization is broadcasted to all ranks */
@@ -889,25 +982,9 @@ static void rw_mgr_mem_initialize(void)
         * One possible solution is n = 0 , a = 256 , b = 106 => a = FF,
         * b = 6A
         */
-
-       /* Load counters */
-       writel(SKIP_DELAY_LOOP_VALUE_OR_ZERO(SEQ_TINIT_CNTR0_VAL),
-              &sdr_rw_load_mgr_regs->load_cntr0);
-       writel(SKIP_DELAY_LOOP_VALUE_OR_ZERO(SEQ_TINIT_CNTR1_VAL),
-              &sdr_rw_load_mgr_regs->load_cntr1);
-       writel(SKIP_DELAY_LOOP_VALUE_OR_ZERO(SEQ_TINIT_CNTR2_VAL),
-              &sdr_rw_load_mgr_regs->load_cntr2);
-
-       /* Load jump address */
-       writel(RW_MGR_INIT_RESET_0_CKE_0,
-               &sdr_rw_load_jump_mgr_regs->load_jump_add0);
-       writel(RW_MGR_INIT_RESET_0_CKE_0,
-               &sdr_rw_load_jump_mgr_regs->load_jump_add1);
-       writel(RW_MGR_INIT_RESET_0_CKE_0,
-               &sdr_rw_load_jump_mgr_regs->load_jump_add2);
-
-       /* Execute count instruction */
-       writel(RW_MGR_INIT_RESET_0_CKE_0, grpaddr);
+       rw_mgr_mem_init_load_regs(SEQ_TINIT_CNTR0_VAL, SEQ_TINIT_CNTR1_VAL,
+                                 SEQ_TINIT_CNTR2_VAL,
+                                 RW_MGR_INIT_RESET_0_CKE_0);
 
        /* indicate that memory is stable */
        writel(1, &phy_mgr_cfg->reset_mem_stbl);
@@ -926,73 +1003,17 @@ static void rw_mgr_mem_initialize(void)
         * One possible solution is n = 2 , a = 131 , b = 256 => a = 83,
         * b = FF
         */
-
-       /* Load counters */
-       writel(SKIP_DELAY_LOOP_VALUE_OR_ZERO(SEQ_TRESET_CNTR0_VAL),
-              &sdr_rw_load_mgr_regs->load_cntr0);
-       writel(SKIP_DELAY_LOOP_VALUE_OR_ZERO(SEQ_TRESET_CNTR1_VAL),
-              &sdr_rw_load_mgr_regs->load_cntr1);
-       writel(SKIP_DELAY_LOOP_VALUE_OR_ZERO(SEQ_TRESET_CNTR2_VAL),
-              &sdr_rw_load_mgr_regs->load_cntr2);
-
-       /* Load jump address */
-       writel(RW_MGR_INIT_RESET_1_CKE_0,
-               &sdr_rw_load_jump_mgr_regs->load_jump_add0);
-       writel(RW_MGR_INIT_RESET_1_CKE_0,
-               &sdr_rw_load_jump_mgr_regs->load_jump_add1);
-       writel(RW_MGR_INIT_RESET_1_CKE_0,
-               &sdr_rw_load_jump_mgr_regs->load_jump_add2);
-
-       writel(RW_MGR_INIT_RESET_1_CKE_0, grpaddr);
+       rw_mgr_mem_init_load_regs(SEQ_TRESET_CNTR0_VAL, SEQ_TRESET_CNTR1_VAL,
+                                 SEQ_TRESET_CNTR2_VAL,
+                                 RW_MGR_INIT_RESET_1_CKE_0);
 
        /* bring up clock enable */
 
        /* tXRP < 250 ck cycles */
        delay_for_n_mem_clocks(250);
 
-       for (r = 0; r < RW_MGR_MEM_NUMBER_OF_RANKS; r++) {
-               if (param->skip_ranks[r]) {
-                       /* request to skip the rank */
-                       continue;
-               }
-
-               /* set rank */
-               set_rank_and_odt_mask(r, RW_MGR_ODT_MODE_OFF);
-
-               /*
-                * USER Use Mirror-ed commands for odd ranks if address
-                * mirrorring is on
-                */
-               if ((RW_MGR_MEM_ADDRESS_MIRRORING >> r) & 0x1) {
-                       set_jump_as_return();
-                       writel(RW_MGR_MRS2_MIRR, grpaddr);
-                       delay_for_n_mem_clocks(4);
-                       set_jump_as_return();
-                       writel(RW_MGR_MRS3_MIRR, grpaddr);
-                       delay_for_n_mem_clocks(4);
-                       set_jump_as_return();
-                       writel(RW_MGR_MRS1_MIRR, grpaddr);
-                       delay_for_n_mem_clocks(4);
-                       set_jump_as_return();
-                       writel(RW_MGR_MRS0_DLL_RESET_MIRR, grpaddr);
-               } else {
-                       set_jump_as_return();
-                       writel(RW_MGR_MRS2, grpaddr);
-                       delay_for_n_mem_clocks(4);
-                       set_jump_as_return();
-                       writel(RW_MGR_MRS3, grpaddr);
-                       delay_for_n_mem_clocks(4);
-                       set_jump_as_return();
-                       writel(RW_MGR_MRS1, grpaddr);
-                       set_jump_as_return();
-                       writel(RW_MGR_MRS0_DLL_RESET, grpaddr);
-               }
-               set_jump_as_return();
-               writel(RW_MGR_ZQCL, grpaddr);
-
-               /* tZQinit = tDLLK = 512 ck cycles */
-               delay_for_n_mem_clocks(512);
-       }
+       rw_mgr_mem_load_user(RW_MGR_MRS0_DLL_RESET_MIRR, RW_MGR_MRS0_DLL_RESET,
+                            0);
 }
 
 /*
@@ -1001,58 +1022,12 @@ static void rw_mgr_mem_initialize(void)
  */
 static void rw_mgr_mem_handoff(void)
 {
-       uint32_t r;
-       uint32_t grpaddr = SDR_PHYGRP_RWMGRGRP_ADDRESS |
-                          RW_MGR_RUN_SINGLE_GROUP_OFFSET;
-
-       debug("%s:%d\n", __func__, __LINE__);
-       for (r = 0; r < RW_MGR_MEM_NUMBER_OF_RANKS; r++) {
-               if (param->skip_ranks[r])
-                       /* request to skip the rank */
-                       continue;
-               /* set rank */
-               set_rank_and_odt_mask(r, RW_MGR_ODT_MODE_OFF);
-
-               /* precharge all banks ... */
-               writel(RW_MGR_PRECHARGE_ALL, grpaddr);
-
-               /* load up MR settings specified by user */
-
-               /*
-                * Use Mirror-ed commands for odd ranks if address
-                * mirrorring is on
-                */
-               if ((RW_MGR_MEM_ADDRESS_MIRRORING >> r) & 0x1) {
-                       set_jump_as_return();
-                       writel(RW_MGR_MRS2_MIRR, grpaddr);
-                       delay_for_n_mem_clocks(4);
-                       set_jump_as_return();
-                       writel(RW_MGR_MRS3_MIRR, grpaddr);
-                       delay_for_n_mem_clocks(4);
-                       set_jump_as_return();
-                       writel(RW_MGR_MRS1_MIRR, grpaddr);
-                       delay_for_n_mem_clocks(4);
-                       set_jump_as_return();
-                       writel(RW_MGR_MRS0_USER_MIRR, grpaddr);
-               } else {
-                       set_jump_as_return();
-                       writel(RW_MGR_MRS2, grpaddr);
-                       delay_for_n_mem_clocks(4);
-                       set_jump_as_return();
-                       writel(RW_MGR_MRS3, grpaddr);
-                       delay_for_n_mem_clocks(4);
-                       set_jump_as_return();
-                       writel(RW_MGR_MRS1, grpaddr);
-                       delay_for_n_mem_clocks(4);
-                       set_jump_as_return();
-                       writel(RW_MGR_MRS0_USER, grpaddr);
-               }
-               /*
-                * USER  need to wait tMOD (12CK or 15ns) time before issuing
-                * other commands, but we will have plenty of NIOS cycles before
-                * actual handoff so its okay.
-                */
-       }
+       rw_mgr_mem_load_user(RW_MGR_MRS0_USER_MIRR, RW_MGR_MRS0_USER, 1);
+       /*
+        * USER  need to wait tMOD (12CK or 15ns) time before issuing
+        * other commands, but we will have plenty of NIOS cycles before
+        * actual handoff so its okay.
+        */
 }
 
 /*
@@ -1800,8 +1775,7 @@ rw_mgr_mem_calibrate_vfifo_find_dqs_en_phase_sweep_dq_in_delay
 
        for (r = 0; r < RW_MGR_MEM_NUMBER_OF_RANKS;
             r += NUM_RANKS_PER_SHADOW_REG) {
-               for (i = 0, p = test_bgn, d = 0; i < RW_MGR_MEM_DQ_PER_READ_DQS;
-                       i++, p++, d += delay_step) {
+               for (i = 0, p = test_bgn, d = 0; i < RW_MGR_MEM_DQ_PER_READ_DQS; i++, p++, d += delay_step) {
                        debug_cond(DLEVEL == 1, "%s:%d rw_mgr_mem_calibrate_\
                                   vfifo_find_dqs_", __func__, __LINE__);
                        debug_cond(DLEVEL == 1, "en_phase_sweep_dq_in_delay: g=%u/%u ",
@@ -1927,7 +1901,7 @@ static uint32_t rw_mgr_mem_calibrate_vfifo_center(uint32_t rank_bgn,
        }
 
        /* Reset DQ delay chains to 0 */
-       scc_mgr_apply_group_dq_in_delay(write_group, test_bgn, 0);
+       scc_mgr_apply_group_dq_in_delay(test_bgn, 0);
        sticky_bit_chk = 0;
        for (i = RW_MGR_MEM_DQ_PER_READ_DQS - 1;; i--) {
                debug_cond(DLEVEL == 2, "%s:%d vfifo_center: left_edge[%u]: \
@@ -2219,7 +2193,6 @@ static uint32_t rw_mgr_mem_calibrate_vfifo(uint32_t read_group,
 {
        uint32_t p, d, rank_bgn, sr;
        uint32_t dtaps_per_ptap;
-       uint32_t tmp_delay;
        uint32_t bit_chk;
        uint32_t grp_calibrated;
        uint32_t write_group, write_test_bgn;
@@ -2234,14 +2207,8 @@ static uint32_t rw_mgr_mem_calibrate_vfifo(uint32_t read_group,
        write_test_bgn = test_bgn;
 
        /* USER Determine number of delay taps for each phase tap */
-       dtaps_per_ptap = 0;
-       tmp_delay = 0;
-       while (tmp_delay < IO_DELAY_PER_OPA_TAP) {
-               dtaps_per_ptap++;
-               tmp_delay += IO_DELAY_PER_DQS_EN_DCHAIN_TAP;
-       }
-       dtaps_per_ptap--;
-       tmp_delay = 0;
+       dtaps_per_ptap = DIV_ROUND_UP(IO_DELAY_PER_OPA_TAP,
+                                     IO_DELAY_PER_DQS_EN_DCHAIN_TAP) - 1;
 
        /* update info for sims */
        reg_file_set_group(read_group);
@@ -2259,8 +2226,8 @@ static uint32_t rw_mgr_mem_calibrate_vfifo(uint32_t read_group,
                 * calibrated output side yet.
                 */
                if (d > 0) {
-                       scc_mgr_apply_group_all_out_delay_add_all_ranks
-                       (write_group, write_test_bgn, d);
+                       scc_mgr_apply_group_all_out_delay_add_all_ranks(
+                                                               write_group, d);
                }
 
                for (p = 0; p <= IO_DQDQS_OUT_PHASE_MAX && grp_calibrated == 0;
@@ -2339,7 +2306,7 @@ static uint32_t rw_mgr_mem_calibrate_vfifo(uint32_t read_group,
         * first case).
         */
        if (d > 2)
-               scc_mgr_zero_group(write_group, write_test_bgn, 1);
+               scc_mgr_zero_group(write_group, 1);
 
        return 1;
 }
@@ -2697,7 +2664,7 @@ static uint32_t rw_mgr_mem_calibrate_writes_center(uint32_t rank_bgn,
 
        /* Search for the left edge of the window for each bit */
        for (d = 0; d <= IO_IO_OUT1_DELAY_MAX; d++) {
-               scc_mgr_apply_group_dq_out1_delay(write_group, test_bgn, d);
+               scc_mgr_apply_group_dq_out1_delay(write_group, d);
 
                writel(0, &sdr_scc_mgr->update);
 
@@ -2746,7 +2713,7 @@ static uint32_t rw_mgr_mem_calibrate_writes_center(uint32_t rank_bgn,
        }
 
        /* Reset DQ delay chains to 0 */
-       scc_mgr_apply_group_dq_out1_delay(write_group, test_bgn, 0);
+       scc_mgr_apply_group_dq_out1_delay(0);
        sticky_bit_chk = 0;
        for (i = RW_MGR_MEM_DQ_PER_WRITE_DQS - 1;; i--) {
                debug_cond(DLEVEL == 2, "%s:%d write_center: left_edge[%u]: \
@@ -2970,7 +2937,7 @@ static uint32_t rw_mgr_mem_calibrate_writes_center(uint32_t rank_bgn,
 
        /* Search for the/part of the window with DM shift */
        for (d = IO_IO_OUT1_DELAY_MAX; d >= 0; d -= DELTA_D) {
-               scc_mgr_apply_group_dm_out1_delay(write_group, d);
+               scc_mgr_apply_group_dm_out1_delay(d);
                writel(0, &sdr_scc_mgr->update);
 
                if (rw_mgr_mem_calibrate_write_test(rank_bgn, write_group, 1,
@@ -3003,7 +2970,7 @@ static uint32_t rw_mgr_mem_calibrate_writes_center(uint32_t rank_bgn,
 
 
        /* Reset DM delay chains to 0 */
-       scc_mgr_apply_group_dm_out1_delay(write_group, 0);
+       scc_mgr_apply_group_dm_out1_delay(0);
 
        /*
         * Check to see if the current window nudges up aganist 0 delay.
@@ -3085,7 +3052,7 @@ static uint32_t rw_mgr_mem_calibrate_writes_center(uint32_t rank_bgn,
        else
                dm_margin = left_edge[0] - mid;
 
-       scc_mgr_apply_group_dm_out1_delay(write_group, mid);
+       scc_mgr_apply_group_dm_out1_delay(mid);
        writel(0, &sdr_scc_mgr->update);
 
        debug_cond(DLEVEL == 2, "%s:%d dm_calib: left=%d right=%d mid=%d \
@@ -3127,21 +3094,24 @@ static uint32_t rw_mgr_mem_calibrate_writes(uint32_t rank_bgn, uint32_t g,
        return 1;
 }
 
-/* precharge all banks and activate row 0 in bank "000..." and bank "111..." */
+/**
+ * mem_precharge_and_activate() - Precharge all banks and activate
+ *
+ * Precharge all banks and activate row 0 in bank "000..." and bank "111...".
+ */
 static void mem_precharge_and_activate(void)
 {
-       uint32_t r;
+       int r;
 
        for (r = 0; r < RW_MGR_MEM_NUMBER_OF_RANKS; r++) {
-               if (param->skip_ranks[r]) {
-                       /* request to skip the rank */
+               /* Test if the rank should be skipped. */
+               if (param->skip_ranks[r])
                        continue;
-               }
 
-               /* set rank */
+               /* Set rank. */
                set_rank_and_odt_mask(r, RW_MGR_ODT_MODE_OFF);
 
-               /* precharge all banks ... */
+               /* Precharge all banks. */
                writel(RW_MGR_PRECHARGE_ALL, SDR_PHYGRP_RWMGRGRP_ADDRESS |
                                             RW_MGR_RUN_SINGLE_GROUP_OFFSET);
 
@@ -3153,66 +3123,57 @@ static void mem_precharge_and_activate(void)
                writel(RW_MGR_ACTIVATE_0_AND_1_WAIT2,
                        &sdr_rw_load_jump_mgr_regs->load_jump_add1);
 
-               /* activate rows */
+               /* Activate rows. */
                writel(RW_MGR_ACTIVATE_0_AND_1, SDR_PHYGRP_RWMGRGRP_ADDRESS |
                                                RW_MGR_RUN_SINGLE_GROUP_OFFSET);
        }
 }
 
-/* Configure various memory related parameters. */
-static void mem_config(void)
+/**
+ * mem_init_latency() - Configure memory RLAT and WLAT settings
+ *
+ * Configure memory RLAT and WLAT parameters.
+ */
+static void mem_init_latency(void)
 {
-       uint32_t rlat, wlat;
-       uint32_t rw_wl_nop_cycles;
-       uint32_t max_latency;
-
-       debug("%s:%d\n", __func__, __LINE__);
-       /* read in write and read latency */
-       wlat = readl(&data_mgr->t_wl_add);
-       wlat += readl(&data_mgr->mem_t_add);
-
-       /* WL for hard phy does not include additive latency */
-
        /*
-        * add addtional write latency to offset the address/command extra
-        * clock cycle. We change the AC mux setting causing AC to be delayed
-        * by one mem clock cycle. Only do this for DDR3
+        * For AV/CV, LFIFO is hardened and always runs at full rate
+        * so max latency in AFI clocks, used here, is correspondingly
+        * smaller.
         */
-       wlat = wlat + 1;
+       const u32 max_latency = (1 << MAX_LATENCY_COUNT_WIDTH) - 1;
+       u32 rlat, wlat;
 
-       rlat = readl(&data_mgr->t_rl_add);
-
-       rw_wl_nop_cycles = wlat - 2;
-       gbl->rw_wl_nop_cycles = rw_wl_nop_cycles;
+       debug("%s:%d\n", __func__, __LINE__);
 
        /*
-        * For AV/CV, lfifo is hardened and always runs at full rate so
-        * max latency in AFI clocks, used here, is correspondingly smaller.
+        * Read in write latency.
+        * WL for Hard PHY does not include additive latency.
         */
-       max_latency = (1<<MAX_LATENCY_COUNT_WIDTH)/1 - 1;
-       /* configure for a burst length of 8 */
+       wlat = readl(&data_mgr->t_wl_add);
+       wlat += readl(&data_mgr->mem_t_add);
 
-       /* write latency */
-       /* Adjust Write Latency for Hard PHY */
-       wlat = wlat + 1;
+       gbl->rw_wl_nop_cycles = wlat - 1;
 
-       /* set a pretty high read latency initially */
-       gbl->curr_read_lat = rlat + 16;
+       /* Read in readl latency. */
+       rlat = readl(&data_mgr->t_rl_add);
 
+       /* Set a pretty high read latency initially. */
+       gbl->curr_read_lat = rlat + 16;
        if (gbl->curr_read_lat > max_latency)
                gbl->curr_read_lat = max_latency;
 
        writel(gbl->curr_read_lat, &phy_mgr_cfg->phy_rlat);
 
-       /* advertise write latency */
-       gbl->curr_write_lat = wlat;
-       writel(wlat - 2, &phy_mgr_cfg->afi_wlat);
-
-       /* initialize bit slips */
-       mem_precharge_and_activate();
+       /* Advertise write latency. */
+       writel(wlat, &phy_mgr_cfg->afi_wlat);
 }
 
-/* Set VFIFO and LFIFO to instant-on settings in skip calibration mode */
+/**
+ * @mem_skip_calibrate() - Set VFIFO and LFIFO to instant-on settings
+ *
+ * Set VFIFO and LFIFO to instant-on settings in skip calibration mode.
+ */
 static void mem_skip_calibrate(void)
 {
        uint32_t vfifo_offset;
@@ -3221,7 +3182,7 @@ static void mem_skip_calibrate(void)
        debug("%s:%d\n", __func__, __LINE__);
        /* Need to update every shadow register set used by the interface */
        for (r = 0; r < RW_MGR_MEM_NUMBER_OF_RANKS;
-               r += NUM_RANKS_PER_SHADOW_REG) {
+            r += NUM_RANKS_PER_SHADOW_REG) {
                /*
                 * Set output phase alignment settings appropriate for
                 * skip calibration.
@@ -3258,8 +3219,8 @@ static void mem_skip_calibrate(void)
                         *
                         *    (1.25 * IO_DLL_CHAIN_LENGTH - 2)
                         */
-                       scc_mgr_set_dqdqs_output_phase(i, (1.25 *
-                               IO_DLL_CHAIN_LENGTH - 2));
+                       scc_mgr_set_dqdqs_output_phase(i,
+                                       1.25 * IO_DLL_CHAIN_LENGTH - 2);
                }
                writel(0xff, &sdr_scc_mgr->dqs_ena);
                writel(0xff, &sdr_scc_mgr->dqs_io_ena);
@@ -3285,14 +3246,13 @@ static void mem_skip_calibrate(void)
         * in sequencer.
         */
        vfifo_offset = CALIB_VFIFO_OFFSET;
-       for (j = 0; j < vfifo_offset; j++) {
+       for (j = 0; j < vfifo_offset; j++)
                writel(0xff, &phy_mgr_cmd->inc_vfifo_hard_phy);
-       }
        writel(0, &phy_mgr_cmd->fifo_reset);
 
        /*
-        * For ACV with hard lfifo, we get the skip-cal setting from
-        * generation-time constant.
+        * For Arria V and Cyclone V with hard LFIFO, we get the skip-cal
+        * setting from generation-time constant.
         */
        gbl->curr_read_lat = CALIB_LFIFO_OFFSET;
        writel(gbl->curr_read_lat, &phy_mgr_cfg->phy_rlat);
@@ -3308,173 +3268,173 @@ static uint32_t mem_calibrate(void)
        uint32_t run_groups, current_run;
        uint32_t failing_groups = 0;
        uint32_t group_failed = 0;
-       uint32_t sr_failed = 0;
+
+       const u32 rwdqs_ratio = RW_MGR_MEM_IF_READ_DQS_WIDTH /
+                               RW_MGR_MEM_IF_WRITE_DQS_WIDTH;
 
        debug("%s:%d\n", __func__, __LINE__);
-       /* Initialize the data settings */
 
+       /* Initialize the data settings */
        gbl->error_substage = CAL_SUBSTAGE_NIL;
        gbl->error_stage = CAL_STAGE_NIL;
        gbl->error_group = 0xff;
        gbl->fom_in = 0;
        gbl->fom_out = 0;
 
-       mem_config();
+       /* Initialize WLAT and RLAT. */
+       mem_init_latency();
+
+       /* Initialize bit slips. */
+       mem_precharge_and_activate();
 
-       uint32_t bypass_mode = 0x1;
        for (i = 0; i < RW_MGR_MEM_IF_READ_DQS_WIDTH; i++) {
                writel(i, SDR_PHYGRP_SCCGRP_ADDRESS |
                          SCC_MGR_GROUP_COUNTER_OFFSET);
-               scc_set_bypass_mode(i, bypass_mode);
+               /* Only needed once to set all groups, pins, DQ, DQS, DM. */
+               if (i == 0)
+                       scc_mgr_set_hhp_extras();
+
+               scc_set_bypass_mode(i);
        }
 
+       /* Calibration is skipped. */
        if ((dyn_calib_steps & CALIB_SKIP_ALL) == CALIB_SKIP_ALL) {
                /*
                 * Set VFIFO and LFIFO to instant-on settings in skip
                 * calibration mode.
                 */
                mem_skip_calibrate();
-       } else {
-               for (i = 0; i < NUM_CALIB_REPEAT; i++) {
-                       /*
-                        * Zero all delay chain/phase settings for all
-                        * groups and all shadow register sets.
-                        */
-                       scc_mgr_zero_all();
-
-                       run_groups = ~param->skip_groups;
 
-                       for (write_group = 0, write_test_bgn = 0; write_group
-                               < RW_MGR_MEM_IF_WRITE_DQS_WIDTH; write_group++,
-                               write_test_bgn += RW_MGR_MEM_DQ_PER_WRITE_DQS) {
-                               /* Initialized the group failure */
-                               group_failed = 0;
+               /*
+                * Do not remove this line as it makes sure all of our
+                * decisions have been applied.
+                */
+               writel(0, &sdr_scc_mgr->update);
+               return 1;
+       }
 
-                               current_run = run_groups & ((1 <<
-                                       RW_MGR_NUM_DQS_PER_WRITE_GROUP) - 1);
-                               run_groups = run_groups >>
-                                       RW_MGR_NUM_DQS_PER_WRITE_GROUP;
+       /* Calibration is not skipped. */
+       for (i = 0; i < NUM_CALIB_REPEAT; i++) {
+               /*
+                * Zero all delay chain/phase settings for all
+                * groups and all shadow register sets.
+                */
+               scc_mgr_zero_all();
+
+               run_groups = ~param->skip_groups;
+
+               for (write_group = 0, write_test_bgn = 0; write_group
+                       < RW_MGR_MEM_IF_WRITE_DQS_WIDTH; write_group++,
+                       write_test_bgn += RW_MGR_MEM_DQ_PER_WRITE_DQS) {
+                       /* Initialized the group failure */
+                       group_failed = 0;
+
+                       current_run = run_groups & ((1 <<
+                               RW_MGR_NUM_DQS_PER_WRITE_GROUP) - 1);
+                       run_groups = run_groups >>
+                               RW_MGR_NUM_DQS_PER_WRITE_GROUP;
+
+                       if (current_run == 0)
+                               continue;
+
+                       writel(write_group, SDR_PHYGRP_SCCGRP_ADDRESS |
+                                           SCC_MGR_GROUP_COUNTER_OFFSET);
+                       scc_mgr_zero_group(write_group, 0);
+
+                       for (read_group = write_group * rwdqs_ratio,
+                            read_test_bgn = 0;
+                            read_group < (write_group + 1) * rwdqs_ratio && group_failed == 0;
+                            read_group++,
+                            read_test_bgn += RW_MGR_MEM_DQ_PER_READ_DQS) {
+                               if (STATIC_CALIB_STEPS & CALIB_SKIP_VFIFO)
+                                       continue;
 
-                               if (current_run == 0)
+                               /* Calibrate the VFIFO */
+                               if (rw_mgr_mem_calibrate_vfifo(read_group,
+                                                              read_test_bgn))
                                        continue;
 
-                               writel(write_group, SDR_PHYGRP_SCCGRP_ADDRESS |
-                                                   SCC_MGR_GROUP_COUNTER_OFFSET);
-                               scc_mgr_zero_group(write_group, write_test_bgn,
-                                                  0);
+                               group_failed = 1;
+                               if (!(gbl->phy_debug_mode_flags & PHY_DEBUG_SWEEP_ALL_GROUPS))
+                                       return 0;
+                       }
+
+                       /* Calibrate the output side */
+                       if (group_failed == 0) {
+                               for (rank_bgn = 0, sr = 0;
+                                    rank_bgn < RW_MGR_MEM_NUMBER_OF_RANKS;
+                                    rank_bgn += NUM_RANKS_PER_SHADOW_REG, sr++) {
+                                       if (STATIC_CALIB_STEPS & CALIB_SKIP_WRITES)
+                                               continue;
+
+                                       /* Not needed in quick mode! */
+                                       if (STATIC_CALIB_STEPS & CALIB_SKIP_DELAY_SWEEPS)
+                                               continue;
 
+                                       /*
+                                        * Determine if this set of ranks
+                                        * should be skipped entirely.
+                                        */
+                                       if (param->skip_shadow_regs[sr])
+                                               continue;
+
+                                       /* Calibrate WRITEs */
+                                       if (rw_mgr_mem_calibrate_writes(rank_bgn,
+                                                       write_group, write_test_bgn))
+                                               continue;
+
+                                       group_failed = 1;
+                                       if (!(gbl->phy_debug_mode_flags & PHY_DEBUG_SWEEP_ALL_GROUPS))
+                                               return 0;
+                               }
+                       }
+
+                       if (group_failed == 0) {
                                for (read_group = write_group *
-                                       RW_MGR_MEM_IF_READ_DQS_WIDTH /
-                                       RW_MGR_MEM_IF_WRITE_DQS_WIDTH,
-                                       read_test_bgn = 0;
-                                       read_group < (write_group + 1) *
-                                       RW_MGR_MEM_IF_READ_DQS_WIDTH /
-                                       RW_MGR_MEM_IF_WRITE_DQS_WIDTH &&
+                               RW_MGR_MEM_IF_READ_DQS_WIDTH /
+                               RW_MGR_MEM_IF_WRITE_DQS_WIDTH,
+                               read_test_bgn = 0;
+                                       read_group < (write_group + 1)
+                                       * RW_MGR_MEM_IF_READ_DQS_WIDTH
+                                       RW_MGR_MEM_IF_WRITE_DQS_WIDTH &&
                                        group_failed == 0;
                                        read_group++, read_test_bgn +=
                                        RW_MGR_MEM_DQ_PER_READ_DQS) {
-                                       /* Calibrate the VFIFO */
                                        if (!((STATIC_CALIB_STEPS) &
-                                               CALIB_SKIP_VFIFO)) {
-                                               if (!rw_mgr_mem_calibrate_vfifo
-                                                       (read_group,
-                                                       read_test_bgn)) {
-                                                       group_failed = 1;
-
-                                                       if (!(gbl->
-                                                       phy_debug_mode_flags &
-                                               PHY_DEBUG_SWEEP_ALL_GROUPS)) {
-                                                               return 0;
-                                                       }
-                                               }
-                                       }
-                               }
-
-                               /* Calibrate the output side */
-                               if (group_failed == 0)  {
-                                       for (rank_bgn = 0, sr = 0; rank_bgn
-                                               < RW_MGR_MEM_NUMBER_OF_RANKS;
-                                               rank_bgn +=
-                                               NUM_RANKS_PER_SHADOW_REG,
-                                               ++sr) {
-                                               sr_failed = 0;
-                                               if (!((STATIC_CALIB_STEPS) &
                                                CALIB_SKIP_WRITES)) {
-                                                       if ((STATIC_CALIB_STEPS)
-                                               & CALIB_SKIP_DELAY_SWEEPS) {
-                                               /* not needed in quick mode! */
-                                                       } else {
-                                               /*
-                                                * Determine if this set of
-                                                * ranks should be skipped
-                                                * entirely.
-                                                */
-                                       if (!param->skip_shadow_regs[sr]) {
-                                               if (!rw_mgr_mem_calibrate_writes
-                                               (rank_bgn, write_group,
-                                               write_test_bgn)) {
-                                                       sr_failed = 1;
-                                                       if (!(gbl->
-                                                       phy_debug_mode_flags &
-                                               PHY_DEBUG_SWEEP_ALL_GROUPS)) {
-                                                               return 0;
-                                                                       }
-                                                                       }
-                                                               }
-                                                       }
-                                               }
-                                               if (sr_failed != 0)
-                                                       group_failed = 1;
-                                       }
-                               }
+                               if (!rw_mgr_mem_calibrate_vfifo_end
+                                       (read_group, read_test_bgn)) {
+                                               group_failed = 1;
 
-                               if (group_failed == 0) {
-                                       for (read_group = write_group *
-                                       RW_MGR_MEM_IF_READ_DQS_WIDTH /
-                                       RW_MGR_MEM_IF_WRITE_DQS_WIDTH,
-                                       read_test_bgn = 0;
-                                               read_group < (write_group + 1)
-                                               * RW_MGR_MEM_IF_READ_DQS_WIDTH
-                                               / RW_MGR_MEM_IF_WRITE_DQS_WIDTH &&
-                                               group_failed == 0;
-                                               read_group++, read_test_bgn +=
-                                               RW_MGR_MEM_DQ_PER_READ_DQS) {
-                                               if (!((STATIC_CALIB_STEPS) &
-                                                       CALIB_SKIP_WRITES)) {
-                                       if (!rw_mgr_mem_calibrate_vfifo_end
-                                               (read_group, read_test_bgn)) {
-                                                       group_failed = 1;
-
-                                               if (!(gbl->phy_debug_mode_flags
-                                               & PHY_DEBUG_SWEEP_ALL_GROUPS)) {
-                                                               return 0;
-                                                               }
+                                       if (!(gbl->phy_debug_mode_flags
+                                       & PHY_DEBUG_SWEEP_ALL_GROUPS)) {
+                                                       return 0;
                                                        }
                                                }
                                        }
                                }
-
-                               if (group_failed != 0)
-                                       failing_groups++;
                        }
 
+                       if (group_failed != 0)
+                               failing_groups++;
+               }
+
+               /*
+                * USER If there are any failing groups then report
+                * the failure.
+                */
+               if (failing_groups != 0)
+                       return 0;
+
+               /* Calibrate the LFIFO */
+               if (!((STATIC_CALIB_STEPS) & CALIB_SKIP_LFIFO)) {
                        /*
-                        * USER If there are any failing groups then report
-                        * the failure.
+                        * If we're skipping groups as part of debug,
+                        * don't calibrate LFIFO.
                         */
-                       if (failing_groups != 0)
-                               return 0;
-
-                       /* Calibrate the LFIFO */
-                       if (!((STATIC_CALIB_STEPS) & CALIB_SKIP_LFIFO)) {
-                               /*
-                                * If we're skipping groups as part of debug,
-                                * don't calibrate LFIFO.
-                                */
-                               if (param->skip_groups == 0) {
-                                       if (!rw_mgr_mem_calibrate_lfifo())
-                                               return 0;
-                               }
+                       if (param->skip_groups == 0) {
+                               if (!rw_mgr_mem_calibrate_lfifo())
+                                       return 0;
                        }
                }
        }
@@ -3487,44 +3447,57 @@ static uint32_t mem_calibrate(void)
        return 1;
 }
 
-static uint32_t run_mem_calibrate(void)
+/**
+ * run_mem_calibrate() - Perform memory calibration
+ *
+ * This function triggers the entire memory calibration procedure.
+ */
+static int run_mem_calibrate(void)
 {
-       uint32_t pass;
-       uint32_t debug_info;
+       int pass;
 
        debug("%s:%d\n", __func__, __LINE__);
 
        /* Reset pass/fail status shown on afi_cal_success/fail */
        writel(PHY_MGR_CAL_RESET, &phy_mgr_cfg->cal_status);
 
-       /* stop tracking manger */
-       uint32_t ctrlcfg = readl(&sdr_ctrl->ctrl_cfg);
+       /* Stop tracking manager. */
+       clrbits_le32(&sdr_ctrl->ctrl_cfg, 1 << 22);
 
-       writel(ctrlcfg & 0xFFBFFFFF, &sdr_ctrl->ctrl_cfg);
-
-       initialize();
+       phy_mgr_initialize();
        rw_mgr_mem_initialize();
 
+       /* Perform the actual memory calibration. */
        pass = mem_calibrate();
 
        mem_precharge_and_activate();
        writel(0, &phy_mgr_cmd->fifo_reset);
 
+       /* Handoff. */
+       rw_mgr_mem_handoff();
        /*
-        * Handoff:
-        * Don't return control of the PHY back to AFI when in debug mode.
+        * In Hard PHY this is a 2-bit control:
+        * 0: AFI Mux Select
+        * 1: DDIO Mux Select
         */
-       if ((gbl->phy_debug_mode_flags & PHY_DEBUG_IN_DEBUG_MODE) == 0) {
-               rw_mgr_mem_handoff();
-               /*
-                * In Hard PHY this is a 2-bit control:
-                * 0: AFI Mux Select
-                * 1: DDIO Mux Select
-                */
-               writel(0x2, &phy_mgr_cfg->mux_sel);
-       }
+       writel(0x2, &phy_mgr_cfg->mux_sel);
+
+       /* Start tracking manager. */
+       setbits_le32(&sdr_ctrl->ctrl_cfg, 1 << 22);
+
+       return pass;
+}
 
-       writel(ctrlcfg, &sdr_ctrl->ctrl_cfg);
+/**
+ * debug_mem_calibrate() - Report result of memory calibration
+ * @pass:      Value indicating whether calibration passed or failed
+ *
+ * This function reports the results of the memory calibration
+ * and writes debug information into the register file.
+ */
+static void debug_mem_calibrate(int pass)
+{
+       uint32_t debug_info;
 
        if (pass) {
                printf("%s: CALIBRATION PASSED\n", __FILE__);
@@ -3563,7 +3536,7 @@ static uint32_t run_mem_calibrate(void)
                writel(debug_info, &sdr_reg_file->failing_stage);
        }
 
-       return pass;
+       printf("%s: Calibration complete\n", __FILE__);
 }
 
 /**
@@ -3651,65 +3624,47 @@ static void initialize_hps_phy(void)
        writel(reg, &sdr_ctrl->phy_ctrl2);
 }
 
+/**
+ * initialize_tracking() - Initialize tracking
+ *
+ * Initialize the register file with usable initial data.
+ */
 static void initialize_tracking(void)
 {
-       uint32_t concatenated_longidle = 0x0;
-       uint32_t concatenated_delays = 0x0;
-       uint32_t concatenated_rw_addr = 0x0;
-       uint32_t concatenated_refresh = 0x0;
-       uint32_t trk_sample_count = 7500;
-       uint32_t dtaps_per_ptap;
-       uint32_t tmp_delay;
+       /*
+        * Initialize the register file with the correct data.
+        * Compute usable version of value in case we skip full
+        * computation later.
+        */
+       writel(DIV_ROUND_UP(IO_DELAY_PER_OPA_TAP, IO_DELAY_PER_DCHAIN_TAP) - 1,
+              &sdr_reg_file->dtaps_per_ptap);
+
+       /* trk_sample_count */
+       writel(7500, &sdr_reg_file->trk_sample_count);
+
+       /* longidle outer loop [15:0] */
+       writel((10 << 16) | (100 << 0), &sdr_reg_file->trk_longidle);
 
        /*
-        * compute usable version of value in case we skip full
-        * computation later
+        * longidle sample count [31:24]
+        * trfc, worst case of 933Mhz 4Gb [23:16]
+        * trcd, worst case [15:8]
+        * vfifo wait [7:0]
         */
-       dtaps_per_ptap = 0;
-       tmp_delay = 0;
-       while (tmp_delay < IO_DELAY_PER_OPA_TAP) {
-               dtaps_per_ptap++;
-               tmp_delay += IO_DELAY_PER_DCHAIN_TAP;
-       }
-       dtaps_per_ptap--;
-
-       concatenated_longidle = concatenated_longidle ^ 10;
-               /*longidle outer loop */
-       concatenated_longidle = concatenated_longidle << 16;
-       concatenated_longidle = concatenated_longidle ^ 100;
-               /*longidle sample count */
-       concatenated_delays = concatenated_delays ^ 243;
-               /* trfc, worst case of 933Mhz 4Gb */
-       concatenated_delays = concatenated_delays << 8;
-       concatenated_delays = concatenated_delays ^ 14;
-               /* trcd, worst case */
-       concatenated_delays = concatenated_delays << 8;
-       concatenated_delays = concatenated_delays ^ 10;
-               /* vfifo wait */
-       concatenated_delays = concatenated_delays << 8;
-       concatenated_delays = concatenated_delays ^ 4;
-               /* mux delay */
-
-       concatenated_rw_addr = concatenated_rw_addr ^ RW_MGR_IDLE;
-       concatenated_rw_addr = concatenated_rw_addr << 8;
-       concatenated_rw_addr = concatenated_rw_addr ^ RW_MGR_ACTIVATE_1;
-       concatenated_rw_addr = concatenated_rw_addr << 8;
-       concatenated_rw_addr = concatenated_rw_addr ^ RW_MGR_SGLE_READ;
-       concatenated_rw_addr = concatenated_rw_addr << 8;
-       concatenated_rw_addr = concatenated_rw_addr ^ RW_MGR_PRECHARGE_ALL;
-
-       concatenated_refresh = concatenated_refresh ^ RW_MGR_REFRESH_ALL;
-       concatenated_refresh = concatenated_refresh << 24;
-       concatenated_refresh = concatenated_refresh ^ 1000; /* trefi */
+       writel((243 << 24) | (14 << 16) | (10 << 8) | (4 << 0),
+              &sdr_reg_file->delays);
 
-       /* Initialize the register file with the correct data */
-       writel(dtaps_per_ptap, &sdr_reg_file->dtaps_per_ptap);
-       writel(trk_sample_count, &sdr_reg_file->trk_sample_count);
-       writel(concatenated_longidle, &sdr_reg_file->trk_longidle);
-       writel(concatenated_delays, &sdr_reg_file->delays);
-       writel(concatenated_rw_addr, &sdr_reg_file->trk_rw_mgr_addr);
-       writel(RW_MGR_MEM_IF_READ_DQS_WIDTH, &sdr_reg_file->trk_read_dqs_width);
-       writel(concatenated_refresh, &sdr_reg_file->trk_rfsh);
+       /* mux delay */
+       writel((RW_MGR_IDLE << 24) | (RW_MGR_ACTIVATE_1 << 16) |
+              (RW_MGR_SGLE_READ << 8) | (RW_MGR_PRECHARGE_ALL << 0),
+              &sdr_reg_file->trk_rw_mgr_addr);
+
+       writel(RW_MGR_MEM_IF_READ_DQS_WIDTH,
+              &sdr_reg_file->trk_read_dqs_width);
+
+       /* trefi [7:0] */
+       writel((RW_MGR_REFRESH_ALL << 24) | (1000 << 0),
+              &sdr_reg_file->trk_rfsh);
 }
 
 int sdram_calibration_full(void)
@@ -3717,13 +3672,13 @@ int sdram_calibration_full(void)
        struct param_type my_param;
        struct gbl_type my_gbl;
        uint32_t pass;
-       uint32_t i;
+
+       memset(&my_param, 0, sizeof(my_param));
+       memset(&my_gbl, 0, sizeof(my_gbl));
 
        param = &my_param;
        gbl = &my_gbl;
 
-       /* Initialize the debug mode flags */
-       gbl->phy_debug_mode_flags = 0;
        /* Set the calibration enabled by default */
        gbl->phy_debug_mode_flags |= PHY_DEBUG_ENABLE_CAL_RPT;
        /*
@@ -3743,13 +3698,6 @@ int sdram_calibration_full(void)
 
        initialize_tracking();
 
-       /* USER Enable all ranks, groups */
-       for (i = 0; i < RW_MGR_MEM_NUMBER_OF_RANKS; i++)
-               param->skip_ranks[i] = 0;
-       for (i = 0; i < NUM_SHADOW_REGS; ++i)
-               param->skip_shadow_regs[i] = 0;
-       param->skip_groups = 0;
-
        printf("%s: Preparing to start memory calibration\n", __FILE__);
 
        debug("%s:%d\n", __func__, __LINE__);
@@ -3796,7 +3744,6 @@ int sdram_calibration_full(void)
                skip_delay_mask = 0x0;
 
        pass = run_mem_calibrate();
-
-       printf("%s: Calibration complete\n", __FILE__);
+       debug_mem_calibrate(pass);
        return pass;
 }