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

Commit 66a173b9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull powerpc updates from Benjamin Herrenschmidt:
 "The bulk of this is LE updates.  One should now be able to build an LE
  kernel and even run some things in it.

  I'm still sitting on a handful of patches to enable the new ABI that I
  *might* still send this merge window around, but due to the
  incertainty (they are pretty fresh) I want to keep them separate.

  Other notable changes are some infrastructure bits to better handle
  PCI pass-through under KVM, some bits and pieces added to the new
  PowerNV platform support such as access to the CPU SCOM bus via sysfs,
  and support for EEH error handling on PHB3 (Power8 PCIe).

  We also grew arch_get_random_long() for both pseries and powernv when
  running on P7+ and P8, exploiting the HW rng.

  And finally various embedded updates from freescale"

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (154 commits)
  powerpc: Fix fatal SLB miss when restoring PPR
  powerpc/powernv: Reserve the correct PE number
  powerpc/powernv: Add PE to its own PELTV
  powerpc/powernv: Add support for indirect XSCOM via debugfs
  powerpc/scom: Improve debugfs interface
  powerpc/scom: Enable 64-bit addresses
  powerpc/boot: Properly handle the base "of" boot wrapper
  powerpc/bpf: Support MOD operation
  powerpc/bpf: Fix DIVWU instruction opcode
  of: Move definition of of_find_next_cache_node into common code.
  powerpc: Remove big endianness assumption in of_find_next_cache_node
  powerpc/tm: Remove interrupt disable in __switch_to()
  powerpc: word-at-a-time optimization for 64-bit Little Endian
  powerpc/bpf: BPF JIT compiler for 64-bit Little Endian
  powerpc: Only save/restore SDR1 if in hypervisor mode
  powerpc/pmu: Fix ADB_PMU_LED_IDE dependencies
  powerpc/nvram: Fix endian issue when using the partition length
  powerpc/nvram: Fix endian issue when reading the NVRAM size
  powerpc/nvram: Scan partitions only once
  powerpc/mpc512x: remove unnecessary #if
  ...
parents 11db81a5 0c4888ef

arch/powerpc/Kconfig

+9 −3
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ config PPC 
	select VIRT_TO_BUS if !PPC64

	select HAVE_IDE

	select HAVE_IOREMAP_PROT

	select HAVE_EFFICIENT_UNALIGNED_ACCESS

	select HAVE_EFFICIENT_UNALIGNED_ACCESS if !CPU_LITTLE_ENDIAN

	select HAVE_KPROBES

	select HAVE_ARCH_KGDB

	select HAVE_KRETPROBES
@@ -140,6 +140,9 @@ config PPC 
	select HAVE_DEBUG_STACKOVERFLOW

	select HAVE_IRQ_EXIT_ON_IRQ_STACK



config GENERIC_CSUM

	def_bool CPU_LITTLE_ENDIAN



config EARLY_PRINTK

	bool

	default y
@@ -405,7 +408,7 @@ config CRASH_DUMP 


config FA_DUMP

	bool "Firmware-assisted dump"

	depends on PPC64 && PPC_RTAS && CRASH_DUMP

	depends on PPC64 && PPC_RTAS && CRASH_DUMP && KEXEC

	help

	  A robust mechanism to get reliable kernel crash dump with

	  assistance from firmware. This approach does not use kexec,
@@ -418,7 +421,7 @@ config FA_DUMP 


config IRQ_ALL_CPUS

	bool "Distribute interrupts on all CPUs by default"

	depends on SMP && !MV64360

	depends on SMP

	help

	  This option gives the kernel permission to distribute IRQs across

	  multiple CPUs.  Saying N here will route all IRQs to the first
@@ -1010,6 +1013,9 @@ config PHYSICAL_START 
	default "0x00000000"

endif



config	ARCH_RANDOM

	def_bool n



source "net/Kconfig"



source "drivers/Kconfig"

arch/powerpc/Makefile

+32 −5
Original line number Diff line number Diff line
@@ -36,17 +36,26 @@ KBUILD_DEFCONFIG := ppc64_defconfig 
endif



ifeq ($(CONFIG_PPC64),y)

OLDARCH	:= ppc64



new_nm := $(shell if $(NM) --help 2>&1 | grep -- '--synthetic' > /dev/null; then echo y; else echo n; fi)



ifeq ($(new_nm),y)

NM		:= $(NM) --synthetic

endif

endif



ifeq ($(CONFIG_PPC64),y)

ifeq ($(CONFIG_CPU_LITTLE_ENDIAN),y)

OLDARCH	:= ppc64le

else

OLDARCH	:= ppc64

endif

else

ifeq ($(CONFIG_CPU_LITTLE_ENDIAN),y)

OLDARCH	:= ppcle

else

OLDARCH	:= ppc

endif

endif



# It seems there are times we use this Makefile without

# including the config file, but this replicates the old behaviour
@@ -56,11 +65,29 @@ endif 


UTS_MACHINE := $(OLDARCH)



ifeq ($(CONFIG_CPU_LITTLE_ENDIAN),y)

override CC	+= -mlittle-endian -mno-strict-align

override AS	+= -mlittle-endian

override LD	+= -EL

override CROSS32CC += -mlittle-endian

override CROSS32AS += -mlittle-endian

LDEMULATION	:= lppc

GNUTARGET	:= powerpcle

MULTIPLEWORD	:= -mno-multiple

else

override CC	+= -mbig-endian

override AS	+= -mbig-endian

override LD	+= -EB

LDEMULATION	:= ppc

GNUTARGET	:= powerpc

MULTIPLEWORD	:= -mmultiple

endif



ifeq ($(HAS_BIARCH),y)

override AS	+= -a$(CONFIG_WORD_SIZE)

override LD	+= -m elf$(CONFIG_WORD_SIZE)ppc

override LD	+= -m elf$(CONFIG_WORD_SIZE)$(LDEMULATION)

override CC	+= -m$(CONFIG_WORD_SIZE)

override AR	:= GNUTARGET=elf$(CONFIG_WORD_SIZE)-powerpc $(AR)

override AR	:= GNUTARGET=elf$(CONFIG_WORD_SIZE)-$(GNUTARGET) $(AR)

endif



LDFLAGS_vmlinux-y := -Bstatic
@@ -86,7 +113,7 @@ endif 
CFLAGS-$(CONFIG_PPC64)	:= -mtraceback=no -mcall-aixdesc

CFLAGS-$(CONFIG_PPC64)	+= $(call cc-option,-mcmodel=medium,-mminimal-toc)

CFLAGS-$(CONFIG_PPC64)	+= $(call cc-option,-mno-pointers-to-nested-functions)

CFLAGS-$(CONFIG_PPC32)	:= -ffixed-r2 -mmultiple

CFLAGS-$(CONFIG_PPC32)	:= -ffixed-r2 $(MULTIPLEWORD)



ifeq ($(CONFIG_PPC_BOOK3S_64),y)

CFLAGS-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mtune=power7,-mtune=power4)

arch/powerpc/boot/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ all: $(obj)/zImage 
BOOTCFLAGS    := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \

		 -fno-strict-aliasing -Os -msoft-float -pipe \

		 -fomit-frame-pointer -fno-builtin -fPIC -nostdinc \

		 -isystem $(shell $(CROSS32CC) -print-file-name=include)

		 -isystem $(shell $(CROSS32CC) -print-file-name=include) \

		 -mbig-endian

BOOTAFLAGS	:= -D__ASSEMBLY__ $(BOOTCFLAGS) -traditional -nostdinc



ifdef CONFIG_DEBUG_INFO

arch/powerpc/boot/dts/b4860emu.dts

0 → 100644
+218 −0
Original line number Diff line number Diff line 
/*

 * B4860 emulator Device Tree Source

 *

 * Copyright 2013 Freescale Semiconductor Inc.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions are met:

 *     * Redistributions of source code must retain the above copyright

 *       notice, this list of conditions and the following disclaimer.

 *     * Redistributions in binary form must reproduce the above copyright

 *       notice, this list of conditions and the following disclaimer in the

 *       documentation and/or other materials provided with the distribution.

 *     * Neither the name of Freescale Semiconductor nor the

 *       names of its contributors may be used to endorse or promote products

 *       derived from this software without specific prior written permission.

 *

 *

 * ALTERNATIVELY, this software may be distributed under the terms of the

 * GNU General Public License ("GPL") as published by the Free Software

 * Foundation, either version 2 of that License or (at your option) any

 * later version.

 *

 * This software is provided by Freescale Semiconductor "as is" and any

 * express or implied warranties, including, but not limited to, the implied

 * warranties of merchantability and fitness for a particular purpose are

 * disclaimed. In no event shall Freescale Semiconductor be liable for any

 * direct, indirect, incidental, special, exemplary, or consequential damages

 * (including, but not limited to, procurement of substitute goods or services;

 * loss of use, data, or profits; or business interruption) however caused and

 * on any theory of liability, whether in contract, strict liability, or tort

 * (including negligence or otherwise) arising in any way out of the use of

 * this software, even if advised of the possibility of such damage.

 */



/dts-v1/;



/include/ "fsl/e6500_power_isa.dtsi"



/ {

	compatible = "fsl,B4860";

	#address-cells = <2>;

	#size-cells = <2>;

	interrupt-parent = <&mpic>;



	aliases {

		ccsr = &soc;



		serial0 = &serial0;

		serial1 = &serial1;

		serial2 = &serial2;

		serial3 = &serial3;

		dma0 = &dma0;

		dma1 = &dma1;

	};



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;



		cpu0: PowerPC,e6500@0 {

			device_type = "cpu";

			reg = <0 1>;

			next-level-cache = <&L2>;

		};

		cpu1: PowerPC,e6500@2 {

			device_type = "cpu";

			reg = <2 3>;

			next-level-cache = <&L2>;

		};

		cpu2: PowerPC,e6500@4 {

			device_type = "cpu";

			reg = <4 5>;

			next-level-cache = <&L2>;

		};

		cpu3: PowerPC,e6500@6 {

			device_type = "cpu";

			reg = <6 7>;

			next-level-cache = <&L2>;

		};

	};

};



/ {

	model = "fsl,B4860QDS";

	compatible = "fsl,B4860EMU", "fsl,B4860QDS";

	#address-cells = <2>;

	#size-cells = <2>;

	interrupt-parent = <&mpic>;



	ifc: localbus@ffe124000 {

		reg = <0xf 0xfe124000 0 0x2000>;

		ranges = <0 0 0xf 0xe8000000 0x08000000

			  2 0 0xf 0xff800000 0x00010000

			  3 0 0xf 0xffdf0000 0x00008000>;



		nor@0,0 {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "cfi-flash";

			reg = <0x0 0x0 0x8000000>;

			bank-width = <2>;

			device-width = <1>;

		};

	};



	memory {

		device_type = "memory";

	};



	soc: soc@ffe000000 {

		ranges = <0x00000000 0xf 0xfe000000 0x1000000>;

		reg = <0xf 0xfe000000 0 0x00001000>;

	};

};



&ifc {

	#address-cells = <2>;

	#size-cells = <1>;

	compatible = "fsl,ifc", "simple-bus";

	interrupts = <25 2 0 0>;

};



&soc {

	#address-cells = <1>;

	#size-cells = <1>;

	device_type = "soc";

	compatible = "simple-bus";



	soc-sram-error {

		compatible = "fsl,soc-sram-error";

		interrupts = <16 2 1 2>;

	};



	corenet-law@0 {

		compatible = "fsl,corenet-law";

		reg = <0x0 0x1000>;

		fsl,num-laws = <32>;

	};



	ddr1: memory-controller@8000 {

		compatible = "fsl,qoriq-memory-controller-v4.5", "fsl,qoriq-memory-controller";

		reg = <0x8000 0x1000>;

		interrupts = <16 2 1 8>;

	};



	ddr2: memory-controller@9000 {

		compatible = "fsl,qoriq-memory-controller-v4.5","fsl,qoriq-memory-controller";

		reg = <0x9000 0x1000>;

		interrupts = <16 2 1 9>;

	};



	cpc: l3-cache-controller@10000 {

		compatible = "fsl,b4-l3-cache-controller", "cache";

		reg = <0x10000 0x1000

		       0x11000 0x1000>;

		interrupts = <16 2 1 4>;

	};



	corenet-cf@18000 {

		compatible = "fsl,b4-corenet-cf";

		reg = <0x18000 0x1000>;

		interrupts = <16 2 1 0>;

		fsl,ccf-num-csdids = <32>;

		fsl,ccf-num-snoopids = <32>;

	};



	iommu@20000 {

		compatible = "fsl,pamu-v1.0", "fsl,pamu";

		reg = <0x20000 0x4000>;

		#address-cells = <1>;

		#size-cells = <1>;

		interrupts = <

			24 2 0 0

			16 2 1 1>;

		pamu0: pamu@0 {

			reg = <0 0x1000>;

			fsl,primary-cache-geometry = <8 1>;

			fsl,secondary-cache-geometry = <32 2>;

		};

	};



/include/ "fsl/qoriq-mpic.dtsi"



	guts: global-utilities@e0000 {

		compatible = "fsl,b4-device-config";

		reg = <0xe0000 0xe00>;

		fsl,has-rstcr;

		fsl,liodn-bits = <12>;

	};



	clockgen: global-utilities@e1000 {

		compatible = "fsl,b4-clockgen", "fsl,qoriq-clockgen-2.0";

		reg = <0xe1000 0x1000>;

	};



/include/ "fsl/qoriq-dma-0.dtsi"

	dma@100300 {

		fsl,iommu-parent = <&pamu0>;

		fsl,liodn-reg = <&guts 0x580>; /* DMA1LIODNR */

	};



/include/ "fsl/qoriq-dma-1.dtsi"

	dma@101300 {

		fsl,iommu-parent = <&pamu0>;

		fsl,liodn-reg = <&guts 0x584>; /* DMA2LIODNR */

	};



/include/ "fsl/qoriq-i2c-0.dtsi"

/include/ "fsl/qoriq-i2c-1.dtsi"

/include/ "fsl/qoriq-duart-0.dtsi"

/include/ "fsl/qoriq-duart-1.dtsi"



	L2: l2-cache-controller@c20000 {

		compatible = "fsl,b4-l2-cache-controller";

		reg = <0xc20000 0x1000>;

		next-level-cache = <&cpc>;

	};

};

arch/powerpc/boot/dts/b4qds.dtsi

+32 −19
Original line number Diff line number Diff line
@@ -120,6 +120,17 @@ 
		};



		i2c@118000 {

			mux@77 {

				compatible = "nxp,pca9547";

				reg = <0x77>;

				#address-cells = <1>;

				#size-cells = <0>;



				i2c@0 {

					#address-cells = <1>;

					#size-cells = <0>;

					reg = <0>;



					eeprom@50 {

						compatible = "at24,24c64";

						reg = <0x50>;
@@ -141,6 +152,8 @@ 
						reg = <0x68>;

					};

				};

			};

		};



		usb@210000 {

			dr_mode = "host";