Commit 5d5b1b9f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/powermac: Build fix with SMP and CPU hotplug
  powerpc/perf_event: Skip updating kernel counters if register value shrinks
  powerpc: Don't write protect kernel text with CONFIG_DYNAMIC_FTRACE enabled
  powerpc: Fix oops if scan_dispatch_log is called too early
  powerpc/pseries: Use a kmem cache for DTL buffers
  powerpc/kexec: Fix regression causing compile failure on UP
  powerpc/85xx: disable Suspend support if SMP enabled
  powerpc/e500mc: Remove CPU_FTR_MAYBE_CAN_NAP/CPU_FTR_MAYBE_CAN_DOZE
  powerpc/book3e: Fix CPU feature handling on 64-bit e5500
  powerpc: Check device status before adding serial device
  powerpc/85xx: Don't add disabled PCIe devices
parents adff377b 7b84b29b

arch/powerpc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ config ARCH_HIBERNATION_POSSIBLE 
config ARCH_SUSPEND_POSSIBLE

	def_bool y

	depends on ADB_PMU || PPC_EFIKA || PPC_LITE5200 || PPC_83xx || \

		   PPC_85xx || PPC_86xx || PPC_PSERIES || 44x || 40x

		   (PPC_85xx && !SMP) || PPC_86xx || PPC_PSERIES || 44x || 40x



config PPC_DCR_NATIVE

	bool

arch/powerpc/include/asm/cputable.h

+14 −2
Original line number Diff line number Diff line
@@ -382,10 +382,12 @@ extern const char *powerpc_base_platform; 
#define CPU_FTRS_E500_2	(CPU_FTR_MAYBE_CAN_DOZE | CPU_FTR_USE_TB | \

	    CPU_FTR_SPE_COMP | CPU_FTR_MAYBE_CAN_NAP | \

	    CPU_FTR_NODSISRALIGN | CPU_FTR_NOEXECUTE)

#define CPU_FTRS_E500MC	(CPU_FTR_MAYBE_CAN_DOZE | CPU_FTR_USE_TB | \

	    CPU_FTR_MAYBE_CAN_NAP | CPU_FTR_NODSISRALIGN | \

#define CPU_FTRS_E500MC	(CPU_FTR_USE_TB | CPU_FTR_NODSISRALIGN | \

	    CPU_FTR_L2CSR | CPU_FTR_LWSYNC | CPU_FTR_NOEXECUTE | \

	    CPU_FTR_DBELL)

#define CPU_FTRS_E5500	(CPU_FTR_USE_TB | CPU_FTR_NODSISRALIGN | \

	    CPU_FTR_L2CSR | CPU_FTR_LWSYNC | CPU_FTR_NOEXECUTE | \

	    CPU_FTR_DBELL | CPU_FTR_POPCNTB | CPU_FTR_POPCNTD)

#define CPU_FTRS_GENERIC_32	(CPU_FTR_COMMON | CPU_FTR_NODSISRALIGN)



/* 64-bit CPUs */
@@ -435,11 +437,15 @@ extern const char *powerpc_base_platform; 
#define CPU_FTRS_COMPATIBLE	(CPU_FTR_USE_TB | CPU_FTR_PPCAS_ARCH_V2)



#ifdef __powerpc64__

#ifdef CONFIG_PPC_BOOK3E

#define CPU_FTRS_POSSIBLE	(CPU_FTRS_E5500)

#else

#define CPU_FTRS_POSSIBLE	\

	    (CPU_FTRS_POWER3 | CPU_FTRS_RS64 | CPU_FTRS_POWER4 |	\

	    CPU_FTRS_PPC970 | CPU_FTRS_POWER5 | CPU_FTRS_POWER6 |	\

	    CPU_FTRS_POWER7 | CPU_FTRS_CELL | CPU_FTRS_PA6T |		\

	    CPU_FTR_1T_SEGMENT | CPU_FTR_VSX)

#endif

#else

enum {

	CPU_FTRS_POSSIBLE =
@@ -473,16 +479,21 @@ enum { 
#endif

#ifdef CONFIG_E500

	    CPU_FTRS_E500 | CPU_FTRS_E500_2 | CPU_FTRS_E500MC |

	    CPU_FTRS_E5500 |

#endif

	    0,

};

#endif /* __powerpc64__ */



#ifdef __powerpc64__

#ifdef CONFIG_PPC_BOOK3E

#define CPU_FTRS_ALWAYS		(CPU_FTRS_E5500)

#else

#define CPU_FTRS_ALWAYS		\

	    (CPU_FTRS_POWER3 & CPU_FTRS_RS64 & CPU_FTRS_POWER4 &	\

	    CPU_FTRS_PPC970 & CPU_FTRS_POWER5 & CPU_FTRS_POWER6 &	\

	    CPU_FTRS_POWER7 & CPU_FTRS_CELL & CPU_FTRS_PA6T & CPU_FTRS_POSSIBLE)

#endif

#else

enum {

	CPU_FTRS_ALWAYS =
@@ -513,6 +524,7 @@ enum { 
#endif

#ifdef CONFIG_E500

	    CPU_FTRS_E500 & CPU_FTRS_E500_2 & CPU_FTRS_E500MC &

	    CPU_FTRS_E5500 &

#endif

	    CPU_FTRS_POSSIBLE,

};

arch/powerpc/include/asm/pte-common.h

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ extern unsigned long bad_call_to_PMD_PAGE_SIZE(void); 
 * on platforms where such control is possible.

 */

#if defined(CONFIG_KGDB) || defined(CONFIG_XMON) || defined(CONFIG_BDI_SWITCH) ||\

	defined(CONFIG_KPROBES)

	defined(CONFIG_KPROBES) || defined(CONFIG_DYNAMIC_FTRACE)

#define PAGE_KERNEL_TEXT	PAGE_KERNEL_X

#else

#define PAGE_KERNEL_TEXT	PAGE_KERNEL_ROX

arch/powerpc/kernel/cputable.c

+1 −1
Original line number Diff line number Diff line
@@ -1973,7 +1973,7 @@ static struct cpu_spec __initdata cpu_specs[] = { 
		.pvr_mask		= 0xffff0000,

		.pvr_value		= 0x80240000,

		.cpu_name		= "e5500",

		.cpu_features		= CPU_FTRS_E500MC,

		.cpu_features		= CPU_FTRS_E5500,

		.cpu_user_features	= COMMON_USER_BOOKE,

		.mmu_features		= MMU_FTR_TYPE_FSL_E | MMU_FTR_BIG_PHYS |

			MMU_FTR_USE_TLBILX,

arch/powerpc/kernel/crash.c

+6 −6
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ static void crash_kexec_prepare_cpus(int cpu) 
}



/* wait for all the CPUs to hit real mode but timeout if they don't come in */

#if defined(CONFIG_PPC_STD_MMU_64) && defined(CONFIG_SMP)

#ifdef CONFIG_PPC_STD_MMU_64

static void crash_kexec_wait_realmode(int cpu)

{

	unsigned int msecs;
@@ -188,9 +188,7 @@ static void crash_kexec_wait_realmode(int cpu) 
	}

	mb();

}

#else

static inline void crash_kexec_wait_realmode(int cpu) {}

#endif

#endif	/* CONFIG_PPC_STD_MMU_64 */



/*

 * This function will be called by secondary cpus or by kexec cpu
@@ -235,7 +233,9 @@ void crash_kexec_secondary(struct pt_regs *regs) 
	crash_ipi_callback(regs);

}



#else

#else	/* ! CONFIG_SMP */

static inline void crash_kexec_wait_realmode(int cpu) {}



static void crash_kexec_prepare_cpus(int cpu)

{

	/*
@@ -255,7 +255,7 @@ void crash_kexec_secondary(struct pt_regs *regs) 
{

	cpus_in_sr = CPU_MASK_NONE;

}

#endif

#endif	/* CONFIG_SMP */



/*

 * Register a function to be called on shutdown.  Only use this if you

CRA Git | Maintained and supported by SUSTech CRA and CCSE