linux-next: manual merge of the tegra tree with the tree

linux-next: manual merge of the tegra tree with the tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 551 bytes --]

Hi all,

Today's linux-next merge of the tegra tree got a conflict in
arch/arm/mach-tegra/devices.c arch/arm/mach-tegra/devices.h between
commits 2db4ddfe6e23 ("ARM: pmu: remove arm_pmu_type enumeration") from
the arm-perf tree and 1ba8216f0bc0 ("usb: move phy driver from mach-tegra
to drivers/usb") from the usb tree and commit ba07ee57d4bc ("ARM: tegra:
remove dead code") from the tegra tree.

The latter removed the files, so I did that (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the tegra tree with the tree

[Greg KH]

On Wed, Sep 12, 2012 at 04:43:53PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the tegra tree got a conflict in
> arch/arm/mach-tegra/devices.c arch/arm/mach-tegra/devices.h between
> commits 2db4ddfe6e23 ("ARM: pmu: remove arm_pmu_type enumeration") from
> the arm-perf tree and 1ba8216f0bc0 ("usb: move phy driver from mach-tegra
> to drivers/usb") from the usb tree and commit ba07ee57d4bc ("ARM: tegra:
> remove dead code") from the tegra tree.
> 
> The latter removed the files, so I did that (no action is required).

Stephen (Warren that is), should be fixing this up in his tree soon, as
he will be including the same patchset that caused this problem in his
tree to resolve this.

thanks,

greg k-h

RE: linux-next: manual merge of the tegra tree with the tree

[Stephen Warren]

Greg KH wrote at Wednesday, September 12, 2012 10:12 AM:
> On Wed, Sep 12, 2012 at 04:43:53PM +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the tegra tree got a conflict in
> > arch/arm/mach-tegra/devices.c arch/arm/mach-tegra/devices.h between
> > commits 2db4ddfe6e23 ("ARM: pmu: remove arm_pmu_type enumeration") from
> > the arm-perf tree and 1ba8216f0bc0 ("usb: move phy driver from mach-tegra
> > to drivers/usb") from the usb tree and commit ba07ee57d4bc ("ARM: tegra:
> > remove dead code") from the tegra tree.
> >
> > The latter removed the files, so I did that (no action is required).
> 
> Stephen (Warren that is), should be fixing this up in his tree soon, as
> he will be including the same patchset that caused this problem in his
> tree to resolve this.

This issue is something else; the issue we've been discussing doesn't 
cause any merge conflict in linux-next, but rather causes a build failure
once the two trees are merged together (due to a new #include of a file
that got renamed elsewhere). I've already re-generated my for-next to
avoid that issue in tomorrow's linux-next.

-- 
nvpublic

Re: linux-next: manual merge of the tegra tree with the tree

[Will Deacon]

On Wed, Jan 09, 2013 at 02:58:16AM +0000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the tegra tree got a conflict in
> arch/arm/mach-tegra/headsmp.S between commit bc4f1bdabc89 ("ARM:
> coresight: common definition for (OS) Lock Access Register key value")
> from the arm-perf tree and commit 2a3eb5bc45bd ("ARM: tegra: make device
> can run on UP") from the tegra tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Argh, given that these two trees won't likely meet outside of next until
they hit torvalds, I'll just drop my tegra change from hw-breakpoint as it's
only cosmetic. I can requeue it via Stephen later on.

Thanks,

Will

linux-next: manual merge of the tegra tree with the tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2848 bytes --]

Hi all,

Today's linux-next merge of the tegra tree got a conflict in
arch/arm/mach-tegra/headsmp.S between commit bc4f1bdabc89 ("ARM:
coresight: common definition for (OS) Lock Access Register key value")
from the arm-perf tree and commit 2a3eb5bc45bd ("ARM: tegra: make device
can run on UP") from the tegra tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-tegra/headsmp.S
index b154213,fd473f2..0000000
--- a/arch/arm/mach-tegra/headsmp.S
+++ b/arch/arm/mach-tegra/headsmp.S
@@@ -1,67 -1,9 +1,11 @@@
  #include <linux/linkage.h>
  #include <linux/init.h>
  
- #include <asm/cache.h>
- #include <asm/asm-offsets.h>
- #include <asm/hardware/cache-l2x0.h>
 +#include <asm/hardware/coresight.h>
 +
- #include "flowctrl.h"
- #include "iomap.h"
- #include "reset.h"
  #include "sleep.h"
  
- #define APB_MISC_GP_HIDREV	0x804
- #define PMC_SCRATCH41	0x140
- 
- #define RESET_DATA(x)	((TEGRA_RESET_##x)*4)
- 
          .section ".text.head", "ax"
- 	__CPUINIT
- 
- /*
-  * Tegra specific entry point for secondary CPUs.
-  *   The secondary kernel init calls v7_flush_dcache_all before it enables
-  *   the L1; however, the L1 comes out of reset in an undefined state, so
-  *   the clean + invalidate performed by v7_flush_dcache_all causes a bunch
-  *   of cache lines with uninitialized data and uninitialized tags to get
-  *   written out to memory, which does really unpleasant things to the main
-  *   processor.  We fix this by performing an invalidate, rather than a
-  *   clean + invalidate, before jumping into the kernel.
-  */
- ENTRY(v7_invalidate_l1)
-         mov     r0, #0
-         mcr     p15, 2, r0, c0, c0, 0
-         mrc     p15, 1, r0, c0, c0, 0
- 
-         ldr     r1, =0x7fff
-         and     r2, r1, r0, lsr #13
- 
-         ldr     r1, =0x3ff
- 
-         and     r3, r1, r0, lsr #3  @ NumWays - 1
-         add     r2, r2, #1          @ NumSets
- 
-         and     r0, r0, #0x7
-         add     r0, r0, #4          @ SetShift
- 
-         clz     r1, r3              @ WayShift
-         add     r4, r3, #1          @ NumWays
- 1:      sub     r2, r2, #1          @ NumSets--
-         mov     r3, r4              @ Temp = NumWays
- 2:      subs    r3, r3, #1          @ Temp--
-         mov     r5, r3, lsl r1
-         mov     r6, r2, lsl r0
-         orr     r5, r5, r6          @ Reg = (Temp<<WayShift)|(NumSets<<SetShift)
-         mcr     p15, 0, r5, c7, c6, 2
-         bgt     2b
-         cmp     r2, #0
-         bgt     1b
-         dsb
-         isb
-         mov     pc, lr
- ENDPROC(v7_invalidate_l1)
- 
  
  ENTRY(tegra_secondary_startup)
          bl      v7_invalidate_l1

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the tegra tree with the tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 597 bytes --]

Hi Stephen,

On Thu, 08 Dec 2011 21:37:19 -0700 Stephen Warren <swarren@nvidia.com> wrote:
>
> I'm not very familiar with git diff for merge conflicts, so I might be
> wrong here, but I did reproduce this conflict to investigate, and I
> think your fixup isn't quite correct.
> 
> I think you're left with two separate copies of the macro
> arch_ret_to_user, and your conflict resolution diff should be more like
> that below:

Good catch!  I have fixed it up for next time.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the tegra tree with the tree

[Stephen Warren]

On 12/08/2011 05:47 PM, Stephen Rothwell wrote:
> * PGP Signed by an unknown key
> 
> Hi all,
> 
> Today's linux-next merge of the tegra tree got a conflict in
> arch/arm/mach-tegra/include/mach/entry-macro.S between commit
> afed2a261825 ("ARM: tegra2: convert to CONFIG_MULTI_IRQ_HANDLER") from
> the arm tree and commit f5ce5e7e9cc3 (arm/tegra: Remove code that's
> ifndef CONFIG_ARM_GIC"") from the tegra tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

StephenR,

I'm not very familiar with git diff for merge conflicts, so I might be
wrong here, but I did reproduce this conflict to investigate, and I
think your fixup isn't quite correct.

I think you're left with two separate copies of the macro
arch_ret_to_user, and your conflict resolution diff should be more like
that below:

diff --git a/arch/arm/mach-tegra/include/mach/entry-macro.S
b/arch/arm/mach-tegra/include/mach/entry-macro.S
index ac11262..e577cfe 100644
--- a/arch/arm/mach-tegra/include/mach/entry-macro.S
+++ b/arch/arm/mach-tegra/include/mach/entry-macro.S
@@ -18,21 +18,3 @@

        .macro  arch_ret_to_user, tmp1, tmp2
        .endm
-
-#if !defined(CONFIG_ARM_GIC)
-       /* legacy interrupt controller for AP16 */
-
-       .macro  get_irqnr_preamble, base, tmp
-       @ enable imprecise aborts
-       cpsie   a
-       @ EVP base at 0xf010f000
-       mov \base, #0xf0000000
-       orr \base, #0x00100000
-       orr \base, #0x0000f000
-       .endm
-
-       .macro  get_irqnr_and_base, irqnr, irqstat, base, tmp
-       ldr \irqnr, [\base, #0x20]      @ EVT_IRQ_STS
-       cmp \irqnr, #0x80
-       .endm
-#endif

Thanks for the work on linux-next.

-- 
nvpublic

linux-next: manual merge of the tegra tree with the tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1391 bytes --]

Hi all,

Today's linux-next merge of the tegra tree got a conflict in
arch/arm/mach-tegra/include/mach/entry-macro.S between commit
afed2a261825 ("ARM: tegra2: convert to CONFIG_MULTI_IRQ_HANDLER") from
the arm tree and commit f5ce5e7e9cc3 (arm/tegra: Remove code that's
ifndef CONFIG_ARM_GIC"") from the tegra tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-tegra/include/mach/entry-macro.S
index ac11262,485a11e..0000000
--- a/arch/arm/mach-tegra/include/mach/entry-macro.S
+++ b/arch/arm/mach-tegra/include/mach/entry-macro.S
@@@ -16,23 -24,10 +16,8 @@@
  	.macro	disable_fiq
  	.endm
  
 -	.macro	get_irqnr_preamble, base, tmp
 -	movw \base, #(ICTRL_BASE & 0x0000ffff)
 -	movt \base, #((ICTRL_BASE & 0xffff0000) >> 16)
 +	.macro	arch_ret_to_user, tmp1, tmp2
  	.endm
  
- #if !defined(CONFIG_ARM_GIC)
- 	/* legacy interrupt controller for AP16 */
- 
- 	.macro	get_irqnr_preamble, base, tmp
- 	@ enable imprecise aborts
- 	cpsie	a
- 	@ EVP base at 0xf010f000
- 	mov \base, #0xf0000000
- 	orr \base, #0x00100000
- 	orr \base, #0x0000f000
- 	.endm
- 
- 	.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp
- 	ldr \irqnr, [\base, #0x20]	@ EVT_IRQ_STS
- 	cmp \irqnr, #0x80
+ 	.macro  arch_ret_to_user, tmp1, tmp2
  	.endm
- #endif

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]