Message ID | 1362439781-21480-1-git-send-email-swarren@wwwdotorg.org |
---|---|
State | Accepted |
Delegated to: | Albert ARIBAUD |
Headers | show |
Hi Tom, On Thu, 21 Mar 2013 09:29:14 -0700, Tom Warren <TWarren@nvidia.com> wrote: > Albert, > > > -----Original Message----- > > From: Stephen Warren [mailto:swarren@wwwdotorg.org] > > Sent: Monday, March 04, 2013 4:30 PM > > To: u-boot@lists.denx.de; Albert Aribaud > > Cc: Simon Glass; Tom Warren; Stephen Warren > > Subject: [PATCH 1/2] ARM: implement erratum 716044 workaround > > This patchset from Stephen (includes "2/2 ARM: tegra: enable workaround for ARM erratum 716044") are both assigned to you in PatchWork, but haven't been applied yet to ARM/master AFAICT. I found them when I was searching for unapplied Tegra patches. > > Could you please take this in thru the ARM tree ASAP? Will take them in later today. Want an ARM PR once done? > Thanks, > > Tom Amicalement,
Hi Tom, On Thu, 21 Mar 2013 11:35:11 -0700, Tom Warren <TWarren@nvidia.com> wrote: > Albert, > > > -----Original Message----- > > From: Albert ARIBAUD [mailto:albert.u.boot@aribaud.net] > > Sent: Thursday, March 21, 2013 10:56 AM > > To: Tom Warren > > Cc: u-boot@lists.denx.de; Simon Glass; Stephen Warren; Tom Warren; > > Stephen Warren > > Subject: Re: [PATCH 1/2] ARM: implement erratum 716044 workaround > > > > Hi Tom, > > > > On Thu, 21 Mar 2013 09:29:14 -0700, Tom Warren <TWarren@nvidia.com> > > wrote: > > > > > Albert, > > > > > > > -----Original Message----- > > > > From: Stephen Warren [mailto:swarren@wwwdotorg.org] > > > > Sent: Monday, March 04, 2013 4:30 PM > > > > To: u-boot@lists.denx.de; Albert Aribaud > > > > Cc: Simon Glass; Tom Warren; Stephen Warren > > > > Subject: [PATCH 1/2] ARM: implement erratum 716044 workaround > > > > > > This patchset from Stephen (includes "2/2 ARM: tegra: enable workaround > > for ARM erratum 716044") are both assigned to you in PatchWork, but > > haven't been applied yet to ARM/master AFAICT. I found them when I was > > searching for unapplied Tegra patches. > > > > > > Could you please take this in thru the ARM tree ASAP? > > > > Will take them in later today. Want an ARM PR once done? > Just a notice that they're in TOT u-boot-arm/master, and I'll rebase u-boot-tegra/next against it. Hmm... I don't see them in ARM ToT on my side. Can you point me to the commit ID? > Thanks, > > Tom Amicalement,
Hi Tom, On Fri, 22 Mar 2013 08:24:14 -0700, Tom Warren <TWarren@nvidia.com> wrote: > Albert, > > > -----Original Message----- > > From: Albert ARIBAUD [mailto:albert.u.boot@aribaud.net] > > Sent: Thursday, March 21, 2013 11:34 PM > > To: Tom Warren > > Cc: u-boot@lists.denx.de; Tom Warren; Stephen Warren > > Subject: Re: [U-Boot] [PATCH 1/2] ARM: implement erratum 716044 > > workaround > > > > Hi Tom, > > > > On Thu, 21 Mar 2013 11:35:11 -0700, Tom Warren <TWarren@nvidia.com> > > wrote: > > > > > Albert, > > > > > > > -----Original Message----- > > > > From: Albert ARIBAUD [mailto:albert.u.boot@aribaud.net] > > > > Sent: Thursday, March 21, 2013 10:56 AM > > > > To: Tom Warren > > > > Cc: u-boot@lists.denx.de; Simon Glass; Stephen Warren; Tom Warren; > > > > Stephen Warren > > > > Subject: Re: [PATCH 1/2] ARM: implement erratum 716044 workaround > > > > > > > > Hi Tom, > > > > > > > > On Thu, 21 Mar 2013 09:29:14 -0700, Tom Warren <TWarren@nvidia.com> > > > > wrote: > > > > > > > > > Albert, > > > > > > > > > > > -----Original Message----- > > > > > > From: Stephen Warren [mailto:swarren@wwwdotorg.org] > > > > > > Sent: Monday, March 04, 2013 4:30 PM > > > > > > To: u-boot@lists.denx.de; Albert Aribaud > > > > > > Cc: Simon Glass; Tom Warren; Stephen Warren > > > > > > Subject: [PATCH 1/2] ARM: implement erratum 716044 workaround > > > > > > > > > > This patchset from Stephen (includes "2/2 ARM: tegra: enable > > > > > workaround > > > > for ARM erratum 716044") are both assigned to you in PatchWork, but > > > > haven't been applied yet to ARM/master AFAICT. I found them when I > > > > was searching for unapplied Tegra patches. > > > > > > > > > > Could you please take this in thru the ARM tree ASAP? > > > > > > > > Will take them in later today. Want an ARM PR once done? > > > Just a notice that they're in TOT u-boot-arm/master, and I'll rebase u-boot- > > tegra/next against it. > > > > Hmm... I don't see them in ARM ToT on my side. Can you point me to the > > commit ID? > I think there's some confusion here. You asked if I wanted an ARM PR - I assume you thought I was Tom Rini? > > I'm Tom Warren, the Tegra custodian. I'd like to see this patchset (ARM errata 716044, 2 parts, from Stephen Warren, assigned to you in PatchWork) pulled into u-boot-arm/master. Once that happens, if you let me know it's done, I can rebase u-boot-tegra.git against u-boot-arm.git so that it's pulled into the Tegra repo. I had indeed ask if a PR was wanted, i.e. if you wanted the commits to also go to u-boot/master, as the request seemed urgent and some people prefer to use the mainline tree as their reference. But I did mis-understand something: when you said "just a notice etc", I took this as meaning you were making the notice to me that the commits were actually there, while you were saying "no PR needed, a simple notice will do". Apologies for this msistake. I am build-testing the two changes and will push them as soon as done. > Thanks, > > Tom Warren Amicalement,
Hi Tom, On Thu, 21 Mar 2013 11:35:11 -0700, Tom Warren <TWarren@nvidia.com> wrote: > Albert, > > > -----Original Message----- > > From: Albert ARIBAUD [mailto:albert.u.boot@aribaud.net] > > Sent: Thursday, March 21, 2013 10:56 AM > > To: Tom Warren > > Cc: u-boot@lists.denx.de; Simon Glass; Stephen Warren; Tom Warren; > > Stephen Warren > > Subject: Re: [PATCH 1/2] ARM: implement erratum 716044 workaround > > > > Hi Tom, > > > > On Thu, 21 Mar 2013 09:29:14 -0700, Tom Warren <TWarren@nvidia.com> > > wrote: > > > > > Albert, > > > > > > > -----Original Message----- > > > > From: Stephen Warren [mailto:swarren@wwwdotorg.org] > > > > Sent: Monday, March 04, 2013 4:30 PM > > > > To: u-boot@lists.denx.de; Albert Aribaud > > > > Cc: Simon Glass; Tom Warren; Stephen Warren > > > > Subject: [PATCH 1/2] ARM: implement erratum 716044 workaround > > > > > > This patchset from Stephen (includes "2/2 ARM: tegra: enable workaround > > for ARM erratum 716044") are both assigned to you in PatchWork, but > > haven't been applied yet to ARM/master AFAICT. I found them when I was > > searching for unapplied Tegra patches. > > > > > > Could you please take this in thru the ARM tree ASAP? > > > > Will take them in later today. Want an ARM PR once done? > Just a notice that they're in TOT u-boot-arm/master, and I'll rebase u-boot-tegra/next against it. Here is said notice, with my apologies for the misunderstanding. Amicalement,
diff --git a/README b/README index f2b1c88..97ef9f0 100644 --- a/README +++ b/README @@ -485,6 +485,7 @@ The following options need to be configured: Thumb2 this flag will result in Thumb2 code generated by GCC. + CONFIG_ARM_ERRATA_716044 CONFIG_ARM_ERRATA_742230 CONFIG_ARM_ERRATA_743622 CONFIG_ARM_ERRATA_751472 diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S index 30f02d3..6834ffe 100644 --- a/arch/arm/cpu/armv7/start.S +++ b/arch/arm/cpu/armv7/start.S @@ -310,6 +310,12 @@ ENTRY(cpu_init_cp15) #endif mcr p15, 0, r0, c1, c0, 0 +#ifdef CONFIG_ARM_ERRATA_716044 + mrc p15, 0, r0, c1, c0, 0 @ read system control register + orr r0, r0, #1 << 11 @ set bit #11 + mcr p15, 0, r0, c1, c0, 0 @ write system control register +#endif + #ifdef CONFIG_ARM_ERRATA_742230 mrc p15, 0, r0, c15, c0, 1 @ read diagnostic register orr r0, r0, #1 << 4 @ set bit #4