[U-Boot] [PATCH 2/2] ppc/85xx: Repack tlb_table to save space

[Kumar Gala]

We can pack the initial tlb_table in MAS register format and use
write_tlb to set things up.  This savings can be helpful for NAND
style first stage boot loaders.

Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
---
 cpu/mpc85xx/tlb.c     |    9 +++++----
 include/asm-ppc/mmu.h |   21 ++++++++++-----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/cpu/mpc85xx/tlb.c b/cpu/mpc85xx/tlb.c
index 3e502ac..857908e 100644
--- a/cpu/mpc85xx/tlb.c
+++ b/cpu/mpc85xx/tlb.c
@@ -90,10 +90,11 @@ void init_tlbs(void)
 	int i;
 
 	for (i = 0; i < num_tlb_entries; i++) {
-		set_tlb(tlb_table[i].tlb, tlb_table[i].epn, tlb_table[i].rpn,
-			tlb_table[i].perms, tlb_table[i].wimge,
-			tlb_table[i].ts, tlb_table[i].esel, tlb_table[i].tsize,
-			tlb_table[i].iprot);
+ 		write_tlb(tlb_table[i].mas0,
+ 			  tlb_table[i].mas1,
+ 			  tlb_table[i].mas2,
+ 			  tlb_table[i].mas3,
+			  tlb_table[i].mas7);
 	}
 
 	return ;
diff --git a/include/asm-ppc/mmu.h b/include/asm-ppc/mmu.h
index d311ba2..3fa98fa 100644
--- a/include/asm-ppc/mmu.h
+++ b/include/asm-ppc/mmu.h
@@ -483,19 +483,18 @@ extern unsigned int setup_ddr_tlbs(unsigned int memsize_in_meg);
 extern void write_tlb(u32 _mas0, u32 _mas1, u32 _mas2, u32 _mas3, u32 _mas7);
 
 #define SET_TLB_ENTRY(_tlb, _epn, _rpn, _perms, _wimge, _ts, _esel, _sz, _iprot) \
-	{ .tlb = _tlb, .epn = _epn, .rpn = _rpn, .perms = _perms, \
-	  .wimge = _wimge, .ts = _ts, .esel = _esel, .tsize = _sz, .iprot = _iprot }
+	{ .mas0 = FSL_BOOKE_MAS0(_tlb, _esel, 0), \
+	  .mas1 = FSL_BOOKE_MAS1(1, _iprot, 0, _ts, _sz), \
+	  .mas2 = FSL_BOOKE_MAS2(_epn, _wimge), \
+	  .mas3 = FSL_BOOKE_MAS3(_rpn, 0, _perms), \
+	  .mas7 = ((u64)_rpn) >> 32, }
 
 struct fsl_e_tlb_entry {
-	u8	tlb;
-	u32	epn;
-	u64	rpn;
-	u8	perms;
-	u8	wimge;
-	u8	ts;
-	u8	esel;
-	u8	tsize;
-	u8	iprot;
+	u32	mas0;
+	u32	mas1;
+	u32	mas2;
+	u32	mas3;
+	u32	mas7;
 };
 
 extern struct fsl_e_tlb_entry tlb_table[];
-- 
1.6.0.6