Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5be061ee authored by Kumar Gala's avatar Kumar Gala Committed by Linus Torvalds
Browse files

[PATCH] ppc32: Clean up NUM_TLBCAMS usage for Freescale Book-E PPC's 



Made the number of TLB CAM entries private and converted the board
consumers to use num_tlbcam_entries which is setup at boot time from
configuration registers.  This way the only consumers of the #define
NUM_TLBCAMS are the arrays used to manage the TLB.

Signed-off-by: default avatarKumar Gala <kumar.gala@freescale.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 65145e06

arch/ppc/mm/fsl_booke_mmu.c

+2 −0
Original line number Diff line number Diff line
@@ -64,6 +64,8 @@ extern unsigned long total_lowmem; 
extern unsigned long __max_low_memory;

#define MAX_LOW_MEM	CONFIG_LOWMEM_SIZE



#define NUM_TLBCAMS	(16)



struct tlbcam {

   	u32	MAS0;

	u32	MAS1;

arch/ppc/mm/mmu_decl.h

+2 −0
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@ extern int mem_init_done; 
extern PTE *Hash, *Hash_end;

extern unsigned long Hash_size, Hash_mask;



extern unsigned int num_tlbcam_entries;



/* ...and now those things that may be slightly different between processor

 * architectures.  -- Dan

 */

arch/ppc/mm/pgtable.c

+0 −1
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ void setbat(int index, unsigned long virt, unsigned long phys, 


#ifdef HAVE_TLBCAM

extern unsigned int tlbcam_index;

extern unsigned int num_tlbcam_entries;

extern unsigned long v_mapped_by_tlbcam(unsigned long va);

extern unsigned long p_mapped_by_tlbcam(unsigned long pa);

#else /* !HAVE_TLBCAM */

arch/ppc/platforms/85xx/mpc8540_ads.c

+2 −2
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ mpc8540ads_setup_arch(void) 
#ifdef CONFIG_SERIAL_TEXT_DEBUG

	/* Invalidate the entry we stole earlier the serial ports

	 * should be properly mapped */

	invalidate_tlbcam_entry(NUM_TLBCAMS - 1);

	invalidate_tlbcam_entry(num_tlbcam_entries - 1);

#endif



	/* setup the board related information for the enet controllers */
@@ -150,7 +150,7 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5, 
		struct uart_port p;



		/* Use the last TLB entry to map CCSRBAR to allow access to DUART regs */

		settlbcam(NUM_TLBCAMS - 1, binfo->bi_immr_base,

		settlbcam(num_tlbcam_entries - 1, binfo->bi_immr_base,

			  binfo->bi_immr_base, MPC85xx_CCSRBAR_SIZE, _PAGE_IO, 0);



		memset(&p, 0, sizeof (p));

arch/ppc/platforms/85xx/mpc85xx_cds_common.c

+2 −2
Original line number Diff line number Diff line
@@ -446,7 +446,7 @@ mpc85xx_cds_setup_arch(void) 
#ifdef CONFIG_SERIAL_TEXT_DEBUG

	/* Invalidate the entry we stole earlier the serial ports

	 * should be properly mapped */

	invalidate_tlbcam_entry(NUM_TLBCAMS - 1);

	invalidate_tlbcam_entry(num_tlbcam_entries - 1);

#endif



	/* setup the board related information for the enet controllers */
@@ -528,7 +528,7 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5, 
		struct uart_port p;



		/* Use the last TLB entry to map CCSRBAR to allow access to DUART regs */

		settlbcam(NUM_TLBCAMS - 1, binfo->bi_immr_base,

		settlbcam(num_tlbcam_entries - 1, binfo->bi_immr_base,

				binfo->bi_immr_base, MPC85xx_CCSRBAR_SIZE, _PAGE_IO, 0);



		memset(&p, 0, sizeof (p));