Commit dc2a2481 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'powerpc-4.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull more powerpc updates from Michael Ellerman:
 "The change to the Linux page table geometry was delayed for more
  testing with 16G pages, and there's the new CPU features stuff which
  just needed one more polish before going in. Plus a few changes from
  Scott which came in a bit late. And then various fixes, mostly minor.

  Summary highlights:

   - rework the Linux page table geometry to lower memory usage on
     64-bit Book3S (IBM chips) using the Hash MMU.

   - support for a new device tree binding for discovering CPU features
     on future firmwares.

   - Freescale updates from Scott:
      "Includes a fix for a powerpc/next mm regression on 64e, a fix for
       a kernel hang on 64e when using a debugger inside a relocated
       kernel, a qman fix, and misc qe improvements."

  Thanks to: Christophe Leroy, Gavin Shan, Horia Geantă, LiuHailong,
  Nicholas Piggin, Roy Pledge, Scott Wood, Valentin Longchamp"

* tag 'powerpc-4.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/64s: Support new device tree binding for discovering CPU features
  powerpc: Don't print cpu_spec->cpu_name if it's NULL
  of/fdt: introduce of_scan_flat_dt_subnodes and of_get_flat_dt_phandle
  powerpc/64s: Fix unnecessary machine check handler relocation branch
  powerpc/mm/book3s/64: Rework page table geometry for lower memory usage
  powerpc: Fix distclean with Makefile.postlink
  powerpc/64e: Don't place the stack beyond TASK_SIZE
  powerpc/powernv: Block PCI config access on BCM5718 during EEH recovery
  powerpc/8xx: Adding support of IRQ in MPC8xx GPIO
  soc/fsl/qbman: Disable IRQs for deferred QBMan work
  soc/fsl/qe: add EXPORT_SYMBOL for the 2 qe_tdm functions
  soc/fsl/qe: only apply QE_General4 workaround on affected SoCs
  soc/fsl/qe: round brg_freq to 1kHz granularity
  soc/fsl/qe: get rid of immrbar_virt_to_phys()
  net: ethernet: ucc_geth: fix MEM_PART_MURAM mode
  powerpc/64e: Fix hang when debugging programs with relocated kernel
parents ac3c4aa2 5a61ef74

Documentation/devicetree/bindings/powerpc/ibm,powerpc-cpu-features.txt

0 → 100644
+248 −0
Original line number Diff line number Diff line 
*** NOTE ***

This document is copied from OPAL firmware

(skiboot/doc/device-tree/ibm,powerpc-cpu-features/binding.txt)



There is more complete overview and documentation of features in that

source tree.  All patches and modifications should go there.

************



ibm,powerpc-cpu-features binding

================================



This device tree binding describes CPU features available to software, with

enablement, privilege, and compatibility metadata.



More general description of design and implementation of this binding is

found in design.txt, which also points to documentation of specific features.





/cpus/ibm,powerpc-cpu-features node binding

-------------------------------------------



Node: ibm,powerpc-cpu-features



Description: Container of CPU feature nodes.



The node name must be "ibm,powerpc-cpu-features".



It is implemented as a child of the node "/cpus", but this must not be

assumed by parsers.



The node is optional but should be provided by new OPAL firmware.



Properties:



- compatible

  Usage: required

  Value type: string

  Definition: "ibm,powerpc-cpu-features"



  This compatibility refers to backwards compatibility of the overall

  design with parsers that behave according to these guidelines. This can

  be extended in a backward compatible manner which would not warrant a

  revision of the compatible property.



- isa

  Usage: required

  Value type: <u32>

  Definition:



  isa that the CPU is currently running in. This provides instruction set

  compatibility, less the individual feature nodes. For example, an ISA v3.0

  implementation that lacks the "transactional-memory" cpufeature node

  should not use transactional memory facilities.



  Value corresponds to the "Power ISA Version" multiplied by 1000.

  For example, <3000> corresponds to Version 3.0, <2070> to Version 2.07.

  The minor digit is available for revisions.



- display-name

  Usage: optional

  Value type: string

  Definition:



  A human readable name for the CPU.



/cpus/ibm,powerpc-cpu-features/example-feature node bindings

----------------------------------------------------------------



Each child node of cpu-features represents a CPU feature / capability.



Node: A string describing an architected CPU feature, e.g., "floating-point".



Description: A feature or capability supported by the CPUs.



The name of the node is a human readable string that forms the interface

used to describe features to software. Features are currently documented

in the code where they are implemented in skiboot/core/cpufeatures.c



Presence of the node indicates the feature is available.



Properties:



- isa

  Usage: required

  Value type: <u32>

  Definition:



  First level of the Power ISA that the feature appears in.

  Software should filter out features when constraining the

  environment to a particular ISA version.



  Value is defined similarly to /cpus/features/isa



- usable-privilege

  Usage: required

  Value type: <u32> bit mask

  Definition:

              Bit numbers are LSB0

              bit 0 - PR (problem state / user mode)

              bit 1 - OS (privileged state)

              bit 2 - HV (hypervisor state)

              All other bits reserved and should be zero.



  This property describes the privilege levels and/or software components

  that can use the feature.



  If bit 0 is set, then the hwcap-bit-nr property will exist.





- hv-support

  Usage: optional

  Value type: <u32> bit mask

  Definition:

              Bit numbers are LSB0

              bit 0 -  HFSCR

              All other bits reserved and should be zero.



  This property describes the HV privilege support required to enable the

  feature to lesser privilege levels. If the property does not exist then no

  support is required.



  If no bits are set, the hypervisor must have explicit/custom support for

  this feature.



  If the HFSCR bit is set, then the hfscr-bit-nr property will exist and

  the feature may be enabled by setting this bit in the HFSCR register.





- os-support

  Usage: optional

  Value type: <u32> bit mask

  Definition:

              Bit numbers are LSB0

              bit 0 -  FSCR

              All other bits reserved and should be zero.



  This property describes the OS privilege support required to enable the

  feature to lesser privilege levels. If the property does not exist then no

  support is required.



  If no bits are set, the operating system must have explicit/custom support

  for this feature.



  If the FSCR bit is set, then the fscr-bit-nr property will exist and

  the feature may be enabled by setting this bit in the FSCR register.





- hfscr-bit-nr

  Usage: optional

  Value type: <u32>

  Definition: HFSCR bit position (LSB0)



  This property exists when the hv-support property HFSCR bit is set. This

  property describes the bit number in the HFSCR register that the

  hypervisor must set in order to enable this feature.



  This property also exists if an HFSCR bit corresponds with this feature.

  This makes CPU feature parsing slightly simpler.





- fscr-bit-nr

  Usage: optional

  Value type: <u32>

  Definition: FSCR bit position (LSB0)



  This property exists when the os-support property FSCR bit is set. This

  property describes the bit number in the FSCR register that the

  operating system must set in order to enable this feature.



  This property also exists if an FSCR bit corresponds with this feature.

  This makes CPU feature parsing slightly simpler.





- hwcap-bit-nr

  Usage: optional

  Value type: <u32>

  Definition: Linux ELF AUX vector bit position (LSB0)



  This property may exist when the usable-privilege property value has PR bit set.

  This property describes the bit number that should be set in the ELF AUX

  hardware capability vectors in order to advertise this feature to userspace.

  Bits 0-31 correspond to bits 0-31 in AT_HWCAP vector. Bits 32-63 correspond

  to 0-31 in AT_HWCAP2 vector, and so on.  Missing AT_HWCAPx vectors implies

  that the feature is not enabled or can not be advertised. Operating systems

  may provide a number of unassigned hardware capability bits to allow for new

  features to be advertised.



  Some properties representing features created before this binding are

  advertised to userspace without a one-to-one hwcap bit number may not specify

  this bit. Operating system will handle those bits specifically.  All new

  features usable by userspace will have a hwcap-bit-nr property.





- dependencies

  Usage: optional

  Value type: <prop-encoded-array>

  Definition:



  If this property exists then it is a list of phandles to cpu feature

  nodes that must be enabled for this feature to be enabled.





Example

-------



	/cpus/ibm,powerpc-cpu-features {

		compatible = "ibm,powerpc-cpu-features";



		isa = <3020>;



		darn {

			isa = <3000>;

			usable-privilege = <1 | 2 | 4>;

			hwcap-bit-nr = <xx>;

		};



		scv {

			isa = <3000>;

			usable-privilege = <1 | 2>;

			os-support = <0>;

			hwcap-bit-nr = <xx>;

		};



		stop {

			isa = <3000>;

			usable-privilege = <2 | 4>;

			hv-support = <0>;

			os-support = <0>;

		};



		vsx2 (hypothetical) {

			isa = <3010>;

			usable-privilege = <1 | 2 | 4>;

			hv-support = <0>;

			os-support = <0>;

			hwcap-bit-nr = <xx>;

		};



		vsx2-newinsns {

			isa = <3020>;

			usable-privilege = <1 | 2 | 4>;

			os-support = <1>;

			fscr-bit-nr = <xx>;

			hwcap-bit-nr = <xx>;

			dependencies = <&vsx2>;

		};



	};

Documentation/devicetree/bindings/soc/fsl/cpm_qe/gpio.txt

+20 −1
Original line number Diff line number Diff line
@@ -13,8 +13,17 @@ Required properties: 
- #gpio-cells : Should be two. The first cell is the pin number and the

  second cell is used to specify optional parameters (currently unused).

- gpio-controller : Marks the port as GPIO controller.

Optional properties:

- fsl,cpm1-gpio-irq-mask : For banks having interrupt capability (like port C

  on CPM1), this item tells which ports have an associated interrupt (ports are

  listed in the same order as in PCINT register)

- interrupts : This property provides the list of interrupt for each GPIO having

  one as described by the fsl,cpm1-gpio-irq-mask property. There should be as

  many interrupts as number of ones in the mask property. The first interrupt in

  the list corresponds to the most significant bit of the mask.

- interrupt-parent : Parent for the above interrupt property.



Example of three SOC GPIO banks defined as gpio-controller nodes:

Example of four SOC GPIO banks defined as gpio-controller nodes:



	CPM1_PIO_A: gpio-controller@950 {

		#gpio-cells = <2>;
@@ -30,6 +39,16 @@ Example of three SOC GPIO banks defined as gpio-controller nodes: 
		gpio-controller;

	};



	CPM1_PIO_C: gpio-controller@960 {

		#gpio-cells = <2>;

		compatible = "fsl,cpm1-pario-bank-c";

		reg = <0x960 0x10>;

		fsl,cpm1-gpio-irq-mask = <0x0fff>;

		interrupts = <1 2 6 9 10 11 14 15 23 24 26 31>;

		interrupt-parent = <&CPM_PIC>;

		gpio-controller;

	};



	CPM1_PIO_E: gpio-controller@ac8 {

		#gpio-cells = <2>;

		compatible = "fsl,cpm1-pario-bank-e";

arch/powerpc/Kconfig

+16 −0
Original line number Diff line number Diff line
@@ -380,6 +380,22 @@ source "arch/powerpc/platforms/Kconfig" 


menu "Kernel options"



config PPC_DT_CPU_FTRS

	bool "Device-tree based CPU feature discovery & setup"

	depends on PPC_BOOK3S_64

	default n

	help

	  This enables code to use a new device tree binding for describing CPU

	  compatibility and features. Saying Y here will attempt to use the new

	  binding if the firmware provides it. Currently only the skiboot

	  firmware provides this binding.

	  If you're not sure say Y.



config PPC_CPUFEATURES_ENABLE_UNKNOWN

	bool "cpufeatures pass through unknown features to guest/userspace"

	depends on PPC_DT_CPU_FTRS

	default y



config HIGHMEM

	bool "High memory support"

	depends on PPC32

arch/powerpc/Makefile.postlink

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
PHONY := __archpost

__archpost:



include include/config/auto.conf

-include include/config/auto.conf

include scripts/Kbuild.include



quiet_cmd_relocs_check = CHKREL  $@

arch/powerpc/include/asm/book3s/64/hash-64k.h

+3 −3
Original line number Diff line number Diff line
@@ -2,9 +2,9 @@ 
#define _ASM_POWERPC_BOOK3S_64_HASH_64K_H



#define H_PTE_INDEX_SIZE  8

#define H_PMD_INDEX_SIZE  5

#define H_PUD_INDEX_SIZE  5

#define H_PGD_INDEX_SIZE  15

#define H_PMD_INDEX_SIZE  10

#define H_PUD_INDEX_SIZE  7

#define H_PGD_INDEX_SIZE  8



/*

 * 64k aligned address free up few of the lower bits of RPN for us

CRA Git | Maintained and supported by SUSTech CRA and CCSE