* linux-next: manual merge of the kvm-ppc tree with the powerpc tree
@ 2012-07-12 3:57 ` Stephen Rothwell
0 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2012-07-12 3:57 UTC (permalink / raw)
To: Alexander Graf
Cc: linux-next, linux-kernel, Bharat Bhushan, Michael Neuling,
Benjamin Herrenschmidt, Paul Mackerras, linuxppc-dev
[-- Attachment #1: Type: text/plain, Size: 1947 bytes --]
Hi Alexander,
Today's linux-next merge of the kvm-ppc tree got a conflict in
arch/powerpc/kvm/booke_interrupts.S between commit c75df6f96c59
("powerpc: Fix usage of register macros getting ready for %r0 change")
from the powerpc tree and commit fc372c0843b8 ("booke: Added crit/mc
exception handler for e500v2") from the kvm-ppc tree.
I fixed it up (see below - could do with checking) and can carry the fix
as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/powerpc/kvm/booke_interrupts.S
index 8fd4b2a,09456c4..0000000
--- a/arch/powerpc/kvm/booke_interrupts.S
+++ b/arch/powerpc/kvm/booke_interrupts.S
@@@ -52,16 -53,21 +52,21 @@@
(1<<BOOKE_INTERRUPT_PROGRAM) | \
(1<<BOOKE_INTERRUPT_DTLB_MISS))
- .macro KVM_HANDLER ivor_nr
+ .macro KVM_HANDLER ivor_nr scratch srr0
_GLOBAL(kvmppc_handler_\ivor_nr)
/* Get pointer to vcpu and record exit number. */
- mtspr SPRN_SPRG_WSCRATCH0, r4
+ mtspr \scratch , r4
mfspr r4, SPRN_SPRG_RVCPU
- stw r3, VCPU_GPR(r3)(r4)
- stw r5, VCPU_GPR(r5)(r4)
- stw r6, VCPU_GPR(r6)(r4)
++ stw r3, VCPU_GPR(R3)(r4)
+ stw r5, VCPU_GPR(R5)(r4)
+ stw r6, VCPU_GPR(R6)(r4)
+ mfspr r3, \scratch
mfctr r5
- lis r6, kvmppc_resume_host@h
- stw r3, VCPU_GPR(r4)(r4)
++ stw r3, VCPU_GPR(R4)(r4)
stw r5, VCPU_CTR(r4)
+ mfspr r3, \srr0
+ lis r6, kvmppc_resume_host@h
+ stw r3, VCPU_PC(r4)
li r5, \ivor_nr
ori r6, r6, kvmppc_resume_host@l
mtctr r6
@@@ -99,12 -104,11 +103,11 @@@ _GLOBAL(kvmppc_handler_len
* r5: KVM exit number
*/
_GLOBAL(kvmppc_resume_host)
- stw r3, VCPU_GPR(R3)(r4)
mfcr r3
stw r3, VCPU_CR(r4)
- stw r7, VCPU_GPR(r7)(r4)
- stw r8, VCPU_GPR(r8)(r4)
- stw r9, VCPU_GPR(r9)(r4)
+ stw r7, VCPU_GPR(R7)(r4)
+ stw r8, VCPU_GPR(R8)(r4)
+ stw r9, VCPU_GPR(R9)(r4)
li r6, 1
slw r6, r6, r5
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* linux-next: manual merge of the kvm-ppc tree with the powerpc tree
@ 2012-07-12 3:57 ` Stephen Rothwell
0 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2012-07-12 3:57 UTC (permalink / raw)
To: Alexander Graf
Cc: Michael Neuling, linux-kernel, linux-next, Paul Mackerras,
Bharat Bhushan, linuxppc-dev
[-- Attachment #1.1: Type: text/plain, Size: 1947 bytes --]
Hi Alexander,
Today's linux-next merge of the kvm-ppc tree got a conflict in
arch/powerpc/kvm/booke_interrupts.S between commit c75df6f96c59
("powerpc: Fix usage of register macros getting ready for %r0 change")
from the powerpc tree and commit fc372c0843b8 ("booke: Added crit/mc
exception handler for e500v2") from the kvm-ppc tree.
I fixed it up (see below - could do with checking) and can carry the fix
as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/powerpc/kvm/booke_interrupts.S
index 8fd4b2a,09456c4..0000000
--- a/arch/powerpc/kvm/booke_interrupts.S
+++ b/arch/powerpc/kvm/booke_interrupts.S
@@@ -52,16 -53,21 +52,21 @@@
(1<<BOOKE_INTERRUPT_PROGRAM) | \
(1<<BOOKE_INTERRUPT_DTLB_MISS))
- .macro KVM_HANDLER ivor_nr
+ .macro KVM_HANDLER ivor_nr scratch srr0
_GLOBAL(kvmppc_handler_\ivor_nr)
/* Get pointer to vcpu and record exit number. */
- mtspr SPRN_SPRG_WSCRATCH0, r4
+ mtspr \scratch , r4
mfspr r4, SPRN_SPRG_RVCPU
- stw r3, VCPU_GPR(r3)(r4)
- stw r5, VCPU_GPR(r5)(r4)
- stw r6, VCPU_GPR(r6)(r4)
++ stw r3, VCPU_GPR(R3)(r4)
+ stw r5, VCPU_GPR(R5)(r4)
+ stw r6, VCPU_GPR(R6)(r4)
+ mfspr r3, \scratch
mfctr r5
- lis r6, kvmppc_resume_host@h
- stw r3, VCPU_GPR(r4)(r4)
++ stw r3, VCPU_GPR(R4)(r4)
stw r5, VCPU_CTR(r4)
+ mfspr r3, \srr0
+ lis r6, kvmppc_resume_host@h
+ stw r3, VCPU_PC(r4)
li r5, \ivor_nr
ori r6, r6, kvmppc_resume_host@l
mtctr r6
@@@ -99,12 -104,11 +103,11 @@@ _GLOBAL(kvmppc_handler_len
* r5: KVM exit number
*/
_GLOBAL(kvmppc_resume_host)
- stw r3, VCPU_GPR(R3)(r4)
mfcr r3
stw r3, VCPU_CR(r4)
- stw r7, VCPU_GPR(r7)(r4)
- stw r8, VCPU_GPR(r8)(r4)
- stw r9, VCPU_GPR(r9)(r4)
+ stw r7, VCPU_GPR(R7)(r4)
+ stw r8, VCPU_GPR(R8)(r4)
+ stw r9, VCPU_GPR(R9)(r4)
li r6, 1
slw r6, r6, r5
[-- Attachment #1.2: Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 150 bytes --]
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
^ permalink raw reply [flat|nested] 13+ messages in thread
* linux-next: manual merge of the kvm-ppc tree with the powerpc tree
@ 2012-07-12 3:57 ` Stephen Rothwell
0 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2012-07-12 3:57 UTC (permalink / raw)
To: Alexander Graf
Cc: Michael Neuling, linux-kernel, linux-next, Paul Mackerras,
Bharat Bhushan, linuxppc-dev
[-- Attachment #1: Type: text/plain, Size: 1947 bytes --]
Hi Alexander,
Today's linux-next merge of the kvm-ppc tree got a conflict in
arch/powerpc/kvm/booke_interrupts.S between commit c75df6f96c59
("powerpc: Fix usage of register macros getting ready for %r0 change")
from the powerpc tree and commit fc372c0843b8 ("booke: Added crit/mc
exception handler for e500v2") from the kvm-ppc tree.
I fixed it up (see below - could do with checking) and can carry the fix
as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/powerpc/kvm/booke_interrupts.S
index 8fd4b2a,09456c4..0000000
--- a/arch/powerpc/kvm/booke_interrupts.S
+++ b/arch/powerpc/kvm/booke_interrupts.S
@@@ -52,16 -53,21 +52,21 @@@
(1<<BOOKE_INTERRUPT_PROGRAM) | \
(1<<BOOKE_INTERRUPT_DTLB_MISS))
- .macro KVM_HANDLER ivor_nr
+ .macro KVM_HANDLER ivor_nr scratch srr0
_GLOBAL(kvmppc_handler_\ivor_nr)
/* Get pointer to vcpu and record exit number. */
- mtspr SPRN_SPRG_WSCRATCH0, r4
+ mtspr \scratch , r4
mfspr r4, SPRN_SPRG_RVCPU
- stw r3, VCPU_GPR(r3)(r4)
- stw r5, VCPU_GPR(r5)(r4)
- stw r6, VCPU_GPR(r6)(r4)
++ stw r3, VCPU_GPR(R3)(r4)
+ stw r5, VCPU_GPR(R5)(r4)
+ stw r6, VCPU_GPR(R6)(r4)
+ mfspr r3, \scratch
mfctr r5
- lis r6, kvmppc_resume_host@h
- stw r3, VCPU_GPR(r4)(r4)
++ stw r3, VCPU_GPR(R4)(r4)
stw r5, VCPU_CTR(r4)
+ mfspr r3, \srr0
+ lis r6, kvmppc_resume_host@h
+ stw r3, VCPU_PC(r4)
li r5, \ivor_nr
ori r6, r6, kvmppc_resume_host@l
mtctr r6
@@@ -99,12 -104,11 +103,11 @@@ _GLOBAL(kvmppc_handler_len
* r5: KVM exit number
*/
_GLOBAL(kvmppc_resume_host)
- stw r3, VCPU_GPR(R3)(r4)
mfcr r3
stw r3, VCPU_CR(r4)
- stw r7, VCPU_GPR(r7)(r4)
- stw r8, VCPU_GPR(r8)(r4)
- stw r9, VCPU_GPR(r9)(r4)
+ stw r7, VCPU_GPR(R7)(r4)
+ stw r8, VCPU_GPR(R8)(r4)
+ stw r9, VCPU_GPR(R9)(r4)
li r6, 1
slw r6, r6, r5
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: linux-next: manual merge of the kvm-ppc tree with the powerpc tree
2012-07-12 3:57 ` Stephen Rothwell
(?)
@ 2012-07-12 5:56 ` Alexander Graf
-1 siblings, 0 replies; 13+ messages in thread
From: Alexander Graf @ 2012-07-12 5:56 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Bharat Bhushan, Michael Neuling,
Benjamin Herrenschmidt, Paul Mackerras, linuxppc-dev
On 12.07.2012, at 05:57, Stephen Rothwell wrote:
> Hi Alexander,
>
> Today's linux-next merge of the kvm-ppc tree got a conflict in
> arch/powerpc/kvm/booke_interrupts.S between commit c75df6f96c59
> ("powerpc: Fix usage of register macros getting ready for %r0 change")
> from the powerpc tree and commit fc372c0843b8 ("booke: Added crit/mc
> exception handler for e500v2") from the kvm-ppc tree.
>
> I fixed it up (see below - could do with checking) and can carry the fix
> as necessary.
Hrm. Ben already warned me that this will happen, so I did a test merge a few days ago. Back then I also had to change 2 other bits that were not conflicting, to get to code to actually compile.
Could you please do an s/VCPU_GPR(r/VCPU_GPR/R/g in arch/powerpc/kvm/booke_interrupts.S? I'd check if you actually need it myself, but the tree doesn't seem to be pushed out yet :).
Alex
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc arch/powerpc/kvm/booke_interrupts.S
> index 8fd4b2a,09456c4..0000000
> --- a/arch/powerpc/kvm/booke_interrupts.S
> +++ b/arch/powerpc/kvm/booke_interrupts.S
> @@@ -52,16 -53,21 +52,21 @@@
> (1<<BOOKE_INTERRUPT_PROGRAM) | \
> (1<<BOOKE_INTERRUPT_DTLB_MISS))
>
> - .macro KVM_HANDLER ivor_nr
> + .macro KVM_HANDLER ivor_nr scratch srr0
> _GLOBAL(kvmppc_handler_\ivor_nr)
> /* Get pointer to vcpu and record exit number. */
> - mtspr SPRN_SPRG_WSCRATCH0, r4
> + mtspr \scratch , r4
> mfspr r4, SPRN_SPRG_RVCPU
> - stw r3, VCPU_GPR(r3)(r4)
> - stw r5, VCPU_GPR(r5)(r4)
> - stw r6, VCPU_GPR(r6)(r4)
> ++ stw r3, VCPU_GPR(R3)(r4)
> + stw r5, VCPU_GPR(R5)(r4)
> + stw r6, VCPU_GPR(R6)(r4)
> + mfspr r3, \scratch
> mfctr r5
> - lis r6, kvmppc_resume_host@h
> - stw r3, VCPU_GPR(r4)(r4)
> ++ stw r3, VCPU_GPR(R4)(r4)
> stw r5, VCPU_CTR(r4)
> + mfspr r3, \srr0
> + lis r6, kvmppc_resume_host@h
> + stw r3, VCPU_PC(r4)
> li r5, \ivor_nr
> ori r6, r6, kvmppc_resume_host@l
> mtctr r6
> @@@ -99,12 -104,11 +103,11 @@@ _GLOBAL(kvmppc_handler_len
> * r5: KVM exit number
> */
> _GLOBAL(kvmppc_resume_host)
> - stw r3, VCPU_GPR(R3)(r4)
> mfcr r3
> stw r3, VCPU_CR(r4)
> - stw r7, VCPU_GPR(r7)(r4)
> - stw r8, VCPU_GPR(r8)(r4)
> - stw r9, VCPU_GPR(r9)(r4)
> + stw r7, VCPU_GPR(R7)(r4)
> + stw r8, VCPU_GPR(R8)(r4)
> + stw r9, VCPU_GPR(R9)(r4)
>
> li r6, 1
> slw r6, r6, r5
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: linux-next: manual merge of the kvm-ppc tree with the powerpc tree
@ 2012-07-12 5:56 ` Alexander Graf
0 siblings, 0 replies; 13+ messages in thread
From: Alexander Graf @ 2012-07-12 5:56 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Bharat Bhushan, Michael Neuling,
Benjamin Herrenschmidt, Paul Mackerras, linuxppc-dev
On 12.07.2012, at 05:57, Stephen Rothwell wrote:
> Hi Alexander,
>
> Today's linux-next merge of the kvm-ppc tree got a conflict in
> arch/powerpc/kvm/booke_interrupts.S between commit c75df6f96c59
> ("powerpc: Fix usage of register macros getting ready for %r0 change")
> from the powerpc tree and commit fc372c0843b8 ("booke: Added crit/mc
> exception handler for e500v2") from the kvm-ppc tree.
>
> I fixed it up (see below - could do with checking) and can carry the fix
> as necessary.
Hrm. Ben already warned me that this will happen, so I did a test merge a few days ago. Back then I also had to change 2 other bits that were not conflicting, to get to code to actually compile.
Could you please do an s/VCPU_GPR(r/VCPU_GPR/R/g in arch/powerpc/kvm/booke_interrupts.S? I'd check if you actually need it myself, but the tree doesn't seem to be pushed out yet :).
Alex
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc arch/powerpc/kvm/booke_interrupts.S
> index 8fd4b2a,09456c4..0000000
> --- a/arch/powerpc/kvm/booke_interrupts.S
> +++ b/arch/powerpc/kvm/booke_interrupts.S
> @@@ -52,16 -53,21 +52,21 @@@
> (1<<BOOKE_INTERRUPT_PROGRAM) | \
> (1<<BOOKE_INTERRUPT_DTLB_MISS))
>
> - .macro KVM_HANDLER ivor_nr
> + .macro KVM_HANDLER ivor_nr scratch srr0
> _GLOBAL(kvmppc_handler_\ivor_nr)
> /* Get pointer to vcpu and record exit number. */
> - mtspr SPRN_SPRG_WSCRATCH0, r4
> + mtspr \scratch , r4
> mfspr r4, SPRN_SPRG_RVCPU
> - stw r3, VCPU_GPR(r3)(r4)
> - stw r5, VCPU_GPR(r5)(r4)
> - stw r6, VCPU_GPR(r6)(r4)
> ++ stw r3, VCPU_GPR(R3)(r4)
> + stw r5, VCPU_GPR(R5)(r4)
> + stw r6, VCPU_GPR(R6)(r4)
> + mfspr r3, \scratch
> mfctr r5
> - lis r6, kvmppc_resume_host@h
> - stw r3, VCPU_GPR(r4)(r4)
> ++ stw r3, VCPU_GPR(R4)(r4)
> stw r5, VCPU_CTR(r4)
> + mfspr r3, \srr0
> + lis r6, kvmppc_resume_host@h
> + stw r3, VCPU_PC(r4)
> li r5, \ivor_nr
> ori r6, r6, kvmppc_resume_host@l
> mtctr r6
> @@@ -99,12 -104,11 +103,11 @@@ _GLOBAL(kvmppc_handler_len
> * r5: KVM exit number
> */
> _GLOBAL(kvmppc_resume_host)
> - stw r3, VCPU_GPR(R3)(r4)
> mfcr r3
> stw r3, VCPU_CR(r4)
> - stw r7, VCPU_GPR(r7)(r4)
> - stw r8, VCPU_GPR(r8)(r4)
> - stw r9, VCPU_GPR(r9)(r4)
> + stw r7, VCPU_GPR(R7)(r4)
> + stw r8, VCPU_GPR(R8)(r4)
> + stw r9, VCPU_GPR(R9)(r4)
>
> li r6, 1
> slw r6, r6, r5
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: linux-next: manual merge of the kvm-ppc tree with the powerpc tree
@ 2012-07-12 5:56 ` Alexander Graf
0 siblings, 0 replies; 13+ messages in thread
From: Alexander Graf @ 2012-07-12 5:56 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Michael Neuling, linux-kernel, linux-next, Paul Mackerras,
Bharat Bhushan, linuxppc-dev
On 12.07.2012, at 05:57, Stephen Rothwell wrote:
> Hi Alexander,
>=20
> Today's linux-next merge of the kvm-ppc tree got a conflict in
> arch/powerpc/kvm/booke_interrupts.S between commit c75df6f96c59
> ("powerpc: Fix usage of register macros getting ready for %r0 change")
> from the powerpc tree and commit fc372c0843b8 ("booke: Added crit/mc
> exception handler for e500v2") from the kvm-ppc tree.
>=20
> I fixed it up (see below - could do with checking) and can carry the =
fix
> as necessary.
Hrm. Ben already warned me that this will happen, so I did a test merge =
a few days ago. Back then I also had to change 2 other bits that were =
not conflicting, to get to code to actually compile.
Could you please do an s/VCPU_GPR(r/VCPU_GPR/R/g in =
arch/powerpc/kvm/booke_interrupts.S? I'd check if you actually need it =
myself, but the tree doesn't seem to be pushed out yet :).
Alex
> --=20
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>=20
> diff --cc arch/powerpc/kvm/booke_interrupts.S
> index 8fd4b2a,09456c4..0000000
> --- a/arch/powerpc/kvm/booke_interrupts.S
> +++ b/arch/powerpc/kvm/booke_interrupts.S
> @@@ -52,16 -53,21 +52,21 @@@
> (1<<BOOKE_INTERRUPT_PROGRAM) | \
> (1<<BOOKE_INTERRUPT_DTLB_MISS))
>=20
> - .macro KVM_HANDLER ivor_nr
> + .macro KVM_HANDLER ivor_nr scratch srr0
> _GLOBAL(kvmppc_handler_\ivor_nr)
> /* Get pointer to vcpu and record exit number. */
> - mtspr SPRN_SPRG_WSCRATCH0, r4
> + mtspr \scratch , r4
> mfspr r4, SPRN_SPRG_RVCPU
> - stw r3, VCPU_GPR(r3)(r4)
> - stw r5, VCPU_GPR(r5)(r4)
> - stw r6, VCPU_GPR(r6)(r4)
> ++ stw r3, VCPU_GPR(R3)(r4)
> + stw r5, VCPU_GPR(R5)(r4)
> + stw r6, VCPU_GPR(R6)(r4)
> + mfspr r3, \scratch
> mfctr r5
> - lis r6, kvmppc_resume_host@h
> - stw r3, VCPU_GPR(r4)(r4)
> ++ stw r3, VCPU_GPR(R4)(r4)
> stw r5, VCPU_CTR(r4)
> + mfspr r3, \srr0
> + lis r6, kvmppc_resume_host@h
> + stw r3, VCPU_PC(r4)
> li r5, \ivor_nr
> ori r6, r6, kvmppc_resume_host@l
> mtctr r6
> @@@ -99,12 -104,11 +103,11 @@@ _GLOBAL(kvmppc_handler_len
> * r5: KVM exit number
> */
> _GLOBAL(kvmppc_resume_host)
> - stw r3, VCPU_GPR(R3)(r4)
> mfcr r3
> stw r3, VCPU_CR(r4)
> - stw r7, VCPU_GPR(r7)(r4)
> - stw r8, VCPU_GPR(r8)(r4)
> - stw r9, VCPU_GPR(r9)(r4)
> + stw r7, VCPU_GPR(R7)(r4)
> + stw r8, VCPU_GPR(R8)(r4)
> + stw r9, VCPU_GPR(R9)(r4)
>=20
> li r6, 1
> slw r6, r6, r5
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: linux-next: manual merge of the kvm-ppc tree with the powerpc tree
2012-07-12 5:56 ` Alexander Graf
(?)
@ 2012-07-12 6:23 ` Stephen Rothwell
-1 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2012-07-12 6:23 UTC (permalink / raw)
To: Alexander Graf
Cc: linux-next, linux-kernel, Bharat Bhushan, Michael Neuling,
Benjamin Herrenschmidt, Paul Mackerras, linuxppc-dev
[-- Attachment #1: Type: text/plain, Size: 1205 bytes --]
Hi Alex,
On Thu, 12 Jul 2012 07:56:46 +0200 Alexander Graf <agraf@suse.de> wrote:
>
> On 12.07.2012, at 05:57, Stephen Rothwell wrote:
>
> > Today's linux-next merge of the kvm-ppc tree got a conflict in
> > arch/powerpc/kvm/booke_interrupts.S between commit c75df6f96c59
> > ("powerpc: Fix usage of register macros getting ready for %r0 change")
> > from the powerpc tree and commit fc372c0843b8 ("booke: Added crit/mc
> > exception handler for e500v2") from the kvm-ppc tree.
> >
> > I fixed it up (see below - could do with checking) and can carry the fix
> > as necessary.
>
> Hrm. Ben already warned me that this will happen, so I did a test merge a few days ago. Back then I also had to change 2 other bits that were not conflicting, to get to code to actually compile.
>
> Could you please do an s/VCPU_GPR(r/VCPU_GPR/R/g in arch/powerpc/kvm/booke_interrupts.S? I'd check if you actually need it myself, but the tree doesn't seem to be pushed out yet :).
Thanks for the response. I checked and I think I got them all. The
tree should be available as soon as the kernel.org mirroring gets done.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: linux-next: manual merge of the kvm-ppc tree with the powerpc tree
@ 2012-07-12 6:23 ` Stephen Rothwell
0 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2012-07-12 6:23 UTC (permalink / raw)
To: Alexander Graf
Cc: linux-next, linux-kernel, Bharat Bhushan, Michael Neuling,
Benjamin Herrenschmidt, Paul Mackerras, linuxppc-dev
[-- Attachment #1: Type: text/plain, Size: 1205 bytes --]
Hi Alex,
On Thu, 12 Jul 2012 07:56:46 +0200 Alexander Graf <agraf@suse.de> wrote:
>
> On 12.07.2012, at 05:57, Stephen Rothwell wrote:
>
> > Today's linux-next merge of the kvm-ppc tree got a conflict in
> > arch/powerpc/kvm/booke_interrupts.S between commit c75df6f96c59
> > ("powerpc: Fix usage of register macros getting ready for %r0 change")
> > from the powerpc tree and commit fc372c0843b8 ("booke: Added crit/mc
> > exception handler for e500v2") from the kvm-ppc tree.
> >
> > I fixed it up (see below - could do with checking) and can carry the fix
> > as necessary.
>
> Hrm. Ben already warned me that this will happen, so I did a test merge a few days ago. Back then I also had to change 2 other bits that were not conflicting, to get to code to actually compile.
>
> Could you please do an s/VCPU_GPR(r/VCPU_GPR/R/g in arch/powerpc/kvm/booke_interrupts.S? I'd check if you actually need it myself, but the tree doesn't seem to be pushed out yet :).
Thanks for the response. I checked and I think I got them all. The
tree should be available as soon as the kernel.org mirroring gets done.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: linux-next: manual merge of the kvm-ppc tree with the powerpc tree
@ 2012-07-12 6:23 ` Stephen Rothwell
0 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2012-07-12 6:23 UTC (permalink / raw)
To: Alexander Graf
Cc: Michael Neuling, linux-kernel, linux-next, Paul Mackerras,
Bharat Bhushan, linuxppc-dev
[-- Attachment #1: Type: text/plain, Size: 1205 bytes --]
Hi Alex,
On Thu, 12 Jul 2012 07:56:46 +0200 Alexander Graf <agraf@suse.de> wrote:
>
> On 12.07.2012, at 05:57, Stephen Rothwell wrote:
>
> > Today's linux-next merge of the kvm-ppc tree got a conflict in
> > arch/powerpc/kvm/booke_interrupts.S between commit c75df6f96c59
> > ("powerpc: Fix usage of register macros getting ready for %r0 change")
> > from the powerpc tree and commit fc372c0843b8 ("booke: Added crit/mc
> > exception handler for e500v2") from the kvm-ppc tree.
> >
> > I fixed it up (see below - could do with checking) and can carry the fix
> > as necessary.
>
> Hrm. Ben already warned me that this will happen, so I did a test merge a few days ago. Back then I also had to change 2 other bits that were not conflicting, to get to code to actually compile.
>
> Could you please do an s/VCPU_GPR(r/VCPU_GPR/R/g in arch/powerpc/kvm/booke_interrupts.S? I'd check if you actually need it myself, but the tree doesn't seem to be pushed out yet :).
Thanks for the response. I checked and I think I got them all. The
tree should be available as soon as the kernel.org mirroring gets done.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: linux-next: manual merge of the kvm-ppc tree with the powerpc tree
2017-02-09 3:37 ` Stephen Rothwell
@ 2017-02-09 11:38 ` Michael Ellerman
-1 siblings, 0 replies; 13+ messages in thread
From: Michael Ellerman @ 2017-02-09 11:38 UTC (permalink / raw)
To: Stephen Rothwell, Paul Mackerras, Benjamin Herrenschmidt, PowerPC
Cc: linux-next, linux-kernel, Alistair Popple
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi Paul,
>
> Today's linux-next merge of the kvm-ppc tree got conflicts in:
>
> arch/powerpc/include/asm/opal.h
> arch/powerpc/platforms/powernv/opal-wrappers.S
>
> between commit:
>
> 1d0761d2557d ("powerpc/powernv: Initialise nest mmu")
>
> from the powerpc tree and commit:
>
> ab9bad0ead9a ("powerpc/powernv: Remove separate entry for OPAL real mode calls")
>
> from the kvm-ppc tree.
Thanks.
This will go away when I merge the ppc-kvm topic branch.
cheers
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: linux-next: manual merge of the kvm-ppc tree with the powerpc tree
@ 2017-02-09 11:38 ` Michael Ellerman
0 siblings, 0 replies; 13+ messages in thread
From: Michael Ellerman @ 2017-02-09 11:38 UTC (permalink / raw)
To: Stephen Rothwell, Paul Mackerras, Benjamin Herrenschmidt, PowerPC
Cc: Alistair Popple, linux-next, linux-kernel
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi Paul,
>
> Today's linux-next merge of the kvm-ppc tree got conflicts in:
>
> arch/powerpc/include/asm/opal.h
> arch/powerpc/platforms/powernv/opal-wrappers.S
>
> between commit:
>
> 1d0761d2557d ("powerpc/powernv: Initialise nest mmu")
>
> from the powerpc tree and commit:
>
> ab9bad0ead9a ("powerpc/powernv: Remove separate entry for OPAL real mode calls")
>
> from the kvm-ppc tree.
Thanks.
This will go away when I merge the ppc-kvm topic branch.
cheers
^ permalink raw reply [flat|nested] 13+ messages in thread
* linux-next: manual merge of the kvm-ppc tree with the powerpc tree
@ 2017-02-09 3:37 ` Stephen Rothwell
0 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2017-02-09 3:37 UTC (permalink / raw)
To: Paul Mackerras, Michael Ellerman, Benjamin Herrenschmidt, PowerPC
Cc: linux-next, linux-kernel, Alistair Popple
Hi Paul,
Today's linux-next merge of the kvm-ppc tree got conflicts in:
arch/powerpc/include/asm/opal.h
arch/powerpc/platforms/powernv/opal-wrappers.S
between commit:
1d0761d2557d ("powerpc/powernv: Initialise nest mmu")
from the powerpc tree and commit:
ab9bad0ead9a ("powerpc/powernv: Remove separate entry for OPAL real mode calls")
from the kvm-ppc tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/powerpc/include/asm/opal.h
index 08ddea966601,16efe7406776..000000000000
--- a/arch/powerpc/include/asm/opal.h
+++ b/arch/powerpc/include/asm/opal.h
@@@ -228,11 -225,6 +225,7 @@@ int64_t opal_int_set_mfrr(uint32_t cpu
int64_t opal_pci_tce_kill(uint64_t phb_id, uint32_t kill_type,
uint32_t pe_num, uint32_t tce_size,
uint64_t dma_addr, uint32_t npages);
- int64_t opal_rm_pci_tce_kill(uint64_t phb_id, uint32_t kill_type,
- uint32_t pe_num, uint32_t tce_size,
- uint64_t dma_addr, uint32_t npages);
+int64_t opal_nmmu_set_ptcr(uint64_t chip_id, uint64_t ptcr);
/* Internal functions */
extern int early_init_dt_scan_opal(unsigned long node, const char *uname,
diff --cc arch/powerpc/platforms/powernv/opal-wrappers.S
index f7c19c9c57ed,28799e557348..000000000000
--- a/arch/powerpc/platforms/powernv/opal-wrappers.S
+++ b/arch/powerpc/platforms/powernv/opal-wrappers.S
@@@ -304,12 -296,7 +296,8 @@@ OPAL_CALL(opal_pci_get_presence_state
OPAL_CALL(opal_pci_get_power_state, OPAL_PCI_GET_POWER_STATE);
OPAL_CALL(opal_pci_set_power_state, OPAL_PCI_SET_POWER_STATE);
OPAL_CALL(opal_int_get_xirr, OPAL_INT_GET_XIRR);
- OPAL_CALL_REAL(opal_rm_int_get_xirr, OPAL_INT_GET_XIRR);
OPAL_CALL(opal_int_set_cppr, OPAL_INT_SET_CPPR);
OPAL_CALL(opal_int_eoi, OPAL_INT_EOI);
- OPAL_CALL_REAL(opal_rm_int_eoi, OPAL_INT_EOI);
OPAL_CALL(opal_int_set_mfrr, OPAL_INT_SET_MFRR);
- OPAL_CALL_REAL(opal_rm_int_set_mfrr, OPAL_INT_SET_MFRR);
OPAL_CALL(opal_pci_tce_kill, OPAL_PCI_TCE_KILL);
+OPAL_CALL(opal_nmmu_set_ptcr, OPAL_NMMU_SET_PTCR);
- OPAL_CALL_REAL(opal_rm_pci_tce_kill, OPAL_PCI_TCE_KILL);
^ permalink raw reply [flat|nested] 13+ messages in thread
* linux-next: manual merge of the kvm-ppc tree with the powerpc tree
@ 2017-02-09 3:37 ` Stephen Rothwell
0 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2017-02-09 3:37 UTC (permalink / raw)
To: Paul Mackerras, Michael Ellerman, Benjamin Herrenschmidt, PowerPC
Cc: Alistair Popple, linux-next, linux-kernel
Hi Paul,
Today's linux-next merge of the kvm-ppc tree got conflicts in:
arch/powerpc/include/asm/opal.h
arch/powerpc/platforms/powernv/opal-wrappers.S
between commit:
1d0761d2557d ("powerpc/powernv: Initialise nest mmu")
from the powerpc tree and commit:
ab9bad0ead9a ("powerpc/powernv: Remove separate entry for OPAL real mode calls")
from the kvm-ppc tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/powerpc/include/asm/opal.h
index 08ddea966601,16efe7406776..000000000000
--- a/arch/powerpc/include/asm/opal.h
+++ b/arch/powerpc/include/asm/opal.h
@@@ -228,11 -225,6 +225,7 @@@ int64_t opal_int_set_mfrr(uint32_t cpu
int64_t opal_pci_tce_kill(uint64_t phb_id, uint32_t kill_type,
uint32_t pe_num, uint32_t tce_size,
uint64_t dma_addr, uint32_t npages);
- int64_t opal_rm_pci_tce_kill(uint64_t phb_id, uint32_t kill_type,
- uint32_t pe_num, uint32_t tce_size,
- uint64_t dma_addr, uint32_t npages);
+int64_t opal_nmmu_set_ptcr(uint64_t chip_id, uint64_t ptcr);
/* Internal functions */
extern int early_init_dt_scan_opal(unsigned long node, const char *uname,
diff --cc arch/powerpc/platforms/powernv/opal-wrappers.S
index f7c19c9c57ed,28799e557348..000000000000
--- a/arch/powerpc/platforms/powernv/opal-wrappers.S
+++ b/arch/powerpc/platforms/powernv/opal-wrappers.S
@@@ -304,12 -296,7 +296,8 @@@ OPAL_CALL(opal_pci_get_presence_state
OPAL_CALL(opal_pci_get_power_state, OPAL_PCI_GET_POWER_STATE);
OPAL_CALL(opal_pci_set_power_state, OPAL_PCI_SET_POWER_STATE);
OPAL_CALL(opal_int_get_xirr, OPAL_INT_GET_XIRR);
- OPAL_CALL_REAL(opal_rm_int_get_xirr, OPAL_INT_GET_XIRR);
OPAL_CALL(opal_int_set_cppr, OPAL_INT_SET_CPPR);
OPAL_CALL(opal_int_eoi, OPAL_INT_EOI);
- OPAL_CALL_REAL(opal_rm_int_eoi, OPAL_INT_EOI);
OPAL_CALL(opal_int_set_mfrr, OPAL_INT_SET_MFRR);
- OPAL_CALL_REAL(opal_rm_int_set_mfrr, OPAL_INT_SET_MFRR);
OPAL_CALL(opal_pci_tce_kill, OPAL_PCI_TCE_KILL);
+OPAL_CALL(opal_nmmu_set_ptcr, OPAL_NMMU_SET_PTCR);
- OPAL_CALL_REAL(opal_rm_pci_tce_kill, OPAL_PCI_TCE_KILL);
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2017-02-09 12:05 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-07-12 3:57 linux-next: manual merge of the kvm-ppc tree with the powerpc tree Stephen Rothwell
2012-07-12 3:57 ` Stephen Rothwell
2012-07-12 3:57 ` Stephen Rothwell
2012-07-12 5:56 ` Alexander Graf
2012-07-12 5:56 ` Alexander Graf
2012-07-12 5:56 ` Alexander Graf
2012-07-12 6:23 ` Stephen Rothwell
2012-07-12 6:23 ` Stephen Rothwell
2012-07-12 6:23 ` Stephen Rothwell
2017-02-09 3:37 Stephen Rothwell
2017-02-09 3:37 ` Stephen Rothwell
2017-02-09 11:38 ` Michael Ellerman
2017-02-09 11:38 ` Michael Ellerman
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.