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

Merge tag 'powerpc-4.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc updates from Michael Ellerman:
 "Highlights:
   - Support for Power ISA 3.0 (Power9) Radix Tree MMU from Aneesh Kumar K.V
   - Live patching support for ppc64le (also merged via livepatching.git)

  Various cleanups & minor fixes from:
   - Aaro Koskinen, Alexey Kardashevskiy, Andrew Donnellan, Aneesh Kumar K.V,
     Chris Smart, Daniel Axtens, Frederic Barrat, Gavin Shan, Ian Munsie,
     Lennart Sorensen, Madhavan Srinivasan, Mahesh Salgaonkar, Markus Elfring,
     Michael Ellerman, Oliver O'Halloran, Paul Gortmaker, Paul Mackerras,
     Rashmica Gupta, Russell Currey, Suraj Jitindar Singh, Thiago Jung
     Bauermann, Valentin Rothberg, Vipin K Parashar.

  General:
   - Update LMB associativity index during DLPAR add/remove from Nathan
     Fontenot
   - Fix branching to OOL handlers in relocatable kernel from Hari Bathini
   - Add support for userspace Power9 copy/paste from Chris Smart
   - Always use STRICT_MM_TYPECHECKS from Michael Ellerman
   - Add mask of possible MMU features from Michael Ellerman

  PCI:
   - Enable pass through of NVLink to guests from Alexey Kardashevskiy
   - Cleanups in preparation for powernv PCI hotplug from Gavin Shan
   - Don't report error in eeh_pe_reset_and_recover() from Gavin Shan
   - Restore initial state in eeh_pe_reset_and_recover() from Gavin Shan
   - Revert "powerpc/eeh: Fix crash in eeh_add_device_early() on Cell"
     from Guilherme G Piccoli
   - Remove the dependency on EEH struct in DDW mechanism from Guilherme
     G Piccoli

  selftests:
   - Test cp_abort during context switch from Chris Smart
   - Add several tests for transactional memory support from Rashmica
     Gupta

  perf:
   - Add support for sampling interrupt register state from Anju T
   - Add support for unwinding perf-stackdump from Chandan Kumar

  cxl:
   - Configure the PSL for two CAPI ports on POWER8NVL from Philippe
     Bergheaud
   - Allow initialization on timebase sync failures from Frederic Barrat
   - Increase timeout for detection of AFU mmio hang from Frederic
     Barrat
   - Handle num_of_processes larger than can fit in the SPA from Ian
     Munsie
   - Ensure PSL interrupt is configured for contexts with no AFU IRQs
     from Ian Munsie
   - Add kernel API to allow a context to operate with relocate disabled
     from Ian Munsie
   - Check periodically the coherent platform function's state from
     Christophe Lombard

  Freescale:
   - Updates from Scott: "Contains 86xx fixes, minor device tree fixes,
     an erratum workaround, and a kconfig dependency fix."

* tag 'powerpc-4.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (192 commits)
  powerpc/86xx: Fix PCI interrupt map definition
  powerpc/86xx: Move pci1 definition to the include file
  powerpc/fsl: Fix build of the dtb embedded kernel images
  powerpc/fsl: Fix rcpm compatible string
  powerpc/fsl: Remove FSL_SOC dependency from FSL_LBC
  powerpc/fsl-pci: Add a workaround for PCI 5 errata
  powerpc/fsl: Fix SPI compatible on t208xrdb and t1040rdb
  powerpc/powernv/npu: Add PE to PHB's list
  powerpc/powernv: Fix insufficient memory allocation
  powerpc/iommu: Remove the dependency on EEH struct in DDW mechanism
  Revert "powerpc/eeh: Fix crash in eeh_add_device_early() on Cell"
  powerpc/eeh: Drop unnecessary label in eeh_pe_change_owner()
  powerpc/eeh: Ignore handlers in eeh_pe_reset_and_recover()
  powerpc/eeh: Restore initial state in eeh_pe_reset_and_recover()
  powerpc/eeh: Don't report error in eeh_pe_reset_and_recover()
  Revert "powerpc/powernv: Exclude root bus in pnv_pci_reset_secondary_bus()"
  powerpc/powernv/npu: Enable NVLink pass through
  powerpc/powernv/npu: Rework TCE Kill handling
  powerpc/powernv/npu: Add set/unset window helpers
  powerpc/powernv/ioda2: Export debug helper pe_level_printk()
  ...
parents a1c28b75 138a0764

Documentation/ABI/testing/sysfs-class-cxl

+8 −0
Original line number Diff line number Diff line
@@ -233,3 +233,11 @@ Description: read/write 
		0 = don't trust, the image may be different (default)

		1 = trust that the image will not change.

Users:		https://github.com/ibm-capi/libcxl



What:           /sys/class/cxl/<card>/psl_timebase_synced

Date:           March 2016

Contact:        linuxppc-dev@lists.ozlabs.org

Description:    read only

                Returns 1 if the psl timebase register is synchronized

                with the core timebase register, 0 otherwise.

Users:          https://github.com/ibm-capi/libcxl

Documentation/features/perf/perf-regs/arch-support.txt

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
    |       nios2: | TODO |

    |    openrisc: | TODO |

    |      parisc: | TODO |

    |     powerpc: | TODO |

    |     powerpc: |  ok  |

    |        s390: | TODO |

    |       score: | TODO |

    |          sh: | TODO |

Documentation/features/perf/perf-stackdump/arch-support.txt

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
    |       nios2: | TODO |

    |    openrisc: | TODO |

    |      parisc: | TODO |

    |     powerpc: | TODO |

    |     powerpc: |  ok  |

    |        s390: | TODO |

    |       score: | TODO |

    |          sh: | TODO |

Documentation/powerpc/eeh-pci-error-recovery.txt

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ Overview: 
The IBM POWER-based pSeries and iSeries computers include PCI bus

controller chips that have extended capabilities for detecting and

reporting a large variety of PCI bus error conditions.  These features

go under the name of "EEH", for "Extended Error Handling".  The EEH

go under the name of "EEH", for "Enhanced Error Handling".  The EEH

hardware features allow PCI bus errors to be cleared and a PCI

card to be "rebooted", without also having to reboot the operating

system.

MAINTAINERS

+13 −0
Original line number Diff line number Diff line
@@ -6675,6 +6675,19 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git 
S:	Supported

F:	Documentation/powerpc/

F:	arch/powerpc/

F:	drivers/char/tpm/tpm_ibmvtpm*

F:	drivers/crypto/nx/

F:	drivers/crypto/vmx/

F:	drivers/net/ethernet/ibm/ibmveth.*

F:	drivers/net/ethernet/ibm/ibmvnic.*

F:	drivers/pci/hotplug/rpa*

F:	drivers/scsi/ibmvscsi/

N:	opal

N:	/pmac

N:	powermac

N:	powernv

N:	[^a-z0-9]ps3

N:	pseries



LINUX FOR POWER MACINTOSH

M:	Benjamin Herrenschmidt <benh@kernel.crashing.org>

CRA Git | Maintained and supported by SUSTech CRA and CCSE