lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

powerpc/64: Move MMU backend selection out of platform code

Browse Source 
We move it into early_mmu_init() based on firmware features. For PS3,
we have to move the setting of these into early_init_devtree().

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Benjamin Herrenschmidt 2016-07-05 15:03:51 +10:00 committed by Michael Ellerman
parent 91b6fad5cf
commit 166dd7d3fb
11 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/include/asm/ps3.h
View File

@ -526,4 +526,6 @@ void ps3_sync_irq(int node);
u32 ps3_get_hw_thread_id(int cpu);
u64 ps3_get_spe_id(void *arg);
void ps3_early_mm_init(void);
#endif

6
arch/powerpc/kernel/prom.c
View File

@ -759,6 +759,12 @@ void __init early_init_devtree(void *params)
/* Now try to figure out if we are running on LPAR and so on */
pseries_probe_fw_features();
#ifdef CONFIG_PPC_PS3
/* Identify PS3 firmware */
if (of_flat_dt_is_compatible(of_get_flat_dt_root(), "sony,ps3"))
powerpc_firmware_features |= FW_FEATURE_PS3_POSSIBLE;
#endif
DBG(" <- early_init_devtree()\n");
}

14
arch/powerpc/mm/hash_utils_64.c
View File

@ -58,6 +58,7 @@
#include <asm/firmware.h>
#include <asm/tm.h>
#include <asm/trace.h>
#include <asm/ps3.h>
#ifdef DEBUG
#define DBG(fmt...) udbg_printf(fmt)
@ -872,6 +873,11 @@ static void __init htab_initialize(void)
#undef KB
#undef MB
void __init __weak hpte_init_lpar(void)
{
panic("FW_FEATURE_LPAR set but no LPAR support compiled\n");
}
void __init hash__early_init_mmu(void)
{
/*
@ -908,6 +914,14 @@ void __init hash__early_init_mmu(void)
pci_io_base = ISA_IO_BASE;
#endif
/* Select appropriate backend */
if (firmware_has_feature(FW_FEATURE_PS3_LV1))
ps3_early_mm_init();
else if (firmware_has_feature(FW_FEATURE_LPAR))
hpte_init_lpar();
else
hpte_init_native();
/* Initialize the MMU Hash table and create the linear mapping
* of memory. Has to be done before SLB initialization as this is
* currently where the page size encoding is obtained.

1
arch/powerpc/mm/pgtable-radix.c
View File

@ -345,6 +345,7 @@ void __init radix__early_init_mmu(void)
radix_init_page_sizes();
if (!firmware_has_feature(FW_FEATURE_LPAR)) {
radix_init_native();
lpcr = mfspr(SPRN_LPCR);
mtspr(SPRN_LPCR, lpcr | LPCR_UPRT | LPCR_HR);
radix_init_partition_table();

1
arch/powerpc/platforms/cell/setup.c
View File

@ -261,7 +261,6 @@ static int __init cell_probe(void)
!of_flat_dt_is_compatible(root, "IBM,CPBW-1.0"))
return 0;
hpte_init_native();
pm_power_off = rtas_power_off;
return 1;

1
arch/powerpc/platforms/maple/setup.c
View File

@ -306,7 +306,6 @@ static int __init maple_probe(void)
!of_flat_dt_is_compatible(root, "Momentum,Apache"))
return 0;
hpte_init_native();
pm_power_off = maple_power_off;
return 1;

2
arch/powerpc/platforms/pasemi/setup.c
View File

@ -426,8 +426,6 @@ static int __init pas_probe(void)
!of_flat_dt_is_compatible(root, "pasemi,pwrficient"))
return 0;
hpte_init_native();
alloc_iobmap_l2();
return 1;

4
arch/powerpc/platforms/powermac/setup.c
View File

@ -599,10 +599,6 @@ static int __init pmac_probe(void)
!of_flat_dt_is_compatible(root, "MacRISC"))
return 0;
#ifdef CONFIG_PPC64
hpte_init_native();
#endif
#ifdef CONFIG_PPC32
/* isa_io_base gets set in pmac_pci_init */
ISA_DMA_THRESHOLD = ~0L;

5
arch/powerpc/platforms/powernv/setup.c
View File

@ -273,11 +273,6 @@ static int __init pnv_probe(void)
if (!of_flat_dt_is_compatible(root, "ibm,powernv"))
return 0;
if (IS_ENABLED(CONFIG_PPC_RADIX_MMU) && radix_enabled())
radix_init_native();
else if (IS_ENABLED(CONFIG_PPC_STD_MMU_64))
hpte_init_native();
if (firmware_has_feature(FW_FEATURE_OPAL))
pnv_setup_machdep_opal();

15
arch/powerpc/platforms/ps3/setup.c
View File

@ -226,9 +226,17 @@ static void __init ps3_progress(char *s, unsigned short hex)
printk("*** %04x : %s\n", hex, s ? s : "");
}
static int __init ps3_probe(void)
void __init ps3_early_mm_init(void)
{
unsigned long htab_size;
ps3_mm_init();
ps3_mm_vas_create(&htab_size);
ps3_hpte_init(htab_size);
}
static int __init ps3_probe(void)
{
unsigned long dt_root;
DBG(" -> %s:%d\n", __func__, __LINE__);
@ -237,12 +245,7 @@ static int __init ps3_probe(void)
if (!of_flat_dt_is_compatible(dt_root, "sony,ps3"))
return 0;
powerpc_firmware_features |= FW_FEATURE_PS3_POSSIBLE;
ps3_os_area_save_params();
ps3_mm_init();
ps3_mm_vas_create(&htab_size);
ps3_hpte_init(htab_size);
pm_power_off = ps3_power_off;
DBG(" <- %s:%d\n", __func__, __LINE__);

7
arch/powerpc/platforms/pseries/setup.c
View File

@ -687,13 +687,6 @@ static int __init pSeries_probe(void)
of_flat_dt_is_compatible(root, "IBM,CBEA"))
return 0;
pr_debug("pSeries detected, looking for LPAR capability...\n");
if (firmware_has_feature(FW_FEATURE_LPAR))
hpte_init_lpar();
else
hpte_init_native();
pm_power_off = pseries_power_off;
pr_debug("Machine is%s LPAR !\n",