On Thu, Oct 6, 2011 at 1:56 PM, Paul Walmsley <paul@xxxxxxxxx> wrote: > > The HSMMC1/HSMMC2 host controllers on OMAP34xx and > OMAP3503/3515/3525/3530 chips at ES levels prior to 3.0 can't do multiple > block reads[1]. Mark the hwmod data appropriately. > > Reported by Dave Hylands <dhylands@xxxxxxxxx> and Steve Sakoman > <sakoman@xxxxxxxxx>. > > 1. See for example Advisory 2.1.1.128 "MMC: Multiple Block Read > Operation Issue" in _OMAP3530/3525/3515/3503 Silicon Errata_ > Revision F (October 2010) (SPRZ278F), available from > http://focus.ti.com/lit/er/sprz278f/sprz278f.pdf > > Signed-off-by: Paul Walmsley <paul@xxxxxxxxx> > Cc: Dave Hylands <dhylands@xxxxxxxxx> > Cc: Steve Sakoman <sakoman@xxxxxxxxx> > --- > > This patch has a dependency on the "MMC: disable multiblock reads on > controllers that don't support them" series recently posted to > the linux-mmc list, so the application of this patch will probably be > delayed until the 3.3 merge window. Since the above patch is now in mainline (2bf22b39823c1d173dda31111a4eb2ce36daaf39) this patch can go in. Without it 35XXES2.1 systems have broken mmc. Too late as a bug fix for 3.2? Steve > arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 90 ++++++++++++++++++++++++++- > 1 files changed, 86 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c > index 53b6706..a14d150 100644 > --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c > +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c > @@ -3020,7 +3020,35 @@ static struct omap_mmc_dev_attr mmc1_dev_attr = { > .flags = OMAP_HSMMC_SUPPORTS_DUAL_VOLT, > }; > > -static struct omap_hwmod omap3xxx_mmc1_hwmod = { > +/* See 35xx errata 2.1.1.128 in SPRZ278F */ > +static struct omap_mmc_dev_attr mmc1_pre_es3_dev_attr = { > + .flags = (OMAP_HSMMC_SUPPORTS_DUAL_VOLT | > + OMAP_HSMMC_BROKEN_MULTIBLOCK_READ), > +}; > + > +static struct omap_hwmod omap3xxx_pre_es3_mmc1_hwmod = { > + .name = "mmc1", > + .mpu_irqs = omap34xx_mmc1_mpu_irqs, > + .sdma_reqs = omap34xx_mmc1_sdma_reqs, > + .opt_clks = omap34xx_mmc1_opt_clks, > + .opt_clks_cnt = ARRAY_SIZE(omap34xx_mmc1_opt_clks), > + .main_clk = "mmchs1_fck", > + .prcm = { > + .omap2 = { > + .module_offs = CORE_MOD, > + .prcm_reg_id = 1, > + .module_bit = OMAP3430_EN_MMC1_SHIFT, > + .idlest_reg_id = 1, > + .idlest_idle_bit = OMAP3430_ST_MMC1_SHIFT, > + }, > + }, > + .dev_attr = &mmc1_pre_es3_dev_attr, > + .slaves = omap3xxx_mmc1_slaves, > + .slaves_cnt = ARRAY_SIZE(omap3xxx_mmc1_slaves), > + .class = &omap34xx_mmc_class, > +}; > + > +static struct omap_hwmod omap3xxx_es3plus_mmc1_hwmod = { > .name = "mmc1", > .mpu_irqs = omap34xx_mmc1_mpu_irqs, > .sdma_reqs = omap34xx_mmc1_sdma_reqs, > @@ -3063,7 +3091,34 @@ static struct omap_hwmod_ocp_if *omap3xxx_mmc2_slaves[] = { > &omap3xxx_l4_core__mmc2, > }; > > -static struct omap_hwmod omap3xxx_mmc2_hwmod = { > +/* See 35xx errata 2.1.1.128 in SPRZ278F */ > +static struct omap_mmc_dev_attr mmc2_pre_es3_dev_attr = { > + .flags = OMAP_HSMMC_BROKEN_MULTIBLOCK_READ, > +}; > + > +static struct omap_hwmod omap3xxx_pre_es3_mmc2_hwmod = { > + .name = "mmc2", > + .mpu_irqs = omap34xx_mmc2_mpu_irqs, > + .sdma_reqs = omap34xx_mmc2_sdma_reqs, > + .opt_clks = omap34xx_mmc2_opt_clks, > + .opt_clks_cnt = ARRAY_SIZE(omap34xx_mmc2_opt_clks), > + .main_clk = "mmchs2_fck", > + .prcm = { > + .omap2 = { > + .module_offs = CORE_MOD, > + .prcm_reg_id = 1, > + .module_bit = OMAP3430_EN_MMC2_SHIFT, > + .idlest_reg_id = 1, > + .idlest_idle_bit = OMAP3430_ST_MMC2_SHIFT, > + }, > + }, > + .dev_attr = &mmc2_pre_es3_dev_attr, > + .slaves = omap3xxx_mmc2_slaves, > + .slaves_cnt = ARRAY_SIZE(omap3xxx_mmc2_slaves), > + .class = &omap34xx_mmc_class, > +}; > + > +static struct omap_hwmod omap3xxx_es3plus_mmc2_hwmod = { > .name = "mmc2", > .mpu_irqs = omap34xx_mmc2_mpu_irqs, > .sdma_reqs = omap34xx_mmc2_sdma_reqs, > @@ -3130,8 +3185,6 @@ static __initdata struct omap_hwmod *omap3xxx_hwmods[] = { > &omap3xxx_l4_core_hwmod, > &omap3xxx_l4_per_hwmod, > &omap3xxx_l4_wkup_hwmod, > - &omap3xxx_mmc1_hwmod, > - &omap3xxx_mmc2_hwmod, > &omap3xxx_mmc3_hwmod, > &omap3xxx_mpu_hwmod, > &omap3xxx_iva_hwmod, > @@ -3209,6 +3262,20 @@ static __initdata struct omap_hwmod *omap3430es2plus_hwmods[] = { > NULL > }; > > +/* <= 3430ES3-only hwmods */ > +static __initdata struct omap_hwmod *omap3430_pre_es3_hwmods[] = { > + &omap3xxx_pre_es3_mmc1_hwmod, > + &omap3xxx_pre_es3_mmc2_hwmod, > + NULL > +}; > + > +/* 3430ES3+-only hwmods */ > +static __initdata struct omap_hwmod *omap3430_es3plus_hwmods[] = { > + &omap3xxx_es3plus_mmc1_hwmod, > + &omap3xxx_es3plus_mmc2_hwmod, > + NULL > +}; > + > /* 34xx-only hwmods (all ES revisions) */ > static __initdata struct omap_hwmod *omap34xx_hwmods[] = { > &omap34xx_sr1_hwmod, > @@ -3281,6 +3348,21 @@ int __init omap3xxx_hwmod_init(void) > h = omap3430es2plus_hwmods; > }; > > + if (h) { > + r = omap_hwmod_register(h); > + if (IS_ERR_VALUE(r)) > + return r; > + } > + > + h = NULL; > + if (rev == OMAP3430_REV_ES1_0 || rev == OMAP3430_REV_ES2_0 || > + rev == OMAP3430_REV_ES2_1) { > + h = omap3430_pre_es3_hwmods; > + } else if (rev == OMAP3430_REV_ES3_0 || rev == OMAP3430_REV_ES3_1 || > + rev == OMAP3430_REV_ES3_1_2) { > + h = omap3430_es3plus_hwmods; > + }; > + > if (h) > r = omap_hwmod_register(h); > > -- > 1.7.6.3 > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
