[PATCH] Fix powerpc 44x_mmu build

[PATCH] Fix powerpc 44x_mmu build

[Matt Porter]

The PIN_SIZE definition name changed, update 44x_mmu.c accordingly.

Signed-off-by: Matt Porter <mporter@embeddedalley.com>

diff --git a/arch/powerpc/mm/44x_mmu.c b/arch/powerpc/mm/44x_mmu.c
index 3d79ce2..e0152a9 100644
--- a/arch/powerpc/mm/44x_mmu.c
+++ b/arch/powerpc/mm/44x_mmu.c
@@ -104,7 +104,7 @@ unsigned long __init mmu_mapin_ram(void)
 
 	/* Determine number of entries necessary to cover lowmem */
 	pinned_tlbs = (unsigned int)
-		(_ALIGN(total_lowmem, PPC44x_PIN_SIZE) >> PPC44x_PIN_SHIFT);
+		(_ALIGN(total_lowmem, PPC_PIN_SIZE) >> PPC44x_PIN_SHIFT);
 
 	/* Write upper watermark to save location */
 	tlb_44x_hwater = PPC44x_LOW_SLOT - pinned_tlbs;
@@ -112,7 +112,7 @@ unsigned long __init mmu_mapin_ram(void)
 	/* If necessary, set additional pinned TLBs */
 	if (pinned_tlbs > 1)
 		for (i = (PPC44x_LOW_SLOT-(pinned_tlbs-1)); i < PPC44x_LOW_SLOT; i++) {
-			unsigned int phys_addr = (PPC44x_LOW_SLOT-i) * PPC44x_PIN_SIZE;
+			unsigned int phys_addr = (PPC44x_LOW_SLOT-i) * PPC_PIN_SIZE;
 			ppc44x_pin_tlb(i, phys_addr+PAGE_OFFSET, phys_addr);
 		}
 

Re: [PATCH] Fix powerpc 44x_mmu build

[Josh Boyer]

On Fri, 2006-08-04 at 11:44 -0500, Matt Porter wrote:
> The PIN_SIZE definition name changed, update 44x_mmu.c accordingly.

As far as I know, 4xx still builds as ARCH=ppc...  is this patch just
something you noticed, or is it a hint that you're working on moving 4xx
to arch/powerpc?

Just curious, since I've been poking at this a bit and would rather not
duplicate effort.

josh

Re: [PATCH] Fix powerpc 44x_mmu build

[Matt Porter]

On Fri, Aug 04, 2006 at 08:12:22PM -0500, Josh Boyer wrote:
> On Fri, 2006-08-04 at 11:44 -0500, Matt Porter wrote:
> > The PIN_SIZE definition name changed, update 44x_mmu.c accordingly.
> 
> As far as I know, 4xx still builds as ARCH=ppc...  is this patch just
> something you noticed, or is it a hint that you're working on moving 4xx
> to arch/powerpc?

Yes, working on moving 4xx to arch/powerpc.

> Just curious, since I've been poking at this a bit and would rather not
> duplicate effort.

Sounds great. In fact, I talked to BenH and tgall at ols about this
and they mentioned you were doing some work. These patches are
just some obvious basic things to get started.

Since there's a lot of work here, what aspect are you working on?
I haven't seen anything publicly but hear plenty of talk of people
working on dt soc definitions for 4xx i/o blocks.

I'm currently looking at merging ocotea but am using it to focus
on a few fundamental things like merging over a version of the
non-coherent DMA API implementation. The plan here is to get
a serial-only port merged and then sync with whoever is working
on the definitions and driver changes for the essential drivers
(obviously emac first from my POV).

-Matt`

Re: [PATCH] Fix powerpc 44x_mmu build

[Josh Boyer]

On Sat, 2006-08-05 at 09:11 -0400, Matt Porter wrote:
> On Fri, Aug 04, 2006 at 08:12:22PM -0500, Josh Boyer wrote:
> > On Fri, 2006-08-04 at 11:44 -0500, Matt Porter wrote:
> > > The PIN_SIZE definition name changed, update 44x_mmu.c accordingly.
> > 
> > As far as I know, 4xx still builds as ARCH=ppc...  is this patch just
> > something you noticed, or is it a hint that you're working on moving 4xx
> > to arch/powerpc?
> 
> Yes, working on moving 4xx to arch/powerpc.

Excellent.

> 
> > Just curious, since I've been poking at this a bit and would rather not
> > duplicate effort.
> 
> Sounds great. In fact, I talked to BenH and tgall at ols about this
> and they mentioned you were doing some work. These patches are
> just some obvious basic things to get started.
> 
> Since there's a lot of work here, what aspect are you working on?
> I haven't seen anything publicly but hear plenty of talk of people
> working on dt soc definitions for 4xx i/o blocks.

At the moment, I'm mostly trying to sit down and figure out the whole
device tree stack.  That, and keep up with the irq rework BenH did.  I
won't really be digging in for another couple weeks, but then I hope to
start actually doing something.

> I'm currently looking at merging ocotea but am using it to focus
> on a few fundamental things like merging over a version of the
> non-coherent DMA API implementation. The plan here is to get
> a serial-only port merged and then sync with whoever is working
> on the definitions and driver changes for the essential drivers
> (obviously emac first from my POV).

That sounds like a good plan.  I know a guy already working on emac, but
it's a bit of a unique setup he's got.  I'll try and get some patches
out of him soon.

>From talking with BenH, we'd also need the dt-in-zImage patches that are
floating around.  Anybody know what's going on with those?

josh