Skip to contentSkip to conversation

Fix powerpc 44x_mmu build

PATCH In review Matt Porter 2 participants 4 messages Aug 4, 2006 – Aug 7, 2006 PowerPC

lore
Share & tools
lore

Matt Porter

author
#0 lore raw

PATCH 1/1 Fix powerpc 44x_mmu build

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

Signed-off-by Matt Porter <[email protected]>
arch/powerpc/mm/44x_mmu.c +2 -2
index 3d79ce2..e0152a9 100644
@@ -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);
 		}
#1 lore raw
Quoted 1 line · Matt Porter

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

author
#2 lore raw
Quoted 6 lines · Josh Boyer
Quoted 1 line · Matt Porter

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.

Quoted 2 lines

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`

#3 lore raw
Quoted 9 lines · Matt Porter
Quoted 6 lines · Josh Boyer
Quoted 1 line · Matt Porter

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.

Quoted 11 lines
Quoted 3 lines

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.

Quoted 6 lines

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.

Quoted 1 line

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