Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge (3ae0af12) · Commits · e / devices / android_kernel_oneplus_sm7250

arch/powerpc/Kconfig

+4 −0

Original line number	Diff line number	Diff line
		@@ -599,6 +599,10 @@ config HAVE_ARCH_EARLY_PFN_TO_NID
		def_bool y
		depends on NEED_MULTIPLE_NODES

		config ARCH_MEMORY_PROBE
		def_bool y
		depends on MEMORY_HOTPLUG

		# Some NUMA nodes have memory ranges that span
		# other nodes. Even though a pfn is valid and
		# between a node's start and end pfns, it may not

arch/powerpc/kernel/Makefile

+10 −3

Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@

		ifeq ($(CONFIG_PPC64),y)
		EXTRA_CFLAGS += -mno-minimal-toc
		CFLAGS_ioctl32.o += -Ifs/
		endif
		ifeq ($(CONFIG_PPC32),y)
		CFLAGS_prom_init.o += -fPIC
		@@ -11,15 +12,21 @@ CFLAGS_btext.o += -fPIC
		endif

		obj-y := semaphore.o cputable.o ptrace.o syscalls.o \
		signal_32.o pmc.o
		irq.o signal_32.o pmc.o
		obj-$(CONFIG_PPC64) += setup_64.o binfmt_elf32.o sys_ppc32.o \
		signal_64.o ptrace32.o systbl.o
		signal_64.o ptrace32.o systbl.o \
		paca.o ioctl32.o cpu_setup_power4.o \
		firmware.o sysfs.o
		obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o
		obj-$(CONFIG_POWER4) += idle_power4.o
		obj-$(CONFIG_PPC_OF) += of_device.o
		obj-$(CONFIG_PPC_RTAS) += rtas.o
		procfs-$(CONFIG_PPC64) := proc_ppc64.o
		obj-$(CONFIG_PROC_FS) += $(procfs-y)
		rtaspci-$(CONFIG_PPC64) := rtas_pci.o
		obj-$(CONFIG_PPC_RTAS) += rtas.o $(rtaspci-y)
		obj-$(CONFIG_RTAS_FLASH) += rtas_flash.o
		obj-$(CONFIG_RTAS_PROC) += rtas-proc.o
		obj-$(CONFIG_LPARCFG) += lparcfg.o
		obj-$(CONFIG_IBMVIO) += vio.o
		obj-$(CONFIG_GENERIC_TBSYNC) += smp-tbsync.o

arch/powerpc/kernel/asm-offsets.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -106,7 +106,6 @@ int main(void)
		DEFINE(ICACHEL1LINESIZE, offsetof(struct ppc64_caches, iline_size));
		DEFINE(ICACHEL1LOGLINESIZE, offsetof(struct ppc64_caches, log_iline_size));
		DEFINE(ICACHEL1LINESPERPAGE, offsetof(struct ppc64_caches, ilines_per_page));
		DEFINE(PLATFORM, offsetof(struct systemcfg, platform));
		DEFINE(PLATFORM_LPAR, PLATFORM_LPAR);

		/* paca */

arch/ppc64/kernel/cpu_setup_power4.S→arch/powerpc/kernel/cpu_setup_power4.S

+4 −4

File changed and moved.

Contains only whitespace changes.

arch/powerpc/kernel/cputable.c

+11 −8

Original line number	Diff line number	Diff line
		@@ -52,6 +52,9 @@ extern void __setup_cpu_ppc970(unsigned long offset, struct cpu_spec* spec);
		#define COMMON_USER (PPC_FEATURE_32 \| PPC_FEATURE_HAS_FPU \| \
		PPC_FEATURE_HAS_MMU)
		#define COMMON_USER_PPC64 (COMMON_USER \| PPC_FEATURE_64)
		#define COMMON_USER_POWER4 (COMMON_USER_PPC64 \| PPC_FEATURE_POWER4)
		#define COMMON_USER_POWER5 (COMMON_USER_PPC64 \| PPC_FEATURE_POWER5)
		#define COMMON_USER_POWER5_PLUS (COMMON_USER_PPC64 \| PPC_FEATURE_POWER5_PLUS)


		/* We only set the spe features if the kernel was compiled with
		@@ -160,7 +163,7 @@ struct cpu_spec cpu_specs[] = {
		.pvr_value = 0x00350000,
		.cpu_name = "POWER4 (gp)",
		.cpu_features = CPU_FTRS_POWER4,
		.cpu_user_features = COMMON_USER_PPC64,
		.cpu_user_features = COMMON_USER_POWER4,
		.icache_bsize = 128,
		.dcache_bsize = 128,
		.num_pmcs = 8,
		@@ -175,7 +178,7 @@ struct cpu_spec cpu_specs[] = {
		.pvr_value = 0x00380000,
		.cpu_name = "POWER4+ (gq)",
		.cpu_features = CPU_FTRS_POWER4,
		.cpu_user_features = COMMON_USER_PPC64,
		.cpu_user_features = COMMON_USER_POWER4,
		.icache_bsize = 128,
		.dcache_bsize = 128,
		.num_pmcs = 8,
		@@ -190,7 +193,7 @@ struct cpu_spec cpu_specs[] = {
		.pvr_value = 0x00390000,
		.cpu_name = "PPC970",
		.cpu_features = CPU_FTRS_PPC970,
		.cpu_user_features = COMMON_USER_PPC64 \|
		.cpu_user_features = COMMON_USER_POWER4 \|
		PPC_FEATURE_HAS_ALTIVEC_COMP,
		.icache_bsize = 128,
		.dcache_bsize = 128,
		@@ -212,7 +215,7 @@ struct cpu_spec cpu_specs[] = {
		#else
		.cpu_features = CPU_FTRS_PPC970,
		#endif
		.cpu_user_features = COMMON_USER_PPC64 \|
		.cpu_user_features = COMMON_USER_POWER4 \|
		PPC_FEATURE_HAS_ALTIVEC_COMP,
		.icache_bsize = 128,
		.dcache_bsize = 128,
		@@ -230,7 +233,7 @@ struct cpu_spec cpu_specs[] = {
		.pvr_value = 0x00440000,
		.cpu_name = "PPC970MP",
		.cpu_features = CPU_FTRS_PPC970,
		.cpu_user_features = COMMON_USER_PPC64 \|
		.cpu_user_features = COMMON_USER_POWER4 \|
		PPC_FEATURE_HAS_ALTIVEC_COMP,
		.icache_bsize = 128,
		.dcache_bsize = 128,
		@@ -245,7 +248,7 @@ struct cpu_spec cpu_specs[] = {
		.pvr_value = 0x003a0000,
		.cpu_name = "POWER5 (gr)",
		.cpu_features = CPU_FTRS_POWER5,
		.cpu_user_features = COMMON_USER_PPC64,
		.cpu_user_features = COMMON_USER_POWER5,
		.icache_bsize = 128,
		.dcache_bsize = 128,
		.num_pmcs = 6,
		@@ -260,7 +263,7 @@ struct cpu_spec cpu_specs[] = {
		.pvr_value = 0x003b0000,
		.cpu_name = "POWER5 (gs)",
		.cpu_features = CPU_FTRS_POWER5,
		.cpu_user_features = COMMON_USER_PPC64,
		.cpu_user_features = COMMON_USER_POWER5_PLUS,
		.icache_bsize = 128,
		.dcache_bsize = 128,
		.num_pmcs = 6,
		@@ -276,7 +279,7 @@ struct cpu_spec cpu_specs[] = {
		.cpu_name = "Cell Broadband Engine",
		.cpu_features = CPU_FTRS_CELL,
		.cpu_user_features = COMMON_USER_PPC64 \|
		PPC_FEATURE_HAS_ALTIVEC_COMP,
		PPC_FEATURE_CELL \| PPC_FEATURE_HAS_ALTIVEC_COMP,
		.icache_bsize = 128,
		.dcache_bsize = 128,
		.cpu_setup = __setup_cpu_be,