Commit 13d7d84e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 

* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (36 commits)
  [POWERPC] Generic BUG for powerpc
  [PPC] Fix compile failure do to introduction of PHY_POLL
  [POWERPC] Only export __mtdcr/__mfdcr if CONFIG_PPC_DCR is set
  [POWERPC] Remove old dcr.S
  [POWERPC] Fix SPU coredump code for max_fdset removal
  [POWERPC] Fix irq routing on some 32-bit PowerMacs
  [POWERPC] ps3: Add vuart support
  [POWERPC] Support ibm,dynamic-reconfiguration-memory nodes
  [POWERPC] dont allow pSeries_probe to succeed without initialising MMU
  [POWERPC] micro optimise pSeries_probe
  [POWERPC] Add SPURR SPR to sysfs
  [POWERPC] Add DSCR SPR to sysfs
  [POWERPC] Fix 440SPe CPU table entry
  [POWERPC] Add support for FP emulation for the e300c2 core
  [POWERPC] of_device_register: propagate device_create_file return code
  [POWERPC] Fix mmap of PCI resource with hack for X
  [POWERPC] iSeries: head_64.o needs to depend on lparmap.s
  [POWERPC] cbe_thermal: Fix initialization of sysfs attribute_group
  [POWERPC] Remove QE header files from lite5200.c
  [POWERPC] of_platform_make_bus_id(): make `magic' int
  ...
parents cbb8fc07 73c9ceab

arch/powerpc/Kconfig

+7 −1
Original line number Diff line number Diff line
@@ -107,6 +107,11 @@ config AUDIT_ARCH 
	bool

	default y



config GENERIC_BUG

	bool

	default y

	depends on BUG



config DEFAULT_UIMAGE

	bool

	help
@@ -478,6 +483,7 @@ config PPC_MAPLE 
	select PPC_UDBG_16550

	select PPC_970_NAP

	select PPC_NATIVE

	select PPC_RTAS

	default n

	help

          This option enables support for the Maple 970FX Evaluation Board.
@@ -714,7 +720,7 @@ config FORCE_MAX_ZONEORDER 


config MATH_EMULATION

	bool "Math emulation"

	depends on 4xx || 8xx || E200 || E500

	depends on 4xx || 8xx || E200 || PPC_83xx || E500

	---help---

	  Some PowerPC chips designed for embedded applications do not have

	  a floating-point unit and therefore do not implement the

arch/powerpc/configs/ps3_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ CONFIG_SPU_BASE=y 
CONFIG_PS3_HTAB_SIZE=20

CONFIG_PS3_DYNAMIC_DMA=y

CONFIG_PS3_USE_LPAR_ADDR=y

CONFIG_PS3_VUART=y



#

# Kernel options

arch/powerpc/kernel/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ endif 


ifeq ($(CONFIG_PPC_ISERIES),y)

extra-y += lparmap.s

$(obj)/head_64.o:	$(obj)/lparmap.s

AFLAGS_head_64.o += -I$(obj)

endif

arch/powerpc/kernel/cputable.c

+2 −3
Original line number Diff line number Diff line
@@ -833,7 +833,7 @@ static struct cpu_spec cpu_specs[] = { 
		.pvr_mask		= 0x7fff0000,

		.pvr_value		= 0x00840000,

		.cpu_name		= "e300c2",

		.cpu_features		= CPU_FTRS_E300,

		.cpu_features		= CPU_FTRS_E300C2,

		.cpu_user_features	= PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU,

		.icache_bsize		= 32,

		.dcache_bsize		= 32,
@@ -1136,8 +1136,7 @@ static struct cpu_spec cpu_specs[] = { 
		.pvr_mask		= 0xff000fff,

		.pvr_value		= 0x53000890,

		.cpu_name		= "440SPe Rev. A",

		.cpu_features		= CPU_FTR_SPLIT_ID_CACHE |

			CPU_FTR_USE_TB,

		.cpu_features		= CPU_FTRS_44X,

		.cpu_user_features	= COMMON_USER_BOOKE,

		.icache_bsize		= 32,

		.dcache_bsize		= 32,

arch/powerpc/kernel/head_32.S

+7 −0
Original line number Diff line number Diff line
@@ -437,6 +437,13 @@ Alignment: 
/* Floating-point unavailable */

	. = 0x800

FPUnavailable:

BEGIN_FTR_SECTION

/*

 * Certain Freescale cores don't have a FPU and treat fp instructions

 * as a FP Unavailable exception.  Redirect to illegal/emulation handling.

 */

	b 	ProgramCheck

END_FTR_SECTION_IFSET(CPU_FTR_FPU_UNAVAILABLE)

	EXCEPTION_PROLOG

	bne	load_up_fpu		/* if from user, just load it up */

	addi	r3,r1,STACK_FRAME_OVERHEAD

CRA Git | Maintained and supported by SUSTech CRA and CCSE