p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mmc: sunxi: Always set signal delay to 0 for A64 

Experience have shown that the using the  autocalibration could severely
degrade the performances of the MMC bus.

Allwinner is using in its BSP a delay set to 0 for all the modes but HS400.
Remove the calibration code for now, and add comments to document our
findings.

Reviewed-by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Tested-by: Florian Vaussard <florian.vaussard@heig-vd.ch>
Acked-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Maxime Ripard 2017-01-27 22:38:35 +01:00 committed by Ulf Hansson
parent 9479074e93
commit 860fdf89b9
1 changed files with 17 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
drivers/mmc/host/sunxi-mmc.c
View File

@ -683,41 +683,19 @@ static int sunxi_mmc_oclk_onoff(struct sunxi_mmc_host *host, u32 oclk_en)
static int sunxi_mmc_calibrate(struct sunxi_mmc_host *host, int reg_off) static int sunxi_mmc_calibrate(struct sunxi_mmc_host *host, int reg_off)
{ {
u32 reg = readl(host->reg_base + reg_off);
u32 delay;
unsigned long timeout;
if (!host->cfg->can_calibrate) if (!host->cfg->can_calibrate)
return 0; return 0;
reg &= ~(SDXC_CAL_DL_MASK << SDXC_CAL_DL_SW_SHIFT); /*
reg &= ~SDXC_CAL_DL_SW_EN; * FIXME:
* This is not clear how the calibration is supposed to work
writel(reg | SDXC_CAL_START, host->reg_base + reg_off); * yet. The best rate have been obtained by simply setting the
* delay to 0, as Allwinner does in its BSP.
dev_dbg(mmc_dev(host->mmc), "calibration started\n"); *
* The only mode that doesn't have such a delay is HS400, that
timeout = jiffies + HZ * SDXC_CAL_TIMEOUT; * is in itself a TODO.
*/
while (!((reg = readl(host->reg_base + reg_off)) & SDXC_CAL_DONE)) { writel(SDXC_CAL_DL_SW_EN, host->reg_base + reg_off);
if (time_before(jiffies, timeout))
cpu_relax();
else {
reg &= ~SDXC_CAL_START;
writel(reg, host->reg_base + reg_off);
return -ETIMEDOUT;
}
}
delay = (reg >> SDXC_CAL_DL_SHIFT) & SDXC_CAL_DL_MASK;
reg &= ~SDXC_CAL_START;
reg |= (delay << SDXC_CAL_DL_SW_SHIFT) | SDXC_CAL_DL_SW_EN;
writel(reg, host->reg_base + reg_off);
dev_dbg(mmc_dev(host->mmc), "calibration ended, reg is 0x%x\n", reg);
return 0; return 0;
} }
@ -809,7 +787,13 @@ static int sunxi_mmc_clk_set_rate(struct sunxi_mmc_host *host,
if (ret) if (ret)
return ret; return ret;
/* TODO: enable calibrate on sdc2 SDXC_REG_DS_DL_REG of A64 */ /*
* FIXME:
*
* In HS400 we'll also need to calibrate the data strobe
* signal. This should only happen on the MMC2 controller (at
* least on the A64).
*/
return sunxi_mmc_oclk_onoff(host, 1); return sunxi_mmc_oclk_onoff(host, 1);
} }