[PATCH v3 01/11] powerpc/8xx: remove remaining unnecessary code in FixupDAR

[PATCH v3 01/11] powerpc/8xx: remove remaining unnecessary code in FixupDAR

[Christophe Leroy]

Since commit 33fb845a6f01 ("powerpc/8xx: Don't use MD_TWC for walk"), MD_EPN and
MD_TWC are not writen anymore in FixupDAR so saving r3 has become useless.

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>

---
v2: no change
v3: no change

 arch/powerpc/kernel/head_8xx.S | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/arch/powerpc/kernel/head_8xx.S b/arch/powerpc/kernel/head_8xx.S
index 3d4b8ee..79b8a23 100644
--- a/arch/powerpc/kernel/head_8xx.S
+++ b/arch/powerpc/kernel/head_8xx.S
@@ -532,9 +532,6 @@ DARFixed:/* Return from dcbx instruction bug workaround */
  /* define if you don't want to use self modifying code */
 #define NO_SELF_MODIFYING_CODE
 FixupDAR:/* Entry point for dcbx workaround. */
-#ifdef CONFIG_8xx_CPU6
-	mtspr	SPRN_DAR, r3
-#endif
 	mtspr	SPRN_SPRG_SCRATCH2, r10
 	/* fetch instruction from memory. */
 	mfspr	r10, SPRN_SRR0
@@ -551,9 +548,6 @@ FixupDAR:/* Entry point for dcbx workaround. */
 	/* Extract level 2 index */
 	rlwinm	r11, r11, 32 - (PAGE_SHIFT - 2), 32 - PAGE_SHIFT, 29
 	lwzx	r11, r10, r11	/* Get the pte */
-#ifdef CONFIG_8xx_CPU6
-	mfspr	r3, SPRN_DAR
-#endif
 	/* concat physical page address(r11) and page offset(r10) */
 	mfspr	r10, SPRN_SRR0
 	rlwimi	r11, r10, 0, 32 - PAGE_SHIFT, 31
-- 
2.1.0

Re: [v3, 01/11] powerpc/8xx: remove remaining unnecessary code in FixupDAR

[Scott Wood]

On Tue, Feb 03, 2015 at 12:38:16PM +0100, LEROY Christophe wrote:
> Since commit 33fb845a6f01 ("powerpc/8xx: Don't use MD_TWC for walk"), MD_EPN and
> MD_TWC are not writen anymore in FixupDAR so saving r3 has become useless.
> 
> Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
> ---
> v2: no change
> v3: no change

This doesn't apply cleanly.

>  arch/powerpc/kernel/head_8xx.S | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/arch/powerpc/kernel/head_8xx.S b/arch/powerpc/kernel/head_8xx.S
> index 3d4b8ee..79b8a23 100644
> --- a/arch/powerpc/kernel/head_8xx.S
> +++ b/arch/powerpc/kernel/head_8xx.S
> @@ -532,9 +532,6 @@ DARFixed:/* Return from dcbx instruction bug workaround */
>   /* define if you don't want to use self modifying code */
>  #define NO_SELF_MODIFYING_CODE
>  FixupDAR:/* Entry point for dcbx workaround. */
> -#ifdef CONFIG_8xx_CPU6
> -	mtspr	SPRN_DAR, r3
> -#endif
>  	mtspr	SPRN_SPRG_SCRATCH2, r10
>  	/* fetch instruction from memory. */
>  	mfspr	r10, SPRN_SRR0

This hunk looks OK but should start at line 500.

> @@ -551,9 +548,6 @@ FixupDAR:/* Entry point for dcbx workaround. */
>  	/* Extract level 2 index */
>  	rlwinm	r11, r11, 32 - (PAGE_SHIFT - 2), 32 - PAGE_SHIFT, 29
>  	lwzx	r11, r10, r11	/* Get the pte */
> -#ifdef CONFIG_8xx_CPU6
> -	mfspr	r3, SPRN_DAR
> -#endif
>  	/* concat physical page address(r11) and page offset(r10) */
>  	mfspr	r10, SPRN_SRR0
>  	rlwimi	r11, r10, 0, 32 - PAGE_SHIFT, 31

There is no ifdef CONFIG_8xx_CPU6 after any of the the "Get the pte"
lines, and none of them are "lwzx	r11, r10, r11".

What tree is this patchset against?

-Scott

Re: [v3, 01/11] powerpc/8xx: remove remaining unnecessary code in FixupDAR

[leroy christophe]

Le 26/03/2015 22:32, Scott Wood a écrit :
> On Tue, Feb 03, 2015 at 12:38:16PM +0100, LEROY Christophe wrote:
>> Since commit 33fb845a6f01 ("powerpc/8xx: Don't use MD_TWC for walk"), MD_EPN and
>> MD_TWC are not writen anymore in FixupDAR so saving r3 has become useless.
>>
>> Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
>> ---
>> v2: no change
>> v3: no change
> This doesn't apply cleanly.
>
>
You already applied part of that patchset it in your next tree, 
including that one (commit 2374d0a).
You told me to re-submit a patchset with only the remaining ones, 
therefore I sent v4 on the 4th of Feb, based on your tree.

Christophe

Re: [v3, 01/11] powerpc/8xx: remove remaining unnecessary code in FixupDAR

[Scott Wood]

On Sun, 2015-04-12 at 18:16 +0200, leroy christophe wrote:
> 
> Le 26/03/2015 22:32, Scott Wood a écrit :
> > On Tue, Feb 03, 2015 at 12:38:16PM +0100, LEROY Christophe wrote:
> >> Since commit 33fb845a6f01 ("powerpc/8xx: Don't use MD_TWC for walk"), MD_EPN and
> >> MD_TWC are not writen anymore in FixupDAR so saving r3 has become useless.
> >>
> >> Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
> >> ---
> >> v2: no change
> >> v3: no change
> > This doesn't apply cleanly.
> >
> >
> You already applied part of that patchset it in your next tree, 
> including that one (commit 2374d0a).
> You told me to re-submit a patchset with only the remaining ones, 
> therefore I sent v4 on the 4th of Feb, based on your tree.

OK.  I applied v2, and didn't remember that when I came across v3 in
patchwork.

-Scott

Re: [v3, 01/11] powerpc/8xx: remove remaining unnecessary code in FixupDAR

[leroy christophe]

Le 13/04/2015 22:26, Scott Wood a écrit :
> On Sun, 2015-04-12 at 18:16 +0200, leroy christophe wrote:
>> Le 26/03/2015 22:32, Scott Wood a écrit :
>>> On Tue, Feb 03, 2015 at 12:38:16PM +0100, LEROY Christophe wrote:
>>>> Since commit 33fb845a6f01 ("powerpc/8xx: Don't use MD_TWC for walk"), MD_EPN and
>>>> MD_TWC are not writen anymore in FixupDAR so saving r3 has become useless.
>>>>
>>>> Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
>>>> ---
>>>> v2: no change
>>>> v3: no change
>>> This doesn't apply cleanly.
>>>
>>>
>> You already applied part of that patchset it in your next tree,
>> including that one (commit 2374d0a).
>> You told me to re-submit a patchset with only the remaining ones,
>> therefore I sent v4 on the 4th of Feb, based on your tree.
> OK.  I applied v2, and didn't remember that when I came across v3 in
> patchwork.
>
>
What about v4 (the remaining ones) ? You got comments on the last one of 
the set, have you applied the other ones or shall I re-sumbit a full v5 ?

Christophe

Re: [v3, 01/11] powerpc/8xx: remove remaining unnecessary code in FixupDAR

[Scott Wood]

On Tue, 2015-04-14 at 00:19 +0200, leroy christophe wrote:
> 
> Le 13/04/2015 22:26, Scott Wood a écrit :
> > On Sun, 2015-04-12 at 18:16 +0200, leroy christophe wrote:
> >> Le 26/03/2015 22:32, Scott Wood a écrit :
> >>> On Tue, Feb 03, 2015 at 12:38:16PM +0100, LEROY Christophe wrote:
> >>>> Since commit 33fb845a6f01 ("powerpc/8xx: Don't use MD_TWC for walk"), MD_EPN and
> >>>> MD_TWC are not writen anymore in FixupDAR so saving r3 has become useless.
> >>>>
> >>>> Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
> >>>> ---
> >>>> v2: no change
> >>>> v3: no change
> >>> This doesn't apply cleanly.
> >>>
> >>>
> >> You already applied part of that patchset it in your next tree,
> >> including that one (commit 2374d0a).
> >> You told me to re-submit a patchset with only the remaining ones,
> >> therefore I sent v4 on the 4th of Feb, based on your tree.
> > OK.  I applied v2, and didn't remember that when I came across v3 in
> > patchwork.
> >
> >
> What about v4 (the remaining ones) ? You got comments on the last one of 
> the set, have you applied the other ones or shall I re-sumbit a full v5 ?

I haven't applied them yet.

-Scott