powerpc: Initialise ppc_md htab pointers earlier
PATCH 1/2 powerpc: Initialise ppc_md htab pointers earlier
Initialise the ppc_md htab callbacks earlier, in the probe routines. This allows us to call htab_finish_init() from htab_initialize(), and makes it private to hash_utils_64.c. Move htab_finish_init() and make_bl() above htab_initialize() to avoid forward declarations.
Signed-off-by Michael Ellerman <[email protected]>
---
arch/powerpc/kernel/setup_64.c | 6 -- arch/powerpc/mm/hash_native_64.c | 3 - arch/powerpc/mm/hash_utils_64.c | 72 ++++++++++++++++---------------- arch/powerpc/platforms/cell/setup.c | 12 ++--- arch/powerpc/platforms/iseries/htab.c | 4 - arch/powerpc/platforms/iseries/setup.c | 7 --- arch/powerpc/platforms/maple/setup.c | 7 --- arch/powerpc/platforms/powermac/setup.c | 9 ---- arch/powerpc/platforms/pseries/lpar.c | 4 - arch/powerpc/platforms/pseries/setup.c | 10 ++-- include/asm-powerpc/mmu.h | 1 11 files changed, 58 insertions(+), 77 deletions(-)
arch/powerpc/kernel/setup_64.c +1 -5
@@ -358,11 +358,7 @@ void __init setup_system(void)* Fill the ppc64_caches & systemcfg structures with informations * retrieved from the device-tree. Need to be called before * finish_device_tree() since the later requires some of the -* informations filled up here to properly parse the interrupt -* tree. -* It also sets up the cache line sizes which allows to call -* routines like flush_icache_range (used by the hash init -* later on). +* informations filled up here to properly parse the interrupt tree. */ initialize_cache_info ();
arch/powerpc/mm/hash_native_64.c +1 -2
@@ -520,7 +520,7 @@ static inline int tlb_batching_enabled(v }#endif -void hpte_init_native (void ) +void __init hpte_init_native (void ) { ppc_md.hpte_invalidate = native_hpte_invalidate; ppc_md.hpte_updatepp = native_hpte_updatepp;
@@ -530,5 +530,4 @@ void hpte_init_native(void) ppc_md.hpte_clear_all = native_hpte_clear;if (tlb_batching_enabled ()) ppc_md.flush_hash_range = native_flush_hash_range; -htab_finish_init (); }
arch/powerpc/mm/hash_utils_64.c +37 -35
93 lines not on this page · raw message
arch/powerpc/platforms/cell/setup.c +6 -6
@@ -125,8 +125,6 @@ static void __init cell_init_early(void) {DBG (" -> cell_init_early()\n" ); -hpte_init_native (); -cell_init_iommu (); ppc64_interrupt_controller =IC_CELL_PIC ;
@@ -139,11 +137,13 @@ static int __init cell_probe(void) {unsigned long root =of_get_flat_dt_root (); -if (of_flat_dt_is_compatible (root,"IBM,CBEA" ) || -of_flat_dt_is_compatible (root,"IBM,CPBW-1.0" )) -return 1 ; +if (!of_flat_dt_is_compatible (root,"IBM,CBEA" ) && + !of_flat_dt_is_compatible (root,"IBM,CPBW-1.0" )) +return 0 ; + +hpte_init_native (); -return 0 ; +return 1 ; }/*
arch/powerpc/platforms/iseries/htab.c +1 -3
@@ -242,13 +242,11 @@ static void iSeries_hpte_invalidate(unsilocal_irq_restore (flags); } -void hpte_init_iSeries (void ) +void __init hpte_init_iSeries (void ) { ppc_md.hpte_invalidate = iSeries_hpte_invalidate; ppc_md.hpte_updatepp = iSeries_hpte_updatepp; ppc_md.hpte_updateboltedpp = iSeries_hpte_updateboltedpp; ppc_md.hpte_insert = iSeries_hpte_insert; ppc_md.hpte_remove = iSeries_hpte_remove; - -htab_finish_init (); }
arch/powerpc/platforms/iseries/setup.c +2 -5
@@ -319,11 +319,6 @@ static void __init iSeries_init_early(vo iSeries_recal_titan =HvCallXm_loadTod ();/* -* Initialize the hash table management pointers -*/ -hpte_init_iSeries (); - -/* * Initialize the DMA/TCE management */ iommu_init_early_iSeries ();
@@ -671,6 +666,8 @@ static int __init iseries_probe(void)*/ virt_irq_max =255 ; +hpte_init_iSeries (); +return 1 ; }
arch/powerpc/platforms/maple/setup.c +2 -5
@@ -199,11 +199,6 @@ static void __init maple_init_early(void {DBG (" -> maple_init_early\n" ); -/* Initialize hash table, from now on, we can take hash faults -* and call ioremap -*/ -hpte_init_native (); -/* Setup interrupt mapping options */ ppc64_interrupt_controller =IC_OPEN_PIC ;
@@ -272,6 +267,8 @@ static int __init maple_probe(void)*/ alloc_dart_table (); +hpte_init_native (); +return 1 ; }
arch/powerpc/platforms/powermac/setup.c +2 -7
@@ -600,13 +600,6 @@ pmac_halt(void)*/ static void __init pmac_init_early (void ) { -#ifdef CONFIG_PPC64 -/* Initialize hash table, from now on, we can take hash faults -* and call ioremap -*/ -hpte_init_native (); -#endif -/* Enable early btext debug if requested */ if (strstr (cmd_line,"btextdbg" )) {udbg_adb_init_early ();
@@ -683,6 +676,8 @@ static int __init pmac_probe(void)* part of the cacheable linar mapping */ alloc_dart_table (); + +hpte_init_native ();#endif #ifdef CONFIG_PPC32
arch/powerpc/platforms/pseries/lpar.c +1 -3
@@ -513,7 +513,7 @@ void pSeries_lpar_flush_hash_range(unsigspin_unlock_irqrestore (&pSeries_lpar_tlbie_lock, flags); } -void hpte_init_lpar (void ) +void __init hpte_init_lpar (void ) { ppc_md.hpte_invalidate = pSeries_lpar_hpte_invalidate; ppc_md.hpte_updatepp = pSeries_lpar_hpte_updatepp;
@@ -522,6 +522,4 @@ void hpte_init_lpar(void) ppc_md.hpte_remove = pSeries_lpar_hpte_remove; ppc_md.flush_hash_range = pSeries_lpar_flush_hash_range; ppc_md.hpte_clear_all = pSeries_lpar_hptab_clear; - -htab_finish_init (); }
arch/powerpc/platforms/pseries/setup.c +5 -5
@@ -322,11 +322,6 @@ static void __init pSeries_init_early(voDBG (" -> pSeries_init_early()\n" );fw_feature_init (); - -if (firmware_has_feature (FW_FEATURE_LPAR )) -hpte_init_lpar (); -else -hpte_init_native ();if (firmware_has_feature (FW_FEATURE_LPAR ))find_udbg_vterm ();
@@ -384,6 +379,11 @@ static int __init pSeries_probe_hypertasif (of_get_flat_dt_prop (node,"ibm,hypertas-functions" ,NULL ) !=NULL ) powerpc_firmware_features |=FW_FEATURE_LPAR ; +if (firmware_has_feature (FW_FEATURE_LPAR )) +hpte_init_lpar (); +else +hpte_init_native (); +return 1 ; }
include/asm-powerpc/mmu.h +0 -1
@@ -238,7 +238,6 @@ extern int hash_huge_page(struct mm_stru unsigned long ea, unsigned long vsid, int local, unsigned long trap); -extern void htab_finish_init (void );extern int htab_bolt_mapping (unsigned long vstart,unsigned long vend,unsigned long pstart,unsigned long mode,int psize);