mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-18 13:11:31 +00:00
ppc: Move used_tlb_cams to arch_global_data
Move this field into arch_global_data and tidy up. Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
8670dbc953
commit
7c80c6c51a
2 changed files with 7 additions and 7 deletions
|
@ -99,7 +99,7 @@ static inline void use_tlb_cam(u8 idx)
|
|||
int i = idx / 32;
|
||||
int bit = idx % 32;
|
||||
|
||||
gd->used_tlb_cams[i] |= (1 << bit);
|
||||
gd->arch.used_tlb_cams[i] |= (1 << bit);
|
||||
}
|
||||
|
||||
static inline void free_tlb_cam(u8 idx)
|
||||
|
@ -107,7 +107,7 @@ static inline void free_tlb_cam(u8 idx)
|
|||
int i = idx / 32;
|
||||
int bit = idx % 32;
|
||||
|
||||
gd->used_tlb_cams[i] &= ~(1 << bit);
|
||||
gd->arch.used_tlb_cams[i] &= ~(1 << bit);
|
||||
}
|
||||
|
||||
void init_used_tlb_cams(void)
|
||||
|
@ -116,7 +116,7 @@ void init_used_tlb_cams(void)
|
|||
unsigned int num_cam = mfspr(SPRN_TLB1CFG) & 0xfff;
|
||||
|
||||
for (i = 0; i < ((CONFIG_SYS_NUM_TLBCAMS+31)/32); i++)
|
||||
gd->used_tlb_cams[i] = 0;
|
||||
gd->arch.used_tlb_cams[i] = 0;
|
||||
|
||||
/* walk all the entries */
|
||||
for (i = 0; i < num_cam; i++) {
|
||||
|
@ -133,7 +133,7 @@ int find_free_tlbcam(void)
|
|||
u32 idx;
|
||||
|
||||
for (i = 0; i < ((CONFIG_SYS_NUM_TLBCAMS+31)/32); i++) {
|
||||
idx = ffz(gd->used_tlb_cams[i]);
|
||||
idx = ffz(gd->arch.used_tlb_cams[i]);
|
||||
|
||||
if (idx != 32)
|
||||
break;
|
||||
|
|
|
@ -91,6 +91,9 @@ struct arch_global_data {
|
|||
#if defined(CONFIG_FSL_LAW)
|
||||
u32 used_laws;
|
||||
#endif
|
||||
#if defined(CONFIG_E500)
|
||||
u32 used_tlb_cams[(CONFIG_SYS_NUM_TLBCAMS+31)/32];
|
||||
#endif
|
||||
};
|
||||
|
||||
/*
|
||||
|
@ -113,9 +116,6 @@ typedef struct global_data {
|
|||
#if defined(CONFIG_FSL_ESDHC)
|
||||
u32 sdhc_clk;
|
||||
#endif
|
||||
#if defined(CONFIG_E500)
|
||||
u32 used_tlb_cams[(CONFIG_SYS_NUM_TLBCAMS+31)/32];
|
||||
#endif
|
||||
#if defined(CONFIG_MPC5xxx)
|
||||
unsigned long ipb_clk;
|
||||
#endif
|
||||
|
|
Loading…
Add table
Reference in a new issue