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

Commit 19f5465e authored by Trent Piepho's avatar Trent Piepho Committed by Kumar Gala
Browse files

powerpc/fsl-booke: Don't hard-code size of struct tlbcam 



Some assembly code in head_fsl_booke.S hard-coded the size of struct tlbcam
to 20 when it indexed the TLBCAM table.  Anyone changing the size of struct
tlbcam would not know to expect that.

The kernel already has a system to get the size of C structures into
assembly language files, asm-offsets, so let's use it.

The definition of the struct gets moved to a header, so that asm-offsets.c
can include it.

Signed-off-by: default avatarTrent Piepho <tpiepho@freescale.com>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 565f3764

arch/powerpc/kernel/asm-offsets.c

+7 −0
Original line number Diff line number Diff line
@@ -56,6 +56,10 @@ 
#include "head_booke.h"

#endif



#if defined(CONFIG_FSL_BOOKE)

#include "../mm/mmu_decl.h"

#endif



int main(void)

{

	DEFINE(THREAD, offsetof(struct task_struct, thread));
@@ -384,6 +388,9 @@ int main(void) 
	DEFINE(PGD_T_LOG2, PGD_T_LOG2);

	DEFINE(PTE_T_LOG2, PTE_T_LOG2);

#endif

#ifdef CONFIG_FSL_BOOKE

	DEFINE(TLBCAM_SIZE, sizeof(struct tlbcam));

#endif



	return 0;

}

arch/powerpc/kernel/head_fsl_booke.S

+1 −1
Original line number Diff line number Diff line
@@ -909,7 +909,7 @@ KernelSPE: 
_GLOBAL(loadcam_entry)

	lis	r4,TLBCAM@ha

	addi	r4,r4,TLBCAM@l

	mulli	r5,r3,20

	mulli	r5,r3,TLBCAM_SIZE

	add	r3,r5,r4

	lwz	r4,0(r3)

	mtspr	SPRN_MAS0,r4

arch/powerpc/mm/fsl_booke_mmu.c

+1 −7
Original line number Diff line number Diff line
@@ -61,13 +61,7 @@ static unsigned long __cam0, __cam1, __cam2; 


#define NUM_TLBCAMS	(16)



struct tlbcam {

   	u32	MAS0;

	u32	MAS1;

	u32	MAS2;

	u32	MAS3;

	u32	MAS7;

} TLBCAM[NUM_TLBCAMS];

struct tlbcam TLBCAM[NUM_TLBCAMS];



struct tlbcamrange {

   	unsigned long start;

arch/powerpc/mm/mmu_decl.h

+9 −0
Original line number Diff line number Diff line
@@ -75,6 +75,15 @@ extern void _tlbia(void); 
#endif /* CONFIG_PPC_MMU_NOHASH */



#ifdef CONFIG_PPC32



struct tlbcam {

	u32	MAS0;

	u32	MAS1;

	u32	MAS2;

	u32	MAS3;

	u32	MAS7;

};



extern void mapin_ram(void);

extern int map_page(unsigned long va, phys_addr_t pa, int flags);

extern void setbat(int index, unsigned long virt, phys_addr_t phys,