powerpc: Remove CONFIG_PPC_FSL_BOOK3E
CONFIG_PPC_FSL_BOOK3E is redundant with CONFIG_PPC_E500. Remove it. And rename five files accordingly. Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> [mpe: Rename include guards to match new file names] Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/795cb93b88c9a0279289712e674f39e3b108a1b4.1663606876.git.christophe.leroy@csgroup.eu
This commit is contained in:
parent
ec65560ad8
commit
3e7318584d
@ -290,7 +290,7 @@ config PPC_LONG_DOUBLE_128
|
||||
config PPC_BARRIER_NOSPEC
|
||||
bool
|
||||
default y
|
||||
depends on PPC_BOOK3S_64 || PPC_FSL_BOOK3E
|
||||
depends on PPC_BOOK3S_64 || PPC_E500
|
||||
|
||||
config EARLY_PRINTK
|
||||
bool
|
||||
|
@ -86,7 +86,7 @@ do { \
|
||||
|
||||
#ifdef CONFIG_PPC_BOOK3S_64
|
||||
#define NOSPEC_BARRIER_SLOT nop
|
||||
#elif defined(CONFIG_PPC_FSL_BOOK3E)
|
||||
#elif defined(CONFIG_PPC_E500)
|
||||
#define NOSPEC_BARRIER_SLOT nop; nop
|
||||
#endif
|
||||
|
||||
|
@ -7,8 +7,8 @@
|
||||
|
||||
#ifdef CONFIG_PPC_BOOK3S_64
|
||||
#include <asm/book3s/64/hugetlb.h>
|
||||
#elif defined(CONFIG_PPC_FSL_BOOK3E)
|
||||
#include <asm/nohash/hugetlb-book3e.h>
|
||||
#elif defined(CONFIG_PPC_E500)
|
||||
#include <asm/nohash/hugetlb-e500.h>
|
||||
#elif defined(CONFIG_PPC_8xx)
|
||||
#include <asm/nohash/32/hugetlb-8xx.h>
|
||||
#endif /* CONFIG_PPC_BOOK3S_64 */
|
||||
|
@ -443,7 +443,7 @@ struct kvmppc_passthru_irqmap {
|
||||
};
|
||||
#endif
|
||||
|
||||
# ifdef CONFIG_PPC_FSL_BOOK3E
|
||||
# ifdef CONFIG_PPC_E500
|
||||
#define KVMPPC_BOOKE_IAC_NUM 2
|
||||
#define KVMPPC_BOOKE_DAC_NUM 2
|
||||
# else
|
||||
|
@ -141,7 +141,7 @@
|
||||
|
||||
typedef pte_t *pgtable_t;
|
||||
|
||||
#ifdef CONFIG_PPC_FSL_BOOK3E
|
||||
#ifdef CONFIG_PPC_E500
|
||||
#include <asm/percpu.h>
|
||||
DECLARE_PER_CPU(int, next_tlbcam_idx);
|
||||
#endif
|
||||
|
@ -131,7 +131,7 @@ void unmap_kernel_page(unsigned long va);
|
||||
#elif defined(CONFIG_44x)
|
||||
#include <asm/nohash/32/pte-44x.h>
|
||||
#elif defined(CONFIG_PPC_85xx) && defined(CONFIG_PTE_64BIT)
|
||||
#include <asm/nohash/pte-book3e.h>
|
||||
#include <asm/nohash/pte-e500.h>
|
||||
#elif defined(CONFIG_PPC_85xx)
|
||||
#include <asm/nohash/32/pte-85xx.h>
|
||||
#elif defined(CONFIG_PPC_8xx)
|
||||
|
@ -70,7 +70,7 @@
|
||||
/*
|
||||
* Include the PTE bits definitions
|
||||
*/
|
||||
#include <asm/nohash/pte-book3e.h>
|
||||
#include <asm/nohash/pte-e500.h>
|
||||
|
||||
#define PTE_RPN_MASK (~((1UL << PTE_RPN_SHIFT) - 1))
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0 */
|
||||
#ifndef _ASM_POWERPC_NOHASH_HUGETLB_BOOK3E_H
|
||||
#define _ASM_POWERPC_NOHASH_HUGETLB_BOOK3E_H
|
||||
#ifndef _ASM_POWERPC_NOHASH_HUGETLB_E500_H
|
||||
#define _ASM_POWERPC_NOHASH_HUGETLB_E500_H
|
||||
|
||||
static inline pte_t *hugepd_page(hugepd_t hpd)
|
||||
{
|
||||
@ -30,7 +30,7 @@ void flush_hugetlb_page(struct vm_area_struct *vma, unsigned long vmaddr);
|
||||
|
||||
static inline void hugepd_populate(hugepd_t *hpdp, pte_t *new, unsigned int pshift)
|
||||
{
|
||||
/* We use the old format for PPC_FSL_BOOK3E */
|
||||
/* We use the old format for PPC_E500 */
|
||||
*hpdp = __hugepd(((unsigned long)new & ~PD_HUGE) | pshift);
|
||||
}
|
||||
|
||||
@ -42,4 +42,4 @@ static inline int check_and_get_huge_psize(int shift)
|
||||
return shift_to_mmu_psize(shift);
|
||||
}
|
||||
|
||||
#endif /* _ASM_POWERPC_NOHASH_HUGETLB_BOOK3E_H */
|
||||
#endif /* _ASM_POWERPC_NOHASH_HUGETLB_E500_H */
|
@ -266,7 +266,7 @@ static inline int pud_huge(pud_t pud)
|
||||
* We use it to ensure coherency between the i-cache and d-cache
|
||||
* for the page which has just been mapped in.
|
||||
*/
|
||||
#if defined(CONFIG_PPC_FSL_BOOK3E) && defined(CONFIG_HUGETLB_PAGE)
|
||||
#if defined(CONFIG_PPC_E500) && defined(CONFIG_HUGETLB_PAGE)
|
||||
void update_mmu_cache(struct vm_area_struct *vma, unsigned long address, pte_t *ptep);
|
||||
#else
|
||||
static inline
|
||||
|
@ -1,6 +1,6 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0 */
|
||||
#ifndef _ASM_POWERPC_NOHASH_PTE_BOOK3E_H
|
||||
#define _ASM_POWERPC_NOHASH_PTE_BOOK3E_H
|
||||
#ifndef _ASM_POWERPC_NOHASH_PTE_E500_H
|
||||
#define _ASM_POWERPC_NOHASH_PTE_E500_H
|
||||
#ifdef __KERNEL__
|
||||
|
||||
/* PTE bit definitions for processors compliant to the Book3E
|
||||
@ -126,4 +126,4 @@ static inline pte_t pte_mkexec(pte_t pte)
|
||||
#endif /* __ASSEMBLY__ */
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
#endif /* _ASM_POWERPC_NOHASH_PTE_BOOK3E_H */
|
||||
#endif /* _ASM_POWERPC_NOHASH_PTE_E500_H */
|
@ -31,7 +31,7 @@ extern unsigned int hpage_shift;
|
||||
#define HPAGE_SHIFT hpage_shift
|
||||
#elif defined(CONFIG_PPC_8xx)
|
||||
#define HPAGE_SHIFT 19 /* 512k pages */
|
||||
#elif defined(CONFIG_PPC_FSL_BOOK3E)
|
||||
#elif defined(CONFIG_PPC_E500)
|
||||
#define HPAGE_SHIFT 22 /* 4M pages */
|
||||
#endif
|
||||
#define HPAGE_SIZE ((1UL) << HPAGE_SHIFT)
|
||||
|
@ -342,7 +342,7 @@ n:
|
||||
#endif
|
||||
|
||||
/* various errata or part fixups */
|
||||
#if defined(CONFIG_PPC_CELL) || defined(CONFIG_PPC_FSL_BOOK3E)
|
||||
#if defined(CONFIG_PPC_CELL) || defined(CONFIG_PPC_E500)
|
||||
#define MFTB(dest) \
|
||||
90: mfspr dest, SPRN_TBRL; \
|
||||
BEGIN_FTR_SECTION_NESTED(96); \
|
||||
@ -768,7 +768,7 @@ END_FTR_SECTION_NESTED(CPU_FTR_CELL_TB_BUG, CPU_FTR_CELL_TB_BUG, 96)
|
||||
stringify_in_c(.llong (_target);) \
|
||||
stringify_in_c(.previous)
|
||||
|
||||
#ifdef CONFIG_PPC_FSL_BOOK3E
|
||||
#ifdef CONFIG_PPC_E500
|
||||
#define BTB_FLUSH(reg) \
|
||||
lis reg,BUCSR_INIT@h; \
|
||||
ori reg,reg,BUCSR_INIT@l; \
|
||||
@ -776,6 +776,6 @@ END_FTR_SECTION_NESTED(CPU_FTR_CELL_TB_BUG, CPU_FTR_CELL_TB_BUG, 96)
|
||||
isync;
|
||||
#else
|
||||
#define BTB_FLUSH(reg)
|
||||
#endif /* CONFIG_PPC_FSL_BOOK3E */
|
||||
#endif /* CONFIG_PPC_E500 */
|
||||
|
||||
#endif /* _ASM_POWERPC_PPC_ASM_H */
|
||||
|
@ -69,7 +69,7 @@ void do_barrier_nospec_fixups_range(bool enable, void *start, void *end);
|
||||
static inline void do_barrier_nospec_fixups_range(bool enable, void *start, void *end) { }
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_PPC_FSL_BOOK3E
|
||||
#ifdef CONFIG_PPC_E500
|
||||
void __init setup_spectre_v2(void);
|
||||
#else
|
||||
static inline void setup_spectre_v2(void) {}
|
||||
|
@ -114,7 +114,7 @@ endif
|
||||
obj64-$(CONFIG_HIBERNATION) += swsusp_asm64.o
|
||||
obj-$(CONFIG_MODULES) += module.o module_$(BITS).o
|
||||
obj-$(CONFIG_44x) += cpu_setup_44x.o
|
||||
obj-$(CONFIG_PPC_FSL_BOOK3E) += cpu_setup_fsl_booke.o
|
||||
obj-$(CONFIG_PPC_E500) += cpu_setup_e500.o
|
||||
obj-$(CONFIG_PPC_DOORBELL) += dbell.o
|
||||
obj-$(CONFIG_JUMP_LABEL) += jump_label.o
|
||||
|
||||
|
@ -59,7 +59,7 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_PPC_FSL_BOOK3E)
|
||||
#if defined(CONFIG_PPC_E500)
|
||||
#include "../mm/mmu_decl.h"
|
||||
#endif
|
||||
|
||||
@ -651,7 +651,7 @@ int main(void)
|
||||
DEFINE(PGD_T_LOG2, PGD_T_LOG2);
|
||||
DEFINE(PTE_T_LOG2, PTE_T_LOG2);
|
||||
#endif
|
||||
#ifdef CONFIG_PPC_FSL_BOOK3E
|
||||
#ifdef CONFIG_PPC_E500
|
||||
DEFINE(TLBCAM_SIZE, sizeof(struct tlbcam));
|
||||
OFFSET(TLBCAM_MAS0, tlbcam, MAS0);
|
||||
OFFSET(TLBCAM_MAS1, tlbcam, MAS1);
|
||||
|
@ -34,7 +34,7 @@
|
||||
*/
|
||||
#define THREAD_NORMSAVE(offset) (THREAD_NORMSAVES + (offset * 4))
|
||||
|
||||
#ifdef CONFIG_PPC_FSL_BOOK3E
|
||||
#ifdef CONFIG_PPC_E500
|
||||
#define BOOKE_CLEAR_BTB(reg) \
|
||||
START_BTB_FLUSH_SECTION \
|
||||
BTB_FLUSH(reg) \
|
||||
|
@ -230,7 +230,7 @@ _ASM_NOKPROBE_SYMBOL(system_call_common)
|
||||
std r0,GPR0(r1)
|
||||
std r10,GPR1(r1)
|
||||
std r2,GPR2(r1)
|
||||
#ifdef CONFIG_PPC_FSL_BOOK3E
|
||||
#ifdef CONFIG_PPC_E500
|
||||
START_BTB_FLUSH_SECTION
|
||||
BTB_FLUSH(r10)
|
||||
END_BTB_FLUSH_SECTION
|
||||
|
@ -35,7 +35,7 @@ static enum branch_cache_flush_type link_stack_flush_type = BRANCH_CACHE_FLUSH_N
|
||||
bool barrier_nospec_enabled;
|
||||
static bool no_nospec;
|
||||
static bool btb_flush_enabled;
|
||||
#if defined(CONFIG_PPC_FSL_BOOK3E) || defined(CONFIG_PPC_BOOK3S_64)
|
||||
#if defined(CONFIG_PPC_E500) || defined(CONFIG_PPC_BOOK3S_64)
|
||||
static bool no_spectrev2;
|
||||
#endif
|
||||
|
||||
@ -122,7 +122,7 @@ static __init int security_feature_debugfs_init(void)
|
||||
device_initcall(security_feature_debugfs_init);
|
||||
#endif /* CONFIG_DEBUG_FS */
|
||||
|
||||
#if defined(CONFIG_PPC_FSL_BOOK3E) || defined(CONFIG_PPC_BOOK3S_64)
|
||||
#if defined(CONFIG_PPC_E500) || defined(CONFIG_PPC_BOOK3S_64)
|
||||
static int __init handle_nospectre_v2(char *p)
|
||||
{
|
||||
no_spectrev2 = true;
|
||||
@ -130,9 +130,9 @@ static int __init handle_nospectre_v2(char *p)
|
||||
return 0;
|
||||
}
|
||||
early_param("nospectre_v2", handle_nospectre_v2);
|
||||
#endif /* CONFIG_PPC_FSL_BOOK3E || CONFIG_PPC_BOOK3S_64 */
|
||||
#endif /* CONFIG_PPC_E500 || CONFIG_PPC_BOOK3S_64 */
|
||||
|
||||
#ifdef CONFIG_PPC_FSL_BOOK3E
|
||||
#ifdef CONFIG_PPC_E500
|
||||
void __init setup_spectre_v2(void)
|
||||
{
|
||||
if (no_spectrev2 || cpu_mitigations_off())
|
||||
@ -140,7 +140,7 @@ void __init setup_spectre_v2(void)
|
||||
else
|
||||
btb_flush_enabled = true;
|
||||
}
|
||||
#endif /* CONFIG_PPC_FSL_BOOK3E */
|
||||
#endif /* CONFIG_PPC_E500 */
|
||||
|
||||
#ifdef CONFIG_PPC_BOOK3S_64
|
||||
ssize_t cpu_show_meltdown(struct device *dev, struct device_attribute *attr, char *buf)
|
||||
|
@ -708,7 +708,7 @@ static struct task_struct *current_set[NR_CPUS];
|
||||
static void smp_store_cpu_info(int id)
|
||||
{
|
||||
per_cpu(cpu_pvr, id) = mfspr(SPRN_PVR);
|
||||
#ifdef CONFIG_PPC_FSL_BOOK3E
|
||||
#ifdef CONFIG_PPC_E500
|
||||
per_cpu(next_tlbcam_idx, id)
|
||||
= (mfspr(SPRN_TLB1CFG) & TLBnCFG_N_ENTRY) - 1;
|
||||
#endif
|
||||
|
@ -228,7 +228,7 @@ static void __init sysfs_create_dscr_default(void)
|
||||
}
|
||||
#endif /* CONFIG_PPC64 */
|
||||
|
||||
#ifdef CONFIG_PPC_FSL_BOOK3E
|
||||
#ifdef CONFIG_PPC_E500
|
||||
#define MAX_BIT 63
|
||||
|
||||
static u64 pw20_wt;
|
||||
@ -907,7 +907,7 @@ static int register_cpu_online(unsigned int cpu)
|
||||
device_create_file(s, &dev_attr_tscr);
|
||||
#endif /* CONFIG_PPC64 */
|
||||
|
||||
#ifdef CONFIG_PPC_FSL_BOOK3E
|
||||
#ifdef CONFIG_PPC_E500
|
||||
if (PVR_VER(cur_cpu_spec->pvr_value) == PVR_VER_E6500) {
|
||||
device_create_file(s, &dev_attr_pw20_state);
|
||||
device_create_file(s, &dev_attr_pw20_wait_time);
|
||||
@ -1003,7 +1003,7 @@ static int unregister_cpu_online(unsigned int cpu)
|
||||
device_remove_file(s, &dev_attr_tscr);
|
||||
#endif /* CONFIG_PPC64 */
|
||||
|
||||
#ifdef CONFIG_PPC_FSL_BOOK3E
|
||||
#ifdef CONFIG_PPC_E500
|
||||
if (PVR_VER(cur_cpu_spec->pvr_value) == PVR_VER_E6500) {
|
||||
device_remove_file(s, &dev_attr_pw20_state);
|
||||
device_remove_file(s, &dev_attr_pw20_wait_time);
|
||||
|
@ -239,7 +239,7 @@ SECTIONS
|
||||
}
|
||||
#endif /* CONFIG_PPC_BARRIER_NOSPEC */
|
||||
|
||||
#ifdef CONFIG_PPC_FSL_BOOK3E
|
||||
#ifdef CONFIG_PPC_E500
|
||||
. = ALIGN(8);
|
||||
__spec_btb_flush_fixup : AT(ADDR(__spec_btb_flush_fixup) - LOAD_OFFSET) {
|
||||
__start__btb_flush_fixup = .;
|
||||
|
@ -550,7 +550,7 @@ void do_barrier_nospec_fixups(bool enable)
|
||||
}
|
||||
#endif /* CONFIG_PPC_BARRIER_NOSPEC */
|
||||
|
||||
#ifdef CONFIG_PPC_FSL_BOOK3E
|
||||
#ifdef CONFIG_PPC_E500
|
||||
void do_barrier_nospec_fixups_range(bool enable, void *fixup_start, void *fixup_end)
|
||||
{
|
||||
unsigned int instr[2], *dest;
|
||||
@ -602,7 +602,7 @@ void __init do_btb_flush_fixups(void)
|
||||
for (; start < end; start += 2)
|
||||
patch_btb_flush_section(start);
|
||||
}
|
||||
#endif /* CONFIG_PPC_FSL_BOOK3E */
|
||||
#endif /* CONFIG_PPC_E500 */
|
||||
|
||||
void do_lwsync_fixups(unsigned long value, void *fixup_start, void *fixup_end)
|
||||
{
|
||||
|
@ -623,7 +623,7 @@ static int __init hugetlbpage_init(void)
|
||||
if (pdshift > shift) {
|
||||
if (!IS_ENABLED(CONFIG_PPC_8xx))
|
||||
pgtable_cache_add(pdshift - shift);
|
||||
} else if (IS_ENABLED(CONFIG_PPC_FSL_BOOK3E) ||
|
||||
} else if (IS_ENABLED(CONFIG_PPC_E500) ||
|
||||
IS_ENABLED(CONFIG_PPC_8xx)) {
|
||||
pgtable_cache_add(PTE_T_ORDER);
|
||||
}
|
||||
|
@ -308,7 +308,7 @@ void __init mem_init(void)
|
||||
}
|
||||
#endif /* CONFIG_HIGHMEM */
|
||||
|
||||
#if defined(CONFIG_PPC_FSL_BOOK3E) && !defined(CONFIG_SMP)
|
||||
#if defined(CONFIG_PPC_E500) && !defined(CONFIG_SMP)
|
||||
/*
|
||||
* If smp is enabled, next_tlbcam_idx is initialized in the cpu up
|
||||
* functions.... do it here for the non-smp case.
|
||||
|
@ -111,7 +111,7 @@ void MMU_init_hw_patch(void);
|
||||
unsigned long mmu_mapin_ram(unsigned long base, unsigned long top);
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_PPC_FSL_BOOK3E
|
||||
#ifdef CONFIG_PPC_E500
|
||||
extern unsigned long map_mem_in_cams(unsigned long ram, int max_cam_idx,
|
||||
bool dryrun, bool init);
|
||||
#ifdef CONFIG_PPC32
|
||||
@ -157,7 +157,7 @@ static inline phys_addr_t v_block_mapped(unsigned long va) { return 0; }
|
||||
static inline unsigned long p_block_mapped(phys_addr_t pa) { return 0; }
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_PPC_BOOK3S_32) || defined(CONFIG_PPC_8xx) || defined(CONFIG_PPC_FSL_BOOK3E)
|
||||
#if defined(CONFIG_PPC_BOOK3S_32) || defined(CONFIG_PPC_8xx) || defined(CONFIG_PPC_E500)
|
||||
void mmu_mark_initmem_nx(void);
|
||||
void mmu_mark_rodata_ro(void);
|
||||
#else
|
||||
|
@ -7,13 +7,13 @@ obj-$(CONFIG_PPC_BOOK3E_64) += tlb_low_64e.o book3e_pgtable.o
|
||||
obj-$(CONFIG_40x) += 40x.o
|
||||
obj-$(CONFIG_44x) += 44x.o
|
||||
obj-$(CONFIG_PPC_8xx) += 8xx.o
|
||||
obj-$(CONFIG_PPC_FSL_BOOK3E) += fsl_book3e.o
|
||||
obj-$(CONFIG_PPC_E500) += e500.o
|
||||
obj-$(CONFIG_RANDOMIZE_BASE) += kaslr_booke.o
|
||||
ifdef CONFIG_HUGETLB_PAGE
|
||||
obj-$(CONFIG_PPC_FSL_BOOK3E) += book3e_hugetlbpage.o
|
||||
obj-$(CONFIG_PPC_E500) += e500_hugetlbpage.o
|
||||
endif
|
||||
|
||||
# Disable kcov instrumentation on sensitive code
|
||||
# This is necessary for booting with kcov enabled on book3e machines
|
||||
KCOV_INSTRUMENT_tlb.o := n
|
||||
KCOV_INSTRUMENT_fsl_book3e.o := n
|
||||
KCOV_INSTRUMENT_e500.o := n
|
||||
|
@ -50,7 +50,7 @@
|
||||
* indirect page table entries.
|
||||
*/
|
||||
#if defined(CONFIG_PPC_BOOK3E_MMU) || defined(CONFIG_PPC_8xx)
|
||||
#ifdef CONFIG_PPC_FSL_BOOK3E
|
||||
#ifdef CONFIG_PPC_E500
|
||||
struct mmu_psize_def mmu_psize_defs[MMU_PAGE_COUNT] = {
|
||||
[MMU_PAGE_4K] = {
|
||||
.shift = 12,
|
||||
@ -166,7 +166,7 @@ int extlb_level_exc;
|
||||
|
||||
#endif /* CONFIG_PPC64 */
|
||||
|
||||
#ifdef CONFIG_PPC_FSL_BOOK3E
|
||||
#ifdef CONFIG_PPC_E500
|
||||
/* next_tlbcam_idx is used to round-robin tlbcam entry assignment */
|
||||
DEFINE_PER_CPU(int, next_tlbcam_idx);
|
||||
EXPORT_PER_CPU_SYMBOL(next_tlbcam_idx);
|
||||
@ -441,7 +441,7 @@ static void __init setup_page_sizes(void)
|
||||
unsigned int eptcfg;
|
||||
int i, psize;
|
||||
|
||||
#ifdef CONFIG_PPC_FSL_BOOK3E
|
||||
#ifdef CONFIG_PPC_E500
|
||||
unsigned int mmucfg = mfspr(SPRN_MMUCFG);
|
||||
int fsl_mmu = mmu_has_feature(MMU_FTR_TYPE_FSL_E);
|
||||
|
||||
@ -584,7 +584,7 @@ static void __init setup_mmu_htw(void)
|
||||
patch_exception(0x1c0, exc_data_tlb_miss_htw_book3e);
|
||||
patch_exception(0x1e0, exc_instruction_tlb_miss_htw_book3e);
|
||||
break;
|
||||
#ifdef CONFIG_PPC_FSL_BOOK3E
|
||||
#ifdef CONFIG_PPC_E500
|
||||
case PPC_HTW_E6500:
|
||||
extlb_level_exc = EX_TLB_SIZE;
|
||||
patch_exception(0x1c0, exc_data_tlb_miss_e6500_book3e);
|
||||
@ -627,7 +627,7 @@ static void early_init_this_mmu(void)
|
||||
}
|
||||
mtspr(SPRN_MAS4, mas4);
|
||||
|
||||
#ifdef CONFIG_PPC_FSL_BOOK3E
|
||||
#ifdef CONFIG_PPC_E500
|
||||
if (mmu_has_feature(MMU_FTR_TYPE_FSL_E)) {
|
||||
unsigned int num_cams;
|
||||
bool map = true;
|
||||
@ -680,7 +680,7 @@ static void __init early_init_mmu_global(void)
|
||||
/* Look for HW tablewalk support */
|
||||
setup_mmu_htw();
|
||||
|
||||
#ifdef CONFIG_PPC_FSL_BOOK3E
|
||||
#ifdef CONFIG_PPC_E500
|
||||
if (mmu_has_feature(MMU_FTR_TYPE_FSL_E)) {
|
||||
if (book3e_htw_mode == PPC_HTW_NONE) {
|
||||
extlb_level_exc = EX_TLB_SIZE;
|
||||
@ -701,7 +701,7 @@ static void __init early_init_mmu_global(void)
|
||||
|
||||
static void __init early_mmu_set_memory_limit(void)
|
||||
{
|
||||
#ifdef CONFIG_PPC_FSL_BOOK3E
|
||||
#ifdef CONFIG_PPC_E500
|
||||
if (mmu_has_feature(MMU_FTR_TYPE_FSL_E)) {
|
||||
/*
|
||||
* Limit memory so we dont have linear faults.
|
||||
@ -750,7 +750,7 @@ void setup_initial_memory_limit(phys_addr_t first_memblock_base,
|
||||
* We crop it to the size of the first MEMBLOCK to
|
||||
* avoid going over total available memory just in case...
|
||||
*/
|
||||
#ifdef CONFIG_PPC_FSL_BOOK3E
|
||||
#ifdef CONFIG_PPC_E500
|
||||
if (early_mmu_has_feature(MMU_FTR_TYPE_FSL_E)) {
|
||||
unsigned long linear_sz;
|
||||
unsigned int num_cams;
|
||||
|
@ -364,7 +364,7 @@ _GLOBAL(_tlbivax_bcast)
|
||||
#error Unsupported processor type !
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_PPC_FSL_BOOK3E)
|
||||
#if defined(CONFIG_PPC_E500)
|
||||
/*
|
||||
* extern void loadcam_entry(unsigned int index)
|
||||
*
|
||||
|
@ -107,7 +107,6 @@ config PPC_BOOK3S_64
|
||||
|
||||
config PPC_BOOK3E_64
|
||||
bool "Embedded processors"
|
||||
select PPC_FSL_BOOK3E
|
||||
select PPC_E500
|
||||
select PPC_E500MC
|
||||
select PPC_FPU # Make it a choice ?
|
||||
@ -259,8 +258,11 @@ config PPC_BOOK3S
|
||||
|
||||
config PPC_E500
|
||||
select FSL_EMB_PERFMON
|
||||
select PPC_FSL_BOOK3E
|
||||
bool
|
||||
select ARCH_SUPPORTS_HUGETLBFS if PHYS_64BIT || PPC64
|
||||
select PPC_SMP_MUXED_IPI
|
||||
select PPC_DOORBELL
|
||||
select PPC_KUEP
|
||||
|
||||
config PPC_E500MC
|
||||
bool "e500mc Support"
|
||||
@ -320,16 +322,6 @@ config BOOKE_OR_40x
|
||||
depends on BOOKE || 40x
|
||||
default y
|
||||
|
||||
# this is for common code between PPC32 & PPC64 FSL BOOKE
|
||||
config PPC_FSL_BOOK3E
|
||||
bool
|
||||
select ARCH_SUPPORTS_HUGETLBFS if PHYS_64BIT || PPC64
|
||||
imply FSL_EMB_PERFMON
|
||||
select PPC_SMP_MUXED_IPI
|
||||
select PPC_DOORBELL
|
||||
select PPC_KUEP
|
||||
default y if PPC_85xx
|
||||
|
||||
config PTE_64BIT
|
||||
bool
|
||||
depends on 44x || PPC_E500 || PPC_86xx
|
||||
|
Loading…
Reference in New Issue
Block a user