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

Commit 7d0daae4 authored by Michael Ellerman's avatar Michael Ellerman Committed by Paul Mackerras
Browse files

[POWERPC] 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: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 7a4571ae

arch/powerpc/kernel/setup_64.c

+1 −5
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -520,7 +520,7 @@ static inline int tlb_batching_enabled(void) 
}

#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
Original line number Diff line number Diff line
@@ -413,6 +413,41 @@ void create_section_mapping(unsigned long start, unsigned long end) 
}

#endif /* CONFIG_MEMORY_HOTPLUG */



static inline void make_bl(unsigned int *insn_addr, void *func)

{

	unsigned long funcp = *((unsigned long *)func);

	int offset = funcp - (unsigned long)insn_addr;



	*insn_addr = (unsigned int)(0x48000001 | (offset & 0x03fffffc));

	flush_icache_range((unsigned long)insn_addr, 4+

			   (unsigned long)insn_addr);

}



static void __init htab_finish_init(void)

{

	extern unsigned int *htab_call_hpte_insert1;

	extern unsigned int *htab_call_hpte_insert2;

	extern unsigned int *htab_call_hpte_remove;

	extern unsigned int *htab_call_hpte_updatepp;



#ifdef CONFIG_PPC_64K_PAGES

	extern unsigned int *ht64_call_hpte_insert1;

	extern unsigned int *ht64_call_hpte_insert2;

	extern unsigned int *ht64_call_hpte_remove;

	extern unsigned int *ht64_call_hpte_updatepp;



	make_bl(ht64_call_hpte_insert1, ppc_md.hpte_insert);

	make_bl(ht64_call_hpte_insert2, ppc_md.hpte_insert);

	make_bl(ht64_call_hpte_remove, ppc_md.hpte_remove);

	make_bl(ht64_call_hpte_updatepp, ppc_md.hpte_updatepp);

#endif /* CONFIG_PPC_64K_PAGES */



	make_bl(htab_call_hpte_insert1, ppc_md.hpte_insert);

	make_bl(htab_call_hpte_insert2, ppc_md.hpte_insert);

	make_bl(htab_call_hpte_remove, ppc_md.hpte_remove);

	make_bl(htab_call_hpte_updatepp, ppc_md.hpte_updatepp);

}



void __init htab_initialize(void)

{

	unsigned long table;
@@ -525,6 +560,8 @@ void __init htab_initialize(void) 
					 mmu_linear_psize));

	}



	htab_finish_init();



	DBG(" <- htab_initialize()\n");

}

#undef KB
@@ -787,16 +824,6 @@ void flush_hash_range(unsigned long number, int local) 
	}

}



static inline void make_bl(unsigned int *insn_addr, void *func)

{

	unsigned long funcp = *((unsigned long *)func);

	int offset = funcp - (unsigned long)insn_addr;



	*insn_addr = (unsigned int)(0x48000001 | (offset & 0x03fffffc));

	flush_icache_range((unsigned long)insn_addr, 4+

			   (unsigned long)insn_addr);

}



/*

 * low_hash_fault is called when we the low level hash code failed

 * to instert a PTE due to an hypervisor error
@@ -815,28 +842,3 @@ void low_hash_fault(struct pt_regs *regs, unsigned long address) 
	}

	bad_page_fault(regs, address, SIGBUS);

}
 


void __init htab_finish_init(void)

{

	extern unsigned int *htab_call_hpte_insert1;

	extern unsigned int *htab_call_hpte_insert2;

	extern unsigned int *htab_call_hpte_remove;

	extern unsigned int *htab_call_hpte_updatepp;



#ifdef CONFIG_PPC_64K_PAGES

	extern unsigned int *ht64_call_hpte_insert1;

	extern unsigned int *ht64_call_hpte_insert2;

	extern unsigned int *ht64_call_hpte_remove;

	extern unsigned int *ht64_call_hpte_updatepp;



	make_bl(ht64_call_hpte_insert1, ppc_md.hpte_insert);

	make_bl(ht64_call_hpte_insert2, ppc_md.hpte_insert);

	make_bl(ht64_call_hpte_remove, ppc_md.hpte_remove);

	make_bl(ht64_call_hpte_updatepp, ppc_md.hpte_updatepp);

#endif /* CONFIG_PPC_64K_PAGES */



	make_bl(htab_call_hpte_insert1, ppc_md.hpte_insert);

	make_bl(htab_call_hpte_insert2, ppc_md.hpte_insert);

	make_bl(htab_call_hpte_remove, ppc_md.hpte_remove);

	make_bl(htab_call_hpte_updatepp, ppc_md.hpte_updatepp);

}

arch/powerpc/platforms/cell/setup.c

+6 −6
Original line number Diff line number Diff line
@@ -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 1;

}



/*

arch/powerpc/platforms/iseries/htab.c

+1 −3
Original line number Diff line number Diff line
@@ -242,13 +242,11 @@ static void iSeries_hpte_invalidate(unsigned long slot, unsigned long va, 
	local_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();

}