| Message ID | E1WTYZ1-0007Gn-3J@rmk-PC.arm.linux.org.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
* Russell King <rmk+kernel@arm.linux.org.uk> [140328 08:22]: Missing description? > Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> > --- > arch/arm/mach-omap2/omap4-common.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/arch/arm/mach-omap2/omap4-common.c b/arch/arm/mach-omap2/omap4-common.c > index ce2fad84a43c..c0f9a81a2d32 100644 > --- a/arch/arm/mach-omap2/omap4-common.c > +++ b/arch/arm/mach-omap2/omap4-common.c > @@ -212,20 +212,18 @@ static int __init omap_l2_cache_init(void) > return -ENOMEM; > > /* 16-way associativity, parity disabled, way size - 64KB (es2.0 +) */ > - aux_ctrl = L310_AUX_CTRL_ASSOCIATIVITY_16 | > - L310_AUX_CTRL_CACHE_REPLACE_RR | > + aux_ctrl = L310_AUX_CTRL_CACHE_REPLACE_RR | > L310_AUX_CTRL_NS_LOCKDOWN | > L310_AUX_CTRL_NS_INT_CTRL | > - L2C_AUX_CTRL_WAY_SIZE(3) | > L2C_AUX_CTRL_SHARED_OVERRIDE | > L310_AUX_CTRL_DATA_PREFETCH | > L310_AUX_CTRL_INSTR_PREFETCH; > > outer_cache.write_sec = omap4_l2c310_write_sec; > if (of_have_populated_dt()) > - l2x0_of_init(aux_ctrl, L2X0_AUX_CTRL_MASK); > + l2x0_of_init(aux_ctrl, 0xc19fffff); > else > - l2x0_init(l2cache_base, aux_ctrl, L2X0_AUX_CTRL_MASK); > + l2x0_init(l2cache_base, aux_ctrl, 0xc19fffff); > > return 0; > } > -- > 1.8.3.1 > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Mar 28, 2014 at 09:03:59AM -0700, Tony Lindgren wrote: > * Russell King <rmk+kernel@arm.linux.org.uk> [140328 08:22]: > > Missing description? No, I just got sick and tired of trying to write descriptions for these patches. Many of these I regard as totally unnecessary patches that should never have been required had platform folk not invested in cargo cult programming. Given the number of patches I'm presently dealing with in my tree right now, I don't actually have time to even follow the mailing lists at the moment. If I were to properly describe all of these patches, I'd probably be at this for another few weeks. So, I'm at the point of "what you see is what you've got" as far as the descriptions go... it's going to cause me a /lot/ of pain to just add all the acks I'm going to need to these patches. And... don't expect me to send the series out again any time soon to LAKML - it's taken four to five hours for all these patches to filter through the lists.
* Russell King - ARM Linux <linux@arm.linux.org.uk> [140328 14:13]: > On Fri, Mar 28, 2014 at 09:03:59AM -0700, Tony Lindgren wrote: > > * Russell King <rmk+kernel@arm.linux.org.uk> [140328 08:22]: > > > > Missing description? > > No, I just got sick and tired of trying to write descriptions for these > patches. Many of these I regard as totally unnecessary patches that > should never have been required had platform folk not invested in > cargo cult programming. > > Given the number of patches I'm presently dealing with in my tree right > now, I don't actually have time to even follow the mailing lists at the > moment. If I were to properly describe all of these patches, I'd > probably be at this for another few weeks. Heh well I have a feeling you'll add some generic description anyways :) > So, I'm at the point of "what you see is what you've got" as far as the > descriptions go... it's going to cause me a /lot/ of pain to just add > all the acks I'm going to need to these patches. In that case here's one more painful ack for this patch: Acked-by: Tony Lindgren <tony@atomide.com> > And... don't expect me to send the series out again any time soon to > LAKML - it's taken four to five hours for all these patches to filter > through the lists. No need to repost on my part. Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Mar 28, 2014 at 03:21:59PM -0700, Tony Lindgren wrote: > * Russell King - ARM Linux <linux@arm.linux.org.uk> [140328 14:13]: > > On Fri, Mar 28, 2014 at 09:03:59AM -0700, Tony Lindgren wrote: > > > * Russell King <rmk+kernel@arm.linux.org.uk> [140328 08:22]: > > > > > > Missing description? > > > > No, I just got sick and tired of trying to write descriptions for these > > patches. Many of these I regard as totally unnecessary patches that > > should never have been required had platform folk not invested in > > cargo cult programming. > > > > Given the number of patches I'm presently dealing with in my tree right > > now, I don't actually have time to even follow the mailing lists at the > > moment. If I were to properly describe all of these patches, I'd > > probably be at this for another few weeks. > > Heh well I have a feeling you'll add some generic description anyways :) If I end up merging each of these patches removingthe cache override together into one commit touching many of the SoCs, then yes.
diff --git a/arch/arm/mach-omap2/omap4-common.c b/arch/arm/mach-omap2/omap4-common.c index ce2fad84a43c..c0f9a81a2d32 100644 --- a/arch/arm/mach-omap2/omap4-common.c +++ b/arch/arm/mach-omap2/omap4-common.c @@ -212,20 +212,18 @@ static int __init omap_l2_cache_init(void) return -ENOMEM; /* 16-way associativity, parity disabled, way size - 64KB (es2.0 +) */ - aux_ctrl = L310_AUX_CTRL_ASSOCIATIVITY_16 | - L310_AUX_CTRL_CACHE_REPLACE_RR | + aux_ctrl = L310_AUX_CTRL_CACHE_REPLACE_RR | L310_AUX_CTRL_NS_LOCKDOWN | L310_AUX_CTRL_NS_INT_CTRL | - L2C_AUX_CTRL_WAY_SIZE(3) | L2C_AUX_CTRL_SHARED_OVERRIDE | L310_AUX_CTRL_DATA_PREFETCH | L310_AUX_CTRL_INSTR_PREFETCH; outer_cache.write_sec = omap4_l2c310_write_sec; if (of_have_populated_dt()) - l2x0_of_init(aux_ctrl, L2X0_AUX_CTRL_MASK); + l2x0_of_init(aux_ctrl, 0xc19fffff); else - l2x0_init(l2cache_base, aux_ctrl, L2X0_AUX_CTRL_MASK); + l2x0_init(l2cache_base, aux_ctrl, 0xc19fffff); return 0; }
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> --- arch/arm/mach-omap2/omap4-common.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)