[RFC/PATCH] powerpc: 4xx PCI work in progress

[RFC/PATCH] powerpc: 4xx PCI work in progress

[Benjamin Herrenschmidt]

Because a mailing list is the best of backups and I've get something
working allright on ebony right now, I figured I would post my WIP
pile of patch bringing PCI to the 44x arch/powerpc world.

At this stage, only ebony is hooked up, there's a known problem with
the SCSI layer and non-coherent architecture that causes random
corruption for which I'm trying to find a solution, and e1000 has a
problem with resources > 32 bits for which I have a separate patch.

[RFC/PATCH] powerpc: Fix 8xx build breakage due to _tlbie changes

[Benjamin Herrenschmidt]

My changes to _tlbie to fix 4xx unfortunately broke 8xx build in a
couple of places. This fixes it.

Spotted by Olof Johansson

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---

 arch/powerpc/mm/mem.c      |    2 +-
 arch/powerpc/mm/mmu_decl.h |    2 +-
 arch/ppc/mm/init.c         |    2 +-
 arch/ppc/mm/mmu_decl.h     |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

Index: linux-work/arch/powerpc/mm/mem.c
===================================================================
--- linux-work.orig/arch/powerpc/mm/mem.c	2007-11-15 13:59:27.000000000 +1100
+++ linux-work/arch/powerpc/mm/mem.c	2007-11-15 13:59:44.000000000 +1100
@@ -464,7 +464,7 @@ void update_mmu_cache(struct vm_area_str
 		 * we invalidate the TLB here, thus avoiding dcbst
 		 * misbehaviour.
 		 */
-		_tlbie(address);
+		_tlbie(address, 0 /* 8xx doesn't care about PID */);
 #endif
 		if (!PageReserved(page)
 		    && !test_bit(PG_arch_1, &page->flags)) {
Index: linux-work/arch/ppc/mm/init.c
===================================================================
--- linux-work.orig/arch/ppc/mm/init.c	2007-11-15 14:00:20.000000000 +1100
+++ linux-work/arch/ppc/mm/init.c	2007-11-15 14:00:35.000000000 +1100
@@ -561,7 +561,7 @@ void update_mmu_cache(struct vm_area_str
 		 * That means the zeroed TLB has to be invalidated
 		 * whenever a page miss occurs.
 		 */
-		_tlbie(address);
+		_tlbie(address, 0 /* 8xx doesn't care about PID */);
 #endif
 		if (!PageReserved(page)
 		    && !test_bit(PG_arch_1, &page->flags)) {
Index: linux-work/arch/powerpc/mm/mmu_decl.h
===================================================================
--- linux-work.orig/arch/powerpc/mm/mmu_decl.h	2007-11-15 14:09:16.000000000 +1100
+++ linux-work/arch/powerpc/mm/mmu_decl.h	2007-11-15 14:14:29.000000000 +1100
@@ -56,7 +56,7 @@ extern unsigned long total_lowmem;
  * architectures.  -- Dan
  */
 #if defined(CONFIG_8xx)
-#define flush_HPTE(X, va, pg)	_tlbie(va)
+#define flush_HPTE(X, va, pg)	_tlbie(va, 0, /* 8xx doesn't care about PID */)
 #define MMU_init_hw()		do { } while(0)
 #define mmu_mapin_ram()		(0UL)
 
Index: linux-work/arch/ppc/mm/mmu_decl.h
===================================================================
--- linux-work.orig/arch/ppc/mm/mmu_decl.h	2007-11-15 14:08:54.000000000 +1100
+++ linux-work/arch/ppc/mm/mmu_decl.h	2007-11-15 14:14:45.000000000 +1100
@@ -49,7 +49,7 @@ extern unsigned int num_tlbcam_entries;
  * architectures.  -- Dan
  */
 #if defined(CONFIG_8xx)
-#define flush_HPTE(X, va, pg)	_tlbie(va)
+#define flush_HPTE(X, va, pg)	_tlbie(va, 0 /* 8xx doesn't care about PID */)
 #define MMU_init_hw()		do { } while(0)
 #define mmu_mapin_ram()		(0UL)
 

Re: [RFC/PATCH] powerpc: Fix 8xx build breakage due to _tlbie changes

[Josh Boyer]

On Mon, 19 Nov 2007 17:41:21 +1100
Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote:

> My changes to _tlbie to fix 4xx unfortunately broke 8xx build in a
> couple of places. This fixes it.
> 
> Spotted by Olof Johansson
> 
> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> ---
> 
>  arch/powerpc/mm/mem.c      |    2 +-
>  arch/powerpc/mm/mmu_decl.h |    2 +-
>  arch/ppc/mm/init.c         |    2 +-
>  arch/ppc/mm/mmu_decl.h     |    2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)
> 
> Index: linux-work/arch/powerpc/mm/mem.c
> ===================================================================
> --- linux-work.orig/arch/powerpc/mm/mem.c	2007-11-15 13:59:27.000000000 +1100
> +++ linux-work/arch/powerpc/mm/mem.c	2007-11-15 13:59:44.000000000 +1100
> @@ -464,7 +464,7 @@ void update_mmu_cache(struct vm_area_str
>  		 * we invalidate the TLB here, thus avoiding dcbst
>  		 * misbehaviour.
>  		 */
> -		_tlbie(address);
> +		_tlbie(address, 0 /* 8xx doesn't care about PID */);
>  #endif
>  		if (!PageReserved(page)
>  		    && !test_bit(PG_arch_1, &page->flags)) {
> Index: linux-work/arch/ppc/mm/init.c
> ===================================================================
> --- linux-work.orig/arch/ppc/mm/init.c	2007-11-15 14:00:20.000000000 +1100
> +++ linux-work/arch/ppc/mm/init.c	2007-11-15 14:00:35.000000000 +1100
> @@ -561,7 +561,7 @@ void update_mmu_cache(struct vm_area_str
>  		 * That means the zeroed TLB has to be invalidated
>  		 * whenever a page miss occurs.
>  		 */
> -		_tlbie(address);
> +		_tlbie(address, 0 /* 8xx doesn't care about PID */);
>  #endif
>  		if (!PageReserved(page)
>  		    && !test_bit(PG_arch_1, &page->flags)) {
> Index: linux-work/arch/powerpc/mm/mmu_decl.h
> ===================================================================
> --- linux-work.orig/arch/powerpc/mm/mmu_decl.h	2007-11-15 14:09:16.000000000 +1100
> +++ linux-work/arch/powerpc/mm/mmu_decl.h	2007-11-15 14:14:29.000000000 +1100
> @@ -56,7 +56,7 @@ extern unsigned long total_lowmem;
>   * architectures.  -- Dan
>   */
>  #if defined(CONFIG_8xx)
> -#define flush_HPTE(X, va, pg)	_tlbie(va)
> +#define flush_HPTE(X, va, pg)	_tlbie(va, 0, /* 8xx doesn't care about PID */)

Spurious ','?

josh

Re: [RFC/PATCH] powerpc: Fix 8xx build breakage due to _tlbie changes

[Benjamin Herrenschmidt]

> > Index: linux-work/arch/powerpc/mm/mmu_decl.h
> > ===================================================================
> > --- linux-work.orig/arch/powerpc/mm/mmu_decl.h	2007-11-15 14:09:16.000000000 +1100
> > +++ linux-work/arch/powerpc/mm/mmu_decl.h	2007-11-15 14:14:29.000000000 +1100
> > @@ -56,7 +56,7 @@ extern unsigned long total_lowmem;
> >   * architectures.  -- Dan
> >   */
> >  #if defined(CONFIG_8xx)
> > -#define flush_HPTE(X, va, pg)	_tlbie(va)
> > +#define flush_HPTE(X, va, pg)	_tlbie(va, 0, /* 8xx doesn't care about PID */)
> 
> Spurious ','?

Weird, it did build ...

Ben.