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

Pull powerpc updates from Michael Ellerman:
 "This was delayed a day or two by some build-breakage on old toolchains
  which we've now fixed.

  There's two PCI commits both acked by Bjorn.

  There's one commit to mm/hugepage.c which is (co)authored by Kirill.

  Highlights:
   - Restructure Linux PTE on Book3S/64 to Radix format from Paul
     Mackerras
   - Book3s 64 MMU cleanup in preparation for Radix MMU from Aneesh
     Kumar K.V
   - Add POWER9 cputable entry from Michael Neuling
   - FPU/Altivec/VSX save/restore optimisations from Cyril Bur
   - Add support for new ftrace ABI on ppc64le from Torsten Duwe

  Various cleanups & minor fixes from:
   - Adam Buchbinder, Andrew Donnellan, Balbir Singh, Christophe Leroy,
     Cyril Bur, Luis Henriques, Madhavan Srinivasan, Pan Xinhui, Russell
     Currey, Sukadev Bhattiprolu, Suraj Jitindar Singh.

  General:
   - atomics: Allow architectures to define their own __atomic_op_*
     helpers from Boqun Feng
   - Implement atomic{, 64}_*_return_* variants and acquire/release/
     relaxed variants for (cmp)xchg from Boqun Feng
   - Add powernv_defconfig from Jeremy Kerr
   - Fix BUG_ON() reporting in real mode from Balbir Singh
   - Add xmon command to dump OPAL msglog from Andrew Donnellan
   - Add xmon command to dump process/task similar to ps(1) from Douglas
     Miller
   - Clean up memory hotplug failure paths from David Gibson

  pci/eeh:
   - Redesign SR-IOV on PowerNV to give absolute isolation between VFs
     from Wei Yang.
   - EEH Support for SRIOV VFs from Wei Yang and Gavin Shan.
   - PCI/IOV: Rename and export virtfn_{add, remove} from Wei Yang
   - PCI: Add pcibios_bus_add_device() weak function from Wei Yang
   - MAINTAINERS: Update EEH details and maintainership from Russell
     Currey

  cxl:
   - Support added to the CXL driver for running on both bare-metal and
     hypervisor systems, from Christophe Lombard and Frederic Barrat.
   - Ignore probes for virtual afu pci devices from Vaibhav Jain

  perf:
   - Export Power8 generic and cache events to sysfs from Sukadev
     Bhattiprolu
   - hv-24x7: Fix usage with chip events, display change in counter
     values, display domain indices in sysfs, eliminate domain suffix in
     event names, from Sukadev Bhattiprolu

  Freescale:
   - Updates from Scott: "Highlights include 8xx optimizations, 32-bit
     checksum optimizations, 86xx consolidation, e5500/e6500 cpu
     hotplug, more fman and other dt bits, and minor fixes/cleanup"

* tag 'powerpc-4.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (179 commits)
  powerpc: Fix unrecoverable SLB miss during restore_math()
  powerpc/8xx: Fix do_mtspr_cpu6() build on older compilers
  powerpc/rcpm: Fix build break when SMP=n
  powerpc/book3e-64: Use hardcoded mttmr opcode
  powerpc/fsl/dts: Add "jedec,spi-nor" flash compatible
  powerpc/T104xRDB: add tdm riser card node to device tree
  powerpc32: PAGE_EXEC required for inittext
  powerpc/mpc85xx: Add pcsphy nodes to FManV3 device tree
  powerpc/mpc85xx: Add MDIO bus muxing support to the board device tree(s)
  powerpc/86xx: Introduce and use common dtsi
  powerpc/86xx: Update device tree
  powerpc/86xx: Move dts files to fsl directory
  powerpc/86xx: Switch to kconfig fragments approach
  powerpc/86xx: Update defconfigs
  powerpc/86xx: Consolidate common platform code
  powerpc32: Remove one insn in mulhdu
  powerpc32: small optimisation in flush_icache_range()
  powerpc: Simplify test in __dma_sync()
  powerpc32: move xxxxx_dcache_range() functions inline
  powerpc32: Remove clear_pages() and define clear_page() inline
  ...

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/powerpc/crypto/aes-spe-glue.c
Simple merge

diff --cc arch/powerpc/include/asm/pci-bridge.h
Simple merge

diff --cc arch/powerpc/include/asm/smp.h
Simple merge

diff --cc arch/powerpc/include/asm/xics.h
Simple merge

diff --cc arch/powerpc/kernel/process.c
Simple merge

diff --cc arch/powerpc/kernel/smp.c
Simple merge

diff --cc arch/powerpc/kernel/traps.c
Simple merge

diff --cc arch/powerpc/kvm/book3s_64_vio.c
Simple merge

diff --cc arch/powerpc/kvm/book3s_64_vio_hv.c
index 44be73e6aa26b6563d1cc4cc91e1a332a84271c3,039028d3ccb5ab38a39ea52dfa1bad00a6052d74..f88b859af53b5c85d71a35e3d11b4dace211674e
--- 1/arch/powerpc/kvm/book3s_64_vio_hv.c
--- 2/arch/powerpc/kvm/book3s_64_vio_hv.c
+++ b/arch/powerpc/kvm/book3s_64_vio_hv.c
@@@ -30,8 -29,7 +30,8 @@@
  #include <asm/tlbflush.h>
  #include <asm/kvm_ppc.h>
  #include <asm/kvm_book3s.h>
- #include <asm/mmu-hash64.h>
+ #include <asm/book3s/64/mmu-hash.h>
 +#include <asm/mmu_context.h>
  #include <asm/hvcall.h>
  #include <asm/synch.h>
  #include <asm/ppc-opcode.h>

diff --cc arch/powerpc/kvm/book3s_hv_rmhandlers.S
Simple merge

diff --cc arch/powerpc/mm/hash_utils_64.c
Simple merge

diff --cc arch/powerpc/mm/init_32.c
Simple merge

diff --cc arch/powerpc/mm/mem.c
Simple merge

diff --cc arch/powerpc/mm/pgtable_64.c
Simple merge

diff --cc arch/powerpc/perf/hv-24x7.c
index 3b09ecfd0aee20861ae7c2d5f48a19965a21953f,59012e750abeb82ed95fb1c49719e1dcb889ef58..2da41b78cb6da64d99762502f389830aa07a221a
--- 1/arch/powerpc/perf/hv-24x7.c
--- 2/arch/powerpc/perf/hv-24x7.c
+++ b/arch/powerpc/perf/hv-24x7.c
@@@ -452,47 -493,24 +493,16 @@@ event_to_long_desc_attr(struct hv_24x7_
        return device_str_attr_create(name, nl, nonce, desc, dl);
  }
  
- static ssize_t event_data_to_attrs(unsigned ix, struct attribute **attrs,
+ static int event_data_to_attrs(unsigned ix, struct attribute **attrs,
                                   struct hv_24x7_event_data *event, int nonce)
  {
-       unsigned i;
- 
-       switch (event->domain) {
-       case HV_PERF_DOMAIN_PHYS_CHIP:
-               *attrs = event_to_attr(ix, event, event->domain, nonce);
-               return 1;
-       case HV_PERF_DOMAIN_PHYS_CORE:
-               for (i = 0; i < ARRAY_SIZE(core_domains); i++) {
-                       attrs[i] = event_to_attr(ix, event, core_domains[i],
-                                               nonce);
-                       if (!attrs[i]) {
-                               pr_warn("catalog event %u: individual attr %u "
-                                       "creation failure\n", ix, i);
-                               for (; i; i--)
-                                       device_str_attr_destroy(attrs[i - 1]);
-                               return -1;
-                       }
-               }
-               return i;
-       default:
-               pr_warn("catalog event %u: domain %u is not allowed in the "
-                               "catalog\n", ix, event->domain);
+       *attrs = event_to_attr(ix, event, event->domain, nonce);
+       if (!*attrs)
                return -1;
-       }
- }
  
- static size_t event_to_attr_ct(struct hv_24x7_event_data *event)
- {
-       switch (event->domain) {
-       case HV_PERF_DOMAIN_PHYS_CHIP:
-               return 1;
-       case HV_PERF_DOMAIN_PHYS_CORE:
-               return ARRAY_SIZE(core_domains);
-       default:
-               return 0;
-       }
+       return 0;
  }
  
 -static unsigned long vmalloc_to_phys(void *v)
 -{
 -      struct page *p = vmalloc_to_page(v);
 -
 -      BUG_ON(!p);
 -      return page_to_phys(p) + offset_in_page(v);
 -}
 -
  /* */
  struct event_uniq {
        struct rb_node node;

diff --cc drivers/misc/cxl/pci.c
Simple merge

diff --cc drivers/misc/cxl/sysfs.c
index 038af5d45145b741fbe1f421f3a0ec4e11afabaa,907c99b9f5afc1c7c008e52847ad05fc76e9372e..25913c08794cc29e24c19102e737f94426522e06
--- 1/drivers/misc/cxl/sysfs.c
--- 2/drivers/misc/cxl/sysfs.c
+++ b/drivers/misc/cxl/sysfs.c
@@@ -386,9 -392,10 +392,9 @@@ static ssize_t afu_eb_read(struct file 
                               struct bin_attribute *bin_attr, char *buf,
                               loff_t off, size_t count)
  {
 -      struct cxl_afu *afu = to_cxl_afu(container_of(kobj,
 -                                                    struct device, kobj));
 +      struct cxl_afu *afu = to_cxl_afu(kobj_to_dev(kobj));
  
-       return cxl_afu_read_err_buffer(afu, buf, off, count);
+       return cxl_ops->afu_read_err_buffer(afu, buf, off, count);
  }
  
  static struct device_attribute afu_attrs[] = {
@@@ -466,12 -488,14 +487,14 @@@ static ssize_t afu_read_config(struct f
                               loff_t off, size_t count)
  {
        struct afu_config_record *cr = to_cr(kobj);
 -      struct cxl_afu *afu = to_cxl_afu(container_of(kobj->parent, struct device, kobj));
 +      struct cxl_afu *afu = to_cxl_afu(kobj_to_dev(kobj->parent));
  
-       u64 i, j, val;
+       u64 i, j, val, rc;
  
        for (i = 0; i < count;) {
-               val = cxl_afu_cr_read64(afu, cr->cr, off & ~0x7);
+               rc = cxl_ops->afu_cr_read64(afu, cr->cr, off & ~0x7, &val);
+               if (rc)
+                       val = ~0ULL;
                for (j = off & 0x7; j < 8 && i < count; i++, j++, off++)
                        buf[i] = (val >> (j * 8)) & 0xff;
        }

diff --cc drivers/pci/bus.c
Simple merge

diff --cc drivers/pci/iov.c
Simple merge

diff --cc drivers/scsi/cxlflash/common.h
Simple merge

diff --cc drivers/scsi/cxlflash/main.c
Simple merge

diff --cc include/linux/atomic.h
Simple merge

diff --cc include/linux/huge_mm.h
index 5307dfb3f8ec013394cc844d84f0a9fab2935708,f12513a20a0623c9931b6587ccce23f81c18991c..79b0ef6aaa143d4f093f9f3cd7f9ad19a4421258
--- 1/include/linux/huge_mm.h
--- 2/include/linux/huge_mm.h
+++ b/include/linux/huge_mm.h
@@@ -103,17 -108,9 +103,14 @@@ void __split_huge_pmd(struct vm_area_st
                pmd_t *____pmd = (__pmd);                               \
                if (pmd_trans_huge(*____pmd)                            \
                                        || pmd_devmap(*____pmd))        \
 -                      __split_huge_pmd(__vma, __pmd, __address);      \
 +                      __split_huge_pmd(__vma, __pmd, __address,       \
 +                                              false);                 \
        }  while (0)
  
- #if HPAGE_PMD_ORDER >= MAX_ORDER
- #error "hugepages can't be allocated by the buddy allocator"
- #endif
 +
 +void split_huge_pmd_address(struct vm_area_struct *vma, unsigned long address,
 +              bool freeze, struct page *page);
 +
  extern int hugepage_madvise(struct vm_area_struct *vma,
                            unsigned long *vm_flags, int advice);
  extern void vma_adjust_trans_huge(struct vm_area_struct *vma,

diff --cc include/linux/pci.h
Simple merge

diff --cc mm/huge_memory.c
Simple merge