On Thu, Apr 05, 2012 at 03:31:15PM -0700, Stephen Warren wrote: > [email protected] wrote at Wednesday, March 28, 2012 4:32 PM: > > This is a note to let you know that I've just added the patch titled > > > > ARM: tegra: select required CPU and L2 errata options > > > > to the 3.2-stable tree which can be found at: > > > > http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary > > Greg, > > Sorry for being so slow to notice this, but it looks like there was an > incorrect conflict resolution when applying this; see below. > > > The filename of the patch is: > > arm-tegra-select-required-cpu-and-l2-errata-options.patch > > and it can be found in the queue-3.2 subdirectory. > > > > If you, or anyone else, feels it should not be added to the stable tree, > > please let <[email protected]> know about it. > > > > > > From f35b431dde39fb40944d1024f08d88fbf04a3193 Mon Sep 17 00:00:00 2001 > > From: Stephen Warren <[email protected]> > > Date: Tue, 14 Feb 2012 13:39:39 -0700 > > Subject: ARM: tegra: select required CPU and L2 errata options > > > > From: Stephen Warren <[email protected]> > > > > commit f35b431dde39fb40944d1024f08d88fbf04a3193 upstream. > > > > The ARM IP revisions in Tegra are: > > Tegra20: CPU r1p1, PL310 r2p0 > > Tegra30: CPU A01=r2p7/>=A02=r2p9, NEON r2p3-50, PL310 r3p1-50 > > > > Based on work by Olof Johansson, although the actual list of errata is > > somewhat different here, since I added a bunch more and removed one PL310 > > erratum that doesn't seem applicable. > > > > Signed-off-by: Stephen Warren <[email protected]> > > Signed-off-by: Olof Johansson <[email protected]> > > Signed-off-by: Greg Kroah-Hartman <[email protected]> > > > > --- > > arch/arm/mach-tegra/Kconfig | 12 ++++++++++++ > > 1 file changed, 12 insertions(+) > > > > --- a/arch/arm/mach-tegra/Kconfig > > +++ b/arch/arm/mach-tegra/Kconfig > > @@ -13,6 +13,13 @@ config ARCH_TEGRA_2x_SOC > > select USB_ARCH_HAS_EHCI if USB_SUPPORT > > select USB_ULPI if USB_SUPPORT > > select USB_ULPI_VIEWPORT if USB_SUPPORT > > + select ARM_ERRATA_720789 > > + select ARM_ERRATA_742230 > > + select ARM_ERRATA_751472 > > + select ARM_ERRATA_754327 > > + select ARM_ERRATA_764369 > > + select PL310_ERRATA_727915 if CACHE_L2X0 > > + select PL310_ERRATA_769419 if CACHE_L2X0 > > help > > Support for NVIDIA Tegra AP20 and T20 processors, based on the > > ARM CortexA9MP CPU and the ARM PL310 L2 cache controller > > That chunk is OK. > > > @@ -54,6 +61,11 @@ config MACH_SEABOARD > > config MACH_TEGRA_DT > > bool "Generic Tegra board (FDT support)" > > select USE_OF > > + select ARM_ERRATA_743622 > > + select ARM_ERRATA_751472 > > + select ARM_ERRATA_754322 > > + select ARM_ERRATA_764369 > > + select PL310_ERRATA_769419 if CACHE_L2X0 > > help > > Support for generic nVidia Tegra boards using Flattened Device Tree > > But that's wrong; in the upstream commit, that chunk was applied to the > ARCH_TEGRA_3x_SOC config option, which was only introduced in v3.3. Before > that, this second chunk should simply be dropped.
Ugh. Thanks for catching that. > I note that this patch failed to apply 3.0-stable because of this issue. > I'm not sure why it didn't also fail against 3.2-stable? Me either, I need to revisit my "apply this patch" script to catch this type of thing better. quilt is being a bit too "loose" at times and for some reason, I'm not noticing it, I'll work on that next week, as it is sorely needed. Thanks for the fix-up patch, I'll go queue it up now. greg k-h -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
