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

Commit 5b972592 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

Merge branch 'merge' into next

parents cd115477 f5602941

arch/powerpc/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -414,7 +414,7 @@ config KEXEC 
config CRASH_DUMP

	bool "Build a kdump crash kernel"

	depends on PPC64 || 6xx || FSL_BOOKE || (44x && !SMP)

	select RELOCATABLE if PPC64 || 44x || FSL_BOOKE

	select RELOCATABLE if (PPC64 && !COMPILE_TEST) || 44x || FSL_BOOKE

	help

	  Build a kernel suitable for use as a kdump capture kernel.

	  The same kernel binary can be used as production kernel and dump
@@ -1017,6 +1017,7 @@ endmenu 
if PPC64

config RELOCATABLE

	bool "Build a relocatable kernel"

	depends on !COMPILE_TEST

	select NONSTATIC_KERNEL

	help

	  This builds a kernel image that is capable of running anywhere

arch/powerpc/Kconfig.debug

+0 −1
Original line number Diff line number Diff line
@@ -303,7 +303,6 @@ config PPC_EARLY_DEBUG_OPAL_VTERMNO 
	  This correspond to which /dev/hvcN you want to use for early

	  debug.



	  On OPAL v1 (takeover) this should always be 0

	  On OPAL v2, this will be 0 for network console and 1 or 2 for

	  the machine built-in serial ports.

arch/powerpc/include/asm/code-patching.h

+11 −0
Original line number Diff line number Diff line
@@ -88,4 +88,15 @@ static inline unsigned long ppc_function_entry(void *func) 
#endif

}



static inline unsigned long ppc_global_function_entry(void *func)

{

#if defined(CONFIG_PPC64) && defined(_CALL_ELF) && _CALL_ELF == 2

	/* PPC64 ABIv2 the global entry point is at the address */

	return (unsigned long)func;

#else

	/* All other cases there is no change vs ppc_function_entry() */

	return ppc_function_entry(func);

#endif

}



#endif /* _ASM_POWERPC_CODE_PATCHING_H */

arch/powerpc/include/asm/mmu.h

+1 −9
Original line number Diff line number Diff line
@@ -19,8 +19,7 @@ 
#define MMU_FTR_TYPE_40x		ASM_CONST(0x00000004)

#define MMU_FTR_TYPE_44x		ASM_CONST(0x00000008)

#define MMU_FTR_TYPE_FSL_E		ASM_CONST(0x00000010)

#define MMU_FTR_TYPE_3E			ASM_CONST(0x00000020)

#define MMU_FTR_TYPE_47x		ASM_CONST(0x00000040)

#define MMU_FTR_TYPE_47x		ASM_CONST(0x00000020)



/*

 * This is individual features
@@ -106,13 +105,6 @@ 
				MMU_FTR_CI_LARGE_PAGE

#define MMU_FTRS_PA6T		MMU_FTRS_DEFAULT_HPTE_ARCH_V2 | \

				MMU_FTR_CI_LARGE_PAGE | MMU_FTR_NO_SLBIE_B

#define MMU_FTRS_A2		MMU_FTR_TYPE_3E | MMU_FTR_USE_TLBILX | \

				MMU_FTR_USE_TLBIVAX_BCAST | \

				MMU_FTR_LOCK_BCAST_INVAL | \

				MMU_FTR_USE_TLBRSRV | \

				MMU_FTR_USE_PAIRED_MAS | \

				MMU_FTR_TLBIEL | \

				MMU_FTR_16M_PAGE

#ifndef __ASSEMBLY__

#include <asm/cputable.h>

arch/powerpc/include/asm/opal.h

+0 −29
Original line number Diff line number Diff line
@@ -12,27 +12,7 @@ 
#ifndef __OPAL_H

#define __OPAL_H



/****** Takeover interface ********/



/* PAPR H-Call used to querty the HAL existence and/or instanciate

 * it from within pHyp (tech preview only).

 *

 * This is exclusively used in prom_init.c

 */



#ifndef __ASSEMBLY__



struct opal_takeover_args {

	u64	k_image;		/* r4 */

	u64	k_size;			/* r5 */

	u64	k_entry;		/* r6 */

	u64	k_entry2;		/* r7 */

	u64	hal_addr;		/* r8 */

	u64	rd_image;		/* r9 */

	u64	rd_size;		/* r10 */

	u64	rd_loc;			/* r11 */

};



/*

 * SG entry

 *
@@ -55,15 +35,6 @@ struct opal_sg_list { 
/* We calculate number of sg entries based on PAGE_SIZE */

#define SG_ENTRIES_PER_NODE ((PAGE_SIZE - 16) / sizeof(struct opal_sg_entry))



extern long opal_query_takeover(u64 *hal_size, u64 *hal_align);



extern long opal_do_takeover(struct opal_takeover_args *args);



struct rtas_args;

extern int opal_enter_rtas(struct rtas_args *args,

			   unsigned long data,

			   unsigned long entry);



#endif /* __ASSEMBLY__ */



/****** OPAL APIs ******/