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

Commit 3c92ec8a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (144 commits)
  powerpc/44x: Support 16K/64K base page sizes on 44x
  powerpc: Force memory size to be a multiple of PAGE_SIZE
  powerpc/32: Wire up the trampoline code for kdump
  powerpc/32: Add the ability for a classic ppc kernel to be loaded at 32M
  powerpc/32: Allow __ioremap on RAM addresses for kdump kernel
  powerpc/32: Setup OF properties for kdump
  powerpc/32/kdump: Implement crash_setup_regs() using ppc_save_regs()
  powerpc: Prepare xmon_save_regs for use with kdump
  powerpc: Remove default kexec/crash_kernel ops assignments
  powerpc: Make default kexec/crash_kernel ops implicit
  powerpc: Setup OF properties for ppc32 kexec
  powerpc/pseries: Fix cpu hotplug
  powerpc: Fix KVM build on ppc440
  powerpc/cell: add QPACE as a separate Cell platform
  powerpc/cell: fix build breakage with CONFIG_SPUFS disabled
  powerpc/mpc5200: fix error paths in PSC UART probe function
  powerpc/mpc5200: add rts/cts handling in PSC UART driver
  powerpc/mpc5200: Make PSC UART driver update serial errors counters
  powerpc/mpc5200: Remove obsolete code from mpc5200 MDIO driver
  powerpc/mpc5200: Add MDMA/UDMA support to MPC5200 ATA driver
  ...

Fix trivial conflict in drivers/char/Makefile as per Paul's directions
parents c4c9f018 ca9153a3

arch/powerpc/Kconfig

+49 −15
Original line number Diff line number Diff line
@@ -285,6 +285,10 @@ config IOMMU_VMERGE 
config IOMMU_HELPER

	def_bool PPC64



config PPC_NEED_DMA_SYNC_OPS

	def_bool y

	depends on NOT_COHERENT_CACHE



config HOTPLUG_CPU

	bool "Support for enabling/disabling CPUs"

	depends on SMP && HOTPLUG && EXPERIMENTAL && (PPC_PSERIES || PPC_PMAC)
@@ -322,7 +326,7 @@ config KEXEC 


config CRASH_DUMP

	bool "Build a kdump crash kernel"

	depends on PPC_MULTIPLATFORM && PPC64 && RELOCATABLE

	depends on (PPC64 && RELOCATABLE) || 6xx

	help

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

	  The same kernel binary can be used as production kernel and dump
@@ -401,23 +405,53 @@ config PPC_HAS_HASH_64K 
	depends on PPC64

	default n



config PPC_64K_PAGES

	bool "64k page size"

	depends on PPC64

	select PPC_HAS_HASH_64K

choice

	prompt "Page size"

	default PPC_4K_PAGES

	help

	  This option changes the kernel logical page size to 64k. On machines

	  without processor support for 64k pages, the kernel will simulate

	  them by loading each individual 4k page on demand transparently,

	  while on hardware with such support, it will be used to map

	  normal application pages.

	  Select the kernel logical page size. Increasing the page size

	  will reduce software overhead at each page boundary, allow

	  hardware prefetch mechanisms to be more effective, and allow

	  larger dma transfers increasing IO efficiency and reducing

	  overhead. However the utilization of memory will increase.

	  For example, each cached file will using a multiple of the

	  page size to hold its contents and the difference between the

	  end of file and the end of page is wasted.



	  Some dedicated systems, such as software raid serving with

	  accelerated calculations, have shown significant increases.



	  If you configure a 64 bit kernel for 64k pages but the

	  processor does not support them, then the kernel will simulate

	  them with 4k pages, loading them on demand, but with the

	  reduced software overhead and larger internal fragmentation.

	  For the 32 bit kernel, a large page option will not be offered

	  unless it is supported by the configured processor.



	  If unsure, choose 4K_PAGES.



config PPC_4K_PAGES

	bool "4k page size"



config PPC_16K_PAGES

	bool "16k page size" if 44x



config PPC_64K_PAGES

	bool "64k page size" if 44x || PPC_STD_MMU_64

	select PPC_HAS_HASH_64K if PPC_STD_MMU_64



endchoice



config FORCE_MAX_ZONEORDER

	int "Maximum zone order"

	range 9 64 if PPC_64K_PAGES

	default "9" if PPC_64K_PAGES

	range 13 64 if PPC64 && !PPC_64K_PAGES

	default "13" if PPC64 && !PPC_64K_PAGES

	range 9 64 if PPC_STD_MMU_64 && PPC_64K_PAGES

	default "9" if PPC_STD_MMU_64 && PPC_64K_PAGES

	range 13 64 if PPC_STD_MMU_64 && !PPC_64K_PAGES

	default "13" if PPC_STD_MMU_64 && !PPC_64K_PAGES

	range 9 64 if PPC_STD_MMU_32 && PPC_16K_PAGES

	default "9" if PPC_STD_MMU_32 && PPC_16K_PAGES

	range 7 64 if PPC_STD_MMU_32 && PPC_64K_PAGES

	default "7" if PPC_STD_MMU_32 && PPC_64K_PAGES

	range 11 64

	default "11"

	help
@@ -437,7 +471,7 @@ config FORCE_MAX_ZONEORDER 


config PPC_SUBPAGE_PROT

	bool "Support setting protections for 4k subpages"

	depends on PPC_64K_PAGES

	depends on PPC_STD_MMU_64 && PPC_64K_PAGES

	help

	  This option adds support for a system call to allow user programs

	  to set access permissions (read/write, readonly, or no access)

arch/powerpc/Kconfig.debug

+9 −0
Original line number Diff line number Diff line
@@ -2,6 +2,15 @@ menu "Kernel hacking" 


source "lib/Kconfig.debug"



config PRINT_STACK_DEPTH

	int "Stack depth to print" if DEBUG_KERNEL

	default 64

	help

	  This option allows you to set the stack depth that the kernel

	  prints in stack traces. This can be useful if your display is

	  too small and stack traces cause important information to

	  scroll off the screen.



config DEBUG_STACKOVERFLOW

	bool "Check for stack overflows"

	depends on DEBUG_KERNEL

arch/powerpc/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ KBUILD_CFLAGS += $(call cc-option,-mno-altivec) 
# (We use all available options to help semi-broken compilers)

KBUILD_CFLAGS += $(call cc-option,-mno-spe)

KBUILD_CFLAGS += $(call cc-option,-mspe=no)

KBUILD_CFLAGS += $(call cc-option,-mabi=no-spe)



# Enable unit-at-a-time mode when possible. It shrinks the

# kernel considerably.

arch/powerpc/boot/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -194,6 +194,7 @@ image-$(CONFIG_PPC_MAPLE) += zImage.pseries 
image-$(CONFIG_PPC_IBM_CELL_BLADE)	+= zImage.pseries

image-$(CONFIG_PPC_PS3)			+= dtbImage.ps3

image-$(CONFIG_PPC_CELLEB)		+= zImage.pseries

image-$(CONFIG_PPC_CELL_QPACE)		+= zImage.pseries

image-$(CONFIG_PPC_CHRP)		+= zImage.chrp

image-$(CONFIG_PPC_EFIKA)		+= zImage.chrp

image-$(CONFIG_PPC_PMAC)		+= zImage.pmac

arch/powerpc/boot/devtree.c

+1 −1
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ static int find_range(u32 *reg, u32 *ranges, int nregaddr, 
		u32 range_addr[MAX_ADDR_CELLS];

		u32 range_size[MAX_ADDR_CELLS];



		copy_val(range_addr, ranges + i, naddr);

		copy_val(range_addr, ranges + i, nregaddr);

		copy_val(range_size, ranges + i + nregaddr + naddr, nsize);



		if (compare_reg(reg, range_addr, range_size))