Merge branch 'linus' into perf/urgent, to resolve conflict

 Conflicts:
	arch/powerpc/configs/85xx/kmp204x_defconfig

Signed-off-by: Ingo Molnar <mingo@kernel.org>

195 files changed, 13074 insertions, 6901 deletions

diff --git a/Documentation/devicetree/bindings/pwm/imx-pwm.txt b/Documentation/devicetree/bindings/pwm/imx-pwm.txt
index e00c2e9f484d..c61bdf8cd41b 100644
--- a/Documentation/devicetree/bindings/pwm/imx-pwm.txt
+++ b/Documentation/devicetree/bindings/pwm/imx-pwm.txt
@@ -6,8 +6,8 @@ Required properties:
   - "fsl,imx1-pwm" for PWM compatible with the one integrated on i.MX1
   - "fsl,imx27-pwm" for PWM compatible with the one integrated on i.MX27
 - reg: physical base address and length of the controller's registers
-- #pwm-cells: should be 2. See pwm.txt in this directory for a description of
-  the cells format.
+- #pwm-cells: 2 for i.MX1 and 3 for i.MX27 and newer SoCs. See pwm.txt
+  in this directory for a description of the cells format.
 - clocks : Clock specifiers for both ipg and per clocks.
 - clock-names : Clock names should include both "ipg" and "per"
 See the clock consumer binding,
@@ -17,7 +17,7 @@ See the clock consumer binding,
 Example:
 
 pwm1: pwm@53fb4000 {
-        #pwm-cells = <2>;
+        #pwm-cells = <3>;
         compatible = "fsl,imx53-pwm", "fsl,imx27-pwm";
         reg = <0x53fb4000 0x4000>;
         clocks = <&clks IMX5_CLK_PWM1_IPG_GATE>,
diff --git a/Documentation/devicetree/bindings/thermal/qoriq-thermal.txt b/Documentation/devicetree/bindings/thermal/qoriq-thermal.txt
index 66223d561972..20ca4ef9d776 100644
--- a/Documentation/devicetree/bindings/thermal/qoriq-thermal.txt
+++ b/Documentation/devicetree/bindings/thermal/qoriq-thermal.txt
@@ -17,6 +17,12 @@ Required properties:
         calibration data, as specified by the SoC reference manual.
         The first cell of each pair is the value to be written to TTCFGR,
         and the second is the value to be written to TSCFGR.
+- #thermal-sensor-cells : Must be 1. The sensor specifier is the monitoring
+        site ID, and represents the "n" in TRITSRn and TRATSRn.
+
+Optional property:
+- little-endian : If present, the TMU registers are little endian. If absent,
+        the default is big endian.
 
 Example:
 
@@ -60,4 +66,5 @@ tmu@f0000 {
 
                                0x00030000 0x00000012
                                0x00030001 0x0000001d>;
+        #thermal-sensor-cells = <1>;
 };
diff --git a/Documentation/devicetree/bindings/thermal/rcar-gen3-thermal.txt b/Documentation/devicetree/bindings/thermal/rcar-gen3-thermal.txt
new file mode 100644
index 000000000000..07a9713ae6a7
--- /dev/null
+++ b/Documentation/devicetree/bindings/thermal/rcar-gen3-thermal.txt
@@ -0,0 +1,56 @@
+* DT bindings for Renesas R-Car Gen3 Thermal Sensor driver
+
+On R-Car Gen3 SoCs, the thermal sensor controllers (TSC) control the thermal
+sensors (THS) which are the analog circuits for measuring temperature (Tj)
+inside the LSI.
+
+Required properties:
+- compatible            : "renesas,<soctype>-thermal",
+                          Examples with soctypes are:
+                            - "renesas,r8a7795-thermal" (R-Car H3)
+                            - "renesas,r8a7796-thermal" (R-Car M3-W)
+- reg                   : Address ranges of the thermal registers. Each sensor
+                          needs one address range. Sorting must be done in
+                          increasing order according to datasheet, i.e.
+                          TSC1, TSC2, ...
+- clocks                : Must contain a reference to the functional clock.
+- #thermal-sensor-cells : must be <1>.
+
+Optional properties:
+
+- interrupts           : interrupts routed to the TSC (3 for H3 and M3-W)
+- power-domain          : Must contain a reference to the power domain. This
+                          property is mandatory if the thermal sensor instance
+                          is part of a controllable power domain.
+
+Example:
+
+        tsc: thermal@e6198000 {
+                compatible = "renesas,r8a7795-thermal";
+                reg = <0 0xe6198000 0 0x68>,
+                      <0 0xe61a0000 0 0x5c>,
+                      <0 0xe61a8000 0 0x5c>;
+                interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>,
+                             <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>,
+                             <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&cpg CPG_MOD 522>;
+                power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                #thermal-sensor-cells = <1>;
+                status = "okay";
+        };
+
+        thermal-zones {
+                sensor_thermal1: sensor-thermal1 {
+                        polling-delay-passive = <250>;
+                        polling-delay = <1000>;
+                        thermal-sensors = <&tsc 0>;
+
+                        trips {
+                                sensor1_crit: sensor1-crit {
+                                        temperature = <90000>;
+                                        hysteresis = <2000>;
+                                        type = "critical";
+                                };
+                        };
+                };
+        };
diff --git a/Documentation/devicetree/bindings/thermal/zx2967-thermal.txt b/Documentation/devicetree/bindings/thermal/zx2967-thermal.txt
new file mode 100644
index 000000000000..3dc1c6bf0478
--- /dev/null
+++ b/Documentation/devicetree/bindings/thermal/zx2967-thermal.txt
@@ -0,0 +1,116 @@
+* ZTE zx2967 family Thermal
+
+Required Properties:
+- compatible: should be one of the following.
+    * zte,zx296718-thermal
+- reg: physical base address of the controller and length of memory mapped
+    region.
+- clocks : Pairs of phandle and specifier referencing the controller's clocks.
+- clock-names: "topcrm" for the topcrm clock.
+               "apb" for the apb clock.
+- #thermal-sensor-cells: must be 0.
+
+Please note: slope coefficient defined in thermal-zones section need to be
+multiplied by 1000.
+
+Example for tempsensor:
+
+        tempsensor: tempsensor@148a000 {
+                compatible = "zte,zx296718-thermal";
+                reg = <0x0148a000 0x20>;
+                clocks = <&topcrm TEMPSENSOR_GATE>, <&audiocrm AUDIO_TS_PCLK>;
+                clock-names = "topcrm", "apb";
+                #thermal-sensor-cells = <0>;
+        };
+
+Example for cooling device:
+
+        cooling_dev: cooling_dev {
+                cluster0_cooling_dev: cluster0-cooling-dev {
+                        #cooling-cells = <2>;
+                        cpumask = <0xf>;
+                        capacitance = <1500>;
+                };
+
+        cluster1_cooling_dev: cluster1-cooling-dev {
+                        #cooling-cells = <2>;
+                        cpumask = <0x30>;
+                        capacitance = <2000>;
+                };
+        };
+
+Example for thermal zones:
+
+        thermal-zones {
+                zx296718_thermal: zx296718_thermal {
+                        polling-delay-passive = <500>;
+                        polling-delay = <1000>;
+                        sustainable-power = <6500>;
+
+                        thermal-sensors = <&tempsensor 0>;
+                        /*
+                         * slope need to be multiplied by 1000.
+                         */
+                        coefficients = <1951 (-922)>;
+
+                        trips {
+                                trip0: switch_on_temperature {
+                                        temperature = <90000>;
+                                        hysteresis = <2000>;
+                                        type = "passive";
+                                };
+
+                                trip1: desired_temperature {
+                                        temperature = <100000>;
+                                        hysteresis = <2000>;
+                                        type = "passive";
+                                };
+
+                                crit: critical_temperature {
+                                        temperature = <110000>;
+                                        hysteresis = <2000>;
+                                        type = "critical";
+                                };
+                        };
+
+                        cooling-maps {
+                                map0 {
+                                        trip = <&trip0>;
+                                        cooling-device = <&gpu 2 5>;
+                                };
+
+                                map1 {
+                                        trip = <&trip0>;
+                                        cooling-device = <&cluster0_cooling_dev 1 2>;
+                                };
+
+                                map2 {
+                                        trip = <&trip1>;
+                                        cooling-device = <&cluster0_cooling_dev 1 2>;
+                                };
+
+                                map3 {
+                                        trip = <&crit>;
+                                        cooling-device = <&cluster0_cooling_dev 1 2>;
+                                };
+
+                                map4 {
+                                        trip = <&trip0>;
+                                        cooling-device = <&cluster1_cooling_dev 1 2>;
+                                        contribution = <9000>;
+                                };
+
+                                map5 {
+                                        trip = <&trip1>;
+                                        cooling-device = <&cluster1_cooling_dev 1 2>;
+                                        contribution = <4096>;
+                                };
+
+                                map6 {
+                                        trip = <&crit>;
+                                        cooling-device = <&cluster1_cooling_dev 1 2>;
+                                        contribution = <4096>;
+                                };
+                        };
+                };
+        };
diff --git a/Documentation/filesystems/f2fs.txt b/Documentation/filesystems/f2fs.txt
index 753dd4f96afe..4f6531a4701b 100644
--- a/Documentation/filesystems/f2fs.txt
+++ b/Documentation/filesystems/f2fs.txt
@@ -125,13 +125,14 @@ active_logs=%u         Support configuring the number of active logs. In the
 disable_ext_identify   Disable the extension list configured by mkfs, so f2fs
                        does not aware of cold files such as media files.
 inline_xattr           Enable the inline xattrs feature.
+noinline_xattr         Disable the inline xattrs feature.
 inline_data            Enable the inline data feature: New created small(<~3.4k)
                        files can be written into inode block.
 inline_dentry          Enable the inline dir feature: data in new created
                        directory entries can be written into inode block. The
                        space of inode block which is used to store inline
                        dentries is limited to ~3.4k.
-noinline_dentry        Diable the inline dentry feature.
+noinline_dentry        Disable the inline dentry feature.
 flush_merge            Merge concurrent cache_flush commands as much as possible
                        to eliminate redundant command issues. If the underlying
                        device handles the cache_flush command relatively slowly,
@@ -157,6 +158,8 @@ data_flush             Enable data flushing before checkpoint in order to
 mode=%s                Control block allocation mode which supports "adaptive"
                        and "lfs". In "lfs" mode, there should be no random
                        writes towards main area.
+io_bits=%u             Set the bit size of write IO requests. It should be set
+                       with "mode=lfs".
 
 ================================================================================
 DEBUGFS ENTRIES
@@ -174,7 +177,7 @@ f2fs. Each file shows the whole f2fs information.
 SYSFS ENTRIES
 ================================================================================
 
-Information about mounted f2f2 file systems can be found in
+Information about mounted f2fs file systems can be found in
 /sys/fs/f2fs.  Each mounted filesystem will have a directory in
 /sys/fs/f2fs based on its device name (i.e., /sys/fs/f2fs/sda).
 The files in each per-device directory are shown in table below.
diff --git a/MAINTAINERS b/MAINTAINERS
index 846f97aa3508..00018356f4a5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7483,18 +7483,24 @@ L:	linuxppc-dev@lists.ozlabs.org
 Q:      http://patchwork.ozlabs.org/project/linuxppc-dev/list/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git
 S:      Supported
+F:      Documentation/ABI/stable/sysfs-firmware-opal-*
+F:      Documentation/devicetree/bindings/powerpc/opal/
+F:      Documentation/devicetree/bindings/rtc/rtc-opal.txt
+F:      Documentation/devicetree/bindings/i2c/i2c-opal.txt
 F:      Documentation/powerpc/
 F:      arch/powerpc/
 F:      drivers/char/tpm/tpm_ibmvtpm*
 F:      drivers/crypto/nx/
 F:      drivers/crypto/vmx/
+F:      drivers/i2c/busses/i2c-opal.c
 F:      drivers/net/ethernet/ibm/ibmveth.*
 F:      drivers/net/ethernet/ibm/ibmvnic.*
 F:      drivers/pci/hotplug/pnv_php.c
 F:      drivers/pci/hotplug/rpa*
+F:      drivers/rtc/rtc-opal.c
 F:      drivers/scsi/ibmvscsi/
+F:      drivers/tty/hvc/hvc_opal.c
 F:      tools/testing/selftests/powerpc
-N:      opal
 N:      /pmac
 N:      powermac
 N:      powernv
diff --git a/arch/arm64/include/asm/cpufeature.h b/arch/arm64/include/asm/cpufeature.h
index 4ce82ed3e7c3..05310ad8c5ab 100644
--- a/arch/arm64/include/asm/cpufeature.h
+++ b/arch/arm64/include/asm/cpufeature.h
@@ -184,16 +184,22 @@ static inline u64 arm64_ftr_reg_user_value(const struct arm64_ftr_reg *reg)
 }
 
 static inline int __attribute_const__
-cpuid_feature_extract_field(u64 features, int field, bool sign)
+cpuid_feature_extract_field_width(u64 features, int field, int width, bool sign)
 {
         return (sign) ?
-                cpuid_feature_extract_signed_field(features, field) :
-                cpuid_feature_extract_unsigned_field(features, field);
+                cpuid_feature_extract_signed_field_width(features, field, width) :
+                cpuid_feature_extract_unsigned_field_width(features, field, width);
+}
+
+static inline int __attribute_const__
+cpuid_feature_extract_field(u64 features, int field, bool sign)
+{
+        return cpuid_feature_extract_field_width(features, field, 4, sign);
 }
 
 static inline s64 arm64_ftr_value(const struct arm64_ftr_bits *ftrp, u64 val)
 {
-        return (s64)cpuid_feature_extract_field(val, ftrp->shift, ftrp->sign);
+        return (s64)cpuid_feature_extract_field_width(val, ftrp->shift, ftrp->width, ftrp->sign);
 }
 
 static inline bool id_aa64mmfr0_mixed_endian_el0(u64 mmfr0)
diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c
index b805c017f789..d28dbcf596b6 100644
--- a/arch/arm64/mm/mmu.c
+++ b/arch/arm64/mm/mmu.c
@@ -109,10 +109,8 @@ static bool pgattr_change_is_safe(u64 old, u64 new)
 static void alloc_init_pte(pmd_t *pmd, unsigned long addr,
                                   unsigned long end, unsigned long pfn,
                                   pgprot_t prot,
-                                  phys_addr_t (*pgtable_alloc)(void),
-                                  bool page_mappings_only)
+                                  phys_addr_t (*pgtable_alloc)(void))
 {
-        pgprot_t __prot = prot;
         pte_t *pte;
 
         BUG_ON(pmd_sect(*pmd));
@@ -130,18 +128,7 @@ static void alloc_init_pte(pmd_t *pmd, unsigned long addr,
         do {
                 pte_t old_pte = *pte;
 
-                /*
-                 * Set the contiguous bit for the subsequent group of PTEs if
-                 * its size and alignment are appropriate.
-                 */
-                if (((addr | PFN_PHYS(pfn)) & ~CONT_PTE_MASK) == 0) {
-                        if (end - addr >= CONT_PTE_SIZE && !page_mappings_only)
-                                __prot = __pgprot(pgprot_val(prot) | PTE_CONT);
-                        else
-                                __prot = prot;
-                }
-
-                set_pte(pte, pfn_pte(pfn, __prot));
+                set_pte(pte, pfn_pte(pfn, prot));
                 pfn++;
 
                 /*
@@ -160,7 +147,6 @@ static void alloc_init_pmd(pud_t *pud, unsigned long addr, unsigned long end,
                                   phys_addr_t (*pgtable_alloc)(void),
                                   bool page_mappings_only)
 {
-        pgprot_t __prot = prot;
         pmd_t *pmd;
         unsigned long next;
 
@@ -187,18 +173,7 @@ static void alloc_init_pmd(pud_t *pud, unsigned long addr, unsigned long end,
                 /* try section mapping first */
                 if (((addr | next | phys) & ~SECTION_MASK) == 0 &&
                       !page_mappings_only) {
-                        /*
-                         * Set the contiguous bit for the subsequent group of
-                         * PMDs if its size and alignment are appropriate.
-                         */
-                        if (((addr | phys) & ~CONT_PMD_MASK) == 0) {
-                                if (end - addr >= CONT_PMD_SIZE)
-                                        __prot = __pgprot(pgprot_val(prot) |
-                                                          PTE_CONT);
-                                else
-                                        __prot = prot;
-                        }
-                        pmd_set_huge(pmd, phys, __prot);
+                        pmd_set_huge(pmd, phys, prot);
 
                         /*
                          * After the PMD entry has been populated once, we
@@ -208,8 +183,7 @@ static void alloc_init_pmd(pud_t *pud, unsigned long addr, unsigned long end,
                                                       pmd_val(*pmd)));
                 } else {
                         alloc_init_pte(pmd, addr, next, __phys_to_pfn(phys),
-                                       prot, pgtable_alloc,
-                                       page_mappings_only);
+                                       prot, pgtable_alloc);
 
                         BUG_ON(pmd_val(old_pmd) != 0 &&
                                pmd_val(old_pmd) != pmd_val(*pmd));
diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S
index cd4d53d7e458..877d42fb0df6 100644
--- a/arch/arm64/mm/proc.S
+++ b/arch/arm64/mm/proc.S
@@ -138,7 +138,7 @@ ENDPROC(cpu_do_resume)
  *      - pgd_phys - physical address of new TTB
  */
 ENTRY(cpu_do_switch_mm)
-        pre_ttbr0_update_workaround x0, x1, x2
+        pre_ttbr0_update_workaround x0, x2, x3
         mmid    x1, x1                          // get mm->context.id
         bfi     x0, x1, #48, #16                // set the ASID
         msr     ttbr0_el1, x0                   // set TTBR0
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 8582121d7a45..494091762bd7 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -115,7 +115,7 @@ config PPC
         select HAVE_PERF_REGS
         select HAVE_PERF_USER_STACK_DUMP
         select HAVE_REGS_AND_STACK_ACCESS_API
-        select HAVE_HW_BREAKPOINT if PERF_EVENTS && PPC_BOOK3S_64
+        select HAVE_HW_BREAKPOINT if PERF_EVENTS && (PPC_BOOK3S || PPC_8xx)
         select ARCH_WANT_IPC_PARSE_VERSION
         select SPARSE_IRQ
         select IRQ_DOMAIN
diff --git a/arch/powerpc/boot/dts/fsl/kmcent2.dts b/arch/powerpc/boot/dts/fsl/kmcent2.dts
new file mode 100644
index 000000000000..47afa438602e
--- /dev/null
+++ b/arch/powerpc/boot/dts/fsl/kmcent2.dts
@@ -0,0 +1,303 @@
+/*
+ * Keymile kmcent2 Device Tree Source, based on T1040RDB DTS
+ *
+ * (C) Copyright 2016
+ * Valentin Longchamp, Keymile AG, valentin.longchamp@keymile.com
+ *
+ * Copyright 2014 - 2015 Freescale Semiconductor Inc.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+/include/ "t104xsi-pre.dtsi"
+
+/ {
+        model = "keymile,kmcent2";
+        compatible = "keymile,kmcent2";
+
+        aliases {
+                front_phy = &front_phy;
+        };
+
+        reserved-memory {
+                #address-cells = <2>;
+                #size-cells = <2>;
+                ranges;
+
+                bman_fbpr: bman-fbpr {
+                        size = <0 0x1000000>;
+                        alignment = <0 0x1000000>;
+                };
+                qman_fqd: qman-fqd {
+                        size = <0 0x400000>;
+                        alignment = <0 0x400000>;
+                };
+                qman_pfdr: qman-pfdr {
+                        size = <0 0x2000000>;
+                        alignment = <0 0x2000000>;
+                };
+        };
+
+        ifc: localbus@ffe124000 {
+                reg = <0xf 0xfe124000 0 0x2000>;
+                ranges = <0 0 0xf 0xe8000000 0x04000000
+                          1 0 0xf 0xfa000000 0x00010000
+                          2 0 0xf 0xfb000000 0x00010000
+                          4 0 0xf 0xc0000000 0x08000000
+                          6 0 0xf 0xd0000000 0x08000000
+                          7 0 0xf 0xd8000000 0x08000000>;
+
+                nor@0,0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "cfi-flash";
+                        reg = <0x0 0x0 0x04000000>;
+                        bank-width = <2>;
+                        device-width = <2>;
+                };
+
+                nand@1,0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,ifc-nand";
+                        reg = <0x1 0x0 0x10000>;
+                };
+
+                board-control@2,0 {
+                        compatible = "keymile,qriox";
+                        reg = <0x2 0x0 0x80>;
+                };
+
+                chassis-mgmt@6,0 {
+                        compatible = "keymile,bfticu";
+                        reg = <6 0 0x100>;
+                        interrupt-controller;
+                        interrupt-parent = <&mpic>;
+                        interrupts = <11 1 0 0>;
+                        #interrupt-cells = <1>;
+                };
+
+        };
+
+        memory {
+                device_type = "memory";
+        };
+
+        dcsr: dcsr@f00000000 {
+                ranges = <0x00000000 0xf 0x00000000 0x01072000>;
+        };
+
+        bportals: bman-portals@ff4000000 {
+                ranges = <0x0 0xf 0xf4000000 0x2000000>;
+        };
+
+        qportals: qman-portals@ff6000000 {
+                ranges = <0x0 0xf 0xf6000000 0x2000000>;
+        };
+
+        soc: soc@ffe000000 {
+                ranges = <0x00000000 0xf 0xfe000000 0x1000000>;
+                reg = <0xf 0xfe000000 0 0x00001000>;
+
+                spi@110000 {
+                        network-clock@1 {
+                                compatible = "zarlink,zl30364";
+                                reg = <1>;
+                                spi-max-frequency = <1000000>;
+                        };
+                };
+
+                sdhc@114000 {
+                        status = "disabled";
+                };
+
+                i2c@118000 {
+                        clock-frequency = <100000>;
+
+                        mux@70 {
+                                compatible = "nxp,pca9547";
+                                reg = <0x70>;
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                i2c-mux-idle-disconnect;
+
+                                i2c@0 {
+                                        reg = <0>;
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+
+                                        eeprom@54 {
+                                                compatible = "24c02";
+                                                reg = <0x54>;
+                                                pagesize = <2>;
+                                                read-only;
+                                                label = "ddr3-spd";
+                                        };
+                                };
+
+                                i2c@7 {
+                                        reg = <7>;
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+
+                                        temp-sensor@48 {
+                                                compatible = "national,lm75";
+                                                reg = <0x48>;
+                                                label = "SENSOR_0";
+                                        };
+                                        temp-sensor@4a {
+                                                compatible = "national,lm75";
+                                                reg = <0x4a>;
+                                                label = "SENSOR_2";
+                                        };
+                                        temp-sensor@4b {
+                                                compatible = "national,lm75";
+                                                reg = <0x4b>;
+                                                label = "SENSOR_3";
+                                        };
+                                };
+                        };
+                };
+
+                i2c@118100 {
+                        clock-frequency = <100000>;
+
+                        eeprom@50 {
+                                compatible = "atmel,24c08";
+                                reg = <0x50>;
+                                pagesize = <16>;
+                        };
+
+                        eeprom@54 {
+                                compatible = "atmel,24c08";
+                                reg = <0x54>;
+                                pagesize = <16>;
+                        };
+                };
+
+                i2c@119000 {
+                        status = "disabled";
+                };
+
+                i2c@119100 {
+                        status = "disabled";
+                };
+
+                serial2: serial@11d500 {
+                        status = "disabled";
+                };
+
+                serial3: serial@11d600 {
+                        status = "disabled";
+                };
+
+                usb0: usb@210000 {
+                        status = "disabled";
+                };
+                usb1: usb@211000 {
+                        status = "disabled";
+                };
+
+                display@180000 {
+                        status = "disabled";
+                };
+
+                sata@220000 {
+                        status = "disabled";
+                };
+                sata@221000 {
+                        status = "disabled";
+                };
+
+                fman@400000 {
+                        ethernet@e0000 {
+                                fixed-link = <0 1 1000 0 0>;
+                                phy-connection-type = "sgmii";
+                        };
+
+                        ethernet@e2000 {
+                                fixed-link = <1 1 1000 0 0>;
+                                phy-connection-type = "sgmii";
+                        };
+
+                        ethernet@e4000 {
+                                status = "disabled";
+                        };
+
+                        ethernet@e6000 {
+                                status = "disabled";
+                        };
+
+                        ethernet@e8000 {
+                                phy-handle = <&front_phy>;
+                                phy-connection-type = "rgmii";
+                        };
+
+                        mdio0: mdio@fc000 {
+                                front_phy: ethernet-phy@11 {
+                                        reg = <0x11>;
+                                };
+                        };
+                };
+        };
+
+
+        pci0: pcie@ffe240000 {
+                reg = <0xf 0xfe240000 0 0x10000>;
+                ranges = <0x02000000 0 0xe0000000 0xc 0x00000000 0x0 0x20000000
+                          0x01000000 0 0x00000000 0xf 0xf8000000 0x0 0x00010000>;
+                pcie@0 {
+                        ranges = <0x02000000 0 0xe0000000
+                                  0x02000000 0 0xe0000000
+                                  0 0x20000000
+
+                                  0x01000000 0 0x00000000
+                                  0x01000000 0 0x00000000
+                                  0 0x00010000>;
+                };
+        };
+
+        pci1: pcie@ffe250000 {
+                status = "disabled";
+        };
+
+        pci2: pcie@ffe260000 {
+                status = "disabled";
+        };
+
+        pci3: pcie@ffe270000 {
+                status = "disabled";
+        };
+
+        qe: qe@ffe140000 {
+                ranges = <0x0 0xf 0xfe140000 0x40000>;
+                reg = <0xf 0xfe140000 0 0x480>;
+                brg-frequency = <0>;
+                bus-frequency = <0>;
+
+                si1: si@700 {
+                        compatible = "fsl,t1040-qe-si";
+                        reg = <0x700 0x80>;
+                };
+
+                siram1: siram@1000 {
+                        compatible = "fsl,t1040-qe-siram";
+                        reg = <0x1000 0x800>;
+                };
+
+                ucc_hdlc: ucc@2000 {
+                        device_type = "hdlc";
+                        compatible = "fsl,ucc-hdlc";
+                        rx-clock-name = "clk9";
+                        tx-clock-name = "clk9";
+                        fsl,tx-timeslot-mask = <0xfffffffe>;
+                        fsl,rx-timeslot-mask = <0xfffffffe>;
+                        fsl,siram-entry-id = <0>;
+                };
+        };
+};
+
+#include "t1040si-post.dtsi"
diff --git a/arch/powerpc/boot/dts/fsl/kmcoge4.dts b/arch/powerpc/boot/dts/fsl/kmcoge4.dts
index ae70a24094b0..e103c0f3f650 100644
--- a/arch/powerpc/boot/dts/fsl/kmcoge4.dts
+++ b/arch/powerpc/boot/dts/fsl/kmcoge4.dts
@@ -83,6 +83,10 @@
                         };
                 };
 
+                sdhc@114000 {
+                        status = "disabled";
+                };
+
                 i2c@119000 {
                         status = "disabled";
                 };
diff --git a/arch/powerpc/boot/dts/fsl/t1023si-post.dtsi b/arch/powerpc/boot/dts/fsl/t1023si-post.dtsi
index da2894c59479..4908af501098 100644
--- a/arch/powerpc/boot/dts/fsl/t1023si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/t1023si-post.dtsi
@@ -422,7 +422,7 @@
                                        0x00030001 0x0000000d
                                        0x00030002 0x00000019
                                        0x00030003 0x00000024>;
-                #thermal-sensor-cells = <0>;
+                #thermal-sensor-cells = <1>;
         };
 
         thermal-zones {
@@ -430,7 +430,7 @@
                         polling-delay-passive = <1000>;
                         polling-delay = <5000>;
 
-                        thermal-sensors = <&tmu>;
+                        thermal-sensors = <&tmu 0>;
 
                         trips {
                                 cpu_alert: cpu-alert {
diff --git a/arch/powerpc/boot/dts/fsl/t1040si-post.dtsi b/arch/powerpc/boot/dts/fsl/t1040si-post.dtsi
index 44e399b17f6f..145c7f43b5b6 100644
--- a/arch/powerpc/boot/dts/fsl/t1040si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/t1040si-post.dtsi
@@ -526,7 +526,7 @@
 
                                        0x00030000 0x00000012
                                        0x00030001 0x0000001d>;
-                #thermal-sensor-cells = <0>;
+                #thermal-sensor-cells = <1>;
         };
 
         thermal-zones {
@@ -534,7 +534,7 @@
                         polling-delay-passive = <1000>;
                         polling-delay = <5000>;
 
-                        thermal-sensors = <&tmu>;
+                        thermal-sensors = <&tmu 2>;
 
                         trips {
                                 cpu_alert: cpu-alert {
diff --git a/arch/powerpc/configs/85xx/kmp204x_defconfig b/arch/powerpc/configs/85xx/kmp204x_defconfig
deleted file mode 100644
index 34a4da23f000..000000000000
--- a/arch/powerpc/configs/85xx/kmp204x_defconfig
+++ /dev/null
@@ -1,220 +0,0 @@
-CONFIG_PPC_85xx=y
-CONFIG_SMP=y
-CONFIG_NR_CPUS=8
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_AUDIT=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_CGROUPS=y
-CONFIG_CGROUP_SCHED=y
-CONFIG_RELAY=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_KALLSYMS_ALL=y
-CONFIG_EMBEDDED=y
-CONFIG_PERF_EVENTS=y
-CONFIG_SLAB=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_MODVERSIONS=y
-# CONFIG_BLK_DEV_BSG is not set
-CONFIG_PARTITION_ADVANCED=y
-CONFIG_MAC_PARTITION=y
-CONFIG_CORENET_GENERIC=y
-CONFIG_MPIC_MSGR=y
-CONFIG_HIGHMEM=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_BINFMT_MISC=m
-CONFIG_KEXEC=y
-CONFIG_FORCE_MAX_ZONEORDER=13
-CONFIG_PCI=y
-CONFIG_PCIEPORTBUS=y
-# CONFIG_PCIEASPM is not set
-CONFIG_PCI_MSI=y
-CONFIG_ADVANCED_OPTIONS=y
-CONFIG_LOWMEM_SIZE_BOOL=y
-CONFIG_LOWMEM_SIZE=0x20000000
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_XFRM_USER=y
-CONFIG_XFRM_SUB_POLICY=y
-CONFIG_XFRM_STATISTICS=y
-CONFIG_NET_KEY=y
-CONFIG_NET_KEY_MIGRATE=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_IP_PNP_RARP=y
-CONFIG_NET_IPIP=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-CONFIG_INET_AH=y
-CONFIG_INET_ESP=y
-CONFIG_INET_IPCOMP=y
-CONFIG_IPV6=y
-CONFIG_IP_SCTP=m
-CONFIG_TIPC=y
-CONFIG_NET_SCHED=y
-CONFIG_NET_SCH_CBQ=y
-CONFIG_NET_SCH_HTB=y
-CONFIG_NET_SCH_HFSC=y
-CONFIG_NET_SCH_PRIO=y
-CONFIG_NET_SCH_MULTIQ=y
-CONFIG_NET_SCH_RED=y
-CONFIG_NET_SCH_SFQ=y
-CONFIG_NET_SCH_TEQL=y
-CONFIG_NET_SCH_TBF=y
-CONFIG_NET_SCH_GRED=y
-CONFIG_NET_CLS_BASIC=y
-CONFIG_NET_CLS_TCINDEX=y
-CONFIG_NET_CLS_U32=y
-CONFIG_CLS_U32_PERF=y
-CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_FLOW=y
-CONFIG_NET_CLS_CGROUP=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/mdev"
-CONFIG_DEVTMPFS=y
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_PHYSMAP_OF=y
-CONFIG_MTD_PHRAM=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_ECC_BCH=y
-CONFIG_MTD_NAND_FSL_ELBC=y
-CONFIG_MTD_UBI=y
-CONFIG_MTD_UBI_GLUEBI=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=2
-CONFIG_BLK_DEV_RAM_SIZE=2048
-CONFIG_EEPROM_AT24=y
-CONFIG_SCSI=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_CHR_DEV_ST=y
-CONFIG_BLK_DEV_SR=y
-CONFIG_CHR_DEV_SG=y
-CONFIG_SCSI_LOGGING=y
-CONFIG_SCSI_SYM53C8XX_2=y
-CONFIG_NETDEVICES=y
-# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_NET_VENDOR_ADAPTEC is not set
-# CONFIG_NET_VENDOR_ALTEON is not set
-# CONFIG_NET_VENDOR_AMD is not set
-# CONFIG_NET_VENDOR_ATHEROS is not set
-# CONFIG_NET_VENDOR_BROADCOM is not set
-# CONFIG_NET_VENDOR_BROCADE is not set
-# CONFIG_NET_VENDOR_CHELSIO is not set
-# CONFIG_NET_VENDOR_CISCO is not set
-# CONFIG_NET_VENDOR_DEC is not set
-# CONFIG_NET_VENDOR_DLINK is not set
-# CONFIG_NET_VENDOR_EMULEX is not set
-# CONFIG_NET_VENDOR_EXAR is not set
-CONFIG_FSL_PQ_MDIO=y
-CONFIG_FSL_XGMAC_MDIO=y
-# CONFIG_NET_VENDOR_HP is not set
-# CONFIG_NET_VENDOR_INTEL is not set
-# CONFIG_NET_VENDOR_MARVELL is not set
-# CONFIG_NET_VENDOR_MELLANOX is not set
-# CONFIG_NET_VENDOR_MICREL is not set
-# CONFIG_NET_VENDOR_MICROCHIP is not set
-# CONFIG_NET_VENDOR_MYRI is not set
-# CONFIG_NET_VENDOR_NATSEMI is not set
-# CONFIG_NET_VENDOR_NVIDIA is not set
-# CONFIG_NET_VENDOR_OKI is not set
-# CONFIG_NET_PACKET_ENGINE is not set
-# CONFIG_NET_VENDOR_QLOGIC is not set
-# CONFIG_NET_VENDOR_REALTEK is not set
-# CONFIG_NET_VENDOR_RDC is not set
-# CONFIG_NET_VENDOR_SEEQ is not set
-# CONFIG_NET_VENDOR_SILAN is not set
-# CONFIG_NET_VENDOR_SIS is not set
-# CONFIG_NET_VENDOR_SMSC is not set
-# CONFIG_NET_VENDOR_STMICRO is not set
-# CONFIG_NET_VENDOR_SUN is not set
-# CONFIG_NET_VENDOR_TEHUTI is not set
-# CONFIG_NET_VENDOR_TI is not set
-# CONFIG_NET_VENDOR_VIA is not set
-# CONFIG_NET_VENDOR_WIZNET is not set
-# CONFIG_NET_VENDOR_XILINX is not set
-CONFIG_MARVELL_PHY=y
-CONFIG_VITESSE_PHY=y
-CONFIG_FIXED_PHY=y
-# CONFIG_WLAN is not set
-# CONFIG_INPUT_MOUSEDEV is not set
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-CONFIG_SERIO_LIBPS2=y
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_PPC_EPAPR_HV_BYTECHAN=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_MANY_PORTS=y
-CONFIG_SERIAL_8250_DETECT_IRQ=y
-CONFIG_SERIAL_8250_RSA=y
-CONFIG_NVRAM=y
-CONFIG_I2C=y
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_MUX=y
-CONFIG_I2C_MUX_PCA954x=y
-CONFIG_I2C_MPC=y
-CONFIG_SPI=y
-CONFIG_SPI_FSL_SPI=y
-CONFIG_SPI_FSL_ESPI=y
-CONFIG_SPI_SPIDEV=m
-CONFIG_PTP_1588_CLOCK=y
-# CONFIG_HWMON is not set
-# CONFIG_USB_SUPPORT is not set
-CONFIG_EDAC=y
-CONFIG_EDAC_MM_EDAC=y
-CONFIG_EDAC_MPC85XX=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_DS3232=y
-CONFIG_RTC_DRV_CMOS=y
-CONFIG_UIO=y
-CONFIG_STAGING=y
-CONFIG_CLK_QORIQ=y
-CONFIG_EXT2_FS=y
-CONFIG_NTFS_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_TMPFS=y
-CONFIG_JFFS2_FS=y
-CONFIG_UBIFS_FS=y
-CONFIG_CRAMFS=y
-CONFIG_SQUASHFS=y
-CONFIG_SQUASHFS_XZ=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V4=y
-CONFIG_ROOT_NFS=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_UTF8=m
-CONFIG_CRC_ITU_T=m
-CONFIG_DEBUG_INFO=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_DEBUG_SHIRQ=y
-CONFIG_DETECT_HUNG_TASK=y
-CONFIG_SCHEDSTATS=y
-CONFIG_RCU_TRACE=y
-CONFIG_UPROBE_EVENTS=y
-CONFIG_CRYPTO_NULL=y
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_MD4=y
-CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA512=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-CONFIG_CRYPTO_DEV_FSL_CAAM=y
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig
index 6d0eb02fefa4..4ff68b752618 100644
--- a/arch/powerpc/configs/pseries_defconfig
+++ b/arch/powerpc/configs/pseries_defconfig
@@ -58,7 +58,6 @@ CONFIG_KEXEC_FILE=y
 CONFIG_IRQ_ALL_CPUS=y
 CONFIG_MEMORY_HOTPLUG=y
 CONFIG_MEMORY_HOTREMOVE=y
-CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
 CONFIG_KSM=y
 CONFIG_TRANSPARENT_HUGEPAGE=y
 CONFIG_PPC_64K_PAGES=y
diff --git a/arch/powerpc/include/asm/bitops.h b/arch/powerpc/include/asm/bitops.h
index 59abc620f8e8..73eb794d6163 100644
--- a/arch/powerpc/include/asm/bitops.h
+++ b/arch/powerpc/include/asm/bitops.h
@@ -154,6 +154,34 @@ static __inline__ int test_and_change_bit(unsigned long nr,
         return test_and_change_bits(BIT_MASK(nr), addr + BIT_WORD(nr)) != 0;
 }
 
+#ifdef CONFIG_PPC64
+static __inline__ unsigned long clear_bit_unlock_return_word(int nr,
+                                                volatile unsigned long *addr)
+{
+        unsigned long old, t;
+        unsigned long *p = (unsigned long *)addr + BIT_WORD(nr);
+        unsigned long mask = BIT_MASK(nr);
+
+        __asm__ __volatile__ (
+        PPC_RELEASE_BARRIER
+"1:"    PPC_LLARX(%0,0,%3,0) "\n"
+        "andc %1,%0,%2\n"
+        PPC405_ERR77(0,%3)
+        PPC_STLCX "%1,0,%3\n"
+        "bne- 1b\n"
+        : "=&r" (old), "=&r" (t)
+        : "r" (mask), "r" (p)
+        : "cc", "memory");
+
+        return old;
+}
+
+/* This is a special function for mm/filemap.c */
+#define clear_bit_unlock_is_negative_byte(nr, addr)                     \
+        (clear_bit_unlock_return_word(nr, addr) & BIT_MASK(PG_waiters))
+
+#endif /* CONFIG_PPC64 */
+
 #include <asm-generic/bitops/non-atomic.h>
 
 static __inline__ void __clear_bit_unlock(int nr, volatile unsigned long *addr)
diff --git a/arch/powerpc/include/asm/pnv-pci.h b/arch/powerpc/include/asm/pnv-pci.h
index 696438f09aea..de9681034353 100644
--- a/arch/powerpc/include/asm/pnv-pci.h
+++ b/arch/powerpc/include/asm/pnv-pci.h
@@ -57,6 +57,8 @@ struct pnv_php_slot {
         uint64_t                        id;
         char                            *name;
         int                             slot_no;
+        unsigned int                    flags;
+#define PNV_PHP_FLAG_BROKEN_PDC         0x1
         struct kref                     kref;
 #define PNV_PHP_STATE_INITIALIZED       0
 #define PNV_PHP_STATE_REGISTERED        1
diff --git a/arch/powerpc/include/asm/ppc_asm.h b/arch/powerpc/include/asm/ppc_asm.h
index 025833b8df9f..359c44341761 100644
--- a/arch/powerpc/include/asm/ppc_asm.h
+++ b/arch/powerpc/include/asm/ppc_asm.h
@@ -505,7 +505,6 @@ END_FTR_SECTION_IFCLR(CPU_FTR_601)
 #define MTMSRD(r)       mtmsrd  r
 #define MTMSR_EERI(reg) mtmsrd  reg,1
 #else
-#define FIX_SRR1(ra, rb)
 #ifndef CONFIG_40x
 #define RFI             rfi
 #else
diff --git a/arch/powerpc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h
index 21e0b52685b5..e0fecbcea2a2 100644
--- a/arch/powerpc/include/asm/processor.h
+++ b/arch/powerpc/include/asm/processor.h
@@ -225,6 +225,7 @@ struct thread_struct {
 #ifdef CONFIG_PPC64
         unsigned long   start_tb;       /* Start purr when proc switched in */
         unsigned long   accum_tb;       /* Total accumulated purr for process */
+#endif
 #ifdef CONFIG_HAVE_HW_BREAKPOINT
         struct perf_event *ptrace_bps[HBP_NUM];
         /*
@@ -233,7 +234,6 @@ struct thread_struct {
          */
         struct perf_event *last_hit_ubp;
 #endif /* CONFIG_HAVE_HW_BREAKPOINT */
-#endif
         struct arch_hw_breakpoint hw_brk; /* info on the hardware breakpoint */
         unsigned long   trap_nr;        /* last trap # on this thread */
         u8 load_fp;
diff --git a/arch/powerpc/include/asm/prom.h b/arch/powerpc/include/asm/prom.h
index 2c8001cc93b6..4a90634e8322 100644
--- a/arch/powerpc/include/asm/prom.h
+++ b/arch/powerpc/include/asm/prom.h
@@ -153,6 +153,7 @@ struct of_drconf_cell {
 #define OV5_XCMO                0x0440  /* Page Coalescing */
 #define OV5_TYPE1_AFFINITY      0x0580  /* Type 1 NUMA affinity */
 #define OV5_PRRN                0x0540  /* Platform Resource Reassignment */
+#define OV5_HP_EVT              0x0604  /* Hot Plug Event support */
 #define OV5_RESIZE_HPT          0x0601  /* Hash Page Table resizing */
 #define OV5_PFO_HW_RNG          0x1180  /* PFO Random Number Generator */
 #define OV5_PFO_HW_842          0x1140  /* PFO Compression Accelerator */
diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
index cb02d32db147..fc879fd6bdae 100644
--- a/arch/powerpc/include/asm/reg.h
+++ b/arch/powerpc/include/asm/reg.h
@@ -552,7 +552,9 @@
 #define SPRN_IBAT7U     0x236           /* Instruction BAT 7 Upper Register */
 #define SPRN_ICMP       0x3D5           /* Instruction TLB Compare Register */
 #define SPRN_ICTC       0x3FB   /* Instruction Cache Throttling Control Reg */
+#ifndef SPRN_ICTRL
 #define SPRN_ICTRL      0x3F3   /* 1011 7450 icache and interrupt ctrl */
+#endif
 #define ICTRL_EICE      0x08000000      /* enable icache parity errs */
 #define ICTRL_EDC       0x04000000      /* enable dcache parity errs */
 #define ICTRL_EICP      0x00000100      /* enable icache par. check */
diff --git a/arch/powerpc/include/asm/reg_8xx.h b/arch/powerpc/include/asm/reg_8xx.h
index 1f1636124a04..ae16fef7a4d6 100644
--- a/arch/powerpc/include/asm/reg_8xx.h
+++ b/arch/powerpc/include/asm/reg_8xx.h
@@ -28,6 +28,17 @@
 /* Special MSR manipulation registers */
 #define SPRN_EIE        80      /* External interrupt enable (EE=1, RI=1) */
 #define SPRN_EID        81      /* External interrupt disable (EE=0, RI=1) */
+#define SPRN_NRI        82      /* Non recoverable interrupt (EE=0, RI=0) */
+
+/* Debug registers */
+#define SPRN_CMPA       144
+#define SPRN_COUNTA     150
+#define SPRN_CMPE       152
+#define SPRN_CMPF       153
+#define SPRN_LCTRL1     156
+#define SPRN_LCTRL2     157
+#define SPRN_ICTRL      158
+#define SPRN_BAR        159
 
 /* Commands.  Only the first few are available to the instruction cache.
 */
diff --git a/arch/powerpc/include/asm/rtas.h b/arch/powerpc/include/asm/rtas.h
index 076b89247ab5..ec9dd79398ee 100644
--- a/arch/powerpc/include/asm/rtas.h
+++ b/arch/powerpc/include/asm/rtas.h
@@ -307,6 +307,7 @@ struct pseries_hp_errorlog {
         union {
                 __be32  drc_index;
                 __be32  drc_count;
+                struct { __be32 count, index; } ic;
                 char    drc_name[1];
         } _drc_u;
 };
@@ -323,6 +324,7 @@ struct pseries_hp_errorlog {
 #define PSERIES_HP_ELOG_ID_DRC_NAME     1
 #define PSERIES_HP_ELOG_ID_DRC_INDEX    2
 #define PSERIES_HP_ELOG_ID_DRC_COUNT    3
+#define PSERIES_HP_ELOG_ID_DRC_IC       4
 
 struct pseries_errorlog *get_pseries_errorlog(struct rtas_error_log *log,
                                               uint16_t section_id);
diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
index f25239b3a06f..4367e7df51a1 100644
--- a/arch/powerpc/kernel/asm-offsets.c
+++ b/arch/powerpc/kernel/asm-offsets.c
@@ -72,205 +72,190 @@
 #include <asm/fixmap.h>
 #endif
 
+#define STACK_PT_REGS_OFFSET(sym, val)  \
+        DEFINE(sym, STACK_FRAME_OVERHEAD + offsetof(struct pt_regs, val))
+
 int main(void)
 {
-        DEFINE(THREAD, offsetof(struct task_struct, thread));
-        DEFINE(MM, offsetof(struct task_struct, mm));
-        DEFINE(MMCONTEXTID, offsetof(struct mm_struct, context.id));
+        OFFSET(THREAD, task_struct, thread);
+        OFFSET(MM, task_struct, mm);
+        OFFSET(MMCONTEXTID, mm_struct, context.id);
 #ifdef CONFIG_PPC64
         DEFINE(SIGSEGV, SIGSEGV);
         DEFINE(NMI_MASK, NMI_MASK);
-        DEFINE(TASKTHREADPPR, offsetof(struct task_struct, thread.ppr));
+        OFFSET(TASKTHREADPPR, task_struct, thread.ppr);
 #else
-        DEFINE(THREAD_INFO, offsetof(struct task_struct, stack));
+        OFFSET(THREAD_INFO, task_struct, stack);
         DEFINE(THREAD_INFO_GAP, _ALIGN_UP(sizeof(struct thread_info), 16));
-        DEFINE(KSP_LIMIT, offsetof(struct thread_struct, ksp_limit));
+        OFFSET(KSP_LIMIT, thread_struct, ksp_limit);
 #endif /* CONFIG_PPC64 */
 
 #ifdef CONFIG_LIVEPATCH
-        DEFINE(TI_livepatch_sp, offsetof(struct thread_info, livepatch_sp));
+        OFFSET(TI_livepatch_sp, thread_info, livepatch_sp);
 #endif
 
-        DEFINE(KSP, offsetof(struct thread_struct, ksp));
-        DEFINE(PT_REGS, offsetof(struct thread_struct, regs));
+        OFFSET(KSP, thread_struct, ksp);
+        OFFSET(PT_REGS, thread_struct, regs);
 #ifdef CONFIG_BOOKE
-        DEFINE(THREAD_NORMSAVES, offsetof(struct thread_struct, normsave[0]));
+        OFFSET(THREAD_NORMSAVES, thread_struct, normsave[0]);
 #endif
-        DEFINE(THREAD_FPEXC_MODE, offsetof(struct thread_struct, fpexc_mode));
-        DEFINE(THREAD_FPSTATE, offsetof(struct thread_struct, fp_state));
-        DEFINE(THREAD_FPSAVEAREA, offsetof(struct thread_struct, fp_save_area));
-        DEFINE(FPSTATE_FPSCR, offsetof(struct thread_fp_state, fpscr));
-        DEFINE(THREAD_LOAD_FP, offsetof(struct thread_struct, load_fp));
+        OFFSET(THREAD_FPEXC_MODE, thread_struct, fpexc_mode);
+        OFFSET(THREAD_FPSTATE, thread_struct, fp_state);
+        OFFSET(THREAD_FPSAVEAREA, thread_struct, fp_save_area);
+        OFFSET(FPSTATE_FPSCR, thread_fp_state, fpscr);
+        OFFSET(THREAD_LOAD_FP, thread_struct, load_fp);
 #ifdef CONFIG_ALTIVEC
-        DEFINE(THREAD_VRSTATE, offsetof(struct thread_struct, vr_state));
-        DEFINE(THREAD_VRSAVEAREA, offsetof(struct thread_struct, vr_save_area));
-        DEFINE(THREAD_VRSAVE, offsetof(struct thread_struct, vrsave));
-        DEFINE(THREAD_USED_VR, offsetof(struct thread_struct, used_vr));
-        DEFINE(VRSTATE_VSCR, offsetof(struct thread_vr_state, vscr));
-        DEFINE(THREAD_LOAD_VEC, offsetof(struct thread_struct, load_vec));
+        OFFSET(THREAD_VRSTATE, thread_struct, vr_state);
+        OFFSET(THREAD_VRSAVEAREA, thread_struct, vr_save_area);
+        OFFSET(THREAD_VRSAVE, thread_struct, vrsave);
+        OFFSET(THREAD_USED_VR, thread_struct, used_vr);
+        OFFSET(VRSTATE_VSCR, thread_vr_state, vscr);
+        OFFSET(THREAD_LOAD_VEC, thread_struct, load_vec);
 #endif /* CONFIG_ALTIVEC */
 #ifdef CONFIG_VSX
-        DEFINE(THREAD_USED_VSR, offsetof(struct thread_struct, used_vsr));
+        OFFSET(THREAD_USED_VSR, thread_struct, used_vsr);
 #endif /* CONFIG_VSX */
 #ifdef CONFIG_PPC64
-        DEFINE(KSP_VSID, offsetof(struct thread_struct, ksp_vsid));
+        OFFSET(KSP_VSID, thread_struct, ksp_vsid);
 #else /* CONFIG_PPC64 */
-        DEFINE(PGDIR, offsetof(struct thread_struct, pgdir));
+        OFFSET(PGDIR, thread_struct, pgdir);
 #ifdef CONFIG_SPE
-        DEFINE(THREAD_EVR0, offsetof(struct thread_struct, evr[0]));
-        DEFINE(THREAD_ACC, offsetof(struct thread_struct, acc));
-        DEFINE(THREAD_SPEFSCR, offsetof(struct thread_struct, spefscr));
-        DEFINE(THREAD_USED_SPE, offsetof(struct thread_struct, used_spe));
+        OFFSET(THREAD_EVR0, thread_struct, evr[0]);
+        OFFSET(THREAD_ACC, thread_struct, acc);
+        OFFSET(THREAD_SPEFSCR, thread_struct, spefscr);
+        OFFSET(THREAD_USED_SPE, thread_struct, used_spe);
 #endif /* CONFIG_SPE */
 #endif /* CONFIG_PPC64 */
 #if defined(CONFIG_4xx) || defined(CONFIG_BOOKE)
-        DEFINE(THREAD_DBCR0, offsetof(struct thread_struct, debug.dbcr0));
+        OFFSET(THREAD_DBCR0, thread_struct, debug.dbcr0);
 #endif
 #ifdef CONFIG_KVM_BOOK3S_32_HANDLER
-        DEFINE(THREAD_KVM_SVCPU, offsetof(struct thread_struct, kvm_shadow_vcpu));
+        OFFSET(THREAD_KVM_SVCPU, thread_struct, kvm_shadow_vcpu);
 #endif
 #if defined(CONFIG_KVM) && defined(CONFIG_BOOKE)
-        DEFINE(THREAD_KVM_VCPU, offsetof(struct thread_struct, kvm_vcpu));
+        OFFSET(THREAD_KVM_VCPU, thread_struct, kvm_vcpu);
 #endif
 
 #ifdef CONFIG_PPC_TRANSACTIONAL_MEM
-        DEFINE(PACATMSCRATCH, offsetof(struct paca_struct, tm_scratch));
-        DEFINE(THREAD_TM_TFHAR, offsetof(struct thread_struct, tm_tfhar));
-        DEFINE(THREAD_TM_TEXASR, offsetof(struct thread_struct, tm_texasr));
-        DEFINE(THREAD_TM_TFIAR, offsetof(struct thread_struct, tm_tfiar));
-        DEFINE(THREAD_TM_TAR, offsetof(struct thread_struct, tm_tar));
-        DEFINE(THREAD_TM_PPR, offsetof(struct thread_struct, tm_ppr));
-        DEFINE(THREAD_TM_DSCR, offsetof(struct thread_struct, tm_dscr));
-        DEFINE(PT_CKPT_REGS, offsetof(struct thread_struct, ckpt_regs));
-        DEFINE(THREAD_CKVRSTATE, offsetof(struct thread_struct,
-                                                 ckvr_state));
-        DEFINE(THREAD_CKVRSAVE, offsetof(struct thread_struct,
-                                            ckvrsave));
-        DEFINE(THREAD_CKFPSTATE, offsetof(struct thread_struct,
-                                                 ckfp_state));
+        OFFSET(PACATMSCRATCH, paca_struct, tm_scratch);
+        OFFSET(THREAD_TM_TFHAR, thread_struct, tm_tfhar);
+        OFFSET(THREAD_TM_TEXASR, thread_struct, tm_texasr);
+        OFFSET(THREAD_TM_TFIAR, thread_struct, tm_tfiar);
+        OFFSET(THREAD_TM_TAR, thread_struct, tm_tar);
+        OFFSET(THREAD_TM_PPR, thread_struct, tm_ppr);
+        OFFSET(THREAD_TM_DSCR, thread_struct, tm_dscr);
+        OFFSET(PT_CKPT_REGS, thread_struct, ckpt_regs);
+        OFFSET(THREAD_CKVRSTATE, thread_struct, ckvr_state);
+        OFFSET(THREAD_CKVRSAVE, thread_struct, ckvrsave);
+        OFFSET(THREAD_CKFPSTATE, thread_struct, ckfp_state);
         /* Local pt_regs on stack for Transactional Memory funcs. */
         DEFINE(TM_FRAME_SIZE, STACK_FRAME_OVERHEAD +
                sizeof(struct pt_regs) + 16);
 #endif /* CONFIG_PPC_TRANSACTIONAL_MEM */
 
-        DEFINE(TI_FLAGS, offsetof(struct thread_info, flags));
-        DEFINE(TI_LOCAL_FLAGS, offsetof(struct thread_info, local_flags));
-        DEFINE(TI_PREEMPT, offsetof(struct thread_info, preempt_count));
-        DEFINE(TI_TASK, offsetof(struct thread_info, task));
-        DEFINE(TI_CPU, offsetof(struct thread_info, cpu));
+        OFFSET(TI_FLAGS, thread_info, flags);
+        OFFSET(TI_LOCAL_FLAGS, thread_info, local_flags);
+        OFFSET(TI_PREEMPT, thread_info, preempt_count);
+        OFFSET(TI_TASK, thread_info, task);
+        OFFSET(TI_CPU, thread_info, cpu);
 
 #ifdef CONFIG_PPC64
-        DEFINE(DCACHEL1BLOCKSIZE, offsetof(struct ppc64_caches, l1d.block_size));
-        DEFINE(DCACHEL1LOGBLOCKSIZE, offsetof(struct ppc64_caches, l1d.log_block_size));
-        DEFINE(DCACHEL1BLOCKSPERPAGE, offsetof(struct ppc64_caches, l1d.blocks_per_page));
-        DEFINE(ICACHEL1BLOCKSIZE, offsetof(struct ppc64_caches, l1i.block_size));
-        DEFINE(ICACHEL1LOGBLOCKSIZE, offsetof(struct ppc64_caches, l1i.log_block_size));
-        DEFINE(ICACHEL1BLOCKSPERPAGE, offsetof(struct ppc64_caches, l1i.blocks_per_page));
+        OFFSET(DCACHEL1BLOCKSIZE, ppc64_caches, l1d.block_size);
+        OFFSET(DCACHEL1LOGBLOCKSIZE, ppc64_caches, l1d.log_block_size);
+        OFFSET(DCACHEL1BLOCKSPERPAGE, ppc64_caches, l1d.blocks_per_page);
+        OFFSET(ICACHEL1BLOCKSIZE, ppc64_caches, l1i.block_size);
+        OFFSET(ICACHEL1LOGBLOCKSIZE, ppc64_caches, l1i.log_block_size);
+        OFFSET(ICACHEL1BLOCKSPERPAGE, ppc64_caches, l1i.blocks_per_page);
         /* paca */
         DEFINE(PACA_SIZE, sizeof(struct paca_struct));
-        DEFINE(PACAPACAINDEX, offsetof(struct paca_struct, paca_index));
-        DEFINE(PACAPROCSTART, offsetof(struct paca_struct, cpu_start));
-        DEFINE(PACAKSAVE, offsetof(struct paca_struct, kstack));
-        DEFINE(PACACURRENT, offsetof(struct paca_struct, __current));
-        DEFINE(PACASAVEDMSR, offsetof(struct paca_struct, saved_msr));
-        DEFINE(PACASTABRR, offsetof(struct paca_struct, stab_rr));
-        DEFINE(PACAR1, offsetof(struct paca_struct, saved_r1));
-        DEFINE(PACATOC, offsetof(struct paca_struct, kernel_toc));
-        DEFINE(PACAKBASE, offsetof(struct paca_struct, kernelbase));
-        DEFINE(PACAKMSR, offsetof(struct paca_struct, kernel_msr));
-        DEFINE(PACASOFTIRQEN, offsetof(struct paca_struct, soft_enabled));
-        DEFINE(PACAIRQHAPPENED, offsetof(struct paca_struct, irq_happened));
+        OFFSET(PACAPACAINDEX, paca_struct, paca_index);
+        OFFSET(PACAPROCSTART, paca_struct, cpu_start);
+        OFFSET(PACAKSAVE, paca_struct, kstack);
+        OFFSET(PACACURRENT, paca_struct, __current);
+        OFFSET(PACASAVEDMSR, paca_struct, saved_msr);
+        OFFSET(PACASTABRR, paca_struct, stab_rr);
+        OFFSET(PACAR1, paca_struct, saved_r1);
+        OFFSET(PACATOC, paca_struct, kernel_toc);
+        OFFSET(PACAKBASE, paca_struct, kernelbase);
+        OFFSET(PACAKMSR, paca_struct, kernel_msr);
+        OFFSET(PACASOFTIRQEN, paca_struct, soft_enabled);
+        OFFSET(PACAIRQHAPPENED, paca_struct, irq_happened);
 #ifdef CONFIG_PPC_BOOK3S
-        DEFINE(PACACONTEXTID, offsetof(struct paca_struct, mm_ctx_id));
+        OFFSET(PACACONTEXTID, paca_struct, mm_ctx_id);
 #ifdef CONFIG_PPC_MM_SLICES
-        DEFINE(PACALOWSLICESPSIZE, offsetof(struct paca_struct,
-                                            mm_ctx_low_slices_psize));
-        DEFINE(PACAHIGHSLICEPSIZE, offsetof(struct paca_struct,
-                                            mm_ctx_high_slices_psize));
+        OFFSET(PACALOWSLICESPSIZE, paca_struct, mm_ctx_low_slices_psize);
+        OFFSET(PACAHIGHSLICEPSIZE, paca_struct, mm_ctx_high_slices_psize);
         DEFINE(MMUPSIZEDEFSIZE, sizeof(struct mmu_psize_def));
 #endif /* CONFIG_PPC_MM_SLICES */
 #endif
 
 #ifdef CONFIG_PPC_BOOK3E
-        DEFINE(PACAPGD, offsetof(struct paca_struct, pgd));
-        DEFINE(PACA_KERNELPGD, offsetof(struct paca_struct, kernel_pgd));
-        DEFINE(PACA_EXGEN, offsetof(struct paca_struct, exgen));
-        DEFINE(PACA_EXTLB, offsetof(struct paca_struct, extlb));
-        DEFINE(PACA_EXMC, offsetof(struct paca_struct, exmc));
-        DEFINE(PACA_EXCRIT, offsetof(struct paca_struct, excrit));
-        DEFINE(PACA_EXDBG, offsetof(struct paca_struct, exdbg));
-        DEFINE(PACA_MC_STACK, offsetof(struct paca_struct, mc_kstack));
-        DEFINE(PACA_CRIT_STACK, offsetof(struct paca_struct, crit_kstack));
-        DEFINE(PACA_DBG_STACK, offsetof(struct paca_struct, dbg_kstack));
-        DEFINE(PACA_TCD_PTR, offsetof(struct paca_struct, tcd_ptr));
-
-        DEFINE(TCD_ESEL_NEXT,
-                offsetof(struct tlb_core_data, esel_next));
-        DEFINE(TCD_ESEL_MAX,
-                offsetof(struct tlb_core_data, esel_max));
-        DEFINE(TCD_ESEL_FIRST,
-                offsetof(struct tlb_core_data, esel_first));
+        OFFSET(PACAPGD, paca_struct, pgd);
+        OFFSET(PACA_KERNELPGD, paca_struct, kernel_pgd);
+        OFFSET(PACA_EXGEN, paca_struct, exgen);
+        OFFSET(PACA_EXTLB, paca_struct, extlb);
+        OFFSET(PACA_EXMC, paca_struct, exmc);
+        OFFSET(PACA_EXCRIT, paca_struct, excrit);
+        OFFSET(PACA_EXDBG, paca_struct, exdbg);
+        OFFSET(PACA_MC_STACK, paca_struct, mc_kstack);
+        OFFSET(PACA_CRIT_STACK, paca_struct, crit_kstack);
+        OFFSET(PACA_DBG_STACK, paca_struct, dbg_kstack);
+        OFFSET(PACA_TCD_PTR, paca_struct, tcd_ptr);
+
+        OFFSET(TCD_ESEL_NEXT, tlb_core_data, esel_next);
+        OFFSET(TCD_ESEL_MAX, tlb_core_data, esel_max);
+        OFFSET(TCD_ESEL_FIRST, tlb_core_data, esel_first);
 #endif /* CONFIG_PPC_BOOK3E */
 
 #ifdef CONFIG_PPC_STD_MMU_64
-        DEFINE(PACASLBCACHE, offsetof(struct paca_struct, slb_cache));
-        DEFINE(PACASLBCACHEPTR, offsetof(struct paca_struct, slb_cache_ptr));
-        DEFINE(PACAVMALLOCSLLP, offsetof(struct paca_struct, vmalloc_sllp));
+        OFFSET(PACASLBCACHE, paca_struct, slb_cache);
+        OFFSET(PACASLBCACHEPTR, paca_struct, slb_cache_ptr);
+        OFFSET(PACAVMALLOCSLLP, paca_struct, vmalloc_sllp);
 #ifdef CONFIG_PPC_MM_SLICES
-        DEFINE(MMUPSIZESLLP, offsetof(struct mmu_psize_def, sllp));
+        OFFSET(MMUPSIZESLLP, mmu_psize_def, sllp);
 #else
-        DEFINE(PACACONTEXTSLLP, offsetof(struct paca_struct, mm_ctx_sllp));
+        OFFSET(PACACONTEXTSLLP, paca_struct, mm_ctx_sllp);
 #endif /* CONFIG_PPC_MM_SLICES */
-        DEFINE(PACA_EXGEN, offsetof(struct paca_struct, exgen));
-        DEFINE(PACA_EXMC, offsetof(struct paca_struct, exmc));
-        DEFINE(PACA_EXSLB, offsetof(struct paca_struct, exslb));
-        DEFINE(PACALPPACAPTR, offsetof(struct paca_struct, lppaca_ptr));
-        DEFINE(PACA_SLBSHADOWPTR, offsetof(struct paca_struct, slb_shadow_ptr));
-        DEFINE(SLBSHADOW_STACKVSID,
-               offsetof(struct slb_shadow, save_area[SLB_NUM_BOLTED - 1].vsid));
-        DEFINE(SLBSHADOW_STACKESID,
-               offsetof(struct slb_shadow, save_area[SLB_NUM_BOLTED - 1].esid));
-        DEFINE(SLBSHADOW_SAVEAREA, offsetof(struct slb_shadow, save_area));
-        DEFINE(LPPACA_PMCINUSE, offsetof(struct lppaca, pmcregs_in_use));
-        DEFINE(LPPACA_DTLIDX, offsetof(struct lppaca, dtl_idx));
-        DEFINE(LPPACA_YIELDCOUNT, offsetof(struct lppaca, yield_count));
-        DEFINE(PACA_DTL_RIDX, offsetof(struct paca_struct, dtl_ridx));
+        OFFSET(PACA_EXGEN, paca_struct, exgen);
+        OFFSET(PACA_EXMC, paca_struct, exmc);
+        OFFSET(PACA_EXSLB, paca_struct, exslb);
+        OFFSET(PACALPPACAPTR, paca_struct, lppaca_ptr);
+        OFFSET(PACA_SLBSHADOWPTR, paca_struct, slb_shadow_ptr);
+        OFFSET(SLBSHADOW_STACKVSID, slb_shadow, save_area[SLB_NUM_BOLTED - 1].vsid);
+        OFFSET(SLBSHADOW_STACKESID, slb_shadow, save_area[SLB_NUM_BOLTED - 1].esid);
+        OFFSET(SLBSHADOW_SAVEAREA, slb_shadow, save_area);
+        OFFSET(LPPACA_PMCINUSE, lppaca, pmcregs_in_use);
+        OFFSET(LPPACA_DTLIDX, lppaca, dtl_idx);
+        OFFSET(LPPACA_YIELDCOUNT, lppaca, yield_count);
+        OFFSET(PACA_DTL_RIDX, paca_struct, dtl_ridx);
 #endif /* CONFIG_PPC_STD_MMU_64 */
-        DEFINE(PACAEMERGSP, offsetof(struct paca_struct, emergency_sp));
+        OFFSET(PACAEMERGSP, paca_struct, emergency_sp);
 #ifdef CONFIG_PPC_BOOK3S_64
-        DEFINE(PACAMCEMERGSP, offsetof(struct paca_struct, mc_emergency_sp));
-        DEFINE(PACA_IN_MCE, offsetof(struct paca_struct, in_mce));
-#endif
-        DEFINE(PACAHWCPUID, offsetof(struct paca_struct, hw_cpu_id));
-        DEFINE(PACAKEXECSTATE, offsetof(struct paca_struct, kexec_state));
-        DEFINE(PACA_DSCR_DEFAULT, offsetof(struct paca_struct, dscr_default));
-        DEFINE(ACCOUNT_STARTTIME,
-               offsetof(struct paca_struct, accounting.starttime));
-        DEFINE(ACCOUNT_STARTTIME_USER,
-               offsetof(struct paca_struct, accounting.starttime_user));
-        DEFINE(ACCOUNT_USER_TIME,
-               offsetof(struct paca_struct, accounting.utime));
-        DEFINE(ACCOUNT_SYSTEM_TIME,
-               offsetof(struct paca_struct, accounting.stime));
-        DEFINE(PACA_TRAP_SAVE, offsetof(struct paca_struct, trap_save));
-        DEFINE(PACA_NAPSTATELOST, offsetof(struct paca_struct, nap_state_lost));
-        DEFINE(PACA_SPRG_VDSO, offsetof(struct paca_struct, sprg_vdso));
+        OFFSET(PACAMCEMERGSP, paca_struct, mc_emergency_sp);
+        OFFSET(PACA_IN_MCE, paca_struct, in_mce);
+#endif
+        OFFSET(PACAHWCPUID, paca_struct, hw_cpu_id);
+        OFFSET(PACAKEXECSTATE, paca_struct, kexec_state);
+        OFFSET(PACA_DSCR_DEFAULT, paca_struct, dscr_default);
+        OFFSET(ACCOUNT_STARTTIME, paca_struct, accounting.starttime);
+        OFFSET(ACCOUNT_STARTTIME_USER, paca_struct, accounting.starttime_user);
+        OFFSET(ACCOUNT_USER_TIME, paca_struct, accounting.utime);
+        OFFSET(ACCOUNT_SYSTEM_TIME, paca_struct, accounting.stime);
+        OFFSET(PACA_TRAP_SAVE, paca_struct, trap_save);
+        OFFSET(PACA_NAPSTATELOST, paca_struct, nap_state_lost);
+        OFFSET(PACA_SPRG_VDSO, paca_struct, sprg_vdso);
 #else /* CONFIG_PPC64 */
 #ifdef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE
-        DEFINE(ACCOUNT_STARTTIME,
-               offsetof(struct thread_info, accounting.starttime));
-        DEFINE(ACCOUNT_STARTTIME_USER,
-               offsetof(struct thread_info, accounting.starttime_user));
-        DEFINE(ACCOUNT_USER_TIME,
-               offsetof(struct thread_info, accounting.utime));
-        DEFINE(ACCOUNT_SYSTEM_TIME,
-               offsetof(struct thread_info, accounting.stime));
+        OFFSET(ACCOUNT_STARTTIME, thread_info, accounting.starttime);
+        OFFSET(ACCOUNT_STARTTIME_USER, thread_info, accounting.starttime_user);
+        OFFSET(ACCOUNT_USER_TIME, thread_info, accounting.utime);
+        OFFSET(ACCOUNT_SYSTEM_TIME, thread_info, accounting.stime);
 #endif
 #endif /* CONFIG_PPC64 */
 
         /* RTAS */
-        DEFINE(RTASBASE, offsetof(struct rtas_t, base));
-        DEFINE(RTASENTRY, offsetof(struct rtas_t, entry));
+        OFFSET(RTASBASE, rtas_t, base);
+        OFFSET(RTASENTRY, rtas_t, entry);
 
         /* Interrupt register frame */
         DEFINE(INT_FRAME_SIZE, STACK_INT_FRAME_SIZE);
@@ -280,38 +265,38 @@ int main(void)
         DEFINE(PROM_FRAME_SIZE, STACK_FRAME_OVERHEAD + sizeof(struct pt_regs) + 16);
         DEFINE(RTAS_FRAME_SIZE, STACK_FRAME_OVERHEAD + sizeof(struct pt_regs) + 16);
 #endif /* CONFIG_PPC64 */
-        DEFINE(GPR0, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[0]));
-        DEFINE(GPR1, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[1]));
-        DEFINE(GPR2, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[2]));
-        DEFINE(GPR3, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[3]));
-        DEFINE(GPR4, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[4]));
-        DEFINE(GPR5, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[5]));
-        DEFINE(GPR6, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[6]));
-        DEFINE(GPR7, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[7]));
-        DEFINE(GPR8, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[8]));
-        DEFINE(GPR9, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[9]));
-        DEFINE(GPR10, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[10]));
-        DEFINE(GPR11, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[11]));
-        DEFINE(GPR12, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[12]));
-        DEFINE(GPR13, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[13]));
+        STACK_PT_REGS_OFFSET(GPR0, gpr[0]);
+        STACK_PT_REGS_OFFSET(GPR1, gpr[1]);
+        STACK_PT_REGS_OFFSET(GPR2, gpr[2]);
+        STACK_PT_REGS_OFFSET(GPR3, gpr[3]);
+        STACK_PT_REGS_OFFSET(GPR4, gpr[4]);
+        STACK_PT_REGS_OFFSET(GPR5, gpr[5]);
+        STACK_PT_REGS_OFFSET(GPR6, gpr[6]);
+        STACK_PT_REGS_OFFSET(GPR7, gpr[7]);
+        STACK_PT_REGS_OFFSET(GPR8, gpr[8]);
+        STACK_PT_REGS_OFFSET(GPR9, gpr[9]);
+        STACK_PT_REGS_OFFSET(GPR10, gpr[10]);
+        STACK_PT_REGS_OFFSET(GPR11, gpr[11]);
+        STACK_PT_REGS_OFFSET(GPR12, gpr[12]);
+        STACK_PT_REGS_OFFSET(GPR13, gpr[13]);
 #ifndef CONFIG_PPC64
-        DEFINE(GPR14, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, gpr[14]));
+        STACK_PT_REGS_OFFSET(GPR14, gpr[14]);
 #endif /* CONFIG_PPC64 */
         /*
          * Note: these symbols include _ because they overlap with special
          * register names
          */
-        DEFINE(_NIP, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, nip));
-        DEFINE(_MSR, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, msr));
-        DEFINE(_CTR, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, ctr));
-        DEFINE(_LINK, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, link));
-        DEFINE(_CCR, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, ccr));
-        DEFINE(_XER, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, xer));
-        DEFINE(_DAR, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, dar));
-        DEFINE(_DSISR, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, dsisr));
-        DEFINE(ORIG_GPR3, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, orig_gpr3));
-        DEFINE(RESULT, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, result));
-        DEFINE(_TRAP, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, trap));
+        STACK_PT_REGS_OFFSET(_NIP, nip);
+        STACK_PT_REGS_OFFSET(_MSR, msr);
+        STACK_PT_REGS_OFFSET(_CTR, ctr);
+        STACK_PT_REGS_OFFSET(_LINK, link);
+        STACK_PT_REGS_OFFSET(_CCR, ccr);
+        STACK_PT_REGS_OFFSET(_XER, xer);
+        STACK_PT_REGS_OFFSET(_DAR, dar);
+        STACK_PT_REGS_OFFSET(_DSISR, dsisr);
+        STACK_PT_REGS_OFFSET(ORIG_GPR3, orig_gpr3);
+        STACK_PT_REGS_OFFSET(RESULT, result);
+        STACK_PT_REGS_OFFSET(_TRAP, trap);
 #ifndef CONFIG_PPC64
         /*
          * The PowerPC 400-class & Book-E processors have neither the DAR
@@ -319,10 +304,10 @@ int main(void)
          * DEAR and ESR SPRs for such processors.  For critical interrupts
          * we use them to hold SRR0 and SRR1.
          */
-        DEFINE(_DEAR, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, dar));
-        DEFINE(_ESR, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, dsisr));
+        STACK_PT_REGS_OFFSET(_DEAR, dar);
+        STACK_PT_REGS_OFFSET(_ESR, dsisr);
 #else /* CONFIG_PPC64 */
-        DEFINE(SOFTE, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, softe));
+        STACK_PT_REGS_OFFSET(SOFTE, softe);
 
         /* These _only_ to be used with {PROM,RTAS}_FRAME_SIZE!!! */
         DEFINE(_SRR0, STACK_FRAME_OVERHEAD+sizeof(struct pt_regs));
@@ -351,17 +336,17 @@ int main(void)
 #endif
 
 #ifndef CONFIG_PPC64
-        DEFINE(MM_PGD, offsetof(struct mm_struct, pgd));
+        OFFSET(MM_PGD, mm_struct, pgd);
 #endif /* ! CONFIG_PPC64 */
 
         /* About the CPU features table */
-        DEFINE(CPU_SPEC_FEATURES, offsetof(struct cpu_spec, cpu_features));
-        DEFINE(CPU_SPEC_SETUP, offsetof(struct cpu_spec, cpu_setup));
-        DEFINE(CPU_SPEC_RESTORE, offsetof(struct cpu_spec, cpu_restore));
+        OFFSET(CPU_SPEC_FEATURES, cpu_spec, cpu_features);
+        OFFSET(CPU_SPEC_SETUP, cpu_spec, cpu_setup);
+        OFFSET(CPU_SPEC_RESTORE, cpu_spec, cpu_restore);
 
-        DEFINE(pbe_address, offsetof(struct pbe, address));
-        DEFINE(pbe_orig_address, offsetof(struct pbe, orig_address));
-        DEFINE(pbe_next, offsetof(struct pbe, next));
+        OFFSET(pbe_address, pbe, address);
+        OFFSET(pbe_orig_address, pbe, orig_address);
+        OFFSET(pbe_next, pbe, next);
 
 #ifndef CONFIG_PPC64
         DEFINE(TASK_SIZE, TASK_SIZE);
@@ -369,40 +354,40 @@ int main(void)
 #endif /* ! CONFIG_PPC64 */
 
         /* datapage offsets for use by vdso */
-        DEFINE(CFG_TB_ORIG_STAMP, offsetof(struct vdso_data, tb_orig_stamp));
-        DEFINE(CFG_TB_TICKS_PER_SEC, offsetof(struct vdso_data, tb_ticks_per_sec));
-        DEFINE(CFG_TB_TO_XS, offsetof(struct vdso_data, tb_to_xs));
-        DEFINE(CFG_TB_UPDATE_COUNT, offsetof(struct vdso_data, tb_update_count));
-        DEFINE(CFG_TZ_MINUTEWEST, offsetof(struct vdso_data, tz_minuteswest));
-        DEFINE(CFG_TZ_DSTTIME, offsetof(struct vdso_data, tz_dsttime));
-        DEFINE(CFG_SYSCALL_MAP32, offsetof(struct vdso_data, syscall_map_32));
-        DEFINE(WTOM_CLOCK_SEC, offsetof(struct vdso_data, wtom_clock_sec));
-        DEFINE(WTOM_CLOCK_NSEC, offsetof(struct vdso_data, wtom_clock_nsec));
-        DEFINE(STAMP_XTIME, offsetof(struct vdso_data, stamp_xtime));
-        DEFINE(STAMP_SEC_FRAC, offsetof(struct vdso_data, stamp_sec_fraction));
-        DEFINE(CFG_ICACHE_BLOCKSZ, offsetof(struct vdso_data, icache_block_size));
-        DEFINE(CFG_DCACHE_BLOCKSZ, offsetof(struct vdso_data, dcache_block_size));
-        DEFINE(CFG_ICACHE_LOGBLOCKSZ, offsetof(struct vdso_data, icache_log_block_size));
-        DEFINE(CFG_DCACHE_LOGBLOCKSZ, offsetof(struct vdso_data, dcache_log_block_size));
+        OFFSET(CFG_TB_ORIG_STAMP, vdso_data, tb_orig_stamp);
+        OFFSET(CFG_TB_TICKS_PER_SEC, vdso_data, tb_ticks_per_sec);
+        OFFSET(CFG_TB_TO_XS, vdso_data, tb_to_xs);
+        OFFSET(CFG_TB_UPDATE_COUNT, vdso_data, tb_update_count);
+        OFFSET(CFG_TZ_MINUTEWEST, vdso_data, tz_minuteswest);
+        OFFSET(CFG_TZ_DSTTIME, vdso_data, tz_dsttime);
+        OFFSET(CFG_SYSCALL_MAP32, vdso_data, syscall_map_32);
+        OFFSET(WTOM_CLOCK_SEC, vdso_data, wtom_clock_sec);
+        OFFSET(WTOM_CLOCK_NSEC, vdso_data, wtom_clock_nsec);
+        OFFSET(STAMP_XTIME, vdso_data, stamp_xtime);
+        OFFSET(STAMP_SEC_FRAC, vdso_data, stamp_sec_fraction);
+        OFFSET(CFG_ICACHE_BLOCKSZ, vdso_data, icache_block_size);
+        OFFSET(CFG_DCACHE_BLOCKSZ, vdso_data, dcache_block_size);
+        OFFSET(CFG_ICACHE_LOGBLOCKSZ, vdso_data, icache_log_block_size);
+        OFFSET(CFG_DCACHE_LOGBLOCKSZ, vdso_data, dcache_log_block_size);
 #ifdef CONFIG_PPC64
-        DEFINE(CFG_SYSCALL_MAP64, offsetof(struct vdso_data, syscall_map_64));
-        DEFINE(TVAL64_TV_SEC, offsetof(struct timeval, tv_sec));
-        DEFINE(TVAL64_TV_USEC, offsetof(struct timeval, tv_usec));
-        DEFINE(TVAL32_TV_SEC, offsetof(struct compat_timeval, tv_sec));
-        DEFINE(TVAL32_TV_USEC, offsetof(struct compat_timeval, tv_usec));
-        DEFINE(TSPC64_TV_SEC, offsetof(struct timespec, tv_sec));
-        DEFINE(TSPC64_TV_NSEC, offsetof(struct timespec, tv_nsec));
-        DEFINE(TSPC32_TV_SEC, offsetof(struct compat_timespec, tv_sec));
-        DEFINE(TSPC32_TV_NSEC, offsetof(struct compat_timespec, tv_nsec));
+        OFFSET(CFG_SYSCALL_MAP64, vdso_data, syscall_map_64);
+        OFFSET(TVAL64_TV_SEC, timeval, tv_sec);
+        OFFSET(TVAL64_TV_USEC, timeval, tv_usec);
+        OFFSET(TVAL32_TV_SEC, compat_timeval, tv_sec);
+        OFFSET(TVAL32_TV_USEC, compat_timeval, tv_usec);
+        OFFSET(TSPC64_TV_SEC, timespec, tv_sec);
+        OFFSET(TSPC64_TV_NSEC, timespec, tv_nsec);
+        OFFSET(TSPC32_TV_SEC, compat_timespec, tv_sec);
+        OFFSET(TSPC32_TV_NSEC, compat_timespec, tv_nsec);
 #else
-        DEFINE(TVAL32_TV_SEC, offsetof(struct timeval, tv_sec));
-        DEFINE(TVAL32_TV_USEC, offsetof(struct timeval, tv_usec));
-        DEFINE(TSPC32_TV_SEC, offsetof(struct timespec, tv_sec));
-        DEFINE(TSPC32_TV_NSEC, offsetof(struct timespec, tv_nsec));
+        OFFSET(TVAL32_TV_SEC, timeval, tv_sec);
+        OFFSET(TVAL32_TV_USEC, timeval, tv_usec);
+        OFFSET(TSPC32_TV_SEC, timespec, tv_sec);
+        OFFSET(TSPC32_TV_NSEC, timespec, tv_nsec);
 #endif
         /* timeval/timezone offsets for use by vdso */
-        DEFINE(TZONE_TZ_MINWEST, offsetof(struct timezone, tz_minuteswest));
-        DEFINE(TZONE_TZ_DSTTIME, offsetof(struct timezone, tz_dsttime));
+        OFFSET(TZONE_TZ_MINWEST, timezone, tz_minuteswest);
+        OFFSET(TZONE_TZ_DSTTIME, timezone, tz_dsttime);
 
         /* Other bits used by the vdso */
         DEFINE(CLOCK_REALTIME, CLOCK_REALTIME);
@@ -422,170 +407,170 @@ int main(void)
         DEFINE(PTE_SIZE, sizeof(pte_t));
 
 #ifdef CONFIG_KVM
-        DEFINE(VCPU_HOST_STACK, offsetof(struct kvm_vcpu, arch.host_stack));
-        DEFINE(VCPU_HOST_PID, offsetof(struct kvm_vcpu, arch.host_pid));
-        DEFINE(VCPU_GUEST_PID, offsetof(struct kvm_vcpu, arch.pid));
-        DEFINE(VCPU_GPRS, offsetof(struct kvm_vcpu, arch.gpr));
-        DEFINE(VCPU_VRSAVE, offsetof(struct kvm_vcpu, arch.vrsave));
-        DEFINE(VCPU_FPRS, offsetof(struct kvm_vcpu, arch.fp.fpr));
+        OFFSET(VCPU_HOST_STACK, kvm_vcpu, arch.host_stack);
+        OFFSET(VCPU_HOST_PID, kvm_vcpu, arch.host_pid);
+        OFFSET(VCPU_GUEST_PID, kvm_vcpu, arch.pid);
+        OFFSET(VCPU_GPRS, kvm_vcpu, arch.gpr);
+        OFFSET(VCPU_VRSAVE, kvm_vcpu, arch.vrsave);
+        OFFSET(VCPU_FPRS, kvm_vcpu, arch.fp.fpr);
 #ifdef CONFIG_ALTIVEC
-        DEFINE(VCPU_VRS, offsetof(struct kvm_vcpu, arch.vr.vr));
+        OFFSET(VCPU_VRS, kvm_vcpu, arch.vr.vr);
 #endif
-        DEFINE(VCPU_XER, offsetof(struct kvm_vcpu, arch.xer));
-        DEFINE(VCPU_CTR, offsetof(struct kvm_vcpu, arch.ctr));
-        DEFINE(VCPU_LR, offsetof(struct kvm_vcpu, arch.lr));
+        OFFSET(VCPU_XER, kvm_vcpu, arch.xer);
+        OFFSET(VCPU_CTR, kvm_vcpu, arch.ctr);
+        OFFSET(VCPU_LR, kvm_vcpu, arch.lr);
 #ifdef CONFIG_PPC_BOOK3S
-        DEFINE(VCPU_TAR, offsetof(struct kvm_vcpu, arch.tar));
+        OFFSET(VCPU_TAR, kvm_vcpu, arch.tar);
 #endif
-        DEFINE(VCPU_CR, offsetof(struct kvm_vcpu, arch.cr));
-        DEFINE(VCPU_PC, offsetof(struct kvm_vcpu, arch.pc));
+        OFFSET(VCPU_CR, kvm_vcpu, arch.cr);
+        OFFSET(VCPU_PC, kvm_vcpu, arch.pc);
 #ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE
-        DEFINE(VCPU_MSR, offsetof(struct kvm_vcpu, arch.shregs.msr));
-        DEFINE(VCPU_SRR0, offsetof(struct kvm_vcpu, arch.shregs.srr0));
-        DEFINE(VCPU_SRR1, offsetof(struct kvm_vcpu, arch.shregs.srr1));
-        DEFINE(VCPU_SPRG0, offsetof(struct kvm_vcpu, arch.shregs.sprg0));
-        DEFINE(VCPU_SPRG1, offsetof(struct kvm_vcpu, arch.shregs.sprg1));
-        DEFINE(VCPU_SPRG2, offsetof(struct kvm_vcpu, arch.shregs.sprg2));
-        DEFINE(VCPU_SPRG3, offsetof(struct kvm_vcpu, arch.shregs.sprg3));
+        OFFSET(VCPU_MSR, kvm_vcpu, arch.shregs.msr);
+        OFFSET(VCPU_SRR0, kvm_vcpu, arch.shregs.srr0);
+        OFFSET(VCPU_SRR1, kvm_vcpu, arch.shregs.srr1);
+        OFFSET(VCPU_SPRG0, kvm_vcpu, arch.shregs.sprg0);
+        OFFSET(VCPU_SPRG1, kvm_vcpu, arch.shregs.sprg1);
+        OFFSET(VCPU_SPRG2, kvm_vcpu, arch.shregs.sprg2);
+        OFFSET(VCPU_SPRG3, kvm_vcpu, arch.shregs.sprg3);
 #endif
 #ifdef CONFIG_KVM_BOOK3S_HV_EXIT_TIMING
-        DEFINE(VCPU_TB_RMENTRY, offsetof(struct kvm_vcpu, arch.rm_entry));
-        DEFINE(VCPU_TB_RMINTR, offsetof(struct kvm_vcpu, arch.rm_intr));
-        DEFINE(VCPU_TB_RMEXIT, offsetof(struct kvm_vcpu, arch.rm_exit));
-        DEFINE(VCPU_TB_GUEST, offsetof(struct kvm_vcpu, arch.guest_time));
-        DEFINE(VCPU_TB_CEDE, offsetof(struct kvm_vcpu, arch.cede_time));
-        DEFINE(VCPU_CUR_ACTIVITY, offsetof(struct kvm_vcpu, arch.cur_activity));
-        DEFINE(VCPU_ACTIVITY_START, offsetof(struct kvm_vcpu, arch.cur_tb_start));
-        DEFINE(TAS_SEQCOUNT, offsetof(struct kvmhv_tb_accumulator, seqcount));
-        DEFINE(TAS_TOTAL, offsetof(struct kvmhv_tb_accumulator, tb_total));
-        DEFINE(TAS_MIN, offsetof(struct kvmhv_tb_accumulator, tb_min));
-        DEFINE(TAS_MAX, offsetof(struct kvmhv_tb_accumulator, tb_max));
-#endif
-        DEFINE(VCPU_SHARED_SPRG3, offsetof(struct kvm_vcpu_arch_shared, sprg3));
-        DEFINE(VCPU_SHARED_SPRG4, offsetof(struct kvm_vcpu_arch_shared, sprg4));
-        DEFINE(VCPU_SHARED_SPRG5, offsetof(struct kvm_vcpu_arch_shared, sprg5));
-        DEFINE(VCPU_SHARED_SPRG6, offsetof(struct kvm_vcpu_arch_shared, sprg6));
-        DEFINE(VCPU_SHARED_SPRG7, offsetof(struct kvm_vcpu_arch_shared, sprg7));
-        DEFINE(VCPU_SHADOW_PID, offsetof(struct kvm_vcpu, arch.shadow_pid));
-        DEFINE(VCPU_SHADOW_PID1, offsetof(struct kvm_vcpu, arch.shadow_pid1));
-        DEFINE(VCPU_SHARED, offsetof(struct kvm_vcpu, arch.shared));
-        DEFINE(VCPU_SHARED_MSR, offsetof(struct kvm_vcpu_arch_shared, msr));
-        DEFINE(VCPU_SHADOW_MSR, offsetof(struct kvm_vcpu, arch.shadow_msr));
+        OFFSET(VCPU_TB_RMENTRY, kvm_vcpu, arch.rm_entry);
+        OFFSET(VCPU_TB_RMINTR, kvm_vcpu, arch.rm_intr);
+        OFFSET(VCPU_TB_RMEXIT, kvm_vcpu, arch.rm_exit);
+        OFFSET(VCPU_TB_GUEST, kvm_vcpu, arch.guest_time);
+        OFFSET(VCPU_TB_CEDE, kvm_vcpu, arch.cede_time);
+        OFFSET(VCPU_CUR_ACTIVITY, kvm_vcpu, arch.cur_activity);
+        OFFSET(VCPU_ACTIVITY_START, kvm_vcpu, arch.cur_tb_start);
+        OFFSET(TAS_SEQCOUNT, kvmhv_tb_accumulator, seqcount);
+        OFFSET(TAS_TOTAL, kvmhv_tb_accumulator, tb_total);
+        OFFSET(TAS_MIN, kvmhv_tb_accumulator, tb_min);
+        OFFSET(TAS_MAX, kvmhv_tb_accumulator, tb_max);
+#endif
+        OFFSET(VCPU_SHARED_SPRG3, kvm_vcpu_arch_shared, sprg3);
+        OFFSET(VCPU_SHARED_SPRG4, kvm_vcpu_arch_shared, sprg4);
+        OFFSET(VCPU_SHARED_SPRG5, kvm_vcpu_arch_shared, sprg5);
+        OFFSET(VCPU_SHARED_SPRG6, kvm_vcpu_arch_shared, sprg6);
+        OFFSET(VCPU_SHARED_SPRG7, kvm_vcpu_arch_shared, sprg7);
+        OFFSET(VCPU_SHADOW_PID, kvm_vcpu, arch.shadow_pid);
+        OFFSET(VCPU_SHADOW_PID1, kvm_vcpu, arch.shadow_pid1);
+        OFFSET(VCPU_SHARED, kvm_vcpu, arch.shared);
+        OFFSET(VCPU_SHARED_MSR, kvm_vcpu_arch_shared, msr);
+        OFFSET(VCPU_SHADOW_MSR, kvm_vcpu, arch.shadow_msr);
 #if defined(CONFIG_PPC_BOOK3S_64) && defined(CONFIG_KVM_BOOK3S_PR_POSSIBLE)
-        DEFINE(VCPU_SHAREDBE, offsetof(struct kvm_vcpu, arch.shared_big_endian));
+        OFFSET(VCPU_SHAREDBE, kvm_vcpu, arch.shared_big_endian);
 #endif
 
-        DEFINE(VCPU_SHARED_MAS0, offsetof(struct kvm_vcpu_arch_shared, mas0));
-        DEFINE(VCPU_SHARED_MAS1, offsetof(struct kvm_vcpu_arch_shared, mas1));
-        DEFINE(VCPU_SHARED_MAS2, offsetof(struct kvm_vcpu_arch_shared, mas2));
-        DEFINE(VCPU_SHARED_MAS7_3, offsetof(struct kvm_vcpu_arch_shared, mas7_3));
-        DEFINE(VCPU_SHARED_MAS4, offsetof(struct kvm_vcpu_arch_shared, mas4));
-        DEFINE(VCPU_SHARED_MAS6, offsetof(struct kvm_vcpu_arch_shared, mas6));
+        OFFSET(VCPU_SHARED_MAS0, kvm_vcpu_arch_shared, mas0);
+        OFFSET(VCPU_SHARED_MAS1, kvm_vcpu_arch_shared, mas1);
+        OFFSET(VCPU_SHARED_MAS2, kvm_vcpu_arch_shared, mas2);
+        OFFSET(VCPU_SHARED_MAS7_3, kvm_vcpu_arch_shared, mas7_3);
+        OFFSET(VCPU_SHARED_MAS4, kvm_vcpu_arch_shared, mas4);
+        OFFSET(VCPU_SHARED_MAS6, kvm_vcpu_arch_shared, mas6);
 
-        DEFINE(VCPU_KVM, offsetof(struct kvm_vcpu, kvm));
-        DEFINE(KVM_LPID, offsetof(struct kvm, arch.lpid));
+        OFFSET(VCPU_KVM, kvm_vcpu, kvm);
+        OFFSET(KVM_LPID, kvm, arch.lpid);
 
         /* book3s */
 #ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE
-        DEFINE(KVM_TLB_SETS, offsetof(struct kvm, arch.tlb_sets));
-        DEFINE(KVM_SDR1, offsetof(struct kvm, arch.sdr1));
-        DEFINE(KVM_HOST_LPID, offsetof(struct kvm, arch.host_lpid));
-        DEFINE(KVM_HOST_LPCR, offsetof(struct kvm, arch.host_lpcr));
-        DEFINE(KVM_HOST_SDR1, offsetof(struct kvm, arch.host_sdr1));
-        DEFINE(KVM_NEED_FLUSH, offsetof(struct kvm, arch.need_tlb_flush.bits));
-        DEFINE(KVM_ENABLED_HCALLS, offsetof(struct kvm, arch.enabled_hcalls));
-        DEFINE(KVM_VRMA_SLB_V, offsetof(struct kvm, arch.vrma_slb_v));
-        DEFINE(KVM_RADIX, offsetof(struct kvm, arch.radix));
-        DEFINE(VCPU_DSISR, offsetof(struct kvm_vcpu, arch.shregs.dsisr));
-        DEFINE(VCPU_DAR, offsetof(struct kvm_vcpu, arch.shregs.dar));
-        DEFINE(VCPU_VPA, offsetof(struct kvm_vcpu, arch.vpa.pinned_addr));
-        DEFINE(VCPU_VPA_DIRTY, offsetof(struct kvm_vcpu, arch.vpa.dirty));
-        DEFINE(VCPU_HEIR, offsetof(struct kvm_vcpu, arch.emul_inst));
-        DEFINE(VCPU_CPU, offsetof(struct kvm_vcpu, cpu));
-        DEFINE(VCPU_THREAD_CPU, offsetof(struct kvm_vcpu, arch.thread_cpu));
+        OFFSET(KVM_TLB_SETS, kvm, arch.tlb_sets);
+        OFFSET(KVM_SDR1, kvm, arch.sdr1);
+        OFFSET(KVM_HOST_LPID, kvm, arch.host_lpid);
+        OFFSET(KVM_HOST_LPCR, kvm, arch.host_lpcr);
+        OFFSET(KVM_HOST_SDR1, kvm, arch.host_sdr1);
+        OFFSET(KVM_NEED_FLUSH, kvm, arch.need_tlb_flush.bits);
+        OFFSET(KVM_ENABLED_HCALLS, kvm, arch.enabled_hcalls);
+        OFFSET(KVM_VRMA_SLB_V, kvm, arch.vrma_slb_v);
+        OFFSET(KVM_RADIX, kvm, arch.radix);
+        OFFSET(VCPU_DSISR, kvm_vcpu, arch.shregs.dsisr);
+        OFFSET(VCPU_DAR, kvm_vcpu, arch.shregs.dar);
+        OFFSET(VCPU_VPA, kvm_vcpu, arch.vpa.pinned_addr);
+        OFFSET(VCPU_VPA_DIRTY, kvm_vcpu, arch.vpa.dirty);
+        OFFSET(VCPU_HEIR, kvm_vcpu, arch.emul_inst);
+        OFFSET(VCPU_CPU, kvm_vcpu, cpu);
+        OFFSET(VCPU_THREAD_CPU, kvm_vcpu, arch.thread_cpu);
 #endif
 #ifdef CONFIG_PPC_BOOK3S
-        DEFINE(VCPU_PURR, offsetof(struct kvm_vcpu, arch.purr));
-        DEFINE(VCPU_SPURR, offsetof(struct kvm_vcpu, arch.spurr));
-        DEFINE(VCPU_IC, offsetof(struct kvm_vcpu, arch.ic));
-        DEFINE(VCPU_DSCR, offsetof(struct kvm_vcpu, arch.dscr));
-        DEFINE(VCPU_AMR, offsetof(struct kvm_vcpu, arch.amr));
-        DEFINE(VCPU_UAMOR, offsetof(struct kvm_vcpu, arch.uamor));
-        DEFINE(VCPU_IAMR, offsetof(struct kvm_vcpu, arch.iamr));
-        DEFINE(VCPU_CTRL, offsetof(struct kvm_vcpu, arch.ctrl));
-        DEFINE(VCPU_DABR, offsetof(struct kvm_vcpu, arch.dabr));
-        DEFINE(VCPU_DABRX, offsetof(struct kvm_vcpu, arch.dabrx));
-        DEFINE(VCPU_DAWR, offsetof(struct kvm_vcpu, arch.dawr));
-        DEFINE(VCPU_DAWRX, offsetof(struct kvm_vcpu, arch.dawrx));
-        DEFINE(VCPU_CIABR, offsetof(struct kvm_vcpu, arch.ciabr));
-        DEFINE(VCPU_HFLAGS, offsetof(struct kvm_vcpu, arch.hflags));
-        DEFINE(VCPU_DEC, offsetof(struct kvm_vcpu, arch.dec));
-        DEFINE(VCPU_DEC_EXPIRES, offsetof(struct kvm_vcpu, arch.dec_expires));
-        DEFINE(VCPU_PENDING_EXC, offsetof(struct kvm_vcpu, arch.pending_exceptions));
-        DEFINE(VCPU_CEDED, offsetof(struct kvm_vcpu, arch.ceded));
-        DEFINE(VCPU_PRODDED, offsetof(struct kvm_vcpu, arch.prodded));
-        DEFINE(VCPU_MMCR, offsetof(struct kvm_vcpu, arch.mmcr));
-        DEFINE(VCPU_PMC, offsetof(struct kvm_vcpu, arch.pmc));
-        DEFINE(VCPU_SPMC, offsetof(struct kvm_vcpu, arch.spmc));
-        DEFINE(VCPU_SIAR, offsetof(struct kvm_vcpu, arch.siar));
-        DEFINE(VCPU_SDAR, offsetof(struct kvm_vcpu, arch.sdar));
-        DEFINE(VCPU_SIER, offsetof(struct kvm_vcpu, arch.sier));
-        DEFINE(VCPU_SLB, offsetof(struct kvm_vcpu, arch.slb));
-        DEFINE(VCPU_SLB_MAX, offsetof(struct kvm_vcpu, arch.slb_max));
-        DEFINE(VCPU_SLB_NR, offsetof(struct kvm_vcpu, arch.slb_nr));
-        DEFINE(VCPU_FAULT_DSISR, offsetof(struct kvm_vcpu, arch.fault_dsisr));
-        DEFINE(VCPU_FAULT_DAR, offsetof(struct kvm_vcpu, arch.fault_dar));
-        DEFINE(VCPU_FAULT_GPA, offsetof(struct kvm_vcpu, arch.fault_gpa));
-        DEFINE(VCPU_INTR_MSR, offsetof(struct kvm_vcpu, arch.intr_msr));
-        DEFINE(VCPU_LAST_INST, offsetof(struct kvm_vcpu, arch.last_inst));
-        DEFINE(VCPU_TRAP, offsetof(struct kvm_vcpu, arch.trap));
-        DEFINE(VCPU_CFAR, offsetof(struct kvm_vcpu, arch.cfar));
-        DEFINE(VCPU_PPR, offsetof(struct kvm_vcpu, arch.ppr));
-        DEFINE(VCPU_FSCR, offsetof(struct kvm_vcpu, arch.fscr));
-        DEFINE(VCPU_PSPB, offsetof(struct kvm_vcpu, arch.pspb));
-        DEFINE(VCPU_EBBHR, offsetof(struct kvm_vcpu, arch.ebbhr));
-        DEFINE(VCPU_EBBRR, offsetof(struct kvm_vcpu, arch.ebbrr));
-        DEFINE(VCPU_BESCR, offsetof(struct kvm_vcpu, arch.bescr));
-        DEFINE(VCPU_CSIGR, offsetof(struct kvm_vcpu, arch.csigr));
-        DEFINE(VCPU_TACR, offsetof(struct kvm_vcpu, arch.tacr));
-        DEFINE(VCPU_TCSCR, offsetof(struct kvm_vcpu, arch.tcscr));
-        DEFINE(VCPU_ACOP, offsetof(struct kvm_vcpu, arch.acop));
-        DEFINE(VCPU_WORT, offsetof(struct kvm_vcpu, arch.wort));
-        DEFINE(VCPU_TID, offsetof(struct kvm_vcpu, arch.tid));
-        DEFINE(VCPU_PSSCR, offsetof(struct kvm_vcpu, arch.psscr));
-        DEFINE(VCORE_ENTRY_EXIT, offsetof(struct kvmppc_vcore, entry_exit_map));
-        DEFINE(VCORE_IN_GUEST, offsetof(struct kvmppc_vcore, in_guest));
-        DEFINE(VCORE_NAPPING_THREADS, offsetof(struct kvmppc_vcore, napping_threads));
-        DEFINE(VCORE_KVM, offsetof(struct kvmppc_vcore, kvm));
-        DEFINE(VCORE_TB_OFFSET, offsetof(struct kvmppc_vcore, tb_offset));
-        DEFINE(VCORE_LPCR, offsetof(struct kvmppc_vcore, lpcr));
-        DEFINE(VCORE_PCR, offsetof(struct kvmppc_vcore, pcr));
-        DEFINE(VCORE_DPDES, offsetof(struct kvmppc_vcore, dpdes));
-        DEFINE(VCORE_VTB, offsetof(struct kvmppc_vcore, vtb));
-        DEFINE(VCPU_SLB_E, offsetof(struct kvmppc_slb, orige));
-        DEFINE(VCPU_SLB_V, offsetof(struct kvmppc_slb, origv));
+        OFFSET(VCPU_PURR, kvm_vcpu, arch.purr);
+        OFFSET(VCPU_SPURR, kvm_vcpu, arch.spurr);
+        OFFSET(VCPU_IC, kvm_vcpu, arch.ic);
+        OFFSET(VCPU_DSCR, kvm_vcpu, arch.dscr);
+        OFFSET(VCPU_AMR, kvm_vcpu, arch.amr);
+        OFFSET(VCPU_UAMOR, kvm_vcpu, arch.uamor);
+        OFFSET(VCPU_IAMR, kvm_vcpu, arch.iamr);
+        OFFSET(VCPU_CTRL, kvm_vcpu, arch.ctrl);
+        OFFSET(VCPU_DABR, kvm_vcpu, arch.dabr);
+        OFFSET(VCPU_DABRX, kvm_vcpu, arch.dabrx);
+        OFFSET(VCPU_DAWR, kvm_vcpu, arch.dawr);
+        OFFSET(VCPU_DAWRX, kvm_vcpu, arch.dawrx);
+        OFFSET(VCPU_CIABR, kvm_vcpu, arch.ciabr);
+        OFFSET(VCPU_HFLAGS, kvm_vcpu, arch.hflags);
+        OFFSET(VCPU_DEC, kvm_vcpu, arch.dec);
+        OFFSET(VCPU_DEC_EXPIRES, kvm_vcpu, arch.dec_expires);
+        OFFSET(VCPU_PENDING_EXC, kvm_vcpu, arch.pending_exceptions);
+        OFFSET(VCPU_CEDED, kvm_vcpu, arch.ceded);
+        OFFSET(VCPU_PRODDED, kvm_vcpu, arch.prodded);
+        OFFSET(VCPU_MMCR, kvm_vcpu, arch.mmcr);
+        OFFSET(VCPU_PMC, kvm_vcpu, arch.pmc);
+        OFFSET(VCPU_SPMC, kvm_vcpu, arch.spmc);
+        OFFSET(VCPU_SIAR, kvm_vcpu, arch.siar);
+        OFFSET(VCPU_SDAR, kvm_vcpu, arch.sdar);
+        OFFSET(VCPU_SIER, kvm_vcpu, arch.sier);
+        OFFSET(VCPU_SLB, kvm_vcpu, arch.slb);
+        OFFSET(VCPU_SLB_MAX, kvm_vcpu, arch.slb_max);
+        OFFSET(VCPU_SLB_NR, kvm_vcpu, arch.slb_nr);
+        OFFSET(VCPU_FAULT_DSISR, kvm_vcpu, arch.fault_dsisr);
+        OFFSET(VCPU_FAULT_DAR, kvm_vcpu, arch.fault_dar);
+        OFFSET(VCPU_FAULT_GPA, kvm_vcpu, arch.fault_gpa);
+        OFFSET(VCPU_INTR_MSR, kvm_vcpu, arch.intr_msr);
+        OFFSET(VCPU_LAST_INST, kvm_vcpu, arch.last_inst);
+        OFFSET(VCPU_TRAP, kvm_vcpu, arch.trap);
+        OFFSET(VCPU_CFAR, kvm_vcpu, arch.cfar);
+        OFFSET(VCPU_PPR, kvm_vcpu, arch.ppr);
+        OFFSET(VCPU_FSCR, kvm_vcpu, arch.fscr);
+        OFFSET(VCPU_PSPB, kvm_vcpu, arch.pspb);
+        OFFSET(VCPU_EBBHR, kvm_vcpu, arch.ebbhr);
+        OFFSET(VCPU_EBBRR, kvm_vcpu, arch.ebbrr);
+        OFFSET(VCPU_BESCR, kvm_vcpu, arch.bescr);
+        OFFSET(VCPU_CSIGR, kvm_vcpu, arch.csigr);
+        OFFSET(VCPU_TACR, kvm_vcpu, arch.tacr);
+        OFFSET(VCPU_TCSCR, kvm_vcpu, arch.tcscr);
+        OFFSET(VCPU_ACOP, kvm_vcpu, arch.acop);
+        OFFSET(VCPU_WORT, kvm_vcpu, arch.wort);
+        OFFSET(VCPU_TID, kvm_vcpu, arch.tid);
+        OFFSET(VCPU_PSSCR, kvm_vcpu, arch.psscr);
+        OFFSET(VCORE_ENTRY_EXIT, kvmppc_vcore, entry_exit_map);
+        OFFSET(VCORE_IN_GUEST, kvmppc_vcore, in_guest);
+        OFFSET(VCORE_NAPPING_THREADS, kvmppc_vcore, napping_threads);
+        OFFSET(VCORE_KVM, kvmppc_vcore, kvm);
+        OFFSET(VCORE_TB_OFFSET, kvmppc_vcore, tb_offset);
+        OFFSET(VCORE_LPCR, kvmppc_vcore, lpcr);
+        OFFSET(VCORE_PCR, kvmppc_vcore, pcr);
+        OFFSET(VCORE_DPDES, kvmppc_vcore, dpdes);
+        OFFSET(VCORE_VTB, kvmppc_vcore, vtb);
+        OFFSET(VCPU_SLB_E, kvmppc_slb, orige);
+        OFFSET(VCPU_SLB_V, kvmppc_slb, origv);
         DEFINE(VCPU_SLB_SIZE, sizeof(struct kvmppc_slb));
 #ifdef CONFIG_PPC_TRANSACTIONAL_MEM
-        DEFINE(VCPU_TFHAR, offsetof(struct kvm_vcpu, arch.tfhar));
-        DEFINE(VCPU_TFIAR, offsetof(struct kvm_vcpu, arch.tfiar));
-        DEFINE(VCPU_TEXASR, offsetof(struct kvm_vcpu, arch.texasr));
-        DEFINE(VCPU_GPR_TM, offsetof(struct kvm_vcpu, arch.gpr_tm));
-        DEFINE(VCPU_FPRS_TM, offsetof(struct kvm_vcpu, arch.fp_tm.fpr));
-        DEFINE(VCPU_VRS_TM, offsetof(struct kvm_vcpu, arch.vr_tm.vr));
-        DEFINE(VCPU_VRSAVE_TM, offsetof(struct kvm_vcpu, arch.vrsave_tm));
-        DEFINE(VCPU_CR_TM, offsetof(struct kvm_vcpu, arch.cr_tm));
-        DEFINE(VCPU_XER_TM, offsetof(struct kvm_vcpu, arch.xer_tm));
-        DEFINE(VCPU_LR_TM, offsetof(struct kvm_vcpu, arch.lr_tm));
-        DEFINE(VCPU_CTR_TM, offsetof(struct kvm_vcpu, arch.ctr_tm));
-        DEFINE(VCPU_AMR_TM, offsetof(struct kvm_vcpu, arch.amr_tm));
-        DEFINE(VCPU_PPR_TM, offsetof(struct kvm_vcpu, arch.ppr_tm));
-        DEFINE(VCPU_DSCR_TM, offsetof(struct kvm_vcpu, arch.dscr_tm));
-        DEFINE(VCPU_TAR_TM, offsetof(struct kvm_vcpu, arch.tar_tm));
+        OFFSET(VCPU_TFHAR, kvm_vcpu, arch.tfhar);
+        OFFSET(VCPU_TFIAR, kvm_vcpu, arch.tfiar);
+        OFFSET(VCPU_TEXASR, kvm_vcpu, arch.texasr);
+        OFFSET(VCPU_GPR_TM, kvm_vcpu, arch.gpr_tm);
+        OFFSET(VCPU_FPRS_TM, kvm_vcpu, arch.fp_tm.fpr);
+        OFFSET(VCPU_VRS_TM, kvm_vcpu, arch.vr_tm.vr);
+        OFFSET(VCPU_VRSAVE_TM, kvm_vcpu, arch.vrsave_tm);
+        OFFSET(VCPU_CR_TM, kvm_vcpu, arch.cr_tm);
+        OFFSET(VCPU_XER_TM, kvm_vcpu, arch.xer_tm);
+        OFFSET(VCPU_LR_TM, kvm_vcpu, arch.lr_tm);
+        OFFSET(VCPU_CTR_TM, kvm_vcpu, arch.ctr_tm);
+        OFFSET(VCPU_AMR_TM, kvm_vcpu, arch.amr_tm);
+        OFFSET(VCPU_PPR_TM, kvm_vcpu, arch.ppr_tm);
+        OFFSET(VCPU_DSCR_TM, kvm_vcpu, arch.dscr_tm);
+        OFFSET(VCPU_TAR_TM, kvm_vcpu, arch.tar_tm);
 #endif
 
 #ifdef CONFIG_PPC_BOOK3S_64
 #ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE
-        DEFINE(PACA_SVCPU, offsetof(struct paca_struct, shadow_vcpu));
+        OFFSET(PACA_SVCPU, paca_struct, shadow_vcpu);
 # define SVCPU_FIELD(x, f)      DEFINE(x, offsetof(struct paca_struct, shadow_vcpu.f))
 #else
 # define SVCPU_FIELD(x, f)
@@ -668,11 +653,11 @@ int main(void)
         HSTATE_FIELD(HSTATE_DECEXP, dec_expires);
         HSTATE_FIELD(HSTATE_SPLIT_MODE, kvm_split_mode);
         DEFINE(IPI_PRIORITY, IPI_PRIORITY);
-        DEFINE(KVM_SPLIT_RPR, offsetof(struct kvm_split_mode, rpr));
-        DEFINE(KVM_SPLIT_PMMAR, offsetof(struct kvm_split_mode, pmmar));
-        DEFINE(KVM_SPLIT_LDBAR, offsetof(struct kvm_split_mode, ldbar));
-        DEFINE(KVM_SPLIT_DO_NAP, offsetof(struct kvm_split_mode, do_nap));
-        DEFINE(KVM_SPLIT_NAPPED, offsetof(struct kvm_split_mode, napped));
+        OFFSET(KVM_SPLIT_RPR, kvm_split_mode, rpr);
+        OFFSET(KVM_SPLIT_PMMAR, kvm_split_mode, pmmar);
+        OFFSET(KVM_SPLIT_LDBAR, kvm_split_mode, ldbar);
+        OFFSET(KVM_SPLIT_DO_NAP, kvm_split_mode, do_nap);
+        OFFSET(KVM_SPLIT_NAPPED, kvm_split_mode, napped);
 #endif /* CONFIG_KVM_BOOK3S_HV_POSSIBLE */
 
 #ifdef CONFIG_PPC_BOOK3S_64
@@ -682,32 +667,27 @@ int main(void)
 #endif /* CONFIG_PPC_BOOK3S_64 */
 
 #else /* CONFIG_PPC_BOOK3S */
-        DEFINE(VCPU_CR, offsetof(struct kvm_vcpu, arch.cr));
-        DEFINE(VCPU_XER, offsetof(struct kvm_vcpu, arch.xer));
-        DEFINE(VCPU_LR, offsetof(struct kvm_vcpu, arch.lr));
-        DEFINE(VCPU_CTR, offsetof(struct kvm_vcpu, arch.ctr));
-        DEFINE(VCPU_PC, offsetof(struct kvm_vcpu, arch.pc));
-        DEFINE(VCPU_SPRG9, offsetof(struct kvm_vcpu, arch.sprg9));
-        DEFINE(VCPU_LAST_INST, offsetof(struct kvm_vcpu, arch.last_inst));
-        DEFINE(VCPU_FAULT_DEAR, offsetof(struct kvm_vcpu, arch.fault_dear));
-        DEFINE(VCPU_FAULT_ESR, offsetof(struct kvm_vcpu, arch.fault_esr));
-        DEFINE(VCPU_CRIT_SAVE, offsetof(struct kvm_vcpu, arch.crit_save));
+        OFFSET(VCPU_CR, kvm_vcpu, arch.cr);
+        OFFSET(VCPU_XER, kvm_vcpu, arch.xer);
+        OFFSET(VCPU_LR, kvm_vcpu, arch.lr);
+        OFFSET(VCPU_CTR, kvm_vcpu, arch.ctr);
+        OFFSET(VCPU_PC, kvm_vcpu, arch.pc);
+        OFFSET(VCPU_SPRG9, kvm_vcpu, arch.sprg9);
+        OFFSET(VCPU_LAST_INST, kvm_vcpu, arch.last_inst);
+        OFFSET(VCPU_FAULT_DEAR, kvm_vcpu, arch.fault_dear);
+        OFFSET(VCPU_FAULT_ESR, kvm_vcpu, arch.fault_esr);
+        OFFSET(VCPU_CRIT_SAVE, kvm_vcpu, arch.crit_save);
 #endif /* CONFIG_PPC_BOOK3S */
 #endif /* CONFIG_KVM */
 
 #ifdef CONFIG_KVM_GUEST
-        DEFINE(KVM_MAGIC_SCRATCH1, offsetof(struct kvm_vcpu_arch_shared,
-                                            scratch1));
-        DEFINE(KVM_MAGIC_SCRATCH2, offsetof(struct kvm_vcpu_arch_shared,
-                                            scratch2));
-        DEFINE(KVM_MAGIC_SCRATCH3, offsetof(struct kvm_vcpu_arch_shared,
-                                            scratch3));
-        DEFINE(KVM_MAGIC_INT, offsetof(struct kvm_vcpu_arch_shared,
-                                       int_pending));
-        DEFINE(KVM_MAGIC_MSR, offsetof(struct kvm_vcpu_arch_shared, msr));
-        DEFINE(KVM_MAGIC_CRITICAL, offsetof(struct kvm_vcpu_arch_shared,
-                                            critical));
-        DEFINE(KVM_MAGIC_SR, offsetof(struct kvm_vcpu_arch_shared, sr));
+        OFFSET(KVM_MAGIC_SCRATCH1, kvm_vcpu_arch_shared, scratch1);
+        OFFSET(KVM_MAGIC_SCRATCH2, kvm_vcpu_arch_shared, scratch2);
+        OFFSET(KVM_MAGIC_SCRATCH3, kvm_vcpu_arch_shared, scratch3);
+        OFFSET(KVM_MAGIC_INT, kvm_vcpu_arch_shared, int_pending);
+        OFFSET(KVM_MAGIC_MSR, kvm_vcpu_arch_shared, msr);
+        OFFSET(KVM_MAGIC_CRITICAL, kvm_vcpu_arch_shared, critical);
+        OFFSET(KVM_MAGIC_SR, kvm_vcpu_arch_shared, sr);
 #endif
 
 #ifdef CONFIG_44x
@@ -716,45 +696,37 @@ int main(void)
 #endif
 #ifdef CONFIG_PPC_FSL_BOOK3E
         DEFINE(TLBCAM_SIZE, sizeof(struct tlbcam));
-        DEFINE(TLBCAM_MAS0, offsetof(struct tlbcam, MAS0));
-        DEFINE(TLBCAM_MAS1, offsetof(struct tlbcam, MAS1));
-        DEFINE(TLBCAM_MAS2, offsetof(struct tlbcam, MAS2));
-        DEFINE(TLBCAM_MAS3, offsetof(struct tlbcam, MAS3));
-        DEFINE(TLBCAM_MAS7, offsetof(struct tlbcam, MAS7));
+        OFFSET(TLBCAM_MAS0, tlbcam, MAS0);
+        OFFSET(TLBCAM_MAS1, tlbcam, MAS1);
+        OFFSET(TLBCAM_MAS2, tlbcam, MAS2);
+        OFFSET(TLBCAM_MAS3, tlbcam, MAS3);
+        OFFSET(TLBCAM_MAS7, tlbcam, MAS7);
 #endif
 
 #if defined(CONFIG_KVM) && defined(CONFIG_SPE)
-        DEFINE(VCPU_EVR, offsetof(struct kvm_vcpu, arch.evr[0]));
-        DEFINE(VCPU_ACC, offsetof(struct kvm_vcpu, arch.acc));
-        DEFINE(VCPU_SPEFSCR, offsetof(struct kvm_vcpu, arch.spefscr));
-        DEFINE(VCPU_HOST_SPEFSCR, offsetof(struct kvm_vcpu, arch.host_spefscr));
+        OFFSET(VCPU_EVR, kvm_vcpu, arch.evr[0]);
+        OFFSET(VCPU_ACC, kvm_vcpu, arch.acc);
+        OFFSET(VCPU_SPEFSCR, kvm_vcpu, arch.spefscr);
+        OFFSET(VCPU_HOST_SPEFSCR, kvm_vcpu, arch.host_spefscr);
 #endif
 
 #ifdef CONFIG_KVM_BOOKE_HV
-        DEFINE(VCPU_HOST_MAS4, offsetof(struct kvm_vcpu, arch.host_mas4));
-        DEFINE(VCPU_HOST_MAS6, offsetof(struct kvm_vcpu, arch.host_mas6));
+        OFFSET(VCPU_HOST_MAS4, kvm_vcpu, arch.host_mas4);
+        OFFSET(VCPU_HOST_MAS6, kvm_vcpu, arch.host_mas6);
 #endif
 
 #ifdef CONFIG_KVM_EXIT_TIMING
-        DEFINE(VCPU_TIMING_EXIT_TBU, offsetof(struct kvm_vcpu,
-                                                arch.timing_exit.tv32.tbu));
-        DEFINE(VCPU_TIMING_EXIT_TBL, offsetof(struct kvm_vcpu,
-                                                arch.timing_exit.tv32.tbl));
-        DEFINE(VCPU_TIMING_LAST_ENTER_TBU, offsetof(struct kvm_vcpu,
-                                        arch.timing_last_enter.tv32.tbu));
-        DEFINE(VCPU_TIMING_LAST_ENTER_TBL, offsetof(struct kvm_vcpu,
-                                        arch.timing_last_enter.tv32.tbl));
+        OFFSET(VCPU_TIMING_EXIT_TBU, kvm_vcpu, arch.timing_exit.tv32.tbu);
+        OFFSET(VCPU_TIMING_EXIT_TBL, kvm_vcpu, arch.timing_exit.tv32.tbl);
+        OFFSET(VCPU_TIMING_LAST_ENTER_TBU, kvm_vcpu, arch.timing_last_enter.tv32.tbu);
+        OFFSET(VCPU_TIMING_LAST_ENTER_TBL, kvm_vcpu, arch.timing_last_enter.tv32.tbl);
 #endif
 
 #ifdef CONFIG_PPC_POWERNV
-        DEFINE(PACA_CORE_IDLE_STATE_PTR,
-                        offsetof(struct paca_struct, core_idle_state_ptr));
-        DEFINE(PACA_THREAD_IDLE_STATE,
-                        offsetof(struct paca_struct, thread_idle_state));
-        DEFINE(PACA_THREAD_MASK,
-                        offsetof(struct paca_struct, thread_mask));
-        DEFINE(PACA_SUBCORE_SIBLING_MASK,
-                        offsetof(struct paca_struct, subcore_sibling_mask));
+        OFFSET(PACA_CORE_IDLE_STATE_PTR, paca_struct, core_idle_state_ptr);
+        OFFSET(PACA_THREAD_IDLE_STATE, paca_struct, thread_idle_state);
+        OFFSET(PACA_THREAD_MASK, paca_struct, thread_mask);
+        OFFSET(PACA_SUBCORE_SIBLING_MASK, paca_struct, subcore_sibling_mask);
 #endif
 
         DEFINE(PPC_DBELL_SERVER, PPC_DBELL_SERVER);
diff --git a/arch/powerpc/kernel/cpu_setup_power.S b/arch/powerpc/kernel/cpu_setup_power.S
index 917188615bf5..7fe8c79e6937 100644
--- a/arch/powerpc/kernel/cpu_setup_power.S
+++ b/arch/powerpc/kernel/cpu_setup_power.S
@@ -101,6 +101,8 @@ _GLOBAL(__setup_cpu_power9)
         mfspr   r3,SPRN_LPCR
         LOAD_REG_IMMEDIATE(r4, LPCR_PECEDH | LPCR_PECE_HVEE | LPCR_HVICE)
         or      r3, r3, r4
+        LOAD_REG_IMMEDIATE(r4, LPCR_UPRT | LPCR_HR)
+        andc    r3, r3, r4
         bl      __init_LPCR
         bl      __init_HFSCR
         bl      __init_tlb_power9
@@ -122,6 +124,8 @@ _GLOBAL(__restore_cpu_power9)
         mfspr   r3,SPRN_LPCR
         LOAD_REG_IMMEDIATE(r4, LPCR_PECEDH | LPCR_PECE_HVEE | LPCR_HVICE)
         or      r3, r3, r4
+        LOAD_REG_IMMEDIATE(r4, LPCR_UPRT | LPCR_HR)
+        andc    r3, r3, r4
         bl      __init_LPCR
         bl      __init_HFSCR
         bl      __init_tlb_power9
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index 6a82ef039c50..bb7a1890aeb7 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -386,6 +386,23 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .machine_check_early    = __machine_check_early_realmode_p8,
                 .platform               = "power8",
         },
+        {       /* 3.00-compliant processor, i.e. Power9 "architected" mode */
+                .pvr_mask               = 0xffffffff,
+                .pvr_value              = 0x0f000005,
+                .cpu_name               = "POWER9 (architected)",
+                .cpu_features           = CPU_FTRS_POWER9,
+                .cpu_user_features      = COMMON_USER_POWER9,
+                .cpu_user_features2     = COMMON_USER2_POWER9,
+                .mmu_features           = MMU_FTRS_POWER9,
+                .icache_bsize           = 128,
+                .dcache_bsize           = 128,
+                .oprofile_type          = PPC_OPROFILE_INVALID,
+                .oprofile_cpu_type      = "ppc64/ibm-compat-v1",
+                .cpu_setup              = __setup_cpu_power9,
+                .cpu_restore            = __restore_cpu_power9,
+                .flush_tlb              = __flush_tlb_power9,
+                .platform               = "power9",
+        },
         {       /* Power7 */
                 .pvr_mask               = 0xffff0000,
                 .pvr_value              = 0x003f0000,
diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
index 3841d749a430..a38600949f3a 100644
--- a/arch/powerpc/kernel/entry_32.S
+++ b/arch/powerpc/kernel/entry_32.S
@@ -205,6 +205,9 @@ transfer_to_handler_cont:
         mflr    r9
         lwz     r11,0(r9)               /* virtual address of handler */
         lwz     r9,4(r9)                /* where to go when done */
+#ifdef CONFIG_PPC_8xx_PERF_EVENT
+        mtspr   SPRN_NRI, r0
+#endif
 #ifdef CONFIG_TRACE_IRQFLAGS
         lis     r12,reenable_mmu@h
         ori     r12,r12,reenable_mmu@l
@@ -292,7 +295,9 @@ stack_ovf:
         lis     r9,StackOverflow@ha
         addi    r9,r9,StackOverflow@l
         LOAD_MSR_KERNEL(r10,MSR_KERNEL)
-        FIX_SRR1(r10,r12)
+#ifdef CONFIG_PPC_8xx_PERF_EVENT
+        mtspr   SPRN_NRI, r0
+#endif
         mtspr   SPRN_SRR0,r9
         mtspr   SPRN_SRR1,r10
         SYNC
@@ -417,9 +422,11 @@ END_FTR_SECTION_IFSET(CPU_FTR_NEED_PAIRED_STWCX)
         mtlr    r4
         mtcr    r5
         lwz     r7,_NIP(r1)
-        FIX_SRR1(r8, r0)
         lwz     r2,GPR2(r1)
         lwz     r1,GPR1(r1)
+#ifdef CONFIG_PPC_8xx_PERF_EVENT
+        mtspr   SPRN_NRI, r0
+#endif
         mtspr   SPRN_SRR0,r7
         mtspr   SPRN_SRR1,r8
         SYNC
@@ -699,6 +706,9 @@ fast_exception_return:
         lwz     r10,_LINK(r11)
         mtlr    r10
         REST_GPR(10, r11)
+#ifdef CONFIG_PPC_8xx_PERF_EVENT
+        mtspr   SPRN_NRI, r0
+#endif
         mtspr   SPRN_SRR1,r9
         mtspr   SPRN_SRR0,r12
         REST_GPR(9, r11)
@@ -947,7 +957,9 @@ END_FTR_SECTION_IFSET(CPU_FTR_NEED_PAIRED_STWCX)
         .globl exc_exit_restart
 exc_exit_restart:
         lwz     r12,_NIP(r1)
-        FIX_SRR1(r9,r10)
+#ifdef CONFIG_PPC_8xx_PERF_EVENT
+        mtspr   SPRN_NRI, r0
+#endif
         mtspr   SPRN_SRR0,r12
         mtspr   SPRN_SRR1,r9
         REST_4GPRS(9, r1)
@@ -1290,7 +1302,6 @@ _GLOBAL(enter_rtas)
 1:      tophys(r9,r1)
         lwz     r8,INT_FRAME_SIZE+4(r9) /* get return address */
         lwz     r9,8(r9)        /* original msr value */
-        FIX_SRR1(r9,r0)
         addi    r1,r1,INT_FRAME_SIZE
         li      r0,0
         mtspr   SPRN_SPRG_RTAS,r0
diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S
index 9d963547d243..1607be7c0ef2 100644
--- a/arch/powerpc/kernel/head_32.S
+++ b/arch/powerpc/kernel/head_32.S
@@ -869,7 +869,6 @@ __secondary_start:
 
         /* enable MMU and jump to start_secondary */
         li      r4,MSR_KERNEL
-        FIX_SRR1(r4,r5)
         lis     r3,start_secondary@h
         ori     r3,r3,start_secondary@l
         mtspr   SPRN_SRR0,r3
@@ -977,7 +976,6 @@ start_here:
         ori     r4,r4,2f@l
         tophys(r4,r4)
         li      r3,MSR_KERNEL & ~(MSR_IR|MSR_DR)
-        FIX_SRR1(r3,r5)
         mtspr   SPRN_SRR0,r4
         mtspr   SPRN_SRR1,r3
         SYNC
@@ -1001,7 +999,6 @@ start_here:
 
 /* Now turn on the MMU for real! */
         li      r4,MSR_KERNEL
-        FIX_SRR1(r4,r5)
         lis     r3,start_kernel@h
         ori     r3,r3,start_kernel@l
         mtspr   SPRN_SRR0,r3
diff --git a/arch/powerpc/kernel/head_8xx.S b/arch/powerpc/kernel/head_8xx.S
index 1a9c99d3e5d8..c032fe8c2d26 100644
--- a/arch/powerpc/kernel/head_8xx.S
+++ b/arch/powerpc/kernel/head_8xx.S
@@ -329,6 +329,12 @@ InstructionTLBMiss:
         mtspr   SPRN_SPRG_SCRATCH2, r3
 #endif
         EXCEPTION_PROLOG_0
+#ifdef CONFIG_PPC_8xx_PERF_EVENT
+        lis     r10, (itlb_miss_counter - PAGE_OFFSET)@ha
+        lwz     r11, (itlb_miss_counter - PAGE_OFFSET)@l(r10)
+        addi    r11, r11, 1
+        stw     r11, (itlb_miss_counter - PAGE_OFFSET)@l(r10)
+#endif
 
         /* If we are faulting a kernel address, we have to use the
          * kernel page tables.
@@ -429,6 +435,12 @@ InstructionTLBMiss:
 DataStoreTLBMiss:
         mtspr   SPRN_SPRG_SCRATCH2, r3
         EXCEPTION_PROLOG_0
+#ifdef CONFIG_PPC_8xx_PERF_EVENT
+        lis     r10, (dtlb_miss_counter - PAGE_OFFSET)@ha
+        lwz     r11, (dtlb_miss_counter - PAGE_OFFSET)@l(r10)
+        addi    r11, r11, 1
+        stw     r11, (dtlb_miss_counter - PAGE_OFFSET)@l(r10)
+#endif
         mfcr    r3
 
         /* If we are faulting a kernel address, we have to use the
@@ -561,6 +573,7 @@ InstructionTLBError:
         andis.  r10,r5,0x4000
         beq+    1f
         tlbie   r4
+itlbie:
         /* 0x400 is InstructionAccess exception, needed by bad_page_fault() */
 1:      EXC_XFER_LITE(0x400, handle_page_fault)
 
@@ -585,6 +598,7 @@ DARFixed:/* Return from dcbx instruction bug workaround */
         andis.  r10,r5,0x4000
         beq+    1f
         tlbie   r4
+dtlbie:
 1:      li      r10,RPN_PATTERN
         mtspr   SPRN_DAR,r10    /* Tag DAR, to be used in DTLB Error */
         /* 0x300 is DataAccess exception, needed by bad_page_fault() */
@@ -602,8 +616,43 @@ DARFixed:/* Return from dcbx instruction bug workaround */
  * support of breakpoints and such.  Someday I will get around to
  * using them.
  */
-        EXCEPTION(0x1c00, Trap_1c, unknown_exception, EXC_XFER_EE)
+        . = 0x1c00
+DataBreakpoint:
+        EXCEPTION_PROLOG_0
+        mfcr    r10
+        mfspr   r11, SPRN_SRR0
+        cmplwi  cr0, r11, (dtlbie - PAGE_OFFSET)@l
+        cmplwi  cr7, r11, (itlbie - PAGE_OFFSET)@l
+        beq-    cr0, 11f
+        beq-    cr7, 11f
+        EXCEPTION_PROLOG_1
+        EXCEPTION_PROLOG_2
+        addi    r3,r1,STACK_FRAME_OVERHEAD
+        mfspr   r4,SPRN_BAR
+        stw     r4,_DAR(r11)
+        mfspr   r5,SPRN_DSISR
+        EXC_XFER_EE(0x1c00, do_break)
+11:
+        mtcr    r10
+        EXCEPTION_EPILOG_0
+        rfi
+
+#ifdef CONFIG_PPC_8xx_PERF_EVENT
+        . = 0x1d00
+InstructionBreakpoint:
+        EXCEPTION_PROLOG_0
+        lis     r10, (instruction_counter - PAGE_OFFSET)@ha
+        lwz     r11, (instruction_counter - PAGE_OFFSET)@l(r10)
+        addi    r11, r11, -1
+        stw     r11, (instruction_counter - PAGE_OFFSET)@l(r10)
+        lis     r10, 0xffff
+        ori     r10, r10, 0x01
+        mtspr   SPRN_COUNTA, r10
+        EXCEPTION_EPILOG_0
+        rfi
+#else
         EXCEPTION(0x1d00, Trap_1d, unknown_exception, EXC_XFER_EE)
+#endif
         EXCEPTION(0x1e00, Trap_1e, unknown_exception, EXC_XFER_EE)
         EXCEPTION(0x1f00, Trap_1f, unknown_exception, EXC_XFER_EE)
 
@@ -977,6 +1026,14 @@ initial_mmu:
         lis     r8, IDC_ENABLE@h
         mtspr   SPRN_DC_CST, r8
 #endif
+        /* Disable debug mode entry on breakpoints */
+        mfspr   r8, SPRN_DER
+#ifdef CONFIG_PPC_8xx_PERF_EVENT
+        rlwinm  r8, r8, 0, ~0xc
+#else
+        rlwinm  r8, r8, 0, ~0x8
+#endif
+        mtspr   SPRN_DER, r8
         blr
 
 
@@ -1010,3 +1067,16 @@ cpu6_errata_word:
         .space  16
 #endif
 
+#ifdef CONFIG_PPC_8xx_PERF_EVENT
+        .globl  itlb_miss_counter
+itlb_miss_counter:
+        .space  4
+
+        .globl  dtlb_miss_counter
+dtlb_miss_counter:
+        .space  4
+
+        .globl  instruction_counter
+instruction_counter:
+        .space  4
+#endif
diff --git a/arch/powerpc/kernel/hw_breakpoint.c b/arch/powerpc/kernel/hw_breakpoint.c
index 53cc9270aac8..53b9c1dfd7d9 100644
--- a/arch/powerpc/kernel/hw_breakpoint.c
+++ b/arch/powerpc/kernel/hw_breakpoint.c
@@ -211,9 +211,11 @@ int hw_breakpoint_handler(struct die_args *args)
         int rc = NOTIFY_STOP;
         struct perf_event *bp;
         struct pt_regs *regs = args->regs;
+#ifndef CONFIG_PPC_8xx
         int stepped = 1;
-        struct arch_hw_breakpoint *info;
         unsigned int instr;
+#endif
+        struct arch_hw_breakpoint *info;
         unsigned long dar = regs->dar;
 
         /* Disable breakpoints during exception handling */
@@ -257,6 +259,7 @@ int hw_breakpoint_handler(struct die_args *args)
               (dar - bp->attr.bp_addr < bp->attr.bp_len)))
                 info->type |= HW_BRK_TYPE_EXTRANEOUS_IRQ;
 
+#ifndef CONFIG_PPC_8xx
         /* Do not emulate user-space instructions, instead single-step them */
         if (user_mode(regs)) {
                 current->thread.last_hit_ubp = bp;
@@ -280,6 +283,7 @@ int hw_breakpoint_handler(struct die_args *args)
                 perf_event_disable_inatomic(bp);
                 goto out;
         }
+#endif
         /*
          * As a policy, the callback is invoked in a 'trigger-after-execute'
          * fashion
diff --git a/arch/powerpc/kernel/optprobes_head.S b/arch/powerpc/kernel/optprobes_head.S
index 53e429b5a29d..4937bef7652f 100644
--- a/arch/powerpc/kernel/optprobes_head.S
+++ b/arch/powerpc/kernel/optprobes_head.S
@@ -65,6 +65,13 @@ optprobe_template_entry:
         mfdsisr r5
         std     r5,_DSISR(r1)
 
+        /*
+         * We may get here from a module, so load the kernel TOC in r2.
+         * The original TOC gets restored when pt_regs is restored
+         * further below.
+         */
+        ld      r2,PACATOC(r13)
+
         .global optprobe_template_op_address
 optprobe_template_op_address:
         /*
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index 8e6fde8d28f3..ffda24a38dda 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -1560,16 +1560,10 @@ static void pcibios_setup_phb_resources(struct pci_controller *hose,
         /* Hookup PHB Memory resources */
         for (i = 0; i < 3; ++i) {
                 res = &hose->mem_resources[i];
-                if (!res->flags) {
-                        if (i == 0)
-                                printk(KERN_ERR "PCI: Memory resource 0 not set for "
-                                       "host bridge %s (domain %d)\n",
-                                       hose->dn->full_name, hose->global_number);
+                if (!res->flags)
                         continue;
-                }
-                offset = hose->mem_offset[i];
-
 
+                offset = hose->mem_offset[i];
                 pr_debug("PCI: PHB MEM resource %d = %pR off 0x%08llx\n", i,
                          res, (unsigned long long)offset);
 
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index 5dd056df0baa..4379a079b3c2 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -730,6 +730,28 @@ static inline int __set_dabr(unsigned long dabr, unsigned long dabrx)
                 mtspr(SPRN_DABRX, dabrx);
         return 0;
 }
+#elif defined(CONFIG_PPC_8xx)
+static inline int __set_dabr(unsigned long dabr, unsigned long dabrx)
+{
+        unsigned long addr = dabr & ~HW_BRK_TYPE_DABR;
+        unsigned long lctrl1 = 0x90000000; /* compare type: equal on E & F */
+        unsigned long lctrl2 = 0x8e000002; /* watchpoint 1 on cmp E | F */
+
+        if ((dabr & HW_BRK_TYPE_RDWR) == HW_BRK_TYPE_READ)
+                lctrl1 |= 0xa0000;
+        else if ((dabr & HW_BRK_TYPE_RDWR) == HW_BRK_TYPE_WRITE)
+                lctrl1 |= 0xf0000;
+        else if ((dabr & HW_BRK_TYPE_RDWR) == 0)
+                lctrl2 = 0;
+
+        mtspr(SPRN_LCTRL2, 0);
+        mtspr(SPRN_CMPE, addr);
+        mtspr(SPRN_CMPF, addr + 4);
+        mtspr(SPRN_LCTRL1, lctrl1);
+        mtspr(SPRN_LCTRL2, lctrl2);
+
+        return 0;
+}
 #else
 static inline int __set_dabr(unsigned long dabr, unsigned long dabrx)
 {
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index 616de028f7f8..a3944540fe0d 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -839,7 +839,7 @@ struct ibm_arch_vec __cacheline_aligned ibm_architecture_vec = {
                 0,
 #endif
                 .associativity = OV5_FEAT(OV5_TYPE1_AFFINITY) | OV5_FEAT(OV5_PRRN),
-                .bin_opts = OV5_FEAT(OV5_RESIZE_HPT),
+                .bin_opts = OV5_FEAT(OV5_RESIZE_HPT) | OV5_FEAT(OV5_HP_EVT),
                 .micro_checkpoint = 0,
                 .reserved0 = 0,
                 .max_cpus = cpu_to_be32(NR_CPUS),       /* number of cores supported */
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index b9855f1b290a..adf2084f214b 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -113,14 +113,12 @@ void __init setup_tlb_core_data(void)
                  * If we have threads, we need either tlbsrx.
                  * or e6500 tablewalk mode, or else TLB handlers
                  * will be racy and could produce duplicate entries.
+                 * Should we panic instead?
                  */
-                if (smt_enabled_at_boot >= 2 &&
-                    !mmu_has_feature(MMU_FTR_USE_TLBRSRV) &&
-                    book3e_htw_mode != PPC_HTW_E6500) {
-                        /* Should we panic instead? */
-                        WARN_ONCE("%s: unsupported MMU configuration -- expect problems\n",
-                                  __func__);
-                }
+                WARN_ONCE(smt_enabled_at_boot >= 2 &&
+                          !mmu_has_feature(MMU_FTR_USE_TLBRSRV) &&
+                          book3e_htw_mode != PPC_HTW_E6500,
+                          "%s: unsupported MMU configuration\n", __func__);
         }
 }
 #endif
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 14e485525e31..bc84a8d47b9e 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -709,7 +709,7 @@ unsigned long long running_clock(void)
          * time and on a host which doesn't do any virtualisation TB *should* equal
          * VTB so it makes no difference anyway.
          */
-        return local_clock() - cputime_to_nsecs(kcpustat_this_cpu->cpustat[CPUTIME_STEAL]);
+        return local_clock() - kcpustat_this_cpu->cpustat[CPUTIME_STEAL];
 }
 #endif
 
diff --git a/arch/powerpc/mm/pgtable.c b/arch/powerpc/mm/pgtable.c
index cb39c8bd2436..a03ff3d99e0c 100644
--- a/arch/powerpc/mm/pgtable.c
+++ b/arch/powerpc/mm/pgtable.c
@@ -193,9 +193,7 @@ void set_pte_at(struct mm_struct *mm, unsigned long addr, pte_t *ptep,
          */
         VM_WARN_ON(pte_present(*ptep) && !pte_protnone(*ptep));
 
-        /*
-         * Add the pte bit when tryint set a pte
-         */
+        /* Add the pte bit when trying to set a pte */
         pte = __pte(pte_val(pte) | _PAGE_PTE);
 
         /* Note: mm->context.id might not yet have been assigned as
diff --git a/arch/powerpc/mm/slb_low.S b/arch/powerpc/mm/slb_low.S
index e2974fcd20f1..a85e06ea6c20 100644
--- a/arch/powerpc/mm/slb_low.S
+++ b/arch/powerpc/mm/slb_low.S
@@ -71,9 +71,9 @@ slb_miss_kernel_load_linear:
 
 
 BEGIN_FTR_SECTION
-        b       slb_finish_load
+        b       .Lslb_finish_load
 END_MMU_FTR_SECTION_IFCLR(MMU_FTR_1T_SEGMENT)
-        b       slb_finish_load_1T
+        b       .Lslb_finish_load_1T
 
 1:
 #ifdef CONFIG_SPARSEMEM_VMEMMAP
@@ -109,9 +109,9 @@ slb_miss_kernel_load_io:
         addi    r9,r9,(MAX_USER_CONTEXT - 0xc + 1)@l
 
 BEGIN_FTR_SECTION
-        b       slb_finish_load
+        b       .Lslb_finish_load
 END_MMU_FTR_SECTION_IFCLR(MMU_FTR_1T_SEGMENT)
-        b       slb_finish_load_1T
+        b       .Lslb_finish_load_1T
 
 0:      /*
          * For userspace addresses, make sure this is region 0.
@@ -174,9 +174,9 @@ END_MMU_FTR_SECTION_IFCLR(MMU_FTR_1T_SEGMENT)
         ld      r9,PACACONTEXTID(r13)
 BEGIN_FTR_SECTION
         cmpldi  r10,0x1000
-        bge     slb_finish_load_1T
+        bge     .Lslb_finish_load_1T
 END_MMU_FTR_SECTION_IFSET(MMU_FTR_1T_SEGMENT)
-        b       slb_finish_load
+        b       .Lslb_finish_load
 
 8:      /* invalid EA - return an error indication */
         crset   4*cr0+eq                /* indicate failure */
@@ -187,7 +187,7 @@ END_MMU_FTR_SECTION_IFSET(MMU_FTR_1T_SEGMENT)
  *
  * r3 = EA, r9 = context, r10 = ESID, r11 = flags, clobbers r9, cr7 = <> PAGE_OFFSET
  */
-slb_finish_load:
+.Lslb_finish_load:
         rldimi  r10,r9,ESID_BITS,0
         ASM_VSID_SCRAMBLE(r10,r9,256M)
         /*
@@ -256,7 +256,7 @@ slb_compare_rr_to_size:
  *
  * r3 = EA, r9 = context, r10 = ESID(256MB), r11 = flags, clobbers r9
  */
-slb_finish_load_1T:
+.Lslb_finish_load_1T:
         srdi    r10,r10,(SID_SHIFT_1T - SID_SHIFT)      /* get 1T ESID */
         rldimi  r10,r9,ESID_BITS_1T,0
         ASM_VSID_SCRAMBLE(r10,r9,1T)
@@ -272,3 +272,11 @@ slb_finish_load_1T:
         clrrdi  r3,r3,SID_SHIFT_1T      /* clear out non-ESID bits */
         b       7b
 
+
+_ASM_NOKPROBE_SYMBOL(slb_allocate_realmode)
+_ASM_NOKPROBE_SYMBOL(slb_miss_kernel_load_linear)
+_ASM_NOKPROBE_SYMBOL(slb_miss_kernel_load_io)
+_ASM_NOKPROBE_SYMBOL(slb_compare_rr_to_size)
+#ifdef CONFIG_SPARSEMEM_VMEMMAP
+_ASM_NOKPROBE_SYMBOL(slb_miss_kernel_load_vmemmap)
+#endif
diff --git a/arch/powerpc/perf/8xx-pmu.c b/arch/powerpc/perf/8xx-pmu.c
new file mode 100644
index 000000000000..3c39f05f0af3
--- /dev/null
+++ b/arch/powerpc/perf/8xx-pmu.c
@@ -0,0 +1,173 @@
+/*
+ * Performance event support - PPC 8xx
+ *
+ * Copyright 2016 Christophe Leroy, CS Systemes d'Information
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/perf_event.h>
+#include <linux/percpu.h>
+#include <linux/hardirq.h>
+#include <asm/pmc.h>
+#include <asm/machdep.h>
+#include <asm/firmware.h>
+#include <asm/ptrace.h>
+
+#define PERF_8xx_ID_CPU_CYCLES          1
+#define PERF_8xx_ID_HW_INSTRUCTIONS     2
+#define PERF_8xx_ID_ITLB_LOAD_MISS      3
+#define PERF_8xx_ID_DTLB_LOAD_MISS      4
+
+#define C(x)    PERF_COUNT_HW_CACHE_##x
+#define DTLB_LOAD_MISS  (C(DTLB) | (C(OP_READ) << 8) | (C(RESULT_MISS) << 16))
+#define ITLB_LOAD_MISS  (C(ITLB) | (C(OP_READ) << 8) | (C(RESULT_MISS) << 16))
+
+extern unsigned long itlb_miss_counter, dtlb_miss_counter;
+extern atomic_t instruction_counter;
+
+static atomic_t insn_ctr_ref;
+
+static s64 get_insn_ctr(void)
+{
+        int ctr;
+        unsigned long counta;
+
+        do {
+                ctr = atomic_read(&instruction_counter);
+                counta = mfspr(SPRN_COUNTA);
+        } while (ctr != atomic_read(&instruction_counter));
+
+        return ((s64)ctr << 16) | (counta >> 16);
+}
+
+static int event_type(struct perf_event *event)
+{
+        switch (event->attr.type) {
+        case PERF_TYPE_HARDWARE:
+                if (event->attr.config == PERF_COUNT_HW_CPU_CYCLES)
+                        return PERF_8xx_ID_CPU_CYCLES;
+                if (event->attr.config == PERF_COUNT_HW_INSTRUCTIONS)
+                        return PERF_8xx_ID_HW_INSTRUCTIONS;
+                break;
+        case PERF_TYPE_HW_CACHE:
+                if (event->attr.config == ITLB_LOAD_MISS)
+                        return PERF_8xx_ID_ITLB_LOAD_MISS;
+                if (event->attr.config == DTLB_LOAD_MISS)
+                        return PERF_8xx_ID_DTLB_LOAD_MISS;
+                break;
+        case PERF_TYPE_RAW:
+                break;
+        default:
+                return -ENOENT;
+        }
+        return -EOPNOTSUPP;
+}
+
+static int mpc8xx_pmu_event_init(struct perf_event *event)
+{
+        int type = event_type(event);
+
+        if (type < 0)
+                return type;
+        return 0;
+}
+
+static int mpc8xx_pmu_add(struct perf_event *event, int flags)
+{
+        int type = event_type(event);
+        s64 val = 0;
+
+        if (type < 0)
+                return type;
+
+        switch (type) {
+        case PERF_8xx_ID_CPU_CYCLES:
+                val = get_tb();
+                break;
+        case PERF_8xx_ID_HW_INSTRUCTIONS:
+                if (atomic_inc_return(&insn_ctr_ref) == 1)
+                        mtspr(SPRN_ICTRL, 0xc0080007);
+                val = get_insn_ctr();
+                break;
+        case PERF_8xx_ID_ITLB_LOAD_MISS:
+                val = itlb_miss_counter;
+                break;
+        case PERF_8xx_ID_DTLB_LOAD_MISS:
+                val = dtlb_miss_counter;
+                break;
+        }
+        local64_set(&event->hw.prev_count, val);
+        return 0;
+}
+
+static void mpc8xx_pmu_read(struct perf_event *event)
+{
+        int type = event_type(event);
+        s64 prev, val = 0, delta = 0;
+
+        if (type < 0)
+                return;
+
+        do {
+                prev = local64_read(&event->hw.prev_count);
+                switch (type) {
+                case PERF_8xx_ID_CPU_CYCLES:
+                        val = get_tb();
+                        delta = 16 * (val - prev);
+                        break;
+                case PERF_8xx_ID_HW_INSTRUCTIONS:
+                        val = get_insn_ctr();
+                        delta = prev - val;
+                        if (delta < 0)
+                                delta += 0x1000000000000LL;
+                        break;
+                case PERF_8xx_ID_ITLB_LOAD_MISS:
+                        val = itlb_miss_counter;
+                        delta = (s64)((s32)val - (s32)prev);
+                        break;
+                case PERF_8xx_ID_DTLB_LOAD_MISS:
+                        val = dtlb_miss_counter;
+                        delta = (s64)((s32)val - (s32)prev);
+                        break;
+                }
+        } while (local64_cmpxchg(&event->hw.prev_count, prev, val) != prev);
+
+        local64_add(delta, &event->count);
+}
+
+static void mpc8xx_pmu_del(struct perf_event *event, int flags)
+{
+        mpc8xx_pmu_read(event);
+        if (event_type(event) != PERF_8xx_ID_HW_INSTRUCTIONS)
+                return;
+
+        /* If it was the last user, stop counting to avoid useles overhead */
+        if (atomic_dec_return(&insn_ctr_ref) == 0)
+                mtspr(SPRN_ICTRL, 7);
+}
+
+static struct pmu mpc8xx_pmu = {
+        .event_init     = mpc8xx_pmu_event_init,
+        .add            = mpc8xx_pmu_add,
+        .del            = mpc8xx_pmu_del,
+        .read           = mpc8xx_pmu_read,
+        .capabilities   = PERF_PMU_CAP_NO_INTERRUPT |
+                          PERF_PMU_CAP_NO_NMI,
+};
+
+static int init_mpc8xx_pmu(void)
+{
+        mtspr(SPRN_ICTRL, 7);
+        mtspr(SPRN_CMPA, 0);
+        mtspr(SPRN_COUNTA, 0xffff);
+
+        return perf_pmu_register(&mpc8xx_pmu, "cpu", PERF_TYPE_RAW);
+}
+
+early_initcall(init_mpc8xx_pmu);
diff --git a/arch/powerpc/perf/Makefile b/arch/powerpc/perf/Makefile
index f102d5370101..4d606b99a5cb 100644
--- a/arch/powerpc/perf/Makefile
+++ b/arch/powerpc/perf/Makefile
@@ -13,5 +13,7 @@ obj-$(CONFIG_FSL_EMB_PERF_EVENT_E500) += e500-pmu.o e6500-pmu.o
 
 obj-$(CONFIG_HV_PERF_CTRS) += hv-24x7.o hv-gpci.o hv-common.o
 
+obj-$(CONFIG_PPC_8xx_PERF_EVENT) += 8xx-pmu.o
+
 obj-$(CONFIG_PPC64)             += $(obj64-y)
 obj-$(CONFIG_PPC32)             += $(obj32-y)
diff --git a/arch/powerpc/perf/core-book3s.c b/arch/powerpc/perf/core-book3s.c
index 270eb9b74e2e..595dd718ea87 100644
--- a/arch/powerpc/perf/core-book3s.c
+++ b/arch/powerpc/perf/core-book3s.c
@@ -57,6 +57,7 @@ struct cpu_hw_events {
         void                            *bhrb_context;
         struct  perf_branch_stack       bhrb_stack;
         struct  perf_branch_entry       bhrb_entries[BHRB_MAX_ENTRIES];
+        u64                             ic_init;
 };
 
 static DEFINE_PER_CPU(struct cpu_hw_events, cpu_hw_events);
@@ -127,6 +128,10 @@ static inline void power_pmu_bhrb_disable(struct perf_event *event) {}
 static void power_pmu_sched_task(struct perf_event_context *ctx, bool sched_in) {}
 static inline void power_pmu_bhrb_read(struct cpu_hw_events *cpuhw) {}
 static void pmao_restore_workaround(bool ebb) { }
+static bool use_ic(u64 event)
+{
+        return false;
+}
 #endif /* CONFIG_PPC32 */
 
 static bool regs_use_siar(struct pt_regs *regs)
@@ -243,7 +248,7 @@ static inline u32 perf_get_misc_flags(struct pt_regs *regs)
          */
         if (ppmu->flags & PPMU_NO_SIPR) {
                 unsigned long siar = mfspr(SPRN_SIAR);
-                if (siar >= PAGE_OFFSET)
+                if (is_kernel_addr(siar))
                         return PERF_RECORD_MISC_KERNEL;
                 return PERF_RECORD_MISC_USER;
         }
@@ -688,6 +693,15 @@ static void pmao_restore_workaround(bool ebb)
         mtspr(SPRN_PMC5, pmcs[4]);
         mtspr(SPRN_PMC6, pmcs[5]);
 }
+
+static bool use_ic(u64 event)
+{
+        if (cpu_has_feature(CPU_FTR_POWER9_DD1) &&
+                        (event == 0x200f2 || event == 0x300f2))
+                return true;
+
+        return false;
+}
 #endif /* CONFIG_PPC64 */
 
 static void perf_event_interrupt(struct pt_regs *regs);
@@ -1007,6 +1021,7 @@ static u64 check_and_compute_delta(u64 prev, u64 val)
 static void power_pmu_read(struct perf_event *event)
 {
         s64 val, delta, prev;
+        struct cpu_hw_events *cpuhw = this_cpu_ptr(&cpu_hw_events);
 
         if (event->hw.state & PERF_HES_STOPPED)
                 return;
@@ -1016,6 +1031,13 @@ static void power_pmu_read(struct perf_event *event)
 
         if (is_ebb_event(event)) {
                 val = read_pmc(event->hw.idx);
+                if (use_ic(event->attr.config)) {
+                        val = mfspr(SPRN_IC);
+                        if (val > cpuhw->ic_init)
+                                val = val - cpuhw->ic_init;
+                        else
+                                val = val + (0 - cpuhw->ic_init);
+                }
                 local64_set(&event->hw.prev_count, val);
                 return;
         }
@@ -1029,6 +1051,13 @@ static void power_pmu_read(struct perf_event *event)
                 prev = local64_read(&event->hw.prev_count);
                 barrier();
                 val = read_pmc(event->hw.idx);
+                if (use_ic(event->attr.config)) {
+                        val = mfspr(SPRN_IC);
+                        if (val > cpuhw->ic_init)
+                                val = val - cpuhw->ic_init;
+                        else
+                                val = val + (0 - cpuhw->ic_init);
+                }
                 delta = check_and_compute_delta(prev, val);
                 if (!delta)
                         return;
@@ -1466,6 +1495,13 @@ nocheck:
                                         event->attr.branch_sample_type);
         }
 
+        /*
+         * Workaround for POWER9 DD1 to use the Instruction Counter
+         * register value for instruction counting
+         */
+        if (use_ic(event->attr.config))
+                cpuhw->ic_init = mfspr(SPRN_IC);
+
         perf_pmu_enable(event->pmu);
         local_irq_restore(flags);
         return ret;
diff --git a/arch/powerpc/perf/isa207-common.c b/arch/powerpc/perf/isa207-common.c
index 50e598cf644b..e79fb5fb817d 100644
--- a/arch/powerpc/perf/isa207-common.c
+++ b/arch/powerpc/perf/isa207-common.c
@@ -97,6 +97,28 @@ static unsigned long combine_shift(unsigned long pmc)
         return MMCR1_COMBINE_SHIFT(pmc);
 }
 
+static inline bool event_is_threshold(u64 event)
+{
+        return (event >> EVENT_THR_SEL_SHIFT) & EVENT_THR_SEL_MASK;
+}
+
+static bool is_thresh_cmp_valid(u64 event)
+{
+        unsigned int cmp, exp;
+
+        /*
+         * Check the mantissa upper two bits are not zero, unless the
+         * exponent is also zero. See the THRESH_CMP_MANTISSA doc.
+         */
+        cmp = (event >> EVENT_THR_CMP_SHIFT) & EVENT_THR_CMP_MASK;
+        exp = cmp >> 7;
+
+        if (exp && (cmp & 0x60) == 0)
+                return false;
+
+        return true;
+}
+
 int isa207_get_constraint(u64 event, unsigned long *maskp, unsigned long *valp)
 {
         unsigned int unit, pmc, cache, ebb;
@@ -163,28 +185,26 @@ int isa207_get_constraint(u64 event, unsigned long *maskp, unsigned long *valp)
                 value |= CNST_SAMPLE_VAL(event >> EVENT_SAMPLE_SHIFT);
         }
 
-        /*
-         * Special case for PM_MRK_FAB_RSP_MATCH and PM_MRK_FAB_RSP_MATCH_CYC,
-         * the threshold control bits are used for the match value.
-         */
-        if (event_is_fab_match(event)) {
-                mask  |= CNST_FAB_MATCH_MASK;
-                value |= CNST_FAB_MATCH_VAL(event >> EVENT_THR_CTL_SHIFT);
+        if (cpu_has_feature(CPU_FTR_ARCH_300))  {
+                if (event_is_threshold(event) && is_thresh_cmp_valid(event)) {
+                        mask  |= CNST_THRESH_MASK;
+                        value |= CNST_THRESH_VAL(event >> EVENT_THRESH_SHIFT);
+                }
         } else {
                 /*
-                 * Check the mantissa upper two bits are not zero, unless the
-                 * exponent is also zero. See the THRESH_CMP_MANTISSA doc.
+                 * Special case for PM_MRK_FAB_RSP_MATCH and PM_MRK_FAB_RSP_MATCH_CYC,
+                 * the threshold control bits are used for the match value.
                  */
-                unsigned int cmp, exp;
-
-                cmp = (event >> EVENT_THR_CMP_SHIFT) & EVENT_THR_CMP_MASK;
-                exp = cmp >> 7;
-
-                if (exp && (cmp & 0x60) == 0)
-                        return -1;
+                if (event_is_fab_match(event)) {
+                        mask  |= CNST_FAB_MATCH_MASK;
+                        value |= CNST_FAB_MATCH_VAL(event >> EVENT_THR_CTL_SHIFT);
+                } else {
+                        if (!is_thresh_cmp_valid(event))
+                                return -1;
 
-                mask  |= CNST_THRESH_MASK;
-                value |= CNST_THRESH_VAL(event >> EVENT_THRESH_SHIFT);
+                        mask  |= CNST_THRESH_MASK;
+                        value |= CNST_THRESH_VAL(event >> EVENT_THRESH_SHIFT);
+                }
         }
 
         if (!pmc && ebb)
@@ -279,7 +299,7 @@ int isa207_compute_mmcr(u64 event[], int n_ev,
                  * PM_MRK_FAB_RSP_MATCH and PM_MRK_FAB_RSP_MATCH_CYC,
                  * the threshold bits are used for the match value.
                  */
-                if (event_is_fab_match(event[i])) {
+                if (!cpu_has_feature(CPU_FTR_ARCH_300) && event_is_fab_match(event[i])) {
                         mmcr1 |= ((event[i] >> EVENT_THR_CTL_SHIFT) &
                                   EVENT_THR_CTL_MASK) << MMCR1_FAB_SHIFT;
                 } else {
@@ -338,3 +358,39 @@ void isa207_disable_pmc(unsigned int pmc, unsigned long mmcr[])
         if (pmc <= 3)
                 mmcr[1] &= ~(0xffUL << MMCR1_PMCSEL_SHIFT(pmc + 1));
 }
+
+static int find_alternative(u64 event, const unsigned int ev_alt[][MAX_ALT], int size)
+{
+        int i, j;
+
+        for (i = 0; i < size; ++i) {
+                if (event < ev_alt[i][0])
+                        break;
+
+                for (j = 0; j < MAX_ALT && ev_alt[i][j]; ++j)
+                        if (event == ev_alt[i][j])
+                                return i;
+        }
+
+        return -1;
+}
+
+int isa207_get_alternatives(u64 event, u64 alt[],
+                                const unsigned int ev_alt[][MAX_ALT], int size)
+{
+        int i, j, num_alt = 0;
+        u64 alt_event;
+
+        alt[num_alt++] = event;
+        i = find_alternative(event, ev_alt, size);
+        if (i >= 0) {
+                /* Filter out the original event, it's already in alt[0] */
+                for (j = 0; j < MAX_ALT; ++j) {
+                        alt_event = ev_alt[i][j];
+                        if (alt_event && alt_event != event)
+                                alt[num_alt++] = alt_event;
+                }
+        }
+
+        return num_alt;
+}
diff --git a/arch/powerpc/perf/isa207-common.h b/arch/powerpc/perf/isa207-common.h
index 90495f1580c7..cf9bd8990159 100644
--- a/arch/powerpc/perf/isa207-common.h
+++ b/arch/powerpc/perf/isa207-common.h
@@ -222,6 +222,10 @@
         CNST_PMC_VAL(1) | CNST_PMC_VAL(2) | CNST_PMC_VAL(3) | \
         CNST_PMC_VAL(4) | CNST_PMC_VAL(5) | CNST_PMC_VAL(6) | CNST_NC_VAL
 
+/*
+ * Lets restrict use of PMC5 for instruction counting.
+ */
+#define P9_DD1_TEST_ADDER       (ISA207_TEST_ADDER | CNST_PMC_VAL(5))
 
 /* Bits in MMCR1 for PowerISA v2.07 */
 #define MMCR1_UNIT_SHIFT(pmc)           (60 - (4 * ((pmc) - 1)))
@@ -260,5 +264,8 @@ int isa207_compute_mmcr(u64 event[], int n_ev,
                                 unsigned int hwc[], unsigned long mmcr[],
                                 struct perf_event *pevents[]);
 void isa207_disable_pmc(unsigned int pmc, unsigned long mmcr[]);
+int isa207_get_alternatives(u64 event, u64 alt[],
+                                const unsigned int ev_alt[][MAX_ALT], int size);
+
 
 #endif
diff --git a/arch/powerpc/perf/power8-pmu.c b/arch/powerpc/perf/power8-pmu.c
index d07186382f3a..ce15b19a7962 100644
--- a/arch/powerpc/perf/power8-pmu.c
+++ b/arch/powerpc/perf/power8-pmu.c
@@ -48,43 +48,12 @@ static const unsigned int event_alternatives[][MAX_ALT] = {
         { PM_RUN_INST_CMPL_ALT,         PM_RUN_INST_CMPL },
 };
 
-/*
- * Scan the alternatives table for a match and return the
- * index into the alternatives table if found, else -1.
- */
-static int find_alternative(u64 event)
-{
-        int i, j;
-
-        for (i = 0; i < ARRAY_SIZE(event_alternatives); ++i) {
-                if (event < event_alternatives[i][0])
-                        break;
-
-                for (j = 0; j < MAX_ALT && event_alternatives[i][j]; ++j)
-                        if (event == event_alternatives[i][j])
-                                return i;
-        }
-
-        return -1;
-}
-
 static int power8_get_alternatives(u64 event, unsigned int flags, u64 alt[])
 {
         int i, j, num_alt = 0;
-        u64 alt_event;
-
-        alt[num_alt++] = event;
-
-        i = find_alternative(event);
-        if (i >= 0) {
-                /* Filter out the original event, it's already in alt[0] */
-                for (j = 0; j < MAX_ALT; ++j) {
-                        alt_event = event_alternatives[i][j];
-                        if (alt_event && alt_event != event)
-                                alt[num_alt++] = alt_event;
-                }
-        }
 
+        num_alt = isa207_get_alternatives(event, alt, event_alternatives,
+                                        (int)ARRAY_SIZE(event_alternatives));
         if (flags & PPMU_ONLY_COUNT_RUN) {
                 /*
                  * We're only counting in RUN state, so PM_CYC is equivalent to
diff --git a/arch/powerpc/perf/power9-events-list.h b/arch/powerpc/perf/power9-events-list.h
index 929b56d47ad9..71a6bfee5c02 100644
--- a/arch/powerpc/perf/power9-events-list.h
+++ b/arch/powerpc/perf/power9-events-list.h
@@ -53,3 +53,6 @@ EVENT(PM_ITLB_MISS,				0x400fc)
 EVENT(PM_RUN_INST_CMPL,                         0x500fa)
 /* Run_cycles */
 EVENT(PM_RUN_CYC,                               0x600f4)
+/* Instruction Dispatched */
+EVENT(PM_INST_DISP,                             0x200f2)
+EVENT(PM_INST_DISP_ALT,                         0x300f2)
diff --git a/arch/powerpc/perf/power9-pmu.c b/arch/powerpc/perf/power9-pmu.c
index 7332634e18c9..7f6582708e06 100644
--- a/arch/powerpc/perf/power9-pmu.c
+++ b/arch/powerpc/perf/power9-pmu.c
@@ -22,7 +22,7 @@
  * | - - - - | - - - - | - - - - | - - - - | - - - - | - - - - | - - - - | - - - - |
  *   | | [ ]                       [ ] [      thresh_cmp     ]   [  thresh_ctl   ]
  *   | |  |                         |                                     |
- *   | |  *- IFM (Linux)            |    thresh start/stop OR FAB match -*
+ *   | |  *- IFM (Linux)            |                  thresh start/stop -*
  *   | *- BHRB (Linux)              *sm
  *   *- EBB (Linux)
  *
@@ -50,11 +50,9 @@
  * MMCR1[31]   = pmc4combine[1]
  *
  * if pmc == 3 and unit == 0 and pmcxsel[0:6] == 0b0101011
- *      # PM_MRK_FAB_RSP_MATCH
- *      MMCR1[20:27] = thresh_ctl   (FAB_CRESP_MATCH / FAB_TYPE_MATCH)
+ *      MMCR1[20:27] = thresh_ctl
  * else if pmc == 4 and unit == 0xf and pmcxsel[0:6] == 0b0101001
- *      # PM_MRK_FAB_RSP_MATCH_CYC
- *      MMCR1[20:27] = thresh_ctl   (FAB_CRESP_MATCH / FAB_TYPE_MATCH)
+ *      MMCR1[20:27] = thresh_ctl
  * else
  *      MMCRA[48:55] = thresh_ctl   (THRESH START/END)
  *
@@ -106,6 +104,21 @@ enum {
 /* PowerISA v2.07 format attribute structure*/
 extern struct attribute_group isa207_pmu_format_group;
 
+/* Table of alternatives, sorted by column 0 */
+static const unsigned int power9_event_alternatives[][MAX_ALT] = {
+        { PM_INST_DISP,                 PM_INST_DISP_ALT },
+};
+
+static int power9_get_alternatives(u64 event, unsigned int flags, u64 alt[])
+{
+        int num_alt = 0;
+
+        num_alt = isa207_get_alternatives(event, alt, power9_event_alternatives,
+                                (int)ARRAY_SIZE(power9_event_alternatives));
+
+        return num_alt;
+}
+
 GENERIC_EVENT_ATTR(cpu-cycles,                  PM_CYC);
 GENERIC_EVENT_ATTR(stalled-cycles-frontend,     PM_ICT_NOSLOT_CYC);
 GENERIC_EVENT_ATTR(stalled-cycles-backend,      PM_CMPLU_STALL);
@@ -213,6 +226,17 @@ static const struct attribute_group *power9_pmu_attr_groups[] = {
         NULL,
 };
 
+static int power9_generic_events_dd1[] = {
+        [PERF_COUNT_HW_CPU_CYCLES] =                    PM_CYC,
+        [PERF_COUNT_HW_STALLED_CYCLES_FRONTEND] =       PM_ICT_NOSLOT_CYC,
+        [PERF_COUNT_HW_STALLED_CYCLES_BACKEND] =        PM_CMPLU_STALL,
+        [PERF_COUNT_HW_INSTRUCTIONS] =                  PM_INST_DISP,
+        [PERF_COUNT_HW_BRANCH_INSTRUCTIONS] =           PM_BRU_CMPL,
+        [PERF_COUNT_HW_BRANCH_MISSES] =                 PM_BR_MPRED_CMPL,
+        [PERF_COUNT_HW_CACHE_REFERENCES] =              PM_LD_REF_L1,
+        [PERF_COUNT_HW_CACHE_MISSES] =                  PM_LD_MISS_L1_FIN,
+};
+
 static int power9_generic_events[] = {
         [PERF_COUNT_HW_CPU_CYCLES] =                    PM_CYC,
         [PERF_COUNT_HW_STALLED_CYCLES_FRONTEND] =       PM_ICT_NOSLOT_CYC,
@@ -383,10 +407,11 @@ static struct power_pmu power9_isa207_pmu = {
         .config_bhrb            = power9_config_bhrb,
         .bhrb_filter_map        = power9_bhrb_filter_map,
         .get_constraint         = isa207_get_constraint,
+        .get_alternatives       = power9_get_alternatives,
         .disable_pmc            = isa207_disable_pmc,
         .flags                  = PPMU_NO_SIAR | PPMU_ARCH_207S,
-        .n_generic              = ARRAY_SIZE(power9_generic_events),
-        .generic_events         = power9_generic_events,
+        .n_generic              = ARRAY_SIZE(power9_generic_events_dd1),
+        .generic_events         = power9_generic_events_dd1,
         .cache_events           = &power9_cache_events,
         .attr_groups            = power9_isa207_pmu_attr_groups,
         .bhrb_nr                = 32,
@@ -396,11 +421,12 @@ static struct power_pmu power9_pmu = {
         .name                   = "POWER9",
         .n_counter              = MAX_PMU_COUNTERS,
         .add_fields             = ISA207_ADD_FIELDS,
-        .test_adder             = ISA207_TEST_ADDER,
+        .test_adder             = P9_DD1_TEST_ADDER,
         .compute_mmcr           = isa207_compute_mmcr,
         .config_bhrb            = power9_config_bhrb,
         .bhrb_filter_map        = power9_bhrb_filter_map,
         .get_constraint         = isa207_get_constraint,
+        .get_alternatives       = power9_get_alternatives,
         .disable_pmc            = isa207_disable_pmc,
         .flags                  = PPMU_HAS_SIER | PPMU_ARCH_207S,
         .n_generic              = ARRAY_SIZE(power9_generic_events),
@@ -420,6 +446,11 @@ static int __init init_power9_pmu(void)
                 return -ENODEV;
 
         if (cpu_has_feature(CPU_FTR_POWER9_DD1)) {
+                /*
+                 * Since PM_INST_CMPL may not provide right counts in all
+                 * sampling scenarios in power9 DD1, instead use PM_INST_DISP.
+                 */
+                EVENT_VAR(PM_INST_CMPL, _g).id = PM_INST_DISP;
                 rc = register_power_pmu(&power9_isa207_pmu);
         } else {
                 rc = register_power_pmu(&power9_pmu);
diff --git a/arch/powerpc/platforms/85xx/Makefile b/arch/powerpc/platforms/85xx/Makefile
index 7bc86dae9517..fe19dad568e2 100644
--- a/arch/powerpc/platforms/85xx/Makefile
+++ b/arch/powerpc/platforms/85xx/Makefile
@@ -22,6 +22,7 @@ obj-$(CONFIG_P1022_RDK)   += p1022_rdk.o
 obj-$(CONFIG_P1023_RDB)   += p1023_rdb.o
 obj-$(CONFIG_TWR_P102x)   += twr_p102x.o
 obj-$(CONFIG_CORENET_GENERIC)   += corenet_generic.o
+obj-$(CONFIG_FB_FSL_DIU)        += t1042rdb_diu.o
 obj-$(CONFIG_STX_GP3)     += stx_gp3.o
 obj-$(CONFIG_TQM85xx)     += tqm85xx.o
 obj-$(CONFIG_SBC8548)     += sbc8548.o
diff --git a/arch/powerpc/platforms/85xx/corenet_generic.c b/arch/powerpc/platforms/85xx/corenet_generic.c
index 6c0ba75fb256..ac191a7a1337 100644
--- a/arch/powerpc/platforms/85xx/corenet_generic.c
+++ b/arch/powerpc/platforms/85xx/corenet_generic.c
@@ -157,6 +157,7 @@ static const char * const boards[] __initconst = {
         "fsl,T1040RDB",
         "fsl,T1042RDB",
         "fsl,T1042RDB_PI",
+        "keymile,kmcent2",
         "keymile,kmcoge4",
         "varisys,CYRUS",
         NULL
diff --git a/arch/powerpc/platforms/85xx/t1042rdb_diu.c b/arch/powerpc/platforms/85xx/t1042rdb_diu.c
new file mode 100644
index 000000000000..58fa3d319f1c
--- /dev/null
+++ b/arch/powerpc/platforms/85xx/t1042rdb_diu.c
@@ -0,0 +1,152 @@
+/*
+ * T1042 platform DIU operation
+ *
+ * Copyright 2014 Freescale Semiconductor Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/io.h>
+#include <linux/kernel.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+
+#include <sysdev/fsl_soc.h>
+
+/*DIU Pixel ClockCR offset in scfg*/
+#define CCSR_SCFG_PIXCLKCR      0x28
+
+/* DIU Pixel Clock bits of the PIXCLKCR */
+#define PIXCLKCR_PXCKEN         0x80000000
+#define PIXCLKCR_PXCKINV        0x40000000
+#define PIXCLKCR_PXCKDLY        0x0000FF00
+#define PIXCLKCR_PXCLK_MASK     0x00FF0000
+
+/* Some CPLD register definitions */
+#define CPLD_DIUCSR             0x16
+#define CPLD_DIUCSR_DVIEN       0x80
+#define CPLD_DIUCSR_BACKLIGHT   0x0f
+
+struct device_node *cpld_node;
+
+/**
+ * t1042rdb_set_monitor_port: switch the output to a different monitor port
+ */
+static void t1042rdb_set_monitor_port(enum fsl_diu_monitor_port port)
+{
+        static void __iomem *cpld_base;
+
+        cpld_base = of_iomap(cpld_node, 0);
+        if (!cpld_base) {
+                pr_err("%s: Could not map cpld registers\n", __func__);
+                goto exit;
+        }
+
+        switch (port) {
+        case FSL_DIU_PORT_DVI:
+                /* Enable the DVI(HDMI) port, disable the DFP and
+                 * the backlight
+                 */
+                clrbits8(cpld_base + CPLD_DIUCSR, CPLD_DIUCSR_DVIEN);
+                break;
+        case FSL_DIU_PORT_LVDS:
+                /*
+                 * LVDS also needs backlight enabled, otherwise the display
+                 * will be blank.
+                 */
+                /* Enable the DFP port, disable the DVI*/
+                setbits8(cpld_base + CPLD_DIUCSR, 0x01 << 8);
+                setbits8(cpld_base + CPLD_DIUCSR, 0x01 << 4);
+                setbits8(cpld_base + CPLD_DIUCSR, CPLD_DIUCSR_BACKLIGHT);
+                break;
+        default:
+                pr_err("%s: Unsupported monitor port %i\n", __func__, port);
+        }
+
+        iounmap(cpld_base);
+exit:
+        of_node_put(cpld_node);
+}
+
+/**
+ * t1042rdb_set_pixel_clock: program the DIU's clock
+ * @pixclock: pixel clock in ps (pico seconds)
+ */
+static void t1042rdb_set_pixel_clock(unsigned int pixclock)
+{
+        struct device_node *scfg_np;
+        void __iomem *scfg;
+        unsigned long freq;
+        u64 temp;
+        u32 pxclk;
+
+        scfg_np = of_find_compatible_node(NULL, NULL, "fsl,t1040-scfg");
+        if (!scfg_np) {
+                pr_err("%s: Missing scfg node. Can not display video.\n",
+                       __func__);
+                return;
+        }
+
+        scfg = of_iomap(scfg_np, 0);
+        of_node_put(scfg_np);
+        if (!scfg) {
+                pr_err("%s: Could not map device. Can not display video.\n",
+                       __func__);
+                return;
+        }
+
+        /* Convert pixclock into frequency */
+        temp = 1000000000000ULL;
+        do_div(temp, pixclock);
+        freq = temp;
+
+        /*
+         * 'pxclk' is the ratio of the platform clock to the pixel clock.
+         * This number is programmed into the PIXCLKCR register, and the valid
+         * range of values is 2-255.
+         */
+        pxclk = DIV_ROUND_CLOSEST(fsl_get_sys_freq(), freq);
+        pxclk = clamp_t(u32, pxclk, 2, 255);
+
+        /* Disable the pixel clock, and set it to non-inverted and no delay */
+        clrbits32(scfg + CCSR_SCFG_PIXCLKCR,
+                  PIXCLKCR_PXCKEN | PIXCLKCR_PXCKDLY | PIXCLKCR_PXCLK_MASK);
+
+        /* Enable the clock and set the pxclk */
+        setbits32(scfg + CCSR_SCFG_PIXCLKCR, PIXCLKCR_PXCKEN | (pxclk << 16));
+
+        iounmap(scfg);
+}
+
+/**
+ * t1042rdb_valid_monitor_port: set the monitor port for sysfs
+ */
+static enum fsl_diu_monitor_port
+t1042rdb_valid_monitor_port(enum fsl_diu_monitor_port port)
+{
+        switch (port) {
+        case FSL_DIU_PORT_DVI:
+        case FSL_DIU_PORT_LVDS:
+                return port;
+        default:
+                return FSL_DIU_PORT_DVI; /* Dual-link LVDS is not supported */
+        }
+}
+
+static int __init t1042rdb_diu_init(void)
+{
+        cpld_node = of_find_compatible_node(NULL, NULL, "fsl,t1042rdb-cpld");
+        if (!cpld_node)
+                return 0;
+
+        diu_ops.set_monitor_port        = t1042rdb_set_monitor_port;
+        diu_ops.set_pixel_clock         = t1042rdb_set_pixel_clock;
+        diu_ops.valid_monitor_port      = t1042rdb_valid_monitor_port;
+
+        return 0;
+}
+
+early_initcall(t1042rdb_diu_init);
diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index 6e89e5a8d4fb..99b0ae8acb78 100644
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -172,6 +172,13 @@ config PPC_FPU
         bool
         default y if PPC64
 
+config PPC_8xx_PERF_EVENT
+        bool "PPC 8xx perf events"
+        depends on PPC_8xx && PERF_EVENTS
+        help
+          This is Performance Events support for PPC 8xx. The 8xx doesn't
+          have a PMU but some events are emulated using 8xx features.
+
 config FSL_EMB_PERFMON
         bool "Freescale Embedded Perfmon"
         depends on E500 || PPC_83xx
diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
index e5ec1368f0cd..ae2f740a82f1 100644
--- a/arch/powerpc/platforms/cell/spufs/file.c
+++ b/arch/powerpc/platforms/cell/spufs/file.c
@@ -683,23 +683,13 @@ size_t spu_ibox_read(struct spu_context *ctx, u32 *data)
         return ctx->ops->ibox_read(ctx, data);
 }
 
-static int spufs_ibox_fasync(int fd, struct file *file, int on)
-{
-        struct spu_context *ctx = file->private_data;
-
-        return fasync_helper(fd, file, on, &ctx->ibox_fasync);
-}
-
 /* interrupt-level ibox callback function. */
 void spufs_ibox_callback(struct spu *spu)
 {
         struct spu_context *ctx = spu->ctx;
 
-        if (!ctx)
-                return;
-
-        wake_up_all(&ctx->ibox_wq);
-        kill_fasync(&ctx->ibox_fasync, SIGIO, POLLIN);
+        if (ctx)
+                wake_up_all(&ctx->ibox_wq);
 }
 
 /*
@@ -794,7 +784,6 @@ static const struct file_operations spufs_ibox_fops = {
         .open   = spufs_pipe_open,
         .read   = spufs_ibox_read,
         .poll   = spufs_ibox_poll,
-        .fasync = spufs_ibox_fasync,
         .llseek = no_llseek,
 };
 
@@ -832,26 +821,13 @@ size_t spu_wbox_write(struct spu_context *ctx, u32 data)
         return ctx->ops->wbox_write(ctx, data);
 }
 
-static int spufs_wbox_fasync(int fd, struct file *file, int on)
-{
-        struct spu_context *ctx = file->private_data;
-        int ret;
-
-        ret = fasync_helper(fd, file, on, &ctx->wbox_fasync);
-
-        return ret;
-}
-
 /* interrupt-level wbox callback function. */
 void spufs_wbox_callback(struct spu *spu)
 {
         struct spu_context *ctx = spu->ctx;
 
-        if (!ctx)
-                return;
-
-        wake_up_all(&ctx->wbox_wq);
-        kill_fasync(&ctx->wbox_fasync, SIGIO, POLLOUT);
+        if (ctx)
+                wake_up_all(&ctx->wbox_wq);
 }
 
 /*
@@ -944,7 +920,6 @@ static const struct file_operations spufs_wbox_fops = {
         .open   = spufs_pipe_open,
         .write  = spufs_wbox_write,
         .poll   = spufs_wbox_poll,
-        .fasync = spufs_wbox_fasync,
         .llseek = no_llseek,
 };
 
@@ -1520,28 +1495,8 @@ void spufs_mfc_callback(struct spu *spu)
 {
         struct spu_context *ctx = spu->ctx;
 
-        if (!ctx)
-                return;
-
-        wake_up_all(&ctx->mfc_wq);
-
-        pr_debug("%s %s\n", __func__, spu->name);
-        if (ctx->mfc_fasync) {
-                u32 free_elements, tagstatus;
-                unsigned int mask;
-
-                /* no need for spu_acquire in interrupt context */
-                free_elements = ctx->ops->get_mfc_free_elements(ctx);
-                tagstatus = ctx->ops->read_mfc_tagstatus(ctx);
-
-                mask = 0;
-                if (free_elements & 0xffff)
-                        mask |= POLLOUT;
-                if (tagstatus & ctx->tagwait)
-                        mask |= POLLIN;
-
-                kill_fasync(&ctx->mfc_fasync, SIGIO, mask);
-        }
+        if (ctx)
+                wake_up_all(&ctx->mfc_wq);
 }
 
 static int spufs_read_mfc_tagstatus(struct spu_context *ctx, u32 *status)
@@ -1803,13 +1758,6 @@ static int spufs_mfc_fsync(struct file *file, loff_t start, loff_t end, int data
         return err;
 }
 
-static int spufs_mfc_fasync(int fd, struct file *file, int on)
-{
-        struct spu_context *ctx = file->private_data;
-
-        return fasync_helper(fd, file, on, &ctx->mfc_fasync);
-}
-
 static const struct file_operations spufs_mfc_fops = {
         .open    = spufs_mfc_open,
         .release = spufs_mfc_release,
@@ -1818,7 +1766,6 @@ static const struct file_operations spufs_mfc_fops = {
         .poll    = spufs_mfc_poll,
         .flush   = spufs_mfc_flush,
         .fsync   = spufs_mfc_fsync,
-        .fasync  = spufs_mfc_fasync,
         .mmap    = spufs_mfc_mmap,
         .llseek  = no_llseek,
 };
diff --git a/arch/powerpc/platforms/cell/spufs/spufs.h b/arch/powerpc/platforms/cell/spufs/spufs.h
index bcfd6f063efa..aac733966092 100644
--- a/arch/powerpc/platforms/cell/spufs/spufs.h
+++ b/arch/powerpc/platforms/cell/spufs/spufs.h
@@ -102,9 +102,6 @@ struct spu_context {
         wait_queue_head_t stop_wq;
         wait_queue_head_t mfc_wq;
         wait_queue_head_t run_wq;
-        struct fasync_struct *ibox_fasync;
-        struct fasync_struct *wbox_fasync;
-        struct fasync_struct *mfc_fasync;
         u32 tagwait;
         struct spu_context_ops *ops;
         struct work_struct reap_work;
diff --git a/arch/powerpc/platforms/powernv/Kconfig b/arch/powerpc/platforms/powernv/Kconfig
index 604190cab522..3a07e4dcf97c 100644
--- a/arch/powerpc/platforms/powernv/Kconfig
+++ b/arch/powerpc/platforms/powernv/Kconfig
@@ -5,7 +5,8 @@ config PPC_POWERNV
         select PPC_XICS
         select PPC_ICP_NATIVE
         select PPC_P7_NAP
-        select PPC_PCI_CHOICE if EMBEDDED
+        select PCI
+        select PCI_MSI
         select EPAPR_BOOT
         select PPC_INDIRECT_PIO
         select PPC_UDBG_16550
diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
index e0f83c204ccc..6901a06da2f9 100644
--- a/arch/powerpc/platforms/powernv/pci-ioda.c
+++ b/arch/powerpc/platforms/powernv/pci-ioda.c
@@ -1468,14 +1468,12 @@ void pnv_pci_sriov_disable(struct pci_dev *pdev)
         struct pnv_phb        *phb;
         struct pnv_ioda_pe    *pe;
         struct pci_dn         *pdn;
-        struct pci_sriov      *iov;
         u16                    num_vfs, i;
 
         bus = pdev->bus;
         hose = pci_bus_to_host(bus);
         phb = hose->private_data;
         pdn = pci_get_pdn(pdev);
-        iov = pdev->sriov;
         num_vfs = pdn->num_vfs;
 
         /* Release VF PEs */
diff --git a/arch/powerpc/platforms/pseries/dlpar.c b/arch/powerpc/platforms/pseries/dlpar.c
index d3a81e746fc4..193e052fa0dd 100644
--- a/arch/powerpc/platforms/pseries/dlpar.c
+++ b/arch/powerpc/platforms/pseries/dlpar.c
@@ -354,11 +354,17 @@ static int handle_dlpar_errorlog(struct pseries_hp_errorlog *hp_elog)
         switch (hp_elog->id_type) {
         case PSERIES_HP_ELOG_ID_DRC_COUNT:
                 hp_elog->_drc_u.drc_count =
-                                        be32_to_cpu(hp_elog->_drc_u.drc_count);
+                                be32_to_cpu(hp_elog->_drc_u.drc_count);
                 break;
         case PSERIES_HP_ELOG_ID_DRC_INDEX:
                 hp_elog->_drc_u.drc_index =
-                                        be32_to_cpu(hp_elog->_drc_u.drc_index);
+                                be32_to_cpu(hp_elog->_drc_u.drc_index);
+                break;
+        case PSERIES_HP_ELOG_ID_DRC_IC:
+                hp_elog->_drc_u.ic.count =
+                                be32_to_cpu(hp_elog->_drc_u.ic.count);
+                hp_elog->_drc_u.ic.index =
+                                be32_to_cpu(hp_elog->_drc_u.ic.index);
         }
 
         switch (hp_elog->resource) {
@@ -467,7 +473,33 @@ static int dlpar_parse_id_type(char **cmd, struct pseries_hp_errorlog *hp_elog)
         if (!arg)
                 return -EINVAL;
 
-        if (sysfs_streq(arg, "index")) {
+        if (sysfs_streq(arg, "indexed-count")) {
+                hp_elog->id_type = PSERIES_HP_ELOG_ID_DRC_IC;
+                arg = strsep(cmd, " ");
+                if (!arg) {
+                        pr_err("No DRC count specified.\n");
+                        return -EINVAL;
+                }
+
+                if (kstrtou32(arg, 0, &count)) {
+                        pr_err("Invalid DRC count specified.\n");
+                        return -EINVAL;
+                }
+
+                arg = strsep(cmd, " ");
+                if (!arg) {
+                        pr_err("No DRC Index specified.\n");
+                        return -EINVAL;
+                }
+
+                if (kstrtou32(arg, 0, &index)) {
+                        pr_err("Invalid DRC Index specified.\n");
+                        return -EINVAL;
+                }
+
+                hp_elog->_drc_u.ic.count = cpu_to_be32(count);
+                hp_elog->_drc_u.ic.index = cpu_to_be32(index);
+        } else if (sysfs_streq(arg, "index")) {
                 hp_elog->id_type = PSERIES_HP_ELOG_ID_DRC_INDEX;
                 arg = strsep(cmd, " ");
                 if (!arg) {
diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c
index 3381c20edbc0..e104c71ea44a 100644
--- a/arch/powerpc/platforms/pseries/hotplug-memory.c
+++ b/arch/powerpc/platforms/pseries/hotplug-memory.c
@@ -320,6 +320,19 @@ static int dlpar_remove_device_tree_lmb(struct of_drconf_cell *lmb)
         return dlpar_update_device_tree_lmb(lmb);
 }
 
+static struct memory_block *lmb_to_memblock(struct of_drconf_cell *lmb)
+{
+        unsigned long section_nr;
+        struct mem_section *mem_sect;
+        struct memory_block *mem_block;
+
+        section_nr = pfn_to_section_nr(PFN_DOWN(lmb->base_addr));
+        mem_sect = __nr_to_section(section_nr);
+
+        mem_block = find_memory_block(mem_sect);
+        return mem_block;
+}
+
 #ifdef CONFIG_MEMORY_HOTREMOVE
 static int pseries_remove_memblock(unsigned long base, unsigned int memblock_size)
 {
@@ -407,19 +420,6 @@ static bool lmb_is_removable(struct of_drconf_cell *lmb)
 
 static int dlpar_add_lmb(struct of_drconf_cell *);
 
-static struct memory_block *lmb_to_memblock(struct of_drconf_cell *lmb)
-{
-        unsigned long section_nr;
-        struct mem_section *mem_sect;
-        struct memory_block *mem_block;
-
-        section_nr = pfn_to_section_nr(PFN_DOWN(lmb->base_addr));
-        mem_sect = __nr_to_section(section_nr);
-
-        mem_block = find_memory_block(mem_sect);
-        return mem_block;
-}
-
 static int dlpar_remove_lmb(struct of_drconf_cell *lmb)
 {
         struct memory_block *mem_block;
@@ -601,6 +601,94 @@ static int dlpar_memory_readd_by_index(u32 drc_index, struct property *prop)
 
         return rc;
 }
+
+static int dlpar_memory_remove_by_ic(u32 lmbs_to_remove, u32 drc_index,
+                                     struct property *prop)
+{
+        struct of_drconf_cell *lmbs;
+        u32 num_lmbs, *p;
+        int i, rc, start_lmb_found;
+        int lmbs_available = 0, start_index = 0, end_index;
+
+        pr_info("Attempting to hot-remove %u LMB(s) at %x\n",
+                lmbs_to_remove, drc_index);
+
+        if (lmbs_to_remove == 0)
+                return -EINVAL;
+
+        p = prop->value;
+        num_lmbs = *p++;
+        lmbs = (struct of_drconf_cell *)p;
+        start_lmb_found = 0;
+
+        /* Navigate to drc_index */
+        while (start_index < num_lmbs) {
+                if (lmbs[start_index].drc_index == drc_index) {
+                        start_lmb_found = 1;
+                        break;
+                }
+
+                start_index++;
+        }
+
+        if (!start_lmb_found)
+                return -EINVAL;
+
+        end_index = start_index + lmbs_to_remove;
+
+        /* Validate that there are enough LMBs to satisfy the request */
+        for (i = start_index; i < end_index; i++) {
+                if (lmbs[i].flags & DRCONF_MEM_RESERVED)
+                        break;
+
+                lmbs_available++;
+        }
+
+        if (lmbs_available < lmbs_to_remove)
+                return -EINVAL;
+
+        for (i = start_index; i < end_index; i++) {
+                if (!(lmbs[i].flags & DRCONF_MEM_ASSIGNED))
+                        continue;
+
+                rc = dlpar_remove_lmb(&lmbs[i]);
+                if (rc)
+                        break;
+
+                lmbs[i].reserved = 1;
+        }
+
+        if (rc) {
+                pr_err("Memory indexed-count-remove failed, adding any removed LMBs\n");
+
+                for (i = start_index; i < end_index; i++) {
+                        if (!lmbs[i].reserved)
+                                continue;
+
+                        rc = dlpar_add_lmb(&lmbs[i]);
+                        if (rc)
+                                pr_err("Failed to add LMB, drc index %x\n",
+                                       be32_to_cpu(lmbs[i].drc_index));
+
+                        lmbs[i].reserved = 0;
+                }
+                rc = -EINVAL;
+        } else {
+                for (i = start_index; i < end_index; i++) {
+                        if (!lmbs[i].reserved)
+                                continue;
+
+                        dlpar_release_drc(lmbs[i].drc_index);
+                        pr_info("Memory at %llx (drc index %x) was hot-removed\n",
+                                lmbs[i].base_addr, lmbs[i].drc_index);
+
+                        lmbs[i].reserved = 0;
+                }
+        }
+
+        return rc;
+}
+
 #else
 static inline int pseries_remove_memblock(unsigned long base,
                                           unsigned int memblock_size)
@@ -628,9 +716,32 @@ static int dlpar_memory_remove_by_index(u32 drc_index, struct property *prop)
 {
         return -EOPNOTSUPP;
 }
+static int dlpar_memory_readd_by_index(u32 drc_index, struct property *prop)
+{
+        return -EOPNOTSUPP;
+}
 
+static int dlpar_memory_remove_by_ic(u32 lmbs_to_remove, u32 drc_index,
+                                     struct property *prop)
+{
+        return -EOPNOTSUPP;
+}
 #endif /* CONFIG_MEMORY_HOTREMOVE */
 
+static int dlpar_online_lmb(struct of_drconf_cell *lmb)
+{
+        struct memory_block *mem_block;
+        int rc;
+
+        mem_block = lmb_to_memblock(lmb);
+        if (!mem_block)
+                return -EINVAL;
+
+        rc = device_online(&mem_block->dev);
+        put_device(&mem_block->dev);
+        return rc;
+}
+
 static int dlpar_add_lmb(struct of_drconf_cell *lmb)
 {
         unsigned long block_sz;
@@ -654,10 +765,18 @@ static int dlpar_add_lmb(struct of_drconf_cell *lmb)
 
         /* Add the memory */
         rc = add_memory(nid, lmb->base_addr, block_sz);
-        if (rc)
+        if (rc) {
                 dlpar_remove_device_tree_lmb(lmb);
-        else
+                return rc;
+        }
+
+        rc = dlpar_online_lmb(lmb);
+        if (rc) {
+                remove_memory(nid, lmb->base_addr, block_sz);
+                dlpar_remove_device_tree_lmb(lmb);
+        } else {
                 lmb->flags |= DRCONF_MEM_ASSIGNED;
+        }
 
         return rc;
 }
@@ -776,6 +895,97 @@ static int dlpar_memory_add_by_index(u32 drc_index, struct property *prop)
         return rc;
 }
 
+static int dlpar_memory_add_by_ic(u32 lmbs_to_add, u32 drc_index,
+                                  struct property *prop)
+{
+        struct of_drconf_cell *lmbs;
+        u32 num_lmbs, *p;
+        int i, rc, start_lmb_found;
+        int lmbs_available = 0, start_index = 0, end_index;
+
+        pr_info("Attempting to hot-add %u LMB(s) at index %x\n",
+                lmbs_to_add, drc_index);
+
+        if (lmbs_to_add == 0)
+                return -EINVAL;
+
+        p = prop->value;
+        num_lmbs = *p++;
+        lmbs = (struct of_drconf_cell *)p;
+        start_lmb_found = 0;
+
+        /* Navigate to drc_index */
+        while (start_index < num_lmbs) {
+                if (lmbs[start_index].drc_index == drc_index) {
+                        start_lmb_found = 1;
+                        break;
+                }
+
+                start_index++;
+        }
+
+        if (!start_lmb_found)
+                return -EINVAL;
+
+        end_index = start_index + lmbs_to_add;
+
+        /* Validate that the LMBs in this range are not reserved */
+        for (i = start_index; i < end_index; i++) {
+                if (lmbs[i].flags & DRCONF_MEM_RESERVED)
+                        break;
+
+                lmbs_available++;
+        }
+
+        if (lmbs_available < lmbs_to_add)
+                return -EINVAL;
+
+        for (i = start_index; i < end_index; i++) {
+                if (lmbs[i].flags & DRCONF_MEM_ASSIGNED)
+                        continue;
+
+                rc = dlpar_acquire_drc(lmbs[i].drc_index);
+                if (rc)
+                        break;
+
+                rc = dlpar_add_lmb(&lmbs[i]);
+                if (rc) {
+                        dlpar_release_drc(lmbs[i].drc_index);
+                        break;
+                }
+
+                lmbs[i].reserved = 1;
+        }
+
+        if (rc) {
+                pr_err("Memory indexed-count-add failed, removing any added LMBs\n");
+
+                for (i = start_index; i < end_index; i++) {
+                        if (!lmbs[i].reserved)
+                                continue;
+
+                        rc = dlpar_remove_lmb(&lmbs[i]);
+                        if (rc)
+                                pr_err("Failed to remove LMB, drc index %x\n",
+                                       be32_to_cpu(lmbs[i].drc_index));
+                        else
+                                dlpar_release_drc(lmbs[i].drc_index);
+                }
+                rc = -EINVAL;
+        } else {
+                for (i = start_index; i < end_index; i++) {
+                        if (!lmbs[i].reserved)
+                                continue;
+
+                        pr_info("Memory at %llx (drc index %x) was hot-added\n",
+                                lmbs[i].base_addr, lmbs[i].drc_index);
+                        lmbs[i].reserved = 0;
+                }
+        }
+
+        return rc;
+}
+
 int dlpar_memory(struct pseries_hp_errorlog *hp_elog)
 {
         struct device_node *dn;
@@ -783,9 +993,6 @@ int dlpar_memory(struct pseries_hp_errorlog *hp_elog)
         u32 count, drc_index;
         int rc;
 
-        count = hp_elog->_drc_u.drc_count;
-        drc_index = hp_elog->_drc_u.drc_index;
-
         lock_device_hotplug();
 
         dn = of_find_node_by_path("/ibm,dynamic-reconfiguration-memory");
@@ -802,22 +1009,39 @@ int dlpar_memory(struct pseries_hp_errorlog *hp_elog)
 
         switch (hp_elog->action) {
         case PSERIES_HP_ELOG_ACTION_ADD:
-                if (hp_elog->id_type == PSERIES_HP_ELOG_ID_DRC_COUNT)
+                if (hp_elog->id_type == PSERIES_HP_ELOG_ID_DRC_COUNT) {
+                        count = hp_elog->_drc_u.drc_count;
                         rc = dlpar_memory_add_by_count(count, prop);
-                else if (hp_elog->id_type == PSERIES_HP_ELOG_ID_DRC_INDEX)
+                } else if (hp_elog->id_type == PSERIES_HP_ELOG_ID_DRC_INDEX) {
+                        drc_index = hp_elog->_drc_u.drc_index;
                         rc = dlpar_memory_add_by_index(drc_index, prop);
-                else
+                } else if (hp_elog->id_type == PSERIES_HP_ELOG_ID_DRC_IC) {
+                        count = hp_elog->_drc_u.ic.count;
+                        drc_index = hp_elog->_drc_u.ic.index;
+                        rc = dlpar_memory_add_by_ic(count, drc_index, prop);
+                } else {
                         rc = -EINVAL;
+                }
+
                 break;
         case PSERIES_HP_ELOG_ACTION_REMOVE:
-                if (hp_elog->id_type == PSERIES_HP_ELOG_ID_DRC_COUNT)
+                if (hp_elog->id_type == PSERIES_HP_ELOG_ID_DRC_COUNT) {
+                        count = hp_elog->_drc_u.drc_count;
                         rc = dlpar_memory_remove_by_count(count, prop);
-                else if (hp_elog->id_type == PSERIES_HP_ELOG_ID_DRC_INDEX)
+                } else if (hp_elog->id_type == PSERIES_HP_ELOG_ID_DRC_INDEX) {
+                        drc_index = hp_elog->_drc_u.drc_index;
                         rc = dlpar_memory_remove_by_index(drc_index, prop);
-                else
+                } else if (hp_elog->id_type == PSERIES_HP_ELOG_ID_DRC_IC) {
+                        count = hp_elog->_drc_u.ic.count;
+                        drc_index = hp_elog->_drc_u.ic.index;
+                        rc = dlpar_memory_remove_by_ic(count, drc_index, prop);
+                } else {
                         rc = -EINVAL;
+                }
+
                 break;
         case PSERIES_HP_ELOG_ACTION_READD:
+                drc_index = hp_elog->_drc_u.drc_index;
                 rc = dlpar_memory_readd_by_index(drc_index, prop);
                 break;
         default:
diff --git a/arch/powerpc/xmon/ppc-dis.c b/arch/powerpc/xmon/ppc-dis.c
index ee9891734149..31db8c072acd 100644
--- a/arch/powerpc/xmon/ppc-dis.c
+++ b/arch/powerpc/xmon/ppc-dis.c
@@ -1,6 +1,5 @@
 /* ppc-dis.c -- Disassemble PowerPC instructions
-   Copyright 1994, 1995, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
+   Copyright (C) 1994-2016 Free Software Foundation, Inc.
    Written by Ian Lance Taylor, Cygnus Support
 
 This file is part of GDB, GAS, and the GNU binutils.
@@ -26,57 +25,94 @@ Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, US
 #include "ppc.h"
 #include "dis-asm.h"
 
-/* Print a PowerPC or POWER instruction.  */
+/* This file provides several disassembler functions, all of which use
+   the disassembler interface defined in dis-asm.h.  Several functions
+   are provided because this file handles disassembly for the PowerPC
+   in both big and little endian mode and also for the POWER (RS/6000)
+   chip.  */
+
+/* Extract the operand value from the PowerPC or POWER instruction.  */
 
-int
-print_insn_powerpc (unsigned long insn, unsigned long memaddr)
+static long
+operand_value_powerpc (const struct powerpc_operand *operand,
+                       unsigned long insn, ppc_cpu_t dialect)
 {
-  const struct powerpc_opcode *opcode;
-  const struct powerpc_opcode *opcode_end;
-  unsigned long op;
-  int dialect;
+  long value;
+  int invalid;
+  /* Extract the value from the instruction.  */
+  if (operand->extract)
+    value = (*operand->extract) (insn, dialect, &invalid);
+  else
+    {
+      if (operand->shift >= 0)
+        value = (insn >> operand->shift) & operand->bitm;
+      else
+        value = (insn << -operand->shift) & operand->bitm;
+      if ((operand->flags & PPC_OPERAND_SIGNED) != 0)
+        {
+          /* BITM is always some number of zeros followed by some
+             number of ones, followed by some number of zeros.  */
+          unsigned long top = operand->bitm;
+          /* top & -top gives the rightmost 1 bit, so this
+             fills in any trailing zeros.  */
+          top |= (top & -top) - 1;
+          top &= ~(top >> 1);
+          value = (value ^ top) - top;
+        }
+    }
 
-  dialect = PPC_OPCODE_PPC | PPC_OPCODE_CLASSIC | PPC_OPCODE_COMMON
-              | PPC_OPCODE_64 | PPC_OPCODE_POWER4 | PPC_OPCODE_ALTIVEC;
+  return value;
+}
 
-  if (cpu_has_feature(CPU_FTRS_POWER5))
-    dialect |= PPC_OPCODE_POWER5;
+/* Determine whether the optional operand(s) should be printed.  */
 
-  if (cpu_has_feature(CPU_FTRS_CELL))
-    dialect |= PPC_OPCODE_CELL | PPC_OPCODE_ALTIVEC;
+static int
+skip_optional_operands (const unsigned char *opindex,
+                        unsigned long insn, ppc_cpu_t dialect)
+{
+  const struct powerpc_operand *operand;
 
-  if (cpu_has_feature(CPU_FTRS_POWER6))
-    dialect |= PPC_OPCODE_POWER5 | PPC_OPCODE_POWER6 | PPC_OPCODE_ALTIVEC;
+  for (; *opindex != 0; opindex++)
+    {
+      operand = &powerpc_operands[*opindex];
+      if ((operand->flags & PPC_OPERAND_NEXT) != 0
+          || ((operand->flags & PPC_OPERAND_OPTIONAL) != 0
+              && operand_value_powerpc (operand, insn, dialect) !=
+                 ppc_optional_operand_value (operand)))
+        return 0;
+    }
+
+  return 1;
+}
+
+/* Find a match for INSN in the opcode table, given machine DIALECT.
+   A DIALECT of -1 is special, matching all machine opcode variations.  */
+
+static const struct powerpc_opcode *
+lookup_powerpc (unsigned long insn, ppc_cpu_t dialect)
+{
+  const struct powerpc_opcode *opcode;
+  const struct powerpc_opcode *opcode_end;
+  unsigned long op;
 
   /* Get the major opcode of the instruction.  */
   op = PPC_OP (insn);
 
-  /* Find the first match in the opcode table.  We could speed this up
-     a bit by doing a binary search on the major opcode.  */
   opcode_end = powerpc_opcodes + powerpc_num_opcodes;
- again:
-  for (opcode = powerpc_opcodes; opcode < opcode_end; opcode++)
+  /* Find the first match in the opcode table for this major opcode.  */
+  for (opcode = powerpc_opcodes; opcode < opcode_end; ++opcode)
     {
-      unsigned long table_op;
       const unsigned char *opindex;
       const struct powerpc_operand *operand;
       int invalid;
-      int need_comma;
-      int need_paren;
-
-      table_op = PPC_OP (opcode->opcode);
-      if (op < table_op)
-        break;
-      if (op > table_op)
-        continue;
 
       if ((insn & opcode->mask) != opcode->opcode
-          || (opcode->flags & dialect) == 0)
+          || (dialect != (ppc_cpu_t) -1
+              && ((opcode->flags & dialect) == 0
+                  || (opcode->deprecated & dialect) != 0)))
         continue;
 
-      /* Make two passes over the operands.  First see if any of them
-         have extraction functions, and, if they do, make sure the
-         instruction is valid.  */
+      /* Check validity of operands.  */
       invalid = 0;
       for (opindex = opcode->operands; *opindex != 0; opindex++)
         {
@@ -87,14 +123,77 @@ print_insn_powerpc (unsigned long insn, unsigned long memaddr)
       if (invalid)
         continue;
 
-      /* The instruction is valid.  */
-      printf("%s", opcode->name);
+      return opcode;
+    }
+
+  return NULL;
+}
+
+/* Print a PowerPC or POWER instruction.  */
+
+int print_insn_powerpc (unsigned long insn, unsigned long memaddr)
+{
+  const struct powerpc_opcode *opcode;
+  bool insn_is_short;
+  ppc_cpu_t dialect;
+
+  dialect = PPC_OPCODE_PPC | PPC_OPCODE_COMMON
+            | PPC_OPCODE_64 | PPC_OPCODE_POWER4 | PPC_OPCODE_ALTIVEC;
+
+  if (cpu_has_feature(CPU_FTRS_POWER5))
+    dialect |= PPC_OPCODE_POWER5;
+
+  if (cpu_has_feature(CPU_FTRS_CELL))
+    dialect |= (PPC_OPCODE_CELL | PPC_OPCODE_ALTIVEC);
+
+  if (cpu_has_feature(CPU_FTRS_POWER6))
+    dialect |= (PPC_OPCODE_POWER5 | PPC_OPCODE_POWER6 | PPC_OPCODE_ALTIVEC);
+
+  if (cpu_has_feature(CPU_FTRS_POWER7))
+    dialect |= (PPC_OPCODE_POWER5 | PPC_OPCODE_POWER6 | PPC_OPCODE_POWER7
+                | PPC_OPCODE_ALTIVEC | PPC_OPCODE_VSX);
+
+  if (cpu_has_feature(CPU_FTRS_POWER8))
+    dialect |= (PPC_OPCODE_POWER5 | PPC_OPCODE_POWER6 | PPC_OPCODE_POWER7
+                | PPC_OPCODE_POWER8 | PPC_OPCODE_HTM
+                | PPC_OPCODE_ALTIVEC | PPC_OPCODE_ALTIVEC2 | PPC_OPCODE_VSX);
+
+  if (cpu_has_feature(CPU_FTRS_POWER9))
+    dialect |= (PPC_OPCODE_POWER5 | PPC_OPCODE_POWER6 | PPC_OPCODE_POWER7
+                | PPC_OPCODE_POWER8 | PPC_OPCODE_POWER9 | PPC_OPCODE_HTM
+                | PPC_OPCODE_ALTIVEC | PPC_OPCODE_ALTIVEC2
+                | PPC_OPCODE_VSX | PPC_OPCODE_VSX3),
+
+  /* Get the major opcode of the insn.  */
+  opcode = NULL;
+  insn_is_short = false;
+
+  if (opcode == NULL)
+    opcode = lookup_powerpc (insn, dialect);
+  if (opcode == NULL && (dialect & PPC_OPCODE_ANY) != 0)
+    opcode = lookup_powerpc (insn, (ppc_cpu_t) -1);
+
+  if (opcode != NULL)
+    {
+      const unsigned char *opindex;
+      const struct powerpc_operand *operand;
+      int need_comma;
+      int need_paren;
+      int skip_optional;
+
       if (opcode->operands[0] != 0)
-        printf("\t");
+        printf("%-7s ", opcode->name);
+      else
+        printf("%s", opcode->name);
+
+      if (insn_is_short)
+        /* The operands will be fetched out of the 16-bit instruction.  */
+        insn >>= 16;
 
       /* Now extract and print the operands.  */
       need_comma = 0;
       need_paren = 0;
+      skip_optional = -1;
       for (opindex = opcode->operands; *opindex != 0; opindex++)
         {
           long value;
@@ -107,23 +206,18 @@ print_insn_powerpc (unsigned long insn, unsigned long memaddr)
           if ((operand->flags & PPC_OPERAND_FAKE) != 0)
             continue;
 
-          /* Extract the value from the instruction.  */
-          if (operand->extract)
-            value = (*operand->extract) (insn, dialect, &invalid);
-          else
+          /* If all of the optional operands have the value zero,
+             then don't print any of them.  */
+          if ((operand->flags & PPC_OPERAND_OPTIONAL) != 0)
             {
-              value = (insn >> operand->shift) & ((1 << operand->bits) - 1);
-              if ((operand->flags & PPC_OPERAND_SIGNED) != 0
-                  && (value & (1 << (operand->bits - 1))) != 0)
-                value -= 1 << operand->bits;
+              if (skip_optional < 0)
+                skip_optional = skip_optional_operands (opindex, insn,
+                                                        dialect);
+              if (skip_optional)
+                continue;
             }
 
-          /* If the operand is optional, and the value is zero, don't
-             print anything.  */
-          if ((operand->flags & PPC_OPERAND_OPTIONAL) != 0
-              && (operand->flags & PPC_OPERAND_NEXT) == 0
-              && value == 0)
-            continue;
+          value = operand_value_powerpc (operand, insn, dialect);
 
           if (need_comma)
             {
@@ -139,30 +233,38 @@ print_insn_powerpc (unsigned long insn, unsigned long memaddr)
             printf("f%ld", value);
           else if ((operand->flags & PPC_OPERAND_VR) != 0)
             printf("v%ld", value);
+          else if ((operand->flags & PPC_OPERAND_VSR) != 0)
+            printf("vs%ld", value);
           else if ((operand->flags & PPC_OPERAND_RELATIVE) != 0)
-            print_address (memaddr + value);
+            print_address(memaddr + value);
           else if ((operand->flags & PPC_OPERAND_ABSOLUTE) != 0)
-            print_address (value & 0xffffffff);
-          else if ((operand->flags & PPC_OPERAND_CR) == 0
-                   || (dialect & PPC_OPCODE_PPC) == 0)
+            print_address(value & 0xffffffff);
+          else if ((operand->flags & PPC_OPERAND_FSL) != 0)
+            printf("fsl%ld", value);
+          else if ((operand->flags & PPC_OPERAND_FCR) != 0)
+            printf("fcr%ld", value);
+          else if ((operand->flags & PPC_OPERAND_UDI) != 0)
             printf("%ld", value);
-          else
+          else if ((operand->flags & PPC_OPERAND_CR_REG) != 0
+                   && (((dialect & PPC_OPCODE_PPC) != 0)
+                       || ((dialect & PPC_OPCODE_VLE) != 0)))
+            printf("cr%ld", value);
+          else if (((operand->flags & PPC_OPERAND_CR_BIT) != 0)
+                   && (((dialect & PPC_OPCODE_PPC) != 0)
+                       || ((dialect & PPC_OPCODE_VLE) != 0)))
             {
-              if (operand->bits == 3)
-                printf("cr%ld", value);
-              else
-                {
-                  static const char *cbnames[4] = { "lt", "gt", "eq", "so" };
-                  int cr;
-                  int cc;
-
-                  cr = value >> 2;
-                  if (cr != 0)
-                    printf("4*cr%d+", cr);
-                  cc = value & 3;
-                  printf("%s", cbnames[cc]);
-                }
+              static const char *cbnames[4] = { "lt", "gt", "eq", "so" };
+              int cr;
+              int cc;
+
+              cr = value >> 2;
+              if (cr != 0)
+                printf("4*cr%d+", cr);
+              cc = value & 3;
+              printf("%s", cbnames[cc]);
             }
+          else
+            printf("%d", (int) value);
 
           if (need_paren)
             {
@@ -179,14 +281,16 @@ print_insn_powerpc (unsigned long insn, unsigned long memaddr)
             }
         }
 
-      /* We have found and printed an instruction; return.  */
-      return 4;
-    }
-
-  if ((dialect & PPC_OPCODE_ANY) != 0)
-    {
-      dialect = ~PPC_OPCODE_ANY;
-      goto again;
+      /* We have found and printed an instruction.
+         If it was a short VLE instruction we have more to do.  */
+      if (insn_is_short)
+        {
+          memaddr += 2;
+          return 2;
+        }
+      else
+        /* Otherwise, return.  */
+        return 4;
     }
 
   /* We could not find a match.  */
diff --git a/arch/powerpc/xmon/ppc-opc.c b/arch/powerpc/xmon/ppc-opc.c
index 954dbf8222d7..ac2b55b1332e 100644
--- a/arch/powerpc/xmon/ppc-opc.c
+++ b/arch/powerpc/xmon/ppc-opc.c
@@ -1,6 +1,5 @@
 /* ppc-opc.c -- PowerPC opcode list
-   Copyright 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2004,
-   2005 Free Software Foundation, Inc.
+   Copyright (C) 1994-2016 Free Software Foundation, Inc.
    Written by Ian Lance Taylor, Cygnus Support
 
    This file is part of GDB, GAS, and the GNU binutils.
@@ -42,66 +41,97 @@
 
 /* Local insertion and extraction functions.  */
 
-static unsigned long insert_bat (unsigned long, long, int, const char **);
-static long extract_bat (unsigned long, int, int *);
-static unsigned long insert_bba (unsigned long, long, int, const char **);
-static long extract_bba (unsigned long, int, int *);
-static unsigned long insert_bd (unsigned long, long, int, const char **);
-static long extract_bd (unsigned long, int, int *);
-static unsigned long insert_bdm (unsigned long, long, int, const char **);
-static long extract_bdm (unsigned long, int, int *);
-static unsigned long insert_bdp (unsigned long, long, int, const char **);
-static long extract_bdp (unsigned long, int, int *);
-static unsigned long insert_bo (unsigned long, long, int, const char **);
-static long extract_bo (unsigned long, int, int *);
-static unsigned long insert_boe (unsigned long, long, int, const char **);
-static long extract_boe (unsigned long, int, int *);
-static unsigned long insert_dq (unsigned long, long, int, const char **);
-static long extract_dq (unsigned long, int, int *);
-static unsigned long insert_ds (unsigned long, long, int, const char **);
-static long extract_ds (unsigned long, int, int *);
-static unsigned long insert_de (unsigned long, long, int, const char **);
-static long extract_de (unsigned long, int, int *);
-static unsigned long insert_des (unsigned long, long, int, const char **);
-static long extract_des (unsigned long, int, int *);
-static unsigned long insert_fxm (unsigned long, long, int, const char **);
-static long extract_fxm (unsigned long, int, int *);
-static unsigned long insert_li (unsigned long, long, int, const char **);
-static long extract_li (unsigned long, int, int *);
-static unsigned long insert_mbe (unsigned long, long, int, const char **);
-static long extract_mbe (unsigned long, int, int *);
-static unsigned long insert_mb6 (unsigned long, long, int, const char **);
-static long extract_mb6 (unsigned long, int, int *);
-static unsigned long insert_nb (unsigned long, long, int, const char **);
-static long extract_nb (unsigned long, int, int *);
-static unsigned long insert_nsi (unsigned long, long, int, const char **);
-static long extract_nsi (unsigned long, int, int *);
-static unsigned long insert_ral (unsigned long, long, int, const char **);
-static unsigned long insert_ram (unsigned long, long, int, const char **);
-static unsigned long insert_raq (unsigned long, long, int, const char **);
-static unsigned long insert_ras (unsigned long, long, int, const char **);
-static unsigned long insert_rbs (unsigned long, long, int, const char **);
-static long extract_rbs (unsigned long, int, int *);
-static unsigned long insert_rsq (unsigned long, long, int, const char **);
-static unsigned long insert_rtq (unsigned long, long, int, const char **);
-static unsigned long insert_sh6 (unsigned long, long, int, const char **);
-static long extract_sh6 (unsigned long, int, int *);
-static unsigned long insert_spr (unsigned long, long, int, const char **);
-static long extract_spr (unsigned long, int, int *);
-static unsigned long insert_sprg (unsigned long, long, int, const char **);
-static long extract_sprg (unsigned long, int, int *);
-static unsigned long insert_tbr (unsigned long, long, int, const char **);
-static long extract_tbr (unsigned long, int, int *);
-static unsigned long insert_ev2 (unsigned long, long, int, const char **);
-static long extract_ev2 (unsigned long, int, int *);
-static unsigned long insert_ev4 (unsigned long, long, int, const char **);
-static long extract_ev4 (unsigned long, int, int *);
-static unsigned long insert_ev8 (unsigned long, long, int, const char **);
-static long extract_ev8 (unsigned long, int, int *);
+static unsigned long insert_arx (unsigned long, long, ppc_cpu_t, const char **);
+static long extract_arx (unsigned long, ppc_cpu_t, int *);
+static unsigned long insert_ary (unsigned long, long, ppc_cpu_t, const char **);
+static long extract_ary (unsigned long, ppc_cpu_t, int *);
+static unsigned long insert_bat (unsigned long, long, ppc_cpu_t, const char **);
+static long extract_bat (unsigned long, ppc_cpu_t, int *);
+static unsigned long insert_bba (unsigned long, long, ppc_cpu_t, const char **);
+static long extract_bba (unsigned long, ppc_cpu_t, int *);
+static unsigned long insert_bdm (unsigned long, long, ppc_cpu_t, const char **);
+static long extract_bdm (unsigned long, ppc_cpu_t, int *);
+static unsigned long insert_bdp (unsigned long, long, ppc_cpu_t, const char **);
+static long extract_bdp (unsigned long, ppc_cpu_t, int *);
+static unsigned long insert_bo (unsigned long, long, ppc_cpu_t, const char **);
+static long extract_bo (unsigned long, ppc_cpu_t, int *);
+static unsigned long insert_boe (unsigned long, long, ppc_cpu_t, const char **);
+static long extract_boe (unsigned long, ppc_cpu_t, int *);
+static unsigned long insert_esync (unsigned long, long, ppc_cpu_t, const char **);
+static unsigned long insert_dcmxs (unsigned long, long, ppc_cpu_t, const char **);
+static long extract_dcmxs (unsigned long, ppc_cpu_t, int *);
+static unsigned long insert_dxd (unsigned long, long, ppc_cpu_t, const char **);
+static long extract_dxd (unsigned long, ppc_cpu_t, int *);
+static unsigned long insert_dxdn (unsigned long, long, ppc_cpu_t, const char **);
+static long extract_dxdn (unsigned long, ppc_cpu_t, int *);
+static unsigned long insert_fxm (unsigned long, long, ppc_cpu_t, const char **);
+static long extract_fxm (unsigned long, ppc_cpu_t, int *);
+static unsigned long insert_li20 (unsigned long, long, ppc_cpu_t, const char **);
+static long extract_li20 (unsigned long, ppc_cpu_t, int *);
+static unsigned long insert_ls (unsigned long, long, ppc_cpu_t, const char **);
+static unsigned long insert_mbe (unsigned long, long, ppc_cpu_t, const char **);
+static long extract_mbe (unsigned long, ppc_cpu_t, int *);
+static unsigned long insert_mb6 (unsigned long, long, ppc_cpu_t, const char **);
+static long extract_mb6 (unsigned long, ppc_cpu_t, int *);
+static long extract_nb (unsigned long, ppc_cpu_t, int *);
+static unsigned long insert_nbi (unsigned long, long, ppc_cpu_t, const char **);
+static unsigned long insert_nsi (unsigned long, long, ppc_cpu_t, const char **);
+static long extract_nsi (unsigned long, ppc_cpu_t, int *);
+static unsigned long insert_oimm (unsigned long, long, ppc_cpu_t, const char **);
+static long extract_oimm (unsigned long, ppc_cpu_t, int *);
+static unsigned long insert_ral (unsigned long, long, ppc_cpu_t, const char **);
+static unsigned long insert_ram (unsigned long, long, ppc_cpu_t, const char **);
+static unsigned long insert_raq (unsigned long, long, ppc_cpu_t, const char **);
+static unsigned long insert_ras (unsigned long, long, ppc_cpu_t, const char **);
+static unsigned long insert_rbs (unsigned long, long, ppc_cpu_t, const char **);
+static long extract_rbs (unsigned long, ppc_cpu_t, int *);
+static unsigned long insert_rbx (unsigned long, long, ppc_cpu_t, const char **);
+static unsigned long insert_rx (unsigned long, long, ppc_cpu_t, const char **);
+static long extract_rx (unsigned long, ppc_cpu_t, int *);
+static unsigned long insert_ry (unsigned long, long, ppc_cpu_t, const char **);
+static long extract_ry (unsigned long, ppc_cpu_t, int *);
+static unsigned long insert_sh6 (unsigned long, long, ppc_cpu_t, const char **);
+static long extract_sh6 (unsigned long, ppc_cpu_t, int *);
+static unsigned long insert_sci8 (unsigned long, long, ppc_cpu_t, const char **);
+static long extract_sci8 (unsigned long, ppc_cpu_t, int *);
+static unsigned long insert_sci8n (unsigned long, long, ppc_cpu_t, const char **);
+static long extract_sci8n (unsigned long, ppc_cpu_t, int *);
+static unsigned long insert_sd4h (unsigned long, long, ppc_cpu_t, const char **);
+static long extract_sd4h (unsigned long, ppc_cpu_t, int *);
+static unsigned long insert_sd4w (unsigned long, long, ppc_cpu_t, const char **);
+static long extract_sd4w (unsigned long, ppc_cpu_t, int *);
+static unsigned long insert_spr (unsigned long, long, ppc_cpu_t, const char **);
+static long extract_spr (unsigned long, ppc_cpu_t, int *);
+static unsigned long insert_sprg (unsigned long, long, ppc_cpu_t, const char **);
+static long extract_sprg (unsigned long, ppc_cpu_t, int *);
+static unsigned long insert_tbr (unsigned long, long, ppc_cpu_t, const char **);
+static long extract_tbr (unsigned long, ppc_cpu_t, int *);
+static unsigned long insert_xt6 (unsigned long, long, ppc_cpu_t, const char **);
+static long extract_xt6 (unsigned long, ppc_cpu_t, int *);
+static unsigned long insert_xtq6 (unsigned long, long, ppc_cpu_t, const char **);
+static long extract_xtq6 (unsigned long, ppc_cpu_t, int *);
+static unsigned long insert_xa6 (unsigned long, long, ppc_cpu_t, const char **);
+static long extract_xa6 (unsigned long, ppc_cpu_t, int *);
+static unsigned long insert_xb6 (unsigned long, long, ppc_cpu_t, const char **);
+static long extract_xb6 (unsigned long, ppc_cpu_t, int *);
+static unsigned long insert_xb6s (unsigned long, long, ppc_cpu_t, const char **);
+static long extract_xb6s (unsigned long, ppc_cpu_t, int *);
+static unsigned long insert_xc6 (unsigned long, long, ppc_cpu_t, const char **);
+static long extract_xc6 (unsigned long, ppc_cpu_t, int *);
+static unsigned long insert_dm (unsigned long, long, ppc_cpu_t, const char **);
+static long extract_dm (unsigned long, ppc_cpu_t, int *);
+static unsigned long insert_vlesi (unsigned long, long, ppc_cpu_t, const char **);
+static long extract_vlesi (unsigned long, ppc_cpu_t, int *);
+static unsigned long insert_vlensi (unsigned long, long, ppc_cpu_t, const char **);
+static long extract_vlensi (unsigned long, ppc_cpu_t, int *);
+static unsigned long insert_vleui (unsigned long, long, ppc_cpu_t, const char **);
+static long extract_vleui (unsigned long, ppc_cpu_t, int *);
+static unsigned long insert_vleil (unsigned long, long, ppc_cpu_t, const char **);
+static long extract_vleil (unsigned long, ppc_cpu_t, int *);
 
 /* The operands table.
 
-   The fields are bits, shift, insert, extract, flags.
+   The fields are bitm, shift, insert, extract, flags.
 
    We used to put parens around the various additions, like the one
    for BA just below.  However, that caused trouble with feeble
@@ -119,493 +149,934 @@ const struct powerpc_operand powerpc_operands[] =
 
   /* The BA field in an XL form instruction.  */
 #define BA UNUSED + 1
-#define BA_MASK (0x1f << 16)
-  { 5, 16, NULL, NULL, PPC_OPERAND_CR },
+  /* The BI field in a B form or XL form instruction.  */
+#define BI BA
+#define BI_MASK (0x1f << 16)
+  { 0x1f, 16, NULL, NULL, PPC_OPERAND_CR_BIT },
 
   /* The BA field in an XL form instruction when it must be the same
      as the BT field in the same instruction.  */
 #define BAT BA + 1
-  { 5, 16, insert_bat, extract_bat, PPC_OPERAND_FAKE },
+  { 0x1f, 16, insert_bat, extract_bat, PPC_OPERAND_FAKE },
 
   /* The BB field in an XL form instruction.  */
 #define BB BAT + 1
 #define BB_MASK (0x1f << 11)
-  { 5, 11, NULL, NULL, PPC_OPERAND_CR },
+  { 0x1f, 11, NULL, NULL, PPC_OPERAND_CR_BIT },
 
   /* The BB field in an XL form instruction when it must be the same
      as the BA field in the same instruction.  */
 #define BBA BB + 1
-  { 5, 11, insert_bba, extract_bba, PPC_OPERAND_FAKE },
+  /* The VB field in a VX form instruction when it must be the same
+     as the VA field in the same instruction.  */
+#define VBA BBA
+  { 0x1f, 11, insert_bba, extract_bba, PPC_OPERAND_FAKE },
 
   /* The BD field in a B form instruction.  The lower two bits are
      forced to zero.  */
 #define BD BBA + 1
-  { 16, 0, insert_bd, extract_bd, PPC_OPERAND_RELATIVE | PPC_OPERAND_SIGNED },
+  { 0xfffc, 0, NULL, NULL, PPC_OPERAND_RELATIVE | PPC_OPERAND_SIGNED },
 
   /* The BD field in a B form instruction when absolute addressing is
      used.  */
 #define BDA BD + 1
-  { 16, 0, insert_bd, extract_bd, PPC_OPERAND_ABSOLUTE | PPC_OPERAND_SIGNED },
+  { 0xfffc, 0, NULL, NULL, PPC_OPERAND_ABSOLUTE | PPC_OPERAND_SIGNED },
 
   /* The BD field in a B form instruction when the - modifier is used.
      This sets the y bit of the BO field appropriately.  */
 #define BDM BDA + 1
-  { 16, 0, insert_bdm, extract_bdm,
-      PPC_OPERAND_RELATIVE | PPC_OPERAND_SIGNED },
+  { 0xfffc, 0, insert_bdm, extract_bdm,
+    PPC_OPERAND_RELATIVE | PPC_OPERAND_SIGNED },
 
   /* The BD field in a B form instruction when the - modifier is used
      and absolute address is used.  */
 #define BDMA BDM + 1
-  { 16, 0, insert_bdm, extract_bdm,
-      PPC_OPERAND_ABSOLUTE | PPC_OPERAND_SIGNED },
+  { 0xfffc, 0, insert_bdm, extract_bdm,
+    PPC_OPERAND_ABSOLUTE | PPC_OPERAND_SIGNED },
 
   /* The BD field in a B form instruction when the + modifier is used.
      This sets the y bit of the BO field appropriately.  */
 #define BDP BDMA + 1
-  { 16, 0, insert_bdp, extract_bdp,
-      PPC_OPERAND_RELATIVE | PPC_OPERAND_SIGNED },
+  { 0xfffc, 0, insert_bdp, extract_bdp,
+    PPC_OPERAND_RELATIVE | PPC_OPERAND_SIGNED },
 
   /* The BD field in a B form instruction when the + modifier is used
      and absolute addressing is used.  */
 #define BDPA BDP + 1
-  { 16, 0, insert_bdp, extract_bdp,
-      PPC_OPERAND_ABSOLUTE | PPC_OPERAND_SIGNED },
+  { 0xfffc, 0, insert_bdp, extract_bdp,
+    PPC_OPERAND_ABSOLUTE | PPC_OPERAND_SIGNED },
 
   /* The BF field in an X or XL form instruction.  */
 #define BF BDPA + 1
-  { 3, 23, NULL, NULL, PPC_OPERAND_CR },
+  /* The CRFD field in an X form instruction.  */
+#define CRFD BF
+  /* The CRD field in an XL form instruction.  */
+#define CRD BF
+  { 0x7, 23, NULL, NULL, PPC_OPERAND_CR_REG },
+
+  /* The BF field in an X or XL form instruction.  */
+#define BFF BF + 1
+  { 0x7, 23, NULL, NULL, 0 },
 
   /* An optional BF field.  This is used for comparison instructions,
      in which an omitted BF field is taken as zero.  */
-#define OBF BF + 1
-  { 3, 23, NULL, NULL, PPC_OPERAND_CR | PPC_OPERAND_OPTIONAL },
+#define OBF BFF + 1
+  { 0x7, 23, NULL, NULL, PPC_OPERAND_CR_REG | PPC_OPERAND_OPTIONAL },
 
   /* The BFA field in an X or XL form instruction.  */
 #define BFA OBF + 1
-  { 3, 18, NULL, NULL, PPC_OPERAND_CR },
-
-  /* The BI field in a B form or XL form instruction.  */
-#define BI BFA + 1
-#define BI_MASK (0x1f << 16)
-  { 5, 16, NULL, NULL, PPC_OPERAND_CR },
+  { 0x7, 18, NULL, NULL, PPC_OPERAND_CR_REG },
 
   /* The BO field in a B form instruction.  Certain values are
      illegal.  */
-#define BO BI + 1
+#define BO BFA + 1
 #define BO_MASK (0x1f << 21)
-  { 5, 21, insert_bo, extract_bo, 0 },
+  { 0x1f, 21, insert_bo, extract_bo, 0 },
 
   /* The BO field in a B form instruction when the + or - modifier is
      used.  This is like the BO field, but it must be even.  */
 #define BOE BO + 1
-  { 5, 21, insert_boe, extract_boe, 0 },
+  { 0x1e, 21, insert_boe, extract_boe, 0 },
+
+  /* The RM field in an X form instruction.  */
+#define RM BOE + 1
+  { 0x3, 11, NULL, NULL, 0 },
 
-#define BH BOE + 1
-  { 2, 11, NULL, NULL, PPC_OPERAND_OPTIONAL },
+#define BH RM + 1
+  { 0x3, 11, NULL, NULL, PPC_OPERAND_OPTIONAL },
 
   /* The BT field in an X or XL form instruction.  */
 #define BT BH + 1
-  { 5, 21, NULL, NULL, PPC_OPERAND_CR },
+  { 0x1f, 21, NULL, NULL, PPC_OPERAND_CR_BIT },
+
+  /* The BI16 field in a BD8 form instruction.  */
+#define BI16 BT + 1
+  { 0x3, 8, NULL, NULL, PPC_OPERAND_CR_BIT },
+
+  /* The BI32 field in a BD15 form instruction.  */
+#define BI32 BI16 + 1
+  { 0xf, 16, NULL, NULL, PPC_OPERAND_CR_BIT },
+
+  /* The BO32 field in a BD15 form instruction.  */
+#define BO32 BI32 + 1
+  { 0x3, 20, NULL, NULL, 0 },
+
+  /* The B8 field in a BD8 form instruction.  */
+#define B8 BO32 + 1
+  { 0x1fe, -1, NULL, NULL, PPC_OPERAND_RELATIVE | PPC_OPERAND_SIGNED },
+
+  /* The B15 field in a BD15 form instruction.  The lowest bit is
+     forced to zero.  */
+#define B15 B8 + 1
+  { 0xfffe, 0, NULL, NULL, PPC_OPERAND_RELATIVE | PPC_OPERAND_SIGNED },
+
+  /* The B24 field in a BD24 form instruction.  The lowest bit is
+     forced to zero.  */
+#define B24 B15 + 1
+  { 0x1fffffe, 0, NULL, NULL, PPC_OPERAND_RELATIVE | PPC_OPERAND_SIGNED },
 
   /* The condition register number portion of the BI field in a B form
      or XL form instruction.  This is used for the extended
      conditional branch mnemonics, which set the lower two bits of the
      BI field.  This field is optional.  */
-#define CR BT + 1
-  { 3, 18, NULL, NULL, PPC_OPERAND_CR | PPC_OPERAND_OPTIONAL },
+#define CR B24 + 1
+  { 0x7, 18, NULL, NULL, PPC_OPERAND_CR_REG | PPC_OPERAND_OPTIONAL },
 
   /* The CRB field in an X form instruction.  */
 #define CRB CR + 1
-  { 5, 6, NULL, NULL, 0 },
+  /* The MB field in an M form instruction.  */
+#define MB CRB
+#define MB_MASK (0x1f << 6)
+  { 0x1f, 6, NULL, NULL, 0 },
 
-  /* The CRFD field in an X form instruction.  */
-#define CRFD CRB + 1
-  { 3, 23, NULL, NULL, PPC_OPERAND_CR },
+  /* The CRD32 field in an XL form instruction.  */
+#define CRD32 CRB + 1
+  { 0x3, 21, NULL, NULL, PPC_OPERAND_CR_REG },
 
   /* The CRFS field in an X form instruction.  */
-#define CRFS CRFD + 1
-  { 3, 0, NULL, NULL, PPC_OPERAND_CR },
+#define CRFS CRD32 + 1
+  { 0x7, 0, NULL, NULL, PPC_OPERAND_CR_REG },
+
+#define CRS CRFS + 1
+  { 0x3, 18, NULL, NULL, PPC_OPERAND_CR_REG | PPC_OPERAND_OPTIONAL },
 
   /* The CT field in an X form instruction.  */
-#define CT CRFS + 1
-  { 5, 21, NULL, NULL, PPC_OPERAND_OPTIONAL },
+#define CT CRS + 1
+  /* The MO field in an mbar instruction.  */
+#define MO CT
+  { 0x1f, 21, NULL, NULL, PPC_OPERAND_OPTIONAL },
 
   /* The D field in a D form instruction.  This is a displacement off
      a register, and implies that the next operand is a register in
      parentheses.  */
 #define D CT + 1
-  { 16, 0, NULL, NULL, PPC_OPERAND_PARENS | PPC_OPERAND_SIGNED },
+  { 0xffff, 0, NULL, NULL, PPC_OPERAND_PARENS | PPC_OPERAND_SIGNED },
 
-  /* The DE field in a DE form instruction.  This is like D, but is 12
-     bits only.  */
-#define DE D + 1
-  { 14, 0, insert_de, extract_de, PPC_OPERAND_PARENS },
+  /* The D8 field in a D form instruction.  This is a displacement off
+     a register, and implies that the next operand is a register in
+     parentheses.  */
+#define D8 D + 1
+  { 0xff, 0, NULL, NULL, PPC_OPERAND_PARENS | PPC_OPERAND_SIGNED },
+
+  /* The DCMX field in an X form instruction.  */
+#define DCMX D8 + 1
+  { 0x7f, 16, NULL, NULL, 0 },
 
-  /* The DES field in a DES form instruction.  This is like DS, but is 14
-     bits only (12 stored.)  */
-#define DES DE + 1
-  { 14, 0, insert_des, extract_des, PPC_OPERAND_PARENS | PPC_OPERAND_SIGNED },
+  /* The split DCMX field in an X form instruction.  */
+#define DCMXS DCMX + 1
+  { 0x7f, PPC_OPSHIFT_INV, insert_dcmxs, extract_dcmxs, 0 },
 
   /* The DQ field in a DQ form instruction.  This is like D, but the
      lower four bits are forced to zero. */
-#define DQ DES + 1
-  { 16, 0, insert_dq, extract_dq,
-      PPC_OPERAND_PARENS | PPC_OPERAND_SIGNED | PPC_OPERAND_DQ },
+#define DQ DCMXS + 1
+  { 0xfff0, 0, NULL, NULL,
+    PPC_OPERAND_PARENS | PPC_OPERAND_SIGNED | PPC_OPERAND_DQ },
 
   /* The DS field in a DS form instruction.  This is like D, but the
      lower two bits are forced to zero.  */
 #define DS DQ + 1
-  { 16, 0, insert_ds, extract_ds,
-      PPC_OPERAND_PARENS | PPC_OPERAND_SIGNED | PPC_OPERAND_DS },
+  { 0xfffc, 0, NULL, NULL,
+    PPC_OPERAND_PARENS | PPC_OPERAND_SIGNED | PPC_OPERAND_DS },
+
+  /* The DUIS or BHRBE fields in a XFX form instruction, 10 bits
+     unsigned imediate */
+#define DUIS DS + 1
+#define BHRBE DUIS
+  { 0x3ff, 11, NULL, NULL, 0 },
+
+  /* The split D field in a DX form instruction.  */
+#define DXD DUIS + 1
+  { 0xffff, PPC_OPSHIFT_INV, insert_dxd, extract_dxd,
+    PPC_OPERAND_SIGNED | PPC_OPERAND_SIGNOPT},
+
+  /* The split ND field in a DX form instruction.
+     This is the same as the DX field, only negated.  */
+#define NDXD DXD + 1
+  { 0xffff, PPC_OPSHIFT_INV, insert_dxdn, extract_dxdn,
+    PPC_OPERAND_NEGATIVE | PPC_OPERAND_SIGNED | PPC_OPERAND_SIGNOPT},
 
   /* The E field in a wrteei instruction.  */
-#define E DS + 1
-  { 1, 15, NULL, NULL, 0 },
+  /* And the W bit in the pair singles instructions.  */
+  /* And the ST field in a VX form instruction.  */
+#define E NDXD + 1
+#define PSW E
+#define ST E
+  { 0x1, 15, NULL, NULL, 0 },
 
   /* The FL1 field in a POWER SC form instruction.  */
 #define FL1 E + 1
-  { 4, 12, NULL, NULL, 0 },
+  /* The U field in an X form instruction.  */
+#define U FL1
+  { 0xf, 12, NULL, NULL, 0 },
 
   /* The FL2 field in a POWER SC form instruction.  */
 #define FL2 FL1 + 1
-  { 3, 2, NULL, NULL, 0 },
+  { 0x7, 2, NULL, NULL, 0 },
 
   /* The FLM field in an XFL form instruction.  */
 #define FLM FL2 + 1
-  { 8, 17, NULL, NULL, 0 },
+  { 0xff, 17, NULL, NULL, 0 },
 
   /* The FRA field in an X or A form instruction.  */
 #define FRA FLM + 1
 #define FRA_MASK (0x1f << 16)
-  { 5, 16, NULL, NULL, PPC_OPERAND_FPR },
+  { 0x1f, 16, NULL, NULL, PPC_OPERAND_FPR },
+
+  /* The FRAp field of DFP instructions.  */
+#define FRAp FRA + 1
+  { 0x1e, 16, NULL, NULL, PPC_OPERAND_FPR },
 
   /* The FRB field in an X or A form instruction.  */
-#define FRB FRA + 1
+#define FRB FRAp + 1
 #define FRB_MASK (0x1f << 11)
-  { 5, 11, NULL, NULL, PPC_OPERAND_FPR },
+  { 0x1f, 11, NULL, NULL, PPC_OPERAND_FPR },
+
+  /* The FRBp field of DFP instructions.  */
+#define FRBp FRB + 1
+  { 0x1e, 11, NULL, NULL, PPC_OPERAND_FPR },
 
   /* The FRC field in an A form instruction.  */
-#define FRC FRB + 1
+#define FRC FRBp + 1
 #define FRC_MASK (0x1f << 6)
-  { 5, 6, NULL, NULL, PPC_OPERAND_FPR },
+  { 0x1f, 6, NULL, NULL, PPC_OPERAND_FPR },
 
   /* The FRS field in an X form instruction or the FRT field in a D, X
      or A form instruction.  */
 #define FRS FRC + 1
 #define FRT FRS
-  { 5, 21, NULL, NULL, PPC_OPERAND_FPR },
+  { 0x1f, 21, NULL, NULL, PPC_OPERAND_FPR },
+
+  /* The FRSp field of stfdp or the FRTp field of lfdp and DFP
+     instructions.  */
+#define FRSp FRS + 1
+#define FRTp FRSp
+  { 0x1e, 21, NULL, NULL, PPC_OPERAND_FPR },
 
   /* The FXM field in an XFX instruction.  */
-#define FXM FRS + 1
-#define FXM_MASK (0xff << 12)
-  { 8, 12, insert_fxm, extract_fxm, 0 },
+#define FXM FRSp + 1
+  { 0xff, 12, insert_fxm, extract_fxm, 0 },
 
   /* Power4 version for mfcr.  */
 #define FXM4 FXM + 1
-  { 8, 12, insert_fxm, extract_fxm, PPC_OPERAND_OPTIONAL },
+  { 0xff, 12, insert_fxm, extract_fxm,
+    PPC_OPERAND_OPTIONAL | PPC_OPERAND_OPTIONAL_VALUE},
+  /* If the FXM4 operand is ommitted, use the sentinel value -1.  */
+  { -1, -1, NULL, NULL, 0},
+
+  /* The IMM20 field in an LI instruction.  */
+#define IMM20 FXM4 + 2
+  { 0xfffff, PPC_OPSHIFT_INV, insert_li20, extract_li20, PPC_OPERAND_SIGNED},
 
   /* The L field in a D or X form instruction.  */
-#define L FXM4 + 1
-  { 1, 21, NULL, NULL, PPC_OPERAND_OPTIONAL },
+#define L IMM20 + 1
+  { 0x1, 21, NULL, NULL, 0 },
+
+  /* The optional L field in tlbie and tlbiel instructions.  */
+#define LOPT L + 1
+  /* The R field in a HTM X form instruction.  */
+#define HTM_R LOPT
+  { 0x1, 21, NULL, NULL, PPC_OPERAND_OPTIONAL },
+
+  /* The optional (for 32-bit) L field in cmp[l][i] instructions.  */
+#define L32OPT LOPT + 1
+  { 0x1, 21, NULL, NULL, PPC_OPERAND_OPTIONAL | PPC_OPERAND_OPTIONAL32 },
+
+  /* The L field in dcbf instruction.  */
+#define L2OPT L32OPT + 1
+  { 0x3, 21, NULL, NULL, PPC_OPERAND_OPTIONAL },
 
   /* The LEV field in a POWER SVC form instruction.  */
-#define SVC_LEV L + 1
-  { 7, 5, NULL, NULL, 0 },
+#define SVC_LEV L2OPT + 1
+  { 0x7f, 5, NULL, NULL, 0 },
 
   /* The LEV field in an SC form instruction.  */
 #define LEV SVC_LEV + 1
-  { 7, 5, NULL, NULL, PPC_OPERAND_OPTIONAL },
+  { 0x7f, 5, NULL, NULL, PPC_OPERAND_OPTIONAL },
 
   /* The LI field in an I form instruction.  The lower two bits are
      forced to zero.  */
 #define LI LEV + 1
-  { 26, 0, insert_li, extract_li, PPC_OPERAND_RELATIVE | PPC_OPERAND_SIGNED },
+  { 0x3fffffc, 0, NULL, NULL, PPC_OPERAND_RELATIVE | PPC_OPERAND_SIGNED },
 
   /* The LI field in an I form instruction when used as an absolute
      address.  */
 #define LIA LI + 1
-  { 26, 0, insert_li, extract_li, PPC_OPERAND_ABSOLUTE | PPC_OPERAND_SIGNED },
+  { 0x3fffffc, 0, NULL, NULL, PPC_OPERAND_ABSOLUTE | PPC_OPERAND_SIGNED },
 
-  /* The LS field in an X (sync) form instruction.  */
+  /* The LS or WC field in an X (sync or wait) form instruction.  */
 #define LS LIA + 1
-  { 2, 21, NULL, NULL, PPC_OPERAND_OPTIONAL },
-
-  /* The MB field in an M form instruction.  */
-#define MB LS + 1
-#define MB_MASK (0x1f << 6)
-  { 5, 6, NULL, NULL, 0 },
+#define WC LS
+  { 0x3, 21, insert_ls, NULL, PPC_OPERAND_OPTIONAL },
 
   /* The ME field in an M form instruction.  */
-#define ME MB + 1
+#define ME LS + 1
 #define ME_MASK (0x1f << 1)
-  { 5, 1, NULL, NULL, 0 },
+  { 0x1f, 1, NULL, NULL, 0 },
 
   /* The MB and ME fields in an M form instruction expressed a single
      operand which is a bitmask indicating which bits to select.  This
      is a two operand form using PPC_OPERAND_NEXT.  See the
      description in opcode/ppc.h for what this means.  */
 #define MBE ME + 1
-  { 5, 6, NULL, NULL, PPC_OPERAND_OPTIONAL | PPC_OPERAND_NEXT },
-  { 32, 0, insert_mbe, extract_mbe, 0 },
+  { 0x1f, 6, NULL, NULL, PPC_OPERAND_OPTIONAL | PPC_OPERAND_NEXT },
+  { -1, 0, insert_mbe, extract_mbe, 0 },
 
   /* The MB or ME field in an MD or MDS form instruction.  The high
      bit is wrapped to the low end.  */
 #define MB6 MBE + 2
 #define ME6 MB6
 #define MB6_MASK (0x3f << 5)
-  { 6, 5, insert_mb6, extract_mb6, 0 },
-
-  /* The MO field in an mbar instruction.  */
-#define MO MB6 + 1
-  { 5, 21, NULL, NULL, PPC_OPERAND_OPTIONAL },
+  { 0x3f, 5, insert_mb6, extract_mb6, 0 },
 
   /* The NB field in an X form instruction.  The value 32 is stored as
      0.  */
-#define NB MO + 1
-  { 6, 11, insert_nb, extract_nb, 0 },
+#define NB MB6 + 1
+  { 0x1f, 11, NULL, extract_nb, PPC_OPERAND_PLUS1 },
+
+  /* The NBI field in an lswi instruction, which has special value
+     restrictions.  The value 32 is stored as 0.  */
+#define NBI NB + 1
+  { 0x1f, 11, insert_nbi, extract_nb, PPC_OPERAND_PLUS1 },
 
   /* The NSI field in a D form instruction.  This is the same as the
      SI field, only negated.  */
-#define NSI NB + 1
-  { 16, 0, insert_nsi, extract_nsi,
-      PPC_OPERAND_NEGATIVE | PPC_OPERAND_SIGNED },
+#define NSI NBI + 1
+  { 0xffff, 0, insert_nsi, extract_nsi,
+    PPC_OPERAND_NEGATIVE | PPC_OPERAND_SIGNED },
+
+  /* The NSI field in a D form instruction when we accept a wide range
+     of positive values.  */
+#define NSISIGNOPT NSI + 1
+  { 0xffff, 0, insert_nsi, extract_nsi,
+    PPC_OPERAND_NEGATIVE | PPC_OPERAND_SIGNED | PPC_OPERAND_SIGNOPT },
 
   /* The RA field in an D, DS, DQ, X, XO, M, or MDS form instruction.  */
-#define RA NSI + 1
+#define RA NSISIGNOPT + 1
 #define RA_MASK (0x1f << 16)
-  { 5, 16, NULL, NULL, PPC_OPERAND_GPR },
+  { 0x1f, 16, NULL, NULL, PPC_OPERAND_GPR },
 
   /* As above, but 0 in the RA field means zero, not r0.  */
 #define RA0 RA + 1
-  { 5, 16, NULL, NULL, PPC_OPERAND_GPR_0 },
+  { 0x1f, 16, NULL, NULL, PPC_OPERAND_GPR_0 },
 
-  /* The RA field in the DQ form lq instruction, which has special
+  /* The RA field in the DQ form lq or an lswx instruction, which have special
      value restrictions.  */
 #define RAQ RA0 + 1
-  { 5, 16, insert_raq, NULL, PPC_OPERAND_GPR_0 },
+#define RAX RAQ
+  { 0x1f, 16, insert_raq, NULL, PPC_OPERAND_GPR_0 },
 
   /* The RA field in a D or X form instruction which is an updating
      load, which means that the RA field may not be zero and may not
      equal the RT field.  */
 #define RAL RAQ + 1
-  { 5, 16, insert_ral, NULL, PPC_OPERAND_GPR_0 },
+  { 0x1f, 16, insert_ral, NULL, PPC_OPERAND_GPR_0 },
 
   /* The RA field in an lmw instruction, which has special value
      restrictions.  */
 #define RAM RAL + 1
-  { 5, 16, insert_ram, NULL, PPC_OPERAND_GPR_0 },
+  { 0x1f, 16, insert_ram, NULL, PPC_OPERAND_GPR_0 },
 
   /* The RA field in a D or X form instruction which is an updating
      store or an updating floating point load, which means that the RA
      field may not be zero.  */
 #define RAS RAM + 1
-  { 5, 16, insert_ras, NULL, PPC_OPERAND_GPR_0 },
+  { 0x1f, 16, insert_ras, NULL, PPC_OPERAND_GPR_0 },
 
-  /* The RA field of the tlbwe instruction, which is optional.  */
+  /* The RA field of the tlbwe, dccci and iccci instructions,
+     which are optional.  */
 #define RAOPT RAS + 1
-  { 5, 16, NULL, NULL, PPC_OPERAND_GPR | PPC_OPERAND_OPTIONAL },
+  { 0x1f, 16, NULL, NULL, PPC_OPERAND_GPR | PPC_OPERAND_OPTIONAL },
 
   /* The RB field in an X, XO, M, or MDS form instruction.  */
 #define RB RAOPT + 1
 #define RB_MASK (0x1f << 11)
-  { 5, 11, NULL, NULL, PPC_OPERAND_GPR },
+  { 0x1f, 11, NULL, NULL, PPC_OPERAND_GPR },
 
   /* The RB field in an X form instruction when it must be the same as
      the RS field in the instruction.  This is used for extended
      mnemonics like mr.  */
 #define RBS RB + 1
-  { 5, 1, insert_rbs, extract_rbs, PPC_OPERAND_FAKE },
+  { 0x1f, 11, insert_rbs, extract_rbs, PPC_OPERAND_FAKE },
+
+  /* The RB field in an lswx instruction, which has special value
+     restrictions.  */
+#define RBX RBS + 1
+  { 0x1f, 11, insert_rbx, NULL, PPC_OPERAND_GPR },
+
+  /* The RB field of the dccci and iccci instructions, which are optional.  */
+#define RBOPT RBX + 1
+  { 0x1f, 11, NULL, NULL, PPC_OPERAND_GPR | PPC_OPERAND_OPTIONAL },
+
+  /* The RC register field in an maddld, maddhd or maddhdu instruction.  */
+#define RC RBOPT + 1
+  { 0x1f, 6, NULL, NULL, PPC_OPERAND_GPR },
 
   /* The RS field in a D, DS, X, XFX, XS, M, MD or MDS form
      instruction or the RT field in a D, DS, X, XFX or XO form
      instruction.  */
-#define RS RBS + 1
+#define RS RC + 1
 #define RT RS
 #define RT_MASK (0x1f << 21)
-  { 5, 21, NULL, NULL, PPC_OPERAND_GPR },
+#define RD RS
+  { 0x1f, 21, NULL, NULL, PPC_OPERAND_GPR },
 
-  /* The RS field of the DS form stq instruction, which has special
-     value restrictions.  */
+  /* The RS and RT fields of the DS form stq and DQ form lq instructions,
+     which have special value restrictions.  */
 #define RSQ RS + 1
-  { 5, 21, insert_rsq, NULL, PPC_OPERAND_GPR_0 },
-
-  /* The RT field of the DQ form lq instruction, which has special
-     value restrictions.  */
-#define RTQ RSQ + 1
-  { 5, 21, insert_rtq, NULL, PPC_OPERAND_GPR_0 },
+#define RTQ RSQ
+  { 0x1e, 21, NULL, NULL, PPC_OPERAND_GPR },
 
   /* The RS field of the tlbwe instruction, which is optional.  */
-#define RSO RTQ + 1
+#define RSO RSQ + 1
 #define RTO RSO
-  { 5, 21, NULL, NULL, PPC_OPERAND_GPR | PPC_OPERAND_OPTIONAL },
+  { 0x1f, 21, NULL, NULL, PPC_OPERAND_GPR | PPC_OPERAND_OPTIONAL },
+
+  /* The RX field of the SE_RR form instruction.  */
+#define RX RSO + 1
+  { 0x1f, PPC_OPSHIFT_INV, insert_rx, extract_rx, PPC_OPERAND_GPR },
+
+  /* The ARX field of the SE_RR form instruction.  */
+#define ARX RX + 1
+  { 0x1f, PPC_OPSHIFT_INV, insert_arx, extract_arx, PPC_OPERAND_GPR },
+
+  /* The RY field of the SE_RR form instruction.  */
+#define RY ARX + 1
+#define RZ RY
+  { 0x1f, PPC_OPSHIFT_INV, insert_ry, extract_ry, PPC_OPERAND_GPR },
+
+  /* The ARY field of the SE_RR form instruction.  */
+#define ARY RY + 1
+  { 0x1f, PPC_OPSHIFT_INV, insert_ary, extract_ary, PPC_OPERAND_GPR },
+
+  /* The SCLSCI8 field in a D form instruction.  */
+#define SCLSCI8 ARY + 1
+  { 0xffffffff, PPC_OPSHIFT_INV, insert_sci8, extract_sci8, 0 },
+
+  /* The SCLSCI8N field in a D form instruction.  This is the same as the
+     SCLSCI8 field, only negated.  */
+#define SCLSCI8N SCLSCI8 + 1
+  { 0xffffffff, PPC_OPSHIFT_INV, insert_sci8n, extract_sci8n,
+    PPC_OPERAND_NEGATIVE | PPC_OPERAND_SIGNED },
+
+  /* The SD field of the SD4 form instruction.  */
+#define SE_SD SCLSCI8N + 1
+  { 0xf, 8, NULL, NULL, PPC_OPERAND_PARENS },
+
+  /* The SD field of the SD4 form instruction, for halfword.  */
+#define SE_SDH SE_SD + 1
+  { 0x1e, PPC_OPSHIFT_INV, insert_sd4h, extract_sd4h, PPC_OPERAND_PARENS },
+
+  /* The SD field of the SD4 form instruction, for word.  */
+#define SE_SDW SE_SDH + 1
+  { 0x3c, PPC_OPSHIFT_INV, insert_sd4w, extract_sd4w, PPC_OPERAND_PARENS },
 
   /* The SH field in an X or M form instruction.  */
-#define SH RSO + 1
+#define SH SE_SDW + 1
 #define SH_MASK (0x1f << 11)
-  { 5, 11, NULL, NULL, 0 },
+  /* The other UIMM field in a EVX form instruction.  */
+#define EVUIMM SH
+  /* The FC field in an atomic X form instruction.  */
+#define FC SH
+  { 0x1f, 11, NULL, NULL, 0 },
+
+  /* The SI field in a HTM X form instruction.  */
+#define HTM_SI SH + 1
+  { 0x1f, 11, NULL, NULL, PPC_OPERAND_SIGNED },
 
   /* The SH field in an MD form instruction.  This is split.  */
-#define SH6 SH + 1
+#define SH6 HTM_SI + 1
 #define SH6_MASK ((0x1f << 11) | (1 << 1))
-  { 6, 1, insert_sh6, extract_sh6, 0 },
+  { 0x3f, PPC_OPSHIFT_INV, insert_sh6, extract_sh6, 0 },
 
   /* The SH field of the tlbwe instruction, which is optional.  */
 #define SHO SH6 + 1
-  { 5, 11,NULL, NULL, PPC_OPERAND_OPTIONAL },
+  { 0x1f, 11, NULL, NULL, PPC_OPERAND_OPTIONAL },
 
   /* The SI field in a D form instruction.  */
 #define SI SHO + 1
-  { 16, 0, NULL, NULL, PPC_OPERAND_SIGNED },
+  { 0xffff, 0, NULL, NULL, PPC_OPERAND_SIGNED },
 
   /* The SI field in a D form instruction when we accept a wide range
      of positive values.  */
 #define SISIGNOPT SI + 1
-  { 16, 0, NULL, NULL, PPC_OPERAND_SIGNED | PPC_OPERAND_SIGNOPT },
+  { 0xffff, 0, NULL, NULL, PPC_OPERAND_SIGNED | PPC_OPERAND_SIGNOPT },
+
+  /* The SI8 field in a D form instruction.  */
+#define SI8 SISIGNOPT + 1
+  { 0xff, 0, NULL, NULL, PPC_OPERAND_SIGNED },
 
   /* The SPR field in an XFX form instruction.  This is flipped--the
      lower 5 bits are stored in the upper 5 and vice- versa.  */
-#define SPR SISIGNOPT + 1
+#define SPR SI8 + 1
 #define PMR SPR
+#define TMR SPR
 #define SPR_MASK (0x3ff << 11)
-  { 10, 11, insert_spr, extract_spr, 0 },
+  { 0x3ff, 11, insert_spr, extract_spr, 0 },
 
   /* The BAT index number in an XFX form m[ft]ibat[lu] instruction.  */
 #define SPRBAT SPR + 1
 #define SPRBAT_MASK (0x3 << 17)
-  { 2, 17, NULL, NULL, 0 },
+  { 0x3, 17, NULL, NULL, 0 },
 
   /* The SPRG register number in an XFX form m[ft]sprg instruction.  */
 #define SPRG SPRBAT + 1
-  { 5, 16, insert_sprg, extract_sprg, 0 },
+  { 0x1f, 16, insert_sprg, extract_sprg, 0 },
 
   /* The SR field in an X form instruction.  */
 #define SR SPRG + 1
-  { 4, 16, NULL, NULL, 0 },
+  /* The 4-bit UIMM field in a VX form instruction.  */
+#define UIMM4 SR
+  { 0xf, 16, NULL, NULL, 0 },
 
   /* The STRM field in an X AltiVec form instruction.  */
 #define STRM SR + 1
-#define STRM_MASK (0x3 << 21)
-  { 2, 21, NULL, NULL, 0 },
+  /* The T field in a tlbilx form instruction.  */
+#define T STRM
+  /* The L field in wclr instructions.  */
+#define L2 STRM
+  { 0x3, 21, NULL, NULL, 0 },
+
+  /* The ESYNC field in an X (sync) form instruction.  */
+#define ESYNC STRM + 1
+  { 0xf, 16, insert_esync, NULL, PPC_OPERAND_OPTIONAL },
 
   /* The SV field in a POWER SC form instruction.  */
-#define SV STRM + 1
-  { 14, 2, NULL, NULL, 0 },
+#define SV ESYNC + 1
+  { 0x3fff, 2, NULL, NULL, 0 },
 
   /* The TBR field in an XFX form instruction.  This is like the SPR
      field, but it is optional.  */
 #define TBR SV + 1
-  { 10, 11, insert_tbr, extract_tbr, PPC_OPERAND_OPTIONAL },
+  { 0x3ff, 11, insert_tbr, extract_tbr,
+    PPC_OPERAND_OPTIONAL | PPC_OPERAND_OPTIONAL_VALUE},
+  /* If the TBR operand is ommitted, use the value 268.  */
+  { -1, 268, NULL, NULL, 0},
 
   /* The TO field in a D or X form instruction.  */
-#define TO TBR + 1
+#define TO TBR + 2
+#define DUI TO
 #define TO_MASK (0x1f << 21)
-  { 5, 21, NULL, NULL, 0 },
-
-  /* The U field in an X form instruction.  */
-#define U TO + 1
-  { 4, 12, NULL, NULL, 0 },
+  { 0x1f, 21, NULL, NULL, 0 },
 
   /* The UI field in a D form instruction.  */
-#define UI U + 1
-  { 16, 0, NULL, NULL, 0 },
+#define UI TO + 1
+  { 0xffff, 0, NULL, NULL, 0 },
+
+#define UISIGNOPT UI + 1
+  { 0xffff, 0, NULL, NULL, PPC_OPERAND_SIGNOPT },
+
+  /* The IMM field in an SE_IM5 instruction.  */
+#define UI5 UISIGNOPT + 1
+  { 0x1f, 4, NULL, NULL, 0 },
+
+  /* The OIMM field in an SE_OIM5 instruction.  */
+#define OIMM5 UI5 + 1
+  { 0x1f, PPC_OPSHIFT_INV, insert_oimm, extract_oimm, PPC_OPERAND_PLUS1 },
+
+  /* The UI7 field in an SE_LI instruction.  */
+#define UI7 OIMM5 + 1
+  { 0x7f, 4, NULL, NULL, 0 },
 
   /* The VA field in a VA, VX or VXR form instruction.  */
-#define VA UI + 1
-#define VA_MASK (0x1f << 16)
-  { 5, 16, NULL, NULL, PPC_OPERAND_VR },
+#define VA UI7 + 1
+  { 0x1f, 16, NULL, NULL, PPC_OPERAND_VR },
 
   /* The VB field in a VA, VX or VXR form instruction.  */
 #define VB VA + 1
-#define VB_MASK (0x1f << 11)
-  { 5, 11, NULL, NULL, PPC_OPERAND_VR },
+  { 0x1f, 11, NULL, NULL, PPC_OPERAND_VR },
 
   /* The VC field in a VA form instruction.  */
 #define VC VB + 1
-#define VC_MASK (0x1f << 6)
-  { 5, 6, NULL, NULL, PPC_OPERAND_VR },
+  { 0x1f, 6, NULL, NULL, PPC_OPERAND_VR },
 
   /* The VD or VS field in a VA, VX, VXR or X form instruction.  */
 #define VD VC + 1
 #define VS VD
-#define VD_MASK (0x1f << 21)
-  { 5, 21, NULL, NULL, PPC_OPERAND_VR },
+  { 0x1f, 21, NULL, NULL, PPC_OPERAND_VR },
 
-  /* The SIMM field in a VX form instruction.  */
+  /* The SIMM field in a VX form instruction, and TE in Z form.  */
 #define SIMM VD + 1
-  { 5, 16, NULL, NULL, PPC_OPERAND_SIGNED},
+#define TE SIMM
+  { 0x1f, 16, NULL, NULL, PPC_OPERAND_SIGNED},
 
   /* The UIMM field in a VX form instruction.  */
 #define UIMM SIMM + 1
-  { 5, 16, NULL, NULL, 0 },
+#define DCTL UIMM
+  { 0x1f, 16, NULL, NULL, 0 },
 
-  /* The SHB field in a VA form instruction.  */
-#define SHB UIMM + 1
-  { 4, 6, NULL, NULL, 0 },
+  /* The 3-bit UIMM field in a VX form instruction.  */
+#define UIMM3 UIMM + 1
+  { 0x7, 16, NULL, NULL, 0 },
 
-  /* The other UIMM field in a EVX form instruction.  */
-#define EVUIMM SHB + 1
-  { 5, 11, NULL, NULL, 0 },
+  /* The 6-bit UIM field in a X form instruction.  */
+#define UIM6 UIMM3 + 1
+  { 0x3f, 16, NULL, NULL, 0 },
+
+  /* The SIX field in a VX form instruction.  */
+#define SIX UIM6 + 1
+  { 0xf, 11, NULL, NULL, 0 },
+
+  /* The PS field in a VX form instruction.  */
+#define PS SIX + 1
+  { 0x1, 9, NULL, NULL, 0 },
+
+  /* The SHB field in a VA form instruction.  */
+#define SHB PS + 1
+  { 0xf, 6, NULL, NULL, 0 },
 
   /* The other UIMM field in a half word EVX form instruction.  */
-#define EVUIMM_2 EVUIMM + 1
-  { 32, 11, insert_ev2, extract_ev2, PPC_OPERAND_PARENS },
+#define EVUIMM_2 SHB + 1
+  { 0x3e, 10, NULL, NULL, PPC_OPERAND_PARENS },
 
   /* The other UIMM field in a word EVX form instruction.  */
 #define EVUIMM_4 EVUIMM_2 + 1
-  { 32, 11, insert_ev4, extract_ev4, PPC_OPERAND_PARENS },
+  { 0x7c, 9, NULL, NULL, PPC_OPERAND_PARENS },
 
   /* The other UIMM field in a double EVX form instruction.  */
 #define EVUIMM_8 EVUIMM_4 + 1
-  { 32, 11, insert_ev8, extract_ev8, PPC_OPERAND_PARENS },
+  { 0xf8, 8, NULL, NULL, PPC_OPERAND_PARENS },
 
-  /* The WS field.  */
+  /* The WS or DRM field in an X form instruction.  */
 #define WS EVUIMM_8 + 1
-#define WS_MASK (0x7 << 11)
-  { 3, 11, NULL, NULL, 0 },
-
-  /* The L field in an mtmsrd or A form instruction.  */
-#define MTMSRD_L WS + 1
-#define A_L MTMSRD_L
-  { 1, 16, NULL, NULL, PPC_OPERAND_OPTIONAL },
+#define DRM WS
+  { 0x7, 11, NULL, NULL, 0 },
+
+  /* PowerPC paired singles extensions.  */
+  /* W bit in the pair singles instructions for x type instructions.  */
+#define PSWM WS + 1
+  /* The BO16 field in a BD8 form instruction.  */
+#define BO16 PSWM
+  {  0x1, 10, 0, 0, 0 },
+
+  /* IDX bits for quantization in the pair singles instructions.  */
+#define PSQ PSWM + 1
+  {  0x7, 12, 0, 0, 0 },
+
+  /* IDX bits for quantization in the pair singles x-type instructions.  */
+#define PSQM PSQ + 1
+  {  0x7, 7, 0, 0, 0 },
+
+  /* Smaller D field for quantization in the pair singles instructions.  */
+#define PSD PSQM + 1
+  {  0xfff, 0, 0, 0,  PPC_OPERAND_PARENS | PPC_OPERAND_SIGNED },
+
+  /* The L field in an mtmsrd or A form instruction or R or W in an X form.  */
+#define A_L PSD + 1
+#define W A_L
+#define X_R A_L
+  { 0x1, 16, NULL, NULL, PPC_OPERAND_OPTIONAL },
+
+  /* The RMC or CY field in a Z23 form instruction.  */
+#define RMC A_L + 1
+#define CY RMC
+  { 0x3, 9, NULL, NULL, 0 },
 
-  /* The DCM field in a Z form instruction.  */
-#define DCM MTMSRD_L + 1
-  { 6, 16, NULL, NULL, 0 },
-
-  /* Likewise, the DGM field in a Z form instruction.  */
-#define DGM DCM + 1
-  { 6, 16, NULL, NULL, 0 },
+#define R RMC + 1
+  { 0x1, 16, NULL, NULL, 0 },
 
-#define TE DGM + 1
-  { 5, 11, NULL, NULL, 0 },
+#define RIC R + 1
+  { 0x3, 18, NULL, NULL, PPC_OPERAND_OPTIONAL },
 
-#define RMC TE + 1
-  { 2, 21, NULL, NULL, 0 },
+#define PRS RIC + 1
+  { 0x1, 17, NULL, NULL, PPC_OPERAND_OPTIONAL },
 
-#define R RMC + 1
-  { 1, 15, NULL, NULL, 0 },
-
-#define SP R + 1
-  { 2, 11, NULL, NULL, 0 },
+#define SP PRS + 1
+  { 0x3, 19, NULL, NULL, 0 },
 
 #define S SP + 1
-  { 1, 11, NULL, NULL, 0 },
+  { 0x1, 20, NULL, NULL, 0 },
 
-  /* SH field starting at bit position 16.  */
-#define SH16 S + 1
-  { 6, 10, NULL, NULL, 0 },
+  /* The S field in a XL form instruction.  */
+#define SXL S + 1
+  { 0x1, 11, NULL, NULL, PPC_OPERAND_OPTIONAL | PPC_OPERAND_OPTIONAL_VALUE},
+  /* If the SXL operand is ommitted, use the value 1.  */
+  { -1, 1, NULL, NULL, 0},
 
-  /* The L field in an X form with the RT field fixed instruction.  */
-#define XRT_L SH16 + 1
-  { 2, 21, NULL, NULL, PPC_OPERAND_OPTIONAL },
+  /* SH field starting at bit position 16.  */
+#define SH16 SXL + 2
+  /* The DCM and DGM fields in a Z form instruction.  */
+#define DCM SH16
+#define DGM DCM
+  { 0x3f, 10, NULL, NULL, 0 },
 
   /* The EH field in larx instruction.  */
-#define EH XRT_L + 1
-  { 1, 0, NULL, NULL, PPC_OPERAND_OPTIONAL },
+#define EH SH16 + 1
+  { 0x1, 0, NULL, NULL, PPC_OPERAND_OPTIONAL },
+
+  /* The L field in an mtfsf or XFL form instruction.  */
+  /* The A field in a HTM X form instruction.  */
+#define XFL_L EH + 1
+#define HTM_A XFL_L
+  { 0x1, 25, NULL, NULL, PPC_OPERAND_OPTIONAL},
+
+  /* Xilinx APU related masks and macros */
+#define FCRT XFL_L + 1
+#define FCRT_MASK (0x1f << 21)
+  { 0x1f, 21, 0, 0, PPC_OPERAND_FCR },
+
+  /* Xilinx FSL related masks and macros */
+#define FSL FCRT + 1
+#define FSL_MASK (0x1f << 11)
+  { 0x1f, 11, 0, 0, PPC_OPERAND_FSL },
+
+  /* Xilinx UDI related masks and macros */
+#define URT FSL + 1
+  { 0x1f, 21, 0, 0, PPC_OPERAND_UDI },
+
+#define URA URT + 1
+  { 0x1f, 16, 0, 0, PPC_OPERAND_UDI },
+
+#define URB URA + 1
+  { 0x1f, 11, 0, 0, PPC_OPERAND_UDI },
+
+#define URC URB + 1
+  { 0x1f, 6, 0, 0, PPC_OPERAND_UDI },
+
+  /* The VLESIMM field in a D form instruction.  */
+#define VLESIMM URC + 1
+  { 0xffff, PPC_OPSHIFT_INV, insert_vlesi, extract_vlesi,
+    PPC_OPERAND_SIGNED | PPC_OPERAND_SIGNOPT },
+
+  /* The VLENSIMM field in a D form instruction.  */
+#define VLENSIMM VLESIMM + 1
+  { 0xffff, PPC_OPSHIFT_INV, insert_vlensi, extract_vlensi,
+    PPC_OPERAND_NEGATIVE | PPC_OPERAND_SIGNED | PPC_OPERAND_SIGNOPT },
+
+  /* The VLEUIMM field in a D form instruction.  */
+#define VLEUIMM VLENSIMM + 1
+  { 0xffff, PPC_OPSHIFT_INV, insert_vleui, extract_vleui, 0 },
+
+  /* The VLEUIMML field in a D form instruction.  */
+#define VLEUIMML VLEUIMM + 1
+  { 0xffff, PPC_OPSHIFT_INV, insert_vleil, extract_vleil, 0 },
+
+  /* The XT and XS fields in an XX1 or XX3 form instruction.  This is split.  */
+#define XS6 VLEUIMML + 1
+#define XT6 XS6
+  { 0x3f, PPC_OPSHIFT_INV, insert_xt6, extract_xt6, PPC_OPERAND_VSR },
+
+  /* The XT and XS fields in an DQ form VSX instruction.  This is split.  */
+#define XSQ6 XT6 + 1
+#define XTQ6 XSQ6
+  { 0x3f, PPC_OPSHIFT_INV, insert_xtq6, extract_xtq6, PPC_OPERAND_VSR },
+
+  /* The XA field in an XX3 form instruction.  This is split.  */
+#define XA6 XTQ6 + 1
+  { 0x3f, PPC_OPSHIFT_INV, insert_xa6, extract_xa6, PPC_OPERAND_VSR },
+
+  /* The XB field in an XX2 or XX3 form instruction.  This is split.  */
+#define XB6 XA6 + 1
+  { 0x3f, PPC_OPSHIFT_INV, insert_xb6, extract_xb6, PPC_OPERAND_VSR },
+
+  /* The XB field in an XX3 form instruction when it must be the same as
+     the XA field in the instruction.  This is used in extended mnemonics
+     like xvmovdp.  This is split.  */
+#define XB6S XB6 + 1
+  { 0x3f, PPC_OPSHIFT_INV, insert_xb6s, extract_xb6s, PPC_OPERAND_FAKE },
+
+  /* The XC field in an XX4 form instruction.  This is split.  */
+#define XC6 XB6S + 1
+  { 0x3f, PPC_OPSHIFT_INV, insert_xc6, extract_xc6, PPC_OPERAND_VSR },
+
+  /* The DM or SHW field in an XX3 form instruction.  */
+#define DM XC6 + 1
+#define SHW DM
+  { 0x3, 8, NULL, NULL, 0 },
+
+  /* The DM field in an extended mnemonic XX3 form instruction.  */
+#define DMEX DM + 1
+  { 0x3, 8, insert_dm, extract_dm, 0 },
+
+  /* The UIM field in an XX2 form instruction.  */
+#define UIM DMEX + 1
+  /* The 2-bit UIMM field in a VX form instruction.  */
+#define UIMM2 UIM
+  /* The 2-bit L field in a darn instruction.  */
+#define LRAND UIM
+  { 0x3, 16, NULL, NULL, 0 },
+
+#define ERAT_T UIM + 1
+  { 0x7, 21, NULL, NULL, 0 },
+
+#define IH ERAT_T + 1
+  { 0x7, 21, NULL, NULL, PPC_OPERAND_OPTIONAL },
+
+  /* The 8-bit IMM8 field in a XX1 form instruction.  */
+#define IMM8 IH + 1
+  { 0xff, 11, NULL, NULL, PPC_OPERAND_SIGNOPT },
 };
 
+const unsigned int num_powerpc_operands = (sizeof (powerpc_operands)
+                                           / sizeof (powerpc_operands[0]));
+
 /* The functions used to insert and extract complicated operands.  */
 
+/* The ARX, ARY, RX and RY operands are alternate encodings of GPRs.  */
+
+static unsigned long
+insert_arx (unsigned long insn,
+            long value,
+            ppc_cpu_t dialect ATTRIBUTE_UNUSED,
+            const char **errmsg ATTRIBUTE_UNUSED)
+{
+  if (value >= 8 && value < 24)
+    return insn | ((value - 8) & 0xf);
+  else
+    {
+      *errmsg = _("invalid register");
+      return 0;
+    }
+}
+
+static long
+extract_arx (unsigned long insn,
+             ppc_cpu_t dialect ATTRIBUTE_UNUSED,
+             int *invalid ATTRIBUTE_UNUSED)
+{
+  return (insn & 0xf) + 8;
+}
+
+static unsigned long
+insert_ary (unsigned long insn,
+            long value,
+            ppc_cpu_t dialect ATTRIBUTE_UNUSED,
+            const char **errmsg ATTRIBUTE_UNUSED)
+{
+  if (value >= 8 && value < 24)
+    return insn | (((value - 8) & 0xf) << 4);
+  else
+    {
+      *errmsg = _("invalid register");
+      return 0;
+    }
+}
+
+static long
+extract_ary (unsigned long insn,
+             ppc_cpu_t dialect ATTRIBUTE_UNUSED,
+             int *invalid ATTRIBUTE_UNUSED)
+{
+  return ((insn >> 4) & 0xf) + 8;
+}
+
+static unsigned long
+insert_rx (unsigned long insn,
+           long value,
+           ppc_cpu_t dialect ATTRIBUTE_UNUSED,
+           const char **errmsg)
+{
+  if (value >= 0 && value < 8)
+    return insn | value;
+  else if (value >= 24 && value <= 31)
+    return insn | (value - 16);
+  else
+    {
+      *errmsg = _("invalid register");
+      return 0;
+    }
+}
+
+static long
+extract_rx (unsigned long insn,
+            ppc_cpu_t dialect ATTRIBUTE_UNUSED,
+            int *invalid ATTRIBUTE_UNUSED)
+{
+  int value = insn & 0xf;
+  if (value >= 0 && value < 8)
+    return value;
+  else
+    return value + 16;
+}
+
+static unsigned long
+insert_ry (unsigned long insn,
+           long value,
+           ppc_cpu_t dialect ATTRIBUTE_UNUSED,
+           const char **errmsg)
+{
+  if (value >= 0 && value < 8)
+    return insn | (value << 4);
+  else if (value >= 24 && value <= 31)
+    return insn | ((value - 16) << 4);
+  else
+    {
+      *errmsg = _("invalid register");
+      return 0;
+    }
+}
+
+static long
+extract_ry (unsigned long insn,
+            ppc_cpu_t dialect ATTRIBUTE_UNUSED,
+            int *invalid ATTRIBUTE_UNUSED)
+{
+  int value = (insn >> 4) & 0xf;
+  if (value >= 0 && value < 8)
+    return value;
+  else
+    return value + 16;
+}
+
 /* The BA field in an XL form instruction when it must be the same as
    the BT field in the same instruction.  This operand is marked FAKE.
    The insertion function just copies the BT field into the BA field,
@@ -615,7 +1086,7 @@ const struct powerpc_operand powerpc_operands[] =
 static unsigned long
 insert_bat (unsigned long insn,
             long value ATTRIBUTE_UNUSED,
-            int dialect ATTRIBUTE_UNUSED,
+            ppc_cpu_t dialect ATTRIBUTE_UNUSED,
             const char **errmsg ATTRIBUTE_UNUSED)
 {
   return insn | (((insn >> 21) & 0x1f) << 16);
@@ -623,7 +1094,7 @@ insert_bat (unsigned long insn,
 
 static long
 extract_bat (unsigned long insn,
-             int dialect ATTRIBUTE_UNUSED,
+             ppc_cpu_t dialect ATTRIBUTE_UNUSED,
              int *invalid)
 {
   if (((insn >> 21) & 0x1f) != ((insn >> 16) & 0x1f))
@@ -640,7 +1111,7 @@ extract_bat (unsigned long insn,
 static unsigned long
 insert_bba (unsigned long insn,
             long value ATTRIBUTE_UNUSED,
-            int dialect ATTRIBUTE_UNUSED,
+            ppc_cpu_t dialect ATTRIBUTE_UNUSED,
             const char **errmsg ATTRIBUTE_UNUSED)
 {
   return insn | (((insn >> 16) & 0x1f) << 11);
@@ -648,7 +1119,7 @@ insert_bba (unsigned long insn,
 
 static long
 extract_bba (unsigned long insn,
-             int dialect ATTRIBUTE_UNUSED,
+             ppc_cpu_t dialect ATTRIBUTE_UNUSED,
              int *invalid)
 {
   if (((insn >> 16) & 0x1f) != ((insn >> 11) & 0x1f))
@@ -656,26 +1127,6 @@ extract_bba (unsigned long insn,
   return 0;
 }
 
-/* The BD field in a B form instruction.  The lower two bits are
-   forced to zero.  */
-
-static unsigned long
-insert_bd (unsigned long insn,
-           long value,
-           int dialect ATTRIBUTE_UNUSED,
-           const char **errmsg ATTRIBUTE_UNUSED)
-{
-  return insn | (value & 0xfffc);
-}
-
-static long
-extract_bd (unsigned long insn,
-            int dialect ATTRIBUTE_UNUSED,
-            int *invalid ATTRIBUTE_UNUSED)
-{
-  return ((insn & 0xfffc) ^ 0x8000) - 0x8000;
-}
-
 /* The BD field in a B form instruction when the - modifier is used.
    This modifier means that the branch is not expected to be taken.
    For chips built to versions of the architecture prior to version 2
@@ -687,15 +1138,21 @@ extract_bd (unsigned long insn,
    the "y" bit.  "at" == 00 => no hint, "at" == 01 => unpredictable,
    "at" == 10 => not taken, "at" == 11 => taken.  The "t" bit is 00001
    in BO field, the "a" bit is 00010 for branch on CR(BI) and 01000
-   for branch on CTR.  We only handle the taken/not-taken hint here.  */
+   for branch on CTR.  We only handle the taken/not-taken hint here.
+   Note that we don't relax the conditions tested here when
+   disassembling with -Many because insns using extract_bdm and
+   extract_bdp always occur in pairs.  One or the other will always
+   be valid.  */
+
+#define ISA_V2 (PPC_OPCODE_POWER4 | PPC_OPCODE_E500MC | PPC_OPCODE_TITAN)
 
 static unsigned long
 insert_bdm (unsigned long insn,
             long value,
-            int dialect,
+            ppc_cpu_t dialect,
             const char **errmsg ATTRIBUTE_UNUSED)
 {
-  if ((dialect & PPC_OPCODE_POWER4) == 0)
+  if ((dialect & ISA_V2) == 0)
     {
       if ((value & 0x8000) != 0)
         insn |= 1 << 21;
@@ -712,10 +1169,10 @@ insert_bdm (unsigned long insn,
 
 static long
 extract_bdm (unsigned long insn,
-             int dialect,
+             ppc_cpu_t dialect,
              int *invalid)
 {
-  if ((dialect & PPC_OPCODE_POWER4) == 0)
+  if ((dialect & ISA_V2) == 0)
     {
       if (((insn & (1 << 21)) == 0) != ((insn & (1 << 15)) == 0))
         *invalid = 1;
@@ -737,10 +1194,10 @@ extract_bdm (unsigned long insn,
 static unsigned long
 insert_bdp (unsigned long insn,
             long value,
-            int dialect,
+            ppc_cpu_t dialect,
             const char **errmsg ATTRIBUTE_UNUSED)
 {
-  if ((dialect & PPC_OPCODE_POWER4) == 0)
+  if ((dialect & ISA_V2) == 0)
     {
       if ((value & 0x8000) == 0)
         insn |= 1 << 21;
@@ -757,10 +1214,10 @@ insert_bdp (unsigned long insn,
 
 static long
 extract_bdp (unsigned long insn,
-             int dialect,
+             ppc_cpu_t dialect,
              int *invalid)
 {
-  if ((dialect & PPC_OPCODE_POWER4) == 0)
+  if ((dialect & ISA_V2) == 0)
     {
       if (((insn & (1 << 21)) == 0) == ((insn & (1 << 15)) == 0))
         *invalid = 1;
@@ -775,55 +1232,70 @@ extract_bdp (unsigned long insn,
   return ((insn & 0xfffc) ^ 0x8000) - 0x8000;
 }
 
+static inline int
+valid_bo_pre_v2 (long value)
+{
+  /* Certain encodings have bits that are required to be zero.
+     These are (z must be zero, y may be anything):
+         0000y
+         0001y
+         001zy
+         0100y
+         0101y
+         011zy
+         1z00y
+         1z01y
+         1z1zz
+  */
+  if ((value & 0x14) == 0)
+    return 1;
+  else if ((value & 0x14) == 0x4)
+    return (value & 0x2) == 0;
+  else if ((value & 0x14) == 0x10)
+    return (value & 0x8) == 0;
+  else
+    return value == 0x14;
+}
+
+static inline int
+valid_bo_post_v2 (long value)
+{
+  /* Certain encodings have bits that are required to be zero.
+     These are (z must be zero, a & t may be anything):
+         0000z
+         0001z
+         001at
+         0100z
+         0101z
+         011at
+         1a00t
+         1a01t
+         1z1zz
+  */
+  if ((value & 0x14) == 0)
+    return (value & 0x1) == 0;
+  else if ((value & 0x14) == 0x14)
+    return value == 0x14;
+  else
+    return 1;
+}
+
 /* Check for legal values of a BO field.  */
 
 static int
-valid_bo (long value, int dialect)
+valid_bo (long value, ppc_cpu_t dialect, int extract)
 {
-  if ((dialect & PPC_OPCODE_POWER4) == 0)
-    {
-      /* Certain encodings have bits that are required to be zero.
-         These are (z must be zero, y may be anything):
-             001zy
-             011zy
-             1z00y
-             1z01y
-             1z1zz
-      */
-      switch (value & 0x14)
-        {
-        default:
-        case 0:
-          return 1;
-        case 0x4:
-          return (value & 0x2) == 0;
-        case 0x10:
-          return (value & 0x8) == 0;
-        case 0x14:
-          return value == 0x14;
-        }
-    }
+  int valid_y = valid_bo_pre_v2 (value);
+  int valid_at = valid_bo_post_v2 (value);
+
+  /* When disassembling with -Many, accept either encoding on the
+     second pass through opcodes.  */
+  if (extract && dialect == ~(ppc_cpu_t) PPC_OPCODE_ANY)
+    return valid_y || valid_at;
+  if ((dialect & ISA_V2) == 0)
+    return valid_y;
   else
-    {
-      /* Certain encodings have bits that are required to be zero.
-         These are (z must be zero, a & t may be anything):
-             0000z
-             0001z
-             0100z
-             0101z
-             001at
-             011at
-             1a00t
-             1a01t
-             1z1zz
-      */
-      if ((value & 0x14) == 0)
-        return (value & 0x1) == 0;
-      else if ((value & 0x14) == 0x14)
-        return value == 0x14;
-      else
-        return 1;
-    }
+    return valid_at;
 }
 
 /* The BO field in a B form instruction.  Warn about attempts to set
@@ -832,23 +1304,25 @@ valid_bo (long value, int dialect)
 static unsigned long
 insert_bo (unsigned long insn,
            long value,
-           int dialect,
+           ppc_cpu_t dialect,
            const char **errmsg)
 {
-  if (!valid_bo (value, dialect))
+  if (!valid_bo (value, dialect, 0))
     *errmsg = _("invalid conditional option");
+  else if (PPC_OP (insn) == 19 && (insn & 0x400) && ! (value & 4))
+    *errmsg = _("invalid counter access");
   return insn | ((value & 0x1f) << 21);
 }
 
 static long
 extract_bo (unsigned long insn,
-            int dialect,
+            ppc_cpu_t dialect,
             int *invalid)
 {
   long value;
 
   value = (insn >> 21) & 0x1f;
-  if (!valid_bo (value, dialect))
+  if (!valid_bo (value, dialect, 1))
     *invalid = 1;
   return value;
 }
@@ -860,11 +1334,13 @@ extract_bo (unsigned long insn,
 static unsigned long
 insert_boe (unsigned long insn,
             long value,
-            int dialect,
+            ppc_cpu_t dialect,
             const char **errmsg)
 {
-  if (!valid_bo (value, dialect))
+  if (!valid_bo (value, dialect, 0))
     *errmsg = _("invalid conditional option");
+  else if (PPC_OP (insn) == 19 && (insn & 0x400) && ! (value & 4))
+    *errmsg = _("invalid counter access");
   else if ((value & 1) != 0)
     *errmsg = _("attempt to set y bit when using + or - modifier");
 
@@ -873,166 +1349,73 @@ insert_boe (unsigned long insn,
 
 static long
 extract_boe (unsigned long insn,
-             int dialect,
+             ppc_cpu_t dialect,
              int *invalid)
 {
   long value;
 
   value = (insn >> 21) & 0x1f;
-  if (!valid_bo (value, dialect))
+  if (!valid_bo (value, dialect, 1))
     *invalid = 1;
   return value & 0x1e;
 }
 
-/* The DQ field in a DQ form instruction.  This is like D, but the
-   lower four bits are forced to zero. */
-
-static unsigned long
-insert_dq (unsigned long insn,
-           long value,
-           int dialect ATTRIBUTE_UNUSED,
-           const char **errmsg)
-{
-  if ((value & 0xf) != 0)
-    *errmsg = _("offset not a multiple of 16");
-  return insn | (value & 0xfff0);
-}
-
-static long
-extract_dq (unsigned long insn,
-            int dialect ATTRIBUTE_UNUSED,
-            int *invalid ATTRIBUTE_UNUSED)
-{
-  return ((insn & 0xfff0) ^ 0x8000) - 0x8000;
-}
+/* The DCMX field in a X form instruction when the field is split
+   into separate DC, DM and DX fields.  */
 
 static unsigned long
-insert_ev2 (unsigned long insn,
+insert_dcmxs (unsigned long insn,
             long value,
-            int dialect ATTRIBUTE_UNUSED,
-            const char **errmsg)
+            ppc_cpu_t dialect ATTRIBUTE_UNUSED,
+            const char **errmsg ATTRIBUTE_UNUSED)
 {
-  if ((value & 1) != 0)
-    *errmsg = _("offset not a multiple of 2");
-  if ((value > 62) != 0)
-    *errmsg = _("offset greater than 62");
-  return insn | ((value & 0x3e) << 10);
+  return insn | ((value & 0x1f) << 16) | ((value & 0x20) >> 3) | (value & 0x40);
 }
 
 static long
-extract_ev2 (unsigned long insn,
-             int dialect ATTRIBUTE_UNUSED,
+extract_dcmxs (unsigned long insn,
+             ppc_cpu_t dialect ATTRIBUTE_UNUSED,
              int *invalid ATTRIBUTE_UNUSED)
 {
-  return (insn >> 10) & 0x3e;
+  return (insn & 0x40) | ((insn << 3) & 0x20) | ((insn >> 16) & 0x1f);
 }
 
-static unsigned long
-insert_ev4 (unsigned long insn,
-            long value,
-            int dialect ATTRIBUTE_UNUSED,
-            const char **errmsg)
-{
-  if ((value & 3) != 0)
-    *errmsg = _("offset not a multiple of 4");
-  if ((value > 124) != 0)
-    *errmsg = _("offset greater than 124");
-  return insn | ((value & 0x7c) << 9);
-}
-
-static long
-extract_ev4 (unsigned long insn,
-             int dialect ATTRIBUTE_UNUSED,
-             int *invalid ATTRIBUTE_UNUSED)
-{
-  return (insn >> 9) & 0x7c;
-}
+/* The D field in a DX form instruction when the field is split
+   into separate D0, D1 and D2 fields.  */
 
 static unsigned long
-insert_ev8 (unsigned long insn,
+insert_dxd (unsigned long insn,
             long value,
-            int dialect ATTRIBUTE_UNUSED,
-            const char **errmsg)
+            ppc_cpu_t dialect ATTRIBUTE_UNUSED,
+            const char **errmsg ATTRIBUTE_UNUSED)
 {
-  if ((value & 7) != 0)
-    *errmsg = _("offset not a multiple of 8");
-  if ((value > 248) != 0)
-    *errmsg = _("offset greater than 248");
-  return insn | ((value & 0xf8) << 8);
+  return insn | (value & 0xffc1) | ((value & 0x3e) << 15);
 }
 
 static long
-extract_ev8 (unsigned long insn,
-             int dialect ATTRIBUTE_UNUSED,
+extract_dxd (unsigned long insn,
+             ppc_cpu_t dialect ATTRIBUTE_UNUSED,
              int *invalid ATTRIBUTE_UNUSED)
 {
-  return (insn >> 8) & 0xf8;
+  unsigned long dxd = (insn & 0xffc1) | ((insn >> 15) & 0x3e);
+  return (dxd ^ 0x8000) - 0x8000;
 }
 
-/* The DS field in a DS form instruction.  This is like D, but the
-   lower two bits are forced to zero.  */
-
 static unsigned long
-insert_ds (unsigned long insn,
-           long value,
-           int dialect ATTRIBUTE_UNUSED,
-           const char **errmsg)
-{
-  if ((value & 3) != 0)
-    *errmsg = _("offset not a multiple of 4");
-  return insn | (value & 0xfffc);
-}
-
-static long
-extract_ds (unsigned long insn,
-            int dialect ATTRIBUTE_UNUSED,
-            int *invalid ATTRIBUTE_UNUSED)
-{
-  return ((insn & 0xfffc) ^ 0x8000) - 0x8000;
-}
-
-/* The DE field in a DE form instruction.  */
-
-static unsigned long
-insert_de (unsigned long insn,
-           long value,
-           int dialect ATTRIBUTE_UNUSED,
-           const char **errmsg)
-{
-  if (value > 2047 || value < -2048)
-    *errmsg = _("offset not between -2048 and 2047");
-  return insn | ((value << 4) & 0xfff0);
-}
-
-static long
-extract_de (unsigned long insn,
-            int dialect ATTRIBUTE_UNUSED,
-            int *invalid ATTRIBUTE_UNUSED)
-{
-  return (insn & 0xfff0) >> 4;
-}
-
-/* The DES field in a DES form instruction.  */
-
-static unsigned long
-insert_des (unsigned long insn,
+insert_dxdn (unsigned long insn,
             long value,
-            int dialect ATTRIBUTE_UNUSED,
-            const char **errmsg)
+            ppc_cpu_t dialect ATTRIBUTE_UNUSED,
+            const char **errmsg ATTRIBUTE_UNUSED)
 {
-  if (value > 8191 || value < -8192)
-    *errmsg = _("offset not between -8192 and 8191");
-  else if ((value & 3) != 0)
-    *errmsg = _("offset not a multiple of 4");
-  return insn | ((value << 2) & 0xfff0);
+  return insert_dxd (insn, -value, dialect, errmsg);
 }
 
 static long
-extract_des (unsigned long insn,
-             int dialect ATTRIBUTE_UNUSED,
+extract_dxdn (unsigned long insn,
+             ppc_cpu_t dialect ATTRIBUTE_UNUSED,
              int *invalid ATTRIBUTE_UNUSED)
 {
-  return (((insn >> 2) & 0x3ffc) ^ 0x2000) - 0x2000;
+  return -extract_dxd (insn, dialect, invalid);
 }
 
 /* FXM mask in mfcr and mtcrf instructions.  */
@@ -1040,7 +1423,7 @@ extract_des (unsigned long insn,
 static unsigned long
 insert_fxm (unsigned long insn,
             long value,
-            int dialect,
+            ppc_cpu_t dialect,
             const char **errmsg)
 {
   /* If we're handling the mfocrf and mtocrf insns ensure that exactly
@@ -1054,19 +1437,13 @@ insert_fxm (unsigned long insn,
         }
     }
 
-  /* If the optional field on mfcr is missing that means we want to use
-     the old form of the instruction that moves the whole cr.  In that
-     case we'll have VALUE zero.  There doesn't seem to be a way to
-     distinguish this from the case where someone writes mfcr %r3,0.  */
-  else if (value == 0)
-    ;
-
   /* If only one bit of the FXM field is set, we can use the new form
      of the instruction, which is faster.  Unlike the Power4 branch hint
      encoding, this is not backward compatible.  Do not generate the
      new form unless -mpower4 has been given, or -many and the two
      operand form of mfcr was used.  */
-  else if ((value & -value) == value
+  else if (value > 0
+           && (value & -value) == value
            && ((dialect & PPC_OPCODE_POWER4) != 0
                || ((dialect & PPC_OPCODE_ANY) != 0
                    && (insn & (0x3ff << 1)) == 19 << 1)))
@@ -1075,7 +1452,10 @@ insert_fxm (unsigned long insn,
   /* Any other value on mfcr is an error.  */
   else if ((insn & (0x3ff << 1)) == 19 << 1)
     {
-      *errmsg = _("ignoring invalid mfcr mask");
+      /* A value of -1 means we used the one operand form of
+         mfcr which is valid.  */
+      if (value != -1)
+        *errmsg = _("invalid mfcr mask");
       value = 0;
     }
 
@@ -1084,7 +1464,7 @@ insert_fxm (unsigned long insn,
 
 static long
 extract_fxm (unsigned long insn,
-             int dialect ATTRIBUTE_UNUSED,
+             ppc_cpu_t dialect ATTRIBUTE_UNUSED,
              int *invalid)
 {
   long mask = (insn >> 12) & 0xff;
@@ -1102,31 +1482,86 @@ extract_fxm (unsigned long insn,
     {
       if (mask != 0)
         *invalid = 1;
+      else
+        mask = -1;
     }
 
   return mask;
 }
 
-/* The LI field in an I form instruction.  The lower two bits are
-   forced to zero.  */
+static unsigned long
+insert_li20 (unsigned long insn,
+             long value,
+             ppc_cpu_t dialect ATTRIBUTE_UNUSED,
+             const char **errmsg ATTRIBUTE_UNUSED)
+{
+  return insn | ((value & 0xf0000) >> 5) | ((value & 0x0f800) << 5) | (value & 0x7ff);
+}
+
+static long
+extract_li20 (unsigned long insn,
+              ppc_cpu_t dialect ATTRIBUTE_UNUSED,
+              int *invalid ATTRIBUTE_UNUSED)
+{
+  long ext = ((insn & 0x4000) == 0x4000) ? 0xfff00000 : 0x00000000;
+
+  return ext
+         | (((insn >> 11) & 0xf) << 16)
+         | (((insn >> 17) & 0xf) << 12)
+         | (((insn >> 16) & 0x1) << 11)
+         | (insn & 0x7ff);
+}
+
+/* The 2-bit L field in a SYNC or WC field in a WAIT instruction.
+   For SYNC, some L values are reserved:
+     * Value 3 is reserved on newer server cpus.
+     * Values 2 and 3 are reserved on all other cpus.  */
 
 static unsigned long
-insert_li (unsigned long insn,
+insert_ls (unsigned long insn,
            long value,
-           int dialect ATTRIBUTE_UNUSED,
+           ppc_cpu_t dialect,
            const char **errmsg)
 {
-  if ((value & 3) != 0)
-    *errmsg = _("ignoring least significant bits in branch offset");
-  return insn | (value & 0x3fffffc);
+  /* For SYNC, some L values are illegal.  */
+  if (((insn >> 1) & 0x3ff) == 598)
+    {
+      long max_lvalue = (dialect & PPC_OPCODE_POWER4) ? 2 : 1;
+      if (value > max_lvalue)
+        {
+          *errmsg = _("illegal L operand value");
+          return insn;
+        }
+    }
+
+  return insn | ((value & 0x3) << 21);
 }
 
-static long
-extract_li (unsigned long insn,
-            int dialect ATTRIBUTE_UNUSED,
-            int *invalid ATTRIBUTE_UNUSED)
+/* The 4-bit E field in a sync instruction that accepts 2 operands.
+   If ESYNC is non-zero, then the L field must be either 0 or 1 and
+   the complement of ESYNC-bit2.  */
+
+static unsigned long
+insert_esync (unsigned long insn,
+              long value,
+              ppc_cpu_t dialect,
+              const char **errmsg)
 {
-  return ((insn & 0x3fffffc) ^ 0x2000000) - 0x2000000;
+  unsigned long ls = (insn >> 21) & 0x03;
+
+  if (value == 0)
+    {
+      if (((dialect & PPC_OPCODE_E6500) != 0 && ls > 1)
+          || ((dialect & PPC_OPCODE_POWER9) != 0 && ls > 2))
+        *errmsg = _("illegal L operand value");
+      return insn;
+    }
+
+  if ((ls & ~0x1)
+      || (((value >> 1) & 0x1) ^ ls) == 0)
+        *errmsg = _("incompatible L operand value");
+
+  return insn | ((value & 0xf) << 16);
 }
 
 /* The MB and ME fields in an M form instruction expressed as a single
@@ -1137,7 +1572,7 @@ extract_li (unsigned long insn,
 static unsigned long
 insert_mbe (unsigned long insn,
             long value,
-            int dialect ATTRIBUTE_UNUSED,
+            ppc_cpu_t dialect ATTRIBUTE_UNUSED,
             const char **errmsg)
 {
   unsigned long uval, mask;
@@ -1189,7 +1624,7 @@ insert_mbe (unsigned long insn,
 
 static long
 extract_mbe (unsigned long insn,
-             int dialect ATTRIBUTE_UNUSED,
+             ppc_cpu_t dialect ATTRIBUTE_UNUSED,
              int *invalid)
 {
   long ret;
@@ -1223,7 +1658,7 @@ extract_mbe (unsigned long insn,
 static unsigned long
 insert_mb6 (unsigned long insn,
             long value,
-            int dialect ATTRIBUTE_UNUSED,
+            ppc_cpu_t dialect ATTRIBUTE_UNUSED,
             const char **errmsg ATTRIBUTE_UNUSED)
 {
   return insn | ((value & 0x1f) << 6) | (value & 0x20);
@@ -1231,7 +1666,7 @@ insert_mb6 (unsigned long insn,
 
 static long
 extract_mb6 (unsigned long insn,
-             int dialect ATTRIBUTE_UNUSED,
+             ppc_cpu_t dialect ATTRIBUTE_UNUSED,
              int *invalid ATTRIBUTE_UNUSED)
 {
   return ((insn >> 6) & 0x1f) | (insn & 0x20);
@@ -1240,22 +1675,9 @@ extract_mb6 (unsigned long insn,
 /* The NB field in an X form instruction.  The value 32 is stored as
    0.  */
 
-static unsigned long
-insert_nb (unsigned long insn,
-           long value,
-           int dialect ATTRIBUTE_UNUSED,
-           const char **errmsg)
-{
-  if (value < 0 || value > 32)
-    *errmsg = _("value out of range");
-  if (value == 32)
-    value = 0;
-  return insn | ((value & 0x1f) << 11);
-}
-
 static long
 extract_nb (unsigned long insn,
-            int dialect ATTRIBUTE_UNUSED,
+            ppc_cpu_t dialect ATTRIBUTE_UNUSED,
             int *invalid ATTRIBUTE_UNUSED)
 {
   long ret;
@@ -1266,6 +1688,26 @@ extract_nb (unsigned long insn,
   return ret;
 }
 
+/* The NB field in an lswi instruction, which has special value
+   restrictions.  The value 32 is stored as 0.  */
+
+static unsigned long
+insert_nbi (unsigned long insn,
+            long value,
+            ppc_cpu_t dialect ATTRIBUTE_UNUSED,
+            const char **errmsg ATTRIBUTE_UNUSED)
+{
+  long rtvalue = (insn & RT_MASK) >> 21;
+  long ravalue = (insn & RA_MASK) >> 16;
+
+  if (value == 0)
+    value = 32;
+  if (rtvalue + (value + 3) / 4 > (rtvalue > ravalue ? ravalue + 32
+                                                     : ravalue))
+    *errmsg = _("address register in load range");
+  return insn | ((value & 0x1f) << 11);
+}
+
 /* The NSI field in a D form instruction.  This is the same as the SI
    field, only negated.  The extraction function always marks it as
    invalid, since we never want to recognize an instruction which uses
@@ -1274,7 +1716,7 @@ extract_nb (unsigned long insn,
 static unsigned long
 insert_nsi (unsigned long insn,
             long value,
-            int dialect ATTRIBUTE_UNUSED,
+            ppc_cpu_t dialect ATTRIBUTE_UNUSED,
             const char **errmsg ATTRIBUTE_UNUSED)
 {
   return insn | (-value & 0xffff);
@@ -1282,7 +1724,7 @@ insert_nsi (unsigned long insn,
 
 static long
 extract_nsi (unsigned long insn,
-             int dialect ATTRIBUTE_UNUSED,
+             ppc_cpu_t dialect ATTRIBUTE_UNUSED,
              int *invalid)
 {
   *invalid = 1;
@@ -1296,7 +1738,7 @@ extract_nsi (unsigned long insn,
 static unsigned long
 insert_ral (unsigned long insn,
             long value,
-            int dialect ATTRIBUTE_UNUSED,
+            ppc_cpu_t dialect ATTRIBUTE_UNUSED,
             const char **errmsg)
 {
   if (value == 0
@@ -1311,7 +1753,7 @@ insert_ral (unsigned long insn,
 static unsigned long
 insert_ram (unsigned long insn,
             long value,
-            int dialect ATTRIBUTE_UNUSED,
+            ppc_cpu_t dialect ATTRIBUTE_UNUSED,
             const char **errmsg)
 {
   if ((unsigned long) value >= ((insn >> 21) & 0x1f))
@@ -1319,13 +1761,13 @@ insert_ram (unsigned long insn,
   return insn | ((value & 0x1f) << 16);
 }
 
-/* The RA field in the DQ form lq instruction, which has special
+/* The RA field in the DQ form lq or an lswx instruction, which have special
    value restrictions.  */
 
 static unsigned long
 insert_raq (unsigned long insn,
             long value,
-            int dialect ATTRIBUTE_UNUSED,
+            ppc_cpu_t dialect ATTRIBUTE_UNUSED,
             const char **errmsg)
 {
   long rtvalue = (insn & RT_MASK) >> 21;
@@ -1342,7 +1784,7 @@ insert_raq (unsigned long insn,
 static unsigned long
 insert_ras (unsigned long insn,
             long value,
-            int dialect ATTRIBUTE_UNUSED,
+            ppc_cpu_t dialect ATTRIBUTE_UNUSED,
             const char **errmsg)
 {
   if (value == 0)
@@ -1359,7 +1801,7 @@ insert_ras (unsigned long insn,
 static unsigned long
 insert_rbs (unsigned long insn,
             long value ATTRIBUTE_UNUSED,
-            int dialect ATTRIBUTE_UNUSED,
+            ppc_cpu_t dialect ATTRIBUTE_UNUSED,
             const char **errmsg ATTRIBUTE_UNUSED)
 {
   return insn | (((insn >> 21) & 0x1f) << 11);
@@ -1367,7 +1809,7 @@ insert_rbs (unsigned long insn,
 
 static long
 extract_rbs (unsigned long insn,
-             int dialect ATTRIBUTE_UNUSED,
+             ppc_cpu_t dialect ATTRIBUTE_UNUSED,
              int *invalid)
 {
   if (((insn >> 21) & 0x1f) != ((insn >> 11) & 0x1f))
@@ -1375,32 +1817,155 @@ extract_rbs (unsigned long insn,
   return 0;
 }
 
-/* The RT field of the DQ form lq instruction, which has special
-   value restrictions.  */
+/* The RB field in an lswx instruction, which has special value
+   restrictions.  */
 
 static unsigned long
-insert_rtq (unsigned long insn,
+insert_rbx (unsigned long insn,
             long value,
-            int dialect ATTRIBUTE_UNUSED,
+            ppc_cpu_t dialect ATTRIBUTE_UNUSED,
             const char **errmsg)
 {
-  if ((value & 1) != 0)
-    *errmsg = _("target register operand must be even");
-  return insn | ((value & 0x1f) << 21);
+  long rtvalue = (insn & RT_MASK) >> 21;
+
+  if (value == rtvalue)
+    *errmsg = _("source and target register operands must be different");
+  return insn | ((value & 0x1f) << 11);
 }
 
-/* The RS field of the DS form stq instruction, which has special
-   value restrictions.  */
+/* The SCI8 field is made up of SCL and {U,N}I8 fields.  */
+static unsigned long
+insert_sci8 (unsigned long insn,
+             long value,
+             ppc_cpu_t dialect ATTRIBUTE_UNUSED,
+             const char **errmsg)
+{
+  unsigned int fill_scale = 0;
+  unsigned long ui8 = value;
+
+  if ((ui8 & 0xffffff00) == 0)
+    ;
+  else if ((ui8 & 0xffffff00) == 0xffffff00)
+    fill_scale = 0x400;
+  else if ((ui8 & 0xffff00ff) == 0)
+    {
+      fill_scale = 1 << 8;
+      ui8 >>= 8;
+    }
+  else if ((ui8 & 0xffff00ff) == 0xffff00ff)
+    {
+      fill_scale = 0x400 | (1 << 8);
+      ui8 >>= 8;
+    }
+  else if ((ui8 & 0xff00ffff) == 0)
+    {
+      fill_scale = 2 << 8;
+      ui8 >>= 16;
+    }
+  else if ((ui8 & 0xff00ffff) == 0xff00ffff)
+    {
+      fill_scale = 0x400 | (2 << 8);
+      ui8 >>= 16;
+    }
+  else if ((ui8 & 0x00ffffff) == 0)
+    {
+      fill_scale = 3 << 8;
+      ui8 >>= 24;
+    }
+  else if ((ui8 & 0x00ffffff) == 0x00ffffff)
+    {
+      fill_scale = 0x400 | (3 << 8);
+      ui8 >>= 24;
+    }
+  else
+    {
+      *errmsg = _("illegal immediate value");
+      ui8 = 0;
+    }
+
+  return insn | fill_scale | (ui8 & 0xff);
+}
+
+static long
+extract_sci8 (unsigned long insn,
+              ppc_cpu_t dialect ATTRIBUTE_UNUSED,
+              int *invalid ATTRIBUTE_UNUSED)
+{
+  int fill = insn & 0x400;
+  int scale_factor = (insn & 0x300) >> 5;
+  long value = (insn & 0xff) << scale_factor;
+
+  if (fill != 0)
+    value |= ~((long) 0xff << scale_factor);
+  return value;
+}
 
 static unsigned long
-insert_rsq (unsigned long insn,
-            long value ATTRIBUTE_UNUSED,
-            int dialect ATTRIBUTE_UNUSED,
-            const char **errmsg)
+insert_sci8n (unsigned long insn,
+              long value,
+              ppc_cpu_t dialect,
+              const char **errmsg)
 {
-  if ((value & 1) != 0)
-    *errmsg = _("source register operand must be even");
-  return insn | ((value & 0x1f) << 21);
+  return insert_sci8 (insn, -value, dialect, errmsg);
+}
+
+static long
+extract_sci8n (unsigned long insn,
+               ppc_cpu_t dialect,
+               int *invalid)
+{
+  return -extract_sci8 (insn, dialect, invalid);
+}
+
+static unsigned long
+insert_sd4h (unsigned long insn,
+             long value,
+             ppc_cpu_t dialect ATTRIBUTE_UNUSED,
+             const char **errmsg ATTRIBUTE_UNUSED)
+{
+  return insn | ((value & 0x1e) << 7);
+}
+
+static long
+extract_sd4h (unsigned long insn,
+              ppc_cpu_t dialect ATTRIBUTE_UNUSED,
+              int *invalid ATTRIBUTE_UNUSED)
+{
+  return ((insn >> 8) & 0xf) << 1;
+}
+
+static unsigned long
+insert_sd4w (unsigned long insn,
+             long value,
+             ppc_cpu_t dialect ATTRIBUTE_UNUSED,
+             const char **errmsg ATTRIBUTE_UNUSED)
+{
+  return insn | ((value & 0x3c) << 6);
+}
+
+static long
+extract_sd4w (unsigned long insn,
+              ppc_cpu_t dialect ATTRIBUTE_UNUSED,
+              int *invalid ATTRIBUTE_UNUSED)
+{
+  return ((insn >> 8) & 0xf) << 2;
+}
+
+static unsigned long
+insert_oimm (unsigned long insn,
+             long value,
+             ppc_cpu_t dialect ATTRIBUTE_UNUSED,
+             const char **errmsg ATTRIBUTE_UNUSED)
+{
+  return insn | (((value - 1) & 0x1f) << 4);
+}
+
+static long
+extract_oimm (unsigned long insn,
+              ppc_cpu_t dialect ATTRIBUTE_UNUSED,
+              int *invalid ATTRIBUTE_UNUSED)
+{
+  return ((insn >> 4) & 0x1f) + 1;
 }
 
 /* The SH field in an MD form instruction.  This is split.  */
@@ -1408,18 +1973,26 @@ insert_rsq (unsigned long insn,
 static unsigned long
 insert_sh6 (unsigned long insn,
             long value,
-            int dialect ATTRIBUTE_UNUSED,
+            ppc_cpu_t dialect ATTRIBUTE_UNUSED,
             const char **errmsg ATTRIBUTE_UNUSED)
 {
-  return insn | ((value & 0x1f) << 11) | ((value & 0x20) >> 4);
+  /* SH6 operand in the rldixor instructions.  */
+  if (PPC_OP (insn) == 4)
+    return insn | ((value & 0x1f) << 6) | ((value & 0x20) >> 5);
+  else
+    return insn | ((value & 0x1f) << 11) | ((value & 0x20) >> 4);
 }
 
 static long
 extract_sh6 (unsigned long insn,
-             int dialect ATTRIBUTE_UNUSED,
+             ppc_cpu_t dialect ATTRIBUTE_UNUSED,
              int *invalid ATTRIBUTE_UNUSED)
 {
-  return ((insn >> 11) & 0x1f) | ((insn << 4) & 0x20);
+  /* SH6 operand in the rldixor instructions.  */
+  if (PPC_OP (insn) == 4)
+    return ((insn >> 6) & 0x1f) | ((insn << 5) & 0x20);
+  else
+    return ((insn >> 11) & 0x1f) | ((insn << 4) & 0x20);
 }
 
 /* The SPR field in an XFX form instruction.  This is flipped--the
@@ -1428,7 +2001,7 @@ extract_sh6 (unsigned long insn,
 static unsigned long
 insert_spr (unsigned long insn,
             long value,
-            int dialect ATTRIBUTE_UNUSED,
+            ppc_cpu_t dialect ATTRIBUTE_UNUSED,
             const char **errmsg ATTRIBUTE_UNUSED)
 {
   return insn | ((value & 0x1f) << 16) | ((value & 0x3e0) << 6);
@@ -1436,26 +2009,23 @@ insert_spr (unsigned long insn,
 
 static long
 extract_spr (unsigned long insn,
-             int dialect ATTRIBUTE_UNUSED,
+             ppc_cpu_t dialect ATTRIBUTE_UNUSED,
              int *invalid ATTRIBUTE_UNUSED)
 {
   return ((insn >> 16) & 0x1f) | ((insn >> 6) & 0x3e0);
 }
 
 /* Some dialects have 8 SPRG registers instead of the standard 4.  */
+#define ALLOW8_SPRG (PPC_OPCODE_BOOKE | PPC_OPCODE_405)
 
 static unsigned long
 insert_sprg (unsigned long insn,
              long value,
-             int dialect,
+             ppc_cpu_t dialect,
              const char **errmsg)
 {
-  /* This check uses PPC_OPCODE_403 because PPC405 is later defined
-     as a synonym.  If ever a 405 specific dialect is added this
-     check should use that instead.  */
   if (value > 7
-      || (value > 3
-          && (dialect & (PPC_OPCODE_BOOKE | PPC_OPCODE_403)) == 0))
+      || (value > 3 && (dialect & ALLOW8_SPRG) == 0))
     *errmsg = _("invalid sprg number");
 
   /* If this is mfsprg4..7 then use spr 260..263 which can be read in
@@ -1468,54 +2038,272 @@ insert_sprg (unsigned long insn,
 
 static long
 extract_sprg (unsigned long insn,
-              int dialect,
+              ppc_cpu_t dialect,
               int *invalid)
 {
   unsigned long val = (insn >> 16) & 0x1f;
 
   /* mfsprg can use 260..263 and 272..279.  mtsprg only uses spr 272..279
-     If not BOOKE or 405, then both use only 272..275.  */
-  if (val <= 3
-      || (val < 0x10 && (insn & 0x100) != 0)
-      || (val - 0x10 > 3
-          && (dialect & (PPC_OPCODE_BOOKE | PPC_OPCODE_403)) == 0))
+     If not BOOKE, 405 or VLE, then both use only 272..275.  */
+  if ((val - 0x10 > 3 && (dialect & ALLOW8_SPRG) == 0)
+      || (val - 0x10 > 7 && (insn & 0x100) != 0)
+      || val <= 3
+      || (val & 8) != 0)
     *invalid = 1;
   return val & 7;
 }
 
 /* The TBR field in an XFX instruction.  This is just like SPR, but it
-   is optional.  When TBR is omitted, it must be inserted as 268 (the
-   magic number of the TB register).  These functions treat 0
-   (indicating an omitted optional operand) as 268.  This means that
-   ``mftb 4,0'' is not handled correctly.  This does not matter very
-   much, since the architecture manual does not define mftb as
-   accepting any values other than 268 or 269.  */
-
-#define TB (268)
+   is optional.  */
 
 static unsigned long
 insert_tbr (unsigned long insn,
             long value,
-            int dialect ATTRIBUTE_UNUSED,
-            const char **errmsg ATTRIBUTE_UNUSED)
+            ppc_cpu_t dialect ATTRIBUTE_UNUSED,
+            const char **errmsg)
 {
-  if (value == 0)
-    value = TB;
+  if (value != 268 && value != 269)
+    *errmsg = _("invalid tbr number");
   return insn | ((value & 0x1f) << 16) | ((value & 0x3e0) << 6);
 }
 
 static long
 extract_tbr (unsigned long insn,
-             int dialect ATTRIBUTE_UNUSED,
-             int *invalid ATTRIBUTE_UNUSED)
+             ppc_cpu_t dialect ATTRIBUTE_UNUSED,
+             int *invalid)
 {
   long ret;
 
   ret = ((insn >> 16) & 0x1f) | ((insn >> 6) & 0x3e0);
-  if (ret == TB)
-    ret = 0;
+  if (ret != 268 && ret != 269)
+    *invalid = 1;
   return ret;
 }
+
+/* The XT and XS fields in an XX1 or XX3 form instruction.  This is split.  */
+
+static unsigned long
+insert_xt6 (unsigned long insn,
+            long value,
+            ppc_cpu_t dialect ATTRIBUTE_UNUSED,
+            const char **errmsg ATTRIBUTE_UNUSED)
+{
+  return insn | ((value & 0x1f) << 21) | ((value & 0x20) >> 5);
+}
+
+static long
+extract_xt6 (unsigned long insn,
+             ppc_cpu_t dialect ATTRIBUTE_UNUSED,
+             int *invalid ATTRIBUTE_UNUSED)
+{
+  return ((insn << 5) & 0x20) | ((insn >> 21) & 0x1f);
+}
+
+/* The XT and XS fields in an DQ form VSX instruction.  This is split.  */
+static unsigned long
+insert_xtq6 (unsigned long insn,
+            long value,
+            ppc_cpu_t dialect ATTRIBUTE_UNUSED,
+            const char **errmsg ATTRIBUTE_UNUSED)
+{
+  return insn | ((value & 0x1f) << 21) | ((value & 0x20) >> 2);
+}
+
+static long
+extract_xtq6 (unsigned long insn,
+             ppc_cpu_t dialect ATTRIBUTE_UNUSED,
+             int *invalid ATTRIBUTE_UNUSED)
+{
+  return ((insn << 2) & 0x20) | ((insn >> 21) & 0x1f);
+}
+
+/* The XA field in an XX3 form instruction.  This is split.  */
+
+static unsigned long
+insert_xa6 (unsigned long insn,
+            long value,
+            ppc_cpu_t dialect ATTRIBUTE_UNUSED,
+            const char **errmsg ATTRIBUTE_UNUSED)
+{
+  return insn | ((value & 0x1f) << 16) | ((value & 0x20) >> 3);
+}
+
+static long
+extract_xa6 (unsigned long insn,
+             ppc_cpu_t dialect ATTRIBUTE_UNUSED,
+             int *invalid ATTRIBUTE_UNUSED)
+{
+  return ((insn << 3) & 0x20) | ((insn >> 16) & 0x1f);
+}
+
+/* The XB field in an XX3 form instruction.  This is split.  */
+
+static unsigned long
+insert_xb6 (unsigned long insn,
+            long value,
+            ppc_cpu_t dialect ATTRIBUTE_UNUSED,
+            const char **errmsg ATTRIBUTE_UNUSED)
+{
+  return insn | ((value & 0x1f) << 11) | ((value & 0x20) >> 4);
+}
+
+static long
+extract_xb6 (unsigned long insn,
+             ppc_cpu_t dialect ATTRIBUTE_UNUSED,
+             int *invalid ATTRIBUTE_UNUSED)
+{
+  return ((insn << 4) & 0x20) | ((insn >> 11) & 0x1f);
+}
+
+/* The XB field in an XX3 form instruction when it must be the same as
+   the XA field in the instruction.  This is used for extended
+   mnemonics like xvmovdp.  This operand is marked FAKE.  The insertion
+   function just copies the XA field into the XB field, and the
+   extraction function just checks that the fields are the same.  */
+
+static unsigned long
+insert_xb6s (unsigned long insn,
+            long value ATTRIBUTE_UNUSED,
+            ppc_cpu_t dialect ATTRIBUTE_UNUSED,
+            const char **errmsg ATTRIBUTE_UNUSED)
+{
+  return insn | (((insn >> 16) & 0x1f) << 11) | (((insn >> 2) & 0x1) << 1);
+}
+
+static long
+extract_xb6s (unsigned long insn,
+             ppc_cpu_t dialect ATTRIBUTE_UNUSED,
+             int *invalid)
+{
+  if ((((insn >> 16) & 0x1f) != ((insn >> 11) & 0x1f))
+      || (((insn >> 2) & 0x1) != ((insn >> 1) & 0x1)))
+    *invalid = 1;
+  return 0;
+}
+
+/* The XC field in an XX4 form instruction.  This is split.  */
+
+static unsigned long
+insert_xc6 (unsigned long insn,
+            long value,
+            ppc_cpu_t dialect ATTRIBUTE_UNUSED,
+            const char **errmsg ATTRIBUTE_UNUSED)
+{
+  return insn | ((value & 0x1f) << 6) | ((value & 0x20) >> 2);
+}
+
+static long
+extract_xc6 (unsigned long insn,
+             ppc_cpu_t dialect ATTRIBUTE_UNUSED,
+             int *invalid ATTRIBUTE_UNUSED)
+{
+  return ((insn << 2) & 0x20) | ((insn >> 6) & 0x1f);
+}
+
+static unsigned long
+insert_dm (unsigned long insn,
+           long value,
+           ppc_cpu_t dialect ATTRIBUTE_UNUSED,
+           const char **errmsg)
+{
+  if (value != 0 && value != 1)
+    *errmsg = _("invalid constant");
+  return insn | (((value) ? 3 : 0) << 8);
+}
+
+static long
+extract_dm (unsigned long insn,
+            ppc_cpu_t dialect ATTRIBUTE_UNUSED,
+            int *invalid)
+{
+  long value;
+
+  value = (insn >> 8) & 3;
+  if (value != 0 && value != 3)
+    *invalid = 1;
+  return (value) ? 1 : 0;
+}
+
+/* The VLESIMM field in an I16A form instruction.  This is split.  */
+
+static unsigned long
+insert_vlesi (unsigned long insn,
+            long value,
+            ppc_cpu_t dialect ATTRIBUTE_UNUSED,
+            const char **errmsg ATTRIBUTE_UNUSED)
+{
+  return insn | ((value & 0xf800) << 10) | (value & 0x7ff);
+}
+
+static long
+extract_vlesi (unsigned long insn,
+             ppc_cpu_t dialect ATTRIBUTE_UNUSED,
+             int *invalid ATTRIBUTE_UNUSED)
+{
+  long value = ((insn >> 10) & 0xf800) | (insn & 0x7ff);
+  value = (value ^ 0x8000) - 0x8000;
+  return value;
+}
+
+static unsigned long
+insert_vlensi (unsigned long insn,
+            long value,
+            ppc_cpu_t dialect ATTRIBUTE_UNUSED,
+            const char **errmsg ATTRIBUTE_UNUSED)
+{
+  value = -value;
+  return insn | ((value & 0xf800) << 10) | (value & 0x7ff);
+}
+static long
+extract_vlensi (unsigned long insn,
+             ppc_cpu_t dialect ATTRIBUTE_UNUSED,
+             int *invalid ATTRIBUTE_UNUSED)
+{
+  long value = ((insn >> 10) & 0xf800) | (insn & 0x7ff);
+  value = (value ^ 0x8000) - 0x8000;
+  /* Don't use for disassembly.  */
+  *invalid = 1;
+  return -value;
+}
+
+/* The VLEUIMM field in an I16A form instruction.  This is split.  */
+
+static unsigned long
+insert_vleui (unsigned long insn,
+            long value,
+            ppc_cpu_t dialect ATTRIBUTE_UNUSED,
+            const char **errmsg ATTRIBUTE_UNUSED)
+{
+  return insn | ((value & 0xf800) << 10) | (value & 0x7ff);
+}
+
+static long
+extract_vleui (unsigned long insn,
+             ppc_cpu_t dialect ATTRIBUTE_UNUSED,
+             int *invalid ATTRIBUTE_UNUSED)
+{
+  return ((insn >> 10) & 0xf800) | (insn & 0x7ff);
+}
+
+/* The VLEUIMML field in an I16L form instruction.  This is split.  */
+
+static unsigned long
+insert_vleil (unsigned long insn,
+            long value,
+            ppc_cpu_t dialect ATTRIBUTE_UNUSED,
+            const char **errmsg ATTRIBUTE_UNUSED)
+{
+  return insn | ((value & 0xf800) << 5) | (value & 0x7ff);
+}
+
+static long
+extract_vleil (unsigned long insn,
+             ppc_cpu_t dialect ATTRIBUTE_UNUSED,
+             int *invalid ATTRIBUTE_UNUSED)
+{
+  return ((insn >> 5) & 0xf800) | (insn & 0x7ff);
+}
+
 
 /* Macros used to form opcodes.  */
 
@@ -1535,6 +2323,17 @@ extract_tbr (unsigned long insn,
 #define OPL(x,l) (OP (x) | ((((unsigned long)(l)) & 1) << 21))
 #define OPL_MASK OPL (0x3f,1)
 
+/* The main opcode combined with an update code in D form instruction.
+   Used for extended mnemonics for VLE memory instructions.  */
+#define OPVUP(x,vup) (OP (x) | ((((unsigned long)(vup)) & 0xff) << 8))
+#define OPVUP_MASK OPVUP (0x3f,  0xff)
+
+/* The main opcode combined with an update code and the RT fields specified in
+   D form instruction.  Used for VLE volatile context save/restore
+   instructions.  */
+#define OPVUPRT(x,vup,rt) (OPVUP (x, vup) | ((((unsigned long)(rt)) & 0x1f) << 21))
+#define OPVUPRT_MASK OPVUPRT (0x3f, 0xff, 0x1f)
+
 /* An A form instruction.  */
 #define A(op, xop, rc) (OP (op) | ((((unsigned long)(xop)) & 0x1f) << 1) | (((unsigned long)(rc)) & 1))
 #define A_MASK A (0x3f, 0x1f, 1)
@@ -1555,6 +2354,43 @@ extract_tbr (unsigned long insn,
 #define B(op, aa, lk) (OP (op) | ((((unsigned long)(aa)) & 1) << 1) | ((lk) & 1))
 #define B_MASK B (0x3f, 1, 1)
 
+/* A BD8 form instruction.  This is a 16-bit instruction.  */
+#define BD8(op, aa, lk) (((((unsigned long)(op)) & 0x3f) << 10) | (((aa) & 1) << 9) | (((lk) & 1) << 8))
+#define BD8_MASK BD8 (0x3f, 1, 1)
+
+/* Another BD8 form instruction.  This is a 16-bit instruction.  */
+#define BD8IO(op) ((((unsigned long)(op)) & 0x1f) << 11)
+#define BD8IO_MASK BD8IO (0x1f)
+
+/* A BD8 form instruction for simplified mnemonics.  */
+#define EBD8IO(op, bo, bi) (BD8IO ((op)) | ((bo) << 10) | ((bi) << 8))
+/* A mask that excludes BO32 and BI32.  */
+#define EBD8IO1_MASK 0xf800
+/* A mask that includes BO32 and excludes BI32.  */
+#define EBD8IO2_MASK 0xfc00
+/* A mask that include BO32 AND BI32.  */
+#define EBD8IO3_MASK 0xff00
+
+/* A BD15 form instruction.  */
+#define BD15(op, aa, lk) (OP (op) | ((((unsigned long)(aa)) & 0xf) << 22) | ((lk) & 1))
+#define BD15_MASK BD15 (0x3f, 0xf, 1)
+
+/* A BD15 form instruction for extended conditional branch mnemonics.  */
+#define EBD15(op, aa, bo, lk) (((op) & 0x3f) << 26) | (((aa) & 0xf) << 22) | (((bo) & 0x3) << 20) | ((lk) & 1)
+#define EBD15_MASK 0xfff00001
+
+/* A BD15 form instruction for extended conditional branch mnemonics with BI.  */
+#define EBD15BI(op, aa, bo, bi, lk) (((op) & 0x3f) << 26) \
+                                    | (((aa) & 0xf) << 22) \
+                                    | (((bo) & 0x3) << 20) \
+                                    | (((bi) & 0x3) << 16) \
+                                    | ((lk) & 1)
+#define EBD15BI_MASK  0xfff30001
+
+/* A BD24 form instruction.  */
+#define BD24(op, aa, lk) (OP (op) | ((((unsigned long)(aa)) & 1) << 25) | ((lk) & 1))
+#define BD24_MASK BD24 (0x3f, 1, 1)
+
 /* A B form instruction setting the BO field.  */
 #define BBO(op, bo, aa, lk) (B ((op), (aa), (lk)) | ((((unsigned long)(bo)) & 0x1f) << 21))
 #define BBO_MASK BBO (0x3f, 0x1f, 1, 1)
@@ -1562,7 +2398,7 @@ extract_tbr (unsigned long insn,
 /* A BBO_MASK with the y bit of the BO field removed.  This permits
    matching a conditional branch regardless of the setting of the y
    bit.  Similarly for the 'at' bits used for power4 branch hints.  */
-#define Y_MASK   (((unsigned long) 1) << 21)
+#define Y_MASK   (((unsigned long) 1) << 21)
 #define AT1_MASK (((unsigned long) 3) << 21)
 #define AT2_MASK (((unsigned long) 9) << 21)
 #define BBOY_MASK  (BBO_MASK &~ Y_MASK)
@@ -1583,6 +2419,12 @@ extract_tbr (unsigned long insn,
 #define BBOYBI_MASK (BBOYCB_MASK | BI_MASK)
 #define BBOATBI_MASK (BBOAT2CB_MASK | BI_MASK)
 
+/* A VLE C form instruction.  */
+#define C_LK(x, lk) (((((unsigned long)(x)) & 0x7fff) << 1) | ((lk) & 1))
+#define C_LK_MASK C_LK(0x7fff, 1)
+#define C(x) ((((unsigned long)(x)) & 0xffff))
+#define C_MASK C(0xffff)
+
 /* An Context form instruction.  */
 #define CTX(op, xop)   (OP (op) | (((unsigned long)(xop)) & 0x7))
 #define CTX_MASK CTX(0x3f, 0x7)
@@ -1594,22 +2436,46 @@ extract_tbr (unsigned long insn,
 /* The main opcode mask with the RA field clear.  */
 #define DRA_MASK (OP_MASK | RA_MASK)
 
+/* A DQ form VSX instruction.  */
+#define DQX(op, xop) (OP (op) | ((xop) & 0x7))
+#define DQX_MASK DQX (0x3f, 7)
+
 /* A DS form instruction.  */
 #define DSO(op, xop) (OP (op) | ((xop) & 0x3))
 #define DS_MASK DSO (0x3f, 3)
 
-/* A DE form instruction.  */
-#define DEO(op, xop) (OP (op) | ((xop) & 0xf))
-#define DE_MASK DEO (0x3e, 0xf)
+/* An DX form instruction.  */
+#define DX(op, xop) (OP (op) | ((((unsigned long)(xop)) & 0x1f) << 1))
+#define DX_MASK DX (0x3f, 0x1f)
 
 /* An EVSEL form instruction.  */
 #define EVSEL(op, xop) (OP (op) | (((unsigned long)(xop)) & 0xff) << 3)
 #define EVSEL_MASK EVSEL(0x3f, 0xff)
 
+/* An IA16 form instruction.  */
+#define IA16(op, xop) (OP (op) | (((unsigned long)(xop)) & 0x1f) << 11)
+#define IA16_MASK IA16(0x3f, 0x1f)
+
+/* An I16A form instruction.  */
+#define I16A(op, xop) (OP (op) | (((unsigned long)(xop)) & 0x1f) << 11)
+#define I16A_MASK I16A(0x3f, 0x1f)
+
+/* An I16L form instruction.  */
+#define I16L(op, xop) (OP (op) | (((unsigned long)(xop)) & 0x1f) << 11)
+#define I16L_MASK I16L(0x3f, 0x1f)
+
+/* An IM7 form instruction.  */
+#define IM7(op) ((((unsigned long)(op)) & 0x1f) << 11)
+#define IM7_MASK IM7(0x1f)
+
 /* An M form instruction.  */
 #define M(op, rc) (OP (op) | ((rc) & 1))
 #define M_MASK M (0x3f, 1)
 
+/* An LI20 form instruction.  */
+#define LI20(op, xop) (OP (op) | (((unsigned long)(xop)) & 0x1) << 15)
+#define LI20_MASK LI20(0x3f, 0x1)
+
 /* An M form instruction with the ME field specified.  */
 #define MME(op, me, rc) (M ((op), (rc)) | ((((unsigned long)(me)) & 0x1f) << 1))
 
@@ -1640,44 +2506,189 @@ extract_tbr (unsigned long insn,
 #define SC(op, sa, lk) (OP (op) | ((((unsigned long)(sa)) & 1) << 1) | ((lk) & 1))
 #define SC_MASK (OP_MASK | (((unsigned long)0x3ff) << 16) | (((unsigned long)1) << 1) | 1)
 
-/* An VX form instruction.  */
+/* An SCI8 form instruction.  */
+#define SCI8(op, xop) (OP (op) | ((((unsigned long)(xop)) & 0x1f) << 11))
+#define SCI8_MASK SCI8(0x3f, 0x1f)
+
+/* An SCI8 form instruction.  */
+#define SCI8BF(op, fop, xop) (OP (op) | ((((unsigned long)(xop)) & 0x1f) << 11) | (((fop) & 7) << 23))
+#define SCI8BF_MASK SCI8BF(0x3f, 7, 0x1f)
+
+/* An SD4 form instruction.  This is a 16-bit instruction.  */
+#define SD4(op) ((((unsigned long)(op)) & 0xf) << 12)
+#define SD4_MASK SD4(0xf)
+
+/* An SE_IM5 form instruction.  This is a 16-bit instruction.  */
+#define SE_IM5(op, xop) (((((unsigned long)(op)) & 0x3f) << 10) | (((xop) & 0x1) << 9))
+#define SE_IM5_MASK SE_IM5(0x3f, 1)
+
+/* An SE_R form instruction.  This is a 16-bit instruction.  */
+#define SE_R(op, xop) (((((unsigned long)(op)) & 0x3f) << 10) | (((xop) & 0x3f) << 4))
+#define SE_R_MASK SE_R(0x3f, 0x3f)
+
+/* An SE_RR form instruction.  This is a 16-bit instruction.  */
+#define SE_RR(op, xop) (((((unsigned long)(op)) & 0x3f) << 10) | (((xop) & 0x3) << 8))
+#define SE_RR_MASK SE_RR(0x3f, 3)
+
+/* A VX form instruction.  */
 #define VX(op, xop) (OP (op) | (((unsigned long)(xop)) & 0x7ff))
 
 /* The mask for an VX form instruction.  */
 #define VX_MASK VX(0x3f, 0x7ff)
 
-/* An VA form instruction.  */
+/* A VX_MASK with the VA field fixed.  */
+#define VXVA_MASK (VX_MASK | (0x1f << 16))
+
+/* A VX_MASK with the VB field fixed.  */
+#define VXVB_MASK (VX_MASK | (0x1f << 11))
+
+/* A VX_MASK with the VA and VB fields fixed.  */
+#define VXVAVB_MASK (VX_MASK | (0x1f << 16) | (0x1f << 11))
+
+/* A VX_MASK with the VD and VA fields fixed.  */
+#define VXVDVA_MASK (VX_MASK | (0x1f << 21) | (0x1f << 16))
+
+/* A VX_MASK with a UIMM4 field.  */
+#define VXUIMM4_MASK (VX_MASK | (0x1 << 20))
+
+/* A VX_MASK with a UIMM3 field.  */
+#define VXUIMM3_MASK (VX_MASK | (0x3 << 19))
+
+/* A VX_MASK with a UIMM2 field.  */
+#define VXUIMM2_MASK (VX_MASK | (0x7 << 18))
+
+/* A VX_MASK with a PS field.  */
+#define VXPS_MASK (VX_MASK & ~(0x1 << 9))
+
+/* A VX_MASK with the VA field fixed with a PS field.  */
+#define VXVAPS_MASK ((VX_MASK | (0x1f << 16)) & ~(0x1 << 9))
+
+/* A VA form instruction.  */
 #define VXA(op, xop) (OP (op) | (((unsigned long)(xop)) & 0x03f))
 
 /* The mask for an VA form instruction.  */
 #define VXA_MASK VXA(0x3f, 0x3f)
 
-/* An VXR form instruction.  */
+/* A VXA_MASK with a SHB field.  */
+#define VXASHB_MASK (VXA_MASK | (1 << 10))
+
+/* A VXR form instruction.  */
 #define VXR(op, xop, rc) (OP (op) | (((rc) & 1) << 10) | (((unsigned long)(xop)) & 0x3ff))
 
 /* The mask for a VXR form instruction.  */
 #define VXR_MASK VXR(0x3f, 0x3ff, 1)
 
+/* A VX form instruction with a VA tertiary opcode.  */
+#define VXVA(op, xop, vaop) (VX(op,xop) | (((vaop) & 0x1f) << 16))
+
+#define VXASH(op, xop) (OP (op) | ((((unsigned long)(xop)) & 0x1f) << 1))
+#define VXASH_MASK VXASH (0x3f, 0x1f)
+
 /* An X form instruction.  */
 #define X(op, xop) (OP (op) | ((((unsigned long)(xop)) & 0x3ff) << 1))
 
+/* A X form instruction for Quad-Precision FP Instructions.  */
+#define XVA(op, xop, vaop) (X(op,xop) | (((vaop) & 0x1f) << 16))
+
+/* An EX form instruction.  */
+#define EX(op, xop) (OP (op) | (((unsigned long)(xop)) & 0x7ff))
+
+/* The mask for an EX form instruction.  */
+#define EX_MASK EX (0x3f, 0x7ff)
+
+/* An XX2 form instruction.  */
+#define XX2(op, xop) (OP (op) | ((((unsigned long)(xop)) & 0x1ff) << 2))
+
+/* A XX2 form instruction with the VA bits specified.  */
+#define XX2VA(op, xop, vaop) (XX2(op,xop) | (((vaop) & 0x1f) << 16))
+
+/* An XX3 form instruction.  */
+#define XX3(op, xop) (OP (op) | ((((unsigned long)(xop)) & 0xff) << 3))
+
+/* An XX3 form instruction with the RC bit specified.  */
+#define XX3RC(op, xop, rc) (OP (op) | (((rc) & 1) << 10) | ((((unsigned long)(xop)) & 0x7f) << 3))
+
+/* An XX4 form instruction.  */
+#define XX4(op, xop) (OP (op) | ((((unsigned long)(xop)) & 0x3) << 4))
+
 /* A Z form instruction.  */
 #define Z(op, xop) (OP (op) | ((((unsigned long)(xop)) & 0x1ff) << 1))
 
 /* An X form instruction with the RC bit specified.  */
 #define XRC(op, xop, rc) (X ((op), (xop)) | ((rc) & 1))
 
+/* A X form instruction for Quad-Precision FP Instructions with RC bit.  */
+#define XVARC(op, xop, vaop, rc) (XVA ((op), (xop), (vaop)) | ((rc) & 1))
+
+/* An X form instruction with the RA bits specified as two ops.  */
+#define XMMF(op, xop, mop0, mop1) (X ((op), (xop)) | ((mop0) & 3) << 19 | ((mop1) & 7) << 16)
+
 /* A Z form instruction with the RC bit specified.  */
 #define ZRC(op, xop, rc) (Z ((op), (xop)) | ((rc) & 1))
 
 /* The mask for an X form instruction.  */
 #define X_MASK XRC (0x3f, 0x3ff, 1)
 
+/* The mask for an X form instruction with the BF bits specified.  */
+#define XBF_MASK (X_MASK | (3 << 21))
+
+/* An X form wait instruction with everything filled in except the WC field.  */
+#define XWC_MASK (XRC (0x3f, 0x3ff, 1) | (7 << 23) | RA_MASK | RB_MASK)
+
+/* The mask for an XX1 form instruction.  */
+#define XX1_MASK X (0x3f, 0x3ff)
+
+/* An XX1_MASK with the RB field fixed.  */
+#define XX1RB_MASK (XX1_MASK | RB_MASK)
+
+/* The mask for an XX2 form instruction.  */
+#define XX2_MASK (XX2 (0x3f, 0x1ff) | (0x1f << 16))
+
+/* The mask for an XX2 form instruction with the UIM bits specified.  */
+#define XX2UIM_MASK (XX2 (0x3f, 0x1ff) | (7 << 18))
+
+/* The mask for an XX2 form instruction with the 4 UIM bits specified.  */
+#define XX2UIM4_MASK (XX2 (0x3f, 0x1ff) | (1 << 20))
+
+/* The mask for an XX2 form instruction with the BF bits specified.  */
+#define XX2BF_MASK (XX2_MASK | (3 << 21) | (1))
+
+/* The mask for an XX2 form instruction with the BF and DCMX bits specified.  */
+#define XX2BFD_MASK (XX2 (0x3f, 0x1ff) | 1)
+
+/* The mask for an XX2 form instruction with a split DCMX bits specified.  */
+#define XX2DCMXS_MASK XX2 (0x3f, 0x1ee)
+
+/* The mask for an XX3 form instruction.  */
+#define XX3_MASK XX3 (0x3f, 0xff)
+
+/* The mask for an XX3 form instruction with the BF bits specified.  */
+#define XX3BF_MASK (XX3 (0x3f, 0xff) | (3 << 21) | (1))
+
+/* The mask for an XX3 form instruction with the DM or SHW bits specified.  */
+#define XX3DM_MASK (XX3 (0x3f, 0x1f) | (1 << 10))
+#define XX3SHW_MASK XX3DM_MASK
+
+/* The mask for an XX4 form instruction.  */
+#define XX4_MASK XX4 (0x3f, 0x3)
+
+/* An X form wait instruction with everything filled in except the WC field.  */
+#define XWC_MASK (XRC (0x3f, 0x3ff, 1) | (7 << 23) | RA_MASK | RB_MASK)
+
+/* The mask for an XMMF form instruction.  */
+#define XMMF_MASK (XMMF (0x3f, 0x3ff, 3, 7) | (1))
+
 /* The mask for a Z form instruction.  */
 #define Z_MASK ZRC (0x3f, 0x1ff, 1)
+#define Z2_MASK ZRC (0x3f, 0xff, 1)
 
-/* An X_MASK with the RA field fixed.  */
+/* An X_MASK with the RA/VA field fixed.  */
 #define XRA_MASK (X_MASK | RA_MASK)
+#define XVA_MASK XRA_MASK
+
+/* An XRA_MASK with the A_L/W field clear.  */
+#define XWRA_MASK (XRA_MASK & ~((unsigned long) 1 << 16))
+#define XRLA_MASK XWRA_MASK
 
 /* An X_MASK with the RB field fixed.  */
 #define XRB_MASK (X_MASK | RB_MASK)
@@ -1691,18 +2702,54 @@ extract_tbr (unsigned long insn,
 /* An X_MASK with the RA and RB fields fixed.  */
 #define XRARB_MASK (X_MASK | RA_MASK | RB_MASK)
 
+/* An XBF_MASK with the RA and RB fields fixed.  */
+#define XBFRARB_MASK (XBF_MASK | RA_MASK | RB_MASK)
+
 /* An XRARB_MASK, but with the L bit clear.  */
 #define XRLARB_MASK (XRARB_MASK & ~((unsigned long) 1 << 16))
 
+/* An XRARB_MASK, but with the L bits in a darn instruction clear.  */
+#define XLRAND_MASK (XRARB_MASK & ~((unsigned long) 3 << 16))
+
 /* An X_MASK with the RT and RA fields fixed.  */
 #define XRTRA_MASK (X_MASK | RT_MASK | RA_MASK)
 
+/* An X_MASK with the RT and RB fields fixed.  */
+#define XRTRB_MASK (X_MASK | RT_MASK | RB_MASK)
+
 /* An XRTRA_MASK, but with L bit clear.  */
 #define XRTLRA_MASK (XRTRA_MASK & ~((unsigned long) 1 << 21))
 
+/* An X_MASK with the RT, RA and RB fields fixed.  */
+#define XRTRARB_MASK (X_MASK | RT_MASK | RA_MASK | RB_MASK)
+
+/* An XRTRARB_MASK, but with L bit clear.  */
+#define XRTLRARB_MASK (XRTRARB_MASK & ~((unsigned long) 1 << 21))
+
+/* An XRTRARB_MASK, but with A bit clear.  */
+#define XRTARARB_MASK (XRTRARB_MASK & ~((unsigned long) 1 << 25))
+
+/* An XRTRARB_MASK, but with BF bits clear.  */
+#define XRTBFRARB_MASK (XRTRARB_MASK & ~((unsigned long) 7 << 23))
+
 /* An X form instruction with the L bit specified.  */
 #define XOPL(op, xop, l) (X ((op), (xop)) | ((((unsigned long)(l)) & 1) << 21))
 
+/* An X form instruction with the L bits specified.  */
+#define XOPL2(op, xop, l) (X ((op), (xop)) | ((((unsigned long)(l)) & 3) << 21))
+
+/* An X form instruction with the L bit and RC bit specified.  */
+#define XRCL(op, xop, l, rc) (XRC ((op), (xop), (rc)) | ((((unsigned long)(l)) & 1) << 21))
+
+/* An X form instruction with RT fields specified */
+#define XRT(op, xop, rt) (X ((op), (xop)) \
+        | ((((unsigned long)(rt)) & 0x1f) << 21))
+
+/* An X form instruction with RT and RA fields specified */
+#define XRTRA(op, xop, rt, ra) (X ((op), (xop)) \
+        | ((((unsigned long)(rt)) & 0x1f) << 21) \
+        | ((((unsigned long)(ra)) & 0x1f) << 16))
+
 /* The mask for an X form comparison instruction.  */
 #define XCMP_MASK (X_MASK | (((unsigned long)1) << 22))
 
@@ -1724,6 +2771,9 @@ extract_tbr (unsigned long insn,
 /* An X form sync instruction with everything filled in except the LS field.  */
 #define XSYNC_MASK (0xff9fffff)
 
+/* An X form sync instruction with everything filled in except the L and E fields.  */
+#define XSYNCLE_MASK (0xff90ffff)
+
 /* An X_MASK, but with the EH bit clear.  */
 #define XEH_MASK (X_MASK & ~((unsigned long )1))
 
@@ -1733,11 +2783,11 @@ extract_tbr (unsigned long insn,
 
 /* An XFL form instruction.  */
 #define XFL(op, xop, rc) (OP (op) | ((((unsigned long)(xop)) & 0x3ff) << 1) | (((unsigned long)(rc)) & 1))
-#define XFL_MASK (XFL (0x3f, 0x3ff, 1) | (((unsigned long)1) << 25) | (((unsigned long)1) << 16))
+#define XFL_MASK XFL (0x3f, 0x3ff, 1)
 
 /* An X form isel instruction.  */
-#define XISEL(op, xop)  (OP (op) | ((((unsigned long)(xop)) & 0x1f) << 1))
-#define XISEL_MASK      XISEL(0x3f, 0x1f)
+#define XISEL(op, xop)  (OP (op) | ((((unsigned long)(xop)) & 0x1f) << 1))
+#define XISEL_MASK      XISEL(0x3f, 0x1f)
 
 /* An XL form instruction with the LK field set to 0.  */
 #define XL(op, xop) (OP (op) | ((((unsigned long)(xop)) & 0x3ff) << 1))
@@ -1748,6 +2798,9 @@ extract_tbr (unsigned long insn,
 /* The mask for an XL form instruction.  */
 #define XL_MASK XLLK (0x3f, 0x3ff, 1)
 
+/* An XL_MASK with the RT, RA and RB fields fixed, but S bit clear.  */
+#define XLS_MASK ((XL_MASK | RT_MASK | RA_MASK | RB_MASK) & ~(1 << 11))
+
 /* An XL form instruction which explicitly sets the BO field.  */
 #define XLO(op, bo, xop, lk) \
   (XLLK ((op), (xop), (lk)) | ((((unsigned long)(bo)) & 0x1f) << 21))
@@ -1778,6 +2831,9 @@ extract_tbr (unsigned long insn,
 /* An XL_MASK with the BO, BI and BB fields fixed.  */
 #define XLBOBIBB_MASK (XL_MASK | BO_MASK | BI_MASK | BB_MASK)
 
+/* An X form mbar instruction with MO field.  */
+#define XMBAR(op, xop, mo) (X ((op), (xop)) | ((((unsigned long)(mo)) & 1) << 21))
+
 /* An XO form instruction.  */
 #define XO(op, xop, oe, rc) \
   (OP (op) | ((((unsigned long)(xop)) & 0x1ff) << 1) | ((((unsigned long)(oe)) & 1) << 10) | (((unsigned long)(rc)) & 1))
@@ -1786,6 +2842,12 @@ extract_tbr (unsigned long insn,
 /* An XO_MASK with the RB field fixed.  */
 #define XORB_MASK (XO_MASK | RB_MASK)
 
+/* An XOPS form instruction for paired singles.  */
+#define XOPS(op, xop, rc) \
+  (OP (op) | ((((unsigned long)(xop)) & 0x3ff) << 1) | (((unsigned long)(rc)) & 1))
+#define XOPS_MASK XOPS (0x3f, 0x3ff, 1)
+
+
 /* An XS form instruction.  */
 #define XS(op, xop, rc) (OP (op) | ((((unsigned long)(xop)) & 0x1ff) << 2) | (((unsigned long)(rc)) & 1))
 #define XS_MASK XS (0x3f, 0x1ff, 1)
@@ -1809,7 +2871,7 @@ extract_tbr (unsigned long insn,
 
 /* An XFX form instruction with the SPR field filled in except for the
    SPRG field.  */
-#define XSPRG_MASK (XSPR_MASK & ~(0x17 << 16))
+#define XSPRG_MASK (XSPR_MASK & ~(0x1f << 16))
 
 /* An X form instruction with everything filled in except the E field.  */
 #define XE_MASK (0xffff7fff)
@@ -1818,6 +2880,19 @@ extract_tbr (unsigned long insn,
 #define XUC(op, xop)  (OP (op) | (((unsigned long)(xop)) & 0x1f))
 #define XUC_MASK      XUC(0x3f, 0x1f)
 
+/* An XW form instruction.  */
+#define XW(op, xop, rc) (OP (op) | ((((unsigned long)(xop)) & 0x3f) << 1) | ((rc) & 1))
+/* The mask for a G form instruction. rc not supported at present.  */
+#define XW_MASK XW (0x3f, 0x3f, 0)
+
+/* An APU form instruction.  */
+#define APU(op, xop, rc) (OP (op) | (((unsigned long)(xop)) & 0x3ff) << 1 | ((rc) & 1))
+
+/* The mask for an APU form instruction.  */
+#define APU_MASK APU (0x3f, 0x3ff, 1)
+#define APU_RT_MASK (APU_MASK | RT_MASK)
+#define APU_RA_MASK (APU_MASK | RA_MASK)
+
 /* The BO encodings used in extended conditional branch mnemonics.  */
 #define BODNZF  (0x0)
 #define BODNZFP (0x1)
@@ -1848,6 +2923,16 @@ extract_tbr (unsigned long insn,
 
 #define BOU     (0x14)
 
+/* The BO16 encodings used in extended VLE conditional branch mnemonics.  */
+#define BO16F   (0x0)
+#define BO16T   (0x1)
+
+/* The BO32 encodings used in extended VLE conditional branch mnemonics.  */
+#define BO32F   (0x0)
+#define BO32T   (0x1)
+#define BO32DNZ (0x2)
+#define BO32DZ  (0x3)
+
 /* The BI condition bit encodings used in extended conditional branch
    mnemonics.  */
 #define CBLT    (0)
@@ -1875,3066 +2960,4267 @@ extract_tbr (unsigned long insn,
 /* Smaller names for the flags so each entry in the opcodes table will
    fit on a single line.  */
 #undef  PPC
-#define PPC     PPC_OPCODE_PPC
+#define PPC     PPC_OPCODE_PPC
 #define PPCCOM  PPC_OPCODE_PPC | PPC_OPCODE_COMMON
-#define NOPOWER4 PPC_OPCODE_NOPOWER4 | PPCCOM
 #define POWER4  PPC_OPCODE_POWER4
 #define POWER5  PPC_OPCODE_POWER5
 #define POWER6  PPC_OPCODE_POWER6
+#define POWER7  PPC_OPCODE_POWER7
+#define POWER8  PPC_OPCODE_POWER8
+#define POWER9  PPC_OPCODE_POWER9
 #define CELL    PPC_OPCODE_CELL
-#define PPC32   PPC_OPCODE_32 | PPC_OPCODE_PPC
-#define PPC64   PPC_OPCODE_64 | PPC_OPCODE_PPC
+#define PPC64   PPC_OPCODE_64 | PPC_OPCODE_64_BRIDGE
+#define NON32   (PPC_OPCODE_64 | PPC_OPCODE_POWER4      \
+                 | PPC_OPCODE_EFS | PPC_OPCODE_E500MC | PPC_OPCODE_TITAN)
 #define PPC403  PPC_OPCODE_403
-#define PPC405  PPC403
+#define PPC405  PPC_OPCODE_405
 #define PPC440  PPC_OPCODE_440
-#define PPC750  PPC
-#define PPC860  PPC
+#define PPC464  PPC440
+#define PPC476  PPC_OPCODE_476
+#define PPC750  PPC_OPCODE_750
+#define PPC7450 PPC_OPCODE_7450
+#define PPC860  PPC_OPCODE_860
+#define PPCPS   PPC_OPCODE_PPCPS
 #define PPCVEC  PPC_OPCODE_ALTIVEC
-#define POWER   PPC_OPCODE_POWER
-#define POWER2  PPC_OPCODE_POWER | PPC_OPCODE_POWER2
-#define PPCPWR2 PPC_OPCODE_PPC | PPC_OPCODE_POWER | PPC_OPCODE_POWER2
-#define POWER32 PPC_OPCODE_POWER | PPC_OPCODE_32
-#define COM     PPC_OPCODE_POWER | PPC_OPCODE_PPC | PPC_OPCODE_COMMON
-#define COM32   PPC_OPCODE_POWER | PPC_OPCODE_PPC | PPC_OPCODE_COMMON | PPC_OPCODE_32
-#define M601    PPC_OPCODE_POWER | PPC_OPCODE_601
+#define PPCVEC2 PPC_OPCODE_ALTIVEC2
+#define PPCVEC3 PPC_OPCODE_ALTIVEC2
+#define PPCVSX  PPC_OPCODE_VSX
+#define PPCVSX2 PPC_OPCODE_VSX
+#define PPCVSX3 PPC_OPCODE_VSX3
+#define POWER   PPC_OPCODE_POWER
+#define POWER2  PPC_OPCODE_POWER | PPC_OPCODE_POWER2
+#define PWR2COM PPC_OPCODE_POWER | PPC_OPCODE_POWER2 | PPC_OPCODE_COMMON
+#define PPCPWR2 PPC_OPCODE_PPC | PPC_OPCODE_POWER | PPC_OPCODE_POWER2 | PPC_OPCODE_COMMON
+#define COM     PPC_OPCODE_POWER | PPC_OPCODE_PPC | PPC_OPCODE_COMMON
+#define M601    PPC_OPCODE_POWER | PPC_OPCODE_601
 #define PWRCOM  PPC_OPCODE_POWER | PPC_OPCODE_601 | PPC_OPCODE_COMMON
-#define MFDEC1  PPC_OPCODE_POWER
-#define MFDEC2  PPC_OPCODE_PPC | PPC_OPCODE_601 | PPC_OPCODE_BOOKE
+#define MFDEC1  PPC_OPCODE_POWER
+#define MFDEC2  PPC_OPCODE_PPC | PPC_OPCODE_601 | PPC_OPCODE_BOOKE | PPC_OPCODE_TITAN
 #define BOOKE   PPC_OPCODE_BOOKE
-#define BOOKE64 PPC_OPCODE_BOOKE64
-#define CLASSIC PPC_OPCODE_CLASSIC
+#define NO371   PPC_OPCODE_BOOKE | PPC_OPCODE_PPCPS | PPC_OPCODE_EFS
 #define PPCE300 PPC_OPCODE_E300
 #define PPCSPE  PPC_OPCODE_SPE
-#define PPCISEL PPC_OPCODE_ISEL
+#define PPCISEL PPC_OPCODE_ISEL
 #define PPCEFS  PPC_OPCODE_EFS
-#define PPCBRLK PPC_OPCODE_BRLOCK
+#define PPCBRLK PPC_OPCODE_BRLOCK
 #define PPCPMR  PPC_OPCODE_PMR
-#define PPCCHLK PPC_OPCODE_CACHELCK
-#define PPCCHLK64       PPC_OPCODE_CACHELCK | PPC_OPCODE_BOOKE64
+#define PPCTMR  PPC_OPCODE_TMR
+#define PPCCHLK PPC_OPCODE_CACHELCK
 #define PPCRFMCI        PPC_OPCODE_RFMCI
+#define E500MC  PPC_OPCODE_E500MC
+#define PPCA2   PPC_OPCODE_A2
+#define TITAN   PPC_OPCODE_TITAN
+#define MULHW   PPC_OPCODE_405 | PPC_OPCODE_440 | TITAN
+#define E500    PPC_OPCODE_E500
+#define E6500   PPC_OPCODE_E6500
+#define PPCVLE  PPC_OPCODE_VLE
+#define PPCHTM  PPC_OPCODE_HTM
+#define E200Z4  PPC_OPCODE_E200Z4
+/* The list of embedded processors that use the embedded operand ordering
+   for the 3 operand dcbt and dcbtst instructions.  */
+#define DCBT_EO (PPC_OPCODE_E500 | PPC_OPCODE_E500MC | PPC_OPCODE_476 \
+                 | PPC_OPCODE_A2)
+
+
 
 /* The opcode table.
 
    The format of the opcode table is:
 
-   NAME      OPCODE     MASK            FLAGS           { OPERANDS }
+   NAME         OPCODE          MASK         FLAGS      ANTI            {OPERANDS}
 
    NAME is the name of the instruction.
    OPCODE is the instruction opcode.
    MASK is the opcode mask; this is used to tell the disassembler
      which bits in the actual opcode must match OPCODE.
-   FLAGS are flags indicated what processors support the instruction.
+   FLAGS are flags indicating which processors support the instruction.
+   ANTI indicates which processors don't support the instruction.
    OPERANDS is the list of operands.
 
    The disassembler reads the table in order and prints the first
    instruction which matches, so this table is sorted to put more
-   specific instructions before more general instructions.  It is also
-   sorted by major opcode.  */
+   specific instructions before more general instructions.
+
+   This table must be sorted by major opcode.  Please try to keep it
+   vaguely sorted within major opcode too, except of course where
+   constrained otherwise by disassembler operation.  */
 
 const struct powerpc_opcode powerpc_opcodes[] = {
-{ "attn",    X(0,256), X_MASK,          POWER4,         { 0 } },
-{ "tdlgti",  OPTO(2,TOLGT), OPTO_MASK,  PPC64,          { RA, SI } },
-{ "tdllti",  OPTO(2,TOLLT), OPTO_MASK,  PPC64,          { RA, SI } },
-{ "tdeqi",   OPTO(2,TOEQ), OPTO_MASK,   PPC64,          { RA, SI } },
-{ "tdlgei",  OPTO(2,TOLGE), OPTO_MASK,  PPC64,          { RA, SI } },
-{ "tdlnli",  OPTO(2,TOLNL), OPTO_MASK,  PPC64,          { RA, SI } },
-{ "tdllei",  OPTO(2,TOLLE), OPTO_MASK,  PPC64,          { RA, SI } },
-{ "tdlngi",  OPTO(2,TOLNG), OPTO_MASK,  PPC64,          { RA, SI } },
-{ "tdgti",   OPTO(2,TOGT), OPTO_MASK,   PPC64,          { RA, SI } },
-{ "tdgei",   OPTO(2,TOGE), OPTO_MASK,   PPC64,          { RA, SI } },
-{ "tdnli",   OPTO(2,TONL), OPTO_MASK,   PPC64,          { RA, SI } },
-{ "tdlti",   OPTO(2,TOLT), OPTO_MASK,   PPC64,          { RA, SI } },
-{ "tdlei",   OPTO(2,TOLE), OPTO_MASK,   PPC64,          { RA, SI } },
-{ "tdngi",   OPTO(2,TONG), OPTO_MASK,   PPC64,          { RA, SI } },
-{ "tdnei",   OPTO(2,TONE), OPTO_MASK,   PPC64,          { RA, SI } },
-{ "tdi",     OP(2),     OP_MASK,        PPC64,          { TO, RA, SI } },
-
-{ "twlgti",  OPTO(3,TOLGT), OPTO_MASK,  PPCCOM,         { RA, SI } },
-{ "tlgti",   OPTO(3,TOLGT), OPTO_MASK,  PWRCOM,         { RA, SI } },
-{ "twllti",  OPTO(3,TOLLT), OPTO_MASK,  PPCCOM,         { RA, SI } },
-{ "tllti",   OPTO(3,TOLLT), OPTO_MASK,  PWRCOM,         { RA, SI } },
-{ "tweqi",   OPTO(3,TOEQ), OPTO_MASK,   PPCCOM,         { RA, SI } },
-{ "teqi",    OPTO(3,TOEQ), OPTO_MASK,   PWRCOM,         { RA, SI } },
-{ "twlgei",  OPTO(3,TOLGE), OPTO_MASK,  PPCCOM,         { RA, SI } },
-{ "tlgei",   OPTO(3,TOLGE), OPTO_MASK,  PWRCOM,         { RA, SI } },
-{ "twlnli",  OPTO(3,TOLNL), OPTO_MASK,  PPCCOM,         { RA, SI } },
-{ "tlnli",   OPTO(3,TOLNL), OPTO_MASK,  PWRCOM,         { RA, SI } },
-{ "twllei",  OPTO(3,TOLLE), OPTO_MASK,  PPCCOM,         { RA, SI } },
-{ "tllei",   OPTO(3,TOLLE), OPTO_MASK,  PWRCOM,         { RA, SI } },
-{ "twlngi",  OPTO(3,TOLNG), OPTO_MASK,  PPCCOM,         { RA, SI } },
-{ "tlngi",   OPTO(3,TOLNG), OPTO_MASK,  PWRCOM,         { RA, SI } },
-{ "twgti",   OPTO(3,TOGT), OPTO_MASK,   PPCCOM,         { RA, SI } },
-{ "tgti",    OPTO(3,TOGT), OPTO_MASK,   PWRCOM,         { RA, SI } },
-{ "twgei",   OPTO(3,TOGE), OPTO_MASK,   PPCCOM,         { RA, SI } },
-{ "tgei",    OPTO(3,TOGE), OPTO_MASK,   PWRCOM,         { RA, SI } },
-{ "twnli",   OPTO(3,TONL), OPTO_MASK,   PPCCOM,         { RA, SI } },
-{ "tnli",    OPTO(3,TONL), OPTO_MASK,   PWRCOM,         { RA, SI } },
-{ "twlti",   OPTO(3,TOLT), OPTO_MASK,   PPCCOM,         { RA, SI } },
-{ "tlti",    OPTO(3,TOLT), OPTO_MASK,   PWRCOM,         { RA, SI } },
-{ "twlei",   OPTO(3,TOLE), OPTO_MASK,   PPCCOM,         { RA, SI } },
-{ "tlei",    OPTO(3,TOLE), OPTO_MASK,   PWRCOM,         { RA, SI } },
-{ "twngi",   OPTO(3,TONG), OPTO_MASK,   PPCCOM,         { RA, SI } },
-{ "tngi",    OPTO(3,TONG), OPTO_MASK,   PWRCOM,         { RA, SI } },
-{ "twnei",   OPTO(3,TONE), OPTO_MASK,   PPCCOM,         { RA, SI } },
-{ "tnei",    OPTO(3,TONE), OPTO_MASK,   PWRCOM,         { RA, SI } },
-{ "twi",     OP(3),     OP_MASK,        PPCCOM,         { TO, RA, SI } },
-{ "ti",      OP(3),     OP_MASK,        PWRCOM,         { TO, RA, SI } },
-
-{ "macchw",     XO(4,172,0,0), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "macchw.",    XO(4,172,0,1), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "macchwo",    XO(4,172,1,0), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "macchwo.",   XO(4,172,1,1), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "macchws",    XO(4,236,0,0), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "macchws.",   XO(4,236,0,1), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "macchwso",   XO(4,236,1,0), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "macchwso.",  XO(4,236,1,1), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "macchwsu",   XO(4,204,0,0), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "macchwsu.",  XO(4,204,0,1), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "macchwsuo",  XO(4,204,1,0), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "macchwsuo.", XO(4,204,1,1), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "macchwu",    XO(4,140,0,0), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "macchwu.",   XO(4,140,0,1), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "macchwuo",   XO(4,140,1,0), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "macchwuo.",  XO(4,140,1,1), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "machhw",     XO(4,44,0,0),  XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "machhw.",    XO(4,44,0,1),  XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "machhwo",    XO(4,44,1,0),  XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "machhwo.",   XO(4,44,1,1),  XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "machhws",    XO(4,108,0,0), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "machhws.",   XO(4,108,0,1), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "machhwso",   XO(4,108,1,0), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "machhwso.",  XO(4,108,1,1), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "machhwsu",   XO(4,76,0,0),  XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "machhwsu.",  XO(4,76,0,1),  XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "machhwsuo",  XO(4,76,1,0),  XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "machhwsuo.", XO(4,76,1,1),  XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "machhwu",    XO(4,12,0,0),  XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "machhwu.",   XO(4,12,0,1),  XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "machhwuo",   XO(4,12,1,0),  XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "machhwuo.",  XO(4,12,1,1),  XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "maclhw",     XO(4,428,0,0), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "maclhw.",    XO(4,428,0,1), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "maclhwo",    XO(4,428,1,0), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "maclhwo.",   XO(4,428,1,1), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "maclhws",    XO(4,492,0,0), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "maclhws.",   XO(4,492,0,1), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "maclhwso",   XO(4,492,1,0), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "maclhwso.",  XO(4,492,1,1), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "maclhwsu",   XO(4,460,0,0), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "maclhwsu.",  XO(4,460,0,1), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "maclhwsuo",  XO(4,460,1,0), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "maclhwsuo.", XO(4,460,1,1), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "maclhwu",    XO(4,396,0,0), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "maclhwu.",   XO(4,396,0,1), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "maclhwuo",   XO(4,396,1,0), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "maclhwuo.",  XO(4,396,1,1), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "mulchw",     XRC(4,168,0),  X_MASK,  PPC405|PPC440,  { RT, RA, RB } },
-{ "mulchw.",    XRC(4,168,1),  X_MASK,  PPC405|PPC440,  { RT, RA, RB } },
-{ "mulchwu",    XRC(4,136,0),  X_MASK,  PPC405|PPC440,  { RT, RA, RB } },
-{ "mulchwu.",   XRC(4,136,1),  X_MASK,  PPC405|PPC440,  { RT, RA, RB } },
-{ "mulhhw",     XRC(4,40,0),   X_MASK,  PPC405|PPC440,  { RT, RA, RB } },
-{ "mulhhw.",    XRC(4,40,1),   X_MASK,  PPC405|PPC440,  { RT, RA, RB } },
-{ "mulhhwu",    XRC(4,8,0),    X_MASK,  PPC405|PPC440,  { RT, RA, RB } },
-{ "mulhhwu.",   XRC(4,8,1),    X_MASK,  PPC405|PPC440,  { RT, RA, RB } },
-{ "mullhw",     XRC(4,424,0),  X_MASK,  PPC405|PPC440,  { RT, RA, RB } },
-{ "mullhw.",    XRC(4,424,1),  X_MASK,  PPC405|PPC440,  { RT, RA, RB } },
-{ "mullhwu",    XRC(4,392,0),  X_MASK,  PPC405|PPC440,  { RT, RA, RB } },
-{ "mullhwu.",   XRC(4,392,1),  X_MASK,  PPC405|PPC440,  { RT, RA, RB } },
-{ "nmacchw",    XO(4,174,0,0), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "nmacchw.",   XO(4,174,0,1), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "nmacchwo",   XO(4,174,1,0), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "nmacchwo.",  XO(4,174,1,1), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "nmacchws",   XO(4,238,0,0), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "nmacchws.",  XO(4,238,0,1), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "nmacchwso",  XO(4,238,1,0), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "nmacchwso.", XO(4,238,1,1), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "nmachhw",    XO(4,46,0,0),  XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "nmachhw.",   XO(4,46,0,1),  XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "nmachhwo",   XO(4,46,1,0),  XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "nmachhwo.",  XO(4,46,1,1),  XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "nmachhws",   XO(4,110,0,0), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "nmachhws.",  XO(4,110,0,1), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "nmachhwso",  XO(4,110,1,0), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "nmachhwso.", XO(4,110,1,1), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "nmaclhw",    XO(4,430,0,0), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "nmaclhw.",   XO(4,430,0,1), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "nmaclhwo",   XO(4,430,1,0), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "nmaclhwo.",  XO(4,430,1,1), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "nmaclhws",   XO(4,494,0,0), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "nmaclhws.",  XO(4,494,0,1), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "nmaclhwso",  XO(4,494,1,0), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "nmaclhwso.", XO(4,494,1,1), XO_MASK, PPC405|PPC440,  { RT, RA, RB } },
-{ "mfvscr",  VX(4, 1540), VX_MASK,      PPCVEC,         { VD } },
-{ "mtvscr",  VX(4, 1604), VX_MASK,      PPCVEC,         { VB } },
-
-  /* Double-precision opcodes.  */
-  /* Some of these conflict with AltiVec, so move them before, since
-     PPCVEC includes the PPC_OPCODE_PPC set.  */
-{ "efscfd",   VX(4, 719), VX_MASK,      PPCEFS,         { RS, RB } },
-{ "efdabs",   VX(4, 740), VX_MASK,      PPCEFS,         { RS, RA } },
-{ "efdnabs",  VX(4, 741), VX_MASK,      PPCEFS,         { RS, RA } },
-{ "efdneg",   VX(4, 742), VX_MASK,      PPCEFS,         { RS, RA } },
-{ "efdadd",   VX(4, 736), VX_MASK,      PPCEFS,         { RS, RA, RB } },
-{ "efdsub",   VX(4, 737), VX_MASK,      PPCEFS,         { RS, RA, RB } },
-{ "efdmul",   VX(4, 744), VX_MASK,      PPCEFS,         { RS, RA, RB } },
-{ "efddiv",   VX(4, 745), VX_MASK,      PPCEFS,         { RS, RA, RB } },
-{ "efdcmpgt", VX(4, 748), VX_MASK,      PPCEFS,         { CRFD, RA, RB } },
-{ "efdcmplt", VX(4, 749), VX_MASK,      PPCEFS,         { CRFD, RA, RB } },
-{ "efdcmpeq", VX(4, 750), VX_MASK,      PPCEFS,         { CRFD, RA, RB } },
-{ "efdtstgt", VX(4, 764), VX_MASK,      PPCEFS,         { CRFD, RA, RB } },
-{ "efdtstlt", VX(4, 765), VX_MASK,      PPCEFS,         { CRFD, RA, RB } },
-{ "efdtsteq", VX(4, 766), VX_MASK,      PPCEFS,         { CRFD, RA, RB } },
-{ "efdcfsi",  VX(4, 753), VX_MASK,      PPCEFS,         { RS, RB } },
-{ "efdcfsid", VX(4, 739), VX_MASK,      PPCEFS,         { RS, RB } },
-{ "efdcfui",  VX(4, 752), VX_MASK,      PPCEFS,         { RS, RB } },
-{ "efdcfuid", VX(4, 738), VX_MASK,      PPCEFS,         { RS, RB } },
-{ "efdcfsf",  VX(4, 755), VX_MASK,      PPCEFS,         { RS, RB } },
-{ "efdcfuf",  VX(4, 754), VX_MASK,      PPCEFS,         { RS, RB } },
-{ "efdctsi",  VX(4, 757), VX_MASK,      PPCEFS,         { RS, RB } },
-{ "efdctsidz",VX(4, 747), VX_MASK,      PPCEFS,         { RS, RB } },
-{ "efdctsiz", VX(4, 762), VX_MASK,      PPCEFS,         { RS, RB } },
-{ "efdctui",  VX(4, 756), VX_MASK,      PPCEFS,         { RS, RB } },
-{ "efdctuidz",VX(4, 746), VX_MASK,      PPCEFS,         { RS, RB } },
-{ "efdctuiz", VX(4, 760), VX_MASK,      PPCEFS,         { RS, RB } },
-{ "efdctsf",  VX(4, 759), VX_MASK,      PPCEFS,         { RS, RB } },
-{ "efdctuf",  VX(4, 758), VX_MASK,      PPCEFS,         { RS, RB } },
-{ "efdcfs",   VX(4, 751), VX_MASK,      PPCEFS,         { RS, RB } },
-  /* End of double-precision opcodes.  */
-
-{ "vaddcuw", VX(4,  384), VX_MASK,      PPCVEC,         { VD, VA, VB } },
-{ "vaddfp",  VX(4,   10), VX_MASK,      PPCVEC,         { VD, VA, VB } },
-{ "vaddsbs", VX(4,  768), VX_MASK,      PPCVEC,         { VD, VA, VB } },
-{ "vaddshs", VX(4,  832), VX_MASK,      PPCVEC,         { VD, VA, VB } },
-{ "vaddsws", VX(4,  896), VX_MASK,      PPCVEC,         { VD, VA, VB } },
-{ "vaddubm", VX(4,    0), VX_MASK,      PPCVEC,         { VD, VA, VB } },
-{ "vaddubs", VX(4,  512), VX_MASK,      PPCVEC,         { VD, VA, VB } },
-{ "vadduhm", VX(4,   64), VX_MASK,      PPCVEC,         { VD, VA, VB } },
-{ "vadduhs", VX(4,  576), VX_MASK,      PPCVEC,         { VD, VA, VB } },
-{ "vadduwm", VX(4,  128), VX_MASK,      PPCVEC,         { VD, VA, VB } },
-{ "vadduws", VX(4,  640), VX_MASK,      PPCVEC,         { VD, VA, VB } },
-{ "vand",    VX(4, 1028), VX_MASK,      PPCVEC,         { VD, VA, VB } },
-{ "vandc",   VX(4, 1092), VX_MASK,      PPCVEC,         { VD, VA, VB } },
-{ "vavgsb",  VX(4, 1282), VX_MASK,      PPCVEC,         { VD, VA, VB } },
-{ "vavgsh",  VX(4, 1346), VX_MASK,      PPCVEC,         { VD, VA, VB } },
-{ "vavgsw",  VX(4, 1410), VX_MASK,      PPCVEC,         { VD, VA, VB } },
-{ "vavgub",  VX(4, 1026), VX_MASK,      PPCVEC,         { VD, VA, VB } },
-{ "vavguh",  VX(4, 1090), VX_MASK,      PPCVEC,         { VD, VA, VB } },
-{ "vavguw",  VX(4, 1154), VX_MASK,      PPCVEC,         { VD, VA, VB } },
-{ "vcfsx",   VX(4,  842), VX_MASK,      PPCVEC,         { VD, VB, UIMM } },
-{ "vcfux",   VX(4,  778), VX_MASK,      PPCVEC,         { VD, VB, UIMM } },
-{ "vcmpbfp",   VXR(4, 966, 0), VXR_MASK, PPCVEC,        { VD, VA, VB } },
-{ "vcmpbfp.",  VXR(4, 966, 1), VXR_MASK, PPCVEC,        { VD, VA, VB } },
-{ "vcmpeqfp",  VXR(4, 198, 0), VXR_MASK, PPCVEC,        { VD, VA, VB } },
-{ "vcmpeqfp.", VXR(4, 198, 1), VXR_MASK, PPCVEC,        { VD, VA, VB } },
-{ "vcmpequb",  VXR(4,   6, 0), VXR_MASK, PPCVEC,        { VD, VA, VB } },
-{ "vcmpequb.", VXR(4,   6, 1), VXR_MASK, PPCVEC,        { VD, VA, VB } },
-{ "vcmpequh",  VXR(4,  70, 0), VXR_MASK, PPCVEC,        { VD, VA, VB } },
-{ "vcmpequh.", VXR(4,  70, 1), VXR_MASK, PPCVEC,        { VD, VA, VB } },
-{ "vcmpequw",  VXR(4, 134, 0), VXR_MASK, PPCVEC,        { VD, VA, VB } },
-{ "vcmpequw.", VXR(4, 134, 1), VXR_MASK, PPCVEC,        { VD, VA, VB } },
-{ "vcmpgefp",  VXR(4, 454, 0), VXR_MASK, PPCVEC,        { VD, VA, VB } },
-{ "vcmpgefp.", VXR(4, 454, 1), VXR_MASK, PPCVEC,        { VD, VA, VB } },
-{ "vcmpgtfp",  VXR(4, 710, 0), VXR_MASK, PPCVEC,        { VD, VA, VB } },
-{ "vcmpgtfp.", VXR(4, 710, 1), VXR_MASK, PPCVEC,        { VD, VA, VB } },
-{ "vcmpgtsb",  VXR(4, 774, 0), VXR_MASK, PPCVEC,        { VD, VA, VB } },
-{ "vcmpgtsb.", VXR(4, 774, 1), VXR_MASK, PPCVEC,        { VD, VA, VB } },
-{ "vcmpgtsh",  VXR(4, 838, 0), VXR_MASK, PPCVEC,        { VD, VA, VB } },
-{ "vcmpgtsh.", VXR(4, 838, 1), VXR_MASK, PPCVEC,        { VD, VA, VB } },
-{ "vcmpgtsw",  VXR(4, 902, 0), VXR_MASK, PPCVEC,        { VD, VA, VB } },
-{ "vcmpgtsw.", VXR(4, 902, 1), VXR_MASK, PPCVEC,        { VD, VA, VB } },
-{ "vcmpgtub",  VXR(4, 518, 0), VXR_MASK, PPCVEC,        { VD, VA, VB } },
-{ "vcmpgtub.", VXR(4, 518, 1), VXR_MASK, PPCVEC,        { VD, VA, VB } },
-{ "vcmpgtuh",  VXR(4, 582, 0), VXR_MASK, PPCVEC,        { VD, VA, VB } },
-{ "vcmpgtuh.", VXR(4, 582, 1), VXR_MASK, PPCVEC,        { VD, VA, VB } },
-{ "vcmpgtuw",  VXR(4, 646, 0), VXR_MASK, PPCVEC,        { VD, VA, VB } },
-{ "vcmpgtuw.", VXR(4, 646, 1), VXR_MASK, PPCVEC,        { VD, VA, VB } },
-{ "vctsxs",    VX(4,  970), VX_MASK,    PPCVEC,         { VD, VB, UIMM } },
-{ "vctuxs",    VX(4,  906), VX_MASK,    PPCVEC,         { VD, VB, UIMM } },
-{ "vexptefp",  VX(4,  394), VX_MASK,    PPCVEC,         { VD, VB } },
-{ "vlogefp",   VX(4,  458), VX_MASK,    PPCVEC,         { VD, VB } },
-{ "vmaddfp",   VXA(4,  46), VXA_MASK,   PPCVEC,         { VD, VA, VC, VB } },
-{ "vmaxfp",    VX(4, 1034), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vmaxsb",    VX(4,  258), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vmaxsh",    VX(4,  322), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vmaxsw",    VX(4,  386), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vmaxub",    VX(4,    2), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vmaxuh",    VX(4,   66), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vmaxuw",    VX(4,  130), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vmhaddshs", VXA(4,  32), VXA_MASK,   PPCVEC,         { VD, VA, VB, VC } },
-{ "vmhraddshs", VXA(4, 33), VXA_MASK,   PPCVEC,         { VD, VA, VB, VC } },
-{ "vminfp",    VX(4, 1098), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vminsb",    VX(4,  770), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vminsh",    VX(4,  834), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vminsw",    VX(4,  898), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vminub",    VX(4,  514), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vminuh",    VX(4,  578), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vminuw",    VX(4,  642), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vmladduhm", VXA(4,  34), VXA_MASK,   PPCVEC,         { VD, VA, VB, VC } },
-{ "vmrghb",    VX(4,   12), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vmrghh",    VX(4,   76), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vmrghw",    VX(4,  140), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vmrglb",    VX(4,  268), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vmrglh",    VX(4,  332), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vmrglw",    VX(4,  396), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vmsummbm",  VXA(4,  37), VXA_MASK,   PPCVEC,         { VD, VA, VB, VC } },
-{ "vmsumshm",  VXA(4,  40), VXA_MASK,   PPCVEC,         { VD, VA, VB, VC } },
-{ "vmsumshs",  VXA(4,  41), VXA_MASK,   PPCVEC,         { VD, VA, VB, VC } },
-{ "vmsumubm",  VXA(4,  36), VXA_MASK,   PPCVEC,         { VD, VA, VB, VC } },
-{ "vmsumuhm",  VXA(4,  38), VXA_MASK,   PPCVEC,         { VD, VA, VB, VC } },
-{ "vmsumuhs",  VXA(4,  39), VXA_MASK,   PPCVEC,         { VD, VA, VB, VC } },
-{ "vmulesb",   VX(4,  776), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vmulesh",   VX(4,  840), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vmuleub",   VX(4,  520), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vmuleuh",   VX(4,  584), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vmulosb",   VX(4,  264), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vmulosh",   VX(4,  328), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vmuloub",   VX(4,    8), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vmulouh",   VX(4,   72), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vnmsubfp",  VXA(4,  47), VXA_MASK,   PPCVEC,         { VD, VA, VC, VB } },
-{ "vnor",      VX(4, 1284), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vor",       VX(4, 1156), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vperm",     VXA(4,  43), VXA_MASK,   PPCVEC,         { VD, VA, VB, VC } },
-{ "vpkpx",     VX(4,  782), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vpkshss",   VX(4,  398), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vpkshus",   VX(4,  270), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vpkswss",   VX(4,  462), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vpkswus",   VX(4,  334), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vpkuhum",   VX(4,   14), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vpkuhus",   VX(4,  142), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vpkuwum",   VX(4,   78), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vpkuwus",   VX(4,  206), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vrefp",     VX(4,  266), VX_MASK,    PPCVEC,         { VD, VB } },
-{ "vrfim",     VX(4,  714), VX_MASK,    PPCVEC,         { VD, VB } },
-{ "vrfin",     VX(4,  522), VX_MASK,    PPCVEC,         { VD, VB } },
-{ "vrfip",     VX(4,  650), VX_MASK,    PPCVEC,         { VD, VB } },
-{ "vrfiz",     VX(4,  586), VX_MASK,    PPCVEC,         { VD, VB } },
-{ "vrlb",      VX(4,    4), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vrlh",      VX(4,   68), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vrlw",      VX(4,  132), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vrsqrtefp", VX(4,  330), VX_MASK,    PPCVEC,         { VD, VB } },
-{ "vsel",      VXA(4,  42), VXA_MASK,   PPCVEC,         { VD, VA, VB, VC } },
-{ "vsl",       VX(4,  452), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vslb",      VX(4,  260), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vsldoi",    VXA(4,  44), VXA_MASK,   PPCVEC,         { VD, VA, VB, SHB } },
-{ "vslh",      VX(4,  324), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vslo",      VX(4, 1036), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vslw",      VX(4,  388), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vspltb",    VX(4,  524), VX_MASK,    PPCVEC,         { VD, VB, UIMM } },
-{ "vsplth",    VX(4,  588), VX_MASK,    PPCVEC,         { VD, VB, UIMM } },
-{ "vspltisb",  VX(4,  780), VX_MASK,    PPCVEC,         { VD, SIMM } },
-{ "vspltish",  VX(4,  844), VX_MASK,    PPCVEC,         { VD, SIMM } },
-{ "vspltisw",  VX(4,  908), VX_MASK,    PPCVEC,         { VD, SIMM } },
-{ "vspltw",    VX(4,  652), VX_MASK,    PPCVEC,         { VD, VB, UIMM } },
-{ "vsr",       VX(4,  708), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vsrab",     VX(4,  772), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vsrah",     VX(4,  836), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vsraw",     VX(4,  900), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vsrb",      VX(4,  516), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vsrh",      VX(4,  580), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vsro",      VX(4, 1100), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vsrw",      VX(4,  644), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vsubcuw",   VX(4, 1408), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vsubfp",    VX(4,   74), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vsubsbs",   VX(4, 1792), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vsubshs",   VX(4, 1856), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vsubsws",   VX(4, 1920), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vsububm",   VX(4, 1024), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vsububs",   VX(4, 1536), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vsubuhm",   VX(4, 1088), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vsubuhs",   VX(4, 1600), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vsubuwm",   VX(4, 1152), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vsubuws",   VX(4, 1664), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vsumsws",   VX(4, 1928), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vsum2sws",  VX(4, 1672), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vsum4sbs",  VX(4, 1800), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vsum4shs",  VX(4, 1608), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vsum4ubs",  VX(4, 1544), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-{ "vupkhpx",   VX(4,  846), VX_MASK,    PPCVEC,         { VD, VB } },
-{ "vupkhsb",   VX(4,  526), VX_MASK,    PPCVEC,         { VD, VB } },
-{ "vupkhsh",   VX(4,  590), VX_MASK,    PPCVEC,         { VD, VB } },
-{ "vupklpx",   VX(4,  974), VX_MASK,    PPCVEC,         { VD, VB } },
-{ "vupklsb",   VX(4,  654), VX_MASK,    PPCVEC,         { VD, VB } },
-{ "vupklsh",   VX(4,  718), VX_MASK,    PPCVEC,         { VD, VB } },
-{ "vxor",      VX(4, 1220), VX_MASK,    PPCVEC,         { VD, VA, VB } },
-
-{ "evaddw",    VX(4, 512), VX_MASK,     PPCSPE,         { RS, RA, RB } },
-{ "evaddiw",   VX(4, 514), VX_MASK,     PPCSPE,         { RS, RB, UIMM } },
-{ "evsubfw",   VX(4, 516), VX_MASK,     PPCSPE,         { RS, RA, RB } },
-{ "evsubw",    VX(4, 516), VX_MASK,     PPCSPE,         { RS, RB, RA } },
-{ "evsubifw",  VX(4, 518), VX_MASK,     PPCSPE,         { RS, UIMM, RB } },
-{ "evsubiw",   VX(4, 518), VX_MASK,     PPCSPE,         { RS, RB, UIMM } },
-{ "evabs",     VX(4, 520), VX_MASK,     PPCSPE,         { RS, RA } },
-{ "evneg",     VX(4, 521), VX_MASK,     PPCSPE,         { RS, RA } },
-{ "evextsb",   VX(4, 522), VX_MASK,     PPCSPE,         { RS, RA } },
-{ "evextsh",   VX(4, 523), VX_MASK,     PPCSPE,         { RS, RA } },
-{ "evrndw",    VX(4, 524), VX_MASK,     PPCSPE,         { RS, RA } },
-{ "evcntlzw",  VX(4, 525), VX_MASK,     PPCSPE,         { RS, RA } },
-{ "evcntlsw",  VX(4, 526), VX_MASK,     PPCSPE,         { RS, RA } },
-
-{ "brinc",     VX(4, 527), VX_MASK,     PPCSPE,         { RS, RA, RB } },
-
-{ "evand",     VX(4, 529), VX_MASK,     PPCSPE,         { RS, RA, RB } },
-{ "evandc",    VX(4, 530), VX_MASK,     PPCSPE,         { RS, RA, RB } },
-{ "evmr",      VX(4, 535), VX_MASK,     PPCSPE,         { RS, RA, BBA } },
-{ "evor",      VX(4, 535), VX_MASK,     PPCSPE,         { RS, RA, RB } },
-{ "evorc",     VX(4, 539), VX_MASK,     PPCSPE,         { RS, RA, RB } },
-{ "evxor",     VX(4, 534), VX_MASK,     PPCSPE,         { RS, RA, RB } },
-{ "eveqv",     VX(4, 537), VX_MASK,     PPCSPE,         { RS, RA, RB } },
-{ "evnand",    VX(4, 542), VX_MASK,     PPCSPE,         { RS, RA, RB } },
-{ "evnot",     VX(4, 536), VX_MASK,     PPCSPE,         { RS, RA, BBA } },
-{ "evnor",     VX(4, 536), VX_MASK,     PPCSPE,         { RS, RA, RB } },
-
-{ "evrlw",     VX(4, 552), VX_MASK,     PPCSPE,         { RS, RA, RB } },
-{ "evrlwi",    VX(4, 554), VX_MASK,     PPCSPE,         { RS, RA, EVUIMM } },
-{ "evslw",     VX(4, 548), VX_MASK,     PPCSPE,         { RS, RA, RB } },
-{ "evslwi",    VX(4, 550), VX_MASK,     PPCSPE,         { RS, RA, EVUIMM } },
-{ "evsrws",    VX(4, 545), VX_MASK,     PPCSPE,         { RS, RA, RB } },
-{ "evsrwu",    VX(4, 544), VX_MASK,     PPCSPE,         { RS, RA, RB } },
-{ "evsrwis",   VX(4, 547), VX_MASK,     PPCSPE,         { RS, RA, EVUIMM } },
-{ "evsrwiu",   VX(4, 546), VX_MASK,     PPCSPE,         { RS, RA, EVUIMM } },
-{ "evsplati",  VX(4, 553), VX_MASK,     PPCSPE,         { RS, SIMM } },
-{ "evsplatfi", VX(4, 555), VX_MASK,     PPCSPE,         { RS, SIMM } },
-{ "evmergehi", VX(4, 556), VX_MASK,     PPCSPE,         { RS, RA, RB } },
-{ "evmergelo", VX(4, 557), VX_MASK,     PPCSPE,         { RS, RA, RB } },
-{ "evmergehilo",VX(4,558), VX_MASK,     PPCSPE,         { RS, RA, RB } },
-{ "evmergelohi",VX(4,559), VX_MASK,     PPCSPE,         { RS, RA, RB } },
-
-{ "evcmpgts",  VX(4, 561), VX_MASK,     PPCSPE,         { CRFD, RA, RB } },
-{ "evcmpgtu",  VX(4, 560), VX_MASK,     PPCSPE,         { CRFD, RA, RB } },
-{ "evcmplts",  VX(4, 563), VX_MASK,     PPCSPE,         { CRFD, RA, RB } },
-{ "evcmpltu",  VX(4, 562), VX_MASK,     PPCSPE,         { CRFD, RA, RB } },
-{ "evcmpeq",   VX(4, 564), VX_MASK,     PPCSPE,         { CRFD, RA, RB } },
-{ "evsel",     EVSEL(4,79),EVSEL_MASK,  PPCSPE,         { RS, RA, RB, CRFS } },
-
-{ "evldd",     VX(4, 769), VX_MASK,     PPCSPE,         { RS, EVUIMM_8, RA } },
-{ "evlddx",    VX(4, 768), VX_MASK,     PPCSPE,         { RS, RA, RB } },
-{ "evldw",     VX(4, 771), VX_MASK,     PPCSPE,         { RS, EVUIMM_8, RA } },
-{ "evldwx",    VX(4, 770), VX_MASK,     PPCSPE,         { RS, RA, RB } },
-{ "evldh",     VX(4, 773), VX_MASK,     PPCSPE,         { RS, EVUIMM_8, RA } },
-{ "evldhx",    VX(4, 772), VX_MASK,     PPCSPE,         { RS, RA, RB } },
-{ "evlwhe",    VX(4, 785), VX_MASK,     PPCSPE,         { RS, EVUIMM_4, RA } },
-{ "evlwhex",   VX(4, 784), VX_MASK,     PPCSPE,         { RS, RA, RB } },
-{ "evlwhou",   VX(4, 789), VX_MASK,     PPCSPE,         { RS, EVUIMM_4, RA } },
-{ "evlwhoux",  VX(4, 788), VX_MASK,     PPCSPE,         { RS, RA, RB } },
-{ "evlwhos",   VX(4, 791), VX_MASK,     PPCSPE,         { RS, EVUIMM_4, RA } },
-{ "evlwhosx",  VX(4, 790), VX_MASK,     PPCSPE,         { RS, RA, RB } },
-{ "evlwwsplat",VX(4, 793), VX_MASK,     PPCSPE,         { RS, EVUIMM_4, RA } },
-{ "evlwwsplatx",VX(4, 792), VX_MASK,    PPCSPE,         { RS, RA, RB } },
-{ "evlwhsplat",VX(4, 797), VX_MASK,     PPCSPE,         { RS, EVUIMM_4, RA } },
-{ "evlwhsplatx",VX(4, 796), VX_MASK,    PPCSPE,         { RS, RA, RB } },
-{ "evlhhesplat",VX(4, 777), VX_MASK,    PPCSPE,         { RS, EVUIMM_2, RA } },
-{ "evlhhesplatx",VX(4, 776), VX_MASK,   PPCSPE,         { RS, RA, RB } },
-{ "evlhhousplat",VX(4, 781), VX_MASK,   PPCSPE,         { RS, EVUIMM_2, RA } },
-{ "evlhhousplatx",VX(4, 780), VX_MASK,  PPCSPE,         { RS, RA, RB } },
-{ "evlhhossplat",VX(4, 783), VX_MASK,   PPCSPE,         { RS, EVUIMM_2, RA } },
-{ "evlhhossplatx",VX(4, 782), VX_MASK,  PPCSPE,         { RS, RA, RB } },
-
-{ "evstdd",    VX(4, 801), VX_MASK,     PPCSPE,         { RS, EVUIMM_8, RA } },
-{ "evstddx",   VX(4, 800), VX_MASK,     PPCSPE,         { RS, RA, RB } },
-{ "evstdw",    VX(4, 803), VX_MASK,     PPCSPE,         { RS, EVUIMM_8, RA } },
-{ "evstdwx",   VX(4, 802), VX_MASK,     PPCSPE,         { RS, RA, RB } },
-{ "evstdh",    VX(4, 805), VX_MASK,     PPCSPE,         { RS, EVUIMM_8, RA } },
-{ "evstdhx",   VX(4, 804), VX_MASK,     PPCSPE,         { RS, RA, RB } },
-{ "evstwwe",   VX(4, 825), VX_MASK,     PPCSPE,         { RS, EVUIMM_4, RA } },
-{ "evstwwex",  VX(4, 824), VX_MASK,     PPCSPE,         { RS, RA, RB } },
-{ "evstwwo",   VX(4, 829), VX_MASK,     PPCSPE,         { RS, EVUIMM_4, RA } },
-{ "evstwwox",  VX(4, 828), VX_MASK,     PPCSPE,         { RS, RA, RB } },
-{ "evstwhe",   VX(4, 817), VX_MASK,     PPCSPE,         { RS, EVUIMM_4, RA } },
-{ "evstwhex",  VX(4, 816), VX_MASK,     PPCSPE,         { RS, RA, RB } },
-{ "evstwho",   VX(4, 821), VX_MASK,     PPCSPE,         { RS, EVUIMM_4, RA } },
-{ "evstwhox",  VX(4, 820), VX_MASK,     PPCSPE,         { RS, RA, RB } },
-
-{ "evfsabs",   VX(4, 644), VX_MASK,     PPCSPE,         { RS, RA } },
-{ "evfsnabs",  VX(4, 645), VX_MASK,     PPCSPE,         { RS, RA } },
-{ "evfsneg",   VX(4, 646), VX_MASK,     PPCSPE,         { RS, RA } },
-{ "evfsadd",   VX(4, 640), VX_MASK,     PPCSPE,         { RS, RA, RB } },
-{ "evfssub",   VX(4, 641), VX_MASK,     PPCSPE,         { RS, RA, RB } },
-{ "evfsmul",   VX(4, 648), VX_MASK,     PPCSPE,         { RS, RA, RB } },
-{ "evfsdiv",   VX(4, 649), VX_MASK,     PPCSPE,         { RS, RA, RB } },
-{ "evfscmpgt", VX(4, 652), VX_MASK,     PPCSPE,         { CRFD, RA, RB } },
-{ "evfscmplt", VX(4, 653), VX_MASK,     PPCSPE,         { CRFD, RA, RB } },
-{ "evfscmpeq", VX(4, 654), VX_MASK,     PPCSPE,         { CRFD, RA, RB } },
-{ "evfststgt", VX(4, 668), VX_MASK,     PPCSPE,         { CRFD, RA, RB } },
-{ "evfststlt", VX(4, 669), VX_MASK,     PPCSPE,         { CRFD, RA, RB } },
-{ "evfststeq", VX(4, 670), VX_MASK,     PPCSPE,         { CRFD, RA, RB } },
-{ "evfscfui",  VX(4, 656), VX_MASK,     PPCSPE,         { RS, RB } },
-{ "evfsctuiz", VX(4, 664), VX_MASK,     PPCSPE,         { RS, RB } },
-{ "evfscfsi",  VX(4, 657), VX_MASK,     PPCSPE,         { RS, RB } },
-{ "evfscfuf",  VX(4, 658), VX_MASK,     PPCSPE,         { RS, RB } },
-{ "evfscfsf",  VX(4, 659), VX_MASK,     PPCSPE,         { RS, RB } },
-{ "evfsctui",  VX(4, 660), VX_MASK,     PPCSPE,         { RS, RB } },
-{ "evfsctsi",  VX(4, 661), VX_MASK,     PPCSPE,         { RS, RB } },
-{ "evfsctsiz", VX(4, 666), VX_MASK,     PPCSPE,         { RS, RB } },
-{ "evfsctuf",  VX(4, 662), VX_MASK,     PPCSPE,         { RS, RB } },
-{ "evfsctsf",  VX(4, 663), VX_MASK,     PPCSPE,         { RS, RB } },
-
-{ "efsabs",   VX(4, 708), VX_MASK,      PPCEFS,         { RS, RA } },
-{ "efsnabs",  VX(4, 709), VX_MASK,      PPCEFS,         { RS, RA } },
-{ "efsneg",   VX(4, 710), VX_MASK,      PPCEFS,         { RS, RA } },
-{ "efsadd",   VX(4, 704), VX_MASK,      PPCEFS,         { RS, RA, RB } },
-{ "efssub",   VX(4, 705), VX_MASK,      PPCEFS,         { RS, RA, RB } },
-{ "efsmul",   VX(4, 712), VX_MASK,      PPCEFS,         { RS, RA, RB } },
-{ "efsdiv",   VX(4, 713), VX_MASK,      PPCEFS,         { RS, RA, RB } },
-{ "efscmpgt", VX(4, 716), VX_MASK,      PPCEFS,         { CRFD, RA, RB } },
-{ "efscmplt", VX(4, 717), VX_MASK,      PPCEFS,         { CRFD, RA, RB } },
-{ "efscmpeq", VX(4, 718), VX_MASK,      PPCEFS,         { CRFD, RA, RB } },
-{ "efststgt", VX(4, 732), VX_MASK,      PPCEFS,         { CRFD, RA, RB } },
-{ "efststlt", VX(4, 733), VX_MASK,      PPCEFS,         { CRFD, RA, RB } },
-{ "efststeq", VX(4, 734), VX_MASK,      PPCEFS,         { CRFD, RA, RB } },
-{ "efscfui",  VX(4, 720), VX_MASK,      PPCEFS,         { RS, RB } },
-{ "efsctuiz", VX(4, 728), VX_MASK,      PPCEFS,         { RS, RB } },
-{ "efscfsi",  VX(4, 721), VX_MASK,      PPCEFS,         { RS, RB } },
-{ "efscfuf",  VX(4, 722), VX_MASK,      PPCEFS,         { RS, RB } },
-{ "efscfsf",  VX(4, 723), VX_MASK,      PPCEFS,         { RS, RB } },
-{ "efsctui",  VX(4, 724), VX_MASK,      PPCEFS,         { RS, RB } },
-{ "efsctsi",  VX(4, 725), VX_MASK,      PPCEFS,         { RS, RB } },
-{ "efsctsiz", VX(4, 730), VX_MASK,      PPCEFS,         { RS, RB } },
-{ "efsctuf",  VX(4, 726), VX_MASK,      PPCEFS,         { RS, RB } },
-{ "efsctsf",  VX(4, 727), VX_MASK,      PPCEFS,         { RS, RB } },
-
-{ "evmhossf",  VX(4, 1031), VX_MASK,    PPCSPE,         { RS, RA, RB } },
-{ "evmhossfa", VX(4, 1063), VX_MASK,    PPCSPE,         { RS, RA, RB } },
-{ "evmhosmf",  VX(4, 1039), VX_MASK,    PPCSPE,         { RS, RA, RB } },
-{ "evmhosmfa", VX(4, 1071), VX_MASK,    PPCSPE,         { RS, RA, RB } },
-{ "evmhosmi",  VX(4, 1037), VX_MASK,    PPCSPE,         { RS, RA, RB } },
-{ "evmhosmia", VX(4, 1069), VX_MASK,    PPCSPE,         { RS, RA, RB } },
-{ "evmhoumi",  VX(4, 1036), VX_MASK,    PPCSPE,         { RS, RA, RB } },
-{ "evmhoumia", VX(4, 1068), VX_MASK,    PPCSPE,         { RS, RA, RB } },
-{ "evmhessf",  VX(4, 1027), VX_MASK,    PPCSPE,         { RS, RA, RB } },
-{ "evmhessfa", VX(4, 1059), VX_MASK,    PPCSPE,         { RS, RA, RB } },
-{ "evmhesmf",  VX(4, 1035), VX_MASK,    PPCSPE,         { RS, RA, RB } },
-{ "evmhesmfa", VX(4, 1067), VX_MASK,    PPCSPE,         { RS, RA, RB } },
-{ "evmhesmi",  VX(4, 1033), VX_MASK,    PPCSPE,         { RS, RA, RB } },
-{ "evmhesmia", VX(4, 1065), VX_MASK,    PPCSPE,         { RS, RA, RB } },
-{ "evmheumi",  VX(4, 1032), VX_MASK,    PPCSPE,         { RS, RA, RB } },
-{ "evmheumia", VX(4, 1064), VX_MASK,    PPCSPE,         { RS, RA, RB } },
-
-{ "evmhossfaaw",VX(4, 1287), VX_MASK,   PPCSPE,         { RS, RA, RB } },
-{ "evmhossiaaw",VX(4, 1285), VX_MASK,   PPCSPE,         { RS, RA, RB } },
-{ "evmhosmfaaw",VX(4, 1295), VX_MASK,   PPCSPE,         { RS, RA, RB } },
-{ "evmhosmiaaw",VX(4, 1293), VX_MASK,   PPCSPE,         { RS, RA, RB } },
-{ "evmhousiaaw",VX(4, 1284), VX_MASK,   PPCSPE,         { RS, RA, RB } },
-{ "evmhoumiaaw",VX(4, 1292), VX_MASK,   PPCSPE,         { RS, RA, RB } },
-{ "evmhessfaaw",VX(4, 1283), VX_MASK,   PPCSPE,         { RS, RA, RB } },
-{ "evmhessiaaw",VX(4, 1281), VX_MASK,   PPCSPE,         { RS, RA, RB } },
-{ "evmhesmfaaw",VX(4, 1291), VX_MASK,   PPCSPE,         { RS, RA, RB } },
-{ "evmhesmiaaw",VX(4, 1289), VX_MASK,   PPCSPE,         { RS, RA, RB } },
-{ "evmheusiaaw",VX(4, 1280), VX_MASK,   PPCSPE,         { RS, RA, RB } },
-{ "evmheumiaaw",VX(4, 1288), VX_MASK,   PPCSPE,         { RS, RA, RB } },
-
-{ "evmhossfanw",VX(4, 1415), VX_MASK,   PPCSPE,         { RS, RA, RB } },
-{ "evmhossianw",VX(4, 1413), VX_MASK,   PPCSPE,         { RS, RA, RB } },
-{ "evmhosmfanw",VX(4, 1423), VX_MASK,   PPCSPE,         { RS, RA, RB } },
-{ "evmhosmianw",VX(4, 1421), VX_MASK,   PPCSPE,         { RS, RA, RB } },
-{ "evmhousianw",VX(4, 1412), VX_MASK,   PPCSPE,         { RS, RA, RB } },
-{ "evmhoumianw",VX(4, 1420), VX_MASK,   PPCSPE,         { RS, RA, RB } },
-{ "evmhessfanw",VX(4, 1411), VX_MASK,   PPCSPE,         { RS, RA, RB } },
-{ "evmhessianw",VX(4, 1409), VX_MASK,   PPCSPE,         { RS, RA, RB } },
-{ "evmhesmfanw",VX(4, 1419), VX_MASK,   PPCSPE,         { RS, RA, RB } },
-{ "evmhesmianw",VX(4, 1417), VX_MASK,   PPCSPE,         { RS, RA, RB } },
-{ "evmheusianw",VX(4, 1408), VX_MASK,   PPCSPE,         { RS, RA, RB } },
-{ "evmheumianw",VX(4, 1416), VX_MASK,   PPCSPE,         { RS, RA, RB } },
-
-{ "evmhogsmfaa",VX(4, 1327), VX_MASK,   PPCSPE,         { RS, RA, RB } },
-{ "evmhogsmiaa",VX(4, 1325), VX_MASK,   PPCSPE,         { RS, RA, RB } },
-{ "evmhogumiaa",VX(4, 1324), VX_MASK,   PPCSPE,         { RS, RA, RB } },
-{ "evmhegsmfaa",VX(4, 1323), VX_MASK,   PPCSPE,         { RS, RA, RB } },
-{ "evmhegsmiaa",VX(4, 1321), VX_MASK,   PPCSPE,         { RS, RA, RB } },
-{ "evmhegumiaa",VX(4, 1320), VX_MASK,   PPCSPE,         { RS, RA, RB } },
-
-{ "evmhogsmfan",VX(4, 1455), VX_MASK,   PPCSPE,         { RS, RA, RB } },
-{ "evmhogsmian",VX(4, 1453), VX_MASK,   PPCSPE,         { RS, RA, RB } },
-{ "evmhogumian",VX(4, 1452), VX_MASK,   PPCSPE,         { RS, RA, RB } },
-{ "evmhegsmfan",VX(4, 1451), VX_MASK,   PPCSPE,         { RS, RA, RB } },
-{ "evmhegsmian",VX(4, 1449), VX_MASK,   PPCSPE,         { RS, RA, RB } },
-{ "evmhegumian",VX(4, 1448), VX_MASK,   PPCSPE,         { RS, RA, RB } },
-
-{ "evmwhssf",  VX(4, 1095), VX_MASK,    PPCSPE,         { RS, RA, RB } },
-{ "evmwhssfa", VX(4, 1127), VX_MASK,    PPCSPE,         { RS, RA, RB } },
-{ "evmwhsmf",  VX(4, 1103), VX_MASK,    PPCSPE,         { RS, RA, RB } },
-{ "evmwhsmfa", VX(4, 1135), VX_MASK,    PPCSPE,         { RS, RA, RB } },
-{ "evmwhsmi",  VX(4, 1101), VX_MASK,    PPCSPE,         { RS, RA, RB } },
-{ "evmwhsmia", VX(4, 1133), VX_MASK,    PPCSPE,         { RS, RA, RB } },
-{ "evmwhumi",  VX(4, 1100), VX_MASK,    PPCSPE,         { RS, RA, RB } },
-{ "evmwhumia", VX(4, 1132), VX_MASK,    PPCSPE,         { RS, RA, RB } },
-
-{ "evmwlumi",  VX(4, 1096), VX_MASK,    PPCSPE,         { RS, RA, RB } },
-{ "evmwlumia", VX(4, 1128), VX_MASK,    PPCSPE,         { RS, RA, RB } },
-
-{ "evmwlssiaaw",VX(4, 1345), VX_MASK,   PPCSPE,         { RS, RA, RB } },
-{ "evmwlsmiaaw",VX(4, 1353), VX_MASK,   PPCSPE,         { RS, RA, RB } },
-{ "evmwlusiaaw",VX(4, 1344), VX_MASK,   PPCSPE,         { RS, RA, RB } },
-{ "evmwlumiaaw",VX(4, 1352), VX_MASK,   PPCSPE,         { RS, RA, RB } },
-
-{ "evmwlssianw",VX(4, 1473), VX_MASK,   PPCSPE,         { RS, RA, RB } },
-{ "evmwlsmianw",VX(4, 1481), VX_MASK,   PPCSPE,         { RS, RA, RB } },
-{ "evmwlusianw",VX(4, 1472), VX_MASK,   PPCSPE,         { RS, RA, RB } },
-{ "evmwlumianw",VX(4, 1480), VX_MASK,   PPCSPE,         { RS, RA, RB } },
-
-{ "evmwssf",   VX(4, 1107), VX_MASK,    PPCSPE,         { RS, RA, RB } },
-{ "evmwssfa",  VX(4, 1139), VX_MASK,    PPCSPE,         { RS, RA, RB } },
-{ "evmwsmf",   VX(4, 1115), VX_MASK,    PPCSPE,         { RS, RA, RB } },
-{ "evmwsmfa",  VX(4, 1147), VX_MASK,    PPCSPE,         { RS, RA, RB } },
-{ "evmwsmi",   VX(4, 1113), VX_MASK,    PPCSPE,         { RS, RA, RB } },
-{ "evmwsmia",  VX(4, 1145), VX_MASK,    PPCSPE,         { RS, RA, RB } },
-{ "evmwumi",   VX(4, 1112), VX_MASK,    PPCSPE,         { RS, RA, RB } },
-{ "evmwumia",  VX(4, 1144), VX_MASK,    PPCSPE,         { RS, RA, RB } },
-
-{ "evmwssfaa", VX(4, 1363), VX_MASK,    PPCSPE,         { RS, RA, RB } },
-{ "evmwsmfaa", VX(4, 1371), VX_MASK,    PPCSPE,         { RS, RA, RB } },
-{ "evmwsmiaa", VX(4, 1369), VX_MASK,    PPCSPE,         { RS, RA, RB } },
-{ "evmwumiaa", VX(4, 1368), VX_MASK,    PPCSPE,         { RS, RA, RB } },
-
-{ "evmwssfan", VX(4, 1491), VX_MASK,    PPCSPE,         { RS, RA, RB } },
-{ "evmwsmfan", VX(4, 1499), VX_MASK,    PPCSPE,         { RS, RA, RB } },
-{ "evmwsmian", VX(4, 1497), VX_MASK,    PPCSPE,         { RS, RA, RB } },
-{ "evmwumian", VX(4, 1496), VX_MASK,    PPCSPE,         { RS, RA, RB } },
-
-{ "evaddssiaaw",VX(4, 1217), VX_MASK,   PPCSPE,         { RS, RA } },
-{ "evaddsmiaaw",VX(4, 1225), VX_MASK,   PPCSPE,         { RS, RA } },
-{ "evaddusiaaw",VX(4, 1216), VX_MASK,   PPCSPE,         { RS, RA } },
-{ "evaddumiaaw",VX(4, 1224), VX_MASK,   PPCSPE,         { RS, RA } },
-
-{ "evsubfssiaaw",VX(4, 1219), VX_MASK,  PPCSPE,         { RS, RA } },
-{ "evsubfsmiaaw",VX(4, 1227), VX_MASK,  PPCSPE,         { RS, RA } },
-{ "evsubfusiaaw",VX(4, 1218), VX_MASK,  PPCSPE,         { RS, RA } },
-{ "evsubfumiaaw",VX(4, 1226), VX_MASK,  PPCSPE,         { RS, RA } },
-
-{ "evmra",    VX(4, 1220), VX_MASK,     PPCSPE,         { RS, RA } },
-
-{ "evdivws",  VX(4, 1222), VX_MASK,     PPCSPE,         { RS, RA, RB } },
-{ "evdivwu",  VX(4, 1223), VX_MASK,     PPCSPE,         { RS, RA, RB } },
-
-{ "mulli",   OP(7),     OP_MASK,        PPCCOM,         { RT, RA, SI } },
-{ "muli",    OP(7),     OP_MASK,        PWRCOM,         { RT, RA, SI } },
-
-{ "subfic",  OP(8),     OP_MASK,        PPCCOM,         { RT, RA, SI } },
-{ "sfi",     OP(8),     OP_MASK,        PWRCOM,         { RT, RA, SI } },
-
-{ "dozi",    OP(9),     OP_MASK,        M601,           { RT, RA, SI } },
-
-{ "bce",     B(9,0,0),  B_MASK,         BOOKE64,        { BO, BI, BD } },
-{ "bcel",    B(9,0,1),  B_MASK,         BOOKE64,        { BO, BI, BD } },
-{ "bcea",    B(9,1,0),  B_MASK,         BOOKE64,        { BO, BI, BDA } },
-{ "bcela",   B(9,1,1),  B_MASK,         BOOKE64,        { BO, BI, BDA } },
-
-{ "cmplwi",  OPL(10,0), OPL_MASK,       PPCCOM,         { OBF, RA, UI } },
-{ "cmpldi",  OPL(10,1), OPL_MASK,       PPC64,          { OBF, RA, UI } },
-{ "cmpli",   OP(10),    OP_MASK,        PPC,            { BF, L, RA, UI } },
-{ "cmpli",   OP(10),    OP_MASK,        PWRCOM,         { BF, RA, UI } },
-
-{ "cmpwi",   OPL(11,0), OPL_MASK,       PPCCOM,         { OBF, RA, SI } },
-{ "cmpdi",   OPL(11,1), OPL_MASK,       PPC64,          { OBF, RA, SI } },
-{ "cmpi",    OP(11),    OP_MASK,        PPC,            { BF, L, RA, SI } },
-{ "cmpi",    OP(11),    OP_MASK,        PWRCOM,         { BF, RA, SI } },
-
-{ "addic",   OP(12),    OP_MASK,        PPCCOM,         { RT, RA, SI } },
-{ "ai",      OP(12),    OP_MASK,        PWRCOM,         { RT, RA, SI } },
-{ "subic",   OP(12),    OP_MASK,        PPCCOM,         { RT, RA, NSI } },
-
-{ "addic.",  OP(13),    OP_MASK,        PPCCOM,         { RT, RA, SI } },
-{ "ai.",     OP(13),    OP_MASK,        PWRCOM,         { RT, RA, SI } },
-{ "subic.",  OP(13),    OP_MASK,        PPCCOM,         { RT, RA, NSI } },
-
-{ "li",      OP(14),    DRA_MASK,       PPCCOM,         { RT, SI } },
-{ "lil",     OP(14),    DRA_MASK,       PWRCOM,         { RT, SI } },
-{ "addi",    OP(14),    OP_MASK,        PPCCOM,         { RT, RA0, SI } },
-{ "cal",     OP(14),    OP_MASK,        PWRCOM,         { RT, D, RA0 } },
-{ "subi",    OP(14),    OP_MASK,        PPCCOM,         { RT, RA0, NSI } },
-{ "la",      OP(14),    OP_MASK,        PPCCOM,         { RT, D, RA0 } },
-
-{ "lis",     OP(15),    DRA_MASK,       PPCCOM,         { RT, SISIGNOPT } },
-{ "liu",     OP(15),    DRA_MASK,       PWRCOM,         { RT, SISIGNOPT } },
-{ "addis",   OP(15),    OP_MASK,        PPCCOM,         { RT,RA0,SISIGNOPT } },
-{ "cau",     OP(15),    OP_MASK,        PWRCOM,         { RT,RA0,SISIGNOPT } },
-{ "subis",   OP(15),    OP_MASK,        PPCCOM,         { RT, RA0, NSI } },
-
-{ "bdnz-",   BBO(16,BODNZ,0,0),      BBOATBI_MASK, PPCCOM,      { BDM } },
-{ "bdnz+",   BBO(16,BODNZ,0,0),      BBOATBI_MASK, PPCCOM,      { BDP } },
-{ "bdnz",    BBO(16,BODNZ,0,0),      BBOATBI_MASK, PPCCOM,      { BD } },
-{ "bdn",     BBO(16,BODNZ,0,0),      BBOATBI_MASK, PWRCOM,      { BD } },
-{ "bdnzl-",  BBO(16,BODNZ,0,1),      BBOATBI_MASK, PPCCOM,      { BDM } },
-{ "bdnzl+",  BBO(16,BODNZ,0,1),      BBOATBI_MASK, PPCCOM,      { BDP } },
-{ "bdnzl",   BBO(16,BODNZ,0,1),      BBOATBI_MASK, PPCCOM,      { BD } },
-{ "bdnl",    BBO(16,BODNZ,0,1),      BBOATBI_MASK, PWRCOM,      { BD } },
-{ "bdnza-",  BBO(16,BODNZ,1,0),      BBOATBI_MASK, PPCCOM,      { BDMA } },
-{ "bdnza+",  BBO(16,BODNZ,1,0),      BBOATBI_MASK, PPCCOM,      { BDPA } },
-{ "bdnza",   BBO(16,BODNZ,1,0),      BBOATBI_MASK, PPCCOM,      { BDA } },
-{ "bdna",    BBO(16,BODNZ,1,0),      BBOATBI_MASK, PWRCOM,      { BDA } },
-{ "bdnzla-", BBO(16,BODNZ,1,1),      BBOATBI_MASK, PPCCOM,      { BDMA } },
-{ "bdnzla+", BBO(16,BODNZ,1,1),      BBOATBI_MASK, PPCCOM,      { BDPA } },
-{ "bdnzla",  BBO(16,BODNZ,1,1),      BBOATBI_MASK, PPCCOM,      { BDA } },
-{ "bdnla",   BBO(16,BODNZ,1,1),      BBOATBI_MASK, PWRCOM,      { BDA } },
-{ "bdz-",    BBO(16,BODZ,0,0),       BBOATBI_MASK, PPCCOM,      { BDM } },
-{ "bdz+",    BBO(16,BODZ,0,0),       BBOATBI_MASK, PPCCOM,      { BDP } },
-{ "bdz",     BBO(16,BODZ,0,0),       BBOATBI_MASK, COM,         { BD } },
-{ "bdzl-",   BBO(16,BODZ,0,1),       BBOATBI_MASK, PPCCOM,      { BDM } },
-{ "bdzl+",   BBO(16,BODZ,0,1),       BBOATBI_MASK, PPCCOM,      { BDP } },
-{ "bdzl",    BBO(16,BODZ,0,1),       BBOATBI_MASK, COM,         { BD } },
-{ "bdza-",   BBO(16,BODZ,1,0),       BBOATBI_MASK, PPCCOM,      { BDMA } },
-{ "bdza+",   BBO(16,BODZ,1,0),       BBOATBI_MASK, PPCCOM,      { BDPA } },
-{ "bdza",    BBO(16,BODZ,1,0),       BBOATBI_MASK, COM,         { BDA } },
-{ "bdzla-",  BBO(16,BODZ,1,1),       BBOATBI_MASK, PPCCOM,      { BDMA } },
-{ "bdzla+",  BBO(16,BODZ,1,1),       BBOATBI_MASK, PPCCOM,      { BDPA } },
-{ "bdzla",   BBO(16,BODZ,1,1),       BBOATBI_MASK, COM,         { BDA } },
-{ "blt-",    BBOCB(16,BOT,CBLT,0,0), BBOATCB_MASK, PPCCOM,      { CR, BDM } },
-{ "blt+",    BBOCB(16,BOT,CBLT,0,0), BBOATCB_MASK, PPCCOM,      { CR, BDP } },
-{ "blt",     BBOCB(16,BOT,CBLT,0,0), BBOATCB_MASK, COM,         { CR, BD } },
-{ "bltl-",   BBOCB(16,BOT,CBLT,0,1), BBOATCB_MASK, PPCCOM,      { CR, BDM } },
-{ "bltl+",   BBOCB(16,BOT,CBLT,0,1), BBOATCB_MASK, PPCCOM,      { CR, BDP } },
-{ "bltl",    BBOCB(16,BOT,CBLT,0,1), BBOATCB_MASK, COM,         { CR, BD } },
-{ "blta-",   BBOCB(16,BOT,CBLT,1,0), BBOATCB_MASK, PPCCOM,      { CR, BDMA } },
-{ "blta+",   BBOCB(16,BOT,CBLT,1,0), BBOATCB_MASK, PPCCOM,      { CR, BDPA } },
-{ "blta",    BBOCB(16,BOT,CBLT,1,0), BBOATCB_MASK, COM,         { CR, BDA } },
-{ "bltla-",  BBOCB(16,BOT,CBLT,1,1), BBOATCB_MASK, PPCCOM,      { CR, BDMA } },
-{ "bltla+",  BBOCB(16,BOT,CBLT,1,1), BBOATCB_MASK, PPCCOM,      { CR, BDPA } },
-{ "bltla",   BBOCB(16,BOT,CBLT,1,1), BBOATCB_MASK, COM,         { CR, BDA } },
-{ "bgt-",    BBOCB(16,BOT,CBGT,0,0), BBOATCB_MASK, PPCCOM,      { CR, BDM } },
-{ "bgt+",    BBOCB(16,BOT,CBGT,0,0), BBOATCB_MASK, PPCCOM,      { CR, BDP } },
-{ "bgt",     BBOCB(16,BOT,CBGT,0,0), BBOATCB_MASK, COM,         { CR, BD } },
-{ "bgtl-",   BBOCB(16,BOT,CBGT,0,1), BBOATCB_MASK, PPCCOM,      { CR, BDM } },
-{ "bgtl+",   BBOCB(16,BOT,CBGT,0,1), BBOATCB_MASK, PPCCOM,      { CR, BDP } },
-{ "bgtl",    BBOCB(16,BOT,CBGT,0,1), BBOATCB_MASK, COM,         { CR, BD } },
-{ "bgta-",   BBOCB(16,BOT,CBGT,1,0), BBOATCB_MASK, PPCCOM,      { CR, BDMA } },
-{ "bgta+",   BBOCB(16,BOT,CBGT,1,0), BBOATCB_MASK, PPCCOM,      { CR, BDPA } },
-{ "bgta",    BBOCB(16,BOT,CBGT,1,0), BBOATCB_MASK, COM,         { CR, BDA } },
-{ "bgtla-",  BBOCB(16,BOT,CBGT,1,1), BBOATCB_MASK, PPCCOM,      { CR, BDMA } },
-{ "bgtla+",  BBOCB(16,BOT,CBGT,1,1), BBOATCB_MASK, PPCCOM,      { CR, BDPA } },
-{ "bgtla",   BBOCB(16,BOT,CBGT,1,1), BBOATCB_MASK, COM,         { CR, BDA } },
-{ "beq-",    BBOCB(16,BOT,CBEQ,0,0), BBOATCB_MASK, PPCCOM,      { CR, BDM } },
-{ "beq+",    BBOCB(16,BOT,CBEQ,0,0), BBOATCB_MASK, PPCCOM,      { CR, BDP } },
-{ "beq",     BBOCB(16,BOT,CBEQ,0,0), BBOATCB_MASK, COM,         { CR, BD } },
-{ "beql-",   BBOCB(16,BOT,CBEQ,0,1), BBOATCB_MASK, PPCCOM,      { CR, BDM } },
-{ "beql+",   BBOCB(16,BOT,CBEQ,0,1), BBOATCB_MASK, PPCCOM,      { CR, BDP } },
-{ "beql",    BBOCB(16,BOT,CBEQ,0,1), BBOATCB_MASK, COM,         { CR, BD } },
-{ "beqa-",   BBOCB(16,BOT,CBEQ,1,0), BBOATCB_MASK, PPCCOM,      { CR, BDMA } },
-{ "beqa+",   BBOCB(16,BOT,CBEQ,1,0), BBOATCB_MASK, PPCCOM,      { CR, BDPA } },
-{ "beqa",    BBOCB(16,BOT,CBEQ,1,0), BBOATCB_MASK, COM,         { CR, BDA } },
-{ "beqla-",  BBOCB(16,BOT,CBEQ,1,1), BBOATCB_MASK, PPCCOM,      { CR, BDMA } },
-{ "beqla+",  BBOCB(16,BOT,CBEQ,1,1), BBOATCB_MASK, PPCCOM,      { CR, BDPA } },
-{ "beqla",   BBOCB(16,BOT,CBEQ,1,1), BBOATCB_MASK, COM,         { CR, BDA } },
-{ "bso-",    BBOCB(16,BOT,CBSO,0,0), BBOATCB_MASK, PPCCOM,      { CR, BDM } },
-{ "bso+",    BBOCB(16,BOT,CBSO,0,0), BBOATCB_MASK, PPCCOM,      { CR, BDP } },
-{ "bso",     BBOCB(16,BOT,CBSO,0,0), BBOATCB_MASK, COM,         { CR, BD } },
-{ "bsol-",   BBOCB(16,BOT,CBSO,0,1), BBOATCB_MASK, PPCCOM,      { CR, BDM } },
-{ "bsol+",   BBOCB(16,BOT,CBSO,0,1), BBOATCB_MASK, PPCCOM,      { CR, BDP } },
-{ "bsol",    BBOCB(16,BOT,CBSO,0,1), BBOATCB_MASK, COM,         { CR, BD } },
-{ "bsoa-",   BBOCB(16,BOT,CBSO,1,0), BBOATCB_MASK, PPCCOM,      { CR, BDMA } },
-{ "bsoa+",   BBOCB(16,BOT,CBSO,1,0), BBOATCB_MASK, PPCCOM,      { CR, BDPA } },
-{ "bsoa",    BBOCB(16,BOT,CBSO,1,0), BBOATCB_MASK, COM,         { CR, BDA } },
-{ "bsola-",  BBOCB(16,BOT,CBSO,1,1), BBOATCB_MASK, PPCCOM,      { CR, BDMA } },
-{ "bsola+",  BBOCB(16,BOT,CBSO,1,1), BBOATCB_MASK, PPCCOM,      { CR, BDPA } },
-{ "bsola",   BBOCB(16,BOT,CBSO,1,1), BBOATCB_MASK, COM,         { CR, BDA } },
-{ "bun-",    BBOCB(16,BOT,CBSO,0,0), BBOATCB_MASK, PPCCOM,      { CR, BDM } },
-{ "bun+",    BBOCB(16,BOT,CBSO,0,0), BBOATCB_MASK, PPCCOM,      { CR, BDP } },
-{ "bun",     BBOCB(16,BOT,CBSO,0,0), BBOATCB_MASK, PPCCOM,      { CR, BD } },
-{ "bunl-",   BBOCB(16,BOT,CBSO,0,1), BBOATCB_MASK, PPCCOM,      { CR, BDM } },
-{ "bunl+",   BBOCB(16,BOT,CBSO,0,1), BBOATCB_MASK, PPCCOM,      { CR, BDP } },
-{ "bunl",    BBOCB(16,BOT,CBSO,0,1), BBOATCB_MASK, PPCCOM,      { CR, BD } },
-{ "buna-",   BBOCB(16,BOT,CBSO,1,0), BBOATCB_MASK, PPCCOM,      { CR, BDMA } },
-{ "buna+",   BBOCB(16,BOT,CBSO,1,0), BBOATCB_MASK, PPCCOM,      { CR, BDPA } },
-{ "buna",    BBOCB(16,BOT,CBSO,1,0), BBOATCB_MASK, PPCCOM,      { CR, BDA } },
-{ "bunla-",  BBOCB(16,BOT,CBSO,1,1), BBOATCB_MASK, PPCCOM,      { CR, BDMA } },
-{ "bunla+",  BBOCB(16,BOT,CBSO,1,1), BBOATCB_MASK, PPCCOM,      { CR, BDPA } },
-{ "bunla",   BBOCB(16,BOT,CBSO,1,1), BBOATCB_MASK, PPCCOM,      { CR, BDA } },
-{ "bge-",    BBOCB(16,BOF,CBLT,0,0), BBOATCB_MASK, PPCCOM,      { CR, BDM } },
-{ "bge+",    BBOCB(16,BOF,CBLT,0,0), BBOATCB_MASK, PPCCOM,      { CR, BDP } },
-{ "bge",     BBOCB(16,BOF,CBLT,0,0), BBOATCB_MASK, COM,         { CR, BD } },
-{ "bgel-",   BBOCB(16,BOF,CBLT,0,1), BBOATCB_MASK, PPCCOM,      { CR, BDM } },
-{ "bgel+",   BBOCB(16,BOF,CBLT,0,1), BBOATCB_MASK, PPCCOM,      { CR, BDP } },
-{ "bgel",    BBOCB(16,BOF,CBLT,0,1), BBOATCB_MASK, COM,         { CR, BD } },
-{ "bgea-",   BBOCB(16,BOF,CBLT,1,0), BBOATCB_MASK, PPCCOM,      { CR, BDMA } },
-{ "bgea+",   BBOCB(16,BOF,CBLT,1,0), BBOATCB_MASK, PPCCOM,      { CR, BDPA } },
-{ "bgea",    BBOCB(16,BOF,CBLT,1,0), BBOATCB_MASK, COM,         { CR, BDA } },
-{ "bgela-",  BBOCB(16,BOF,CBLT,1,1), BBOATCB_MASK, PPCCOM,      { CR, BDMA } },
-{ "bgela+",  BBOCB(16,BOF,CBLT,1,1), BBOATCB_MASK, PPCCOM,      { CR, BDPA } },
-{ "bgela",   BBOCB(16,BOF,CBLT,1,1), BBOATCB_MASK, COM,         { CR, BDA } },
-{ "bnl-",    BBOCB(16,BOF,CBLT,0,0), BBOATCB_MASK, PPCCOM,      { CR, BDM } },
-{ "bnl+",    BBOCB(16,BOF,CBLT,0,0), BBOATCB_MASK, PPCCOM,      { CR, BDP } },
-{ "bnl",     BBOCB(16,BOF,CBLT,0,0), BBOATCB_MASK, COM,         { CR, BD } },
-{ "bnll-",   BBOCB(16,BOF,CBLT,0,1), BBOATCB_MASK, PPCCOM,      { CR, BDM } },
-{ "bnll+",   BBOCB(16,BOF,CBLT,0,1), BBOATCB_MASK, PPCCOM,      { CR, BDP } },
-{ "bnll",    BBOCB(16,BOF,CBLT,0,1), BBOATCB_MASK, COM,         { CR, BD } },
-{ "bnla-",   BBOCB(16,BOF,CBLT,1,0), BBOATCB_MASK, PPCCOM,      { CR, BDMA } },
-{ "bnla+",   BBOCB(16,BOF,CBLT,1,0), BBOATCB_MASK, PPCCOM,      { CR, BDPA } },
-{ "bnla",    BBOCB(16,BOF,CBLT,1,0), BBOATCB_MASK, COM,         { CR, BDA } },
-{ "bnlla-",  BBOCB(16,BOF,CBLT,1,1), BBOATCB_MASK, PPCCOM,      { CR, BDMA } },
-{ "bnlla+",  BBOCB(16,BOF,CBLT,1,1), BBOATCB_MASK, PPCCOM,      { CR, BDPA } },
-{ "bnlla",   BBOCB(16,BOF,CBLT,1,1), BBOATCB_MASK, COM,         { CR, BDA } },
-{ "ble-",    BBOCB(16,BOF,CBGT,0,0), BBOATCB_MASK, PPCCOM,      { CR, BDM } },
-{ "ble+",    BBOCB(16,BOF,CBGT,0,0), BBOATCB_MASK, PPCCOM,      { CR, BDP } },
-{ "ble",     BBOCB(16,BOF,CBGT,0,0), BBOATCB_MASK, COM,         { CR, BD } },
-{ "blel-",   BBOCB(16,BOF,CBGT,0,1), BBOATCB_MASK, PPCCOM,      { CR, BDM } },
-{ "blel+",   BBOCB(16,BOF,CBGT,0,1), BBOATCB_MASK, PPCCOM,      { CR, BDP } },
-{ "blel",    BBOCB(16,BOF,CBGT,0,1), BBOATCB_MASK, COM,         { CR, BD } },
-{ "blea-",   BBOCB(16,BOF,CBGT,1,0), BBOATCB_MASK, PPCCOM,      { CR, BDMA } },
-{ "blea+",   BBOCB(16,BOF,CBGT,1,0), BBOATCB_MASK, PPCCOM,      { CR, BDPA } },
-{ "blea",    BBOCB(16,BOF,CBGT,1,0), BBOATCB_MASK, COM,         { CR, BDA } },
-{ "blela-",  BBOCB(16,BOF,CBGT,1,1), BBOATCB_MASK, PPCCOM,      { CR, BDMA } },
-{ "blela+",  BBOCB(16,BOF,CBGT,1,1), BBOATCB_MASK, PPCCOM,      { CR, BDPA } },
-{ "blela",   BBOCB(16,BOF,CBGT,1,1), BBOATCB_MASK, COM,         { CR, BDA } },
-{ "bng-",    BBOCB(16,BOF,CBGT,0,0), BBOATCB_MASK, PPCCOM,      { CR, BDM } },
-{ "bng+",    BBOCB(16,BOF,CBGT,0,0), BBOATCB_MASK, PPCCOM,      { CR, BDP } },
-{ "bng",     BBOCB(16,BOF,CBGT,0,0), BBOATCB_MASK, COM,         { CR, BD } },
-{ "bngl-",   BBOCB(16,BOF,CBGT,0,1), BBOATCB_MASK, PPCCOM,      { CR, BDM } },
-{ "bngl+",   BBOCB(16,BOF,CBGT,0,1), BBOATCB_MASK, PPCCOM,      { CR, BDP } },
-{ "bngl",    BBOCB(16,BOF,CBGT,0,1), BBOATCB_MASK, COM,         { CR, BD } },
-{ "bnga-",   BBOCB(16,BOF,CBGT,1,0), BBOATCB_MASK, PPCCOM,      { CR, BDMA } },
-{ "bnga+",   BBOCB(16,BOF,CBGT,1,0), BBOATCB_MASK, PPCCOM,      { CR, BDPA } },
-{ "bnga",    BBOCB(16,BOF,CBGT,1,0), BBOATCB_MASK, COM,         { CR, BDA } },
-{ "bngla-",  BBOCB(16,BOF,CBGT,1,1), BBOATCB_MASK, PPCCOM,      { CR, BDMA } },
-{ "bngla+",  BBOCB(16,BOF,CBGT,1,1), BBOATCB_MASK, PPCCOM,      { CR, BDPA } },
-{ "bngla",   BBOCB(16,BOF,CBGT,1,1), BBOATCB_MASK, COM,         { CR, BDA } },
-{ "bne-",    BBOCB(16,BOF,CBEQ,0,0), BBOATCB_MASK, PPCCOM,      { CR, BDM } },
-{ "bne+",    BBOCB(16,BOF,CBEQ,0,0), BBOATCB_MASK, PPCCOM,      { CR, BDP } },
-{ "bne",     BBOCB(16,BOF,CBEQ,0,0), BBOATCB_MASK, COM,         { CR, BD } },
-{ "bnel-",   BBOCB(16,BOF,CBEQ,0,1), BBOATCB_MASK, PPCCOM,      { CR, BDM } },
-{ "bnel+",   BBOCB(16,BOF,CBEQ,0,1), BBOATCB_MASK, PPCCOM,      { CR, BDP } },
-{ "bnel",    BBOCB(16,BOF,CBEQ,0,1), BBOATCB_MASK, COM,         { CR, BD } },
-{ "bnea-",   BBOCB(16,BOF,CBEQ,1,0), BBOATCB_MASK, PPCCOM,      { CR, BDMA } },
-{ "bnea+",   BBOCB(16,BOF,CBEQ,1,0), BBOATCB_MASK, PPCCOM,      { CR, BDPA } },
-{ "bnea",    BBOCB(16,BOF,CBEQ,1,0), BBOATCB_MASK, COM,         { CR, BDA } },
-{ "bnela-",  BBOCB(16,BOF,CBEQ,1,1), BBOATCB_MASK, PPCCOM,      { CR, BDMA } },
-{ "bnela+",  BBOCB(16,BOF,CBEQ,1,1), BBOATCB_MASK, PPCCOM,      { CR, BDPA } },
-{ "bnela",   BBOCB(16,BOF,CBEQ,1,1), BBOATCB_MASK, COM,         { CR, BDA } },
-{ "bns-",    BBOCB(16,BOF,CBSO,0,0), BBOATCB_MASK, PPCCOM,      { CR, BDM } },
-{ "bns+",    BBOCB(16,BOF,CBSO,0,0), BBOATCB_MASK, PPCCOM,      { CR, BDP } },
-{ "bns",     BBOCB(16,BOF,CBSO,0,0), BBOATCB_MASK, COM,         { CR, BD } },
-{ "bnsl-",   BBOCB(16,BOF,CBSO,0,1), BBOATCB_MASK, PPCCOM,      { CR, BDM } },
-{ "bnsl+",   BBOCB(16,BOF,CBSO,0,1), BBOATCB_MASK, PPCCOM,      { CR, BDP } },
-{ "bnsl",    BBOCB(16,BOF,CBSO,0,1), BBOATCB_MASK, COM,         { CR, BD } },
-{ "bnsa-",   BBOCB(16,BOF,CBSO,1,0), BBOATCB_MASK, PPCCOM,      { CR, BDMA } },
-{ "bnsa+",   BBOCB(16,BOF,CBSO,1,0), BBOATCB_MASK, PPCCOM,      { CR, BDPA } },
-{ "bnsa",    BBOCB(16,BOF,CBSO,1,0), BBOATCB_MASK, COM,         { CR, BDA } },
-{ "bnsla-",  BBOCB(16,BOF,CBSO,1,1), BBOATCB_MASK, PPCCOM,      { CR, BDMA } },
-{ "bnsla+",  BBOCB(16,BOF,CBSO,1,1), BBOATCB_MASK, PPCCOM,      { CR, BDPA } },
-{ "bnsla",   BBOCB(16,BOF,CBSO,1,1), BBOATCB_MASK, COM,         { CR, BDA } },
-{ "bnu-",    BBOCB(16,BOF,CBSO,0,0), BBOATCB_MASK, PPCCOM,      { CR, BDM } },
-{ "bnu+",    BBOCB(16,BOF,CBSO,0,0), BBOATCB_MASK, PPCCOM,      { CR, BDP } },
-{ "bnu",     BBOCB(16,BOF,CBSO,0,0), BBOATCB_MASK, PPCCOM,      { CR, BD } },
-{ "bnul-",   BBOCB(16,BOF,CBSO,0,1), BBOATCB_MASK, PPCCOM,      { CR, BDM } },
-{ "bnul+",   BBOCB(16,BOF,CBSO,0,1), BBOATCB_MASK, PPCCOM,      { CR, BDP } },
-{ "bnul",    BBOCB(16,BOF,CBSO,0,1), BBOATCB_MASK, PPCCOM,      { CR, BD } },
-{ "bnua-",   BBOCB(16,BOF,CBSO,1,0), BBOATCB_MASK, PPCCOM,      { CR, BDMA } },
-{ "bnua+",   BBOCB(16,BOF,CBSO,1,0), BBOATCB_MASK, PPCCOM,      { CR, BDPA } },
-{ "bnua",    BBOCB(16,BOF,CBSO,1,0), BBOATCB_MASK, PPCCOM,      { CR, BDA } },
-{ "bnula-",  BBOCB(16,BOF,CBSO,1,1), BBOATCB_MASK, PPCCOM,      { CR, BDMA } },
-{ "bnula+",  BBOCB(16,BOF,CBSO,1,1), BBOATCB_MASK, PPCCOM,      { CR, BDPA } },
-{ "bnula",   BBOCB(16,BOF,CBSO,1,1), BBOATCB_MASK, PPCCOM,      { CR, BDA } },
-{ "bdnzt-",  BBO(16,BODNZT,0,0), BBOY_MASK, NOPOWER4,   { BI, BDM } },
-{ "bdnzt+",  BBO(16,BODNZT,0,0), BBOY_MASK, NOPOWER4,   { BI, BDP } },
-{ "bdnzt",   BBO(16,BODNZT,0,0), BBOY_MASK, PPCCOM,     { BI, BD } },
-{ "bdnztl-", BBO(16,BODNZT,0,1), BBOY_MASK, NOPOWER4,   { BI, BDM } },
-{ "bdnztl+", BBO(16,BODNZT,0,1), BBOY_MASK, NOPOWER4,   { BI, BDP } },
-{ "bdnztl",  BBO(16,BODNZT,0,1), BBOY_MASK, PPCCOM,     { BI, BD } },
-{ "bdnzta-", BBO(16,BODNZT,1,0), BBOY_MASK, NOPOWER4,   { BI, BDMA } },
-{ "bdnzta+", BBO(16,BODNZT,1,0), BBOY_MASK, NOPOWER4,   { BI, BDPA } },
-{ "bdnzta",  BBO(16,BODNZT,1,0), BBOY_MASK, PPCCOM,     { BI, BDA } },
-{ "bdnztla-",BBO(16,BODNZT,1,1), BBOY_MASK, NOPOWER4,   { BI, BDMA } },
-{ "bdnztla+",BBO(16,BODNZT,1,1), BBOY_MASK, NOPOWER4,   { BI, BDPA } },
-{ "bdnztla", BBO(16,BODNZT,1,1), BBOY_MASK, PPCCOM,     { BI, BDA } },
-{ "bdnzf-",  BBO(16,BODNZF,0,0), BBOY_MASK, NOPOWER4,   { BI, BDM } },
-{ "bdnzf+",  BBO(16,BODNZF,0,0), BBOY_MASK, NOPOWER4,   { BI, BDP } },
-{ "bdnzf",   BBO(16,BODNZF,0,0), BBOY_MASK, PPCCOM,     { BI, BD } },
-{ "bdnzfl-", BBO(16,BODNZF,0,1), BBOY_MASK, NOPOWER4,   { BI, BDM } },
-{ "bdnzfl+", BBO(16,BODNZF,0,1), BBOY_MASK, NOPOWER4,   { BI, BDP } },
-{ "bdnzfl",  BBO(16,BODNZF,0,1), BBOY_MASK, PPCCOM,     { BI, BD } },
-{ "bdnzfa-", BBO(16,BODNZF,1,0), BBOY_MASK, NOPOWER4,   { BI, BDMA } },
-{ "bdnzfa+", BBO(16,BODNZF,1,0), BBOY_MASK, NOPOWER4,   { BI, BDPA } },
-{ "bdnzfa",  BBO(16,BODNZF,1,0), BBOY_MASK, PPCCOM,     { BI, BDA } },
-{ "bdnzfla-",BBO(16,BODNZF,1,1), BBOY_MASK, NOPOWER4,   { BI, BDMA } },
-{ "bdnzfla+",BBO(16,BODNZF,1,1), BBOY_MASK, NOPOWER4,   { BI, BDPA } },
-{ "bdnzfla", BBO(16,BODNZF,1,1), BBOY_MASK, PPCCOM,     { BI, BDA } },
-{ "bt-",     BBO(16,BOT,0,0), BBOAT_MASK, PPCCOM,       { BI, BDM } },
-{ "bt+",     BBO(16,BOT,0,0), BBOAT_MASK, PPCCOM,       { BI, BDP } },
-{ "bt",      BBO(16,BOT,0,0), BBOAT_MASK, PPCCOM,       { BI, BD } },
-{ "bbt",     BBO(16,BOT,0,0), BBOAT_MASK, PWRCOM,       { BI, BD } },
-{ "btl-",    BBO(16,BOT,0,1), BBOAT_MASK, PPCCOM,       { BI, BDM } },
-{ "btl+",    BBO(16,BOT,0,1), BBOAT_MASK, PPCCOM,       { BI, BDP } },
-{ "btl",     BBO(16,BOT,0,1), BBOAT_MASK, PPCCOM,       { BI, BD } },
-{ "bbtl",    BBO(16,BOT,0,1), BBOAT_MASK, PWRCOM,       { BI, BD } },
-{ "bta-",    BBO(16,BOT,1,0), BBOAT_MASK, PPCCOM,       { BI, BDMA } },
-{ "bta+",    BBO(16,BOT,1,0), BBOAT_MASK, PPCCOM,       { BI, BDPA } },
-{ "bta",     BBO(16,BOT,1,0), BBOAT_MASK, PPCCOM,       { BI, BDA } },
-{ "bbta",    BBO(16,BOT,1,0), BBOAT_MASK, PWRCOM,       { BI, BDA } },
-{ "btla-",   BBO(16,BOT,1,1), BBOAT_MASK, PPCCOM,       { BI, BDMA } },
-{ "btla+",   BBO(16,BOT,1,1), BBOAT_MASK, PPCCOM,       { BI, BDPA } },
-{ "btla",    BBO(16,BOT,1,1), BBOAT_MASK, PPCCOM,       { BI, BDA } },
-{ "bbtla",   BBO(16,BOT,1,1), BBOAT_MASK, PWRCOM,       { BI, BDA } },
-{ "bf-",     BBO(16,BOF,0,0), BBOAT_MASK, PPCCOM,       { BI, BDM } },
-{ "bf+",     BBO(16,BOF,0,0), BBOAT_MASK, PPCCOM,       { BI, BDP } },
-{ "bf",      BBO(16,BOF,0,0), BBOAT_MASK, PPCCOM,       { BI, BD } },
-{ "bbf",     BBO(16,BOF,0,0), BBOAT_MASK, PWRCOM,       { BI, BD } },
-{ "bfl-",    BBO(16,BOF,0,1), BBOAT_MASK, PPCCOM,       { BI, BDM } },
-{ "bfl+",    BBO(16,BOF,0,1), BBOAT_MASK, PPCCOM,       { BI, BDP } },
-{ "bfl",     BBO(16,BOF,0,1), BBOAT_MASK, PPCCOM,       { BI, BD } },
-{ "bbfl",    BBO(16,BOF,0,1), BBOAT_MASK, PWRCOM,       { BI, BD } },
-{ "bfa-",    BBO(16,BOF,1,0), BBOAT_MASK, PPCCOM,       { BI, BDMA } },
-{ "bfa+",    BBO(16,BOF,1,0), BBOAT_MASK, PPCCOM,       { BI, BDPA } },
-{ "bfa",     BBO(16,BOF,1,0), BBOAT_MASK, PPCCOM,       { BI, BDA } },
-{ "bbfa",    BBO(16,BOF,1,0), BBOAT_MASK, PWRCOM,       { BI, BDA } },
-{ "bfla-",   BBO(16,BOF,1,1), BBOAT_MASK, PPCCOM,       { BI, BDMA } },
-{ "bfla+",   BBO(16,BOF,1,1), BBOAT_MASK, PPCCOM,       { BI, BDPA } },
-{ "bfla",    BBO(16,BOF,1,1), BBOAT_MASK, PPCCOM,       { BI, BDA } },
-{ "bbfla",   BBO(16,BOF,1,1), BBOAT_MASK, PWRCOM,       { BI, BDA } },
-{ "bdzt-",   BBO(16,BODZT,0,0), BBOY_MASK, NOPOWER4,    { BI, BDM } },
-{ "bdzt+",   BBO(16,BODZT,0,0), BBOY_MASK, NOPOWER4,    { BI, BDP } },
-{ "bdzt",    BBO(16,BODZT,0,0), BBOY_MASK, PPCCOM,      { BI, BD } },
-{ "bdztl-",  BBO(16,BODZT,0,1), BBOY_MASK, NOPOWER4,    { BI, BDM } },
-{ "bdztl+",  BBO(16,BODZT,0,1), BBOY_MASK, NOPOWER4,    { BI, BDP } },
-{ "bdztl",   BBO(16,BODZT,0,1), BBOY_MASK, PPCCOM,      { BI, BD } },
-{ "bdzta-",  BBO(16,BODZT,1,0), BBOY_MASK, NOPOWER4,    { BI, BDMA } },
-{ "bdzta+",  BBO(16,BODZT,1,0), BBOY_MASK, NOPOWER4,    { BI, BDPA } },
-{ "bdzta",   BBO(16,BODZT,1,0), BBOY_MASK, PPCCOM,      { BI, BDA } },
-{ "bdztla-", BBO(16,BODZT,1,1), BBOY_MASK, NOPOWER4,    { BI, BDMA } },
-{ "bdztla+", BBO(16,BODZT,1,1), BBOY_MASK, NOPOWER4,    { BI, BDPA } },
-{ "bdztla",  BBO(16,BODZT,1,1), BBOY_MASK, PPCCOM,      { BI, BDA } },
-{ "bdzf-",   BBO(16,BODZF,0,0), BBOY_MASK, NOPOWER4,    { BI, BDM } },
-{ "bdzf+",   BBO(16,BODZF,0,0), BBOY_MASK, NOPOWER4,    { BI, BDP } },
-{ "bdzf",    BBO(16,BODZF,0,0), BBOY_MASK, PPCCOM,      { BI, BD } },
-{ "bdzfl-",  BBO(16,BODZF,0,1), BBOY_MASK, NOPOWER4,    { BI, BDM } },
-{ "bdzfl+",  BBO(16,BODZF,0,1), BBOY_MASK, NOPOWER4,    { BI, BDP } },
-{ "bdzfl",   BBO(16,BODZF,0,1), BBOY_MASK, PPCCOM,      { BI, BD } },
-{ "bdzfa-",  BBO(16,BODZF,1,0), BBOY_MASK, NOPOWER4,    { BI, BDMA } },
-{ "bdzfa+",  BBO(16,BODZF,1,0), BBOY_MASK, NOPOWER4,    { BI, BDPA } },
-{ "bdzfa",   BBO(16,BODZF,1,0), BBOY_MASK, PPCCOM,      { BI, BDA } },
-{ "bdzfla-", BBO(16,BODZF,1,1), BBOY_MASK, NOPOWER4,    { BI, BDMA } },
-{ "bdzfla+", BBO(16,BODZF,1,1), BBOY_MASK, NOPOWER4,    { BI, BDPA } },
-{ "bdzfla",  BBO(16,BODZF,1,1), BBOY_MASK, PPCCOM,      { BI, BDA } },
-{ "bc-",     B(16,0,0), B_MASK,         PPCCOM,         { BOE, BI, BDM } },
-{ "bc+",     B(16,0,0), B_MASK,         PPCCOM,         { BOE, BI, BDP } },
-{ "bc",      B(16,0,0), B_MASK,         COM,            { BO, BI, BD } },
-{ "bcl-",    B(16,0,1), B_MASK,         PPCCOM,         { BOE, BI, BDM } },
-{ "bcl+",    B(16,0,1), B_MASK,         PPCCOM,         { BOE, BI, BDP } },
-{ "bcl",     B(16,0,1), B_MASK,         COM,            { BO, BI, BD } },
-{ "bca-",    B(16,1,0), B_MASK,         PPCCOM,         { BOE, BI, BDMA } },
-{ "bca+",    B(16,1,0), B_MASK,         PPCCOM,         { BOE, BI, BDPA } },
-{ "bca",     B(16,1,0), B_MASK,         COM,            { BO, BI, BDA } },
-{ "bcla-",   B(16,1,1), B_MASK,         PPCCOM,         { BOE, BI, BDMA } },
-{ "bcla+",   B(16,1,1), B_MASK,         PPCCOM,         { BOE, BI, BDPA } },
-{ "bcla",    B(16,1,1), B_MASK,         COM,            { BO, BI, BDA } },
-
-{ "sc",      SC(17,1,0), SC_MASK,       PPC,            { LEV } },
-{ "svc",     SC(17,0,0), SC_MASK,       POWER,          { SVC_LEV, FL1, FL2 } },
-{ "svcl",    SC(17,0,1), SC_MASK,       POWER,          { SVC_LEV, FL1, FL2 } },
-{ "svca",    SC(17,1,0), SC_MASK,       PWRCOM,         { SV } },
-{ "svcla",   SC(17,1,1), SC_MASK,       POWER,          { SV } },
-
-{ "b",       B(18,0,0), B_MASK,         COM,            { LI } },
-{ "bl",      B(18,0,1), B_MASK,         COM,            { LI } },
-{ "ba",      B(18,1,0), B_MASK,         COM,            { LIA } },
-{ "bla",     B(18,1,1), B_MASK,         COM,            { LIA } },
-
-{ "mcrf",    XL(19,0),  XLBB_MASK|(3 << 21)|(3 << 16), COM,     { BF, BFA } },
-
-{ "blr",     XLO(19,BOU,16,0), XLBOBIBB_MASK, PPCCOM,   { 0 } },
-{ "br",      XLO(19,BOU,16,0), XLBOBIBB_MASK, PWRCOM,   { 0 } },
-{ "blrl",    XLO(19,BOU,16,1), XLBOBIBB_MASK, PPCCOM,   { 0 } },
-{ "brl",     XLO(19,BOU,16,1), XLBOBIBB_MASK, PWRCOM,   { 0 } },
-{ "bdnzlr",  XLO(19,BODNZ,16,0), XLBOBIBB_MASK, PPCCOM, { 0 } },
-{ "bdnzlr-", XLO(19,BODNZ,16,0), XLBOBIBB_MASK, NOPOWER4,       { 0 } },
-{ "bdnzlr-", XLO(19,BODNZM4,16,0), XLBOBIBB_MASK, POWER4,       { 0 } },
-{ "bdnzlr+", XLO(19,BODNZP,16,0), XLBOBIBB_MASK, NOPOWER4,      { 0 } },
-{ "bdnzlr+", XLO(19,BODNZP4,16,0), XLBOBIBB_MASK, POWER4,       { 0 } },
-{ "bdnzlrl", XLO(19,BODNZ,16,1), XLBOBIBB_MASK, PPCCOM, { 0 } },
-{ "bdnzlrl-",XLO(19,BODNZ,16,1), XLBOBIBB_MASK, NOPOWER4,       { 0 } },
-{ "bdnzlrl-",XLO(19,BODNZM4,16,1), XLBOBIBB_MASK, POWER4,       { 0 } },
-{ "bdnzlrl+",XLO(19,BODNZP,16,1), XLBOBIBB_MASK, NOPOWER4,      { 0 } },
-{ "bdnzlrl+",XLO(19,BODNZP4,16,1), XLBOBIBB_MASK, POWER4,       { 0 } },
-{ "bdzlr",   XLO(19,BODZ,16,0), XLBOBIBB_MASK, PPCCOM,  { 0 } },
-{ "bdzlr-",  XLO(19,BODZ,16,0), XLBOBIBB_MASK, NOPOWER4,        { 0 } },
-{ "bdzlr-",  XLO(19,BODZM4,16,0), XLBOBIBB_MASK, POWER4,        { 0 } },
-{ "bdzlr+",  XLO(19,BODZP,16,0), XLBOBIBB_MASK, NOPOWER4,       { 0 } },
-{ "bdzlr+",  XLO(19,BODZP4,16,0), XLBOBIBB_MASK, POWER4,        { 0 } },
-{ "bdzlrl",  XLO(19,BODZ,16,1), XLBOBIBB_MASK, PPCCOM,  { 0 } },
-{ "bdzlrl-", XLO(19,BODZ,16,1), XLBOBIBB_MASK, NOPOWER4,        { 0 } },
-{ "bdzlrl-", XLO(19,BODZM4,16,1), XLBOBIBB_MASK, POWER4,        { 0 } },
-{ "bdzlrl+", XLO(19,BODZP,16,1), XLBOBIBB_MASK, NOPOWER4,       { 0 } },
-{ "bdzlrl+", XLO(19,BODZP4,16,1), XLBOBIBB_MASK, POWER4,        { 0 } },
-{ "bltlr",   XLOCB(19,BOT,CBLT,16,0), XLBOCBBB_MASK, PPCCOM, { CR } },
-{ "bltlr-",  XLOCB(19,BOT,CBLT,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bltlr-",  XLOCB(19,BOTM4,CBLT,16,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bltlr+",  XLOCB(19,BOTP,CBLT,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bltlr+",  XLOCB(19,BOTP4,CBLT,16,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bltr",    XLOCB(19,BOT,CBLT,16,0), XLBOCBBB_MASK, PWRCOM, { CR } },
-{ "bltlrl",  XLOCB(19,BOT,CBLT,16,1), XLBOCBBB_MASK, PPCCOM, { CR } },
-{ "bltlrl-", XLOCB(19,BOT,CBLT,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bltlrl-", XLOCB(19,BOTM4,CBLT,16,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bltlrl+", XLOCB(19,BOTP,CBLT,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bltlrl+", XLOCB(19,BOTP4,CBLT,16,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bltrl",   XLOCB(19,BOT,CBLT,16,1), XLBOCBBB_MASK, PWRCOM, { CR } },
-{ "bgtlr",   XLOCB(19,BOT,CBGT,16,0), XLBOCBBB_MASK, PPCCOM, { CR } },
-{ "bgtlr-",  XLOCB(19,BOT,CBGT,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bgtlr-",  XLOCB(19,BOTM4,CBGT,16,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bgtlr+",  XLOCB(19,BOTP,CBGT,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bgtlr+",  XLOCB(19,BOTP4,CBGT,16,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bgtr",    XLOCB(19,BOT,CBGT,16,0), XLBOCBBB_MASK, PWRCOM, { CR } },
-{ "bgtlrl",  XLOCB(19,BOT,CBGT,16,1), XLBOCBBB_MASK, PPCCOM, { CR } },
-{ "bgtlrl-", XLOCB(19,BOT,CBGT,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bgtlrl-", XLOCB(19,BOTM4,CBGT,16,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bgtlrl+", XLOCB(19,BOTP,CBGT,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bgtlrl+", XLOCB(19,BOTP4,CBGT,16,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bgtrl",   XLOCB(19,BOT,CBGT,16,1), XLBOCBBB_MASK, PWRCOM, { CR } },
-{ "beqlr",   XLOCB(19,BOT,CBEQ,16,0), XLBOCBBB_MASK, PPCCOM, { CR } },
-{ "beqlr-",  XLOCB(19,BOT,CBEQ,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "beqlr-",  XLOCB(19,BOTM4,CBEQ,16,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "beqlr+",  XLOCB(19,BOTP,CBEQ,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "beqlr+",  XLOCB(19,BOTP4,CBEQ,16,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "beqr",    XLOCB(19,BOT,CBEQ,16,0), XLBOCBBB_MASK, PWRCOM, { CR } },
-{ "beqlrl",  XLOCB(19,BOT,CBEQ,16,1), XLBOCBBB_MASK, PPCCOM, { CR } },
-{ "beqlrl-", XLOCB(19,BOT,CBEQ,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "beqlrl-", XLOCB(19,BOTM4,CBEQ,16,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "beqlrl+", XLOCB(19,BOTP,CBEQ,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "beqlrl+", XLOCB(19,BOTP4,CBEQ,16,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "beqrl",   XLOCB(19,BOT,CBEQ,16,1), XLBOCBBB_MASK, PWRCOM, { CR } },
-{ "bsolr",   XLOCB(19,BOT,CBSO,16,0), XLBOCBBB_MASK, PPCCOM, { CR } },
-{ "bsolr-",  XLOCB(19,BOT,CBSO,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bsolr-",  XLOCB(19,BOTM4,CBSO,16,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bsolr+",  XLOCB(19,BOTP,CBSO,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bsolr+",  XLOCB(19,BOTP4,CBSO,16,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bsor",    XLOCB(19,BOT,CBSO,16,0), XLBOCBBB_MASK, PWRCOM, { CR } },
-{ "bsolrl",  XLOCB(19,BOT,CBSO,16,1), XLBOCBBB_MASK, PPCCOM, { CR } },
-{ "bsolrl-", XLOCB(19,BOT,CBSO,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bsolrl-", XLOCB(19,BOTM4,CBSO,16,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bsolrl+", XLOCB(19,BOTP,CBSO,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bsolrl+", XLOCB(19,BOTP4,CBSO,16,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bsorl",   XLOCB(19,BOT,CBSO,16,1), XLBOCBBB_MASK, PWRCOM, { CR } },
-{ "bunlr",   XLOCB(19,BOT,CBSO,16,0), XLBOCBBB_MASK, PPCCOM, { CR } },
-{ "bunlr-",  XLOCB(19,BOT,CBSO,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bunlr-",  XLOCB(19,BOTM4,CBSO,16,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bunlr+",  XLOCB(19,BOTP,CBSO,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bunlr+",  XLOCB(19,BOTP4,CBSO,16,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bunlrl",  XLOCB(19,BOT,CBSO,16,1), XLBOCBBB_MASK, PPCCOM, { CR } },
-{ "bunlrl-", XLOCB(19,BOT,CBSO,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bunlrl-", XLOCB(19,BOTM4,CBSO,16,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bunlrl+", XLOCB(19,BOTP,CBSO,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bunlrl+", XLOCB(19,BOTP4,CBSO,16,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bgelr",   XLOCB(19,BOF,CBLT,16,0), XLBOCBBB_MASK, PPCCOM, { CR } },
-{ "bgelr-",  XLOCB(19,BOF,CBLT,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bgelr-",  XLOCB(19,BOFM4,CBLT,16,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bgelr+",  XLOCB(19,BOFP,CBLT,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bgelr+",  XLOCB(19,BOFP4,CBLT,16,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bger",    XLOCB(19,BOF,CBLT,16,0), XLBOCBBB_MASK, PWRCOM, { CR } },
-{ "bgelrl",  XLOCB(19,BOF,CBLT,16,1), XLBOCBBB_MASK, PPCCOM, { CR } },
-{ "bgelrl-", XLOCB(19,BOF,CBLT,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bgelrl-", XLOCB(19,BOFM4,CBLT,16,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bgelrl+", XLOCB(19,BOFP,CBLT,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bgelrl+", XLOCB(19,BOFP4,CBLT,16,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bgerl",   XLOCB(19,BOF,CBLT,16,1), XLBOCBBB_MASK, PWRCOM, { CR } },
-{ "bnllr",   XLOCB(19,BOF,CBLT,16,0), XLBOCBBB_MASK, PPCCOM, { CR } },
-{ "bnllr-",  XLOCB(19,BOF,CBLT,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bnllr-",  XLOCB(19,BOFM4,CBLT,16,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bnllr+",  XLOCB(19,BOFP,CBLT,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bnllr+",  XLOCB(19,BOFP4,CBLT,16,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bnlr",    XLOCB(19,BOF,CBLT,16,0), XLBOCBBB_MASK, PWRCOM, { CR } },
-{ "bnllrl",  XLOCB(19,BOF,CBLT,16,1), XLBOCBBB_MASK, PPCCOM, { CR } },
-{ "bnllrl-", XLOCB(19,BOF,CBLT,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bnllrl-", XLOCB(19,BOFM4,CBLT,16,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bnllrl+", XLOCB(19,BOFP,CBLT,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bnllrl+", XLOCB(19,BOFP4,CBLT,16,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bnlrl",   XLOCB(19,BOF,CBLT,16,1), XLBOCBBB_MASK, PWRCOM, { CR } },
-{ "blelr",   XLOCB(19,BOF,CBGT,16,0), XLBOCBBB_MASK, PPCCOM, { CR } },
-{ "blelr-",  XLOCB(19,BOF,CBGT,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "blelr-",  XLOCB(19,BOFM4,CBGT,16,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "blelr+",  XLOCB(19,BOFP,CBGT,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "blelr+",  XLOCB(19,BOFP4,CBGT,16,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bler",    XLOCB(19,BOF,CBGT,16,0), XLBOCBBB_MASK, PWRCOM, { CR } },
-{ "blelrl",  XLOCB(19,BOF,CBGT,16,1), XLBOCBBB_MASK, PPCCOM, { CR } },
-{ "blelrl-", XLOCB(19,BOF,CBGT,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "blelrl-", XLOCB(19,BOFM4,CBGT,16,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "blelrl+", XLOCB(19,BOFP,CBGT,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "blelrl+", XLOCB(19,BOFP4,CBGT,16,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "blerl",   XLOCB(19,BOF,CBGT,16,1), XLBOCBBB_MASK, PWRCOM, { CR } },
-{ "bnglr",   XLOCB(19,BOF,CBGT,16,0), XLBOCBBB_MASK, PPCCOM, { CR } },
-{ "bnglr-",  XLOCB(19,BOF,CBGT,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bnglr-",  XLOCB(19,BOFM4,CBGT,16,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bnglr+",  XLOCB(19,BOFP,CBGT,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bnglr+",  XLOCB(19,BOFP4,CBGT,16,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bngr",    XLOCB(19,BOF,CBGT,16,0), XLBOCBBB_MASK, PWRCOM, { CR } },
-{ "bnglrl",  XLOCB(19,BOF,CBGT,16,1), XLBOCBBB_MASK, PPCCOM, { CR } },
-{ "bnglrl-", XLOCB(19,BOF,CBGT,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bnglrl-", XLOCB(19,BOFM4,CBGT,16,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bnglrl+", XLOCB(19,BOFP,CBGT,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bnglrl+", XLOCB(19,BOFP4,CBGT,16,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bngrl",   XLOCB(19,BOF,CBGT,16,1), XLBOCBBB_MASK, PWRCOM, { CR } },
-{ "bnelr",   XLOCB(19,BOF,CBEQ,16,0), XLBOCBBB_MASK, PPCCOM, { CR } },
-{ "bnelr-",  XLOCB(19,BOF,CBEQ,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bnelr-",  XLOCB(19,BOFM4,CBEQ,16,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bnelr+",  XLOCB(19,BOFP,CBEQ,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bnelr+",  XLOCB(19,BOFP4,CBEQ,16,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bner",    XLOCB(19,BOF,CBEQ,16,0), XLBOCBBB_MASK, PWRCOM, { CR } },
-{ "bnelrl",  XLOCB(19,BOF,CBEQ,16,1), XLBOCBBB_MASK, PPCCOM, { CR } },
-{ "bnelrl-", XLOCB(19,BOF,CBEQ,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bnelrl-", XLOCB(19,BOFM4,CBEQ,16,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bnelrl+", XLOCB(19,BOFP,CBEQ,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bnelrl+", XLOCB(19,BOFP4,CBEQ,16,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bnerl",   XLOCB(19,BOF,CBEQ,16,1), XLBOCBBB_MASK, PWRCOM, { CR } },
-{ "bnslr",   XLOCB(19,BOF,CBSO,16,0), XLBOCBBB_MASK, PPCCOM, { CR } },
-{ "bnslr-",  XLOCB(19,BOF,CBSO,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bnslr-",  XLOCB(19,BOFM4,CBSO,16,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bnslr+",  XLOCB(19,BOFP,CBSO,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bnslr+",  XLOCB(19,BOFP4,CBSO,16,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bnsr",    XLOCB(19,BOF,CBSO,16,0), XLBOCBBB_MASK, PWRCOM, { CR } },
-{ "bnslrl",  XLOCB(19,BOF,CBSO,16,1), XLBOCBBB_MASK, PPCCOM, { CR } },
-{ "bnslrl-", XLOCB(19,BOF,CBSO,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bnslrl-", XLOCB(19,BOFM4,CBSO,16,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bnslrl+", XLOCB(19,BOFP,CBSO,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bnslrl+", XLOCB(19,BOFP4,CBSO,16,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bnsrl",   XLOCB(19,BOF,CBSO,16,1), XLBOCBBB_MASK, PWRCOM, { CR } },
-{ "bnulr",   XLOCB(19,BOF,CBSO,16,0), XLBOCBBB_MASK, PPCCOM, { CR } },
-{ "bnulr-",  XLOCB(19,BOF,CBSO,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bnulr-",  XLOCB(19,BOFM4,CBSO,16,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bnulr+",  XLOCB(19,BOFP,CBSO,16,0), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bnulr+",  XLOCB(19,BOFP4,CBSO,16,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bnulrl",  XLOCB(19,BOF,CBSO,16,1), XLBOCBBB_MASK, PPCCOM, { CR } },
-{ "bnulrl-", XLOCB(19,BOF,CBSO,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bnulrl-", XLOCB(19,BOFM4,CBSO,16,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bnulrl+", XLOCB(19,BOFP,CBSO,16,1), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bnulrl+", XLOCB(19,BOFP4,CBSO,16,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "btlr",    XLO(19,BOT,16,0), XLBOBB_MASK, PPCCOM,     { BI } },
-{ "btlr-",   XLO(19,BOT,16,0), XLBOBB_MASK, NOPOWER4,   { BI } },
-{ "btlr-",   XLO(19,BOTM4,16,0), XLBOBB_MASK, POWER4,   { BI } },
-{ "btlr+",   XLO(19,BOTP,16,0), XLBOBB_MASK, NOPOWER4,  { BI } },
-{ "btlr+",   XLO(19,BOTP4,16,0), XLBOBB_MASK, POWER4,   { BI } },
-{ "bbtr",    XLO(19,BOT,16,0), XLBOBB_MASK, PWRCOM,     { BI } },
-{ "btlrl",   XLO(19,BOT,16,1), XLBOBB_MASK, PPCCOM,     { BI } },
-{ "btlrl-",  XLO(19,BOT,16,1), XLBOBB_MASK, NOPOWER4,   { BI } },
-{ "btlrl-",  XLO(19,BOTM4,16,1), XLBOBB_MASK, POWER4,   { BI } },
-{ "btlrl+",  XLO(19,BOTP,16,1), XLBOBB_MASK, NOPOWER4,  { BI } },
-{ "btlrl+",  XLO(19,BOTP4,16,1), XLBOBB_MASK, POWER4,   { BI } },
-{ "bbtrl",   XLO(19,BOT,16,1), XLBOBB_MASK, PWRCOM,     { BI } },
-{ "bflr",    XLO(19,BOF,16,0), XLBOBB_MASK, PPCCOM,     { BI } },
-{ "bflr-",   XLO(19,BOF,16,0), XLBOBB_MASK, NOPOWER4,   { BI } },
-{ "bflr-",   XLO(19,BOFM4,16,0), XLBOBB_MASK, POWER4,   { BI } },
-{ "bflr+",   XLO(19,BOFP,16,0), XLBOBB_MASK, NOPOWER4,  { BI } },
-{ "bflr+",   XLO(19,BOFP4,16,0), XLBOBB_MASK, POWER4,   { BI } },
-{ "bbfr",    XLO(19,BOF,16,0), XLBOBB_MASK, PWRCOM,     { BI } },
-{ "bflrl",   XLO(19,BOF,16,1), XLBOBB_MASK, PPCCOM,     { BI } },
-{ "bflrl-",  XLO(19,BOF,16,1), XLBOBB_MASK, NOPOWER4,   { BI } },
-{ "bflrl-",  XLO(19,BOFM4,16,1), XLBOBB_MASK, POWER4,   { BI } },
-{ "bflrl+",  XLO(19,BOFP,16,1), XLBOBB_MASK, NOPOWER4,  { BI } },
-{ "bflrl+",  XLO(19,BOFP4,16,1), XLBOBB_MASK, POWER4,   { BI } },
-{ "bbfrl",   XLO(19,BOF,16,1), XLBOBB_MASK, PWRCOM,     { BI } },
-{ "bdnztlr", XLO(19,BODNZT,16,0), XLBOBB_MASK, PPCCOM,  { BI } },
-{ "bdnztlr-",XLO(19,BODNZT,16,0), XLBOBB_MASK, NOPOWER4, { BI } },
-{ "bdnztlr+",XLO(19,BODNZTP,16,0), XLBOBB_MASK, NOPOWER4, { BI } },
-{ "bdnztlrl",XLO(19,BODNZT,16,1), XLBOBB_MASK, PPCCOM,  { BI } },
-{ "bdnztlrl-",XLO(19,BODNZT,16,1), XLBOBB_MASK, NOPOWER4, { BI } },
-{ "bdnztlrl+",XLO(19,BODNZTP,16,1), XLBOBB_MASK, NOPOWER4, { BI } },
-{ "bdnzflr", XLO(19,BODNZF,16,0), XLBOBB_MASK, PPCCOM,  { BI } },
-{ "bdnzflr-",XLO(19,BODNZF,16,0), XLBOBB_MASK, NOPOWER4, { BI } },
-{ "bdnzflr+",XLO(19,BODNZFP,16,0), XLBOBB_MASK, NOPOWER4, { BI } },
-{ "bdnzflrl",XLO(19,BODNZF,16,1), XLBOBB_MASK, PPCCOM,  { BI } },
-{ "bdnzflrl-",XLO(19,BODNZF,16,1), XLBOBB_MASK, NOPOWER4, { BI } },
-{ "bdnzflrl+",XLO(19,BODNZFP,16,1), XLBOBB_MASK, NOPOWER4, { BI } },
-{ "bdztlr",  XLO(19,BODZT,16,0), XLBOBB_MASK, PPCCOM,   { BI } },
-{ "bdztlr-", XLO(19,BODZT,16,0), XLBOBB_MASK, NOPOWER4, { BI } },
-{ "bdztlr+", XLO(19,BODZTP,16,0), XLBOBB_MASK, NOPOWER4, { BI } },
-{ "bdztlrl", XLO(19,BODZT,16,1), XLBOBB_MASK, PPCCOM,   { BI } },
-{ "bdztlrl-",XLO(19,BODZT,16,1), XLBOBB_MASK, NOPOWER4, { BI } },
-{ "bdztlrl+",XLO(19,BODZTP,16,1), XLBOBB_MASK, NOPOWER4, { BI } },
-{ "bdzflr",  XLO(19,BODZF,16,0), XLBOBB_MASK, PPCCOM,   { BI } },
-{ "bdzflr-", XLO(19,BODZF,16,0), XLBOBB_MASK, NOPOWER4, { BI } },
-{ "bdzflr+", XLO(19,BODZFP,16,0), XLBOBB_MASK, NOPOWER4, { BI } },
-{ "bdzflrl", XLO(19,BODZF,16,1), XLBOBB_MASK, PPCCOM,   { BI } },
-{ "bdzflrl-",XLO(19,BODZF,16,1), XLBOBB_MASK, NOPOWER4, { BI } },
-{ "bdzflrl+",XLO(19,BODZFP,16,1), XLBOBB_MASK, NOPOWER4, { BI } },
-{ "bclr+",   XLYLK(19,16,1,0), XLYBB_MASK, PPCCOM,      { BOE, BI } },
-{ "bclrl+",  XLYLK(19,16,1,1), XLYBB_MASK, PPCCOM,      { BOE, BI } },
-{ "bclr-",   XLYLK(19,16,0,0), XLYBB_MASK, PPCCOM,      { BOE, BI } },
-{ "bclrl-",  XLYLK(19,16,0,1), XLYBB_MASK, PPCCOM,      { BOE, BI } },
-{ "bclr",    XLLK(19,16,0), XLBH_MASK,  PPCCOM,         { BO, BI, BH } },
-{ "bclrl",   XLLK(19,16,1), XLBH_MASK,  PPCCOM,         { BO, BI, BH } },
-{ "bcr",     XLLK(19,16,0), XLBB_MASK,  PWRCOM,         { BO, BI } },
-{ "bcrl",    XLLK(19,16,1), XLBB_MASK,  PWRCOM,         { BO, BI } },
-{ "bclre",   XLLK(19,17,0), XLBB_MASK,  BOOKE64,        { BO, BI } },
-{ "bclrel",  XLLK(19,17,1), XLBB_MASK,  BOOKE64,        { BO, BI } },
-
-{ "rfid",    XL(19,18), 0xffffffff,     PPC64,          { 0 } },
-
-{ "crnot",   XL(19,33), XL_MASK,        PPCCOM,         { BT, BA, BBA } },
-{ "crnor",   XL(19,33), XL_MASK,        COM,            { BT, BA, BB } },
-{ "rfmci",    X(19,38), 0xffffffff,     PPCRFMCI,       { 0 } },
-
-{ "rfi",     XL(19,50), 0xffffffff,     COM,            { 0 } },
-{ "rfci",    XL(19,51), 0xffffffff,     PPC403 | BOOKE, { 0 } },
-
-{ "rfsvc",   XL(19,82), 0xffffffff,     POWER,          { 0 } },
-
-{ "crandc",  XL(19,129), XL_MASK,       COM,            { BT, BA, BB } },
-
-{ "isync",   XL(19,150), 0xffffffff,    PPCCOM,         { 0 } },
-{ "ics",     XL(19,150), 0xffffffff,    PWRCOM,         { 0 } },
-
-{ "crclr",   XL(19,193), XL_MASK,       PPCCOM,         { BT, BAT, BBA } },
-{ "crxor",   XL(19,193), XL_MASK,       COM,            { BT, BA, BB } },
-
-{ "crnand",  XL(19,225), XL_MASK,       COM,            { BT, BA, BB } },
-
-{ "crand",   XL(19,257), XL_MASK,       COM,            { BT, BA, BB } },
-
-{ "hrfid",   XL(19,274), 0xffffffff,    POWER5 | CELL,  { 0 } },
-
-{ "crset",   XL(19,289), XL_MASK,       PPCCOM,         { BT, BAT, BBA } },
-{ "creqv",   XL(19,289), XL_MASK,       COM,            { BT, BA, BB } },
-
-{ "doze",    XL(19,402), 0xffffffff,    POWER6,         { 0 } },
-
-{ "crorc",   XL(19,417), XL_MASK,       COM,            { BT, BA, BB } },
-
-{ "nap",     XL(19,434), 0xffffffff,    POWER6,         { 0 } },
-
-{ "crmove",  XL(19,449), XL_MASK,       PPCCOM,         { BT, BA, BBA } },
-{ "cror",    XL(19,449), XL_MASK,       COM,            { BT, BA, BB } },
-
-{ "sleep",   XL(19,466), 0xffffffff,    POWER6,         { 0 } },
-{ "rvwinkle", XL(19,498), 0xffffffff,   POWER6,         { 0 } },
-
-{ "bctr",    XLO(19,BOU,528,0), XLBOBIBB_MASK, COM,     { 0 } },
-{ "bctrl",   XLO(19,BOU,528,1), XLBOBIBB_MASK, COM,     { 0 } },
-{ "bltctr",  XLOCB(19,BOT,CBLT,528,0),  XLBOCBBB_MASK, PPCCOM,  { CR } },
-{ "bltctr-", XLOCB(19,BOT,CBLT,528,0),  XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bltctr-", XLOCB(19,BOTM4,CBLT,528,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bltctr+", XLOCB(19,BOTP,CBLT,528,0), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bltctr+", XLOCB(19,BOTP4,CBLT,528,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bltctrl", XLOCB(19,BOT,CBLT,528,1),  XLBOCBBB_MASK, PPCCOM,  { CR } },
-{ "bltctrl-",XLOCB(19,BOT,CBLT,528,1),  XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bltctrl-",XLOCB(19,BOTM4,CBLT,528,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bltctrl+",XLOCB(19,BOTP,CBLT,528,1), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bltctrl+",XLOCB(19,BOTP4,CBLT,528,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bgtctr",  XLOCB(19,BOT,CBGT,528,0),  XLBOCBBB_MASK, PPCCOM,  { CR } },
-{ "bgtctr-", XLOCB(19,BOT,CBGT,528,0),  XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bgtctr-", XLOCB(19,BOTM4,CBGT,528,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bgtctr+", XLOCB(19,BOTP,CBGT,528,0), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bgtctr+", XLOCB(19,BOTP4,CBGT,528,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bgtctrl", XLOCB(19,BOT,CBGT,528,1),  XLBOCBBB_MASK, PPCCOM,  { CR } },
-{ "bgtctrl-",XLOCB(19,BOT,CBGT,528,1),  XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bgtctrl-",XLOCB(19,BOTM4,CBGT,528,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bgtctrl+",XLOCB(19,BOTP,CBGT,528,1), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bgtctrl+",XLOCB(19,BOTP4,CBGT,528,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "beqctr",  XLOCB(19,BOT,CBEQ,528,0),  XLBOCBBB_MASK, PPCCOM,  { CR } },
-{ "beqctr-", XLOCB(19,BOT,CBEQ,528,0),  XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "beqctr-", XLOCB(19,BOTM4,CBEQ,528,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "beqctr+", XLOCB(19,BOTP,CBEQ,528,0), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "beqctr+", XLOCB(19,BOTP4,CBEQ,528,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "beqctrl", XLOCB(19,BOT,CBEQ,528,1),  XLBOCBBB_MASK, PPCCOM,  { CR } },
-{ "beqctrl-",XLOCB(19,BOT,CBEQ,528,1),  XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "beqctrl-",XLOCB(19,BOTM4,CBEQ,528,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "beqctrl+",XLOCB(19,BOTP,CBEQ,528,1), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "beqctrl+",XLOCB(19,BOTP4,CBEQ,528,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bsoctr",  XLOCB(19,BOT,CBSO,528,0),  XLBOCBBB_MASK, PPCCOM,  { CR } },
-{ "bsoctr-", XLOCB(19,BOT,CBSO,528,0),  XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bsoctr-", XLOCB(19,BOTM4,CBSO,528,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bsoctr+", XLOCB(19,BOTP,CBSO,528,0), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bsoctr+", XLOCB(19,BOTP4,CBSO,528,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bsoctrl", XLOCB(19,BOT,CBSO,528,1),  XLBOCBBB_MASK, PPCCOM,  { CR } },
-{ "bsoctrl-",XLOCB(19,BOT,CBSO,528,1),  XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bsoctrl-",XLOCB(19,BOTM4,CBSO,528,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bsoctrl+",XLOCB(19,BOTP,CBSO,528,1), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bsoctrl+",XLOCB(19,BOTP4,CBSO,528,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bunctr",  XLOCB(19,BOT,CBSO,528,0),  XLBOCBBB_MASK, PPCCOM,  { CR } },
-{ "bunctr-", XLOCB(19,BOT,CBSO,528,0),  XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bunctr-", XLOCB(19,BOTM4,CBSO,528,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bunctr+", XLOCB(19,BOTP,CBSO,528,0), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bunctr+", XLOCB(19,BOTP4,CBSO,528,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bunctrl", XLOCB(19,BOT,CBSO,528,1),  XLBOCBBB_MASK, PPCCOM,  { CR } },
-{ "bunctrl-",XLOCB(19,BOT,CBSO,528,1),  XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bunctrl-",XLOCB(19,BOTM4,CBSO,528,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bunctrl+",XLOCB(19,BOTP,CBSO,528,1), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bunctrl+",XLOCB(19,BOTP4,CBSO,528,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bgectr",  XLOCB(19,BOF,CBLT,528,0),  XLBOCBBB_MASK, PPCCOM,  { CR } },
-{ "bgectr-", XLOCB(19,BOF,CBLT,528,0),  XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bgectr-", XLOCB(19,BOFM4,CBLT,528,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bgectr+", XLOCB(19,BOFP,CBLT,528,0), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bgectr+", XLOCB(19,BOFP4,CBLT,528,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bgectrl", XLOCB(19,BOF,CBLT,528,1),  XLBOCBBB_MASK, PPCCOM,  { CR } },
-{ "bgectrl-",XLOCB(19,BOF,CBLT,528,1),  XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bgectrl-",XLOCB(19,BOFM4,CBLT,528,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bgectrl+",XLOCB(19,BOFP,CBLT,528,1), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bgectrl+",XLOCB(19,BOFP4,CBLT,528,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bnlctr",  XLOCB(19,BOF,CBLT,528,0),  XLBOCBBB_MASK, PPCCOM,  { CR } },
-{ "bnlctr-", XLOCB(19,BOF,CBLT,528,0),  XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bnlctr-", XLOCB(19,BOFM4,CBLT,528,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bnlctr+", XLOCB(19,BOFP,CBLT,528,0), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bnlctr+", XLOCB(19,BOFP4,CBLT,528,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bnlctrl", XLOCB(19,BOF,CBLT,528,1),  XLBOCBBB_MASK, PPCCOM,  { CR } },
-{ "bnlctrl-",XLOCB(19,BOF,CBLT,528,1),  XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bnlctrl-",XLOCB(19,BOFM4,CBLT,528,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bnlctrl+",XLOCB(19,BOFP,CBLT,528,1), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bnlctrl+",XLOCB(19,BOFP4,CBLT,528,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "blectr",  XLOCB(19,BOF,CBGT,528,0),  XLBOCBBB_MASK, PPCCOM,  { CR } },
-{ "blectr-", XLOCB(19,BOF,CBGT,528,0),  XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "blectr-", XLOCB(19,BOFM4,CBGT,528,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "blectr+", XLOCB(19,BOFP,CBGT,528,0), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "blectr+", XLOCB(19,BOFP4,CBGT,528,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "blectrl", XLOCB(19,BOF,CBGT,528,1),  XLBOCBBB_MASK, PPCCOM,  { CR } },
-{ "blectrl-",XLOCB(19,BOF,CBGT,528,1),  XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "blectrl-",XLOCB(19,BOFM4,CBGT,528,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "blectrl+",XLOCB(19,BOFP,CBGT,528,1), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "blectrl+",XLOCB(19,BOFP4,CBGT,528,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bngctr",  XLOCB(19,BOF,CBGT,528,0),  XLBOCBBB_MASK, PPCCOM,  { CR } },
-{ "bngctr-", XLOCB(19,BOF,CBGT,528,0),  XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bngctr-", XLOCB(19,BOFM4,CBGT,528,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bngctr+", XLOCB(19,BOFP,CBGT,528,0), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bngctr+", XLOCB(19,BOFP4,CBGT,528,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bngctrl", XLOCB(19,BOF,CBGT,528,1),  XLBOCBBB_MASK, PPCCOM,  { CR } },
-{ "bngctrl-",XLOCB(19,BOF,CBGT,528,1),  XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bngctrl-",XLOCB(19,BOFM4,CBGT,528,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bngctrl+",XLOCB(19,BOFP,CBGT,528,1), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bngctrl+",XLOCB(19,BOFP4,CBGT,528,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bnectr",  XLOCB(19,BOF,CBEQ,528,0),  XLBOCBBB_MASK, PPCCOM,  { CR } },
-{ "bnectr-", XLOCB(19,BOF,CBEQ,528,0),  XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bnectr-", XLOCB(19,BOFM4,CBEQ,528,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bnectr+", XLOCB(19,BOFP,CBEQ,528,0), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bnectr+", XLOCB(19,BOFP4,CBEQ,528,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bnectrl", XLOCB(19,BOF,CBEQ,528,1),  XLBOCBBB_MASK, PPCCOM,  { CR } },
-{ "bnectrl-",XLOCB(19,BOF,CBEQ,528,1),  XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bnectrl-",XLOCB(19,BOFM4,CBEQ,528,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bnectrl+",XLOCB(19,BOFP,CBEQ,528,1), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bnectrl+",XLOCB(19,BOFP4,CBEQ,528,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bnsctr",  XLOCB(19,BOF,CBSO,528,0),  XLBOCBBB_MASK, PPCCOM,  { CR } },
-{ "bnsctr-", XLOCB(19,BOF,CBSO,528,0),  XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bnsctr-", XLOCB(19,BOFM4,CBSO,528,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bnsctr+", XLOCB(19,BOFP,CBSO,528,0), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bnsctr+", XLOCB(19,BOFP4,CBSO,528,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bnsctrl", XLOCB(19,BOF,CBSO,528,1),  XLBOCBBB_MASK, PPCCOM,  { CR } },
-{ "bnsctrl-",XLOCB(19,BOF,CBSO,528,1),  XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bnsctrl-",XLOCB(19,BOFM4,CBSO,528,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bnsctrl+",XLOCB(19,BOFP,CBSO,528,1), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bnsctrl+",XLOCB(19,BOFP4,CBSO,528,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bnuctr",  XLOCB(19,BOF,CBSO,528,0),  XLBOCBBB_MASK, PPCCOM,  { CR } },
-{ "bnuctr-", XLOCB(19,BOF,CBSO,528,0),  XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bnuctr-", XLOCB(19,BOFM4,CBSO,528,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bnuctr+", XLOCB(19,BOFP,CBSO,528,0), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bnuctr+", XLOCB(19,BOFP4,CBSO,528,0), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bnuctrl", XLOCB(19,BOF,CBSO,528,1),  XLBOCBBB_MASK, PPCCOM,  { CR } },
-{ "bnuctrl-",XLOCB(19,BOF,CBSO,528,1),  XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bnuctrl-",XLOCB(19,BOFM4,CBSO,528,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "bnuctrl+",XLOCB(19,BOFP,CBSO,528,1), XLBOCBBB_MASK, NOPOWER4, { CR } },
-{ "bnuctrl+",XLOCB(19,BOFP4,CBSO,528,1), XLBOCBBB_MASK, POWER4, { CR } },
-{ "btctr",   XLO(19,BOT,528,0),  XLBOBB_MASK, PPCCOM,   { BI } },
-{ "btctr-",  XLO(19,BOT,528,0),  XLBOBB_MASK, NOPOWER4, { BI } },
-{ "btctr-",  XLO(19,BOTM4,528,0), XLBOBB_MASK, POWER4, { BI } },
-{ "btctr+",  XLO(19,BOTP,528,0), XLBOBB_MASK, NOPOWER4, { BI } },
-{ "btctr+",  XLO(19,BOTP4,528,0), XLBOBB_MASK, POWER4, { BI } },
-{ "btctrl",  XLO(19,BOT,528,1),  XLBOBB_MASK, PPCCOM,   { BI } },
-{ "btctrl-", XLO(19,BOT,528,1),  XLBOBB_MASK, NOPOWER4, { BI } },
-{ "btctrl-", XLO(19,BOTM4,528,1), XLBOBB_MASK, POWER4, { BI } },
-{ "btctrl+", XLO(19,BOTP,528,1), XLBOBB_MASK, NOPOWER4, { BI } },
-{ "btctrl+", XLO(19,BOTP4,528,1), XLBOBB_MASK, POWER4, { BI } },
-{ "bfctr",   XLO(19,BOF,528,0),  XLBOBB_MASK, PPCCOM,   { BI } },
-{ "bfctr-",  XLO(19,BOF,528,0),  XLBOBB_MASK, NOPOWER4, { BI } },
-{ "bfctr-",  XLO(19,BOFM4,528,0), XLBOBB_MASK, POWER4, { BI } },
-{ "bfctr+",  XLO(19,BOFP,528,0), XLBOBB_MASK, NOPOWER4, { BI } },
-{ "bfctr+",  XLO(19,BOFP4,528,0), XLBOBB_MASK, POWER4, { BI } },
-{ "bfctrl",  XLO(19,BOF,528,1),  XLBOBB_MASK, PPCCOM,   { BI } },
-{ "bfctrl-", XLO(19,BOF,528,1),  XLBOBB_MASK, NOPOWER4, { BI } },
-{ "bfctrl-", XLO(19,BOFM4,528,1), XLBOBB_MASK, POWER4, { BI } },
-{ "bfctrl+", XLO(19,BOFP,528,1), XLBOBB_MASK, NOPOWER4, { BI } },
-{ "bfctrl+", XLO(19,BOFP4,528,1), XLBOBB_MASK, POWER4, { BI } },
-{ "bcctr-",  XLYLK(19,528,0,0),  XLYBB_MASK,  PPCCOM,   { BOE, BI } },
-{ "bcctr+",  XLYLK(19,528,1,0),  XLYBB_MASK,  PPCCOM,   { BOE, BI } },
-{ "bcctrl-", XLYLK(19,528,0,1),  XLYBB_MASK,  PPCCOM,   { BOE, BI } },
-{ "bcctrl+", XLYLK(19,528,1,1),  XLYBB_MASK,  PPCCOM,   { BOE, BI } },
-{ "bcctr",   XLLK(19,528,0),     XLBH_MASK,   PPCCOM,   { BO, BI, BH } },
-{ "bcctrl",  XLLK(19,528,1),     XLBH_MASK,   PPCCOM,   { BO, BI, BH } },
-{ "bcc",     XLLK(19,528,0),     XLBB_MASK,   PWRCOM,   { BO, BI } },
-{ "bccl",    XLLK(19,528,1),     XLBB_MASK,   PWRCOM,   { BO, BI } },
-{ "bcctre",  XLLK(19,529,0),     XLYBB_MASK,  BOOKE64,  { BO, BI } },
-{ "bcctrel", XLLK(19,529,1),     XLYBB_MASK,  BOOKE64,  { BO, BI } },
-
-{ "rlwimi",  M(20,0),   M_MASK,         PPCCOM,         { RA,RS,SH,MBE,ME } },
-{ "rlimi",   M(20,0),   M_MASK,         PWRCOM,         { RA,RS,SH,MBE,ME } },
-
-{ "rlwimi.", M(20,1),   M_MASK,         PPCCOM,         { RA,RS,SH,MBE,ME } },
-{ "rlimi.",  M(20,1),   M_MASK,         PWRCOM,         { RA,RS,SH,MBE,ME } },
-
-{ "rotlwi",  MME(21,31,0), MMBME_MASK,  PPCCOM,         { RA, RS, SH } },
-{ "clrlwi",  MME(21,31,0), MSHME_MASK,  PPCCOM,         { RA, RS, MB } },
-{ "rlwinm",  M(21,0),   M_MASK,         PPCCOM,         { RA,RS,SH,MBE,ME } },
-{ "rlinm",   M(21,0),   M_MASK,         PWRCOM,         { RA,RS,SH,MBE,ME } },
-{ "rotlwi.", MME(21,31,1), MMBME_MASK,  PPCCOM,         { RA,RS,SH } },
-{ "clrlwi.", MME(21,31,1), MSHME_MASK,  PPCCOM,         { RA, RS, MB } },
-{ "rlwinm.", M(21,1),   M_MASK,         PPCCOM,         { RA,RS,SH,MBE,ME } },
-{ "rlinm.",  M(21,1),   M_MASK,         PWRCOM,         { RA,RS,SH,MBE,ME } },
-
-{ "rlmi",    M(22,0),   M_MASK,         M601,           { RA,RS,RB,MBE,ME } },
-{ "rlmi.",   M(22,1),   M_MASK,         M601,           { RA,RS,RB,MBE,ME } },
-
-{ "be",      B(22,0,0), B_MASK,         BOOKE64,        { LI } },
-{ "bel",     B(22,0,1), B_MASK,         BOOKE64,        { LI } },
-{ "bea",     B(22,1,0), B_MASK,         BOOKE64,        { LIA } },
-{ "bela",    B(22,1,1), B_MASK,         BOOKE64,        { LIA } },
-
-{ "rotlw",   MME(23,31,0), MMBME_MASK,  PPCCOM,         { RA, RS, RB } },
-{ "rlwnm",   M(23,0),   M_MASK,         PPCCOM,         { RA,RS,RB,MBE,ME } },
-{ "rlnm",    M(23,0),   M_MASK,         PWRCOM,         { RA,RS,RB,MBE,ME } },
-{ "rotlw.",  MME(23,31,1), MMBME_MASK,  PPCCOM,         { RA, RS, RB } },
-{ "rlwnm.",  M(23,1),   M_MASK,         PPCCOM,         { RA,RS,RB,MBE,ME } },
-{ "rlnm.",   M(23,1),   M_MASK,         PWRCOM,         { RA,RS,RB,MBE,ME } },
-
-{ "nop",     OP(24),    0xffffffff,     PPCCOM,         { 0 } },
-{ "ori",     OP(24),    OP_MASK,        PPCCOM,         { RA, RS, UI } },
-{ "oril",    OP(24),    OP_MASK,        PWRCOM,         { RA, RS, UI } },
-
-{ "oris",    OP(25),    OP_MASK,        PPCCOM,         { RA, RS, UI } },
-{ "oriu",    OP(25),    OP_MASK,        PWRCOM,         { RA, RS, UI } },
-
-{ "xori",    OP(26),    OP_MASK,        PPCCOM,         { RA, RS, UI } },
-{ "xoril",   OP(26),    OP_MASK,        PWRCOM,         { RA, RS, UI } },
-
-{ "xoris",   OP(27),    OP_MASK,        PPCCOM,         { RA, RS, UI } },
-{ "xoriu",   OP(27),    OP_MASK,        PWRCOM,         { RA, RS, UI } },
-
-{ "andi.",   OP(28),    OP_MASK,        PPCCOM,         { RA, RS, UI } },
-{ "andil.",  OP(28),    OP_MASK,        PWRCOM,         { RA, RS, UI } },
-
-{ "andis.",  OP(29),    OP_MASK,        PPCCOM,         { RA, RS, UI } },
-{ "andiu.",  OP(29),    OP_MASK,        PWRCOM,         { RA, RS, UI } },
-
-{ "rotldi",  MD(30,0,0), MDMB_MASK,     PPC64,          { RA, RS, SH6 } },
-{ "clrldi",  MD(30,0,0), MDSH_MASK,     PPC64,          { RA, RS, MB6 } },
-{ "rldicl",  MD(30,0,0), MD_MASK,       PPC64,          { RA, RS, SH6, MB6 } },
-{ "rotldi.", MD(30,0,1), MDMB_MASK,     PPC64,          { RA, RS, SH6 } },
-{ "clrldi.", MD(30,0,1), MDSH_MASK,     PPC64,          { RA, RS, MB6 } },
-{ "rldicl.", MD(30,0,1), MD_MASK,       PPC64,          { RA, RS, SH6, MB6 } },
-
-{ "rldicr",  MD(30,1,0), MD_MASK,       PPC64,          { RA, RS, SH6, ME6 } },
-{ "rldicr.", MD(30,1,1), MD_MASK,       PPC64,          { RA, RS, SH6, ME6 } },
-
-{ "rldic",   MD(30,2,0), MD_MASK,       PPC64,          { RA, RS, SH6, MB6 } },
-{ "rldic.",  MD(30,2,1), MD_MASK,       PPC64,          { RA, RS, SH6, MB6 } },
-
-{ "rldimi",  MD(30,3,0), MD_MASK,       PPC64,          { RA, RS, SH6, MB6 } },
-{ "rldimi.", MD(30,3,1), MD_MASK,       PPC64,          { RA, RS, SH6, MB6 } },
-
-{ "rotld",   MDS(30,8,0), MDSMB_MASK,   PPC64,          { RA, RS, RB } },
-{ "rldcl",   MDS(30,8,0), MDS_MASK,     PPC64,          { RA, RS, RB, MB6 } },
-{ "rotld.",  MDS(30,8,1), MDSMB_MASK,   PPC64,          { RA, RS, RB } },
-{ "rldcl.",  MDS(30,8,1), MDS_MASK,     PPC64,          { RA, RS, RB, MB6 } },
-
-{ "rldcr",   MDS(30,9,0), MDS_MASK,     PPC64,          { RA, RS, RB, ME6 } },
-{ "rldcr.",  MDS(30,9,1), MDS_MASK,     PPC64,          { RA, RS, RB, ME6 } },
-
-{ "cmpw",    XOPL(31,0,0), XCMPL_MASK, PPCCOM,          { OBF, RA, RB } },
-{ "cmpd",    XOPL(31,0,1), XCMPL_MASK, PPC64,           { OBF, RA, RB } },
-{ "cmp",     X(31,0),   XCMP_MASK,      PPC,            { BF, L, RA, RB } },
-{ "cmp",     X(31,0),   XCMPL_MASK,     PWRCOM,         { BF, RA, RB } },
-
-{ "twlgt",   XTO(31,4,TOLGT), XTO_MASK, PPCCOM,         { RA, RB } },
-{ "tlgt",    XTO(31,4,TOLGT), XTO_MASK, PWRCOM,         { RA, RB } },
-{ "twllt",   XTO(31,4,TOLLT), XTO_MASK, PPCCOM,         { RA, RB } },
-{ "tllt",    XTO(31,4,TOLLT), XTO_MASK, PWRCOM,         { RA, RB } },
-{ "tweq",    XTO(31,4,TOEQ), XTO_MASK,  PPCCOM,         { RA, RB } },
-{ "teq",     XTO(31,4,TOEQ), XTO_MASK,  PWRCOM,         { RA, RB } },
-{ "twlge",   XTO(31,4,TOLGE), XTO_MASK, PPCCOM,         { RA, RB } },
-{ "tlge",    XTO(31,4,TOLGE), XTO_MASK, PWRCOM,         { RA, RB } },
-{ "twlnl",   XTO(31,4,TOLNL), XTO_MASK, PPCCOM,         { RA, RB } },
-{ "tlnl",    XTO(31,4,TOLNL), XTO_MASK, PWRCOM,         { RA, RB } },
-{ "twlle",   XTO(31,4,TOLLE), XTO_MASK, PPCCOM,         { RA, RB } },
-{ "tlle",    XTO(31,4,TOLLE), XTO_MASK, PWRCOM,         { RA, RB } },
-{ "twlng",   XTO(31,4,TOLNG), XTO_MASK, PPCCOM,         { RA, RB } },
-{ "tlng",    XTO(31,4,TOLNG), XTO_MASK, PWRCOM,         { RA, RB } },
-{ "twgt",    XTO(31,4,TOGT), XTO_MASK,  PPCCOM,         { RA, RB } },
-{ "tgt",     XTO(31,4,TOGT), XTO_MASK,  PWRCOM,         { RA, RB } },
-{ "twge",    XTO(31,4,TOGE), XTO_MASK,  PPCCOM,         { RA, RB } },
-{ "tge",     XTO(31,4,TOGE), XTO_MASK,  PWRCOM,         { RA, RB } },
-{ "twnl",    XTO(31,4,TONL), XTO_MASK,  PPCCOM,         { RA, RB } },
-{ "tnl",     XTO(31,4,TONL), XTO_MASK,  PWRCOM,         { RA, RB } },
-{ "twlt",    XTO(31,4,TOLT), XTO_MASK,  PPCCOM,         { RA, RB } },
-{ "tlt",     XTO(31,4,TOLT), XTO_MASK,  PWRCOM,         { RA, RB } },
-{ "twle",    XTO(31,4,TOLE), XTO_MASK,  PPCCOM,         { RA, RB } },
-{ "tle",     XTO(31,4,TOLE), XTO_MASK,  PWRCOM,         { RA, RB } },
-{ "twng",    XTO(31,4,TONG), XTO_MASK,  PPCCOM,         { RA, RB } },
-{ "tng",     XTO(31,4,TONG), XTO_MASK,  PWRCOM,         { RA, RB } },
-{ "twne",    XTO(31,4,TONE), XTO_MASK,  PPCCOM,         { RA, RB } },
-{ "tne",     XTO(31,4,TONE), XTO_MASK,  PWRCOM,         { RA, RB } },
-{ "trap",    XTO(31,4,TOU), 0xffffffff, PPCCOM,         { 0 } },
-{ "tw",      X(31,4),   X_MASK,         PPCCOM,         { TO, RA, RB } },
-{ "t",       X(31,4),   X_MASK,         PWRCOM,         { TO, RA, RB } },
-
-{ "subfc",   XO(31,8,0,0), XO_MASK,     PPCCOM,         { RT, RA, RB } },
-{ "sf",      XO(31,8,0,0), XO_MASK,     PWRCOM,         { RT, RA, RB } },
-{ "subc",    XO(31,8,0,0), XO_MASK,     PPC,            { RT, RB, RA } },
-{ "subfc.",  XO(31,8,0,1), XO_MASK,     PPCCOM,         { RT, RA, RB } },
-{ "sf.",     XO(31,8,0,1), XO_MASK,     PWRCOM,         { RT, RA, RB } },
-{ "subc.",   XO(31,8,0,1), XO_MASK,     PPCCOM,         { RT, RB, RA } },
-{ "subfco",  XO(31,8,1,0), XO_MASK,     PPCCOM,         { RT, RA, RB } },
-{ "sfo",     XO(31,8,1,0), XO_MASK,     PWRCOM,         { RT, RA, RB } },
-{ "subco",   XO(31,8,1,0), XO_MASK,     PPC,            { RT, RB, RA } },
-{ "subfco.", XO(31,8,1,1), XO_MASK,     PPCCOM,         { RT, RA, RB } },
-{ "sfo.",    XO(31,8,1,1), XO_MASK,     PWRCOM,         { RT, RA, RB } },
-{ "subco.",  XO(31,8,1,1), XO_MASK,     PPC,            { RT, RB, RA } },
-
-{ "mulhdu",  XO(31,9,0,0), XO_MASK,     PPC64,          { RT, RA, RB } },
-{ "mulhdu.", XO(31,9,0,1), XO_MASK,     PPC64,          { RT, RA, RB } },
-
-{ "addc",    XO(31,10,0,0), XO_MASK,    PPCCOM,         { RT, RA, RB } },
-{ "a",       XO(31,10,0,0), XO_MASK,    PWRCOM,         { RT, RA, RB } },
-{ "addc.",   XO(31,10,0,1), XO_MASK,    PPCCOM,         { RT, RA, RB } },
-{ "a.",      XO(31,10,0,1), XO_MASK,    PWRCOM,         { RT, RA, RB } },
-{ "addco",   XO(31,10,1,0), XO_MASK,    PPCCOM,         { RT, RA, RB } },
-{ "ao",      XO(31,10,1,0), XO_MASK,    PWRCOM,         { RT, RA, RB } },
-{ "addco.",  XO(31,10,1,1), XO_MASK,    PPCCOM,         { RT, RA, RB } },
-{ "ao.",     XO(31,10,1,1), XO_MASK,    PWRCOM,         { RT, RA, RB } },
-
-{ "mulhwu",  XO(31,11,0,0), XO_MASK,    PPC,            { RT, RA, RB } },
-{ "mulhwu.", XO(31,11,0,1), XO_MASK,    PPC,            { RT, RA, RB } },
-
-{ "isellt",  X(31,15),      X_MASK,     PPCISEL,        { RT, RA, RB } },
-{ "iselgt",  X(31,47),      X_MASK,     PPCISEL,        { RT, RA, RB } },
-{ "iseleq",  X(31,79),      X_MASK,     PPCISEL,        { RT, RA, RB } },
-{ "isel",    XISEL(31,15),  XISEL_MASK, PPCISEL,        { RT, RA, RB, CRB } },
-
-{ "mfocrf",  XFXM(31,19,0,1), XFXFXM_MASK, COM,         { RT, FXM } },
-{ "mfcr",    X(31,19),  XRARB_MASK,     NOPOWER4 | COM, { RT } },
-{ "mfcr",    X(31,19),  XFXFXM_MASK,    POWER4,         { RT, FXM4 } },
-
-{ "lwarx",   X(31,20),  XEH_MASK,       PPC,            { RT, RA0, RB, EH } },
-
-{ "ldx",     X(31,21),  X_MASK,         PPC64,          { RT, RA0, RB } },
-
-{ "icbt",    X(31,22),  X_MASK,         BOOKE|PPCE300,  { CT, RA, RB } },
-{ "icbt",    X(31,262), XRT_MASK,       PPC403,         { RA, RB } },
-
-{ "lwzx",    X(31,23),  X_MASK,         PPCCOM,         { RT, RA0, RB } },
-{ "lx",      X(31,23),  X_MASK,         PWRCOM,         { RT, RA, RB } },
-
-{ "slw",     XRC(31,24,0), X_MASK,      PPCCOM,         { RA, RS, RB } },
-{ "sl",      XRC(31,24,0), X_MASK,      PWRCOM,         { RA, RS, RB } },
-{ "slw.",    XRC(31,24,1), X_MASK,      PPCCOM,         { RA, RS, RB } },
-{ "sl.",     XRC(31,24,1), X_MASK,      PWRCOM,         { RA, RS, RB } },
-
-{ "cntlzw",  XRC(31,26,0), XRB_MASK,    PPCCOM,         { RA, RS } },
-{ "cntlz",   XRC(31,26,0), XRB_MASK,    PWRCOM,         { RA, RS } },
-{ "cntlzw.", XRC(31,26,1), XRB_MASK,    PPCCOM,         { RA, RS } },
-{ "cntlz.",  XRC(31,26,1), XRB_MASK,    PWRCOM,         { RA, RS } },
-
-{ "sld",     XRC(31,27,0), X_MASK,      PPC64,          { RA, RS, RB } },
-{ "sld.",    XRC(31,27,1), X_MASK,      PPC64,          { RA, RS, RB } },
-
-{ "and",     XRC(31,28,0), X_MASK,      COM,            { RA, RS, RB } },
-{ "and.",    XRC(31,28,1), X_MASK,      COM,            { RA, RS, RB } },
-
-{ "maskg",   XRC(31,29,0), X_MASK,      M601,           { RA, RS, RB } },
-{ "maskg.",  XRC(31,29,1), X_MASK,      M601,           { RA, RS, RB } },
-
-{ "icbte",   X(31,30),  X_MASK,         BOOKE64,        { CT, RA, RB } },
-
-{ "lwzxe",   X(31,31),  X_MASK,         BOOKE64,        { RT, RA0, RB } },
-
-{ "cmplw",   XOPL(31,32,0), XCMPL_MASK, PPCCOM, { OBF, RA, RB } },
-{ "cmpld",   XOPL(31,32,1), XCMPL_MASK, PPC64,          { OBF, RA, RB } },
-{ "cmpl",    X(31,32),  XCMP_MASK,       PPC,           { BF, L, RA, RB } },
-{ "cmpl",    X(31,32),  XCMPL_MASK,      PWRCOM,        { BF, RA, RB } },
-
-{ "subf",    XO(31,40,0,0), XO_MASK,    PPC,            { RT, RA, RB } },
-{ "sub",     XO(31,40,0,0), XO_MASK,    PPC,            { RT, RB, RA } },
-{ "subf.",   XO(31,40,0,1), XO_MASK,    PPC,            { RT, RA, RB } },
-{ "sub.",    XO(31,40,0,1), XO_MASK,    PPC,            { RT, RB, RA } },
-{ "subfo",   XO(31,40,1,0), XO_MASK,    PPC,            { RT, RA, RB } },
-{ "subo",    XO(31,40,1,0), XO_MASK,    PPC,            { RT, RB, RA } },
-{ "subfo.",  XO(31,40,1,1), XO_MASK,    PPC,            { RT, RA, RB } },
-{ "subo.",   XO(31,40,1,1), XO_MASK,    PPC,            { RT, RB, RA } },
+{"attn",        X(0,256),       X_MASK,   POWER4|PPCA2, PPC476|PPCVLE,  {0}},
+{"tdlgti",      OPTO(2,TOLGT),  OPTO_MASK,   PPC64,     PPCVLE,         {RA, SI}},
+{"tdllti",      OPTO(2,TOLLT),  OPTO_MASK,   PPC64,     PPCVLE,         {RA, SI}},
+{"tdeqi",       OPTO(2,TOEQ),   OPTO_MASK,   PPC64,     PPCVLE,         {RA, SI}},
+{"tdlgei",      OPTO(2,TOLGE),  OPTO_MASK,   PPC64,     PPCVLE,         {RA, SI}},
+{"tdlnli",      OPTO(2,TOLNL),  OPTO_MASK,   PPC64,     PPCVLE,         {RA, SI}},
+{"tdllei",      OPTO(2,TOLLE),  OPTO_MASK,   PPC64,     PPCVLE,         {RA, SI}},
+{"tdlngi",      OPTO(2,TOLNG),  OPTO_MASK,   PPC64,     PPCVLE,         {RA, SI}},
+{"tdgti",       OPTO(2,TOGT),   OPTO_MASK,   PPC64,     PPCVLE,         {RA, SI}},
+{"tdgei",       OPTO(2,TOGE),   OPTO_MASK,   PPC64,     PPCVLE,         {RA, SI}},
+{"tdnli",       OPTO(2,TONL),   OPTO_MASK,   PPC64,     PPCVLE,         {RA, SI}},
+{"tdlti",       OPTO(2,TOLT),   OPTO_MASK,   PPC64,     PPCVLE,         {RA, SI}},
+{"tdlei",       OPTO(2,TOLE),   OPTO_MASK,   PPC64,     PPCVLE,         {RA, SI}},
+{"tdngi",       OPTO(2,TONG),   OPTO_MASK,   PPC64,     PPCVLE,         {RA, SI}},
+{"tdnei",       OPTO(2,TONE),   OPTO_MASK,   PPC64,     PPCVLE,         {RA, SI}},
+{"tdui",        OPTO(2,TOU),    OPTO_MASK,   PPC64,     PPCVLE,         {RA, SI}},
+{"tdi",         OP(2),          OP_MASK,     PPC64,     PPCVLE,         {TO, RA, SI}},
+
+{"twlgti",      OPTO(3,TOLGT),  OPTO_MASK,   PPCCOM,    PPCVLE,         {RA, SI}},
+{"tlgti",       OPTO(3,TOLGT),  OPTO_MASK,   PWRCOM,    PPCVLE,         {RA, SI}},
+{"twllti",      OPTO(3,TOLLT),  OPTO_MASK,   PPCCOM,    PPCVLE,         {RA, SI}},
+{"tllti",       OPTO(3,TOLLT),  OPTO_MASK,   PWRCOM,    PPCVLE,         {RA, SI}},
+{"tweqi",       OPTO(3,TOEQ),   OPTO_MASK,   PPCCOM,    PPCVLE,         {RA, SI}},
+{"teqi",        OPTO(3,TOEQ),   OPTO_MASK,   PWRCOM,    PPCVLE,         {RA, SI}},
+{"twlgei",      OPTO(3,TOLGE),  OPTO_MASK,   PPCCOM,    PPCVLE,         {RA, SI}},
+{"tlgei",       OPTO(3,TOLGE),  OPTO_MASK,   PWRCOM,    PPCVLE,         {RA, SI}},
+{"twlnli",      OPTO(3,TOLNL),  OPTO_MASK,   PPCCOM,    PPCVLE,         {RA, SI}},
+{"tlnli",       OPTO(3,TOLNL),  OPTO_MASK,   PWRCOM,    PPCVLE,         {RA, SI}},
+{"twllei",      OPTO(3,TOLLE),  OPTO_MASK,   PPCCOM,    PPCVLE,         {RA, SI}},
+{"tllei",       OPTO(3,TOLLE),  OPTO_MASK,   PWRCOM,    PPCVLE,         {RA, SI}},
+{"twlngi",      OPTO(3,TOLNG),  OPTO_MASK,   PPCCOM,    PPCVLE,         {RA, SI}},
+{"tlngi",       OPTO(3,TOLNG),  OPTO_MASK,   PWRCOM,    PPCVLE,         {RA, SI}},
+{"twgti",       OPTO(3,TOGT),   OPTO_MASK,   PPCCOM,    PPCVLE,         {RA, SI}},
+{"tgti",        OPTO(3,TOGT),   OPTO_MASK,   PWRCOM,    PPCVLE,         {RA, SI}},
+{"twgei",       OPTO(3,TOGE),   OPTO_MASK,   PPCCOM,    PPCVLE,         {RA, SI}},
+{"tgei",        OPTO(3,TOGE),   OPTO_MASK,   PWRCOM,    PPCVLE,         {RA, SI}},
+{"twnli",       OPTO(3,TONL),   OPTO_MASK,   PPCCOM,    PPCVLE,         {RA, SI}},
+{"tnli",        OPTO(3,TONL),   OPTO_MASK,   PWRCOM,    PPCVLE,         {RA, SI}},
+{"twlti",       OPTO(3,TOLT),   OPTO_MASK,   PPCCOM,    PPCVLE,         {RA, SI}},
+{"tlti",        OPTO(3,TOLT),   OPTO_MASK,   PWRCOM,    PPCVLE,         {RA, SI}},
+{"twlei",       OPTO(3,TOLE),   OPTO_MASK,   PPCCOM,    PPCVLE,         {RA, SI}},
+{"tlei",        OPTO(3,TOLE),   OPTO_MASK,   PWRCOM,    PPCVLE,         {RA, SI}},
+{"twngi",       OPTO(3,TONG),   OPTO_MASK,   PPCCOM,    PPCVLE,         {RA, SI}},
+{"tngi",        OPTO(3,TONG),   OPTO_MASK,   PWRCOM,    PPCVLE,         {RA, SI}},
+{"twnei",       OPTO(3,TONE),   OPTO_MASK,   PPCCOM,    PPCVLE,         {RA, SI}},
+{"tnei",        OPTO(3,TONE),   OPTO_MASK,   PWRCOM,    PPCVLE,         {RA, SI}},
+{"twui",        OPTO(3,TOU),    OPTO_MASK,   PPCCOM,    PPCVLE,         {RA, SI}},
+{"tui",         OPTO(3,TOU),    OPTO_MASK,   PWRCOM,    PPCVLE,         {RA, SI}},
+{"twi",         OP(3),          OP_MASK,     PPCCOM,    PPCVLE,         {TO, RA, SI}},
+{"ti",          OP(3),          OP_MASK,     PWRCOM,    PPCVLE,         {TO, RA, SI}},
+
+{"ps_cmpu0",    X  (4,   0),    XBF_MASK,    PPCPS,     0,              {BF, FRA, FRB}},
+{"vaddubm",     VX (4,   0),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vmul10cuq",   VX (4,   1),    VXVB_MASK,   PPCVEC3,   0,              {VD, VA}},
+{"vmaxub",      VX (4,   2),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vrlb",        VX (4,   4),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vcmpequb",    VXR(4,   6,0),  VXR_MASK,    PPCVEC,    0,              {VD, VA, VB}},
+{"vcmpneb",     VXR(4,   7,0),  VXR_MASK,    PPCVEC3,   0,              {VD, VA, VB}},
+{"vmuloub",     VX (4,   8),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vaddfp",      VX (4,  10),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"psq_lx",      XW (4,   6,0),  XW_MASK,     PPCPS,     0,              {FRT,RA,RB,PSWM,PSQM}},
+{"vmrghb",      VX (4,  12),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"psq_stx",     XW (4,   7,0),  XW_MASK,     PPCPS,     0,              {FRS,RA,RB,PSWM,PSQM}},
+{"vpkuhum",     VX (4,  14),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"mulhhwu",     XRC(4,   8,0),  X_MASK,      MULHW,     0,              {RT, RA, RB}},
+{"mulhhwu.",    XRC(4,   8,1),  X_MASK,      MULHW,     0,              {RT, RA, RB}},
+{"ps_sum0",     A  (4,  10,0),  A_MASK,      PPCPS,     0,              {FRT, FRA, FRC, FRB}},
+{"ps_sum0.",    A  (4,  10,1),  A_MASK,      PPCPS,     0,              {FRT, FRA, FRC, FRB}},
+{"ps_sum1",     A  (4,  11,0),  A_MASK,      PPCPS,     0,              {FRT, FRA, FRC, FRB}},
+{"ps_sum1.",    A  (4,  11,1),  A_MASK,      PPCPS,     0,              {FRT, FRA, FRC, FRB}},
+{"ps_muls0",    A  (4,  12,0),  AFRB_MASK,   PPCPS,     0,              {FRT, FRA, FRC}},
+{"machhwu",     XO (4,  12,0,0), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"ps_muls0.",   A  (4,  12,1),  AFRB_MASK,   PPCPS,     0,              {FRT, FRA, FRC}},
+{"machhwu.",    XO (4,  12,0,1), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"ps_muls1",    A  (4,  13,0),  AFRB_MASK,   PPCPS,     0,              {FRT, FRA, FRC}},
+{"ps_muls1.",   A  (4,  13,1),  AFRB_MASK,   PPCPS,     0,              {FRT, FRA, FRC}},
+{"ps_madds0",   A  (4,  14,0),  A_MASK,      PPCPS,     0,              {FRT, FRA, FRC, FRB}},
+{"ps_madds0.",  A  (4,  14,1),  A_MASK,      PPCPS,     0,              {FRT, FRA, FRC, FRB}},
+{"ps_madds1",   A  (4,  15,0),  A_MASK,      PPCPS,     0,              {FRT, FRA, FRC, FRB}},
+{"ps_madds1.",  A  (4,  15,1),  A_MASK,      PPCPS,     0,              {FRT, FRA, FRC, FRB}},
+{"vmhaddshs",   VXA(4,  32),    VXA_MASK,    PPCVEC,    0,              {VD, VA, VB, VC}},
+{"vmhraddshs",  VXA(4,  33),    VXA_MASK,    PPCVEC,    0,              {VD, VA, VB, VC}},
+{"vmladduhm",   VXA(4,  34),    VXA_MASK,    PPCVEC,    0,              {VD, VA, VB, VC}},
+{"vmsumudm",    VXA(4,  35),    VXA_MASK,    PPCVEC3,   0,              {VD, VA, VB, VC}},
+{"ps_div",      A  (4,  18,0),  AFRC_MASK,   PPCPS,     0,              {FRT, FRA, FRB}},
+{"vmsumubm",    VXA(4,  36),    VXA_MASK,    PPCVEC,    0,              {VD, VA, VB, VC}},
+{"ps_div.",     A  (4,  18,1),  AFRC_MASK,   PPCPS,     0,              {FRT, FRA, FRB}},
+{"vmsummbm",    VXA(4,  37),    VXA_MASK,    PPCVEC,    0,              {VD, VA, VB, VC}},
+{"vmsumuhm",    VXA(4,  38),    VXA_MASK,    PPCVEC,    0,              {VD, VA, VB, VC}},
+{"vmsumuhs",    VXA(4,  39),    VXA_MASK,    PPCVEC,    0,              {VD, VA, VB, VC}},
+{"ps_sub",      A  (4,  20,0),  AFRC_MASK,   PPCPS,     0,              {FRT, FRA, FRB}},
+{"vmsumshm",    VXA(4,  40),    VXA_MASK,    PPCVEC,    0,              {VD, VA, VB, VC}},
+{"ps_sub.",     A  (4,  20,1),  AFRC_MASK,   PPCPS,     0,              {FRT, FRA, FRB}},
+{"vmsumshs",    VXA(4,  41),    VXA_MASK,    PPCVEC,    0,              {VD, VA, VB, VC}},
+{"ps_add",      A  (4,  21,0),  AFRC_MASK,   PPCPS,     0,              {FRT, FRA, FRB}},
+{"vsel",        VXA(4,  42),    VXA_MASK,    PPCVEC,    0,              {VD, VA, VB, VC}},
+{"ps_add.",     A  (4,  21,1),  AFRC_MASK,   PPCPS,     0,              {FRT, FRA, FRB}},
+{"vperm",       VXA(4,  43),    VXA_MASK,    PPCVEC,    0,              {VD, VA, VB, VC}},
+{"vsldoi",      VXA(4,  44),    VXASHB_MASK, PPCVEC,    0,              {VD, VA, VB, SHB}},
+{"vpermxor",    VXA(4,  45),    VXA_MASK,    PPCVEC2,   0,              {VD, VA, VB, VC}},
+{"ps_sel",      A  (4,  23,0),  A_MASK,      PPCPS,     0,              {FRT, FRA, FRC, FRB}},
+{"vmaddfp",     VXA(4,  46),    VXA_MASK,    PPCVEC,    0,              {VD, VA, VC, VB}},
+{"ps_sel.",     A  (4,  23,1),  A_MASK,      PPCPS,     0,              {FRT, FRA, FRC, FRB}},
+{"vnmsubfp",    VXA(4,  47),    VXA_MASK,    PPCVEC,    0,              {VD, VA, VC, VB}},
+{"ps_res",      A  (4,  24,0), AFRAFRC_MASK, PPCPS,     0,              {FRT, FRB}},
+{"maddhd",      VXA(4,  48),    VXA_MASK,    POWER9,    0,              {RT, RA, RB, RC}},
+{"ps_res.",     A  (4,  24,1), AFRAFRC_MASK, PPCPS,     0,              {FRT, FRB}},
+{"maddhdu",     VXA(4,  49),    VXA_MASK,    POWER9,    0,              {RT, RA, RB, RC}},
+{"ps_mul",      A  (4,  25,0),  AFRB_MASK,   PPCPS,     0,              {FRT, FRA, FRC}},
+{"ps_mul.",     A  (4,  25,1),  AFRB_MASK,   PPCPS,     0,              {FRT, FRA, FRC}},
+{"maddld",      VXA(4,  51),    VXA_MASK,    POWER9,    0,              {RT, RA, RB, RC}},
+{"ps_rsqrte",   A  (4,  26,0), AFRAFRC_MASK, PPCPS,     0,              {FRT, FRB}},
+{"ps_rsqrte.",  A  (4,  26,1), AFRAFRC_MASK, PPCPS,     0,              {FRT, FRB}},
+{"ps_msub",     A  (4,  28,0),  A_MASK,      PPCPS,     0,              {FRT, FRA, FRC, FRB}},
+{"ps_msub.",    A  (4,  28,1),  A_MASK,      PPCPS,     0,              {FRT, FRA, FRC, FRB}},
+{"ps_madd",     A  (4,  29,0),  A_MASK,      PPCPS,     0,              {FRT, FRA, FRC, FRB}},
+{"ps_madd.",    A  (4,  29,1),  A_MASK,      PPCPS,     0,              {FRT, FRA, FRC, FRB}},
+{"vpermr",      VXA(4,  59),    VXA_MASK,    PPCVEC3,   0,              {VD, VA, VB, VC}},
+{"ps_nmsub",    A  (4,  30,0),  A_MASK,      PPCPS,     0,              {FRT, FRA, FRC, FRB}},
+{"vaddeuqm",    VXA(4,  60),    VXA_MASK,    PPCVEC2,   0,              {VD, VA, VB, VC}},
+{"ps_nmsub.",   A  (4,  30,1),  A_MASK,      PPCPS,     0,              {FRT, FRA, FRC, FRB}},
+{"vaddecuq",    VXA(4,  61),    VXA_MASK,    PPCVEC2,   0,              {VD, VA, VB, VC}},
+{"ps_nmadd",    A  (4,  31,0),  A_MASK,      PPCPS,     0,              {FRT, FRA, FRC, FRB}},
+{"vsubeuqm",    VXA(4,  62),    VXA_MASK,    PPCVEC2,   0,              {VD, VA, VB, VC}},
+{"ps_nmadd.",   A  (4,  31,1),  A_MASK,      PPCPS,     0,              {FRT, FRA, FRC, FRB}},
+{"vsubecuq",    VXA(4,  63),    VXA_MASK,    PPCVEC2,   0,              {VD, VA, VB, VC}},
+{"ps_cmpo0",    X  (4,  32),    XBF_MASK,    PPCPS,     0,              {BF, FRA, FRB}},
+{"vadduhm",     VX (4,  64),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vmul10ecuq",  VX (4,  65),    VX_MASK,     PPCVEC3,   0,              {VD, VA, VB}},
+{"vmaxuh",      VX (4,  66),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vrlh",        VX (4,  68),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vcmpequh",    VXR(4,  70,0),  VXR_MASK,    PPCVEC,    0,              {VD, VA, VB}},
+{"vcmpneh",     VXR(4,  71,0),  VXR_MASK,    PPCVEC3,   0,              {VD, VA, VB}},
+{"vmulouh",     VX (4,  72),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vsubfp",      VX (4,  74),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"psq_lux",     XW (4,  38,0),  XW_MASK,     PPCPS,     0,              {FRT,RA,RB,PSWM,PSQM}},
+{"vmrghh",      VX (4,  76),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"psq_stux",    XW (4,  39,0),  XW_MASK,     PPCPS,     0,              {FRS,RA,RB,PSWM,PSQM}},
+{"vpkuwum",     VX (4,  78),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"ps_neg",      XRC(4,  40,0),  XRA_MASK,    PPCPS,     0,              {FRT, FRB}},
+{"mulhhw",      XRC(4,  40,0),  X_MASK,      MULHW,     0,              {RT, RA, RB}},
+{"ps_neg.",     XRC(4,  40,1),  XRA_MASK,    PPCPS,     0,              {FRT, FRB}},
+{"mulhhw.",     XRC(4,  40,1),  X_MASK,      MULHW,     0,              {RT, RA, RB}},
+{"machhw",      XO (4,  44,0,0), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"machhw.",     XO (4,  44,0,1), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"nmachhw",     XO (4,  46,0,0), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"nmachhw.",    XO (4,  46,0,1), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"ps_cmpu1",    X  (4,  64),    XBF_MASK,    PPCPS,     0,              {BF, FRA, FRB}},
+{"vadduwm",     VX (4,  128),   VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vmaxuw",      VX (4,  130),   VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vrlw",        VX (4,  132),   VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vrlwmi",      VX (4,  133),   VX_MASK,     PPCVEC3,   0,              {VD, VA, VB}},
+{"vcmpequw",    VXR(4,  134,0), VXR_MASK,    PPCVEC,    0,              {VD, VA, VB}},
+{"vcmpnew",     VXR(4,  135,0), VXR_MASK,    PPCVEC3,   0,              {VD, VA, VB}},
+{"vmulouw",     VX (4,  136),   VX_MASK,     PPCVEC2,   0,              {VD, VA, VB}},
+{"vmuluwm",     VX (4,  137),   VX_MASK,     PPCVEC2,   0,              {VD, VA, VB}},
+{"vmrghw",      VX (4,  140),   VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vpkuhus",     VX (4,  142),   VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"ps_mr",       XRC(4,  72,0),  XRA_MASK,    PPCPS,     0,              {FRT, FRB}},
+{"ps_mr.",      XRC(4,  72,1),  XRA_MASK,    PPCPS,     0,              {FRT, FRB}},
+{"machhwsu",    XO (4,  76,0,0), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"machhwsu.",   XO (4,  76,0,1), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"ps_cmpo1",    X  (4,  96),    XBF_MASK,    PPCPS,     0,              {BF, FRA, FRB}},
+{"vaddudm",     VX (4, 192),    VX_MASK,     PPCVEC2,   0,              {VD, VA, VB}},
+{"vmaxud",      VX (4, 194),    VX_MASK,     PPCVEC2,   0,              {VD, VA, VB}},
+{"vrld",        VX (4, 196),    VX_MASK,     PPCVEC2,   0,              {VD, VA, VB}},
+{"vrldmi",      VX (4, 197),    VX_MASK,     PPCVEC3,   0,              {VD, VA, VB}},
+{"vcmpeqfp",    VXR(4, 198,0),  VXR_MASK,    PPCVEC,    0,              {VD, VA, VB}},
+{"vcmpequd",    VXR(4, 199,0),  VXR_MASK,    PPCVEC2,   0,              {VD, VA, VB}},
+{"vpkuwus",     VX (4, 206),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"machhws",     XO (4, 108,0,0), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"machhws.",    XO (4, 108,0,1), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"nmachhws",    XO (4, 110,0,0), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"nmachhws.",   XO (4, 110,0,1), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"vadduqm",     VX (4, 256),    VX_MASK,     PPCVEC2,   0,              {VD, VA, VB}},
+{"vmaxsb",      VX (4, 258),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vslb",        VX (4, 260),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vcmpnezb",    VXR(4, 263,0),  VXR_MASK,    PPCVEC3,   0,              {VD, VA, VB}},
+{"vmulosb",     VX (4, 264),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vrefp",       VX (4, 266),    VXVA_MASK,   PPCVEC,    0,              {VD, VB}},
+{"vmrglb",      VX (4, 268),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vpkshus",     VX (4, 270),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"ps_nabs",     XRC(4, 136,0),  XRA_MASK,    PPCPS,     0,              {FRT, FRB}},
+{"mulchwu",     XRC(4, 136,0),  X_MASK,      MULHW,     0,              {RT, RA, RB}},
+{"ps_nabs.",    XRC(4, 136,1),  XRA_MASK,    PPCPS,     0,              {FRT, FRB}},
+{"mulchwu.",    XRC(4, 136,1),  X_MASK,      MULHW,     0,              {RT, RA, RB}},
+{"macchwu",     XO (4, 140,0,0), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"macchwu.",    XO (4, 140,0,1), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"vaddcuq",     VX (4, 320),    VX_MASK,     PPCVEC2,   0,              {VD, VA, VB}},
+{"vmaxsh",      VX (4, 322),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vslh",        VX (4, 324),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vcmpnezh",    VXR(4, 327,0),  VXR_MASK,    PPCVEC3,   0,              {VD, VA, VB}},
+{"vmulosh",     VX (4, 328),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vrsqrtefp",   VX (4, 330),    VXVA_MASK,   PPCVEC,    0,              {VD, VB}},
+{"vmrglh",      VX (4, 332),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vpkswus",     VX (4, 334),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"mulchw",      XRC(4, 168,0),  X_MASK,      MULHW,     0,              {RT, RA, RB}},
+{"mulchw.",     XRC(4, 168,1),  X_MASK,      MULHW,     0,              {RT, RA, RB}},
+{"macchw",      XO (4, 172,0,0), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"macchw.",     XO (4, 172,0,1), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"nmacchw",     XO (4, 174,0,0), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"nmacchw.",    XO (4, 174,0,1), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"vaddcuw",     VX (4, 384),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vmaxsw",      VX (4, 386),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vslw",        VX (4, 388),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vrlwnm",      VX (4, 389),    VX_MASK,     PPCVEC3,   0,              {VD, VA, VB}},
+{"vcmpnezw",    VXR(4, 391,0),  VXR_MASK,    PPCVEC3,   0,              {VD, VA, VB}},
+{"vmulosw",     VX (4, 392),    VX_MASK,     PPCVEC2,   0,              {VD, VA, VB}},
+{"vexptefp",    VX (4, 394),    VXVA_MASK,   PPCVEC,    0,              {VD, VB}},
+{"vmrglw",      VX (4, 396),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vpkshss",     VX (4, 398),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"macchwsu",    XO (4, 204,0,0), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"macchwsu.",   XO (4, 204,0,1), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"vmaxsd",      VX (4, 450),    VX_MASK,     PPCVEC2,   0,              {VD, VA, VB}},
+{"vsl",         VX (4, 452),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vrldnm",      VX (4, 453),    VX_MASK,     PPCVEC3,   0,              {VD, VA, VB}},
+{"vcmpgefp",    VXR(4, 454,0),  VXR_MASK,    PPCVEC,    0,              {VD, VA, VB}},
+{"vlogefp",     VX (4, 458),    VXVA_MASK,   PPCVEC,    0,              {VD, VB}},
+{"vpkswss",     VX (4, 462),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"macchws",     XO (4, 236,0,0), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"macchws.",    XO (4, 236,0,1), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"nmacchws",    XO (4, 238,0,0), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"nmacchws.",   XO (4, 238,0,1), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"evaddw",      VX (4, 512),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"vaddubs",     VX (4, 512),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vmul10uq",    VX (4, 513),    VXVB_MASK,   PPCVEC3,   0,              {VD, VA}},
+{"evaddiw",     VX (4, 514),    VX_MASK,     PPCSPE,    0,              {RS, RB, UIMM}},
+{"vminub",      VX (4, 514),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"evsubfw",     VX (4, 516),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evsubw",      VX (4, 516),    VX_MASK,     PPCSPE,    0,              {RS, RB, RA}},
+{"vsrb",        VX (4, 516),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"evsubifw",    VX (4, 518),    VX_MASK,     PPCSPE,    0,              {RS, UIMM, RB}},
+{"evsubiw",     VX (4, 518),    VX_MASK,     PPCSPE,    0,              {RS, RB, UIMM}},
+{"vcmpgtub",    VXR(4, 518,0),  VXR_MASK,    PPCVEC,    0,              {VD, VA, VB}},
+{"evabs",       VX (4, 520),    VX_MASK,     PPCSPE,    0,              {RS, RA}},
+{"vmuleub",     VX (4, 520),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"evneg",       VX (4, 521),    VX_MASK,     PPCSPE,    0,              {RS, RA}},
+{"evextsb",     VX (4, 522),    VX_MASK,     PPCSPE,    0,              {RS, RA}},
+{"vrfin",       VX (4, 522),    VXVA_MASK,   PPCVEC,    0,              {VD, VB}},
+{"evextsh",     VX (4, 523),    VX_MASK,     PPCSPE,    0,              {RS, RA}},
+{"evrndw",      VX (4, 524),    VX_MASK,     PPCSPE,    0,              {RS, RA}},
+{"vspltb",      VX (4, 524),   VXUIMM4_MASK, PPCVEC,    0,              {VD, VB, UIMM4}},
+{"vextractub",  VX (4, 525),   VXUIMM4_MASK, PPCVEC3,   0,              {VD, VB, UIMM4}},
+{"evcntlzw",    VX (4, 525),    VX_MASK,     PPCSPE,    0,              {RS, RA}},
+{"evcntlsw",    VX (4, 526),    VX_MASK,     PPCSPE,    0,              {RS, RA}},
+{"vupkhsb",     VX (4, 526),    VXVA_MASK,   PPCVEC,    0,              {VD, VB}},
+{"brinc",       VX (4, 527),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"ps_abs",      XRC(4, 264,0),  XRA_MASK,    PPCPS,     0,              {FRT, FRB}},
+{"ps_abs.",     XRC(4, 264,1),  XRA_MASK,    PPCPS,     0,              {FRT, FRB}},
+{"evand",       VX (4, 529),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evandc",      VX (4, 530),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evxor",       VX (4, 534),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmr",        VX (4, 535),    VX_MASK,     PPCSPE,    0,              {RS, RA, BBA}},
+{"evor",        VX (4, 535),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evnor",       VX (4, 536),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evnot",       VX (4, 536),    VX_MASK,     PPCSPE,    0,              {RS, RA, BBA}},
+{"get",         APU(4, 268,0),  APU_RA_MASK, PPC405,    0,              {RT, FSL}},
+{"eveqv",       VX (4, 537),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evorc",       VX (4, 539),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evnand",      VX (4, 542),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evsrwu",      VX (4, 544),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evsrws",      VX (4, 545),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evsrwiu",     VX (4, 546),    VX_MASK,     PPCSPE,    0,              {RS, RA, EVUIMM}},
+{"evsrwis",     VX (4, 547),    VX_MASK,     PPCSPE,    0,              {RS, RA, EVUIMM}},
+{"evslw",       VX (4, 548),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evslwi",      VX (4, 550),    VX_MASK,     PPCSPE,    0,              {RS, RA, EVUIMM}},
+{"evrlw",       VX (4, 552),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evsplati",    VX (4, 553),    VX_MASK,     PPCSPE,    0,              {RS, SIMM}},
+{"evrlwi",      VX (4, 554),    VX_MASK,     PPCSPE,    0,              {RS, RA, EVUIMM}},
+{"evsplatfi",   VX (4, 555),    VX_MASK,     PPCSPE,    0,              {RS, SIMM}},
+{"evmergehi",   VX (4, 556),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmergelo",   VX (4, 557),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmergehilo", VX (4, 558),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmergelohi", VX (4, 559),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evcmpgtu",    VX (4, 560),    VX_MASK,     PPCSPE,    0,              {CRFD, RA, RB}},
+{"evcmpgts",    VX (4, 561),    VX_MASK,     PPCSPE,    0,              {CRFD, RA, RB}},
+{"evcmpltu",    VX (4, 562),    VX_MASK,     PPCSPE,    0,              {CRFD, RA, RB}},
+{"evcmplts",    VX (4, 563),    VX_MASK,     PPCSPE,    0,              {CRFD, RA, RB}},
+{"evcmpeq",     VX (4, 564),    VX_MASK,     PPCSPE,    0,              {CRFD, RA, RB}},
+{"cget",        APU(4, 284,0),  APU_RA_MASK, PPC405,    0,              {RT, FSL}},
+{"vadduhs",     VX (4, 576),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vmul10euq",   VX (4, 577),    VX_MASK,     PPCVEC3,   0,              {VD, VA, VB}},
+{"vminuh",      VX (4, 578),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vsrh",        VX (4, 580),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vcmpgtuh",    VXR(4, 582,0),  VXR_MASK,    PPCVEC,    0,              {VD, VA, VB}},
+{"vmuleuh",     VX (4, 584),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vrfiz",       VX (4, 586),    VXVA_MASK,   PPCVEC,    0,              {VD, VB}},
+{"vsplth",      VX (4, 588),   VXUIMM3_MASK, PPCVEC,    0,              {VD, VB, UIMM3}},
+{"vextractuh",  VX (4, 589),   VXUIMM4_MASK, PPCVEC3,   0,              {VD, VB, UIMM4}},
+{"vupkhsh",     VX (4, 590),    VXVA_MASK,   PPCVEC,    0,              {VD, VB}},
+{"nget",        APU(4, 300,0),  APU_RA_MASK, PPC405,    0,              {RT, FSL}},
+{"evsel",       EVSEL(4,79),    EVSEL_MASK,  PPCSPE,    0,              {RS, RA, RB, CRFS}},
+{"ncget",       APU(4, 316,0),  APU_RA_MASK, PPC405,    0,              {RT, FSL}},
+{"evfsadd",     VX (4, 640),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"vadduws",     VX (4, 640),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"evfssub",     VX (4, 641),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"vminuw",      VX (4, 642),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"evfsabs",     VX (4, 644),    VX_MASK,     PPCSPE,    0,              {RS, RA}},
+{"vsrw",        VX (4, 644),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"evfsnabs",    VX (4, 645),    VX_MASK,     PPCSPE,    0,              {RS, RA}},
+{"evfsneg",     VX (4, 646),    VX_MASK,     PPCSPE,    0,              {RS, RA}},
+{"vcmpgtuw",    VXR(4, 646,0),  VXR_MASK,    PPCVEC,    0,              {VD, VA, VB}},
+{"vmuleuw",     VX (4, 648),    VX_MASK,     PPCVEC2,   0,              {VD, VA, VB}},
+{"evfsmul",     VX (4, 648),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evfsdiv",     VX (4, 649),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"vrfip",       VX (4, 650),    VXVA_MASK,   PPCVEC,    0,              {VD, VB}},
+{"evfscmpgt",   VX (4, 652),    VX_MASK,     PPCSPE,    0,              {CRFD, RA, RB}},
+{"vspltw",      VX (4, 652),   VXUIMM2_MASK, PPCVEC,    0,              {VD, VB, UIMM2}},
+{"vextractuw",  VX (4, 653),   VXUIMM4_MASK, PPCVEC3,   0,              {VD, VB, UIMM4}},
+{"evfscmplt",   VX (4, 653),    VX_MASK,     PPCSPE,    0,              {CRFD, RA, RB}},
+{"evfscmpeq",   VX (4, 654),    VX_MASK,     PPCSPE,    0,              {CRFD, RA, RB}},
+{"vupklsb",     VX (4, 654),    VXVA_MASK,   PPCVEC,    0,              {VD, VB}},
+{"evfscfui",    VX (4, 656),    VX_MASK,     PPCSPE,    0,              {RS, RB}},
+{"evfscfsi",    VX (4, 657),    VX_MASK,     PPCSPE,    0,              {RS, RB}},
+{"evfscfuf",    VX (4, 658),    VX_MASK,     PPCSPE,    0,              {RS, RB}},
+{"evfscfsf",    VX (4, 659),    VX_MASK,     PPCSPE,    0,              {RS, RB}},
+{"evfsctui",    VX (4, 660),    VX_MASK,     PPCSPE,    0,              {RS, RB}},
+{"evfsctsi",    VX (4, 661),    VX_MASK,     PPCSPE,    0,              {RS, RB}},
+{"evfsctuf",    VX (4, 662),    VX_MASK,     PPCSPE,    0,              {RS, RB}},
+{"evfsctsf",    VX (4, 663),    VX_MASK,     PPCSPE,    0,              {RS, RB}},
+{"evfsctuiz",   VX (4, 664),    VX_MASK,     PPCSPE,    0,              {RS, RB}},
+{"put",         APU(4, 332,0),  APU_RT_MASK, PPC405,    0,              {RA, FSL}},
+{"evfsctsiz",   VX (4, 666),    VX_MASK,     PPCSPE,    0,              {RS, RB}},
+{"evfststgt",   VX (4, 668),    VX_MASK,     PPCSPE,    0,              {CRFD, RA, RB}},
+{"evfststlt",   VX (4, 669),    VX_MASK,     PPCSPE,    0,              {CRFD, RA, RB}},
+{"evfststeq",   VX (4, 670),    VX_MASK,     PPCSPE,    0,              {CRFD, RA, RB}},
+{"cput",        APU(4, 348,0),  APU_RT_MASK, PPC405,    0,              {RA, FSL}},
+{"efsadd",      VX (4, 704),    VX_MASK,     PPCEFS,    0,              {RS, RA, RB}},
+{"efssub",      VX (4, 705),    VX_MASK,     PPCEFS,    0,              {RS, RA, RB}},
+{"vminud",      VX (4, 706),    VX_MASK,     PPCVEC2,   0,              {VD, VA, VB}},
+{"efsabs",      VX (4, 708),    VX_MASK,     PPCEFS,    0,              {RS, RA}},
+{"vsr",         VX (4, 708),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"efsnabs",     VX (4, 709),    VX_MASK,     PPCEFS,    0,              {RS, RA}},
+{"efsneg",      VX (4, 710),    VX_MASK,     PPCEFS,    0,              {RS, RA}},
+{"vcmpgtfp",    VXR(4, 710,0),  VXR_MASK,    PPCVEC,    0,              {VD, VA, VB}},
+{"vcmpgtud",    VXR(4, 711,0),  VXR_MASK,    PPCVEC2,   0,              {VD, VA, VB}},
+{"efsmul",      VX (4, 712),    VX_MASK,     PPCEFS,    0,              {RS, RA, RB}},
+{"efsdiv",      VX (4, 713),    VX_MASK,     PPCEFS,    0,              {RS, RA, RB}},
+{"vrfim",       VX (4, 714),    VXVA_MASK,   PPCVEC,    0,              {VD, VB}},
+{"efscmpgt",    VX (4, 716),    VX_MASK,     PPCEFS,    0,              {CRFD, RA, RB}},
+{"vextractd",   VX (4, 717),   VXUIMM4_MASK, PPCVEC3,   0,              {VD, VB, UIMM4}},
+{"efscmplt",    VX (4, 717),    VX_MASK,     PPCEFS,    0,              {CRFD, RA, RB}},
+{"efscmpeq",    VX (4, 718),    VX_MASK,     PPCEFS,    0,              {CRFD, RA, RB}},
+{"vupklsh",     VX (4, 718),    VXVA_MASK,   PPCVEC,    0,              {VD, VB}},
+{"efscfd",      VX (4, 719),    VX_MASK,     PPCEFS,    0,              {RS, RB}},
+{"efscfui",     VX (4, 720),    VX_MASK,     PPCEFS,    0,              {RS, RB}},
+{"efscfsi",     VX (4, 721),    VX_MASK,     PPCEFS,    0,              {RS, RB}},
+{"efscfuf",     VX (4, 722),    VX_MASK,     PPCEFS,    0,              {RS, RB}},
+{"efscfsf",     VX (4, 723),    VX_MASK,     PPCEFS,    0,              {RS, RB}},
+{"efsctui",     VX (4, 724),    VX_MASK,     PPCEFS,    0,              {RS, RB}},
+{"efsctsi",     VX (4, 725),    VX_MASK,     PPCEFS,    0,              {RS, RB}},
+{"efsctuf",     VX (4, 726),    VX_MASK,     PPCEFS,    0,              {RS, RB}},
+{"efsctsf",     VX (4, 727),    VX_MASK,     PPCEFS,    0,              {RS, RB}},
+{"efsctuiz",    VX (4, 728),    VX_MASK,     PPCEFS,    0,              {RS, RB}},
+{"nput",        APU(4, 364,0),  APU_RT_MASK, PPC405,    0,              {RA, FSL}},
+{"efsctsiz",    VX (4, 730),    VX_MASK,     PPCEFS,    0,              {RS, RB}},
+{"efststgt",    VX (4, 732),    VX_MASK,     PPCEFS,    0,              {CRFD, RA, RB}},
+{"efststlt",    VX (4, 733),    VX_MASK,     PPCEFS,    0,              {CRFD, RA, RB}},
+{"efststeq",    VX (4, 734),    VX_MASK,     PPCEFS,    0,              {CRFD, RA, RB}},
+{"efdadd",      VX (4, 736),    VX_MASK,     PPCEFS,    0,              {RS, RA, RB}},
+{"efdsub",      VX (4, 737),    VX_MASK,     PPCEFS,    0,              {RS, RA, RB}},
+{"efdcfuid",    VX (4, 738),    VX_MASK,     PPCEFS,    0,              {RS, RB}},
+{"efdcfsid",    VX (4, 739),    VX_MASK,     PPCEFS,    0,              {RS, RB}},
+{"efdabs",      VX (4, 740),    VX_MASK,     PPCEFS,    0,              {RS, RA}},
+{"efdnabs",     VX (4, 741),    VX_MASK,     PPCEFS,    0,              {RS, RA}},
+{"efdneg",      VX (4, 742),    VX_MASK,     PPCEFS,    0,              {RS, RA}},
+{"efdmul",      VX (4, 744),    VX_MASK,     PPCEFS,    0,              {RS, RA, RB}},
+{"efddiv",      VX (4, 745),    VX_MASK,     PPCEFS,    0,              {RS, RA, RB}},
+{"efdctuidz",   VX (4, 746),    VX_MASK,     PPCEFS,    0,              {RS, RB}},
+{"efdctsidz",   VX (4, 747),    VX_MASK,     PPCEFS,    0,              {RS, RB}},
+{"efdcmpgt",    VX (4, 748),    VX_MASK,     PPCEFS,    0,              {CRFD, RA, RB}},
+{"efdcmplt",    VX (4, 749),    VX_MASK,     PPCEFS,    0,              {CRFD, RA, RB}},
+{"efdcmpeq",    VX (4, 750),    VX_MASK,     PPCEFS,    0,              {CRFD, RA, RB}},
+{"efdcfs",      VX (4, 751),    VX_MASK,     PPCEFS,    0,              {RS, RB}},
+{"efdcfui",     VX (4, 752),    VX_MASK,     PPCEFS,    0,              {RS, RB}},
+{"efdcfsi",     VX (4, 753),    VX_MASK,     PPCEFS,    0,              {RS, RB}},
+{"efdcfuf",     VX (4, 754),    VX_MASK,     PPCEFS,    0,              {RS, RB}},
+{"efdcfsf",     VX (4, 755),    VX_MASK,     PPCEFS,    0,              {RS, RB}},
+{"efdctui",     VX (4, 756),    VX_MASK,     PPCEFS,    0,              {RS, RB}},
+{"efdctsi",     VX (4, 757),    VX_MASK,     PPCEFS,    0,              {RS, RB}},
+{"efdctuf",     VX (4, 758),    VX_MASK,     PPCEFS,    0,              {RS, RB}},
+{"efdctsf",     VX (4, 759),    VX_MASK,     PPCEFS,    0,              {RS, RB}},
+{"efdctuiz",    VX (4, 760),    VX_MASK,     PPCEFS,    0,              {RS, RB}},
+{"ncput",       APU(4, 380,0),  APU_RT_MASK, PPC405,    0,              {RA, FSL}},
+{"efdctsiz",    VX (4, 762),    VX_MASK,     PPCEFS,    0,              {RS, RB}},
+{"efdtstgt",    VX (4, 764),    VX_MASK,     PPCEFS,    0,              {CRFD, RA, RB}},
+{"efdtstlt",    VX (4, 765),    VX_MASK,     PPCEFS,    0,              {CRFD, RA, RB}},
+{"efdtsteq",    VX (4, 766),    VX_MASK,     PPCEFS,    0,              {CRFD, RA, RB}},
+{"evlddx",      VX (4, 768),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"vaddsbs",     VX (4, 768),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"evldd",       VX (4, 769),    VX_MASK,     PPCSPE,    0,              {RS, EVUIMM_8, RA}},
+{"evldwx",      VX (4, 770),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"vminsb",      VX (4, 770),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"evldw",       VX (4, 771),    VX_MASK,     PPCSPE,    0,              {RS, EVUIMM_8, RA}},
+{"evldhx",      VX (4, 772),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"vsrab",       VX (4, 772),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"evldh",       VX (4, 773),    VX_MASK,     PPCSPE,    0,              {RS, EVUIMM_8, RA}},
+{"vcmpgtsb",    VXR(4, 774,0),  VXR_MASK,    PPCVEC,    0,              {VD, VA, VB}},
+{"evlhhesplatx",VX (4, 776),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"vmulesb",     VX (4, 776),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"evlhhesplat", VX (4, 777),    VX_MASK,     PPCSPE,    0,              {RS, EVUIMM_2, RA}},
+{"vcfux",       VX (4, 778),    VX_MASK,     PPCVEC,    0,              {VD, VB, UIMM}},
+{"vcuxwfp",     VX (4, 778),    VX_MASK,     PPCVEC,    0,              {VD, VB, UIMM}},
+{"evlhhousplatx",VX(4, 780),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"vspltisb",    VX (4, 780),    VXVB_MASK,   PPCVEC,    0,              {VD, SIMM}},
+{"vinsertb",    VX (4, 781),   VXUIMM4_MASK, PPCVEC3,   0,              {VD, VB, UIMM4}},
+{"evlhhousplat",VX (4, 781),    VX_MASK,     PPCSPE,    0,              {RS, EVUIMM_2, RA}},
+{"evlhhossplatx",VX(4, 782),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"vpkpx",       VX (4, 782),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"evlhhossplat",VX (4, 783),    VX_MASK,     PPCSPE,    0,              {RS, EVUIMM_2, RA}},
+{"mullhwu",     XRC(4, 392,0),  X_MASK,      MULHW,     0,              {RT, RA, RB}},
+{"evlwhex",     VX (4, 784),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"mullhwu.",    XRC(4, 392,1),  X_MASK,      MULHW,     0,              {RT, RA, RB}},
+{"evlwhe",      VX (4, 785),    VX_MASK,     PPCSPE,    0,              {RS, EVUIMM_4, RA}},
+{"evlwhoux",    VX (4, 788),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evlwhou",     VX (4, 789),    VX_MASK,     PPCSPE,    0,              {RS, EVUIMM_4, RA}},
+{"evlwhosx",    VX (4, 790),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evlwhos",     VX (4, 791),    VX_MASK,     PPCSPE,    0,              {RS, EVUIMM_4, RA}},
+{"maclhwu",     XO (4, 396,0,0),XO_MASK,     MULHW,     0,              {RT, RA, RB}},
+{"evlwwsplatx", VX (4, 792),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"maclhwu.",    XO (4, 396,0,1),XO_MASK,     MULHW,     0,              {RT, RA, RB}},
+{"evlwwsplat",  VX (4, 793),    VX_MASK,     PPCSPE,    0,              {RS, EVUIMM_4, RA}},
+{"evlwhsplatx", VX (4, 796),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evlwhsplat",  VX (4, 797),    VX_MASK,     PPCSPE,    0,              {RS, EVUIMM_4, RA}},
+{"evstddx",     VX (4, 800),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evstdd",      VX (4, 801),    VX_MASK,     PPCSPE,    0,              {RS, EVUIMM_8, RA}},
+{"evstdwx",     VX (4, 802),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evstdw",      VX (4, 803),    VX_MASK,     PPCSPE,    0,              {RS, EVUIMM_8, RA}},
+{"evstdhx",     VX (4, 804),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evstdh",      VX (4, 805),    VX_MASK,     PPCSPE,    0,              {RS, EVUIMM_8, RA}},
+{"evstwhex",    VX (4, 816),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evstwhe",     VX (4, 817),    VX_MASK,     PPCSPE,    0,              {RS, EVUIMM_4, RA}},
+{"evstwhox",    VX (4, 820),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evstwho",     VX (4, 821),    VX_MASK,     PPCSPE,    0,              {RS, EVUIMM_4, RA}},
+{"evstwwex",    VX (4, 824),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evstwwe",     VX (4, 825),    VX_MASK,     PPCSPE,    0,              {RS, EVUIMM_4, RA}},
+{"evstwwox",    VX (4, 828),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evstwwo",     VX (4, 829),    VX_MASK,     PPCSPE,    0,              {RS, EVUIMM_4, RA}},
+{"vaddshs",     VX (4, 832),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"bcdcpsgn.",   VX (4, 833),    VX_MASK,     PPCVEC3,   0,              {VD, VA, VB}},
+{"vminsh",      VX (4, 834),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vsrah",       VX (4, 836),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vcmpgtsh",    VXR(4, 838,0),  VXR_MASK,    PPCVEC,    0,              {VD, VA, VB}},
+{"vmulesh",     VX (4, 840),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vcfsx",       VX (4, 842),    VX_MASK,     PPCVEC,    0,              {VD, VB, UIMM}},
+{"vcsxwfp",     VX (4, 842),    VX_MASK,     PPCVEC,    0,              {VD, VB, UIMM}},
+{"vspltish",    VX (4, 844),    VXVB_MASK,   PPCVEC,    0,              {VD, SIMM}},
+{"vinserth",    VX (4, 845),   VXUIMM4_MASK, PPCVEC3,   0,              {VD, VB, UIMM4}},
+{"vupkhpx",     VX (4, 846),    VXVA_MASK,   PPCVEC,    0,              {VD, VB}},
+{"mullhw",      XRC(4, 424,0),  X_MASK,      MULHW,     0,              {RT, RA, RB}},
+{"mullhw.",     XRC(4, 424,1),  X_MASK,      MULHW,     0,              {RT, RA, RB}},
+{"maclhw",      XO (4, 428,0,0),XO_MASK,     MULHW,     0,              {RT, RA, RB}},
+{"maclhw.",     XO (4, 428,0,1),XO_MASK,     MULHW,     0,              {RT, RA, RB}},
+{"nmaclhw",     XO (4, 430,0,0),XO_MASK,     MULHW,     0,              {RT, RA, RB}},
+{"nmaclhw.",    XO (4, 430,0,1),XO_MASK,     MULHW,     0,              {RT, RA, RB}},
+{"vaddsws",     VX (4, 896),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vminsw",      VX (4, 898),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vsraw",       VX (4, 900),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vcmpgtsw",    VXR(4, 902,0),  VXR_MASK,    PPCVEC,    0,              {VD, VA, VB}},
+{"vmulesw",     VX (4, 904),    VX_MASK,     PPCVEC2,   0,              {VD, VA, VB}},
+{"vctuxs",      VX (4, 906),    VX_MASK,     PPCVEC,    0,              {VD, VB, UIMM}},
+{"vcfpuxws",    VX (4, 906),    VX_MASK,     PPCVEC,    0,              {VD, VB, UIMM}},
+{"vspltisw",    VX (4, 908),    VXVB_MASK,   PPCVEC,    0,              {VD, SIMM}},
+{"vinsertw",    VX (4, 909),   VXUIMM4_MASK, PPCVEC3,   0,              {VD, VB, UIMM4}},
+{"maclhwsu",    XO (4, 460,0,0), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"maclhwsu.",   XO (4, 460,0,1), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"vminsd",      VX (4, 962),    VX_MASK,     PPCVEC2,   0,              {VD, VA, VB}},
+{"vsrad",       VX (4, 964),    VX_MASK,     PPCVEC2,   0,              {VD, VA, VB}},
+{"vcmpbfp",     VXR(4, 966,0),  VXR_MASK,    PPCVEC,    0,              {VD, VA, VB}},
+{"vcmpgtsd",    VXR(4, 967,0),  VXR_MASK,    PPCVEC2,   0,              {VD, VA, VB}},
+{"vctsxs",      VX (4, 970),    VX_MASK,     PPCVEC,    0,              {VD, VB, UIMM}},
+{"vcfpsxws",    VX (4, 970),    VX_MASK,     PPCVEC,    0,              {VD, VB, UIMM}},
+{"vinsertd",    VX (4, 973),   VXUIMM4_MASK, PPCVEC3,   0,              {VD, VB, UIMM4}},
+{"vupklpx",     VX (4, 974),    VXVA_MASK,   PPCVEC,    0,              {VD, VB}},
+{"maclhws",     XO (4, 492,0,0), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"maclhws.",    XO (4, 492,0,1), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"nmaclhws",    XO (4, 494,0,0), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"nmaclhws.",   XO (4, 494,0,1), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"vsububm",     VX (4,1024),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"bcdadd.",     VX (4,1025),    VXPS_MASK,   PPCVEC2,   0,              {VD, VA, VB, PS}},
+{"vavgub",      VX (4,1026),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vabsdub",     VX (4,1027),    VX_MASK,     PPCVEC2,   0,              {VD, VA, VB}},
+{"evmhessf",    VX (4,1027),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"vand",        VX (4,1028),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vcmpequb.",   VXR(4,   6,1),  VXR_MASK,    PPCVEC,    0,              {VD, VA, VB}},
+{"vcmpneb.",    VXR(4,   7,1),  VXR_MASK,    PPCVEC3,   0,              {VD, VA, VB}},
+{"udi0fcm.",    APU(4, 515,0),  APU_MASK, PPC405|PPC440, PPC476,        {URT, URA, URB}},
+{"udi0fcm",     APU(4, 515,1),  APU_MASK, PPC405|PPC440, PPC476,        {URT, URA, URB}},
+{"evmhossf",    VX (4,1031),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"vpmsumb",     VX (4,1032),    VX_MASK,     PPCVEC2,   0,              {VD, VA, VB}},
+{"evmheumi",    VX (4,1032),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmhesmi",    VX (4,1033),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"vmaxfp",      VX (4,1034),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"evmhesmf",    VX (4,1035),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmhoumi",    VX (4,1036),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"vslo",        VX (4,1036),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"evmhosmi",    VX (4,1037),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmhosmf",    VX (4,1039),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"machhwuo",    XO (4,  12,1,0), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"machhwuo.",   XO (4,  12,1,1), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"ps_merge00",  XOPS(4,528,0),  XOPS_MASK,   PPCPS,     0,              {FRT, FRA, FRB}},
+{"ps_merge00.", XOPS(4,528,1),  XOPS_MASK,   PPCPS,     0,              {FRT, FRA, FRB}},
+{"evmhessfa",   VX (4,1059),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmhossfa",   VX (4,1063),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmheumia",   VX (4,1064),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmhesmia",   VX (4,1065),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmhesmfa",   VX (4,1067),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmhoumia",   VX (4,1068),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmhosmia",   VX (4,1069),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmhosmfa",   VX (4,1071),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"vsubuhm",     VX (4,1088),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"bcdsub.",     VX (4,1089),    VXPS_MASK,   PPCVEC2,   0,              {VD, VA, VB, PS}},
+{"vavguh",      VX (4,1090),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vabsduh",     VX (4,1091),    VX_MASK,     PPCVEC2,   0,              {VD, VA, VB}},
+{"vandc",       VX (4,1092),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vcmpequh.",   VXR(4,  70,1),  VXR_MASK,    PPCVEC,    0,              {VD, VA, VB}},
+{"udi1fcm.",    APU(4, 547,0),  APU_MASK, PPC405|PPC440, PPC476,        {URT, URA, URB}},
+{"udi1fcm",     APU(4, 547,1),  APU_MASK, PPC405|PPC440, PPC476,        {URT, URA, URB}},
+{"vcmpneh.",    VXR(4,  71,1),  VXR_MASK,    PPCVEC3,   0,              {VD, VA, VB}},
+{"evmwhssf",    VX (4,1095),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"vpmsumh",     VX (4,1096),    VX_MASK,     PPCVEC2,   0,              {VD, VA, VB}},
+{"evmwlumi",    VX (4,1096),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"vminfp",      VX (4,1098),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"evmwhumi",    VX (4,1100),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"vsro",        VX (4,1100),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"evmwhsmi",    VX (4,1101),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"vpkudum",     VX (4,1102),    VX_MASK,     PPCVEC2,   0,              {VD, VA, VB}},
+{"evmwhsmf",    VX (4,1103),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmwssf",     VX (4,1107),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"machhwo",     XO (4,  44,1,0), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"evmwumi",     VX (4,1112),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"machhwo.",    XO (4,  44,1,1), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"evmwsmi",     VX (4,1113),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmwsmf",     VX (4,1115),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"nmachhwo",    XO (4,  46,1,0), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"nmachhwo.",   XO (4,  46,1,1), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"ps_merge01",  XOPS(4,560,0),  XOPS_MASK,   PPCPS,     0,              {FRT, FRA, FRB}},
+{"ps_merge01.", XOPS(4,560,1),  XOPS_MASK,   PPCPS,     0,              {FRT, FRA, FRB}},
+{"evmwhssfa",   VX (4,1127),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmwlumia",   VX (4,1128),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmwhumia",   VX (4,1132),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmwhsmia",   VX (4,1133),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmwhsmfa",   VX (4,1135),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmwssfa",    VX (4,1139),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmwumia",    VX (4,1144),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmwsmia",    VX (4,1145),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmwsmfa",    VX (4,1147),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"vsubuwm",     VX (4,1152),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"bcdus.",      VX (4,1153),    VX_MASK,     PPCVEC3,   0,              {VD, VA, VB}},
+{"vavguw",      VX (4,1154),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vabsduw",     VX (4,1155),    VX_MASK,     PPCVEC2,   0,              {VD, VA, VB}},
+{"vmr",         VX (4,1156),    VX_MASK,     PPCVEC,    0,              {VD, VA, VBA}},
+{"vor",         VX (4,1156),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vcmpnew.",    VXR(4, 135,1),  VXR_MASK,    PPCVEC3,   0,              {VD, VA, VB}},
+{"vpmsumw",     VX (4,1160),    VX_MASK,     PPCVEC2,   0,              {VD, VA, VB}},
+{"vcmpequw.",   VXR(4, 134,1),  VXR_MASK,    PPCVEC,    0,              {VD, VA, VB}},
+{"udi2fcm.",    APU(4, 579,0),  APU_MASK, PPC405|PPC440, PPC476,        {URT, URA, URB}},
+{"udi2fcm",     APU(4, 579,1),  APU_MASK, PPC405|PPC440, PPC476,        {URT, URA, URB}},
+{"machhwsuo",   XO (4,  76,1,0), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"machhwsuo.",  XO (4,  76,1,1), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"ps_merge10",  XOPS(4,592,0),  XOPS_MASK,   PPCPS,     0,              {FRT, FRA, FRB}},
+{"ps_merge10.", XOPS(4,592,1),  XOPS_MASK,   PPCPS,     0,              {FRT, FRA, FRB}},
+{"vsubudm",     VX (4,1216),    VX_MASK,     PPCVEC2,   0,              {VD, VA, VB}},
+{"evaddusiaaw", VX (4,1216),    VX_MASK,     PPCSPE,    0,              {RS, RA}},
+{"bcds.",       VX (4,1217),    VXPS_MASK,   PPCVEC3,   0,              {VD, VA, VB, PS}},
+{"evaddssiaaw", VX (4,1217),    VX_MASK,     PPCSPE,    0,              {RS, RA}},
+{"evsubfusiaaw",VX (4,1218),    VX_MASK,     PPCSPE,    0,              {RS, RA}},
+{"evsubfssiaaw",VX (4,1219),    VX_MASK,     PPCSPE,    0,              {RS, RA}},
+{"evmra",       VX (4,1220),    VX_MASK,     PPCSPE,    0,              {RS, RA}},
+{"vxor",        VX (4,1220),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"evdivws",     VX (4,1222),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"vcmpeqfp.",   VXR(4, 198,1),  VXR_MASK,    PPCVEC,    0,              {VD, VA, VB}},
+{"udi3fcm.",    APU(4, 611,0),  APU_MASK, PPC405|PPC440, PPC476,        {URT, URA, URB}},
+{"vcmpequd.",   VXR(4, 199,1),  VXR_MASK,    PPCVEC2,   0,              {VD, VA, VB}},
+{"udi3fcm",     APU(4, 611,1),  APU_MASK, PPC405|PPC440, PPC476,        {URT, URA, URB}},
+{"evdivwu",     VX (4,1223),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"vpmsumd",     VX (4,1224),    VX_MASK,     PPCVEC2,   0,              {VD, VA, VB}},
+{"evaddumiaaw", VX (4,1224),    VX_MASK,     PPCSPE,    0,              {RS, RA}},
+{"evaddsmiaaw", VX (4,1225),    VX_MASK,     PPCSPE,    0,              {RS, RA}},
+{"evsubfumiaaw",VX (4,1226),    VX_MASK,     PPCSPE,    0,              {RS, RA}},
+{"evsubfsmiaaw",VX (4,1227),    VX_MASK,     PPCSPE,    0,              {RS, RA}},
+{"vpkudus",     VX (4,1230),    VX_MASK,     PPCVEC2,   0,              {VD, VA, VB}},
+{"machhwso",    XO (4, 108,1,0), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"machhwso.",   XO (4, 108,1,1), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"nmachhwso",   XO (4, 110,1,0), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"nmachhwso.",  XO (4, 110,1,1), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"ps_merge11",  XOPS(4,624,0),  XOPS_MASK,   PPCPS,     0,              {FRT, FRA, FRB}},
+{"ps_merge11.", XOPS(4,624,1),  XOPS_MASK,   PPCPS,     0,              {FRT, FRA, FRB}},
+{"vsubuqm",     VX (4,1280),    VX_MASK,     PPCVEC2,   0,              {VD, VA, VB}},
+{"evmheusiaaw", VX (4,1280),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"bcdtrunc.",   VX (4,1281),    VXPS_MASK,   PPCVEC3,   0,              {VD, VA, VB, PS}},
+{"evmhessiaaw", VX (4,1281),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"vavgsb",      VX (4,1282),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"evmhessfaaw", VX (4,1283),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmhousiaaw", VX (4,1284),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"vnot",        VX (4,1284),    VX_MASK,     PPCVEC,    0,              {VD, VA, VBA}},
+{"vnor",        VX (4,1284),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"evmhossiaaw", VX (4,1285),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"udi4fcm.",    APU(4, 643,0),  APU_MASK, PPC405|PPC440, PPC476,        {URT, URA, URB}},
+{"udi4fcm",     APU(4, 643,1),  APU_MASK, PPC405|PPC440, PPC476,        {URT, URA, URB}},
+{"vcmpnezb.",   VXR(4, 263,1),  VXR_MASK,    PPCVEC3,   0,              {VD, VA, VB}},
+{"evmhossfaaw", VX (4,1287),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmheumiaaw", VX (4,1288),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"vcipher",     VX (4,1288),    VX_MASK,     PPCVEC2,   0,              {VD, VA, VB}},
+{"vcipherlast", VX (4,1289),    VX_MASK,     PPCVEC2,   0,              {VD, VA, VB}},
+{"evmhesmiaaw", VX (4,1289),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmhesmfaaw", VX (4,1291),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"vgbbd",       VX (4,1292),    VXVA_MASK,   PPCVEC2,   0,              {VD, VB}},
+{"evmhoumiaaw", VX (4,1292),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmhosmiaaw", VX (4,1293),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmhosmfaaw", VX (4,1295),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"macchwuo",    XO (4, 140,1,0), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"macchwuo.",   XO (4, 140,1,1), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"evmhegumiaa", VX (4,1320),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmhegsmiaa", VX (4,1321),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmhegsmfaa", VX (4,1323),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmhogumiaa", VX (4,1324),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmhogsmiaa", VX (4,1325),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmhogsmfaa", VX (4,1327),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"vsubcuq",     VX (4,1344),    VX_MASK,     PPCVEC2,   0,              {VD, VA, VB}},
+{"evmwlusiaaw", VX (4,1344),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"bcdutrunc.",  VX (4,1345),    VX_MASK,     PPCVEC3,   0,              {VD, VA, VB}},
+{"evmwlssiaaw", VX (4,1345),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"vavgsh",      VX (4,1346),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vorc",        VX (4,1348),    VX_MASK,     PPCVEC2,   0,              {VD, VA, VB}},
+{"udi5fcm.",    APU(4, 675,0),  APU_MASK, PPC405|PPC440, PPC476,        {URT, URA, URB}},
+{"udi5fcm",     APU(4, 675,1),  APU_MASK, PPC405|PPC440, PPC476,        {URT, URA, URB}},
+{"vcmpnezh.",   VXR(4, 327,1),  VXR_MASK,    PPCVEC3,   0,              {VD, VA, VB}},
+{"vncipher",    VX (4,1352),    VX_MASK,     PPCVEC2,   0,              {VD, VA, VB}},
+{"evmwlumiaaw", VX (4,1352),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"vncipherlast",VX (4,1353),    VX_MASK,     PPCVEC2,   0,              {VD, VA, VB}},
+{"evmwlsmiaaw", VX (4,1353),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"vbpermq",     VX (4,1356),    VX_MASK,     PPCVEC2,   0,              {VD, VA, VB}},
+{"vpksdus",     VX (4,1358),    VX_MASK,     PPCVEC2,   0,              {VD, VA, VB}},
+{"evmwssfaa",   VX (4,1363),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"macchwo",     XO (4, 172,1,0), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"evmwumiaa",   VX (4,1368),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"macchwo.",    XO (4, 172,1,1), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"evmwsmiaa",   VX (4,1369),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmwsmfaa",   VX (4,1371),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"nmacchwo",    XO (4, 174,1,0), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"nmacchwo.",   XO (4, 174,1,1), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"evmheusianw", VX (4,1408),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"vsubcuw",     VX (4,1408),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"evmhessianw", VX (4,1409),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"bcdctsq.",    VXVA(4,1409,0), VXVA_MASK,   PPCVEC3,   0,              {VD, VB}},
+{"bcdcfsq.",    VXVA(4,1409,2), VXVAPS_MASK, PPCVEC3,   0,              {VD, VB, PS}},
+{"bcdctz.",     VXVA(4,1409,4), VXVAPS_MASK, PPCVEC3,   0,              {VD, VB, PS}},
+{"bcdctn.",     VXVA(4,1409,5), VXVA_MASK,   PPCVEC3,   0,              {VD, VB}},
+{"bcdcfz.",     VXVA(4,1409,6), VXVAPS_MASK, PPCVEC3,   0,              {VD, VB, PS}},
+{"bcdcfn.",     VXVA(4,1409,7), VXVAPS_MASK, PPCVEC3,   0,              {VD, VB, PS}},
+{"bcdsetsgn.",  VXVA(4,1409,31), VXVAPS_MASK, PPCVEC3,  0,              {VD, VB, PS}},
+{"vavgsw",      VX (4,1410),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"evmhessfanw", VX (4,1411),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"vnand",       VX (4,1412),    VX_MASK,     PPCVEC2,   0,              {VD, VA, VB}},
+{"evmhousianw", VX (4,1412),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmhossianw", VX (4,1413),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"udi6fcm.",    APU(4, 707,0),  APU_MASK, PPC405|PPC440, PPC476,        {URT, URA, URB}},
+{"udi6fcm",     APU(4, 707,1),  APU_MASK, PPC405|PPC440, PPC476,        {URT, URA, URB}},
+{"vcmpnezw.",   VXR(4, 391,1),  VXR_MASK,    PPCVEC3,   0,              {VD, VA, VB}},
+{"evmhossfanw", VX (4,1415),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmheumianw", VX (4,1416),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmhesmianw", VX (4,1417),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmhesmfanw", VX (4,1419),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmhoumianw", VX (4,1420),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmhosmianw", VX (4,1421),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmhosmfanw", VX (4,1423),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"macchwsuo",   XO (4, 204,1,0), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"macchwsuo.",  XO (4, 204,1,1), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"evmhegumian", VX (4,1448),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmhegsmian", VX (4,1449),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmhegsmfan", VX (4,1451),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmhogumian", VX (4,1452),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmhogsmian", VX (4,1453),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmhogsmfan", VX (4,1455),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmwlusianw", VX (4,1472),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"bcdsr.",      VX (4,1473),    VXPS_MASK,   PPCVEC3,   0,              {VD, VA, VB, PS}},
+{"evmwlssianw", VX (4,1473),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"vsld",        VX (4,1476),    VX_MASK,     PPCVEC2,   0,              {VD, VA, VB}},
+{"vcmpgefp.",   VXR(4, 454,1),  VXR_MASK,    PPCVEC,    0,              {VD, VA, VB}},
+{"udi7fcm.",    APU(4, 739,0),  APU_MASK, PPC405|PPC440, PPC476,        {URT, URA, URB}},
+{"udi7fcm",     APU(4, 739,1),  APU_MASK, PPC405|PPC440, PPC476,        {URT, URA, URB}},
+{"vsbox",       VX (4,1480),    VXVB_MASK,   PPCVEC2,   0,              {VD, VA}},
+{"evmwlumianw", VX (4,1480),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmwlsmianw", VX (4,1481),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"vbpermd",     VX (4,1484),    VX_MASK,     PPCVEC3,   0,              {VD, VA, VB}},
+{"vpksdss",     VX (4,1486),    VX_MASK,     PPCVEC2,   0,              {VD, VA, VB}},
+{"evmwssfan",   VX (4,1491),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"macchwso",    XO (4, 236,1,0), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"evmwumian",   VX (4,1496),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"macchwso.",   XO (4, 236,1,1), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"evmwsmian",   VX (4,1497),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"evmwsmfan",   VX (4,1499),    VX_MASK,     PPCSPE,    0,              {RS, RA, RB}},
+{"nmacchwso",   XO (4, 238,1,0), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"nmacchwso.",  XO (4, 238,1,1), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"vsububs",     VX (4,1536),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vclzlsbb",    VXVA(4,1538,0), VXVA_MASK,   PPCVEC3,   0,              {RT, VB}},
+{"vctzlsbb",    VXVA(4,1538,1), VXVA_MASK,   PPCVEC3,   0,              {RT, VB}},
+{"vnegw",       VXVA(4,1538,6), VXVA_MASK,   PPCVEC3,   0,              {VD, VB}},
+{"vnegd",       VXVA(4,1538,7), VXVA_MASK,   PPCVEC3,   0,              {VD, VB}},
+{"vprtybw",     VXVA(4,1538,8), VXVA_MASK,   PPCVEC3,   0,              {VD, VB}},
+{"vprtybd",     VXVA(4,1538,9), VXVA_MASK,   PPCVEC3,   0,              {VD, VB}},
+{"vprtybq",     VXVA(4,1538,10), VXVA_MASK,  PPCVEC3,   0,              {VD, VB}},
+{"vextsb2w",    VXVA(4,1538,16), VXVA_MASK,  PPCVEC3,   0,              {VD, VB}},
+{"vextsh2w",    VXVA(4,1538,17), VXVA_MASK,  PPCVEC3,   0,              {VD, VB}},
+{"vextsb2d",    VXVA(4,1538,24), VXVA_MASK,  PPCVEC3,   0,              {VD, VB}},
+{"vextsh2d",    VXVA(4,1538,25), VXVA_MASK,  PPCVEC3,   0,              {VD, VB}},
+{"vextsw2d",    VXVA(4,1538,26), VXVA_MASK,  PPCVEC3,   0,              {VD, VB}},
+{"vctzb",       VXVA(4,1538,28), VXVA_MASK,  PPCVEC3,   0,              {VD, VB}},
+{"vctzh",       VXVA(4,1538,29), VXVA_MASK,  PPCVEC3,   0,              {VD, VB}},
+{"vctzw",       VXVA(4,1538,30), VXVA_MASK,  PPCVEC3,   0,              {VD, VB}},
+{"vctzd",       VXVA(4,1538,31), VXVA_MASK,  PPCVEC3,   0,              {VD, VB}},
+{"mfvscr",      VX (4,1540),    VXVAVB_MASK, PPCVEC,    0,              {VD}},
+{"vcmpgtub.",   VXR(4, 518,1),  VXR_MASK,    PPCVEC,    0,              {VD, VA, VB}},
+{"udi8fcm.",    APU(4, 771,0),  APU_MASK,    PPC440,    PPC476,         {URT, URA, URB}},
+{"udi8fcm",     APU(4, 771,1),  APU_MASK,    PPC440,    PPC476,         {URT, URA, URB}},
+{"vsum4ubs",    VX (4,1544),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vextublx",    VX (4,1549),    VX_MASK,     PPCVEC3,   0,              {RT, RA, VB}},
+{"vsubuhs",     VX (4,1600),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"mtvscr",      VX (4,1604),    VXVDVA_MASK, PPCVEC,    0,              {VB}},
+{"vcmpgtuh.",   VXR(4, 582,1),  VXR_MASK,    PPCVEC,    0,              {VD, VA, VB}},
+{"vsum4shs",    VX (4,1608),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"udi9fcm.",    APU(4, 804,0),  APU_MASK,    PPC440,    PPC476,         {URT, URA, URB}},
+{"udi9fcm",     APU(4, 804,1),  APU_MASK,    PPC440,    PPC476,         {URT, URA, URB}},
+{"vextuhlx",    VX (4,1613),    VX_MASK,     PPCVEC3,   0,              {RT, RA, VB}},
+{"vupkhsw",     VX (4,1614),    VXVA_MASK,   PPCVEC2,   0,              {VD, VB}},
+{"vsubuws",     VX (4,1664),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vshasigmaw",  VX (4,1666),    VX_MASK,     PPCVEC2,   0,              {VD, VA, ST, SIX}},
+{"veqv",        VX (4,1668),    VX_MASK,     PPCVEC2,   0,              {VD, VA, VB}},
+{"vcmpgtuw.",   VXR(4, 646,1),  VXR_MASK,    PPCVEC,    0,              {VD, VA, VB}},
+{"udi10fcm.",   APU(4, 835,0),  APU_MASK,    PPC440,    PPC476,         {URT, URA, URB}},
+{"udi10fcm",    APU(4, 835,1),  APU_MASK,    PPC440,    PPC476,         {URT, URA, URB}},
+{"vsum2sws",    VX (4,1672),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vmrgow",      VX (4,1676),    VX_MASK,     PPCVEC2,   0,              {VD, VA, VB}},
+{"vextuwlx",    VX (4,1677),    VX_MASK,     PPCVEC3,   0,              {RT, RA, VB}},
+{"vshasigmad",  VX (4,1730),    VX_MASK,     PPCVEC2,   0,              {VD, VA, ST, SIX}},
+{"vsrd",        VX (4,1732),    VX_MASK,     PPCVEC2,   0,              {VD, VA, VB}},
+{"vcmpgtfp.",   VXR(4, 710,1),  VXR_MASK,    PPCVEC,    0,              {VD, VA, VB}},
+{"udi11fcm.",   APU(4, 867,0),  APU_MASK,    PPC440,    PPC476,         {URT, URA, URB}},
+{"vcmpgtud.",   VXR(4, 711,1),  VXR_MASK,    PPCVEC2,   0,              {VD, VA, VB}},
+{"udi11fcm",    APU(4, 867,1),  APU_MASK,    PPC440,    PPC476,         {URT, URA, URB}},
+{"vupklsw",     VX (4,1742),    VXVA_MASK,   PPCVEC2,   0,              {VD, VB}},
+{"vsubsbs",     VX (4,1792),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vclzb",       VX (4,1794),    VXVA_MASK,   PPCVEC2,   0,              {VD, VB}},
+{"vpopcntb",    VX (4,1795),    VXVA_MASK,   PPCVEC2,   0,              {VD, VB}},
+{"vsrv",        VX (4,1796),    VX_MASK,     PPCVEC3,   0,              {VD, VA, VB}},
+{"vcmpgtsb.",   VXR(4, 774,1),  VXR_MASK,    PPCVEC,    0,              {VD, VA, VB}},
+{"udi12fcm.",   APU(4, 899,0),  APU_MASK,    PPC440,    PPC476,         {URT, URA, URB}},
+{"udi12fcm",    APU(4, 899,1),  APU_MASK,    PPC440,    PPC476,         {URT, URA, URB}},
+{"vsum4sbs",    VX (4,1800),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vextubrx",    VX (4,1805),    VX_MASK,     PPCVEC3,   0,              {RT, RA, VB}},
+{"maclhwuo",    XO (4, 396,1,0), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"maclhwuo.",   XO (4, 396,1,1), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"vsubshs",     VX (4,1856),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vclzh",       VX (4,1858),    VXVA_MASK,   PPCVEC2,   0,              {VD, VB}},
+{"vpopcnth",    VX (4,1859),    VXVA_MASK,   PPCVEC2,   0,              {VD, VB}},
+{"vslv",        VX (4,1860),    VX_MASK,     PPCVEC3,   0,              {VD, VA, VB}},
+{"vcmpgtsh.",   VXR(4, 838,1),  VXR_MASK,    PPCVEC,    0,              {VD, VA, VB}},
+{"vextuhrx",    VX (4,1869),    VX_MASK,     PPCVEC3,   0,              {RT, RA, VB}},
+{"udi13fcm.",   APU(4, 931,0),  APU_MASK,    PPC440,    PPC476,         {URT, URA, URB}},
+{"udi13fcm",    APU(4, 931,1),  APU_MASK,    PPC440,    PPC476,         {URT, URA, URB}},
+{"maclhwo",     XO (4, 428,1,0), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"maclhwo.",    XO (4, 428,1,1), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"nmaclhwo",    XO (4, 430,1,0), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"nmaclhwo.",   XO (4, 430,1,1), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"vsubsws",     VX (4,1920),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vclzw",       VX (4,1922),    VXVA_MASK,   PPCVEC2,   0,              {VD, VB}},
+{"vpopcntw",    VX (4,1923),    VXVA_MASK,   PPCVEC2,   0,              {VD, VB}},
+{"vcmpgtsw.",   VXR(4, 902,1),  VXR_MASK,    PPCVEC,    0,              {VD, VA, VB}},
+{"udi14fcm.",   APU(4, 963,0),  APU_MASK,    PPC440,    PPC476,         {URT, URA, URB}},
+{"udi14fcm",    APU(4, 963,1),  APU_MASK,    PPC440,    PPC476,         {URT, URA, URB}},
+{"vsumsws",     VX (4,1928),    VX_MASK,     PPCVEC,    0,              {VD, VA, VB}},
+{"vmrgew",      VX (4,1932),    VX_MASK,     PPCVEC2,   0,              {VD, VA, VB}},
+{"vextuwrx",    VX (4,1933),    VX_MASK,     PPCVEC3,   0,              {RT, RA, VB}},
+{"maclhwsuo",   XO (4, 460,1,0), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"maclhwsuo.",  XO (4, 460,1,1), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"vclzd",       VX (4,1986),    VXVA_MASK,   PPCVEC2,   0,              {VD, VB}},
+{"vpopcntd",    VX (4,1987),    VXVA_MASK,   PPCVEC2,   0,              {VD, VB}},
+{"vcmpbfp.",    VXR(4, 966,1),  VXR_MASK,    PPCVEC,    0,              {VD, VA, VB}},
+{"udi15fcm.",   APU(4, 995,0),  APU_MASK,    PPC440,    PPC476,         {URT, URA, URB}},
+{"vcmpgtsd.",   VXR(4, 967,1),  VXR_MASK,    PPCVEC2,   0,              {VD, VA, VB}},
+{"udi15fcm",    APU(4, 995,1),  APU_MASK,    PPC440,    PPC476,         {URT, URA, URB}},
+{"maclhwso",    XO (4, 492,1,0), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"maclhwso.",   XO (4, 492,1,1), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"nmaclhwso",   XO (4, 494,1,0), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"nmaclhwso.",  XO (4, 494,1,1), XO_MASK,    MULHW,     0,              {RT, RA, RB}},
+{"dcbz_l",      X  (4,1014),    XRT_MASK,    PPCPS,     0,              {RA, RB}},
+
+{"mulli",       OP(7),          OP_MASK,     PPCCOM,    PPCVLE,         {RT, RA, SI}},
+{"muli",        OP(7),          OP_MASK,     PWRCOM,    PPCVLE,         {RT, RA, SI}},
+
+{"subfic",      OP(8),          OP_MASK,     PPCCOM,    PPCVLE,         {RT, RA, SI}},
+{"sfi",         OP(8),          OP_MASK,     PWRCOM,    PPCVLE,         {RT, RA, SI}},
+
+{"dozi",        OP(9),          OP_MASK,     M601,      PPCVLE,         {RT, RA, SI}},
+
+{"cmplwi",      OPL(10,0),      OPL_MASK,    PPCCOM,    PPCVLE,         {OBF, RA, UISIGNOPT}},
+{"cmpldi",      OPL(10,1),      OPL_MASK,    PPC64,     PPCVLE,         {OBF, RA, UISIGNOPT}},
+{"cmpli",       OP(10),         OP_MASK,     PPC,       PPCVLE,         {BF, L32OPT, RA, UISIGNOPT}},
+{"cmpli",       OP(10),         OP_MASK,     PWRCOM,    PPC|PPCVLE,     {BF, RA, UISIGNOPT}},
+
+{"cmpwi",       OPL(11,0),      OPL_MASK,    PPCCOM,    PPCVLE,         {OBF, RA, SI}},
+{"cmpdi",       OPL(11,1),      OPL_MASK,    PPC64,     PPCVLE,         {OBF, RA, SI}},
+{"cmpi",        OP(11),         OP_MASK,     PPC,       PPCVLE,         {BF, L32OPT, RA, SI}},
+{"cmpi",        OP(11),         OP_MASK,     PWRCOM,    PPC|PPCVLE,     {BF, RA, SI}},
+
+{"addic",       OP(12),         OP_MASK,     PPCCOM,    PPCVLE,         {RT, RA, SI}},
+{"ai",          OP(12),         OP_MASK,     PWRCOM,    PPCVLE,         {RT, RA, SI}},
+{"subic",       OP(12),         OP_MASK,     PPCCOM,    PPCVLE,         {RT, RA, NSI}},
+
+{"addic.",      OP(13),         OP_MASK,     PPCCOM,    PPCVLE,         {RT, RA, SI}},
+{"ai.",         OP(13),         OP_MASK,     PWRCOM,    PPCVLE,         {RT, RA, SI}},
+{"subic.",      OP(13),         OP_MASK,     PPCCOM,    PPCVLE,         {RT, RA, NSI}},
+
+{"li",          OP(14),         DRA_MASK,    PPCCOM,    PPCVLE,         {RT, SI}},
+{"lil",         OP(14),         DRA_MASK,    PWRCOM,    PPCVLE,         {RT, SI}},
+{"addi",        OP(14),         OP_MASK,     PPCCOM,    PPCVLE,         {RT, RA0, SI}},
+{"cal",         OP(14),         OP_MASK,     PWRCOM,    PPCVLE,         {RT, D, RA0}},
+{"subi",        OP(14),         OP_MASK,     PPCCOM,    PPCVLE,         {RT, RA0, NSI}},
+{"la",          OP(14),         OP_MASK,     PPCCOM,    PPCVLE,         {RT, D, RA0}},
+
+{"lis",         OP(15),         DRA_MASK,    PPCCOM,    PPCVLE,         {RT, SISIGNOPT}},
+{"liu",         OP(15),         DRA_MASK,    PWRCOM,    PPCVLE,         {RT, SISIGNOPT}},
+{"addis",       OP(15),         OP_MASK,     PPCCOM,    PPCVLE,         {RT, RA0, SISIGNOPT}},
+{"cau",         OP(15),         OP_MASK,     PWRCOM,    PPCVLE,         {RT, RA0, SISIGNOPT}},
+{"subis",       OP(15),         OP_MASK,     PPCCOM,    PPCVLE,         {RT, RA0, NSISIGNOPT}},
+
+{"bdnz-",    BBO(16,BODNZ,0,0),         BBOATBI_MASK,  PPCCOM,   PPCVLE,        {BDM}},
+{"bdnz+",    BBO(16,BODNZ,0,0),         BBOATBI_MASK,  PPCCOM,   PPCVLE,        {BDP}},
+{"bdnz",     BBO(16,BODNZ,0,0),         BBOATBI_MASK,  PPCCOM,   PPCVLE,        {BD}},
+{"bdn",      BBO(16,BODNZ,0,0),         BBOATBI_MASK,  PWRCOM,   PPCVLE,        {BD}},
+{"bdnzl-",   BBO(16,BODNZ,0,1),         BBOATBI_MASK,  PPCCOM,   PPCVLE,        {BDM}},
+{"bdnzl+",   BBO(16,BODNZ,0,1),         BBOATBI_MASK,  PPCCOM,   PPCVLE,        {BDP}},
+{"bdnzl",    BBO(16,BODNZ,0,1),         BBOATBI_MASK,  PPCCOM,   PPCVLE,        {BD}},
+{"bdnl",     BBO(16,BODNZ,0,1),         BBOATBI_MASK,  PWRCOM,   PPCVLE,        {BD}},
+{"bdnza-",   BBO(16,BODNZ,1,0),         BBOATBI_MASK,  PPCCOM,   PPCVLE,        {BDMA}},
+{"bdnza+",   BBO(16,BODNZ,1,0),         BBOATBI_MASK,  PPCCOM,   PPCVLE,        {BDPA}},
+{"bdnza",    BBO(16,BODNZ,1,0),         BBOATBI_MASK,  PPCCOM,   PPCVLE,        {BDA}},
+{"bdna",     BBO(16,BODNZ,1,0),         BBOATBI_MASK,  PWRCOM,   PPCVLE,        {BDA}},
+{"bdnzla-",  BBO(16,BODNZ,1,1),         BBOATBI_MASK,  PPCCOM,   PPCVLE,        {BDMA}},
+{"bdnzla+",  BBO(16,BODNZ,1,1),         BBOATBI_MASK,  PPCCOM,   PPCVLE,        {BDPA}},
+{"bdnzla",   BBO(16,BODNZ,1,1),         BBOATBI_MASK,  PPCCOM,   PPCVLE,        {BDA}},
+{"bdnla",    BBO(16,BODNZ,1,1),         BBOATBI_MASK,  PWRCOM,   PPCVLE,        {BDA}},
+{"bdz-",     BBO(16,BODZ,0,0),          BBOATBI_MASK,  PPCCOM,   PPCVLE,        {BDM}},
+{"bdz+",     BBO(16,BODZ,0,0),          BBOATBI_MASK,  PPCCOM,   PPCVLE,        {BDP}},
+{"bdz",      BBO(16,BODZ,0,0),          BBOATBI_MASK,  COM,      PPCVLE,        {BD}},
+{"bdzl-",    BBO(16,BODZ,0,1),          BBOATBI_MASK,  PPCCOM,   PPCVLE,        {BDM}},
+{"bdzl+",    BBO(16,BODZ,0,1),          BBOATBI_MASK,  PPCCOM,   PPCVLE,        {BDP}},
+{"bdzl",     BBO(16,BODZ,0,1),          BBOATBI_MASK,  COM,      PPCVLE,        {BD}},
+{"bdza-",    BBO(16,BODZ,1,0),          BBOATBI_MASK,  PPCCOM,   PPCVLE,        {BDMA}},
+{"bdza+",    BBO(16,BODZ,1,0),          BBOATBI_MASK,  PPCCOM,   PPCVLE,        {BDPA}},
+{"bdza",     BBO(16,BODZ,1,0),          BBOATBI_MASK,  COM,      PPCVLE,        {BDA}},
+{"bdzla-",   BBO(16,BODZ,1,1),          BBOATBI_MASK,  PPCCOM,   PPCVLE,        {BDMA}},
+{"bdzla+",   BBO(16,BODZ,1,1),          BBOATBI_MASK,  PPCCOM,   PPCVLE,        {BDPA}},
+{"bdzla",    BBO(16,BODZ,1,1),          BBOATBI_MASK,  COM,      PPCVLE,        {BDA}},
+
+{"bge-",     BBOCB(16,BOF,CBLT,0,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDM}},
+{"bge+",     BBOCB(16,BOF,CBLT,0,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDP}},
+{"bge",      BBOCB(16,BOF,CBLT,0,0),    BBOATCB_MASK,  COM,      PPCVLE,        {CR, BD}},
+{"bnl-",     BBOCB(16,BOF,CBLT,0,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDM}},
+{"bnl+",     BBOCB(16,BOF,CBLT,0,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDP}},
+{"bnl",      BBOCB(16,BOF,CBLT,0,0),    BBOATCB_MASK,  COM,      PPCVLE,        {CR, BD}},
+{"bgel-",    BBOCB(16,BOF,CBLT,0,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDM}},
+{"bgel+",    BBOCB(16,BOF,CBLT,0,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDP}},
+{"bgel",     BBOCB(16,BOF,CBLT,0,1),    BBOATCB_MASK,  COM,      PPCVLE,        {CR, BD}},
+{"bnll-",    BBOCB(16,BOF,CBLT,0,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDM}},
+{"bnll+",    BBOCB(16,BOF,CBLT,0,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDP}},
+{"bnll",     BBOCB(16,BOF,CBLT,0,1),    BBOATCB_MASK,  COM,      PPCVLE,        {CR, BD}},
+{"bgea-",    BBOCB(16,BOF,CBLT,1,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDMA}},
+{"bgea+",    BBOCB(16,BOF,CBLT,1,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDPA}},
+{"bgea",     BBOCB(16,BOF,CBLT,1,0),    BBOATCB_MASK,  COM,      PPCVLE,        {CR, BDA}},
+{"bnla-",    BBOCB(16,BOF,CBLT,1,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDMA}},
+{"bnla+",    BBOCB(16,BOF,CBLT,1,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDPA}},
+{"bnla",     BBOCB(16,BOF,CBLT,1,0),    BBOATCB_MASK,  COM,      PPCVLE,        {CR, BDA}},
+{"bgela-",   BBOCB(16,BOF,CBLT,1,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDMA}},
+{"bgela+",   BBOCB(16,BOF,CBLT,1,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDPA}},
+{"bgela",    BBOCB(16,BOF,CBLT,1,1),    BBOATCB_MASK,  COM,      PPCVLE,        {CR, BDA}},
+{"bnlla-",   BBOCB(16,BOF,CBLT,1,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDMA}},
+{"bnlla+",   BBOCB(16,BOF,CBLT,1,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDPA}},
+{"bnlla",    BBOCB(16,BOF,CBLT,1,1),    BBOATCB_MASK,  COM,      PPCVLE,        {CR, BDA}},
+{"ble-",     BBOCB(16,BOF,CBGT,0,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDM}},
+{"ble+",     BBOCB(16,BOF,CBGT,0,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDP}},
+{"ble",      BBOCB(16,BOF,CBGT,0,0),    BBOATCB_MASK,  COM,      PPCVLE,        {CR, BD}},
+{"bng-",     BBOCB(16,BOF,CBGT,0,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDM}},
+{"bng+",     BBOCB(16,BOF,CBGT,0,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDP}},
+{"bng",      BBOCB(16,BOF,CBGT,0,0),    BBOATCB_MASK,  COM,      PPCVLE,        {CR, BD}},
+{"blel-",    BBOCB(16,BOF,CBGT,0,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDM}},
+{"blel+",    BBOCB(16,BOF,CBGT,0,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDP}},
+{"blel",     BBOCB(16,BOF,CBGT,0,1),    BBOATCB_MASK,  COM,      PPCVLE,        {CR, BD}},
+{"bngl-",    BBOCB(16,BOF,CBGT,0,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDM}},
+{"bngl+",    BBOCB(16,BOF,CBGT,0,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDP}},
+{"bngl",     BBOCB(16,BOF,CBGT,0,1),    BBOATCB_MASK,  COM,      PPCVLE,        {CR, BD}},
+{"blea-",    BBOCB(16,BOF,CBGT,1,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDMA}},
+{"blea+",    BBOCB(16,BOF,CBGT,1,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDPA}},
+{"blea",     BBOCB(16,BOF,CBGT,1,0),    BBOATCB_MASK,  COM,      PPCVLE,        {CR, BDA}},
+{"bnga-",    BBOCB(16,BOF,CBGT,1,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDMA}},
+{"bnga+",    BBOCB(16,BOF,CBGT,1,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDPA}},
+{"bnga",     BBOCB(16,BOF,CBGT,1,0),    BBOATCB_MASK,  COM,      PPCVLE,        {CR, BDA}},
+{"blela-",   BBOCB(16,BOF,CBGT,1,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDMA}},
+{"blela+",   BBOCB(16,BOF,CBGT,1,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDPA}},
+{"blela",    BBOCB(16,BOF,CBGT,1,1),    BBOATCB_MASK,  COM,      PPCVLE,        {CR, BDA}},
+{"bngla-",   BBOCB(16,BOF,CBGT,1,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDMA}},
+{"bngla+",   BBOCB(16,BOF,CBGT,1,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDPA}},
+{"bngla",    BBOCB(16,BOF,CBGT,1,1),    BBOATCB_MASK,  COM,      PPCVLE,        {CR, BDA}},
+{"bne-",     BBOCB(16,BOF,CBEQ,0,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDM}},
+{"bne+",     BBOCB(16,BOF,CBEQ,0,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDP}},
+{"bne",      BBOCB(16,BOF,CBEQ,0,0),    BBOATCB_MASK,  COM,      PPCVLE,        {CR, BD}},
+{"bnel-",    BBOCB(16,BOF,CBEQ,0,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDM}},
+{"bnel+",    BBOCB(16,BOF,CBEQ,0,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDP}},
+{"bnel",     BBOCB(16,BOF,CBEQ,0,1),    BBOATCB_MASK,  COM,      PPCVLE,        {CR, BD}},
+{"bnea-",    BBOCB(16,BOF,CBEQ,1,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDMA}},
+{"bnea+",    BBOCB(16,BOF,CBEQ,1,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDPA}},
+{"bnea",     BBOCB(16,BOF,CBEQ,1,0),    BBOATCB_MASK,  COM,      PPCVLE,        {CR, BDA}},
+{"bnela-",   BBOCB(16,BOF,CBEQ,1,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDMA}},
+{"bnela+",   BBOCB(16,BOF,CBEQ,1,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDPA}},
+{"bnela",    BBOCB(16,BOF,CBEQ,1,1),    BBOATCB_MASK,  COM,      PPCVLE,        {CR, BDA}},
+{"bns-",     BBOCB(16,BOF,CBSO,0,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDM}},
+{"bns+",     BBOCB(16,BOF,CBSO,0,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDP}},
+{"bns",      BBOCB(16,BOF,CBSO,0,0),    BBOATCB_MASK,  COM,      PPCVLE,        {CR, BD}},
+{"bnu-",     BBOCB(16,BOF,CBSO,0,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDM}},
+{"bnu+",     BBOCB(16,BOF,CBSO,0,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDP}},
+{"bnu",      BBOCB(16,BOF,CBSO,0,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BD}},
+{"bnsl-",    BBOCB(16,BOF,CBSO,0,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDM}},
+{"bnsl+",    BBOCB(16,BOF,CBSO,0,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDP}},
+{"bnsl",     BBOCB(16,BOF,CBSO,0,1),    BBOATCB_MASK,  COM,      PPCVLE,        {CR, BD}},
+{"bnul-",    BBOCB(16,BOF,CBSO,0,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDM}},
+{"bnul+",    BBOCB(16,BOF,CBSO,0,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDP}},
+{"bnul",     BBOCB(16,BOF,CBSO,0,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BD}},
+{"bnsa-",    BBOCB(16,BOF,CBSO,1,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDMA}},
+{"bnsa+",    BBOCB(16,BOF,CBSO,1,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDPA}},
+{"bnsa",     BBOCB(16,BOF,CBSO,1,0),    BBOATCB_MASK,  COM,      PPCVLE,        {CR, BDA}},
+{"bnua-",    BBOCB(16,BOF,CBSO,1,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDMA}},
+{"bnua+",    BBOCB(16,BOF,CBSO,1,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDPA}},
+{"bnua",     BBOCB(16,BOF,CBSO,1,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDA}},
+{"bnsla-",   BBOCB(16,BOF,CBSO,1,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDMA}},
+{"bnsla+",   BBOCB(16,BOF,CBSO,1,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDPA}},
+{"bnsla",    BBOCB(16,BOF,CBSO,1,1),    BBOATCB_MASK,  COM,      PPCVLE,        {CR, BDA}},
+{"bnula-",   BBOCB(16,BOF,CBSO,1,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDMA}},
+{"bnula+",   BBOCB(16,BOF,CBSO,1,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDPA}},
+{"bnula",    BBOCB(16,BOF,CBSO,1,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDA}},
+
+{"blt-",     BBOCB(16,BOT,CBLT,0,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDM}},
+{"blt+",     BBOCB(16,BOT,CBLT,0,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDP}},
+{"blt",      BBOCB(16,BOT,CBLT,0,0),    BBOATCB_MASK,  COM,      PPCVLE,        {CR, BD}},
+{"bltl-",    BBOCB(16,BOT,CBLT,0,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDM}},
+{"bltl+",    BBOCB(16,BOT,CBLT,0,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDP}},
+{"bltl",     BBOCB(16,BOT,CBLT,0,1),    BBOATCB_MASK,  COM,      PPCVLE,        {CR, BD}},
+{"blta-",    BBOCB(16,BOT,CBLT,1,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDMA}},
+{"blta+",    BBOCB(16,BOT,CBLT,1,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDPA}},
+{"blta",     BBOCB(16,BOT,CBLT,1,0),    BBOATCB_MASK,  COM,      PPCVLE,        {CR, BDA}},
+{"bltla-",   BBOCB(16,BOT,CBLT,1,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDMA}},
+{"bltla+",   BBOCB(16,BOT,CBLT,1,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDPA}},
+{"bltla",    BBOCB(16,BOT,CBLT,1,1),    BBOATCB_MASK,  COM,      PPCVLE,        {CR, BDA}},
+{"bgt-",     BBOCB(16,BOT,CBGT,0,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDM}},
+{"bgt+",     BBOCB(16,BOT,CBGT,0,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDP}},
+{"bgt",      BBOCB(16,BOT,CBGT,0,0),    BBOATCB_MASK,  COM,      PPCVLE,        {CR, BD}},
+{"bgtl-",    BBOCB(16,BOT,CBGT,0,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDM}},
+{"bgtl+",    BBOCB(16,BOT,CBGT,0,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDP}},
+{"bgtl",     BBOCB(16,BOT,CBGT,0,1),    BBOATCB_MASK,  COM,      PPCVLE,        {CR, BD}},
+{"bgta-",    BBOCB(16,BOT,CBGT,1,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDMA}},
+{"bgta+",    BBOCB(16,BOT,CBGT,1,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDPA}},
+{"bgta",     BBOCB(16,BOT,CBGT,1,0),    BBOATCB_MASK,  COM,      PPCVLE,        {CR, BDA}},
+{"bgtla-",   BBOCB(16,BOT,CBGT,1,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDMA}},
+{"bgtla+",   BBOCB(16,BOT,CBGT,1,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDPA}},
+{"bgtla",    BBOCB(16,BOT,CBGT,1,1),    BBOATCB_MASK,  COM,      PPCVLE,        {CR, BDA}},
+{"beq-",     BBOCB(16,BOT,CBEQ,0,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDM}},
+{"beq+",     BBOCB(16,BOT,CBEQ,0,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDP}},
+{"beq",      BBOCB(16,BOT,CBEQ,0,0),    BBOATCB_MASK,  COM,      PPCVLE,        {CR, BD}},
+{"beql-",    BBOCB(16,BOT,CBEQ,0,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDM}},
+{"beql+",    BBOCB(16,BOT,CBEQ,0,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDP}},
+{"beql",     BBOCB(16,BOT,CBEQ,0,1),    BBOATCB_MASK,  COM,      PPCVLE,        {CR, BD}},
+{"beqa-",    BBOCB(16,BOT,CBEQ,1,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDMA}},
+{"beqa+",    BBOCB(16,BOT,CBEQ,1,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDPA}},
+{"beqa",     BBOCB(16,BOT,CBEQ,1,0),    BBOATCB_MASK,  COM,      PPCVLE,        {CR, BDA}},
+{"beqla-",   BBOCB(16,BOT,CBEQ,1,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDMA}},
+{"beqla+",   BBOCB(16,BOT,CBEQ,1,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDPA}},
+{"beqla",    BBOCB(16,BOT,CBEQ,1,1),    BBOATCB_MASK,  COM,      PPCVLE,        {CR, BDA}},
+{"bso-",     BBOCB(16,BOT,CBSO,0,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDM}},
+{"bso+",     BBOCB(16,BOT,CBSO,0,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDP}},
+{"bso",      BBOCB(16,BOT,CBSO,0,0),    BBOATCB_MASK,  COM,      PPCVLE,        {CR, BD}},
+{"bun-",     BBOCB(16,BOT,CBSO,0,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDM}},
+{"bun+",     BBOCB(16,BOT,CBSO,0,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDP}},
+{"bun",      BBOCB(16,BOT,CBSO,0,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BD}},
+{"bsol-",    BBOCB(16,BOT,CBSO,0,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDM}},
+{"bsol+",    BBOCB(16,BOT,CBSO,0,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDP}},
+{"bsol",     BBOCB(16,BOT,CBSO,0,1),    BBOATCB_MASK,  COM,      PPCVLE,        {CR, BD}},
+{"bunl-",    BBOCB(16,BOT,CBSO,0,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDM}},
+{"bunl+",    BBOCB(16,BOT,CBSO,0,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDP}},
+{"bunl",     BBOCB(16,BOT,CBSO,0,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BD}},
+{"bsoa-",    BBOCB(16,BOT,CBSO,1,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDMA}},
+{"bsoa+",    BBOCB(16,BOT,CBSO,1,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDPA}},
+{"bsoa",     BBOCB(16,BOT,CBSO,1,0),    BBOATCB_MASK,  COM,      PPCVLE,        {CR, BDA}},
+{"buna-",    BBOCB(16,BOT,CBSO,1,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDMA}},
+{"buna+",    BBOCB(16,BOT,CBSO,1,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDPA}},
+{"buna",     BBOCB(16,BOT,CBSO,1,0),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDA}},
+{"bsola-",   BBOCB(16,BOT,CBSO,1,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDMA}},
+{"bsola+",   BBOCB(16,BOT,CBSO,1,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDPA}},
+{"bsola",    BBOCB(16,BOT,CBSO,1,1),    BBOATCB_MASK,  COM,      PPCVLE,        {CR, BDA}},
+{"bunla-",   BBOCB(16,BOT,CBSO,1,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDMA}},
+{"bunla+",   BBOCB(16,BOT,CBSO,1,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDPA}},
+{"bunla",    BBOCB(16,BOT,CBSO,1,1),    BBOATCB_MASK,  PPCCOM,   PPCVLE,        {CR, BDA}},
+
+{"bdnzf-",   BBO(16,BODNZF,0,0),        BBOY_MASK,     PPCCOM,   ISA_V2|PPCVLE, {BI, BDM}},
+{"bdnzf+",   BBO(16,BODNZF,0,0),        BBOY_MASK,     PPCCOM,   ISA_V2|PPCVLE, {BI, BDP}},
+{"bdnzf",    BBO(16,BODNZF,0,0),        BBOY_MASK,     PPCCOM,   PPCVLE,        {BI, BD}},
+{"bdnzfl-",  BBO(16,BODNZF,0,1),        BBOY_MASK,     PPCCOM,   ISA_V2|PPCVLE, {BI, BDM}},
+{"bdnzfl+",  BBO(16,BODNZF,0,1),        BBOY_MASK,     PPCCOM,   ISA_V2|PPCVLE, {BI, BDP}},
+{"bdnzfl",   BBO(16,BODNZF,0,1),        BBOY_MASK,     PPCCOM,   PPCVLE,        {BI, BD}},
+{"bdnzfa-",  BBO(16,BODNZF,1,0),        BBOY_MASK,     PPCCOM,   ISA_V2|PPCVLE, {BI, BDMA}},
+{"bdnzfa+",  BBO(16,BODNZF,1,0),        BBOY_MASK,     PPCCOM,   ISA_V2|PPCVLE, {BI, BDPA}},
+{"bdnzfa",   BBO(16,BODNZF,1,0),        BBOY_MASK,     PPCCOM,   PPCVLE,        {BI, BDA}},
+{"bdnzfla-", BBO(16,BODNZF,1,1),        BBOY_MASK,     PPCCOM,   ISA_V2|PPCVLE, {BI, BDMA}},
+{"bdnzfla+", BBO(16,BODNZF,1,1),        BBOY_MASK,     PPCCOM,   ISA_V2|PPCVLE, {BI, BDPA}},
+{"bdnzfla",  BBO(16,BODNZF,1,1),        BBOY_MASK,     PPCCOM,   PPCVLE,        {BI, BDA}},
+{"bdzf-",    BBO(16,BODZF,0,0),         BBOY_MASK,     PPCCOM,   ISA_V2|PPCVLE, {BI, BDM}},
+{"bdzf+",    BBO(16,BODZF,0,0),         BBOY_MASK,     PPCCOM,   ISA_V2|PPCVLE, {BI, BDP}},
+{"bdzf",     BBO(16,BODZF,0,0),         BBOY_MASK,     PPCCOM,   PPCVLE,        {BI, BD}},
+{"bdzfl-",   BBO(16,BODZF,0,1),         BBOY_MASK,     PPCCOM,   ISA_V2|PPCVLE, {BI, BDM}},
+{"bdzfl+",   BBO(16,BODZF,0,1),         BBOY_MASK,     PPCCOM,   ISA_V2|PPCVLE, {BI, BDP}},
+{"bdzfl",    BBO(16,BODZF,0,1),         BBOY_MASK,     PPCCOM,   PPCVLE,        {BI, BD}},
+{"bdzfa-",   BBO(16,BODZF,1,0),         BBOY_MASK,     PPCCOM,   ISA_V2|PPCVLE, {BI, BDMA}},
+{"bdzfa+",   BBO(16,BODZF,1,0),         BBOY_MASK,     PPCCOM,   ISA_V2|PPCVLE, {BI, BDPA}},
+{"bdzfa",    BBO(16,BODZF,1,0),         BBOY_MASK,     PPCCOM,   PPCVLE,        {BI, BDA}},
+{"bdzfla-",  BBO(16,BODZF,1,1),         BBOY_MASK,     PPCCOM,   ISA_V2|PPCVLE, {BI, BDMA}},
+{"bdzfla+",  BBO(16,BODZF,1,1),         BBOY_MASK,     PPCCOM,   ISA_V2|PPCVLE, {BI, BDPA}},
+{"bdzfla",   BBO(16,BODZF,1,1),         BBOY_MASK,     PPCCOM,   PPCVLE,        {BI, BDA}},
+
+{"bf-",      BBO(16,BOF,0,0),           BBOAT_MASK,    PPCCOM,   PPCVLE,        {BI, BDM}},
+{"bf+",      BBO(16,BOF,0,0),           BBOAT_MASK,    PPCCOM,   PPCVLE,        {BI, BDP}},
+{"bf",       BBO(16,BOF,0,0),           BBOAT_MASK,    PPCCOM,   PPCVLE,        {BI, BD}},
+{"bbf",      BBO(16,BOF,0,0),           BBOAT_MASK,    PWRCOM,   PPCVLE,        {BI, BD}},
+{"bfl-",     BBO(16,BOF,0,1),           BBOAT_MASK,    PPCCOM,   PPCVLE,        {BI, BDM}},
+{"bfl+",     BBO(16,BOF,0,1),           BBOAT_MASK,    PPCCOM,   PPCVLE,        {BI, BDP}},
+{"bfl",      BBO(16,BOF,0,1),           BBOAT_MASK,    PPCCOM,   PPCVLE,        {BI, BD}},
+{"bbfl",     BBO(16,BOF,0,1),           BBOAT_MASK,    PWRCOM,   PPCVLE,        {BI, BD}},
+{"bfa-",     BBO(16,BOF,1,0),           BBOAT_MASK,    PPCCOM,   PPCVLE,        {BI, BDMA}},
+{"bfa+",     BBO(16,BOF,1,0),           BBOAT_MASK,    PPCCOM,   PPCVLE,        {BI, BDPA}},
+{"bfa",      BBO(16,BOF,1,0),           BBOAT_MASK,    PPCCOM,   PPCVLE,        {BI, BDA}},
+{"bbfa",     BBO(16,BOF,1,0),           BBOAT_MASK,    PWRCOM,   PPCVLE,        {BI, BDA}},
+{"bfla-",    BBO(16,BOF,1,1),           BBOAT_MASK,    PPCCOM,   PPCVLE,        {BI, BDMA}},
+{"bfla+",    BBO(16,BOF,1,1),           BBOAT_MASK,    PPCCOM,   PPCVLE,        {BI, BDPA}},
+{"bfla",     BBO(16,BOF,1,1),           BBOAT_MASK,    PPCCOM,   PPCVLE,        {BI, BDA}},
+{"bbfla",    BBO(16,BOF,1,1),           BBOAT_MASK,    PWRCOM,   PPCVLE,        {BI, BDA}},
+
+{"bdnzt-",   BBO(16,BODNZT,0,0),        BBOY_MASK,     PPCCOM,   ISA_V2|PPCVLE, {BI, BDM}},
+{"bdnzt+",   BBO(16,BODNZT,0,0),        BBOY_MASK,     PPCCOM,   ISA_V2|PPCVLE, {BI, BDP}},
+{"bdnzt",    BBO(16,BODNZT,0,0),        BBOY_MASK,     PPCCOM,   PPCVLE,        {BI, BD}},
+{"bdnztl-",  BBO(16,BODNZT,0,1),        BBOY_MASK,     PPCCOM,   ISA_V2|PPCVLE, {BI, BDM}},
+{"bdnztl+",  BBO(16,BODNZT,0,1),        BBOY_MASK,     PPCCOM,   ISA_V2|PPCVLE, {BI, BDP}},
+{"bdnztl",   BBO(16,BODNZT,0,1),        BBOY_MASK,     PPCCOM,   PPCVLE,        {BI, BD}},
+{"bdnzta-",  BBO(16,BODNZT,1,0),        BBOY_MASK,     PPCCOM,   ISA_V2|PPCVLE, {BI, BDMA}},
+{"bdnzta+",  BBO(16,BODNZT,1,0),        BBOY_MASK,     PPCCOM,   ISA_V2|PPCVLE, {BI, BDPA}},
+{"bdnzta",   BBO(16,BODNZT,1,0),        BBOY_MASK,     PPCCOM,   PPCVLE,        {BI, BDA}},
+{"bdnztla-", BBO(16,BODNZT,1,1),        BBOY_MASK,     PPCCOM,   ISA_V2|PPCVLE, {BI, BDMA}},
+{"bdnztla+", BBO(16,BODNZT,1,1),        BBOY_MASK,     PPCCOM,   ISA_V2|PPCVLE, {BI, BDPA}},
+{"bdnztla",  BBO(16,BODNZT,1,1),        BBOY_MASK,     PPCCOM,   PPCVLE,        {BI, BDA}},
+{"bdzt-",    BBO(16,BODZT,0,0),         BBOY_MASK,     PPCCOM,   ISA_V2|PPCVLE, {BI, BDM}},
+{"bdzt+",    BBO(16,BODZT,0,0),         BBOY_MASK,     PPCCOM,   ISA_V2|PPCVLE, {BI, BDP}},
+{"bdzt",     BBO(16,BODZT,0,0),         BBOY_MASK,     PPCCOM,   PPCVLE,        {BI, BD}},
+{"bdztl-",   BBO(16,BODZT,0,1),         BBOY_MASK,     PPCCOM,   ISA_V2|PPCVLE, {BI, BDM}},
+{"bdztl+",   BBO(16,BODZT,0,1),         BBOY_MASK,     PPCCOM,   ISA_V2|PPCVLE, {BI, BDP}},
+{"bdztl",    BBO(16,BODZT,0,1),         BBOY_MASK,     PPCCOM,   PPCVLE,        {BI, BD}},
+{"bdzta-",   BBO(16,BODZT,1,0),         BBOY_MASK,     PPCCOM,   ISA_V2|PPCVLE, {BI, BDMA}},
+{"bdzta+",   BBO(16,BODZT,1,0),         BBOY_MASK,     PPCCOM,   ISA_V2|PPCVLE, {BI, BDPA}},
+{"bdzta",    BBO(16,BODZT,1,0),         BBOY_MASK,     PPCCOM,   PPCVLE,        {BI, BDA}},
+{"bdztla-",  BBO(16,BODZT,1,1),         BBOY_MASK,     PPCCOM,   ISA_V2|PPCVLE, {BI, BDMA}},
+{"bdztla+",  BBO(16,BODZT,1,1),         BBOY_MASK,     PPCCOM,   ISA_V2|PPCVLE, {BI, BDPA}},
+{"bdztla",   BBO(16,BODZT,1,1),         BBOY_MASK,     PPCCOM,   PPCVLE,        {BI, BDA}},
+
+{"bt-",      BBO(16,BOT,0,0),           BBOAT_MASK,    PPCCOM,   PPCVLE,        {BI, BDM}},
+{"bt+",      BBO(16,BOT,0,0),           BBOAT_MASK,    PPCCOM,   PPCVLE,        {BI, BDP}},
+{"bt",       BBO(16,BOT,0,0),           BBOAT_MASK,    PPCCOM,   PPCVLE,        {BI, BD}},
+{"bbt",      BBO(16,BOT,0,0),           BBOAT_MASK,    PWRCOM,   PPCVLE,        {BI, BD}},
+{"btl-",     BBO(16,BOT,0,1),           BBOAT_MASK,    PPCCOM,   PPCVLE,        {BI, BDM}},
+{"btl+",     BBO(16,BOT,0,1),           BBOAT_MASK,    PPCCOM,   PPCVLE,        {BI, BDP}},
+{"btl",      BBO(16,BOT,0,1),           BBOAT_MASK,    PPCCOM,   PPCVLE,        {BI, BD}},
+{"bbtl",     BBO(16,BOT,0,1),           BBOAT_MASK,    PWRCOM,   PPCVLE,        {BI, BD}},
+{"bta-",     BBO(16,BOT,1,0),           BBOAT_MASK,    PPCCOM,   PPCVLE,        {BI, BDMA}},
+{"bta+",     BBO(16,BOT,1,0),           BBOAT_MASK,    PPCCOM,   PPCVLE,        {BI, BDPA}},
+{"bta",      BBO(16,BOT,1,0),           BBOAT_MASK,    PPCCOM,   PPCVLE,        {BI, BDA}},
+{"bbta",     BBO(16,BOT,1,0),           BBOAT_MASK,    PWRCOM,   PPCVLE,        {BI, BDA}},
+{"btla-",    BBO(16,BOT,1,1),           BBOAT_MASK,    PPCCOM,   PPCVLE,        {BI, BDMA}},
+{"btla+",    BBO(16,BOT,1,1),           BBOAT_MASK,    PPCCOM,   PPCVLE,        {BI, BDPA}},
+{"btla",     BBO(16,BOT,1,1),           BBOAT_MASK,    PPCCOM,   PPCVLE,        {BI, BDA}},
+{"bbtla",    BBO(16,BOT,1,1),           BBOAT_MASK,    PWRCOM,   PPCVLE,        {BI, BDA}},
+
+{"bc-",         B(16,0,0),      B_MASK,      PPCCOM,    PPCVLE,         {BOE, BI, BDM}},
+{"bc+",         B(16,0,0),      B_MASK,      PPCCOM,    PPCVLE,         {BOE, BI, BDP}},
+{"bc",          B(16,0,0),      B_MASK,      COM,       PPCVLE,         {BO, BI, BD}},
+{"bcl-",        B(16,0,1),      B_MASK,      PPCCOM,    PPCVLE,         {BOE, BI, BDM}},
+{"bcl+",        B(16,0,1),      B_MASK,      PPCCOM,    PPCVLE,         {BOE, BI, BDP}},
+{"bcl",         B(16,0,1),      B_MASK,      COM,       PPCVLE,         {BO, BI, BD}},
+{"bca-",        B(16,1,0),      B_MASK,      PPCCOM,    PPCVLE,         {BOE, BI, BDMA}},
+{"bca+",        B(16,1,0),      B_MASK,      PPCCOM,    PPCVLE,         {BOE, BI, BDPA}},
+{"bca",         B(16,1,0),      B_MASK,      COM,       PPCVLE,         {BO, BI, BDA}},
+{"bcla-",       B(16,1,1),      B_MASK,      PPCCOM,    PPCVLE,         {BOE, BI, BDMA}},
+{"bcla+",       B(16,1,1),      B_MASK,      PPCCOM,    PPCVLE,         {BOE, BI, BDPA}},
+{"bcla",        B(16,1,1),      B_MASK,      COM,       PPCVLE,         {BO, BI, BDA}},
+
+{"svc",         SC(17,0,0),     SC_MASK,     POWER,     PPCVLE,         {SVC_LEV, FL1, FL2}},
+{"svcl",        SC(17,0,1),     SC_MASK,     POWER,     PPCVLE,         {SVC_LEV, FL1, FL2}},
+{"sc",          SC(17,1,0),     SC_MASK,     PPC,       PPCVLE,         {LEV}},
+{"svca",        SC(17,1,0),     SC_MASK,     PWRCOM,    PPCVLE,         {SV}},
+{"svcla",       SC(17,1,1),     SC_MASK,     POWER,     PPCVLE,         {SV}},
+
+{"b",           B(18,0,0),      B_MASK,      COM,       PPCVLE,         {LI}},
+{"bl",          B(18,0,1),      B_MASK,      COM,       PPCVLE,         {LI}},
+{"ba",          B(18,1,0),      B_MASK,      COM,       PPCVLE,         {LIA}},
+{"bla",         B(18,1,1),      B_MASK,      COM,       PPCVLE,         {LIA}},
+
+{"mcrf",     XL(19,0), XLBB_MASK|(3<<21)|(3<<16), COM,  PPCVLE,         {BF, BFA}},
+
+{"addpcis",  DX(19,2),          DX_MASK,     POWER9,    PPCVLE,         {RT, DXD}},
+{"subpcis",  DX(19,2),          DX_MASK,     POWER9,    PPCVLE,         {RT, NDXD}},
+
+{"bdnzlr",   XLO(19,BODNZ,16,0),        XLBOBIBB_MASK, PPCCOM,   PPCVLE,        {0}},
+{"bdnzlr-",  XLO(19,BODNZ,16,0),        XLBOBIBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {0}},
+{"bdnzlrl",  XLO(19,BODNZ,16,1),        XLBOBIBB_MASK, PPCCOM,   PPCVLE,        {0}},
+{"bdnzlrl-", XLO(19,BODNZ,16,1),        XLBOBIBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {0}},
+{"bdnzlr+",  XLO(19,BODNZP,16,0),       XLBOBIBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {0}},
+{"bdnzlrl+", XLO(19,BODNZP,16,1),       XLBOBIBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {0}},
+{"bdzlr",    XLO(19,BODZ,16,0),         XLBOBIBB_MASK, PPCCOM,   PPCVLE,        {0}},
+{"bdzlr-",   XLO(19,BODZ,16,0),         XLBOBIBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {0}},
+{"bdzlrl",   XLO(19,BODZ,16,1),         XLBOBIBB_MASK, PPCCOM,   PPCVLE,        {0}},
+{"bdzlrl-",  XLO(19,BODZ,16,1),         XLBOBIBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {0}},
+{"bdzlr+",   XLO(19,BODZP,16,0),        XLBOBIBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {0}},
+{"bdzlrl+",  XLO(19,BODZP,16,1),        XLBOBIBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {0}},
+{"blr",      XLO(19,BOU,16,0),          XLBOBIBB_MASK, PPCCOM,   PPCVLE,        {0}},
+{"br",       XLO(19,BOU,16,0),          XLBOBIBB_MASK, PWRCOM,   PPCVLE,        {0}},
+{"blrl",     XLO(19,BOU,16,1),          XLBOBIBB_MASK, PPCCOM,   PPCVLE,        {0}},
+{"brl",      XLO(19,BOU,16,1),          XLBOBIBB_MASK, PWRCOM,   PPCVLE,        {0}},
+{"bdnzlr-",  XLO(19,BODNZM4,16,0),      XLBOBIBB_MASK, ISA_V2,   PPCVLE,        {0}},
+{"bdnzlrl-", XLO(19,BODNZM4,16,1),      XLBOBIBB_MASK, ISA_V2,   PPCVLE,        {0}},
+{"bdnzlr+",  XLO(19,BODNZP4,16,0),      XLBOBIBB_MASK, ISA_V2,   PPCVLE,        {0}},
+{"bdnzlrl+", XLO(19,BODNZP4,16,1),      XLBOBIBB_MASK, ISA_V2,   PPCVLE,        {0}},
+{"bdzlr-",   XLO(19,BODZM4,16,0),       XLBOBIBB_MASK, ISA_V2,   PPCVLE,        {0}},
+{"bdzlrl-",  XLO(19,BODZM4,16,1),       XLBOBIBB_MASK, ISA_V2,   PPCVLE,        {0}},
+{"bdzlr+",   XLO(19,BODZP4,16,0),       XLBOBIBB_MASK, ISA_V2,   PPCVLE,        {0}},
+{"bdzlrl+",  XLO(19,BODZP4,16,1),       XLBOBIBB_MASK, ISA_V2,   PPCVLE,        {0}},
+
+{"bgelr",    XLOCB(19,BOF,CBLT,16,0),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"bgelr-",   XLOCB(19,BOF,CBLT,16,0),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bger",     XLOCB(19,BOF,CBLT,16,0),   XLBOCBBB_MASK, PWRCOM,   PPCVLE,        {CR}},
+{"bnllr",    XLOCB(19,BOF,CBLT,16,0),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"bnllr-",   XLOCB(19,BOF,CBLT,16,0),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bnlr",     XLOCB(19,BOF,CBLT,16,0),   XLBOCBBB_MASK, PWRCOM,   PPCVLE,        {CR}},
+{"bgelrl",   XLOCB(19,BOF,CBLT,16,1),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"bgelrl-",  XLOCB(19,BOF,CBLT,16,1),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bgerl",    XLOCB(19,BOF,CBLT,16,1),   XLBOCBBB_MASK, PWRCOM,   PPCVLE,        {CR}},
+{"bnllrl",   XLOCB(19,BOF,CBLT,16,1),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"bnllrl-",  XLOCB(19,BOF,CBLT,16,1),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bnlrl",    XLOCB(19,BOF,CBLT,16,1),   XLBOCBBB_MASK, PWRCOM,   PPCVLE,        {CR}},
+{"blelr",    XLOCB(19,BOF,CBGT,16,0),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"blelr-",   XLOCB(19,BOF,CBGT,16,0),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bler",     XLOCB(19,BOF,CBGT,16,0),   XLBOCBBB_MASK, PWRCOM,   PPCVLE,        {CR}},
+{"bnglr",    XLOCB(19,BOF,CBGT,16,0),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"bnglr-",   XLOCB(19,BOF,CBGT,16,0),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bngr",     XLOCB(19,BOF,CBGT,16,0),   XLBOCBBB_MASK, PWRCOM,   PPCVLE,        {CR}},
+{"blelrl",   XLOCB(19,BOF,CBGT,16,1),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"blelrl-",  XLOCB(19,BOF,CBGT,16,1),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"blerl",    XLOCB(19,BOF,CBGT,16,1),   XLBOCBBB_MASK, PWRCOM,   PPCVLE,        {CR}},
+{"bnglrl",   XLOCB(19,BOF,CBGT,16,1),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"bnglrl-",  XLOCB(19,BOF,CBGT,16,1),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bngrl",    XLOCB(19,BOF,CBGT,16,1),   XLBOCBBB_MASK, PWRCOM,   PPCVLE,        {CR}},
+{"bnelr",    XLOCB(19,BOF,CBEQ,16,0),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"bnelr-",   XLOCB(19,BOF,CBEQ,16,0),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bner",     XLOCB(19,BOF,CBEQ,16,0),   XLBOCBBB_MASK, PWRCOM,   PPCVLE,        {CR}},
+{"bnelrl",   XLOCB(19,BOF,CBEQ,16,1),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"bnelrl-",  XLOCB(19,BOF,CBEQ,16,1),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bnerl",    XLOCB(19,BOF,CBEQ,16,1),   XLBOCBBB_MASK, PWRCOM,   PPCVLE,        {CR}},
+{"bnslr",    XLOCB(19,BOF,CBSO,16,0),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"bnslr-",   XLOCB(19,BOF,CBSO,16,0),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bnsr",     XLOCB(19,BOF,CBSO,16,0),   XLBOCBBB_MASK, PWRCOM,   PPCVLE,        {CR}},
+{"bnulr",    XLOCB(19,BOF,CBSO,16,0),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"bnulr-",   XLOCB(19,BOF,CBSO,16,0),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bnslrl",   XLOCB(19,BOF,CBSO,16,1),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"bnslrl-",  XLOCB(19,BOF,CBSO,16,1),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bnsrl",    XLOCB(19,BOF,CBSO,16,1),   XLBOCBBB_MASK, PWRCOM,   PPCVLE,        {CR}},
+{"bnulrl",   XLOCB(19,BOF,CBSO,16,1),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"bnulrl-",  XLOCB(19,BOF,CBSO,16,1),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bgelr+",   XLOCB(19,BOFP,CBLT,16,0),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bnllr+",   XLOCB(19,BOFP,CBLT,16,0),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bgelrl+",  XLOCB(19,BOFP,CBLT,16,1),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bnllrl+",  XLOCB(19,BOFP,CBLT,16,1),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"blelr+",   XLOCB(19,BOFP,CBGT,16,0),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bnglr+",   XLOCB(19,BOFP,CBGT,16,0),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"blelrl+",  XLOCB(19,BOFP,CBGT,16,1),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bnglrl+",  XLOCB(19,BOFP,CBGT,16,1),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bnelr+",   XLOCB(19,BOFP,CBEQ,16,0),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bnelrl+",  XLOCB(19,BOFP,CBEQ,16,1),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bnslr+",   XLOCB(19,BOFP,CBSO,16,0),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bnulr+",   XLOCB(19,BOFP,CBSO,16,0),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bnslrl+",  XLOCB(19,BOFP,CBSO,16,1),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bnulrl+",  XLOCB(19,BOFP,CBSO,16,1),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bgelr-",   XLOCB(19,BOFM4,CBLT,16,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bnllr-",   XLOCB(19,BOFM4,CBLT,16,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bgelrl-",  XLOCB(19,BOFM4,CBLT,16,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bnllrl-",  XLOCB(19,BOFM4,CBLT,16,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"blelr-",   XLOCB(19,BOFM4,CBGT,16,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bnglr-",   XLOCB(19,BOFM4,CBGT,16,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"blelrl-",  XLOCB(19,BOFM4,CBGT,16,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bnglrl-",  XLOCB(19,BOFM4,CBGT,16,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bnelr-",   XLOCB(19,BOFM4,CBEQ,16,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bnelrl-",  XLOCB(19,BOFM4,CBEQ,16,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bnslr-",   XLOCB(19,BOFM4,CBSO,16,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bnulr-",   XLOCB(19,BOFM4,CBSO,16,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bnslrl-",  XLOCB(19,BOFM4,CBSO,16,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bnulrl-",  XLOCB(19,BOFM4,CBSO,16,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bgelr+",   XLOCB(19,BOFP4,CBLT,16,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bnllr+",   XLOCB(19,BOFP4,CBLT,16,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bgelrl+",  XLOCB(19,BOFP4,CBLT,16,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bnllrl+",  XLOCB(19,BOFP4,CBLT,16,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"blelr+",   XLOCB(19,BOFP4,CBGT,16,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bnglr+",   XLOCB(19,BOFP4,CBGT,16,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"blelrl+",  XLOCB(19,BOFP4,CBGT,16,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bnglrl+",  XLOCB(19,BOFP4,CBGT,16,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bnelr+",   XLOCB(19,BOFP4,CBEQ,16,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bnelrl+",  XLOCB(19,BOFP4,CBEQ,16,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bnslr+",   XLOCB(19,BOFP4,CBSO,16,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bnulr+",   XLOCB(19,BOFP4,CBSO,16,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bnslrl+",  XLOCB(19,BOFP4,CBSO,16,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bnulrl+",  XLOCB(19,BOFP4,CBSO,16,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bltlr",    XLOCB(19,BOT,CBLT,16,0),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"bltlr-",   XLOCB(19,BOT,CBLT,16,0),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bltr",     XLOCB(19,BOT,CBLT,16,0),   XLBOCBBB_MASK, PWRCOM,   PPCVLE,        {CR}},
+{"bltlrl",   XLOCB(19,BOT,CBLT,16,1),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"bltlrl-",  XLOCB(19,BOT,CBLT,16,1),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bltrl",    XLOCB(19,BOT,CBLT,16,1),   XLBOCBBB_MASK, PWRCOM,   PPCVLE,        {CR}},
+{"bgtlr",    XLOCB(19,BOT,CBGT,16,0),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"bgtlr-",   XLOCB(19,BOT,CBGT,16,0),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bgtr",     XLOCB(19,BOT,CBGT,16,0),   XLBOCBBB_MASK, PWRCOM,   PPCVLE,        {CR}},
+{"bgtlrl",   XLOCB(19,BOT,CBGT,16,1),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"bgtlrl-",  XLOCB(19,BOT,CBGT,16,1),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bgtrl",    XLOCB(19,BOT,CBGT,16,1),   XLBOCBBB_MASK, PWRCOM,   PPCVLE,        {CR}},
+{"beqlr",    XLOCB(19,BOT,CBEQ,16,0),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"beqlr-",   XLOCB(19,BOT,CBEQ,16,0),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"beqr",     XLOCB(19,BOT,CBEQ,16,0),   XLBOCBBB_MASK, PWRCOM,   PPCVLE,        {CR}},
+{"beqlrl",   XLOCB(19,BOT,CBEQ,16,1),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"beqlrl-",  XLOCB(19,BOT,CBEQ,16,1),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"beqrl",    XLOCB(19,BOT,CBEQ,16,1),   XLBOCBBB_MASK, PWRCOM,   PPCVLE,        {CR}},
+{"bsolr",    XLOCB(19,BOT,CBSO,16,0),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"bsolr-",   XLOCB(19,BOT,CBSO,16,0),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bsor",     XLOCB(19,BOT,CBSO,16,0),   XLBOCBBB_MASK, PWRCOM,   PPCVLE,        {CR}},
+{"bunlr",    XLOCB(19,BOT,CBSO,16,0),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"bunlr-",   XLOCB(19,BOT,CBSO,16,0),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bsolrl",   XLOCB(19,BOT,CBSO,16,1),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"bsolrl-",  XLOCB(19,BOT,CBSO,16,1),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bsorl",    XLOCB(19,BOT,CBSO,16,1),   XLBOCBBB_MASK, PWRCOM,   PPCVLE,        {CR}},
+{"bunlrl",   XLOCB(19,BOT,CBSO,16,1),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"bunlrl-",  XLOCB(19,BOT,CBSO,16,1),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bltlr+",   XLOCB(19,BOTP,CBLT,16,0),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bltlrl+",  XLOCB(19,BOTP,CBLT,16,1),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bgtlr+",   XLOCB(19,BOTP,CBGT,16,0),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bgtlrl+",  XLOCB(19,BOTP,CBGT,16,1),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"beqlr+",   XLOCB(19,BOTP,CBEQ,16,0),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"beqlrl+",  XLOCB(19,BOTP,CBEQ,16,1),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bsolr+",   XLOCB(19,BOTP,CBSO,16,0),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bunlr+",   XLOCB(19,BOTP,CBSO,16,0),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bsolrl+",  XLOCB(19,BOTP,CBSO,16,1),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bunlrl+",  XLOCB(19,BOTP,CBSO,16,1),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bltlr-",   XLOCB(19,BOTM4,CBLT,16,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bltlrl-",  XLOCB(19,BOTM4,CBLT,16,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bgtlr-",   XLOCB(19,BOTM4,CBGT,16,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bgtlrl-",  XLOCB(19,BOTM4,CBGT,16,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"beqlr-",   XLOCB(19,BOTM4,CBEQ,16,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"beqlrl-",  XLOCB(19,BOTM4,CBEQ,16,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bsolr-",   XLOCB(19,BOTM4,CBSO,16,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bunlr-",   XLOCB(19,BOTM4,CBSO,16,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bsolrl-",  XLOCB(19,BOTM4,CBSO,16,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bunlrl-",  XLOCB(19,BOTM4,CBSO,16,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bltlr+",   XLOCB(19,BOTP4,CBLT,16,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bltlrl+",  XLOCB(19,BOTP4,CBLT,16,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bgtlr+",   XLOCB(19,BOTP4,CBGT,16,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bgtlrl+",  XLOCB(19,BOTP4,CBGT,16,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"beqlr+",   XLOCB(19,BOTP4,CBEQ,16,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"beqlrl+",  XLOCB(19,BOTP4,CBEQ,16,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bsolr+",   XLOCB(19,BOTP4,CBSO,16,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bunlr+",   XLOCB(19,BOTP4,CBSO,16,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bsolrl+",  XLOCB(19,BOTP4,CBSO,16,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bunlrl+",  XLOCB(19,BOTP4,CBSO,16,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+
+{"bdnzflr",  XLO(19,BODNZF,16,0),       XLBOBB_MASK,   PPCCOM,   PPCVLE,        {BI}},
+{"bdnzflr-", XLO(19,BODNZF,16,0),       XLBOBB_MASK,   PPCCOM,   ISA_V2|PPCVLE, {BI}},
+{"bdnzflrl", XLO(19,BODNZF,16,1),       XLBOBB_MASK,   PPCCOM,   PPCVLE,        {BI}},
+{"bdnzflrl-",XLO(19,BODNZF,16,1),       XLBOBB_MASK,   PPCCOM,   ISA_V2|PPCVLE, {BI}},
+{"bdnzflr+", XLO(19,BODNZFP,16,0),      XLBOBB_MASK,   PPCCOM,   ISA_V2|PPCVLE, {BI}},
+{"bdnzflrl+",XLO(19,BODNZFP,16,1),      XLBOBB_MASK,   PPCCOM,   ISA_V2|PPCVLE, {BI}},
+{"bdzflr",   XLO(19,BODZF,16,0),        XLBOBB_MASK,   PPCCOM,   PPCVLE,        {BI}},
+{"bdzflr-",  XLO(19,BODZF,16,0),        XLBOBB_MASK,   PPCCOM,   ISA_V2|PPCVLE, {BI}},
+{"bdzflrl",  XLO(19,BODZF,16,1),        XLBOBB_MASK,   PPCCOM,   PPCVLE,        {BI}},
+{"bdzflrl-", XLO(19,BODZF,16,1),        XLBOBB_MASK,   PPCCOM,   ISA_V2|PPCVLE, {BI}},
+{"bdzflr+",  XLO(19,BODZFP,16,0),       XLBOBB_MASK,   PPCCOM,   ISA_V2|PPCVLE, {BI}},
+{"bdzflrl+", XLO(19,BODZFP,16,1),       XLBOBB_MASK,   PPCCOM,   ISA_V2|PPCVLE, {BI}},
+{"bflr",     XLO(19,BOF,16,0),          XLBOBB_MASK,   PPCCOM,   PPCVLE,        {BI}},
+{"bflr-",    XLO(19,BOF,16,0),          XLBOBB_MASK,   PPCCOM,   ISA_V2|PPCVLE, {BI}},
+{"bbfr",     XLO(19,BOF,16,0),          XLBOBB_MASK,   PWRCOM,   PPCVLE,        {BI}},
+{"bflrl",    XLO(19,BOF,16,1),          XLBOBB_MASK,   PPCCOM,   PPCVLE,        {BI}},
+{"bflrl-",   XLO(19,BOF,16,1),          XLBOBB_MASK,   PPCCOM,   ISA_V2|PPCVLE, {BI}},
+{"bbfrl",    XLO(19,BOF,16,1),          XLBOBB_MASK,   PWRCOM,   PPCVLE,        {BI}},
+{"bflr+",    XLO(19,BOFP,16,0),         XLBOBB_MASK,   PPCCOM,   ISA_V2|PPCVLE, {BI}},
+{"bflrl+",   XLO(19,BOFP,16,1),         XLBOBB_MASK,   PPCCOM,   ISA_V2|PPCVLE, {BI}},
+{"bflr-",    XLO(19,BOFM4,16,0),        XLBOBB_MASK,   ISA_V2,   PPCVLE,        {BI}},
+{"bflrl-",   XLO(19,BOFM4,16,1),        XLBOBB_MASK,   ISA_V2,   PPCVLE,        {BI}},
+{"bflr+",    XLO(19,BOFP4,16,0),        XLBOBB_MASK,   ISA_V2,   PPCVLE,        {BI}},
+{"bflrl+",   XLO(19,BOFP4,16,1),        XLBOBB_MASK,   ISA_V2,   PPCVLE,        {BI}},
+{"bdnztlr",  XLO(19,BODNZT,16,0),       XLBOBB_MASK,   PPCCOM,   PPCVLE,        {BI}},
+{"bdnztlr-", XLO(19,BODNZT,16,0),       XLBOBB_MASK,   PPCCOM,   ISA_V2|PPCVLE, {BI}},
+{"bdnztlrl", XLO(19,BODNZT,16,1),       XLBOBB_MASK,   PPCCOM,   PPCVLE,        {BI}},
+{"bdnztlrl-", XLO(19,BODNZT,16,1),      XLBOBB_MASK,   PPCCOM,   ISA_V2|PPCVLE, {BI}},
+{"bdnztlr+", XLO(19,BODNZTP,16,0),      XLBOBB_MASK,   PPCCOM,   ISA_V2|PPCVLE, {BI}},
+{"bdnztlrl+", XLO(19,BODNZTP,16,1),     XLBOBB_MASK,   PPCCOM,   ISA_V2|PPCVLE, {BI}},
+{"bdztlr",   XLO(19,BODZT,16,0),        XLBOBB_MASK,   PPCCOM,   PPCVLE,        {BI}},
+{"bdztlr-",  XLO(19,BODZT,16,0),        XLBOBB_MASK,   PPCCOM,   ISA_V2|PPCVLE, {BI}},
+{"bdztlrl",  XLO(19,BODZT,16,1),        XLBOBB_MASK,   PPCCOM,   PPCVLE,        {BI}},
+{"bdztlrl-", XLO(19,BODZT,16,1),        XLBOBB_MASK,   PPCCOM,   ISA_V2|PPCVLE, {BI}},
+{"bdztlr+",  XLO(19,BODZTP,16,0),       XLBOBB_MASK,   PPCCOM,   ISA_V2|PPCVLE, {BI}},
+{"bdztlrl+", XLO(19,BODZTP,16,1),       XLBOBB_MASK,   PPCCOM,   ISA_V2|PPCVLE, {BI}},
+{"btlr",     XLO(19,BOT,16,0),          XLBOBB_MASK,   PPCCOM,   PPCVLE,        {BI}},
+{"btlr-",    XLO(19,BOT,16,0),          XLBOBB_MASK,   PPCCOM,   ISA_V2|PPCVLE, {BI}},
+{"bbtr",     XLO(19,BOT,16,0),          XLBOBB_MASK,   PWRCOM,   PPCVLE,        {BI}},
+{"btlrl",    XLO(19,BOT,16,1),          XLBOBB_MASK,   PPCCOM,   PPCVLE,        {BI}},
+{"btlrl-",   XLO(19,BOT,16,1),          XLBOBB_MASK,   PPCCOM,   ISA_V2|PPCVLE, {BI}},
+{"bbtrl",    XLO(19,BOT,16,1),          XLBOBB_MASK,   PWRCOM,   PPCVLE,        {BI}},
+{"btlr+",    XLO(19,BOTP,16,0),         XLBOBB_MASK,   PPCCOM,   ISA_V2|PPCVLE, {BI}},
+{"btlrl+",   XLO(19,BOTP,16,1),         XLBOBB_MASK,   PPCCOM,   ISA_V2|PPCVLE, {BI}},
+{"btlr-",    XLO(19,BOTM4,16,0),        XLBOBB_MASK,   ISA_V2,   PPCVLE,        {BI}},
+{"btlrl-",   XLO(19,BOTM4,16,1),        XLBOBB_MASK,   ISA_V2,   PPCVLE,        {BI}},
+{"btlr+",    XLO(19,BOTP4,16,0),        XLBOBB_MASK,   ISA_V2,   PPCVLE,        {BI}},
+{"btlrl+",   XLO(19,BOTP4,16,1),        XLBOBB_MASK,   ISA_V2,   PPCVLE,        {BI}},
+
+{"bclr-",    XLYLK(19,16,0,0),          XLYBB_MASK,    PPCCOM,   PPCVLE,        {BOE, BI}},
+{"bclrl-",   XLYLK(19,16,0,1),          XLYBB_MASK,    PPCCOM,   PPCVLE,        {BOE, BI}},
+{"bclr+",    XLYLK(19,16,1,0),          XLYBB_MASK,    PPCCOM,   PPCVLE,        {BOE, BI}},
+{"bclrl+",   XLYLK(19,16,1,1),          XLYBB_MASK,    PPCCOM,   PPCVLE,        {BOE, BI}},
+{"bclr",     XLLK(19,16,0),             XLBH_MASK,     PPCCOM,   PPCVLE,        {BO, BI, BH}},
+{"bcr",      XLLK(19,16,0),             XLBB_MASK,     PWRCOM,   PPCVLE,        {BO, BI}},
+{"bclrl",    XLLK(19,16,1),             XLBH_MASK,     PPCCOM,   PPCVLE,        {BO, BI, BH}},
+{"bcrl",     XLLK(19,16,1),             XLBB_MASK,     PWRCOM,   PPCVLE,        {BO, BI}},
+
+{"rfid",        XL(19,18),      0xffffffff,  PPC64,     PPCVLE, {0}},
+
+{"crnot",       XL(19,33),      XL_MASK,     PPCCOM,    PPCVLE,         {BT, BA, BBA}},
+{"crnor",       XL(19,33),      XL_MASK,     COM,       PPCVLE,         {BT, BA, BB}},
+{"rfmci",       X(19,38),    0xffffffff, PPCRFMCI|PPCA2|PPC476, PPCVLE, {0}},
+
+{"rfdi",        XL(19,39),      0xffffffff,  E500MC,    PPCVLE,         {0}},
+{"rfi",         XL(19,50),      0xffffffff,  COM,       PPCVLE,         {0}},
+{"rfci",        XL(19,51), 0xffffffff, PPC403|BOOKE|PPCE300|PPCA2|PPC476, PPCVLE, {0}},
+
+{"rfsvc",       XL(19,82),      0xffffffff,  POWER,     PPCVLE,         {0}},
+
+{"rfgi",        XL(19,102),   0xffffffff, E500MC|PPCA2, PPCVLE,         {0}},
+
+{"crandc",      XL(19,129),     XL_MASK,     COM,       PPCVLE,         {BT, BA, BB}},
+
+{"rfebb",       XL(19,146),     XLS_MASK,    POWER8,    PPCVLE,         {SXL}},
+
+{"isync",       XL(19,150),     0xffffffff,  PPCCOM,    PPCVLE,         {0}},
+{"ics",         XL(19,150),     0xffffffff,  PWRCOM,    PPCVLE,         {0}},
+
+{"crclr",       XL(19,193),     XL_MASK,     PPCCOM,    PPCVLE,         {BT, BAT, BBA}},
+{"crxor",       XL(19,193),     XL_MASK,     COM,       PPCVLE,         {BT, BA, BB}},
+
+{"dnh",         X(19,198),      X_MASK,      E500MC,    PPCVLE,         {DUI, DUIS}},
+
+{"crnand",      XL(19,225),     XL_MASK,     COM,       PPCVLE,         {BT, BA, BB}},
+
+{"crand",       XL(19,257),     XL_MASK,     COM,       PPCVLE,         {BT, BA, BB}},
+
+{"hrfid",       XL(19,274),    0xffffffff, POWER5|CELL, PPC476|PPCVLE,  {0}},
+
+{"crset",       XL(19,289),     XL_MASK,     PPCCOM,    PPCVLE,         {BT, BAT, BBA}},
+{"creqv",       XL(19,289),     XL_MASK,     COM,       PPCVLE,         {BT, BA, BB}},
+
+{"urfid",       XL(19,306),     0xffffffff,  POWER9,    PPCVLE,         {0}},
+{"stop",        XL(19,370),     0xffffffff,  POWER9,    PPCVLE,         {0}},
+
+{"doze",        XL(19,402),     0xffffffff,  POWER6,    POWER9|PPCVLE,  {0}},
+
+{"crorc",       XL(19,417),     XL_MASK,     COM,       PPCVLE,         {BT, BA, BB}},
+
+{"nap",         XL(19,434),     0xffffffff,  POWER6,    POWER9|PPCVLE,  {0}},
+
+{"crmove",      XL(19,449),     XL_MASK,     PPCCOM,    PPCVLE,         {BT, BA, BBA}},
+{"cror",        XL(19,449),     XL_MASK,     COM,       PPCVLE,         {BT, BA, BB}},
+
+{"sleep",       XL(19,466),     0xffffffff,  POWER6,    POWER9|PPCVLE,  {0}},
+{"rvwinkle",    XL(19,498),     0xffffffff,  POWER6,    POWER9|PPCVLE,  {0}},
+
+{"bctr",    XLO(19,BOU,528,0),          XLBOBIBB_MASK, COM,      PPCVLE,        {0}},
+{"bctrl",   XLO(19,BOU,528,1),          XLBOBIBB_MASK, COM,      PPCVLE,        {0}},
+
+{"bgectr",  XLOCB(19,BOF,CBLT,528,0),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"bgectr-", XLOCB(19,BOF,CBLT,528,0),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bnlctr",  XLOCB(19,BOF,CBLT,528,0),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"bnlctr-", XLOCB(19,BOF,CBLT,528,0),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bgectrl", XLOCB(19,BOF,CBLT,528,1),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"bgectrl-",XLOCB(19,BOF,CBLT,528,1),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bnlctrl", XLOCB(19,BOF,CBLT,528,1),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"bnlctrl-",XLOCB(19,BOF,CBLT,528,1),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"blectr",  XLOCB(19,BOF,CBGT,528,0),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"blectr-", XLOCB(19,BOF,CBGT,528,0),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bngctr",  XLOCB(19,BOF,CBGT,528,0),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"bngctr-", XLOCB(19,BOF,CBGT,528,0),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"blectrl", XLOCB(19,BOF,CBGT,528,1),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"blectrl-",XLOCB(19,BOF,CBGT,528,1),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bngctrl", XLOCB(19,BOF,CBGT,528,1),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"bngctrl-",XLOCB(19,BOF,CBGT,528,1),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bnectr",  XLOCB(19,BOF,CBEQ,528,0),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"bnectr-", XLOCB(19,BOF,CBEQ,528,0),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bnectrl", XLOCB(19,BOF,CBEQ,528,1),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"bnectrl-",XLOCB(19,BOF,CBEQ,528,1),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bnsctr",  XLOCB(19,BOF,CBSO,528,0),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"bnsctr-", XLOCB(19,BOF,CBSO,528,0),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bnuctr",  XLOCB(19,BOF,CBSO,528,0),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"bnuctr-", XLOCB(19,BOF,CBSO,528,0),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bnsctrl", XLOCB(19,BOF,CBSO,528,1),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"bnsctrl-",XLOCB(19,BOF,CBSO,528,1),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bnuctrl", XLOCB(19,BOF,CBSO,528,1),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"bnuctrl-",XLOCB(19,BOF,CBSO,528,1),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bgectr+", XLOCB(19,BOFP,CBLT,528,0),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bnlctr+", XLOCB(19,BOFP,CBLT,528,0),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bgectrl+",XLOCB(19,BOFP,CBLT,528,1),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bnlctrl+",XLOCB(19,BOFP,CBLT,528,1),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"blectr+", XLOCB(19,BOFP,CBGT,528,0),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bngctr+", XLOCB(19,BOFP,CBGT,528,0),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"blectrl+",XLOCB(19,BOFP,CBGT,528,1),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bngctrl+",XLOCB(19,BOFP,CBGT,528,1),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bnectr+", XLOCB(19,BOFP,CBEQ,528,0),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bnectrl+",XLOCB(19,BOFP,CBEQ,528,1),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bnsctr+", XLOCB(19,BOFP,CBSO,528,0),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bnuctr+", XLOCB(19,BOFP,CBSO,528,0),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bnsctrl+",XLOCB(19,BOFP,CBSO,528,1),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bnuctrl+",XLOCB(19,BOFP,CBSO,528,1),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bgectr-", XLOCB(19,BOFM4,CBLT,528,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bnlctr-", XLOCB(19,BOFM4,CBLT,528,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bgectrl-",XLOCB(19,BOFM4,CBLT,528,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bnlctrl-",XLOCB(19,BOFM4,CBLT,528,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"blectr-", XLOCB(19,BOFM4,CBGT,528,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bngctr-", XLOCB(19,BOFM4,CBGT,528,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"blectrl-",XLOCB(19,BOFM4,CBGT,528,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bngctrl-",XLOCB(19,BOFM4,CBGT,528,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bnectr-", XLOCB(19,BOFM4,CBEQ,528,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bnectrl-",XLOCB(19,BOFM4,CBEQ,528,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bnsctr-", XLOCB(19,BOFM4,CBSO,528,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bnuctr-", XLOCB(19,BOFM4,CBSO,528,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bnsctrl-",XLOCB(19,BOFM4,CBSO,528,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bnuctrl-",XLOCB(19,BOFM4,CBSO,528,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bgectr+", XLOCB(19,BOFP4,CBLT,528,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bnlctr+", XLOCB(19,BOFP4,CBLT,528,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bgectrl+",XLOCB(19,BOFP4,CBLT,528,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bnlctrl+",XLOCB(19,BOFP4,CBLT,528,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"blectr+", XLOCB(19,BOFP4,CBGT,528,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bngctr+", XLOCB(19,BOFP4,CBGT,528,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"blectrl+",XLOCB(19,BOFP4,CBGT,528,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bngctrl+",XLOCB(19,BOFP4,CBGT,528,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bnectr+", XLOCB(19,BOFP4,CBEQ,528,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bnectrl+",XLOCB(19,BOFP4,CBEQ,528,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bnsctr+", XLOCB(19,BOFP4,CBSO,528,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bnuctr+", XLOCB(19,BOFP4,CBSO,528,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bnsctrl+",XLOCB(19,BOFP4,CBSO,528,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bnuctrl+",XLOCB(19,BOFP4,CBSO,528,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bltctr",  XLOCB(19,BOT,CBLT,528,0),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"bltctr-", XLOCB(19,BOT,CBLT,528,0),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bltctrl", XLOCB(19,BOT,CBLT,528,1),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"bltctrl-",XLOCB(19,BOT,CBLT,528,1),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bgtctr",  XLOCB(19,BOT,CBGT,528,0),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"bgtctr-", XLOCB(19,BOT,CBGT,528,0),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bgtctrl", XLOCB(19,BOT,CBGT,528,1),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"bgtctrl-",XLOCB(19,BOT,CBGT,528,1),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"beqctr",  XLOCB(19,BOT,CBEQ,528,0),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"beqctr-", XLOCB(19,BOT,CBEQ,528,0),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"beqctrl", XLOCB(19,BOT,CBEQ,528,1),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"beqctrl-",XLOCB(19,BOT,CBEQ,528,1),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bsoctr",  XLOCB(19,BOT,CBSO,528,0),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"bsoctr-", XLOCB(19,BOT,CBSO,528,0),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bunctr",  XLOCB(19,BOT,CBSO,528,0),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"bunctr-", XLOCB(19,BOT,CBSO,528,0),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bsoctrl", XLOCB(19,BOT,CBSO,528,1),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"bsoctrl-",XLOCB(19,BOT,CBSO,528,1),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bunctrl", XLOCB(19,BOT,CBSO,528,1),   XLBOCBBB_MASK, PPCCOM,   PPCVLE,        {CR}},
+{"bunctrl-",XLOCB(19,BOT,CBSO,528,1),   XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bltctr+", XLOCB(19,BOTP,CBLT,528,0),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bltctrl+",XLOCB(19,BOTP,CBLT,528,1),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bgtctr+", XLOCB(19,BOTP,CBGT,528,0),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bgtctrl+",XLOCB(19,BOTP,CBGT,528,1),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"beqctr+", XLOCB(19,BOTP,CBEQ,528,0),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"beqctrl+",XLOCB(19,BOTP,CBEQ,528,1),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bsoctr+", XLOCB(19,BOTP,CBSO,528,0),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bunctr+", XLOCB(19,BOTP,CBSO,528,0),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bsoctrl+",XLOCB(19,BOTP,CBSO,528,1),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bunctrl+",XLOCB(19,BOTP,CBSO,528,1),  XLBOCBBB_MASK, PPCCOM,   ISA_V2|PPCVLE, {CR}},
+{"bltctr-", XLOCB(19,BOTM4,CBLT,528,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bltctrl-",XLOCB(19,BOTM4,CBLT,528,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bgtctr-", XLOCB(19,BOTM4,CBGT,528,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bgtctrl-",XLOCB(19,BOTM4,CBGT,528,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"beqctr-", XLOCB(19,BOTM4,CBEQ,528,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"beqctrl-",XLOCB(19,BOTM4,CBEQ,528,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bsoctr-", XLOCB(19,BOTM4,CBSO,528,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bunctr-", XLOCB(19,BOTM4,CBSO,528,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bsoctrl-",XLOCB(19,BOTM4,CBSO,528,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bunctrl-",XLOCB(19,BOTM4,CBSO,528,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bltctr+", XLOCB(19,BOTP4,CBLT,528,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bltctrl+",XLOCB(19,BOTP4,CBLT,528,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bgtctr+", XLOCB(19,BOTP4,CBGT,528,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bgtctrl+",XLOCB(19,BOTP4,CBGT,528,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"beqctr+", XLOCB(19,BOTP4,CBEQ,528,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"beqctrl+",XLOCB(19,BOTP4,CBEQ,528,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bsoctr+", XLOCB(19,BOTP4,CBSO,528,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bunctr+", XLOCB(19,BOTP4,CBSO,528,0), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bsoctrl+",XLOCB(19,BOTP4,CBSO,528,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+{"bunctrl+",XLOCB(19,BOTP4,CBSO,528,1), XLBOCBBB_MASK, ISA_V2,   PPCVLE,        {CR}},
+
+{"bfctr",   XLO(19,BOF,528,0),          XLBOBB_MASK,   PPCCOM,   PPCVLE,        {BI}},
+{"bfctr-",  XLO(19,BOF,528,0),          XLBOBB_MASK,   PPCCOM,   ISA_V2|PPCVLE, {BI}},
+{"bfctrl",  XLO(19,BOF,528,1),          XLBOBB_MASK,   PPCCOM,   PPCVLE,        {BI}},
+{"bfctrl-", XLO(19,BOF,528,1),          XLBOBB_MASK,   PPCCOM,   ISA_V2|PPCVLE, {BI}},
+{"bfctr+",  XLO(19,BOFP,528,0),         XLBOBB_MASK,   PPCCOM,   ISA_V2|PPCVLE, {BI}},
+{"bfctrl+", XLO(19,BOFP,528,1),         XLBOBB_MASK,   PPCCOM,   ISA_V2|PPCVLE, {BI}},
+{"bfctr-",  XLO(19,BOFM4,528,0),        XLBOBB_MASK,   ISA_V2,   PPCVLE,        {BI}},
+{"bfctrl-", XLO(19,BOFM4,528,1),        XLBOBB_MASK,   ISA_V2,   PPCVLE,        {BI}},
+{"bfctr+",  XLO(19,BOFP4,528,0),        XLBOBB_MASK,   ISA_V2,   PPCVLE,        {BI}},
+{"bfctrl+", XLO(19,BOFP4,528,1),        XLBOBB_MASK,   ISA_V2,   PPCVLE,        {BI}},
+{"btctr",   XLO(19,BOT,528,0),          XLBOBB_MASK,   PPCCOM,   PPCVLE,        {BI}},
+{"btctr-",  XLO(19,BOT,528,0),          XLBOBB_MASK,   PPCCOM,   ISA_V2|PPCVLE, {BI}},
+{"btctrl",  XLO(19,BOT,528,1),          XLBOBB_MASK,   PPCCOM,   PPCVLE,        {BI}},
+{"btctrl-", XLO(19,BOT,528,1),          XLBOBB_MASK,   PPCCOM,   ISA_V2|PPCVLE, {BI}},
+{"btctr+",  XLO(19,BOTP,528,0),         XLBOBB_MASK,   PPCCOM,   ISA_V2|PPCVLE, {BI}},
+{"btctrl+", XLO(19,BOTP,528,1),         XLBOBB_MASK,   PPCCOM,   ISA_V2|PPCVLE, {BI}},
+{"btctr-",  XLO(19,BOTM4,528,0),        XLBOBB_MASK,   ISA_V2,   PPCVLE,        {BI}},
+{"btctrl-", XLO(19,BOTM4,528,1),        XLBOBB_MASK,   ISA_V2,   PPCVLE,        {BI}},
+{"btctr+",  XLO(19,BOTP4,528,0),        XLBOBB_MASK,   ISA_V2,   PPCVLE,        {BI}},
+{"btctrl+", XLO(19,BOTP4,528,1),        XLBOBB_MASK,   ISA_V2,   PPCVLE,        {BI}},
+
+{"bcctr-",  XLYLK(19,528,0,0),          XLYBB_MASK,    PPCCOM,   PPCVLE,        {BOE, BI}},
+{"bcctrl-", XLYLK(19,528,0,1),          XLYBB_MASK,    PPCCOM,   PPCVLE,        {BOE, BI}},
+{"bcctr+",  XLYLK(19,528,1,0),          XLYBB_MASK,    PPCCOM,   PPCVLE,        {BOE, BI}},
+{"bcctrl+", XLYLK(19,528,1,1),          XLYBB_MASK,    PPCCOM,   PPCVLE,        {BOE, BI}},
+{"bcctr",   XLLK(19,528,0),             XLBH_MASK,     PPCCOM,   PPCVLE,        {BO, BI, BH}},
+{"bcc",     XLLK(19,528,0),             XLBB_MASK,     PWRCOM,   PPCVLE,        {BO, BI}},
+{"bcctrl",  XLLK(19,528,1),             XLBH_MASK,     PPCCOM,   PPCVLE,        {BO, BI, BH}},
+{"bccl",    XLLK(19,528,1),             XLBB_MASK,     PWRCOM,   PPCVLE,        {BO, BI}},
+
+{"bctar-",  XLYLK(19,560,0,0),          XLYBB_MASK,    POWER8,   PPCVLE,        {BOE, BI}},
+{"bctarl-", XLYLK(19,560,0,1),          XLYBB_MASK,    POWER8,   PPCVLE,        {BOE, BI}},
+{"bctar+",  XLYLK(19,560,1,0),          XLYBB_MASK,    POWER8,   PPCVLE,        {BOE, BI}},
+{"bctarl+", XLYLK(19,560,1,1),          XLYBB_MASK,    POWER8,   PPCVLE,        {BOE, BI}},
+{"bctar",   XLLK(19,560,0),             XLBH_MASK,     POWER8,   PPCVLE,        {BO, BI, BH}},
+{"bctarl",  XLLK(19,560,1),             XLBH_MASK,     POWER8,   PPCVLE,        {BO, BI, BH}},
+
+{"rlwimi",      M(20,0),        M_MASK,      PPCCOM,    PPCVLE,         {RA, RS, SH, MBE, ME}},
+{"rlimi",       M(20,0),        M_MASK,      PWRCOM,    PPCVLE,         {RA, RS, SH, MBE, ME}},
+
+{"rlwimi.",     M(20,1),        M_MASK,      PPCCOM,    PPCVLE,         {RA, RS, SH, MBE, ME}},
+{"rlimi.",      M(20,1),        M_MASK,      PWRCOM,    PPCVLE,         {RA, RS, SH, MBE, ME}},
+
+{"rotlwi",      MME(21,31,0),   MMBME_MASK,  PPCCOM,    PPCVLE,         {RA, RS, SH}},
+{"clrlwi",      MME(21,31,0),   MSHME_MASK,  PPCCOM,    PPCVLE,         {RA, RS, MB}},
+{"rlwinm",      M(21,0),        M_MASK,      PPCCOM,    PPCVLE,         {RA, RS, SH, MBE, ME}},
+{"rlinm",       M(21,0),        M_MASK,      PWRCOM,    PPCVLE,         {RA, RS, SH, MBE, ME}},
+{"rotlwi.",     MME(21,31,1),   MMBME_MASK,  PPCCOM,    PPCVLE,         {RA, RS, SH}},
+{"clrlwi.",     MME(21,31,1),   MSHME_MASK,  PPCCOM,    PPCVLE,         {RA, RS, MB}},
+{"rlwinm.",     M(21,1),        M_MASK,      PPCCOM,    PPCVLE,         {RA, RS, SH, MBE, ME}},
+{"rlinm.",      M(21,1),        M_MASK,      PWRCOM,    PPCVLE,         {RA, RS, SH, MBE, ME}},
+
+{"rlmi",        M(22,0),        M_MASK,      M601,      PPCVLE,         {RA, RS, RB, MBE, ME}},
+{"rlmi.",       M(22,1),        M_MASK,      M601,      PPCVLE,         {RA, RS, RB, MBE, ME}},
+
+{"rotlw",       MME(23,31,0),   MMBME_MASK,  PPCCOM,    PPCVLE,         {RA, RS, RB}},
+{"rlwnm",       M(23,0),        M_MASK,      PPCCOM,    PPCVLE,         {RA, RS, RB, MBE, ME}},
+{"rlnm",        M(23,0),        M_MASK,      PWRCOM,    PPCVLE,         {RA, RS, RB, MBE, ME}},
+{"rotlw.",      MME(23,31,1),   MMBME_MASK,  PPCCOM,    PPCVLE,         {RA, RS, RB}},
+{"rlwnm.",      M(23,1),        M_MASK,      PPCCOM,    PPCVLE,         {RA, RS, RB, MBE, ME}},
+{"rlnm.",       M(23,1),        M_MASK,      PWRCOM,    PPCVLE,         {RA, RS, RB, MBE, ME}},
+
+{"nop",         OP(24),         0xffffffff,  PPCCOM,    PPCVLE,         {0}},
+{"ori",         OP(24),         OP_MASK,     PPCCOM,    PPCVLE,         {RA, RS, UI}},
+{"oril",        OP(24),         OP_MASK,     PWRCOM,    PPCVLE,         {RA, RS, UI}},
+
+{"oris",        OP(25),         OP_MASK,     PPCCOM,    PPCVLE,         {RA, RS, UI}},
+{"oriu",        OP(25),         OP_MASK,     PWRCOM,    PPCVLE,         {RA, RS, UI}},
+
+{"xnop",        OP(26),         0xffffffff,  PPCCOM,    PPCVLE,         {0}},
+{"xori",        OP(26),         OP_MASK,     PPCCOM,    PPCVLE,         {RA, RS, UI}},
+{"xoril",       OP(26),         OP_MASK,     PWRCOM,    PPCVLE,         {RA, RS, UI}},
+
+{"xoris",       OP(27),         OP_MASK,     PPCCOM,    PPCVLE,         {RA, RS, UI}},
+{"xoriu",       OP(27),         OP_MASK,     PWRCOM,    PPCVLE,         {RA, RS, UI}},
+
+{"andi.",       OP(28),         OP_MASK,     PPCCOM,    PPCVLE,         {RA, RS, UI}},
+{"andil.",      OP(28),         OP_MASK,     PWRCOM,    PPCVLE,         {RA, RS, UI}},
+
+{"andis.",      OP(29),         OP_MASK,     PPCCOM,    PPCVLE,         {RA, RS, UI}},
+{"andiu.",      OP(29),         OP_MASK,     PWRCOM,    PPCVLE,         {RA, RS, UI}},
+
+{"rotldi",      MD(30,0,0),     MDMB_MASK,   PPC64,     PPCVLE,         {RA, RS, SH6}},
+{"clrldi",      MD(30,0,0),     MDSH_MASK,   PPC64,     PPCVLE,         {RA, RS, MB6}},
+{"rldicl",      MD(30,0,0),     MD_MASK,     PPC64,     PPCVLE,         {RA, RS, SH6, MB6}},
+{"rotldi.",     MD(30,0,1),     MDMB_MASK,   PPC64,     PPCVLE,         {RA, RS, SH6}},
+{"clrldi.",     MD(30,0,1),     MDSH_MASK,   PPC64,     PPCVLE,         {RA, RS, MB6}},
+{"rldicl.",     MD(30,0,1),     MD_MASK,     PPC64,     PPCVLE,         {RA, RS, SH6, MB6}},
+
+{"rldicr",      MD(30,1,0),     MD_MASK,     PPC64,     PPCVLE,         {RA, RS, SH6, ME6}},
+{"rldicr.",     MD(30,1,1),     MD_MASK,     PPC64,     PPCVLE,         {RA, RS, SH6, ME6}},
+
+{"rldic",       MD(30,2,0),     MD_MASK,     PPC64,     PPCVLE,         {RA, RS, SH6, MB6}},
+{"rldic.",      MD(30,2,1),     MD_MASK,     PPC64,     PPCVLE,         {RA, RS, SH6, MB6}},
+
+{"rldimi",      MD(30,3,0),     MD_MASK,     PPC64,     PPCVLE,         {RA, RS, SH6, MB6}},
+{"rldimi.",     MD(30,3,1),     MD_MASK,     PPC64,     PPCVLE,         {RA, RS, SH6, MB6}},
+
+{"rotld",       MDS(30,8,0),    MDSMB_MASK,  PPC64,     PPCVLE,         {RA, RS, RB}},
+{"rldcl",       MDS(30,8,0),    MDS_MASK,    PPC64,     PPCVLE,         {RA, RS, RB, MB6}},
+{"rotld.",      MDS(30,8,1),    MDSMB_MASK,  PPC64,     PPCVLE,         {RA, RS, RB}},
+{"rldcl.",      MDS(30,8,1),    MDS_MASK,    PPC64,     PPCVLE,         {RA, RS, RB, MB6}},
+
+{"rldcr",       MDS(30,9,0),    MDS_MASK,    PPC64,     PPCVLE,         {RA, RS, RB, ME6}},
+{"rldcr.",      MDS(30,9,1),    MDS_MASK,    PPC64,     PPCVLE,         {RA, RS, RB, ME6}},
+
+{"cmpw",        XOPL(31,0,0),   XCMPL_MASK,  PPCCOM,    0,              {OBF, RA, RB}},
+{"cmpd",        XOPL(31,0,1),   XCMPL_MASK,  PPC64,     0,              {OBF, RA, RB}},
+{"cmp",         X(31,0),        XCMP_MASK,   PPC,       0,              {BF, L32OPT, RA, RB}},
+{"cmp",         X(31,0),        XCMPL_MASK,  PWRCOM,    PPC,            {BF, RA, RB}},
+
+{"twlgt",       XTO(31,4,TOLGT), XTO_MASK,   PPCCOM,    0,              {RA, RB}},
+{"tlgt",        XTO(31,4,TOLGT), XTO_MASK,   PWRCOM,    0,              {RA, RB}},
+{"twllt",       XTO(31,4,TOLLT), XTO_MASK,   PPCCOM,    0,              {RA, RB}},
+{"tllt",        XTO(31,4,TOLLT), XTO_MASK,   PWRCOM,    0,              {RA, RB}},
+{"tweq",        XTO(31,4,TOEQ),  XTO_MASK,   PPCCOM,    0,              {RA, RB}},
+{"teq",         XTO(31,4,TOEQ),  XTO_MASK,   PWRCOM,    0,              {RA, RB}},
+{"twlge",       XTO(31,4,TOLGE), XTO_MASK,   PPCCOM,    0,              {RA, RB}},
+{"tlge",        XTO(31,4,TOLGE), XTO_MASK,   PWRCOM,    0,              {RA, RB}},
+{"twlnl",       XTO(31,4,TOLNL), XTO_MASK,   PPCCOM,    0,              {RA, RB}},
+{"tlnl",        XTO(31,4,TOLNL), XTO_MASK,   PWRCOM,    0,              {RA, RB}},
+{"twlle",       XTO(31,4,TOLLE), XTO_MASK,   PPCCOM,    0,              {RA, RB}},
+{"tlle",        XTO(31,4,TOLLE), XTO_MASK,   PWRCOM,    0,              {RA, RB}},
+{"twlng",       XTO(31,4,TOLNG), XTO_MASK,   PPCCOM,    0,              {RA, RB}},
+{"tlng",        XTO(31,4,TOLNG), XTO_MASK,   PWRCOM,    0,              {RA, RB}},
+{"twgt",        XTO(31,4,TOGT),  XTO_MASK,   PPCCOM,    0,              {RA, RB}},
+{"tgt",         XTO(31,4,TOGT),  XTO_MASK,   PWRCOM,    0,              {RA, RB}},
+{"twge",        XTO(31,4,TOGE),  XTO_MASK,   PPCCOM,    0,              {RA, RB}},
+{"tge",         XTO(31,4,TOGE),  XTO_MASK,   PWRCOM,    0,              {RA, RB}},
+{"twnl",        XTO(31,4,TONL),  XTO_MASK,   PPCCOM,    0,              {RA, RB}},
+{"tnl",         XTO(31,4,TONL),  XTO_MASK,   PWRCOM,    0,              {RA, RB}},
+{"twlt",        XTO(31,4,TOLT),  XTO_MASK,   PPCCOM,    0,              {RA, RB}},
+{"tlt",         XTO(31,4,TOLT),  XTO_MASK,   PWRCOM,    0,              {RA, RB}},
+{"twle",        XTO(31,4,TOLE),  XTO_MASK,   PPCCOM,    0,              {RA, RB}},
+{"tle",         XTO(31,4,TOLE),  XTO_MASK,   PWRCOM,    0,              {RA, RB}},
+{"twng",        XTO(31,4,TONG),  XTO_MASK,   PPCCOM,    0,              {RA, RB}},
+{"tng",         XTO(31,4,TONG),  XTO_MASK,   PWRCOM,    0,              {RA, RB}},
+{"twne",        XTO(31,4,TONE),  XTO_MASK,   PPCCOM,    0,              {RA, RB}},
+{"tne",         XTO(31,4,TONE),  XTO_MASK,   PWRCOM,    0,              {RA, RB}},
+{"trap",        XTO(31,4,TOU),   0xffffffff, PPCCOM,    0,              {0}},
+{"twu",         XTO(31,4,TOU),   XTO_MASK,   PPCCOM,    0,              {RA, RB}},
+{"tu",          XTO(31,4,TOU),   XTO_MASK,   PWRCOM,    0,              {RA, RB}},
+{"tw",          X(31,4),         X_MASK,     PPCCOM,    0,              {TO, RA, RB}},
+{"t",           X(31,4),         X_MASK,     PWRCOM,    0,              {TO, RA, RB}},
+
+{"lvsl",        X(31,6),        X_MASK,      PPCVEC,    0,              {VD, RA0, RB}},
+{"lvebx",       X(31,7),        X_MASK,      PPCVEC,    0,              {VD, RA0, RB}},
+{"lbfcmx",      APU(31,7,0),    APU_MASK,    PPC405,    0,              {FCRT, RA, RB}},
+
+{"subfc",       XO(31,8,0,0),   XO_MASK,     PPCCOM,    0,              {RT, RA, RB}},
+{"sf",          XO(31,8,0,0),   XO_MASK,     PWRCOM,    0,              {RT, RA, RB}},
+{"subc",        XO(31,8,0,0),   XO_MASK,     PPCCOM,    0,              {RT, RB, RA}},
+{"subfc.",      XO(31,8,0,1),   XO_MASK,     PPCCOM,    0,              {RT, RA, RB}},
+{"sf.",         XO(31,8,0,1),   XO_MASK,     PWRCOM,    0,              {RT, RA, RB}},
+{"subc.",       XO(31,8,0,1),   XO_MASK,     PPCCOM,    0,              {RT, RB, RA}},
+
+{"mulhdu",      XO(31,9,0,0),   XO_MASK,     PPC64,     0,              {RT, RA, RB}},
+{"mulhdu.",     XO(31,9,0,1),   XO_MASK,     PPC64,     0,              {RT, RA, RB}},
+
+{"addc",        XO(31,10,0,0),  XO_MASK,     PPCCOM,    0,              {RT, RA, RB}},
+{"a",           XO(31,10,0,0),  XO_MASK,     PWRCOM,    0,              {RT, RA, RB}},
+{"addc.",       XO(31,10,0,1),  XO_MASK,     PPCCOM,    0,              {RT, RA, RB}},
+{"a.",          XO(31,10,0,1),  XO_MASK,     PWRCOM,    0,              {RT, RA, RB}},
+
+{"mulhwu",      XO(31,11,0,0),  XO_MASK,     PPC,       0,              {RT, RA, RB}},
+{"mulhwu.",     XO(31,11,0,1),  XO_MASK,     PPC,       0,              {RT, RA, RB}},
+
+{"lxsiwzx",     X(31,12),       XX1_MASK,    PPCVSX2,   0,              {XT6, RA0, RB}},
+
+{"isellt",      X(31,15),       X_MASK,      PPCISEL,   0,              {RT, RA0, RB}},
+
+{"tlbilxlpid",  XTO(31,18,0),   XTO_MASK, E500MC|PPCA2, 0,              {0}},
+{"tlbilxpid",   XTO(31,18,1),   XTO_MASK, E500MC|PPCA2, 0,              {0}},
+{"tlbilxva",    XTO(31,18,3),   XTO_MASK, E500MC|PPCA2, 0,              {RA0, RB}},
+{"tlbilx",      X(31,18),       X_MASK,   E500MC|PPCA2, 0,              {T, RA0, RB}},
+
+{"mfcr",        XFXM(31,19,0,0), XFXFXM_MASK, COM,      0,              {RT, FXM4}},
+{"mfocrf",      XFXM(31,19,0,1), XFXFXM_MASK, COM,      0,              {RT, FXM}},
+
+{"lwarx",       X(31,20),       XEH_MASK,    PPC,       0,              {RT, RA0, RB, EH}},
+
+{"ldx",         X(31,21),       X_MASK,      PPC64,     0,              {RT, RA0, RB}},
+
+{"icbt",        X(31,22),  X_MASK, BOOKE|PPCE300|PPCA2|PPC476, 0,       {CT, RA0, RB}},
+
+{"lwzx",        X(31,23),       X_MASK,      PPCCOM,    0,              {RT, RA0, RB}},
+{"lx",          X(31,23),       X_MASK,      PWRCOM,    0,              {RT, RA, RB}},
+
+{"slw",         XRC(31,24,0),   X_MASK,      PPCCOM,    0,              {RA, RS, RB}},
+{"sl",          XRC(31,24,0),   X_MASK,      PWRCOM,    0,              {RA, RS, RB}},
+{"slw.",        XRC(31,24,1),   X_MASK,      PPCCOM,    0,              {RA, RS, RB}},
+{"sl.",         XRC(31,24,1),   X_MASK,      PWRCOM,    0,              {RA, RS, RB}},
+
+{"cntlzw",      XRC(31,26,0),   XRB_MASK,    PPCCOM,    0,              {RA, RS}},
+{"cntlz",       XRC(31,26,0),   XRB_MASK,    PWRCOM,    0,              {RA, RS}},
+{"cntlzw.",     XRC(31,26,1),   XRB_MASK,    PPCCOM,    0,              {RA, RS}},
+{"cntlz.",      XRC(31,26,1),   XRB_MASK,    PWRCOM,    0,              {RA, RS}},
+
+{"sld",         XRC(31,27,0),   X_MASK,      PPC64,     0,              {RA, RS, RB}},
+{"sld.",        XRC(31,27,1),   X_MASK,      PPC64,     0,              {RA, RS, RB}},
+
+{"and",         XRC(31,28,0),   X_MASK,      COM,       0,              {RA, RS, RB}},
+{"and.",        XRC(31,28,1),   X_MASK,      COM,       0,              {RA, RS, RB}},
+
+{"maskg",       XRC(31,29,0),   X_MASK,      M601,      PPCA2,          {RA, RS, RB}},
+{"maskg.",      XRC(31,29,1),   X_MASK,      M601,      PPCA2,          {RA, RS, RB}},
+
+{"ldepx",       X(31,29),       X_MASK,   E500MC|PPCA2, 0,              {RT, RA0, RB}},
+
+{"waitasec",    X(31,30),      XRTRARB_MASK, POWER8,    POWER9,         {0}},
+{"wait",        X(31,30),       XWC_MASK,    POWER9,    0,              {WC}},
+
+{"lwepx",       X(31,31),       X_MASK,   E500MC|PPCA2, 0,              {RT, RA0, RB}},
+
+{"cmplw",       XOPL(31,32,0),  XCMPL_MASK,  PPCCOM,    0,              {OBF, RA, RB}},
+{"cmpld",       XOPL(31,32,1),  XCMPL_MASK,  PPC64,     0,              {OBF, RA, RB}},
+{"cmpl",        X(31,32),       XCMP_MASK,   PPC,       0,              {BF, L32OPT, RA, RB}},
+{"cmpl",        X(31,32),       XCMPL_MASK,  PWRCOM,    PPC,            {BF, RA, RB}},
+
+{"lvsr",        X(31,38),       X_MASK,      PPCVEC,    0,              {VD, RA0, RB}},
+{"lvehx",       X(31,39),       X_MASK,      PPCVEC,    0,              {VD, RA0, RB}},
+{"lhfcmx",      APU(31,39,0),   APU_MASK,    PPC405,    0,              {FCRT, RA, RB}},
+
+{"mviwsplt",    X(31,46),       X_MASK,      PPCVEC2,   0,              {VD, RA, RB}},
+
+{"iselgt",      X(31,47),       X_MASK,      PPCISEL,   0,              {RT, RA0, RB}},
+
+{"lvewx",       X(31,71),       X_MASK,      PPCVEC,    0,              {VD, RA0, RB}},
+
+{"addg6s",      XO(31,74,0,0),  XO_MASK,     POWER6,    0,              {RT, RA, RB}},
+
+{"lxsiwax",     X(31,76),       XX1_MASK,    PPCVSX2,   0,              {XT6, RA0, RB}},
+
+{"iseleq",      X(31,79),       X_MASK,      PPCISEL,   0,              {RT, RA0, RB}},
+
+{"isel",        XISEL(31,15), XISEL_MASK, PPCISEL|TITAN, 0,             {RT, RA0, RB, CRB}},
+
+{"subf",        XO(31,40,0,0),  XO_MASK,     PPC,       0,              {RT, RA, RB}},
+{"sub",         XO(31,40,0,0),  XO_MASK,     PPC,       0,              {RT, RB, RA}},
+{"subf.",       XO(31,40,0,1),  XO_MASK,     PPC,       0,              {RT, RA, RB}},
+{"sub.",        XO(31,40,0,1),  XO_MASK,     PPC,       0,              {RT, RB, RA}},
+
+{"mfvsrd",      X(31,51),       XX1RB_MASK,   PPCVSX2,  0,              {RA, XS6}},
+{"mffprd",      X(31,51),       XX1RB_MASK|1, PPCVSX2,  0,              {RA, FRS}},
+{"mfvrd",       X(31,51)|1,     XX1RB_MASK|1, PPCVSX2,  0,              {RA, VS}},
+{"eratilx",     X(31,51),       X_MASK,      PPCA2,     0,              {ERAT_T, RA, RB}},
+
+{"lbarx",       X(31,52),       XEH_MASK, POWER8|E6500, 0,              {RT, RA0, RB, EH}},
+
+{"ldux",        X(31,53),       X_MASK,      PPC64,     0,              {RT, RAL, RB}},
+
+{"dcbst",       X(31,54),       XRT_MASK,    PPC,       0,              {RA0, RB}},
+
+{"lwzux",       X(31,55),       X_MASK,      PPCCOM,    0,              {RT, RAL, RB}},
+{"lux",         X(31,55),       X_MASK,      PWRCOM,    0,              {RT, RA, RB}},
+
+{"cntlzd",      XRC(31,58,0),   XRB_MASK,    PPC64,     0,              {RA, RS}},
+{"cntlzd.",     XRC(31,58,1),   XRB_MASK,    PPC64,     0,              {RA, RS}},
+
+{"andc",        XRC(31,60,0),   X_MASK,      COM,       0,              {RA, RS, RB}},
+{"andc.",       XRC(31,60,1),   X_MASK,      COM,       0,              {RA, RS, RB}},
+
+{"waitrsv",     X(31,62)|(1<<21), 0xffffffff, E500MC|PPCA2, 0,          {0}},
+{"waitimpl",    X(31,62)|(2<<21), 0xffffffff, E500MC|PPCA2, 0,          {0}},
+{"wait",        X(31,62),       XWC_MASK,    E500MC|PPCA2, 0,           {WC}},
+
+{"dcbstep",     XRT(31,63,0),   XRT_MASK,    E500MC|PPCA2, 0,           {RA0, RB}},
+
+{"tdlgt",       XTO(31,68,TOLGT), XTO_MASK,  PPC64,     0,              {RA, RB}},
+{"tdllt",       XTO(31,68,TOLLT), XTO_MASK,  PPC64,     0,              {RA, RB}},
+{"tdeq",        XTO(31,68,TOEQ),  XTO_MASK,  PPC64,     0,              {RA, RB}},
+{"tdlge",       XTO(31,68,TOLGE), XTO_MASK,  PPC64,     0,              {RA, RB}},
+{"tdlnl",       XTO(31,68,TOLNL), XTO_MASK,  PPC64,     0,              {RA, RB}},
+{"tdlle",       XTO(31,68,TOLLE), XTO_MASK,  PPC64,     0,              {RA, RB}},
+{"tdlng",       XTO(31,68,TOLNG), XTO_MASK,  PPC64,     0,              {RA, RB}},
+{"tdgt",        XTO(31,68,TOGT),  XTO_MASK,  PPC64,     0,              {RA, RB}},
+{"tdge",        XTO(31,68,TOGE),  XTO_MASK,  PPC64,     0,              {RA, RB}},
+{"tdnl",        XTO(31,68,TONL),  XTO_MASK,  PPC64,     0,              {RA, RB}},
+{"tdlt",        XTO(31,68,TOLT),  XTO_MASK,  PPC64,     0,              {RA, RB}},
+{"tdle",        XTO(31,68,TOLE),  XTO_MASK,  PPC64,     0,              {RA, RB}},
+{"tdng",        XTO(31,68,TONG),  XTO_MASK,  PPC64,     0,              {RA, RB}},
+{"tdne",        XTO(31,68,TONE),  XTO_MASK,  PPC64,     0,              {RA, RB}},
+{"tdu",         XTO(31,68,TOU),   XTO_MASK,  PPC64,     0,              {RA, RB}},
+{"td",          X(31,68),       X_MASK,      PPC64,     0,              {TO, RA, RB}},
+
+{"lwfcmx",      APU(31,71,0),   APU_MASK,    PPC405,    0,              {FCRT, RA, RB}},
+{"mulhd",       XO(31,73,0,0),  XO_MASK,     PPC64,     0,              {RT, RA, RB}},
+{"mulhd.",      XO(31,73,0,1),  XO_MASK,     PPC64,     0,              {RT, RA, RB}},
+
+{"mulhw",       XO(31,75,0,0),  XO_MASK,     PPC,       0,              {RT, RA, RB}},
+{"mulhw.",      XO(31,75,0,1),  XO_MASK,     PPC,       0,              {RT, RA, RB}},
+
+{"dlmzb",       XRC(31,78,0), X_MASK, PPC403|PPC440|TITAN, 0,           {RA, RS, RB}},
+{"dlmzb.",      XRC(31,78,1), X_MASK, PPC403|PPC440|TITAN, 0,           {RA, RS, RB}},
+
+{"mtsrd",       X(31,82),  XRB_MASK|(1<<20), PPC64,     0,              {SR, RS}},
+
+{"mfmsr",       X(31,83),       XRARB_MASK,  COM,       0,              {RT}},
+
+{"ldarx",       X(31,84),       XEH_MASK,    PPC64,     0,              {RT, RA0, RB, EH}},
+
+{"dcbfl",       XOPL(31,86,1),  XRT_MASK,    POWER5,    PPC476,         {RA0, RB}},
+{"dcbf",        X(31,86),       XLRT_MASK,   PPC,       0,              {RA0, RB, L2OPT}},
+
+{"lbzx",        X(31,87),       X_MASK,      COM,       0,              {RT, RA0, RB}},
+
+{"lbepx",       X(31,95),       X_MASK,   E500MC|PPCA2, 0,              {RT, RA0, RB}},
+
+{"dni",         XRC(31,97,1),   XRB_MASK,    E6500,     0,              {DUI, DCTL}},
+
+{"lvx",         X(31,103),      X_MASK,      PPCVEC,    0,              {VD, RA0, RB}},
+{"lqfcmx",      APU(31,103,0),  APU_MASK,    PPC405,    0,              {FCRT, RA, RB}},
+
+{"neg",         XO(31,104,0,0), XORB_MASK,   COM,       0,              {RT, RA}},
+{"neg.",        XO(31,104,0,1), XORB_MASK,   COM,       0,              {RT, RA}},
+
+{"mul",         XO(31,107,0,0), XO_MASK,     M601,      0,              {RT, RA, RB}},
+{"mul.",        XO(31,107,0,1), XO_MASK,     M601,      0,              {RT, RA, RB}},
+
+{"mvidsplt",    X(31,110),      X_MASK,      PPCVEC2,   0,              {VD, RA, RB}},
+
+{"mtsrdin",     X(31,114),      XRA_MASK,    PPC64,     0,              {RS, RB}},
+
+{"mffprwz",     X(31,115),      XX1RB_MASK|1, PPCVSX2,  0,              {RA, FRS}},
+{"mfvrwz",      X(31,115)|1,    XX1RB_MASK|1, PPCVSX2,  0,              {RA, VS}},
+{"mfvsrwz",     X(31,115),      XX1RB_MASK,   PPCVSX2,  0,              {RA, XS6}},
+
+{"lharx",       X(31,116),      XEH_MASK, POWER8|E6500, 0,              {RT, RA0, RB, EH}},
+
+{"clf",         X(31,118),      XTO_MASK,    POWER,     0,              {RA, RB}},
+
+{"lbzux",       X(31,119),      X_MASK,      COM,       0,              {RT, RAL, RB}},
+
+{"popcntb",     X(31,122),      XRB_MASK,    POWER5,    0,              {RA, RS}},
+
+{"not",         XRC(31,124,0),  X_MASK,      COM,       0,              {RA, RS, RBS}},
+{"nor",         XRC(31,124,0),  X_MASK,      COM,       0,              {RA, RS, RB}},
+{"not.",        XRC(31,124,1),  X_MASK,      COM,       0,              {RA, RS, RBS}},
+{"nor.",        XRC(31,124,1),  X_MASK,      COM,       0,              {RA, RS, RB}},
+
+{"dcbfep",      XRT(31,127,0),  XRT_MASK, E500MC|PPCA2, 0,              {RA0, RB}},
+
+{"setb",        X(31,128),      XRB_MASK|(3<<16), POWER9, 0,            {RT, BFA}},
+
+{"wrtee",       X(31,131), XRARB_MASK, PPC403|BOOKE|PPCA2|PPC476, 0,    {RS}},
+
+{"dcbtstls",    X(31,134),      X_MASK, PPCCHLK|PPC476|TITAN, 0,        {CT, RA0, RB}},
+
+{"stvebx",      X(31,135),      X_MASK,      PPCVEC,    0,              {VS, RA0, RB}},
+{"stbfcmx",     APU(31,135,0),  APU_MASK,    PPC405,    0,              {FCRT, RA, RB}},
+
+{"subfe",       XO(31,136,0,0), XO_MASK,     PPCCOM,    0,              {RT, RA, RB}},
+{"sfe",         XO(31,136,0,0), XO_MASK,     PWRCOM,    0,              {RT, RA, RB}},
+{"subfe.",      XO(31,136,0,1), XO_MASK,     PPCCOM,    0,              {RT, RA, RB}},
+{"sfe.",        XO(31,136,0,1), XO_MASK,     PWRCOM,    0,              {RT, RA, RB}},
+
+{"adde",        XO(31,138,0,0), XO_MASK,     PPCCOM,    0,              {RT, RA, RB}},
+{"ae",          XO(31,138,0,0), XO_MASK,     PWRCOM,    0,              {RT, RA, RB}},
+{"adde.",       XO(31,138,0,1), XO_MASK,     PPCCOM,    0,              {RT, RA, RB}},
+{"ae.",         XO(31,138,0,1), XO_MASK,     PWRCOM,    0,              {RT, RA, RB}},
+
+{"stxsiwx",     X(31,140),      XX1_MASK,    PPCVSX2,   0,              {XS6, RA0, RB}},
+
+{"msgsndp",     XRTRA(31,142,0,0), XRTRA_MASK, POWER8,  0,              {RB}},
+{"dcbtstlse",   X(31,142),      X_MASK,      PPCCHLK,   E500MC,         {CT, RA0, RB}},
+
+{"mtcr",        XFXM(31,144,0xff,0), XRARB_MASK, COM,   0,              {RS}},
+{"mtcrf",       XFXM(31,144,0,0), XFXFXM_MASK, COM,     0,              {FXM, RS}},
+{"mtocrf",      XFXM(31,144,0,1), XFXFXM_MASK, COM,     0,              {FXM, RS}},
+
+{"mtmsr",       X(31,146),      XRLARB_MASK, COM,       0,              {RS, A_L}},
+
+{"mtsle",       X(31,147),    XRTLRARB_MASK, POWER8,    0,              {L}},
 
-{ "ldux",    X(31,53),  X_MASK,         PPC64,          { RT, RAL, RB } },
+{"eratsx",      XRC(31,147,0),  X_MASK,      PPCA2,     0,              {RT, RA0, RB}},
+{"eratsx.",     XRC(31,147,1),  X_MASK,      PPCA2,     0,              {RT, RA0, RB}},
 
-{ "dcbst",   X(31,54),  XRT_MASK,       PPC,            { RA, RB } },
+{"stdx",        X(31,149),      X_MASK,      PPC64,     0,              {RS, RA0, RB}},
 
-{ "lwzux",   X(31,55),  X_MASK,         PPCCOM,         { RT, RAL, RB } },
-{ "lux",     X(31,55),  X_MASK,         PWRCOM,         { RT, RA, RB } },
+{"stwcx.",      XRC(31,150,1),  X_MASK,      PPC,       0,              {RS, RA0, RB}},
 
-{ "dcbste",  X(31,62),  XRT_MASK,       BOOKE64,        { RA, RB } },
+{"stwx",        X(31,151),      X_MASK,      PPCCOM,    0,              {RS, RA0, RB}},
+{"stx",         X(31,151),      X_MASK,      PWRCOM,    0,              {RS, RA, RB}},
 
-{ "lwzuxe",  X(31,63),  X_MASK,         BOOKE64,        { RT, RAL, RB } },
+{"slq",         XRC(31,152,0),  X_MASK,      M601,      0,              {RA, RS, RB}},
+{"slq.",        XRC(31,152,1),  X_MASK,      M601,      0,              {RA, RS, RB}},
 
-{ "cntlzd",  XRC(31,58,0), XRB_MASK,    PPC64,          { RA, RS } },
-{ "cntlzd.", XRC(31,58,1), XRB_MASK,    PPC64,          { RA, RS } },
+{"sle",         XRC(31,153,0),  X_MASK,      M601,      0,              {RA, RS, RB}},
+{"sle.",        XRC(31,153,1),  X_MASK,      M601,      0,              {RA, RS, RB}},
 
-{ "andc",    XRC(31,60,0), X_MASK,      COM,            { RA, RS, RB } },
-{ "andc.",   XRC(31,60,1), X_MASK,      COM,            { RA, RS, RB } },
+{"prtyw",       X(31,154),    XRB_MASK, POWER6|PPCA2|PPC476, 0,         {RA, RS}},
 
-{ "tdlgt",   XTO(31,68,TOLGT), XTO_MASK, PPC64,         { RA, RB } },
-{ "tdllt",   XTO(31,68,TOLLT), XTO_MASK, PPC64,         { RA, RB } },
-{ "tdeq",    XTO(31,68,TOEQ), XTO_MASK,  PPC64,         { RA, RB } },
-{ "tdlge",   XTO(31,68,TOLGE), XTO_MASK, PPC64,         { RA, RB } },
-{ "tdlnl",   XTO(31,68,TOLNL), XTO_MASK, PPC64,         { RA, RB } },
-{ "tdlle",   XTO(31,68,TOLLE), XTO_MASK, PPC64,         { RA, RB } },
-{ "tdlng",   XTO(31,68,TOLNG), XTO_MASK, PPC64,         { RA, RB } },
-{ "tdgt",    XTO(31,68,TOGT), XTO_MASK,  PPC64,         { RA, RB } },
-{ "tdge",    XTO(31,68,TOGE), XTO_MASK,  PPC64,         { RA, RB } },
-{ "tdnl",    XTO(31,68,TONL), XTO_MASK,  PPC64,         { RA, RB } },
-{ "tdlt",    XTO(31,68,TOLT), XTO_MASK,  PPC64,         { RA, RB } },
-{ "tdle",    XTO(31,68,TOLE), XTO_MASK,  PPC64,         { RA, RB } },
-{ "tdng",    XTO(31,68,TONG), XTO_MASK,  PPC64,         { RA, RB } },
-{ "tdne",    XTO(31,68,TONE), XTO_MASK,  PPC64,         { RA, RB } },
-{ "td",      X(31,68),  X_MASK,          PPC64,         { TO, RA, RB } },
+{"stdepx",      X(31,157),      X_MASK,   E500MC|PPCA2, 0,              {RS, RA0, RB}},
 
-{ "mulhd",   XO(31,73,0,0), XO_MASK,     PPC64,         { RT, RA, RB } },
-{ "mulhd.",  XO(31,73,0,1), XO_MASK,     PPC64,         { RT, RA, RB } },
+{"stwepx",      X(31,159),      X_MASK,   E500MC|PPCA2, 0,              {RS, RA0, RB}},
 
-{ "mulhw",   XO(31,75,0,0), XO_MASK,    PPC,            { RT, RA, RB } },
-{ "mulhw.",  XO(31,75,0,1), XO_MASK,    PPC,            { RT, RA, RB } },
+{"wrteei",      X(31,163), XE_MASK, PPC403|BOOKE|PPCA2|PPC476, 0,       {E}},
 
-{ "dlmzb",   XRC(31,78,0),  X_MASK,     PPC403|PPC440,  { RA, RS, RB } },
-{ "dlmzb.",  XRC(31,78,1),  X_MASK,     PPC403|PPC440,  { RA, RS, RB } },
+{"dcbtls",      X(31,166),      X_MASK,  PPCCHLK|PPC476|TITAN, 0,       {CT, RA0, RB}},
 
-{ "mtsrd",   X(31,82),  XRB_MASK|(1<<20), PPC64,        { SR, RS } },
+{"stvehx",      X(31,167),      X_MASK,      PPCVEC,    0,              {VS, RA0, RB}},
+{"sthfcmx",     APU(31,167,0),  APU_MASK,    PPC405,    0,              {FCRT, RA, RB}},
 
-{ "mfmsr",   X(31,83),  XRARB_MASK,     COM,            { RT } },
+{"addex",       ZRC(31,170,0),  Z2_MASK,     POWER9,    0,              {RT, RA, RB, CY}},
 
-{ "ldarx",   X(31,84),  XEH_MASK,       PPC64,          { RT, RA0, RB, EH } },
+{"msgclrp",     XRTRA(31,174,0,0), XRTRA_MASK, POWER8,  0,              {RB}},
+{"dcbtlse",     X(31,174),      X_MASK,      PPCCHLK,   E500MC,         {CT, RA0, RB}},
 
-{ "dcbfl",   XOPL(31,86,1), XRT_MASK,   POWER5,         { RA, RB } },
-{ "dcbf",    X(31,86),  XLRT_MASK,      PPC,            { RA, RB, XRT_L } },
+{"mtmsrd",      X(31,178),      XRLARB_MASK, PPC64,     0,              {RS, A_L}},
 
-{ "lbzx",    X(31,87),  X_MASK,         COM,            { RT, RA0, RB } },
+{"mtvsrd",      X(31,179),      XX1RB_MASK,   PPCVSX2,  0,              {XT6, RA}},
+{"mtfprd",      X(31,179),      XX1RB_MASK|1, PPCVSX2,  0,              {FRT, RA}},
+{"mtvrd",       X(31,179)|1,    XX1RB_MASK|1, PPCVSX2,  0,              {VD, RA}},
+{"eratre",      X(31,179),      X_MASK,      PPCA2,     0,              {RT, RA, WS}},
 
-{ "dcbfe",   X(31,94),  XRT_MASK,       BOOKE64,        { RA, RB } },
+{"stdux",       X(31,181),      X_MASK,      PPC64,     0,              {RS, RAS, RB}},
 
-{ "lbzxe",   X(31,95),  X_MASK,         BOOKE64,        { RT, RA0, RB } },
+{"stqcx.",      XRC(31,182,1),  X_MASK,      POWER8,    0,              {RSQ, RA0, RB}},
+{"wchkall",     X(31,182),      X_MASK,      PPCA2,     0,              {OBF}},
 
-{ "neg",     XO(31,104,0,0), XORB_MASK, COM,            { RT, RA } },
-{ "neg.",    XO(31,104,0,1), XORB_MASK, COM,            { RT, RA } },
-{ "nego",    XO(31,104,1,0), XORB_MASK, COM,            { RT, RA } },
-{ "nego.",   XO(31,104,1,1), XORB_MASK, COM,            { RT, RA } },
+{"stwux",       X(31,183),      X_MASK,      PPCCOM,    0,              {RS, RAS, RB}},
+{"stux",        X(31,183),      X_MASK,      PWRCOM,    0,              {RS, RA0, RB}},
 
-{ "mul",     XO(31,107,0,0), XO_MASK,   M601,           { RT, RA, RB } },
-{ "mul.",    XO(31,107,0,1), XO_MASK,   M601,           { RT, RA, RB } },
-{ "mulo",    XO(31,107,1,0), XO_MASK,   M601,           { RT, RA, RB } },
-{ "mulo.",   XO(31,107,1,1), XO_MASK,   M601,           { RT, RA, RB } },
+{"sliq",        XRC(31,184,0),  X_MASK,      M601,      0,              {RA, RS, SH}},
+{"sliq.",       XRC(31,184,1),  X_MASK,      M601,      0,              {RA, RS, SH}},
 
-{ "mtsrdin", X(31,114), XRA_MASK,       PPC64,          { RS, RB } },
+{"prtyd",       X(31,186),      XRB_MASK, POWER6|PPCA2, 0,              {RA, RS}},
 
-{ "clf",     X(31,118), XTO_MASK,       POWER,          { RA, RB } },
+{"cmprb",       X(31,192),      XCMP_MASK,   POWER9,    0,              {BF, L, RA, RB}},
 
-{ "lbzux",   X(31,119), X_MASK,         COM,            { RT, RAL, RB } },
+{"icblq.",      XRC(31,198,1),  X_MASK,      E6500,     0,              {CT, RA0, RB}},
 
-{ "popcntb", X(31,122), XRB_MASK,       POWER5,         { RA, RS } },
+{"stvewx",      X(31,199),      X_MASK,      PPCVEC,    0,              {VS, RA0, RB}},
+{"stwfcmx",     APU(31,199,0),  APU_MASK,    PPC405,    0,              {FCRT, RA, RB}},
 
-{ "not",     XRC(31,124,0), X_MASK,     COM,            { RA, RS, RBS } },
-{ "nor",     XRC(31,124,0), X_MASK,     COM,            { RA, RS, RB } },
-{ "not.",    XRC(31,124,1), X_MASK,     COM,            { RA, RS, RBS } },
-{ "nor.",    XRC(31,124,1), X_MASK,     COM,            { RA, RS, RB } },
+{"subfze",      XO(31,200,0,0), XORB_MASK,   PPCCOM,    0,              {RT, RA}},
+{"sfze",        XO(31,200,0,0), XORB_MASK,   PWRCOM,    0,              {RT, RA}},
+{"subfze.",     XO(31,200,0,1), XORB_MASK,   PPCCOM,    0,              {RT, RA}},
+{"sfze.",       XO(31,200,0,1), XORB_MASK,   PWRCOM,    0,              {RT, RA}},
 
-{ "lwarxe",  X(31,126), X_MASK,         BOOKE64,        { RT, RA0, RB } },
+{"addze",       XO(31,202,0,0), XORB_MASK,   PPCCOM,    0,              {RT, RA}},
+{"aze",         XO(31,202,0,0), XORB_MASK,   PWRCOM,    0,              {RT, RA}},
+{"addze.",      XO(31,202,0,1), XORB_MASK,   PPCCOM,    0,              {RT, RA}},
+{"aze.",        XO(31,202,0,1), XORB_MASK,   PWRCOM,    0,              {RT, RA}},
 
-{ "lbzuxe",  X(31,127), X_MASK,         BOOKE64,        { RT, RAL, RB } },
+{"msgsnd",      XRTRA(31,206,0,0), XRTRA_MASK, E500MC|PPCA2|POWER8, 0,  {RB}},
 
-{ "wrtee",   X(31,131), XRARB_MASK,     PPC403 | BOOKE, { RS } },
+{"mtsr",        X(31,210), XRB_MASK|(1<<20), COM,       NON32,          {SR, RS}},
 
-{ "dcbtstls",X(31,134), X_MASK,         PPCCHLK,        { CT, RA, RB }},
+{"mtfprwa",     X(31,211),      XX1RB_MASK|1, PPCVSX2,  0,              {FRT, RA}},
+{"mtvrwa",      X(31,211)|1,    XX1RB_MASK|1, PPCVSX2,  0,              {VD, RA}},
+{"mtvsrwa",     X(31,211),      XX1RB_MASK,   PPCVSX2,  0,              {XT6, RA}},
+{"eratwe",      X(31,211),      X_MASK,      PPCA2,     0,              {RS, RA, WS}},
 
-{ "subfe",   XO(31,136,0,0), XO_MASK,   PPCCOM,         { RT, RA, RB } },
-{ "sfe",     XO(31,136,0,0), XO_MASK,   PWRCOM,         { RT, RA, RB } },
-{ "subfe.",  XO(31,136,0,1), XO_MASK,   PPCCOM,         { RT, RA, RB } },
-{ "sfe.",    XO(31,136,0,1), XO_MASK,   PWRCOM,         { RT, RA, RB } },
-{ "subfeo",  XO(31,136,1,0), XO_MASK,   PPCCOM,         { RT, RA, RB } },
-{ "sfeo",    XO(31,136,1,0), XO_MASK,   PWRCOM,         { RT, RA, RB } },
-{ "subfeo.", XO(31,136,1,1), XO_MASK,   PPCCOM,         { RT, RA, RB } },
-{ "sfeo.",   XO(31,136,1,1), XO_MASK,   PWRCOM,         { RT, RA, RB } },
+{"ldawx.",      XRC(31,212,1),  X_MASK,      PPCA2,     0,              {RT, RA0, RB}},
 
-{ "adde",    XO(31,138,0,0), XO_MASK,   PPCCOM,         { RT, RA, RB } },
-{ "ae",      XO(31,138,0,0), XO_MASK,   PWRCOM,         { RT, RA, RB } },
-{ "adde.",   XO(31,138,0,1), XO_MASK,   PPCCOM,         { RT, RA, RB } },
-{ "ae.",     XO(31,138,0,1), XO_MASK,   PWRCOM,         { RT, RA, RB } },
-{ "addeo",   XO(31,138,1,0), XO_MASK,   PPCCOM,         { RT, RA, RB } },
-{ "aeo",     XO(31,138,1,0), XO_MASK,   PWRCOM,         { RT, RA, RB } },
-{ "addeo.",  XO(31,138,1,1), XO_MASK,   PPCCOM,         { RT, RA, RB } },
-{ "aeo.",    XO(31,138,1,1), XO_MASK,   PWRCOM,         { RT, RA, RB } },
+{"stdcx.",      XRC(31,214,1),  X_MASK,      PPC64,     0,              {RS, RA0, RB}},
 
-{ "dcbtstlse",X(31,142),X_MASK,         PPCCHLK64,      { CT, RA, RB }},
+{"stbx",        X(31,215),      X_MASK,      COM,       0,              {RS, RA0, RB}},
 
-{ "mtocrf",  XFXM(31,144,0,1), XFXFXM_MASK, COM,        { FXM, RS } },
-{ "mtcr",    XFXM(31,144,0xff,0), XRARB_MASK, COM,      { RS }},
-{ "mtcrf",   X(31,144), XFXFXM_MASK,    COM,            { FXM, RS } },
+{"sllq",        XRC(31,216,0),  X_MASK,      M601,      0,              {RA, RS, RB}},
+{"sllq.",       XRC(31,216,1),  X_MASK,      M601,      0,              {RA, RS, RB}},
 
-{ "mtmsr",   X(31,146), XRARB_MASK,     COM,            { RS } },
+{"sleq",        XRC(31,217,0),  X_MASK,      M601,      0,              {RA, RS, RB}},
+{"sleq.",       XRC(31,217,1),  X_MASK,      M601,      0,              {RA, RS, RB}},
 
-{ "stdx",    X(31,149), X_MASK,         PPC64,          { RS, RA0, RB } },
+{"stbepx",      X(31,223),      X_MASK,   E500MC|PPCA2, 0,              {RS, RA0, RB}},
 
-{ "stwcx.",  XRC(31,150,1), X_MASK,     PPC,            { RS, RA0, RB } },
+{"cmpeqb",      X(31,224),      XCMPL_MASK,  POWER9,    0,              {BF, RA, RB}},
 
-{ "stwx",    X(31,151), X_MASK,         PPCCOM,         { RS, RA0, RB } },
-{ "stx",     X(31,151), X_MASK,         PWRCOM,         { RS, RA, RB } },
+{"icblc",       X(31,230),      X_MASK, PPCCHLK|PPC476|TITAN, 0,        {CT, RA0, RB}},
 
-{ "stwcxe.", XRC(31,158,1), X_MASK,     BOOKE64,        { RS, RA0, RB } },
+{"stvx",        X(31,231),      X_MASK,      PPCVEC,    0,              {VS, RA0, RB}},
+{"stqfcmx",     APU(31,231,0),  APU_MASK,    PPC405,    0,              {FCRT, RA, RB}},
 
-{ "stwxe",   X(31,159), X_MASK,         BOOKE64,        { RS, RA0, RB } },
+{"subfme",      XO(31,232,0,0), XORB_MASK,   PPCCOM,    0,              {RT, RA}},
+{"sfme",        XO(31,232,0,0), XORB_MASK,   PWRCOM,    0,              {RT, RA}},
+{"subfme.",     XO(31,232,0,1), XORB_MASK,   PPCCOM,    0,              {RT, RA}},
+{"sfme.",       XO(31,232,0,1), XORB_MASK,   PWRCOM,    0,              {RT, RA}},
 
-{ "slq",     XRC(31,152,0), X_MASK,     M601,           { RA, RS, RB } },
-{ "slq.",    XRC(31,152,1), X_MASK,     M601,           { RA, RS, RB } },
+{"mulld",       XO(31,233,0,0), XO_MASK,     PPC64,     0,              {RT, RA, RB}},
+{"mulld.",      XO(31,233,0,1), XO_MASK,     PPC64,     0,              {RT, RA, RB}},
 
-{ "sle",     XRC(31,153,0), X_MASK,     M601,           { RA, RS, RB } },
-{ "sle.",    XRC(31,153,1), X_MASK,     M601,           { RA, RS, RB } },
+{"addme",       XO(31,234,0,0), XORB_MASK,   PPCCOM,    0,              {RT, RA}},
+{"ame",         XO(31,234,0,0), XORB_MASK,   PWRCOM,    0,              {RT, RA}},
+{"addme.",      XO(31,234,0,1), XORB_MASK,   PPCCOM,    0,              {RT, RA}},
+{"ame.",        XO(31,234,0,1), XORB_MASK,   PWRCOM,    0,              {RT, RA}},
 
-{ "prtyw",   X(31,154), XRB_MASK,       POWER6,         { RA, RS } },
+{"mullw",       XO(31,235,0,0), XO_MASK,     PPCCOM,    0,              {RT, RA, RB}},
+{"muls",        XO(31,235,0,0), XO_MASK,     PWRCOM,    0,              {RT, RA, RB}},
+{"mullw.",      XO(31,235,0,1), XO_MASK,     PPCCOM,    0,              {RT, RA, RB}},
+{"muls.",       XO(31,235,0,1), XO_MASK,     PWRCOM,    0,              {RT, RA, RB}},
 
-{ "wrteei",  X(31,163), XE_MASK,        PPC403 | BOOKE, { E } },
+{"icblce",      X(31,238),      X_MASK,      PPCCHLK,   E500MC|PPCA2,   {CT, RA, RB}},
+{"msgclr",      XRTRA(31,238,0,0), XRTRA_MASK, E500MC|PPCA2|POWER8, 0,  {RB}},
+{"mtsrin",      X(31,242),      XRA_MASK,    PPC,       NON32,          {RS, RB}},
+{"mtsri",       X(31,242),      XRA_MASK,    POWER,     NON32,          {RS, RB}},
 
-{ "dcbtls",  X(31,166), X_MASK,         PPCCHLK,        { CT, RA, RB }},
-{ "dcbtlse", X(31,174), X_MASK,         PPCCHLK64,      { CT, RA, RB }},
+{"mtfprwz",     X(31,243),      XX1RB_MASK|1, PPCVSX2,  0,              {FRT, RA}},
+{"mtvrwz",      X(31,243)|1,    XX1RB_MASK|1, PPCVSX2,  0,              {VD, RA}},
+{"mtvsrwz",     X(31,243),      XX1RB_MASK,   PPCVSX2,  0,              {XT6, RA}},
 
-{ "mtmsrd",  X(31,178), XRLARB_MASK,    PPC64,          { RS, MTMSRD_L } },
+{"dcbtstt",     XRT(31,246,0x10), XRT_MASK,  POWER7,    0,              {RA0, RB}},
+{"dcbtst",      X(31,246),      X_MASK,      POWER4,    DCBT_EO,        {RA0, RB, CT}},
+{"dcbtst",      X(31,246),      X_MASK,      DCBT_EO,   0,              {CT, RA0, RB}},
+{"dcbtst",      X(31,246),      X_MASK,      PPC,       POWER4|DCBT_EO, {RA0, RB}},
 
-{ "stdux",   X(31,181), X_MASK,         PPC64,          { RS, RAS, RB } },
+{"stbux",       X(31,247),      X_MASK,      COM,       0,              {RS, RAS, RB}},
 
-{ "stwux",   X(31,183), X_MASK,         PPCCOM,         { RS, RAS, RB } },
-{ "stux",    X(31,183), X_MASK,         PWRCOM,         { RS, RA0, RB } },
+{"slliq",       XRC(31,248,0),  X_MASK,      M601,      0,              {RA, RS, SH}},
+{"slliq.",      XRC(31,248,1),  X_MASK,      M601,      0,              {RA, RS, SH}},
 
-{ "sliq",    XRC(31,184,0), X_MASK,     M601,           { RA, RS, SH } },
-{ "sliq.",   XRC(31,184,1), X_MASK,     M601,           { RA, RS, SH } },
+{"bpermd",      X(31,252),      X_MASK,   POWER7|PPCA2, 0,              {RA, RS, RB}},
 
-{ "prtyd",   X(31,186), XRB_MASK,       POWER6,         { RA, RS } },
+{"dcbtstep",    XRT(31,255,0),  X_MASK,   E500MC|PPCA2, 0,              {RT, RA0, RB}},
 
-{ "stwuxe",  X(31,191), X_MASK,         BOOKE64,        { RS, RAS, RB } },
+{"mfdcrx",      X(31,259),      X_MASK, BOOKE|PPCA2|PPC476, TITAN,      {RS, RA}},
+{"mfdcrx.",     XRC(31,259,1),  X_MASK,      PPCA2,     0,              {RS, RA}},
 
-{ "subfze",  XO(31,200,0,0), XORB_MASK, PPCCOM,         { RT, RA } },
-{ "sfze",    XO(31,200,0,0), XORB_MASK, PWRCOM,         { RT, RA } },
-{ "subfze.", XO(31,200,0,1), XORB_MASK, PPCCOM,         { RT, RA } },
-{ "sfze.",   XO(31,200,0,1), XORB_MASK, PWRCOM,         { RT, RA } },
-{ "subfzeo", XO(31,200,1,0), XORB_MASK, PPCCOM,         { RT, RA } },
-{ "sfzeo",   XO(31,200,1,0), XORB_MASK, PWRCOM,         { RT, RA } },
-{ "subfzeo.",XO(31,200,1,1), XORB_MASK, PPCCOM,         { RT, RA } },
-{ "sfzeo.",  XO(31,200,1,1), XORB_MASK, PWRCOM,         { RT, RA } },
+{"lvexbx",      X(31,261),      X_MASK,      PPCVEC2,   0,              {VD, RA0, RB}},
 
-{ "addze",   XO(31,202,0,0), XORB_MASK, PPCCOM,         { RT, RA } },
-{ "aze",     XO(31,202,0,0), XORB_MASK, PWRCOM,         { RT, RA } },
-{ "addze.",  XO(31,202,0,1), XORB_MASK, PPCCOM,         { RT, RA } },
-{ "aze.",    XO(31,202,0,1), XORB_MASK, PWRCOM,         { RT, RA } },
-{ "addzeo",  XO(31,202,1,0), XORB_MASK, PPCCOM,         { RT, RA } },
-{ "azeo",    XO(31,202,1,0), XORB_MASK, PWRCOM,         { RT, RA } },
-{ "addzeo.", XO(31,202,1,1), XORB_MASK, PPCCOM,         { RT, RA } },
-{ "azeo.",   XO(31,202,1,1), XORB_MASK, PWRCOM,         { RT, RA } },
+{"icbt",        X(31,262),      XRT_MASK,    PPC403,    0,              {RA, RB}},
 
-{ "mtsr",    X(31,210), XRB_MASK|(1<<20), COM32,        { SR, RS } },
+{"lvepxl",      X(31,263),      X_MASK,      PPCVEC2,   0,              {VD, RA0, RB}},
 
-{ "stdcx.",  XRC(31,214,1), X_MASK,     PPC64,          { RS, RA0, RB } },
+{"ldfcmx",      APU(31,263,0),  APU_MASK,    PPC405,    0,              {FCRT, RA, RB}},
+{"doz",         XO(31,264,0,0), XO_MASK,     M601,      0,              {RT, RA, RB}},
+{"doz.",        XO(31,264,0,1), XO_MASK,     M601,      0,              {RT, RA, RB}},
 
-{ "stbx",    X(31,215), X_MASK,         COM,            { RS, RA0, RB } },
+{"modud",       X(31,265),      X_MASK,      POWER9,    0,              {RT, RA, RB}},
 
-{ "sllq",    XRC(31,216,0), X_MASK,     M601,           { RA, RS, RB } },
-{ "sllq.",   XRC(31,216,1), X_MASK,     M601,           { RA, RS, RB } },
+{"add",         XO(31,266,0,0), XO_MASK,     PPCCOM,    0,              {RT, RA, RB}},
+{"cax",         XO(31,266,0,0), XO_MASK,     PWRCOM,    0,              {RT, RA, RB}},
+{"add.",        XO(31,266,0,1), XO_MASK,     PPCCOM,    0,              {RT, RA, RB}},
+{"cax.",        XO(31,266,0,1), XO_MASK,     PWRCOM,    0,              {RT, RA, RB}},
 
-{ "sleq",    XRC(31,217,0), X_MASK,     M601,           { RA, RS, RB } },
-{ "sleq.",   XRC(31,217,1), X_MASK,     M601,           { RA, RS, RB } },
+{"moduw",       X(31,267),      X_MASK,      POWER9,    0,              {RT, RA, RB}},
 
-{ "stbxe",   X(31,223), X_MASK,         BOOKE64,        { RS, RA0, RB } },
+{"lxvx",        X(31,268),      XX1_MASK|1<<6, PPCVSX3, 0,              {XT6, RA0, RB}},
+{"lxvl",        X(31,269),      XX1_MASK,    PPCVSX3,   0,              {XT6, RA0, RB}},
 
-{ "icblc",   X(31,230), X_MASK,         PPCCHLK,        { CT, RA, RB }},
+{"ehpriv",      X(31,270),      0xffffffff,  E500MC|PPCA2, 0,           {0}},
 
-{ "subfme",  XO(31,232,0,0), XORB_MASK, PPCCOM,         { RT, RA } },
-{ "sfme",    XO(31,232,0,0), XORB_MASK, PWRCOM,         { RT, RA } },
-{ "subfme.", XO(31,232,0,1), XORB_MASK, PPCCOM,         { RT, RA } },
-{ "sfme.",   XO(31,232,0,1), XORB_MASK, PWRCOM,         { RT, RA } },
-{ "subfmeo", XO(31,232,1,0), XORB_MASK, PPCCOM,         { RT, RA } },
-{ "sfmeo",   XO(31,232,1,0), XORB_MASK, PWRCOM,         { RT, RA } },
-{ "subfmeo.",XO(31,232,1,1), XORB_MASK, PPCCOM,         { RT, RA } },
-{ "sfmeo.",  XO(31,232,1,1), XORB_MASK, PWRCOM,         { RT, RA } },
+{"tlbiel",      X(31,274),      X_MASK|1<<20,POWER9,    PPC476,         {RB, RSO, RIC, PRS, X_R}},
+{"tlbiel",      X(31,274),      XRTLRA_MASK, POWER4,    POWER9|PPC476,  {RB, LOPT}},
 
-{ "mulld",   XO(31,233,0,0), XO_MASK,   PPC64,          { RT, RA, RB } },
-{ "mulld.",  XO(31,233,0,1), XO_MASK,   PPC64,          { RT, RA, RB } },
-{ "mulldo",  XO(31,233,1,0), XO_MASK,   PPC64,          { RT, RA, RB } },
-{ "mulldo.", XO(31,233,1,1), XO_MASK,   PPC64,          { RT, RA, RB } },
+{"mfapidi",     X(31,275),      X_MASK,      BOOKE,     E500|TITAN,     {RT, RA}},
 
-{ "addme",   XO(31,234,0,0), XORB_MASK, PPCCOM,         { RT, RA } },
-{ "ame",     XO(31,234,0,0), XORB_MASK, PWRCOM,         { RT, RA } },
-{ "addme.",  XO(31,234,0,1), XORB_MASK, PPCCOM,         { RT, RA } },
-{ "ame.",    XO(31,234,0,1), XORB_MASK, PWRCOM,         { RT, RA } },
-{ "addmeo",  XO(31,234,1,0), XORB_MASK, PPCCOM,         { RT, RA } },
-{ "ameo",    XO(31,234,1,0), XORB_MASK, PWRCOM,         { RT, RA } },
-{ "addmeo.", XO(31,234,1,1), XORB_MASK, PPCCOM,         { RT, RA } },
-{ "ameo.",   XO(31,234,1,1), XORB_MASK, PWRCOM,         { RT, RA } },
+{"lqarx",       X(31,276),      XEH_MASK,    POWER8,    0,              {RTQ, RAX, RBX, EH}},
 
-{ "mullw",   XO(31,235,0,0), XO_MASK,   PPCCOM,         { RT, RA, RB } },
-{ "muls",    XO(31,235,0,0), XO_MASK,   PWRCOM,         { RT, RA, RB } },
-{ "mullw.",  XO(31,235,0,1), XO_MASK,   PPCCOM,         { RT, RA, RB } },
-{ "muls.",   XO(31,235,0,1), XO_MASK,   PWRCOM,         { RT, RA, RB } },
-{ "mullwo",  XO(31,235,1,0), XO_MASK,   PPCCOM,         { RT, RA, RB } },
-{ "mulso",   XO(31,235,1,0), XO_MASK,   PWRCOM,         { RT, RA, RB } },
-{ "mullwo.", XO(31,235,1,1), XO_MASK,   PPCCOM,         { RT, RA, RB } },
-{ "mulso.",  XO(31,235,1,1), XO_MASK,   PWRCOM,         { RT, RA, RB } },
+{"lscbx",       XRC(31,277,0),  X_MASK,      M601,      0,              {RT, RA, RB}},
+{"lscbx.",      XRC(31,277,1),  X_MASK,      M601,      0,              {RT, RA, RB}},
 
-{ "icblce",  X(31,238), X_MASK,         PPCCHLK64,      { CT, RA, RB }},
-{ "mtsrin",  X(31,242), XRA_MASK,       PPC32,          { RS, RB } },
-{ "mtsri",   X(31,242), XRA_MASK,       POWER32,        { RS, RB } },
+{"dcbtt",       XRT(31,278,0x10), XRT_MASK,  POWER7,    0,              {RA0, RB}},
+{"dcbt",        X(31,278),      X_MASK,      POWER4,    DCBT_EO,        {RA0, RB, CT}},
+{"dcbt",        X(31,278),      X_MASK,      DCBT_EO,   0,              {CT, RA0, RB}},
+{"dcbt",        X(31,278),      X_MASK,      PPC,       POWER4|DCBT_EO, {RA0, RB}},
 
-{ "dcbtst",  X(31,246), X_MASK, PPC,                    { CT, RA, RB } },
+{"lhzx",        X(31,279),      X_MASK,      COM,       0,              {RT, RA0, RB}},
 
-{ "stbux",   X(31,247), X_MASK,         COM,            { RS, RAS, RB } },
-
-{ "slliq",   XRC(31,248,0), X_MASK,     M601,           { RA, RS, SH } },
-{ "slliq.",  XRC(31,248,1), X_MASK,     M601,           { RA, RS, SH } },
-
-{ "dcbtste", X(31,253), X_MASK,         BOOKE64,        { CT, RA, RB } },
-
-{ "stbuxe",  X(31,255), X_MASK,         BOOKE64,        { RS, RAS, RB } },
-
-{ "mfdcrx",  X(31,259), X_MASK,         BOOKE,          { RS, RA } },
-
-{ "doz",     XO(31,264,0,0), XO_MASK,   M601,           { RT, RA, RB } },
-{ "doz.",    XO(31,264,0,1), XO_MASK,   M601,           { RT, RA, RB } },
-{ "dozo",    XO(31,264,1,0), XO_MASK,   M601,           { RT, RA, RB } },
-{ "dozo.",   XO(31,264,1,1), XO_MASK,   M601,           { RT, RA, RB } },
-
-{ "add",     XO(31,266,0,0), XO_MASK,   PPCCOM,         { RT, RA, RB } },
-{ "cax",     XO(31,266,0,0), XO_MASK,   PWRCOM,         { RT, RA, RB } },
-{ "add.",    XO(31,266,0,1), XO_MASK,   PPCCOM,         { RT, RA, RB } },
-{ "cax.",    XO(31,266,0,1), XO_MASK,   PWRCOM,         { RT, RA, RB } },
-{ "addo",    XO(31,266,1,0), XO_MASK,   PPCCOM,         { RT, RA, RB } },
-{ "caxo",    XO(31,266,1,0), XO_MASK,   PWRCOM,         { RT, RA, RB } },
-{ "addo.",   XO(31,266,1,1), XO_MASK,   PPCCOM,         { RT, RA, RB } },
-{ "caxo.",   XO(31,266,1,1), XO_MASK,   PWRCOM,         { RT, RA, RB } },
-
-{ "tlbiel",  X(31,274), XRTLRA_MASK,    POWER4,         { RB, L } },
-
-{ "mfapidi", X(31,275), X_MASK,         BOOKE,          { RT, RA } },
-
-{ "lscbx",   XRC(31,277,0), X_MASK,     M601,           { RT, RA, RB } },
-{ "lscbx.",  XRC(31,277,1), X_MASK,     M601,           { RT, RA, RB } },
-
-{ "dcbt",    X(31,278), X_MASK,         PPC,            { CT, RA, RB } },
-
-{ "lhzx",    X(31,279), X_MASK,         COM,            { RT, RA0, RB } },
-
-{ "eqv",     XRC(31,284,0), X_MASK,     COM,            { RA, RS, RB } },
-{ "eqv.",    XRC(31,284,1), X_MASK,     COM,            { RA, RS, RB } },
-
-{ "dcbte",   X(31,286), X_MASK,         BOOKE64,        { CT, RA, RB } },
-
-{ "lhzxe",   X(31,287), X_MASK,         BOOKE64,        { RT, RA0, RB } },
-
-{ "tlbie",   X(31,306), XRTLRA_MASK,    PPC,            { RB, L } },
-{ "tlbi",    X(31,306), XRT_MASK,       POWER,          { RA0, RB } },
-
-{ "eciwx",   X(31,310), X_MASK,         PPC,            { RT, RA, RB } },
-
-{ "lhzux",   X(31,311), X_MASK,         COM,            { RT, RAL, RB } },
-
-{ "xor",     XRC(31,316,0), X_MASK,     COM,            { RA, RS, RB } },
-{ "xor.",    XRC(31,316,1), X_MASK,     COM,            { RA, RS, RB } },
-
-{ "lhzuxe",  X(31,319), X_MASK,         BOOKE64,        { RT, RAL, RB } },
-
-{ "mfexisr",  XSPR(31,323,64),  XSPR_MASK, PPC403,      { RT } },
-{ "mfexier",  XSPR(31,323,66),  XSPR_MASK, PPC403,      { RT } },
-{ "mfbr0",    XSPR(31,323,128), XSPR_MASK, PPC403,      { RT } },
-{ "mfbr1",    XSPR(31,323,129), XSPR_MASK, PPC403,      { RT } },
-{ "mfbr2",    XSPR(31,323,130), XSPR_MASK, PPC403,      { RT } },
-{ "mfbr3",    XSPR(31,323,131), XSPR_MASK, PPC403,      { RT } },
-{ "mfbr4",    XSPR(31,323,132), XSPR_MASK, PPC403,      { RT } },
-{ "mfbr5",    XSPR(31,323,133), XSPR_MASK, PPC403,      { RT } },
-{ "mfbr6",    XSPR(31,323,134), XSPR_MASK, PPC403,      { RT } },
-{ "mfbr7",    XSPR(31,323,135), XSPR_MASK, PPC403,      { RT } },
-{ "mfbear",   XSPR(31,323,144), XSPR_MASK, PPC403,      { RT } },
-{ "mfbesr",   XSPR(31,323,145), XSPR_MASK, PPC403,      { RT } },
-{ "mfiocr",   XSPR(31,323,160), XSPR_MASK, PPC403,      { RT } },
-{ "mfdmacr0", XSPR(31,323,192), XSPR_MASK, PPC403,      { RT } },
-{ "mfdmact0", XSPR(31,323,193), XSPR_MASK, PPC403,      { RT } },
-{ "mfdmada0", XSPR(31,323,194), XSPR_MASK, PPC403,      { RT } },
-{ "mfdmasa0", XSPR(31,323,195), XSPR_MASK, PPC403,      { RT } },
-{ "mfdmacc0", XSPR(31,323,196), XSPR_MASK, PPC403,      { RT } },
-{ "mfdmacr1", XSPR(31,323,200), XSPR_MASK, PPC403,      { RT } },
-{ "mfdmact1", XSPR(31,323,201), XSPR_MASK, PPC403,      { RT } },
-{ "mfdmada1", XSPR(31,323,202), XSPR_MASK, PPC403,      { RT } },
-{ "mfdmasa1", XSPR(31,323,203), XSPR_MASK, PPC403,      { RT } },
-{ "mfdmacc1", XSPR(31,323,204), XSPR_MASK, PPC403,      { RT } },
-{ "mfdmacr2", XSPR(31,323,208), XSPR_MASK, PPC403,      { RT } },
-{ "mfdmact2", XSPR(31,323,209), XSPR_MASK, PPC403,      { RT } },
-{ "mfdmada2", XSPR(31,323,210), XSPR_MASK, PPC403,      { RT } },
-{ "mfdmasa2", XSPR(31,323,211), XSPR_MASK, PPC403,      { RT } },
-{ "mfdmacc2", XSPR(31,323,212), XSPR_MASK, PPC403,      { RT } },
-{ "mfdmacr3", XSPR(31,323,216), XSPR_MASK, PPC403,      { RT } },
-{ "mfdmact3", XSPR(31,323,217), XSPR_MASK, PPC403,      { RT } },
-{ "mfdmada3", XSPR(31,323,218), XSPR_MASK, PPC403,      { RT } },
-{ "mfdmasa3", XSPR(31,323,219), XSPR_MASK, PPC403,      { RT } },
-{ "mfdmacc3", XSPR(31,323,220), XSPR_MASK, PPC403,      { RT } },
-{ "mfdmasr",  XSPR(31,323,224), XSPR_MASK, PPC403,      { RT } },
-{ "mfdcr",    X(31,323),        X_MASK, PPC403 | BOOKE, { RT, SPR } },
-
-{ "div",     XO(31,331,0,0), XO_MASK,   M601,           { RT, RA, RB } },
-{ "div.",    XO(31,331,0,1), XO_MASK,   M601,           { RT, RA, RB } },
-{ "divo",    XO(31,331,1,0), XO_MASK,   M601,           { RT, RA, RB } },
-{ "divo.",   XO(31,331,1,1), XO_MASK,   M601,           { RT, RA, RB } },
-
-{ "mfpmr",   X(31,334), X_MASK,         PPCPMR,         { RT, PMR }},
-
-{ "mfmq",       XSPR(31,339,0),    XSPR_MASK, M601,     { RT } },
-{ "mfxer",      XSPR(31,339,1),    XSPR_MASK, COM,      { RT } },
-{ "mfrtcu",     XSPR(31,339,4),    XSPR_MASK, COM,      { RT } },
-{ "mfrtcl",     XSPR(31,339,5),    XSPR_MASK, COM,      { RT } },
-{ "mfdec",      XSPR(31,339,6),    XSPR_MASK, MFDEC1,   { RT } },
-{ "mfdec",      XSPR(31,339,22),   XSPR_MASK, MFDEC2,   { RT } },
-{ "mflr",       XSPR(31,339,8),    XSPR_MASK, COM,      { RT } },
-{ "mfctr",      XSPR(31,339,9),    XSPR_MASK, COM,      { RT } },
-{ "mftid",      XSPR(31,339,17),   XSPR_MASK, POWER,    { RT } },
-{ "mfdsisr",    XSPR(31,339,18),   XSPR_MASK, COM,      { RT } },
-{ "mfdar",      XSPR(31,339,19),   XSPR_MASK, COM,      { RT } },
-{ "mfsdr0",     XSPR(31,339,24),   XSPR_MASK, POWER,    { RT } },
-{ "mfsdr1",     XSPR(31,339,25),   XSPR_MASK, COM,      { RT } },
-{ "mfsrr0",     XSPR(31,339,26),   XSPR_MASK, COM,      { RT } },
-{ "mfsrr1",     XSPR(31,339,27),   XSPR_MASK, COM,      { RT } },
-{ "mfcfar",     XSPR(31,339,28),   XSPR_MASK, POWER6,   { RT } },
-{ "mfpid",      XSPR(31,339,48),   XSPR_MASK, BOOKE,    { RT } },
-{ "mfpid",      XSPR(31,339,945),  XSPR_MASK, PPC403,   { RT } },
-{ "mfcsrr0",    XSPR(31,339,58),   XSPR_MASK, BOOKE,    { RT } },
-{ "mfcsrr1",    XSPR(31,339,59),   XSPR_MASK, BOOKE,    { RT } },
-{ "mfdear",     XSPR(31,339,61),   XSPR_MASK, BOOKE,    { RT } },
-{ "mfdear",     XSPR(31,339,981),  XSPR_MASK, PPC403,   { RT } },
-{ "mfesr",      XSPR(31,339,62),   XSPR_MASK, BOOKE,    { RT } },
-{ "mfesr",      XSPR(31,339,980),  XSPR_MASK, PPC403,   { RT } },
-{ "mfivpr",     XSPR(31,339,63),   XSPR_MASK, BOOKE,    { RT } },
-{ "mfcmpa",     XSPR(31,339,144),  XSPR_MASK, PPC860,   { RT } },
-{ "mfcmpb",     XSPR(31,339,145),  XSPR_MASK, PPC860,   { RT } },
-{ "mfcmpc",     XSPR(31,339,146),  XSPR_MASK, PPC860,   { RT } },
-{ "mfcmpd",     XSPR(31,339,147),  XSPR_MASK, PPC860,   { RT } },
-{ "mficr",      XSPR(31,339,148),  XSPR_MASK, PPC860,   { RT } },
-{ "mfder",      XSPR(31,339,149),  XSPR_MASK, PPC860,   { RT } },
-{ "mfcounta",   XSPR(31,339,150),  XSPR_MASK, PPC860,   { RT } },
-{ "mfcountb",   XSPR(31,339,151),  XSPR_MASK, PPC860,   { RT } },
-{ "mfcmpe",     XSPR(31,339,152),  XSPR_MASK, PPC860,   { RT } },
-{ "mfcmpf",     XSPR(31,339,153),  XSPR_MASK, PPC860,   { RT } },
-{ "mfcmpg",     XSPR(31,339,154),  XSPR_MASK, PPC860,   { RT } },
-{ "mfcmph",     XSPR(31,339,155),  XSPR_MASK, PPC860,   { RT } },
-{ "mflctrl1",   XSPR(31,339,156),  XSPR_MASK, PPC860,   { RT } },
-{ "mflctrl2",   XSPR(31,339,157),  XSPR_MASK, PPC860,   { RT } },
-{ "mfictrl",    XSPR(31,339,158),  XSPR_MASK, PPC860,   { RT } },
-{ "mfbar",      XSPR(31,339,159),  XSPR_MASK, PPC860,   { RT } },
-{ "mfvrsave",   XSPR(31,339,256),  XSPR_MASK, PPCVEC,   { RT } },
-{ "mfusprg0",   XSPR(31,339,256),  XSPR_MASK, BOOKE,    { RT } },
-{ "mftb",       X(31,371),         X_MASK,    CLASSIC,  { RT, TBR } },
-{ "mftb",       XSPR(31,339,268),  XSPR_MASK, BOOKE,    { RT } },
-{ "mftbl",      XSPR(31,371,268),  XSPR_MASK, CLASSIC,  { RT } },
-{ "mftbl",      XSPR(31,339,268),  XSPR_MASK, BOOKE,    { RT } },
-{ "mftbu",      XSPR(31,371,269),  XSPR_MASK, CLASSIC,  { RT } },
-{ "mftbu",      XSPR(31,339,269),  XSPR_MASK, BOOKE,    { RT } },
-{ "mfsprg",     XSPR(31,339,256),  XSPRG_MASK, PPC,     { RT, SPRG } },
-{ "mfsprg0",    XSPR(31,339,272),  XSPR_MASK, PPC,      { RT } },
-{ "mfsprg1",    XSPR(31,339,273),  XSPR_MASK, PPC,      { RT } },
-{ "mfsprg2",    XSPR(31,339,274),  XSPR_MASK, PPC,      { RT } },
-{ "mfsprg3",    XSPR(31,339,275),  XSPR_MASK, PPC,      { RT } },
-{ "mfsprg4",    XSPR(31,339,260),  XSPR_MASK, PPC405 | BOOKE,   { RT } },
-{ "mfsprg5",    XSPR(31,339,261),  XSPR_MASK, PPC405 | BOOKE,   { RT } },
-{ "mfsprg6",    XSPR(31,339,262),  XSPR_MASK, PPC405 | BOOKE,   { RT } },
-{ "mfsprg7",    XSPR(31,339,263),  XSPR_MASK, PPC405 | BOOKE,   { RT } },
-{ "mfasr",      XSPR(31,339,280),  XSPR_MASK, PPC64,    { RT } },
-{ "mfear",      XSPR(31,339,282),  XSPR_MASK, PPC,      { RT } },
-{ "mfpir",      XSPR(31,339,286),  XSPR_MASK, BOOKE,    { RT } },
-{ "mfpvr",      XSPR(31,339,287),  XSPR_MASK, PPC,      { RT } },
-{ "mfdbsr",     XSPR(31,339,304),  XSPR_MASK, BOOKE,    { RT } },
-{ "mfdbsr",     XSPR(31,339,1008), XSPR_MASK, PPC403,   { RT } },
-{ "mfdbcr0",    XSPR(31,339,308),  XSPR_MASK, BOOKE,    { RT } },
-{ "mfdbcr0",    XSPR(31,339,1010), XSPR_MASK, PPC405,   { RT } },
-{ "mfdbcr1",    XSPR(31,339,309),  XSPR_MASK, BOOKE,    { RT } },
-{ "mfdbcr1",    XSPR(31,339,957),  XSPR_MASK, PPC405,   { RT } },
-{ "mfdbcr2",    XSPR(31,339,310),  XSPR_MASK, BOOKE,    { RT } },
-{ "mfiac1",     XSPR(31,339,312),  XSPR_MASK, BOOKE,    { RT } },
-{ "mfiac1",     XSPR(31,339,1012), XSPR_MASK, PPC403,   { RT } },
-{ "mfiac2",     XSPR(31,339,313),  XSPR_MASK, BOOKE,    { RT } },
-{ "mfiac2",     XSPR(31,339,1013), XSPR_MASK, PPC403,   { RT } },
-{ "mfiac3",     XSPR(31,339,314),  XSPR_MASK, BOOKE,    { RT } },
-{ "mfiac3",     XSPR(31,339,948),  XSPR_MASK, PPC405,   { RT } },
-{ "mfiac4",     XSPR(31,339,315),  XSPR_MASK, BOOKE,    { RT } },
-{ "mfiac4",     XSPR(31,339,949),  XSPR_MASK, PPC405,   { RT } },
-{ "mfdac1",     XSPR(31,339,316),  XSPR_MASK, BOOKE,    { RT } },
-{ "mfdac1",     XSPR(31,339,1014), XSPR_MASK, PPC403,   { RT } },
-{ "mfdac2",     XSPR(31,339,317),  XSPR_MASK, BOOKE,    { RT } },
-{ "mfdac2",     XSPR(31,339,1015), XSPR_MASK, PPC403,   { RT } },
-{ "mfdvc1",     XSPR(31,339,318),  XSPR_MASK, BOOKE,    { RT } },
-{ "mfdvc1",     XSPR(31,339,950),  XSPR_MASK, PPC405,   { RT } },
-{ "mfdvc2",     XSPR(31,339,319),  XSPR_MASK, BOOKE,    { RT } },
-{ "mfdvc2",     XSPR(31,339,951),  XSPR_MASK, PPC405,   { RT } },
-{ "mftsr",      XSPR(31,339,336),  XSPR_MASK, BOOKE,    { RT } },
-{ "mftsr",      XSPR(31,339,984),  XSPR_MASK, PPC403,   { RT } },
-{ "mftcr",      XSPR(31,339,340),  XSPR_MASK, BOOKE,    { RT } },
-{ "mftcr",      XSPR(31,339,986),  XSPR_MASK, PPC403,   { RT } },
-{ "mfivor0",    XSPR(31,339,400),  XSPR_MASK, BOOKE,    { RT } },
-{ "mfivor1",    XSPR(31,339,401),  XSPR_MASK, BOOKE,    { RT } },
-{ "mfivor2",    XSPR(31,339,402),  XSPR_MASK, BOOKE,    { RT } },
-{ "mfivor3",    XSPR(31,339,403),  XSPR_MASK, BOOKE,    { RT } },
-{ "mfivor4",    XSPR(31,339,404),  XSPR_MASK, BOOKE,    { RT } },
-{ "mfivor5",    XSPR(31,339,405),  XSPR_MASK, BOOKE,    { RT } },
-{ "mfivor6",    XSPR(31,339,406),  XSPR_MASK, BOOKE,    { RT } },
-{ "mfivor7",    XSPR(31,339,407),  XSPR_MASK, BOOKE,    { RT } },
-{ "mfivor8",    XSPR(31,339,408),  XSPR_MASK, BOOKE,    { RT } },
-{ "mfivor9",    XSPR(31,339,409),  XSPR_MASK, BOOKE,    { RT } },
-{ "mfivor10",   XSPR(31,339,410),  XSPR_MASK, BOOKE,    { RT } },
-{ "mfivor11",   XSPR(31,339,411),  XSPR_MASK, BOOKE,    { RT } },
-{ "mfivor12",   XSPR(31,339,412),  XSPR_MASK, BOOKE,    { RT } },
-{ "mfivor13",   XSPR(31,339,413),  XSPR_MASK, BOOKE,    { RT } },
-{ "mfivor14",   XSPR(31,339,414),  XSPR_MASK, BOOKE,    { RT } },
-{ "mfivor15",   XSPR(31,339,415),  XSPR_MASK, BOOKE,    { RT } },
-{ "mfspefscr",  XSPR(31,339,512),  XSPR_MASK, PPCSPE,   { RT } },
-{ "mfbbear",    XSPR(31,339,513),  XSPR_MASK, PPCBRLK,  { RT } },
-{ "mfbbtar",    XSPR(31,339,514),  XSPR_MASK, PPCBRLK,  { RT } },
-{ "mfivor32",   XSPR(31,339,528),  XSPR_MASK, PPCSPE,   { RT } },
-{ "mfivor33",   XSPR(31,339,529),  XSPR_MASK, PPCSPE,   { RT } },
-{ "mfivor34",   XSPR(31,339,530),  XSPR_MASK, PPCSPE,   { RT } },
-{ "mfivor35",   XSPR(31,339,531),  XSPR_MASK, PPCPMR,   { RT } },
-{ "mfibatu",    XSPR(31,339,528),  XSPRBAT_MASK, PPC,   { RT, SPRBAT } },
-{ "mfibatl",    XSPR(31,339,529),  XSPRBAT_MASK, PPC,   { RT, SPRBAT } },
-{ "mfdbatu",    XSPR(31,339,536),  XSPRBAT_MASK, PPC,   { RT, SPRBAT } },
-{ "mfdbatl",    XSPR(31,339,537),  XSPRBAT_MASK, PPC,   { RT, SPRBAT } },
-{ "mfic_cst",   XSPR(31,339,560),  XSPR_MASK, PPC860,   { RT } },
-{ "mfic_adr",   XSPR(31,339,561),  XSPR_MASK, PPC860,   { RT } },
-{ "mfic_dat",   XSPR(31,339,562),  XSPR_MASK, PPC860,   { RT } },
-{ "mfdc_cst",   XSPR(31,339,568),  XSPR_MASK, PPC860,   { RT } },
-{ "mfdc_adr",   XSPR(31,339,569),  XSPR_MASK, PPC860,   { RT } },
-{ "mfmcsrr0",   XSPR(31,339,570),  XSPR_MASK, PPCRFMCI, { RT } },
-{ "mfdc_dat",   XSPR(31,339,570),  XSPR_MASK, PPC860,   { RT } },
-{ "mfmcsrr1",   XSPR(31,339,571),  XSPR_MASK, PPCRFMCI, { RT } },
-{ "mfmcsr",     XSPR(31,339,572),  XSPR_MASK, PPCRFMCI, { RT } },
-{ "mfmcar",     XSPR(31,339,573),  XSPR_MASK, PPCRFMCI, { RT } },
-{ "mfdpdr",     XSPR(31,339,630),  XSPR_MASK, PPC860,   { RT } },
-{ "mfdpir",     XSPR(31,339,631),  XSPR_MASK, PPC860,   { RT } },
-{ "mfimmr",     XSPR(31,339,638),  XSPR_MASK, PPC860,   { RT } },
-{ "mfmi_ctr",   XSPR(31,339,784),  XSPR_MASK, PPC860,   { RT } },
-{ "mfmi_ap",    XSPR(31,339,786),  XSPR_MASK, PPC860,   { RT } },
-{ "mfmi_epn",   XSPR(31,339,787),  XSPR_MASK, PPC860,   { RT } },
-{ "mfmi_twc",   XSPR(31,339,789),  XSPR_MASK, PPC860,   { RT } },
-{ "mfmi_rpn",   XSPR(31,339,790),  XSPR_MASK, PPC860,   { RT } },
-{ "mfmd_ctr",   XSPR(31,339,792),  XSPR_MASK, PPC860,   { RT } },
-{ "mfm_casid",  XSPR(31,339,793),  XSPR_MASK, PPC860,   { RT } },
-{ "mfmd_ap",    XSPR(31,339,794),  XSPR_MASK, PPC860,   { RT } },
-{ "mfmd_epn",   XSPR(31,339,795),  XSPR_MASK, PPC860,   { RT } },
-{ "mfmd_twb",   XSPR(31,339,796),  XSPR_MASK, PPC860,   { RT } },
-{ "mfmd_twc",   XSPR(31,339,797),  XSPR_MASK, PPC860,   { RT } },
-{ "mfmd_rpn",   XSPR(31,339,798),  XSPR_MASK, PPC860,   { RT } },
-{ "mfm_tw",     XSPR(31,339,799),  XSPR_MASK, PPC860,   { RT } },
-{ "mfmi_dbcam", XSPR(31,339,816),  XSPR_MASK, PPC860,   { RT } },
-{ "mfmi_dbram0",XSPR(31,339,817),  XSPR_MASK, PPC860,   { RT } },
-{ "mfmi_dbram1",XSPR(31,339,818),  XSPR_MASK, PPC860,   { RT } },
-{ "mfmd_dbcam", XSPR(31,339,824),  XSPR_MASK, PPC860,   { RT } },
-{ "mfmd_dbram0",XSPR(31,339,825),  XSPR_MASK, PPC860,   { RT } },
-{ "mfmd_dbram1",XSPR(31,339,826),  XSPR_MASK, PPC860,   { RT } },
-{ "mfummcr0",   XSPR(31,339,936),  XSPR_MASK, PPC750,   { RT } },
-{ "mfupmc1",    XSPR(31,339,937),  XSPR_MASK, PPC750,   { RT } },
-{ "mfupmc2",    XSPR(31,339,938),  XSPR_MASK, PPC750,   { RT } },
-{ "mfusia",     XSPR(31,339,939),  XSPR_MASK, PPC750,   { RT } },
-{ "mfummcr1",   XSPR(31,339,940),  XSPR_MASK, PPC750,   { RT } },
-{ "mfupmc3",    XSPR(31,339,941),  XSPR_MASK, PPC750,   { RT } },
-{ "mfupmc4",    XSPR(31,339,942),  XSPR_MASK, PPC750,   { RT } },
-{ "mfzpr",      XSPR(31,339,944),  XSPR_MASK, PPC403,   { RT } },
-{ "mfccr0",     XSPR(31,339,947),  XSPR_MASK, PPC405,   { RT } },
-{ "mfmmcr0",    XSPR(31,339,952),  XSPR_MASK, PPC750,   { RT } },
-{ "mfpmc1",     XSPR(31,339,953),  XSPR_MASK, PPC750,   { RT } },
-{ "mfsgr",      XSPR(31,339,953),  XSPR_MASK, PPC403,   { RT } },
-{ "mfpmc2",     XSPR(31,339,954),  XSPR_MASK, PPC750,   { RT } },
-{ "mfdcwr",     XSPR(31,339,954),  XSPR_MASK, PPC403,   { RT } },
-{ "mfsia",      XSPR(31,339,955),  XSPR_MASK, PPC750,   { RT } },
-{ "mfsler",     XSPR(31,339,955),  XSPR_MASK, PPC405,   { RT } },
-{ "mfmmcr1",    XSPR(31,339,956),  XSPR_MASK, PPC750,   { RT } },
-{ "mfsu0r",     XSPR(31,339,956),  XSPR_MASK, PPC405,   { RT } },
-{ "mfpmc3",     XSPR(31,339,957),  XSPR_MASK, PPC750,   { RT } },
-{ "mfpmc4",     XSPR(31,339,958),  XSPR_MASK, PPC750,   { RT } },
-{ "mficdbdr",   XSPR(31,339,979),  XSPR_MASK, PPC403,   { RT } },
-{ "mfevpr",     XSPR(31,339,982),  XSPR_MASK, PPC403,   { RT } },
-{ "mfcdbcr",    XSPR(31,339,983),  XSPR_MASK, PPC403,   { RT } },
-{ "mfpit",      XSPR(31,339,987),  XSPR_MASK, PPC403,   { RT } },
-{ "mftbhi",     XSPR(31,339,988),  XSPR_MASK, PPC403,   { RT } },
-{ "mftblo",     XSPR(31,339,989),  XSPR_MASK, PPC403,   { RT } },
-{ "mfsrr2",     XSPR(31,339,990),  XSPR_MASK, PPC403,   { RT } },
-{ "mfsrr3",     XSPR(31,339,991),  XSPR_MASK, PPC403,   { RT } },
-{ "mfl2cr",     XSPR(31,339,1017), XSPR_MASK, PPC750,   { RT } },
-{ "mfdccr",     XSPR(31,339,1018), XSPR_MASK, PPC403,   { RT } },
-{ "mficcr",     XSPR(31,339,1019), XSPR_MASK, PPC403,   { RT } },
-{ "mfictc",     XSPR(31,339,1019), XSPR_MASK, PPC750,   { RT } },
-{ "mfpbl1",     XSPR(31,339,1020), XSPR_MASK, PPC403,   { RT } },
-{ "mfthrm1",    XSPR(31,339,1020), XSPR_MASK, PPC750,   { RT } },
-{ "mfpbu1",     XSPR(31,339,1021), XSPR_MASK, PPC403,   { RT } },
-{ "mfthrm2",    XSPR(31,339,1021), XSPR_MASK, PPC750,   { RT } },
-{ "mfpbl2",     XSPR(31,339,1022), XSPR_MASK, PPC403,   { RT } },
-{ "mfthrm3",    XSPR(31,339,1022), XSPR_MASK, PPC750,   { RT } },
-{ "mfpbu2",     XSPR(31,339,1023), XSPR_MASK, PPC403,   { RT } },
-{ "mfspr",      X(31,339),         X_MASK,    COM,      { RT, SPR } },
-
-{ "lwax",    X(31,341), X_MASK,         PPC64,          { RT, RA0, RB } },
-
-{ "dst",     XDSS(31,342,0), XDSS_MASK, PPCVEC,         { RA, RB, STRM } },
-{ "dstt",    XDSS(31,342,1), XDSS_MASK, PPCVEC,         { RA, RB, STRM } },
-
-{ "lhax",    X(31,343), X_MASK,         COM,            { RT, RA0, RB } },
-
-{ "lhaxe",   X(31,351), X_MASK,         BOOKE64,        { RT, RA0, RB } },
-
-{ "dstst",   XDSS(31,374,0), XDSS_MASK, PPCVEC,         { RA, RB, STRM } },
-{ "dststt",  XDSS(31,374,1), XDSS_MASK, PPCVEC,         { RA, RB, STRM } },
-
-{ "dccci",   X(31,454), XRT_MASK,       PPC403|PPC440,  { RA, RB } },
-
-{ "abs",     XO(31,360,0,0), XORB_MASK, M601,           { RT, RA } },
-{ "abs.",    XO(31,360,0,1), XORB_MASK, M601,           { RT, RA } },
-{ "abso",    XO(31,360,1,0), XORB_MASK, M601,           { RT, RA } },
-{ "abso.",   XO(31,360,1,1), XORB_MASK, M601,           { RT, RA } },
-
-{ "divs",    XO(31,363,0,0), XO_MASK,   M601,           { RT, RA, RB } },
-{ "divs.",   XO(31,363,0,1), XO_MASK,   M601,           { RT, RA, RB } },
-{ "divso",   XO(31,363,1,0), XO_MASK,   M601,           { RT, RA, RB } },
-{ "divso.",  XO(31,363,1,1), XO_MASK,   M601,           { RT, RA, RB } },
-
-{ "tlbia",   X(31,370), 0xffffffff,     PPC,            { 0 } },
-
-{ "lwaux",   X(31,373), X_MASK,         PPC64,          { RT, RAL, RB } },
-
-{ "lhaux",   X(31,375), X_MASK,         COM,            { RT, RAL, RB } },
-
-{ "lhauxe",  X(31,383), X_MASK,         BOOKE64,        { RT, RAL, RB } },
-
-{ "mtdcrx",  X(31,387), X_MASK,         BOOKE,          { RA, RS } },
-
-{ "dcblc",   X(31,390), X_MASK,         PPCCHLK,        { CT, RA, RB }},
-
-{ "subfe64", XO(31,392,0,0), XO_MASK,   BOOKE64,        { RT, RA, RB } },
-{ "subfe64o",XO(31,392,1,0), XO_MASK,   BOOKE64,        { RT, RA, RB } },
-
-{ "adde64",  XO(31,394,0,0), XO_MASK,   BOOKE64,        { RT, RA, RB } },
-{ "adde64o", XO(31,394,1,0), XO_MASK,   BOOKE64,        { RT, RA, RB } },
-
-{ "dcblce",  X(31,398), X_MASK,         PPCCHLK64,      { CT, RA, RB }},
-
-{ "slbmte",  X(31,402), XRA_MASK,       PPC64,          { RS, RB } },
-
-{ "sthx",    X(31,407), X_MASK,         COM,            { RS, RA0, RB } },
-
-{ "cmpb",    X(31,508), X_MASK,         POWER6,         { RA, RS, RB } },
-
-{ "lfqx",    X(31,791), X_MASK,         POWER2,         { FRT, RA, RB } },
-
-{ "lfdpx",   X(31,791), X_MASK,         POWER6,         { FRT, RA, RB } },
-
-{ "lfqux",   X(31,823), X_MASK,         POWER2,         { FRT, RA, RB } },
-
-{ "stfqx",   X(31,919), X_MASK,         POWER2,         { FRS, RA, RB } },
-
-{ "stfdpx",  X(31,919), X_MASK,         POWER6,         { FRS, RA, RB } },
-
-{ "stfqux",  X(31,951), X_MASK,         POWER2,         { FRS, RA, RB } },
-
-{ "orc",     XRC(31,412,0), X_MASK,     COM,            { RA, RS, RB } },
-{ "orc.",    XRC(31,412,1), X_MASK,     COM,            { RA, RS, RB } },
-
-{ "sradi",   XS(31,413,0), XS_MASK,     PPC64,          { RA, RS, SH6 } },
-{ "sradi.",  XS(31,413,1), XS_MASK,     PPC64,          { RA, RS, SH6 } },
-
-{ "sthxe",   X(31,415), X_MASK,         BOOKE64,        { RS, RA0, RB } },
-
-{ "slbie",   X(31,434), XRTRA_MASK,     PPC64,          { RB } },
-
-{ "ecowx",   X(31,438), X_MASK,         PPC,            { RT, RA, RB } },
-
-{ "sthux",   X(31,439), X_MASK,         COM,            { RS, RAS, RB } },
-
-{ "sthuxe",  X(31,447), X_MASK,         BOOKE64,        { RS, RAS, RB } },
-
-{ "mr",      XRC(31,444,0), X_MASK,     COM,            { RA, RS, RBS } },
-{ "or",      XRC(31,444,0), X_MASK,     COM,            { RA, RS, RB } },
-{ "mr.",     XRC(31,444,1), X_MASK,     COM,            { RA, RS, RBS } },
-{ "or.",     XRC(31,444,1), X_MASK,     COM,            { RA, RS, RB } },
-
-{ "mtexisr",  XSPR(31,451,64),  XSPR_MASK, PPC403,      { RS } },
-{ "mtexier",  XSPR(31,451,66),  XSPR_MASK, PPC403,      { RS } },
-{ "mtbr0",    XSPR(31,451,128), XSPR_MASK, PPC403,      { RS } },
-{ "mtbr1",    XSPR(31,451,129), XSPR_MASK, PPC403,      { RS } },
-{ "mtbr2",    XSPR(31,451,130), XSPR_MASK, PPC403,      { RS } },
-{ "mtbr3",    XSPR(31,451,131), XSPR_MASK, PPC403,      { RS } },
-{ "mtbr4",    XSPR(31,451,132), XSPR_MASK, PPC403,      { RS } },
-{ "mtbr5",    XSPR(31,451,133), XSPR_MASK, PPC403,      { RS } },
-{ "mtbr6",    XSPR(31,451,134), XSPR_MASK, PPC403,      { RS } },
-{ "mtbr7",    XSPR(31,451,135), XSPR_MASK, PPC403,      { RS } },
-{ "mtbear",   XSPR(31,451,144), XSPR_MASK, PPC403,      { RS } },
-{ "mtbesr",   XSPR(31,451,145), XSPR_MASK, PPC403,      { RS } },
-{ "mtiocr",   XSPR(31,451,160), XSPR_MASK, PPC403,      { RS } },
-{ "mtdmacr0", XSPR(31,451,192), XSPR_MASK, PPC403,      { RS } },
-{ "mtdmact0", XSPR(31,451,193), XSPR_MASK, PPC403,      { RS } },
-{ "mtdmada0", XSPR(31,451,194), XSPR_MASK, PPC403,      { RS } },
-{ "mtdmasa0", XSPR(31,451,195), XSPR_MASK, PPC403,      { RS } },
-{ "mtdmacc0", XSPR(31,451,196), XSPR_MASK, PPC403,      { RS } },
-{ "mtdmacr1", XSPR(31,451,200), XSPR_MASK, PPC403,      { RS } },
-{ "mtdmact1", XSPR(31,451,201), XSPR_MASK, PPC403,      { RS } },
-{ "mtdmada1", XSPR(31,451,202), XSPR_MASK, PPC403,      { RS } },
-{ "mtdmasa1", XSPR(31,451,203), XSPR_MASK, PPC403,      { RS } },
-{ "mtdmacc1", XSPR(31,451,204), XSPR_MASK, PPC403,      { RS } },
-{ "mtdmacr2", XSPR(31,451,208), XSPR_MASK, PPC403,      { RS } },
-{ "mtdmact2", XSPR(31,451,209), XSPR_MASK, PPC403,      { RS } },
-{ "mtdmada2", XSPR(31,451,210), XSPR_MASK, PPC403,      { RS } },
-{ "mtdmasa2", XSPR(31,451,211), XSPR_MASK, PPC403,      { RS } },
-{ "mtdmacc2", XSPR(31,451,212), XSPR_MASK, PPC403,      { RS } },
-{ "mtdmacr3", XSPR(31,451,216), XSPR_MASK, PPC403,      { RS } },
-{ "mtdmact3", XSPR(31,451,217), XSPR_MASK, PPC403,      { RS } },
-{ "mtdmada3", XSPR(31,451,218), XSPR_MASK, PPC403,      { RS } },
-{ "mtdmasa3", XSPR(31,451,219), XSPR_MASK, PPC403,      { RS } },
-{ "mtdmacc3", XSPR(31,451,220), XSPR_MASK, PPC403,      { RS } },
-{ "mtdmasr",  XSPR(31,451,224), XSPR_MASK, PPC403,      { RS } },
-{ "mtdcr",    X(31,451),        X_MASK, PPC403 | BOOKE, { SPR, RS } },
-
-{ "subfze64",XO(31,456,0,0), XORB_MASK, BOOKE64,        { RT, RA } },
-{ "subfze64o",XO(31,456,1,0), XORB_MASK, BOOKE64,       { RT, RA } },
-
-{ "divdu",   XO(31,457,0,0), XO_MASK,   PPC64,          { RT, RA, RB } },
-{ "divdu.",  XO(31,457,0,1), XO_MASK,   PPC64,          { RT, RA, RB } },
-{ "divduo",  XO(31,457,1,0), XO_MASK,   PPC64,          { RT, RA, RB } },
-{ "divduo.", XO(31,457,1,1), XO_MASK,   PPC64,          { RT, RA, RB } },
-
-{ "addze64", XO(31,458,0,0), XORB_MASK, BOOKE64,        { RT, RA } },
-{ "addze64o",XO(31,458,1,0), XORB_MASK, BOOKE64,        { RT, RA } },
-
-{ "divwu",   XO(31,459,0,0), XO_MASK,   PPC,            { RT, RA, RB } },
-{ "divwu.",  XO(31,459,0,1), XO_MASK,   PPC,            { RT, RA, RB } },
-{ "divwuo",  XO(31,459,1,0), XO_MASK,   PPC,            { RT, RA, RB } },
-{ "divwuo.", XO(31,459,1,1), XO_MASK,   PPC,            { RT, RA, RB } },
-
-{ "mtmq",      XSPR(31,467,0),    XSPR_MASK, M601,      { RS } },
-{ "mtxer",     XSPR(31,467,1),    XSPR_MASK, COM,       { RS } },
-{ "mtlr",      XSPR(31,467,8),    XSPR_MASK, COM,       { RS } },
-{ "mtctr",     XSPR(31,467,9),    XSPR_MASK, COM,       { RS } },
-{ "mttid",     XSPR(31,467,17),   XSPR_MASK, POWER,     { RS } },
-{ "mtdsisr",   XSPR(31,467,18),   XSPR_MASK, COM,       { RS } },
-{ "mtdar",     XSPR(31,467,19),   XSPR_MASK, COM,       { RS } },
-{ "mtrtcu",    XSPR(31,467,20),   XSPR_MASK, COM,       { RS } },
-{ "mtrtcl",    XSPR(31,467,21),   XSPR_MASK, COM,       { RS } },
-{ "mtdec",     XSPR(31,467,22),   XSPR_MASK, COM,       { RS } },
-{ "mtsdr0",    XSPR(31,467,24),   XSPR_MASK, POWER,     { RS } },
-{ "mtsdr1",    XSPR(31,467,25),   XSPR_MASK, COM,       { RS } },
-{ "mtsrr0",    XSPR(31,467,26),   XSPR_MASK, COM,       { RS } },
-{ "mtsrr1",    XSPR(31,467,27),   XSPR_MASK, COM,       { RS } },
-{ "mtcfar",    XSPR(31,467,28),   XSPR_MASK, POWER6,    { RS } },
-{ "mtpid",     XSPR(31,467,48),   XSPR_MASK, BOOKE,     { RS } },
-{ "mtpid",     XSPR(31,467,945),  XSPR_MASK, PPC403,    { RS } },
-{ "mtdecar",   XSPR(31,467,54),   XSPR_MASK, BOOKE,     { RS } },
-{ "mtcsrr0",   XSPR(31,467,58),   XSPR_MASK, BOOKE,     { RS } },
-{ "mtcsrr1",   XSPR(31,467,59),   XSPR_MASK, BOOKE,     { RS } },
-{ "mtdear",    XSPR(31,467,61),   XSPR_MASK, BOOKE,     { RS } },
-{ "mtdear",    XSPR(31,467,981),  XSPR_MASK, PPC403,    { RS } },
-{ "mtesr",     XSPR(31,467,62),   XSPR_MASK, BOOKE,     { RS } },
-{ "mtesr",     XSPR(31,467,980),  XSPR_MASK, PPC403,    { RS } },
-{ "mtivpr",    XSPR(31,467,63),   XSPR_MASK, BOOKE,     { RS } },
-{ "mtcmpa",    XSPR(31,467,144),  XSPR_MASK, PPC860,    { RS } },
-{ "mtcmpb",    XSPR(31,467,145),  XSPR_MASK, PPC860,    { RS } },
-{ "mtcmpc",    XSPR(31,467,146),  XSPR_MASK, PPC860,    { RS } },
-{ "mtcmpd",    XSPR(31,467,147),  XSPR_MASK, PPC860,    { RS } },
-{ "mticr",     XSPR(31,467,148),  XSPR_MASK, PPC860,    { RS } },
-{ "mtder",     XSPR(31,467,149),  XSPR_MASK, PPC860,    { RS } },
-{ "mtcounta",  XSPR(31,467,150),  XSPR_MASK, PPC860,    { RS } },
-{ "mtcountb",  XSPR(31,467,151),  XSPR_MASK, PPC860,    { RS } },
-{ "mtcmpe",    XSPR(31,467,152),  XSPR_MASK, PPC860,    { RS } },
-{ "mtcmpf",    XSPR(31,467,153),  XSPR_MASK, PPC860,    { RS } },
-{ "mtcmpg",    XSPR(31,467,154),  XSPR_MASK, PPC860,    { RS } },
-{ "mtcmph",    XSPR(31,467,155),  XSPR_MASK, PPC860,    { RS } },
-{ "mtlctrl1",  XSPR(31,467,156),  XSPR_MASK, PPC860,    { RS } },
-{ "mtlctrl2",  XSPR(31,467,157),  XSPR_MASK, PPC860,    { RS } },
-{ "mtictrl",   XSPR(31,467,158),  XSPR_MASK, PPC860,    { RS } },
-{ "mtbar",     XSPR(31,467,159),  XSPR_MASK, PPC860,    { RS } },
-{ "mtvrsave",  XSPR(31,467,256),  XSPR_MASK, PPCVEC,    { RS } },
-{ "mtusprg0",  XSPR(31,467,256),  XSPR_MASK, BOOKE,     { RS } },
-{ "mtsprg",    XSPR(31,467,256),  XSPRG_MASK,PPC,       { SPRG, RS } },
-{ "mtsprg0",   XSPR(31,467,272),  XSPR_MASK, PPC,       { RS } },
-{ "mtsprg1",   XSPR(31,467,273),  XSPR_MASK, PPC,       { RS } },
-{ "mtsprg2",   XSPR(31,467,274),  XSPR_MASK, PPC,       { RS } },
-{ "mtsprg3",   XSPR(31,467,275),  XSPR_MASK, PPC,       { RS } },
-{ "mtsprg4",   XSPR(31,467,276),  XSPR_MASK, PPC405 | BOOKE, { RS } },
-{ "mtsprg5",   XSPR(31,467,277),  XSPR_MASK, PPC405 | BOOKE, { RS } },
-{ "mtsprg6",   XSPR(31,467,278),  XSPR_MASK, PPC405 | BOOKE, { RS } },
-{ "mtsprg7",   XSPR(31,467,279),  XSPR_MASK, PPC405 | BOOKE, { RS } },
-{ "mtasr",     XSPR(31,467,280),  XSPR_MASK, PPC64,     { RS } },
-{ "mtear",     XSPR(31,467,282),  XSPR_MASK, PPC,       { RS } },
-{ "mttbl",     XSPR(31,467,284),  XSPR_MASK, PPC,       { RS } },
-{ "mttbu",     XSPR(31,467,285),  XSPR_MASK, PPC,       { RS } },
-{ "mtdbsr",    XSPR(31,467,304),  XSPR_MASK, BOOKE,     { RS } },
-{ "mtdbsr",    XSPR(31,467,1008), XSPR_MASK, PPC403,    { RS } },
-{ "mtdbcr0",   XSPR(31,467,308),  XSPR_MASK, BOOKE,     { RS } },
-{ "mtdbcr0",   XSPR(31,467,1010), XSPR_MASK, PPC405,    { RS } },
-{ "mtdbcr1",   XSPR(31,467,309),  XSPR_MASK, BOOKE,     { RS } },
-{ "mtdbcr1",   XSPR(31,467,957),  XSPR_MASK, PPC405,    { RS } },
-{ "mtdbcr2",   XSPR(31,467,310),  XSPR_MASK, BOOKE,     { RS } },
-{ "mtiac1",    XSPR(31,467,312),  XSPR_MASK, BOOKE,     { RS } },
-{ "mtiac1",    XSPR(31,467,1012), XSPR_MASK, PPC403,    { RS } },
-{ "mtiac2",    XSPR(31,467,313),  XSPR_MASK, BOOKE,     { RS } },
-{ "mtiac2",    XSPR(31,467,1013), XSPR_MASK, PPC403,    { RS } },
-{ "mtiac3",    XSPR(31,467,314),  XSPR_MASK, BOOKE,     { RS } },
-{ "mtiac3",    XSPR(31,467,948),  XSPR_MASK, PPC405,    { RS } },
-{ "mtiac4",    XSPR(31,467,315),  XSPR_MASK, BOOKE,     { RS } },
-{ "mtiac4",    XSPR(31,467,949),  XSPR_MASK, PPC405,    { RS } },
-{ "mtdac1",    XSPR(31,467,316),  XSPR_MASK, BOOKE,     { RS } },
-{ "mtdac1",    XSPR(31,467,1014), XSPR_MASK, PPC403,    { RS } },
-{ "mtdac2",    XSPR(31,467,317),  XSPR_MASK, BOOKE,     { RS } },
-{ "mtdac2",    XSPR(31,467,1015), XSPR_MASK, PPC403,    { RS } },
-{ "mtdvc1",    XSPR(31,467,318),  XSPR_MASK, BOOKE,     { RS } },
-{ "mtdvc1",    XSPR(31,467,950),  XSPR_MASK, PPC405,    { RS } },
-{ "mtdvc2",    XSPR(31,467,319),  XSPR_MASK, BOOKE,     { RS } },
-{ "mtdvc2",    XSPR(31,467,951),  XSPR_MASK, PPC405,    { RS } },
-{ "mttsr",     XSPR(31,467,336),  XSPR_MASK, BOOKE,     { RS } },
-{ "mttsr",     XSPR(31,467,984),  XSPR_MASK, PPC403,    { RS } },
-{ "mttcr",     XSPR(31,467,340),  XSPR_MASK, BOOKE,     { RS } },
-{ "mttcr",     XSPR(31,467,986),  XSPR_MASK, PPC403,    { RS } },
-{ "mtivor0",   XSPR(31,467,400),  XSPR_MASK, BOOKE,     { RS } },
-{ "mtivor1",   XSPR(31,467,401),  XSPR_MASK, BOOKE,     { RS } },
-{ "mtivor2",   XSPR(31,467,402),  XSPR_MASK, BOOKE,     { RS } },
-{ "mtivor3",   XSPR(31,467,403),  XSPR_MASK, BOOKE,     { RS } },
-{ "mtivor4",   XSPR(31,467,404),  XSPR_MASK, BOOKE,     { RS } },
-{ "mtivor5",   XSPR(31,467,405),  XSPR_MASK, BOOKE,     { RS } },
-{ "mtivor6",   XSPR(31,467,406),  XSPR_MASK, BOOKE,     { RS } },
-{ "mtivor7",   XSPR(31,467,407),  XSPR_MASK, BOOKE,     { RS } },
-{ "mtivor8",   XSPR(31,467,408),  XSPR_MASK, BOOKE,     { RS } },
-{ "mtivor9",   XSPR(31,467,409),  XSPR_MASK, BOOKE,     { RS } },
-{ "mtivor10",  XSPR(31,467,410),  XSPR_MASK, BOOKE,     { RS } },
-{ "mtivor11",  XSPR(31,467,411),  XSPR_MASK, BOOKE,     { RS } },
-{ "mtivor12",  XSPR(31,467,412),  XSPR_MASK, BOOKE,     { RS } },
-{ "mtivor13",  XSPR(31,467,413),  XSPR_MASK, BOOKE,     { RS } },
-{ "mtivor14",  XSPR(31,467,414),  XSPR_MASK, BOOKE,     { RS } },
-{ "mtivor15",  XSPR(31,467,415),  XSPR_MASK, BOOKE,     { RS } },
-{ "mtspefscr",  XSPR(31,467,512),  XSPR_MASK, PPCSPE,   { RS } },
-{ "mtbbear",   XSPR(31,467,513),  XSPR_MASK, PPCBRLK,   { RS } },
-{ "mtbbtar",   XSPR(31,467,514),  XSPR_MASK, PPCBRLK,  { RS } },
-{ "mtivor32",  XSPR(31,467,528),  XSPR_MASK, PPCSPE,    { RS } },
-{ "mtivor33",  XSPR(31,467,529),  XSPR_MASK, PPCSPE,    { RS } },
-{ "mtivor34",  XSPR(31,467,530),  XSPR_MASK, PPCSPE,    { RS } },
-{ "mtivor35",  XSPR(31,467,531),  XSPR_MASK, PPCPMR,    { RS } },
-{ "mtibatu",   XSPR(31,467,528),  XSPRBAT_MASK, PPC,    { SPRBAT, RS } },
-{ "mtibatl",   XSPR(31,467,529),  XSPRBAT_MASK, PPC,    { SPRBAT, RS } },
-{ "mtdbatu",   XSPR(31,467,536),  XSPRBAT_MASK, PPC,    { SPRBAT, RS } },
-{ "mtdbatl",   XSPR(31,467,537),  XSPRBAT_MASK, PPC,    { SPRBAT, RS } },
-{ "mtmcsrr0",  XSPR(31,467,570),  XSPR_MASK, PPCRFMCI,  { RS } },
-{ "mtmcsrr1",  XSPR(31,467,571),  XSPR_MASK, PPCRFMCI,  { RS } },
-{ "mtmcsr",    XSPR(31,467,572),  XSPR_MASK, PPCRFMCI,  { RS } },
-{ "mtummcr0",  XSPR(31,467,936),  XSPR_MASK, PPC750,    { RS } },
-{ "mtupmc1",   XSPR(31,467,937),  XSPR_MASK, PPC750,    { RS } },
-{ "mtupmc2",   XSPR(31,467,938),  XSPR_MASK, PPC750,    { RS } },
-{ "mtusia",    XSPR(31,467,939),  XSPR_MASK, PPC750,    { RS } },
-{ "mtummcr1",  XSPR(31,467,940),  XSPR_MASK, PPC750,    { RS } },
-{ "mtupmc3",   XSPR(31,467,941),  XSPR_MASK, PPC750,    { RS } },
-{ "mtupmc4",   XSPR(31,467,942),  XSPR_MASK, PPC750,    { RS } },
-{ "mtzpr",     XSPR(31,467,944),  XSPR_MASK, PPC403,    { RS } },
-{ "mtccr0",    XSPR(31,467,947),  XSPR_MASK, PPC405,    { RS } },
-{ "mtmmcr0",   XSPR(31,467,952),  XSPR_MASK, PPC750,    { RS } },
-{ "mtsgr",     XSPR(31,467,953),  XSPR_MASK, PPC403,    { RS } },
-{ "mtpmc1",    XSPR(31,467,953),  XSPR_MASK, PPC750,    { RS } },
-{ "mtdcwr",    XSPR(31,467,954),  XSPR_MASK, PPC403,    { RS } },
-{ "mtpmc2",    XSPR(31,467,954),  XSPR_MASK, PPC750,    { RS } },
-{ "mtsler",    XSPR(31,467,955),  XSPR_MASK, PPC405,    { RS } },
-{ "mtsia",     XSPR(31,467,955),  XSPR_MASK, PPC750,    { RS } },
-{ "mtsu0r",    XSPR(31,467,956),  XSPR_MASK, PPC405,    { RS } },
-{ "mtmmcr1",   XSPR(31,467,956),  XSPR_MASK, PPC750,    { RS } },
-{ "mtpmc3",    XSPR(31,467,957),  XSPR_MASK, PPC750,    { RS } },
-{ "mtpmc4",    XSPR(31,467,958),  XSPR_MASK, PPC750,    { RS } },
-{ "mticdbdr",  XSPR(31,467,979),  XSPR_MASK, PPC403,    { RS } },
-{ "mtevpr",    XSPR(31,467,982),  XSPR_MASK, PPC403,    { RS } },
-{ "mtcdbcr",   XSPR(31,467,983),  XSPR_MASK, PPC403,    { RS } },
-{ "mtpit",     XSPR(31,467,987),  XSPR_MASK, PPC403,    { RS } },
-{ "mttbhi",    XSPR(31,467,988),  XSPR_MASK, PPC403,    { RS } },
-{ "mttblo",    XSPR(31,467,989),  XSPR_MASK, PPC403,    { RS } },
-{ "mtsrr2",    XSPR(31,467,990),  XSPR_MASK, PPC403,    { RS } },
-{ "mtsrr3",    XSPR(31,467,991),  XSPR_MASK, PPC403,    { RS } },
-{ "mtl2cr",    XSPR(31,467,1017), XSPR_MASK, PPC750,    { RS } },
-{ "mtdccr",    XSPR(31,467,1018), XSPR_MASK, PPC403,    { RS } },
-{ "mticcr",    XSPR(31,467,1019), XSPR_MASK, PPC403,    { RS } },
-{ "mtictc",    XSPR(31,467,1019), XSPR_MASK, PPC750,    { RS } },
-{ "mtpbl1",    XSPR(31,467,1020), XSPR_MASK, PPC403,    { RS } },
-{ "mtthrm1",   XSPR(31,467,1020), XSPR_MASK, PPC750,    { RS } },
-{ "mtpbu1",    XSPR(31,467,1021), XSPR_MASK, PPC403,    { RS } },
-{ "mtthrm2",   XSPR(31,467,1021), XSPR_MASK, PPC750,    { RS } },
-{ "mtpbl2",    XSPR(31,467,1022), XSPR_MASK, PPC403,    { RS } },
-{ "mtthrm3",   XSPR(31,467,1022), XSPR_MASK, PPC750,    { RS } },
-{ "mtpbu2",    XSPR(31,467,1023), XSPR_MASK, PPC403,    { RS } },
-{ "mtspr",     X(31,467),         X_MASK,    COM,       { SPR, RS } },
-
-{ "dcbi",    X(31,470), XRT_MASK,       PPC,            { RA, RB } },
-
-{ "nand",    XRC(31,476,0), X_MASK,     COM,            { RA, RS, RB } },
-{ "nand.",   XRC(31,476,1), X_MASK,     COM,            { RA, RS, RB } },
-
-{ "dcbie",   X(31,478), XRT_MASK,       BOOKE64,        { RA, RB } },
-
-{ "dcread",  X(31,486), X_MASK,         PPC403|PPC440,  { RT, RA, RB }},
-
-{ "mtpmr",   X(31,462), X_MASK,         PPCPMR,         { PMR, RS }},
-
-{ "icbtls",  X(31,486), X_MASK,         PPCCHLK,        { CT, RA, RB }},
-
-{ "nabs",    XO(31,488,0,0), XORB_MASK, M601,           { RT, RA } },
-{ "subfme64",XO(31,488,0,0), XORB_MASK, BOOKE64,        { RT, RA } },
-{ "nabs.",   XO(31,488,0,1), XORB_MASK, M601,           { RT, RA } },
-{ "nabso",   XO(31,488,1,0), XORB_MASK, M601,           { RT, RA } },
-{ "subfme64o",XO(31,488,1,0), XORB_MASK, BOOKE64,       { RT, RA } },
-{ "nabso.",  XO(31,488,1,1), XORB_MASK, M601,           { RT, RA } },
-
-{ "divd",    XO(31,489,0,0), XO_MASK,   PPC64,          { RT, RA, RB } },
-{ "divd.",   XO(31,489,0,1), XO_MASK,   PPC64,          { RT, RA, RB } },
-{ "divdo",   XO(31,489,1,0), XO_MASK,   PPC64,          { RT, RA, RB } },
-{ "divdo.",  XO(31,489,1,1), XO_MASK,   PPC64,          { RT, RA, RB } },
-
-{ "addme64", XO(31,490,0,0), XORB_MASK, BOOKE64,        { RT, RA } },
-{ "addme64o",XO(31,490,1,0), XORB_MASK, BOOKE64,        { RT, RA } },
-
-{ "divw",    XO(31,491,0,0), XO_MASK,   PPC,            { RT, RA, RB } },
-{ "divw.",   XO(31,491,0,1), XO_MASK,   PPC,            { RT, RA, RB } },
-{ "divwo",   XO(31,491,1,0), XO_MASK,   PPC,            { RT, RA, RB } },
-{ "divwo.",  XO(31,491,1,1), XO_MASK,   PPC,            { RT, RA, RB } },
+{"cdtbcd",      X(31,282),      XRB_MASK,    POWER6,    0,              {RA, RS}},
 
-{ "icbtlse", X(31,494), X_MASK,         PPCCHLK64,      { CT, RA, RB }},
+{"eqv",         XRC(31,284,0),  X_MASK,      COM,       0,              {RA, RS, RB}},
+{"eqv.",        XRC(31,284,1),  X_MASK,      COM,       0,              {RA, RS, RB}},
 
-{ "slbia",   X(31,498), 0xffffffff,     PPC64,          { 0 } },
+{"lhepx",       X(31,287),      X_MASK,   E500MC|PPCA2, 0,              {RT, RA0, RB}},
 
-{ "cli",     X(31,502), XRB_MASK,       POWER,          { RT, RA } },
+{"mfdcrux",     X(31,291),      X_MASK,      PPC464,    0,              {RS, RA}},
 
-{ "stdcxe.", XRC(31,511,1), X_MASK,     BOOKE64,        { RS, RA, RB } },
+{"lvexhx",      X(31,293),      X_MASK,      PPCVEC2,   0,              {VD, RA0, RB}},
+{"lvepx",       X(31,295),      X_MASK,      PPCVEC2,   0,              {VD, RA0, RB}},
 
-{ "mcrxr",   X(31,512), XRARB_MASK|(3<<21), COM,        { BF } },
+{"lxvll",       X(31,301),      XX1_MASK,    PPCVSX3,   0,              {XT6, RA0, RB}},
 
-{ "bblels",  X(31,518), X_MASK,         PPCBRLK,        { 0 }},
-{ "mcrxr64", X(31,544), XRARB_MASK|(3<<21), BOOKE64,    { BF } },
+{"mfbhrbe",     X(31,302),      X_MASK,      POWER8,    0,              {RT, BHRBE}},
+
+{"tlbie",       X(31,306),      X_MASK|1<<20,POWER9,    TITAN,          {RB, RS, RIC, PRS, X_R}},
+{"tlbie",       X(31,306),      XRA_MASK,    POWER7,    POWER9|TITAN,   {RB, RS}},
+{"tlbie",       X(31,306),      XRTLRA_MASK, PPC,    E500|POWER7|TITAN, {RB, LOPT}},
+{"tlbi",        X(31,306),      XRT_MASK,    POWER,     0,              {RA0, RB}},
+
+{"mfvsrld",     X(31,307),      XX1RB_MASK,  PPCVSX3,   0,              {RA, XS6}},
+
+{"ldmx",        X(31,309),      X_MASK,      POWER9,    0,              {RT, RA0, RB}},
+
+{"eciwx",       X(31,310),      X_MASK,      PPC,       E500|TITAN,     {RT, RA0, RB}},
+
+{"lhzux",       X(31,311),      X_MASK,      COM,       0,              {RT, RAL, RB}},
+
+{"cbcdtd",      X(31,314),      XRB_MASK,    POWER6,    0,              {RA, RS}},
+
+{"xor",         XRC(31,316,0),  X_MASK,      COM,       0,              {RA, RS, RB}},
+{"xor.",        XRC(31,316,1),  X_MASK,      COM,       0,              {RA, RS, RB}},
+
+{"dcbtep",      XRT(31,319,0),  X_MASK,   E500MC|PPCA2, 0,              {RT, RA0, RB}},
+
+{"mfexisr",     XSPR(31,323, 64), XSPR_MASK, PPC403,    0,              {RT}},
+{"mfexier",     XSPR(31,323, 66), XSPR_MASK, PPC403,    0,              {RT}},
+{"mfbr0",       XSPR(31,323,128), XSPR_MASK, PPC403,    0,              {RT}},
+{"mfbr1",       XSPR(31,323,129), XSPR_MASK, PPC403,    0,              {RT}},
+{"mfbr2",       XSPR(31,323,130), XSPR_MASK, PPC403,    0,              {RT}},
+{"mfbr3",       XSPR(31,323,131), XSPR_MASK, PPC403,    0,              {RT}},
+{"mfbr4",       XSPR(31,323,132), XSPR_MASK, PPC403,    0,              {RT}},
+{"mfbr5",       XSPR(31,323,133), XSPR_MASK, PPC403,    0,              {RT}},
+{"mfbr6",       XSPR(31,323,134), XSPR_MASK, PPC403,    0,              {RT}},
+{"mfbr7",       XSPR(31,323,135), XSPR_MASK, PPC403,    0,              {RT}},
+{"mfbear",      XSPR(31,323,144), XSPR_MASK, PPC403,    0,              {RT}},
+{"mfbesr",      XSPR(31,323,145), XSPR_MASK, PPC403,    0,              {RT}},
+{"mfiocr",      XSPR(31,323,160), XSPR_MASK, PPC403,    0,              {RT}},
+{"mfdmacr0",    XSPR(31,323,192), XSPR_MASK, PPC403,    0,              {RT}},
+{"mfdmact0",    XSPR(31,323,193), XSPR_MASK, PPC403,    0,              {RT}},
+{"mfdmada0",    XSPR(31,323,194), XSPR_MASK, PPC403,    0,              {RT}},
+{"mfdmasa0",    XSPR(31,323,195), XSPR_MASK, PPC403,    0,              {RT}},
+{"mfdmacc0",    XSPR(31,323,196), XSPR_MASK, PPC403,    0,              {RT}},
+{"mfdmacr1",    XSPR(31,323,200), XSPR_MASK, PPC403,    0,              {RT}},
+{"mfdmact1",    XSPR(31,323,201), XSPR_MASK, PPC403,    0,              {RT}},
+{"mfdmada1",    XSPR(31,323,202), XSPR_MASK, PPC403,    0,              {RT}},
+{"mfdmasa1",    XSPR(31,323,203), XSPR_MASK, PPC403,    0,              {RT}},
+{"mfdmacc1",    XSPR(31,323,204), XSPR_MASK, PPC403,    0,              {RT}},
+{"mfdmacr2",    XSPR(31,323,208), XSPR_MASK, PPC403,    0,              {RT}},
+{"mfdmact2",    XSPR(31,323,209), XSPR_MASK, PPC403,    0,              {RT}},
+{"mfdmada2",    XSPR(31,323,210), XSPR_MASK, PPC403,    0,              {RT}},
+{"mfdmasa2",    XSPR(31,323,211), XSPR_MASK, PPC403,    0,              {RT}},
+{"mfdmacc2",    XSPR(31,323,212), XSPR_MASK, PPC403,    0,              {RT}},
+{"mfdmacr3",    XSPR(31,323,216), XSPR_MASK, PPC403,    0,              {RT}},
+{"mfdmact3",    XSPR(31,323,217), XSPR_MASK, PPC403,    0,              {RT}},
+{"mfdmada3",    XSPR(31,323,218), XSPR_MASK, PPC403,    0,              {RT}},
+{"mfdmasa3",    XSPR(31,323,219), XSPR_MASK, PPC403,    0,              {RT}},
+{"mfdmacc3",    XSPR(31,323,220), XSPR_MASK, PPC403,    0,              {RT}},
+{"mfdmasr",     XSPR(31,323,224), XSPR_MASK, PPC403,    0,              {RT}},
+{"mfdcr",       X(31,323), X_MASK, PPC403|BOOKE|PPCA2|PPC476, E500|TITAN, {RT, SPR}},
+{"mfdcr.",      XRC(31,323,1),  X_MASK,      PPCA2,     0,              {RT, SPR}},
+
+{"lvexwx",      X(31,325),      X_MASK,      PPCVEC2,   0,              {VD, RA0, RB}},
+
+{"dcread",      X(31,326),      X_MASK,   PPC476|TITAN, 0,              {RT, RA0, RB}},
+
+{"div",         XO(31,331,0,0), XO_MASK,     M601,      0,              {RT, RA, RB}},
+{"div.",        XO(31,331,0,1), XO_MASK,     M601,      0,              {RT, RA, RB}},
+
+{"lxvdsx",      X(31,332),      XX1_MASK,    PPCVSX,    0,              {XT6, RA0, RB}},
+
+{"mfpmr",       X(31,334),      X_MASK, PPCPMR|PPCE300, 0,              {RT, PMR}},
+{"mftmr",       X(31,366),      X_MASK, PPCTMR|E6500,   0,              {RT, TMR}},
+
+{"slbsync",     X(31,338),      0xffffffff,  POWER9,    0,              {0}},
+
+{"mfmq",        XSPR(31,339,  0), XSPR_MASK, M601,      0,              {RT}},
+{"mfxer",       XSPR(31,339,  1), XSPR_MASK, COM,       0,              {RT}},
+{"mfrtcu",      XSPR(31,339,  4), XSPR_MASK, COM,       TITAN,          {RT}},
+{"mfrtcl",      XSPR(31,339,  5), XSPR_MASK, COM,       TITAN,          {RT}},
+{"mfdec",       XSPR(31,339,  6), XSPR_MASK, MFDEC1,    0,              {RT}},
+{"mflr",        XSPR(31,339,  8), XSPR_MASK, COM,       0,              {RT}},
+{"mfctr",       XSPR(31,339,  9), XSPR_MASK, COM,       0,              {RT}},
+{"mfdscr",      XSPR(31,339, 17), XSPR_MASK, POWER6,    0,              {RT}},
+{"mftid",       XSPR(31,339, 17), XSPR_MASK, POWER,     0,              {RT}},
+{"mfdsisr",     XSPR(31,339, 18), XSPR_MASK, COM,       TITAN,          {RT}},
+{"mfdar",       XSPR(31,339, 19), XSPR_MASK, COM,       TITAN,          {RT}},
+{"mfdec",       XSPR(31,339, 22), XSPR_MASK, MFDEC2,    MFDEC1,         {RT}},
+{"mfsdr0",      XSPR(31,339, 24), XSPR_MASK, POWER,     0,              {RT}},
+{"mfsdr1",      XSPR(31,339, 25), XSPR_MASK, COM,       TITAN,          {RT}},
+{"mfsrr0",      XSPR(31,339, 26), XSPR_MASK, COM,       0,              {RT}},
+{"mfsrr1",      XSPR(31,339, 27), XSPR_MASK, COM,       0,              {RT}},
+{"mfcfar",      XSPR(31,339, 28), XSPR_MASK, POWER6,    0,              {RT}},
+{"mfpid",       XSPR(31,339, 48), XSPR_MASK, BOOKE,     0,              {RT}},
+{"mfcsrr0",     XSPR(31,339, 58), XSPR_MASK, BOOKE,     0,              {RT}},
+{"mfcsrr1",     XSPR(31,339, 59), XSPR_MASK, BOOKE,     0,              {RT}},
+{"mfdear",      XSPR(31,339, 61), XSPR_MASK, BOOKE,     0,              {RT}},
+{"mfesr",       XSPR(31,339, 62), XSPR_MASK, BOOKE,     0,              {RT}},
+{"mfivpr",      XSPR(31,339, 63), XSPR_MASK, BOOKE,     0,              {RT}},
+{"mfctrl",      XSPR(31,339,136), XSPR_MASK, POWER4,    0,              {RT}},
+{"mfcmpa",      XSPR(31,339,144), XSPR_MASK, PPC860,    0,              {RT}},
+{"mfcmpb",      XSPR(31,339,145), XSPR_MASK, PPC860,    0,              {RT}},
+{"mfcmpc",      XSPR(31,339,146), XSPR_MASK, PPC860,    0,              {RT}},
+{"mfcmpd",      XSPR(31,339,147), XSPR_MASK, PPC860,    0,              {RT}},
+{"mficr",       XSPR(31,339,148), XSPR_MASK, PPC860,    0,              {RT}},
+{"mfder",       XSPR(31,339,149), XSPR_MASK, PPC860,    0,              {RT}},
+{"mfcounta",    XSPR(31,339,150), XSPR_MASK, PPC860,    0,              {RT}},
+{"mfcountb",    XSPR(31,339,151), XSPR_MASK, PPC860,    0,              {RT}},
+{"mfcmpe",      XSPR(31,339,152), XSPR_MASK, PPC860,    0,              {RT}},
+{"mfcmpf",      XSPR(31,339,153), XSPR_MASK, PPC860,    0,              {RT}},
+{"mfcmpg",      XSPR(31,339,154), XSPR_MASK, PPC860,    0,              {RT}},
+{"mfcmph",      XSPR(31,339,155), XSPR_MASK, PPC860,    0,              {RT}},
+{"mflctrl1",    XSPR(31,339,156), XSPR_MASK, PPC860,    0,              {RT}},
+{"mflctrl2",    XSPR(31,339,157), XSPR_MASK, PPC860,    0,              {RT}},
+{"mfictrl",     XSPR(31,339,158), XSPR_MASK, PPC860,    0,              {RT}},
+{"mfbar",       XSPR(31,339,159), XSPR_MASK, PPC860,    0,              {RT}},
+{"mfvrsave",    XSPR(31,339,256), XSPR_MASK, PPCVEC,    0,              {RT}},
+{"mfusprg0",    XSPR(31,339,256), XSPR_MASK, BOOKE,     0,              {RT}},
+{"mfsprg",      XSPR(31,339,256), XSPRG_MASK, PPC,      0,              {RT, SPRG}},
+{"mfsprg4",     XSPR(31,339,260), XSPR_MASK, PPC405|BOOKE, 0,           {RT}},
+{"mfsprg5",     XSPR(31,339,261), XSPR_MASK, PPC405|BOOKE, 0,           {RT}},
+{"mfsprg6",     XSPR(31,339,262), XSPR_MASK, PPC405|BOOKE, 0,           {RT}},
+{"mfsprg7",     XSPR(31,339,263), XSPR_MASK, PPC405|BOOKE, 0,           {RT}},
+{"mftbu",       XSPR(31,339,269), XSPR_MASK, POWER4|BOOKE, 0,           {RT}},
+{"mftb",        X(31,339),        X_MASK,    POWER4|BOOKE, 0,           {RT, TBR}},
+{"mftbl",       XSPR(31,339,268), XSPR_MASK, POWER4|BOOKE, 0,           {RT}},
+{"mfsprg0",     XSPR(31,339,272), XSPR_MASK, PPC,       0,              {RT}},
+{"mfsprg1",     XSPR(31,339,273), XSPR_MASK, PPC,       0,              {RT}},
+{"mfsprg2",     XSPR(31,339,274), XSPR_MASK, PPC,       0,              {RT}},
+{"mfsprg3",     XSPR(31,339,275), XSPR_MASK, PPC,       0,              {RT}},
+{"mfasr",       XSPR(31,339,280), XSPR_MASK, PPC64,     0,              {RT}},
+{"mfear",       XSPR(31,339,282), XSPR_MASK, PPC,       TITAN,          {RT}},
+{"mfpir",       XSPR(31,339,286), XSPR_MASK, BOOKE,     0,              {RT}},
+{"mfpvr",       XSPR(31,339,287), XSPR_MASK, PPC,       0,              {RT}},
+{"mfdbsr",      XSPR(31,339,304), XSPR_MASK, BOOKE,     0,              {RT}},
+{"mfdbcr0",     XSPR(31,339,308), XSPR_MASK, BOOKE,     0,              {RT}},
+{"mfdbcr1",     XSPR(31,339,309), XSPR_MASK, BOOKE,     0,              {RT}},
+{"mfdbcr2",     XSPR(31,339,310), XSPR_MASK, BOOKE,     0,              {RT}},
+{"mfiac1",      XSPR(31,339,312), XSPR_MASK, BOOKE,     0,              {RT}},
+{"mfiac2",      XSPR(31,339,313), XSPR_MASK, BOOKE,     0,              {RT}},
+{"mfiac3",      XSPR(31,339,314), XSPR_MASK, BOOKE,     0,              {RT}},
+{"mfiac4",      XSPR(31,339,315), XSPR_MASK, BOOKE,     0,              {RT}},
+{"mfdac1",      XSPR(31,339,316), XSPR_MASK, BOOKE,     0,              {RT}},
+{"mfdac2",      XSPR(31,339,317), XSPR_MASK, BOOKE,     0,              {RT}},
+{"mfdvc1",      XSPR(31,339,318), XSPR_MASK, BOOKE,     0,              {RT}},
+{"mfdvc2",      XSPR(31,339,319), XSPR_MASK, BOOKE,     0,              {RT}},
+{"mftsr",       XSPR(31,339,336), XSPR_MASK, BOOKE,     0,              {RT}},
+{"mftcr",       XSPR(31,339,340), XSPR_MASK, BOOKE,     0,              {RT}},
+{"mfivor0",     XSPR(31,339,400), XSPR_MASK, BOOKE,     0,              {RT}},
+{"mfivor1",     XSPR(31,339,401), XSPR_MASK, BOOKE,     0,              {RT}},
+{"mfivor2",     XSPR(31,339,402), XSPR_MASK, BOOKE,     0,              {RT}},
+{"mfivor3",     XSPR(31,339,403), XSPR_MASK, BOOKE,     0,              {RT}},
+{"mfivor4",     XSPR(31,339,404), XSPR_MASK, BOOKE,     0,              {RT}},
+{"mfivor5",     XSPR(31,339,405), XSPR_MASK, BOOKE,     0,              {RT}},
+{"mfivor6",     XSPR(31,339,406), XSPR_MASK, BOOKE,     0,              {RT}},
+{"mfivor7",     XSPR(31,339,407), XSPR_MASK, BOOKE,     0,              {RT}},
+{"mfivor8",     XSPR(31,339,408), XSPR_MASK, BOOKE,     0,              {RT}},
+{"mfivor9",     XSPR(31,339,409), XSPR_MASK, BOOKE,     0,              {RT}},
+{"mfivor10",    XSPR(31,339,410), XSPR_MASK, BOOKE,     0,              {RT}},
+{"mfivor11",    XSPR(31,339,411), XSPR_MASK, BOOKE,     0,              {RT}},
+{"mfivor12",    XSPR(31,339,412), XSPR_MASK, BOOKE,     0,              {RT}},
+{"mfivor13",    XSPR(31,339,413), XSPR_MASK, BOOKE,     0,              {RT}},
+{"mfivor14",    XSPR(31,339,414), XSPR_MASK, BOOKE,     0,              {RT}},
+{"mfivor15",    XSPR(31,339,415), XSPR_MASK, BOOKE,     0,              {RT}},
+{"mfspefscr",   XSPR(31,339,512), XSPR_MASK, PPCSPE,    0,              {RT}},
+{"mfbbear",     XSPR(31,339,513), XSPR_MASK, PPCBRLK,   0,              {RT}},
+{"mfbbtar",     XSPR(31,339,514), XSPR_MASK, PPCBRLK,   0,              {RT}},
+{"mfivor32",    XSPR(31,339,528), XSPR_MASK, PPCSPE,    0,              {RT}},
+{"mfibatu",     XSPR(31,339,528), XSPRBAT_MASK, PPC,    TITAN,          {RT, SPRBAT}},
+{"mfivor33",    XSPR(31,339,529), XSPR_MASK, PPCSPE,    0,              {RT}},
+{"mfibatl",     XSPR(31,339,529), XSPRBAT_MASK, PPC,    TITAN,          {RT, SPRBAT}},
+{"mfivor34",    XSPR(31,339,530), XSPR_MASK, PPCSPE,    0,              {RT}},
+{"mfivor35",    XSPR(31,339,531), XSPR_MASK, PPCPMR,    0,              {RT}},
+{"mfdbatu",     XSPR(31,339,536), XSPRBAT_MASK, PPC,    TITAN,          {RT, SPRBAT}},
+{"mfdbatl",     XSPR(31,339,537), XSPRBAT_MASK, PPC,    TITAN,          {RT, SPRBAT}},
+{"mfic_cst",    XSPR(31,339,560), XSPR_MASK, PPC860,    0,              {RT}},
+{"mfic_adr",    XSPR(31,339,561), XSPR_MASK, PPC860,    0,              {RT}},
+{"mfic_dat",    XSPR(31,339,562), XSPR_MASK, PPC860,    0,              {RT}},
+{"mfdc_cst",    XSPR(31,339,568), XSPR_MASK, PPC860,    0,              {RT}},
+{"mfdc_adr",    XSPR(31,339,569), XSPR_MASK, PPC860,    0,              {RT}},
+{"mfdc_dat",    XSPR(31,339,570), XSPR_MASK, PPC860,    0,              {RT}},
+{"mfmcsrr0",    XSPR(31,339,570), XSPR_MASK, PPCRFMCI,  0,              {RT}},
+{"mfmcsrr1",    XSPR(31,339,571), XSPR_MASK, PPCRFMCI,  0,              {RT}},
+{"mfmcsr",      XSPR(31,339,572), XSPR_MASK, PPCRFMCI,  0,              {RT}},
+{"mfmcar",      XSPR(31,339,573), XSPR_MASK, PPCRFMCI,  TITAN,          {RT}},
+{"mfdpdr",      XSPR(31,339,630), XSPR_MASK, PPC860,    0,              {RT}},
+{"mfdpir",      XSPR(31,339,631), XSPR_MASK, PPC860,    0,              {RT}},
+{"mfimmr",      XSPR(31,339,638), XSPR_MASK, PPC860,    0,              {RT}},
+{"mfmi_ctr",    XSPR(31,339,784), XSPR_MASK, PPC860,    0,              {RT}},
+{"mfmi_ap",     XSPR(31,339,786), XSPR_MASK, PPC860,    0,              {RT}},
+{"mfmi_epn",    XSPR(31,339,787), XSPR_MASK, PPC860,    0,              {RT}},
+{"mfmi_twc",    XSPR(31,339,789), XSPR_MASK, PPC860,    0,              {RT}},
+{"mfmi_rpn",    XSPR(31,339,790), XSPR_MASK, PPC860,    0,              {RT}},
+{"mfmd_ctr",    XSPR(31,339,792), XSPR_MASK, PPC860,    0,              {RT}},
+{"mfm_casid",   XSPR(31,339,793), XSPR_MASK, PPC860,    0,              {RT}},
+{"mfmd_ap",     XSPR(31,339,794), XSPR_MASK, PPC860,    0,              {RT}},
+{"mfmd_epn",    XSPR(31,339,795), XSPR_MASK, PPC860,    0,              {RT}},
+{"mfmd_twb",    XSPR(31,339,796), XSPR_MASK, PPC860,    0,              {RT}},
+{"mfmd_twc",    XSPR(31,339,797), XSPR_MASK, PPC860,    0,              {RT}},
+{"mfmd_rpn",    XSPR(31,339,798), XSPR_MASK, PPC860,    0,              {RT}},
+{"mfm_tw",      XSPR(31,339,799), XSPR_MASK, PPC860,    0,              {RT}},
+{"mfmi_dbcam",  XSPR(31,339,816), XSPR_MASK, PPC860,    0,              {RT}},
+{"mfmi_dbram0", XSPR(31,339,817), XSPR_MASK, PPC860,    0,              {RT}},
+{"mfmi_dbram1", XSPR(31,339,818), XSPR_MASK, PPC860,    0,              {RT}},
+{"mfmd_dbcam",  XSPR(31,339,824), XSPR_MASK, PPC860,    0,              {RT}},
+{"mfmd_dbram0", XSPR(31,339,825), XSPR_MASK, PPC860,    0,              {RT}},
+{"mfmd_dbram1", XSPR(31,339,826), XSPR_MASK, PPC860,    0,              {RT}},
+{"mfivndx",     XSPR(31,339,880), XSPR_MASK, TITAN,     0,              {RT}},
+{"mfdvndx",     XSPR(31,339,881), XSPR_MASK, TITAN,     0,              {RT}},
+{"mfivlim",     XSPR(31,339,882), XSPR_MASK, TITAN,     0,              {RT}},
+{"mfdvlim",     XSPR(31,339,883), XSPR_MASK, TITAN,     0,              {RT}},
+{"mfclcsr",     XSPR(31,339,884), XSPR_MASK, TITAN,     0,              {RT}},
+{"mfccr1",      XSPR(31,339,888), XSPR_MASK, TITAN,     0,              {RT}},
+{"mfppr",       XSPR(31,339,896), XSPR_MASK, POWER7,    0,              {RT}},
+{"mfppr32",     XSPR(31,339,898), XSPR_MASK, POWER7,    0,              {RT}},
+{"mfrstcfg",    XSPR(31,339,923), XSPR_MASK, TITAN,     0,              {RT}},
+{"mfdcdbtrl",   XSPR(31,339,924), XSPR_MASK, TITAN,     0,              {RT}},
+{"mfdcdbtrh",   XSPR(31,339,925), XSPR_MASK, TITAN,     0,              {RT}},
+{"mficdbtr",    XSPR(31,339,927), XSPR_MASK, TITAN,     0,              {RT}},
+{"mfummcr0",    XSPR(31,339,936), XSPR_MASK, PPC750,    0,              {RT}},
+{"mfupmc1",     XSPR(31,339,937), XSPR_MASK, PPC750,    0,              {RT}},
+{"mfupmc2",     XSPR(31,339,938), XSPR_MASK, PPC750,    0,              {RT}},
+{"mfusia",      XSPR(31,339,939), XSPR_MASK, PPC750,    0,              {RT}},
+{"mfummcr1",    XSPR(31,339,940), XSPR_MASK, PPC750,    0,              {RT}},
+{"mfupmc3",     XSPR(31,339,941), XSPR_MASK, PPC750,    0,              {RT}},
+{"mfupmc4",     XSPR(31,339,942), XSPR_MASK, PPC750,    0,              {RT}},
+{"mfzpr",       XSPR(31,339,944), XSPR_MASK, PPC403,    0,              {RT}},
+{"mfpid",       XSPR(31,339,945), XSPR_MASK, PPC403,    0,              {RT}},
+{"mfmmucr",     XSPR(31,339,946), XSPR_MASK, TITAN,     0,              {RT}},
+{"mfccr0",      XSPR(31,339,947), XSPR_MASK, PPC405|TITAN, 0,           {RT}},
+{"mfiac3",      XSPR(31,339,948), XSPR_MASK, PPC405,    0,              {RT}},
+{"mfiac4",      XSPR(31,339,949), XSPR_MASK, PPC405,    0,              {RT}},
+{"mfdvc1",      XSPR(31,339,950), XSPR_MASK, PPC405,    0,              {RT}},
+{"mfdvc2",      XSPR(31,339,951), XSPR_MASK, PPC405,    0,              {RT}},
+{"mfmmcr0",     XSPR(31,339,952), XSPR_MASK, PPC750,    0,              {RT}},
+{"mfpmc1",      XSPR(31,339,953), XSPR_MASK, PPC750,    0,              {RT}},
+{"mfsgr",       XSPR(31,339,953), XSPR_MASK, PPC403,    0,              {RT}},
+{"mfdcwr",      XSPR(31,339,954), XSPR_MASK, PPC403,    0,              {RT}},
+{"mfpmc2",      XSPR(31,339,954), XSPR_MASK, PPC750,    0,              {RT}},
+{"mfsia",       XSPR(31,339,955), XSPR_MASK, PPC750,    0,              {RT}},
+{"mfsler",      XSPR(31,339,955), XSPR_MASK, PPC405,    0,              {RT}},
+{"mfmmcr1",     XSPR(31,339,956), XSPR_MASK, PPC750,    0,              {RT}},
+{"mfsu0r",      XSPR(31,339,956), XSPR_MASK, PPC405,    0,              {RT}},
+{"mfdbcr1",     XSPR(31,339,957), XSPR_MASK, PPC405,    0,              {RT}},
+{"mfpmc3",      XSPR(31,339,957), XSPR_MASK, PPC750,    0,              {RT}},
+{"mfpmc4",      XSPR(31,339,958), XSPR_MASK, PPC750,    0,              {RT}},
+{"mficdbdr",    XSPR(31,339,979), XSPR_MASK, PPC403|TITAN, 0,           {RT}},
+{"mfesr",       XSPR(31,339,980), XSPR_MASK, PPC403,    0,              {RT}},
+{"mfdear",      XSPR(31,339,981), XSPR_MASK, PPC403,    0,              {RT}},
+{"mfevpr",      XSPR(31,339,982), XSPR_MASK, PPC403,    0,              {RT}},
+{"mfcdbcr",     XSPR(31,339,983), XSPR_MASK, PPC403,    0,              {RT}},
+{"mftsr",       XSPR(31,339,984), XSPR_MASK, PPC403,    0,              {RT}},
+{"mftcr",       XSPR(31,339,986), XSPR_MASK, PPC403,    0,              {RT}},
+{"mfpit",       XSPR(31,339,987), XSPR_MASK, PPC403,    0,              {RT}},
+{"mftbhi",      XSPR(31,339,988), XSPR_MASK, PPC403,    0,              {RT}},
+{"mftblo",      XSPR(31,339,989), XSPR_MASK, PPC403,    0,              {RT}},
+{"mfsrr2",      XSPR(31,339,990), XSPR_MASK, PPC403,    0,              {RT}},
+{"mfsrr3",      XSPR(31,339,991), XSPR_MASK, PPC403,    0,              {RT}},
+{"mfdbsr",      XSPR(31,339,1008), XSPR_MASK, PPC403,   0,              {RT}},
+{"mfdbcr0",     XSPR(31,339,1010), XSPR_MASK, PPC405,   0,              {RT}},
+{"mfdbdr",      XSPR(31,339,1011), XSPR_MASK, TITAN,    0,              {RS}},
+{"mfiac1",      XSPR(31,339,1012), XSPR_MASK, PPC403,   0,              {RT}},
+{"mfiac2",      XSPR(31,339,1013), XSPR_MASK, PPC403,   0,              {RT}},
+{"mfdac1",      XSPR(31,339,1014), XSPR_MASK, PPC403,   0,              {RT}},
+{"mfdac2",      XSPR(31,339,1015), XSPR_MASK, PPC403,   0,              {RT}},
+{"mfl2cr",      XSPR(31,339,1017), XSPR_MASK, PPC750,   0,              {RT}},
+{"mfdccr",      XSPR(31,339,1018), XSPR_MASK, PPC403,   0,              {RT}},
+{"mficcr",      XSPR(31,339,1019), XSPR_MASK, PPC403,   0,              {RT}},
+{"mfictc",      XSPR(31,339,1019), XSPR_MASK, PPC750,   0,              {RT}},
+{"mfpbl1",      XSPR(31,339,1020), XSPR_MASK, PPC403,   0,              {RT}},
+{"mfthrm1",     XSPR(31,339,1020), XSPR_MASK, PPC750,   0,              {RT}},
+{"mfpbu1",      XSPR(31,339,1021), XSPR_MASK, PPC403,   0,              {RT}},
+{"mfthrm2",     XSPR(31,339,1021), XSPR_MASK, PPC750,   0,              {RT}},
+{"mfpbl2",      XSPR(31,339,1022), XSPR_MASK, PPC403,   0,              {RT}},
+{"mfthrm3",     XSPR(31,339,1022), XSPR_MASK, PPC750,   0,              {RT}},
+{"mfpbu2",      XSPR(31,339,1023), XSPR_MASK, PPC403,   0,              {RT}},
+{"mfspr",       X(31,339),      X_MASK,      COM,       0,              {RT, SPR}},
+
+{"lwax",        X(31,341),      X_MASK,      PPC64,     0,              {RT, RA0, RB}},
+
+{"dst",         XDSS(31,342,0), XDSS_MASK,   PPCVEC,    0,              {RA, RB, STRM}},
+
+{"lhax",        X(31,343),      X_MASK,      COM,       0,              {RT, RA0, RB}},
+
+{"lvxl",        X(31,359),      X_MASK,      PPCVEC,    0,              {VD, RA0, RB}},
+
+{"abs",         XO(31,360,0,0), XORB_MASK,   M601,      0,              {RT, RA}},
+{"abs.",        XO(31,360,0,1), XORB_MASK,   M601,      0,              {RT, RA}},
+
+{"divs",        XO(31,363,0,0), XO_MASK,     M601,      0,              {RT, RA, RB}},
+{"divs.",       XO(31,363,0,1), XO_MASK,     M601,      0,              {RT, RA, RB}},
+
+{"lxvwsx",      X(31,364),      XX1_MASK,    PPCVSX3,   0,              {XT6, RA0, RB}},
+
+{"tlbia",       X(31,370),      0xffffffff,  PPC,       E500|TITAN,     {0}},
+
+{"mftbu",       XSPR(31,371,269), XSPR_MASK, PPC,       NO371|POWER4,   {RT}},
+{"mftb",        X(31,371),      X_MASK,      PPC,       NO371|POWER4,   {RT, TBR}},
+{"mftbl",       XSPR(31,371,268), XSPR_MASK, PPC,       NO371|POWER4,   {RT}},
+
+{"lwaux",       X(31,373),      X_MASK,      PPC64,     0,              {RT, RAL, RB}},
+
+{"dstst",       XDSS(31,374,0), XDSS_MASK,   PPCVEC,    0,              {RA, RB, STRM}},
+
+{"lhaux",       X(31,375),      X_MASK,      COM,       0,              {RT, RAL, RB}},
+
+{"popcntw",     X(31,378),      XRB_MASK,    POWER7|PPCA2, 0,           {RA, RS}},
+
+{"mtdcrx",      X(31,387),      X_MASK,      BOOKE|PPCA2|PPC476, TITAN, {RA, RS}},
+{"mtdcrx.",     XRC(31,387,1),  X_MASK,      PPCA2,     0,              {RA, RS}},
+
+{"stvexbx",     X(31,389),      X_MASK,      PPCVEC2,   0,              {VS, RA0, RB}},
+
+{"dcblc",       X(31,390),      X_MASK,  PPCCHLK|PPC476|TITAN, 0,       {CT, RA0, RB}},
+{"stdfcmx",     APU(31,391,0),  APU_MASK,    PPC405,    0,              {FCRT, RA, RB}},
+
+{"divdeu",      XO(31,393,0,0), XO_MASK,     POWER7|PPCA2, 0,           {RT, RA, RB}},
+{"divdeu.",     XO(31,393,0,1), XO_MASK,     POWER7|PPCA2, 0,           {RT, RA, RB}},
+{"divweu",      XO(31,395,0,0), XO_MASK,     POWER7|PPCA2, 0,           {RT, RA, RB}},
+{"divweu.",     XO(31,395,0,1), XO_MASK,     POWER7|PPCA2, 0,           {RT, RA, RB}},
+
+{"stxvx",       X(31,396),      XX1_MASK,    PPCVSX3,   0,              {XS6, RA0, RB}},
+{"stxvl",       X(31,397),      XX1_MASK,    PPCVSX3,   0,              {XS6, RA0, RB}},
+
+{"dcblce",      X(31,398),      X_MASK,      PPCCHLK,   E500MC,         {CT, RA, RB}},
+
+{"slbmte",      X(31,402),      XRA_MASK,    PPC64,     0,              {RS, RB}},
+
+{"mtvsrws",     X(31,403),      XX1RB_MASK,  PPCVSX3,   0,              {XT6, RA}},
+
+{"pbt.",        XRC(31,404,1),  X_MASK,      POWER8,    0,              {RS, RA0, RB}},
+
+{"icswx",       XRC(31,406,0),  X_MASK,   POWER7|PPCA2, 0,              {RS, RA, RB}},
+{"icswx.",      XRC(31,406,1),  X_MASK,   POWER7|PPCA2, 0,              {RS, RA, RB}},
+
+{"sthx",        X(31,407),      X_MASK,      COM,       0,              {RS, RA0, RB}},
+
+{"orc",         XRC(31,412,0),  X_MASK,      COM,       0,              {RA, RS, RB}},
+{"orc.",        XRC(31,412,1),  X_MASK,      COM,       0,              {RA, RS, RB}},
+
+{"sthepx",      X(31,415),      X_MASK,   E500MC|PPCA2, 0,              {RS, RA0, RB}},
+
+{"mtdcrux",     X(31,419),      X_MASK,      PPC464,    0,              {RA, RS}},
+
+{"stvexhx",     X(31,421),      X_MASK,      PPCVEC2,   0,              {VS, RA0, RB}},
+
+{"dcblq.",      XRC(31,422,1),  X_MASK,      E6500,     0,              {CT, RA0, RB}},
+
+{"divde",       XO(31,425,0,0), XO_MASK,  POWER7|PPCA2, 0,              {RT, RA, RB}},
+{"divde.",      XO(31,425,0,1), XO_MASK,  POWER7|PPCA2, 0,              {RT, RA, RB}},
+{"divwe",       XO(31,427,0,0), XO_MASK,  POWER7|PPCA2, 0,              {RT, RA, RB}},
+{"divwe.",      XO(31,427,0,1), XO_MASK,  POWER7|PPCA2, 0,              {RT, RA, RB}},
+
+{"stxvll",      X(31,429),      XX1_MASK,    PPCVSX3,   0,              {XS6, RA0, RB}},
+
+{"clrbhrb",     X(31,430),      0xffffffff,  POWER8,    0,              {0}},
+
+{"slbie",       X(31,434),      XRTRA_MASK,  PPC64,     0,              {RB}},
+
+{"mtvsrdd",     X(31,435),      XX1_MASK,    PPCVSX3,   0,              {XT6, RA0, RB}},
+
+{"ecowx",       X(31,438),      X_MASK,      PPC,       E500|TITAN,     {RT, RA0, RB}},
+
+{"sthux",       X(31,439),      X_MASK,      COM,       0,              {RS, RAS, RB}},
+
+{"mdors",       0x7f9ce378,     0xffffffff,  E500MC,    0,              {0}},
+
+{"miso",        0x7f5ad378,     0xffffffff,  E6500,     0,              {0}},
+
+/* The "yield", "mdoio" and "mdoom" instructions are extended mnemonics for
+   "or rX,rX,rX", with rX being r27, r29 and r30 respectively.  */
+{"yield",       0x7f7bdb78,     0xffffffff,  POWER7,    0,              {0}},
+{"mdoio",       0x7fbdeb78,     0xffffffff,  POWER7,    0,              {0}},
+{"mdoom",       0x7fdef378,     0xffffffff,  POWER7,    0,              {0}},
+{"mr",          XRC(31,444,0),  X_MASK,      COM,       0,              {RA, RS, RBS}},
+{"or",          XRC(31,444,0),  X_MASK,      COM,       0,              {RA, RS, RB}},
+{"mr.",         XRC(31,444,1),  X_MASK,      COM,       0,              {RA, RS, RBS}},
+{"or.",         XRC(31,444,1),  X_MASK,      COM,       0,              {RA, RS, RB}},
+
+{"mtexisr",     XSPR(31,451, 64), XSPR_MASK, PPC403,    0,              {RS}},
+{"mtexier",     XSPR(31,451, 66), XSPR_MASK, PPC403,    0,              {RS}},
+{"mtbr0",       XSPR(31,451,128), XSPR_MASK, PPC403,    0,              {RS}},
+{"mtbr1",       XSPR(31,451,129), XSPR_MASK, PPC403,    0,              {RS}},
+{"mtbr2",       XSPR(31,451,130), XSPR_MASK, PPC403,    0,              {RS}},
+{"mtbr3",       XSPR(31,451,131), XSPR_MASK, PPC403,    0,              {RS}},
+{"mtbr4",       XSPR(31,451,132), XSPR_MASK, PPC403,    0,              {RS}},
+{"mtbr5",       XSPR(31,451,133), XSPR_MASK, PPC403,    0,              {RS}},
+{"mtbr6",       XSPR(31,451,134), XSPR_MASK, PPC403,    0,              {RS}},
+{"mtbr7",       XSPR(31,451,135), XSPR_MASK, PPC403,    0,              {RS}},
+{"mtbear",      XSPR(31,451,144), XSPR_MASK, PPC403,    0,              {RS}},
+{"mtbesr",      XSPR(31,451,145), XSPR_MASK, PPC403,    0,              {RS}},
+{"mtiocr",      XSPR(31,451,160), XSPR_MASK, PPC403,    0,              {RS}},
+{"mtdmacr0",    XSPR(31,451,192), XSPR_MASK, PPC403,    0,              {RS}},
+{"mtdmact0",    XSPR(31,451,193), XSPR_MASK, PPC403,    0,              {RS}},
+{"mtdmada0",    XSPR(31,451,194), XSPR_MASK, PPC403,    0,              {RS}},
+{"mtdmasa0",    XSPR(31,451,195), XSPR_MASK, PPC403,    0,              {RS}},
+{"mtdmacc0",    XSPR(31,451,196), XSPR_MASK, PPC403,    0,              {RS}},
+{"mtdmacr1",    XSPR(31,451,200), XSPR_MASK, PPC403,    0,              {RS}},
+{"mtdmact1",    XSPR(31,451,201), XSPR_MASK, PPC403,    0,              {RS}},
+{"mtdmada1",    XSPR(31,451,202), XSPR_MASK, PPC403,    0,              {RS}},
+{"mtdmasa1",    XSPR(31,451,203), XSPR_MASK, PPC403,    0,              {RS}},
+{"mtdmacc1",    XSPR(31,451,204), XSPR_MASK, PPC403,    0,              {RS}},
+{"mtdmacr2",    XSPR(31,451,208), XSPR_MASK, PPC403,    0,              {RS}},
+{"mtdmact2",    XSPR(31,451,209), XSPR_MASK, PPC403,    0,              {RS}},
+{"mtdmada2",    XSPR(31,451,210), XSPR_MASK, PPC403,    0,              {RS}},
+{"mtdmasa2",    XSPR(31,451,211), XSPR_MASK, PPC403,    0,              {RS}},
+{"mtdmacc2",    XSPR(31,451,212), XSPR_MASK, PPC403,    0,              {RS}},
+{"mtdmacr3",    XSPR(31,451,216), XSPR_MASK, PPC403,    0,              {RS}},
+{"mtdmact3",    XSPR(31,451,217), XSPR_MASK, PPC403,    0,              {RS}},
+{"mtdmada3",    XSPR(31,451,218), XSPR_MASK, PPC403,    0,              {RS}},
+{"mtdmasa3",    XSPR(31,451,219), XSPR_MASK, PPC403,    0,              {RS}},
+{"mtdmacc3",    XSPR(31,451,220), XSPR_MASK, PPC403,    0,              {RS}},
+{"mtdmasr",     XSPR(31,451,224), XSPR_MASK, PPC403,    0,              {RS}},
+{"mtdcr",       X(31,451), X_MASK, PPC403|BOOKE|PPCA2|PPC476, E500|TITAN, {SPR, RS}},
+{"mtdcr.",      XRC(31,451,1), X_MASK,       PPCA2,     0,              {SPR, RS}},
+
+{"stvexwx",     X(31,453),      X_MASK,      PPCVEC2,   0,              {VS, RA0, RB}},
+
+{"dccci",       X(31,454), XRT_MASK, PPC403|PPC440|TITAN|PPCA2, 0,      {RAOPT, RBOPT}},
+{"dci",         X(31,454),      XRARB_MASK, PPCA2|PPC476, 0,            {CT}},
+
+{"divdu",       XO(31,457,0,0), XO_MASK,     PPC64,     0,              {RT, RA, RB}},
+{"divdu.",      XO(31,457,0,1), XO_MASK,     PPC64,     0,              {RT, RA, RB}},
+
+{"divwu",       XO(31,459,0,0), XO_MASK,     PPC,       0,              {RT, RA, RB}},
+{"divwu.",      XO(31,459,0,1), XO_MASK,     PPC,       0,              {RT, RA, RB}},
+
+{"mtpmr",       X(31,462),      X_MASK, PPCPMR|PPCE300, 0,              {PMR, RS}},
+{"mttmr",       X(31,494),      X_MASK, PPCTMR|E6500,   0,              {TMR, RS}},
+
+{"slbieg",      X(31,466),      XRA_MASK,    POWER9,    0,              {RS, RB}},
+
+{"mtmq",        XSPR(31,467,  0), XSPR_MASK, M601,      0,              {RS}},
+{"mtxer",       XSPR(31,467,  1), XSPR_MASK, COM,       0,              {RS}},
+{"mtlr",        XSPR(31,467,  8), XSPR_MASK, COM,       0,              {RS}},
+{"mtctr",       XSPR(31,467,  9), XSPR_MASK, COM,       0,              {RS}},
+{"mtdscr",      XSPR(31,467, 17), XSPR_MASK, POWER6,    0,              {RS}},
+{"mttid",       XSPR(31,467, 17), XSPR_MASK, POWER,     0,              {RS}},
+{"mtdsisr",     XSPR(31,467, 18), XSPR_MASK, COM,       TITAN,          {RS}},
+{"mtdar",       XSPR(31,467, 19), XSPR_MASK, COM,       TITAN,          {RS}},
+{"mtrtcu",      XSPR(31,467, 20), XSPR_MASK, COM,       TITAN,          {RS}},
+{"mtrtcl",      XSPR(31,467, 21), XSPR_MASK, COM,       TITAN,          {RS}},
+{"mtdec",       XSPR(31,467, 22), XSPR_MASK, COM,       0,              {RS}},
+{"mtsdr0",      XSPR(31,467, 24), XSPR_MASK, POWER,     0,              {RS}},
+{"mtsdr1",      XSPR(31,467, 25), XSPR_MASK, COM,       TITAN,          {RS}},
+{"mtsrr0",      XSPR(31,467, 26), XSPR_MASK, COM,       0,              {RS}},
+{"mtsrr1",      XSPR(31,467, 27), XSPR_MASK, COM,       0,              {RS}},
+{"mtcfar",      XSPR(31,467, 28), XSPR_MASK, POWER6,    0,              {RS}},
+{"mtpid",       XSPR(31,467, 48), XSPR_MASK, BOOKE,     0,              {RS}},
+{"mtdecar",     XSPR(31,467, 54), XSPR_MASK, BOOKE,     0,              {RS}},
+{"mtcsrr0",     XSPR(31,467, 58), XSPR_MASK, BOOKE,     0,              {RS}},
+{"mtcsrr1",     XSPR(31,467, 59), XSPR_MASK, BOOKE,     0,              {RS}},
+{"mtdear",      XSPR(31,467, 61), XSPR_MASK, BOOKE,     0,              {RS}},
+{"mtesr",       XSPR(31,467, 62), XSPR_MASK, BOOKE,     0,              {RS}},
+{"mtivpr",      XSPR(31,467, 63), XSPR_MASK, BOOKE,     0,              {RS}},
+{"mtcmpa",      XSPR(31,467,144), XSPR_MASK, PPC860,    0,              {RS}},
+{"mtcmpb",      XSPR(31,467,145), XSPR_MASK, PPC860,    0,              {RS}},
+{"mtcmpc",      XSPR(31,467,146), XSPR_MASK, PPC860,    0,              {RS}},
+{"mtcmpd",      XSPR(31,467,147), XSPR_MASK, PPC860,    0,              {RS}},
+{"mticr",       XSPR(31,467,148), XSPR_MASK, PPC860,    0,              {RS}},
+{"mtder",       XSPR(31,467,149), XSPR_MASK, PPC860,    0,              {RS}},
+{"mtcounta",    XSPR(31,467,150), XSPR_MASK, PPC860,    0,              {RS}},
+{"mtcountb",    XSPR(31,467,151), XSPR_MASK, PPC860,    0,              {RS}},
+{"mtctrl",      XSPR(31,467,152), XSPR_MASK, POWER4,    0,              {RS}},
+{"mtcmpe",      XSPR(31,467,152), XSPR_MASK, PPC860,    0,              {RS}},
+{"mtcmpf",      XSPR(31,467,153), XSPR_MASK, PPC860,    0,              {RS}},
+{"mtcmpg",      XSPR(31,467,154), XSPR_MASK, PPC860,    0,              {RS}},
+{"mtcmph",      XSPR(31,467,155), XSPR_MASK, PPC860,    0,              {RS}},
+{"mtlctrl1",    XSPR(31,467,156), XSPR_MASK, PPC860,    0,              {RS}},
+{"mtlctrl2",    XSPR(31,467,157), XSPR_MASK, PPC860,    0,              {RS}},
+{"mtictrl",     XSPR(31,467,158), XSPR_MASK, PPC860,    0,              {RS}},
+{"mtbar",       XSPR(31,467,159), XSPR_MASK, PPC860,    0,              {RS}},
+{"mtvrsave",    XSPR(31,467,256), XSPR_MASK, PPCVEC,    0,              {RS}},
+{"mtusprg0",    XSPR(31,467,256), XSPR_MASK, BOOKE,     0,              {RS}},
+{"mtsprg",      XSPR(31,467,256), XSPRG_MASK, PPC,      0,              {SPRG, RS}},
+{"mtsprg0",     XSPR(31,467,272), XSPR_MASK, PPC,       0,              {RS}},
+{"mtsprg1",     XSPR(31,467,273), XSPR_MASK, PPC,       0,              {RS}},
+{"mtsprg2",     XSPR(31,467,274), XSPR_MASK, PPC,       0,              {RS}},
+{"mtsprg3",     XSPR(31,467,275), XSPR_MASK, PPC,       0,              {RS}},
+{"mtsprg4",     XSPR(31,467,276), XSPR_MASK, PPC405|BOOKE, 0,           {RS}},
+{"mtsprg5",     XSPR(31,467,277), XSPR_MASK, PPC405|BOOKE, 0,           {RS}},
+{"mtsprg6",     XSPR(31,467,278), XSPR_MASK, PPC405|BOOKE, 0,           {RS}},
+{"mtsprg7",     XSPR(31,467,279), XSPR_MASK, PPC405|BOOKE, 0,           {RS}},
+{"mtasr",       XSPR(31,467,280), XSPR_MASK, PPC64,     0,              {RS}},
+{"mtear",       XSPR(31,467,282), XSPR_MASK, PPC,       TITAN,          {RS}},
+{"mttbl",       XSPR(31,467,284), XSPR_MASK, PPC,       0,              {RS}},
+{"mttbu",       XSPR(31,467,285), XSPR_MASK, PPC,       0,              {RS}},
+{"mtdbsr",      XSPR(31,467,304), XSPR_MASK, BOOKE,     0,              {RS}},
+{"mtdbcr0",     XSPR(31,467,308), XSPR_MASK, BOOKE,     0,              {RS}},
+{"mtdbcr1",     XSPR(31,467,309), XSPR_MASK, BOOKE,     0,              {RS}},
+{"mtdbcr2",     XSPR(31,467,310), XSPR_MASK, BOOKE,     0,              {RS}},
+{"mtiac1",      XSPR(31,467,312), XSPR_MASK, BOOKE,     0,              {RS}},
+{"mtiac2",      XSPR(31,467,313), XSPR_MASK, BOOKE,     0,              {RS}},
+{"mtiac3",      XSPR(31,467,314), XSPR_MASK, BOOKE,     0,              {RS}},
+{"mtiac4",      XSPR(31,467,315), XSPR_MASK, BOOKE,     0,              {RS}},
+{"mtdac1",      XSPR(31,467,316), XSPR_MASK, BOOKE,     0,              {RS}},
+{"mtdac2",      XSPR(31,467,317), XSPR_MASK, BOOKE,     0,              {RS}},
+{"mtdvc1",      XSPR(31,467,318), XSPR_MASK, BOOKE,     0,              {RS}},
+{"mtdvc2",      XSPR(31,467,319), XSPR_MASK, BOOKE,     0,              {RS}},
+{"mttsr",       XSPR(31,467,336), XSPR_MASK, BOOKE,     0,              {RS}},
+{"mttcr",       XSPR(31,467,340), XSPR_MASK, BOOKE,     0,              {RS}},
+{"mtivor0",     XSPR(31,467,400), XSPR_MASK, BOOKE,     0,              {RS}},
+{"mtivor1",     XSPR(31,467,401), XSPR_MASK, BOOKE,     0,              {RS}},
+{"mtivor2",     XSPR(31,467,402), XSPR_MASK, BOOKE,     0,              {RS}},
+{"mtivor3",     XSPR(31,467,403), XSPR_MASK, BOOKE,     0,              {RS}},
+{"mtivor4",     XSPR(31,467,404), XSPR_MASK, BOOKE,     0,              {RS}},
+{"mtivor5",     XSPR(31,467,405), XSPR_MASK, BOOKE,     0,              {RS}},
+{"mtivor6",     XSPR(31,467,406), XSPR_MASK, BOOKE,     0,              {RS}},
+{"mtivor7",     XSPR(31,467,407), XSPR_MASK, BOOKE,     0,              {RS}},
+{"mtivor8",     XSPR(31,467,408), XSPR_MASK, BOOKE,     0,              {RS}},
+{"mtivor9",     XSPR(31,467,409), XSPR_MASK, BOOKE,     0,              {RS}},
+{"mtivor10",    XSPR(31,467,410), XSPR_MASK, BOOKE,     0,              {RS}},
+{"mtivor11",    XSPR(31,467,411), XSPR_MASK, BOOKE,     0,              {RS}},
+{"mtivor12",    XSPR(31,467,412), XSPR_MASK, BOOKE,     0,              {RS}},
+{"mtivor13",    XSPR(31,467,413), XSPR_MASK, BOOKE,     0,              {RS}},
+{"mtivor14",    XSPR(31,467,414), XSPR_MASK, BOOKE,     0,              {RS}},
+{"mtivor15",    XSPR(31,467,415), XSPR_MASK, BOOKE,     0,              {RS}},
+{"mtspefscr",   XSPR(31,467,512), XSPR_MASK, PPCSPE,    0,              {RS}},
+{"mtbbear",     XSPR(31,467,513), XSPR_MASK, PPCBRLK,   0,              {RS}},
+{"mtbbtar",     XSPR(31,467,514), XSPR_MASK, PPCBRLK,   0,              {RS}},
+{"mtivor32",    XSPR(31,467,528), XSPR_MASK, PPCSPE,    0,              {RS}},
+{"mtibatu",     XSPR(31,467,528), XSPRBAT_MASK, PPC,    TITAN,          {SPRBAT, RS}},
+{"mtivor33",    XSPR(31,467,529), XSPR_MASK, PPCSPE,    0,              {RS}},
+{"mtibatl",     XSPR(31,467,529), XSPRBAT_MASK, PPC,    TITAN,          {SPRBAT, RS}},
+{"mtivor34",    XSPR(31,467,530), XSPR_MASK, PPCSPE,    0,              {RS}},
+{"mtivor35",    XSPR(31,467,531), XSPR_MASK, PPCPMR,    0,              {RS}},
+{"mtdbatu",     XSPR(31,467,536), XSPRBAT_MASK, PPC,    TITAN,          {SPRBAT, RS}},
+{"mtdbatl",     XSPR(31,467,537), XSPRBAT_MASK, PPC,    TITAN,          {SPRBAT, RS}},
+{"mtmcsrr0",    XSPR(31,467,570), XSPR_MASK, PPCRFMCI,  0,              {RS}},
+{"mtmcsrr1",    XSPR(31,467,571), XSPR_MASK, PPCRFMCI,  0,              {RS}},
+{"mtmcsr",      XSPR(31,467,572), XSPR_MASK, PPCRFMCI,  0,              {RS}},
+{"mtivndx",     XSPR(31,467,880), XSPR_MASK, TITAN,     0,              {RS}},
+{"mtdvndx",     XSPR(31,467,881), XSPR_MASK, TITAN,     0,              {RS}},
+{"mtivlim",     XSPR(31,467,882), XSPR_MASK, TITAN,     0,              {RS}},
+{"mtdvlim",     XSPR(31,467,883), XSPR_MASK, TITAN,     0,              {RS}},
+{"mtclcsr",     XSPR(31,467,884), XSPR_MASK, TITAN,     0,              {RS}},
+{"mtccr1",      XSPR(31,467,888), XSPR_MASK, TITAN,     0,              {RS}},
+{"mtppr",       XSPR(31,467,896), XSPR_MASK, POWER7,    0,              {RS}},
+{"mtppr32",     XSPR(31,467,898), XSPR_MASK, POWER7,    0,              {RS}},
+{"mtummcr0",    XSPR(31,467,936), XSPR_MASK, PPC750,    0,              {RS}},
+{"mtupmc1",     XSPR(31,467,937), XSPR_MASK, PPC750,    0,              {RS}},
+{"mtupmc2",     XSPR(31,467,938), XSPR_MASK, PPC750,    0,              {RS}},
+{"mtusia",      XSPR(31,467,939), XSPR_MASK, PPC750,    0,              {RS}},
+{"mtummcr1",    XSPR(31,467,940), XSPR_MASK, PPC750,    0,              {RS}},
+{"mtupmc3",     XSPR(31,467,941), XSPR_MASK, PPC750,    0,              {RS}},
+{"mtupmc4",     XSPR(31,467,942), XSPR_MASK, PPC750,    0,              {RS}},
+{"mtzpr",       XSPR(31,467,944), XSPR_MASK, PPC403,    0,              {RS}},
+{"mtpid",       XSPR(31,467,945), XSPR_MASK, PPC403,    0,              {RS}},
+{"mtrmmucr",    XSPR(31,467,946), XSPR_MASK, TITAN,     0,              {RS}},
+{"mtccr0",      XSPR(31,467,947), XSPR_MASK, PPC405|TITAN, 0,           {RS}},
+{"mtiac3",      XSPR(31,467,948), XSPR_MASK, PPC405,    0,              {RS}},
+{"mtiac4",      XSPR(31,467,949), XSPR_MASK, PPC405,    0,              {RS}},
+{"mtdvc1",      XSPR(31,467,950), XSPR_MASK, PPC405,    0,              {RS}},
+{"mtdvc2",      XSPR(31,467,951), XSPR_MASK, PPC405,    0,              {RS}},
+{"mtmmcr0",     XSPR(31,467,952), XSPR_MASK, PPC750,    0,              {RS}},
+{"mtpmc1",      XSPR(31,467,953), XSPR_MASK, PPC750,    0,              {RS}},
+{"mtsgr",       XSPR(31,467,953), XSPR_MASK, PPC403,    0,              {RS}},
+{"mtdcwr",      XSPR(31,467,954), XSPR_MASK, PPC403,    0,              {RS}},
+{"mtpmc2",      XSPR(31,467,954), XSPR_MASK, PPC750,    0,              {RS}},
+{"mtsia",       XSPR(31,467,955), XSPR_MASK, PPC750,    0,              {RS}},
+{"mtsler",      XSPR(31,467,955), XSPR_MASK, PPC405,    0,              {RS}},
+{"mtmmcr1",     XSPR(31,467,956), XSPR_MASK, PPC750,    0,              {RS}},
+{"mtsu0r",      XSPR(31,467,956), XSPR_MASK, PPC405,    0,              {RS}},
+{"mtdbcr1",     XSPR(31,467,957), XSPR_MASK, PPC405,    0,              {RS}},
+{"mtpmc3",      XSPR(31,467,957), XSPR_MASK, PPC750,    0,              {RS}},
+{"mtpmc4",      XSPR(31,467,958), XSPR_MASK, PPC750,    0,              {RS}},
+{"mticdbdr",    XSPR(31,467,979), XSPR_MASK, PPC403,    0,              {RS}},
+{"mtesr",       XSPR(31,467,980), XSPR_MASK, PPC403,    0,              {RS}},
+{"mtdear",      XSPR(31,467,981), XSPR_MASK, PPC403,    0,              {RS}},
+{"mtevpr",      XSPR(31,467,982), XSPR_MASK, PPC403,    0,              {RS}},
+{"mtcdbcr",     XSPR(31,467,983), XSPR_MASK, PPC403,    0,              {RS}},
+{"mttsr",       XSPR(31,467,984), XSPR_MASK, PPC403,    0,              {RS}},
+{"mttcr",       XSPR(31,467,986), XSPR_MASK, PPC403,    0,              {RS}},
+{"mtpit",       XSPR(31,467,987), XSPR_MASK, PPC403,    0,              {RS}},
+{"mttbhi",      XSPR(31,467,988), XSPR_MASK, PPC403,    0,              {RS}},
+{"mttblo",      XSPR(31,467,989), XSPR_MASK, PPC403,    0,              {RS}},
+{"mtsrr2",      XSPR(31,467,990), XSPR_MASK, PPC403,    0,              {RS}},
+{"mtsrr3",      XSPR(31,467,991), XSPR_MASK, PPC403,    0,              {RS}},
+{"mtdbsr",      XSPR(31,467,1008), XSPR_MASK, PPC403,   0,              {RS}},
+{"mtdbdr",      XSPR(31,467,1011), XSPR_MASK, TITAN,    0,              {RS}},
+{"mtdbcr0",     XSPR(31,467,1010), XSPR_MASK, PPC405,   0,              {RS}},
+{"mtiac1",      XSPR(31,467,1012), XSPR_MASK, PPC403,   0,              {RS}},
+{"mtiac2",      XSPR(31,467,1013), XSPR_MASK, PPC403,   0,              {RS}},
+{"mtdac1",      XSPR(31,467,1014), XSPR_MASK, PPC403,   0,              {RS}},
+{"mtdac2",      XSPR(31,467,1015), XSPR_MASK, PPC403,   0,              {RS}},
+{"mtl2cr",      XSPR(31,467,1017), XSPR_MASK, PPC750,   0,              {RS}},
+{"mtdccr",      XSPR(31,467,1018), XSPR_MASK, PPC403,   0,              {RS}},
+{"mticcr",      XSPR(31,467,1019), XSPR_MASK, PPC403,   0,              {RS}},
+{"mtictc",      XSPR(31,467,1019), XSPR_MASK, PPC750,   0,              {RS}},
+{"mtpbl1",      XSPR(31,467,1020), XSPR_MASK, PPC403,   0,              {RS}},
+{"mtthrm1",     XSPR(31,467,1020), XSPR_MASK, PPC750,   0,              {RS}},
+{"mtpbu1",      XSPR(31,467,1021), XSPR_MASK, PPC403,   0,              {RS}},
+{"mtthrm2",     XSPR(31,467,1021), XSPR_MASK, PPC750,   0,              {RS}},
+{"mtpbl2",      XSPR(31,467,1022), XSPR_MASK, PPC403,   0,              {RS}},
+{"mtthrm3",     XSPR(31,467,1022), XSPR_MASK, PPC750,   0,              {RS}},
+{"mtpbu2",      XSPR(31,467,1023), XSPR_MASK, PPC403,   0,              {RS}},
+{"mtspr",       X(31,467),      X_MASK,      COM,       0,              {SPR, RS}},
+
+{"dcbi",        X(31,470),      XRT_MASK,    PPC,       0,              {RA0, RB}},
+
+{"nand",        XRC(31,476,0),  X_MASK,      COM,       0,              {RA, RS, RB}},
+{"nand.",       XRC(31,476,1),  X_MASK,      COM,       0,              {RA, RS, RB}},
+
+{"dsn",         X(31,483),      XRT_MASK,    E500MC,    0,              {RA, RB}},
+
+{"dcread",      X(31,486),      X_MASK,  PPC403|PPC440, PPCA2|PPC476,   {RT, RA0, RB}},
+
+{"icbtls",      X(31,486),      X_MASK,  PPCCHLK|PPC476|TITAN, 0,       {CT, RA0, RB}},
+
+{"stvxl",       X(31,487),      X_MASK,      PPCVEC,    0,              {VS, RA0, RB}},
+
+{"nabs",        XO(31,488,0,0), XORB_MASK,   M601,      0,              {RT, RA}},
+{"nabs.",       XO(31,488,0,1), XORB_MASK,   M601,      0,              {RT, RA}},
+
+{"divd",        XO(31,489,0,0), XO_MASK,     PPC64,     0,              {RT, RA, RB}},
+{"divd.",       XO(31,489,0,1), XO_MASK,     PPC64,     0,              {RT, RA, RB}},
+
+{"divw",        XO(31,491,0,0), XO_MASK,     PPC,       0,              {RT, RA, RB}},
+{"divw.",       XO(31,491,0,1), XO_MASK,     PPC,       0,              {RT, RA, RB}},
+
+{"icbtlse",     X(31,494),      X_MASK,      PPCCHLK,   E500MC,         {CT, RA, RB}},
+
+{"slbia",       X(31,498),      0xff1fffff,  POWER6,    0,              {IH}},
+{"slbia",       X(31,498),      0xffffffff,  PPC64,     POWER6,         {0}},
+
+{"cli",         X(31,502),      XRB_MASK,    POWER,     0,              {RT, RA}},
+
+{"popcntd",     X(31,506),      XRB_MASK, POWER7|PPCA2, 0,              {RA, RS}},
+
+{"cmpb",        X(31,508),      X_MASK, POWER6|PPCA2|PPC476, 0,         {RA, RS, RB}},
+
+{"mcrxr",       X(31,512),      XBFRARB_MASK, COM,      POWER7,         {BF}},
+
+{"lbdcbx",      X(31,514),      X_MASK,      E200Z4,    0,              {RT, RA, RB}},
+{"lbdx",        X(31,515),      X_MASK,      E500MC,    0,              {RT, RA, RB}},
 
-{ "clcs",    X(31,531), XRB_MASK,       M601,           { RT, RA } },
+{"bblels",      X(31,518),      X_MASK,      PPCBRLK,   0,              {0}},
 
-{ "ldbrx",   X(31,532), X_MASK,         CELL,           { RT, RA0, RB } },
+{"lvlx",        X(31,519),      X_MASK,      CELL,      0,              {VD, RA0, RB}},
+{"lbfcmux",     APU(31,519,0),  APU_MASK,    PPC405,    0,              {FCRT, RA, RB}},
 
-{ "lswx",    X(31,533), X_MASK,         PPCCOM,         { RT, RA0, RB } },
-{ "lsx",     X(31,533), X_MASK,         PWRCOM,         { RT, RA, RB } },
+{"subfco",      XO(31,8,1,0),   XO_MASK,     PPCCOM,    0,              {RT, RA, RB}},
+{"sfo",         XO(31,8,1,0),   XO_MASK,     PWRCOM,    0,              {RT, RA, RB}},
+{"subco",       XO(31,8,1,0),   XO_MASK,     PPCCOM,    0,              {RT, RB, RA}},
+{"subfco.",     XO(31,8,1,1),   XO_MASK,     PPCCOM,    0,              {RT, RA, RB}},
+{"sfo.",        XO(31,8,1,1),   XO_MASK,     PWRCOM,    0,              {RT, RA, RB}},
+{"subco.",      XO(31,8,1,1),   XO_MASK,     PPCCOM,    0,              {RT, RB, RA}},
 
-{ "lwbrx",   X(31,534), X_MASK,         PPCCOM,         { RT, RA0, RB } },
-{ "lbrx",    X(31,534), X_MASK,         PWRCOM,         { RT, RA, RB } },
+{"addco",       XO(31,10,1,0),  XO_MASK,     PPCCOM,    0,              {RT, RA, RB}},
+{"ao",          XO(31,10,1,0),  XO_MASK,     PWRCOM,    0,              {RT, RA, RB}},
+{"addco.",      XO(31,10,1,1),  XO_MASK,     PPCCOM,    0,              {RT, RA, RB}},
+{"ao.",         XO(31,10,1,1),  XO_MASK,     PWRCOM,    0,              {RT, RA, RB}},
 
-{ "lfsx",    X(31,535), X_MASK,         COM,            { FRT, RA0, RB } },
+{"lxsspx",      X(31,524),      XX1_MASK,    PPCVSX2,   0,              {XT6, RA0, RB}},
 
-{ "srw",     XRC(31,536,0), X_MASK,     PPCCOM,         { RA, RS, RB } },
-{ "sr",      XRC(31,536,0), X_MASK,     PWRCOM,         { RA, RS, RB } },
-{ "srw.",    XRC(31,536,1), X_MASK,     PPCCOM,         { RA, RS, RB } },
-{ "sr.",     XRC(31,536,1), X_MASK,     PWRCOM,         { RA, RS, RB } },
+{"clcs",        X(31,531),      XRB_MASK,    M601,      0,              {RT, RA}},
 
-{ "rrib",    XRC(31,537,0), X_MASK,     M601,           { RA, RS, RB } },
-{ "rrib.",   XRC(31,537,1), X_MASK,     M601,           { RA, RS, RB } },
+{"ldbrx",       X(31,532),      X_MASK, CELL|POWER7|PPCA2, 0,           {RT, RA0, RB}},
 
-{ "srd",     XRC(31,539,0), X_MASK,     PPC64,          { RA, RS, RB } },
-{ "srd.",    XRC(31,539,1), X_MASK,     PPC64,          { RA, RS, RB } },
+{"lswx",        X(31,533),      X_MASK,      PPCCOM,    E500|E500MC,    {RT, RAX, RBX}},
+{"lsx",         X(31,533),      X_MASK,      PWRCOM,    0,              {RT, RA, RB}},
 
-{ "maskir",  XRC(31,541,0), X_MASK,     M601,           { RA, RS, RB } },
-{ "maskir.", XRC(31,541,1), X_MASK,     M601,           { RA, RS, RB } },
+{"lwbrx",       X(31,534),      X_MASK,      PPCCOM,    0,              {RT, RA0, RB}},
+{"lbrx",        X(31,534),      X_MASK,      PWRCOM,    0,              {RT, RA, RB}},
 
-{ "lwbrxe",  X(31,542), X_MASK,         BOOKE64,        { RT, RA0, RB } },
+{"lfsx",        X(31,535),      X_MASK,      COM,       PPCEFS,         {FRT, RA0, RB}},
 
-{ "lfsxe",   X(31,543), X_MASK,         BOOKE64,        { FRT, RA0, RB } },
+{"srw",         XRC(31,536,0),  X_MASK,      PPCCOM,    0,              {RA, RS, RB}},
+{"sr",          XRC(31,536,0),  X_MASK,      PWRCOM,    0,              {RA, RS, RB}},
+{"srw.",        XRC(31,536,1),  X_MASK,      PPCCOM,    0,              {RA, RS, RB}},
+{"sr.",         XRC(31,536,1),  X_MASK,      PWRCOM,    0,              {RA, RS, RB}},
 
-{ "bbelr",   X(31,550), X_MASK,         PPCBRLK,        { 0 }},
+{"rrib",        XRC(31,537,0),  X_MASK,      M601,      0,              {RA, RS, RB}},
+{"rrib.",       XRC(31,537,1),  X_MASK,      M601,      0,              {RA, RS, RB}},
 
-{ "tlbsync", X(31,566), 0xffffffff,     PPC,            { 0 } },
+{"cnttzw",      XRC(31,538,0),  XRB_MASK,    POWER9,    0,              {RA, RS}},
+{"cnttzw.",     XRC(31,538,1),  XRB_MASK,    POWER9,    0,              {RA, RS}},
 
-{ "lfsux",   X(31,567), X_MASK,         COM,            { FRT, RAS, RB } },
+{"srd",         XRC(31,539,0),  X_MASK,      PPC64,     0,              {RA, RS, RB}},
+{"srd.",        XRC(31,539,1),  X_MASK,      PPC64,     0,              {RA, RS, RB}},
 
-{ "lfsuxe",  X(31,575), X_MASK,         BOOKE64,        { FRT, RAS, RB } },
+{"maskir",      XRC(31,541,0),  X_MASK,      M601,      0,              {RA, RS, RB}},
+{"maskir.",     XRC(31,541,1),  X_MASK,      M601,      0,              {RA, RS, RB}},
 
-{ "mfsr",    X(31,595), XRB_MASK|(1<<20), COM32,        { RT, SR } },
+{"lhdcbx",      X(31,546),      X_MASK,      E200Z4,    0,              {RT, RA, RB}},
+{"lhdx",        X(31,547),      X_MASK,      E500MC,    0,              {RT, RA, RB}},
 
-{ "lswi",    X(31,597), X_MASK,         PPCCOM,         { RT, RA0, NB } },
-{ "lsi",     X(31,597), X_MASK,         PWRCOM,         { RT, RA0, NB } },
+{"lvtrx",       X(31,549),      X_MASK,      PPCVEC2,   0,              {VD, RA0, RB}},
 
-{ "lwsync",  XSYNC(31,598,1), 0xffffffff, PPC,          { 0 } },
-{ "ptesync", XSYNC(31,598,2), 0xffffffff, PPC64,        { 0 } },
-{ "msync",   X(31,598), 0xffffffff,     BOOKE,          { 0 } },
-{ "sync",    X(31,598), XSYNC_MASK,     PPCCOM,         { LS } },
-{ "dcs",     X(31,598), 0xffffffff,     PWRCOM,         { 0 } },
+{"bbelr",       X(31,550),      X_MASK,      PPCBRLK,   0,              {0}},
 
-{ "lfdx",    X(31,599), X_MASK,         COM,            { FRT, RA0, RB } },
+{"lvrx",        X(31,551),      X_MASK,      CELL,      0,              {VD, RA0, RB}},
+{"lhfcmux",     APU(31,551,0),  APU_MASK,    PPC405,    0,              {FCRT, RA, RB}},
 
-{ "lfdxe",   X(31,607), X_MASK,         BOOKE64,        { FRT, RA0, RB } },
+{"subfo",       XO(31,40,1,0),  XO_MASK,     PPC,       0,              {RT, RA, RB}},
+{"subo",        XO(31,40,1,0),  XO_MASK,     PPC,       0,              {RT, RB, RA}},
+{"subfo.",      XO(31,40,1,1),  XO_MASK,     PPC,       0,              {RT, RA, RB}},
+{"subo.",       XO(31,40,1,1),  XO_MASK,     PPC,       0,              {RT, RB, RA}},
 
-{ "mffgpr",  XRC(31,607,0), XRA_MASK,   POWER6,         { FRT, RB } },
+{"tlbsync",     X(31,566),      0xffffffff,  PPC,       0,              {0}},
 
-{ "mfsri",   X(31,627), X_MASK,         PWRCOM,         { RT, RA, RB } },
+{"lfsux",       X(31,567),      X_MASK,      COM,       PPCEFS,         {FRT, RAS, RB}},
 
-{ "dclst",   X(31,630), XRB_MASK,       PWRCOM,         { RS, RA } },
+{"cnttzd",      XRC(31,570,0),  XRB_MASK,    POWER9,    0,              {RA, RS}},
+{"cnttzd.",     XRC(31,570,1),  XRB_MASK,    POWER9,    0,              {RA, RS}},
 
-{ "lfdux",   X(31,631), X_MASK,         COM,            { FRT, RAS, RB } },
+{"mcrxrx",      X(31,576),     XBFRARB_MASK, POWER9,    0,              {BF}},
 
-{ "lfduxe",  X(31,639), X_MASK,         BOOKE64,        { FRT, RAS, RB } },
+{"lwdcbx",      X(31,578),      X_MASK,      E200Z4,    0,              {RT, RA, RB}},
+{"lwdx",        X(31,579),      X_MASK,      E500MC,    0,              {RT, RA, RB}},
 
-{ "mfsrin",  X(31,659), XRA_MASK,       PPC32,          { RT, RB } },
+{"lvtlx",       X(31,581),      X_MASK,      PPCVEC2,   0,              {VD, RA0, RB}},
 
-{ "stdbrx",  X(31,660), X_MASK,         CELL,           { RS, RA0, RB } },
+{"lwat",        X(31,582),      X_MASK,      POWER9,    0,              {RT, RA0, FC}},
 
-{ "stswx",   X(31,661), X_MASK,         PPCCOM,         { RS, RA0, RB } },
-{ "stsx",    X(31,661), X_MASK,         PWRCOM,         { RS, RA0, RB } },
+{"lwfcmux",     APU(31,583,0),  APU_MASK,    PPC405,    0,              {FCRT, RA, RB}},
 
-{ "stwbrx",  X(31,662), X_MASK,         PPCCOM,         { RS, RA0, RB } },
-{ "stbrx",   X(31,662), X_MASK,         PWRCOM,         { RS, RA0, RB } },
+{"lxsdx",       X(31,588),      XX1_MASK,    PPCVSX,    0,              {XT6, RA0, RB}},
 
-{ "stfsx",   X(31,663), X_MASK,         COM,            { FRS, RA0, RB } },
+{"mfsr",        X(31,595), XRB_MASK|(1<<20), COM,       NON32,          {RT, SR}},
 
-{ "srq",     XRC(31,664,0), X_MASK,     M601,           { RA, RS, RB } },
-{ "srq.",    XRC(31,664,1), X_MASK,     M601,           { RA, RS, RB } },
+{"lswi",        X(31,597),      X_MASK,      PPCCOM,    E500|E500MC,    {RT, RAX, NBI}},
+{"lsi",         X(31,597),      X_MASK,      PWRCOM,    0,              {RT, RA0, NB}},
 
-{ "sre",     XRC(31,665,0), X_MASK,     M601,           { RA, RS, RB } },
-{ "sre.",    XRC(31,665,1), X_MASK,     M601,           { RA, RS, RB } },
+{"hwsync",      XSYNC(31,598,0), 0xffffffff, POWER4,    BOOKE|PPC476,   {0}},
+{"lwsync",      XSYNC(31,598,1), 0xffffffff, PPC,       E500,           {0}},
+{"ptesync",     XSYNC(31,598,2), 0xffffffff, PPC64,     0,              {0}},
+{"sync",        X(31,598),     XSYNCLE_MASK, E6500,     0,              {LS, ESYNC}},
+{"sync",        X(31,598),     XSYNC_MASK,   PPCCOM,    BOOKE|PPC476,   {LS}},
+{"msync",       X(31,598),     0xffffffff, BOOKE|PPCA2|PPC476, 0,       {0}},
+{"sync",        X(31,598),     0xffffffff,   BOOKE|PPC476, E6500,       {0}},
+{"lwsync",      X(31,598),     0xffffffff,   E500,      0,              {0}},
+{"dcs",         X(31,598),     0xffffffff,   PWRCOM,    0,              {0}},
 
-{ "stwbrxe", X(31,670), X_MASK,         BOOKE64,        { RS, RA0, RB } },
+{"lfdx",        X(31,599),      X_MASK,      COM,       PPCEFS,         {FRT, RA0, RB}},
 
-{ "stfsxe",  X(31,671), X_MASK,         BOOKE64,        { FRS, RA0, RB } },
+{"mffgpr",      XRC(31,607,0),  XRA_MASK,    POWER6,    POWER7,         {FRT, RB}},
+{"lfdepx",      X(31,607),      X_MASK,   E500MC|PPCA2, 0,              {FRT, RA0, RB}},
 
-{ "stfsux",  X(31,695), X_MASK,         COM,            { FRS, RAS, RB } },
+{"lddx",        X(31,611),      X_MASK,      E500MC,    0,              {RT, RA, RB}},
 
-{ "sriq",    XRC(31,696,0), X_MASK,     M601,           { RA, RS, SH } },
-{ "sriq.",   XRC(31,696,1), X_MASK,     M601,           { RA, RS, SH } },
+{"lvswx",       X(31,613),      X_MASK,      PPCVEC2,   0,              {VD, RA0, RB}},
 
-{ "stfsuxe", X(31,703), X_MASK,         BOOKE64,        { FRS, RAS, RB } },
+{"ldat",        X(31,614),      X_MASK,      POWER9,    0,              {RT, RA0, FC}},
 
-{ "stswi",   X(31,725), X_MASK,         PPCCOM,         { RS, RA0, NB } },
-{ "stsi",    X(31,725), X_MASK,         PWRCOM,         { RS, RA0, NB } },
+{"lqfcmux",     APU(31,615,0),  APU_MASK,    PPC405,    0,              {FCRT, RA, RB}},
 
-{ "stfdx",   X(31,727), X_MASK,         COM,            { FRS, RA0, RB } },
+{"nego",        XO(31,104,1,0), XORB_MASK,   COM,       0,              {RT, RA}},
+{"nego.",       XO(31,104,1,1), XORB_MASK,   COM,       0,              {RT, RA}},
 
-{ "srlq",    XRC(31,728,0), X_MASK,     M601,           { RA, RS, RB } },
-{ "srlq.",   XRC(31,728,1), X_MASK,     M601,           { RA, RS, RB } },
+{"mulo",        XO(31,107,1,0), XO_MASK,     M601,      0,              {RT, RA, RB}},
+{"mulo.",       XO(31,107,1,1), XO_MASK,     M601,      0,              {RT, RA, RB}},
 
-{ "sreq",    XRC(31,729,0), X_MASK,     M601,           { RA, RS, RB } },
-{ "sreq.",   XRC(31,729,1), X_MASK,     M601,           { RA, RS, RB } },
+{"mfsri",       X(31,627),      X_MASK,      M601,      0,              {RT, RA, RB}},
 
-{ "stfdxe",  X(31,735), X_MASK,         BOOKE64,        { FRS, RA0, RB } },
+{"dclst",       X(31,630),      XRB_MASK,    M601,      0,              {RS, RA}},
 
-{ "mftgpr",  XRC(31,735,0), XRA_MASK,   POWER6,         { RT, FRB } },
+{"lfdux",       X(31,631),      X_MASK,      COM,       PPCEFS,         {FRT, RAS, RB}},
 
-{ "dcba",    X(31,758), XRT_MASK,       PPC405 | BOOKE, { RA, RB } },
+{"stbdcbx",     X(31,642),      X_MASK,      E200Z4,    0,              {RS, RA, RB}},
+{"stbdx",       X(31,643),      X_MASK,      E500MC,    0,              {RS, RA, RB}},
 
-{ "stfdux",  X(31,759), X_MASK,         COM,            { FRS, RAS, RB } },
+{"stvlx",       X(31,647),      X_MASK,      CELL,      0,              {VS, RA0, RB}},
+{"stbfcmux",    APU(31,647,0),  APU_MASK,    PPC405,    0,              {FCRT, RA, RB}},
 
-{ "srliq",   XRC(31,760,0), X_MASK,     M601,           { RA, RS, SH } },
-{ "srliq.",  XRC(31,760,1), X_MASK,     M601,           { RA, RS, SH } },
+{"stxsspx",     X(31,652),      XX1_MASK,    PPCVSX2,   0,              {XS6, RA0, RB}},
 
-{ "dcbae",   X(31,766), XRT_MASK,       BOOKE64,        { RA, RB } },
+{"tbegin.",     XRC(31,654,1), XRTLRARB_MASK, PPCHTM,   0,              {HTM_R}},
 
-{ "stfduxe", X(31,767), X_MASK,         BOOKE64,        { FRS, RAS, RB } },
+{"subfeo",      XO(31,136,1,0), XO_MASK,     PPCCOM,    0,              {RT, RA, RB}},
+{"sfeo",        XO(31,136,1,0), XO_MASK,     PWRCOM,    0,              {RT, RA, RB}},
+{"subfeo.",     XO(31,136,1,1), XO_MASK,     PPCCOM,    0,              {RT, RA, RB}},
+{"sfeo.",       XO(31,136,1,1), XO_MASK,     PWRCOM,    0,              {RT, RA, RB}},
 
-{ "tlbivax", X(31,786), XRT_MASK,       BOOKE,          { RA, RB } },
-{ "tlbivaxe",X(31,787), XRT_MASK,       BOOKE64,        { RA, RB } },
+{"addeo",       XO(31,138,1,0), XO_MASK,     PPCCOM,    0,              {RT, RA, RB}},
+{"aeo",         XO(31,138,1,0), XO_MASK,     PWRCOM,    0,              {RT, RA, RB}},
+{"addeo.",      XO(31,138,1,1), XO_MASK,     PPCCOM,    0,              {RT, RA, RB}},
+{"aeo.",        XO(31,138,1,1), XO_MASK,     PWRCOM,    0,              {RT, RA, RB}},
 
-{ "lwzcix",  X(31,789), X_MASK,         POWER6,         { RT, RA0, RB } },
+{"mfsrin",      X(31,659),      XRA_MASK,    PPC,       NON32,          {RT, RB}},
 
-{ "lhbrx",   X(31,790), X_MASK,         COM,            { RT, RA0, RB } },
+{"stdbrx",      X(31,660),      X_MASK, CELL|POWER7|PPCA2, 0,           {RS, RA0, RB}},
 
-{ "sraw",    XRC(31,792,0), X_MASK,     PPCCOM,         { RA, RS, RB } },
-{ "sra",     XRC(31,792,0), X_MASK,     PWRCOM,         { RA, RS, RB } },
-{ "sraw.",   XRC(31,792,1), X_MASK,     PPCCOM,         { RA, RS, RB } },
-{ "sra.",    XRC(31,792,1), X_MASK,     PWRCOM,         { RA, RS, RB } },
+{"stswx",       X(31,661),      X_MASK,      PPCCOM,    E500|E500MC,    {RS, RA0, RB}},
+{"stsx",        X(31,661),      X_MASK,      PWRCOM,    0,              {RS, RA0, RB}},
 
-{ "srad",    XRC(31,794,0), X_MASK,     PPC64,          { RA, RS, RB } },
-{ "srad.",   XRC(31,794,1), X_MASK,     PPC64,          { RA, RS, RB } },
+{"stwbrx",      X(31,662),      X_MASK,      PPCCOM,    0,              {RS, RA0, RB}},
+{"stbrx",       X(31,662),      X_MASK,      PWRCOM,    0,              {RS, RA0, RB}},
 
-{ "lhbrxe",  X(31,798), X_MASK,         BOOKE64,        { RT, RA0, RB } },
+{"stfsx",       X(31,663),      X_MASK,      COM,       PPCEFS,         {FRS, RA0, RB}},
 
-{ "ldxe",    X(31,799), X_MASK,         BOOKE64,        { RT, RA0, RB } },
-{ "lduxe",   X(31,831), X_MASK,         BOOKE64,        { RT, RA0, RB } },
+{"srq",         XRC(31,664,0),  X_MASK,      M601,      0,              {RA, RS, RB}},
+{"srq.",        XRC(31,664,1),  X_MASK,      M601,      0,              {RA, RS, RB}},
 
-{ "rac",     X(31,818), X_MASK,         PWRCOM,         { RT, RA, RB } },
+{"sre",         XRC(31,665,0),  X_MASK,      M601,      0,              {RA, RS, RB}},
+{"sre.",        XRC(31,665,1),  X_MASK,      M601,      0,              {RA, RS, RB}},
 
-{ "lhzcix",  X(31,821), X_MASK,         POWER6,         { RT, RA0, RB } },
+{"sthdcbx",     X(31,674),      X_MASK,      E200Z4,    0,              {RS, RA, RB}},
+{"sthdx",       X(31,675),      X_MASK,      E500MC,    0,              {RS, RA, RB}},
 
-{ "dss",     XDSS(31,822,0), XDSS_MASK, PPCVEC,         { STRM } },
-{ "dssall",  XDSS(31,822,1), XDSS_MASK, PPCVEC,         { 0 } },
+{"stvfrx",      X(31,677),      X_MASK,      PPCVEC2,   0,              {VS, RA0, RB}},
 
-{ "srawi",   XRC(31,824,0), X_MASK,     PPCCOM,         { RA, RS, SH } },
-{ "srai",    XRC(31,824,0), X_MASK,     PWRCOM,         { RA, RS, SH } },
-{ "srawi.",  XRC(31,824,1), X_MASK,     PPCCOM,         { RA, RS, SH } },
-{ "srai.",   XRC(31,824,1), X_MASK,     PWRCOM,         { RA, RS, SH } },
+{"stvrx",       X(31,679),      X_MASK,      CELL,      0,              {VS, RA0, RB}},
+{"sthfcmux",    APU(31,679,0),  APU_MASK,    PPC405,    0,              {FCRT, RA, RB}},
 
-{ "slbmfev", X(31,851), XRA_MASK,       PPC64,          { RT, RB } },
+{"tendall.",    XRC(31,686,1)|(1<<25), XRTRARB_MASK, PPCHTM, 0,         {0}},
+{"tend.",       XRC(31,686,1), XRTARARB_MASK, PPCHTM,   0,              {HTM_A}},
 
-{ "lbzcix",  X(31,853), X_MASK,         POWER6,         { RT, RA0, RB } },
+{"stbcx.",      XRC(31,694,1),  X_MASK,   POWER8|E6500, 0,              {RS, RA0, RB}},
 
-{ "mbar",    X(31,854), X_MASK,         BOOKE,          { MO } },
-{ "eieio",   X(31,854), 0xffffffff,     PPC,            { 0 } },
+{"stfsux",      X(31,695),      X_MASK,      COM,       PPCEFS,         {FRS, RAS, RB}},
 
-{ "lfiwax",  X(31,855), X_MASK,         POWER6,         { FRT, RA0, RB } },
+{"sriq",        XRC(31,696,0),  X_MASK,      M601,      0,              {RA, RS, SH}},
+{"sriq.",       XRC(31,696,1),  X_MASK,      M601,      0,              {RA, RS, SH}},
 
-{ "ldcix",   X(31,885), X_MASK,         POWER6,         { RT, RA0, RB } },
+{"stwdcbx",     X(31,706),      X_MASK,      E200Z4,    0,              {RS, RA, RB}},
+{"stwdx",       X(31,707),      X_MASK,      E500MC,    0,              {RS, RA, RB}},
 
-{ "tlbsx",   XRC(31,914,0), X_MASK,     PPC403|BOOKE,   { RTO, RA, RB } },
-{ "tlbsx.",  XRC(31,914,1), X_MASK,     PPC403|BOOKE,   { RTO, RA, RB } },
-{ "tlbsxe",  XRC(31,915,0), X_MASK,     BOOKE64,        { RA, RB } },
-{ "tlbsxe.", XRC(31,915,1), X_MASK,     BOOKE64,        { RA, RB } },
+{"stvflx",      X(31,709),      X_MASK,      PPCVEC2,   0,              {VS, RA0, RB}},
 
-{ "slbmfee", X(31,915), XRA_MASK,       PPC64,          { RT, RB } },
+{"stwat",       X(31,710),      X_MASK,      POWER9,    0,              {RS, RA0, FC}},
 
-{ "stwcix",  X(31,917), X_MASK,         POWER6,         { RS, RA0, RB } },
+{"stwfcmux",    APU(31,711,0),  APU_MASK,    PPC405,    0,              {FCRT, RA, RB}},
 
-{ "sthbrx",  X(31,918), X_MASK,         COM,            { RS, RA0, RB } },
+{"stxsdx",      X(31,716),      XX1_MASK,    PPCVSX,    0,              {XS6, RA0, RB}},
 
-{ "sraq",    XRC(31,920,0), X_MASK,     M601,           { RA, RS, RB } },
-{ "sraq.",   XRC(31,920,1), X_MASK,     M601,           { RA, RS, RB } },
+{"tcheck",      X(31,718),   XRTBFRARB_MASK, PPCHTM,    0,              {BF}},
 
-{ "srea",    XRC(31,921,0), X_MASK,     M601,           { RA, RS, RB } },
-{ "srea.",   XRC(31,921,1), X_MASK,     M601,           { RA, RS, RB } },
+{"subfzeo",     XO(31,200,1,0), XORB_MASK,   PPCCOM,    0,              {RT, RA}},
+{"sfzeo",       XO(31,200,1,0), XORB_MASK,   PWRCOM,    0,              {RT, RA}},
+{"subfzeo.",    XO(31,200,1,1), XORB_MASK,   PPCCOM,    0,              {RT, RA}},
+{"sfzeo.",      XO(31,200,1,1), XORB_MASK,   PWRCOM,    0,              {RT, RA}},
 
-{ "extsh",   XRC(31,922,0), XRB_MASK,   PPCCOM,         { RA, RS } },
-{ "exts",    XRC(31,922,0), XRB_MASK,   PWRCOM,         { RA, RS } },
-{ "extsh.",  XRC(31,922,1), XRB_MASK,   PPCCOM,         { RA, RS } },
-{ "exts.",   XRC(31,922,1), XRB_MASK,   PWRCOM,         { RA, RS } },
+{"addzeo",      XO(31,202,1,0), XORB_MASK,   PPCCOM,    0,              {RT, RA}},
+{"azeo",        XO(31,202,1,0), XORB_MASK,   PWRCOM,    0,              {RT, RA}},
+{"addzeo.",     XO(31,202,1,1), XORB_MASK,   PPCCOM,    0,              {RT, RA}},
+{"azeo.",       XO(31,202,1,1), XORB_MASK,   PWRCOM,    0,              {RT, RA}},
 
-{ "sthbrxe", X(31,926), X_MASK,         BOOKE64,        { RS, RA0, RB } },
+{"stswi",       X(31,725),      X_MASK,      PPCCOM,    E500|E500MC,    {RS, RA0, NB}},
+{"stsi",        X(31,725),      X_MASK,      PWRCOM,    0,              {RS, RA0, NB}},
 
-{ "stdxe",   X(31,927), X_MASK,         BOOKE64,        { RS, RA0, RB } },
+{"sthcx.",      XRC(31,726,1),  X_MASK,   POWER8|E6500, 0,              {RS, RA0, RB}},
 
-{ "tlbrehi", XTLB(31,946,0), XTLB_MASK, PPC403,         { RT, RA } },
-{ "tlbrelo", XTLB(31,946,1), XTLB_MASK, PPC403,         { RT, RA } },
-{ "tlbre",   X(31,946), X_MASK,         PPC403|BOOKE,   { RSO, RAOPT, SHO } },
+{"stfdx",       X(31,727),      X_MASK,      COM,       PPCEFS,         {FRS, RA0, RB}},
 
-{ "sthcix",  X(31,949), X_MASK,         POWER6,         { RS, RA0, RB } },
+{"srlq",        XRC(31,728,0),  X_MASK,      M601,      0,              {RA, RS, RB}},
+{"srlq.",       XRC(31,728,1),  X_MASK,      M601,      0,              {RA, RS, RB}},
 
-{ "sraiq",   XRC(31,952,0), X_MASK,     M601,           { RA, RS, SH } },
-{ "sraiq.",  XRC(31,952,1), X_MASK,     M601,           { RA, RS, SH } },
+{"sreq",        XRC(31,729,0),  X_MASK,      M601,      0,              {RA, RS, RB}},
+{"sreq.",       XRC(31,729,1),  X_MASK,      M601,      0,              {RA, RS, RB}},
 
-{ "extsb",   XRC(31,954,0), XRB_MASK,   PPC,            { RA, RS} },
-{ "extsb.",  XRC(31,954,1), XRB_MASK,   PPC,            { RA, RS} },
+{"mftgpr",      XRC(31,735,0),  XRA_MASK,    POWER6,    POWER7,         {RT, FRB}},
+{"stfdepx",     X(31,735),      X_MASK,   E500MC|PPCA2, 0,              {FRS, RA0, RB}},
 
-{ "stduxe",  X(31,959), X_MASK,         BOOKE64,        { RS, RAS, RB } },
+{"stddx",       X(31,739),      X_MASK,      E500MC,    0,              {RS, RA, RB}},
 
-{ "iccci",   X(31,966), XRT_MASK,       PPC403|PPC440,  { RA, RB } },
+{"stvswx",      X(31,741),      X_MASK,      PPCVEC2,   0,              {VS, RA0, RB}},
 
-{ "tlbwehi", XTLB(31,978,0), XTLB_MASK, PPC403,         { RT, RA } },
-{ "tlbwelo", XTLB(31,978,1), XTLB_MASK, PPC403,         { RT, RA } },
-{ "tlbwe",   X(31,978), X_MASK,         PPC403|BOOKE,   { RSO, RAOPT, SHO } },
-{ "tlbld",   X(31,978), XRTRA_MASK,     PPC,            { RB } },
+{"stdat",       X(31,742),      X_MASK,      POWER9,    0,              {RS, RA0, FC}},
 
-{ "stbcix",  X(31,981), X_MASK,         POWER6,         { RS, RA0, RB } },
+{"stqfcmux",    APU(31,743,0),  APU_MASK,    PPC405,    0,              {FCRT, RA, RB}},
 
-{ "icbi",    X(31,982), XRT_MASK,       PPC,            { RA, RB } },
+{"subfmeo",     XO(31,232,1,0), XORB_MASK,   PPCCOM,    0,              {RT, RA}},
+{"sfmeo",       XO(31,232,1,0), XORB_MASK,   PWRCOM,    0,              {RT, RA}},
+{"subfmeo.",    XO(31,232,1,1), XORB_MASK,   PPCCOM,    0,              {RT, RA}},
+{"sfmeo.",      XO(31,232,1,1), XORB_MASK,   PWRCOM,    0,              {RT, RA}},
 
-{ "stfiwx",  X(31,983), X_MASK,         PPC,            { FRS, RA0, RB } },
+{"mulldo",      XO(31,233,1,0), XO_MASK,     PPC64,     0,              {RT, RA, RB}},
+{"mulldo.",     XO(31,233,1,1), XO_MASK,     PPC64,     0,              {RT, RA, RB}},
 
-{ "extsw",   XRC(31,986,0), XRB_MASK,   PPC64 | BOOKE64,{ RA, RS } },
-{ "extsw.",  XRC(31,986,1), XRB_MASK,   PPC64,          { RA, RS } },
+{"addmeo",      XO(31,234,1,0), XORB_MASK,   PPCCOM,    0,              {RT, RA}},
+{"ameo",        XO(31,234,1,0), XORB_MASK,   PWRCOM,    0,              {RT, RA}},
+{"addmeo.",     XO(31,234,1,1), XORB_MASK,   PPCCOM,    0,              {RT, RA}},
+{"ameo.",       XO(31,234,1,1), XORB_MASK,   PWRCOM,    0,              {RT, RA}},
 
-{ "icread",  X(31,998), XRT_MASK,       PPC403|PPC440,  { RA, RB } },
+{"mullwo",      XO(31,235,1,0), XO_MASK,     PPCCOM,    0,              {RT, RA, RB}},
+{"mulso",       XO(31,235,1,0), XO_MASK,     PWRCOM,    0,              {RT, RA, RB}},
+{"mullwo.",     XO(31,235,1,1), XO_MASK,     PPCCOM,    0,              {RT, RA, RB}},
+{"mulso.",      XO(31,235,1,1), XO_MASK,     PWRCOM,    0,              {RT, RA, RB}},
 
-{ "icbie",   X(31,990), XRT_MASK,       BOOKE64,        { RA, RB } },
-{ "stfiwxe", X(31,991), X_MASK,         BOOKE64,        { FRS, RA0, RB } },
+{"tsuspend.",   XRCL(31,750,0,1), XRTRARB_MASK,PPCHTM,  0,              {0}},
+{"tresume.",    XRCL(31,750,1,1), XRTRARB_MASK,PPCHTM,  0,              {0}},
+{"tsr.",        XRC(31,750,1),    XRTLRARB_MASK,PPCHTM, 0,              {L}},
 
-{ "tlbli",   X(31,1010), XRTRA_MASK,    PPC,            { RB } },
+{"darn",        X(31,755),      XLRAND_MASK, POWER9,    0,              {RT, LRAND}},
 
-{ "stdcix",  X(31,1013), X_MASK,        POWER6,         { RS, RA0, RB } },
+{"dcba",        X(31,758), XRT_MASK, PPC405|PPC7450|BOOKE|PPCA2|PPC476, 0, {RA0, RB}},
+{"dcbal",       XOPL(31,758,1), XRT_MASK,    E500MC,    0,              {RA0, RB}},
 
-{ "dcbzl",   XOPL(31,1014,1), XRT_MASK,POWER4,            { RA, RB } },
-{ "dcbz",    X(31,1014), XRT_MASK,      PPC,            { RA, RB } },
-{ "dclz",    X(31,1014), XRT_MASK,      PPC,            { RA, RB } },
+{"stfdux",      X(31,759),      X_MASK,      COM,       PPCEFS,         {FRS, RAS, RB}},
 
-{ "dcbze",   X(31,1022), XRT_MASK,      BOOKE64,        { RA, RB } },
+{"srliq",       XRC(31,760,0),  X_MASK,      M601,      0,              {RA, RS, SH}},
+{"srliq.",      XRC(31,760,1),  X_MASK,      M601,      0,              {RA, RS, SH}},
 
-{ "lvebx",   X(31,   7), X_MASK,        PPCVEC,         { VD, RA, RB } },
-{ "lvehx",   X(31,  39), X_MASK,        PPCVEC,         { VD, RA, RB } },
-{ "lvewx",   X(31,  71), X_MASK,        PPCVEC,         { VD, RA, RB } },
-{ "lvsl",    X(31,   6), X_MASK,        PPCVEC,         { VD, RA, RB } },
-{ "lvsr",    X(31,  38), X_MASK,        PPCVEC,         { VD, RA, RB } },
-{ "lvx",     X(31, 103), X_MASK,        PPCVEC,         { VD, RA, RB } },
-{ "lvxl",    X(31, 359), X_MASK,        PPCVEC,         { VD, RA, RB } },
-{ "stvebx",  X(31, 135), X_MASK,        PPCVEC,         { VS, RA, RB } },
-{ "stvehx",  X(31, 167), X_MASK,        PPCVEC,         { VS, RA, RB } },
-{ "stvewx",  X(31, 199), X_MASK,        PPCVEC,         { VS, RA, RB } },
-{ "stvx",    X(31, 231), X_MASK,        PPCVEC,         { VS, RA, RB } },
-{ "stvxl",   X(31, 487), X_MASK,        PPCVEC,         { VS, RA, RB } },
+{"lvsm",        X(31,773),      X_MASK,      PPCVEC2,   0,              {VD, RA0, RB}},
 
-/* New load/store left/right index vector instructions that are in the Cell only.  */
-{ "lvlx",    X(31, 519), X_MASK,        CELL,           { VD, RA0, RB } },
-{ "lvlxl",   X(31, 775), X_MASK,        CELL,           { VD, RA0, RB } },
-{ "lvrx",    X(31, 551), X_MASK,        CELL,           { VD, RA0, RB } },
-{ "lvrxl",   X(31, 807), X_MASK,        CELL,           { VD, RA0, RB } },
-{ "stvlx",   X(31, 647), X_MASK,        CELL,           { VS, RA0, RB } },
-{ "stvlxl",  X(31, 903), X_MASK,        CELL,           { VS, RA0, RB } },
-{ "stvrx",   X(31, 679), X_MASK,        CELL,           { VS, RA0, RB } },
-{ "stvrxl",  X(31, 935), X_MASK,        CELL,           { VS, RA0, RB } },
+{"copy",        XOPL(31,774,1), XRT_MASK,    POWER9,    0,              {RA0, RB}},
 
-{ "lwz",     OP(32),    OP_MASK,        PPCCOM,         { RT, D, RA0 } },
-{ "l",       OP(32),    OP_MASK,        PWRCOM,         { RT, D, RA0 } },
+{"stvepxl",     X(31,775),      X_MASK,      PPCVEC2,   0,              {VS, RA0, RB}},
+{"lvlxl",       X(31,775),      X_MASK,      CELL,      0,              {VD, RA0, RB}},
+{"ldfcmux",     APU(31,775,0),  APU_MASK,    PPC405,    0,              {FCRT, RA, RB}},
 
-{ "lwzu",    OP(33),    OP_MASK,        PPCCOM,         { RT, D, RAL } },
-{ "lu",      OP(33),    OP_MASK,        PWRCOM,         { RT, D, RA0 } },
+{"dozo",        XO(31,264,1,0), XO_MASK,     M601,      0,              {RT, RA, RB}},
+{"dozo.",       XO(31,264,1,1), XO_MASK,     M601,      0,              {RT, RA, RB}},
 
-{ "lbz",     OP(34),    OP_MASK,        COM,            { RT, D, RA0 } },
+{"addo",        XO(31,266,1,0), XO_MASK,     PPCCOM,    0,              {RT, RA, RB}},
+{"caxo",        XO(31,266,1,0), XO_MASK,     PWRCOM,    0,              {RT, RA, RB}},
+{"addo.",       XO(31,266,1,1), XO_MASK,     PPCCOM,    0,              {RT, RA, RB}},
+{"caxo.",       XO(31,266,1,1), XO_MASK,     PWRCOM,    0,              {RT, RA, RB}},
 
-{ "lbzu",    OP(35),    OP_MASK,        COM,            { RT, D, RAL } },
+{"modsd",       X(31,777),      X_MASK,      POWER9,    0,              {RT, RA, RB}},
+{"modsw",       X(31,779),      X_MASK,      POWER9,    0,              {RT, RA, RB}},
 
-{ "stw",     OP(36),    OP_MASK,        PPCCOM,         { RS, D, RA0 } },
-{ "st",      OP(36),    OP_MASK,        PWRCOM,         { RS, D, RA0 } },
+{"lxvw4x",      X(31,780),      XX1_MASK,    PPCVSX,    0,              {XT6, RA0, RB}},
+{"lxsibzx",     X(31,781),      XX1_MASK,    PPCVSX3,   0,              {XT6, RA0, RB}},
 
-{ "stwu",    OP(37),    OP_MASK,        PPCCOM,         { RS, D, RAS } },
-{ "stu",     OP(37),    OP_MASK,        PWRCOM,         { RS, D, RA0 } },
+{"tabortwc.",   XRC(31,782,1),  X_MASK,      PPCHTM,    0,              {TO, RA, RB}},
 
-{ "stb",     OP(38),    OP_MASK,        COM,            { RS, D, RA0 } },
+{"tlbivax",     X(31,786),      XRT_MASK, BOOKE|PPCA2|PPC476, 0,        {RA0, RB}},
 
-{ "stbu",    OP(39),    OP_MASK,        COM,            { RS, D, RAS } },
+{"lwzcix",      X(31,789),      X_MASK,      POWER6,    0,              {RT, RA0, RB}},
 
-{ "lhz",     OP(40),    OP_MASK,        COM,            { RT, D, RA0 } },
+{"lhbrx",       X(31,790),      X_MASK,      COM,       0,              {RT, RA0, RB}},
 
-{ "lhzu",    OP(41),    OP_MASK,        COM,            { RT, D, RAL } },
+{"lfdpx",       X(31,791),      X_MASK,      POWER6,    POWER7,         {FRTp, RA0, RB}},
+{"lfqx",        X(31,791),      X_MASK,      POWER2,    0,              {FRT, RA, RB}},
 
-{ "lha",     OP(42),    OP_MASK,        COM,            { RT, D, RA0 } },
+{"sraw",        XRC(31,792,0),  X_MASK,      PPCCOM,    0,              {RA, RS, RB}},
+{"sra",         XRC(31,792,0),  X_MASK,      PWRCOM,    0,              {RA, RS, RB}},
+{"sraw.",       XRC(31,792,1),  X_MASK,      PPCCOM,    0,              {RA, RS, RB}},
+{"sra.",        XRC(31,792,1),  X_MASK,      PWRCOM,    0,              {RA, RS, RB}},
 
-{ "lhau",    OP(43),    OP_MASK,        COM,            { RT, D, RAL } },
+{"srad",        XRC(31,794,0),  X_MASK,      PPC64,     0,              {RA, RS, RB}},
+{"srad.",       XRC(31,794,1),  X_MASK,      PPC64,     0,              {RA, RS, RB}},
 
-{ "sth",     OP(44),    OP_MASK,        COM,            { RS, D, RA0 } },
+{"lfddx",       X(31,803),      X_MASK,      E500MC,    0,              {FRT, RA, RB}},
 
-{ "sthu",    OP(45),    OP_MASK,        COM,            { RS, D, RAS } },
+{"lvtrxl",      X(31,805),      X_MASK,      PPCVEC2,   0,              {VD, RA0, RB}},
+{"stvepx",      X(31,807),      X_MASK,      PPCVEC2,   0,              {VS, RA0, RB}},
+{"lvrxl",       X(31,807),      X_MASK,      CELL,      0,              {VD, RA0, RB}},
 
-{ "lmw",     OP(46),    OP_MASK,        PPCCOM,         { RT, D, RAM } },
-{ "lm",      OP(46),    OP_MASK,        PWRCOM,         { RT, D, RA0 } },
+{"lxvh8x",      X(31,812),      XX1_MASK,    PPCVSX3,   0,              {XT6, RA0, RB}},
+{"lxsihzx",     X(31,813),      XX1_MASK,    PPCVSX3,   0,              {XT6, RA0, RB}},
 
-{ "stmw",    OP(47),    OP_MASK,        PPCCOM,         { RS, D, RA0 } },
-{ "stm",     OP(47),    OP_MASK,        PWRCOM,         { RS, D, RA0 } },
+{"tabortdc.",   XRC(31,814,1),  X_MASK,      PPCHTM,    0,              {TO, RA, RB}},
 
-{ "lfs",     OP(48),    OP_MASK,        COM,            { FRT, D, RA0 } },
+{"rac",         X(31,818),      X_MASK,      M601,      0,              {RT, RA, RB}},
 
-{ "lfsu",    OP(49),    OP_MASK,        COM,            { FRT, D, RAS } },
+{"erativax",    X(31,819),      X_MASK,      PPCA2,     0,              {RS, RA0, RB}},
 
-{ "lfd",     OP(50),    OP_MASK,        COM,            { FRT, D, RA0 } },
+{"lhzcix",      X(31,821),      X_MASK,      POWER6,    0,              {RT, RA0, RB}},
 
-{ "lfdu",    OP(51),    OP_MASK,        COM,            { FRT, D, RAS } },
+{"dss",         XDSS(31,822,0), XDSS_MASK,   PPCVEC,    0,              {STRM}},
 
-{ "stfs",    OP(52),    OP_MASK,        COM,            { FRS, D, RA0 } },
+{"lfqux",       X(31,823),      X_MASK,      POWER2,    0,              {FRT, RA, RB}},
 
-{ "stfsu",   OP(53),    OP_MASK,        COM,            { FRS, D, RAS } },
+{"srawi",       XRC(31,824,0),  X_MASK,      PPCCOM,    0,              {RA, RS, SH}},
+{"srai",        XRC(31,824,0),  X_MASK,      PWRCOM,    0,              {RA, RS, SH}},
+{"srawi.",      XRC(31,824,1),  X_MASK,      PPCCOM,    0,              {RA, RS, SH}},
+{"srai.",       XRC(31,824,1),  X_MASK,      PWRCOM,    0,              {RA, RS, SH}},
 
-{ "stfd",    OP(54),    OP_MASK,        COM,            { FRS, D, RA0 } },
+{"sradi",       XS(31,413,0),   XS_MASK,     PPC64,     0,              {RA, RS, SH6}},
+{"sradi.",      XS(31,413,1),   XS_MASK,     PPC64,     0,              {RA, RS, SH6}},
 
-{ "stfdu",   OP(55),    OP_MASK,        COM,            { FRS, D, RAS } },
+{"lvtlxl",      X(31,837),      X_MASK,      PPCVEC2,   0,              {VD, RA0, RB}},
 
-{ "lq",      OP(56),    OP_MASK,        POWER4,         { RTQ, DQ, RAQ } },
+{"cpabort",     X(31,838),      XRTRARB_MASK,POWER9,    0,              {0}},
 
-{ "lfq",     OP(56),    OP_MASK,        POWER2,         { FRT, D, RA0 } },
+{"divo",        XO(31,331,1,0), XO_MASK,     M601,      0,              {RT, RA, RB}},
+{"divo.",       XO(31,331,1,1), XO_MASK,     M601,      0,              {RT, RA, RB}},
 
-{ "lfqu",    OP(57),    OP_MASK,        POWER2,         { FRT, D, RA0 } },
+{"lxvd2x",      X(31,844),      XX1_MASK,    PPCVSX,    0,              {XT6, RA0, RB}},
+{"lxvx",        X(31,844),      XX1_MASK,    POWER8,    POWER9|PPCVSX3, {XT6, RA0, RB}},
 
-{ "lfdp",    OP(57),    OP_MASK,        POWER6,         { FRT, D, RA0 } },
+{"tabortwci.",  XRC(31,846,1),  X_MASK,      PPCHTM,    0,              {TO, RA, HTM_SI}},
 
-{ "lbze",    DEO(58,0), DE_MASK,        BOOKE64,        { RT, DE, RA0 } },
-{ "lbzue",   DEO(58,1), DE_MASK,        BOOKE64,        { RT, DE, RAL } },
-{ "lhze",    DEO(58,2), DE_MASK,        BOOKE64,        { RT, DE, RA0 } },
-{ "lhzue",   DEO(58,3), DE_MASK,        BOOKE64,        { RT, DE, RAL } },
-{ "lhae",    DEO(58,4), DE_MASK,        BOOKE64,        { RT, DE, RA0 } },
-{ "lhaue",   DEO(58,5), DE_MASK,        BOOKE64,        { RT, DE, RAL } },
-{ "lwze",    DEO(58,6), DE_MASK,        BOOKE64,        { RT, DE, RA0 } },
-{ "lwzue",   DEO(58,7), DE_MASK,        BOOKE64,        { RT, DE, RAL } },
-{ "stbe",    DEO(58,8), DE_MASK,        BOOKE64,        { RS, DE, RA0 } },
-{ "stbue",   DEO(58,9), DE_MASK,        BOOKE64,        { RS, DE, RAS } },
-{ "sthe",    DEO(58,10), DE_MASK,       BOOKE64,        { RS, DE, RA0 } },
-{ "sthue",   DEO(58,11), DE_MASK,       BOOKE64,        { RS, DE, RAS } },
-{ "stwe",    DEO(58,14), DE_MASK,       BOOKE64,        { RS, DE, RA0 } },
-{ "stwue",   DEO(58,15), DE_MASK,       BOOKE64,        { RS, DE, RAS } },
+{"tlbsrx.",     XRC(31,850,1),  XRT_MASK,    PPCA2,     0,              {RA0, RB}},
 
-{ "ld",      DSO(58,0), DS_MASK,        PPC64,          { RT, DS, RA0 } },
+{"slbiag",      X(31,850),      XRARB_MASK,  POWER9,    0,              {RS}},
+{"slbmfev",     X(31,851),      XRLA_MASK,   POWER9,    0,              {RT, RB, A_L}},
+{"slbmfev",     X(31,851),      XRA_MASK,    PPC64,     POWER9,         {RT, RB}},
 
-{ "ldu",     DSO(58,1), DS_MASK,        PPC64,          { RT, DS, RAL } },
+{"lbzcix",      X(31,853),      X_MASK,      POWER6,    0,              {RT, RA0, RB}},
 
-{ "lwa",     DSO(58,2), DS_MASK,        PPC64,          { RT, DS, RA0 } },
+{"eieio",       X(31,854),      0xffffffff,  PPC,   BOOKE|PPCA2|PPC476, {0}},
+{"mbar",        X(31,854),      X_MASK,    BOOKE|PPCA2|PPC476, 0,       {MO}},
+{"eieio",       XMBAR(31,854,1),0xffffffff,  E500,      0,              {0}},
+{"eieio",       X(31,854),      0xffffffff, PPCA2|PPC476, 0,            {0}},
 
-{ "dadd",    XRC(59,2,0), X_MASK,       POWER6,         { FRT, FRA, FRB } },
-{ "dadd.",   XRC(59,2,1), X_MASK,       POWER6,         { FRT, FRA, FRB } },
+{"lfiwax",      X(31,855),      X_MASK, POWER6|PPCA2|PPC476, 0,         {FRT, RA0, RB}},
 
-{ "dqua",    ZRC(59,3,0), Z_MASK,       POWER6,         { FRT, FRA, FRB, RMC } },
-{ "dqua.",   ZRC(59,3,1), Z_MASK,       POWER6,         { FRT, FRA, FRB, RMC } },
+{"lvswxl",      X(31,869),      X_MASK,      PPCVEC2,   0,              {VD, RA0, RB}},
 
-{ "fdivs",   A(59,18,0), AFRC_MASK,     PPC,            { FRT, FRA, FRB } },
-{ "fdivs.",  A(59,18,1), AFRC_MASK,     PPC,            { FRT, FRA, FRB } },
+{"abso",        XO(31,360,1,0), XORB_MASK,   M601,      0,              {RT, RA}},
+{"abso.",       XO(31,360,1,1), XORB_MASK,   M601,      0,              {RT, RA}},
 
-{ "fsubs",   A(59,20,0), AFRC_MASK,     PPC,            { FRT, FRA, FRB } },
-{ "fsubs.",  A(59,20,1), AFRC_MASK,     PPC,            { FRT, FRA, FRB } },
+{"divso",       XO(31,363,1,0), XO_MASK,     M601,      0,              {RT, RA, RB}},
+{"divso.",      XO(31,363,1,1), XO_MASK,     M601,      0,              {RT, RA, RB}},
 
-{ "fadds",   A(59,21,0), AFRC_MASK,     PPC,            { FRT, FRA, FRB } },
-{ "fadds.",  A(59,21,1), AFRC_MASK,     PPC,            { FRT, FRA, FRB } },
+{"lxvb16x",     X(31,876),      XX1_MASK,    PPCVSX3,   0,              {XT6, RA0, RB}},
 
-{ "fsqrts",  A(59,22,0), AFRAFRC_MASK,  PPC,            { FRT, FRB } },
-{ "fsqrts.", A(59,22,1), AFRAFRC_MASK,  PPC,            { FRT, FRB } },
+{"tabortdci.",  XRC(31,878,1),  X_MASK,      PPCHTM,    0,              {TO, RA, HTM_SI}},
 
-{ "fres",    A(59,24,0), AFRALFRC_MASK, PPC,            { FRT, FRB, A_L } },
-{ "fres.",   A(59,24,1), AFRALFRC_MASK, PPC,            { FRT, FRB, A_L } },
+{"rmieg",       X(31,882),      XRTRA_MASK,  POWER9,    0,              {RB}},
 
-{ "fmuls",   A(59,25,0), AFRB_MASK,     PPC,            { FRT, FRA, FRC } },
-{ "fmuls.",  A(59,25,1), AFRB_MASK,     PPC,            { FRT, FRA, FRC } },
+{"ldcix",       X(31,885),      X_MASK,      POWER6,    0,              {RT, RA0, RB}},
 
-{ "frsqrtes", A(59,26,0), AFRALFRC_MASK,POWER5,         { FRT, FRB, A_L } },
-{ "frsqrtes.",A(59,26,1), AFRALFRC_MASK,POWER5,         { FRT, FRB, A_L } },
+{"msgsync",     X(31,886),      0xffffffff,  POWER9,    0,              {0}},
 
-{ "fmsubs",  A(59,28,0), A_MASK,        PPC,            { FRT,FRA,FRC,FRB } },
-{ "fmsubs.", A(59,28,1), A_MASK,        PPC,            { FRT,FRA,FRC,FRB } },
+{"lfiwzx",      X(31,887),      X_MASK,   POWER7|PPCA2, 0,              {FRT, RA0, RB}},
 
-{ "fmadds",  A(59,29,0), A_MASK,        PPC,            { FRT,FRA,FRC,FRB } },
-{ "fmadds.", A(59,29,1), A_MASK,        PPC,            { FRT,FRA,FRC,FRB } },
+{"extswsli",    XS(31,445,0),   XS_MASK,     POWER9,    0,              {RA, RS, SH6}},
+{"extswsli.",   XS(31,445,1),   XS_MASK,     POWER9,    0,              {RA, RS, SH6}},
 
-{ "fnmsubs", A(59,30,0), A_MASK,        PPC,            { FRT,FRA,FRC,FRB } },
-{ "fnmsubs.",A(59,30,1), A_MASK,        PPC,            { FRT,FRA,FRC,FRB } },
+{"paste.",      XRCL(31,902,1,1),XRT_MASK,   POWER9,    0,              {RA0, RB}},
 
-{ "fnmadds", A(59,31,0), A_MASK,        PPC,            { FRT,FRA,FRC,FRB } },
-{ "fnmadds.",A(59,31,1), A_MASK,        PPC,            { FRT,FRA,FRC,FRB } },
+{"stvlxl",      X(31,903),      X_MASK,      CELL,      0,              {VS, RA0, RB}},
+{"stdfcmux",    APU(31,903,0),  APU_MASK,    PPC405,    0,              {FCRT, RA, RB}},
 
-{ "dmul",    XRC(59,34,0), X_MASK,      POWER6,         { FRT, FRA, FRB } },
-{ "dmul.",   XRC(59,34,1), X_MASK,      POWER6,         { FRT, FRA, FRB } },
+{"divdeuo",     XO(31,393,1,0), XO_MASK,  POWER7|PPCA2, 0,              {RT, RA, RB}},
+{"divdeuo.",    XO(31,393,1,1), XO_MASK,  POWER7|PPCA2, 0,              {RT, RA, RB}},
+{"divweuo",     XO(31,395,1,0), XO_MASK,  POWER7|PPCA2, 0,              {RT, RA, RB}},
+{"divweuo.",    XO(31,395,1,1), XO_MASK,  POWER7|PPCA2, 0,              {RT, RA, RB}},
 
-{ "drrnd",   ZRC(59,35,0), Z_MASK,      POWER6,         { FRT, FRA, FRB, RMC } },
-{ "drrnd.",  ZRC(59,35,1), Z_MASK,      POWER6,         { FRT, FRA, FRB, RMC } },
+{"stxvw4x",     X(31,908),      XX1_MASK,    PPCVSX,    0,              {XS6, RA0, RB}},
+{"stxsibx",     X(31,909),      XX1_MASK,    PPCVSX3,   0,              {XS6, RA0, RB}},
 
-{ "dscli",   ZRC(59,66,0), Z_MASK,      POWER6,         { FRT, FRA, SH16 } },
-{ "dscli.",  ZRC(59,66,1), Z_MASK,      POWER6,         { FRT, FRA, SH16 } },
+{"tabort.",     XRC(31,910,1),  XRTRB_MASK,  PPCHTM,    0,              {RA}},
 
-{ "dquai",   ZRC(59,67,0), Z_MASK,      POWER6,         { TE,  FRT, FRB, RMC } },
-{ "dquai.",  ZRC(59,67,1), Z_MASK,      POWER6,         { TE,  FRT, FRB, RMC } },
+{"tlbsx",       XRC(31,914,0),  X_MASK, PPC403|BOOKE|PPCA2|PPC476, 0,   {RTO, RA0, RB}},
+{"tlbsx.",      XRC(31,914,1),  X_MASK, PPC403|BOOKE|PPCA2|PPC476, 0,   {RTO, RA0, RB}},
 
-{ "dscri",   ZRC(59,98,0), Z_MASK,      POWER6,         { FRT, FRA, SH16 } },
-{ "dscri.",  ZRC(59,98,1), Z_MASK,      POWER6,         { FRT, FRA, SH16 } },
+{"slbmfee",     X(31,915),      XRLA_MASK,   POWER9,    0,              {RT, RB, A_L}},
+{"slbmfee",     X(31,915),      XRA_MASK,    PPC64,     POWER9,         {RT, RB}},
 
-{ "drintx",  ZRC(59,99,0), Z_MASK,      POWER6,         { R, FRT, FRB, RMC } },
-{ "drintx.", ZRC(59,99,1), Z_MASK,      POWER6,         { R, FRT, FRB, RMC } },
+{"stwcix",      X(31,917),      X_MASK,      POWER6,    0,              {RS, RA0, RB}},
 
-{ "dcmpo",   X(59,130),    X_MASK,      POWER6,         { BF,  FRA, FRB } },
+{"sthbrx",      X(31,918),      X_MASK,      COM,       0,              {RS, RA0, RB}},
 
-{ "dtstex",  X(59,162),    X_MASK,      POWER6,         { BF,  FRA, FRB } },
-{ "dtstdc",  Z(59,194),    Z_MASK,      POWER6,         { BF,  FRA, DCM } },
-{ "dtstdg",  Z(59,226),    Z_MASK,      POWER6,         { BF,  FRA, DGM } },
+{"stfdpx",      X(31,919),      X_MASK,      POWER6,    POWER7,         {FRSp, RA0, RB}},
+{"stfqx",       X(31,919),      X_MASK,      POWER2,    0,              {FRS, RA0, RB}},
 
-{ "drintn",  ZRC(59,227,0), Z_MASK,     POWER6,         { R, FRT, FRB, RMC } },
-{ "drintn.", ZRC(59,227,1), Z_MASK,     POWER6,         { R, FRT, FRB, RMC } },
+{"sraq",        XRC(31,920,0),  X_MASK,      M601,      0,              {RA, RS, RB}},
+{"sraq.",       XRC(31,920,1),  X_MASK,      M601,      0,              {RA, RS, RB}},
 
-{ "dctdp",   XRC(59,258,0), X_MASK,     POWER6,         { FRT, FRB } },
-{ "dctdp.",  XRC(59,258,1), X_MASK,     POWER6,         { FRT, FRB } },
+{"srea",        XRC(31,921,0),  X_MASK,      M601,      0,              {RA, RS, RB}},
+{"srea.",       XRC(31,921,1),  X_MASK,      M601,      0,              {RA, RS, RB}},
 
-{ "dctfix",  XRC(59,290,0), X_MASK,     POWER6,         { FRT, FRB } },
-{ "dctfix.", XRC(59,290,1), X_MASK,     POWER6,         { FRT, FRB } },
+{"extsh",       XRC(31,922,0),  XRB_MASK,    PPCCOM,    0,              {RA, RS}},
+{"exts",        XRC(31,922,0),  XRB_MASK,    PWRCOM,    0,              {RA, RS}},
+{"extsh.",      XRC(31,922,1),  XRB_MASK,    PPCCOM,    0,              {RA, RS}},
+{"exts.",       XRC(31,922,1),  XRB_MASK,    PWRCOM,    0,              {RA, RS}},
 
-{ "ddedpd",  XRC(59,322,0), X_MASK,     POWER6,         { SP, FRT, FRB } }, 
-{ "ddedpd.", XRC(59,322,1), X_MASK,     POWER6,         { SP, FRT, FRB } }, 
+{"stfddx",      X(31,931),      X_MASK,      E500MC,    0,              {FRS, RA, RB}},
 
-{ "dxex",    XRC(59,354,0), X_MASK,     POWER6,         { FRT, FRB } },
-{ "dxex.",   XRC(59,354,1), X_MASK,     POWER6,         { FRT, FRB } },
+{"stvfrxl",     X(31,933),      X_MASK,      PPCVEC2,   0,              {VS, RA0, RB}},
 
-{ "dsub",    XRC(59,514,0), X_MASK,     POWER6,         { FRT, FRA, FRB } },
-{ "dsub.",   XRC(59,514,1), X_MASK,     POWER6,         { FRT, FRA, FRB } },
+{"wclrone",     XOPL2(31,934,2),XRT_MASK,    PPCA2,     0,              {RA0, RB}},
+{"wclrall",     X(31,934),      XRARB_MASK,  PPCA2,     0,              {L2}},
+{"wclr",        X(31,934),      X_MASK,      PPCA2,     0,              {L2, RA0, RB}},
 
-{ "ddiv",    XRC(59,546,0), X_MASK,     POWER6,         { FRT, FRA, FRB } },
-{ "ddiv.",   XRC(59,546,1), X_MASK,     POWER6,         { FRT, FRA, FRB } },
+{"stvrxl",      X(31,935),      X_MASK,      CELL,      0,              {VS, RA0, RB}},
 
-{ "dcmpu",   X(59,642),     X_MASK,     POWER6,         { BF,  FRA, FRB } },
+{"divdeo",      XO(31,425,1,0), XO_MASK,  POWER7|PPCA2, 0,              {RT, RA, RB}},
+{"divdeo.",     XO(31,425,1,1), XO_MASK,  POWER7|PPCA2, 0,              {RT, RA, RB}},
+{"divweo",      XO(31,427,1,0), XO_MASK,  POWER7|PPCA2, 0,              {RT, RA, RB}},
+{"divweo.",     XO(31,427,1,1), XO_MASK,  POWER7|PPCA2, 0,              {RT, RA, RB}},
 
-{ "dtstsf",  X(59,674),    X_MASK,      POWER6,         { BF,  FRA, FRB } },
+{"stxvh8x",     X(31,940),      XX1_MASK,    PPCVSX3,   0,              {XS6, RA0, RB}},
+{"stxsihx",     X(31,941),      XX1_MASK,    PPCVSX3,   0,              {XS6, RA0, RB}},
 
-{ "drsp",    XRC(59,770,0), X_MASK,     POWER6,         { FRT, FRB } },
-{ "drsp.",   XRC(59,770,1), X_MASK,     POWER6,         { FRT, FRB } },
+{"treclaim.",   XRC(31,942,1),  XRTRB_MASK,  PPCHTM,    0,              {RA}},
 
-{ "dcffix",  XRC(59,802,0), X_MASK,     POWER6,         { FRT, FRB } },
-{ "dcffix.", XRC(59,802,1), X_MASK,     POWER6,         { FRT, FRB } },
+{"tlbrehi",     XTLB(31,946,0), XTLB_MASK,   PPC403,    PPCA2,          {RT, RA}},
+{"tlbrelo",     XTLB(31,946,1), XTLB_MASK,   PPC403,    PPCA2,          {RT, RA}},
+{"tlbre",       X(31,946),  X_MASK, PPC403|BOOKE|PPCA2|PPC476, 0,       {RSO, RAOPT, SHO}},
 
-{ "denbcd",  XRC(59,834,0), X_MASK,     POWER6,         { S, FRT, FRB } },
-{ "denbcd.", XRC(59,834,1), X_MASK,     POWER6,         { S, FRT, FRB } },
+{"sthcix",      X(31,949),      X_MASK,      POWER6,    0,              {RS, RA0, RB}},
 
-{ "diex",    XRC(59,866,0), X_MASK,     POWER6,         { FRT, FRA, FRB } },
-{ "diex.",   XRC(59,866,1), X_MASK,     POWER6,         { FRT, FRA, FRB } },
+{"icswepx",     XRC(31,950,0),  X_MASK,      PPCA2,     0,              {RS, RA, RB}},
+{"icswepx.",    XRC(31,950,1),  X_MASK,      PPCA2,     0,              {RS, RA, RB}},
 
-{ "stfq",    OP(60),    OP_MASK,        POWER2,         { FRS, D, RA } },
+{"stfqux",      X(31,951),      X_MASK,      POWER2,    0,              {FRS, RA, RB}},
 
-{ "stfqu",   OP(61),    OP_MASK,        POWER2,         { FRS, D, RA } },
+{"sraiq",       XRC(31,952,0),  X_MASK,      M601,      0,              {RA, RS, SH}},
+{"sraiq.",      XRC(31,952,1),  X_MASK,      M601,      0,              {RA, RS, SH}},
 
-{ "stfdp",   OP(61),    OP_MASK,        POWER6,         { FRT, D, RA0 } },
+{"extsb",       XRC(31,954,0),  XRB_MASK,    PPC,       0,              {RA, RS}},
+{"extsb.",      XRC(31,954,1),  XRB_MASK,    PPC,       0,              {RA, RS}},
 
-{ "lde",     DEO(62,0), DE_MASK,        BOOKE64,        { RT, DES, RA0 } },
-{ "ldue",    DEO(62,1), DE_MASK,        BOOKE64,        { RT, DES, RA0 } },
-{ "lfse",    DEO(62,4), DE_MASK,        BOOKE64,        { FRT, DES, RA0 } },
-{ "lfsue",   DEO(62,5), DE_MASK,        BOOKE64,        { FRT, DES, RAS } },
-{ "lfde",    DEO(62,6), DE_MASK,        BOOKE64,        { FRT, DES, RA0 } },
-{ "lfdue",   DEO(62,7), DE_MASK,        BOOKE64,        { FRT, DES, RAS } },
-{ "stde",    DEO(62,8), DE_MASK,        BOOKE64,        { RS, DES, RA0 } },
-{ "stdue",   DEO(62,9), DE_MASK,        BOOKE64,        { RS, DES, RAS } },
-{ "stfse",   DEO(62,12), DE_MASK,       BOOKE64,        { FRS, DES, RA0 } },
-{ "stfsue",  DEO(62,13), DE_MASK,       BOOKE64,        { FRS, DES, RAS } },
-{ "stfde",   DEO(62,14), DE_MASK,       BOOKE64,        { FRS, DES, RA0 } },
-{ "stfdue",  DEO(62,15), DE_MASK,       BOOKE64,        { FRS, DES, RAS } },
+{"stvflxl",     X(31,965),      X_MASK,      PPCVEC2,   0,              {VS, RA0, RB}},
 
-{ "std",     DSO(62,0), DS_MASK,        PPC64,          { RS, DS, RA0 } },
+{"iccci",       X(31,966), XRT_MASK, PPC403|PPC440|TITAN|PPCA2, 0,       {RAOPT, RBOPT}},
+{"ici",         X(31,966),      XRARB_MASK,  PPCA2|PPC476, 0,           {CT}},
 
-{ "stdu",    DSO(62,1), DS_MASK,        PPC64,          { RS, DS, RAS } },
+{"divduo",      XO(31,457,1,0), XO_MASK,     PPC64,     0,              {RT, RA, RB}},
+{"divduo.",     XO(31,457,1,1), XO_MASK,     PPC64,     0,              {RT, RA, RB}},
 
-{ "stq",     DSO(62,2), DS_MASK,        POWER4,         { RSQ, DS, RA0 } },
+{"divwuo",      XO(31,459,1,0), XO_MASK,     PPC,       0,              {RT, RA, RB}},
+{"divwuo.",     XO(31,459,1,1), XO_MASK,     PPC,       0,              {RT, RA, RB}},
 
-{ "fcmpu",   X(63,0),   X_MASK|(3<<21), COM,            { BF, FRA, FRB } },
+{"stxvd2x",     X(31,972),      XX1_MASK,    PPCVSX,    0,              {XS6, RA0, RB}},
+{"stxvx",       X(31,972),      XX1_MASK,    POWER8,    POWER9|PPCVSX3, {XS6, RA0, RB}},
 
-{ "daddq",   XRC(63,2,0), X_MASK,       POWER6,         { FRT, FRA, FRB } },
-{ "daddq.",  XRC(63,2,1), X_MASK,       POWER6,         { FRT, FRA, FRB } },
+{"tlbld",       X(31,978),      XRTRA_MASK,  PPC, PPC403|BOOKE|PPCA2|PPC476, {RB}},
+{"tlbwehi",     XTLB(31,978,0), XTLB_MASK,   PPC403,    0,              {RT, RA}},
+{"tlbwelo",     XTLB(31,978,1), XTLB_MASK,   PPC403,    0,              {RT, RA}},
+{"tlbwe",       X(31,978),  X_MASK, PPC403|BOOKE|PPCA2|PPC476, 0,       {RSO, RAOPT, SHO}},
 
-{ "dquaq",   ZRC(63,3,0), Z_MASK,       POWER6,         { FRT, FRA, FRB, RMC } },
-{ "dquaq.",  ZRC(63,3,1), Z_MASK,       POWER6,         { FRT, FRA, FRB, RMC } },
+{"slbfee.",     XRC(31,979,1),  XRA_MASK,    POWER6,    0,              {RT, RB}},
 
-{ "fcpsgn",  XRC(63,8,0), X_MASK,       POWER6,         { FRT, FRA, FRB } },
-{ "fcpsgn.", XRC(63,8,1), X_MASK,       POWER6,         { FRT, FRA, FRB } },
+{"stbcix",      X(31,981),      X_MASK,      POWER6,    0,              {RS, RA0, RB}},
 
-{ "frsp",    XRC(63,12,0), XRA_MASK,    COM,            { FRT, FRB } },
-{ "frsp.",   XRC(63,12,1), XRA_MASK,    COM,            { FRT, FRB } },
+{"icbi",        X(31,982),      XRT_MASK,    PPC,       0,              {RA0, RB}},
 
-{ "fctiw",   XRC(63,14,0), XRA_MASK,    PPCCOM,         { FRT, FRB } },
-{ "fcir",    XRC(63,14,0), XRA_MASK,    POWER2,         { FRT, FRB } },
-{ "fctiw.",  XRC(63,14,1), XRA_MASK,    PPCCOM,         { FRT, FRB } },
-{ "fcir.",   XRC(63,14,1), XRA_MASK,    POWER2,         { FRT, FRB } },
+{"stfiwx",      X(31,983),      X_MASK,      PPC,       PPCEFS,         {FRS, RA0, RB}},
 
-{ "fctiwz",  XRC(63,15,0), XRA_MASK,    PPCCOM,         { FRT, FRB } },
-{ "fcirz",   XRC(63,15,0), XRA_MASK,    POWER2,         { FRT, FRB } },
-{ "fctiwz.", XRC(63,15,1), XRA_MASK,    PPCCOM,         { FRT, FRB } },
-{ "fcirz.",  XRC(63,15,1), XRA_MASK,    POWER2,         { FRT, FRB } },
+{"extsw",       XRC(31,986,0),  XRB_MASK,    PPC64,     0,              {RA, RS}},
+{"extsw.",      XRC(31,986,1),  XRB_MASK,    PPC64,     0,              {RA, RS}},
 
-{ "fdiv",    A(63,18,0), AFRC_MASK,     PPCCOM,         { FRT, FRA, FRB } },
-{ "fd",      A(63,18,0), AFRC_MASK,     PWRCOM,         { FRT, FRA, FRB } },
-{ "fdiv.",   A(63,18,1), AFRC_MASK,     PPCCOM,         { FRT, FRA, FRB } },
-{ "fd.",     A(63,18,1), AFRC_MASK,     PWRCOM,         { FRT, FRA, FRB } },
+{"icbiep",      XRT(31,991,0),  XRT_MASK,    E500MC|PPCA2, 0,           {RA0, RB}},
 
-{ "fsub",    A(63,20,0), AFRC_MASK,     PPCCOM,         { FRT, FRA, FRB } },
-{ "fs",      A(63,20,0), AFRC_MASK,     PWRCOM,         { FRT, FRA, FRB } },
-{ "fsub.",   A(63,20,1), AFRC_MASK,     PPCCOM,         { FRT, FRA, FRB } },
-{ "fs.",     A(63,20,1), AFRC_MASK,     PWRCOM,         { FRT, FRA, FRB } },
+{"stvswxl",     X(31,997),      X_MASK,      PPCVEC2,   0,              {VS, RA0, RB}},
 
-{ "fadd",    A(63,21,0), AFRC_MASK,     PPCCOM,         { FRT, FRA, FRB } },
-{ "fa",      A(63,21,0), AFRC_MASK,     PWRCOM,         { FRT, FRA, FRB } },
-{ "fadd.",   A(63,21,1), AFRC_MASK,     PPCCOM,         { FRT, FRA, FRB } },
-{ "fa.",     A(63,21,1), AFRC_MASK,     PWRCOM,         { FRT, FRA, FRB } },
+{"icread",      X(31,998),     XRT_MASK, PPC403|PPC440|PPC476|TITAN, 0, {RA0, RB}},
 
-{ "fsqrt",   A(63,22,0), AFRAFRC_MASK,  PPCPWR2,        { FRT, FRB } },
-{ "fsqrt.",  A(63,22,1), AFRAFRC_MASK,  PPCPWR2,        { FRT, FRB } },
+{"nabso",       XO(31,488,1,0), XORB_MASK,   M601,      0,              {RT, RA}},
+{"nabso.",      XO(31,488,1,1), XORB_MASK,   M601,      0,              {RT, RA}},
 
-{ "fsel",    A(63,23,0), A_MASK,        PPC,            { FRT,FRA,FRC,FRB } },
-{ "fsel.",   A(63,23,1), A_MASK,        PPC,            { FRT,FRA,FRC,FRB } },
+{"divdo",       XO(31,489,1,0), XO_MASK,     PPC64,     0,              {RT, RA, RB}},
+{"divdo.",      XO(31,489,1,1), XO_MASK,     PPC64,     0,              {RT, RA, RB}},
 
-{ "fre",     A(63,24,0), AFRALFRC_MASK, POWER5,         { FRT, FRB, A_L } },
-{ "fre.",    A(63,24,1), AFRALFRC_MASK, POWER5,         { FRT, FRB, A_L } },
+{"divwo",       XO(31,491,1,0), XO_MASK,     PPC,       0,              {RT, RA, RB}},
+{"divwo.",      XO(31,491,1,1), XO_MASK,     PPC,       0,              {RT, RA, RB}},
 
-{ "fmul",    A(63,25,0), AFRB_MASK,     PPCCOM,         { FRT, FRA, FRC } },
-{ "fm",      A(63,25,0), AFRB_MASK,     PWRCOM,         { FRT, FRA, FRC } },
-{ "fmul.",   A(63,25,1), AFRB_MASK,     PPCCOM,         { FRT, FRA, FRC } },
-{ "fm.",     A(63,25,1), AFRB_MASK,     PWRCOM,         { FRT, FRA, FRC } },
+{"stxvb16x",    X(31,1004),     XX1_MASK,    PPCVSX3,   0,              {XS6, RA0, RB}},
 
-{ "frsqrte", A(63,26,0), AFRALFRC_MASK, PPC,            { FRT, FRB, A_L } },
-{ "frsqrte.",A(63,26,1), AFRALFRC_MASK, PPC,            { FRT, FRB, A_L } },
+{"trechkpt.",   XRC(31,1006,1), XRTRARB_MASK,PPCHTM,    0,              {0}},
 
-{ "fmsub",   A(63,28,0), A_MASK,        PPCCOM,         { FRT,FRA,FRC,FRB } },
-{ "fms",     A(63,28,0), A_MASK,        PWRCOM,         { FRT,FRA,FRC,FRB } },
-{ "fmsub.",  A(63,28,1), A_MASK,        PPCCOM,         { FRT,FRA,FRC,FRB } },
-{ "fms.",    A(63,28,1), A_MASK,        PWRCOM,         { FRT,FRA,FRC,FRB } },
+{"tlbli",       X(31,1010),     XRTRA_MASK,  PPC,       TITAN,          {RB}},
 
-{ "fmadd",   A(63,29,0), A_MASK,        PPCCOM,         { FRT,FRA,FRC,FRB } },
-{ "fma",     A(63,29,0), A_MASK,        PWRCOM,         { FRT,FRA,FRC,FRB } },
-{ "fmadd.",  A(63,29,1), A_MASK,        PPCCOM,         { FRT,FRA,FRC,FRB } },
-{ "fma.",    A(63,29,1), A_MASK,        PWRCOM,         { FRT,FRA,FRC,FRB } },
+{"stdcix",      X(31,1013),     X_MASK,      POWER6,    0,              {RS, RA0, RB}},
 
-{ "fnmsub",  A(63,30,0), A_MASK,        PPCCOM,         { FRT,FRA,FRC,FRB } },
-{ "fnms",    A(63,30,0), A_MASK,        PWRCOM,         { FRT,FRA,FRC,FRB } },
-{ "fnmsub.", A(63,30,1), A_MASK,        PPCCOM,         { FRT,FRA,FRC,FRB } },
-{ "fnms.",   A(63,30,1), A_MASK,        PWRCOM,         { FRT,FRA,FRC,FRB } },
+{"dcbz",        X(31,1014),     XRT_MASK,    PPC,       0,              {RA0, RB}},
+{"dclz",        X(31,1014),     XRT_MASK,    PPC,       0,              {RA0, RB}},
 
-{ "fnmadd",  A(63,31,0), A_MASK,        PPCCOM,         { FRT,FRA,FRC,FRB } },
-{ "fnma",    A(63,31,0), A_MASK,        PWRCOM,         { FRT,FRA,FRC,FRB } },
-{ "fnmadd.", A(63,31,1), A_MASK,        PPCCOM,         { FRT,FRA,FRC,FRB } },
-{ "fnma.",   A(63,31,1), A_MASK,        PWRCOM,         { FRT,FRA,FRC,FRB } },
+{"dcbzep",      XRT(31,1023,0), XRT_MASK,    E500MC|PPCA2, 0,           {RA0, RB}},
 
-{ "fcmpo",   X(63,32),  X_MASK|(3<<21), COM,            { BF, FRA, FRB } },
+{"dcbzl",       XOPL(31,1014,1), XRT_MASK,   POWER4|E500MC, PPC476,     {RA0, RB}},
 
-{ "dmulq",   XRC(63,34,0), X_MASK,      POWER6,         { FRT, FRA, FRB } },
-{ "dmulq.",  XRC(63,34,1), X_MASK,      POWER6,         { FRT, FRA, FRB } },
+{"cctpl",       0x7c210b78,     0xffffffff,  CELL,      0,              {0}},
+{"cctpm",       0x7c421378,     0xffffffff,  CELL,      0,              {0}},
+{"cctph",       0x7c631b78,     0xffffffff,  CELL,      0,              {0}},
 
-{ "drrndq",  ZRC(63,35,0), Z_MASK,      POWER6,         { FRT, FRA, FRB, RMC } },
-{ "drrndq.", ZRC(63,35,1), Z_MASK,      POWER6,         { FRT, FRA, FRB, RMC } },
+{"dstt",        XDSS(31,342,1), XDSS_MASK,   PPCVEC,    0,              {RA, RB, STRM}},
+{"dststt",      XDSS(31,374,1), XDSS_MASK,   PPCVEC,    0,              {RA, RB, STRM}},
+{"dssall",      XDSS(31,822,1), XDSS_MASK,   PPCVEC,    0,              {0}},
 
-{ "mtfsb1",  XRC(63,38,0), XRARB_MASK,  COM,            { BT } },
-{ "mtfsb1.", XRC(63,38,1), XRARB_MASK,  COM,            { BT } },
+{"db8cyc",      0x7f9ce378,     0xffffffff,  CELL,      0,              {0}},
+{"db10cyc",     0x7fbdeb78,     0xffffffff,  CELL,      0,              {0}},
+{"db12cyc",     0x7fdef378,     0xffffffff,  CELL,      0,              {0}},
+{"db16cyc",     0x7ffffb78,     0xffffffff,  CELL,      0,              {0}},
 
-{ "fneg",    XRC(63,40,0), XRA_MASK,    COM,            { FRT, FRB } },
-{ "fneg.",   XRC(63,40,1), XRA_MASK,    COM,            { FRT, FRB } },
+{"lwz",         OP(32),         OP_MASK,     PPCCOM,    PPCVLE,         {RT, D, RA0}},
+{"l",           OP(32),         OP_MASK,     PWRCOM,    PPCVLE,         {RT, D, RA0}},
 
-{ "mcrfs",   X(63,64),  XRB_MASK|(3<<21)|(3<<16), COM,  { BF, BFA } },
+{"lwzu",        OP(33),         OP_MASK,     PPCCOM,    PPCVLE,         {RT, D, RAL}},
+{"lu",          OP(33),         OP_MASK,     PWRCOM,    PPCVLE,         {RT, D, RA0}},
 
-{ "dscliq",  ZRC(63,66,0), Z_MASK,      POWER6,         { FRT, FRA, SH16 } },
-{ "dscliq.", ZRC(63,66,1), Z_MASK,      POWER6,         { FRT, FRA, SH16 } },
+{"lbz",         OP(34),         OP_MASK,     COM,       PPCVLE,         {RT, D, RA0}},
 
-{ "dquaiq",  ZRC(63,67,0), Z_MASK,      POWER6,         { TE,  FRT, FRB, RMC } },
-{ "dquaiq.", ZRC(63,67,1), Z_MASK,      POWER6,         { FRT, FRA, FRB, RMC } },
+{"lbzu",        OP(35),         OP_MASK,     COM,       PPCVLE,         {RT, D, RAL}},
 
-{ "mtfsb0",  XRC(63,70,0), XRARB_MASK,  COM,            { BT } },
-{ "mtfsb0.", XRC(63,70,1), XRARB_MASK,  COM,            { BT } },
+{"stw",         OP(36),         OP_MASK,     PPCCOM,    PPCVLE,         {RS, D, RA0}},
+{"st",          OP(36),         OP_MASK,     PWRCOM,    PPCVLE,         {RS, D, RA0}},
 
-{ "fmr",     XRC(63,72,0), XRA_MASK,    COM,            { FRT, FRB } },
-{ "fmr.",    XRC(63,72,1), XRA_MASK,    COM,            { FRT, FRB } },
+{"stwu",        OP(37),         OP_MASK,     PPCCOM,    PPCVLE,         {RS, D, RAS}},
+{"stu",         OP(37),         OP_MASK,     PWRCOM,    PPCVLE,         {RS, D, RA0}},
 
-{ "dscriq",  ZRC(63,98,0), Z_MASK,      POWER6,         { FRT, FRA, SH16 } },
-{ "dscriq.", ZRC(63,98,1), Z_MASK,      POWER6,         { FRT, FRA, SH16 } },
+{"stb",         OP(38),         OP_MASK,     COM,       PPCVLE,         {RS, D, RA0}},
 
-{ "drintxq", ZRC(63,99,0), Z_MASK,      POWER6,         { R, FRT, FRB, RMC } },
-{ "drintxq.",ZRC(63,99,1), Z_MASK,      POWER6,         { R, FRT, FRB, RMC } },
+{"stbu",        OP(39),         OP_MASK,     COM,       PPCVLE,         {RS, D, RAS}},
 
-{ "dcmpoq",  X(63,130),    X_MASK,      POWER6,         { BF,  FRA, FRB } },
+{"lhz",         OP(40),         OP_MASK,     COM,       PPCVLE,         {RT, D, RA0}},
 
-{ "mtfsfi",  XRC(63,134,0), XRA_MASK|(3<<21)|(1<<11), COM, { BF, U } },
-{ "mtfsfi.", XRC(63,134,1), XRA_MASK|(3<<21)|(1<<11), COM, { BF, U } },
+{"lhzu",        OP(41),         OP_MASK,     COM,       PPCVLE,         {RT, D, RAL}},
 
-{ "fnabs",   XRC(63,136,0), XRA_MASK,   COM,            { FRT, FRB } },
-{ "fnabs.",  XRC(63,136,1), XRA_MASK,   COM,            { FRT, FRB } },
+{"lha",         OP(42),         OP_MASK,     COM,       PPCVLE,         {RT, D, RA0}},
 
-{ "dtstexq", X(63,162),     X_MASK,     POWER6,         { BF,  FRA, FRB } },
-{ "dtstdcq", Z(63,194),     Z_MASK,     POWER6,         { BF,  FRA, DCM } },
-{ "dtstdgq", Z(63,226),     Z_MASK,     POWER6,         { BF,  FRA, DGM } },
+{"lhau",        OP(43),         OP_MASK,     COM,       PPCVLE,         {RT, D, RAL}},
 
-{ "drintnq", ZRC(63,227,0), Z_MASK,     POWER6,         { R, FRT, FRB, RMC } },
-{ "drintnq.",ZRC(63,227,1), Z_MASK,     POWER6,         { R, FRT, FRB, RMC } },
+{"sth",         OP(44),         OP_MASK,     COM,       PPCVLE,         {RS, D, RA0}},
 
-{ "dctqpq",  XRC(63,258,0), X_MASK,     POWER6,         { FRT, FRB } },
-{ "dctqpq.", XRC(63,258,1), X_MASK,     POWER6,         { FRT, FRB } },
+{"sthu",        OP(45),         OP_MASK,     COM,       PPCVLE,         {RS, D, RAS}},
 
-{ "fabs",    XRC(63,264,0), XRA_MASK,   COM,            { FRT, FRB } },
-{ "fabs.",   XRC(63,264,1), XRA_MASK,   COM,            { FRT, FRB } },
+{"lmw",         OP(46),         OP_MASK,     PPCCOM,    PPCVLE,         {RT, D, RAM}},
+{"lm",          OP(46),         OP_MASK,     PWRCOM,    PPCVLE,         {RT, D, RA0}},
 
-{ "dctfixq", XRC(63,290,0), X_MASK,     POWER6,         { FRT, FRB } },
-{ "dctfixq.",XRC(63,290,1), X_MASK,     POWER6,         { FRT, FRB } },
+{"stmw",        OP(47),         OP_MASK,     PPCCOM,    PPCVLE,         {RS, D, RA0}},
+{"stm",         OP(47),         OP_MASK,     PWRCOM,    PPCVLE,         {RS, D, RA0}},
 
-{ "ddedpdq", XRC(63,322,0), X_MASK,     POWER6,         { SP, FRT, FRB } },
-{ "ddedpdq.",XRC(63,322,1), X_MASK,     POWER6,         { SP, FRT, FRB } },
+{"lfs",         OP(48),         OP_MASK,     COM,       PPCEFS|PPCVLE,  {FRT, D, RA0}},
 
-{ "dxexq",   XRC(63,354,0), X_MASK,     POWER6,         { FRT, FRB } },
-{ "dxexq.",  XRC(63,354,1), X_MASK,     POWER6,         { FRT, FRB } },
+{"lfsu",        OP(49),         OP_MASK,     COM,       PPCEFS|PPCVLE,  {FRT, D, RAS}},
 
-{ "frin",    XRC(63,392,0), XRA_MASK,   POWER5,         { FRT, FRB } },
-{ "frin.",   XRC(63,392,1), XRA_MASK,   POWER5,         { FRT, FRB } },
-{ "friz",    XRC(63,424,0), XRA_MASK,   POWER5,         { FRT, FRB } },
-{ "friz.",   XRC(63,424,1), XRA_MASK,   POWER5,         { FRT, FRB } },
-{ "frip",    XRC(63,456,0), XRA_MASK,   POWER5,         { FRT, FRB } },
-{ "frip.",   XRC(63,456,1), XRA_MASK,   POWER5,         { FRT, FRB } },
-{ "frim",    XRC(63,488,0), XRA_MASK,   POWER5,         { FRT, FRB } },
-{ "frim.",   XRC(63,488,1), XRA_MASK,   POWER5,         { FRT, FRB } },
+{"lfd",         OP(50),         OP_MASK,     COM,       PPCEFS|PPCVLE,  {FRT, D, RA0}},
 
-{ "dsubq",   XRC(63,514,0), X_MASK,     POWER6,         { FRT, FRA, FRB } },
-{ "dsubq.",  XRC(63,514,1), X_MASK,     POWER6,         { FRT, FRA, FRB } },
+{"lfdu",        OP(51),         OP_MASK,     COM,       PPCEFS|PPCVLE,  {FRT, D, RAS}},
 
-{ "ddivq",   XRC(63,546,0), X_MASK,     POWER6,         { FRT, FRA, FRB } },
-{ "ddivq.",  XRC(63,546,1), X_MASK,     POWER6,         { FRT, FRA, FRB } },
+{"stfs",        OP(52),         OP_MASK,     COM,       PPCEFS|PPCVLE,  {FRS, D, RA0}},
 
-{ "mffs",    XRC(63,583,0), XRARB_MASK, COM,            { FRT } },
-{ "mffs.",   XRC(63,583,1), XRARB_MASK, COM,            { FRT } },
+{"stfsu",       OP(53),         OP_MASK,     COM,       PPCEFS|PPCVLE,  {FRS, D, RAS}},
 
-{ "dcmpuq",  X(63,642),     X_MASK,     POWER6,         { BF,  FRA, FRB } },
+{"stfd",        OP(54),         OP_MASK,     COM,       PPCEFS|PPCVLE,  {FRS, D, RA0}},
 
-{ "dtstsfq", X(63,674),     X_MASK,     POWER6,         { BF,  FRA, FRB } },
+{"stfdu",       OP(55),         OP_MASK,     COM,       PPCEFS|PPCVLE,  {FRS, D, RAS}},
 
-{ "mtfsf",   XFL(63,711,0), XFL_MASK,   COM,            { FLM, FRB } },
-{ "mtfsf.",  XFL(63,711,1), XFL_MASK,   COM,            { FLM, FRB } },
+{"lq",          OP(56),         OP_MASK,     POWER4,    PPC476|PPCVLE,  {RTQ, DQ, RAQ}},
+{"psq_l",       OP(56),         OP_MASK,     PPCPS,     PPCVLE,         {FRT,PSD,RA,PSW,PSQ}},
+{"lfq",         OP(56),         OP_MASK,     POWER2,    PPCVLE,         {FRT, D, RA0}},
 
-{ "drdpq",   XRC(63,770,0), X_MASK,     POWER6,         { FRT, FRB } },
-{ "drdpq.",  XRC(63,770,1), X_MASK,     POWER6,         { FRT, FRB } },
+{"lxsd",        DSO(57,2),      DS_MASK,     PPCVSX3,   PPCVLE,         {VD, DS, RA0}},
+{"lxssp",       DSO(57,3),      DS_MASK,     PPCVSX3,   PPCVLE,         {VD, DS, RA0}},
+{"lfdp",        OP(57),         OP_MASK,     POWER6,    POWER7|PPCVLE,  {FRTp, DS, RA0}},
+{"psq_lu",      OP(57),         OP_MASK,     PPCPS,     PPCVLE,         {FRT,PSD,RA,PSW,PSQ}},
+{"lfqu",        OP(57),         OP_MASK,     POWER2,    PPCVLE,         {FRT, D, RA0}},
 
-{ "dcffixq", XRC(63,802,0), X_MASK,     POWER6,         { FRT, FRB } },
-{ "dcffixq.",XRC(63,802,1), X_MASK,     POWER6,         { FRT, FRB } },
+{"ld",          DSO(58,0),      DS_MASK,     PPC64,     PPCVLE,         {RT, DS, RA0}},
+{"ldu",         DSO(58,1),      DS_MASK,     PPC64,     PPCVLE,         {RT, DS, RAL}},
+{"lwa",         DSO(58,2),      DS_MASK,     PPC64,     PPCVLE,         {RT, DS, RA0}},
 
-{ "fctid",   XRC(63,814,0), XRA_MASK,   PPC64,          { FRT, FRB } },
-{ "fctid.",  XRC(63,814,1), XRA_MASK,   PPC64,          { FRT, FRB } },
+{"dadd",        XRC(59,2,0),    X_MASK,      POWER6,    PPCVLE,         {FRT, FRA, FRB}},
+{"dadd.",       XRC(59,2,1),    X_MASK,      POWER6,    PPCVLE,         {FRT, FRA, FRB}},
 
-{ "fctidz",  XRC(63,815,0), XRA_MASK,   PPC64,          { FRT, FRB } },
-{ "fctidz.", XRC(63,815,1), XRA_MASK,   PPC64,          { FRT, FRB } },
+{"dqua",        ZRC(59,3,0),    Z2_MASK,     POWER6,    PPCVLE,         {FRT,FRA,FRB,RMC}},
+{"dqua.",       ZRC(59,3,1),    Z2_MASK,     POWER6,    PPCVLE,         {FRT,FRA,FRB,RMC}},
 
-{ "denbcdq", XRC(63,834,0), X_MASK,     POWER6,         { S, FRT, FRB } },
-{ "denbcdq.",XRC(63,834,1), X_MASK,     POWER6,         { S, FRT, FRB } },
+{"fdivs",       A(59,18,0),     AFRC_MASK,   PPC,       PPCEFS|PPCVLE,  {FRT, FRA, FRB}},
+{"fdivs.",      A(59,18,1),     AFRC_MASK,   PPC,       PPCEFS|PPCVLE,  {FRT, FRA, FRB}},
 
-{ "fcfid",   XRC(63,846,0), XRA_MASK,   PPC64,          { FRT, FRB } },
-{ "fcfid.",  XRC(63,846,1), XRA_MASK,   PPC64,          { FRT, FRB } },
+{"fsubs",       A(59,20,0),     AFRC_MASK,   PPC,       PPCEFS|PPCVLE,  {FRT, FRA, FRB}},
+{"fsubs.",      A(59,20,1),     AFRC_MASK,   PPC,       PPCEFS|PPCVLE,  {FRT, FRA, FRB}},
 
-{ "diexq",   XRC(63,866,0), X_MASK,     POWER6,         { FRT, FRA, FRB } },
-{ "diexq.",  XRC(63,866,1), X_MASK,     POWER6,         { FRT, FRA, FRB } },
+{"fadds",       A(59,21,0),     AFRC_MASK,   PPC,       PPCEFS|PPCVLE,  {FRT, FRA, FRB}},
+{"fadds.",      A(59,21,1),     AFRC_MASK,   PPC,       PPCEFS|PPCVLE,  {FRT, FRA, FRB}},
 
+{"fsqrts",      A(59,22,0),    AFRAFRC_MASK, PPC,       TITAN|PPCVLE,   {FRT, FRB}},
+{"fsqrts.",     A(59,22,1),    AFRAFRC_MASK, PPC,       TITAN|PPCVLE,   {FRT, FRB}},
+
+{"fres",        A(59,24,0),   AFRAFRC_MASK,  POWER7,    PPCVLE,         {FRT, FRB}},
+{"fres",        A(59,24,0),   AFRALFRC_MASK, PPC,       POWER7|PPCVLE,  {FRT, FRB, A_L}},
+{"fres.",       A(59,24,1),   AFRAFRC_MASK,  POWER7,    PPCVLE,         {FRT, FRB}},
+{"fres.",       A(59,24,1),   AFRALFRC_MASK, PPC,       POWER7|PPCVLE,  {FRT, FRB, A_L}},
+
+{"fmuls",       A(59,25,0),     AFRB_MASK,   PPC,       PPCEFS|PPCVLE,  {FRT, FRA, FRC}},
+{"fmuls.",      A(59,25,1),     AFRB_MASK,   PPC,       PPCEFS|PPCVLE,  {FRT, FRA, FRC}},
+
+{"frsqrtes",    A(59,26,0),   AFRAFRC_MASK,  POWER7,    PPCVLE,         {FRT, FRB}},
+{"frsqrtes",    A(59,26,0),   AFRALFRC_MASK, POWER5,    POWER7|PPCVLE,  {FRT, FRB, A_L}},
+{"frsqrtes.",   A(59,26,1),   AFRAFRC_MASK,  POWER7,    PPCVLE,         {FRT, FRB}},
+{"frsqrtes.",   A(59,26,1),   AFRALFRC_MASK, POWER5,    POWER7|PPCVLE,  {FRT, FRB, A_L}},
+
+{"fmsubs",      A(59,28,0),     A_MASK,      PPC,       PPCEFS|PPCVLE,  {FRT, FRA, FRC, FRB}},
+{"fmsubs.",     A(59,28,1),     A_MASK,      PPC,       PPCEFS|PPCVLE,  {FRT, FRA, FRC, FRB}},
+
+{"fmadds",      A(59,29,0),     A_MASK,      PPC,       PPCEFS|PPCVLE,  {FRT, FRA, FRC, FRB}},
+{"fmadds.",     A(59,29,1),     A_MASK,      PPC,       PPCEFS|PPCVLE,  {FRT, FRA, FRC, FRB}},
+
+{"fnmsubs",     A(59,30,0),     A_MASK,      PPC,       PPCEFS|PPCVLE,  {FRT, FRA, FRC, FRB}},
+{"fnmsubs.",    A(59,30,1),     A_MASK,      PPC,       PPCEFS|PPCVLE,  {FRT, FRA, FRC, FRB}},
+
+{"fnmadds",     A(59,31,0),     A_MASK,      PPC,       PPCEFS|PPCVLE,  {FRT, FRA, FRC, FRB}},
+{"fnmadds.",    A(59,31,1),     A_MASK,      PPC,       PPCEFS|PPCVLE,  {FRT, FRA, FRC, FRB}},
+
+{"dmul",        XRC(59,34,0),   X_MASK,      POWER6,    PPCVLE,         {FRT, FRA, FRB}},
+{"dmul.",       XRC(59,34,1),   X_MASK,      POWER6,    PPCVLE,         {FRT, FRA, FRB}},
+
+{"drrnd",       ZRC(59,35,0),   Z2_MASK,     POWER6,    PPCVLE,         {FRT, FRA, FRB, RMC}},
+{"drrnd.",      ZRC(59,35,1),   Z2_MASK,     POWER6,    PPCVLE,         {FRT, FRA, FRB, RMC}},
+
+{"dscli",       ZRC(59,66,0),   Z_MASK,      POWER6,    PPCVLE,         {FRT, FRA, SH16}},
+{"dscli.",      ZRC(59,66,1),   Z_MASK,      POWER6,    PPCVLE,         {FRT, FRA, SH16}},
+
+{"dquai",       ZRC(59,67,0),   Z2_MASK,     POWER6,    PPCVLE,         {TE, FRT,FRB,RMC}},
+{"dquai.",      ZRC(59,67,1),   Z2_MASK,     POWER6,    PPCVLE,         {TE, FRT,FRB,RMC}},
+
+{"dscri",       ZRC(59,98,0),   Z_MASK,      POWER6,    PPCVLE,         {FRT, FRA, SH16}},
+{"dscri.",      ZRC(59,98,1),   Z_MASK,      POWER6,    PPCVLE,         {FRT, FRA, SH16}},
+
+{"drintx",      ZRC(59,99,0),   Z2_MASK,     POWER6,    PPCVLE,         {R, FRT, FRB, RMC}},
+{"drintx.",     ZRC(59,99,1),   Z2_MASK,     POWER6,    PPCVLE,         {R, FRT, FRB, RMC}},
+
+{"dcmpo",       X(59,130),      X_MASK,      POWER6,    PPCVLE,         {BF,  FRA, FRB}},
+
+{"dtstex",      X(59,162),      X_MASK,      POWER6,    PPCVLE,         {BF,  FRA, FRB}},
+{"dtstdc",      Z(59,194),      Z_MASK,      POWER6,    PPCVLE,         {BF,  FRA, DCM}},
+{"dtstdg",      Z(59,226),      Z_MASK,      POWER6,    PPCVLE,         {BF,  FRA, DGM}},
+
+{"drintn",      ZRC(59,227,0),  Z2_MASK,     POWER6,    PPCVLE,         {R, FRT, FRB, RMC}},
+{"drintn.",     ZRC(59,227,1),  Z2_MASK,     POWER6,    PPCVLE,         {R, FRT, FRB, RMC}},
+
+{"dctdp",       XRC(59,258,0),  X_MASK,      POWER6,    PPCVLE,         {FRT, FRB}},
+{"dctdp.",      XRC(59,258,1),  X_MASK,      POWER6,    PPCVLE,         {FRT, FRB}},
+
+{"dctfix",      XRC(59,290,0),  X_MASK,      POWER6,    PPCVLE,         {FRT, FRB}},
+{"dctfix.",     XRC(59,290,1),  X_MASK,      POWER6,    PPCVLE,         {FRT, FRB}},
+
+{"ddedpd",      XRC(59,322,0),  X_MASK,      POWER6,    PPCVLE,         {SP, FRT, FRB}},
+{"ddedpd.",     XRC(59,322,1),  X_MASK,      POWER6,    PPCVLE,         {SP, FRT, FRB}},
+
+{"dxex",        XRC(59,354,0),  X_MASK,      POWER6,    PPCVLE,         {FRT, FRB}},
+{"dxex.",       XRC(59,354,1),  X_MASK,      POWER6,    PPCVLE,         {FRT, FRB}},
+
+{"dsub",        XRC(59,514,0),  X_MASK,      POWER6,    PPCVLE,         {FRT, FRA, FRB}},
+{"dsub.",       XRC(59,514,1),  X_MASK,      POWER6,    PPCVLE,         {FRT, FRA, FRB}},
+
+{"ddiv",        XRC(59,546,0),  X_MASK,      POWER6,    PPCVLE,         {FRT, FRA, FRB}},
+{"ddiv.",       XRC(59,546,1),  X_MASK,      POWER6,    PPCVLE,         {FRT, FRA, FRB}},
+
+{"dcmpu",       X(59,642),      X_MASK,      POWER6,    PPCVLE,         {BF,  FRA, FRB}},
+
+{"dtstsf",      X(59,674),      X_MASK,      POWER6,    PPCVLE,         {BF,  FRA, FRB}},
+{"dtstsfi",     X(59,675),      X_MASK|1<<22,POWER9,    PPCVLE,         {BF, UIM6, FRB}},
+
+{"drsp",        XRC(59,770,0),  X_MASK,      POWER6,    PPCVLE,         {FRT, FRB}},
+{"drsp.",       XRC(59,770,1),  X_MASK,      POWER6,    PPCVLE,         {FRT, FRB}},
+
+{"dcffix",      XRC(59,802,0), X_MASK|FRA_MASK, POWER7, PPCVLE,         {FRT, FRB}},
+{"dcffix.",     XRC(59,802,1), X_MASK|FRA_MASK, POWER7, PPCVLE,         {FRT, FRB}},
+
+{"denbcd",      XRC(59,834,0),  X_MASK,      POWER6,    PPCVLE,         {S, FRT, FRB}},
+{"denbcd.",     XRC(59,834,1),  X_MASK,      POWER6,    PPCVLE,         {S, FRT, FRB}},
+
+{"fcfids",      XRC(59,846,0),  XRA_MASK, POWER7|PPCA2, PPCVLE,         {FRT, FRB}},
+{"fcfids.",     XRC(59,846,1),  XRA_MASK, POWER7|PPCA2, PPCVLE,         {FRT, FRB}},
+
+{"diex",        XRC(59,866,0),  X_MASK,      POWER6,    PPCVLE,         {FRT, FRA, FRB}},
+{"diex.",       XRC(59,866,1),  X_MASK,      POWER6,    PPCVLE,         {FRT, FRA, FRB}},
+
+{"fcfidus",     XRC(59,974,0),  XRA_MASK, POWER7|PPCA2, PPCVLE,         {FRT, FRB}},
+{"fcfidus.",    XRC(59,974,1),  XRA_MASK, POWER7|PPCA2, PPCVLE,         {FRT, FRB}},
+
+{"xsaddsp",     XX3(60,0),      XX3_MASK,    PPCVSX2,   PPCVLE,         {XT6, XA6, XB6}},
+{"xsmaddasp",   XX3(60,1),      XX3_MASK,    PPCVSX2,   PPCVLE,         {XT6, XA6, XB6}},
+{"xxsldwi",     XX3(60,2),      XX3SHW_MASK, PPCVSX,    PPCVLE,         {XT6, XA6, XB6, SHW}},
+{"xscmpeqdp",   XX3(60,3),      XX3_MASK,    PPCVSX3,   PPCVLE,         {XT6, XA6, XB6}},
+{"xsrsqrtesp",  XX2(60,10),     XX2_MASK,    PPCVSX2,   PPCVLE,         {XT6, XB6}},
+{"xssqrtsp",    XX2(60,11),     XX2_MASK,    PPCVSX2,   PPCVLE,         {XT6, XB6}},
+{"xxsel",       XX4(60,3),      XX4_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6, XC6}},
+{"xssubsp",     XX3(60,8),      XX3_MASK,    PPCVSX2,   PPCVLE,         {XT6, XA6, XB6}},
+{"xsmaddmsp",   XX3(60,9),      XX3_MASK,    PPCVSX2,   PPCVLE,         {XT6, XA6, XB6}},
+{"xxspltd",     XX3(60,10),     XX3DM_MASK,  PPCVSX,    PPCVLE,         {XT6, XA6, XB6S, DMEX}},
+{"xxmrghd",     XX3(60,10),     XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xxswapd",     XX3(60,10)|(2<<8), XX3_MASK, PPCVSX,    PPCVLE,         {XT6, XA6, XB6S}},
+{"xxmrgld",     XX3(60,10)|(3<<8), XX3_MASK, PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xxpermdi",    XX3(60,10),     XX3DM_MASK,  PPCVSX,    PPCVLE,         {XT6, XA6, XB6, DM}},
+{"xscmpgtdp",   XX3(60,11),     XX3_MASK,    PPCVSX3,   PPCVLE,         {XT6, XA6, XB6}},
+{"xsresp",      XX2(60,26),     XX2_MASK,    PPCVSX2,   PPCVLE,         {XT6, XB6}},
+{"xsmulsp",     XX3(60,16),     XX3_MASK,    PPCVSX2,   PPCVLE,         {XT6, XA6, XB6}},
+{"xsmsubasp",   XX3(60,17),     XX3_MASK,    PPCVSX2,   PPCVLE,         {XT6, XA6, XB6}},
+{"xxmrghw",     XX3(60,18),     XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xscmpgedp",   XX3(60,19),     XX3_MASK,    PPCVSX3,   PPCVLE,         {XT6, XA6, XB6}},
+{"xsdivsp",     XX3(60,24),     XX3_MASK,    PPCVSX2,   PPCVLE,         {XT6, XA6, XB6}},
+{"xsmsubmsp",   XX3(60,25),     XX3_MASK,    PPCVSX2,   PPCVLE,         {XT6, XA6, XB6}},
+{"xxperm",      XX3(60,26),     XX3_MASK,    PPCVSX3,   PPCVLE,         {XT6, XA6, XB6}},
+{"xsadddp",     XX3(60,32),     XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xsmaddadp",   XX3(60,33),     XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xscmpudp",    XX3(60,35),     XX3BF_MASK,  PPCVSX,    PPCVLE,         {BF, XA6, XB6}},
+{"xscvdpuxws",  XX2(60,72),     XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xsrdpi",      XX2(60,73),     XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xsrsqrtedp",  XX2(60,74),     XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xssqrtdp",    XX2(60,75),     XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xssubdp",     XX3(60,40),     XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xsmaddmdp",   XX3(60,41),     XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xscmpodp",    XX3(60,43),     XX3BF_MASK,  PPCVSX,    PPCVLE,         {BF, XA6, XB6}},
+{"xscvdpsxws",  XX2(60,88),     XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xsrdpiz",     XX2(60,89),     XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xsredp",      XX2(60,90),     XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xsmuldp",     XX3(60,48),     XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xsmsubadp",   XX3(60,49),     XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xxmrglw",     XX3(60,50),     XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xsrdpip",     XX2(60,105),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xstsqrtdp",   XX2(60,106),    XX2BF_MASK,  PPCVSX,    PPCVLE,         {BF, XB6}},
+{"xsrdpic",     XX2(60,107),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xsdivdp",     XX3(60,56),     XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xsmsubmdp",   XX3(60,57),     XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xxpermr",     XX3(60,58),     XX3_MASK,    PPCVSX3,   PPCVLE,         {XT6, XA6, XB6}},
+{"xscmpexpdp",  XX3(60,59),     XX3BF_MASK,  PPCVSX3,   PPCVLE,         {BF, XA6, XB6}},
+{"xsrdpim",     XX2(60,121),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xstdivdp",    XX3(60,61),     XX3BF_MASK,  PPCVSX,    PPCVLE,         {BF, XA6, XB6}},
+{"xvaddsp",     XX3(60,64),     XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xvmaddasp",   XX3(60,65),     XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xvcmpeqsp",   XX3RC(60,67,0), XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xvcmpeqsp.",  XX3RC(60,67,1), XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xvcvspuxws",  XX2(60,136),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xvrspi",      XX2(60,137),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xvrsqrtesp",  XX2(60,138),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xvsqrtsp",    XX2(60,139),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xvsubsp",     XX3(60,72),     XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xvmaddmsp",   XX3(60,73),     XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xvcmpgtsp",   XX3RC(60,75,0), XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xvcmpgtsp.",  XX3RC(60,75,1), XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xvcvspsxws",  XX2(60,152),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xvrspiz",     XX2(60,153),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xvresp",      XX2(60,154),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xvmulsp",     XX3(60,80),     XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xvmsubasp",   XX3(60,81),     XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xxspltw",     XX2(60,164),    XX2UIM_MASK, PPCVSX,    PPCVLE,         {XT6, XB6, UIM}},
+{"xxextractuw", XX2(60,165),   XX2UIM4_MASK, PPCVSX3,   PPCVLE,         {XT6, XB6, UIMM4}},
+{"xvcmpgesp",   XX3RC(60,83,0), XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xvcmpgesp.",  XX3RC(60,83,1), XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xvcvuxwsp",   XX2(60,168),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xvrspip",     XX2(60,169),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xvtsqrtsp",   XX2(60,170),    XX2BF_MASK,  PPCVSX,    PPCVLE,         {BF, XB6}},
+{"xvrspic",     XX2(60,171),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xvdivsp",     XX3(60,88),     XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xvmsubmsp",   XX3(60,89),     XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xxspltib",    X(60,360),   XX1_MASK|3<<19, PPCVSX3,   PPCVLE,         {XT6, IMM8}},
+{"xxinsertw",   XX2(60,181),   XX2UIM4_MASK, PPCVSX3,   PPCVLE,         {XT6, XB6, UIMM4}},
+{"xvcvsxwsp",   XX2(60,184),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xvrspim",     XX2(60,185),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xvtdivsp",    XX3(60,93),     XX3BF_MASK,  PPCVSX,    PPCVLE,         {BF, XA6, XB6}},
+{"xvadddp",     XX3(60,96),     XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xvmaddadp",   XX3(60,97),     XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xvcmpeqdp",   XX3RC(60,99,0), XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xvcmpeqdp.",  XX3RC(60,99,1), XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xvcvdpuxws",  XX2(60,200),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xvrdpi",      XX2(60,201),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xvrsqrtedp",  XX2(60,202),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xvsqrtdp",    XX2(60,203),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xvsubdp",     XX3(60,104),    XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xvmaddmdp",   XX3(60,105),    XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xvcmpgtdp",   XX3RC(60,107,0), XX3_MASK,   PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xvcmpgtdp.",  XX3RC(60,107,1), XX3_MASK,   PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xvcvdpsxws",  XX2(60,216),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xvrdpiz",     XX2(60,217),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xvredp",      XX2(60,218),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xvmuldp",     XX3(60,112),    XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xvmsubadp",   XX3(60,113),    XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xvcmpgedp",   XX3RC(60,115,0), XX3_MASK,   PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xvcmpgedp.",  XX3RC(60,115,1), XX3_MASK,   PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xvcvuxwdp",   XX2(60,232),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xvrdpip",     XX2(60,233),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xvtsqrtdp",   XX2(60,234),    XX2BF_MASK,  PPCVSX,    PPCVLE,         {BF, XB6}},
+{"xvrdpic",     XX2(60,235),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xvdivdp",     XX3(60,120),    XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xvmsubmdp",   XX3(60,121),    XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xvcvsxwdp",   XX2(60,248),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xvrdpim",     XX2(60,249),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xvtdivdp",    XX3(60,125),    XX3BF_MASK,  PPCVSX,    PPCVLE,         {BF, XA6, XB6}},
+{"xsmaxcdp",    XX3(60,128),    XX3_MASK,    PPCVSX3,   PPCVLE,         {XT6, XA6, XB6}},
+{"xsnmaddasp",  XX3(60,129),    XX3_MASK,    PPCVSX2,   PPCVLE,         {XT6, XA6, XB6}},
+{"xxland",      XX3(60,130),    XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xscvdpsp",    XX2(60,265),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xscvdpspn",   XX2(60,267),    XX2_MASK,    PPCVSX2,   PPCVLE,         {XT6, XB6}},
+{"xsmincdp",    XX3(60,136),    XX3_MASK,    PPCVSX3,   PPCVLE,         {XT6, XA6, XB6}},
+{"xsnmaddmsp",  XX3(60,137),    XX3_MASK,    PPCVSX2,   PPCVLE,         {XT6, XA6, XB6}},
+{"xxlandc",     XX3(60,138),    XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xsrsp",       XX2(60,281),    XX2_MASK,    PPCVSX2,   PPCVLE,         {XT6, XB6}},
+{"xsmaxjdp",    XX3(60,144),    XX3_MASK,    PPCVSX3,   PPCVLE,         {XT6, XA6, XB6}},
+{"xsnmsubasp",  XX3(60,145),    XX3_MASK,    PPCVSX2,   PPCVLE,         {XT6, XA6, XB6}},
+{"xxlor",       XX3(60,146),    XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xscvuxdsp",   XX2(60,296),    XX2_MASK,    PPCVSX2,   PPCVLE,         {XT6, XB6}},
+{"xststdcsp",   XX2(60,298),    XX2BFD_MASK, PPCVSX3,   PPCVLE,         {BF, XB6, DCMX}},
+{"xsminjdp",    XX3(60,152),    XX3_MASK,    PPCVSX3,   PPCVLE,         {XT6, XA6, XB6}},
+{"xsnmsubmsp",  XX3(60,153),    XX3_MASK,    PPCVSX2,   PPCVLE,         {XT6, XA6, XB6}},
+{"xxlxor",      XX3(60,154),    XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xscvsxdsp",   XX2(60,312),    XX2_MASK,    PPCVSX2,   PPCVLE,         {XT6, XB6}},
+{"xsmaxdp",     XX3(60,160),    XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xsnmaddadp",  XX3(60,161),    XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xxlnor",      XX3(60,162),    XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xscvdpuxds",  XX2(60,328),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xscvspdp",    XX2(60,329),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xscvspdpn",   XX2(60,331),    XX2_MASK,    PPCVSX2,   PPCVLE,         {XT6, XB6}},
+{"xsmindp",     XX3(60,168),    XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xsnmaddmdp",  XX3(60,169),    XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xxlorc",      XX3(60,170),    XX3_MASK,    PPCVSX2,   PPCVLE,         {XT6, XA6, XB6}},
+{"xscvdpsxds",  XX2(60,344),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xsabsdp",     XX2(60,345),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xsxexpdp",    XX2VA(60,347,0),XX2_MASK|1,  PPCVSX3,   PPCVLE,         {RT, XB6}},
+{"xsxsigdp",    XX2VA(60,347,1),XX2_MASK|1,  PPCVSX3,   PPCVLE,         {RT, XB6}},
+{"xscvhpdp",    XX2VA(60,347,16),XX2_MASK,   PPCVSX3,   PPCVLE,         {XT6, XB6}},
+{"xscvdphp",    XX2VA(60,347,17),XX2_MASK,   PPCVSX3,   PPCVLE,         {XT6, XB6}},
+{"xscpsgndp",   XX3(60,176),    XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xsnmsubadp",  XX3(60,177),    XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xxlnand",     XX3(60,178),    XX3_MASK,    PPCVSX2,   PPCVLE,         {XT6, XA6, XB6}},
+{"xscvuxddp",   XX2(60,360),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xsnabsdp",    XX2(60,361),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xststdcdp",   XX2(60,362),    XX2BFD_MASK, PPCVSX3,   PPCVLE,         {BF, XB6, DCMX}},
+{"xsnmsubmdp",  XX3(60,185),    XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xxleqv",      XX3(60,186),    XX3_MASK,    PPCVSX2,   PPCVLE,         {XT6, XA6, XB6}},
+{"xscvsxddp",   XX2(60,376),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xsnegdp",     XX2(60,377),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xvmaxsp",     XX3(60,192),    XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xvnmaddasp",  XX3(60,193),    XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xvcvspuxds",  XX2(60,392),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xvcvdpsp",    XX2(60,393),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xvminsp",     XX3(60,200),    XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xvnmaddmsp",  XX3(60,201),    XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xvcvspsxds",  XX2(60,408),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xvabssp",     XX2(60,409),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xvmovsp",     XX3(60,208),    XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6S}},
+{"xvcpsgnsp",   XX3(60,208),    XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xvnmsubasp",  XX3(60,209),    XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xvcvuxdsp",   XX2(60,424),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xvnabssp",    XX2(60,425),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xvtstdcsp",   XX2(60,426),  XX2DCMXS_MASK, PPCVSX3,   PPCVLE,         {XT6, XB6, DCMXS}},
+{"xviexpsp",    XX3(60,216),    XX3_MASK,    PPCVSX3,   PPCVLE,         {XT6, XA6, XB6}},
+{"xvnmsubmsp",  XX3(60,217),    XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xvcvsxdsp",   XX2(60,440),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xvnegsp",     XX2(60,441),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xvmaxdp",     XX3(60,224),    XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xvnmaddadp",  XX3(60,225),    XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xvcvdpuxds",  XX2(60,456),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xvcvspdp",    XX2(60,457),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xsiexpdp",    X(60,918),      XX1_MASK,    PPCVSX3,   PPCVLE,         {XT6, RA, RB}},
+{"xvmindp",     XX3(60,232),    XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xvnmaddmdp",  XX3(60,233),    XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xvcvdpsxds",  XX2(60,472),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xvabsdp",     XX2(60,473),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xvxexpdp",    XX2VA(60,475,0),XX2_MASK,    PPCVSX3,   PPCVLE,         {XT6, XB6}},
+{"xvxsigdp",    XX2VA(60,475,1),XX2_MASK,    PPCVSX3,   PPCVLE,         {XT6, XB6}},
+{"xxbrh",       XX2VA(60,475,7),XX2_MASK,    PPCVSX3,   PPCVLE,         {XT6, XB6}},
+{"xvxexpsp",    XX2VA(60,475,8),XX2_MASK,    PPCVSX3,   PPCVLE,         {XT6, XB6}},
+{"xvxsigsp",    XX2VA(60,475,9),XX2_MASK,    PPCVSX3,   PPCVLE,         {XT6, XB6}},
+{"xxbrw",       XX2VA(60,475,15),XX2_MASK,   PPCVSX3,   PPCVLE,         {XT6, XB6}},
+{"xxbrd",       XX2VA(60,475,23),XX2_MASK,   PPCVSX3,   PPCVLE,         {XT6, XB6}},
+{"xvcvhpsp",    XX2VA(60,475,24),XX2_MASK,   PPCVSX3,   PPCVLE,         {XT6, XB6}},
+{"xvcvsphp",    XX2VA(60,475,25),XX2_MASK,   PPCVSX3,   PPCVLE,         {XT6, XB6}},
+{"xxbrq",       XX2VA(60,475,31),XX2_MASK,   PPCVSX3,   PPCVLE,         {XT6, XB6}},
+{"xvmovdp",     XX3(60,240),    XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6S}},
+{"xvcpsgndp",   XX3(60,240),    XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xvnmsubadp",  XX3(60,241),    XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xvcvuxddp",   XX2(60,488),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xvnabsdp",    XX2(60,489),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xvtstdcdp",   XX2(60,490),  XX2DCMXS_MASK, PPCVSX3,   PPCVLE,         {XT6, XB6, DCMXS}},
+{"xviexpdp",    XX3(60,248),    XX3_MASK,    PPCVSX3,   PPCVLE,         {XT6, XA6, XB6}},
+{"xvnmsubmdp",  XX3(60,249),    XX3_MASK,    PPCVSX,    PPCVLE,         {XT6, XA6, XB6}},
+{"xvcvsxddp",   XX2(60,504),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+{"xvnegdp",     XX2(60,505),    XX2_MASK,    PPCVSX,    PPCVLE,         {XT6, XB6}},
+
+{"psq_st",      OP(60),         OP_MASK,     PPCPS,     PPCVLE,         {FRS,PSD,RA,PSW,PSQ}},
+{"stfq",        OP(60),         OP_MASK,     POWER2,    PPCVLE,         {FRS, D, RA}},
+
+{"lxv",         DQX(61,1),      DQX_MASK,    PPCVSX3,   PPCVLE,         {XTQ6, DQ, RA0}},
+{"stxv",        DQX(61,5),      DQX_MASK,    PPCVSX3,   PPCVLE,         {XSQ6, DQ, RA0}},
+{"stxsd",       DSO(61,2),      DS_MASK,     PPCVSX3,   PPCVLE,         {VS, DS, RA0}},
+{"stxssp",      DSO(61,3),      DS_MASK,     PPCVSX3,   PPCVLE,         {VS, DS, RA0}},
+{"stfdp",       OP(61),         OP_MASK,     POWER6,    POWER7|PPCVLE,  {FRSp, DS, RA0}},
+{"psq_stu",     OP(61),         OP_MASK,     PPCPS,     PPCVLE,         {FRS,PSD,RA,PSW,PSQ}},
+{"stfqu",       OP(61),         OP_MASK,     POWER2,    PPCVLE,         {FRS, D, RA}},
+
+{"std",         DSO(62,0),      DS_MASK,     PPC64,     PPCVLE,         {RS, DS, RA0}},
+{"stdu",        DSO(62,1),      DS_MASK,     PPC64,     PPCVLE,         {RS, DS, RAS}},
+{"stq",         DSO(62,2),      DS_MASK,     POWER4,    PPC476|PPCVLE,  {RSQ, DS, RA0}},
+
+{"fcmpu",       X(63,0),        XBF_MASK,    COM,       PPCEFS|PPCVLE,  {BF, FRA, FRB}},
+
+{"daddq",       XRC(63,2,0),    X_MASK,      POWER6,    PPCVLE,         {FRTp, FRAp, FRBp}},
+{"daddq.",      XRC(63,2,1),    X_MASK,      POWER6,    PPCVLE,         {FRTp, FRAp, FRBp}},
+
+{"dquaq",       ZRC(63,3,0),    Z2_MASK,     POWER6,    PPCVLE,         {FRTp, FRAp, FRBp, RMC}},
+{"dquaq.",      ZRC(63,3,1),    Z2_MASK,     POWER6,    PPCVLE,         {FRTp, FRAp, FRBp, RMC}},
+
+{"xsaddqp",     XRC(63,4,0),    X_MASK,      PPCVSX3,   PPCVLE,         {VD, VA, VB}},
+{"xsaddqpo",    XRC(63,4,1),    X_MASK,      PPCVSX3,   PPCVLE,         {VD, VA, VB}},
+
+{"xsrqpi",      ZRC(63,5,0),    Z2_MASK,     PPCVSX3,   PPCVLE,         {R, VD, VB, RMC}},
+{"xsrqpix",     ZRC(63,5,1),    Z2_MASK,     PPCVSX3,   PPCVLE,         {R, VD, VB, RMC}},
+
+{"fcpsgn",      XRC(63,8,0),    X_MASK, POWER6|PPCA2|PPC476, PPCVLE,    {FRT, FRA, FRB}},
+{"fcpsgn.",     XRC(63,8,1),    X_MASK, POWER6|PPCA2|PPC476, PPCVLE,    {FRT, FRA, FRB}},
+
+{"frsp",        XRC(63,12,0),   XRA_MASK,    COM,       PPCEFS|PPCVLE,  {FRT, FRB}},
+{"frsp.",       XRC(63,12,1),   XRA_MASK,    COM,       PPCEFS|PPCVLE,  {FRT, FRB}},
+
+{"fctiw",       XRC(63,14,0),   XRA_MASK,    PPCCOM,    PPCEFS|PPCVLE,  {FRT, FRB}},
+{"fcir",        XRC(63,14,0),   XRA_MASK,    PWR2COM,   PPCVLE,         {FRT, FRB}},
+{"fctiw.",      XRC(63,14,1),   XRA_MASK,    PPCCOM,    PPCEFS|PPCVLE,  {FRT, FRB}},
+{"fcir.",       XRC(63,14,1),   XRA_MASK,    PWR2COM,   PPCVLE,         {FRT, FRB}},
+
+{"fctiwz",      XRC(63,15,0),   XRA_MASK,    PPCCOM,    PPCEFS|PPCVLE,  {FRT, FRB}},
+{"fcirz",       XRC(63,15,0),   XRA_MASK,    PWR2COM,   PPCVLE,         {FRT, FRB}},
+{"fctiwz.",     XRC(63,15,1),   XRA_MASK,    PPCCOM,    PPCEFS|PPCVLE,  {FRT, FRB}},
+{"fcirz.",      XRC(63,15,1),   XRA_MASK,    PWR2COM,   PPCVLE,         {FRT, FRB}},
+
+{"fdiv",        A(63,18,0),     AFRC_MASK,   PPCCOM,    PPCEFS|PPCVLE,  {FRT, FRA, FRB}},
+{"fd",          A(63,18,0),     AFRC_MASK,   PWRCOM,    PPCVLE,         {FRT, FRA, FRB}},
+{"fdiv.",       A(63,18,1),     AFRC_MASK,   PPCCOM,    PPCEFS|PPCVLE,  {FRT, FRA, FRB}},
+{"fd.",         A(63,18,1),     AFRC_MASK,   PWRCOM,    PPCVLE,         {FRT, FRA, FRB}},
+
+{"fsub",        A(63,20,0),     AFRC_MASK,   PPCCOM,    PPCEFS|PPCVLE,  {FRT, FRA, FRB}},
+{"fs",          A(63,20,0),     AFRC_MASK,   PWRCOM,    PPCVLE,         {FRT, FRA, FRB}},
+{"fsub.",       A(63,20,1),     AFRC_MASK,   PPCCOM,    PPCEFS|PPCVLE,  {FRT, FRA, FRB}},
+{"fs.",         A(63,20,1),     AFRC_MASK,   PWRCOM,    PPCVLE,         {FRT, FRA, FRB}},
+
+{"fadd",        A(63,21,0),     AFRC_MASK,   PPCCOM,    PPCEFS|PPCVLE,  {FRT, FRA, FRB}},
+{"fa",          A(63,21,0),     AFRC_MASK,   PWRCOM,    PPCVLE,         {FRT, FRA, FRB}},
+{"fadd.",       A(63,21,1),     AFRC_MASK,   PPCCOM,    PPCEFS|PPCVLE,  {FRT, FRA, FRB}},
+{"fa.",         A(63,21,1),     AFRC_MASK,   PWRCOM,    PPCVLE,         {FRT, FRA, FRB}},
+
+{"fsqrt",       A(63,22,0),    AFRAFRC_MASK, PPCPWR2,   TITAN|PPCVLE,   {FRT, FRB}},
+{"fsqrt.",      A(63,22,1),    AFRAFRC_MASK, PPCPWR2,   TITAN|PPCVLE,   {FRT, FRB}},
+
+{"fsel",        A(63,23,0),     A_MASK,      PPC,       PPCEFS|PPCVLE,  {FRT, FRA, FRC, FRB}},
+{"fsel.",       A(63,23,1),     A_MASK,      PPC,       PPCEFS|PPCVLE,  {FRT, FRA, FRC, FRB}},
+
+{"fre",         A(63,24,0),   AFRAFRC_MASK,  POWER7,    PPCVLE,         {FRT, FRB}},
+{"fre",         A(63,24,0),   AFRALFRC_MASK, POWER5,    POWER7|PPCVLE,  {FRT, FRB, A_L}},
+{"fre.",        A(63,24,1),   AFRAFRC_MASK,  POWER7,    PPCVLE,         {FRT, FRB}},
+{"fre.",        A(63,24,1),   AFRALFRC_MASK, POWER5,    POWER7|PPCVLE,  {FRT, FRB, A_L}},
+
+{"fmul",        A(63,25,0),     AFRB_MASK,   PPCCOM,    PPCEFS|PPCVLE,  {FRT, FRA, FRC}},
+{"fm",          A(63,25,0),     AFRB_MASK,   PWRCOM,    PPCVLE|PPCVLE,  {FRT, FRA, FRC}},
+{"fmul.",       A(63,25,1),     AFRB_MASK,   PPCCOM,    PPCEFS|PPCVLE,  {FRT, FRA, FRC}},
+{"fm.",         A(63,25,1),     AFRB_MASK,   PWRCOM,    PPCVLE|PPCVLE,  {FRT, FRA, FRC}},
+
+{"frsqrte",     A(63,26,0),   AFRAFRC_MASK,  POWER7,    PPCVLE,         {FRT, FRB}},
+{"frsqrte",     A(63,26,0),   AFRALFRC_MASK, PPC,       POWER7|PPCVLE,  {FRT, FRB, A_L}},
+{"frsqrte.",    A(63,26,1),   AFRAFRC_MASK,  POWER7,    PPCVLE,         {FRT, FRB}},
+{"frsqrte.",    A(63,26,1),   AFRALFRC_MASK, PPC,       POWER7|PPCVLE,  {FRT, FRB, A_L}},
+
+{"fmsub",       A(63,28,0),     A_MASK,      PPCCOM,    PPCEFS|PPCVLE,  {FRT, FRA, FRC, FRB}},
+{"fms",         A(63,28,0),     A_MASK,      PWRCOM,    PPCVLE,         {FRT, FRA, FRC, FRB}},
+{"fmsub.",      A(63,28,1),     A_MASK,      PPCCOM,    PPCEFS|PPCVLE,  {FRT, FRA, FRC, FRB}},
+{"fms.",        A(63,28,1),     A_MASK,      PWRCOM,    PPCVLE,         {FRT, FRA, FRC, FRB}},
+
+{"fmadd",       A(63,29,0),     A_MASK,      PPCCOM,    PPCEFS|PPCVLE,  {FRT, FRA, FRC, FRB}},
+{"fma",         A(63,29,0),     A_MASK,      PWRCOM,    PPCVLE,         {FRT, FRA, FRC, FRB}},
+{"fmadd.",      A(63,29,1),     A_MASK,      PPCCOM,    PPCEFS|PPCVLE,  {FRT, FRA, FRC, FRB}},
+{"fma.",        A(63,29,1),     A_MASK,      PWRCOM,    PPCVLE,         {FRT, FRA, FRC, FRB}},
+
+{"fnmsub",      A(63,30,0),     A_MASK,      PPCCOM,    PPCEFS|PPCVLE,  {FRT, FRA, FRC, FRB}},
+{"fnms",        A(63,30,0),     A_MASK,      PWRCOM,    PPCVLE,         {FRT, FRA, FRC, FRB}},
+{"fnmsub.",     A(63,30,1),     A_MASK,      PPCCOM,    PPCEFS|PPCVLE,  {FRT, FRA, FRC, FRB}},
+{"fnms.",       A(63,30,1),     A_MASK,      PWRCOM,    PPCVLE,         {FRT, FRA, FRC, FRB}},
+
+{"fnmadd",      A(63,31,0),     A_MASK,      PPCCOM,    PPCEFS|PPCVLE,  {FRT, FRA, FRC, FRB}},
+{"fnma",        A(63,31,0),     A_MASK,      PWRCOM,    PPCVLE,         {FRT, FRA, FRC, FRB}},
+{"fnmadd.",     A(63,31,1),     A_MASK,      PPCCOM,    PPCEFS|PPCVLE,  {FRT, FRA, FRC, FRB}},
+{"fnma.",       A(63,31,1),     A_MASK,      PWRCOM,    PPCVLE,         {FRT, FRA, FRC, FRB}},
+
+{"fcmpo",       X(63,32),       XBF_MASK,    COM,       PPCEFS|PPCVLE,  {BF, FRA, FRB}},
+
+{"dmulq",       XRC(63,34,0),   X_MASK,      POWER6,    PPCVLE,         {FRTp, FRAp, FRBp}},
+{"dmulq.",      XRC(63,34,1),   X_MASK,      POWER6,    PPCVLE,         {FRTp, FRAp, FRBp}},
+
+{"drrndq",      ZRC(63,35,0),   Z2_MASK,     POWER6,    PPCVLE,         {FRTp, FRA, FRBp, RMC}},
+{"drrndq.",     ZRC(63,35,1),   Z2_MASK,     POWER6,    PPCVLE,         {FRTp, FRA, FRBp, RMC}},
+
+{"xsmulqp",     XRC(63,36,0),   X_MASK,      PPCVSX3,   PPCVLE,         {VD, VA, VB}},
+{"xsmulqpo",    XRC(63,36,1),   X_MASK,      PPCVSX3,   PPCVLE,         {VD, VA, VB}},
+
+{"xsrqpxp",     Z(63,37),       Z2_MASK,     PPCVSX3,   PPCVLE,         {R, VD, VB, RMC}},
+
+{"mtfsb1",      XRC(63,38,0),   XRARB_MASK,  COM,       PPCVLE,         {BT}},
+{"mtfsb1.",     XRC(63,38,1),   XRARB_MASK,  COM,       PPCVLE,         {BT}},
+
+{"fneg",        XRC(63,40,0),   XRA_MASK,    COM,       PPCEFS|PPCVLE,  {FRT, FRB}},
+{"fneg.",       XRC(63,40,1),   XRA_MASK,    COM,       PPCEFS|PPCVLE,  {FRT, FRB}},
+
+{"mcrfs",      X(63,64), XRB_MASK|(3<<21)|(3<<16), COM, PPCVLE,         {BF, BFA}},
+
+{"dscliq",      ZRC(63,66,0),   Z_MASK,      POWER6,    PPCVLE,         {FRTp, FRAp, SH16}},
+{"dscliq.",     ZRC(63,66,1),   Z_MASK,      POWER6,    PPCVLE,         {FRTp, FRAp, SH16}},
+
+{"dquaiq",      ZRC(63,67,0),   Z2_MASK,     POWER6,    PPCVLE,         {TE, FRTp, FRBp, RMC}},
+{"dquaiq.",     ZRC(63,67,1),   Z2_MASK,     POWER6,    PPCVLE,         {TE, FRTp, FRBp, RMC}},
+
+{"mtfsb0",      XRC(63,70,0),   XRARB_MASK,  COM,       PPCVLE,         {BT}},
+{"mtfsb0.",     XRC(63,70,1),   XRARB_MASK,  COM,       PPCVLE,         {BT}},
+
+{"fmr",         XRC(63,72,0),   XRA_MASK,    COM,       PPCEFS|PPCVLE,  {FRT, FRB}},
+{"fmr.",        XRC(63,72,1),   XRA_MASK,    COM,       PPCEFS|PPCVLE,  {FRT, FRB}},
+
+{"dscriq",      ZRC(63,98,0),   Z_MASK,      POWER6,    PPCVLE,         {FRTp, FRAp, SH16}},
+{"dscriq.",     ZRC(63,98,1),   Z_MASK,      POWER6,    PPCVLE,         {FRTp, FRAp, SH16}},
+
+{"drintxq",     ZRC(63,99,0),   Z2_MASK,     POWER6,    PPCVLE,         {R, FRTp, FRBp, RMC}},
+{"drintxq.",    ZRC(63,99,1),   Z2_MASK,     POWER6,    PPCVLE,         {R, FRTp, FRBp, RMC}},
+
+{"xscpsgnqp",   X(63,100),      X_MASK,      PPCVSX3,   PPCVLE,         {VD, VA, VB}},
+
+{"ftdiv",       X(63,128),      XBF_MASK,    POWER7,    PPCVLE,         {BF, FRA, FRB}},
+
+{"dcmpoq",      X(63,130),      X_MASK,      POWER6,    PPCVLE,         {BF, FRAp, FRBp}},
+
+{"xscmpoqp",    X(63,132),      XBF_MASK,    PPCVSX3,   PPCVLE,         {BF, VA, VB}},
+
+{"mtfsfi",  XRC(63,134,0), XWRA_MASK|(3<<21)|(1<<11), POWER6|PPCA2|PPC476, PPCVLE, {BFF, U, W}},
+{"mtfsfi",  XRC(63,134,0), XRA_MASK|(3<<21)|(1<<11), COM, POWER6|PPCA2|PPC476|PPCVLE, {BFF, U}},
+{"mtfsfi.", XRC(63,134,1), XWRA_MASK|(3<<21)|(1<<11), POWER6|PPCA2|PPC476, PPCVLE, {BFF, U, W}},
+{"mtfsfi.", XRC(63,134,1), XRA_MASK|(3<<21)|(1<<11), COM, POWER6|PPCA2|PPC476|PPCVLE, {BFF, U}},
+
+{"fnabs",       XRC(63,136,0),  XRA_MASK,    COM,       PPCEFS|PPCVLE,  {FRT, FRB}},
+{"fnabs.",      XRC(63,136,1),  XRA_MASK,    COM,       PPCEFS|PPCVLE,  {FRT, FRB}},
+
+{"fctiwu",      XRC(63,142,0),  XRA_MASK,    POWER7,    PPCVLE,         {FRT, FRB}},
+{"fctiwu.",     XRC(63,142,1),  XRA_MASK,    POWER7,    PPCVLE,         {FRT, FRB}},
+{"fctiwuz",     XRC(63,143,0),  XRA_MASK,    POWER7,    PPCVLE,         {FRT, FRB}},
+{"fctiwuz.",    XRC(63,143,1),  XRA_MASK,    POWER7,    PPCVLE,         {FRT, FRB}},
+
+{"ftsqrt",      X(63,160),      XBF_MASK|FRA_MASK, POWER7, PPCVLE,      {BF, FRB}},
+
+{"dtstexq",     X(63,162),      X_MASK,      POWER6,    PPCVLE,         {BF, FRAp, FRBp}},
+
+{"xscmpexpqp",  X(63,164),      XBF_MASK,    PPCVSX3,   PPCVLE,         {BF, VA, VB}},
+
+{"dtstdcq",     Z(63,194),      Z_MASK,      POWER6,    PPCVLE,         {BF, FRAp, DCM}},
+{"dtstdgq",     Z(63,226),      Z_MASK,      POWER6,    PPCVLE,         {BF, FRAp, DGM}},
+
+{"drintnq",     ZRC(63,227,0),  Z2_MASK,     POWER6,    PPCVLE,         {R, FRTp, FRBp, RMC}},
+{"drintnq.",    ZRC(63,227,1),  Z2_MASK,     POWER6,    PPCVLE,         {R, FRTp, FRBp, RMC}},
+
+{"dctqpq",      XRC(63,258,0),  X_MASK,      POWER6,    PPCVLE,         {FRTp, FRB}},
+{"dctqpq.",     XRC(63,258,1),  X_MASK,      POWER6,    PPCVLE,         {FRTp, FRB}},
+
+{"fabs",        XRC(63,264,0),  XRA_MASK,    COM,       PPCEFS|PPCVLE,  {FRT, FRB}},
+{"fabs.",       XRC(63,264,1),  XRA_MASK,    COM,       PPCEFS|PPCVLE,  {FRT, FRB}},
+
+{"dctfixq",     XRC(63,290,0),  X_MASK,      POWER6,    PPCVLE,         {FRT, FRBp}},
+{"dctfixq.",    XRC(63,290,1),  X_MASK,      POWER6,    PPCVLE,         {FRT, FRBp}},
+
+{"ddedpdq",     XRC(63,322,0),  X_MASK,      POWER6,    PPCVLE,         {SP, FRTp, FRBp}},
+{"ddedpdq.",    XRC(63,322,1),  X_MASK,      POWER6,    PPCVLE,         {SP, FRTp, FRBp}},
+
+{"dxexq",       XRC(63,354,0),  X_MASK,      POWER6,    PPCVLE,         {FRT, FRBp}},
+{"dxexq.",      XRC(63,354,1),  X_MASK,      POWER6,    PPCVLE,         {FRT, FRBp}},
+
+{"xsmaddqp",    XRC(63,388,0),  X_MASK,      PPCVSX3,   PPCVLE,         {VD, VA, VB}},
+{"xsmaddqpo",   XRC(63,388,1),  X_MASK,      PPCVSX3,   PPCVLE,         {VD, VA, VB}},
+
+{"frin",        XRC(63,392,0),  XRA_MASK,    POWER5,    PPCVLE,         {FRT, FRB}},
+{"frin.",       XRC(63,392,1),  XRA_MASK,    POWER5,    PPCVLE,         {FRT, FRB}},
+
+{"xsmsubqp",    XRC(63,420,0),  X_MASK,      PPCVSX3,   PPCVLE,         {VD, VA, VB}},
+{"xsmsubqpo",   XRC(63,420,1),  X_MASK,      PPCVSX3,   PPCVLE,         {VD, VA, VB}},
+
+{"friz",        XRC(63,424,0),  XRA_MASK,    POWER5,    PPCVLE,         {FRT, FRB}},
+{"friz.",       XRC(63,424,1),  XRA_MASK,    POWER5,    PPCVLE,         {FRT, FRB}},
+
+{"xsnmaddqp",   XRC(63,452,0),  X_MASK,      PPCVSX3,   PPCVLE,         {VD, VA, VB}},
+{"xsnmaddqpo",  XRC(63,452,1),  X_MASK,      PPCVSX3,   PPCVLE,         {VD, VA, VB}},
+
+{"frip",        XRC(63,456,0),  XRA_MASK,    POWER5,    PPCVLE,         {FRT, FRB}},
+{"frip.",       XRC(63,456,1),  XRA_MASK,    POWER5,    PPCVLE,         {FRT, FRB}},
+
+{"xsnmsubqp",   XRC(63,484,0),  X_MASK,      PPCVSX3,   PPCVLE,         {VD, VA, VB}},
+{"xsnmsubqpo",  XRC(63,484,1),  X_MASK,      PPCVSX3,   PPCVLE,         {VD, VA, VB}},
+
+{"frim",        XRC(63,488,0),  XRA_MASK,    POWER5,    PPCVLE,         {FRT, FRB}},
+{"frim.",       XRC(63,488,1),  XRA_MASK,    POWER5,    PPCVLE,         {FRT, FRB}},
+
+{"dsubq",       XRC(63,514,0),  X_MASK,      POWER6,    PPCVLE,         {FRTp, FRAp, FRBp}},
+{"dsubq.",      XRC(63,514,1),  X_MASK,      POWER6,    PPCVLE,         {FRTp, FRAp, FRBp}},
+
+{"xssubqp",     XRC(63,516,0),  X_MASK,      PPCVSX3,   PPCVLE,         {VD, VA, VB}},
+{"xssubqpo",    XRC(63,516,1),  X_MASK,      PPCVSX3,   PPCVLE,         {VD, VA, VB}},
+
+{"ddivq",       XRC(63,546,0),  X_MASK,      POWER6,    PPCVLE,         {FRTp, FRAp, FRBp}},
+{"ddivq.",      XRC(63,546,1),  X_MASK,      POWER6,    PPCVLE,         {FRTp, FRAp, FRBp}},
+
+{"xsdivqp",     XRC(63,548,0),  X_MASK,      PPCVSX3,   PPCVLE,         {VD, VA, VB}},
+{"xsdivqpo",    XRC(63,548,1),  X_MASK,      PPCVSX3,   PPCVLE,         {VD, VA, VB}},
+
+{"mffs",        XRC(63,583,0),  XRARB_MASK,  COM,       PPCEFS|PPCVLE,  {FRT}},
+{"mffs.",       XRC(63,583,1),  XRARB_MASK,  COM,       PPCEFS|PPCVLE,  {FRT}},
+
+{"mffsce",      XMMF(63,583,0,1), XMMF_MASK|RB_MASK, POWER9, PPCVLE,    {FRT}},
+{"mffscdrn",    XMMF(63,583,2,4), XMMF_MASK,         POWER9, PPCVLE,    {FRT, FRB}},
+{"mffscdrni",   XMMF(63,583,2,5), XMMF_MASK|(3<<14), POWER9, PPCVLE,    {FRT, DRM}},
+{"mffscrn",     XMMF(63,583,2,6), XMMF_MASK,         POWER9, PPCVLE,    {FRT, FRB}},
+{"mffscrni",    XMMF(63,583,2,7), XMMF_MASK|(7<<13), POWER9, PPCVLE,    {FRT, RM}},
+{"mffsl",       XMMF(63,583,3,0), XMMF_MASK|RB_MASK, POWER9, PPCVLE,    {FRT}},
+
+{"dcmpuq",      X(63,642),      X_MASK,      POWER6,    PPCVLE,         {BF, FRAp, FRBp}},
+
+{"xscmpuqp",    X(63,644),      XBF_MASK,    PPCVSX3,   PPCVLE,         {BF, VA, VB}},
+
+{"dtstsfq",     X(63,674),      X_MASK,      POWER6,    PPCVLE,         {BF, FRA, FRBp}},
+{"dtstsfiq",    X(63,675),      X_MASK|1<<22,POWER9,    PPCVLE,         {BF, UIM6, FRBp}},
+
+{"xststdcqp",   X(63,708),      X_MASK,      PPCVSX3,   PPCVLE,         {BF, VB, DCMX}},
+
+{"mtfsf",       XFL(63,711,0),  XFL_MASK, POWER6|PPCA2|PPC476, PPCVLE,  {FLM, FRB, XFL_L, W}},
+{"mtfsf",       XFL(63,711,0),  XFL_MASK,    COM, POWER6|PPCA2|PPC476|PPCEFS|PPCVLE, {FLM, FRB}},
+{"mtfsf.",      XFL(63,711,1),  XFL_MASK, POWER6|PPCA2|PPC476, PPCVLE,  {FLM, FRB, XFL_L, W}},
+{"mtfsf.",      XFL(63,711,1),  XFL_MASK,    COM, POWER6|PPCA2|PPC476|PPCEFS|PPCVLE, {FLM, FRB}},
+
+{"drdpq",       XRC(63,770,0),  X_MASK,      POWER6,    PPCVLE,         {FRTp, FRBp}},
+{"drdpq.",      XRC(63,770,1),  X_MASK,      POWER6,    PPCVLE,         {FRTp, FRBp}},
+
+{"dcffixq",     XRC(63,802,0),  X_MASK,      POWER6,    PPCVLE,         {FRTp, FRB}},
+{"dcffixq.",    XRC(63,802,1),  X_MASK,      POWER6,    PPCVLE,         {FRTp, FRB}},
+
+{"xsabsqp",     XVA(63,804,0),  XVA_MASK,    PPCVSX3,   PPCVLE,         {VD, VB}},
+{"xsxexpqp",    XVA(63,804,2),  XVA_MASK,    PPCVSX3,   PPCVLE,         {VD, VB}},
+{"xsnabsqp",    XVA(63,804,8),  XVA_MASK,    PPCVSX3,   PPCVLE,         {VD, VB}},
+{"xsnegqp",     XVA(63,804,16), XVA_MASK,    PPCVSX3,   PPCVLE,         {VD, VB}},
+{"xsxsigqp",    XVA(63,804,18), XVA_MASK,    PPCVSX3,   PPCVLE,         {VD, VB}},
+{"xssqrtqp",    XVARC(63,804,27,0), XVA_MASK, PPCVSX3,  PPCVLE,         {VD, VB}},
+{"xssqrtqpo",   XVARC(63,804,27,1), XVA_MASK, PPCVSX3,  PPCVLE,         {VD, VB}},
+
+{"fctid",       XRC(63,814,0),  XRA_MASK,    PPC64,     PPCVLE,         {FRT, FRB}},
+{"fctid",       XRC(63,814,0),  XRA_MASK,    PPC476,    PPCVLE,         {FRT, FRB}},
+{"fctid.",      XRC(63,814,1),  XRA_MASK,    PPC64,     PPCVLE,         {FRT, FRB}},
+{"fctid.",      XRC(63,814,1),  XRA_MASK,    PPC476,    PPCVLE,         {FRT, FRB}},
+
+{"fctidz",      XRC(63,815,0),  XRA_MASK,    PPC64,     PPCVLE,         {FRT, FRB}},
+{"fctidz",      XRC(63,815,0),  XRA_MASK,    PPC476,    PPCVLE,         {FRT, FRB}},
+{"fctidz.",     XRC(63,815,1),  XRA_MASK,    PPC64,     PPCVLE,         {FRT, FRB}},
+{"fctidz.",     XRC(63,815,1),  XRA_MASK,    PPC476,    PPCVLE,         {FRT, FRB}},
+
+{"denbcdq",     XRC(63,834,0),  X_MASK,      POWER6,    PPCVLE,         {S, FRTp, FRBp}},
+{"denbcdq.",    XRC(63,834,1),  X_MASK,      POWER6,    PPCVLE,         {S, FRTp, FRBp}},
+
+{"xscvqpuwz",   XVA(63,836,1),  XVA_MASK,    PPCVSX3,   PPCVLE,         {VD, VB}},
+{"xscvudqp",    XVA(63,836,2),  XVA_MASK,    PPCVSX3,   PPCVLE,         {VD, VB}},
+{"xscvqpswz",   XVA(63,836,9),  XVA_MASK,    PPCVSX3,   PPCVLE,         {VD, VB}},
+{"xscvsdqp",    XVA(63,836,10), XVA_MASK,    PPCVSX3,   PPCVLE,         {VD, VB}},
+{"xscvqpudz",   XVA(63,836,17), XVA_MASK,    PPCVSX3,   PPCVLE,         {VD, VB}},
+{"xscvqpdp",    XVARC(63,836,20,0), XVA_MASK, PPCVSX3,  PPCVLE,         {VD, VB}},
+{"xscvqpdpo",   XVARC(63,836,20,1), XVA_MASK, PPCVSX3,  PPCVLE,         {VD, VB}},
+{"xscvdpqp",    XVA(63,836,22), XVA_MASK,    PPCVSX3,   PPCVLE,         {VD, VB}},
+{"xscvqpsdz",   XVA(63,836,25), XVA_MASK,    PPCVSX3,   PPCVLE,         {VD, VB}},
+
+{"fmrgow",      X(63,838),      X_MASK,      PPCVSX2,   PPCVLE,         {FRT, FRA, FRB}},
+
+{"fcfid",       XRC(63,846,0),  XRA_MASK,    PPC64,     PPCVLE,         {FRT, FRB}},
+{"fcfid",       XRC(63,846,0),  XRA_MASK,    PPC476,    PPCVLE,         {FRT, FRB}},
+{"fcfid.",      XRC(63,846,1),  XRA_MASK,    PPC64,     PPCVLE,         {FRT, FRB}},
+{"fcfid.",      XRC(63,846,1),  XRA_MASK,    PPC476,    PPCVLE,         {FRT, FRB}},
+
+{"diexq",       XRC(63,866,0),  X_MASK,      POWER6,    PPCVLE,         {FRTp, FRA, FRBp}},
+{"diexq.",      XRC(63,866,1),  X_MASK,      POWER6,    PPCVLE,         {FRTp, FRA, FRBp}},
+
+{"xsiexpqp",    X(63,868),      X_MASK,      PPCVSX3,   PPCVLE,         {VD, VA, VB}},
+
+{"fctidu",      XRC(63,942,0),  XRA_MASK, POWER7|PPCA2, PPCVLE,         {FRT, FRB}},
+{"fctidu.",     XRC(63,942,1),  XRA_MASK, POWER7|PPCA2, PPCVLE,         {FRT, FRB}},
+
+{"fctiduz",     XRC(63,943,0),  XRA_MASK, POWER7|PPCA2, PPCVLE,         {FRT, FRB}},
+{"fctiduz.",    XRC(63,943,1),  XRA_MASK, POWER7|PPCA2, PPCVLE,         {FRT, FRB}},
+
+{"fmrgew",      X(63,966),      X_MASK,      PPCVSX2,   PPCVLE,         {FRT, FRA, FRB}},
+
+{"fcfidu",      XRC(63,974,0),  XRA_MASK, POWER7|PPCA2, PPCVLE,         {FRT, FRB}},
+{"fcfidu.",     XRC(63,974,1),  XRA_MASK, POWER7|PPCA2, PPCVLE,         {FRT, FRB}},
+};
+
+const int powerpc_num_opcodes =
+  sizeof (powerpc_opcodes) / sizeof (powerpc_opcodes[0]);
+
+/* The VLE opcode table.
+
+   The format of this opcode table is the same as the main opcode table.  */
+
+const struct powerpc_opcode vle_opcodes[] = {
+{"se_illegal",  C(0),           C_MASK,         PPCVLE, 0,              {}},
+{"se_isync",    C(1),           C_MASK,         PPCVLE, 0,              {}},
+{"se_sc",       C(2),           C_MASK,         PPCVLE, 0,              {}},
+{"se_blr",      C_LK(2,0),      C_LK_MASK,      PPCVLE, 0,              {}},
+{"se_blrl",     C_LK(2,1),      C_LK_MASK,      PPCVLE, 0,              {}},
+{"se_bctr",     C_LK(3,0),      C_LK_MASK,      PPCVLE, 0,              {}},
+{"se_bctrl",    C_LK(3,1),      C_LK_MASK,      PPCVLE, 0,              {}},
+{"se_rfi",      C(8),           C_MASK,         PPCVLE, 0,              {}},
+{"se_rfci",     C(9),           C_MASK,         PPCVLE, 0,              {}},
+{"se_rfdi",     C(10),          C_MASK,         PPCVLE, 0,              {}},
+{"se_rfmci",    C(11),          C_MASK, PPCRFMCI|PPCVLE, 0,             {}},
+{"se_not",      SE_R(0,2),      SE_R_MASK,      PPCVLE, 0,              {RX}},
+{"se_neg",      SE_R(0,3),      SE_R_MASK,      PPCVLE, 0,              {RX}},
+{"se_mflr",     SE_R(0,8),      SE_R_MASK,      PPCVLE, 0,              {RX}},
+{"se_mtlr",     SE_R(0,9),      SE_R_MASK,      PPCVLE, 0,              {RX}},
+{"se_mfctr",    SE_R(0,10),     SE_R_MASK,      PPCVLE, 0,              {RX}},
+{"se_mtctr",    SE_R(0,11),     SE_R_MASK,      PPCVLE, 0,              {RX}},
+{"se_extzb",    SE_R(0,12),     SE_R_MASK,      PPCVLE, 0,              {RX}},
+{"se_extsb",    SE_R(0,13),     SE_R_MASK,      PPCVLE, 0,              {RX}},
+{"se_extzh",    SE_R(0,14),     SE_R_MASK,      PPCVLE, 0,              {RX}},
+{"se_extsh",    SE_R(0,15),     SE_R_MASK,      PPCVLE, 0,              {RX}},
+{"se_mr",       SE_RR(0,1),     SE_RR_MASK,     PPCVLE, 0,              {RX, RY}},
+{"se_mtar",     SE_RR(0,2),     SE_RR_MASK,     PPCVLE, 0,              {ARX, RY}},
+{"se_mfar",     SE_RR(0,3),     SE_RR_MASK,     PPCVLE, 0,              {RX, ARY}},
+{"se_add",      SE_RR(1,0),     SE_RR_MASK,     PPCVLE, 0,              {RX, RY}},
+{"se_mullw",    SE_RR(1,1),     SE_RR_MASK,     PPCVLE, 0,              {RX, RY}},
+{"se_sub",      SE_RR(1,2),     SE_RR_MASK,     PPCVLE, 0,              {RX, RY}},
+{"se_subf",     SE_RR(1,3),     SE_RR_MASK,     PPCVLE, 0,              {RX, RY}},
+{"se_cmp",      SE_RR(3,0),     SE_RR_MASK,     PPCVLE, 0,              {RX, RY}},
+{"se_cmpl",     SE_RR(3,1),     SE_RR_MASK,     PPCVLE, 0,              {RX, RY}},
+{"se_cmph",     SE_RR(3,2),     SE_RR_MASK,     PPCVLE, 0,              {RX, RY}},
+{"se_cmphl",    SE_RR(3,3),     SE_RR_MASK,     PPCVLE, 0,              {RX, RY}},
+
+{"e_cmpi",      SCI8BF(6,0,21), SCI8BF_MASK,    PPCVLE, 0,              {CRD32, RA, SCLSCI8}},
+{"e_cmpwi",     SCI8BF(6,0,21), SCI8BF_MASK,    PPCVLE, 0,              {CRD32, RA, SCLSCI8}},
+{"e_cmpli",     SCI8BF(6,1,21), SCI8BF_MASK,    PPCVLE, 0,              {CRD32, RA, SCLSCI8}},
+{"e_cmplwi",    SCI8BF(6,1,21), SCI8BF_MASK,    PPCVLE, 0,              {CRD32, RA, SCLSCI8}},
+{"e_addi",      SCI8(6,16),     SCI8_MASK,      PPCVLE, 0,              {RT, RA, SCLSCI8}},
+{"e_subi",      SCI8(6,16),     SCI8_MASK,      PPCVLE, 0,              {RT, RA, SCLSCI8N}},
+{"e_addi.",     SCI8(6,17),     SCI8_MASK,      PPCVLE, 0,              {RT, RA, SCLSCI8}},
+{"e_addic",     SCI8(6,18),     SCI8_MASK,      PPCVLE, 0,              {RT, RA, SCLSCI8}},
+{"e_subic",     SCI8(6,18),     SCI8_MASK,      PPCVLE, 0,              {RT, RA, SCLSCI8N}},
+{"e_addic.",    SCI8(6,19),     SCI8_MASK,      PPCVLE, 0,              {RT, RA, SCLSCI8}},
+{"e_subic.",    SCI8(6,19),     SCI8_MASK,      PPCVLE, 0,              {RT, RA, SCLSCI8N}},
+{"e_mulli",     SCI8(6,20),     SCI8_MASK,      PPCVLE, 0,              {RT, RA, SCLSCI8}},
+{"e_subfic",    SCI8(6,22),     SCI8_MASK,      PPCVLE, 0,              {RT, RA, SCLSCI8}},
+{"e_subfic.",   SCI8(6,23),     SCI8_MASK,      PPCVLE, 0,              {RT, RA, SCLSCI8}},
+{"e_andi",      SCI8(6,24),     SCI8_MASK,      PPCVLE, 0,              {RA, RS, SCLSCI8}},
+{"e_andi.",     SCI8(6,25),     SCI8_MASK,      PPCVLE, 0,              {RA, RS, SCLSCI8}},
+{"e_nop",       SCI8(6,26),     0xffffffff,     PPCVLE, 0,              {0}},
+{"e_ori",       SCI8(6,26),     SCI8_MASK,      PPCVLE, 0,              {RA, RS, SCLSCI8}},
+{"e_ori.",      SCI8(6,27),     SCI8_MASK,      PPCVLE, 0,              {RA, RS, SCLSCI8}},
+{"e_xori",      SCI8(6,28),     SCI8_MASK,      PPCVLE, 0,              {RA, RS, SCLSCI8}},
+{"e_xori.",     SCI8(6,29),     SCI8_MASK,      PPCVLE, 0,              {RA, RS, SCLSCI8}},
+{"e_lbzu",      OPVUP(6,0),     OPVUP_MASK,     PPCVLE, 0,              {RT, D8, RA0}},
+{"e_lhau",      OPVUP(6,3),     OPVUP_MASK,     PPCVLE, 0,              {RT, D8, RA0}},
+{"e_lhzu",      OPVUP(6,1),     OPVUP_MASK,     PPCVLE, 0,              {RT, D8, RA0}},
+{"e_lmw",       OPVUP(6,8),     OPVUP_MASK,     PPCVLE, 0,              {RT, D8, RA0}},
+{"e_lwzu",      OPVUP(6,2),     OPVUP_MASK,     PPCVLE, 0,              {RT, D8, RA0}},
+{"e_stbu",      OPVUP(6,4),     OPVUP_MASK,     PPCVLE, 0,              {RT, D8, RA0}},
+{"e_sthu",      OPVUP(6,5),     OPVUP_MASK,     PPCVLE, 0,              {RT, D8, RA0}},
+{"e_stwu",      OPVUP(6,6),     OPVUP_MASK,     PPCVLE, 0,              {RT, D8, RA0}},
+{"e_stmw",      OPVUP(6,9),     OPVUP_MASK,     PPCVLE, 0,              {RT, D8, RA0}},
+{"e_ldmvgprw",  OPVUPRT(6,16,0),OPVUPRT_MASK,   PPCVLE, 0,              {D8, RA0}},
+{"e_stmvgprw",  OPVUPRT(6,17,0),OPVUPRT_MASK,   PPCVLE, 0,              {D8, RA0}},
+{"e_ldmvsprw",  OPVUPRT(6,16,1),OPVUPRT_MASK,   PPCVLE, 0,              {D8, RA0}},
+{"e_stmvsprw",  OPVUPRT(6,17,1),OPVUPRT_MASK,   PPCVLE, 0,              {D8, RA0}},
+{"e_ldmvsrrw",  OPVUPRT(6,16,4),OPVUPRT_MASK,   PPCVLE, 0,              {D8, RA0}},
+{"e_stmvsrrw",  OPVUPRT(6,17,4),OPVUPRT_MASK,   PPCVLE, 0,              {D8, RA0}},
+{"e_ldmvcsrrw", OPVUPRT(6,16,5),OPVUPRT_MASK,   PPCVLE, 0,              {D8, RA0}},
+{"e_stmvcsrrw", OPVUPRT(6,17,5),OPVUPRT_MASK,   PPCVLE, 0,              {D8, RA0}},
+{"e_ldmvdsrrw", OPVUPRT(6,16,6),OPVUPRT_MASK,   PPCVLE, 0,              {D8, RA0}},
+{"e_stmvdsrrw", OPVUPRT(6,17,6),OPVUPRT_MASK,   PPCVLE, 0,              {D8, RA0}},
+{"e_add16i",    OP(7),          OP_MASK,        PPCVLE, 0,              {RT, RA, SI}},
+{"e_la",        OP(7),          OP_MASK,        PPCVLE, 0,              {RT, D, RA0}},
+{"e_sub16i",    OP(7),          OP_MASK,        PPCVLE, 0,              {RT, RA, NSI}},
+
+{"se_addi",     SE_IM5(8,0),    SE_IM5_MASK,    PPCVLE, 0,              {RX, OIMM5}},
+{"se_cmpli",    SE_IM5(8,1),    SE_IM5_MASK,    PPCVLE, 0,              {RX, OIMM5}},
+{"se_subi",     SE_IM5(9,0),    SE_IM5_MASK,    PPCVLE, 0,              {RX, OIMM5}},
+{"se_subi.",    SE_IM5(9,1),    SE_IM5_MASK,    PPCVLE, 0,              {RX, OIMM5}},
+{"se_cmpi",     SE_IM5(10,1),   SE_IM5_MASK,    PPCVLE, 0,              {RX, UI5}},
+{"se_bmaski",   SE_IM5(11,0),   SE_IM5_MASK,    PPCVLE, 0,              {RX, UI5}},
+{"se_andi",     SE_IM5(11,1),   SE_IM5_MASK,    PPCVLE, 0,              {RX, UI5}},
+
+{"e_lbz",       OP(12),         OP_MASK,        PPCVLE, 0,              {RT, D, RA0}},
+{"e_stb",       OP(13),         OP_MASK,        PPCVLE, 0,              {RT, D, RA0}},
+{"e_lha",       OP(14),         OP_MASK,        PPCVLE, 0,              {RT, D, RA0}},
+
+{"se_srw",      SE_RR(16,0),    SE_RR_MASK,     PPCVLE, 0,              {RX, RY}},
+{"se_sraw",     SE_RR(16,1),    SE_RR_MASK,     PPCVLE, 0,              {RX, RY}},
+{"se_slw",      SE_RR(16,2),    SE_RR_MASK,     PPCVLE, 0,              {RX, RY}},
+{"se_nop",      SE_RR(17,0),    0xffff,         PPCVLE, 0,              {0}},
+{"se_or",       SE_RR(17,0),    SE_RR_MASK,     PPCVLE, 0,              {RX, RY}},
+{"se_andc",     SE_RR(17,1),    SE_RR_MASK,     PPCVLE, 0,              {RX, RY}},
+{"se_and",      SE_RR(17,2),    SE_RR_MASK,     PPCVLE, 0,              {RX, RY}},
+{"se_and.",     SE_RR(17,3),    SE_RR_MASK,     PPCVLE, 0,              {RX, RY}},
+{"se_li",       IM7(9),         IM7_MASK,       PPCVLE, 0,              {RX, UI7}},
+
+{"e_lwz",       OP(20),         OP_MASK,        PPCVLE, 0,              {RT, D, RA0}},
+{"e_stw",       OP(21),         OP_MASK,        PPCVLE, 0,              {RT, D, RA0}},
+{"e_lhz",       OP(22),         OP_MASK,        PPCVLE, 0,              {RT, D, RA0}},
+{"e_sth",       OP(23),         OP_MASK,        PPCVLE, 0,              {RT, D, RA0}},
+
+{"se_bclri",    SE_IM5(24,0),   SE_IM5_MASK,    PPCVLE, 0,              {RX, UI5}},
+{"se_bgeni",    SE_IM5(24,1),   SE_IM5_MASK,    PPCVLE, 0,              {RX, UI5}},
+{"se_bseti",    SE_IM5(25,0),   SE_IM5_MASK,    PPCVLE, 0,              {RX, UI5}},
+{"se_btsti",    SE_IM5(25,1),   SE_IM5_MASK,    PPCVLE, 0,              {RX, UI5}},
+{"se_srwi",     SE_IM5(26,0),   SE_IM5_MASK,    PPCVLE, 0,              {RX, UI5}},
+{"se_srawi",    SE_IM5(26,1),   SE_IM5_MASK,    PPCVLE, 0,              {RX, UI5}},
+{"se_slwi",     SE_IM5(27,0),   SE_IM5_MASK,    PPCVLE, 0,              {RX, UI5}},
+
+{"e_lis",       I16L(28,28),    I16L_MASK,      PPCVLE, 0,              {RD, VLEUIMML}},
+{"e_and2is.",   I16L(28,29),    I16L_MASK,      PPCVLE, 0,              {RD, VLEUIMML}},
+{"e_or2is",     I16L(28,26),    I16L_MASK,      PPCVLE, 0,              {RD, VLEUIMML}},
+{"e_and2i.",    I16L(28,25),    I16L_MASK,      PPCVLE, 0,              {RD, VLEUIMML}},
+{"e_or2i",      I16L(28,24),    I16L_MASK,      PPCVLE, 0,              {RD, VLEUIMML}},
+{"e_cmphl16i",  IA16(28,23),    IA16_MASK,      PPCVLE, 0,              {RA, VLEUIMM}},
+{"e_cmph16i",   IA16(28,22),    IA16_MASK,      PPCVLE, 0,              {RA, VLESIMM}},
+{"e_cmpl16i",   I16A(28,21),    I16A_MASK,      PPCVLE, 0,              {RA, VLEUIMM}},
+{"e_mull2i",    I16A(28,20),    I16A_MASK,      PPCVLE, 0,              {RA, VLESIMM}},
+{"e_cmp16i",    IA16(28,19),    IA16_MASK,      PPCVLE, 0,              {RA, VLESIMM}},
+{"e_sub2is",    I16A(28,18),    I16A_MASK,      PPCVLE, 0,              {RA, VLENSIMM}},
+{"e_add2is",    I16A(28,18),    I16A_MASK,      PPCVLE, 0,              {RA, VLESIMM}},
+{"e_sub2i.",    I16A(28,17),    I16A_MASK,      PPCVLE, 0,              {RA, VLENSIMM}},
+{"e_add2i.",    I16A(28,17),    I16A_MASK,      PPCVLE, 0,              {RA, VLESIMM}},
+{"e_li",        LI20(28,0),     LI20_MASK,      PPCVLE, 0,              {RT, IMM20}},
+{"e_rlwimi",    M(29,0),        M_MASK,         PPCVLE, 0,              {RA, RS, SH, MB, ME}},
+{"e_rlwinm",    M(29,1),        M_MASK,         PPCVLE, 0,              {RA, RT, SH, MBE, ME}},
+{"e_b",         BD24(30,0,0),   BD24_MASK,      PPCVLE, 0,              {B24}},
+{"e_bl",        BD24(30,0,1),   BD24_MASK,      PPCVLE, 0,              {B24}},
+{"e_bdnz",      EBD15(30,8,BO32DNZ,0),  EBD15_MASK, PPCVLE, 0,          {B15}},
+{"e_bdnzl",     EBD15(30,8,BO32DNZ,1),  EBD15_MASK, PPCVLE, 0,          {B15}},
+{"e_bdz",       EBD15(30,8,BO32DZ,0),   EBD15_MASK, PPCVLE, 0,          {B15}},
+{"e_bdzl",      EBD15(30,8,BO32DZ,1),   EBD15_MASK, PPCVLE, 0,          {B15}},
+{"e_bge",       EBD15BI(30,8,BO32F,CBLT,0), EBD15BI_MASK, PPCVLE, 0,    {CRS,B15}},
+{"e_bgel",      EBD15BI(30,8,BO32F,CBLT,1), EBD15BI_MASK, PPCVLE, 0,    {CRS,B15}},
+{"e_bnl",       EBD15BI(30,8,BO32F,CBLT,0), EBD15BI_MASK, PPCVLE, 0,    {CRS,B15}},
+{"e_bnll",      EBD15BI(30,8,BO32F,CBLT,1), EBD15BI_MASK, PPCVLE, 0,    {CRS,B15}},
+{"e_blt",       EBD15BI(30,8,BO32T,CBLT,0), EBD15BI_MASK, PPCVLE, 0,    {CRS,B15}},
+{"e_bltl",      EBD15BI(30,8,BO32T,CBLT,1), EBD15BI_MASK, PPCVLE, 0,    {CRS,B15}},
+{"e_bgt",       EBD15BI(30,8,BO32T,CBGT,0), EBD15BI_MASK, PPCVLE, 0,    {CRS,B15}},
+{"e_bgtl",      EBD15BI(30,8,BO32T,CBGT,1), EBD15BI_MASK, PPCVLE, 0,    {CRS,B15}},
+{"e_ble",       EBD15BI(30,8,BO32F,CBGT,0), EBD15BI_MASK, PPCVLE, 0,    {CRS,B15}},
+{"e_blel",      EBD15BI(30,8,BO32F,CBGT,1), EBD15BI_MASK, PPCVLE, 0,    {CRS,B15}},
+{"e_bng",       EBD15BI(30,8,BO32F,CBGT,0), EBD15BI_MASK, PPCVLE, 0,    {CRS,B15}},
+{"e_bngl",      EBD15BI(30,8,BO32F,CBGT,1), EBD15BI_MASK, PPCVLE, 0,    {CRS,B15}},
+{"e_bne",       EBD15BI(30,8,BO32F,CBEQ,0), EBD15BI_MASK, PPCVLE, 0,    {CRS,B15}},
+{"e_bnel",      EBD15BI(30,8,BO32F,CBEQ,1), EBD15BI_MASK, PPCVLE, 0,    {CRS,B15}},
+{"e_beq",       EBD15BI(30,8,BO32T,CBEQ,0), EBD15BI_MASK, PPCVLE, 0,    {CRS,B15}},
+{"e_beql",      EBD15BI(30,8,BO32T,CBEQ,1), EBD15BI_MASK, PPCVLE, 0,    {CRS,B15}},
+{"e_bso",       EBD15BI(30,8,BO32T,CBSO,0), EBD15BI_MASK, PPCVLE, 0,    {CRS,B15}},
+{"e_bsol",      EBD15BI(30,8,BO32T,CBSO,1), EBD15BI_MASK, PPCVLE, 0,    {CRS,B15}},
+{"e_bun",       EBD15BI(30,8,BO32T,CBSO,0), EBD15BI_MASK, PPCVLE, 0,    {CRS,B15}},
+{"e_bunl",      EBD15BI(30,8,BO32T,CBSO,1), EBD15BI_MASK, PPCVLE, 0,    {CRS,B15}},
+{"e_bns",       EBD15BI(30,8,BO32F,CBSO,0), EBD15BI_MASK, PPCVLE, 0,    {CRS,B15}},
+{"e_bnsl",      EBD15BI(30,8,BO32F,CBSO,1), EBD15BI_MASK, PPCVLE, 0,    {CRS,B15}},
+{"e_bnu",       EBD15BI(30,8,BO32F,CBSO,0), EBD15BI_MASK, PPCVLE, 0,    {CRS,B15}},
+{"e_bnul",      EBD15BI(30,8,BO32F,CBSO,1), EBD15BI_MASK, PPCVLE, 0,    {CRS,B15}},
+{"e_bc",        BD15(30,8,0),   BD15_MASK,      PPCVLE, 0,              {BO32, BI32, B15}},
+{"e_bcl",       BD15(30,8,1),   BD15_MASK,      PPCVLE, 0,              {BO32, BI32, B15}},
+
+{"e_bf",        EBD15(30,8,BO32F,0), EBD15_MASK, PPCVLE, 0,             {BI32,B15}},
+{"e_bfl",       EBD15(30,8,BO32F,1), EBD15_MASK, PPCVLE, 0,             {BI32,B15}},
+{"e_bt",        EBD15(30,8,BO32T,0), EBD15_MASK, PPCVLE, 0,             {BI32,B15}},
+{"e_btl",       EBD15(30,8,BO32T,1), EBD15_MASK, PPCVLE, 0,             {BI32,B15}},
+
+{"e_cmph",      X(31,14),       X_MASK,         PPCVLE, 0,              {CRD, RA, RB}},
+{"e_cmphl",     X(31,46),       X_MASK,         PPCVLE, 0,              {CRD, RA, RB}},
+{"e_crandc",    XL(31,129),     XL_MASK,        PPCVLE, 0,              {BT, BA, BB}},
+{"e_crnand",    XL(31,225),     XL_MASK,        PPCVLE, 0,              {BT, BA, BB}},
+{"e_crnot",     XL(31,33),      XL_MASK,        PPCVLE, 0,              {BT, BA, BBA}},
+{"e_crnor",     XL(31,33),      XL_MASK,        PPCVLE, 0,              {BT, BA, BB}},
+{"e_crclr",     XL(31,193),     XL_MASK,        PPCVLE, 0,              {BT, BAT, BBA}},
+{"e_crxor",     XL(31,193),     XL_MASK,        PPCVLE, 0,              {BT, BA, BB}},
+{"e_mcrf",      XL(31,16),      XL_MASK,        PPCVLE, 0,              {CRD, CR}},
+{"e_slwi",      EX(31,112),     EX_MASK,        PPCVLE, 0,              {RA, RS, SH}},
+{"e_slwi.",     EX(31,113),     EX_MASK,        PPCVLE, 0,              {RA, RS, SH}},
+
+{"e_crand",     XL(31,257),     XL_MASK,        PPCVLE, 0,              {BT, BA, BB}},
+
+{"e_rlw",       EX(31,560),     EX_MASK,        PPCVLE, 0,              {RA, RS, RB}},
+{"e_rlw.",      EX(31,561),     EX_MASK,        PPCVLE, 0,              {RA, RS, RB}},
+
+{"e_crset",     XL(31,289),     XL_MASK,        PPCVLE, 0,              {BT, BAT, BBA}},
+{"e_creqv",     XL(31,289),     XL_MASK,        PPCVLE, 0,              {BT, BA, BB}},
+
+{"e_rlwi",      EX(31,624),     EX_MASK,        PPCVLE, 0,              {RA, RS, SH}},
+{"e_rlwi.",     EX(31,625),     EX_MASK,        PPCVLE, 0,              {RA, RS, SH}},
+
+{"e_crorc",     XL(31,417),     XL_MASK,        PPCVLE, 0,              {BT, BA, BB}},
+
+{"e_crmove",    XL(31,449),     XL_MASK,        PPCVLE, 0,              {BT, BA, BBA}},
+{"e_cror",      XL(31,449),     XL_MASK,        PPCVLE, 0,              {BT, BA, BB}},
+
+{"mtmas1",      XSPR(31,467,625), XSPR_MASK,    PPCVLE, 0,              {RS}},
+
+{"e_srwi",      EX(31,1136),    EX_MASK,        PPCVLE, 0,              {RA, RS, SH}},
+{"e_srwi.",     EX(31,1137),    EX_MASK,        PPCVLE, 0,              {RA, RS, SH}},
+
+{"se_lbz",      SD4(8),         SD4_MASK,       PPCVLE, 0,              {RZ, SE_SD, RX}},
+
+{"se_stb",      SD4(9),         SD4_MASK,       PPCVLE, 0,              {RZ, SE_SD, RX}},
+
+{"se_lhz",      SD4(10),        SD4_MASK,       PPCVLE, 0,              {RZ, SE_SDH, RX}},
+
+{"se_sth",      SD4(11),        SD4_MASK,       PPCVLE, 0,              {RZ, SE_SDH, RX}},
+
+{"se_lwz",      SD4(12),        SD4_MASK,       PPCVLE, 0,              {RZ, SE_SDW, RX}},
+
+{"se_stw",      SD4(13),        SD4_MASK,       PPCVLE, 0,              {RZ, SE_SDW, RX}},
+
+{"se_bge",      EBD8IO(28,0,0), EBD8IO3_MASK,   PPCVLE, 0,              {B8}},
+{"se_bnl",      EBD8IO(28,0,0), EBD8IO3_MASK,   PPCVLE, 0,              {B8}},
+{"se_ble",      EBD8IO(28,0,1), EBD8IO3_MASK,   PPCVLE, 0,              {B8}},
+{"se_bng",      EBD8IO(28,0,1), EBD8IO3_MASK,   PPCVLE, 0,              {B8}},
+{"se_bne",      EBD8IO(28,0,2), EBD8IO3_MASK,   PPCVLE, 0,              {B8}},
+{"se_bns",      EBD8IO(28,0,3), EBD8IO3_MASK,   PPCVLE, 0,              {B8}},
+{"se_bnu",      EBD8IO(28,0,3), EBD8IO3_MASK,   PPCVLE, 0,              {B8}},
+{"se_bf",       EBD8IO(28,0,0), EBD8IO2_MASK,   PPCVLE, 0,              {BI16, B8}},
+{"se_blt",      EBD8IO(28,1,0), EBD8IO3_MASK,   PPCVLE, 0,              {B8}},
+{"se_bgt",      EBD8IO(28,1,1), EBD8IO3_MASK,   PPCVLE, 0,              {B8}},
+{"se_beq",      EBD8IO(28,1,2), EBD8IO3_MASK,   PPCVLE, 0,              {B8}},
+{"se_bso",      EBD8IO(28,1,3), EBD8IO3_MASK,   PPCVLE, 0,              {B8}},
+{"se_bun",      EBD8IO(28,1,3), EBD8IO3_MASK,   PPCVLE, 0,              {B8}},
+{"se_bt",       EBD8IO(28,1,0), EBD8IO2_MASK,   PPCVLE, 0,              {BI16, B8}},
+{"se_bc",       BD8IO(28),      BD8IO_MASK,     PPCVLE, 0,              {BO16, BI16, B8}},
+{"se_b",        BD8(58,0,0),    BD8_MASK,       PPCVLE, 0,              {B8}},
+{"se_bl",       BD8(58,0,1),    BD8_MASK,       PPCVLE, 0,              {B8}},
 };
 
-const int powerpc_num_opcodes = ARRAY_SIZE(powerpc_opcodes);
+const int vle_num_opcodes =
+  sizeof (vle_opcodes) / sizeof (vle_opcodes[0]);
 
 /* The macro table.  This is only used by the assembler.  */
 
@@ -4949,45 +7235,58 @@ const int powerpc_num_opcodes = ARRAY_SIZE(powerpc_opcodes);
    support extracting the whole word (32 bits in this case).  */
 
 const struct powerpc_macro powerpc_macros[] = {
-{ "extldi",  4,   PPC64,        "rldicr %0,%1,%3,(%2)-1" },
-{ "extldi.", 4,   PPC64,        "rldicr. %0,%1,%3,(%2)-1" },
-{ "extrdi",  4,   PPC64,        "rldicl %0,%1,(%2)+(%3),64-(%2)" },
-{ "extrdi.", 4,   PPC64,        "rldicl. %0,%1,(%2)+(%3),64-(%2)" },
-{ "insrdi",  4,   PPC64,        "rldimi %0,%1,64-((%2)+(%3)),%3" },
-{ "insrdi.", 4,   PPC64,        "rldimi. %0,%1,64-((%2)+(%3)),%3" },
-{ "rotrdi",  3,   PPC64,        "rldicl %0,%1,(-(%2)!63)&((%2)|63),0" },
-{ "rotrdi.", 3,   PPC64,        "rldicl. %0,%1,(-(%2)!63)&((%2)|63),0" },
-{ "sldi",    3,   PPC64,        "rldicr %0,%1,%2,63-(%2)" },
-{ "sldi.",   3,   PPC64,        "rldicr. %0,%1,%2,63-(%2)" },
-{ "srdi",    3,   PPC64,        "rldicl %0,%1,(-(%2)!63)&((%2)|63),%2" },
-{ "srdi.",   3,   PPC64,        "rldicl. %0,%1,(-(%2)!63)&((%2)|63),%2" },
-{ "clrrdi",  3,   PPC64,        "rldicr %0,%1,0,63-(%2)" },
-{ "clrrdi.", 3,   PPC64,        "rldicr. %0,%1,0,63-(%2)" },
-{ "clrlsldi",4,   PPC64,        "rldic %0,%1,%3,(%2)-(%3)" },
-{ "clrlsldi.",4,  PPC64,        "rldic. %0,%1,%3,(%2)-(%3)" },
-
-{ "extlwi",  4,   PPCCOM,       "rlwinm %0,%1,%3,0,(%2)-1" },
-{ "extlwi.", 4,   PPCCOM,       "rlwinm. %0,%1,%3,0,(%2)-1" },
-{ "extrwi",  4,   PPCCOM,       "rlwinm %0,%1,((%2)+(%3))&((%2)+(%3)<>32),32-(%2),31" },
-{ "extrwi.", 4,   PPCCOM,       "rlwinm. %0,%1,((%2)+(%3))&((%2)+(%3)<>32),32-(%2),31" },
-{ "inslwi",  4,   PPCCOM,       "rlwimi %0,%1,(-(%3)!31)&((%3)|31),%3,(%2)+(%3)-1" },
-{ "inslwi.", 4,   PPCCOM,       "rlwimi. %0,%1,(-(%3)!31)&((%3)|31),%3,(%2)+(%3)-1"},
-{ "insrwi",  4,   PPCCOM,       "rlwimi %0,%1,32-((%2)+(%3)),%3,(%2)+(%3)-1" },
-{ "insrwi.", 4,   PPCCOM,       "rlwimi. %0,%1,32-((%2)+(%3)),%3,(%2)+(%3)-1"},
-{ "rotrwi",  3,   PPCCOM,       "rlwinm %0,%1,(-(%2)!31)&((%2)|31),0,31" },
-{ "rotrwi.", 3,   PPCCOM,       "rlwinm. %0,%1,(-(%2)!31)&((%2)|31),0,31" },
-{ "slwi",    3,   PPCCOM,       "rlwinm %0,%1,%2,0,31-(%2)" },
-{ "sli",     3,   PWRCOM,       "rlinm %0,%1,%2,0,31-(%2)" },
-{ "slwi.",   3,   PPCCOM,       "rlwinm. %0,%1,%2,0,31-(%2)" },
-{ "sli.",    3,   PWRCOM,       "rlinm. %0,%1,%2,0,31-(%2)" },
-{ "srwi",    3,   PPCCOM,       "rlwinm %0,%1,(-(%2)!31)&((%2)|31),%2,31" },
-{ "sri",     3,   PWRCOM,       "rlinm %0,%1,(-(%2)!31)&((%2)|31),%2,31" },
-{ "srwi.",   3,   PPCCOM,       "rlwinm. %0,%1,(-(%2)!31)&((%2)|31),%2,31" },
-{ "sri.",    3,   PWRCOM,       "rlinm. %0,%1,(-(%2)!31)&((%2)|31),%2,31" },
-{ "clrrwi",  3,   PPCCOM,       "rlwinm %0,%1,0,0,31-(%2)" },
-{ "clrrwi.", 3,   PPCCOM,       "rlwinm. %0,%1,0,0,31-(%2)" },
-{ "clrlslwi",4,   PPCCOM,       "rlwinm %0,%1,%3,(%2)-(%3),31-(%3)" },
-{ "clrlslwi.",4,  PPCCOM,       "rlwinm. %0,%1,%3,(%2)-(%3),31-(%3)" },
+{"extldi",   4, PPC64,  "rldicr %0,%1,%3,(%2)-1"},
+{"extldi.",  4, PPC64,  "rldicr. %0,%1,%3,(%2)-1"},
+{"extrdi",   4, PPC64,  "rldicl %0,%1,((%2)+(%3))&((%2)+(%3)<>64),64-(%2)"},
+{"extrdi.",  4, PPC64,  "rldicl. %0,%1,((%2)+(%3))&((%2)+(%3)<>64),64-(%2)"},
+{"insrdi",   4, PPC64,  "rldimi %0,%1,64-((%2)+(%3)),%3"},
+{"insrdi.",  4, PPC64,  "rldimi. %0,%1,64-((%2)+(%3)),%3"},
+{"rotrdi",   3, PPC64,  "rldicl %0,%1,(-(%2)!63)&((%2)|63),0"},
+{"rotrdi.",  3, PPC64,  "rldicl. %0,%1,(-(%2)!63)&((%2)|63),0"},
+{"sldi",     3, PPC64,  "rldicr %0,%1,%2,63-(%2)"},
+{"sldi.",    3, PPC64,  "rldicr. %0,%1,%2,63-(%2)"},
+{"srdi",     3, PPC64,  "rldicl %0,%1,(-(%2)!63)&((%2)|63),%2"},
+{"srdi.",    3, PPC64,  "rldicl. %0,%1,(-(%2)!63)&((%2)|63),%2"},
+{"clrrdi",   3, PPC64,  "rldicr %0,%1,0,63-(%2)"},
+{"clrrdi.",  3, PPC64,  "rldicr. %0,%1,0,63-(%2)"},
+{"clrlsldi", 4, PPC64,  "rldic %0,%1,%3,(%2)-(%3)"},
+{"clrlsldi.",4, PPC64,  "rldic. %0,%1,%3,(%2)-(%3)"},
+
+{"extlwi",   4, PPCCOM, "rlwinm %0,%1,%3,0,(%2)-1"},
+{"extlwi.",  4, PPCCOM, "rlwinm. %0,%1,%3,0,(%2)-1"},
+{"extrwi",   4, PPCCOM, "rlwinm %0,%1,((%2)+(%3))&((%2)+(%3)<>32),32-(%2),31"},
+{"extrwi.",  4, PPCCOM, "rlwinm. %0,%1,((%2)+(%3))&((%2)+(%3)<>32),32-(%2),31"},
+{"inslwi",   4, PPCCOM, "rlwimi %0,%1,(-(%3)!31)&((%3)|31),%3,(%2)+(%3)-1"},
+{"inslwi.",  4, PPCCOM, "rlwimi. %0,%1,(-(%3)!31)&((%3)|31),%3,(%2)+(%3)-1"},
+{"insrwi",   4, PPCCOM, "rlwimi %0,%1,32-((%2)+(%3)),%3,(%2)+(%3)-1"},
+{"insrwi.",  4, PPCCOM, "rlwimi. %0,%1,32-((%2)+(%3)),%3,(%2)+(%3)-1"},
+{"rotrwi",   3, PPCCOM, "rlwinm %0,%1,(-(%2)!31)&((%2)|31),0,31"},
+{"rotrwi.",  3, PPCCOM, "rlwinm. %0,%1,(-(%2)!31)&((%2)|31),0,31"},
+{"slwi",     3, PPCCOM, "rlwinm %0,%1,%2,0,31-(%2)"},
+{"sli",      3, PWRCOM, "rlinm %0,%1,%2,0,31-(%2)"},
+{"slwi.",    3, PPCCOM, "rlwinm. %0,%1,%2,0,31-(%2)"},
+{"sli.",     3, PWRCOM, "rlinm. %0,%1,%2,0,31-(%2)"},
+{"srwi",     3, PPCCOM, "rlwinm %0,%1,(-(%2)!31)&((%2)|31),%2,31"},
+{"sri",      3, PWRCOM, "rlinm %0,%1,(-(%2)!31)&((%2)|31),%2,31"},
+{"srwi.",    3, PPCCOM, "rlwinm. %0,%1,(-(%2)!31)&((%2)|31),%2,31"},
+{"sri.",     3, PWRCOM, "rlinm. %0,%1,(-(%2)!31)&((%2)|31),%2,31"},
+{"clrrwi",   3, PPCCOM, "rlwinm %0,%1,0,0,31-(%2)"},
+{"clrrwi.",  3, PPCCOM, "rlwinm. %0,%1,0,0,31-(%2)"},
+{"clrlslwi", 4, PPCCOM, "rlwinm %0,%1,%3,(%2)-(%3),31-(%3)"},
+{"clrlslwi.",4, PPCCOM, "rlwinm. %0,%1,%3,(%2)-(%3),31-(%3)"},
+
+{"e_extlwi", 4, PPCVLE, "e_rlwinm %0,%1,%3,0,(%2)-1"},
+{"e_extrwi", 4, PPCVLE, "e_rlwinm %0,%1,((%2)+(%3))&((%2)+(%3)<>32),32-(%2),31"},
+{"e_inslwi", 4, PPCVLE, "e_rlwimi %0,%1,(-(%3)!31)&((%3)|31),%3,(%2)+(%3)-1"},
+{"e_insrwi", 4, PPCVLE, "e_rlwimi %0,%1,32-((%2)+(%3)),%3,(%2)+(%3)-1"},
+{"e_rotlwi", 3, PPCVLE, "e_rlwinm %0,%1,%2,0,31"},
+{"e_rotrwi", 3, PPCVLE, "e_rlwinm %0,%1,(-(%2)!31)&((%2)|31),0,31"},
+{"e_slwi",   3, PPCVLE, "e_rlwinm %0,%1,%2,0,31-(%2)"},
+{"e_srwi",   3, PPCVLE, "e_rlwinm %0,%1,(-(%2)!31)&((%2)|31),%2,31"},
+{"e_clrlwi", 3, PPCVLE, "e_rlwinm %0,%1,0,%2,31"},
+{"e_clrrwi", 3, PPCVLE, "e_rlwinm %0,%1,0,0,31-(%2)"},
+{"e_clrlslwi",4, PPCVLE, "e_rlwinm %0,%1,%3,(%2)-(%3),31-(%3)"},
 };
 
-const int powerpc_num_macros = ARRAY_SIZE(powerpc_macros);
+const int powerpc_num_macros =
+  sizeof (powerpc_macros) / sizeof (powerpc_macros[0]);
diff --git a/arch/powerpc/xmon/ppc.h b/arch/powerpc/xmon/ppc.h
index 110df96354b4..d00f33dcf192 100644
--- a/arch/powerpc/xmon/ppc.h
+++ b/arch/powerpc/xmon/ppc.h
@@ -1,6 +1,5 @@
 /* ppc.h -- Header file for PowerPC opcode table
-   Copyright 1994, 1995, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
+   Copyright (C) 1994-2016 Free Software Foundation, Inc.
    Written by Ian Lance Taylor, Cygnus Support
 
 This file is part of GDB, GAS, and the GNU binutils.
@@ -22,6 +21,12 @@ Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, US
 #ifndef PPC_H
 #define PPC_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef uint64_t ppc_cpu_t;
+
 /* The opcode table is an array of struct powerpc_opcode.  */
 
 struct powerpc_opcode
@@ -42,7 +47,12 @@ struct powerpc_opcode
   /* One bit flags for the opcode.  These are used to indicate which
      specific processors support the instructions.  The defined values
      are listed below.  */
-  unsigned long flags;
+  ppc_cpu_t flags;
+
+  /* One bit flags for the opcode.  These are used to indicate which
+     specific processors no longer support the instructions.  The defined
+     values are listed below.  */
+  ppc_cpu_t deprecated;
 
   /* An array of operand codes.  Each code is an index into the
      operand table.  They appear in the order which the operands must
@@ -55,6 +65,8 @@ struct powerpc_opcode
    instructions.  */
 extern const struct powerpc_opcode powerpc_opcodes[];
 extern const int powerpc_num_opcodes;
+extern const struct powerpc_opcode vle_opcodes[];
+extern const int vle_num_opcodes;
 
 /* Values defined for the flags field of a struct powerpc_opcode.  */
 
@@ -67,106 +79,178 @@ extern const int powerpc_num_opcodes;
 /* Opcode is defined for the POWER2 (Rios 2) architecture.  */
 #define PPC_OPCODE_POWER2                4
 
-/* Opcode is only defined on 32 bit architectures.  */
-#define PPC_OPCODE_32                    8
-
-/* Opcode is only defined on 64 bit architectures.  */
-#define PPC_OPCODE_64                 0x10
-
 /* Opcode is supported by the Motorola PowerPC 601 processor.  The 601
    is assumed to support all PowerPC (PPC_OPCODE_PPC) instructions,
    but it also supports many additional POWER instructions.  */
-#define PPC_OPCODE_601                0x20
+#define PPC_OPCODE_601                   8
 
 /* Opcode is supported in both the Power and PowerPC architectures
-   (ie, compiler's -mcpu=common or assembler's -mcom).  */
-#define PPC_OPCODE_COMMON             0x40
+   (ie, compiler's -mcpu=common or assembler's -mcom).  More than just
+   the intersection of PPC_OPCODE_PPC with the union of PPC_OPCODE_POWER
+   and PPC_OPCODE_POWER2 because many instructions changed mnemonics
+   between POWER and POWERPC.  */
+#define PPC_OPCODE_COMMON             0x10
 
 /* Opcode is supported for any Power or PowerPC platform (this is
    for the assembler's -many option, and it eliminates duplicates).  */
-#define PPC_OPCODE_ANY                0x80
+#define PPC_OPCODE_ANY                0x20
+
+/* Opcode is only defined on 64 bit architectures.  */
+#define PPC_OPCODE_64                 0x40
 
 /* Opcode is supported as part of the 64-bit bridge.  */
-#define PPC_OPCODE_64_BRIDGE         0x100
+#define PPC_OPCODE_64_BRIDGE          0x80
 
 /* Opcode is supported by Altivec Vector Unit */
-#define PPC_OPCODE_ALTIVEC           0x200
+#define PPC_OPCODE_ALTIVEC           0x100
 
 /* Opcode is supported by PowerPC 403 processor.  */
-#define PPC_OPCODE_403               0x400
+#define PPC_OPCODE_403               0x200
 
 /* Opcode is supported by PowerPC BookE processor.  */
-#define PPC_OPCODE_BOOKE             0x800
-
-/* Opcode is only supported by 64-bit PowerPC BookE processor.  */
-#define PPC_OPCODE_BOOKE64          0x1000
+#define PPC_OPCODE_BOOKE             0x400
 
 /* Opcode is supported by PowerPC 440 processor.  */
-#define PPC_OPCODE_440              0x2000
+#define PPC_OPCODE_440               0x800
 
 /* Opcode is only supported by Power4 architecture.  */
-#define PPC_OPCODE_POWER4           0x4000
-
-/* Opcode isn't supported by Power4 architecture.  */
-#define PPC_OPCODE_NOPOWER4         0x8000
+#define PPC_OPCODE_POWER4           0x1000
 
-/* Opcode is only supported by POWERPC Classic architecture.  */
-#define PPC_OPCODE_CLASSIC         0x10000
+/* Opcode is only supported by Power7 architecture.  */
+#define PPC_OPCODE_POWER7           0x2000
 
 /* Opcode is only supported by e500x2 Core.  */
-#define PPC_OPCODE_SPE             0x20000
+#define PPC_OPCODE_SPE              0x4000
 
 /* Opcode is supported by e500x2 Integer select APU.  */
-#define PPC_OPCODE_ISEL            0x40000
+#define PPC_OPCODE_ISEL             0x8000
 
 /* Opcode is an e500 SPE floating point instruction.  */
-#define PPC_OPCODE_EFS             0x80000
+#define PPC_OPCODE_EFS             0x10000
 
 /* Opcode is supported by branch locking APU.  */
-#define PPC_OPCODE_BRLOCK         0x100000
+#define PPC_OPCODE_BRLOCK          0x20000
 
 /* Opcode is supported by performance monitor APU.  */
-#define PPC_OPCODE_PMR            0x200000
+#define PPC_OPCODE_PMR             0x40000
 
 /* Opcode is supported by cache locking APU.  */
-#define PPC_OPCODE_CACHELCK       0x400000
+#define PPC_OPCODE_CACHELCK        0x80000
 
 /* Opcode is supported by machine check APU.  */
-#define PPC_OPCODE_RFMCI          0x800000
+#define PPC_OPCODE_RFMCI          0x100000
 
 /* Opcode is only supported by Power5 architecture.  */
-#define PPC_OPCODE_POWER5        0x1000000
+#define PPC_OPCODE_POWER5         0x200000
 
 /* Opcode is supported by PowerPC e300 family.  */
-#define PPC_OPCODE_E300          0x2000000
+#define PPC_OPCODE_E300           0x400000
 
 /* Opcode is only supported by Power6 architecture.  */
-#define PPC_OPCODE_POWER6        0x4000000
+#define PPC_OPCODE_POWER6         0x800000
 
 /* Opcode is only supported by PowerPC Cell family.  */
-#define PPC_OPCODE_CELL          0x8000000
+#define PPC_OPCODE_CELL          0x1000000
+
+/* Opcode is supported by CPUs with paired singles support.  */
+#define PPC_OPCODE_PPCPS         0x2000000
+
+/* Opcode is supported by Power E500MC */
+#define PPC_OPCODE_E500MC        0x4000000
+
+/* Opcode is supported by PowerPC 405 processor.  */
+#define PPC_OPCODE_405           0x8000000
+
+/* Opcode is supported by Vector-Scalar (VSX) Unit */
+#define PPC_OPCODE_VSX          0x10000000
+
+/* Opcode is supported by A2.  */
+#define PPC_OPCODE_A2           0x20000000
+
+/* Opcode is supported by PowerPC 476 processor.  */
+#define PPC_OPCODE_476          0x40000000
+
+/* Opcode is supported by AppliedMicro Titan core */
+#define PPC_OPCODE_TITAN        0x80000000
+
+/* Opcode which is supported by the e500 family */
+#define PPC_OPCODE_E500        0x100000000ull
+
+/* Opcode is supported by Extended Altivec Vector Unit */
+#define PPC_OPCODE_ALTIVEC2    0x200000000ull
+
+/* Opcode is supported by Power E6500 */
+#define PPC_OPCODE_E6500       0x400000000ull
+
+/* Opcode is supported by Thread management APU */
+#define PPC_OPCODE_TMR         0x800000000ull
+
+/* Opcode which is supported by the VLE extension.  */
+#define PPC_OPCODE_VLE        0x1000000000ull
+
+/* Opcode is only supported by Power8 architecture.  */
+#define PPC_OPCODE_POWER8     0x2000000000ull
+
+/* Opcode which is supported by the Hardware Transactional Memory extension.  */
+/* Currently, this is the same as the POWER8 mask.  If another cpu comes out
+   that isn't a superset of POWER8, we can define this to its own mask.  */
+#define PPC_OPCODE_HTM        PPC_OPCODE_POWER8
+
+/* Opcode is supported by ppc750cl.  */
+#define PPC_OPCODE_750        0x4000000000ull
+
+/* Opcode is supported by ppc7450.  */
+#define PPC_OPCODE_7450       0x8000000000ull
+
+/* Opcode is supported by ppc821/850/860.  */
+#define PPC_OPCODE_860        0x10000000000ull
+
+/* Opcode is only supported by Power9 architecture.  */
+#define PPC_OPCODE_POWER9     0x20000000000ull
+
+/* Opcode is supported by Vector-Scalar (VSX) Unit from ISA 2.08.  */
+#define PPC_OPCODE_VSX3       0x40000000000ull
+
+  /* Opcode is supported by e200z4.  */
+#define PPC_OPCODE_E200Z4     0x80000000000ull
 
 /* A macro to extract the major opcode from an instruction.  */
 #define PPC_OP(i) (((i) >> 26) & 0x3f)
+
+/* A macro to determine if the instruction is a 2-byte VLE insn.  */
+#define PPC_OP_SE_VLE(m) ((m) <= 0xffff)
+
+/* A macro to extract the major opcode from a VLE instruction.  */
+#define VLE_OP(i,m) (((i) >> ((m) <= 0xffff ? 10 : 26)) & 0x3f)
+
+/* A macro to convert a VLE opcode to a VLE opcode segment.  */
+#define VLE_OP_TO_SEG(i) ((i) >> 1)
 
 /* The operands table is an array of struct powerpc_operand.  */
 
 struct powerpc_operand
 {
-  /* The number of bits in the operand.  */
-  int bits;
-
-  /* How far the operand is left shifted in the instruction.  */
+  /* A bitmask of bits in the operand.  */
+  unsigned int bitm;
+
+  /* The shift operation to be applied to the operand.  No shift
+     is made if this is zero.  For positive values, the operand
+     is shifted left by SHIFT.  For negative values, the operand
+     is shifted right by -SHIFT.  Use PPC_OPSHIFT_INV to indicate
+     that BITM and SHIFT cannot be used to determine where the
+     operand goes in the insn.  */
   int shift;
 
   /* Insertion function.  This is used by the assembler.  To insert an
      operand value into an instruction, check this field.
 
      If it is NULL, execute
-         i |= (op & ((1 << o->bits) - 1)) << o->shift;
+         if (o->shift >= 0)
+           i |= (op & o->bitm) << o->shift;
+         else
+           i |= (op & o->bitm) >> -o->shift;
      (i is the instruction which we are filling in, o is a pointer to
-     this structure, and op is the opcode value; this assumes twos
-     complement arithmetic).
+     this structure, and op is the operand value).
 
      If this field is not NULL, then simply call it with the
      instruction and the operand value.  It will return the new value
@@ -176,18 +260,20 @@ struct powerpc_operand
      operand value is legal, *ERRMSG will be unchanged (most operands
      can accept any value).  */
   unsigned long (*insert)
-    (unsigned long instruction, long op, int dialect, const char **errmsg);
+    (unsigned long instruction, long op, ppc_cpu_t dialect, const char **errmsg);
 
   /* Extraction function.  This is used by the disassembler.  To
      extract this operand type from an instruction, check this field.
 
      If it is NULL, compute
-         op = ((i) >> o->shift) & ((1 << o->bits) - 1);
-         if ((o->flags & PPC_OPERAND_SIGNED) != 0
-             && (op & (1 << (o->bits - 1))) != 0)
-           op -= 1 << o->bits;
+         if (o->shift >= 0)
+           op = (i >> o->shift) & o->bitm;
+         else
+           op = (i << -o->shift) & o->bitm;
+         if ((o->flags & PPC_OPERAND_SIGNED) != 0)
+           sign_extend (op);
      (i is the instruction, o is a pointer to this structure, and op
-     is the result; this assumes twos complement arithmetic).
+     is the result).
 
      If this field is not NULL, then simply call it with the
      instruction value.  It will return the value of the operand.  If
@@ -195,7 +281,7 @@ struct powerpc_operand
      non-zero if this operand type can not actually be extracted from
      this operand (i.e., the instruction does not match).  If the
      operand is valid, *INVALID will not be changed.  */
-  long (*extract) (unsigned long instruction, int dialect, int *invalid);
+  long (*extract) (unsigned long instruction, ppc_cpu_t dialect, int *invalid);
 
   /* One bit syntax flags.  */
   unsigned long flags;
@@ -205,17 +291,23 @@ struct powerpc_operand
    the operands field of the powerpc_opcodes table.  */
 
 extern const struct powerpc_operand powerpc_operands[];
+extern const unsigned int num_powerpc_operands;
+
+/* Use with the shift field of a struct powerpc_operand to indicate
+     that BITM and SHIFT cannot be used to determine where the operand
+     goes in the insn.  */
+#define PPC_OPSHIFT_INV (-1U << 31)
 
 /* Values defined for the flags field of a struct powerpc_operand.  */
 
 /* This operand takes signed values.  */
-#define PPC_OPERAND_SIGNED (01)
+#define PPC_OPERAND_SIGNED (0x1)
 
 /* This operand takes signed values, but also accepts a full positive
    range of values when running in 32 bit mode.  That is, if bits is
    16, it takes any value from -0x8000 to 0xffff.  In 64 bit mode,
    this flag is ignored.  */
-#define PPC_OPERAND_SIGNOPT (02)
+#define PPC_OPERAND_SIGNOPT (0x2)
 
 /* This operand does not actually exist in the assembler input.  This
    is used to support extended mnemonics such as mr, for which two
@@ -223,14 +315,14 @@ extern const struct powerpc_operand powerpc_operands[];
    insert function with any op value.  The disassembler should call
    the extract function, ignore the return value, and check the value
    placed in the valid argument.  */
-#define PPC_OPERAND_FAKE (04)
+#define PPC_OPERAND_FAKE (0x4)
 
 /* The next operand should be wrapped in parentheses rather than
    separated from this one by a comma.  This is used for the load and
    store instructions which want their operands to look like
        reg,displacement(reg)
    */
-#define PPC_OPERAND_PARENS (010)
+#define PPC_OPERAND_PARENS (0x8)
 
 /* This operand may use the symbolic names for the CR fields, which
    are
@@ -239,26 +331,26 @@ extern const struct powerpc_operand powerpc_operands[];
        cr4 4    cr5 5   cr6 6   cr7 7
    These may be combined arithmetically, as in cr2*4+gt.  These are
    only supported on the PowerPC, not the POWER.  */
-#define PPC_OPERAND_CR (020)
+#define PPC_OPERAND_CR_BIT (0x10)
 
 /* This operand names a register.  The disassembler uses this to print
    register names with a leading 'r'.  */
-#define PPC_OPERAND_GPR (040)
+#define PPC_OPERAND_GPR (0x20)
 
 /* Like PPC_OPERAND_GPR, but don't print a leading 'r' for r0.  */
-#define PPC_OPERAND_GPR_0 (0100)
+#define PPC_OPERAND_GPR_0 (0x40)
 
 /* This operand names a floating point register.  The disassembler
    prints these with a leading 'f'.  */
-#define PPC_OPERAND_FPR (0200)
+#define PPC_OPERAND_FPR (0x80)
 
 /* This operand is a relative branch displacement.  The disassembler
    prints these symbolically if possible.  */
-#define PPC_OPERAND_RELATIVE (0400)
+#define PPC_OPERAND_RELATIVE (0x100)
 
 /* This operand is an absolute branch address.  The disassembler
    prints these symbolically if possible.  */
-#define PPC_OPERAND_ABSOLUTE (01000)
+#define PPC_OPERAND_ABSOLUTE (0x200)
 
 /* This operand is optional, and is zero if omitted.  This is used for
    example, in the optional BF field in the comparison instructions.  The
@@ -266,7 +358,7 @@ extern const struct powerpc_operand powerpc_operands[];
    and the number of operands remaining for the opcode, and decide
    whether this operand is present or not.  The disassembler should
    print this operand out only if it is not zero.  */
-#define PPC_OPERAND_OPTIONAL (02000)
+#define PPC_OPERAND_OPTIONAL (0x400)
 
 /* This flag is only used with PPC_OPERAND_OPTIONAL.  If this operand
    is omitted, then for the next operand use this operand value plus
@@ -274,24 +366,48 @@ extern const struct powerpc_operand powerpc_operands[];
    hack is needed because the Power rotate instructions can take
    either 4 or 5 operands.  The disassembler should print this operand
    out regardless of the PPC_OPERAND_OPTIONAL field.  */
-#define PPC_OPERAND_NEXT (04000)
+#define PPC_OPERAND_NEXT (0x800)
 
 /* This operand should be regarded as a negative number for the
    purposes of overflow checking (i.e., the normal most negative
    number is disallowed and one more than the normal most positive
    number is allowed).  This flag will only be set for a signed
    operand.  */
-#define PPC_OPERAND_NEGATIVE (010000)
+#define PPC_OPERAND_NEGATIVE (0x1000)
 
 /* This operand names a vector unit register.  The disassembler
    prints these with a leading 'v'.  */
-#define PPC_OPERAND_VR (020000)
+#define PPC_OPERAND_VR (0x2000)
 
 /* This operand is for the DS field in a DS form instruction.  */
-#define PPC_OPERAND_DS (040000)
+#define PPC_OPERAND_DS (0x4000)
 
 /* This operand is for the DQ field in a DQ form instruction.  */
-#define PPC_OPERAND_DQ (0100000)
+#define PPC_OPERAND_DQ (0x8000)
+
+/* Valid range of operand is 0..n rather than 0..n-1.  */
+#define PPC_OPERAND_PLUS1 (0x10000)
+
+/* Xilinx APU and FSL related operands */
+#define PPC_OPERAND_FSL (0x20000)
+#define PPC_OPERAND_FCR (0x40000)
+#define PPC_OPERAND_UDI (0x80000)
+
+/* This operand names a vector-scalar unit register.  The disassembler
+   prints these with a leading 'vs'.  */
+#define PPC_OPERAND_VSR (0x100000)
+
+/* This is a CR FIELD that does not use symbolic names.  */
+#define PPC_OPERAND_CR_REG (0x200000)
+
+/* This flag is only used with PPC_OPERAND_OPTIONAL.  If this operand
+   is omitted, then the value it should use for the operand is stored
+   in the SHIFT field of the immediatly following operand field.  */
+#define PPC_OPERAND_OPTIONAL_VALUE (0x400000)
+
+/* This flag is only used with PPC_OPERAND_OPTIONAL.  The operand is
+   only optional when generating 32-bit code.  */
+#define PPC_OPERAND_OPTIONAL32 (0x800000)
 
 /* The POWER and PowerPC assemblers use a few macros.  We keep them
    with the operands table for simplicity.  The macro table is an
@@ -308,7 +424,7 @@ struct powerpc_macro
   /* One bit flags for the opcode.  These are used to indicate which
      specific processors support the instructions.  The values are the
      same as those for the struct powerpc_opcode flags field.  */
-  unsigned long flags;
+  ppc_cpu_t flags;
 
   /* A format string to turn the macro into a normal instruction.
      Each %N in the string is replaced with operand number N (zero
@@ -319,4 +435,18 @@ struct powerpc_macro
 extern const struct powerpc_macro powerpc_macros[];
 extern const int powerpc_num_macros;
 
+extern ppc_cpu_t ppc_parse_cpu (ppc_cpu_t, ppc_cpu_t *, const char *);
+
+static inline long
+ppc_optional_operand_value (const struct powerpc_operand *operand)
+{
+  if ((operand->flags & PPC_OPERAND_OPTIONAL_VALUE) != 0)
+    return (operand+1)->shift;
+  return 0;
+}
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* PPC_H */
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index 5720236d0266..26fa03fc9f3c 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -212,6 +212,10 @@ Commands:\n\
   "\
   C     checksum\n\
   d     dump bytes\n\
+  d1    dump 1 byte values\n\
+  d2    dump 2 byte values\n\
+  d4    dump 4 byte values\n\
+  d8    dump 8 byte values\n\
   di    dump instructions\n\
   df    dump float values\n\
   dd    dump double values\n\
@@ -2334,9 +2338,42 @@ static void dump_pacas(void)
 }
 #endif
 
+static void dump_by_size(unsigned long addr, long count, int size)
+{
+        unsigned char temp[16];
+        int i, j;
+        u64 val;
+
+        count = ALIGN(count, 16);
+
+        for (i = 0; i < count; i += 16, addr += 16) {
+                printf(REG, addr);
+
+                if (mread(addr, temp, 16) != 16) {
+                        printf("\nFaulted reading %d bytes from 0x"REG"\n", 16, addr);
+                        return;
+                }
+
+                for (j = 0; j < 16; j += size) {
+                        putchar(' ');
+                        switch (size) {
+                        case 1: val = temp[j]; break;
+                        case 2: val = *(u16 *)&temp[j]; break;
+                        case 4: val = *(u32 *)&temp[j]; break;
+                        case 8: val = *(u64 *)&temp[j]; break;
+                        default: val = 0;
+                        }
+
+                        printf("%0*lx", size * 2, val);
+                }
+                printf("\n");
+        }
+}
+
 static void
 dump(void)
 {
+        static char last[] = { "d?\n" };
         int c;
 
         c = inchar();
@@ -2350,8 +2387,9 @@ dump(void)
         }
 #endif
 
-        if ((isxdigit(c) && c != 'f' && c != 'd') || c == '\n')
+        if (c == '\n')
                 termch = c;
+
         scanhex((void *)&adrs);
         if (termch != '\n')
                 termch = 0;
@@ -2383,9 +2421,23 @@ dump(void)
                         ndump = 64;
                 else if (ndump > MAX_DUMP)
                         ndump = MAX_DUMP;
-                prdump(adrs, ndump);
+
+                switch (c) {
+                case '8':
+                case '4':
+                case '2':
+                case '1':
+                        ndump = ALIGN(ndump, 16);
+                        dump_by_size(adrs, ndump, c - '0');
+                        last[1] = c;
+                        last_cmd = last;
+                        break;
+                default:
+                        prdump(adrs, ndump);
+                        last_cmd = "d\n";
+                }
+
                 adrs += ndump;
-                last_cmd = "d\n";
         }
 }
 
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index ad0118fbce90..c74ae9ce8dc4 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -345,8 +345,6 @@ SECTIONS
         DISCARDS
         /DISCARD/ : {
                 *(.eh_frame)
-                *(__func_stack_frame_non_standard)
-                *(__unreachable)
         }
 }
 
diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c
index 90d112a3063a..5edfd9c49044 100644
--- a/drivers/acpi/acpi_lpss.c
+++ b/drivers/acpi/acpi_lpss.c
@@ -21,6 +21,7 @@
 #include <linux/platform_data/x86/pmc_atom.h>
 #include <linux/pm_domain.h>
 #include <linux/pm_runtime.h>
+#include <linux/pwm.h>
 #include <linux/delay.h>
 
 #include "internal.h"
@@ -154,6 +155,18 @@ static void byt_i2c_setup(struct lpss_private_data *pdata)
         writel(0, pdata->mmio_base + LPSS_I2C_ENABLE);
 }
 
+/* BSW PWM used for backlight control by the i915 driver */
+static struct pwm_lookup bsw_pwm_lookup[] = {
+        PWM_LOOKUP_WITH_MODULE("80862288:00", 0, "0000:00:02.0",
+                               "pwm_backlight", 0, PWM_POLARITY_NORMAL,
+                               "pwm-lpss-platform"),
+};
+
+static void bsw_pwm_setup(struct lpss_private_data *pdata)
+{
+        pwm_add_table(bsw_pwm_lookup, ARRAY_SIZE(bsw_pwm_lookup));
+}
+
 static const struct lpss_device_desc lpt_dev_desc = {
         .flags = LPSS_CLK | LPSS_CLK_GATE | LPSS_CLK_DIVIDER | LPSS_LTR,
         .prv_offset = 0x800,
@@ -191,6 +204,7 @@ static const struct lpss_device_desc byt_pwm_dev_desc = {
 
 static const struct lpss_device_desc bsw_pwm_dev_desc = {
         .flags = LPSS_SAVE_CTX | LPSS_NO_D3_DELAY,
+        .setup = bsw_pwm_setup,
 };
 
 static const struct lpss_device_desc byt_uart_dev_desc = {
diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c
index 718f832a5c71..0007b792827b 100644
--- a/drivers/dma-buf/dma-buf.c
+++ b/drivers/dma-buf/dma-buf.c
@@ -325,6 +325,9 @@ static const struct file_operations dma_buf_fops = {
         .llseek         = dma_buf_llseek,
         .poll           = dma_buf_poll,
         .unlocked_ioctl = dma_buf_ioctl,
+#ifdef CONFIG_COMPAT
+        .compat_ioctl   = dma_buf_ioctl,
+#endif
 };
 
 /*
diff --git a/drivers/gpu/drm/ast/ast_dram_tables.h b/drivers/gpu/drm/ast/ast_dram_tables.h
index cc04539c0ff3..1d9c4e75d303 100644
--- a/drivers/gpu/drm/ast/ast_dram_tables.h
+++ b/drivers/gpu/drm/ast/ast_dram_tables.h
@@ -141,4 +141,66 @@ static const struct ast_dramstruct ast2100_dram_table_data[] = {
         { 0xffff, 0xffffffff },
 };
 
+/*
+ * AST2500 DRAM settings modules
+ */
+#define REGTBL_NUM           17
+#define REGIDX_010           0
+#define REGIDX_014           1
+#define REGIDX_018           2
+#define REGIDX_020           3
+#define REGIDX_024           4
+#define REGIDX_02C           5
+#define REGIDX_030           6
+#define REGIDX_214           7
+#define REGIDX_2E0           8
+#define REGIDX_2E4           9
+#define REGIDX_2E8           10
+#define REGIDX_2EC           11
+#define REGIDX_2F0           12
+#define REGIDX_2F4           13
+#define REGIDX_2F8           14
+#define REGIDX_RFC           15
+#define REGIDX_PLL           16
+
+static const u32 ast2500_ddr3_1600_timing_table[REGTBL_NUM] = {
+        0x64604D38,                  /* 0x010 */
+        0x29690599,                  /* 0x014 */
+        0x00000300,                  /* 0x018 */
+        0x00000000,                  /* 0x020 */
+        0x00000000,                  /* 0x024 */
+        0x02181E70,                  /* 0x02C */
+        0x00000040,                  /* 0x030 */
+        0x00000024,                  /* 0x214 */
+        0x02001300,                  /* 0x2E0 */
+        0x0E0000A0,                  /* 0x2E4 */
+        0x000E001B,                  /* 0x2E8 */
+        0x35B8C105,                  /* 0x2EC */
+        0x08090408,                  /* 0x2F0 */
+        0x9B000800,                  /* 0x2F4 */
+        0x0E400A00,                  /* 0x2F8 */
+        0x9971452F,                  /* tRFC  */
+        0x000071C1                   /* PLL   */
+};
+
+static const u32 ast2500_ddr4_1600_timing_table[REGTBL_NUM] = {
+        0x63604E37,                  /* 0x010 */
+        0xE97AFA99,                  /* 0x014 */
+        0x00019000,                  /* 0x018 */
+        0x08000000,                  /* 0x020 */
+        0x00000400,                  /* 0x024 */
+        0x00000410,                  /* 0x02C */
+        0x00000101,                  /* 0x030 */
+        0x00000024,                  /* 0x214 */
+        0x03002900,                  /* 0x2E0 */
+        0x0E0000A0,                  /* 0x2E4 */
+        0x000E001C,                  /* 0x2E8 */
+        0x35B8C106,                  /* 0x2EC */
+        0x08080607,                  /* 0x2F0 */
+        0x9B000900,                  /* 0x2F4 */
+        0x0E400A00,                  /* 0x2F8 */
+        0x99714545,                  /* tRFC  */
+        0x000071C1                   /* PLL   */
+};
+
 #endif
diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h
index 5a8fa1c85229..8880f0b62e9c 100644
--- a/drivers/gpu/drm/ast/ast_drv.h
+++ b/drivers/gpu/drm/ast/ast_drv.h
@@ -65,6 +65,7 @@ enum ast_chip {
         AST2150,
         AST2300,
         AST2400,
+        AST2500,
         AST1180,
 };
 
@@ -81,6 +82,7 @@ enum ast_tx_chip {
 #define AST_DRAM_1Gx32   3
 #define AST_DRAM_2Gx16   6
 #define AST_DRAM_4Gx16   7
+#define AST_DRAM_8Gx16   8
 
 struct ast_fbdev;
 
@@ -114,7 +116,11 @@ struct ast_private {
         struct ttm_bo_kmap_obj cache_kmap;
         int next_cursor;
         bool support_wide_screen;
-        bool DisableP2A;
+        enum {
+                ast_use_p2a,
+                ast_use_dt,
+                ast_use_defaults
+        } config_mode;
 
         enum ast_tx_chip tx_chip_type;
         u8 dp501_maxclk;
@@ -301,8 +307,8 @@ struct ast_vbios_dclk_info {
 };
 
 struct ast_vbios_mode_info {
-        struct ast_vbios_stdtable *std_table;
-        struct ast_vbios_enhtable *enh_table;
+        const struct ast_vbios_stdtable *std_table;
+        const struct ast_vbios_enhtable *enh_table;
 };
 
 extern int ast_mode_init(struct drm_device *dev);
diff --git a/drivers/gpu/drm/ast/ast_main.c b/drivers/gpu/drm/ast/ast_main.c
index 993909430736..262c2c0e43b4 100644
--- a/drivers/gpu/drm/ast/ast_main.c
+++ b/drivers/gpu/drm/ast/ast_main.c
@@ -32,8 +32,6 @@
 #include <drm/drm_fb_helper.h>
 #include <drm/drm_crtc_helper.h>
 
-#include "ast_dram_tables.h"
-
 void ast_set_index_reg_mask(struct ast_private *ast,
                             uint32_t base, uint8_t index,
                             uint8_t mask, uint8_t val)
@@ -62,30 +60,99 @@ uint8_t ast_get_index_reg_mask(struct ast_private *ast,
         return ret;
 }
 
+static void ast_detect_config_mode(struct drm_device *dev, u32 *scu_rev)
+{
+        struct device_node *np = dev->pdev->dev.of_node;
+        struct ast_private *ast = dev->dev_private;
+        uint32_t data, jregd0, jregd1;
+
+        /* Defaults */
+        ast->config_mode = ast_use_defaults;
+        *scu_rev = 0xffffffff;
+
+        /* Check if we have device-tree properties */
+        if (np && !of_property_read_u32(np, "aspeed,scu-revision-id",
+                                        scu_rev)) {
+                /* We do, disable P2A access */
+                ast->config_mode = ast_use_dt;
+                DRM_INFO("Using device-tree for configuration\n");
+                return;
+        }
+
+        /* Not all families have a P2A bridge */
+        if (dev->pdev->device != PCI_CHIP_AST2000)
+                return;
+
+        /*
+         * The BMC will set SCU 0x40 D[12] to 1 if the P2 bridge
+         * is disabled. We force using P2A if VGA only mode bit
+         * is set D[7]
+         */
+        jregd0 = ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xd0, 0xff);
+        jregd1 = ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xd1, 0xff);
+        if (!(jregd0 & 0x80) || !(jregd1 & 0x10)) {
+                /* Double check it's actually working */
+                data = ast_read32(ast, 0xf004);
+                if (data != 0xFFFFFFFF) {
+                        /* P2A works, grab silicon revision */
+                        ast->config_mode = ast_use_p2a;
+
+                        DRM_INFO("Using P2A bridge for configuration\n");
+
+                        /* Read SCU7c (silicon revision register) */
+                        ast_write32(ast, 0xf004, 0x1e6e0000);
+                        ast_write32(ast, 0xf000, 0x1);
+                        *scu_rev = ast_read32(ast, 0x1207c);
+                        return;
+                }
+        }
+
+        /* We have a P2A bridge but it's disabled */
+        DRM_INFO("P2A bridge disabled, using default configuration\n");
+}
 
 static int ast_detect_chip(struct drm_device *dev, bool *need_post)
 {
         struct ast_private *ast = dev->dev_private;
-        uint32_t data, jreg;
+        uint32_t jreg, scu_rev;
+
+        /*
+         * If VGA isn't enabled, we need to enable now or subsequent
+         * access to the scratch registers will fail. We also inform
+         * our caller that it needs to POST the chip
+         * (Assumption: VGA not enabled -> need to POST)
+         */
+        if (!ast_is_vga_enabled(dev)) {
+                ast_enable_vga(dev);
+                DRM_INFO("VGA not enabled on entry, requesting chip POST\n");
+                *need_post = true;
+        } else
+                *need_post = false;
+
+
+        /* Enable extended register access */
+        ast_enable_mmio(dev);
         ast_open_key(ast);
 
+        /* Find out whether P2A works or whether to use device-tree */
+        ast_detect_config_mode(dev, &scu_rev);
+
+        /* Identify chipset */
         if (dev->pdev->device == PCI_CHIP_AST1180) {
                 ast->chip = AST1100;
                 DRM_INFO("AST 1180 detected\n");
         } else {
-                if (dev->pdev->revision >= 0x30) {
+                if (dev->pdev->revision >= 0x40) {
+                        ast->chip = AST2500;
+                        DRM_INFO("AST 2500 detected\n");
+                } else if (dev->pdev->revision >= 0x30) {
                         ast->chip = AST2400;
                         DRM_INFO("AST 2400 detected\n");
                 } else if (dev->pdev->revision >= 0x20) {
                         ast->chip = AST2300;
                         DRM_INFO("AST 2300 detected\n");
                 } else if (dev->pdev->revision >= 0x10) {
-                        uint32_t data;
-                        ast_write32(ast, 0xf004, 0x1e6e0000);
-                        ast_write32(ast, 0xf000, 0x1);
-
-                        data = ast_read32(ast, 0x1207c);
-                        switch (data & 0x0300) {
+                        switch (scu_rev & 0x0300) {
                         case 0x0200:
                                 ast->chip = AST1100;
                                 DRM_INFO("AST 1100 detected\n");
@@ -110,26 +177,6 @@ static int ast_detect_chip(struct drm_device *dev, bool *need_post)
                 }
         }
 
-        /*
-         * If VGA isn't enabled, we need to enable now or subsequent
-         * access to the scratch registers will fail. We also inform
-         * our caller that it needs to POST the chip
-         * (Assumption: VGA not enabled -> need to POST)
-         */
-        if (!ast_is_vga_enabled(dev)) {
-                ast_enable_vga(dev);
-                ast_enable_mmio(dev);
-                DRM_INFO("VGA not enabled on entry, requesting chip POST\n");
-                *need_post = true;
-        } else
-                *need_post = false;
-
-        /* Check P2A Access */
-        ast->DisableP2A = true;
-        data = ast_read32(ast, 0xf004);
-        if (data != 0xFFFFFFFF)
-                ast->DisableP2A = false;
-
         /* Check if we support wide screen */
         switch (ast->chip) {
         case AST1180:
@@ -146,17 +193,15 @@ static int ast_detect_chip(struct drm_device *dev, bool *need_post)
                         ast->support_wide_screen = true;
                 else {
                         ast->support_wide_screen = false;
-                        if (ast->DisableP2A == false) {
-                                /* Read SCU7c (silicon revision register) */
-                                ast_write32(ast, 0xf004, 0x1e6e0000);
-                                ast_write32(ast, 0xf000, 0x1);
-                                data = ast_read32(ast, 0x1207c);
-                                data &= 0x300;
-                                if (ast->chip == AST2300 && data == 0x0) /* ast1300 */
-                                        ast->support_wide_screen = true;
-                                if (ast->chip == AST2400 && data == 0x100) /* ast1400 */
-                                        ast->support_wide_screen = true;
-                        }
+                        if (ast->chip == AST2300 &&
+                            (scu_rev & 0x300) == 0x0) /* ast1300 */
+                                ast->support_wide_screen = true;
+                        if (ast->chip == AST2400 &&
+                            (scu_rev & 0x300) == 0x100) /* ast1400 */
+                                ast->support_wide_screen = true;
+                        if (ast->chip == AST2500 &&
+                            scu_rev == 0x100)           /* ast2510 */
+                                ast->support_wide_screen = true;
                 }
                 break;
         }
@@ -220,85 +265,121 @@ static int ast_detect_chip(struct drm_device *dev, bool *need_post)
 
 static int ast_get_dram_info(struct drm_device *dev)
 {
+        struct device_node *np = dev->pdev->dev.of_node;
         struct ast_private *ast = dev->dev_private;
-        uint32_t data, data2;
-        uint32_t denum, num, div, ref_pll;
+        uint32_t mcr_cfg, mcr_scu_mpll, mcr_scu_strap;
+        uint32_t denum, num, div, ref_pll, dsel;
 
-        if (ast->DisableP2A)
-        {
-                ast->dram_bus_width = 16;
-                ast->dram_type = AST_DRAM_1Gx16;
-                ast->mclk = 396;
-        }
-        else
-        {
+        switch (ast->config_mode) {
+        case ast_use_dt:
+                /*
+                 * If some properties are missing, use reasonable
+                 * defaults for AST2400
+                 */
+                if (of_property_read_u32(np, "aspeed,mcr-configuration",
+                                         &mcr_cfg))
+                        mcr_cfg = 0x00000577;
+                if (of_property_read_u32(np, "aspeed,mcr-scu-mpll",
+                                         &mcr_scu_mpll))
+                        mcr_scu_mpll = 0x000050C0;
+                if (of_property_read_u32(np, "aspeed,mcr-scu-strap",
+                                         &mcr_scu_strap))
+                        mcr_scu_strap = 0;
+                break;
+        case ast_use_p2a:
                 ast_write32(ast, 0xf004, 0x1e6e0000);
                 ast_write32(ast, 0xf000, 0x1);
-                data = ast_read32(ast, 0x10004);
-
-                if (data & 0x40)
-                        ast->dram_bus_width = 16;
+                mcr_cfg = ast_read32(ast, 0x10004);
+                mcr_scu_mpll = ast_read32(ast, 0x10120);
+                mcr_scu_strap = ast_read32(ast, 0x10170);
+                break;
+        case ast_use_defaults:
+        default:
+                ast->dram_bus_width = 16;
+                ast->dram_type = AST_DRAM_1Gx16;
+                if (ast->chip == AST2500)
+                        ast->mclk = 800;
                 else
-                        ast->dram_bus_width = 32;
-
-                if (ast->chip == AST2300 || ast->chip == AST2400) {
-                        switch (data & 0x03) {
-                        case 0:
-                                ast->dram_type = AST_DRAM_512Mx16;
-                                break;
-                        default:
-                        case 1:
-                                ast->dram_type = AST_DRAM_1Gx16;
-                                break;
-                        case 2:
-                                ast->dram_type = AST_DRAM_2Gx16;
-                                break;
-                        case 3:
-                                ast->dram_type = AST_DRAM_4Gx16;
-                                break;
-                        }
-                } else {
-                        switch (data & 0x0c) {
-                        case 0:
-                        case 4:
-                                ast->dram_type = AST_DRAM_512Mx16;
-                                break;
-                        case 8:
-                                if (data & 0x40)
-                                        ast->dram_type = AST_DRAM_1Gx16;
-                                else
-                                        ast->dram_type = AST_DRAM_512Mx32;
-                                break;
-                        case 0xc:
-                                ast->dram_type = AST_DRAM_1Gx32;
-                                break;
-                        }
-                }
+                        ast->mclk = 396;
+                return 0;
+        }
 
-                data = ast_read32(ast, 0x10120);
-                data2 = ast_read32(ast, 0x10170);
-                if (data2 & 0x2000)
-                        ref_pll = 14318;
-                else
-                        ref_pll = 12000;
+        if (mcr_cfg & 0x40)
+                ast->dram_bus_width = 16;
+        else
+                ast->dram_bus_width = 32;
 
-                denum = data & 0x1f;
-                num = (data & 0x3fe0) >> 5;
-                data = (data & 0xc000) >> 14;
-                switch (data) {
-                case 3:
-                        div = 0x4;
+        if (ast->chip == AST2500) {
+                switch (mcr_cfg & 0x03) {
+                case 0:
+                        ast->dram_type = AST_DRAM_1Gx16;
                         break;
-                case 2:
+                default:
                 case 1:
-                        div = 0x2;
+                        ast->dram_type = AST_DRAM_2Gx16;
+                        break;
+                case 2:
+                        ast->dram_type = AST_DRAM_4Gx16;
+                        break;
+                case 3:
+                        ast->dram_type = AST_DRAM_8Gx16;
+                        break;
+                }
+        } else if (ast->chip == AST2300 || ast->chip == AST2400) {
+                switch (mcr_cfg & 0x03) {
+                case 0:
+                        ast->dram_type = AST_DRAM_512Mx16;
                         break;
                 default:
-                        div = 0x1;
+                case 1:
+                        ast->dram_type = AST_DRAM_1Gx16;
+                        break;
+                case 2:
+                        ast->dram_type = AST_DRAM_2Gx16;
+                        break;
+                case 3:
+                        ast->dram_type = AST_DRAM_4Gx16;
+                        break;
+                }
+        } else {
+                switch (mcr_cfg & 0x0c) {
+                case 0:
+                case 4:
+                        ast->dram_type = AST_DRAM_512Mx16;
+                        break;
+                case 8:
+                        if (mcr_cfg & 0x40)
+                                ast->dram_type = AST_DRAM_1Gx16;
+                        else
+                                ast->dram_type = AST_DRAM_512Mx32;
+                        break;
+                case 0xc:
+                        ast->dram_type = AST_DRAM_1Gx32;
                         break;
                 }
-                ast->mclk = ref_pll * (num + 2) / (denum + 2) * (div * 1000);
         }
+
+        if (mcr_scu_strap & 0x2000)
+                ref_pll = 14318;
+        else
+                ref_pll = 12000;
+
+        denum = mcr_scu_mpll & 0x1f;
+        num = (mcr_scu_mpll & 0x3fe0) >> 5;
+        dsel = (mcr_scu_mpll & 0xc000) >> 14;
+        switch (dsel) {
+        case 3:
+                div = 0x4;
+                break;
+        case 2:
+        case 1:
+                div = 0x2;
+                break;
+        default:
+                div = 0x1;
+                break;
+        }
+        ast->mclk = ref_pll * (num + 2) / ((denum + 2) * (div * 1000));
         return 0;
 }
 
@@ -437,17 +518,19 @@ int ast_driver_load(struct drm_device *dev, unsigned long flags)
 
         ast_detect_chip(dev, &need_post);
 
+        if (need_post)
+                ast_post_gpu(dev);
+
         if (ast->chip != AST1180) {
                 ret = ast_get_dram_info(dev);
                 if (ret)
                         goto out_free;
                 ast->vram_size = ast_get_vram_info(dev);
-                DRM_INFO("dram %d %d %d %08x\n", ast->mclk, ast->dram_type, ast->dram_bus_width, ast->vram_size);
+                DRM_INFO("dram MCLK=%u Mhz type=%d bus_width=%d size=%08x\n",
+                         ast->mclk, ast->dram_type,
+                         ast->dram_bus_width, ast->vram_size);
         }
 
-        if (need_post)
-                ast_post_gpu(dev);
-
         ret = ast_mm_init(ast);
         if (ret)
                 goto out_free;
@@ -465,6 +548,7 @@ int ast_driver_load(struct drm_device *dev, unsigned long flags)
             ast->chip == AST2200 ||
             ast->chip == AST2300 ||
             ast->chip == AST2400 ||
+            ast->chip == AST2500 ||
             ast->chip == AST1180) {
                 dev->mode_config.max_width = 1920;
                 dev->mode_config.max_height = 2048;
diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c
index 606cb40f6c7c..47b78e52691c 100644
--- a/drivers/gpu/drm/ast/ast_mode.c
+++ b/drivers/gpu/drm/ast/ast_mode.c
@@ -81,9 +81,9 @@ static bool ast_get_vbios_mode_info(struct drm_crtc *crtc, struct drm_display_mo
         struct ast_private *ast = crtc->dev->dev_private;
         const struct drm_framebuffer *fb = crtc->primary->fb;
         u32 refresh_rate_index = 0, mode_id, color_index, refresh_rate;
+        const struct ast_vbios_enhtable *best = NULL;
         u32 hborder, vborder;
         bool check_sync;
-        struct ast_vbios_enhtable *best = NULL;
 
         switch (fb->format->cpp[0] * 8) {
         case 8:
@@ -147,7 +147,7 @@ static bool ast_get_vbios_mode_info(struct drm_crtc *crtc, struct drm_display_mo
         refresh_rate = drm_mode_vrefresh(mode);
         check_sync = vbios_mode->enh_table->flags & WideScreenMode;
         do {
-                struct ast_vbios_enhtable *loop = vbios_mode->enh_table;
+                const struct ast_vbios_enhtable *loop = vbios_mode->enh_table;
 
                 while (loop->refresh_rate != 0xff) {
                         if ((check_sync) &&
@@ -227,7 +227,7 @@ static void ast_set_std_reg(struct drm_crtc *crtc, struct drm_display_mode *mode
                             struct ast_vbios_mode_info *vbios_mode)
 {
         struct ast_private *ast = crtc->dev->dev_private;
-        struct ast_vbios_stdtable *stdtable;
+        const struct ast_vbios_stdtable *stdtable;
         u32 i;
         u8 jreg;
 
@@ -273,7 +273,11 @@ static void ast_set_crtc_reg(struct drm_crtc *crtc, struct drm_display_mode *mod
 {
         struct ast_private *ast = crtc->dev->dev_private;
         u8 jreg05 = 0, jreg07 = 0, jreg09 = 0, jregAC = 0, jregAD = 0, jregAE = 0;
-        u16 temp;
+        u16 temp, precache = 0;
+
+        if ((ast->chip == AST2500) &&
+            (vbios_mode->enh_table->flags & AST2500PreCatchCRT))
+                precache = 40;
 
         ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0x11, 0x7f, 0x00);
 
@@ -299,12 +303,12 @@ static void ast_set_crtc_reg(struct drm_crtc *crtc, struct drm_display_mode *mod
                 jregAD |= 0x01;  /* HBE D[5] */
         ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0x03, 0xE0, (temp & 0x1f));
 
-        temp = (mode->crtc_hsync_start >> 3) - 1;
+        temp = ((mode->crtc_hsync_start-precache) >> 3) - 1;
         if (temp & 0x100)
                 jregAC |= 0x40; /* HRS D[5] */
         ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0x04, 0x00, temp);
 
-        temp = ((mode->crtc_hsync_end >> 3) - 1) & 0x3f;
+        temp = (((mode->crtc_hsync_end-precache) >> 3) - 1) & 0x3f;
         if (temp & 0x20)
                 jregAD |= 0x04; /* HRE D[5] */
         ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0x05, 0x60, (u8)((temp & 0x1f) | jreg05));
@@ -365,6 +369,11 @@ static void ast_set_crtc_reg(struct drm_crtc *crtc, struct drm_display_mode *mod
         ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0x09, 0xdf, jreg09);
         ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xAE, 0x00, (jregAE | 0x80));
 
+        if (precache)
+                ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xb6, 0x3f, 0x80);
+        else
+                ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xb6, 0x3f, 0x00);
+
         ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0x11, 0x7f, 0x80);
 }
 
@@ -384,14 +393,18 @@ static void ast_set_dclk_reg(struct drm_device *dev, struct drm_display_mode *mo
                              struct ast_vbios_mode_info *vbios_mode)
 {
         struct ast_private *ast = dev->dev_private;
-        struct ast_vbios_dclk_info *clk_info;
+        const struct ast_vbios_dclk_info *clk_info;
 
-        clk_info = &dclk_table[vbios_mode->enh_table->dclk_index];
+        if (ast->chip == AST2500)
+                clk_info = &dclk_table_ast2500[vbios_mode->enh_table->dclk_index];
+        else
+                clk_info = &dclk_table[vbios_mode->enh_table->dclk_index];
 
         ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xc0, 0x00, clk_info->param1);
         ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xc1, 0x00, clk_info->param2);
         ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xbb, 0x0f,
-                               (clk_info->param3 & 0x80) | ((clk_info->param3 & 0x3) << 4));
+                               (clk_info->param3 & 0xc0) |
+                               ((clk_info->param3 & 0x3) << 4));
 }
 
 static void ast_set_ext_reg(struct drm_crtc *crtc, struct drm_display_mode *mode,
@@ -425,7 +438,8 @@ static void ast_set_ext_reg(struct drm_crtc *crtc, struct drm_display_mode *mode
         ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xa8, 0xfd, jregA8);
 
         /* Set Threshold */
-        if (ast->chip == AST2300 || ast->chip == AST2400) {
+        if (ast->chip == AST2300 || ast->chip == AST2400 ||
+            ast->chip == AST2500) {
                 ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0xa7, 0x78);
                 ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0xa6, 0x60);
         } else if (ast->chip == AST2100 ||
@@ -800,7 +814,9 @@ static int ast_mode_valid(struct drm_connector *connector,
                 if ((mode->hdisplay == 1600) && (mode->vdisplay == 900))
                         return MODE_OK;
 
-                if ((ast->chip == AST2100) || (ast->chip == AST2200) || (ast->chip == AST2300) || (ast->chip == AST2400) || (ast->chip == AST1180)) {
+                if ((ast->chip == AST2100) || (ast->chip == AST2200) ||
+                    (ast->chip == AST2300) || (ast->chip == AST2400) ||
+                    (ast->chip == AST2500) || (ast->chip == AST1180)) {
                         if ((mode->hdisplay == 1920) && (mode->vdisplay == 1080))
                                 return MODE_OK;
 
diff --git a/drivers/gpu/drm/ast/ast_post.c b/drivers/gpu/drm/ast/ast_post.c
index 5331ee1df086..f7d421359d56 100644
--- a/drivers/gpu/drm/ast/ast_post.c
+++ b/drivers/gpu/drm/ast/ast_post.c
@@ -31,7 +31,8 @@
 
 #include "ast_dram_tables.h"
 
-static void ast_init_dram_2300(struct drm_device *dev);
+static void ast_post_chip_2300(struct drm_device *dev);
+static void ast_post_chip_2500(struct drm_device *dev);
 
 void ast_enable_vga(struct drm_device *dev)
 {
@@ -58,13 +59,9 @@ bool ast_is_vga_enabled(struct drm_device *dev)
                 /* TODO 1180 */
         } else {
                 ch = ast_io_read8(ast, AST_IO_VGA_ENABLE_PORT);
-                if (ch) {
-                        ast_open_key(ast);
-                        ch = ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xb6, 0xff);
-                        return ch & 0x04;
-                }
+                return !!(ch & 0x01);
         }
-        return 0;
+        return false;
 }
 
 static const u8 extreginfo[] = { 0x0f, 0x04, 0x1c, 0xff };
@@ -79,10 +76,11 @@ ast_set_def_ext_reg(struct drm_device *dev)
         const u8 *ext_reg_info;
 
         /* reset scratch */
-        for (i = 0x81; i <= 0x8f; i++)
+        for (i = 0x81; i <= 0x9f; i++)
                 ast_set_index_reg(ast, AST_IO_CRTC_PORT, i, 0x00);
 
-        if (ast->chip == AST2300 || ast->chip == AST2400) {
+        if (ast->chip == AST2300 || ast->chip == AST2400 ||
+            ast->chip == AST2500) {
                 if (dev->pdev->revision >= 0x20)
                         ext_reg_info = extreginfo_ast2300;
                 else
@@ -106,7 +104,8 @@ ast_set_def_ext_reg(struct drm_device *dev)
 
         /* Enable RAMDAC for A1 */
         reg = 0x04;
-        if (ast->chip == AST2300 || ast->chip == AST2400)
+        if (ast->chip == AST2300 || ast->chip == AST2400 ||
+            ast->chip == AST2500)
                 reg |= 0x20;
         ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xb6, 0xff, reg);
 }
@@ -375,21 +374,20 @@ void ast_post_gpu(struct drm_device *dev)
         pci_write_config_dword(ast->dev->pdev, 0x04, reg);
 
         ast_enable_vga(dev);
-        ast_enable_mmio(dev);
         ast_open_key(ast);
+        ast_enable_mmio(dev);
         ast_set_def_ext_reg(dev);
 
-        if (ast->DisableP2A == false)
-        {
-                if (ast->chip == AST2300 || ast->chip == AST2400)
-                        ast_init_dram_2300(dev);
+        if (ast->config_mode == ast_use_p2a) {
+                if (ast->chip == AST2500)
+                        ast_post_chip_2500(dev);
+                else if (ast->chip == AST2300 || ast->chip == AST2400)
+                        ast_post_chip_2300(dev);
                 else
                         ast_init_dram_reg(dev);
 
                 ast_init_3rdtx(dev);
-        }
-        else
-        {
+        } else {
                 if (ast->tx_chip_type != AST_TX_NONE)
                         ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xa3, 0xcf, 0x80);        /* Enable DVO */
         }
@@ -448,85 +446,70 @@ static const u32 pattern[8] = {
         0x7C61D253
 };
 
-static int mmc_test_burst(struct ast_private *ast, u32 datagen)
+static bool mmc_test(struct ast_private *ast, u32 datagen, u8 test_ctl)
 {
         u32 data, timeout;
 
         ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
-        ast_moutdwm(ast, 0x1e6e0070, 0x000000c1 | (datagen << 3));
+        ast_moutdwm(ast, 0x1e6e0070, (datagen << 3) | test_ctl);
         timeout = 0;
         do {
                 data = ast_mindwm(ast, 0x1e6e0070) & 0x3000;
-                if (data & 0x2000) {
-                        return 0;
-                }
+                if (data & 0x2000)
+                        return false;
                 if (++timeout > TIMEOUT) {
                         ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
-                        return 0;
+                        return false;
                 }
         } while (!data);
-        ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
-        return 1;
+        ast_moutdwm(ast, 0x1e6e0070, 0x0);
+        return true;
 }
 
-static int mmc_test_burst2(struct ast_private *ast, u32 datagen)
+static u32 mmc_test2(struct ast_private *ast, u32 datagen, u8 test_ctl)
 {
         u32 data, timeout;
 
         ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
-        ast_moutdwm(ast, 0x1e6e0070, 0x00000041 | (datagen << 3));
+        ast_moutdwm(ast, 0x1e6e0070, (datagen << 3) | test_ctl);
         timeout = 0;
         do {
                 data = ast_mindwm(ast, 0x1e6e0070) & 0x1000;
                 if (++timeout > TIMEOUT) {
                         ast_moutdwm(ast, 0x1e6e0070, 0x0);
-                        return -1;
+                        return 0xffffffff;
                 }
         } while (!data);
         data = ast_mindwm(ast, 0x1e6e0078);
         data = (data | (data >> 16)) & 0xffff;
-        ast_moutdwm(ast, 0x1e6e0070, 0x0);
+        ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
         return data;
 }
 
-static int mmc_test_single(struct ast_private *ast, u32 datagen)
+
+static bool mmc_test_burst(struct ast_private *ast, u32 datagen)
 {
-        u32 data, timeout;
+        return mmc_test(ast, datagen, 0xc1);
+}
 
-        ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
-        ast_moutdwm(ast, 0x1e6e0070, 0x000000c5 | (datagen << 3));
-        timeout = 0;
-        do {
-                data = ast_mindwm(ast, 0x1e6e0070) & 0x3000;
-                if (data & 0x2000)
-                        return 0;
-                if (++timeout > TIMEOUT) {
-                        ast_moutdwm(ast, 0x1e6e0070, 0x0);
-                        return 0;
-                }
-        } while (!data);
-        ast_moutdwm(ast, 0x1e6e0070, 0x0);
-        return 1;
+static u32 mmc_test_burst2(struct ast_private *ast, u32 datagen)
+{
+        return mmc_test2(ast, datagen, 0x41);
 }
 
-static int mmc_test_single2(struct ast_private *ast, u32 datagen)
+static bool mmc_test_single(struct ast_private *ast, u32 datagen)
 {
-        u32 data, timeout;
+        return mmc_test(ast, datagen, 0xc5);
+}
 
-        ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
-        ast_moutdwm(ast, 0x1e6e0070, 0x00000005 | (datagen << 3));
-        timeout = 0;
-        do {
-                data = ast_mindwm(ast, 0x1e6e0070) & 0x1000;
-                if (++timeout > TIMEOUT) {
-                        ast_moutdwm(ast, 0x1e6e0070, 0x0);
-                        return -1;
-                }
-        } while (!data);
-        data = ast_mindwm(ast, 0x1e6e0078);
-        data = (data | (data >> 16)) & 0xffff;
-        ast_moutdwm(ast, 0x1e6e0070, 0x0);
-        return data;
+static u32 mmc_test_single2(struct ast_private *ast, u32 datagen)
+{
+        return mmc_test2(ast, datagen, 0x05);
+}
+
+static bool mmc_test_single_2500(struct ast_private *ast, u32 datagen)
+{
+        return mmc_test(ast, datagen, 0x85);
 }
 
 static int cbr_test(struct ast_private *ast)
@@ -604,16 +587,16 @@ static u32 cbr_scan2(struct ast_private *ast)
         return data2;
 }
 
-static u32 cbr_test3(struct ast_private *ast)
+static bool cbr_test3(struct ast_private *ast)
 {
         if (!mmc_test_burst(ast, 0))
-                return 0;
+                return false;
         if (!mmc_test_single(ast, 0))
-                return 0;
-        return 1;
+                return false;
+        return true;
 }
 
-static u32 cbr_scan3(struct ast_private *ast)
+static bool cbr_scan3(struct ast_private *ast)
 {
         u32 patcnt, loop;
 
@@ -624,9 +607,9 @@ static u32 cbr_scan3(struct ast_private *ast)
                                 break;
                 }
                 if (loop == 2)
-                        return 0;
+                        return false;
         }
-        return 1;
+        return true;
 }
 
 static bool finetuneDQI_L(struct ast_private *ast, struct ast2300_dram_param *param)
@@ -1612,7 +1595,7 @@ ddr2_init_start:
 
 }
 
-static void ast_init_dram_2300(struct drm_device *dev)
+static void ast_post_chip_2300(struct drm_device *dev)
 {
         struct ast_private *ast = dev->dev_private;
         struct ast2300_dram_param param;
@@ -1638,12 +1621,44 @@ static void ast_init_dram_2300(struct drm_device *dev)
                 temp |= 0x73;
                 ast_write32(ast, 0x12008, temp);
 
+                param.dram_freq = 396;
                 param.dram_type = AST_DDR3;
+                temp = ast_mindwm(ast, 0x1e6e2070);
                 if (temp & 0x01000000)
                         param.dram_type = AST_DDR2;
-                param.dram_chipid = ast->dram_type;
-                param.dram_freq = ast->mclk;
-                param.vram_size = ast->vram_size;
+                switch (temp & 0x18000000) {
+                case 0:
+                        param.dram_chipid = AST_DRAM_512Mx16;
+                        break;
+                default:
+                case 0x08000000:
+                        param.dram_chipid = AST_DRAM_1Gx16;
+                        break;
+                case 0x10000000:
+                        param.dram_chipid = AST_DRAM_2Gx16;
+                        break;
+                case 0x18000000:
+                        param.dram_chipid = AST_DRAM_4Gx16;
+                        break;
+                }
+                switch (temp & 0x0c) {
+                default:
+                case 0x00:
+                        param.vram_size = AST_VIDMEM_SIZE_8M;
+                        break;
+
+                case 0x04:
+                        param.vram_size = AST_VIDMEM_SIZE_16M;
+                        break;
+
+                case 0x08:
+                        param.vram_size = AST_VIDMEM_SIZE_32M;
+                        break;
+
+                case 0x0c:
+                        param.vram_size = AST_VIDMEM_SIZE_64M;
+                        break;
+                }
 
                 if (param.dram_type == AST_DDR3) {
                         get_ddr3_info(ast, &param);
@@ -1663,3 +1678,404 @@ static void ast_init_dram_2300(struct drm_device *dev)
         } while ((reg & 0x40) == 0);
 }
 
+static bool cbr_test_2500(struct ast_private *ast)
+{
+        ast_moutdwm(ast, 0x1E6E0074, 0x0000FFFF);
+        ast_moutdwm(ast, 0x1E6E007C, 0xFF00FF00);
+        if (!mmc_test_burst(ast, 0))
+                return false;
+        if (!mmc_test_single_2500(ast, 0))
+                return false;
+        return true;
+}
+
+static bool ddr_test_2500(struct ast_private *ast)
+{
+        ast_moutdwm(ast, 0x1E6E0074, 0x0000FFFF);
+        ast_moutdwm(ast, 0x1E6E007C, 0xFF00FF00);
+        if (!mmc_test_burst(ast, 0))
+                return false;
+        if (!mmc_test_burst(ast, 1))
+                return false;
+        if (!mmc_test_burst(ast, 2))
+                return false;
+        if (!mmc_test_burst(ast, 3))
+                return false;
+        if (!mmc_test_single_2500(ast, 0))
+                return false;
+        return true;
+}
+
+static void ddr_init_common_2500(struct ast_private *ast)
+{
+        ast_moutdwm(ast, 0x1E6E0034, 0x00020080);
+        ast_moutdwm(ast, 0x1E6E0008, 0x2003000F);
+        ast_moutdwm(ast, 0x1E6E0038, 0x00000FFF);
+        ast_moutdwm(ast, 0x1E6E0040, 0x88448844);
+        ast_moutdwm(ast, 0x1E6E0044, 0x24422288);
+        ast_moutdwm(ast, 0x1E6E0048, 0x22222222);
+        ast_moutdwm(ast, 0x1E6E004C, 0x22222222);
+        ast_moutdwm(ast, 0x1E6E0050, 0x80000000);
+        ast_moutdwm(ast, 0x1E6E0208, 0x00000000);
+        ast_moutdwm(ast, 0x1E6E0218, 0x00000000);
+        ast_moutdwm(ast, 0x1E6E0220, 0x00000000);
+        ast_moutdwm(ast, 0x1E6E0228, 0x00000000);
+        ast_moutdwm(ast, 0x1E6E0230, 0x00000000);
+        ast_moutdwm(ast, 0x1E6E02A8, 0x00000000);
+        ast_moutdwm(ast, 0x1E6E02B0, 0x00000000);
+        ast_moutdwm(ast, 0x1E6E0240, 0x86000000);
+        ast_moutdwm(ast, 0x1E6E0244, 0x00008600);
+        ast_moutdwm(ast, 0x1E6E0248, 0x80000000);
+        ast_moutdwm(ast, 0x1E6E024C, 0x80808080);
+}
+
+static void ddr_phy_init_2500(struct ast_private *ast)
+{
+        u32 data, pass, timecnt;
+
+        pass = 0;
+        ast_moutdwm(ast, 0x1E6E0060, 0x00000005);
+        while (!pass) {
+                for (timecnt = 0; timecnt < TIMEOUT; timecnt++) {
+                        data = ast_mindwm(ast, 0x1E6E0060) & 0x1;
+                        if (!data)
+                                break;
+                }
+                if (timecnt != TIMEOUT) {
+                        data = ast_mindwm(ast, 0x1E6E0300) & 0x000A0000;
+                        if (!data)
+                                pass = 1;
+                }
+                if (!pass) {
+                        ast_moutdwm(ast, 0x1E6E0060, 0x00000000);
+                        udelay(10); /* delay 10 us */
+                        ast_moutdwm(ast, 0x1E6E0060, 0x00000005);
+                }
+        }
+
+        ast_moutdwm(ast, 0x1E6E0060, 0x00000006);
+}
+
+/*
+ * Check DRAM Size
+ * 1Gb : 0x80000000 ~ 0x87FFFFFF
+ * 2Gb : 0x80000000 ~ 0x8FFFFFFF
+ * 4Gb : 0x80000000 ~ 0x9FFFFFFF
+ * 8Gb : 0x80000000 ~ 0xBFFFFFFF
+ */
+static void check_dram_size_2500(struct ast_private *ast, u32 tRFC)
+{
+        u32 reg_04, reg_14;
+
+        reg_04 = ast_mindwm(ast, 0x1E6E0004) & 0xfffffffc;
+        reg_14 = ast_mindwm(ast, 0x1E6E0014) & 0xffffff00;
+
+        ast_moutdwm(ast, 0xA0100000, 0x41424344);
+        ast_moutdwm(ast, 0x90100000, 0x35363738);
+        ast_moutdwm(ast, 0x88100000, 0x292A2B2C);
+        ast_moutdwm(ast, 0x80100000, 0x1D1E1F10);
+
+        /* Check 8Gbit */
+        if (ast_mindwm(ast, 0xA0100000) == 0x41424344) {
+                reg_04 |= 0x03;
+                reg_14 |= (tRFC >> 24) & 0xFF;
+                /* Check 4Gbit */
+        } else if (ast_mindwm(ast, 0x90100000) == 0x35363738) {
+                reg_04 |= 0x02;
+                reg_14 |= (tRFC >> 16) & 0xFF;
+                /* Check 2Gbit */
+        } else if (ast_mindwm(ast, 0x88100000) == 0x292A2B2C) {
+                reg_04 |= 0x01;
+                reg_14 |= (tRFC >> 8) & 0xFF;
+        } else {
+                reg_14 |= tRFC & 0xFF;
+        }
+        ast_moutdwm(ast, 0x1E6E0004, reg_04);
+        ast_moutdwm(ast, 0x1E6E0014, reg_14);
+}
+
+static void enable_cache_2500(struct ast_private *ast)
+{
+        u32 reg_04, data;
+
+        reg_04 = ast_mindwm(ast, 0x1E6E0004);
+        ast_moutdwm(ast, 0x1E6E0004, reg_04 | 0x1000);
+
+        do
+                data = ast_mindwm(ast, 0x1E6E0004);
+        while (!(data & 0x80000));
+        ast_moutdwm(ast, 0x1E6E0004, reg_04 | 0x400);
+}
+
+static void set_mpll_2500(struct ast_private *ast)
+{
+        u32 addr, data, param;
+
+        /* Reset MMC */
+        ast_moutdwm(ast, 0x1E6E0000, 0xFC600309);
+        ast_moutdwm(ast, 0x1E6E0034, 0x00020080);
+        for (addr = 0x1e6e0004; addr < 0x1e6e0090;) {
+                ast_moutdwm(ast, addr, 0x0);
+                addr += 4;
+        }
+        ast_moutdwm(ast, 0x1E6E0034, 0x00020000);
+
+        ast_moutdwm(ast, 0x1E6E2000, 0x1688A8A8);
+        data = ast_mindwm(ast, 0x1E6E2070) & 0x00800000;
+        if (data) {
+                /* CLKIN = 25MHz */
+                param = 0x930023E0;
+                ast_moutdwm(ast, 0x1E6E2160, 0x00011320);
+        } else {
+                /* CLKIN = 24MHz */
+                param = 0x93002400;
+        }
+        ast_moutdwm(ast, 0x1E6E2020, param);
+        udelay(100);
+}
+
+static void reset_mmc_2500(struct ast_private *ast)
+{
+        ast_moutdwm(ast, 0x1E78505C, 0x00000004);
+        ast_moutdwm(ast, 0x1E785044, 0x00000001);
+        ast_moutdwm(ast, 0x1E785048, 0x00004755);
+        ast_moutdwm(ast, 0x1E78504C, 0x00000013);
+        mdelay(100);
+        ast_moutdwm(ast, 0x1E785054, 0x00000077);
+        ast_moutdwm(ast, 0x1E6E0000, 0xFC600309);
+}
+
+static void ddr3_init_2500(struct ast_private *ast, const u32 *ddr_table)
+{
+
+        ast_moutdwm(ast, 0x1E6E0004, 0x00000303);
+        ast_moutdwm(ast, 0x1E6E0010, ddr_table[REGIDX_010]);
+        ast_moutdwm(ast, 0x1E6E0014, ddr_table[REGIDX_014]);
+        ast_moutdwm(ast, 0x1E6E0018, ddr_table[REGIDX_018]);
+        ast_moutdwm(ast, 0x1E6E0020, ddr_table[REGIDX_020]);         /* MODEREG4/6 */
+        ast_moutdwm(ast, 0x1E6E0024, ddr_table[REGIDX_024]);         /* MODEREG5 */
+        ast_moutdwm(ast, 0x1E6E002C, ddr_table[REGIDX_02C] | 0x100); /* MODEREG0/2 */
+        ast_moutdwm(ast, 0x1E6E0030, ddr_table[REGIDX_030]);         /* MODEREG1/3 */
+
+        /* DDR PHY Setting */
+        ast_moutdwm(ast, 0x1E6E0200, 0x02492AAE);
+        ast_moutdwm(ast, 0x1E6E0204, 0x00001001);
+        ast_moutdwm(ast, 0x1E6E020C, 0x55E00B0B);
+        ast_moutdwm(ast, 0x1E6E0210, 0x20000000);
+        ast_moutdwm(ast, 0x1E6E0214, ddr_table[REGIDX_214]);
+        ast_moutdwm(ast, 0x1E6E02E0, ddr_table[REGIDX_2E0]);
+        ast_moutdwm(ast, 0x1E6E02E4, ddr_table[REGIDX_2E4]);
+        ast_moutdwm(ast, 0x1E6E02E8, ddr_table[REGIDX_2E8]);
+        ast_moutdwm(ast, 0x1E6E02EC, ddr_table[REGIDX_2EC]);
+        ast_moutdwm(ast, 0x1E6E02F0, ddr_table[REGIDX_2F0]);
+        ast_moutdwm(ast, 0x1E6E02F4, ddr_table[REGIDX_2F4]);
+        ast_moutdwm(ast, 0x1E6E02F8, ddr_table[REGIDX_2F8]);
+        ast_moutdwm(ast, 0x1E6E0290, 0x00100008);
+        ast_moutdwm(ast, 0x1E6E02C0, 0x00000006);
+
+        /* Controller Setting */
+        ast_moutdwm(ast, 0x1E6E0034, 0x00020091);
+
+        /* Wait DDR PHY init done */
+        ddr_phy_init_2500(ast);
+
+        ast_moutdwm(ast, 0x1E6E0120, ddr_table[REGIDX_PLL]);
+        ast_moutdwm(ast, 0x1E6E000C, 0x42AA5C81);
+        ast_moutdwm(ast, 0x1E6E0034, 0x0001AF93);
+
+        check_dram_size_2500(ast, ddr_table[REGIDX_RFC]);
+        enable_cache_2500(ast);
+        ast_moutdwm(ast, 0x1E6E001C, 0x00000008);
+        ast_moutdwm(ast, 0x1E6E0038, 0xFFFFFF00);
+}
+
+static void ddr4_init_2500(struct ast_private *ast, const u32 *ddr_table)
+{
+        u32 data, data2, pass, retrycnt;
+        u32 ddr_vref, phy_vref;
+        u32 min_ddr_vref = 0, min_phy_vref = 0;
+        u32 max_ddr_vref = 0, max_phy_vref = 0;
+
+        ast_moutdwm(ast, 0x1E6E0004, 0x00000313);
+        ast_moutdwm(ast, 0x1E6E0010, ddr_table[REGIDX_010]);
+        ast_moutdwm(ast, 0x1E6E0014, ddr_table[REGIDX_014]);
+        ast_moutdwm(ast, 0x1E6E0018, ddr_table[REGIDX_018]);
+        ast_moutdwm(ast, 0x1E6E0020, ddr_table[REGIDX_020]);         /* MODEREG4/6 */
+        ast_moutdwm(ast, 0x1E6E0024, ddr_table[REGIDX_024]);         /* MODEREG5 */
+        ast_moutdwm(ast, 0x1E6E002C, ddr_table[REGIDX_02C] | 0x100); /* MODEREG0/2 */
+        ast_moutdwm(ast, 0x1E6E0030, ddr_table[REGIDX_030]);         /* MODEREG1/3 */
+
+        /* DDR PHY Setting */
+        ast_moutdwm(ast, 0x1E6E0200, 0x42492AAE);
+        ast_moutdwm(ast, 0x1E6E0204, 0x09002000);
+        ast_moutdwm(ast, 0x1E6E020C, 0x55E00B0B);
+        ast_moutdwm(ast, 0x1E6E0210, 0x20000000);
+        ast_moutdwm(ast, 0x1E6E0214, ddr_table[REGIDX_214]);
+        ast_moutdwm(ast, 0x1E6E02E0, ddr_table[REGIDX_2E0]);
+        ast_moutdwm(ast, 0x1E6E02E4, ddr_table[REGIDX_2E4]);
+        ast_moutdwm(ast, 0x1E6E02E8, ddr_table[REGIDX_2E8]);
+        ast_moutdwm(ast, 0x1E6E02EC, ddr_table[REGIDX_2EC]);
+        ast_moutdwm(ast, 0x1E6E02F0, ddr_table[REGIDX_2F0]);
+        ast_moutdwm(ast, 0x1E6E02F4, ddr_table[REGIDX_2F4]);
+        ast_moutdwm(ast, 0x1E6E02F8, ddr_table[REGIDX_2F8]);
+        ast_moutdwm(ast, 0x1E6E0290, 0x00100008);
+        ast_moutdwm(ast, 0x1E6E02C4, 0x3C183C3C);
+        ast_moutdwm(ast, 0x1E6E02C8, 0x00631E0E);
+
+        /* Controller Setting */
+        ast_moutdwm(ast, 0x1E6E0034, 0x0001A991);
+
+        /* Train PHY Vref first */
+        pass = 0;
+
+        for (retrycnt = 0; retrycnt < 4 && pass == 0; retrycnt++) {
+                max_phy_vref = 0x0;
+                pass = 0;
+                ast_moutdwm(ast, 0x1E6E02C0, 0x00001C06);
+                for (phy_vref = 0x40; phy_vref < 0x80; phy_vref++) {
+                        ast_moutdwm(ast, 0x1E6E000C, 0x00000000);
+                        ast_moutdwm(ast, 0x1E6E0060, 0x00000000);
+                        ast_moutdwm(ast, 0x1E6E02CC, phy_vref | (phy_vref << 8));
+                        /* Fire DFI Init */
+                        ddr_phy_init_2500(ast);
+                        ast_moutdwm(ast, 0x1E6E000C, 0x00005C01);
+                        if (cbr_test_2500(ast)) {
+                                pass++;
+                                data = ast_mindwm(ast, 0x1E6E03D0);
+                                data2 = data >> 8;
+                                data  = data & 0xff;
+                                if (data > data2)
+                                        data = data2;
+                                if (max_phy_vref < data) {
+                                        max_phy_vref = data;
+                                        min_phy_vref = phy_vref;
+                                }
+                        } else if (pass > 0)
+                                break;
+                }
+        }
+        ast_moutdwm(ast, 0x1E6E02CC, min_phy_vref | (min_phy_vref << 8));
+
+        /* Train DDR Vref next */
+        pass = 0;
+
+        for (retrycnt = 0; retrycnt < 4 && pass == 0; retrycnt++) {
+                min_ddr_vref = 0xFF;
+                max_ddr_vref = 0x0;
+                pass = 0;
+                for (ddr_vref = 0x00; ddr_vref < 0x40; ddr_vref++) {
+                        ast_moutdwm(ast, 0x1E6E000C, 0x00000000);
+                        ast_moutdwm(ast, 0x1E6E0060, 0x00000000);
+                        ast_moutdwm(ast, 0x1E6E02C0, 0x00000006 | (ddr_vref << 8));
+                        /* Fire DFI Init */
+                        ddr_phy_init_2500(ast);
+                        ast_moutdwm(ast, 0x1E6E000C, 0x00005C01);
+                        if (cbr_test_2500(ast)) {
+                                pass++;
+                                if (min_ddr_vref > ddr_vref)
+                                        min_ddr_vref = ddr_vref;
+                                if (max_ddr_vref < ddr_vref)
+                                        max_ddr_vref = ddr_vref;
+                        } else if (pass != 0)
+                                break;
+                }
+        }
+
+        ast_moutdwm(ast, 0x1E6E000C, 0x00000000);
+        ast_moutdwm(ast, 0x1E6E0060, 0x00000000);
+        ddr_vref = (min_ddr_vref + max_ddr_vref + 1) >> 1;
+        ast_moutdwm(ast, 0x1E6E02C0, 0x00000006 | (ddr_vref << 8));
+
+        /* Wait DDR PHY init done */
+        ddr_phy_init_2500(ast);
+
+        ast_moutdwm(ast, 0x1E6E0120, ddr_table[REGIDX_PLL]);
+        ast_moutdwm(ast, 0x1E6E000C, 0x42AA5C81);
+        ast_moutdwm(ast, 0x1E6E0034, 0x0001AF93);
+
+        check_dram_size_2500(ast, ddr_table[REGIDX_RFC]);
+        enable_cache_2500(ast);
+        ast_moutdwm(ast, 0x1E6E001C, 0x00000008);
+        ast_moutdwm(ast, 0x1E6E0038, 0xFFFFFF00);
+}
+
+static bool ast_dram_init_2500(struct ast_private *ast)
+{
+        u32 data;
+        u32 max_tries = 5;
+
+        do {
+                if (max_tries-- == 0)
+                        return false;
+                set_mpll_2500(ast);
+                reset_mmc_2500(ast);
+                ddr_init_common_2500(ast);
+
+                data = ast_mindwm(ast, 0x1E6E2070);
+                if (data & 0x01000000)
+                        ddr4_init_2500(ast, ast2500_ddr4_1600_timing_table);
+                else
+                        ddr3_init_2500(ast, ast2500_ddr3_1600_timing_table);
+        } while (!ddr_test_2500(ast));
+
+        ast_moutdwm(ast, 0x1E6E2040, ast_mindwm(ast, 0x1E6E2040) | 0x41);
+
+        /* Patch code */
+        data = ast_mindwm(ast, 0x1E6E200C) & 0xF9FFFFFF;
+        ast_moutdwm(ast, 0x1E6E200C, data | 0x10000000);
+
+        return true;
+}
+
+void ast_post_chip_2500(struct drm_device *dev)
+{
+        struct ast_private *ast = dev->dev_private;
+        u32 temp;
+        u8 reg;
+
+        reg = ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xd0, 0xff);
+        if ((reg & 0x80) == 0) {/* vga only */
+                /* Clear bus lock condition */
+                ast_moutdwm(ast, 0x1e600000, 0xAEED1A03);
+                ast_moutdwm(ast, 0x1e600084, 0x00010000);
+                ast_moutdwm(ast, 0x1e600088, 0x00000000);
+                ast_moutdwm(ast, 0x1e6e2000, 0x1688A8A8);
+                ast_write32(ast, 0xf004, 0x1e6e0000);
+                ast_write32(ast, 0xf000, 0x1);
+                ast_write32(ast, 0x12000, 0x1688a8a8);
+                while (ast_read32(ast, 0x12000) != 0x1)
+                        ;
+
+                ast_write32(ast, 0x10000, 0xfc600309);
+                while (ast_read32(ast, 0x10000) != 0x1)
+                        ;
+
+                /* Slow down CPU/AHB CLK in VGA only mode */
+                temp = ast_read32(ast, 0x12008);
+                temp |= 0x73;
+                ast_write32(ast, 0x12008, temp);
+
+                /* Reset USB port to patch USB unknown device issue */
+                ast_moutdwm(ast, 0x1e6e2090, 0x20000000);
+                temp  = ast_mindwm(ast, 0x1e6e2094);
+                temp |= 0x00004000;
+                ast_moutdwm(ast, 0x1e6e2094, temp);
+                temp  = ast_mindwm(ast, 0x1e6e2070);
+                if (temp & 0x00800000) {
+                        ast_moutdwm(ast, 0x1e6e207c, 0x00800000);
+                        mdelay(100);
+                        ast_moutdwm(ast, 0x1e6e2070, 0x00800000);
+                }
+
+                if (!ast_dram_init_2500(ast))
+                        DRM_ERROR("DRAM init failed !\n");
+
+                temp = ast_mindwm(ast, 0x1e6e2040);
+                ast_moutdwm(ast, 0x1e6e2040, temp | 0x40);
+        }
+
+        /* wait ready */
+        do {
+                reg = ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xd0, 0xff);
+        } while ((reg & 0x40) == 0);
+}
diff --git a/drivers/gpu/drm/ast/ast_tables.h b/drivers/gpu/drm/ast/ast_tables.h
index 3608d5aa7451..5f4c2e833a65 100644
--- a/drivers/gpu/drm/ast/ast_tables.h
+++ b/drivers/gpu/drm/ast/ast_tables.h
@@ -47,6 +47,7 @@
 #define SyncPN                  (PVSync | NHSync)
 #define SyncNP                  (NVSync | PHSync)
 #define SyncNN                  (NVSync | NHSync)
+#define AST2500PreCatchCRT              0x00004000
 
 /* DCLK Index */
 #define VCLK25_175              0x00
@@ -78,37 +79,67 @@
 #define VCLK97_75               0x19
 #define VCLK118_25                      0x1A
 
-static struct ast_vbios_dclk_info dclk_table[] = {
-        {0x2C, 0xE7, 0x03},                                     /* 00: VCLK25_175       */
-        {0x95, 0x62, 0x03},                                     /* 01: VCLK28_322       */
-        {0x67, 0x63, 0x01},                                     /* 02: VCLK31_5         */
-        {0x76, 0x63, 0x01},                                     /* 03: VCLK36           */
-        {0xEE, 0x67, 0x01},                                     /* 04: VCLK40           */
-        {0x82, 0x62, 0x01},                             /* 05: VCLK49_5         */
-        {0xC6, 0x64, 0x01},                                     /* 06: VCLK50           */
-        {0x94, 0x62, 0x01},                                     /* 07: VCLK56_25        */
-        {0x80, 0x64, 0x00},                                     /* 08: VCLK65           */
-        {0x7B, 0x63, 0x00},                                     /* 09: VCLK75           */
-        {0x67, 0x62, 0x00},                                     /* 0A: VCLK78_75        */
-        {0x7C, 0x62, 0x00},                                     /* 0B: VCLK94_5         */
-        {0x8E, 0x62, 0x00},                                     /* 0C: VCLK108          */
-        {0x85, 0x24, 0x00},                                     /* 0D: VCLK135          */
-        {0x67, 0x22, 0x00},                                     /* 0E: VCLK157_5        */
-        {0x6A, 0x22, 0x00},                                     /* 0F: VCLK162          */
-        {0x4d, 0x4c, 0x80},                                     /* 10: VCLK154          */
-        {0xa7, 0x78, 0x80},                                     /* 11: VCLK83.5         */
-        {0x28, 0x49, 0x80},                                     /* 12: VCLK106.5        */
-        {0x37, 0x49, 0x80},                                     /* 13: VCLK146.25       */
-        {0x1f, 0x45, 0x80},                                     /* 14: VCLK148.5        */
-        {0x47, 0x6c, 0x80},                                     /* 15: VCLK71       */
-        {0x25, 0x65, 0x80},                                     /* 16: VCLK88.75    */
-        {0x77, 0x58, 0x80},                                     /* 17: VCLK119      */
-        {0x32, 0x67, 0x80},                                 /* 18: VCLK85_5     */
-        {0x6a, 0x6d, 0x80},                                     /* 19: VCLK97_75        */
-        {0x3b, 0x2c, 0x81},                                     /* 1A: VCLK118_25       */
+static const struct ast_vbios_dclk_info dclk_table[] = {
+        {0x2C, 0xE7, 0x03},                     /* 00: VCLK25_175       */
+        {0x95, 0x62, 0x03},                     /* 01: VCLK28_322       */
+        {0x67, 0x63, 0x01},                     /* 02: VCLK31_5         */
+        {0x76, 0x63, 0x01},                     /* 03: VCLK36           */
+        {0xEE, 0x67, 0x01},                     /* 04: VCLK40           */
+        {0x82, 0x62, 0x01},                     /* 05: VCLK49_5         */
+        {0xC6, 0x64, 0x01},                     /* 06: VCLK50           */
+        {0x94, 0x62, 0x01},                     /* 07: VCLK56_25        */
+        {0x80, 0x64, 0x00},                     /* 08: VCLK65           */
+        {0x7B, 0x63, 0x00},                     /* 09: VCLK75           */
+        {0x67, 0x62, 0x00},                     /* 0A: VCLK78_75        */
+        {0x7C, 0x62, 0x00},                     /* 0B: VCLK94_5         */
+        {0x8E, 0x62, 0x00},                     /* 0C: VCLK108          */
+        {0x85, 0x24, 0x00},                     /* 0D: VCLK135          */
+        {0x67, 0x22, 0x00},                     /* 0E: VCLK157_5        */
+        {0x6A, 0x22, 0x00},                     /* 0F: VCLK162          */
+        {0x4d, 0x4c, 0x80},                     /* 10: VCLK154          */
+        {0xa7, 0x78, 0x80},                     /* 11: VCLK83.5         */
+        {0x28, 0x49, 0x80},                     /* 12: VCLK106.5        */
+        {0x37, 0x49, 0x80},                     /* 13: VCLK146.25       */
+        {0x1f, 0x45, 0x80},                     /* 14: VCLK148.5        */
+        {0x47, 0x6c, 0x80},                     /* 15: VCLK71           */
+        {0x25, 0x65, 0x80},                     /* 16: VCLK88.75        */
+        {0x77, 0x58, 0x80},                     /* 17: VCLK119          */
+        {0x32, 0x67, 0x80},                     /* 18: VCLK85_5         */
+        {0x6a, 0x6d, 0x80},                     /* 19: VCLK97_75        */
+        {0x3b, 0x2c, 0x81},                     /* 1A: VCLK118_25       */
 };
 
-static struct ast_vbios_stdtable vbios_stdtable[] = {
+static const struct ast_vbios_dclk_info dclk_table_ast2500[] = {
+        {0x2C, 0xE7, 0x03},                     /* 00: VCLK25_175       */
+        {0x95, 0x62, 0x03},                     /* 01: VCLK28_322       */
+        {0x67, 0x63, 0x01},                     /* 02: VCLK31_5         */
+        {0x76, 0x63, 0x01},                     /* 03: VCLK36           */
+        {0xEE, 0x67, 0x01},                     /* 04: VCLK40           */
+        {0x82, 0x62, 0x01},                     /* 05: VCLK49_5         */
+        {0xC6, 0x64, 0x01},                     /* 06: VCLK50           */
+        {0x94, 0x62, 0x01},                     /* 07: VCLK56_25        */
+        {0x80, 0x64, 0x00},                     /* 08: VCLK65           */
+        {0x7B, 0x63, 0x00},                     /* 09: VCLK75           */
+        {0x67, 0x62, 0x00},                     /* 0A: VCLK78_75        */
+        {0x7C, 0x62, 0x00},                     /* 0B: VCLK94_5         */
+        {0x8E, 0x62, 0x00},                     /* 0C: VCLK108          */
+        {0x85, 0x24, 0x00},                     /* 0D: VCLK135          */
+        {0x67, 0x22, 0x00},                     /* 0E: VCLK157_5        */
+        {0x6A, 0x22, 0x00},                     /* 0F: VCLK162          */
+        {0x4d, 0x4c, 0x80},                     /* 10: VCLK154          */
+        {0xa7, 0x78, 0x80},                     /* 11: VCLK83.5         */
+        {0x28, 0x49, 0x80},                     /* 12: VCLK106.5        */
+        {0x37, 0x49, 0x80},                     /* 13: VCLK146.25       */
+        {0x1f, 0x45, 0x80},                     /* 14: VCLK148.5        */
+        {0x47, 0x6c, 0x80},                     /* 15: VCLK71           */
+        {0x25, 0x65, 0x80},                     /* 16: VCLK88.75        */
+        {0x58, 0x01, 0x42},                     /* 17: VCLK119          */
+        {0x32, 0x67, 0x80},                     /* 18: VCLK85_5         */
+        {0x6a, 0x6d, 0x80},                     /* 19: VCLK97_75        */
+        {0x44, 0x20, 0x43},                     /* 1A: VCLK118_25       */
+};
+
+static const struct ast_vbios_stdtable vbios_stdtable[] = {
         /* MD_2_3_400 */
         {
                 0x67,
@@ -181,21 +212,21 @@ static struct ast_vbios_stdtable vbios_stdtable[] = {
         },
 };
 
-static struct ast_vbios_enhtable res_640x480[] = {
+static const struct ast_vbios_enhtable res_640x480[] = {
         { 800, 640, 8, 96, 525, 480, 2, 2, VCLK25_175,  /* 60Hz */
           (SyncNN | HBorder | VBorder | Charx8Dot), 60, 1, 0x2E },
         { 832, 640, 16, 40, 520, 480, 1, 3, VCLK31_5,   /* 72Hz */
           (SyncNN | HBorder | VBorder | Charx8Dot), 72, 2, 0x2E  },
         { 840, 640, 16, 64, 500, 480, 1, 3, VCLK31_5,   /* 75Hz */
           (SyncNN | Charx8Dot) , 75, 3, 0x2E },
-        { 832, 640, 56, 56, 509, 480, 1, 3, VCLK36,             /* 85Hz */
+        { 832, 640, 56, 56, 509, 480, 1, 3, VCLK36,     /* 85Hz */
           (SyncNN | Charx8Dot) , 85, 4, 0x2E },
-        { 832, 640, 56, 56, 509, 480, 1, 3, VCLK36,             /* end */
+        { 832, 640, 56, 56, 509, 480, 1, 3, VCLK36,     /* end */
           (SyncNN | Charx8Dot) , 0xFF, 4, 0x2E },
 };
 
-static struct ast_vbios_enhtable res_800x600[] = {
-        {1024, 800, 24, 72, 625, 600, 1, 2, VCLK36,             /* 56Hz */
+static const struct ast_vbios_enhtable res_800x600[] = {
+        {1024, 800, 24, 72, 625, 600, 1, 2, VCLK36,     /* 56Hz */
          (SyncPP | Charx8Dot), 56, 1, 0x30 },
         {1056, 800, 40, 128, 628, 600, 1, 4, VCLK40,    /* 60Hz */
          (SyncPP | Charx8Dot), 60, 2, 0x30 },
@@ -210,7 +241,7 @@ static struct ast_vbios_enhtable res_800x600[] = {
 };
 
 
-static struct ast_vbios_enhtable res_1024x768[] = {
+static const struct ast_vbios_enhtable res_1024x768[] = {
         {1344, 1024, 24, 136, 806, 768, 3, 6, VCLK65,   /* 60Hz */
          (SyncNN | Charx8Dot), 60, 1, 0x31 },
         {1328, 1024, 24, 136, 806, 768, 3, 6, VCLK75,   /* 70Hz */
@@ -223,7 +254,7 @@ static struct ast_vbios_enhtable res_1024x768[] = {
          (SyncPP | Charx8Dot), 0xFF, 4, 0x31 },
 };
 
-static struct ast_vbios_enhtable res_1280x1024[] = {
+static const struct ast_vbios_enhtable res_1280x1024[] = {
         {1688, 1280, 48, 112, 1066, 1024, 1, 3, VCLK108,        /* 60Hz */
          (SyncPP | Charx8Dot), 60, 1, 0x32 },
         {1688, 1280, 16, 144, 1066, 1024, 1, 3, VCLK135,        /* 75Hz */
@@ -234,7 +265,7 @@ static struct ast_vbios_enhtable res_1280x1024[] = {
          (SyncPP | Charx8Dot), 0xFF, 3, 0x32 },
 };
 
-static struct ast_vbios_enhtable res_1600x1200[] = {
+static const struct ast_vbios_enhtable res_1600x1200[] = {
         {2160, 1600, 64, 192, 1250, 1200, 1, 3, VCLK162,        /* 60Hz */
          (SyncPP | Charx8Dot), 60, 1, 0x33 },
         {2160, 1600, 64, 192, 1250, 1200, 1, 3, VCLK162,        /* end */
@@ -242,34 +273,39 @@ static struct ast_vbios_enhtable res_1600x1200[] = {
 };
 
 /* 16:9 */
-static struct ast_vbios_enhtable res_1360x768[] = {
-        {1792, 1360, 64,112, 795,  768, 3, 6, VCLK85_5,          /* 60Hz */
+static const struct ast_vbios_enhtable res_1360x768[] = {
+        {1792, 1360, 64, 112, 795, 768, 3, 6, VCLK85_5,         /* 60Hz */
          (SyncPP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 1, 0x39 },
-        {1792, 1360, 64,112, 795,  768, 3, 6, VCLK85_5,          /* end */
-         (SyncPP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 0xFF, 1, 0x39 },
+        {1792, 1360, 64, 112, 795, 768, 3, 6, VCLK85_5,          /* end */
+         (SyncPP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo |
+          AST2500PreCatchCRT), 0xFF, 1, 0x39 },
 };
 
-static struct ast_vbios_enhtable res_1600x900[] = {
-        {1760, 1600, 48, 32, 926,  900, 3, 5, VCLK97_75,        /* 60Hz CVT RB */
-         (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 1, 0x3A },
-        {2112, 1600, 88,168, 934,  900, 3, 5, VCLK118_25,       /* 60Hz CVT */
+static const struct ast_vbios_enhtable res_1600x900[] = {
+        {1760, 1600, 48, 32, 926, 900, 3, 5, VCLK97_75,         /* 60Hz CVT RB */
+         (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo |
+          AST2500PreCatchCRT), 60, 1, 0x3A },
+        {2112, 1600, 88, 168, 934, 900, 3, 5, VCLK118_25,       /* 60Hz CVT */
          (SyncPN | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 2, 0x3A },
-        {2112, 1600, 88,168, 934,  900, 3, 5, VCLK118_25,       /* 60Hz CVT */
+        {2112, 1600, 88, 168, 934, 900, 3, 5, VCLK118_25,       /* 60Hz CVT */
          (SyncPN | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 0xFF, 2, 0x3A },
 };
 
-static struct ast_vbios_enhtable res_1920x1080[] = {
+static const struct ast_vbios_enhtable res_1920x1080[] = {
         {2200, 1920, 88, 44, 1125, 1080, 4, 5, VCLK148_5,       /* 60Hz */
-         (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 1, 0x38 },
+         (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo |
+          AST2500PreCatchCRT), 60, 1, 0x38 },
         {2200, 1920, 88, 44, 1125, 1080, 4, 5, VCLK148_5,       /* 60Hz */
-         (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 0xFF, 1, 0x38 },
+         (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo |
+          AST2500PreCatchCRT), 0xFF, 1, 0x38 },
 };
 
 
 /* 16:10 */
-static struct ast_vbios_enhtable res_1280x800[] = {
-        {1440, 1280, 48, 32,  823,  800, 3, 6, VCLK71,  /* 60Hz RB */
-         (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 1, 0x35 },
+static const struct ast_vbios_enhtable res_1280x800[] = {
+        {1440, 1280, 48, 32,  823,  800, 3, 6, VCLK71,          /* 60Hz RB */
+         (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo |
+          AST2500PreCatchCRT), 60, 1, 0x35 },
         {1680, 1280, 72,128,  831,  800, 3, 6, VCLK83_5,        /* 60Hz */
          (SyncPN | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 2, 0x35 },
         {1680, 1280, 72,128,  831,  800, 3, 6, VCLK83_5,        /* 60Hz */
@@ -277,29 +313,33 @@ static struct ast_vbios_enhtable res_1280x800[] = {
 
 };
 
-static struct ast_vbios_enhtable res_1440x900[] = {
+static const struct ast_vbios_enhtable res_1440x900[] = {
         {1600, 1440, 48, 32,  926,  900, 3, 6, VCLK88_75,       /* 60Hz RB */
-         (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 1, 0x36 },
+         (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo |
+          AST2500PreCatchCRT), 60, 1, 0x36 },
         {1904, 1440, 80,152,  934,  900, 3, 6, VCLK106_5,       /* 60Hz */
          (SyncPN | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 2, 0x36 },
         {1904, 1440, 80,152,  934,  900, 3, 6, VCLK106_5,       /* 60Hz */
          (SyncPN | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 0xFF, 2, 0x36 },
 };
 
-static struct ast_vbios_enhtable res_1680x1050[] = {
-        {1840, 1680, 48, 32, 1080, 1050, 3, 6, VCLK119, /* 60Hz RB */
-         (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 1, 0x37 },
+static const struct ast_vbios_enhtable res_1680x1050[] = {
+        {1840, 1680, 48, 32, 1080, 1050, 3, 6, VCLK119,         /* 60Hz RB */
+         (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo |
+          AST2500PreCatchCRT), 60, 1, 0x37 },
         {2240, 1680,104,176, 1089, 1050, 3, 6, VCLK146_25,      /* 60Hz */
          (SyncPN | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 2, 0x37 },
         {2240, 1680,104,176, 1089, 1050, 3, 6, VCLK146_25,      /* 60Hz */
          (SyncPN | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 0xFF, 2, 0x37 },
 };
 
-static struct ast_vbios_enhtable res_1920x1200[] = {
-        {2080, 1920, 48, 32, 1235, 1200, 3, 6, VCLK154, /* 60Hz RB*/
-         (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 1, 0x34 },
-        {2080, 1920, 48, 32, 1235, 1200, 3, 6, VCLK154, /* 60Hz RB */
-         (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 0xFF, 1, 0x34 },
+static const struct ast_vbios_enhtable res_1920x1200[] = {
+        {2080, 1920, 48, 32, 1235, 1200, 3, 6, VCLK154,         /* 60Hz RB*/
+         (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo |
+          AST2500PreCatchCRT), 60, 1, 0x34 },
+        {2080, 1920, 48, 32, 1235, 1200, 3, 6, VCLK154,         /* 60Hz RB */
+         (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo |
+          AST2500PreCatchCRT), 0xFF, 1, 0x34 },
 };
 
 #endif
diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig
index ad31b3eb408f..0e4eb845cbb0 100644
--- a/drivers/gpu/drm/rockchip/Kconfig
+++ b/drivers/gpu/drm/rockchip/Kconfig
@@ -24,6 +24,7 @@ config ROCKCHIP_ANALOGIX_DP
 config ROCKCHIP_CDN_DP
         tristate "Rockchip cdn DP"
         depends on DRM_ROCKCHIP
+        depends on EXTCON
         select SND_SOC_HDMI_CODEC if SND_SOC
         help
           This selects support for Rockchip SoC specific extensions
diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c
index 9ab67a670885..fd79a70b8552 100644
--- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
+++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
@@ -111,7 +111,7 @@ static int cdn_dp_clk_enable(struct cdn_dp_device *dp)
         ret = pm_runtime_get_sync(dp->dev);
         if (ret < 0) {
                 DRM_DEV_ERROR(dp->dev, "cannot get pm runtime %d\n", ret);
-                goto err_pclk;
+                goto err_pm_runtime_get;
         }
 
         reset_control_assert(dp->core_rst);
@@ -133,6 +133,8 @@ static int cdn_dp_clk_enable(struct cdn_dp_device *dp)
         return 0;
 
 err_set_rate:
+        pm_runtime_put(dp->dev);
+err_pm_runtime_get:
         clk_disable_unprepare(dp->core_clk);
 err_core_clk:
         clk_disable_unprepare(dp->pclk);
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index 541a5887dd6c..d08f26973d0b 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -199,9 +199,14 @@ static const struct drm_ioctl_desc vmw_ioctls[] = {
         VMW_IOCTL_DEF(VMW_PRESENT_READBACK,
                       vmw_present_readback_ioctl,
                       DRM_MASTER | DRM_AUTH),
+        /*
+         * The permissions of the below ioctl are overridden in
+         * vmw_generic_ioctl(). We require either
+         * DRM_MASTER or capable(CAP_SYS_ADMIN).
+         */
         VMW_IOCTL_DEF(VMW_UPDATE_LAYOUT,
                       vmw_kms_update_layout_ioctl,
-                      DRM_MASTER | DRM_CONTROL_ALLOW),
+                      DRM_RENDER_ALLOW),
         VMW_IOCTL_DEF(VMW_CREATE_SHADER,
                       vmw_shader_define_ioctl,
                       DRM_AUTH | DRM_RENDER_ALLOW),
@@ -1123,6 +1128,10 @@ static long vmw_generic_ioctl(struct file *filp, unsigned int cmd,
 
                         return (long) vmw_execbuf_ioctl(dev, arg, file_priv,
                                                         _IOC_SIZE(cmd));
+                } else if (nr == DRM_COMMAND_BASE + DRM_VMW_UPDATE_LAYOUT) {
+                        if (!drm_is_current_master(file_priv) &&
+                            !capable(CAP_SYS_ADMIN))
+                                return -EACCES;
                 }
 
                 if (unlikely(ioctl->cmd != cmd))
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
index 1e59a486bba8..59ff4197173a 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
@@ -41,9 +41,9 @@
 #include <drm/ttm/ttm_module.h>
 #include "vmwgfx_fence.h"
 
-#define VMWGFX_DRIVER_DATE "20160210"
+#define VMWGFX_DRIVER_DATE "20170221"
 #define VMWGFX_DRIVER_MAJOR 2
-#define VMWGFX_DRIVER_MINOR 11
+#define VMWGFX_DRIVER_MINOR 12
 #define VMWGFX_DRIVER_PATCHLEVEL 0
 #define VMWGFX_FILE_PAGE_OFFSET 0x00100000
 #define VMWGFX_FIFO_STATIC_SIZE (1024*1024)
diff --git a/drivers/gpu/drm/zte/zx_plane.c b/drivers/gpu/drm/zte/zx_plane.c
index 1d08ba381098..d646ac931663 100644
--- a/drivers/gpu/drm/zte/zx_plane.c
+++ b/drivers/gpu/drm/zte/zx_plane.c
@@ -159,7 +159,7 @@ static void zx_vl_rsz_setup(struct zx_plane *zplane, uint32_t format,
         void __iomem *rsz = zplane->rsz;
         u32 src_chroma_w = src_w;
         u32 src_chroma_h = src_h;
-        u32 fmt;
+        int fmt;
 
         /* Set up source and destination resolution */
         zx_writel(rsz + RSZ_SRC_CFG, RSZ_VER(src_h - 1) | RSZ_HOR(src_w - 1));
@@ -203,7 +203,7 @@ static void zx_vl_plane_atomic_update(struct drm_plane *plane,
         u32 src_x, src_y, src_w, src_h;
         u32 dst_x, dst_y, dst_w, dst_h;
         uint32_t format;
-        u32 fmt;
+        int fmt;
         int num_planes;
         int i;
 
diff --git a/drivers/input/rmi4/rmi_f30.c b/drivers/input/rmi4/rmi_f30.c
index 3422464af229..198678613382 100644
--- a/drivers/input/rmi4/rmi_f30.c
+++ b/drivers/input/rmi4/rmi_f30.c
@@ -258,9 +258,10 @@ static int rmi_f30_map_gpios(struct rmi_function *fn,
 
         /*
          * Buttonpad could be also inferred from f30->has_mech_mouse_btns,
-         * but I am not sure, so use only the pdata info.
+         * but I am not sure, so use only the pdata info and the number of
+         * mapped buttons.
          */
-        if (pdata->f30_data.buttonpad)
+        if (pdata->f30_data.buttonpad || (button - BTN_LEFT == 1))
                 __set_bit(INPUT_PROP_BUTTONPAD, input->propbit);
 
         return 0;
diff --git a/drivers/leds/leds-pwm.c b/drivers/leds/leds-pwm.c
index a9145aa7f36a..8d456dc6c5bf 100644
--- a/drivers/leds/leds-pwm.c
+++ b/drivers/leds/leds-pwm.c
@@ -29,7 +29,6 @@ struct led_pwm_data {
         unsigned int            active_low;
         unsigned int            period;
         int                     duty;
-        bool                    can_sleep;
 };
 
 struct led_pwm_priv {
@@ -49,8 +48,8 @@ static void __led_pwm_set(struct led_pwm_data *led_dat)
                 pwm_enable(led_dat->pwm);
 }
 
-static void led_pwm_set(struct led_classdev *led_cdev,
-        enum led_brightness brightness)
+static int led_pwm_set(struct led_classdev *led_cdev,
+                       enum led_brightness brightness)
 {
         struct led_pwm_data *led_dat =
                 container_of(led_cdev, struct led_pwm_data, cdev);
@@ -66,12 +65,7 @@ static void led_pwm_set(struct led_classdev *led_cdev,
         led_dat->duty = duty;
 
         __led_pwm_set(led_dat);
-}
 
-static int led_pwm_set_blocking(struct led_classdev *led_cdev,
-        enum led_brightness brightness)
-{
-        led_pwm_set(led_cdev, brightness);
         return 0;
 }
 
@@ -112,11 +106,7 @@ static int led_pwm_add(struct device *dev, struct led_pwm_priv *priv,
                 return ret;
         }
 
-        led_data->can_sleep = pwm_can_sleep(led_data->pwm);
-        if (!led_data->can_sleep)
-                led_data->cdev.brightness_set = led_pwm_set;
-        else
-                led_data->cdev.brightness_set_blocking = led_pwm_set_blocking;
+        led_data->cdev.brightness_set_blocking = led_pwm_set;
 
         /*
          * FIXME: pwm_apply_args() should be removed when switching to the
diff --git a/drivers/misc/cxl/cxl.h b/drivers/misc/cxl/cxl.h
index 6c722d96b775..79e60ec70bd3 100644
--- a/drivers/misc/cxl/cxl.h
+++ b/drivers/misc/cxl/cxl.h
@@ -418,8 +418,9 @@ struct cxl_afu {
         struct dentry *debugfs;
         struct mutex contexts_lock;
         spinlock_t afu_cntl_lock;
-        /* Used to block access to AFU config space while deconfigured */
-        struct rw_semaphore configured_rwsem;
+
+        /* -1: AFU deconfigured/locked, >= 0: number of readers */
+        atomic_t configured_state;
 
         /* AFU error buffer fields and bin attribute for sysfs */
         u64 eb_len, eb_offset;
diff --git a/drivers/misc/cxl/main.c b/drivers/misc/cxl/main.c
index 2a6bf1d0a3a4..cc1706a92ace 100644
--- a/drivers/misc/cxl/main.c
+++ b/drivers/misc/cxl/main.c
@@ -268,8 +268,7 @@ struct cxl_afu *cxl_alloc_afu(struct cxl *adapter, int slice)
         idr_init(&afu->contexts_idr);
         mutex_init(&afu->contexts_lock);
         spin_lock_init(&afu->afu_cntl_lock);
-        init_rwsem(&afu->configured_rwsem);
-        down_write(&afu->configured_rwsem);
+        atomic_set(&afu->configured_state, -1);
         afu->prefault_mode = CXL_PREFAULT_NONE;
         afu->irqs_max = afu->adapter->user_irqs;
 
diff --git a/drivers/misc/cxl/pci.c b/drivers/misc/cxl/pci.c
index cca938845ffd..91f645992c94 100644
--- a/drivers/misc/cxl/pci.c
+++ b/drivers/misc/cxl/pci.c
@@ -1129,7 +1129,7 @@ static int pci_configure_afu(struct cxl_afu *afu, struct cxl *adapter, struct pc
         if ((rc = cxl_native_register_psl_irq(afu)))
                 goto err2;
 
-        up_write(&afu->configured_rwsem);
+        atomic_set(&afu->configured_state, 0);
         return 0;
 
 err2:
@@ -1142,7 +1142,14 @@ err1:
 
 static void pci_deconfigure_afu(struct cxl_afu *afu)
 {
-        down_write(&afu->configured_rwsem);
+        /*
+         * It's okay to deconfigure when AFU is already locked, otherwise wait
+         * until there are no readers
+         */
+        if (atomic_read(&afu->configured_state) != -1) {
+                while (atomic_cmpxchg(&afu->configured_state, 0, -1) != -1)
+                        schedule();
+        }
         cxl_native_release_psl_irq(afu);
         if (afu->adapter->native->sl_ops->release_serr_irq)
                 afu->adapter->native->sl_ops->release_serr_irq(afu);
diff --git a/drivers/misc/cxl/vphb.c b/drivers/misc/cxl/vphb.c
index 639a343b7836..512a4897dbf6 100644
--- a/drivers/misc/cxl/vphb.c
+++ b/drivers/misc/cxl/vphb.c
@@ -83,6 +83,16 @@ static inline struct cxl_afu *pci_bus_to_afu(struct pci_bus *bus)
         return phb ? phb->private_data : NULL;
 }
 
+static void cxl_afu_configured_put(struct cxl_afu *afu)
+{
+        atomic_dec_if_positive(&afu->configured_state);
+}
+
+static bool cxl_afu_configured_get(struct cxl_afu *afu)
+{
+        return atomic_inc_unless_negative(&afu->configured_state);
+}
+
 static inline int cxl_pcie_config_info(struct pci_bus *bus, unsigned int devfn,
                                        struct cxl_afu *afu, int *_record)
 {
@@ -107,7 +117,7 @@ static int cxl_pcie_read_config(struct pci_bus *bus, unsigned int devfn,
 
         afu = pci_bus_to_afu(bus);
         /* Grab a reader lock on afu. */
-        if (afu == NULL || !down_read_trylock(&afu->configured_rwsem))
+        if (afu == NULL || !cxl_afu_configured_get(afu))
                 return PCIBIOS_DEVICE_NOT_FOUND;
 
         rc = cxl_pcie_config_info(bus, devfn, afu, &record);
@@ -132,7 +142,7 @@ static int cxl_pcie_read_config(struct pci_bus *bus, unsigned int devfn,
         }
 
 out:
-        up_read(&afu->configured_rwsem);
+        cxl_afu_configured_put(afu);
         return rc ? PCIBIOS_DEVICE_NOT_FOUND : PCIBIOS_SUCCESSFUL;
 }
 
@@ -144,7 +154,7 @@ static int cxl_pcie_write_config(struct pci_bus *bus, unsigned int devfn,
 
         afu = pci_bus_to_afu(bus);
         /* Grab a reader lock on afu. */
-        if (afu == NULL || !down_read_trylock(&afu->configured_rwsem))
+        if (afu == NULL || !cxl_afu_configured_get(afu))
                 return PCIBIOS_DEVICE_NOT_FOUND;
 
         rc = cxl_pcie_config_info(bus, devfn, afu, &record);
@@ -166,7 +176,7 @@ static int cxl_pcie_write_config(struct pci_bus *bus, unsigned int devfn,
         }
 
 out:
-        up_read(&afu->configured_rwsem);
+        cxl_afu_configured_put(afu);
         return rc ? PCIBIOS_SET_FAILED : PCIBIOS_SUCCESSFUL;
 }
 
diff --git a/drivers/pci/hotplug/pnv_php.c b/drivers/pci/hotplug/pnv_php.c
index d2961ef39a3a..7c203198b582 100644
--- a/drivers/pci/hotplug/pnv_php.c
+++ b/drivers/pci/hotplug/pnv_php.c
@@ -35,9 +35,11 @@ static void pnv_php_register(struct device_node *dn);
 static void pnv_php_unregister_one(struct device_node *dn);
 static void pnv_php_unregister(struct device_node *dn);
 
-static void pnv_php_disable_irq(struct pnv_php_slot *php_slot)
+static void pnv_php_disable_irq(struct pnv_php_slot *php_slot,
+                                bool disable_device)
 {
         struct pci_dev *pdev = php_slot->pdev;
+        int irq = php_slot->irq;
         u16 ctrl;
 
         if (php_slot->irq > 0) {
@@ -56,10 +58,14 @@ static void pnv_php_disable_irq(struct pnv_php_slot *php_slot)
                 php_slot->wq = NULL;
         }
 
-        if (pdev->msix_enabled)
-                pci_disable_msix(pdev);
-        else if (pdev->msi_enabled)
-                pci_disable_msi(pdev);
+        if (disable_device || irq > 0) {
+                if (pdev->msix_enabled)
+                        pci_disable_msix(pdev);
+                else if (pdev->msi_enabled)
+                        pci_disable_msi(pdev);
+
+                pci_disable_device(pdev);
+        }
 }
 
 static void pnv_php_free_slot(struct kref *kref)
@@ -68,7 +74,7 @@ static void pnv_php_free_slot(struct kref *kref)
                                         struct pnv_php_slot, kref);
 
         WARN_ON(!list_empty(&php_slot->children));
-        pnv_php_disable_irq(php_slot);
+        pnv_php_disable_irq(php_slot, false);
         kfree(php_slot->name);
         kfree(php_slot);
 }
@@ -76,7 +82,7 @@ static void pnv_php_free_slot(struct kref *kref)
 static inline void pnv_php_put_slot(struct pnv_php_slot *php_slot)
 {
 
-        if (WARN_ON(!php_slot))
+        if (!php_slot)
                 return;
 
         kref_put(&php_slot->kref, pnv_php_free_slot);
@@ -430,9 +436,21 @@ static int pnv_php_enable(struct pnv_php_slot *php_slot, bool rescan)
         if (ret)
                 return ret;
 
-        /* Proceed if there have nothing behind the slot */
-        if (presence == OPAL_PCI_SLOT_EMPTY)
+        /*
+         * Proceed if there have nothing behind the slot. However,
+         * we should leave the slot in registered state at the
+         * beginning. Otherwise, the PCI devices inserted afterwards
+         * won't be probed and populated.
+         */
+        if (presence == OPAL_PCI_SLOT_EMPTY) {
+                if (!php_slot->power_state_check) {
+                        php_slot->power_state_check = true;
+
+                        return 0;
+                }
+
                 goto scan;
+        }
 
         /*
          * If the power supply to the slot is off, we can't detect
@@ -705,10 +723,15 @@ static irqreturn_t pnv_php_interrupt(int irq, void *data)
         if (sts & PCI_EXP_SLTSTA_DLLSC) {
                 pcie_capability_read_word(pdev, PCI_EXP_LNKSTA, &lsts);
                 added = !!(lsts & PCI_EXP_LNKSTA_DLLLA);
-        } else if (sts & PCI_EXP_SLTSTA_PDC) {
+        } else if (!(php_slot->flags & PNV_PHP_FLAG_BROKEN_PDC) &&
+                   (sts & PCI_EXP_SLTSTA_PDC)) {
                 ret = pnv_pci_get_presence_state(php_slot->id, &presence);
-                if (!ret)
+                if (ret) {
+                        dev_warn(&pdev->dev, "PCI slot [%s] error %d getting presence (0x%04x), to retry the operation.\n",
+                                 php_slot->name, ret, sts);
                         return IRQ_HANDLED;
+                }
+
                 added = !!(presence == OPAL_PCI_SLOT_PRESENT);
         } else {
                 return IRQ_NONE;
@@ -752,6 +775,7 @@ static irqreturn_t pnv_php_interrupt(int irq, void *data)
 static void pnv_php_init_irq(struct pnv_php_slot *php_slot, int irq)
 {
         struct pci_dev *pdev = php_slot->pdev;
+        u32 broken_pdc = 0;
         u16 sts, ctrl;
         int ret;
 
@@ -759,29 +783,44 @@ static void pnv_php_init_irq(struct pnv_php_slot *php_slot, int irq)
         php_slot->wq = alloc_workqueue("pciehp-%s", 0, 0, php_slot->name);
         if (!php_slot->wq) {
                 dev_warn(&pdev->dev, "Cannot alloc workqueue\n");
-                pnv_php_disable_irq(php_slot);
+                pnv_php_disable_irq(php_slot, true);
                 return;
         }
 
+        /* Check PDC (Presence Detection Change) is broken or not */
+        ret = of_property_read_u32(php_slot->dn, "ibm,slot-broken-pdc",
+                                   &broken_pdc);
+        if (!ret && broken_pdc)
+                php_slot->flags |= PNV_PHP_FLAG_BROKEN_PDC;
+
         /* Clear pending interrupts */
         pcie_capability_read_word(pdev, PCI_EXP_SLTSTA, &sts);
-        sts |= (PCI_EXP_SLTSTA_PDC | PCI_EXP_SLTSTA_DLLSC);
+        if (php_slot->flags & PNV_PHP_FLAG_BROKEN_PDC)
+                sts |= PCI_EXP_SLTSTA_DLLSC;
+        else
+                sts |= (PCI_EXP_SLTSTA_PDC | PCI_EXP_SLTSTA_DLLSC);
         pcie_capability_write_word(pdev, PCI_EXP_SLTSTA, sts);
 
         /* Request the interrupt */
         ret = request_irq(irq, pnv_php_interrupt, IRQF_SHARED,
                           php_slot->name, php_slot);
         if (ret) {
-                pnv_php_disable_irq(php_slot);
+                pnv_php_disable_irq(php_slot, true);
                 dev_warn(&pdev->dev, "Error %d enabling IRQ %d\n", ret, irq);
                 return;
         }
 
         /* Enable the interrupts */
         pcie_capability_read_word(pdev, PCI_EXP_SLTCTL, &ctrl);
-        ctrl |= (PCI_EXP_SLTCTL_HPIE |
-                 PCI_EXP_SLTCTL_PDCE |
-                 PCI_EXP_SLTCTL_DLLSCE);
+        if (php_slot->flags & PNV_PHP_FLAG_BROKEN_PDC) {
+                ctrl &= ~PCI_EXP_SLTCTL_PDCE;
+                ctrl |= (PCI_EXP_SLTCTL_HPIE |
+                         PCI_EXP_SLTCTL_DLLSCE);
+        } else {
+                ctrl |= (PCI_EXP_SLTCTL_HPIE |
+                         PCI_EXP_SLTCTL_PDCE |
+                         PCI_EXP_SLTCTL_DLLSCE);
+        }
         pcie_capability_write_word(pdev, PCI_EXP_SLTCTL, ctrl);
 
         /* The interrupt is initialized successfully when @irq is valid */
@@ -793,6 +832,14 @@ static void pnv_php_enable_irq(struct pnv_php_slot *php_slot)
         struct pci_dev *pdev = php_slot->pdev;
         int irq, ret;
 
+        /*
+         * The MSI/MSIx interrupt might have been occupied by other
+         * drivers. Don't populate the surprise hotplug capability
+         * in that case.
+         */
+        if (pci_dev_msi_enabled(pdev))
+                return;
+
         ret = pci_enable_device(pdev);
         if (ret) {
                 dev_warn(&pdev->dev, "Error %d enabling device\n", ret);
diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
index 2d0cfaa6d84c..42e37c20b361 100644
--- a/drivers/pwm/Kconfig
+++ b/drivers/pwm/Kconfig
@@ -76,7 +76,9 @@ config PWM_ATMEL_TCB
 
 config PWM_BCM_IPROC
         tristate "iProc PWM support"
-        depends on ARCH_BCM_IPROC
+        depends on ARCH_BCM_IPROC || COMPILE_TEST
+        depends on COMMON_CLK
+        default ARCH_BCM_IPROC
         help
           Generic PWM framework driver for Broadcom iProc PWM block. This
           block is used in Broadcom iProc SoC's.
diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c
index 172ef8245811..a0860b30bd93 100644
--- a/drivers/pwm/core.c
+++ b/drivers/pwm/core.c
@@ -137,9 +137,14 @@ of_pwm_xlate_with_flags(struct pwm_chip *pc, const struct of_phandle_args *args)
 {
         struct pwm_device *pwm;
 
+        /* check, whether the driver supports a third cell for flags */
         if (pc->of_pwm_n_cells < 3)
                 return ERR_PTR(-EINVAL);
 
+        /* flags in the third cell are optional */
+        if (args->args_count < 2)
+                return ERR_PTR(-EINVAL);
+
         if (args->args[0] >= pc->npwm)
                 return ERR_PTR(-EINVAL);
 
@@ -148,11 +153,10 @@ of_pwm_xlate_with_flags(struct pwm_chip *pc, const struct of_phandle_args *args)
                 return pwm;
 
         pwm->args.period = args->args[1];
+        pwm->args.polarity = PWM_POLARITY_NORMAL;
 
-        if (args->args[2] & PWM_POLARITY_INVERTED)
+        if (args->args_count > 2 && args->args[2] & PWM_POLARITY_INVERTED)
                 pwm->args.polarity = PWM_POLARITY_INVERSED;
-        else
-                pwm->args.polarity = PWM_POLARITY_NORMAL;
 
         return pwm;
 }
@@ -163,9 +167,14 @@ of_pwm_simple_xlate(struct pwm_chip *pc, const struct of_phandle_args *args)
 {
         struct pwm_device *pwm;
 
+        /* sanity check driver support */
         if (pc->of_pwm_n_cells < 2)
                 return ERR_PTR(-EINVAL);
 
+        /* all cells are required */
+        if (args->args_count != pc->of_pwm_n_cells)
+                return ERR_PTR(-EINVAL);
+
         if (args->args[0] >= pc->npwm)
                 return ERR_PTR(-EINVAL);
 
@@ -663,24 +672,17 @@ struct pwm_device *of_pwm_get(struct device_node *np, const char *con_id)
         err = of_parse_phandle_with_args(np, "pwms", "#pwm-cells", index,
                                          &args);
         if (err) {
-                pr_debug("%s(): can't parse \"pwms\" property\n", __func__);
+                pr_err("%s(): can't parse \"pwms\" property\n", __func__);
                 return ERR_PTR(err);
         }
 
         pc = of_node_to_pwmchip(args.np);
         if (IS_ERR(pc)) {
-                pr_debug("%s(): PWM chip not found\n", __func__);
+                pr_err("%s(): PWM chip not found\n", __func__);
                 pwm = ERR_CAST(pc);
                 goto put;
         }
 
-        if (args.args_count != pc->of_pwm_n_cells) {
-                pr_debug("%s: wrong #pwm-cells for %s\n", np->full_name,
-                         args.np->full_name);
-                pwm = ERR_PTR(-EINVAL);
-                goto put;
-        }
-
         pwm = pc->of_xlate(pc, &args);
         if (IS_ERR(pwm))
                 goto put;
@@ -757,12 +759,13 @@ void pwm_remove_table(struct pwm_lookup *table, size_t num)
  */
 struct pwm_device *pwm_get(struct device *dev, const char *con_id)
 {
-        struct pwm_device *pwm = ERR_PTR(-EPROBE_DEFER);
         const char *dev_id = dev ? dev_name(dev) : NULL;
-        struct pwm_chip *chip = NULL;
+        struct pwm_device *pwm;
+        struct pwm_chip *chip;
         unsigned int best = 0;
         struct pwm_lookup *p, *chosen = NULL;
         unsigned int match;
+        int err;
 
         /* look up via DT first */
         if (IS_ENABLED(CONFIG_OF) && dev && dev->of_node)
@@ -817,24 +820,35 @@ struct pwm_device *pwm_get(struct device *dev, const char *con_id)
                 }
         }
 
-        if (!chosen) {
-                pwm = ERR_PTR(-ENODEV);
-                goto out;
-        }
+        mutex_unlock(&pwm_lookup_lock);
+
+        if (!chosen)
+                return ERR_PTR(-ENODEV);
 
         chip = pwmchip_find_by_name(chosen->provider);
+
+        /*
+         * If the lookup entry specifies a module, load the module and retry
+         * the PWM chip lookup. This can be used to work around driver load
+         * ordering issues if driver's can't be made to properly support the
+         * deferred probe mechanism.
+         */
+        if (!chip && chosen->module) {
+                err = request_module(chosen->module);
+                if (err == 0)
+                        chip = pwmchip_find_by_name(chosen->provider);
+        }
+
         if (!chip)
-                goto out;
+                return ERR_PTR(-EPROBE_DEFER);
 
         pwm = pwm_request_from_chip(chip, chosen->index, con_id ?: dev_id);
         if (IS_ERR(pwm))
-                goto out;
+                return pwm;
 
         pwm->args.period = chosen->period;
         pwm->args.polarity = chosen->polarity;
 
-out:
-        mutex_unlock(&pwm_lookup_lock);
         return pwm;
 }
 EXPORT_SYMBOL_GPL(pwm_get);
@@ -960,18 +974,6 @@ void devm_pwm_put(struct device *dev, struct pwm_device *pwm)
 }
 EXPORT_SYMBOL_GPL(devm_pwm_put);
 
-/**
-  * pwm_can_sleep() - report whether PWM access will sleep
-  * @pwm: PWM device
-  *
-  * Returns: True if accessing the PWM can sleep, false otherwise.
-  */
-bool pwm_can_sleep(struct pwm_device *pwm)
-{
-        return true;
-}
-EXPORT_SYMBOL_GPL(pwm_can_sleep);
-
 #ifdef CONFIG_DEBUG_FS
 static void pwm_dbg_show(struct pwm_chip *chip, struct seq_file *s)
 {
diff --git a/drivers/pwm/pwm-atmel-hlcdc.c b/drivers/pwm/pwm-atmel-hlcdc.c
index 14fc011faa32..999187277ea5 100644
--- a/drivers/pwm/pwm-atmel-hlcdc.c
+++ b/drivers/pwm/pwm-atmel-hlcdc.c
@@ -270,7 +270,6 @@ static int atmel_hlcdc_pwm_probe(struct platform_device *pdev)
         chip->chip.npwm = 1;
         chip->chip.of_xlate = of_pwm_xlate_with_flags;
         chip->chip.of_pwm_n_cells = 3;
-        chip->chip.can_sleep = 1;
 
         ret = pwmchip_add_with_polarity(&chip->chip, PWM_POLARITY_INVERSED);
         if (ret) {
diff --git a/drivers/pwm/pwm-atmel.c b/drivers/pwm/pwm-atmel.c
index e6b8b1b7e6ba..67a7023be5c2 100644
--- a/drivers/pwm/pwm-atmel.c
+++ b/drivers/pwm/pwm-atmel.c
@@ -385,7 +385,6 @@ static int atmel_pwm_probe(struct platform_device *pdev)
 
         atmel_pwm->chip.base = -1;
         atmel_pwm->chip.npwm = 4;
-        atmel_pwm->chip.can_sleep = true;
         atmel_pwm->config = data->config;
         atmel_pwm->updated_pwms = 0;
         mutex_init(&atmel_pwm->isr_lock);
diff --git a/drivers/pwm/pwm-bcm-kona.c b/drivers/pwm/pwm-bcm-kona.c
index c63418322023..09a95aeb3a70 100644
--- a/drivers/pwm/pwm-bcm-kona.c
+++ b/drivers/pwm/pwm-bcm-kona.c
@@ -276,7 +276,6 @@ static int kona_pwmc_probe(struct platform_device *pdev)
         kp->chip.npwm = 6;
         kp->chip.of_xlate = of_pwm_xlate_with_flags;
         kp->chip.of_pwm_n_cells = 3;
-        kp->chip.can_sleep = true;
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         kp->base = devm_ioremap_resource(&pdev->dev, res);
diff --git a/drivers/pwm/pwm-berlin.c b/drivers/pwm/pwm-berlin.c
index 01339c152ab0..771859aca4be 100644
--- a/drivers/pwm/pwm-berlin.c
+++ b/drivers/pwm/pwm-berlin.c
@@ -206,7 +206,6 @@ static int berlin_pwm_probe(struct platform_device *pdev)
         pwm->chip.ops = &berlin_pwm_ops;
         pwm->chip.base = -1;
         pwm->chip.npwm = 4;
-        pwm->chip.can_sleep = true;
         pwm->chip.of_xlate = of_pwm_xlate_with_flags;
         pwm->chip.of_pwm_n_cells = 3;
 
diff --git a/drivers/pwm/pwm-bfin.c b/drivers/pwm/pwm-bfin.c
index 7631ef194de7..d2ed0a2a18e8 100644
--- a/drivers/pwm/pwm-bfin.c
+++ b/drivers/pwm/pwm-bfin.c
@@ -103,7 +103,7 @@ static void bfin_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)
         disable_gptimer(priv->pin);
 }
 
-static struct pwm_ops bfin_pwm_ops = {
+static const struct pwm_ops bfin_pwm_ops = {
         .request = bfin_pwm_request,
         .free = bfin_pwm_free,
         .config = bfin_pwm_config,
diff --git a/drivers/pwm/pwm-brcmstb.c b/drivers/pwm/pwm-brcmstb.c
index 5d5adee16886..8063cffa1c96 100644
--- a/drivers/pwm/pwm-brcmstb.c
+++ b/drivers/pwm/pwm-brcmstb.c
@@ -270,7 +270,6 @@ static int brcmstb_pwm_probe(struct platform_device *pdev)
         p->chip.ops = &brcmstb_pwm_ops;
         p->chip.base = -1;
         p->chip.npwm = 2;
-        p->chip.can_sleep = true;
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         p->base = devm_ioremap_resource(&pdev->dev, res);
diff --git a/drivers/pwm/pwm-fsl-ftm.c b/drivers/pwm/pwm-fsl-ftm.c
index fad968eb75f6..557b4ea16796 100644
--- a/drivers/pwm/pwm-fsl-ftm.c
+++ b/drivers/pwm/pwm-fsl-ftm.c
@@ -446,7 +446,6 @@ static int fsl_pwm_probe(struct platform_device *pdev)
         fpc->chip.of_pwm_n_cells = 3;
         fpc->chip.base = -1;
         fpc->chip.npwm = 8;
-        fpc->chip.can_sleep = true;
 
         ret = pwmchip_add(&fpc->chip);
         if (ret < 0) {
diff --git a/drivers/pwm/pwm-imx.c b/drivers/pwm/pwm-imx.c
index d600fd5cd4ba..2ba5c3a398ff 100644
--- a/drivers/pwm/pwm-imx.c
+++ b/drivers/pwm/pwm-imx.c
@@ -38,6 +38,7 @@
 #define MX3_PWMCR_DOZEEN                (1 << 24)
 #define MX3_PWMCR_WAITEN                (1 << 23)
 #define MX3_PWMCR_DBGEN                 (1 << 22)
+#define MX3_PWMCR_POUTC                 (1 << 18)
 #define MX3_PWMCR_CLKSRC_IPG_HIGH       (2 << 16)
 #define MX3_PWMCR_CLKSRC_IPG            (1 << 16)
 #define MX3_PWMCR_SWR                   (1 << 3)
@@ -49,15 +50,10 @@
 
 struct imx_chip {
         struct clk      *clk_per;
-        struct clk      *clk_ipg;
 
         void __iomem    *mmio_base;
 
         struct pwm_chip chip;
-
-        int (*config)(struct pwm_chip *chip,
-                struct pwm_device *pwm, int duty_ns, int period_ns);
-        void (*set_enable)(struct pwm_chip *chip, bool enable);
 };
 
 #define to_imx_chip(chip)       container_of(chip, struct imx_chip, chip)
@@ -91,176 +87,170 @@ static int imx_pwm_config_v1(struct pwm_chip *chip,
         return 0;
 }
 
-static void imx_pwm_set_enable_v1(struct pwm_chip *chip, bool enable)
+static int imx_pwm_enable_v1(struct pwm_chip *chip, struct pwm_device *pwm)
 {
         struct imx_chip *imx = to_imx_chip(chip);
         u32 val;
+        int ret;
 
-        val = readl(imx->mmio_base + MX1_PWMC);
-
-        if (enable)
-                val |= MX1_PWMC_EN;
-        else
-                val &= ~MX1_PWMC_EN;
+        ret = clk_prepare_enable(imx->clk_per);
+        if (ret < 0)
+                return ret;
 
+        val = readl(imx->mmio_base + MX1_PWMC);
+        val |= MX1_PWMC_EN;
         writel(val, imx->mmio_base + MX1_PWMC);
-}
-
-static int imx_pwm_config_v2(struct pwm_chip *chip,
-                struct pwm_device *pwm, int duty_ns, int period_ns)
-{
-        struct imx_chip *imx = to_imx_chip(chip);
-        struct device *dev = chip->dev;
-        unsigned long long c;
-        unsigned long period_cycles, duty_cycles, prescale;
-        unsigned int period_ms;
-        bool enable = pwm_is_enabled(pwm);
-        int wait_count = 0, fifoav;
-        u32 cr, sr;
-
-        /*
-         * i.MX PWMv2 has a 4-word sample FIFO.
-         * In order to avoid FIFO overflow issue, we do software reset
-         * to clear all sample FIFO if the controller is disabled or
-         * wait for a full PWM cycle to get a relinquished FIFO slot
-         * when the controller is enabled and the FIFO is fully loaded.
-         */
-        if (enable) {
-                sr = readl(imx->mmio_base + MX3_PWMSR);
-                fifoav = sr & MX3_PWMSR_FIFOAV_MASK;
-                if (fifoav == MX3_PWMSR_FIFOAV_4WORDS) {
-                        period_ms = DIV_ROUND_UP(pwm_get_period(pwm),
-                                                 NSEC_PER_MSEC);
-                        msleep(period_ms);
-
-                        sr = readl(imx->mmio_base + MX3_PWMSR);
-                        if (fifoav == (sr & MX3_PWMSR_FIFOAV_MASK))
-                                dev_warn(dev, "there is no free FIFO slot\n");
-                }
-        } else {
-                writel(MX3_PWMCR_SWR, imx->mmio_base + MX3_PWMCR);
-                do {
-                        usleep_range(200, 1000);
-                        cr = readl(imx->mmio_base + MX3_PWMCR);
-                } while ((cr & MX3_PWMCR_SWR) &&
-                         (wait_count++ < MX3_PWM_SWR_LOOP));
-
-                if (cr & MX3_PWMCR_SWR)
-                        dev_warn(dev, "software reset timeout\n");
-        }
-
-        c = clk_get_rate(imx->clk_per);
-        c = c * period_ns;
-        do_div(c, 1000000000);
-        period_cycles = c;
-
-        prescale = period_cycles / 0x10000 + 1;
-
-        period_cycles /= prescale;
-        c = (unsigned long long)period_cycles * duty_ns;
-        do_div(c, period_ns);
-        duty_cycles = c;
-
-        /*
-         * according to imx pwm RM, the real period value should be
-         * PERIOD value in PWMPR plus 2.
-         */
-        if (period_cycles > 2)
-                period_cycles -= 2;
-        else
-                period_cycles = 0;
-
-        writel(duty_cycles, imx->mmio_base + MX3_PWMSAR);
-        writel(period_cycles, imx->mmio_base + MX3_PWMPR);
-
-        cr = MX3_PWMCR_PRESCALER(prescale) |
-                MX3_PWMCR_DOZEEN | MX3_PWMCR_WAITEN |
-                MX3_PWMCR_DBGEN | MX3_PWMCR_CLKSRC_IPG_HIGH;
-
-        if (enable)
-                cr |= MX3_PWMCR_EN;
-
-        writel(cr, imx->mmio_base + MX3_PWMCR);
 
         return 0;
 }
 
-static void imx_pwm_set_enable_v2(struct pwm_chip *chip, bool enable)
+static void imx_pwm_disable_v1(struct pwm_chip *chip, struct pwm_device *pwm)
 {
         struct imx_chip *imx = to_imx_chip(chip);
         u32 val;
 
-        val = readl(imx->mmio_base + MX3_PWMCR);
-
-        if (enable)
-                val |= MX3_PWMCR_EN;
-        else
-                val &= ~MX3_PWMCR_EN;
+        val = readl(imx->mmio_base + MX1_PWMC);
+        val &= ~MX1_PWMC_EN;
+        writel(val, imx->mmio_base + MX1_PWMC);
 
-        writel(val, imx->mmio_base + MX3_PWMCR);
+        clk_disable_unprepare(imx->clk_per);
 }
 
-static int imx_pwm_config(struct pwm_chip *chip,
-                struct pwm_device *pwm, int duty_ns, int period_ns)
+static void imx_pwm_sw_reset(struct pwm_chip *chip)
 {
         struct imx_chip *imx = to_imx_chip(chip);
-        int ret;
-
-        ret = clk_prepare_enable(imx->clk_ipg);
-        if (ret)
-                return ret;
+        struct device *dev = chip->dev;
+        int wait_count = 0;
+        u32 cr;
+
+        writel(MX3_PWMCR_SWR, imx->mmio_base + MX3_PWMCR);
+        do {
+                usleep_range(200, 1000);
+                cr = readl(imx->mmio_base + MX3_PWMCR);
+        } while ((cr & MX3_PWMCR_SWR) &&
+                 (wait_count++ < MX3_PWM_SWR_LOOP));
+
+        if (cr & MX3_PWMCR_SWR)
+                dev_warn(dev, "software reset timeout\n");
+}
 
-        ret = imx->config(chip, pwm, duty_ns, period_ns);
+static void imx_pwm_wait_fifo_slot(struct pwm_chip *chip,
+                                   struct pwm_device *pwm)
+{
+        struct imx_chip *imx = to_imx_chip(chip);
+        struct device *dev = chip->dev;
+        unsigned int period_ms;
+        int fifoav;
+        u32 sr;
 
-        clk_disable_unprepare(imx->clk_ipg);
+        sr = readl(imx->mmio_base + MX3_PWMSR);
+        fifoav = sr & MX3_PWMSR_FIFOAV_MASK;
+        if (fifoav == MX3_PWMSR_FIFOAV_4WORDS) {
+                period_ms = DIV_ROUND_UP(pwm_get_period(pwm),
+                                         NSEC_PER_MSEC);
+                msleep(period_ms);
 
-        return ret;
+                sr = readl(imx->mmio_base + MX3_PWMSR);
+                if (fifoav == (sr & MX3_PWMSR_FIFOAV_MASK))
+                        dev_warn(dev, "there is no free FIFO slot\n");
+        }
 }
 
-static int imx_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm)
+static int imx_pwm_apply_v2(struct pwm_chip *chip, struct pwm_device *pwm,
+                            struct pwm_state *state)
 {
+        unsigned long period_cycles, duty_cycles, prescale;
         struct imx_chip *imx = to_imx_chip(chip);
+        struct pwm_state cstate;
+        unsigned long long c;
         int ret;
+        u32 cr;
+
+        pwm_get_state(pwm, &cstate);
+
+        if (state->enabled) {
+                c = clk_get_rate(imx->clk_per);
+                c *= state->period;
+
+                do_div(c, 1000000000);
+                period_cycles = c;
+
+                prescale = period_cycles / 0x10000 + 1;
+
+                period_cycles /= prescale;
+                c = (unsigned long long)period_cycles * state->duty_cycle;
+                do_div(c, state->period);
+                duty_cycles = c;
+
+                /*
+                 * according to imx pwm RM, the real period value should be
+                 * PERIOD value in PWMPR plus 2.
+                 */
+                if (period_cycles > 2)
+                        period_cycles -= 2;
+                else
+                        period_cycles = 0;
+
+                /*
+                 * Wait for a free FIFO slot if the PWM is already enabled, and
+                 * flush the FIFO if the PWM was disabled and is about to be
+                 * enabled.
+                 */
+                if (cstate.enabled) {
+                        imx_pwm_wait_fifo_slot(chip, pwm);
+                } else {
+                        ret = clk_prepare_enable(imx->clk_per);
+                        if (ret)
+                                return ret;
+
+                        imx_pwm_sw_reset(chip);
+                }
 
-        ret = clk_prepare_enable(imx->clk_per);
-        if (ret)
-                return ret;
+                writel(duty_cycles, imx->mmio_base + MX3_PWMSAR);
+                writel(period_cycles, imx->mmio_base + MX3_PWMPR);
 
-        imx->set_enable(chip, true);
+                cr = MX3_PWMCR_PRESCALER(prescale) |
+                     MX3_PWMCR_DOZEEN | MX3_PWMCR_WAITEN |
+                     MX3_PWMCR_DBGEN | MX3_PWMCR_CLKSRC_IPG_HIGH |
+                     MX3_PWMCR_EN;
 
-        return 0;
-}
+                if (state->polarity == PWM_POLARITY_INVERSED)
+                        cr |= MX3_PWMCR_POUTC;
 
-static void imx_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)
-{
-        struct imx_chip *imx = to_imx_chip(chip);
+                writel(cr, imx->mmio_base + MX3_PWMCR);
+        } else if (cstate.enabled) {
+                writel(0, imx->mmio_base + MX3_PWMCR);
 
-        imx->set_enable(chip, false);
+                clk_disable_unprepare(imx->clk_per);
+        }
 
-        clk_disable_unprepare(imx->clk_per);
+        return 0;
 }
 
-static struct pwm_ops imx_pwm_ops = {
-        .enable = imx_pwm_enable,
-        .disable = imx_pwm_disable,
-        .config = imx_pwm_config,
+static const struct pwm_ops imx_pwm_ops_v1 = {
+        .enable = imx_pwm_enable_v1,
+        .disable = imx_pwm_disable_v1,
+        .config = imx_pwm_config_v1,
+        .owner = THIS_MODULE,
+};
+
+static const struct pwm_ops imx_pwm_ops_v2 = {
+        .apply = imx_pwm_apply_v2,
         .owner = THIS_MODULE,
 };
 
 struct imx_pwm_data {
-        int (*config)(struct pwm_chip *chip,
-                struct pwm_device *pwm, int duty_ns, int period_ns);
-        void (*set_enable)(struct pwm_chip *chip, bool enable);
+        bool polarity_supported;
+        const struct pwm_ops *ops;
 };
 
 static struct imx_pwm_data imx_pwm_data_v1 = {
-        .config = imx_pwm_config_v1,
-        .set_enable = imx_pwm_set_enable_v1,
+        .ops = &imx_pwm_ops_v1,
 };
 
 static struct imx_pwm_data imx_pwm_data_v2 = {
-        .config = imx_pwm_config_v2,
-        .set_enable = imx_pwm_set_enable_v2,
+        .polarity_supported = true,
+        .ops = &imx_pwm_ops_v2,
 };
 
 static const struct of_device_id imx_pwm_dt_ids[] = {
@@ -282,6 +272,8 @@ static int imx_pwm_probe(struct platform_device *pdev)
         if (!of_id)
                 return -ENODEV;
 
+        data = of_id->data;
+
         imx = devm_kzalloc(&pdev->dev, sizeof(*imx), GFP_KERNEL);
         if (imx == NULL)
                 return -ENOMEM;
@@ -293,28 +285,22 @@ static int imx_pwm_probe(struct platform_device *pdev)
                 return PTR_ERR(imx->clk_per);
         }
 
-        imx->clk_ipg = devm_clk_get(&pdev->dev, "ipg");
-        if (IS_ERR(imx->clk_ipg)) {
-                dev_err(&pdev->dev, "getting ipg clock failed with %ld\n",
-                                PTR_ERR(imx->clk_ipg));
-                return PTR_ERR(imx->clk_ipg);
-        }
-
-        imx->chip.ops = &imx_pwm_ops;
+        imx->chip.ops = data->ops;
         imx->chip.dev = &pdev->dev;
         imx->chip.base = -1;
         imx->chip.npwm = 1;
-        imx->chip.can_sleep = true;
+
+        if (data->polarity_supported) {
+                dev_dbg(&pdev->dev, "PWM supports output inversion\n");
+                imx->chip.of_xlate = of_pwm_xlate_with_flags;
+                imx->chip.of_pwm_n_cells = 3;
+        }
 
         r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         imx->mmio_base = devm_ioremap_resource(&pdev->dev, r);
         if (IS_ERR(imx->mmio_base))
                 return PTR_ERR(imx->mmio_base);
 
-        data = of_id->data;
-        imx->config = data->config;
-        imx->set_enable = data->set_enable;
-
         ret = pwmchip_add(&imx->chip);
         if (ret < 0)
                 return ret;
diff --git a/drivers/pwm/pwm-lp3943.c b/drivers/pwm/pwm-lp3943.c
index 872ea76a4f19..52584e9962ed 100644
--- a/drivers/pwm/pwm-lp3943.c
+++ b/drivers/pwm/pwm-lp3943.c
@@ -278,7 +278,6 @@ static int lp3943_pwm_probe(struct platform_device *pdev)
         lp3943_pwm->chip.dev = &pdev->dev;
         lp3943_pwm->chip.ops = &lp3943_pwm_ops;
         lp3943_pwm->chip.npwm = LP3943_NUM_PWMS;
-        lp3943_pwm->chip.can_sleep = true;
 
         platform_set_drvdata(pdev, lp3943_pwm);
 
diff --git a/drivers/pwm/pwm-lpss-pci.c b/drivers/pwm/pwm-lpss-pci.c
index 3622f093490e..053088b9b66e 100644
--- a/drivers/pwm/pwm-lpss-pci.c
+++ b/drivers/pwm/pwm-lpss-pci.c
@@ -17,6 +17,27 @@
 
 #include "pwm-lpss.h"
 
+/* BayTrail */
+static const struct pwm_lpss_boardinfo pwm_lpss_byt_info = {
+        .clk_rate = 25000000,
+        .npwm = 1,
+        .base_unit_bits = 16,
+};
+
+/* Braswell */
+static const struct pwm_lpss_boardinfo pwm_lpss_bsw_info = {
+        .clk_rate = 19200000,
+        .npwm = 1,
+        .base_unit_bits = 16,
+};
+
+/* Broxton */
+static const struct pwm_lpss_boardinfo pwm_lpss_bxt_info = {
+        .clk_rate = 19200000,
+        .npwm = 4,
+        .base_unit_bits = 22,
+};
+
 static int pwm_lpss_probe_pci(struct pci_dev *pdev,
                               const struct pci_device_id *id)
 {
@@ -80,6 +101,7 @@ static const struct pci_device_id pwm_lpss_pci_ids[] = {
         { PCI_VDEVICE(INTEL, 0x1ac8), (unsigned long)&pwm_lpss_bxt_info},
         { PCI_VDEVICE(INTEL, 0x2288), (unsigned long)&pwm_lpss_bsw_info},
         { PCI_VDEVICE(INTEL, 0x2289), (unsigned long)&pwm_lpss_bsw_info},
+        { PCI_VDEVICE(INTEL, 0x31c8), (unsigned long)&pwm_lpss_bxt_info},
         { PCI_VDEVICE(INTEL, 0x5ac8), (unsigned long)&pwm_lpss_bxt_info},
         { },
 };
diff --git a/drivers/pwm/pwm-lpss-platform.c b/drivers/pwm/pwm-lpss-platform.c
index 54433fc6d1a4..b22b6fdadb9a 100644
--- a/drivers/pwm/pwm-lpss-platform.c
+++ b/drivers/pwm/pwm-lpss-platform.c
@@ -18,6 +18,27 @@
 
 #include "pwm-lpss.h"
 
+/* BayTrail */
+static const struct pwm_lpss_boardinfo pwm_lpss_byt_info = {
+        .clk_rate = 25000000,
+        .npwm = 1,
+        .base_unit_bits = 16,
+};
+
+/* Braswell */
+static const struct pwm_lpss_boardinfo pwm_lpss_bsw_info = {
+        .clk_rate = 19200000,
+        .npwm = 1,
+        .base_unit_bits = 16,
+};
+
+/* Broxton */
+static const struct pwm_lpss_boardinfo pwm_lpss_bxt_info = {
+        .clk_rate = 19200000,
+        .npwm = 4,
+        .base_unit_bits = 22,
+};
+
 static int pwm_lpss_probe_platform(struct platform_device *pdev)
 {
         const struct pwm_lpss_boardinfo *info;
diff --git a/drivers/pwm/pwm-lpss.c b/drivers/pwm/pwm-lpss.c
index 72c0bce5a75c..689d2c1cbead 100644
--- a/drivers/pwm/pwm-lpss.c
+++ b/drivers/pwm/pwm-lpss.c
@@ -15,6 +15,7 @@
 
 #include <linux/delay.h>
 #include <linux/io.h>
+#include <linux/iopoll.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/pm_runtime.h>
@@ -37,30 +38,6 @@ struct pwm_lpss_chip {
         const struct pwm_lpss_boardinfo *info;
 };
 
-/* BayTrail */
-const struct pwm_lpss_boardinfo pwm_lpss_byt_info = {
-        .clk_rate = 25000000,
-        .npwm = 1,
-        .base_unit_bits = 16,
-};
-EXPORT_SYMBOL_GPL(pwm_lpss_byt_info);
-
-/* Braswell */
-const struct pwm_lpss_boardinfo pwm_lpss_bsw_info = {
-        .clk_rate = 19200000,
-        .npwm = 1,
-        .base_unit_bits = 16,
-};
-EXPORT_SYMBOL_GPL(pwm_lpss_bsw_info);
-
-/* Broxton */
-const struct pwm_lpss_boardinfo pwm_lpss_bxt_info = {
-        .clk_rate = 19200000,
-        .npwm = 4,
-        .base_unit_bits = 22,
-};
-EXPORT_SYMBOL_GPL(pwm_lpss_bxt_info);
-
 static inline struct pwm_lpss_chip *to_lpwm(struct pwm_chip *chip)
 {
         return container_of(chip, struct pwm_lpss_chip, chip);
@@ -80,17 +57,42 @@ static inline void pwm_lpss_write(const struct pwm_device *pwm, u32 value)
         writel(value, lpwm->regs + pwm->hwpwm * PWM_SIZE + PWM);
 }
 
-static void pwm_lpss_update(struct pwm_device *pwm)
+static int pwm_lpss_update(struct pwm_device *pwm)
 {
+        struct pwm_lpss_chip *lpwm = to_lpwm(pwm->chip);
+        const void __iomem *addr = lpwm->regs + pwm->hwpwm * PWM_SIZE + PWM;
+        const unsigned int ms = 500 * USEC_PER_MSEC;
+        u32 val;
+        int err;
+
         pwm_lpss_write(pwm, pwm_lpss_read(pwm) | PWM_SW_UPDATE);
-        /* Give it some time to propagate */
-        usleep_range(10, 50);
+
+        /*
+         * PWM Configuration register has SW_UPDATE bit that is set when a new
+         * configuration is written to the register. The bit is automatically
+         * cleared at the start of the next output cycle by the IP block.
+         *
+         * If one writes a new configuration to the register while it still has
+         * the bit enabled, PWM may freeze. That is, while one can still write
+         * to the register, it won't have an effect. Thus, we try to sleep long
+         * enough that the bit gets cleared and make sure the bit is not
+         * enabled while we update the configuration.
+         */
+        err = readl_poll_timeout(addr, val, !(val & PWM_SW_UPDATE), 40, ms);
+        if (err)
+                dev_err(pwm->chip->dev, "PWM_SW_UPDATE was not cleared\n");
+
+        return err;
 }
 
-static int pwm_lpss_config(struct pwm_chip *chip, struct pwm_device *pwm,
-                           int duty_ns, int period_ns)
+static inline int pwm_lpss_is_updating(struct pwm_device *pwm)
+{
+        return (pwm_lpss_read(pwm) & PWM_SW_UPDATE) ? -EBUSY : 0;
+}
+
+static void pwm_lpss_prepare(struct pwm_lpss_chip *lpwm, struct pwm_device *pwm,
+                             int duty_ns, int period_ns)
 {
-        struct pwm_lpss_chip *lpwm = to_lpwm(chip);
         unsigned long long on_time_div;
         unsigned long c = lpwm->info->clk_rate, base_unit_range;
         unsigned long long base_unit, freq = NSEC_PER_SEC;
@@ -102,62 +104,62 @@ static int pwm_lpss_config(struct pwm_chip *chip, struct pwm_device *pwm,
          * The equation is:
          * base_unit = round(base_unit_range * freq / c)
          */
-        base_unit_range = BIT(lpwm->info->base_unit_bits);
+        base_unit_range = BIT(lpwm->info->base_unit_bits) - 1;
         freq *= base_unit_range;
 
         base_unit = DIV_ROUND_CLOSEST_ULL(freq, c);
 
-        if (duty_ns <= 0)
-                duty_ns = 1;
         on_time_div = 255ULL * duty_ns;
         do_div(on_time_div, period_ns);
         on_time_div = 255ULL - on_time_div;
 
-        pm_runtime_get_sync(chip->dev);
-
         ctrl = pwm_lpss_read(pwm);
         ctrl &= ~PWM_ON_TIME_DIV_MASK;
-        ctrl &= ~((base_unit_range - 1) << PWM_BASE_UNIT_SHIFT);
-        base_unit &= (base_unit_range - 1);
+        ctrl &= ~(base_unit_range << PWM_BASE_UNIT_SHIFT);
+        base_unit &= base_unit_range;
         ctrl |= (u32) base_unit << PWM_BASE_UNIT_SHIFT;
         ctrl |= on_time_div;
         pwm_lpss_write(pwm, ctrl);
-
-        /*
-         * If the PWM is already enabled we need to notify the hardware
-         * about the change by setting PWM_SW_UPDATE.
-         */
-        if (pwm_is_enabled(pwm))
-                pwm_lpss_update(pwm);
-
-        pm_runtime_put(chip->dev);
-
-        return 0;
 }
 
-static int pwm_lpss_enable(struct pwm_chip *chip, struct pwm_device *pwm)
+static int pwm_lpss_apply(struct pwm_chip *chip, struct pwm_device *pwm,
+                          struct pwm_state *state)
 {
-        pm_runtime_get_sync(chip->dev);
+        struct pwm_lpss_chip *lpwm = to_lpwm(chip);
+        int ret;
 
-        /*
-         * Hardware must first see PWM_SW_UPDATE before the PWM can be
-         * enabled.
-         */
-        pwm_lpss_update(pwm);
-        pwm_lpss_write(pwm, pwm_lpss_read(pwm) | PWM_ENABLE);
-        return 0;
-}
+        if (state->enabled) {
+                if (!pwm_is_enabled(pwm)) {
+                        pm_runtime_get_sync(chip->dev);
+                        ret = pwm_lpss_is_updating(pwm);
+                        if (ret) {
+                                pm_runtime_put(chip->dev);
+                                return ret;
+                        }
+                        pwm_lpss_prepare(lpwm, pwm, state->duty_cycle, state->period);
+                        ret = pwm_lpss_update(pwm);
+                        if (ret) {
+                                pm_runtime_put(chip->dev);
+                                return ret;
+                        }
+                        pwm_lpss_write(pwm, pwm_lpss_read(pwm) | PWM_ENABLE);
+                } else {
+                        ret = pwm_lpss_is_updating(pwm);
+                        if (ret)
+                                return ret;
+                        pwm_lpss_prepare(lpwm, pwm, state->duty_cycle, state->period);
+                        return pwm_lpss_update(pwm);
+                }
+        } else if (pwm_is_enabled(pwm)) {
+                pwm_lpss_write(pwm, pwm_lpss_read(pwm) & ~PWM_ENABLE);
+                pm_runtime_put(chip->dev);
+        }
 
-static void pwm_lpss_disable(struct pwm_chip *chip, struct pwm_device *pwm)
-{
-        pwm_lpss_write(pwm, pwm_lpss_read(pwm) & ~PWM_ENABLE);
-        pm_runtime_put(chip->dev);
+        return 0;
 }
 
 static const struct pwm_ops pwm_lpss_ops = {
-        .config = pwm_lpss_config,
-        .enable = pwm_lpss_enable,
-        .disable = pwm_lpss_disable,
+        .apply = pwm_lpss_apply,
         .owner = THIS_MODULE,
 };
 
diff --git a/drivers/pwm/pwm-lpss.h b/drivers/pwm/pwm-lpss.h
index 04766e0d41aa..c94cd7c2695d 100644
--- a/drivers/pwm/pwm-lpss.h
+++ b/drivers/pwm/pwm-lpss.h
@@ -24,10 +24,6 @@ struct pwm_lpss_boardinfo {
         unsigned long base_unit_bits;
 };
 
-extern const struct pwm_lpss_boardinfo pwm_lpss_byt_info;
-extern const struct pwm_lpss_boardinfo pwm_lpss_bsw_info;
-extern const struct pwm_lpss_boardinfo pwm_lpss_bxt_info;
-
 struct pwm_lpss_chip *pwm_lpss_probe(struct device *dev, struct resource *r,
                                      const struct pwm_lpss_boardinfo *info);
 int pwm_lpss_remove(struct pwm_lpss_chip *lpwm);
diff --git a/drivers/pwm/pwm-mxs.c b/drivers/pwm/pwm-mxs.c
index 9a596324ebef..a6017ad9926c 100644
--- a/drivers/pwm/pwm-mxs.c
+++ b/drivers/pwm/pwm-mxs.c
@@ -151,7 +151,7 @@ static int mxs_pwm_probe(struct platform_device *pdev)
         mxs->chip.dev = &pdev->dev;
         mxs->chip.ops = &mxs_pwm_ops;
         mxs->chip.base = -1;
-        mxs->chip.can_sleep = true;
+
         ret = of_property_read_u32(np, "fsl,pwm-number", &mxs->chip.npwm);
         if (ret < 0) {
                 dev_err(&pdev->dev, "failed to get pwm number: %d\n", ret);
diff --git a/drivers/pwm/pwm-pca9685.c b/drivers/pwm/pwm-pca9685.c
index 117fccf7934a..0cfb3571a732 100644
--- a/drivers/pwm/pwm-pca9685.c
+++ b/drivers/pwm/pwm-pca9685.c
@@ -20,8 +20,10 @@
  */
 
 #include <linux/acpi.h>
+#include <linux/gpio/driver.h>
 #include <linux/i2c.h>
 #include <linux/module.h>
+#include <linux/mutex.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
 #include <linux/pwm.h>
@@ -65,7 +67,6 @@
 #define PCA9685_MAXCHAN         0x10
 
 #define LED_FULL                (1 << 4)
-#define MODE1_RESTART           (1 << 7)
 #define MODE1_SLEEP             (1 << 4)
 #define MODE2_INVRT             (1 << 4)
 #define MODE2_OUTDRV            (1 << 2)
@@ -81,6 +82,10 @@ struct pca9685 {
         int active_cnt;
         int duty_ns;
         int period_ns;
+#if IS_ENABLED(CONFIG_GPIOLIB)
+        struct mutex lock;
+        struct gpio_chip gpio;
+#endif
 };
 
 static inline struct pca9685 *to_pca(struct pwm_chip *chip)
@@ -88,6 +93,151 @@ static inline struct pca9685 *to_pca(struct pwm_chip *chip)
         return container_of(chip, struct pca9685, chip);
 }
 
+#if IS_ENABLED(CONFIG_GPIOLIB)
+static int pca9685_pwm_gpio_request(struct gpio_chip *gpio, unsigned int offset)
+{
+        struct pca9685 *pca = gpiochip_get_data(gpio);
+        struct pwm_device *pwm;
+
+        mutex_lock(&pca->lock);
+
+        pwm = &pca->chip.pwms[offset];
+
+        if (pwm->flags & (PWMF_REQUESTED | PWMF_EXPORTED)) {
+                mutex_unlock(&pca->lock);
+                return -EBUSY;
+        }
+
+        pwm_set_chip_data(pwm, (void *)1);
+
+        mutex_unlock(&pca->lock);
+        return 0;
+}
+
+static void pca9685_pwm_gpio_free(struct gpio_chip *gpio, unsigned int offset)
+{
+        struct pca9685 *pca = gpiochip_get_data(gpio);
+        struct pwm_device *pwm;
+
+        mutex_lock(&pca->lock);
+        pwm = &pca->chip.pwms[offset];
+        pwm_set_chip_data(pwm, NULL);
+        mutex_unlock(&pca->lock);
+}
+
+static bool pca9685_pwm_is_gpio(struct pca9685 *pca, struct pwm_device *pwm)
+{
+        bool is_gpio = false;
+
+        mutex_lock(&pca->lock);
+
+        if (pwm->hwpwm >= PCA9685_MAXCHAN) {
+                unsigned int i;
+
+                /*
+                 * Check if any of the GPIOs are requested and in that case
+                 * prevent using the "all LEDs" channel.
+                 */
+                for (i = 0; i < pca->gpio.ngpio; i++)
+                        if (gpiochip_is_requested(&pca->gpio, i)) {
+                                is_gpio = true;
+                                break;
+                        }
+        } else if (pwm_get_chip_data(pwm)) {
+                is_gpio = true;
+        }
+
+        mutex_unlock(&pca->lock);
+        return is_gpio;
+}
+
+static int pca9685_pwm_gpio_get(struct gpio_chip *gpio, unsigned int offset)
+{
+        struct pca9685 *pca = gpiochip_get_data(gpio);
+        struct pwm_device *pwm = &pca->chip.pwms[offset];
+        unsigned int value;
+
+        regmap_read(pca->regmap, LED_N_ON_H(pwm->hwpwm), &value);
+
+        return value & LED_FULL;
+}
+
+static void pca9685_pwm_gpio_set(struct gpio_chip *gpio, unsigned int offset,
+                                 int value)
+{
+        struct pca9685 *pca = gpiochip_get_data(gpio);
+        struct pwm_device *pwm = &pca->chip.pwms[offset];
+        unsigned int on = value ? LED_FULL : 0;
+
+        /* Clear both OFF registers */
+        regmap_write(pca->regmap, LED_N_OFF_L(pwm->hwpwm), 0);
+        regmap_write(pca->regmap, LED_N_OFF_H(pwm->hwpwm), 0);
+
+        /* Set the full ON bit */
+        regmap_write(pca->regmap, LED_N_ON_H(pwm->hwpwm), on);
+}
+
+static int pca9685_pwm_gpio_get_direction(struct gpio_chip *chip,
+                                          unsigned int offset)
+{
+        /* Always out */
+        return 0;
+}
+
+static int pca9685_pwm_gpio_direction_input(struct gpio_chip *gpio,
+                                            unsigned int offset)
+{
+        return -EINVAL;
+}
+
+static int pca9685_pwm_gpio_direction_output(struct gpio_chip *gpio,
+                                             unsigned int offset, int value)
+{
+        pca9685_pwm_gpio_set(gpio, offset, value);
+
+        return 0;
+}
+
+/*
+ * The PCA9685 has a bit for turning the PWM output full off or on. Some
+ * boards like Intel Galileo actually uses these as normal GPIOs so we
+ * expose a GPIO chip here which can exclusively take over the underlying
+ * PWM channel.
+ */
+static int pca9685_pwm_gpio_probe(struct pca9685 *pca)
+{
+        struct device *dev = pca->chip.dev;
+
+        mutex_init(&pca->lock);
+
+        pca->gpio.label = dev_name(dev);
+        pca->gpio.parent = dev;
+        pca->gpio.request = pca9685_pwm_gpio_request;
+        pca->gpio.free = pca9685_pwm_gpio_free;
+        pca->gpio.get_direction = pca9685_pwm_gpio_get_direction;
+        pca->gpio.direction_input = pca9685_pwm_gpio_direction_input;
+        pca->gpio.direction_output = pca9685_pwm_gpio_direction_output;
+        pca->gpio.get = pca9685_pwm_gpio_get;
+        pca->gpio.set = pca9685_pwm_gpio_set;
+        pca->gpio.base = -1;
+        pca->gpio.ngpio = PCA9685_MAXCHAN;
+        pca->gpio.can_sleep = true;
+
+        return devm_gpiochip_add_data(dev, &pca->gpio, pca);
+}
+#else
+static inline bool pca9685_pwm_is_gpio(struct pca9685 *pca,
+                                       struct pwm_device *pwm)
+{
+        return false;
+}
+
+static inline int pca9685_pwm_gpio_probe(struct pca9685 *pca)
+{
+        return 0;
+}
+#endif
+
 static int pca9685_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
                               int duty_ns, int period_ns)
 {
@@ -117,16 +267,6 @@ static int pca9685_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
                         udelay(500);
 
                         pca->period_ns = period_ns;
-
-                        /*
-                         * If the duty cycle did not change, restart PWM with
-                         * the same duty cycle to period ratio and return.
-                         */
-                        if (duty_ns == pca->duty_ns) {
-                                regmap_update_bits(pca->regmap, PCA9685_MODE1,
-                                                   MODE1_RESTART, 0x1);
-                                return 0;
-                        }
                 } else {
                         dev_err(chip->dev,
                                 "prescaler not set: period out of bounds!\n");
@@ -264,6 +404,9 @@ static int pca9685_pwm_request(struct pwm_chip *chip, struct pwm_device *pwm)
 {
         struct pca9685 *pca = to_pca(chip);
 
+        if (pca9685_pwm_is_gpio(pca, pwm))
+                return -EBUSY;
+
         if (pca->active_cnt++ == 0)
                 return regmap_update_bits(pca->regmap, PCA9685_MODE1,
                                           MODE1_SLEEP, 0x0);
@@ -343,9 +486,16 @@ static int pca9685_pwm_probe(struct i2c_client *client,
 
         pca->chip.dev = &client->dev;
         pca->chip.base = -1;
-        pca->chip.can_sleep = true;
 
-        return pwmchip_add(&pca->chip);
+        ret = pwmchip_add(&pca->chip);
+        if (ret < 0)
+                return ret;
+
+        ret = pca9685_pwm_gpio_probe(pca);
+        if (ret < 0)
+                pwmchip_remove(&pca->chip);
+
+        return ret;
 }
 
 static int pca9685_pwm_remove(struct i2c_client *client)
diff --git a/drivers/pwm/pwm-pxa.c b/drivers/pwm/pwm-pxa.c
index 58b709f29130..4143a46684d2 100644
--- a/drivers/pwm/pwm-pxa.c
+++ b/drivers/pwm/pwm-pxa.c
@@ -118,7 +118,7 @@ static void pxa_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)
         clk_disable_unprepare(pc->clk);
 }
 
-static struct pwm_ops pxa_pwm_ops = {
+static const struct pwm_ops pxa_pwm_ops = {
         .config = pxa_pwm_config,
         .enable = pxa_pwm_enable,
         .disable = pxa_pwm_disable,
diff --git a/drivers/pwm/pwm-sti.c b/drivers/pwm/pwm-sti.c
index dd82dc840af9..2b7c31c9d1ab 100644
--- a/drivers/pwm/pwm-sti.c
+++ b/drivers/pwm/pwm-sti.c
@@ -635,7 +635,6 @@ skip_cpt:
         pc->chip.ops = &sti_pwm_ops;
         pc->chip.base = -1;
         pc->chip.npwm = pc->cdata->pwm_num_devs;
-        pc->chip.can_sleep = true;
 
         ret = pwmchip_add(&pc->chip);
         if (ret < 0) {
diff --git a/drivers/pwm/pwm-sun4i.c b/drivers/pwm/pwm-sun4i.c
index b0803f6c64d9..1284ffa05921 100644
--- a/drivers/pwm/pwm-sun4i.c
+++ b/drivers/pwm/pwm-sun4i.c
@@ -340,7 +340,6 @@ static int sun4i_pwm_probe(struct platform_device *pdev)
         pwm->chip.ops = &sun4i_pwm_ops;
         pwm->chip.base = -1;
         pwm->chip.npwm = pwm->data->npwm;
-        pwm->chip.can_sleep = true;
         pwm->chip.of_xlate = of_pwm_xlate_with_flags;
         pwm->chip.of_pwm_n_cells = 3;
 
diff --git a/drivers/pwm/pwm-twl-led.c b/drivers/pwm/pwm-twl-led.c
index b964470025c5..21eff991d0e3 100644
--- a/drivers/pwm/pwm-twl-led.c
+++ b/drivers/pwm/pwm-twl-led.c
@@ -303,7 +303,6 @@ static int twl_pwmled_probe(struct platform_device *pdev)
 
         twl->chip.dev = &pdev->dev;
         twl->chip.base = -1;
-        twl->chip.can_sleep = true;
 
         mutex_init(&twl->mutex);
 
diff --git a/drivers/pwm/pwm-twl.c b/drivers/pwm/pwm-twl.c
index 7a993b056638..9de617b76680 100644
--- a/drivers/pwm/pwm-twl.c
+++ b/drivers/pwm/pwm-twl.c
@@ -323,7 +323,6 @@ static int twl_pwm_probe(struct platform_device *pdev)
         twl->chip.dev = &pdev->dev;
         twl->chip.base = -1;
         twl->chip.npwm = 2;
-        twl->chip.can_sleep = true;
 
         mutex_init(&twl->mutex);
 
diff --git a/drivers/pwm/pwm-vt8500.c b/drivers/pwm/pwm-vt8500.c
index cdb58fd4619d..8141a4984126 100644
--- a/drivers/pwm/pwm-vt8500.c
+++ b/drivers/pwm/pwm-vt8500.c
@@ -184,7 +184,7 @@ static int vt8500_pwm_set_polarity(struct pwm_chip *chip,
         return 0;
 }
 
-static struct pwm_ops vt8500_pwm_ops = {
+static const struct pwm_ops vt8500_pwm_ops = {
         .enable = vt8500_pwm_enable,
         .disable = vt8500_pwm_disable,
         .config = vt8500_pwm_config,
diff --git a/drivers/staging/greybus/pwm.c b/drivers/staging/greybus/pwm.c
index c4bf3298ba07..f0404bc37123 100644
--- a/drivers/staging/greybus/pwm.c
+++ b/drivers/staging/greybus/pwm.c
@@ -284,7 +284,6 @@ static int gb_pwm_probe(struct gbphy_device *gbphy_dev,
         pwm->ops = &gb_pwm_ops;
         pwm->base = -1;                 /* Allocate base dynamically */
         pwm->npwm = pwmc->pwm_max + 1;
-        pwm->can_sleep = true;          /* FIXME */
 
         ret = pwmchip_add(pwm);
         if (ret) {
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index c2c056cc7ea5..776b34396144 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -245,6 +245,15 @@ config RCAR_THERMAL
           Enable this to plug the R-Car thermal sensor driver into the Linux
           thermal framework.
 
+config RCAR_GEN3_THERMAL
+        tristate "Renesas R-Car Gen3 thermal driver"
+        depends on ARCH_RENESAS || COMPILE_TEST
+        depends on HAS_IOMEM
+        depends on OF
+        help
+          Enable this to plug the R-Car Gen3 thermal sensor driver into the Linux
+          thermal framework.
+
 config KIRKWOOD_THERMAL
         tristate "Temperature sensor on Marvell Kirkwood SoCs"
         depends on MACH_KIRKWOOD || COMPILE_TEST
@@ -436,4 +445,12 @@ depends on (ARCH_QCOM && OF) || COMPILE_TEST
 source "drivers/thermal/qcom/Kconfig"
 endmenu
 
+config ZX2967_THERMAL
+        tristate "Thermal sensors on zx2967 SoC"
+        depends on ARCH_ZX || COMPILE_TEST
+        help
+          Enable the zx2967 thermal sensors driver, which supports
+          the primitive temperature sensor embedded in zx2967 SoCs.
+          This sensor generates the real time die temperature.
+
 endif
diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
index 6a3d7b573036..7adae2029355 100644
--- a/drivers/thermal/Makefile
+++ b/drivers/thermal/Makefile
@@ -31,6 +31,7 @@ obj-$(CONFIG_QCOM_SPMI_TEMP_ALARM)	+= qcom-spmi-temp-alarm.o
 obj-$(CONFIG_SPEAR_THERMAL)     += spear_thermal.o
 obj-$(CONFIG_ROCKCHIP_THERMAL)  += rockchip_thermal.o
 obj-$(CONFIG_RCAR_THERMAL)      += rcar_thermal.o
+obj-$(CONFIG_RCAR_GEN3_THERMAL) += rcar_gen3_thermal.o
 obj-$(CONFIG_KIRKWOOD_THERMAL)  += kirkwood_thermal.o
 obj-y                           += samsung/
 obj-$(CONFIG_DOVE_THERMAL)      += dove_thermal.o
@@ -56,3 +57,4 @@ obj-$(CONFIG_TEGRA_SOCTHERM)	+= tegra/
 obj-$(CONFIG_HISI_THERMAL)     += hisi_thermal.o
 obj-$(CONFIG_MTK_THERMAL)       += mtk_thermal.o
 obj-$(CONFIG_GENERIC_ADC_THERMAL)       += thermal-generic-adc.o
+obj-$(CONFIG_ZX2967_THERMAL)    += zx2967_thermal.o
diff --git a/drivers/thermal/clock_cooling.c b/drivers/thermal/clock_cooling.c
index ed5dd0e88657..56711c25584d 100644
--- a/drivers/thermal/clock_cooling.c
+++ b/drivers/thermal/clock_cooling.c
@@ -65,42 +65,7 @@ struct clock_cooling_device {
 };
 #define to_clock_cooling_device(x) \
                 container_of(x, struct clock_cooling_device, clk_rate_change_nb)
-static DEFINE_IDR(clock_idr);
-static DEFINE_MUTEX(cooling_clock_lock);
-
-/**
- * clock_cooling_get_idr - function to get an unique id.
- * @id: int * value generated by this function.
- *
- * This function will populate @id with an unique
- * id, using the idr API.
- *
- * Return: 0 on success, an error code on failure.
- */
-static int clock_cooling_get_idr(int *id)
-{
-        int ret;
-
-        mutex_lock(&cooling_clock_lock);
-        ret = idr_alloc(&clock_idr, NULL, 0, 0, GFP_KERNEL);
-        mutex_unlock(&cooling_clock_lock);
-        if (unlikely(ret < 0))
-                return ret;
-        *id = ret;
-
-        return 0;
-}
-
-/**
- * release_idr - function to free the unique id.
- * @id: int value representing the unique id.
- */
-static void release_idr(int id)
-{
-        mutex_lock(&cooling_clock_lock);
-        idr_remove(&clock_idr, id);
-        mutex_unlock(&cooling_clock_lock);
-}
+static DEFINE_IDA(clock_ida);
 
 /* Below code defines functions to be used for clock as cooling device */
 
@@ -432,16 +397,17 @@ clock_cooling_register(struct device *dev, const char *clock_name)
         if (IS_ERR(ccdev->clk))
                 return ERR_CAST(ccdev->clk);
 
-        ret = clock_cooling_get_idr(&ccdev->id);
-        if (ret)
-                return ERR_PTR(-EINVAL);
+        ret = ida_simple_get(&clock_ida, 0, 0, GFP_KERNEL);
+        if (ret < 0)
+                return ERR_PTR(ret);
+        ccdev->id = ret;
 
         snprintf(dev_name, sizeof(dev_name), "thermal-clock-%d", ccdev->id);
 
         cdev = thermal_cooling_device_register(dev_name, ccdev,
                                                &clock_cooling_ops);
         if (IS_ERR(cdev)) {
-                release_idr(ccdev->id);
+                ida_simple_remove(&clock_ida, ccdev->id);
                 return ERR_PTR(-EINVAL);
         }
         ccdev->cdev = cdev;
@@ -450,7 +416,7 @@ clock_cooling_register(struct device *dev, const char *clock_name)
         /* Assuming someone has already filled the opp table for this device */
         ret = dev_pm_opp_init_cpufreq_table(dev, &ccdev->freq_table);
         if (ret) {
-                release_idr(ccdev->id);
+                ida_simple_remove(&clock_ida, ccdev->id);
                 return ERR_PTR(ret);
         }
         ccdev->clock_state = 0;
@@ -481,6 +447,6 @@ void clock_cooling_unregister(struct thermal_cooling_device *cdev)
         dev_pm_opp_free_cpufreq_table(ccdev->dev, &ccdev->freq_table);
 
         thermal_cooling_device_unregister(ccdev->cdev);
-        release_idr(ccdev->id);
+        ida_simple_remove(&clock_ida, ccdev->id);
 }
 EXPORT_SYMBOL_GPL(clock_cooling_unregister);
diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c
index 85fdbf762fa0..91048eeca28b 100644
--- a/drivers/thermal/cpu_cooling.c
+++ b/drivers/thermal/cpu_cooling.c
@@ -26,6 +26,7 @@
 #include <linux/thermal.h>
 #include <linux/cpufreq.h>
 #include <linux/err.h>
+#include <linux/idr.h>
 #include <linux/pm_opp.h>
 #include <linux/slab.h>
 #include <linux/cpu.h>
@@ -104,50 +105,13 @@ struct cpufreq_cooling_device {
         struct device *cpu_dev;
         get_static_t plat_get_static_power;
 };
-static DEFINE_IDR(cpufreq_idr);
-static DEFINE_MUTEX(cooling_cpufreq_lock);
+static DEFINE_IDA(cpufreq_ida);
 
 static unsigned int cpufreq_dev_count;
 
 static DEFINE_MUTEX(cooling_list_lock);
 static LIST_HEAD(cpufreq_dev_list);
 
-/**
- * get_idr - function to get a unique id.
- * @idr: struct idr * handle used to create a id.
- * @id: int * value generated by this function.
- *
- * This function will populate @id with an unique
- * id, using the idr API.
- *
- * Return: 0 on success, an error code on failure.
- */
-static int get_idr(struct idr *idr, int *id)
-{
-        int ret;
-
-        mutex_lock(&cooling_cpufreq_lock);
-        ret = idr_alloc(idr, NULL, 0, 0, GFP_KERNEL);
-        mutex_unlock(&cooling_cpufreq_lock);
-        if (unlikely(ret < 0))
-                return ret;
-        *id = ret;
-
-        return 0;
-}
-
-/**
- * release_idr - function to free the unique id.
- * @idr: struct idr * handle used for creating the id.
- * @id: int value representing the unique id.
- */
-static void release_idr(struct idr *idr, int id)
-{
-        mutex_lock(&cooling_cpufreq_lock);
-        idr_remove(idr, id);
-        mutex_unlock(&cooling_cpufreq_lock);
-}
-
 /* Below code defines functions to be used for cpufreq as cooling device */
 
 /**
@@ -645,31 +609,39 @@ static int cpufreq_state2power(struct thermal_cooling_device *cdev,
                                unsigned long state, u32 *power)
 {
         unsigned int freq, num_cpus;
-        cpumask_t cpumask;
+        cpumask_var_t cpumask;
         u32 static_power, dynamic_power;
         int ret;
         struct cpufreq_cooling_device *cpufreq_device = cdev->devdata;
 
-        cpumask_and(&cpumask, &cpufreq_device->allowed_cpus, cpu_online_mask);
-        num_cpus = cpumask_weight(&cpumask);
+        if (!alloc_cpumask_var(&cpumask, GFP_KERNEL))
+                return -ENOMEM;
+
+        cpumask_and(cpumask, &cpufreq_device->allowed_cpus, cpu_online_mask);
+        num_cpus = cpumask_weight(cpumask);
 
         /* None of our cpus are online, so no power */
         if (num_cpus == 0) {
                 *power = 0;
-                return 0;
+                ret = 0;
+                goto out;
         }
 
         freq = cpufreq_device->freq_table[state];
-        if (!freq)
-                return -EINVAL;
+        if (!freq) {
+                ret = -EINVAL;
+                goto out;
+        }
 
         dynamic_power = cpu_freq_to_power(cpufreq_device, freq) * num_cpus;
         ret = get_static_power(cpufreq_device, tz, freq, &static_power);
         if (ret)
-                return ret;
+                goto out;
 
         *power = static_power + dynamic_power;
-        return 0;
+out:
+        free_cpumask_var(cpumask);
+        return ret;
 }
 
 /**
@@ -795,16 +767,20 @@ __cpufreq_cooling_register(struct device_node *np,
         struct cpufreq_cooling_device *cpufreq_dev;
         char dev_name[THERMAL_NAME_LENGTH];
         struct cpufreq_frequency_table *pos, *table;
-        struct cpumask temp_mask;
+        cpumask_var_t temp_mask;
         unsigned int freq, i, num_cpus;
         int ret;
         struct thermal_cooling_device_ops *cooling_ops;
 
-        cpumask_and(&temp_mask, clip_cpus, cpu_online_mask);
-        policy = cpufreq_cpu_get(cpumask_first(&temp_mask));
+        if (!alloc_cpumask_var(&temp_mask, GFP_KERNEL))
+                return ERR_PTR(-ENOMEM);
+
+        cpumask_and(temp_mask, clip_cpus, cpu_online_mask);
+        policy = cpufreq_cpu_get(cpumask_first(temp_mask));
         if (!policy) {
                 pr_debug("%s: CPUFreq policy not found\n", __func__);
-                return ERR_PTR(-EPROBE_DEFER);
+                cool_dev = ERR_PTR(-EPROBE_DEFER);
+                goto free_cpumask;
         }
 
         table = policy->freq_table;
@@ -867,11 +843,12 @@ __cpufreq_cooling_register(struct device_node *np,
                 cooling_ops = &cpufreq_cooling_ops;
         }
 
-        ret = get_idr(&cpufreq_idr, &cpufreq_dev->id);
-        if (ret) {
+        ret = ida_simple_get(&cpufreq_ida, 0, 0, GFP_KERNEL);
+        if (ret < 0) {
                 cool_dev = ERR_PTR(ret);
                 goto free_power_table;
         }
+        cpufreq_dev->id = ret;
 
         /* Fill freq-table in descending order of frequencies */
         for (i = 0, freq = -1; i <= cpufreq_dev->max_level; i++) {
@@ -891,27 +868,24 @@ __cpufreq_cooling_register(struct device_node *np,
         cool_dev = thermal_of_cooling_device_register(np, dev_name, cpufreq_dev,
                                                       cooling_ops);
         if (IS_ERR(cool_dev))
-                goto remove_idr;
+                goto remove_ida;
 
         cpufreq_dev->clipped_freq = cpufreq_dev->freq_table[0];
         cpufreq_dev->cool_dev = cool_dev;
 
-        mutex_lock(&cooling_cpufreq_lock);
-
         mutex_lock(&cooling_list_lock);
         list_add(&cpufreq_dev->node, &cpufreq_dev_list);
-        mutex_unlock(&cooling_list_lock);
 
         /* Register the notifier for first cpufreq cooling device */
         if (!cpufreq_dev_count++)
                 cpufreq_register_notifier(&thermal_cpufreq_notifier_block,
                                           CPUFREQ_POLICY_NOTIFIER);
-        mutex_unlock(&cooling_cpufreq_lock);
+        mutex_unlock(&cooling_list_lock);
 
         goto put_policy;
 
-remove_idr:
-        release_idr(&cpufreq_idr, cpufreq_dev->id);
+remove_ida:
+        ida_simple_remove(&cpufreq_ida, cpufreq_dev->id);
 free_power_table:
         kfree(cpufreq_dev->dyn_power_table);
 free_table:
@@ -924,7 +898,8 @@ free_cdev:
         kfree(cpufreq_dev);
 put_policy:
         cpufreq_cpu_put(policy);
-
+free_cpumask:
+        free_cpumask_var(temp_mask);
         return cool_dev;
 }
 
@@ -1052,20 +1027,17 @@ void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev)
 
         cpufreq_dev = cdev->devdata;
 
+        mutex_lock(&cooling_list_lock);
         /* Unregister the notifier for the last cpufreq cooling device */
-        mutex_lock(&cooling_cpufreq_lock);
         if (!--cpufreq_dev_count)
                 cpufreq_unregister_notifier(&thermal_cpufreq_notifier_block,
                                             CPUFREQ_POLICY_NOTIFIER);
 
-        mutex_lock(&cooling_list_lock);
         list_del(&cpufreq_dev->node);
         mutex_unlock(&cooling_list_lock);
 
-        mutex_unlock(&cooling_cpufreq_lock);
-
         thermal_cooling_device_unregister(cpufreq_dev->cool_dev);
-        release_idr(&cpufreq_idr, cpufreq_dev->id);
+        ida_simple_remove(&cpufreq_ida, cpufreq_dev->id);
         kfree(cpufreq_dev->dyn_power_table);
         kfree(cpufreq_dev->time_in_idle_timestamp);
         kfree(cpufreq_dev->time_in_idle);
diff --git a/drivers/thermal/devfreq_cooling.c b/drivers/thermal/devfreq_cooling.c
index ba7a5cd994dc..7743a78d4723 100644
--- a/drivers/thermal/devfreq_cooling.c
+++ b/drivers/thermal/devfreq_cooling.c
@@ -21,14 +21,14 @@
 #include <linux/devfreq.h>
 #include <linux/devfreq_cooling.h>
 #include <linux/export.h>
+#include <linux/idr.h>
 #include <linux/slab.h>
 #include <linux/pm_opp.h>
 #include <linux/thermal.h>
 
 #include <trace/events/thermal.h>
 
-static DEFINE_MUTEX(devfreq_lock);
-static DEFINE_IDR(devfreq_idr);
+static DEFINE_IDA(devfreq_ida);
 
 /**
  * struct devfreq_cooling_device - Devfreq cooling device
@@ -58,42 +58,6 @@ struct devfreq_cooling_device {
 };
 
 /**
- * get_idr - function to get a unique id.
- * @idr: struct idr * handle used to create a id.
- * @id: int * value generated by this function.
- *
- * This function will populate @id with an unique
- * id, using the idr API.
- *
- * Return: 0 on success, an error code on failure.
- */
-static int get_idr(struct idr *idr, int *id)
-{
-        int ret;
-
-        mutex_lock(&devfreq_lock);
-        ret = idr_alloc(idr, NULL, 0, 0, GFP_KERNEL);
-        mutex_unlock(&devfreq_lock);
-        if (unlikely(ret < 0))
-                return ret;
-        *id = ret;
-
-        return 0;
-}
-
-/**
- * release_idr - function to free the unique id.
- * @idr: struct idr * handle used for creating the id.
- * @id: int value representing the unique id.
- */
-static void release_idr(struct idr *idr, int id)
-{
-        mutex_lock(&devfreq_lock);
-        idr_remove(idr, id);
-        mutex_unlock(&devfreq_lock);
-}
-
-/**
  * partition_enable_opps() - disable all opps above a given state
  * @dfc:        Pointer to devfreq we are operating on
  * @cdev_state: cooling device state we're setting
@@ -489,9 +453,10 @@ of_devfreq_cooling_register_power(struct device_node *np, struct devfreq *df,
         if (err)
                 goto free_dfc;
 
-        err = get_idr(&devfreq_idr, &dfc->id);
-        if (err)
+        err = ida_simple_get(&devfreq_ida, 0, 0, GFP_KERNEL);
+        if (err < 0)
                 goto free_tables;
+        dfc->id = err;
 
         snprintf(dev_name, sizeof(dev_name), "thermal-devfreq-%d", dfc->id);
 
@@ -502,15 +467,15 @@ of_devfreq_cooling_register_power(struct device_node *np, struct devfreq *df,
                 dev_err(df->dev.parent,
                         "Failed to register devfreq cooling device (%d)\n",
                         err);
-                goto release_idr;
+                goto release_ida;
         }
 
         dfc->cdev = cdev;
 
         return cdev;
 
-release_idr:
-        release_idr(&devfreq_idr, dfc->id);
+release_ida:
+        ida_simple_remove(&devfreq_ida, dfc->id);
 free_tables:
         kfree(dfc->power_table);
         kfree(dfc->freq_table);
@@ -558,7 +523,7 @@ void devfreq_cooling_unregister(struct thermal_cooling_device *cdev)
         dfc = cdev->devdata;
 
         thermal_cooling_device_unregister(dfc->cdev);
-        release_idr(&devfreq_idr, dfc->id);
+        ida_simple_remove(&devfreq_ida, dfc->id);
         kfree(dfc->power_table);
         kfree(dfc->freq_table);
 
diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c
index 06912f0602b7..fb648a45754e 100644
--- a/drivers/thermal/imx_thermal.c
+++ b/drivers/thermal/imx_thermal.c
@@ -489,6 +489,10 @@ static int imx_thermal_probe(struct platform_device *pdev)
         data->tempmon = map;
 
         data->socdata = of_device_get_match_data(&pdev->dev);
+        if (!data->socdata) {
+                dev_err(&pdev->dev, "no device match found\n");
+                return -ENODEV;
+        }
 
         /* make sure the IRQ flag is clear before enabling irq on i.MX6SX */
         if (data->socdata->version == TEMPMON_IMX6SX) {
diff --git a/drivers/thermal/intel_powerclamp.c b/drivers/thermal/intel_powerclamp.c
index df64692e9e64..a47103a659fa 100644
--- a/drivers/thermal/intel_powerclamp.c
+++ b/drivers/thermal/intel_powerclamp.c
@@ -461,16 +461,13 @@ static void poll_pkg_cstate(struct work_struct *dummy)
 {
         static u64 msr_last;
         static u64 tsc_last;
-        static unsigned long jiffies_last;
 
         u64 msr_now;
-        unsigned long jiffies_now;
         u64 tsc_now;
         u64 val64;
 
         msr_now = pkg_state_counter();
         tsc_now = rdtsc();
-        jiffies_now = jiffies;
 
         /* calculate pkg cstate vs tsc ratio */
         if (!msr_last || !tsc_last)
@@ -485,7 +482,6 @@ static void poll_pkg_cstate(struct work_struct *dummy)
 
         /* update record */
         msr_last = msr_now;
-        jiffies_last = jiffies_now;
         tsc_last = tsc_now;
 
         if (true == clamping)
diff --git a/drivers/thermal/mtk_thermal.c b/drivers/thermal/mtk_thermal.c
index 34169c32d495..1aff7fde54b1 100644
--- a/drivers/thermal/mtk_thermal.c
+++ b/drivers/thermal/mtk_thermal.c
@@ -183,37 +183,37 @@ struct mtk_thermal {
 };
 
 /* MT8173 thermal sensor data */
-const int mt8173_bank_data[MT8173_NUM_ZONES][3] = {
+static const int mt8173_bank_data[MT8173_NUM_ZONES][3] = {
         { MT8173_TS2, MT8173_TS3 },
         { MT8173_TS2, MT8173_TS4 },
         { MT8173_TS1, MT8173_TS2, MT8173_TSABB },
         { MT8173_TS2 },
 };
 
-const int mt8173_msr[MT8173_NUM_SENSORS_PER_ZONE] = {
+static const int mt8173_msr[MT8173_NUM_SENSORS_PER_ZONE] = {
         TEMP_MSR0, TEMP_MSR1, TEMP_MSR2, TEMP_MSR2
 };
 
-const int mt8173_adcpnp[MT8173_NUM_SENSORS_PER_ZONE] = {
+static const int mt8173_adcpnp[MT8173_NUM_SENSORS_PER_ZONE] = {
         TEMP_ADCPNP0, TEMP_ADCPNP1, TEMP_ADCPNP2, TEMP_ADCPNP3
 };
 
-const int mt8173_mux_values[MT8173_NUM_SENSORS] = { 0, 1, 2, 3, 16 };
+static const int mt8173_mux_values[MT8173_NUM_SENSORS] = { 0, 1, 2, 3, 16 };
 
 /* MT2701 thermal sensor data */
-const int mt2701_bank_data[MT2701_NUM_SENSORS] = {
+static const int mt2701_bank_data[MT2701_NUM_SENSORS] = {
         MT2701_TS1, MT2701_TS2, MT2701_TSABB
 };
 
-const int mt2701_msr[MT2701_NUM_SENSORS_PER_ZONE] = {
+static const int mt2701_msr[MT2701_NUM_SENSORS_PER_ZONE] = {
         TEMP_MSR0, TEMP_MSR1, TEMP_MSR2
 };
 
-const int mt2701_adcpnp[MT2701_NUM_SENSORS_PER_ZONE] = {
+static const int mt2701_adcpnp[MT2701_NUM_SENSORS_PER_ZONE] = {
         TEMP_ADCPNP0, TEMP_ADCPNP1, TEMP_ADCPNP2
 };
 
-const int mt2701_mux_values[MT2701_NUM_SENSORS] = { 0, 1, 16 };
+static const int mt2701_mux_values[MT2701_NUM_SENSORS] = { 0, 1, 16 };
 
 /**
  * The MT8173 thermal controller has four banks. Each bank can read up to
diff --git a/drivers/thermal/rcar_gen3_thermal.c b/drivers/thermal/rcar_gen3_thermal.c
new file mode 100644
index 000000000000..d33c845244b1
--- /dev/null
+++ b/drivers/thermal/rcar_gen3_thermal.c
@@ -0,0 +1,335 @@
+/*
+ *  R-Car Gen3 THS thermal sensor driver
+ *  Based on rcar_thermal.c and work from Hien Dang and Khiem Nguyen.
+ *
+ * Copyright (C) 2016 Renesas Electronics Corporation.
+ * Copyright (C) 2016 Sang Engineering
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; version 2 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful, but
+ *  WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  General Public License for more details.
+ *
+ */
+#include <linux/delay.h>
+#include <linux/err.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/mutex.h>
+#include <linux/of_device.h>
+#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
+#include <linux/thermal.h>
+
+/* Register offsets */
+#define REG_GEN3_IRQSTR         0x04
+#define REG_GEN3_IRQMSK         0x08
+#define REG_GEN3_IRQCTL         0x0C
+#define REG_GEN3_IRQEN          0x10
+#define REG_GEN3_IRQTEMP1       0x14
+#define REG_GEN3_IRQTEMP2       0x18
+#define REG_GEN3_IRQTEMP3       0x1C
+#define REG_GEN3_CTSR           0x20
+#define REG_GEN3_THCTR          0x20
+#define REG_GEN3_TEMP           0x28
+#define REG_GEN3_THCODE1        0x50
+#define REG_GEN3_THCODE2        0x54
+#define REG_GEN3_THCODE3        0x58
+
+/* CTSR bits */
+#define CTSR_PONM       BIT(8)
+#define CTSR_AOUT       BIT(7)
+#define CTSR_THBGR      BIT(5)
+#define CTSR_VMEN       BIT(4)
+#define CTSR_VMST       BIT(1)
+#define CTSR_THSST      BIT(0)
+
+/* THCTR bits */
+#define THCTR_PONM      BIT(6)
+#define THCTR_THSST     BIT(0)
+
+#define CTEMP_MASK      0xFFF
+
+#define MCELSIUS(temp)  ((temp) * 1000)
+#define GEN3_FUSE_MASK  0xFFF
+
+#define TSC_MAX_NUM     3
+
+/* Structure for thermal temperature calculation */
+struct equation_coefs {
+        int a1;
+        int b1;
+        int a2;
+        int b2;
+};
+
+struct rcar_gen3_thermal_tsc {
+        void __iomem *base;
+        struct thermal_zone_device *zone;
+        struct equation_coefs coef;
+        struct mutex lock;
+};
+
+struct rcar_gen3_thermal_priv {
+        struct rcar_gen3_thermal_tsc *tscs[TSC_MAX_NUM];
+};
+
+struct rcar_gen3_thermal_data {
+        void (*thermal_init)(struct rcar_gen3_thermal_tsc *tsc);
+};
+
+static inline u32 rcar_gen3_thermal_read(struct rcar_gen3_thermal_tsc *tsc,
+                                         u32 reg)
+{
+        return ioread32(tsc->base + reg);
+}
+
+static inline void rcar_gen3_thermal_write(struct rcar_gen3_thermal_tsc *tsc,
+                                           u32 reg, u32 data)
+{
+        iowrite32(data, tsc->base + reg);
+}
+
+/*
+ * Linear approximation for temperature
+ *
+ * [reg] = [temp] * a + b => [temp] = ([reg] - b) / a
+ *
+ * The constants a and b are calculated using two triplets of int values PTAT
+ * and THCODE. PTAT and THCODE can either be read from hardware or use hard
+ * coded values from driver. The formula to calculate a and b are taken from
+ * BSP and sparsely documented and understood.
+ *
+ * Examining the linear formula and the formula used to calculate constants a
+ * and b while knowing that the span for PTAT and THCODE values are between
+ * 0x000 and 0xfff the largest integer possible is 0xfff * 0xfff == 0xffe001.
+ * Integer also needs to be signed so that leaves 7 bits for binary
+ * fixed point scaling.
+ */
+
+#define FIXPT_SHIFT 7
+#define FIXPT_INT(_x) ((_x) << FIXPT_SHIFT)
+#define FIXPT_DIV(_a, _b) DIV_ROUND_CLOSEST(((_a) << FIXPT_SHIFT), (_b))
+#define FIXPT_TO_MCELSIUS(_x) ((_x) * 1000 >> FIXPT_SHIFT)
+
+#define RCAR3_THERMAL_GRAN 500 /* mili Celsius */
+
+/* no idea where these constants come from */
+#define TJ_1 96
+#define TJ_3 -41
+
+static void rcar_gen3_thermal_calc_coefs(struct equation_coefs *coef,
+                                         int *ptat, int *thcode)
+{
+        int tj_2;
+
+        /* TODO: Find documentation and document constant calculation formula */
+
+        /*
+         * Division is not scaled in BSP and if scaled it might overflow
+         * the dividend (4095 * 4095 << 14 > INT_MAX) so keep it unscaled
+         */
+        tj_2 = (FIXPT_INT((ptat[1] - ptat[2]) * 137)
+                / (ptat[0] - ptat[2])) - FIXPT_INT(41);
+
+        coef->a1 = FIXPT_DIV(FIXPT_INT(thcode[1] - thcode[2]),
+                             tj_2 - FIXPT_INT(TJ_3));
+        coef->b1 = FIXPT_INT(thcode[2]) - coef->a1 * TJ_3;
+
+        coef->a2 = FIXPT_DIV(FIXPT_INT(thcode[1] - thcode[0]),
+                             tj_2 - FIXPT_INT(TJ_1));
+        coef->b2 = FIXPT_INT(thcode[0]) - coef->a2 * TJ_1;
+}
+
+static int rcar_gen3_thermal_round(int temp)
+{
+        int result, round_offs;
+
+        round_offs = temp >= 0 ? RCAR3_THERMAL_GRAN / 2 :
+                -RCAR3_THERMAL_GRAN / 2;
+        result = (temp + round_offs) / RCAR3_THERMAL_GRAN;
+        return result * RCAR3_THERMAL_GRAN;
+}
+
+static int rcar_gen3_thermal_get_temp(void *devdata, int *temp)
+{
+        struct rcar_gen3_thermal_tsc *tsc = devdata;
+        int mcelsius, val1, val2;
+        u32 reg;
+
+        /* Read register and convert to mili Celsius */
+        mutex_lock(&tsc->lock);
+
+        reg = rcar_gen3_thermal_read(tsc, REG_GEN3_TEMP) & CTEMP_MASK;
+
+        val1 = FIXPT_DIV(FIXPT_INT(reg) - tsc->coef.b1, tsc->coef.a1);
+        val2 = FIXPT_DIV(FIXPT_INT(reg) - tsc->coef.b2, tsc->coef.a2);
+        mcelsius = FIXPT_TO_MCELSIUS((val1 + val2) / 2);
+
+        mutex_unlock(&tsc->lock);
+
+        /* Make sure we are inside specifications */
+        if ((mcelsius < MCELSIUS(-40)) || (mcelsius > MCELSIUS(125)))
+                return -EIO;
+
+        /* Round value to device granularity setting */
+        *temp = rcar_gen3_thermal_round(mcelsius);
+
+        return 0;
+}
+
+static struct thermal_zone_of_device_ops rcar_gen3_tz_of_ops = {
+        .get_temp       = rcar_gen3_thermal_get_temp,
+};
+
+static void r8a7795_thermal_init(struct rcar_gen3_thermal_tsc *tsc)
+{
+        rcar_gen3_thermal_write(tsc, REG_GEN3_CTSR,  CTSR_THBGR);
+        rcar_gen3_thermal_write(tsc, REG_GEN3_CTSR,  0x0);
+
+        usleep_range(1000, 2000);
+
+        rcar_gen3_thermal_write(tsc, REG_GEN3_CTSR, CTSR_PONM);
+        rcar_gen3_thermal_write(tsc, REG_GEN3_IRQCTL, 0x3F);
+        rcar_gen3_thermal_write(tsc, REG_GEN3_CTSR,
+                                CTSR_PONM | CTSR_AOUT | CTSR_THBGR | CTSR_VMEN);
+
+        usleep_range(100, 200);
+
+        rcar_gen3_thermal_write(tsc, REG_GEN3_CTSR,
+                                CTSR_PONM | CTSR_AOUT | CTSR_THBGR | CTSR_VMEN |
+                                CTSR_VMST | CTSR_THSST);
+
+        usleep_range(1000, 2000);
+}
+
+static void r8a7796_thermal_init(struct rcar_gen3_thermal_tsc *tsc)
+{
+        u32 reg_val;
+
+        reg_val = rcar_gen3_thermal_read(tsc, REG_GEN3_THCTR);
+        reg_val &= ~THCTR_PONM;
+        rcar_gen3_thermal_write(tsc, REG_GEN3_THCTR, reg_val);
+
+        usleep_range(1000, 2000);
+
+        rcar_gen3_thermal_write(tsc, REG_GEN3_IRQCTL, 0x3F);
+        reg_val = rcar_gen3_thermal_read(tsc, REG_GEN3_THCTR);
+        reg_val |= THCTR_THSST;
+        rcar_gen3_thermal_write(tsc, REG_GEN3_THCTR, reg_val);
+}
+
+static const struct rcar_gen3_thermal_data r8a7795_data = {
+        .thermal_init = r8a7795_thermal_init,
+};
+
+static const struct rcar_gen3_thermal_data r8a7796_data = {
+        .thermal_init = r8a7796_thermal_init,
+};
+
+static const struct of_device_id rcar_gen3_thermal_dt_ids[] = {
+        { .compatible = "renesas,r8a7795-thermal", .data = &r8a7795_data},
+        { .compatible = "renesas,r8a7796-thermal", .data = &r8a7796_data},
+        {},
+};
+MODULE_DEVICE_TABLE(of, rcar_gen3_thermal_dt_ids);
+
+static int rcar_gen3_thermal_remove(struct platform_device *pdev)
+{
+        struct device *dev = &pdev->dev;
+
+        pm_runtime_put(dev);
+        pm_runtime_disable(dev);
+
+        return 0;
+}
+
+static int rcar_gen3_thermal_probe(struct platform_device *pdev)
+{
+        struct rcar_gen3_thermal_priv *priv;
+        struct device *dev = &pdev->dev;
+        struct resource *res;
+        struct thermal_zone_device *zone;
+        int ret, i;
+        const struct rcar_gen3_thermal_data *match_data =
+                of_device_get_match_data(dev);
+
+        /* default values if FUSEs are missing */
+        /* TODO: Read values from hardware on supported platforms */
+        int ptat[3] = { 2351, 1509, 435 };
+        int thcode[TSC_MAX_NUM][3] = {
+                { 3248, 2800, 2221 },
+                { 3245, 2795, 2216 },
+                { 3250, 2805, 2237 },
+        };
+
+        priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
+        if (!priv)
+                return -ENOMEM;
+
+        platform_set_drvdata(pdev, priv);
+
+        pm_runtime_enable(dev);
+        pm_runtime_get_sync(dev);
+
+        for (i = 0; i < TSC_MAX_NUM; i++) {
+                struct rcar_gen3_thermal_tsc *tsc;
+
+                tsc = devm_kzalloc(dev, sizeof(*tsc), GFP_KERNEL);
+                if (!tsc) {
+                        ret = -ENOMEM;
+                        goto error_unregister;
+                }
+
+                res = platform_get_resource(pdev, IORESOURCE_MEM, i);
+                if (!res)
+                        break;
+
+                tsc->base = devm_ioremap_resource(dev, res);
+                if (IS_ERR(tsc->base)) {
+                        ret = PTR_ERR(tsc->base);
+                        goto error_unregister;
+                }
+
+                priv->tscs[i] = tsc;
+                mutex_init(&tsc->lock);
+
+                match_data->thermal_init(tsc);
+                rcar_gen3_thermal_calc_coefs(&tsc->coef, ptat, thcode[i]);
+
+                zone = devm_thermal_zone_of_sensor_register(dev, i, tsc,
+                                                            &rcar_gen3_tz_of_ops);
+                if (IS_ERR(zone)) {
+                        dev_err(dev, "Can't register thermal zone\n");
+                        ret = PTR_ERR(zone);
+                        goto error_unregister;
+                }
+                tsc->zone = zone;
+        }
+
+        return 0;
+
+error_unregister:
+        rcar_gen3_thermal_remove(pdev);
+
+        return ret;
+}
+
+static struct platform_driver rcar_gen3_thermal_driver = {
+        .driver = {
+                .name   = "rcar_gen3_thermal",
+                .of_match_table = rcar_gen3_thermal_dt_ids,
+        },
+        .probe          = rcar_gen3_thermal_probe,
+        .remove         = rcar_gen3_thermal_remove,
+};
+module_platform_driver(rcar_gen3_thermal_driver);
+
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("R-Car Gen3 THS thermal sensor driver");
+MODULE_AUTHOR("Wolfram Sang <wsa+renesas@sang-engineering.com>");
diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c
index ad1186dd6132..7b8ef09d2b3c 100644
--- a/drivers/thermal/samsung/exynos_tmu.c
+++ b/drivers/thermal/samsung/exynos_tmu.c
@@ -1168,7 +1168,6 @@ static int exynos_of_sensor_conf(struct device_node *np,
         pdata->default_temp_offset = (u8)value;
 
         of_property_read_u32(np, "samsung,tmu_cal_type", &pdata->cal_type);
-        of_property_read_u32(np, "samsung,tmu_cal_mode", &pdata->cal_mode);
 
         of_node_put(np);
         return 0;
diff --git a/drivers/thermal/samsung/exynos_tmu.h b/drivers/thermal/samsung/exynos_tmu.h
index 440c7140b660..5149c2a3030c 100644
--- a/drivers/thermal/samsung/exynos_tmu.h
+++ b/drivers/thermal/samsung/exynos_tmu.h
@@ -70,7 +70,6 @@ struct exynos_tmu_platform_data {
 
         enum soc_type type;
         u32 cal_type;
-        u32 cal_mode;
 };
 
 #endif /* _EXYNOS_TMU_H */
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index 655591316a88..11f0675cb7e5 100644
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -36,9 +36,8 @@ MODULE_AUTHOR("Zhang Rui");
 MODULE_DESCRIPTION("Generic thermal management sysfs support");
 MODULE_LICENSE("GPL v2");
 
-static DEFINE_IDR(thermal_tz_idr);
-static DEFINE_IDR(thermal_cdev_idr);
-static DEFINE_MUTEX(thermal_idr_lock);
+static DEFINE_IDA(thermal_tz_ida);
+static DEFINE_IDA(thermal_cdev_ida);
 
 static LIST_HEAD(thermal_tz_list);
 static LIST_HEAD(thermal_cdev_list);
@@ -589,29 +588,6 @@ void thermal_zone_device_unbind_exception(struct thermal_zone_device *tz,
  * - thermal zone devices lifecycle: registration, unregistration,
  *                                   binding, and unbinding.
  */
-static int get_idr(struct idr *idr, struct mutex *lock, int *id)
-{
-        int ret;
-
-        if (lock)
-                mutex_lock(lock);
-        ret = idr_alloc(idr, NULL, 0, 0, GFP_KERNEL);
-        if (lock)
-                mutex_unlock(lock);
-        if (unlikely(ret < 0))
-                return ret;
-        *id = ret;
-        return 0;
-}
-
-static void release_idr(struct idr *idr, struct mutex *lock, int id)
-{
-        if (lock)
-                mutex_lock(lock);
-        idr_remove(idr, id);
-        if (lock)
-                mutex_unlock(lock);
-}
 
 /**
  * thermal_zone_bind_cooling_device() - bind a cooling device to a thermal zone
@@ -685,15 +661,16 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz,
         dev->target = THERMAL_NO_TARGET;
         dev->weight = weight;
 
-        result = get_idr(&tz->idr, &tz->lock, &dev->id);
-        if (result)
+        result = ida_simple_get(&tz->ida, 0, 0, GFP_KERNEL);
+        if (result < 0)
                 goto free_mem;
 
+        dev->id = result;
         sprintf(dev->name, "cdev%d", dev->id);
         result =
             sysfs_create_link(&tz->device.kobj, &cdev->device.kobj, dev->name);
         if (result)
-                goto release_idr;
+                goto release_ida;
 
         sprintf(dev->attr_name, "cdev%d_trip_point", dev->id);
         sysfs_attr_init(&dev->attr.attr);
@@ -737,8 +714,8 @@ remove_trip_file:
         device_remove_file(&tz->device, &dev->attr);
 remove_symbol_link:
         sysfs_remove_link(&tz->device.kobj, dev->name);
-release_idr:
-        release_idr(&tz->idr, &tz->lock, dev->id);
+release_ida:
+        ida_simple_remove(&tz->ida, dev->id);
 free_mem:
         kfree(dev);
         return result;
@@ -785,7 +762,7 @@ unbind:
         device_remove_file(&tz->device, &pos->weight_attr);
         device_remove_file(&tz->device, &pos->attr);
         sysfs_remove_link(&tz->device.kobj, pos->name);
-        release_idr(&tz->idr, &tz->lock, pos->id);
+        ida_simple_remove(&tz->ida, pos->id);
         kfree(pos);
         return 0;
 }
@@ -925,12 +902,13 @@ __thermal_cooling_device_register(struct device_node *np,
         if (!cdev)
                 return ERR_PTR(-ENOMEM);
 
-        result = get_idr(&thermal_cdev_idr, &thermal_idr_lock, &cdev->id);
-        if (result) {
+        result = ida_simple_get(&thermal_cdev_ida, 0, 0, GFP_KERNEL);
+        if (result < 0) {
                 kfree(cdev);
                 return ERR_PTR(result);
         }
 
+        cdev->id = result;
         strlcpy(cdev->type, type ? : "", sizeof(cdev->type));
         mutex_init(&cdev->lock);
         INIT_LIST_HEAD(&cdev->thermal_instances);
@@ -943,7 +921,7 @@ __thermal_cooling_device_register(struct device_node *np,
         dev_set_name(&cdev->device, "cooling_device%d", cdev->id);
         result = device_register(&cdev->device);
         if (result) {
-                release_idr(&thermal_cdev_idr, &thermal_idr_lock, cdev->id);
+                ida_simple_remove(&thermal_cdev_ida, cdev->id);
                 kfree(cdev);
                 return ERR_PTR(result);
         }
@@ -1070,7 +1048,7 @@ void thermal_cooling_device_unregister(struct thermal_cooling_device *cdev)
 
         mutex_unlock(&thermal_list_lock);
 
-        release_idr(&thermal_cdev_idr, &thermal_idr_lock, cdev->id);
+        ida_simple_remove(&thermal_cdev_ida, cdev->id);
         device_unregister(&cdev->device);
 }
 EXPORT_SYMBOL_GPL(thermal_cooling_device_unregister);
@@ -1172,14 +1150,15 @@ thermal_zone_device_register(const char *type, int trips, int mask,
                 return ERR_PTR(-ENOMEM);
 
         INIT_LIST_HEAD(&tz->thermal_instances);
-        idr_init(&tz->idr);
+        ida_init(&tz->ida);
         mutex_init(&tz->lock);
-        result = get_idr(&thermal_tz_idr, &thermal_idr_lock, &tz->id);
-        if (result) {
+        result = ida_simple_get(&thermal_tz_ida, 0, 0, GFP_KERNEL);
+        if (result < 0) {
                 kfree(tz);
                 return ERR_PTR(result);
         }
 
+        tz->id = result;
         strlcpy(tz->type, type, sizeof(tz->type));
         tz->ops = ops;
         tz->tzp = tzp;
@@ -1201,7 +1180,7 @@ thermal_zone_device_register(const char *type, int trips, int mask,
         dev_set_name(&tz->device, "thermal_zone%d", tz->id);
         result = device_register(&tz->device);
         if (result) {
-                release_idr(&thermal_tz_idr, &thermal_idr_lock, tz->id);
+                ida_simple_remove(&thermal_tz_ida, tz->id);
                 kfree(tz);
                 return ERR_PTR(result);
         }
@@ -1255,7 +1234,7 @@ thermal_zone_device_register(const char *type, int trips, int mask,
         return tz;
 
 unregister:
-        release_idr(&thermal_tz_idr, &thermal_idr_lock, tz->id);
+        ida_simple_remove(&thermal_tz_ida, tz->id);
         device_unregister(&tz->device);
         return ERR_PTR(result);
 }
@@ -1313,8 +1292,8 @@ void thermal_zone_device_unregister(struct thermal_zone_device *tz)
         thermal_set_governor(tz, NULL);
 
         thermal_remove_hwmon_sysfs(tz);
-        release_idr(&thermal_tz_idr, &thermal_idr_lock, tz->id);
-        idr_destroy(&tz->idr);
+        ida_simple_remove(&thermal_tz_ida, tz->id);
+        ida_destroy(&tz->ida);
         mutex_destroy(&tz->lock);
         device_unregister(&tz->device);
 }
@@ -1514,9 +1493,8 @@ unregister_class:
 unregister_governors:
         thermal_unregister_governors();
 error:
-        idr_destroy(&thermal_tz_idr);
-        idr_destroy(&thermal_cdev_idr);
-        mutex_destroy(&thermal_idr_lock);
+        ida_destroy(&thermal_tz_ida);
+        ida_destroy(&thermal_cdev_ida);
         mutex_destroy(&thermal_list_lock);
         mutex_destroy(&thermal_governor_lock);
         return result;
@@ -1529,9 +1507,8 @@ static void __exit thermal_exit(void)
         genetlink_exit();
         class_unregister(&thermal_class);
         thermal_unregister_governors();
-        idr_destroy(&thermal_tz_idr);
-        idr_destroy(&thermal_cdev_idr);
-        mutex_destroy(&thermal_idr_lock);
+        ida_destroy(&thermal_tz_ida);
+        ida_destroy(&thermal_cdev_ida);
         mutex_destroy(&thermal_list_lock);
         mutex_destroy(&thermal_governor_lock);
 }
diff --git a/drivers/thermal/ti-soc-thermal/Kconfig b/drivers/thermal/ti-soc-thermal/Kconfig
index ea8283f08aa6..fe0e877f84d0 100644
--- a/drivers/thermal/ti-soc-thermal/Kconfig
+++ b/drivers/thermal/ti-soc-thermal/Kconfig
@@ -11,7 +11,6 @@ config TI_SOC_THERMAL
 config TI_THERMAL
         bool "Texas Instruments SoCs thermal framework support"
         depends on TI_SOC_THERMAL
-        depends on CPU_THERMAL
         help
           If you say yes here you want to get support for generic thermal
           framework for the Texas Instruments on die bandgap temperature sensor.
diff --git a/drivers/thermal/ti-soc-thermal/dra752-bandgap.h b/drivers/thermal/ti-soc-thermal/dra752-bandgap.h
index 6b0f2b1160f7..a31e4b5e82cd 100644
--- a/drivers/thermal/ti-soc-thermal/dra752-bandgap.h
+++ b/drivers/thermal/ti-soc-thermal/dra752-bandgap.h
@@ -54,7 +54,6 @@
 #define DRA752_STD_FUSE_OPP_BGAP_CORE_OFFSET            0x8
 #define DRA752_TEMP_SENSOR_CORE_OFFSET                  0x154
 #define DRA752_BANDGAP_THRESHOLD_CORE_OFFSET            0x1ac
-#define DRA752_BANDGAP_TSHUT_CORE_OFFSET                0x1b8
 #define DRA752_BANDGAP_CUMUL_DTEMP_CORE_OFFSET          0x1c4
 #define DRA752_DTEMP_CORE_0_OFFSET                      0x208
 #define DRA752_DTEMP_CORE_1_OFFSET                      0x20c
@@ -66,7 +65,6 @@
 #define DRA752_STD_FUSE_OPP_BGAP_IVA_OFFSET             0x388
 #define DRA752_TEMP_SENSOR_IVA_OFFSET                   0x398
 #define DRA752_BANDGAP_THRESHOLD_IVA_OFFSET             0x3a4
-#define DRA752_BANDGAP_TSHUT_IVA_OFFSET                 0x3ac
 #define DRA752_BANDGAP_CUMUL_DTEMP_IVA_OFFSET           0x3b4
 #define DRA752_DTEMP_IVA_0_OFFSET                       0x3d0
 #define DRA752_DTEMP_IVA_1_OFFSET                       0x3d4
@@ -78,7 +76,6 @@
 #define DRA752_STD_FUSE_OPP_BGAP_MPU_OFFSET             0x4
 #define DRA752_TEMP_SENSOR_MPU_OFFSET                   0x14c
 #define DRA752_BANDGAP_THRESHOLD_MPU_OFFSET             0x1a4
-#define DRA752_BANDGAP_TSHUT_MPU_OFFSET                 0x1b0
 #define DRA752_BANDGAP_CUMUL_DTEMP_MPU_OFFSET           0x1bc
 #define DRA752_DTEMP_MPU_0_OFFSET                       0x1e0
 #define DRA752_DTEMP_MPU_1_OFFSET                       0x1e4
@@ -90,7 +87,6 @@
 #define DRA752_STD_FUSE_OPP_BGAP_DSPEVE_OFFSET                  0x384
 #define DRA752_TEMP_SENSOR_DSPEVE_OFFSET                        0x394
 #define DRA752_BANDGAP_THRESHOLD_DSPEVE_OFFSET                  0x3a0
-#define DRA752_BANDGAP_TSHUT_DSPEVE_OFFSET                      0x3a8
 #define DRA752_BANDGAP_CUMUL_DTEMP_DSPEVE_OFFSET                0x3b0
 #define DRA752_DTEMP_DSPEVE_0_OFFSET                            0x3bc
 #define DRA752_DTEMP_DSPEVE_1_OFFSET                            0x3c0
@@ -102,7 +98,6 @@
 #define DRA752_STD_FUSE_OPP_BGAP_GPU_OFFSET             0x0
 #define DRA752_TEMP_SENSOR_GPU_OFFSET                   0x150
 #define DRA752_BANDGAP_THRESHOLD_GPU_OFFSET             0x1a8
-#define DRA752_BANDGAP_TSHUT_GPU_OFFSET                 0x1b4
 #define DRA752_BANDGAP_CUMUL_DTEMP_GPU_OFFSET           0x1c0
 #define DRA752_DTEMP_GPU_0_OFFSET                       0x1f4
 #define DRA752_DTEMP_GPU_1_OFFSET                       0x1f8
@@ -173,10 +168,6 @@
 #define DRA752_BANDGAP_THRESHOLD_HOT_MASK               (0x3ff << 16)
 #define DRA752_BANDGAP_THRESHOLD_COLD_MASK              (0x3ff << 0)
 
-/* DRA752.TSHUT_THRESHOLD */
-#define DRA752_TSHUT_THRESHOLD_MUXCTRL_MASK             BIT(31)
-#define DRA752_TSHUT_THRESHOLD_HOT_MASK                 (0x3ff << 16)
-#define DRA752_TSHUT_THRESHOLD_COLD_MASK                (0x3ff << 0)
 
 /* DRA752.BANDGAP_CUMUL_DTEMP_CORE */
 #define DRA752_BANDGAP_CUMUL_DTEMP_CORE_MASK            (0xffffffff << 0)
@@ -216,8 +207,6 @@
 #define DRA752_GPU_MAX_TEMP                             125000
 #define DRA752_GPU_HYST_VAL                             5000
 /* interrupts thresholds */
-#define DRA752_GPU_TSHUT_HOT                            915
-#define DRA752_GPU_TSHUT_COLD                           900
 #define DRA752_GPU_T_HOT                                800
 #define DRA752_GPU_T_COLD                               795
 
@@ -230,8 +219,6 @@
 #define DRA752_MPU_MAX_TEMP                             125000
 #define DRA752_MPU_HYST_VAL                             5000
 /* interrupts thresholds */
-#define DRA752_MPU_TSHUT_HOT                            915
-#define DRA752_MPU_TSHUT_COLD                           900
 #define DRA752_MPU_T_HOT                                800
 #define DRA752_MPU_T_COLD                               795
 
@@ -244,8 +231,6 @@
 #define DRA752_CORE_MAX_TEMP                            125000
 #define DRA752_CORE_HYST_VAL                            5000
 /* interrupts thresholds */
-#define DRA752_CORE_TSHUT_HOT                           915
-#define DRA752_CORE_TSHUT_COLD                          900
 #define DRA752_CORE_T_HOT                               800
 #define DRA752_CORE_T_COLD                              795
 
@@ -258,8 +243,6 @@
 #define DRA752_DSPEVE_MAX_TEMP                          125000
 #define DRA752_DSPEVE_HYST_VAL                          5000
 /* interrupts thresholds */
-#define DRA752_DSPEVE_TSHUT_HOT                         915
-#define DRA752_DSPEVE_TSHUT_COLD                        900
 #define DRA752_DSPEVE_T_HOT                             800
 #define DRA752_DSPEVE_T_COLD                            795
 
@@ -272,8 +255,6 @@
 #define DRA752_IVA_MAX_TEMP                             125000
 #define DRA752_IVA_HYST_VAL                             5000
 /* interrupts thresholds */
-#define DRA752_IVA_TSHUT_HOT                            915
-#define DRA752_IVA_TSHUT_COLD                           900
 #define DRA752_IVA_T_HOT                                800
 #define DRA752_IVA_T_COLD                               795
 
diff --git a/drivers/thermal/ti-soc-thermal/dra752-thermal-data.c b/drivers/thermal/ti-soc-thermal/dra752-thermal-data.c
index 58b5c6694cd4..118d7d847715 100644
--- a/drivers/thermal/ti-soc-thermal/dra752-thermal-data.c
+++ b/drivers/thermal/ti-soc-thermal/dra752-thermal-data.c
@@ -49,9 +49,6 @@ dra752_core_temp_sensor_registers = {
         .bgap_threshold = DRA752_BANDGAP_THRESHOLD_CORE_OFFSET,
         .threshold_thot_mask = DRA752_BANDGAP_THRESHOLD_HOT_MASK,
         .threshold_tcold_mask = DRA752_BANDGAP_THRESHOLD_COLD_MASK,
-        .tshut_threshold = DRA752_BANDGAP_TSHUT_CORE_OFFSET,
-        .tshut_hot_mask = DRA752_TSHUT_THRESHOLD_HOT_MASK,
-        .tshut_cold_mask = DRA752_TSHUT_THRESHOLD_COLD_MASK,
         .bgap_status = DRA752_BANDGAP_STATUS_1_OFFSET,
         .status_bgap_alert_mask = DRA752_BANDGAP_STATUS_1_ALERT_MASK,
         .status_hot_mask = DRA752_BANDGAP_STATUS_1_HOT_CORE_MASK,
@@ -85,9 +82,6 @@ dra752_iva_temp_sensor_registers = {
         .bgap_threshold = DRA752_BANDGAP_THRESHOLD_IVA_OFFSET,
         .threshold_thot_mask = DRA752_BANDGAP_THRESHOLD_HOT_MASK,
         .threshold_tcold_mask = DRA752_BANDGAP_THRESHOLD_COLD_MASK,
-        .tshut_threshold = DRA752_BANDGAP_TSHUT_IVA_OFFSET,
-        .tshut_hot_mask = DRA752_TSHUT_THRESHOLD_HOT_MASK,
-        .tshut_cold_mask = DRA752_TSHUT_THRESHOLD_COLD_MASK,
         .bgap_status = DRA752_BANDGAP_STATUS_2_OFFSET,
         .status_bgap_alert_mask = DRA752_BANDGAP_STATUS_1_ALERT_MASK,
         .status_hot_mask = DRA752_BANDGAP_STATUS_2_HOT_IVA_MASK,
@@ -121,9 +115,6 @@ dra752_mpu_temp_sensor_registers = {
         .bgap_threshold = DRA752_BANDGAP_THRESHOLD_MPU_OFFSET,
         .threshold_thot_mask = DRA752_BANDGAP_THRESHOLD_HOT_MASK,
         .threshold_tcold_mask = DRA752_BANDGAP_THRESHOLD_COLD_MASK,
-        .tshut_threshold = DRA752_BANDGAP_TSHUT_MPU_OFFSET,
-        .tshut_hot_mask = DRA752_TSHUT_THRESHOLD_HOT_MASK,
-        .tshut_cold_mask = DRA752_TSHUT_THRESHOLD_COLD_MASK,
         .bgap_status = DRA752_BANDGAP_STATUS_1_OFFSET,
         .status_bgap_alert_mask = DRA752_BANDGAP_STATUS_1_ALERT_MASK,
         .status_hot_mask = DRA752_BANDGAP_STATUS_1_HOT_MPU_MASK,
@@ -157,9 +148,6 @@ dra752_dspeve_temp_sensor_registers = {
         .bgap_threshold = DRA752_BANDGAP_THRESHOLD_DSPEVE_OFFSET,
         .threshold_thot_mask = DRA752_BANDGAP_THRESHOLD_HOT_MASK,
         .threshold_tcold_mask = DRA752_BANDGAP_THRESHOLD_COLD_MASK,
-        .tshut_threshold = DRA752_BANDGAP_TSHUT_DSPEVE_OFFSET,
-        .tshut_hot_mask = DRA752_TSHUT_THRESHOLD_HOT_MASK,
-        .tshut_cold_mask = DRA752_TSHUT_THRESHOLD_COLD_MASK,
         .bgap_status = DRA752_BANDGAP_STATUS_2_OFFSET,
         .status_bgap_alert_mask = DRA752_BANDGAP_STATUS_1_ALERT_MASK,
         .status_hot_mask = DRA752_BANDGAP_STATUS_2_HOT_DSPEVE_MASK,
@@ -193,9 +181,6 @@ dra752_gpu_temp_sensor_registers = {
         .bgap_threshold = DRA752_BANDGAP_THRESHOLD_GPU_OFFSET,
         .threshold_thot_mask = DRA752_BANDGAP_THRESHOLD_HOT_MASK,
         .threshold_tcold_mask = DRA752_BANDGAP_THRESHOLD_COLD_MASK,
-        .tshut_threshold = DRA752_BANDGAP_TSHUT_GPU_OFFSET,
-        .tshut_hot_mask = DRA752_TSHUT_THRESHOLD_HOT_MASK,
-        .tshut_cold_mask = DRA752_TSHUT_THRESHOLD_COLD_MASK,
         .bgap_status = DRA752_BANDGAP_STATUS_1_OFFSET,
         .status_bgap_alert_mask = DRA752_BANDGAP_STATUS_1_ALERT_MASK,
         .status_hot_mask = DRA752_BANDGAP_STATUS_1_HOT_GPU_MASK,
@@ -211,8 +196,6 @@ dra752_gpu_temp_sensor_registers = {
 
 /* Thresholds and limits for DRA752 MPU temperature sensor */
 static struct temp_sensor_data dra752_mpu_temp_sensor_data = {
-        .tshut_hot = DRA752_MPU_TSHUT_HOT,
-        .tshut_cold = DRA752_MPU_TSHUT_COLD,
         .t_hot = DRA752_MPU_T_HOT,
         .t_cold = DRA752_MPU_T_COLD,
         .min_freq = DRA752_MPU_MIN_FREQ,
@@ -226,8 +209,6 @@ static struct temp_sensor_data dra752_mpu_temp_sensor_data = {
 
 /* Thresholds and limits for DRA752 GPU temperature sensor */
 static struct temp_sensor_data dra752_gpu_temp_sensor_data = {
-        .tshut_hot = DRA752_GPU_TSHUT_HOT,
-        .tshut_cold = DRA752_GPU_TSHUT_COLD,
         .t_hot = DRA752_GPU_T_HOT,
         .t_cold = DRA752_GPU_T_COLD,
         .min_freq = DRA752_GPU_MIN_FREQ,
@@ -241,8 +222,6 @@ static struct temp_sensor_data dra752_gpu_temp_sensor_data = {
 
 /* Thresholds and limits for DRA752 CORE temperature sensor */
 static struct temp_sensor_data dra752_core_temp_sensor_data = {
-        .tshut_hot = DRA752_CORE_TSHUT_HOT,
-        .tshut_cold = DRA752_CORE_TSHUT_COLD,
         .t_hot = DRA752_CORE_T_HOT,
         .t_cold = DRA752_CORE_T_COLD,
         .min_freq = DRA752_CORE_MIN_FREQ,
@@ -256,8 +235,6 @@ static struct temp_sensor_data dra752_core_temp_sensor_data = {
 
 /* Thresholds and limits for DRA752 DSPEVE temperature sensor */
 static struct temp_sensor_data dra752_dspeve_temp_sensor_data = {
-        .tshut_hot = DRA752_DSPEVE_TSHUT_HOT,
-        .tshut_cold = DRA752_DSPEVE_TSHUT_COLD,
         .t_hot = DRA752_DSPEVE_T_HOT,
         .t_cold = DRA752_DSPEVE_T_COLD,
         .min_freq = DRA752_DSPEVE_MIN_FREQ,
@@ -271,8 +248,6 @@ static struct temp_sensor_data dra752_dspeve_temp_sensor_data = {
 
 /* Thresholds and limits for DRA752 IVA temperature sensor */
 static struct temp_sensor_data dra752_iva_temp_sensor_data = {
-        .tshut_hot = DRA752_IVA_TSHUT_HOT,
-        .tshut_cold = DRA752_IVA_TSHUT_COLD,
         .t_hot = DRA752_IVA_T_HOT,
         .t_cold = DRA752_IVA_T_COLD,
         .min_freq = DRA752_IVA_MIN_FREQ,
@@ -416,8 +391,7 @@ int dra752_adc_to_temp[DRA752_ADC_END_VALUE - DRA752_ADC_START_VALUE + 1] = {
 
 /* DRA752 data */
 const struct ti_bandgap_data dra752_data = {
-        .features = TI_BANDGAP_FEATURE_TSHUT_CONFIG |
-                        TI_BANDGAP_FEATURE_FREEZE_BIT |
+        .features = TI_BANDGAP_FEATURE_FREEZE_BIT |
                         TI_BANDGAP_FEATURE_TALERT |
                         TI_BANDGAP_FEATURE_COUNTER_DELAY |
                         TI_BANDGAP_FEATURE_HISTORY_BUFFER |
diff --git a/drivers/thermal/zx2967_thermal.c b/drivers/thermal/zx2967_thermal.c
new file mode 100644
index 000000000000..a5670ad2cfc8
--- /dev/null
+++ b/drivers/thermal/zx2967_thermal.c
@@ -0,0 +1,258 @@
+/*
+ * ZTE's zx2967 family thermal sensor driver
+ *
+ * Copyright (C) 2017 ZTE Ltd.
+ *
+ * Author: Baoyou Xie <baoyou.xie@linaro.org>
+ *
+ * License terms: GNU General Public License (GPL) version 2
+ */
+
+#include <linux/clk.h>
+#include <linux/device.h>
+#include <linux/err.h>
+#include <linux/iopoll.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/thermal.h>
+
+/* Power Mode: 0->low 1->high */
+#define ZX2967_THERMAL_POWER_MODE       0
+#define ZX2967_POWER_MODE_LOW           0
+#define ZX2967_POWER_MODE_HIGH          1
+
+/* DCF Control Register */
+#define ZX2967_THERMAL_DCF              0x4
+#define ZX2967_DCF_EN                   BIT(1)
+#define ZX2967_DCF_FREEZE               BIT(0)
+
+/* Selection Register */
+#define ZX2967_THERMAL_SEL              0x8
+
+/* Control Register */
+#define ZX2967_THERMAL_CTRL             0x10
+
+#define ZX2967_THERMAL_READY            BIT(12)
+#define ZX2967_THERMAL_TEMP_MASK        GENMASK(11, 0)
+#define ZX2967_THERMAL_ID_MASK          0x18
+#define ZX2967_THERMAL_ID               0x10
+
+#define ZX2967_GET_TEMP_TIMEOUT_US      (100 * 1024)
+
+/**
+ * struct zx2967_thermal_priv - zx2967 thermal sensor private structure
+ * @tzd: struct thermal_zone_device where the sensor is registered
+ * @lock: prevents read sensor in parallel
+ * @clk_topcrm: topcrm clk structure
+ * @clk_apb: apb clk structure
+ * @regs: pointer to base address of the thermal sensor
+ */
+
+struct zx2967_thermal_priv {
+        struct thermal_zone_device      *tzd;
+        struct mutex                    lock;
+        struct clk                      *clk_topcrm;
+        struct clk                      *clk_apb;
+        void __iomem                    *regs;
+        struct device                   *dev;
+};
+
+static int zx2967_thermal_get_temp(void *data, int *temp)
+{
+        void __iomem *regs;
+        struct zx2967_thermal_priv *priv = data;
+        u32 val;
+        int ret;
+
+        if (!priv->tzd)
+                return -EAGAIN;
+
+        regs = priv->regs;
+        mutex_lock(&priv->lock);
+        writel_relaxed(ZX2967_POWER_MODE_LOW,
+                       regs + ZX2967_THERMAL_POWER_MODE);
+        writel_relaxed(ZX2967_DCF_EN, regs + ZX2967_THERMAL_DCF);
+
+        val = readl_relaxed(regs + ZX2967_THERMAL_SEL);
+        val &= ~ZX2967_THERMAL_ID_MASK;
+        val |= ZX2967_THERMAL_ID;
+        writel_relaxed(val, regs + ZX2967_THERMAL_SEL);
+
+        /*
+         * Must wait for a while, surely it's a bit odd.
+         * otherwise temperature value we got has a few deviation, even if
+         * the THERMAL_READY bit is set.
+         */
+        usleep_range(100, 300);
+        ret = readx_poll_timeout(readl, regs + ZX2967_THERMAL_CTRL,
+                                 val, val & ZX2967_THERMAL_READY, 300,
+                                 ZX2967_GET_TEMP_TIMEOUT_US);
+        if (ret) {
+                dev_err(priv->dev, "Thermal sensor data timeout\n");
+                goto unlock;
+        }
+
+        writel_relaxed(ZX2967_DCF_FREEZE | ZX2967_DCF_EN,
+                       regs + ZX2967_THERMAL_DCF);
+        val = readl_relaxed(regs + ZX2967_THERMAL_CTRL)
+                         & ZX2967_THERMAL_TEMP_MASK;
+        writel_relaxed(ZX2967_POWER_MODE_HIGH,
+                       regs + ZX2967_THERMAL_POWER_MODE);
+
+        /*
+         * Calculate temperature
+         * In dts, slope is multiplied by 1000.
+         */
+        *temp = DIV_ROUND_CLOSEST(((s32)val + priv->tzd->tzp->offset) * 1000,
+                                  priv->tzd->tzp->slope);
+
+unlock:
+        mutex_unlock(&priv->lock);
+        return ret;
+}
+
+static struct thermal_zone_of_device_ops zx2967_of_thermal_ops = {
+        .get_temp = zx2967_thermal_get_temp,
+};
+
+static int zx2967_thermal_probe(struct platform_device *pdev)
+{
+        struct zx2967_thermal_priv *priv;
+        struct resource *res;
+        int ret;
+
+        priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
+        if (!priv)
+                return -ENOMEM;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        priv->regs = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(priv->regs))
+                return PTR_ERR(priv->regs);
+
+        priv->clk_topcrm = devm_clk_get(&pdev->dev, "topcrm");
+        if (IS_ERR(priv->clk_topcrm)) {
+                ret = PTR_ERR(priv->clk_topcrm);
+                dev_err(&pdev->dev, "failed to get topcrm clock: %d\n", ret);
+                return ret;
+        }
+
+        ret = clk_prepare_enable(priv->clk_topcrm);
+        if (ret) {
+                dev_err(&pdev->dev, "failed to enable topcrm clock: %d\n",
+                        ret);
+                return ret;
+        }
+
+        priv->clk_apb = devm_clk_get(&pdev->dev, "apb");
+        if (IS_ERR(priv->clk_apb)) {
+                ret = PTR_ERR(priv->clk_apb);
+                dev_err(&pdev->dev, "failed to get apb clock: %d\n", ret);
+                goto disable_clk_topcrm;
+        }
+
+        ret = clk_prepare_enable(priv->clk_apb);
+        if (ret) {
+                dev_err(&pdev->dev, "failed to enable apb clock: %d\n",
+                        ret);
+                goto disable_clk_topcrm;
+        }
+
+        mutex_init(&priv->lock);
+        priv->tzd = thermal_zone_of_sensor_register(&pdev->dev,
+                                        0, priv, &zx2967_of_thermal_ops);
+
+        if (IS_ERR(priv->tzd)) {
+                ret = PTR_ERR(priv->tzd);
+                dev_err(&pdev->dev, "failed to register sensor: %d\n", ret);
+                goto disable_clk_all;
+        }
+
+        if (priv->tzd->tzp->slope == 0) {
+                thermal_zone_of_sensor_unregister(&pdev->dev, priv->tzd);
+                dev_err(&pdev->dev, "coefficients of sensor is invalid\n");
+                ret = -EINVAL;
+                goto disable_clk_all;
+        }
+
+        priv->dev = &pdev->dev;
+        platform_set_drvdata(pdev, priv);
+
+        return 0;
+
+disable_clk_all:
+        clk_disable_unprepare(priv->clk_apb);
+disable_clk_topcrm:
+        clk_disable_unprepare(priv->clk_topcrm);
+        return ret;
+}
+
+static int zx2967_thermal_exit(struct platform_device *pdev)
+{
+        struct zx2967_thermal_priv *priv = platform_get_drvdata(pdev);
+
+        thermal_zone_of_sensor_unregister(&pdev->dev, priv->tzd);
+        clk_disable_unprepare(priv->clk_topcrm);
+        clk_disable_unprepare(priv->clk_apb);
+
+        return 0;
+}
+
+static const struct of_device_id zx2967_thermal_id_table[] = {
+        { .compatible = "zte,zx296718-thermal" },
+        {}
+};
+MODULE_DEVICE_TABLE(of, zx2967_thermal_id_table);
+
+#ifdef CONFIG_PM_SLEEP
+static int zx2967_thermal_suspend(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct zx2967_thermal_priv *priv = platform_get_drvdata(pdev);
+
+        if (priv && priv->clk_topcrm)
+                clk_disable_unprepare(priv->clk_topcrm);
+
+        if (priv && priv->clk_apb)
+                clk_disable_unprepare(priv->clk_apb);
+
+        return 0;
+}
+
+static int zx2967_thermal_resume(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct zx2967_thermal_priv *priv = platform_get_drvdata(pdev);
+        int error;
+
+        error = clk_prepare_enable(priv->clk_topcrm);
+        if (error)
+                return error;
+
+        error = clk_prepare_enable(priv->clk_apb);
+        if (error) {
+                clk_disable_unprepare(priv->clk_topcrm);
+                return error;
+        }
+
+        return 0;
+}
+#endif
+
+static SIMPLE_DEV_PM_OPS(zx2967_thermal_pm_ops,
+                         zx2967_thermal_suspend, zx2967_thermal_resume);
+
+static struct platform_driver zx2967_thermal_driver = {
+        .probe = zx2967_thermal_probe,
+        .remove = zx2967_thermal_exit,
+        .driver = {
+                .name = "zx2967_thermal",
+                .of_match_table = zx2967_thermal_id_table,
+                .pm = &zx2967_thermal_pm_ops,
+        },
+};
+module_platform_driver(zx2967_thermal_driver);
+
+MODULE_AUTHOR("Baoyou Xie <baoyou.xie@linaro.org>");
+MODULE_DESCRIPTION("ZTE zx2967 thermal driver");
+MODULE_LICENSE("GPL v2");
diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index f73ee9534d83..0339daf4ca02 100644
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -249,7 +249,8 @@ static int f2fs_write_meta_page(struct page *page,
         dec_page_count(sbi, F2FS_DIRTY_META);
 
         if (wbc->for_reclaim)
-                f2fs_submit_merged_bio_cond(sbi, NULL, page, 0, META, WRITE);
+                f2fs_submit_merged_bio_cond(sbi, page->mapping->host,
+                                                0, page->index, META, WRITE);
 
         unlock_page(page);
 
@@ -493,6 +494,7 @@ int acquire_orphan_inode(struct f2fs_sb_info *sbi)
 #ifdef CONFIG_F2FS_FAULT_INJECTION
         if (time_to_inject(sbi, FAULT_ORPHAN)) {
                 spin_unlock(&im->ino_lock);
+                f2fs_show_injection_info(FAULT_ORPHAN);
                 return -ENOSPC;
         }
 #endif
@@ -681,8 +683,7 @@ static int get_checkpoint_version(struct f2fs_sb_info *sbi, block_t cp_addr,
                 return -EINVAL;
         }
 
-        crc = le32_to_cpu(*((__le32 *)((unsigned char *)*cp_block
-                                                        + crc_offset)));
+        crc = cur_cp_crc(*cp_block);
         if (!f2fs_crc_valid(sbi, crc, *cp_block, crc_offset)) {
                 f2fs_msg(sbi->sb, KERN_WARNING, "invalid crc value");
                 return -EINVAL;
@@ -891,7 +892,7 @@ retry:
                                 F2FS_DIRTY_DENTS : F2FS_DIRTY_DATA));
                 return 0;
         }
-        fi = list_entry(head->next, struct f2fs_inode_info, dirty_list);
+        fi = list_first_entry(head, struct f2fs_inode_info, dirty_list);
         inode = igrab(&fi->vfs_inode);
         spin_unlock(&sbi->inode_lock[type]);
         if (inode) {
@@ -924,7 +925,7 @@ int f2fs_sync_inode_meta(struct f2fs_sb_info *sbi)
                         spin_unlock(&sbi->inode_lock[DIRTY_META]);
                         return 0;
                 }
-                fi = list_entry(head->next, struct f2fs_inode_info,
+                fi = list_first_entry(head, struct f2fs_inode_info,
                                                         gdirty_list);
                 inode = igrab(&fi->vfs_inode);
                 spin_unlock(&sbi->inode_lock[DIRTY_META]);
@@ -998,8 +999,6 @@ out:
 static void unblock_operations(struct f2fs_sb_info *sbi)
 {
         up_write(&sbi->node_write);
-
-        build_free_nids(sbi, false);
         f2fs_unlock_all(sbi);
 }
 
@@ -1025,6 +1024,10 @@ static void update_ckpt_flags(struct f2fs_sb_info *sbi, struct cp_control *cpc)
 
         spin_lock(&sbi->cp_lock);
 
+        if (cpc->reason == CP_UMOUNT && ckpt->cp_pack_total_block_count >
+                        sbi->blocks_per_seg - NM_I(sbi)->nat_bits_blocks)
+                disable_nat_bits(sbi, false);
+
         if (cpc->reason == CP_UMOUNT)
                 __set_ckpt_flags(ckpt, CP_UMOUNT_FLAG);
         else
@@ -1137,6 +1140,28 @@ static int do_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc)
 
         start_blk = __start_cp_next_addr(sbi);
 
+        /* write nat bits */
+        if (enabled_nat_bits(sbi, cpc)) {
+                __u64 cp_ver = cur_cp_version(ckpt);
+                unsigned int i;
+                block_t blk;
+
+                cp_ver |= ((__u64)crc32 << 32);
+                *(__le64 *)nm_i->nat_bits = cpu_to_le64(cp_ver);
+
+                blk = start_blk + sbi->blocks_per_seg - nm_i->nat_bits_blocks;
+                for (i = 0; i < nm_i->nat_bits_blocks; i++)
+                        update_meta_page(sbi, nm_i->nat_bits +
+                                        (i << F2FS_BLKSIZE_BITS), blk + i);
+
+                /* Flush all the NAT BITS pages */
+                while (get_pages(sbi, F2FS_DIRTY_META)) {
+                        sync_meta_pages(sbi, META, LONG_MAX);
+                        if (unlikely(f2fs_cp_error(sbi)))
+                                return -EIO;
+                }
+        }
+
         /* need to wait for end_io results */
         wait_on_all_pages_writeback(sbi);
         if (unlikely(f2fs_cp_error(sbi)))
@@ -1248,15 +1273,20 @@ int write_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc)
         f2fs_flush_merged_bios(sbi);
 
         /* this is the case of multiple fstrims without any changes */
-        if (cpc->reason == CP_DISCARD && !is_sbi_flag_set(sbi, SBI_IS_DIRTY)) {
-                f2fs_bug_on(sbi, NM_I(sbi)->dirty_nat_cnt);
-                f2fs_bug_on(sbi, SIT_I(sbi)->dirty_sentries);
-                f2fs_bug_on(sbi, prefree_segments(sbi));
-                flush_sit_entries(sbi, cpc);
-                clear_prefree_segments(sbi, cpc);
-                f2fs_wait_all_discard_bio(sbi);
-                unblock_operations(sbi);
-                goto out;
+        if (cpc->reason == CP_DISCARD) {
+                if (!exist_trim_candidates(sbi, cpc)) {
+                        unblock_operations(sbi);
+                        goto out;
+                }
+
+                if (NM_I(sbi)->dirty_nat_cnt == 0 &&
+                                SIT_I(sbi)->dirty_sentries == 0 &&
+                                prefree_segments(sbi) == 0) {
+                        flush_sit_entries(sbi, cpc);
+                        clear_prefree_segments(sbi, cpc);
+                        unblock_operations(sbi);
+                        goto out;
+                }
         }
 
         /*
@@ -1268,17 +1298,15 @@ int write_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc)
         ckpt->checkpoint_ver = cpu_to_le64(++ckpt_ver);
 
         /* write cached NAT/SIT entries to NAT/SIT area */
-        flush_nat_entries(sbi);
+        flush_nat_entries(sbi, cpc);
         flush_sit_entries(sbi, cpc);
 
         /* unlock all the fs_lock[] in do_checkpoint() */
         err = do_checkpoint(sbi, cpc);
-        if (err) {
+        if (err)
                 release_discard_addrs(sbi);
-        } else {
+        else
                 clear_prefree_segments(sbi, cpc);
-                f2fs_wait_all_discard_bio(sbi);
-        }
 
         unblock_operations(sbi);
         stat_inc_cp_count(sbi->stat_info);
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 9ac262564fa6..1375fef11146 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -55,8 +55,10 @@ static void f2fs_read_end_io(struct bio *bio)
         int i;
 
 #ifdef CONFIG_F2FS_FAULT_INJECTION
-        if (time_to_inject(F2FS_P_SB(bio->bi_io_vec->bv_page), FAULT_IO))
+        if (time_to_inject(F2FS_P_SB(bio->bi_io_vec->bv_page), FAULT_IO)) {
+                f2fs_show_injection_info(FAULT_IO);
                 bio->bi_error = -EIO;
+        }
 #endif
 
         if (f2fs_bio_encrypted(bio)) {
@@ -93,6 +95,17 @@ static void f2fs_write_end_io(struct bio *bio)
                 struct page *page = bvec->bv_page;
                 enum count_type type = WB_DATA_TYPE(page);
 
+                if (IS_DUMMY_WRITTEN_PAGE(page)) {
+                        set_page_private(page, (unsigned long)NULL);
+                        ClearPagePrivate(page);
+                        unlock_page(page);
+                        mempool_free(page, sbi->write_io_dummy);
+
+                        if (unlikely(bio->bi_error))
+                                f2fs_stop_checkpoint(sbi, true);
+                        continue;
+                }
+
                 fscrypt_pullback_bio_page(&page, true);
 
                 if (unlikely(bio->bi_error)) {
@@ -171,10 +184,46 @@ static inline void __submit_bio(struct f2fs_sb_info *sbi,
                                 struct bio *bio, enum page_type type)
 {
         if (!is_read_io(bio_op(bio))) {
+                unsigned int start;
+
                 if (f2fs_sb_mounted_blkzoned(sbi->sb) &&
                         current->plug && (type == DATA || type == NODE))
                         blk_finish_plug(current->plug);
+
+                if (type != DATA && type != NODE)
+                        goto submit_io;
+
+                start = bio->bi_iter.bi_size >> F2FS_BLKSIZE_BITS;
+                start %= F2FS_IO_SIZE(sbi);
+
+                if (start == 0)
+                        goto submit_io;
+
+                /* fill dummy pages */
+                for (; start < F2FS_IO_SIZE(sbi); start++) {
+                        struct page *page =
+                                mempool_alloc(sbi->write_io_dummy,
+                                        GFP_NOIO | __GFP_ZERO | __GFP_NOFAIL);
+                        f2fs_bug_on(sbi, !page);
+
+                        SetPagePrivate(page);
+                        set_page_private(page, (unsigned long)DUMMY_WRITTEN_PAGE);
+                        lock_page(page);
+                        if (bio_add_page(bio, page, PAGE_SIZE, 0) < PAGE_SIZE)
+                                f2fs_bug_on(sbi, 1);
+                }
+                /*
+                 * In the NODE case, we lose next block address chain. So, we
+                 * need to do checkpoint in f2fs_sync_file.
+                 */
+                if (type == NODE)
+                        set_sbi_flag(sbi, SBI_NEED_CP);
         }
+submit_io:
+        if (is_read_io(bio_op(bio)))
+                trace_f2fs_submit_read_bio(sbi->sb, type, bio);
+        else
+                trace_f2fs_submit_write_bio(sbi->sb, type, bio);
         submit_bio(bio);
 }
 
@@ -185,19 +234,19 @@ static void __submit_merged_bio(struct f2fs_bio_info *io)
         if (!io->bio)
                 return;
 
+        bio_set_op_attrs(io->bio, fio->op, fio->op_flags);
+
         if (is_read_io(fio->op))
-                trace_f2fs_submit_read_bio(io->sbi->sb, fio, io->bio);
+                trace_f2fs_prepare_read_bio(io->sbi->sb, fio->type, io->bio);
         else
-                trace_f2fs_submit_write_bio(io->sbi->sb, fio, io->bio);
-
-        bio_set_op_attrs(io->bio, fio->op, fio->op_flags);
+                trace_f2fs_prepare_write_bio(io->sbi->sb, fio->type, io->bio);
 
         __submit_bio(io->sbi, io->bio, fio->type);
         io->bio = NULL;
 }
 
-static bool __has_merged_page(struct f2fs_bio_info *io, struct inode *inode,
-                                                struct page *page, nid_t ino)
+static bool __has_merged_page(struct f2fs_bio_info *io,
+                                struct inode *inode, nid_t ino, pgoff_t idx)
 {
         struct bio_vec *bvec;
         struct page *target;
@@ -206,7 +255,7 @@ static bool __has_merged_page(struct f2fs_bio_info *io, struct inode *inode,
         if (!io->bio)
                 return false;
 
-        if (!inode && !page && !ino)
+        if (!inode && !ino)
                 return true;
 
         bio_for_each_segment_all(bvec, io->bio, i) {
@@ -216,10 +265,11 @@ static bool __has_merged_page(struct f2fs_bio_info *io, struct inode *inode,
                 else
                         target = fscrypt_control_page(bvec->bv_page);
 
+                if (idx != target->index)
+                        continue;
+
                 if (inode && inode == target->mapping->host)
                         return true;
-                if (page && page == target)
-                        return true;
                 if (ino && ino == ino_of_node(target))
                         return true;
         }
@@ -228,22 +278,21 @@ static bool __has_merged_page(struct f2fs_bio_info *io, struct inode *inode,
 }
 
 static bool has_merged_page(struct f2fs_sb_info *sbi, struct inode *inode,
-                                                struct page *page, nid_t ino,
-                                                enum page_type type)
+                                nid_t ino, pgoff_t idx, enum page_type type)
 {
         enum page_type btype = PAGE_TYPE_OF_BIO(type);
         struct f2fs_bio_info *io = &sbi->write_io[btype];
         bool ret;
 
         down_read(&io->io_rwsem);
-        ret = __has_merged_page(io, inode, page, ino);
+        ret = __has_merged_page(io, inode, ino, idx);
         up_read(&io->io_rwsem);
         return ret;
 }
 
 static void __f2fs_submit_merged_bio(struct f2fs_sb_info *sbi,
-                                struct inode *inode, struct page *page,
-                                nid_t ino, enum page_type type, int rw)
+                                struct inode *inode, nid_t ino, pgoff_t idx,
+                                enum page_type type, int rw)
 {
         enum page_type btype = PAGE_TYPE_OF_BIO(type);
         struct f2fs_bio_info *io;
@@ -252,16 +301,16 @@ static void __f2fs_submit_merged_bio(struct f2fs_sb_info *sbi,
 
         down_write(&io->io_rwsem);
 
-        if (!__has_merged_page(io, inode, page, ino))
+        if (!__has_merged_page(io, inode, ino, idx))
                 goto out;
 
         /* change META to META_FLUSH in the checkpoint procedure */
         if (type >= META_FLUSH) {
                 io->fio.type = META_FLUSH;
                 io->fio.op = REQ_OP_WRITE;
-                io->fio.op_flags = REQ_PREFLUSH | REQ_META | REQ_PRIO;
+                io->fio.op_flags = REQ_META | REQ_PRIO;
                 if (!test_opt(sbi, NOBARRIER))
-                        io->fio.op_flags |= REQ_FUA;
+                        io->fio.op_flags |= REQ_PREFLUSH | REQ_FUA;
         }
         __submit_merged_bio(io);
 out:
@@ -271,15 +320,15 @@ out:
 void f2fs_submit_merged_bio(struct f2fs_sb_info *sbi, enum page_type type,
                                                                         int rw)
 {
-        __f2fs_submit_merged_bio(sbi, NULL, NULL, 0, type, rw);
+        __f2fs_submit_merged_bio(sbi, NULL, 0, 0, type, rw);
 }
 
 void f2fs_submit_merged_bio_cond(struct f2fs_sb_info *sbi,
-                                struct inode *inode, struct page *page,
-                                nid_t ino, enum page_type type, int rw)
+                                struct inode *inode, nid_t ino, pgoff_t idx,
+                                enum page_type type, int rw)
 {
-        if (has_merged_page(sbi, inode, page, ino, type))
-                __f2fs_submit_merged_bio(sbi, inode, page, ino, type, rw);
+        if (has_merged_page(sbi, inode, ino, idx, type))
+                __f2fs_submit_merged_bio(sbi, inode, ino, idx, type, rw);
 }
 
 void f2fs_flush_merged_bios(struct f2fs_sb_info *sbi)
@@ -315,13 +364,14 @@ int f2fs_submit_page_bio(struct f2fs_io_info *fio)
         return 0;
 }
 
-void f2fs_submit_page_mbio(struct f2fs_io_info *fio)
+int f2fs_submit_page_mbio(struct f2fs_io_info *fio)
 {
         struct f2fs_sb_info *sbi = fio->sbi;
         enum page_type btype = PAGE_TYPE_OF_BIO(fio->type);
         struct f2fs_bio_info *io;
         bool is_read = is_read_io(fio->op);
         struct page *bio_page;
+        int err = 0;
 
         io = is_read ? &sbi->read_io : &sbi->write_io[btype];
 
@@ -331,6 +381,9 @@ void f2fs_submit_page_mbio(struct f2fs_io_info *fio)
 
         bio_page = fio->encrypted_page ? fio->encrypted_page : fio->page;
 
+        /* set submitted = 1 as a return value */
+        fio->submitted = 1;
+
         if (!is_read)
                 inc_page_count(sbi, WB_DATA_TYPE(bio_page));
 
@@ -342,6 +395,13 @@ void f2fs_submit_page_mbio(struct f2fs_io_info *fio)
                 __submit_merged_bio(io);
 alloc_new:
         if (io->bio == NULL) {
+                if ((fio->type == DATA || fio->type == NODE) &&
+                                fio->new_blkaddr & F2FS_IO_SIZE_MASK(sbi)) {
+                        err = -EAGAIN;
+                        if (!is_read)
+                                dec_page_count(sbi, WB_DATA_TYPE(bio_page));
+                        goto out_fail;
+                }
                 io->bio = __bio_alloc(sbi, fio->new_blkaddr,
                                                 BIO_MAX_PAGES, is_read);
                 io->fio = *fio;
@@ -355,9 +415,10 @@ alloc_new:
 
         io->last_block_in_bio = fio->new_blkaddr;
         f2fs_trace_ios(fio, 0);
-
+out_fail:
         up_write(&io->io_rwsem);
         trace_f2fs_submit_page_mbio(fio->page, fio);
+        return err;
 }
 
 static void __set_data_blkaddr(struct dnode_of_data *dn)
@@ -453,7 +514,7 @@ int f2fs_reserve_block(struct dnode_of_data *dn, pgoff_t index)
 
 int f2fs_get_block(struct dnode_of_data *dn, pgoff_t index)
 {
-        struct extent_info ei;
+        struct extent_info ei  = {0,0,0};
         struct inode *inode = dn->inode;
 
         if (f2fs_lookup_extent_cache(inode, index, &ei)) {
@@ -470,7 +531,7 @@ struct page *get_read_data_page(struct inode *inode, pgoff_t index,
         struct address_space *mapping = inode->i_mapping;
         struct dnode_of_data dn;
         struct page *page;
-        struct extent_info ei;
+        struct extent_info ei = {0,0,0};
         int err;
         struct f2fs_io_info fio = {
                 .sbi = F2FS_I_SB(inode),
@@ -694,6 +755,9 @@ int f2fs_preallocate_blocks(struct kiocb *iocb, struct iov_iter *from)
         struct f2fs_map_blocks map;
         int err = 0;
 
+        if (is_inode_flag_set(inode, FI_NO_PREALLOC))
+                return 0;
+
         map.m_lblk = F2FS_BLK_ALIGN(iocb->ki_pos);
         map.m_len = F2FS_BYTES_TO_BLK(iocb->ki_pos + iov_iter_count(from));
         if (map.m_len > map.m_lblk)
@@ -742,7 +806,7 @@ int f2fs_map_blocks(struct inode *inode, struct f2fs_map_blocks *map,
         int err = 0, ofs = 1;
         unsigned int ofs_in_node, last_ofs_in_node;
         blkcnt_t prealloc;
-        struct extent_info ei;
+        struct extent_info ei = {0,0,0};
         block_t blkaddr;
 
         if (!maxblocks)
@@ -806,7 +870,7 @@ next_block:
                         }
                         if (err)
                                 goto sync_out;
-                        map->m_flags = F2FS_MAP_NEW;
+                        map->m_flags |= F2FS_MAP_NEW;
                         blkaddr = dn.data_blkaddr;
                 } else {
                         if (flag == F2FS_GET_BLOCK_BMAP) {
@@ -906,7 +970,7 @@ static int __get_data_block(struct inode *inode, sector_t iblock,
         if (!err) {
                 map_bh(bh, inode->i_sb, map.m_pblk);
                 bh->b_state = (bh->b_state & ~F2FS_MAP_FLAGS) | map.m_flags;
-                bh->b_size = map.m_len << inode->i_blkbits;
+                bh->b_size = (u64)map.m_len << inode->i_blkbits;
         }
         return err;
 }
@@ -1088,7 +1152,7 @@ static int f2fs_mpage_readpages(struct address_space *mapping,
 
                 prefetchw(&page->flags);
                 if (pages) {
-                        page = list_entry(pages->prev, struct page, lru);
+                        page = list_last_entry(pages, struct page, lru);
                         list_del(&page->lru);
                         if (add_to_page_cache_lru(page, mapping,
                                                   page->index,
@@ -1207,7 +1271,7 @@ static int f2fs_read_data_pages(struct file *file,
                         struct list_head *pages, unsigned nr_pages)
 {
         struct inode *inode = file->f_mapping->host;
-        struct page *page = list_entry(pages->prev, struct page, lru);
+        struct page *page = list_last_entry(pages, struct page, lru);
 
         trace_f2fs_readpages(inode, page, nr_pages);
 
@@ -1288,8 +1352,8 @@ out_writepage:
         return err;
 }
 
-static int f2fs_write_data_page(struct page *page,
-                                        struct writeback_control *wbc)
+static int __write_data_page(struct page *page, bool *submitted,
+                                struct writeback_control *wbc)
 {
         struct inode *inode = page->mapping->host;
         struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
@@ -1307,6 +1371,7 @@ static int f2fs_write_data_page(struct page *page,
                 .op_flags = wbc_to_write_flags(wbc),
                 .page = page,
                 .encrypted_page = NULL,
+                .submitted = false,
         };
 
         trace_f2fs_writepage(page, DATA);
@@ -1352,9 +1417,12 @@ write:
                 goto redirty_out;
 
         err = -EAGAIN;
-        f2fs_lock_op(sbi);
-        if (f2fs_has_inline_data(inode))
+        if (f2fs_has_inline_data(inode)) {
                 err = f2fs_write_inline_data(inode, page);
+                if (!err)
+                        goto out;
+        }
+        f2fs_lock_op(sbi);
         if (err == -EAGAIN)
                 err = do_write_data_page(&fio);
         if (F2FS_I(inode)->last_disk_size < psize)
@@ -1370,15 +1438,22 @@ out:
                 ClearPageUptodate(page);
 
         if (wbc->for_reclaim) {
-                f2fs_submit_merged_bio_cond(sbi, NULL, page, 0, DATA, WRITE);
+                f2fs_submit_merged_bio_cond(sbi, inode, 0, page->index,
+                                                DATA, WRITE);
                 remove_dirty_inode(inode);
+                submitted = NULL;
         }
 
         unlock_page(page);
         f2fs_balance_fs(sbi, need_balance_fs);
 
-        if (unlikely(f2fs_cp_error(sbi)))
+        if (unlikely(f2fs_cp_error(sbi))) {
                 f2fs_submit_merged_bio(sbi, DATA, WRITE);
+                submitted = NULL;
+        }
+
+        if (submitted)
+                *submitted = fio.submitted;
 
         return 0;
 
@@ -1390,6 +1465,12 @@ redirty_out:
         return err;
 }
 
+static int f2fs_write_data_page(struct page *page,
+                                        struct writeback_control *wbc)
+{
+        return __write_data_page(page, NULL, wbc);
+}
+
 /*
  * This function was copied from write_cche_pages from mm/page-writeback.c.
  * The major change is making write step of cold data page separately from
@@ -1406,10 +1487,10 @@ static int f2fs_write_cache_pages(struct address_space *mapping,
         pgoff_t index;
         pgoff_t end;            /* Inclusive */
         pgoff_t done_index;
+        pgoff_t last_idx = ULONG_MAX;
         int cycled;
         int range_whole = 0;
         int tag;
-        int nwritten = 0;
 
         pagevec_init(&pvec, 0);
 
@@ -1446,6 +1527,7 @@ retry:
 
                 for (i = 0; i < nr_pages; i++) {
                         struct page *page = pvec.pages[i];
+                        bool submitted = false;
 
                         if (page->index > end) {
                                 done = 1;
@@ -1479,7 +1561,7 @@ continue_unlock:
                         if (!clear_page_dirty_for_io(page))
                                 goto continue_unlock;
 
-                        ret = mapping->a_ops->writepage(page, wbc);
+                        ret = __write_data_page(page, &submitted, wbc);
                         if (unlikely(ret)) {
                                 /*
                                  * keep nr_to_write, since vfs uses this to
@@ -1493,8 +1575,8 @@ continue_unlock:
                                 done_index = page->index + 1;
                                 done = 1;
                                 break;
-                        } else {
-                                nwritten++;
+                        } else if (submitted) {
+                                last_idx = page->index;
                         }
 
                         if (--wbc->nr_to_write <= 0 &&
@@ -1516,9 +1598,9 @@ continue_unlock:
         if (wbc->range_cyclic || (range_whole && wbc->nr_to_write > 0))
                 mapping->writeback_index = done_index;
 
-        if (nwritten)
+        if (last_idx != ULONG_MAX)
                 f2fs_submit_merged_bio_cond(F2FS_M_SB(mapping), mapping->host,
-                                                        NULL, 0, DATA, WRITE);
+                                                0, last_idx, DATA, WRITE);
 
         return ret;
 }
@@ -1591,14 +1673,15 @@ static int prepare_write_begin(struct f2fs_sb_info *sbi,
         struct dnode_of_data dn;
         struct page *ipage;
         bool locked = false;
-        struct extent_info ei;
+        struct extent_info ei = {0,0,0};
         int err = 0;
 
         /*
          * we already allocated all the blocks, so we don't need to get
          * the block addresses when there is no need to fill the page.
          */
-        if (!f2fs_has_inline_data(inode) && len == PAGE_SIZE)
+        if (!f2fs_has_inline_data(inode) && len == PAGE_SIZE &&
+                        !is_inode_flag_set(inode, FI_NO_PREALLOC))
                 return 0;
 
         if (f2fs_has_inline_data(inode) ||
@@ -1682,7 +1765,12 @@ static int f2fs_write_begin(struct file *file, struct address_space *mapping,
                         goto fail;
         }
 repeat:
-        page = grab_cache_page_write_begin(mapping, index, flags);
+        /*
+         * Do not use grab_cache_page_write_begin() to avoid deadlock due to
+         * wait_for_stable_page. Will wait that below with our IO control.
+         */
+        page = pagecache_get_page(mapping, index,
+                                FGP_LOCK | FGP_WRITE | FGP_CREAT, GFP_NOFS);
         if (!page) {
                 err = -ENOMEM;
                 goto fail;
@@ -1715,6 +1803,11 @@ repeat:
         if (len == PAGE_SIZE || PageUptodate(page))
                 return 0;
 
+        if (!(pos & (PAGE_SIZE - 1)) && (pos + len) >= i_size_read(inode)) {
+                zero_user_segment(page, len, PAGE_SIZE);
+                return 0;
+        }
+
         if (blkaddr == NEW_ADDR) {
                 zero_user_segment(page, 0, PAGE_SIZE);
                 SetPageUptodate(page);
@@ -1768,7 +1861,7 @@ static int f2fs_write_end(struct file *file,
          * let generic_perform_write() try to copy data again through copied=0.
          */
         if (!PageUptodate(page)) {
-                if (unlikely(copied != PAGE_SIZE))
+                if (unlikely(copied != len))
                         copied = 0;
                 else
                         SetPageUptodate(page);
@@ -1917,7 +2010,7 @@ static int f2fs_set_data_page_dirty(struct page *page)
         if (!PageUptodate(page))
                 SetPageUptodate(page);
 
-        if (f2fs_is_atomic_file(inode)) {
+        if (f2fs_is_atomic_file(inode) && !f2fs_is_commit_atomic_write(inode)) {
                 if (!IS_ATOMIC_WRITTEN_PAGE(page)) {
                         register_inmem_page(inode, page);
                         return 1;
diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c
index fbd5184140d0..a77df377e2e8 100644
--- a/fs/f2fs/debug.c
+++ b/fs/f2fs/debug.c
@@ -50,8 +50,16 @@ static void update_general_status(struct f2fs_sb_info *sbi)
         si->ndirty_files = sbi->ndirty_inode[FILE_INODE];
         si->ndirty_all = sbi->ndirty_inode[DIRTY_META];
         si->inmem_pages = get_pages(sbi, F2FS_INMEM_PAGES);
+        si->aw_cnt = atomic_read(&sbi->aw_cnt);
+        si->max_aw_cnt = atomic_read(&sbi->max_aw_cnt);
         si->nr_wb_cp_data = get_pages(sbi, F2FS_WB_CP_DATA);
         si->nr_wb_data = get_pages(sbi, F2FS_WB_DATA);
+        if (SM_I(sbi) && SM_I(sbi)->fcc_info)
+                si->nr_flush =
+                        atomic_read(&SM_I(sbi)->fcc_info->submit_flush);
+        if (SM_I(sbi) && SM_I(sbi)->dcc_info)
+                si->nr_discard =
+                        atomic_read(&SM_I(sbi)->dcc_info->submit_discard);
         si->total_count = (int)sbi->user_block_count / sbi->blocks_per_seg;
         si->rsvd_segs = reserved_segments(sbi);
         si->overp_segs = overprovision_segments(sbi);
@@ -62,6 +70,8 @@ static void update_general_status(struct f2fs_sb_info *sbi)
         si->inline_xattr = atomic_read(&sbi->inline_xattr);
         si->inline_inode = atomic_read(&sbi->inline_inode);
         si->inline_dir = atomic_read(&sbi->inline_dir);
+        si->append = sbi->im[APPEND_INO].ino_num;
+        si->update = sbi->im[UPDATE_INO].ino_num;
         si->orphans = sbi->im[ORPHAN_INO].ino_num;
         si->utilization = utilization(sbi);
 
@@ -183,6 +193,9 @@ static void update_mem_info(struct f2fs_sb_info *sbi)
         /* build nm */
         si->base_mem += sizeof(struct f2fs_nm_info);
         si->base_mem += __bitmap_size(sbi, NAT_BITMAP);
+        si->base_mem += (NM_I(sbi)->nat_bits_blocks << F2FS_BLKSIZE_BITS);
+        si->base_mem += NM_I(sbi)->nat_blocks * NAT_ENTRY_BITMAP_SIZE;
+        si->base_mem += NM_I(sbi)->nat_blocks / 8;
 
 get_cache:
         si->cache_mem = 0;
@@ -192,8 +205,10 @@ get_cache:
                 si->cache_mem += sizeof(struct f2fs_gc_kthread);
 
         /* build merge flush thread */
-        if (SM_I(sbi)->cmd_control_info)
+        if (SM_I(sbi)->fcc_info)
                 si->cache_mem += sizeof(struct flush_cmd_control);
+        if (SM_I(sbi)->dcc_info)
+                si->cache_mem += sizeof(struct discard_cmd_control);
 
         /* free nids */
         si->cache_mem += (NM_I(sbi)->nid_cnt[FREE_NID_LIST] +
@@ -254,8 +269,8 @@ static int stat_show(struct seq_file *s, void *v)
                            si->inline_inode);
                 seq_printf(s, "  - Inline_dentry Inode: %u\n",
                            si->inline_dir);
-                seq_printf(s, "  - Orphan Inode: %u\n",
-                           si->orphans);
+                seq_printf(s, "  - Orphan/Append/Update Inode: %u, %u, %u\n",
+                           si->orphans, si->append, si->update);
                 seq_printf(s, "\nMain area: %d segs, %d secs %d zones\n",
                            si->main_area_segs, si->main_area_sections,
                            si->main_area_zones);
@@ -314,8 +329,11 @@ static int stat_show(struct seq_file *s, void *v)
                 seq_printf(s, "  - Inner Struct Count: tree: %d(%d), node: %d\n",
                                 si->ext_tree, si->zombie_tree, si->ext_node);
                 seq_puts(s, "\nBalancing F2FS Async:\n");
-                seq_printf(s, "  - inmem: %4d, wb_cp_data: %4d, wb_data: %4d\n",
-                           si->inmem_pages, si->nr_wb_cp_data, si->nr_wb_data);
+                seq_printf(s, "  - IO (CP: %4d, Data: %4d, Flush: %4d, Discard: %4d)\n",
+                           si->nr_wb_cp_data, si->nr_wb_data,
+                           si->nr_flush, si->nr_discard);
+                seq_printf(s, "  - inmem: %4d, atomic IO: %4d (Max. %4d)\n",
+                           si->inmem_pages, si->aw_cnt, si->max_aw_cnt);
                 seq_printf(s, "  - nodes: %4d in %4d\n",
                            si->ndirty_node, si->node_pages);
                 seq_printf(s, "  - dents: %4d in dirs:%4d (%4d)\n",
@@ -414,6 +432,9 @@ int f2fs_build_stats(struct f2fs_sb_info *sbi)
         atomic_set(&sbi->inline_dir, 0);
         atomic_set(&sbi->inplace_count, 0);
 
+        atomic_set(&sbi->aw_cnt, 0);
+        atomic_set(&sbi->max_aw_cnt, 0);
+
         mutex_lock(&f2fs_stat_mutex);
         list_add_tail(&si->stat_list, &f2fs_stat_list);
         mutex_unlock(&f2fs_stat_mutex);
diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
index 18607fc5240d..4650c9b85de7 100644
--- a/fs/f2fs/dir.c
+++ b/fs/f2fs/dir.c
@@ -207,9 +207,13 @@ static struct f2fs_dir_entry *find_in_level(struct inode *dir,
                 f2fs_put_page(dentry_page, 0);
         }
 
-        if (!de && room && F2FS_I(dir)->chash != namehash) {
-                F2FS_I(dir)->chash = namehash;
-                F2FS_I(dir)->clevel = level;
+        /* This is to increase the speed of f2fs_create */
+        if (!de && room) {
+                F2FS_I(dir)->task = current;
+                if (F2FS_I(dir)->chash != namehash) {
+                        F2FS_I(dir)->chash = namehash;
+                        F2FS_I(dir)->clevel = level;
+                }
         }
 
         return de;
@@ -548,8 +552,10 @@ int f2fs_add_regular_entry(struct inode *dir, const struct qstr *new_name,
 
 start:
 #ifdef CONFIG_F2FS_FAULT_INJECTION
-        if (time_to_inject(F2FS_I_SB(dir), FAULT_DIR_DEPTH))
+        if (time_to_inject(F2FS_I_SB(dir), FAULT_DIR_DEPTH)) {
+                f2fs_show_injection_info(FAULT_DIR_DEPTH);
                 return -ENOSPC;
+        }
 #endif
         if (unlikely(current_depth == MAX_DIR_HASH_DEPTH))
                 return -ENOSPC;
@@ -646,14 +652,34 @@ int __f2fs_add_link(struct inode *dir, const struct qstr *name,
                                 struct inode *inode, nid_t ino, umode_t mode)
 {
         struct fscrypt_name fname;
+        struct page *page = NULL;
+        struct f2fs_dir_entry *de = NULL;
         int err;
 
         err = fscrypt_setup_filename(dir, name, 0, &fname);
         if (err)
                 return err;
 
-        err = __f2fs_do_add_link(dir, &fname, inode, ino, mode);
-
+        /*
+         * An immature stakable filesystem shows a race condition between lookup
+         * and create. If we have same task when doing lookup and create, it's
+         * definitely fine as expected by VFS normally. Otherwise, let's just
+         * verify on-disk dentry one more time, which guarantees filesystem
+         * consistency more.
+         */
+        if (current != F2FS_I(dir)->task) {
+                de = __f2fs_find_entry(dir, &fname, &page);
+                F2FS_I(dir)->task = NULL;
+        }
+        if (de) {
+                f2fs_dentry_kunmap(dir, page);
+                f2fs_put_page(page, 0);
+                err = -EEXIST;
+        } else if (IS_ERR(page)) {
+                err = PTR_ERR(page);
+        } else {
+                err = __f2fs_do_add_link(dir, &fname, inode, ino, mode);
+        }
         fscrypt_free_filename(&fname);
         return err;
 }
diff --git a/fs/f2fs/extent_cache.c b/fs/f2fs/extent_cache.c
index 4db44da7ef69..c6934f014e0f 100644
--- a/fs/f2fs/extent_cache.c
+++ b/fs/f2fs/extent_cache.c
@@ -77,7 +77,7 @@ static struct extent_tree *__grab_extent_tree(struct inode *inode)
         struct extent_tree *et;
         nid_t ino = inode->i_ino;
 
-        down_write(&sbi->extent_tree_lock);
+        mutex_lock(&sbi->extent_tree_lock);
         et = radix_tree_lookup(&sbi->extent_tree_root, ino);
         if (!et) {
                 et = f2fs_kmem_cache_alloc(extent_tree_slab, GFP_NOFS);
@@ -94,7 +94,7 @@ static struct extent_tree *__grab_extent_tree(struct inode *inode)
                 atomic_dec(&sbi->total_zombie_tree);
                 list_del_init(&et->list);
         }
-        up_write(&sbi->extent_tree_lock);
+        mutex_unlock(&sbi->extent_tree_lock);
 
         /* never died until evict_inode */
         F2FS_I(inode)->extent_tree = et;
@@ -311,28 +311,24 @@ static struct extent_node *__lookup_extent_tree_ret(struct extent_tree *et,
         tmp_node = parent;
         if (parent && fofs > en->ei.fofs)
                 tmp_node = rb_next(parent);
-        *next_ex = tmp_node ?
-                rb_entry(tmp_node, struct extent_node, rb_node) : NULL;
+        *next_ex = rb_entry_safe(tmp_node, struct extent_node, rb_node);
 
         tmp_node = parent;
         if (parent && fofs < en->ei.fofs)
                 tmp_node = rb_prev(parent);
-        *prev_ex = tmp_node ?
-                rb_entry(tmp_node, struct extent_node, rb_node) : NULL;
+        *prev_ex = rb_entry_safe(tmp_node, struct extent_node, rb_node);
         return NULL;
 
 lookup_neighbors:
         if (fofs == en->ei.fofs) {
                 /* lookup prev node for merging backward later */
                 tmp_node = rb_prev(&en->rb_node);
-                *prev_ex = tmp_node ?
-                        rb_entry(tmp_node, struct extent_node, rb_node) : NULL;
+                *prev_ex = rb_entry_safe(tmp_node, struct extent_node, rb_node);
         }
         if (fofs == en->ei.fofs + en->ei.len - 1) {
                 /* lookup next node for merging frontward later */
                 tmp_node = rb_next(&en->rb_node);
-                *next_ex = tmp_node ?
-                        rb_entry(tmp_node, struct extent_node, rb_node) : NULL;
+                *next_ex = rb_entry_safe(tmp_node, struct extent_node, rb_node);
         }
         return en;
 }
@@ -352,11 +348,12 @@ static struct extent_node *__try_merge_extent_node(struct inode *inode,
         }
 
         if (next_ex && __is_front_mergeable(ei, &next_ex->ei)) {
-                if (en)
-                        __release_extent_node(sbi, et, prev_ex);
                 next_ex->ei.fofs = ei->fofs;
                 next_ex->ei.blk = ei->blk;
                 next_ex->ei.len += ei->len;
+                if (en)
+                        __release_extent_node(sbi, et, prev_ex);
+
                 en = next_ex;
         }
 
@@ -416,7 +413,7 @@ do_insert:
         return en;
 }
 
-static unsigned int f2fs_update_extent_tree_range(struct inode *inode,
+static void f2fs_update_extent_tree_range(struct inode *inode,
                                 pgoff_t fofs, block_t blkaddr, unsigned int len)
 {
         struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
@@ -429,7 +426,7 @@ static unsigned int f2fs_update_extent_tree_range(struct inode *inode,
         unsigned int pos = (unsigned int)fofs;
 
         if (!et)
-                return false;
+                return;
 
         trace_f2fs_update_extent_tree_range(inode, fofs, blkaddr, len);
 
@@ -437,7 +434,7 @@ static unsigned int f2fs_update_extent_tree_range(struct inode *inode,
 
         if (is_inode_flag_set(inode, FI_NO_EXTENT)) {
                 write_unlock(&et->lock);
-                return false;
+                return;
         }
 
         prev = et->largest;
@@ -492,9 +489,8 @@ static unsigned int f2fs_update_extent_tree_range(struct inode *inode,
                 if (!next_en) {
                         struct rb_node *node = rb_next(&en->rb_node);
 
-                        next_en = node ?
-                                rb_entry(node, struct extent_node, rb_node)
-                                : NULL;
+                        next_en = rb_entry_safe(node, struct extent_node,
+                                                rb_node);
                 }
 
                 if (parts)
@@ -535,8 +531,6 @@ static unsigned int f2fs_update_extent_tree_range(struct inode *inode,
                 __free_extent_tree(sbi, et);
 
         write_unlock(&et->lock);
-
-        return !__is_extent_same(&prev, &et->largest);
 }
 
 unsigned int f2fs_shrink_extent_tree(struct f2fs_sb_info *sbi, int nr_shrink)
@@ -552,7 +546,7 @@ unsigned int f2fs_shrink_extent_tree(struct f2fs_sb_info *sbi, int nr_shrink)
         if (!atomic_read(&sbi->total_zombie_tree))
                 goto free_node;
 
-        if (!down_write_trylock(&sbi->extent_tree_lock))
+        if (!mutex_trylock(&sbi->extent_tree_lock))
                 goto out;
 
         /* 1. remove unreferenced extent tree */
@@ -574,11 +568,11 @@ unsigned int f2fs_shrink_extent_tree(struct f2fs_sb_info *sbi, int nr_shrink)
                         goto unlock_out;
                 cond_resched();
         }
-        up_write(&sbi->extent_tree_lock);
+        mutex_unlock(&sbi->extent_tree_lock);
 
 free_node:
         /* 2. remove LRU extent entries */
-        if (!down_write_trylock(&sbi->extent_tree_lock))
+        if (!mutex_trylock(&sbi->extent_tree_lock))
                 goto out;
 
         remained = nr_shrink - (node_cnt + tree_cnt);
@@ -608,7 +602,7 @@ free_node:
         spin_unlock(&sbi->extent_lock);
 
 unlock_out:
-        up_write(&sbi->extent_tree_lock);
+        mutex_unlock(&sbi->extent_tree_lock);
 out:
         trace_f2fs_shrink_extent_tree(sbi, node_cnt, tree_cnt);
 
@@ -655,10 +649,10 @@ void f2fs_destroy_extent_tree(struct inode *inode)
 
         if (inode->i_nlink && !is_bad_inode(inode) &&
                                         atomic_read(&et->node_cnt)) {
-                down_write(&sbi->extent_tree_lock);
+                mutex_lock(&sbi->extent_tree_lock);
                 list_add_tail(&et->list, &sbi->zombie_list);
                 atomic_inc(&sbi->total_zombie_tree);
-                up_write(&sbi->extent_tree_lock);
+                mutex_unlock(&sbi->extent_tree_lock);
                 return;
         }
 
@@ -666,12 +660,12 @@ void f2fs_destroy_extent_tree(struct inode *inode)
         node_cnt = f2fs_destroy_extent_node(inode);
 
         /* delete extent tree entry in radix tree */
-        down_write(&sbi->extent_tree_lock);
+        mutex_lock(&sbi->extent_tree_lock);
         f2fs_bug_on(sbi, atomic_read(&et->node_cnt));
         radix_tree_delete(&sbi->extent_tree_root, inode->i_ino);
         kmem_cache_free(extent_tree_slab, et);
         atomic_dec(&sbi->total_ext_tree);
-        up_write(&sbi->extent_tree_lock);
+        mutex_unlock(&sbi->extent_tree_lock);
 
         F2FS_I(inode)->extent_tree = NULL;
 
@@ -718,7 +712,7 @@ void f2fs_update_extent_cache_range(struct dnode_of_data *dn,
 void init_extent_cache_info(struct f2fs_sb_info *sbi)
 {
         INIT_RADIX_TREE(&sbi->extent_tree_root, GFP_NOIO);
-        init_rwsem(&sbi->extent_tree_lock);
+        mutex_init(&sbi->extent_tree_lock);
         INIT_LIST_HEAD(&sbi->extent_list);
         spin_lock_init(&sbi->extent_lock);
         atomic_set(&sbi->total_ext_tree, 0);
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 069fc7277d8d..d1483136fed6 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -112,9 +112,9 @@ struct f2fs_mount_info {
 #define F2FS_HAS_FEATURE(sb, mask)                                      \
         ((F2FS_SB(sb)->raw_super->feature & cpu_to_le32(mask)) != 0)
 #define F2FS_SET_FEATURE(sb, mask)                                      \
-        F2FS_SB(sb)->raw_super->feature |= cpu_to_le32(mask)
+        (F2FS_SB(sb)->raw_super->feature |= cpu_to_le32(mask))
 #define F2FS_CLEAR_FEATURE(sb, mask)                                    \
-        F2FS_SB(sb)->raw_super->feature &= ~cpu_to_le32(mask)
+        (F2FS_SB(sb)->raw_super->feature &= ~cpu_to_le32(mask))
 
 /*
  * For checkpoint manager
@@ -132,11 +132,14 @@ enum {
         CP_DISCARD,
 };
 
-#define DEF_BATCHED_TRIM_SECTIONS       2
+#define DEF_BATCHED_TRIM_SECTIONS       2048
 #define BATCHED_TRIM_SEGMENTS(sbi)      \
                 (SM_I(sbi)->trim_sections * (sbi)->segs_per_sec)
 #define BATCHED_TRIM_BLOCKS(sbi)        \
                 (BATCHED_TRIM_SEGMENTS(sbi) << (sbi)->log_blocks_per_seg)
+#define MAX_DISCARD_BLOCKS(sbi)                                         \
+                ((1 << (sbi)->log_blocks_per_seg) * (sbi)->segs_per_sec)
+#define DISCARD_ISSUE_RATE      8
 #define DEF_CP_INTERVAL                 60      /* 60 secs */
 #define DEF_IDLE_INTERVAL               5       /* 5 secs */
 
@@ -185,11 +188,30 @@ struct discard_entry {
         int len;                /* # of consecutive blocks of the discard */
 };
 
-struct bio_entry {
-        struct list_head list;
-        struct bio *bio;
-        struct completion event;
-        int error;
+enum {
+        D_PREP,
+        D_SUBMIT,
+        D_DONE,
+};
+
+struct discard_cmd {
+        struct list_head list;          /* command list */
+        struct completion wait;         /* compleation */
+        block_t lstart;                 /* logical start address */
+        block_t len;                    /* length */
+        struct bio *bio;                /* bio */
+        int state;                      /* state */
+};
+
+struct discard_cmd_control {
+        struct task_struct *f2fs_issue_discard; /* discard thread */
+        struct list_head discard_entry_list;    /* 4KB discard entry list */
+        int nr_discards;                        /* # of discards in the list */
+        struct list_head discard_cmd_list;      /* discard cmd list */
+        wait_queue_head_t discard_wait_queue;   /* waiting queue for wake-up */
+        struct mutex cmd_lock;
+        int max_discards;                       /* max. discards to be issued */
+        atomic_t submit_discard;                /* # of issued discard */
 };
 
 /* for the list of fsync inodes, used only during recovery */
@@ -214,6 +236,7 @@ struct fsync_inode_entry {
 static inline int update_nats_in_cursum(struct f2fs_journal *journal, int i)
 {
         int before = nats_in_cursum(journal);
+
         journal->n_nats = cpu_to_le16(before + i);
         return before;
 }
@@ -221,6 +244,7 @@ static inline int update_nats_in_cursum(struct f2fs_journal *journal, int i)
 static inline int update_sits_in_cursum(struct f2fs_journal *journal, int i)
 {
         int before = sits_in_cursum(journal);
+
         journal->n_sits = cpu_to_le16(before + i);
         return before;
 }
@@ -306,12 +330,14 @@ static inline void make_dentry_ptr(struct inode *inode,
 
         if (type == 1) {
                 struct f2fs_dentry_block *t = (struct f2fs_dentry_block *)src;
+
                 d->max = NR_DENTRY_IN_BLOCK;
                 d->bitmap = &t->dentry_bitmap;
                 d->dentry = t->dentry;
                 d->filename = t->filename;
         } else {
                 struct f2fs_inline_dentry *t = (struct f2fs_inline_dentry *)src;
+
                 d->max = NR_INLINE_DENTRY;
                 d->bitmap = &t->dentry_bitmap;
                 d->dentry = t->dentry;
@@ -438,8 +464,8 @@ struct f2fs_inode_info {
         atomic_t dirty_pages;           /* # of dirty pages */
         f2fs_hash_t chash;              /* hash value of given file name */
         unsigned int clevel;            /* maximum level of given file name */
+        struct task_struct *task;       /* lookup and create consistency */
         nid_t i_xattr_nid;              /* node id that contains xattrs */
-        unsigned long long xattr_ver;   /* cp version of xattr modification */
         loff_t  last_disk_size;         /* lastly written file size */
 
         struct list_head dirty_list;    /* dirty list for dirs and files */
@@ -474,13 +500,6 @@ static inline void set_extent_info(struct extent_info *ei, unsigned int fofs,
         ei->len = len;
 }
 
-static inline bool __is_extent_same(struct extent_info *ei1,
-                                                struct extent_info *ei2)
-{
-        return (ei1->fofs == ei2->fofs && ei1->blk == ei2->blk &&
-                                                ei1->len == ei2->len);
-}
-
 static inline bool __is_extent_mergeable(struct extent_info *back,
                                                 struct extent_info *front)
 {
@@ -500,7 +519,7 @@ static inline bool __is_front_mergeable(struct extent_info *cur,
         return __is_extent_mergeable(cur, front);
 }
 
-extern void f2fs_mark_inode_dirty_sync(struct inode *, bool);
+extern void f2fs_mark_inode_dirty_sync(struct inode *inode, bool sync);
 static inline void __try_update_largest_extent(struct inode *inode,
                         struct extent_tree *et, struct extent_node *en)
 {
@@ -532,6 +551,7 @@ struct f2fs_nm_info {
         struct list_head nat_entries;   /* cached nat entry list (clean) */
         unsigned int nat_cnt;           /* the # of cached nat entries */
         unsigned int dirty_nat_cnt;     /* total num of nat entries in set */
+        unsigned int nat_blocks;        /* # of nat blocks */
 
         /* free node ids management */
         struct radix_tree_root free_nid_root;/* root of the free_nid cache */
@@ -539,9 +559,19 @@ struct f2fs_nm_info {
         unsigned int nid_cnt[MAX_NID_LIST];     /* the number of free node id */
         spinlock_t nid_list_lock;       /* protect nid lists ops */
         struct mutex build_lock;        /* lock for build free nids */
+        unsigned char (*free_nid_bitmap)[NAT_ENTRY_BITMAP_SIZE];
+        unsigned char *nat_block_bitmap;
 
         /* for checkpoint */
         char *nat_bitmap;               /* NAT bitmap pointer */
+
+        unsigned int nat_bits_blocks;   /* # of nat bits blocks */
+        unsigned char *nat_bits;        /* NAT bits blocks */
+        unsigned char *full_nat_bits;   /* full NAT pages */
+        unsigned char *empty_nat_bits;  /* empty NAT pages */
+#ifdef CONFIG_F2FS_CHECK_FS
+        char *nat_bitmap_mir;           /* NAT bitmap mirror */
+#endif
         int bitmap_size;                /* bitmap size */
 };
 
@@ -632,12 +662,6 @@ struct f2fs_sm_info {
         /* a threshold to reclaim prefree segments */
         unsigned int rec_prefree_segments;
 
-        /* for small discard management */
-        struct list_head discard_list;          /* 4KB discard list */
-        struct list_head wait_list;             /* linked with issued discard bio */
-        int nr_discards;                        /* # of discards in the list */
-        int max_discards;                       /* max. discards to be issued */
-
         /* for batched trimming */
         unsigned int trim_sections;             /* # of sections to trim */
 
@@ -648,8 +672,10 @@ struct f2fs_sm_info {
         unsigned int min_fsync_blocks;  /* threshold for fsync */
 
         /* for flush command control */
-        struct flush_cmd_control *cmd_control_info;
+        struct flush_cmd_control *fcc_info;
 
+        /* for discard command control */
+        struct discard_cmd_control *dcc_info;
 };
 
 /*
@@ -708,6 +734,7 @@ struct f2fs_io_info {
         block_t old_blkaddr;    /* old block address before Cow */
         struct page *page;      /* page to be written */
         struct page *encrypted_page;    /* encrypted page */
+        bool submitted;         /* indicate IO submission */
 };
 
 #define is_read_io(rw) (rw == READ)
@@ -787,6 +814,8 @@ struct f2fs_sb_info {
         struct f2fs_bio_info read_io;                   /* for read bios */
         struct f2fs_bio_info write_io[NR_PAGE_TYPE];    /* for write bios */
         struct mutex wio_mutex[NODE + 1];       /* bio ordering for NODE/DATA */
+        int write_io_size_bits;                 /* Write IO size bits */
+        mempool_t *write_io_dummy;              /* Dummy pages */
 
         /* for checkpoint */
         struct f2fs_checkpoint *ckpt;           /* raw checkpoint pointer */
@@ -811,7 +840,7 @@ struct f2fs_sb_info {
 
         /* for extent tree cache */
         struct radix_tree_root extent_tree_root;/* cache extent cache entries */
-        struct rw_semaphore extent_tree_lock;   /* locking extent radix tree */
+        struct mutex extent_tree_lock;  /* locking extent radix tree */
         struct list_head extent_list;           /* lru list for shrinker */
         spinlock_t extent_lock;                 /* locking extent lru list */
         atomic_t total_ext_tree;                /* extent tree count */
@@ -858,6 +887,9 @@ struct f2fs_sb_info {
         struct f2fs_gc_kthread  *gc_thread;     /* GC thread */
         unsigned int cur_victim_sec;            /* current victim section num */
 
+        /* threshold for converting bg victims for fg */
+        u64 fggc_threshold;
+
         /* maximum # of trials to find a victim segment for SSR and GC */
         unsigned int max_victim_search;
 
@@ -877,6 +909,8 @@ struct f2fs_sb_info {
         atomic_t inline_xattr;                  /* # of inline_xattr inodes */
         atomic_t inline_inode;                  /* # of inline_data inodes */
         atomic_t inline_dir;                    /* # of inline_dentry inodes */
+        atomic_t aw_cnt;                        /* # of atomic writes */
+        atomic_t max_aw_cnt;                    /* max # of atomic writes */
         int bg_gc;                              /* background gc calls */
         unsigned int ndirty_inode[NR_INODE_TYPE];       /* # of dirty inodes */
 #endif
@@ -908,6 +942,10 @@ struct f2fs_sb_info {
 };
 
 #ifdef CONFIG_F2FS_FAULT_INJECTION
+#define f2fs_show_injection_info(type)                          \
+        printk("%sF2FS-fs : inject %s in %s of %pF\n",          \
+                KERN_INFO, fault_name[type],                    \
+                __func__, __builtin_return_address(0))
 static inline bool time_to_inject(struct f2fs_sb_info *sbi, int type)
 {
         struct f2fs_fault_info *ffi = &sbi->fault_info;
@@ -921,10 +959,6 @@ static inline bool time_to_inject(struct f2fs_sb_info *sbi, int type)
         atomic_inc(&ffi->inject_ops);
         if (atomic_read(&ffi->inject_ops) >= ffi->inject_rate) {
                 atomic_set(&ffi->inject_ops, 0);
-                printk("%sF2FS-fs : inject %s in %pF\n",
-                                KERN_INFO,
-                                fault_name[type],
-                                __builtin_return_address(0));
                 return true;
         }
         return false;
@@ -1089,6 +1123,12 @@ static inline unsigned long long cur_cp_version(struct f2fs_checkpoint *cp)
         return le64_to_cpu(cp->checkpoint_ver);
 }
 
+static inline __u64 cur_cp_crc(struct f2fs_checkpoint *cp)
+{
+        size_t crc_offset = le32_to_cpu(cp->checksum_offset);
+        return le32_to_cpu(*((__le32 *)((unsigned char *)cp + crc_offset)));
+}
+
 static inline bool __is_set_ckpt_flags(struct f2fs_checkpoint *cp, unsigned int f)
 {
         unsigned int ckpt_flags = le32_to_cpu(cp->ckpt_flags);
@@ -1133,6 +1173,27 @@ static inline void clear_ckpt_flags(struct f2fs_sb_info *sbi, unsigned int f)
         spin_unlock(&sbi->cp_lock);
 }
 
+static inline void disable_nat_bits(struct f2fs_sb_info *sbi, bool lock)
+{
+        set_sbi_flag(sbi, SBI_NEED_FSCK);
+
+        if (lock)
+                spin_lock(&sbi->cp_lock);
+        __clear_ckpt_flags(F2FS_CKPT(sbi), CP_NAT_BITS_FLAG);
+        kfree(NM_I(sbi)->nat_bits);
+        NM_I(sbi)->nat_bits = NULL;
+        if (lock)
+                spin_unlock(&sbi->cp_lock);
+}
+
+static inline bool enabled_nat_bits(struct f2fs_sb_info *sbi,
+                                        struct cp_control *cpc)
+{
+        bool set = is_set_ckpt_flags(sbi, CP_NAT_BITS_FLAG);
+
+        return (cpc) ? (cpc->reason == CP_UMOUNT) && set : set;
+}
+
 static inline void f2fs_lock_op(struct f2fs_sb_info *sbi)
 {
         down_read(&sbi->cp_rwsem);
@@ -1212,8 +1273,10 @@ static inline bool inc_valid_block_count(struct f2fs_sb_info *sbi,
         blkcnt_t diff;
 
 #ifdef CONFIG_F2FS_FAULT_INJECTION
-        if (time_to_inject(sbi, FAULT_BLOCK))
+        if (time_to_inject(sbi, FAULT_BLOCK)) {
+                f2fs_show_injection_info(FAULT_BLOCK);
                 return false;
+        }
 #endif
         /*
          * let's increase this in prior to actual block count change in order
@@ -1449,11 +1512,14 @@ static inline struct page *f2fs_grab_cache_page(struct address_space *mapping,
 {
 #ifdef CONFIG_F2FS_FAULT_INJECTION
         struct page *page = find_lock_page(mapping, index);
+
         if (page)
                 return page;
 
-        if (time_to_inject(F2FS_M_SB(mapping), FAULT_PAGE_ALLOC))
+        if (time_to_inject(F2FS_M_SB(mapping), FAULT_PAGE_ALLOC)) {
+                f2fs_show_injection_info(FAULT_PAGE_ALLOC);
                 return NULL;
+        }
 #endif
         if (!for_write)
                 return grab_cache_page(mapping, index);
@@ -1532,6 +1598,7 @@ static inline void f2fs_radix_tree_insert(struct radix_tree_root *root,
 static inline bool IS_INODE(struct page *page)
 {
         struct f2fs_node *p = F2FS_NODE(page);
+
         return RAW_IS_INODE(p);
 }
 
@@ -1545,6 +1612,7 @@ static inline block_t datablock_addr(struct page *node_page,
 {
         struct f2fs_node *raw_node;
         __le32 *addr_array;
+
         raw_node = F2FS_NODE(node_page);
         addr_array = blkaddr_in_node(raw_node);
         return le32_to_cpu(addr_array[offset]);
@@ -1628,6 +1696,7 @@ enum {
         FI_UPDATE_WRITE,        /* inode has in-place-update data */
         FI_NEED_IPU,            /* used for ipu per file */
         FI_ATOMIC_FILE,         /* indicate atomic file */
+        FI_ATOMIC_COMMIT,       /* indicate the state of atomical committing */
         FI_VOLATILE_FILE,       /* indicate volatile file */
         FI_FIRST_BLOCK_WRITTEN, /* indicate #0 data block was written */
         FI_DROP_CACHE,          /* drop dirty page cache */
@@ -1635,6 +1704,7 @@ enum {
         FI_INLINE_DOTS,         /* indicate inline dot dentries */
         FI_DO_DEFRAG,           /* indicate defragment is running */
         FI_DIRTY_FILE,          /* indicate regular/symlink has dirty pages */
+        FI_NO_PREALLOC,         /* indicate skipped preallocated blocks */
 };
 
 static inline void __mark_inode_dirty_flag(struct inode *inode,
@@ -1779,6 +1849,7 @@ static inline unsigned int addrs_per_inode(struct inode *inode)
 static inline void *inline_xattr_addr(struct page *page)
 {
         struct f2fs_inode *ri = F2FS_INODE(page);
+
         return (void *)&(ri->i_addr[DEF_ADDRS_PER_INODE -
                                         F2FS_INLINE_XATTR_ADDRS]);
 }
@@ -1817,6 +1888,11 @@ static inline bool f2fs_is_atomic_file(struct inode *inode)
         return is_inode_flag_set(inode, FI_ATOMIC_FILE);
 }
 
+static inline bool f2fs_is_commit_atomic_write(struct inode *inode)
+{
+        return is_inode_flag_set(inode, FI_ATOMIC_COMMIT);
+}
+
 static inline bool f2fs_is_volatile_file(struct inode *inode)
 {
         return is_inode_flag_set(inode, FI_VOLATILE_FILE);
@@ -1835,6 +1911,7 @@ static inline bool f2fs_is_drop_cache(struct inode *inode)
 static inline void *inline_data_addr(struct page *page)
 {
         struct f2fs_inode *ri = F2FS_INODE(page);
+
         return (void *)&(ri->i_addr[1]);
 }
 
@@ -1918,8 +1995,10 @@ static inline void *f2fs_kmalloc(struct f2fs_sb_info *sbi,
                                         size_t size, gfp_t flags)
 {
 #ifdef CONFIG_F2FS_FAULT_INJECTION
-        if (time_to_inject(sbi, FAULT_KMALLOC))
+        if (time_to_inject(sbi, FAULT_KMALLOC)) {
+                f2fs_show_injection_info(FAULT_KMALLOC);
                 return NULL;
+        }
 #endif
         return kmalloc(size, flags);
 }
@@ -1957,29 +2036,30 @@ static inline void *f2fs_kvzalloc(size_t size, gfp_t flags)
 /*
  * file.c
  */
-int f2fs_sync_file(struct file *, loff_t, loff_t, int);
-void truncate_data_blocks(struct dnode_of_data *);
-int truncate_blocks(struct inode *, u64, bool);
-int f2fs_truncate(struct inode *);
-int f2fs_getattr(struct vfsmount *, struct dentry *, struct kstat *);
-int f2fs_setattr(struct dentry *, struct iattr *);
-int truncate_hole(struct inode *, pgoff_t, pgoff_t);
-int truncate_data_blocks_range(struct dnode_of_data *, int);
-long f2fs_ioctl(struct file *, unsigned int, unsigned long);
-long f2fs_compat_ioctl(struct file *, unsigned int, unsigned long);
+int f2fs_sync_file(struct file *file, loff_t start, loff_t end, int datasync);
+void truncate_data_blocks(struct dnode_of_data *dn);
+int truncate_blocks(struct inode *inode, u64 from, bool lock);
+int f2fs_truncate(struct inode *inode);
+int f2fs_getattr(struct vfsmount *mnt, struct dentry *dentry,
+                        struct kstat *stat);
+int f2fs_setattr(struct dentry *dentry, struct iattr *attr);
+int truncate_hole(struct inode *inode, pgoff_t pg_start, pgoff_t pg_end);
+int truncate_data_blocks_range(struct dnode_of_data *dn, int count);
+long f2fs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg);
+long f2fs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
 
 /*
  * inode.c
  */
-void f2fs_set_inode_flags(struct inode *);
-struct inode *f2fs_iget(struct super_block *, unsigned long);
-struct inode *f2fs_iget_retry(struct super_block *, unsigned long);
-int try_to_free_nats(struct f2fs_sb_info *, int);
-int update_inode(struct inode *, struct page *);
-int update_inode_page(struct inode *);
-int f2fs_write_inode(struct inode *, struct writeback_control *);
-void f2fs_evict_inode(struct inode *);
-void handle_failed_inode(struct inode *);
+void f2fs_set_inode_flags(struct inode *inode);
+struct inode *f2fs_iget(struct super_block *sb, unsigned long ino);
+struct inode *f2fs_iget_retry(struct super_block *sb, unsigned long ino);
+int try_to_free_nats(struct f2fs_sb_info *sbi, int nr_shrink);
+int update_inode(struct inode *inode, struct page *node_page);
+int update_inode_page(struct inode *inode);
+int f2fs_write_inode(struct inode *inode, struct writeback_control *wbc);
+void f2fs_evict_inode(struct inode *inode);
+void handle_failed_inode(struct inode *inode);
 
 /*
  * namei.c
@@ -1989,40 +2069,47 @@ struct dentry *f2fs_get_parent(struct dentry *child);
 /*
  * dir.c
  */
-void set_de_type(struct f2fs_dir_entry *, umode_t);
-unsigned char get_de_type(struct f2fs_dir_entry *);
-struct f2fs_dir_entry *find_target_dentry(struct fscrypt_name *,
-                        f2fs_hash_t, int *, struct f2fs_dentry_ptr *);
-int f2fs_fill_dentries(struct dir_context *, struct f2fs_dentry_ptr *,
-                        unsigned int, struct fscrypt_str *);
-void do_make_empty_dir(struct inode *, struct inode *,
-                        struct f2fs_dentry_ptr *);
-struct page *init_inode_metadata(struct inode *, struct inode *,
-                const struct qstr *, const struct qstr *, struct page *);
-void update_parent_metadata(struct inode *, struct inode *, unsigned int);
-int room_for_filename(const void *, int, int);
-void f2fs_drop_nlink(struct inode *, struct inode *);
-struct f2fs_dir_entry *__f2fs_find_entry(struct inode *, struct fscrypt_name *,
-                                                        struct page **);
-struct f2fs_dir_entry *f2fs_find_entry(struct inode *, const struct qstr *,
-                                                        struct page **);
-struct f2fs_dir_entry *f2fs_parent_dir(struct inode *, struct page **);
-ino_t f2fs_inode_by_name(struct inode *, const struct qstr *, struct page **);
-void f2fs_set_link(struct inode *, struct f2fs_dir_entry *,
-                                struct page *, struct inode *);
-int update_dent_inode(struct inode *, struct inode *, const struct qstr *);
-void f2fs_update_dentry(nid_t ino, umode_t mode, struct f2fs_dentry_ptr *,
-                        const struct qstr *, f2fs_hash_t , unsigned int);
-int f2fs_add_regular_entry(struct inode *, const struct qstr *,
-                        const struct qstr *, struct inode *, nid_t, umode_t);
-int __f2fs_do_add_link(struct inode *, struct fscrypt_name*, struct inode *,
-                        nid_t, umode_t);
-int __f2fs_add_link(struct inode *, const struct qstr *, struct inode *, nid_t,
-                        umode_t);
-void f2fs_delete_entry(struct f2fs_dir_entry *, struct page *, struct inode *,
-                                                        struct inode *);
-int f2fs_do_tmpfile(struct inode *, struct inode *);
-bool f2fs_empty_dir(struct inode *);
+void set_de_type(struct f2fs_dir_entry *de, umode_t mode);
+unsigned char get_de_type(struct f2fs_dir_entry *de);
+struct f2fs_dir_entry *find_target_dentry(struct fscrypt_name *fname,
+                        f2fs_hash_t namehash, int *max_slots,
+                        struct f2fs_dentry_ptr *d);
+int f2fs_fill_dentries(struct dir_context *ctx, struct f2fs_dentry_ptr *d,
+                        unsigned int start_pos, struct fscrypt_str *fstr);
+void do_make_empty_dir(struct inode *inode, struct inode *parent,
+                        struct f2fs_dentry_ptr *d);
+struct page *init_inode_metadata(struct inode *inode, struct inode *dir,
+                        const struct qstr *new_name,
+                        const struct qstr *orig_name, struct page *dpage);
+void update_parent_metadata(struct inode *dir, struct inode *inode,
+                        unsigned int current_depth);
+int room_for_filename(const void *bitmap, int slots, int max_slots);
+void f2fs_drop_nlink(struct inode *dir, struct inode *inode);
+struct f2fs_dir_entry *__f2fs_find_entry(struct inode *dir,
+                        struct fscrypt_name *fname, struct page **res_page);
+struct f2fs_dir_entry *f2fs_find_entry(struct inode *dir,
+                        const struct qstr *child, struct page **res_page);
+struct f2fs_dir_entry *f2fs_parent_dir(struct inode *dir, struct page **p);
+ino_t f2fs_inode_by_name(struct inode *dir, const struct qstr *qstr,
+                        struct page **page);
+void f2fs_set_link(struct inode *dir, struct f2fs_dir_entry *de,
+                        struct page *page, struct inode *inode);
+int update_dent_inode(struct inode *inode, struct inode *to,
+                        const struct qstr *name);
+void f2fs_update_dentry(nid_t ino, umode_t mode, struct f2fs_dentry_ptr *d,
+                        const struct qstr *name, f2fs_hash_t name_hash,
+                        unsigned int bit_pos);
+int f2fs_add_regular_entry(struct inode *dir, const struct qstr *new_name,
+                        const struct qstr *orig_name,
+                        struct inode *inode, nid_t ino, umode_t mode);
+int __f2fs_do_add_link(struct inode *dir, struct fscrypt_name *fname,
+                        struct inode *inode, nid_t ino, umode_t mode);
+int __f2fs_add_link(struct inode *dir, const struct qstr *name,
+                        struct inode *inode, nid_t ino, umode_t mode);
+void f2fs_delete_entry(struct f2fs_dir_entry *dentry, struct page *page,
+                        struct inode *dir, struct inode *inode);
+int f2fs_do_tmpfile(struct inode *inode, struct inode *dir);
+bool f2fs_empty_dir(struct inode *dir);
 
 static inline int f2fs_add_link(struct dentry *dentry, struct inode *inode)
 {
@@ -2033,18 +2120,18 @@ static inline int f2fs_add_link(struct dentry *dentry, struct inode *inode)
 /*
  * super.c
  */
-int f2fs_inode_dirtied(struct inode *, bool);
-void f2fs_inode_synced(struct inode *);
-int f2fs_commit_super(struct f2fs_sb_info *, bool);
-int f2fs_sync_fs(struct super_block *, int);
+int f2fs_inode_dirtied(struct inode *inode, bool sync);
+void f2fs_inode_synced(struct inode *inode);
+int f2fs_commit_super(struct f2fs_sb_info *sbi, bool recover);
+int f2fs_sync_fs(struct super_block *sb, int sync);
 extern __printf(3, 4)
-void f2fs_msg(struct super_block *, const char *, const char *, ...);
+void f2fs_msg(struct super_block *sb, const char *level, const char *fmt, ...);
 int sanity_check_ckpt(struct f2fs_sb_info *sbi);
 
 /*
  * hash.c
  */
-f2fs_hash_t f2fs_dentry_hash(const struct qstr *);
+f2fs_hash_t f2fs_dentry_hash(const struct qstr *name_info);
 
 /*
  * node.c
@@ -2052,163 +2139,183 @@ f2fs_hash_t f2fs_dentry_hash(const struct qstr *);
 struct dnode_of_data;
 struct node_info;
 
-bool available_free_memory(struct f2fs_sb_info *, int);
-int need_dentry_mark(struct f2fs_sb_info *, nid_t);
-bool is_checkpointed_node(struct f2fs_sb_info *, nid_t);
-bool need_inode_block_update(struct f2fs_sb_info *, nid_t);
-void get_node_info(struct f2fs_sb_info *, nid_t, struct node_info *);
-pgoff_t get_next_page_offset(struct dnode_of_data *, pgoff_t);
-int get_dnode_of_data(struct dnode_of_data *, pgoff_t, int);
-int truncate_inode_blocks(struct inode *, pgoff_t);
-int truncate_xattr_node(struct inode *, struct page *);
-int wait_on_node_pages_writeback(struct f2fs_sb_info *, nid_t);
-int remove_inode_page(struct inode *);
-struct page *new_inode_page(struct inode *);
-struct page *new_node_page(struct dnode_of_data *, unsigned int, struct page *);
-void ra_node_page(struct f2fs_sb_info *, nid_t);
-struct page *get_node_page(struct f2fs_sb_info *, pgoff_t);
-struct page *get_node_page_ra(struct page *, int);
-void move_node_page(struct page *, int);
-int fsync_node_pages(struct f2fs_sb_info *, struct inode *,
-                        struct writeback_control *, bool);
-int sync_node_pages(struct f2fs_sb_info *, struct writeback_control *);
-void build_free_nids(struct f2fs_sb_info *, bool);
-bool alloc_nid(struct f2fs_sb_info *, nid_t *);
-void alloc_nid_done(struct f2fs_sb_info *, nid_t);
-void alloc_nid_failed(struct f2fs_sb_info *, nid_t);
-int try_to_free_nids(struct f2fs_sb_info *, int);
-void recover_inline_xattr(struct inode *, struct page *);
-void recover_xattr_data(struct inode *, struct page *, block_t);
-int recover_inode_page(struct f2fs_sb_info *, struct page *);
-int restore_node_summary(struct f2fs_sb_info *, unsigned int,
-                                struct f2fs_summary_block *);
-void flush_nat_entries(struct f2fs_sb_info *);
-int build_node_manager(struct f2fs_sb_info *);
-void destroy_node_manager(struct f2fs_sb_info *);
+bool available_free_memory(struct f2fs_sb_info *sbi, int type);
+int need_dentry_mark(struct f2fs_sb_info *sbi, nid_t nid);
+bool is_checkpointed_node(struct f2fs_sb_info *sbi, nid_t nid);
+bool need_inode_block_update(struct f2fs_sb_info *sbi, nid_t ino);
+void get_node_info(struct f2fs_sb_info *sbi, nid_t nid, struct node_info *ni);
+pgoff_t get_next_page_offset(struct dnode_of_data *dn, pgoff_t pgofs);
+int get_dnode_of_data(struct dnode_of_data *dn, pgoff_t index, int mode);
+int truncate_inode_blocks(struct inode *inode, pgoff_t from);
+int truncate_xattr_node(struct inode *inode, struct page *page);
+int wait_on_node_pages_writeback(struct f2fs_sb_info *sbi, nid_t ino);
+int remove_inode_page(struct inode *inode);
+struct page *new_inode_page(struct inode *inode);
+struct page *new_node_page(struct dnode_of_data *dn,
+                        unsigned int ofs, struct page *ipage);
+void ra_node_page(struct f2fs_sb_info *sbi, nid_t nid);
+struct page *get_node_page(struct f2fs_sb_info *sbi, pgoff_t nid);
+struct page *get_node_page_ra(struct page *parent, int start);
+void move_node_page(struct page *node_page, int gc_type);
+int fsync_node_pages(struct f2fs_sb_info *sbi, struct inode *inode,
+                        struct writeback_control *wbc, bool atomic);
+int sync_node_pages(struct f2fs_sb_info *sbi, struct writeback_control *wbc);
+void build_free_nids(struct f2fs_sb_info *sbi, bool sync, bool mount);
+bool alloc_nid(struct f2fs_sb_info *sbi, nid_t *nid);
+void alloc_nid_done(struct f2fs_sb_info *sbi, nid_t nid);
+void alloc_nid_failed(struct f2fs_sb_info *sbi, nid_t nid);
+int try_to_free_nids(struct f2fs_sb_info *sbi, int nr_shrink);
+void recover_inline_xattr(struct inode *inode, struct page *page);
+int recover_xattr_data(struct inode *inode, struct page *page,
+                        block_t blkaddr);
+int recover_inode_page(struct f2fs_sb_info *sbi, struct page *page);
+int restore_node_summary(struct f2fs_sb_info *sbi,
+                        unsigned int segno, struct f2fs_summary_block *sum);
+void flush_nat_entries(struct f2fs_sb_info *sbi, struct cp_control *cpc);
+int build_node_manager(struct f2fs_sb_info *sbi);
+void destroy_node_manager(struct f2fs_sb_info *sbi);
 int __init create_node_manager_caches(void);
 void destroy_node_manager_caches(void);
 
 /*
  * segment.c
  */
-void register_inmem_page(struct inode *, struct page *);
-void drop_inmem_pages(struct inode *);
-int commit_inmem_pages(struct inode *);
-void f2fs_balance_fs(struct f2fs_sb_info *, bool);
-void f2fs_balance_fs_bg(struct f2fs_sb_info *);
-int f2fs_issue_flush(struct f2fs_sb_info *);
-int create_flush_cmd_control(struct f2fs_sb_info *);
-void destroy_flush_cmd_control(struct f2fs_sb_info *, bool);
-void invalidate_blocks(struct f2fs_sb_info *, block_t);
-bool is_checkpointed_data(struct f2fs_sb_info *, block_t);
-void refresh_sit_entry(struct f2fs_sb_info *, block_t, block_t);
-void f2fs_wait_all_discard_bio(struct f2fs_sb_info *);
-void clear_prefree_segments(struct f2fs_sb_info *, struct cp_control *);
-void release_discard_addrs(struct f2fs_sb_info *);
-int npages_for_summary_flush(struct f2fs_sb_info *, bool);
-void allocate_new_segments(struct f2fs_sb_info *);
-int f2fs_trim_fs(struct f2fs_sb_info *, struct fstrim_range *);
-struct page *get_sum_page(struct f2fs_sb_info *, unsigned int);
-void update_meta_page(struct f2fs_sb_info *, void *, block_t);
-void write_meta_page(struct f2fs_sb_info *, struct page *);
-void write_node_page(unsigned int, struct f2fs_io_info *);
-void write_data_page(struct dnode_of_data *, struct f2fs_io_info *);
-void rewrite_data_page(struct f2fs_io_info *);
-void __f2fs_replace_block(struct f2fs_sb_info *, struct f2fs_summary *,
-                                        block_t, block_t, bool, bool);
-void f2fs_replace_block(struct f2fs_sb_info *, struct dnode_of_data *,
-                                block_t, block_t, unsigned char, bool, bool);
-void allocate_data_block(struct f2fs_sb_info *, struct page *,
-                block_t, block_t *, struct f2fs_summary *, int);
-void f2fs_wait_on_page_writeback(struct page *, enum page_type, bool);
-void f2fs_wait_on_encrypted_page_writeback(struct f2fs_sb_info *, block_t);
-void write_data_summaries(struct f2fs_sb_info *, block_t);
-void write_node_summaries(struct f2fs_sb_info *, block_t);
-int lookup_journal_in_cursum(struct f2fs_journal *, int, unsigned int, int);
-void flush_sit_entries(struct f2fs_sb_info *, struct cp_control *);
-int build_segment_manager(struct f2fs_sb_info *);
-void destroy_segment_manager(struct f2fs_sb_info *);
+void register_inmem_page(struct inode *inode, struct page *page);
+void drop_inmem_pages(struct inode *inode);
+int commit_inmem_pages(struct inode *inode);
+void f2fs_balance_fs(struct f2fs_sb_info *sbi, bool need);
+void f2fs_balance_fs_bg(struct f2fs_sb_info *sbi);
+int f2fs_issue_flush(struct f2fs_sb_info *sbi);
+int create_flush_cmd_control(struct f2fs_sb_info *sbi);
+void destroy_flush_cmd_control(struct f2fs_sb_info *sbi, bool free);
+void invalidate_blocks(struct f2fs_sb_info *sbi, block_t addr);
+bool is_checkpointed_data(struct f2fs_sb_info *sbi, block_t blkaddr);
+void refresh_sit_entry(struct f2fs_sb_info *sbi, block_t old, block_t new);
+void f2fs_wait_discard_bio(struct f2fs_sb_info *sbi, block_t blkaddr);
+void clear_prefree_segments(struct f2fs_sb_info *sbi, struct cp_control *cpc);
+void release_discard_addrs(struct f2fs_sb_info *sbi);
+int npages_for_summary_flush(struct f2fs_sb_info *sbi, bool for_ra);
+void allocate_new_segments(struct f2fs_sb_info *sbi);
+int f2fs_trim_fs(struct f2fs_sb_info *sbi, struct fstrim_range *range);
+bool exist_trim_candidates(struct f2fs_sb_info *sbi, struct cp_control *cpc);
+struct page *get_sum_page(struct f2fs_sb_info *sbi, unsigned int segno);
+void update_meta_page(struct f2fs_sb_info *sbi, void *src, block_t blk_addr);
+void write_meta_page(struct f2fs_sb_info *sbi, struct page *page);
+void write_node_page(unsigned int nid, struct f2fs_io_info *fio);
+void write_data_page(struct dnode_of_data *dn, struct f2fs_io_info *fio);
+void rewrite_data_page(struct f2fs_io_info *fio);
+void __f2fs_replace_block(struct f2fs_sb_info *sbi, struct f2fs_summary *sum,
+                        block_t old_blkaddr, block_t new_blkaddr,
+                        bool recover_curseg, bool recover_newaddr);
+void f2fs_replace_block(struct f2fs_sb_info *sbi, struct dnode_of_data *dn,
+                        block_t old_addr, block_t new_addr,
+                        unsigned char version, bool recover_curseg,
+                        bool recover_newaddr);
+void allocate_data_block(struct f2fs_sb_info *sbi, struct page *page,
+                        block_t old_blkaddr, block_t *new_blkaddr,
+                        struct f2fs_summary *sum, int type);
+void f2fs_wait_on_page_writeback(struct page *page,
+                        enum page_type type, bool ordered);
+void f2fs_wait_on_encrypted_page_writeback(struct f2fs_sb_info *sbi,
+                        block_t blkaddr);
+void write_data_summaries(struct f2fs_sb_info *sbi, block_t start_blk);
+void write_node_summaries(struct f2fs_sb_info *sbi, block_t start_blk);
+int lookup_journal_in_cursum(struct f2fs_journal *journal, int type,
+                        unsigned int val, int alloc);
+void flush_sit_entries(struct f2fs_sb_info *sbi, struct cp_control *cpc);
+int build_segment_manager(struct f2fs_sb_info *sbi);
+void destroy_segment_manager(struct f2fs_sb_info *sbi);
 int __init create_segment_manager_caches(void);
 void destroy_segment_manager_caches(void);
 
 /*
  * checkpoint.c
  */
-void f2fs_stop_checkpoint(struct f2fs_sb_info *, bool);
-struct page *grab_meta_page(struct f2fs_sb_info *, pgoff_t);
-struct page *get_meta_page(struct f2fs_sb_info *, pgoff_t);
-struct page *get_tmp_page(struct f2fs_sb_info *, pgoff_t);
-bool is_valid_blkaddr(struct f2fs_sb_info *, block_t, int);
-int ra_meta_pages(struct f2fs_sb_info *, block_t, int, int, bool);
-void ra_meta_pages_cond(struct f2fs_sb_info *, pgoff_t);
-long sync_meta_pages(struct f2fs_sb_info *, enum page_type, long);
-void add_ino_entry(struct f2fs_sb_info *, nid_t, int type);
-void remove_ino_entry(struct f2fs_sb_info *, nid_t, int type);
-void release_ino_entry(struct f2fs_sb_info *, bool);
-bool exist_written_data(struct f2fs_sb_info *, nid_t, int);
-int f2fs_sync_inode_meta(struct f2fs_sb_info *);
-int acquire_orphan_inode(struct f2fs_sb_info *);
-void release_orphan_inode(struct f2fs_sb_info *);
-void add_orphan_inode(struct inode *);
-void remove_orphan_inode(struct f2fs_sb_info *, nid_t);
-int recover_orphan_inodes(struct f2fs_sb_info *);
-int get_valid_checkpoint(struct f2fs_sb_info *);
-void update_dirty_page(struct inode *, struct page *);
-void remove_dirty_inode(struct inode *);
-int sync_dirty_inodes(struct f2fs_sb_info *, enum inode_type);
-int write_checkpoint(struct f2fs_sb_info *, struct cp_control *);
-void init_ino_entry_info(struct f2fs_sb_info *);
+void f2fs_stop_checkpoint(struct f2fs_sb_info *sbi, bool end_io);
+struct page *grab_meta_page(struct f2fs_sb_info *sbi, pgoff_t index);
+struct page *get_meta_page(struct f2fs_sb_info *sbi, pgoff_t index);
+struct page *get_tmp_page(struct f2fs_sb_info *sbi, pgoff_t index);
+bool is_valid_blkaddr(struct f2fs_sb_info *sbi, block_t blkaddr, int type);
+int ra_meta_pages(struct f2fs_sb_info *sbi, block_t start, int nrpages,
+                        int type, bool sync);
+void ra_meta_pages_cond(struct f2fs_sb_info *sbi, pgoff_t index);
+long sync_meta_pages(struct f2fs_sb_info *sbi, enum page_type type,
+                        long nr_to_write);
+void add_ino_entry(struct f2fs_sb_info *sbi, nid_t ino, int type);
+void remove_ino_entry(struct f2fs_sb_info *sbi, nid_t ino, int type);
+void release_ino_entry(struct f2fs_sb_info *sbi, bool all);
+bool exist_written_data(struct f2fs_sb_info *sbi, nid_t ino, int mode);
+int f2fs_sync_inode_meta(struct f2fs_sb_info *sbi);
+int acquire_orphan_inode(struct f2fs_sb_info *sbi);
+void release_orphan_inode(struct f2fs_sb_info *sbi);
+void add_orphan_inode(struct inode *inode);
+void remove_orphan_inode(struct f2fs_sb_info *sbi, nid_t ino);
+int recover_orphan_inodes(struct f2fs_sb_info *sbi);
+int get_valid_checkpoint(struct f2fs_sb_info *sbi);
+void update_dirty_page(struct inode *inode, struct page *page);
+void remove_dirty_inode(struct inode *inode);
+int sync_dirty_inodes(struct f2fs_sb_info *sbi, enum inode_type type);
+int write_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc);
+void init_ino_entry_info(struct f2fs_sb_info *sbi);
 int __init create_checkpoint_caches(void);
 void destroy_checkpoint_caches(void);
 
 /*
  * data.c
  */
-void f2fs_submit_merged_bio(struct f2fs_sb_info *, enum page_type, int);
-void f2fs_submit_merged_bio_cond(struct f2fs_sb_info *, struct inode *,
-                                struct page *, nid_t, enum page_type, int);
-void f2fs_flush_merged_bios(struct f2fs_sb_info *);
-int f2fs_submit_page_bio(struct f2fs_io_info *);
-void f2fs_submit_page_mbio(struct f2fs_io_info *);
-struct block_device *f2fs_target_device(struct f2fs_sb_info *,
-                                block_t, struct bio *);
-int f2fs_target_device_index(struct f2fs_sb_info *, block_t);
-void set_data_blkaddr(struct dnode_of_data *);
-void f2fs_update_data_blkaddr(struct dnode_of_data *, block_t);
-int reserve_new_blocks(struct dnode_of_data *, blkcnt_t);
-int reserve_new_block(struct dnode_of_data *);
-int f2fs_get_block(struct dnode_of_data *, pgoff_t);
-int f2fs_preallocate_blocks(struct kiocb *, struct iov_iter *);
-int f2fs_reserve_block(struct dnode_of_data *, pgoff_t);
-struct page *get_read_data_page(struct inode *, pgoff_t, int, bool);
-struct page *find_data_page(struct inode *, pgoff_t);
-struct page *get_lock_data_page(struct inode *, pgoff_t, bool);
-struct page *get_new_data_page(struct inode *, struct page *, pgoff_t, bool);
-int do_write_data_page(struct f2fs_io_info *);
-int f2fs_map_blocks(struct inode *, struct f2fs_map_blocks *, int, int);
-int f2fs_fiemap(struct inode *inode, struct fiemap_extent_info *, u64, u64);
-void f2fs_set_page_dirty_nobuffers(struct page *);
-void f2fs_invalidate_page(struct page *, unsigned int, unsigned int);
-int f2fs_release_page(struct page *, gfp_t);
+void f2fs_submit_merged_bio(struct f2fs_sb_info *sbi, enum page_type type,
+                        int rw);
+void f2fs_submit_merged_bio_cond(struct f2fs_sb_info *sbi,
+                                struct inode *inode, nid_t ino, pgoff_t idx,
+                                enum page_type type, int rw);
+void f2fs_flush_merged_bios(struct f2fs_sb_info *sbi);
+int f2fs_submit_page_bio(struct f2fs_io_info *fio);
+int f2fs_submit_page_mbio(struct f2fs_io_info *fio);
+struct block_device *f2fs_target_device(struct f2fs_sb_info *sbi,
+                        block_t blk_addr, struct bio *bio);
+int f2fs_target_device_index(struct f2fs_sb_info *sbi, block_t blkaddr);
+void set_data_blkaddr(struct dnode_of_data *dn);
+void f2fs_update_data_blkaddr(struct dnode_of_data *dn, block_t blkaddr);
+int reserve_new_blocks(struct dnode_of_data *dn, blkcnt_t count);
+int reserve_new_block(struct dnode_of_data *dn);
+int f2fs_get_block(struct dnode_of_data *dn, pgoff_t index);
+int f2fs_preallocate_blocks(struct kiocb *iocb, struct iov_iter *from);
+int f2fs_reserve_block(struct dnode_of_data *dn, pgoff_t index);
+struct page *get_read_data_page(struct inode *inode, pgoff_t index,
+                        int op_flags, bool for_write);
+struct page *find_data_page(struct inode *inode, pgoff_t index);
+struct page *get_lock_data_page(struct inode *inode, pgoff_t index,
+                        bool for_write);
+struct page *get_new_data_page(struct inode *inode,
+                        struct page *ipage, pgoff_t index, bool new_i_size);
+int do_write_data_page(struct f2fs_io_info *fio);
+int f2fs_map_blocks(struct inode *inode, struct f2fs_map_blocks *map,
+                        int create, int flag);
+int f2fs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
+                        u64 start, u64 len);
+void f2fs_set_page_dirty_nobuffers(struct page *page);
+void f2fs_invalidate_page(struct page *page, unsigned int offset,
+                        unsigned int length);
+int f2fs_release_page(struct page *page, gfp_t wait);
 #ifdef CONFIG_MIGRATION
-int f2fs_migrate_page(struct address_space *, struct page *, struct page *,
-                                enum migrate_mode);
+int f2fs_migrate_page(struct address_space *mapping, struct page *newpage,
+                        struct page *page, enum migrate_mode mode);
 #endif
 
 /*
  * gc.c
  */
-int start_gc_thread(struct f2fs_sb_info *);
-void stop_gc_thread(struct f2fs_sb_info *);
-block_t start_bidx_of_node(unsigned int, struct inode *);
-int f2fs_gc(struct f2fs_sb_info *, bool, bool);
-void build_gc_manager(struct f2fs_sb_info *);
+int start_gc_thread(struct f2fs_sb_info *sbi);
+void stop_gc_thread(struct f2fs_sb_info *sbi);
+block_t start_bidx_of_node(unsigned int node_ofs, struct inode *inode);
+int f2fs_gc(struct f2fs_sb_info *sbi, bool sync, bool background);
+void build_gc_manager(struct f2fs_sb_info *sbi);
 
 /*
  * recovery.c
  */
-int recover_fsync_data(struct f2fs_sb_info *, bool);
-bool space_for_roll_forward(struct f2fs_sb_info *);
+int recover_fsync_data(struct f2fs_sb_info *sbi, bool check_only);
+bool space_for_roll_forward(struct f2fs_sb_info *sbi);
 
 /*
  * debug.c
@@ -2227,8 +2334,9 @@ struct f2fs_stat_info {
         unsigned int ndirty_dirs, ndirty_files, ndirty_all;
         int nats, dirty_nats, sits, dirty_sits, free_nids, alloc_nids;
         int total_count, utilization;
-        int bg_gc, nr_wb_cp_data, nr_wb_data;
-        int inline_xattr, inline_inode, inline_dir, orphans;
+        int bg_gc, nr_wb_cp_data, nr_wb_data, nr_flush, nr_discard;
+        int inline_xattr, inline_inode, inline_dir, append, update, orphans;
+        int aw_cnt, max_aw_cnt;
         unsigned int valid_count, valid_node_count, valid_inode_count, discard_blks;
         unsigned int bimodal, avg_vblocks;
         int util_free, util_valid, util_invalid;
@@ -2300,6 +2408,17 @@ static inline struct f2fs_stat_info *F2FS_STAT(struct f2fs_sb_info *sbi)
                 ((sbi)->block_count[(curseg)->alloc_type]++)
 #define stat_inc_inplace_blocks(sbi)                                    \
                 (atomic_inc(&(sbi)->inplace_count))
+#define stat_inc_atomic_write(inode)                                    \
+                (atomic_inc(&F2FS_I_SB(inode)->aw_cnt))
+#define stat_dec_atomic_write(inode)                                    \
+                (atomic_dec(&F2FS_I_SB(inode)->aw_cnt))
+#define stat_update_max_atomic_write(inode)                             \
+        do {                                                            \
+                int cur = atomic_read(&F2FS_I_SB(inode)->aw_cnt);       \
+                int max = atomic_read(&F2FS_I_SB(inode)->max_aw_cnt);   \
+                if (cur > max)                                          \
+                        atomic_set(&F2FS_I_SB(inode)->max_aw_cnt, cur); \
+        } while (0)
 #define stat_inc_seg_count(sbi, type, gc_type)                          \
         do {                                                            \
                 struct f2fs_stat_info *si = F2FS_STAT(sbi);             \
@@ -2332,8 +2451,8 @@ static inline struct f2fs_stat_info *F2FS_STAT(struct f2fs_sb_info *sbi)
                 si->bg_node_blks += (gc_type == BG_GC) ? (blks) : 0;    \
         } while (0)
 
-int f2fs_build_stats(struct f2fs_sb_info *);
-void f2fs_destroy_stats(struct f2fs_sb_info *);
+int f2fs_build_stats(struct f2fs_sb_info *sbi);
+void f2fs_destroy_stats(struct f2fs_sb_info *sbi);
 int __init f2fs_create_root_stats(void);
 void f2fs_destroy_root_stats(void);
 #else
@@ -2353,6 +2472,9 @@ void f2fs_destroy_root_stats(void);
 #define stat_dec_inline_inode(inode)
 #define stat_inc_inline_dir(inode)
 #define stat_dec_inline_dir(inode)
+#define stat_inc_atomic_write(inode)
+#define stat_dec_atomic_write(inode)
+#define stat_update_max_atomic_write(inode)
 #define stat_inc_seg_type(sbi, curseg)
 #define stat_inc_block_count(sbi, curseg)
 #define stat_inc_inplace_blocks(sbi)
@@ -2382,49 +2504,55 @@ extern struct kmem_cache *inode_entry_slab;
 /*
  * inline.c
  */
-bool f2fs_may_inline_data(struct inode *);
-bool f2fs_may_inline_dentry(struct inode *);
-void read_inline_data(struct page *, struct page *);
-bool truncate_inline_inode(struct page *, u64);
-int f2fs_read_inline_data(struct inode *, struct page *);
-int f2fs_convert_inline_page(struct dnode_of_data *, struct page *);
-int f2fs_convert_inline_inode(struct inode *);
-int f2fs_write_inline_data(struct inode *, struct page *);
-bool recover_inline_data(struct inode *, struct page *);
-struct f2fs_dir_entry *find_in_inline_dir(struct inode *,
-                                struct fscrypt_name *, struct page **);
-int make_empty_inline_dir(struct inode *inode, struct inode *, struct page *);
-int f2fs_add_inline_entry(struct inode *, const struct qstr *,
-                const struct qstr *, struct inode *, nid_t, umode_t);
-void f2fs_delete_inline_entry(struct f2fs_dir_entry *, struct page *,
-                                                struct inode *, struct inode *);
-bool f2fs_empty_inline_dir(struct inode *);
-int f2fs_read_inline_dir(struct file *, struct dir_context *,
-                                                struct fscrypt_str *);
-int f2fs_inline_data_fiemap(struct inode *,
-                struct fiemap_extent_info *, __u64, __u64);
+bool f2fs_may_inline_data(struct inode *inode);
+bool f2fs_may_inline_dentry(struct inode *inode);
+void read_inline_data(struct page *page, struct page *ipage);
+bool truncate_inline_inode(struct page *ipage, u64 from);
+int f2fs_read_inline_data(struct inode *inode, struct page *page);
+int f2fs_convert_inline_page(struct dnode_of_data *dn, struct page *page);
+int f2fs_convert_inline_inode(struct inode *inode);
+int f2fs_write_inline_data(struct inode *inode, struct page *page);
+bool recover_inline_data(struct inode *inode, struct page *npage);
+struct f2fs_dir_entry *find_in_inline_dir(struct inode *dir,
+                        struct fscrypt_name *fname, struct page **res_page);
+int make_empty_inline_dir(struct inode *inode, struct inode *parent,
+                        struct page *ipage);
+int f2fs_add_inline_entry(struct inode *dir, const struct qstr *new_name,
+                        const struct qstr *orig_name,
+                        struct inode *inode, nid_t ino, umode_t mode);
+void f2fs_delete_inline_entry(struct f2fs_dir_entry *dentry, struct page *page,
+                        struct inode *dir, struct inode *inode);
+bool f2fs_empty_inline_dir(struct inode *dir);
+int f2fs_read_inline_dir(struct file *file, struct dir_context *ctx,
+                        struct fscrypt_str *fstr);
+int f2fs_inline_data_fiemap(struct inode *inode,
+                        struct fiemap_extent_info *fieinfo,
+                        __u64 start, __u64 len);
 
 /*
  * shrinker.c
  */
-unsigned long f2fs_shrink_count(struct shrinker *, struct shrink_control *);
-unsigned long f2fs_shrink_scan(struct shrinker *, struct shrink_control *);
-void f2fs_join_shrinker(struct f2fs_sb_info *);
-void f2fs_leave_shrinker(struct f2fs_sb_info *);
+unsigned long f2fs_shrink_count(struct shrinker *shrink,
+                        struct shrink_control *sc);
+unsigned long f2fs_shrink_scan(struct shrinker *shrink,
+                        struct shrink_control *sc);
+void f2fs_join_shrinker(struct f2fs_sb_info *sbi);
+void f2fs_leave_shrinker(struct f2fs_sb_info *sbi);
 
 /*
  * extent_cache.c
  */
-unsigned int f2fs_shrink_extent_tree(struct f2fs_sb_info *, int);
-bool f2fs_init_extent_tree(struct inode *, struct f2fs_extent *);
-void f2fs_drop_extent_tree(struct inode *);
-unsigned int f2fs_destroy_extent_node(struct inode *);
-void f2fs_destroy_extent_tree(struct inode *);
-bool f2fs_lookup_extent_cache(struct inode *, pgoff_t, struct extent_info *);
-void f2fs_update_extent_cache(struct dnode_of_data *);
+unsigned int f2fs_shrink_extent_tree(struct f2fs_sb_info *sbi, int nr_shrink);
+bool f2fs_init_extent_tree(struct inode *inode, struct f2fs_extent *i_ext);
+void f2fs_drop_extent_tree(struct inode *inode);
+unsigned int f2fs_destroy_extent_node(struct inode *inode);
+void f2fs_destroy_extent_tree(struct inode *inode);
+bool f2fs_lookup_extent_cache(struct inode *inode, pgoff_t pgofs,
+                        struct extent_info *ei);
+void f2fs_update_extent_cache(struct dnode_of_data *dn);
 void f2fs_update_extent_cache_range(struct dnode_of_data *dn,
-                                                pgoff_t, block_t, unsigned int);
-void init_extent_cache_info(struct f2fs_sb_info *);
+                        pgoff_t fofs, block_t blkaddr, unsigned int len);
+void init_extent_cache_info(struct f2fs_sb_info *sbi);
 int __init create_extent_cache(void);
 void destroy_extent_cache(void);
 
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 1edc86e874e3..78e65288f2b2 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -20,6 +20,7 @@
 #include <linux/uaccess.h>
 #include <linux/mount.h>
 #include <linux/pagevec.h>
+#include <linux/uio.h>
 #include <linux/uuid.h>
 #include <linux/file.h>
 
@@ -140,8 +141,6 @@ static inline bool need_do_checkpoint(struct inode *inode)
                 need_cp = true;
         else if (!is_checkpointed_node(sbi, F2FS_I(inode)->i_pino))
                 need_cp = true;
-        else if (F2FS_I(inode)->xattr_ver == cur_cp_version(F2FS_CKPT(sbi)))
-                need_cp = true;
         else if (test_opt(sbi, FASTBOOT))
                 need_cp = true;
         else if (sbi->active_logs == 2)
@@ -167,7 +166,6 @@ static void try_to_fix_pino(struct inode *inode)
         nid_t pino;
 
         down_write(&fi->i_sem);
-        fi->xattr_ver = 0;
         if (file_wrong_pino(inode) && inode->i_nlink == 1 &&
                         get_parent_ino(inode, &pino)) {
                 f2fs_i_pino_write(inode, pino);
@@ -276,7 +274,8 @@ sync_nodes:
 flush_out:
         remove_ino_entry(sbi, ino, UPDATE_INO);
         clear_inode_flag(inode, FI_UPDATE_WRITE);
-        ret = f2fs_issue_flush(sbi);
+        if (!atomic)
+                ret = f2fs_issue_flush(sbi);
         f2fs_update_time(sbi, REQ_TIME);
 out:
         trace_f2fs_sync_file_exit(inode, need_cp, datasync, ret);
@@ -567,8 +566,9 @@ int truncate_blocks(struct inode *inode, u64 from, bool lock)
         }
 
         if (f2fs_has_inline_data(inode)) {
-                if (truncate_inline_inode(ipage, from))
-                        set_page_dirty(ipage);
+                truncate_inline_inode(ipage, from);
+                if (from == 0)
+                        clear_inode_flag(inode, FI_DATA_EXIST);
                 f2fs_put_page(ipage, 1);
                 truncate_page = true;
                 goto out;
@@ -1541,6 +1541,8 @@ static int f2fs_ioc_start_atomic_write(struct file *filp)
         if (ret)
                 clear_inode_flag(inode, FI_ATOMIC_FILE);
 out:
+        stat_inc_atomic_write(inode);
+        stat_update_max_atomic_write(inode);
         inode_unlock(inode);
         mnt_drop_write_file(filp);
         return ret;
@@ -1564,15 +1566,18 @@ static int f2fs_ioc_commit_atomic_write(struct file *filp)
                 goto err_out;
 
         if (f2fs_is_atomic_file(inode)) {
-                clear_inode_flag(inode, FI_ATOMIC_FILE);
                 ret = commit_inmem_pages(inode);
-                if (ret) {
-                        set_inode_flag(inode, FI_ATOMIC_FILE);
+                if (ret)
                         goto err_out;
+
+                ret = f2fs_do_sync_file(filp, 0, LLONG_MAX, 0, true);
+                if (!ret) {
+                        clear_inode_flag(inode, FI_ATOMIC_FILE);
+                        stat_dec_atomic_write(inode);
                 }
+        } else {
+                ret = f2fs_do_sync_file(filp, 0, LLONG_MAX, 0, true);
         }
-
-        ret = f2fs_do_sync_file(filp, 0, LLONG_MAX, 0, true);
 err_out:
         inode_unlock(inode);
         mnt_drop_write_file(filp);
@@ -1870,7 +1875,7 @@ static int f2fs_defragment_range(struct f2fs_sb_info *sbi,
 {
         struct inode *inode = file_inode(filp);
         struct f2fs_map_blocks map = { .m_next_pgofs = NULL };
-        struct extent_info ei;
+        struct extent_info ei = {0,0,0};
         pgoff_t pg_start, pg_end;
         unsigned int blk_per_seg = sbi->blocks_per_seg;
         unsigned int total = 0, sec_num;
@@ -2250,8 +2255,12 @@ static ssize_t f2fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
         inode_lock(inode);
         ret = generic_write_checks(iocb, from);
         if (ret > 0) {
-                int err = f2fs_preallocate_blocks(iocb, from);
+                int err;
+
+                if (iov_iter_fault_in_readable(from, iov_iter_count(from)))
+                        set_inode_flag(inode, FI_NO_PREALLOC);
 
+                err = f2fs_preallocate_blocks(iocb, from);
                 if (err) {
                         inode_unlock(inode);
                         return err;
@@ -2259,6 +2268,7 @@ static ssize_t f2fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
                 blk_start_plug(&plug);
                 ret = __generic_file_write_iter(iocb, from);
                 blk_finish_plug(&plug);
+                clear_inode_flag(inode, FI_NO_PREALLOC);
         }
         inode_unlock(inode);
 
diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
index 88bfc3dff496..418fd9881646 100644
--- a/fs/f2fs/gc.c
+++ b/fs/f2fs/gc.c
@@ -48,8 +48,10 @@ static int gc_thread_func(void *data)
                 }
 
 #ifdef CONFIG_F2FS_FAULT_INJECTION
-                if (time_to_inject(sbi, FAULT_CHECKPOINT))
+                if (time_to_inject(sbi, FAULT_CHECKPOINT)) {
+                        f2fs_show_injection_info(FAULT_CHECKPOINT);
                         f2fs_stop_checkpoint(sbi, false);
+                }
 #endif
 
                 /*
@@ -166,7 +168,8 @@ static void select_policy(struct f2fs_sb_info *sbi, int gc_type,
                 p->ofs_unit = sbi->segs_per_sec;
         }
 
-        if (p->max_search > sbi->max_victim_search)
+        /* we need to check every dirty segments in the FG_GC case */
+        if (gc_type != FG_GC && p->max_search > sbi->max_victim_search)
                 p->max_search = sbi->max_victim_search;
 
         p->offset = sbi->last_victim[p->gc_mode];
@@ -199,6 +202,10 @@ static unsigned int check_bg_victims(struct f2fs_sb_info *sbi)
         for_each_set_bit(secno, dirty_i->victim_secmap, MAIN_SECS(sbi)) {
                 if (sec_usage_check(sbi, secno))
                         continue;
+
+                if (no_fggc_candidate(sbi, secno))
+                        continue;
+
                 clear_bit(secno, dirty_i->victim_secmap);
                 return secno * sbi->segs_per_sec;
         }
@@ -237,6 +244,16 @@ static unsigned int get_cb_cost(struct f2fs_sb_info *sbi, unsigned int segno)
         return UINT_MAX - ((100 * (100 - u) * age) / (100 + u));
 }
 
+static unsigned int get_greedy_cost(struct f2fs_sb_info *sbi,
+                                                unsigned int segno)
+{
+        unsigned int valid_blocks =
+                        get_valid_blocks(sbi, segno, sbi->segs_per_sec);
+
+        return IS_DATASEG(get_seg_entry(sbi, segno)->type) ?
+                                valid_blocks * 2 : valid_blocks;
+}
+
 static inline unsigned int get_gc_cost(struct f2fs_sb_info *sbi,
                         unsigned int segno, struct victim_sel_policy *p)
 {
@@ -245,7 +262,7 @@ static inline unsigned int get_gc_cost(struct f2fs_sb_info *sbi,
 
         /* alloc_mode == LFS */
         if (p->gc_mode == GC_GREEDY)
-                return get_valid_blocks(sbi, segno, sbi->segs_per_sec);
+                return get_greedy_cost(sbi, segno);
         else
                 return get_cb_cost(sbi, segno);
 }
@@ -322,13 +339,15 @@ static int get_victim_by_default(struct f2fs_sb_info *sbi,
                         nsearched++;
                 }
 
-
                 secno = GET_SECNO(sbi, segno);
 
                 if (sec_usage_check(sbi, secno))
                         goto next;
                 if (gc_type == BG_GC && test_bit(secno, dirty_i->victim_secmap))
                         goto next;
+                if (gc_type == FG_GC && p.alloc_mode == LFS &&
+                                        no_fggc_candidate(sbi, secno))
+                        goto next;
 
                 cost = get_gc_cost(sbi, segno, &p);
 
@@ -569,6 +588,9 @@ static void move_encrypted_block(struct inode *inode, block_t bidx,
         if (!check_valid_map(F2FS_I_SB(inode), segno, off))
                 goto out;
 
+        if (f2fs_is_atomic_file(inode))
+                goto out;
+
         set_new_dnode(&dn, inode, NULL, NULL, 0);
         err = get_dnode_of_data(&dn, bidx, LOOKUP_NODE);
         if (err)
@@ -661,6 +683,9 @@ static void move_data_page(struct inode *inode, block_t bidx, int gc_type,
         if (!check_valid_map(F2FS_I_SB(inode), segno, off))
                 goto out;
 
+        if (f2fs_is_atomic_file(inode))
+                goto out;
+
         if (gc_type == BG_GC) {
                 if (PageWriteback(page))
                         goto out;
@@ -921,8 +946,6 @@ int f2fs_gc(struct f2fs_sb_info *sbi, bool sync, bool background)
 
         cpc.reason = __get_cp_reason(sbi);
 gc_more:
-        segno = NULL_SEGNO;
-
         if (unlikely(!(sbi->sb->s_flags & MS_ACTIVE)))
                 goto stop;
         if (unlikely(f2fs_cp_error(sbi))) {
@@ -930,30 +953,23 @@ gc_more:
                 goto stop;
         }
 
-        if (gc_type == BG_GC && has_not_enough_free_secs(sbi, sec_freed, 0)) {
-                gc_type = FG_GC;
+        if (gc_type == BG_GC && has_not_enough_free_secs(sbi, 0, 0)) {
                 /*
-                 * If there is no victim and no prefree segment but still not
-                 * enough free sections, we should flush dent/node blocks and do
-                 * garbage collections.
+                 * For example, if there are many prefree_segments below given
+                 * threshold, we can make them free by checkpoint. Then, we
+                 * secure free segments which doesn't need fggc any more.
                  */
-                if (__get_victim(sbi, &segno, gc_type) ||
-                                                prefree_segments(sbi)) {
-                        ret = write_checkpoint(sbi, &cpc);
-                        if (ret)
-                                goto stop;
-                        segno = NULL_SEGNO;
-                } else if (has_not_enough_free_secs(sbi, 0, 0)) {
-                        ret = write_checkpoint(sbi, &cpc);
-                        if (ret)
-                                goto stop;
-                }
-        } else if (gc_type == BG_GC && !background) {
-                /* f2fs_balance_fs doesn't need to do BG_GC in critical path. */
-                goto stop;
+                ret = write_checkpoint(sbi, &cpc);
+                if (ret)
+                        goto stop;
+                if (has_not_enough_free_secs(sbi, 0, 0))
+                        gc_type = FG_GC;
         }
 
-        if (segno == NULL_SEGNO && !__get_victim(sbi, &segno, gc_type))
+        /* f2fs_balance_fs doesn't need to do BG_GC in critical path. */
+        if (gc_type == BG_GC && !background)
+                goto stop;
+        if (!__get_victim(sbi, &segno, gc_type))
                 goto stop;
         ret = 0;
 
@@ -983,5 +999,16 @@ stop:
 
 void build_gc_manager(struct f2fs_sb_info *sbi)
 {
+        u64 main_count, resv_count, ovp_count, blocks_per_sec;
+
         DIRTY_I(sbi)->v_ops = &default_v_ops;
+
+        /* threshold of # of valid blocks in a section for victims of FG_GC */
+        main_count = SM_I(sbi)->main_segments << sbi->log_blocks_per_seg;
+        resv_count = SM_I(sbi)->reserved_segments << sbi->log_blocks_per_seg;
+        ovp_count = SM_I(sbi)->ovp_segments << sbi->log_blocks_per_seg;
+        blocks_per_sec = sbi->blocks_per_seg * sbi->segs_per_sec;
+
+        sbi->fggc_threshold = div64_u64((main_count - ovp_count) * blocks_per_sec,
+                                        (main_count - resv_count));
 }
diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c
index af06bda51a54..24bb8213d974 100644
--- a/fs/f2fs/inode.c
+++ b/fs/f2fs/inode.c
@@ -373,8 +373,10 @@ void f2fs_evict_inode(struct inode *inode)
                 goto no_delete;
 
 #ifdef CONFIG_F2FS_FAULT_INJECTION
-        if (time_to_inject(sbi, FAULT_EVICT_INODE))
+        if (time_to_inject(sbi, FAULT_EVICT_INODE)) {
+                f2fs_show_injection_info(FAULT_EVICT_INODE);
                 goto no_delete;
+        }
 #endif
 
         remove_ino_entry(sbi, inode->i_ino, APPEND_INO);
diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
index 11cabcadb1a3..98f00a3a7f50 100644
--- a/fs/f2fs/namei.c
+++ b/fs/f2fs/namei.c
@@ -321,9 +321,9 @@ static struct dentry *f2fs_lookup(struct inode *dir, struct dentry *dentry,
                 if (err)
                         goto err_out;
         }
-        if (!IS_ERR(inode) && f2fs_encrypted_inode(dir) &&
-                        (S_ISDIR(inode->i_mode) || S_ISLNK(inode->i_mode)) &&
-                        !fscrypt_has_permitted_context(dir, inode)) {
+        if (f2fs_encrypted_inode(dir) &&
+            (S_ISDIR(inode->i_mode) || S_ISLNK(inode->i_mode)) &&
+            !fscrypt_has_permitted_context(dir, inode)) {
                 bool nokey = f2fs_encrypted_inode(inode) &&
                         !fscrypt_has_encryption_key(inode);
                 err = nokey ? -ENOKEY : -EPERM;
@@ -663,6 +663,12 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry,
         bool is_old_inline = f2fs_has_inline_dentry(old_dir);
         int err = -ENOENT;
 
+        if ((f2fs_encrypted_inode(old_dir) &&
+                        !fscrypt_has_encryption_key(old_dir)) ||
+                        (f2fs_encrypted_inode(new_dir) &&
+                        !fscrypt_has_encryption_key(new_dir)))
+                return -ENOKEY;
+
         if ((old_dir != new_dir) && f2fs_encrypted_inode(new_dir) &&
                         !fscrypt_has_permitted_context(new_dir, old_inode)) {
                 err = -EPERM;
@@ -843,6 +849,12 @@ static int f2fs_cross_rename(struct inode *old_dir, struct dentry *old_dentry,
         int old_nlink = 0, new_nlink = 0;
         int err = -ENOENT;
 
+        if ((f2fs_encrypted_inode(old_dir) &&
+                        !fscrypt_has_encryption_key(old_dir)) ||
+                        (f2fs_encrypted_inode(new_dir) &&
+                        !fscrypt_has_encryption_key(new_dir)))
+                return -ENOKEY;
+
         if ((f2fs_encrypted_inode(old_dir) || f2fs_encrypted_inode(new_dir)) &&
                         (old_dir != new_dir) &&
                         (!fscrypt_has_permitted_context(new_dir, old_inode) ||
diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index b9078fdb3743..94967171dee8 100644
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -245,12 +245,24 @@ bool need_inode_block_update(struct f2fs_sb_info *sbi, nid_t ino)
         return need_update;
 }
 
-static struct nat_entry *grab_nat_entry(struct f2fs_nm_info *nm_i, nid_t nid)
+static struct nat_entry *grab_nat_entry(struct f2fs_nm_info *nm_i, nid_t nid,
+                                                                bool no_fail)
 {
         struct nat_entry *new;
 
-        new = f2fs_kmem_cache_alloc(nat_entry_slab, GFP_NOFS);
-        f2fs_radix_tree_insert(&nm_i->nat_root, nid, new);
+        if (no_fail) {
+                new = f2fs_kmem_cache_alloc(nat_entry_slab, GFP_NOFS);
+                f2fs_radix_tree_insert(&nm_i->nat_root, nid, new);
+        } else {
+                new = kmem_cache_alloc(nat_entry_slab, GFP_NOFS);
+                if (!new)
+                        return NULL;
+                if (radix_tree_insert(&nm_i->nat_root, nid, new)) {
+                        kmem_cache_free(nat_entry_slab, new);
+                        return NULL;
+                }
+        }
+
         memset(new, 0, sizeof(struct nat_entry));
         nat_set_nid(new, nid);
         nat_reset_flag(new);
@@ -267,8 +279,9 @@ static void cache_nat_entry(struct f2fs_sb_info *sbi, nid_t nid,
 
         e = __lookup_nat_cache(nm_i, nid);
         if (!e) {
-                e = grab_nat_entry(nm_i, nid);
-                node_info_from_raw_nat(&e->ni, ne);
+                e = grab_nat_entry(nm_i, nid, false);
+                if (e)
+                        node_info_from_raw_nat(&e->ni, ne);
         } else {
                 f2fs_bug_on(sbi, nat_get_ino(e) != le32_to_cpu(ne->ino) ||
                                 nat_get_blkaddr(e) !=
@@ -286,7 +299,7 @@ static void set_node_addr(struct f2fs_sb_info *sbi, struct node_info *ni,
         down_write(&nm_i->nat_tree_lock);
         e = __lookup_nat_cache(nm_i, ni->nid);
         if (!e) {
-                e = grab_nat_entry(nm_i, ni->nid);
+                e = grab_nat_entry(nm_i, ni->nid, true);
                 copy_node_info(&e->ni, ni);
                 f2fs_bug_on(sbi, ni->blk_addr == NEW_ADDR);
         } else if (new_blkaddr == NEW_ADDR) {
@@ -325,6 +338,9 @@ static void set_node_addr(struct f2fs_sb_info *sbi, struct node_info *ni,
                 set_nat_flag(e, IS_CHECKPOINTED, false);
         __set_nat_cache_dirty(nm_i, e);
 
+        if (enabled_nat_bits(sbi, NULL) && new_blkaddr == NEW_ADDR)
+                clear_bit_le(NAT_BLOCK_OFFSET(ni->nid), nm_i->empty_nat_bits);
+
         /* update fsync_mark if its inode nat entry is still alive */
         if (ni->nid != ni->ino)
                 e = __lookup_nat_cache(nm_i, ni->ino);
@@ -958,9 +974,6 @@ int truncate_xattr_node(struct inode *inode, struct page *page)
 
         f2fs_i_xnid_write(inode, 0);
 
-        /* need to do checkpoint during fsync */
-        F2FS_I(inode)->xattr_ver = cur_cp_version(F2FS_CKPT(sbi));
-
         set_new_dnode(&dn, inode, page, npage, nid);
 
         if (page)
@@ -1018,7 +1031,7 @@ struct page *new_node_page(struct dnode_of_data *dn,
                                 unsigned int ofs, struct page *ipage)
 {
         struct f2fs_sb_info *sbi = F2FS_I_SB(dn->inode);
-        struct node_info old_ni, new_ni;
+        struct node_info new_ni;
         struct page *page;
         int err;
 
@@ -1033,13 +1046,15 @@ struct page *new_node_page(struct dnode_of_data *dn,
                 err = -ENOSPC;
                 goto fail;
         }
-
-        get_node_info(sbi, dn->nid, &old_ni);
-
-        /* Reinitialize old_ni with new node page */
-        f2fs_bug_on(sbi, old_ni.blk_addr != NULL_ADDR);
-        new_ni = old_ni;
+#ifdef CONFIG_F2FS_CHECK_FS
+        get_node_info(sbi, dn->nid, &new_ni);
+        f2fs_bug_on(sbi, new_ni.blk_addr != NULL_ADDR);
+#endif
+        new_ni.nid = dn->nid;
         new_ni.ino = dn->inode->i_ino;
+        new_ni.blk_addr = NULL_ADDR;
+        new_ni.flag = 0;
+        new_ni.version = 0;
         set_node_addr(sbi, &new_ni, NEW_ADDR, false);
 
         f2fs_wait_on_page_writeback(page, NODE, true);
@@ -1305,16 +1320,99 @@ continue_unlock:
         return last_page;
 }
 
+static int __write_node_page(struct page *page, bool atomic, bool *submitted,
+                                struct writeback_control *wbc)
+{
+        struct f2fs_sb_info *sbi = F2FS_P_SB(page);
+        nid_t nid;
+        struct node_info ni;
+        struct f2fs_io_info fio = {
+                .sbi = sbi,
+                .type = NODE,
+                .op = REQ_OP_WRITE,
+                .op_flags = wbc_to_write_flags(wbc),
+                .page = page,
+                .encrypted_page = NULL,
+                .submitted = false,
+        };
+
+        trace_f2fs_writepage(page, NODE);
+
+        if (unlikely(is_sbi_flag_set(sbi, SBI_POR_DOING)))
+                goto redirty_out;
+        if (unlikely(f2fs_cp_error(sbi)))
+                goto redirty_out;
+
+        /* get old block addr of this node page */
+        nid = nid_of_node(page);
+        f2fs_bug_on(sbi, page->index != nid);
+
+        if (wbc->for_reclaim) {
+                if (!down_read_trylock(&sbi->node_write))
+                        goto redirty_out;
+        } else {
+                down_read(&sbi->node_write);
+        }
+
+        get_node_info(sbi, nid, &ni);
+
+        /* This page is already truncated */
+        if (unlikely(ni.blk_addr == NULL_ADDR)) {
+                ClearPageUptodate(page);
+                dec_page_count(sbi, F2FS_DIRTY_NODES);
+                up_read(&sbi->node_write);
+                unlock_page(page);
+                return 0;
+        }
+
+        if (atomic && !test_opt(sbi, NOBARRIER))
+                fio.op_flags |= REQ_PREFLUSH | REQ_FUA;
+
+        set_page_writeback(page);
+        fio.old_blkaddr = ni.blk_addr;
+        write_node_page(nid, &fio);
+        set_node_addr(sbi, &ni, fio.new_blkaddr, is_fsync_dnode(page));
+        dec_page_count(sbi, F2FS_DIRTY_NODES);
+        up_read(&sbi->node_write);
+
+        if (wbc->for_reclaim) {
+                f2fs_submit_merged_bio_cond(sbi, page->mapping->host, 0,
+                                                page->index, NODE, WRITE);
+                submitted = NULL;
+        }
+
+        unlock_page(page);
+
+        if (unlikely(f2fs_cp_error(sbi))) {
+                f2fs_submit_merged_bio(sbi, NODE, WRITE);
+                submitted = NULL;
+        }
+        if (submitted)
+                *submitted = fio.submitted;
+
+        return 0;
+
+redirty_out:
+        redirty_page_for_writepage(wbc, page);
+        return AOP_WRITEPAGE_ACTIVATE;
+}
+
+static int f2fs_write_node_page(struct page *page,
+                                struct writeback_control *wbc)
+{
+        return __write_node_page(page, false, NULL, wbc);
+}
+
 int fsync_node_pages(struct f2fs_sb_info *sbi, struct inode *inode,
                         struct writeback_control *wbc, bool atomic)
 {
         pgoff_t index, end;
+        pgoff_t last_idx = ULONG_MAX;
         struct pagevec pvec;
         int ret = 0;
         struct page *last_page = NULL;
         bool marked = false;
         nid_t ino = inode->i_ino;
-        int nwritten = 0;
 
         if (atomic) {
                 last_page = last_fsync_dnode(sbi, ino);
@@ -1336,6 +1434,7 @@ retry:
 
                 for (i = 0; i < nr_pages; i++) {
                         struct page *page = pvec.pages[i];
+                        bool submitted = false;
 
                         if (unlikely(f2fs_cp_error(sbi))) {
                                 f2fs_put_page(last_page, 0);
@@ -1384,13 +1483,15 @@ continue_unlock:
                         if (!clear_page_dirty_for_io(page))
                                 goto continue_unlock;
 
-                        ret = NODE_MAPPING(sbi)->a_ops->writepage(page, wbc);
+                        ret = __write_node_page(page, atomic &&
+                                                page == last_page,
+                                                &submitted, wbc);
                         if (ret) {
                                 unlock_page(page);
                                 f2fs_put_page(last_page, 0);
                                 break;
-                        } else {
-                                nwritten++;
+                        } else if (submitted) {
+                                last_idx = page->index;
                         }
 
                         if (page == last_page) {
@@ -1416,8 +1517,9 @@ continue_unlock:
                 goto retry;
         }
 out:
-        if (nwritten)
-                f2fs_submit_merged_bio_cond(sbi, NULL, NULL, ino, NODE, WRITE);
+        if (last_idx != ULONG_MAX)
+                f2fs_submit_merged_bio_cond(sbi, NULL, ino, last_idx,
+                                                        NODE, WRITE);
         return ret ? -EIO: 0;
 }
 
@@ -1445,6 +1547,7 @@ next_step:
 
                 for (i = 0; i < nr_pages; i++) {
                         struct page *page = pvec.pages[i];
+                        bool submitted = false;
 
                         if (unlikely(f2fs_cp_error(sbi))) {
                                 pagevec_release(&pvec);
@@ -1498,9 +1601,10 @@ continue_unlock:
                         set_fsync_mark(page, 0);
                         set_dentry_mark(page, 0);
 
-                        if (NODE_MAPPING(sbi)->a_ops->writepage(page, wbc))
+                        ret = __write_node_page(page, false, &submitted, wbc);
+                        if (ret)
                                 unlock_page(page);
-                        else
+                        else if (submitted)
                                 nwritten++;
 
                         if (--wbc->nr_to_write == 0)
@@ -1564,72 +1668,6 @@ int wait_on_node_pages_writeback(struct f2fs_sb_info *sbi, nid_t ino)
         return ret;
 }
 
-static int f2fs_write_node_page(struct page *page,
-                                struct writeback_control *wbc)
-{
-        struct f2fs_sb_info *sbi = F2FS_P_SB(page);
-        nid_t nid;
-        struct node_info ni;
-        struct f2fs_io_info fio = {
-                .sbi = sbi,
-                .type = NODE,
-                .op = REQ_OP_WRITE,
-                .op_flags = wbc_to_write_flags(wbc),
-                .page = page,
-                .encrypted_page = NULL,
-        };
-
-        trace_f2fs_writepage(page, NODE);
-
-        if (unlikely(is_sbi_flag_set(sbi, SBI_POR_DOING)))
-                goto redirty_out;
-        if (unlikely(f2fs_cp_error(sbi)))
-                goto redirty_out;
-
-        /* get old block addr of this node page */
-        nid = nid_of_node(page);
-        f2fs_bug_on(sbi, page->index != nid);
-
-        if (wbc->for_reclaim) {
-                if (!down_read_trylock(&sbi->node_write))
-                        goto redirty_out;
-        } else {
-                down_read(&sbi->node_write);
-        }
-
-        get_node_info(sbi, nid, &ni);
-
-        /* This page is already truncated */
-        if (unlikely(ni.blk_addr == NULL_ADDR)) {
-                ClearPageUptodate(page);
-                dec_page_count(sbi, F2FS_DIRTY_NODES);
-                up_read(&sbi->node_write);
-                unlock_page(page);
-                return 0;
-        }
-
-        set_page_writeback(page);
-        fio.old_blkaddr = ni.blk_addr;
-        write_node_page(nid, &fio);
-        set_node_addr(sbi, &ni, fio.new_blkaddr, is_fsync_dnode(page));
-        dec_page_count(sbi, F2FS_DIRTY_NODES);
-        up_read(&sbi->node_write);
-
-        if (wbc->for_reclaim)
-                f2fs_submit_merged_bio_cond(sbi, NULL, page, 0, NODE, WRITE);
-
-        unlock_page(page);
-
-        if (unlikely(f2fs_cp_error(sbi)))
-                f2fs_submit_merged_bio(sbi, NODE, WRITE);
-
-        return 0;
-
-redirty_out:
-        redirty_page_for_writepage(wbc, page);
-        return AOP_WRITEPAGE_ACTIVATE;
-}
-
 static int f2fs_write_node_pages(struct address_space *mapping,
                             struct writeback_control *wbc)
 {
@@ -1727,7 +1765,8 @@ static void __remove_nid_from_list(struct f2fs_sb_info *sbi,
                 radix_tree_delete(&nm_i->free_nid_root, i->nid);
 }
 
-static int add_free_nid(struct f2fs_sb_info *sbi, nid_t nid, bool build)
+/* return if the nid is recognized as free */
+static bool add_free_nid(struct f2fs_sb_info *sbi, nid_t nid, bool build)
 {
         struct f2fs_nm_info *nm_i = NM_I(sbi);
         struct free_nid *i;
@@ -1736,14 +1775,14 @@ static int add_free_nid(struct f2fs_sb_info *sbi, nid_t nid, bool build)
 
         /* 0 nid should not be used */
         if (unlikely(nid == 0))
-                return 0;
+                return false;
 
         if (build) {
                 /* do not add allocated nids */
                 ne = __lookup_nat_cache(nm_i, nid);
                 if (ne && (!get_nat_flag(ne, IS_CHECKPOINTED) ||
                                 nat_get_blkaddr(ne) != NULL_ADDR))
-                        return 0;
+                        return false;
         }
 
         i = f2fs_kmem_cache_alloc(free_nid_slab, GFP_NOFS);
@@ -1752,7 +1791,7 @@ static int add_free_nid(struct f2fs_sb_info *sbi, nid_t nid, bool build)
 
         if (radix_tree_preload(GFP_NOFS)) {
                 kmem_cache_free(free_nid_slab, i);
-                return 0;
+                return true;
         }
 
         spin_lock(&nm_i->nid_list_lock);
@@ -1761,9 +1800,9 @@ static int add_free_nid(struct f2fs_sb_info *sbi, nid_t nid, bool build)
         radix_tree_preload_end();
         if (err) {
                 kmem_cache_free(free_nid_slab, i);
-                return 0;
+                return true;
         }
-        return 1;
+        return true;
 }
 
 static void remove_free_nid(struct f2fs_sb_info *sbi, nid_t nid)
@@ -1784,17 +1823,36 @@ static void remove_free_nid(struct f2fs_sb_info *sbi, nid_t nid)
                 kmem_cache_free(free_nid_slab, i);
 }
 
+void update_free_nid_bitmap(struct f2fs_sb_info *sbi, nid_t nid, bool set)
+{
+        struct f2fs_nm_info *nm_i = NM_I(sbi);
+        unsigned int nat_ofs = NAT_BLOCK_OFFSET(nid);
+        unsigned int nid_ofs = nid - START_NID(nid);
+
+        if (!test_bit_le(nat_ofs, nm_i->nat_block_bitmap))
+                return;
+
+        if (set)
+                set_bit_le(nid_ofs, nm_i->free_nid_bitmap[nat_ofs]);
+        else
+                clear_bit_le(nid_ofs, nm_i->free_nid_bitmap[nat_ofs]);
+}
+
 static void scan_nat_page(struct f2fs_sb_info *sbi,
                         struct page *nat_page, nid_t start_nid)
 {
         struct f2fs_nm_info *nm_i = NM_I(sbi);
         struct f2fs_nat_block *nat_blk = page_address(nat_page);
         block_t blk_addr;
+        unsigned int nat_ofs = NAT_BLOCK_OFFSET(start_nid);
         int i;
 
+        set_bit_le(nat_ofs, nm_i->nat_block_bitmap);
+
         i = start_nid % NAT_ENTRY_PER_BLOCK;
 
         for (; i < NAT_ENTRY_PER_BLOCK; i++, start_nid++) {
+                bool freed = false;
 
                 if (unlikely(start_nid >= nm_i->max_nid))
                         break;
@@ -1802,11 +1860,106 @@ static void scan_nat_page(struct f2fs_sb_info *sbi,
                 blk_addr = le32_to_cpu(nat_blk->entries[i].block_addr);
                 f2fs_bug_on(sbi, blk_addr == NEW_ADDR);
                 if (blk_addr == NULL_ADDR)
-                        add_free_nid(sbi, start_nid, true);
+                        freed = add_free_nid(sbi, start_nid, true);
+                update_free_nid_bitmap(sbi, start_nid, freed);
+        }
+}
+
+static void scan_free_nid_bits(struct f2fs_sb_info *sbi)
+{
+        struct f2fs_nm_info *nm_i = NM_I(sbi);
+        struct curseg_info *curseg = CURSEG_I(sbi, CURSEG_HOT_DATA);
+        struct f2fs_journal *journal = curseg->journal;
+        unsigned int i, idx;
+
+        down_read(&nm_i->nat_tree_lock);
+
+        for (i = 0; i < nm_i->nat_blocks; i++) {
+                if (!test_bit_le(i, nm_i->nat_block_bitmap))
+                        continue;
+                for (idx = 0; idx < NAT_ENTRY_PER_BLOCK; idx++) {
+                        nid_t nid;
+
+                        if (!test_bit_le(idx, nm_i->free_nid_bitmap[i]))
+                                continue;
+
+                        nid = i * NAT_ENTRY_PER_BLOCK + idx;
+                        add_free_nid(sbi, nid, true);
+
+                        if (nm_i->nid_cnt[FREE_NID_LIST] >= MAX_FREE_NIDS)
+                                goto out;
+                }
+        }
+out:
+        down_read(&curseg->journal_rwsem);
+        for (i = 0; i < nats_in_cursum(journal); i++) {
+                block_t addr;
+                nid_t nid;
+
+                addr = le32_to_cpu(nat_in_journal(journal, i).block_addr);
+                nid = le32_to_cpu(nid_in_journal(journal, i));
+                if (addr == NULL_ADDR)
+                        add_free_nid(sbi, nid, true);
+                else
+                        remove_free_nid(sbi, nid);
         }
+        up_read(&curseg->journal_rwsem);
+        up_read(&nm_i->nat_tree_lock);
 }
 
-static void __build_free_nids(struct f2fs_sb_info *sbi, bool sync)
+static int scan_nat_bits(struct f2fs_sb_info *sbi)
+{
+        struct f2fs_nm_info *nm_i = NM_I(sbi);
+        struct page *page;
+        unsigned int i = 0;
+        nid_t nid;
+
+        if (!enabled_nat_bits(sbi, NULL))
+                return -EAGAIN;
+
+        down_read(&nm_i->nat_tree_lock);
+check_empty:
+        i = find_next_bit_le(nm_i->empty_nat_bits, nm_i->nat_blocks, i);
+        if (i >= nm_i->nat_blocks) {
+                i = 0;
+                goto check_partial;
+        }
+
+        for (nid = i * NAT_ENTRY_PER_BLOCK; nid < (i + 1) * NAT_ENTRY_PER_BLOCK;
+                                                                        nid++) {
+                if (unlikely(nid >= nm_i->max_nid))
+                        break;
+                add_free_nid(sbi, nid, true);
+        }
+
+        if (nm_i->nid_cnt[FREE_NID_LIST] >= MAX_FREE_NIDS)
+                goto out;
+        i++;
+        goto check_empty;
+
+check_partial:
+        i = find_next_zero_bit_le(nm_i->full_nat_bits, nm_i->nat_blocks, i);
+        if (i >= nm_i->nat_blocks) {
+                disable_nat_bits(sbi, true);
+                up_read(&nm_i->nat_tree_lock);
+                return -EINVAL;
+        }
+
+        nid = i * NAT_ENTRY_PER_BLOCK;
+        page = get_current_nat_page(sbi, nid);
+        scan_nat_page(sbi, page, nid);
+        f2fs_put_page(page, 1);
+
+        if (nm_i->nid_cnt[FREE_NID_LIST] < MAX_FREE_NIDS) {
+                i++;
+                goto check_partial;
+        }
+out:
+        up_read(&nm_i->nat_tree_lock);
+        return 0;
+}
+
+static void __build_free_nids(struct f2fs_sb_info *sbi, bool sync, bool mount)
 {
         struct f2fs_nm_info *nm_i = NM_I(sbi);
         struct curseg_info *curseg = CURSEG_I(sbi, CURSEG_HOT_DATA);
@@ -1821,6 +1974,29 @@ static void __build_free_nids(struct f2fs_sb_info *sbi, bool sync)
         if (!sync && !available_free_memory(sbi, FREE_NIDS))
                 return;
 
+        if (!mount) {
+                /* try to find free nids in free_nid_bitmap */
+                scan_free_nid_bits(sbi);
+
+                if (nm_i->nid_cnt[FREE_NID_LIST])
+                        return;
+
+                /* try to find free nids with nat_bits */
+                if (!scan_nat_bits(sbi) && nm_i->nid_cnt[FREE_NID_LIST])
+                        return;
+        }
+
+        /* find next valid candidate */
+        if (enabled_nat_bits(sbi, NULL)) {
+                int idx = find_next_zero_bit_le(nm_i->full_nat_bits,
+                                        nm_i->nat_blocks, 0);
+
+                if (idx >= nm_i->nat_blocks)
+                        set_sbi_flag(sbi, SBI_NEED_FSCK);
+                else
+                        nid = idx * NAT_ENTRY_PER_BLOCK;
+        }
+
         /* readahead nat pages to be scanned */
         ra_meta_pages(sbi, NAT_BLOCK_OFFSET(nid), FREE_NID_PAGES,
                                                         META_NAT, true);
@@ -1863,10 +2039,10 @@ static void __build_free_nids(struct f2fs_sb_info *sbi, bool sync)
                                         nm_i->ra_nid_pages, META_NAT, false);
 }
 
-void build_free_nids(struct f2fs_sb_info *sbi, bool sync)
+void build_free_nids(struct f2fs_sb_info *sbi, bool sync, bool mount)
 {
         mutex_lock(&NM_I(sbi)->build_lock);
-        __build_free_nids(sbi, sync);
+        __build_free_nids(sbi, sync, mount);
         mutex_unlock(&NM_I(sbi)->build_lock);
 }
 
@@ -1881,8 +2057,10 @@ bool alloc_nid(struct f2fs_sb_info *sbi, nid_t *nid)
         struct free_nid *i = NULL;
 retry:
 #ifdef CONFIG_F2FS_FAULT_INJECTION
-        if (time_to_inject(sbi, FAULT_ALLOC_NID))
+        if (time_to_inject(sbi, FAULT_ALLOC_NID)) {
+                f2fs_show_injection_info(FAULT_ALLOC_NID);
                 return false;
+        }
 #endif
         spin_lock(&nm_i->nid_list_lock);
 
@@ -1902,13 +2080,16 @@ retry:
                 i->state = NID_ALLOC;
                 __insert_nid_to_list(sbi, i, ALLOC_NID_LIST, false);
                 nm_i->available_nids--;
+
+                update_free_nid_bitmap(sbi, *nid, false);
+
                 spin_unlock(&nm_i->nid_list_lock);
                 return true;
         }
         spin_unlock(&nm_i->nid_list_lock);
 
         /* Let's scan nat pages and its caches to get free nids */
-        build_free_nids(sbi, true);
+        build_free_nids(sbi, true, false);
         goto retry;
 }
 
@@ -1956,6 +2137,8 @@ void alloc_nid_failed(struct f2fs_sb_info *sbi, nid_t nid)
 
         nm_i->available_nids++;
 
+        update_free_nid_bitmap(sbi, nid, true);
+
         spin_unlock(&nm_i->nid_list_lock);
 
         if (need_free)
@@ -2018,18 +2201,18 @@ update_inode:
         f2fs_put_page(ipage, 1);
 }
 
-void recover_xattr_data(struct inode *inode, struct page *page, block_t blkaddr)
+int recover_xattr_data(struct inode *inode, struct page *page, block_t blkaddr)
 {
         struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
         nid_t prev_xnid = F2FS_I(inode)->i_xattr_nid;
         nid_t new_xnid = nid_of_node(page);
         struct node_info ni;
+        struct page *xpage;
 
-        /* 1: invalidate the previous xattr nid */
         if (!prev_xnid)
                 goto recover_xnid;
 
-        /* Deallocate node address */
+        /* 1: invalidate the previous xattr nid */
         get_node_info(sbi, prev_xnid, &ni);
         f2fs_bug_on(sbi, ni.blk_addr == NULL_ADDR);
         invalidate_blocks(sbi, ni.blk_addr);
@@ -2037,19 +2220,27 @@ void recover_xattr_data(struct inode *inode, struct page *page, block_t blkaddr)
         set_node_addr(sbi, &ni, NULL_ADDR, false);
 
 recover_xnid:
-        /* 2: allocate new xattr nid */
+        /* 2: update xattr nid in inode */
+        remove_free_nid(sbi, new_xnid);
+        f2fs_i_xnid_write(inode, new_xnid);
         if (unlikely(!inc_valid_node_count(sbi, inode)))
                 f2fs_bug_on(sbi, 1);
+        update_inode_page(inode);
+
+        /* 3: update and set xattr node page dirty */
+        xpage = grab_cache_page(NODE_MAPPING(sbi), new_xnid);
+        if (!xpage)
+                return -ENOMEM;
+
+        memcpy(F2FS_NODE(xpage), F2FS_NODE(page), PAGE_SIZE);
 
-        remove_free_nid(sbi, new_xnid);
         get_node_info(sbi, new_xnid, &ni);
         ni.ino = inode->i_ino;
         set_node_addr(sbi, &ni, NEW_ADDR, false);
-        f2fs_i_xnid_write(inode, new_xnid);
+        set_page_dirty(xpage);
+        f2fs_put_page(xpage, 1);
 
-        /* 3: update xattr blkaddr */
-        refresh_sit_entry(sbi, NEW_ADDR, blkaddr);
-        set_node_addr(sbi, &ni, blkaddr, false);
+        return 0;
 }
 
 int recover_inode_page(struct f2fs_sb_info *sbi, struct page *page)
@@ -2152,7 +2343,7 @@ static void remove_nats_in_journal(struct f2fs_sb_info *sbi)
 
                 ne = __lookup_nat_cache(nm_i, nid);
                 if (!ne) {
-                        ne = grab_nat_entry(nm_i, nid);
+                        ne = grab_nat_entry(nm_i, nid, true);
                         node_info_from_raw_nat(&ne->ni, &raw_ne);
                 }
 
@@ -2192,8 +2383,39 @@ add_out:
         list_add_tail(&nes->set_list, head);
 }
 
+void __update_nat_bits(struct f2fs_sb_info *sbi, nid_t start_nid,
+                                                struct page *page)
+{
+        struct f2fs_nm_info *nm_i = NM_I(sbi);
+        unsigned int nat_index = start_nid / NAT_ENTRY_PER_BLOCK;
+        struct f2fs_nat_block *nat_blk = page_address(page);
+        int valid = 0;
+        int i;
+
+        if (!enabled_nat_bits(sbi, NULL))
+                return;
+
+        for (i = 0; i < NAT_ENTRY_PER_BLOCK; i++) {
+                if (start_nid == 0 && i == 0)
+                        valid++;
+                if (nat_blk->entries[i].block_addr)
+                        valid++;
+        }
+        if (valid == 0) {
+                set_bit_le(nat_index, nm_i->empty_nat_bits);
+                clear_bit_le(nat_index, nm_i->full_nat_bits);
+                return;
+        }
+
+        clear_bit_le(nat_index, nm_i->empty_nat_bits);
+        if (valid == NAT_ENTRY_PER_BLOCK)
+                set_bit_le(nat_index, nm_i->full_nat_bits);
+        else
+                clear_bit_le(nat_index, nm_i->full_nat_bits);
+}
+
 static void __flush_nat_entry_set(struct f2fs_sb_info *sbi,
-                                        struct nat_entry_set *set)
+                struct nat_entry_set *set, struct cp_control *cpc)
 {
         struct curseg_info *curseg = CURSEG_I(sbi, CURSEG_HOT_DATA);
         struct f2fs_journal *journal = curseg->journal;
@@ -2208,7 +2430,8 @@ static void __flush_nat_entry_set(struct f2fs_sb_info *sbi,
          * #1, flush nat entries to journal in current hot data summary block.
          * #2, flush nat entries to nat page.
          */
-        if (!__has_cursum_space(journal, set->entry_cnt, NAT_JOURNAL))
+        if (enabled_nat_bits(sbi, cpc) ||
+                !__has_cursum_space(journal, set->entry_cnt, NAT_JOURNAL))
                 to_journal = false;
 
         if (to_journal) {
@@ -2244,14 +2467,21 @@ static void __flush_nat_entry_set(struct f2fs_sb_info *sbi,
                         add_free_nid(sbi, nid, false);
                         spin_lock(&NM_I(sbi)->nid_list_lock);
                         NM_I(sbi)->available_nids++;
+                        update_free_nid_bitmap(sbi, nid, true);
+                        spin_unlock(&NM_I(sbi)->nid_list_lock);
+                } else {
+                        spin_lock(&NM_I(sbi)->nid_list_lock);
+                        update_free_nid_bitmap(sbi, nid, false);
                         spin_unlock(&NM_I(sbi)->nid_list_lock);
                 }
         }
 
-        if (to_journal)
+        if (to_journal) {
                 up_write(&curseg->journal_rwsem);
-        else
+        } else {
+                __update_nat_bits(sbi, start_nid, page);
                 f2fs_put_page(page, 1);
+        }
 
         f2fs_bug_on(sbi, set->entry_cnt);
 
@@ -2262,7 +2492,7 @@ static void __flush_nat_entry_set(struct f2fs_sb_info *sbi,
 /*
  * This function is called during the checkpointing process.
  */
-void flush_nat_entries(struct f2fs_sb_info *sbi)
+void flush_nat_entries(struct f2fs_sb_info *sbi, struct cp_control *cpc)
 {
         struct f2fs_nm_info *nm_i = NM_I(sbi);
         struct curseg_info *curseg = CURSEG_I(sbi, CURSEG_HOT_DATA);
@@ -2283,7 +2513,8 @@ void flush_nat_entries(struct f2fs_sb_info *sbi)
          * entries, remove all entries from journal and merge them
          * into nat entry set.
          */
-        if (!__has_cursum_space(journal, nm_i->dirty_nat_cnt, NAT_JOURNAL))
+        if (enabled_nat_bits(sbi, cpc) ||
+                !__has_cursum_space(journal, nm_i->dirty_nat_cnt, NAT_JOURNAL))
                 remove_nats_in_journal(sbi);
 
         while ((found = __gang_lookup_nat_set(nm_i,
@@ -2297,27 +2528,69 @@ void flush_nat_entries(struct f2fs_sb_info *sbi)
 
         /* flush dirty nats in nat entry set */
         list_for_each_entry_safe(set, tmp, &sets, set_list)
-                __flush_nat_entry_set(sbi, set);
+                __flush_nat_entry_set(sbi, set, cpc);
 
         up_write(&nm_i->nat_tree_lock);
 
         f2fs_bug_on(sbi, nm_i->dirty_nat_cnt);
 }
 
+static int __get_nat_bitmaps(struct f2fs_sb_info *sbi)
+{
+        struct f2fs_checkpoint *ckpt = F2FS_CKPT(sbi);
+        struct f2fs_nm_info *nm_i = NM_I(sbi);
+        unsigned int nat_bits_bytes = nm_i->nat_blocks / BITS_PER_BYTE;
+        unsigned int i;
+        __u64 cp_ver = cur_cp_version(ckpt);
+        block_t nat_bits_addr;
+
+        if (!enabled_nat_bits(sbi, NULL))
+                return 0;
+
+        nm_i->nat_bits_blocks = F2FS_BYTES_TO_BLK((nat_bits_bytes << 1) + 8 +
+                                                F2FS_BLKSIZE - 1);
+        nm_i->nat_bits = kzalloc(nm_i->nat_bits_blocks << F2FS_BLKSIZE_BITS,
+                                                GFP_KERNEL);
+        if (!nm_i->nat_bits)
+                return -ENOMEM;
+
+        nat_bits_addr = __start_cp_addr(sbi) + sbi->blocks_per_seg -
+                                                nm_i->nat_bits_blocks;
+        for (i = 0; i < nm_i->nat_bits_blocks; i++) {
+                struct page *page = get_meta_page(sbi, nat_bits_addr++);
+
+                memcpy(nm_i->nat_bits + (i << F2FS_BLKSIZE_BITS),
+                                        page_address(page), F2FS_BLKSIZE);
+                f2fs_put_page(page, 1);
+        }
+
+        cp_ver |= (cur_cp_crc(ckpt) << 32);
+        if (cpu_to_le64(cp_ver) != *(__le64 *)nm_i->nat_bits) {
+                disable_nat_bits(sbi, true);
+                return 0;
+        }
+
+        nm_i->full_nat_bits = nm_i->nat_bits + 8;
+        nm_i->empty_nat_bits = nm_i->full_nat_bits + nat_bits_bytes;
+
+        f2fs_msg(sbi->sb, KERN_NOTICE, "Found nat_bits in checkpoint");
+        return 0;
+}
+
 static int init_node_manager(struct f2fs_sb_info *sbi)
 {
         struct f2fs_super_block *sb_raw = F2FS_RAW_SUPER(sbi);
         struct f2fs_nm_info *nm_i = NM_I(sbi);
         unsigned char *version_bitmap;
-        unsigned int nat_segs, nat_blocks;
+        unsigned int nat_segs;
+        int err;
 
         nm_i->nat_blkaddr = le32_to_cpu(sb_raw->nat_blkaddr);
 
         /* segment_count_nat includes pair segment so divide to 2. */
         nat_segs = le32_to_cpu(sb_raw->segment_count_nat) >> 1;
-        nat_blocks = nat_segs << le32_to_cpu(sb_raw->log_blocks_per_seg);
-
-        nm_i->max_nid = NAT_ENTRY_PER_BLOCK * nat_blocks;
+        nm_i->nat_blocks = nat_segs << le32_to_cpu(sb_raw->log_blocks_per_seg);
+        nm_i->max_nid = NAT_ENTRY_PER_BLOCK * nm_i->nat_blocks;
 
         /* not used nids: 0, node, meta, (and root counted as valid node) */
         nm_i->available_nids = nm_i->max_nid - sbi->total_valid_node_count -
@@ -2350,6 +2623,34 @@ static int init_node_manager(struct f2fs_sb_info *sbi)
                                         GFP_KERNEL);
         if (!nm_i->nat_bitmap)
                 return -ENOMEM;
+
+        err = __get_nat_bitmaps(sbi);
+        if (err)
+                return err;
+
+#ifdef CONFIG_F2FS_CHECK_FS
+        nm_i->nat_bitmap_mir = kmemdup(version_bitmap, nm_i->bitmap_size,
+                                        GFP_KERNEL);
+        if (!nm_i->nat_bitmap_mir)
+                return -ENOMEM;
+#endif
+
+        return 0;
+}
+
+int init_free_nid_cache(struct f2fs_sb_info *sbi)
+{
+        struct f2fs_nm_info *nm_i = NM_I(sbi);
+
+        nm_i->free_nid_bitmap = f2fs_kvzalloc(nm_i->nat_blocks *
+                                        NAT_ENTRY_BITMAP_SIZE, GFP_KERNEL);
+        if (!nm_i->free_nid_bitmap)
+                return -ENOMEM;
+
+        nm_i->nat_block_bitmap = f2fs_kvzalloc(nm_i->nat_blocks / 8,
+                                                                GFP_KERNEL);
+        if (!nm_i->nat_block_bitmap)
+                return -ENOMEM;
         return 0;
 }
 
@@ -2365,7 +2666,11 @@ int build_node_manager(struct f2fs_sb_info *sbi)
         if (err)
                 return err;
 
-        build_free_nids(sbi, true);
+        err = init_free_nid_cache(sbi);
+        if (err)
+                return err;
+
+        build_free_nids(sbi, true, true);
         return 0;
 }
 
@@ -2423,7 +2728,14 @@ void destroy_node_manager(struct f2fs_sb_info *sbi)
         }
         up_write(&nm_i->nat_tree_lock);
 
+        kvfree(nm_i->nat_block_bitmap);
+        kvfree(nm_i->free_nid_bitmap);
+
         kfree(nm_i->nat_bitmap);
+        kfree(nm_i->nat_bits);
+#ifdef CONFIG_F2FS_CHECK_FS
+        kfree(nm_i->nat_bitmap_mir);
+#endif
         sbi->nm_info = NULL;
         kfree(nm_i);
 }
diff --git a/fs/f2fs/node.h b/fs/f2fs/node.h
index e7997e240366..2f9603fa85a5 100644
--- a/fs/f2fs/node.h
+++ b/fs/f2fs/node.h
@@ -174,7 +174,7 @@ static inline void next_free_nid(struct f2fs_sb_info *sbi, nid_t *nid)
                 spin_unlock(&nm_i->nid_list_lock);
                 return;
         }
-        fnid = list_entry(nm_i->nid_list[FREE_NID_LIST].next,
+        fnid = list_first_entry(&nm_i->nid_list[FREE_NID_LIST],
                                                 struct free_nid, list);
         *nid = fnid->nid;
         spin_unlock(&nm_i->nid_list_lock);
@@ -186,6 +186,12 @@ static inline void next_free_nid(struct f2fs_sb_info *sbi, nid_t *nid)
 static inline void get_nat_bitmap(struct f2fs_sb_info *sbi, void *addr)
 {
         struct f2fs_nm_info *nm_i = NM_I(sbi);
+
+#ifdef CONFIG_F2FS_CHECK_FS
+        if (memcmp(nm_i->nat_bitmap, nm_i->nat_bitmap_mir,
+                                                nm_i->bitmap_size))
+                f2fs_bug_on(sbi, 1);
+#endif
         memcpy(addr, nm_i->nat_bitmap, nm_i->bitmap_size);
 }
 
@@ -228,6 +234,9 @@ static inline void set_to_next_nat(struct f2fs_nm_info *nm_i, nid_t start_nid)
         unsigned int block_off = NAT_BLOCK_OFFSET(start_nid);
 
         f2fs_change_bit(block_off, nm_i->nat_bitmap);
+#ifdef CONFIG_F2FS_CHECK_FS
+        f2fs_change_bit(block_off, nm_i->nat_bitmap_mir);
+#endif
 }
 
 static inline nid_t ino_of_node(struct page *node_page)
@@ -291,14 +300,11 @@ static inline void fill_node_footer_blkaddr(struct page *page, block_t blkaddr)
 {
         struct f2fs_checkpoint *ckpt = F2FS_CKPT(F2FS_P_SB(page));
         struct f2fs_node *rn = F2FS_NODE(page);
-        size_t crc_offset = le32_to_cpu(ckpt->checksum_offset);
-        __u64 cp_ver = le64_to_cpu(ckpt->checkpoint_ver);
+        __u64 cp_ver = cur_cp_version(ckpt);
+
+        if (__is_set_ckpt_flags(ckpt, CP_CRC_RECOVERY_FLAG))
+                cp_ver |= (cur_cp_crc(ckpt) << 32);
 
-        if (__is_set_ckpt_flags(ckpt, CP_CRC_RECOVERY_FLAG)) {
-                __u64 crc = le32_to_cpu(*((__le32 *)
-                                ((unsigned char *)ckpt + crc_offset)));
-                cp_ver |= (crc << 32);
-        }
         rn->footer.cp_ver = cpu_to_le64(cp_ver);
         rn->footer.next_blkaddr = cpu_to_le32(blkaddr);
 }
@@ -306,14 +312,11 @@ static inline void fill_node_footer_blkaddr(struct page *page, block_t blkaddr)
 static inline bool is_recoverable_dnode(struct page *page)
 {
         struct f2fs_checkpoint *ckpt = F2FS_CKPT(F2FS_P_SB(page));
-        size_t crc_offset = le32_to_cpu(ckpt->checksum_offset);
         __u64 cp_ver = cur_cp_version(ckpt);
 
-        if (__is_set_ckpt_flags(ckpt, CP_CRC_RECOVERY_FLAG)) {
-                __u64 crc = le32_to_cpu(*((__le32 *)
-                                ((unsigned char *)ckpt + crc_offset)));
-                cp_ver |= (crc << 32);
-        }
+        if (__is_set_ckpt_flags(ckpt, CP_CRC_RECOVERY_FLAG))
+                cp_ver |= (cur_cp_crc(ckpt) << 32);
+
         return cp_ver == cpver_of_node(page);
 }
 
@@ -343,7 +346,7 @@ static inline bool IS_DNODE(struct page *node_page)
         unsigned int ofs = ofs_of_node(node_page);
 
         if (f2fs_has_xattr_block(ofs))
-                return false;
+                return true;
 
         if (ofs == 3 || ofs == 4 + NIDS_PER_BLOCK ||
                         ofs == 5 + 2 * NIDS_PER_BLOCK)
diff --git a/fs/f2fs/recovery.c b/fs/f2fs/recovery.c
index 981a9584b62f..d025aa83fb5b 100644
--- a/fs/f2fs/recovery.c
+++ b/fs/f2fs/recovery.c
@@ -378,11 +378,9 @@ static int do_recover_data(struct f2fs_sb_info *sbi, struct inode *inode,
         if (IS_INODE(page)) {
                 recover_inline_xattr(inode, page);
         } else if (f2fs_has_xattr_block(ofs_of_node(page))) {
-                /*
-                 * Deprecated; xattr blocks should be found from cold log.
-                 * But, we should remain this for backward compatibility.
-                 */
-                recover_xattr_data(inode, page, blkaddr);
+                err = recover_xattr_data(inode, page, blkaddr);
+                if (!err)
+                        recovered++;
                 goto out;
         }
 
@@ -428,8 +426,9 @@ retry_dn:
                 }
 
                 if (!file_keep_isize(inode) &&
-                                (i_size_read(inode) <= (start << PAGE_SHIFT)))
-                        f2fs_i_size_write(inode, (start + 1) << PAGE_SHIFT);
+                        (i_size_read(inode) <= ((loff_t)start << PAGE_SHIFT)))
+                        f2fs_i_size_write(inode,
+                                (loff_t)(start + 1) << PAGE_SHIFT);
 
                 /*
                  * dest is reserved block, invalidate src block
@@ -552,10 +551,8 @@ next:
 
 int recover_fsync_data(struct f2fs_sb_info *sbi, bool check_only)
 {
-        struct curseg_info *curseg = CURSEG_I(sbi, CURSEG_WARM_NODE);
         struct list_head inode_list;
         struct list_head dir_list;
-        block_t blkaddr;
         int err;
         int ret = 0;
         bool need_writecp = false;
@@ -571,8 +568,6 @@ int recover_fsync_data(struct f2fs_sb_info *sbi, bool check_only)
         /* prevent checkpoint */
         mutex_lock(&sbi->cp_mutex);
 
-        blkaddr = NEXT_FREE_BLKADDR(sbi, curseg);
-
         /* step #1: find fsynced inode numbers */
         err = find_fsync_dnodes(sbi, &inode_list);
         if (err || list_empty(&inode_list))
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 0d8802453758..4bd7a8b19332 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -26,7 +26,7 @@
 #define __reverse_ffz(x) __reverse_ffs(~(x))
 
 static struct kmem_cache *discard_entry_slab;
-static struct kmem_cache *bio_entry_slab;
+static struct kmem_cache *discard_cmd_slab;
 static struct kmem_cache *sit_entry_set_slab;
 static struct kmem_cache *inmem_entry_slab;
 
@@ -242,11 +242,12 @@ void drop_inmem_pages(struct inode *inode)
 {
         struct f2fs_inode_info *fi = F2FS_I(inode);
 
-        clear_inode_flag(inode, FI_ATOMIC_FILE);
-
         mutex_lock(&fi->inmem_lock);
         __revoke_inmem_pages(inode, &fi->inmem_pages, true, false);
         mutex_unlock(&fi->inmem_lock);
+
+        clear_inode_flag(inode, FI_ATOMIC_FILE);
+        stat_dec_atomic_write(inode);
 }
 
 static int __commit_inmem_pages(struct inode *inode,
@@ -262,7 +263,7 @@ static int __commit_inmem_pages(struct inode *inode,
                 .op_flags = REQ_SYNC | REQ_PRIO,
                 .encrypted_page = NULL,
         };
-        bool submit_bio = false;
+        pgoff_t last_idx = ULONG_MAX;
         int err = 0;
 
         list_for_each_entry_safe(cur, tmp, &fi->inmem_pages, list) {
@@ -288,15 +289,15 @@ static int __commit_inmem_pages(struct inode *inode,
 
                         /* record old blkaddr for revoking */
                         cur->old_addr = fio.old_blkaddr;
-
-                        submit_bio = true;
+                        last_idx = page->index;
                 }
                 unlock_page(page);
                 list_move_tail(&cur->list, revoke_list);
         }
 
-        if (submit_bio)
-                f2fs_submit_merged_bio_cond(sbi, inode, NULL, 0, DATA, WRITE);
+        if (last_idx != ULONG_MAX)
+                f2fs_submit_merged_bio_cond(sbi, inode, 0, last_idx,
+                                                        DATA, WRITE);
 
         if (!err)
                 __revoke_inmem_pages(inode, revoke_list, false, false);
@@ -315,6 +316,8 @@ int commit_inmem_pages(struct inode *inode)
         f2fs_balance_fs(sbi, true);
         f2fs_lock_op(sbi);
 
+        set_inode_flag(inode, FI_ATOMIC_COMMIT);
+
         mutex_lock(&fi->inmem_lock);
         err = __commit_inmem_pages(inode, &revoke_list);
         if (err) {
@@ -336,6 +339,8 @@ int commit_inmem_pages(struct inode *inode)
         }
         mutex_unlock(&fi->inmem_lock);
 
+        clear_inode_flag(inode, FI_ATOMIC_COMMIT);
+
         f2fs_unlock_op(sbi);
         return err;
 }
@@ -347,8 +352,10 @@ int commit_inmem_pages(struct inode *inode)
 void f2fs_balance_fs(struct f2fs_sb_info *sbi, bool need)
 {
 #ifdef CONFIG_F2FS_FAULT_INJECTION
-        if (time_to_inject(sbi, FAULT_CHECKPOINT))
+        if (time_to_inject(sbi, FAULT_CHECKPOINT)) {
+                f2fs_show_injection_info(FAULT_CHECKPOINT);
                 f2fs_stop_checkpoint(sbi, false);
+        }
 #endif
 
         if (!need)
@@ -381,7 +388,7 @@ void f2fs_balance_fs_bg(struct f2fs_sb_info *sbi)
         if (!available_free_memory(sbi, FREE_NIDS))
                 try_to_free_nids(sbi, MAX_FREE_NIDS);
         else
-                build_free_nids(sbi, false);
+                build_free_nids(sbi, false, false);
 
         if (!is_idle(sbi))
                 return;
@@ -423,6 +430,9 @@ static int submit_flush_wait(struct f2fs_sb_info *sbi)
 
         if (sbi->s_ndevs && !ret) {
                 for (i = 1; i < sbi->s_ndevs; i++) {
+                        trace_f2fs_issue_flush(FDEV(i).bdev,
+                                        test_opt(sbi, NOBARRIER),
+                                        test_opt(sbi, FLUSH_MERGE));
                         ret = __submit_flush_wait(FDEV(i).bdev);
                         if (ret)
                                 break;
@@ -434,7 +444,7 @@ static int submit_flush_wait(struct f2fs_sb_info *sbi)
 static int issue_flush_thread(void *data)
 {
         struct f2fs_sb_info *sbi = data;
-        struct flush_cmd_control *fcc = SM_I(sbi)->cmd_control_info;
+        struct flush_cmd_control *fcc = SM_I(sbi)->fcc_info;
         wait_queue_head_t *q = &fcc->flush_wait_queue;
 repeat:
         if (kthread_should_stop())
@@ -463,16 +473,16 @@ repeat:
 
 int f2fs_issue_flush(struct f2fs_sb_info *sbi)
 {
-        struct flush_cmd_control *fcc = SM_I(sbi)->cmd_control_info;
+        struct flush_cmd_control *fcc = SM_I(sbi)->fcc_info;
         struct flush_cmd cmd;
 
-        trace_f2fs_issue_flush(sbi->sb, test_opt(sbi, NOBARRIER),
-                                        test_opt(sbi, FLUSH_MERGE));
-
         if (test_opt(sbi, NOBARRIER))
                 return 0;
 
-        if (!test_opt(sbi, FLUSH_MERGE) || !atomic_read(&fcc->submit_flush)) {
+        if (!test_opt(sbi, FLUSH_MERGE))
+                return submit_flush_wait(sbi);
+
+        if (!atomic_read(&fcc->submit_flush)) {
                 int ret;
 
                 atomic_inc(&fcc->submit_flush);
@@ -506,8 +516,8 @@ int create_flush_cmd_control(struct f2fs_sb_info *sbi)
         struct flush_cmd_control *fcc;
         int err = 0;
 
-        if (SM_I(sbi)->cmd_control_info) {
-                fcc = SM_I(sbi)->cmd_control_info;
+        if (SM_I(sbi)->fcc_info) {
+                fcc = SM_I(sbi)->fcc_info;
                 goto init_thread;
         }
 
@@ -517,14 +527,14 @@ int create_flush_cmd_control(struct f2fs_sb_info *sbi)
         atomic_set(&fcc->submit_flush, 0);
         init_waitqueue_head(&fcc->flush_wait_queue);
         init_llist_head(&fcc->issue_list);
-        SM_I(sbi)->cmd_control_info = fcc;
+        SM_I(sbi)->fcc_info = fcc;
 init_thread:
         fcc->f2fs_issue_flush = kthread_run(issue_flush_thread, sbi,
                                 "f2fs_flush-%u:%u", MAJOR(dev), MINOR(dev));
         if (IS_ERR(fcc->f2fs_issue_flush)) {
                 err = PTR_ERR(fcc->f2fs_issue_flush);
                 kfree(fcc);
-                SM_I(sbi)->cmd_control_info = NULL;
+                SM_I(sbi)->fcc_info = NULL;
                 return err;
         }
 
@@ -533,7 +543,7 @@ init_thread:
 
 void destroy_flush_cmd_control(struct f2fs_sb_info *sbi, bool free)
 {
-        struct flush_cmd_control *fcc = SM_I(sbi)->cmd_control_info;
+        struct flush_cmd_control *fcc = SM_I(sbi)->fcc_info;
 
         if (fcc && fcc->f2fs_issue_flush) {
                 struct task_struct *flush_thread = fcc->f2fs_issue_flush;
@@ -543,7 +553,7 @@ void destroy_flush_cmd_control(struct f2fs_sb_info *sbi, bool free)
         }
         if (free) {
                 kfree(fcc);
-                SM_I(sbi)->cmd_control_info = NULL;
+                SM_I(sbi)->fcc_info = NULL;
         }
 }
 
@@ -623,60 +633,144 @@ static void locate_dirty_segment(struct f2fs_sb_info *sbi, unsigned int segno)
         mutex_unlock(&dirty_i->seglist_lock);
 }
 
-static struct bio_entry *__add_bio_entry(struct f2fs_sb_info *sbi,
-                                                        struct bio *bio)
+static void __add_discard_cmd(struct f2fs_sb_info *sbi,
+                        struct bio *bio, block_t lstart, block_t len)
 {
-        struct list_head *wait_list = &(SM_I(sbi)->wait_list);
-        struct bio_entry *be = f2fs_kmem_cache_alloc(bio_entry_slab, GFP_NOFS);
+        struct discard_cmd_control *dcc = SM_I(sbi)->dcc_info;
+        struct list_head *cmd_list = &(dcc->discard_cmd_list);
+        struct discard_cmd *dc;
 
-        INIT_LIST_HEAD(&be->list);
-        be->bio = bio;
-        init_completion(&be->event);
-        list_add_tail(&be->list, wait_list);
+        dc = f2fs_kmem_cache_alloc(discard_cmd_slab, GFP_NOFS);
+        INIT_LIST_HEAD(&dc->list);
+        dc->bio = bio;
+        bio->bi_private = dc;
+        dc->lstart = lstart;
+        dc->len = len;
+        dc->state = D_PREP;
+        init_completion(&dc->wait);
 
-        return be;
+        mutex_lock(&dcc->cmd_lock);
+        list_add_tail(&dc->list, cmd_list);
+        mutex_unlock(&dcc->cmd_lock);
 }
 
-void f2fs_wait_all_discard_bio(struct f2fs_sb_info *sbi)
+static void __remove_discard_cmd(struct f2fs_sb_info *sbi, struct discard_cmd *dc)
 {
-        struct list_head *wait_list = &(SM_I(sbi)->wait_list);
-        struct bio_entry *be, *tmp;
+        int err = dc->bio->bi_error;
 
-        list_for_each_entry_safe(be, tmp, wait_list, list) {
-                struct bio *bio = be->bio;
-                int err;
+        if (dc->state == D_DONE)
+                atomic_dec(&(SM_I(sbi)->dcc_info->submit_discard));
 
-                wait_for_completion_io(&be->event);
-                err = be->error;
-                if (err == -EOPNOTSUPP)
-                        err = 0;
+        if (err == -EOPNOTSUPP)
+                err = 0;
 
-                if (err)
-                        f2fs_msg(sbi->sb, KERN_INFO,
+        if (err)
+                f2fs_msg(sbi->sb, KERN_INFO,
                                 "Issue discard failed, ret: %d", err);
+        bio_put(dc->bio);
+        list_del(&dc->list);
+        kmem_cache_free(discard_cmd_slab, dc);
+}
+
+/* This should be covered by global mutex, &sit_i->sentry_lock */
+void f2fs_wait_discard_bio(struct f2fs_sb_info *sbi, block_t blkaddr)
+{
+        struct discard_cmd_control *dcc = SM_I(sbi)->dcc_info;
+        struct list_head *wait_list = &(dcc->discard_cmd_list);
+        struct discard_cmd *dc, *tmp;
+        struct blk_plug plug;
+
+        mutex_lock(&dcc->cmd_lock);
 
-                bio_put(bio);
-                list_del(&be->list);
-                kmem_cache_free(bio_entry_slab, be);
+        blk_start_plug(&plug);
+
+        list_for_each_entry_safe(dc, tmp, wait_list, list) {
+
+                if (blkaddr == NULL_ADDR) {
+                        if (dc->state == D_PREP) {
+                                dc->state = D_SUBMIT;
+                                submit_bio(dc->bio);
+                                atomic_inc(&dcc->submit_discard);
+                        }
+                        continue;
+                }
+
+                if (dc->lstart <= blkaddr && blkaddr < dc->lstart + dc->len) {
+                        if (dc->state == D_SUBMIT)
+                                wait_for_completion_io(&dc->wait);
+                        else
+                                __remove_discard_cmd(sbi, dc);
+                }
+        }
+        blk_finish_plug(&plug);
+
+        /* this comes from f2fs_put_super */
+        if (blkaddr == NULL_ADDR) {
+                list_for_each_entry_safe(dc, tmp, wait_list, list) {
+                        wait_for_completion_io(&dc->wait);
+                        __remove_discard_cmd(sbi, dc);
+                }
         }
+        mutex_unlock(&dcc->cmd_lock);
+}
+
+static void f2fs_submit_discard_endio(struct bio *bio)
+{
+        struct discard_cmd *dc = (struct discard_cmd *)bio->bi_private;
+
+        complete(&dc->wait);
+        dc->state = D_DONE;
 }
 
-static void f2fs_submit_bio_wait_endio(struct bio *bio)
+static int issue_discard_thread(void *data)
 {
-        struct bio_entry *be = (struct bio_entry *)bio->bi_private;
+        struct f2fs_sb_info *sbi = data;
+        struct discard_cmd_control *dcc = SM_I(sbi)->dcc_info;
+        wait_queue_head_t *q = &dcc->discard_wait_queue;
+        struct list_head *cmd_list = &dcc->discard_cmd_list;
+        struct discard_cmd *dc, *tmp;
+        struct blk_plug plug;
+        int iter = 0;
+repeat:
+        if (kthread_should_stop())
+                return 0;
+
+        blk_start_plug(&plug);
+
+        mutex_lock(&dcc->cmd_lock);
+        list_for_each_entry_safe(dc, tmp, cmd_list, list) {
+                if (dc->state == D_PREP) {
+                        dc->state = D_SUBMIT;
+                        submit_bio(dc->bio);
+                        atomic_inc(&dcc->submit_discard);
+                        if (iter++ > DISCARD_ISSUE_RATE)
+                                break;
+                } else if (dc->state == D_DONE) {
+                        __remove_discard_cmd(sbi, dc);
+                }
+        }
+        mutex_unlock(&dcc->cmd_lock);
+
+        blk_finish_plug(&plug);
+
+        iter = 0;
+        congestion_wait(BLK_RW_SYNC, HZ/50);
 
-        be->error = bio->bi_error;
-        complete(&be->event);
+        wait_event_interruptible(*q,
+                kthread_should_stop() || !list_empty(&dcc->discard_cmd_list));
+        goto repeat;
 }
 
+
 /* this function is copied from blkdev_issue_discard from block/blk-lib.c */
 static int __f2fs_issue_discard_async(struct f2fs_sb_info *sbi,
                 struct block_device *bdev, block_t blkstart, block_t blklen)
 {
         struct bio *bio = NULL;
+        block_t lblkstart = blkstart;
         int err;
 
-        trace_f2fs_issue_discard(sbi->sb, blkstart, blklen);
+        trace_f2fs_issue_discard(bdev, blkstart, blklen);
 
         if (sbi->s_ndevs) {
                 int devi = f2fs_target_device_index(sbi, blkstart);
@@ -688,14 +782,12 @@ static int __f2fs_issue_discard_async(struct f2fs_sb_info *sbi,
                                 SECTOR_FROM_BLOCK(blklen),
                                 GFP_NOFS, 0, &bio);
         if (!err && bio) {
-                struct bio_entry *be = __add_bio_entry(sbi, bio);
-
-                bio->bi_private = be;
-                bio->bi_end_io = f2fs_submit_bio_wait_endio;
+                bio->bi_end_io = f2fs_submit_discard_endio;
                 bio->bi_opf |= REQ_SYNC;
-                submit_bio(bio);
-        }
 
+                __add_discard_cmd(sbi, bio, lblkstart, blklen);
+                wake_up(&SM_I(sbi)->dcc_info->discard_wait_queue);
+        }
         return err;
 }
 
@@ -703,24 +795,13 @@ static int __f2fs_issue_discard_async(struct f2fs_sb_info *sbi,
 static int __f2fs_issue_discard_zone(struct f2fs_sb_info *sbi,
                 struct block_device *bdev, block_t blkstart, block_t blklen)
 {
-        sector_t nr_sects = SECTOR_FROM_BLOCK(blklen);
-        sector_t sector;
+        sector_t sector, nr_sects;
         int devi = 0;
 
         if (sbi->s_ndevs) {
                 devi = f2fs_target_device_index(sbi, blkstart);
                 blkstart -= FDEV(devi).start_blk;
         }
-        sector = SECTOR_FROM_BLOCK(blkstart);
-
-        if (sector & (bdev_zone_sectors(bdev) - 1) ||
-            nr_sects != bdev_zone_sectors(bdev)) {
-                f2fs_msg(sbi->sb, KERN_INFO,
-                        "(%d) %s: Unaligned discard attempted (block %x + %x)",
-                        devi, sbi->s_ndevs ? FDEV(devi).path: "",
-                        blkstart, blklen);
-                return -EIO;
-        }
 
         /*
          * We need to know the type of the zone: for conventional zones,
@@ -735,7 +816,18 @@ static int __f2fs_issue_discard_zone(struct f2fs_sb_info *sbi,
                 return __f2fs_issue_discard_async(sbi, bdev, blkstart, blklen);
         case BLK_ZONE_TYPE_SEQWRITE_REQ:
         case BLK_ZONE_TYPE_SEQWRITE_PREF:
-                trace_f2fs_issue_reset_zone(sbi->sb, blkstart);
+                sector = SECTOR_FROM_BLOCK(blkstart);
+                nr_sects = SECTOR_FROM_BLOCK(blklen);
+
+                if (sector & (bdev_zone_sectors(bdev) - 1) ||
+                                nr_sects != bdev_zone_sectors(bdev)) {
+                        f2fs_msg(sbi->sb, KERN_INFO,
+                                "(%d) %s: Unaligned discard attempted (block %x + %x)",
+                                devi, sbi->s_ndevs ? FDEV(devi).path: "",
+                                blkstart, blklen);
+                        return -EIO;
+                }
+                trace_f2fs_issue_reset_zone(bdev, blkstart);
                 return blkdev_reset_zones(bdev, sector,
                                           nr_sects, GFP_NOFS);
         default:
@@ -800,13 +892,14 @@ static void __add_discard_entry(struct f2fs_sb_info *sbi,
                 struct cp_control *cpc, struct seg_entry *se,
                 unsigned int start, unsigned int end)
 {
-        struct list_head *head = &SM_I(sbi)->discard_list;
+        struct list_head *head = &SM_I(sbi)->dcc_info->discard_entry_list;
         struct discard_entry *new, *last;
 
         if (!list_empty(head)) {
                 last = list_last_entry(head, struct discard_entry, list);
                 if (START_BLOCK(sbi, cpc->trim_start) + start ==
-                                                last->blkaddr + last->len) {
+                                last->blkaddr + last->len &&
+                                last->len < MAX_DISCARD_BLOCKS(sbi)) {
                         last->len += end - start;
                         goto done;
                 }
@@ -818,10 +911,11 @@ static void __add_discard_entry(struct f2fs_sb_info *sbi,
         new->len = end - start;
         list_add_tail(&new->list, head);
 done:
-        SM_I(sbi)->nr_discards += end - start;
+        SM_I(sbi)->dcc_info->nr_discards += end - start;
 }
 
-static void add_discard_addrs(struct f2fs_sb_info *sbi, struct cp_control *cpc)
+static bool add_discard_addrs(struct f2fs_sb_info *sbi, struct cp_control *cpc,
+                                                        bool check_only)
 {
         int entries = SIT_VBLOCK_MAP_SIZE / sizeof(unsigned long);
         int max_blocks = sbi->blocks_per_seg;
@@ -835,12 +929,13 @@ static void add_discard_addrs(struct f2fs_sb_info *sbi, struct cp_control *cpc)
         int i;
 
         if (se->valid_blocks == max_blocks || !f2fs_discard_en(sbi))
-                return;
+                return false;
 
         if (!force) {
                 if (!test_opt(sbi, DISCARD) || !se->valid_blocks ||
-                    SM_I(sbi)->nr_discards >= SM_I(sbi)->max_discards)
-                        return;
+                        SM_I(sbi)->dcc_info->nr_discards >=
+                                SM_I(sbi)->dcc_info->max_discards)
+                        return false;
         }
 
         /* SIT_VBLOCK_MAP_SIZE should be multiple of sizeof(unsigned long) */
@@ -848,7 +943,8 @@ static void add_discard_addrs(struct f2fs_sb_info *sbi, struct cp_control *cpc)
                 dmap[i] = force ? ~ckpt_map[i] & ~discard_map[i] :
                                 (cur_map[i] ^ ckpt_map[i]) & ckpt_map[i];
 
-        while (force || SM_I(sbi)->nr_discards <= SM_I(sbi)->max_discards) {
+        while (force || SM_I(sbi)->dcc_info->nr_discards <=
+                                SM_I(sbi)->dcc_info->max_discards) {
                 start = __find_rev_next_bit(dmap, max_blocks, end + 1);
                 if (start >= max_blocks)
                         break;
@@ -858,13 +954,17 @@ static void add_discard_addrs(struct f2fs_sb_info *sbi, struct cp_control *cpc)
                                         && (end - start) < cpc->trim_minlen)
                         continue;
 
+                if (check_only)
+                        return true;
+
                 __add_discard_entry(sbi, cpc, se, start, end);
         }
+        return false;
 }
 
 void release_discard_addrs(struct f2fs_sb_info *sbi)
 {
-        struct list_head *head = &(SM_I(sbi)->discard_list);
+        struct list_head *head = &(SM_I(sbi)->dcc_info->discard_entry_list);
         struct discard_entry *entry, *this;
 
         /* drop caches */
@@ -890,17 +990,14 @@ static void set_prefree_as_free_segments(struct f2fs_sb_info *sbi)
 
 void clear_prefree_segments(struct f2fs_sb_info *sbi, struct cp_control *cpc)
 {
-        struct list_head *head = &(SM_I(sbi)->discard_list);
+        struct list_head *head = &(SM_I(sbi)->dcc_info->discard_entry_list);
         struct discard_entry *entry, *this;
         struct dirty_seglist_info *dirty_i = DIRTY_I(sbi);
-        struct blk_plug plug;
         unsigned long *prefree_map = dirty_i->dirty_segmap[PRE];
         unsigned int start = 0, end = -1;
         unsigned int secno, start_segno;
         bool force = (cpc->reason == CP_DISCARD);
 
-        blk_start_plug(&plug);
-
         mutex_lock(&dirty_i->seglist_lock);
 
         while (1) {
@@ -916,9 +1013,13 @@ void clear_prefree_segments(struct f2fs_sb_info *sbi, struct cp_control *cpc)
 
                 dirty_i->nr_dirty[PRE] -= end - start;
 
-                if (force || !test_opt(sbi, DISCARD))
+                if (!test_opt(sbi, DISCARD))
                         continue;
 
+                if (force && start >= cpc->trim_start &&
+                                        (end - 1) <= cpc->trim_end)
+                                continue;
+
                 if (!test_opt(sbi, LFS) || sbi->segs_per_sec == 1) {
                         f2fs_issue_discard(sbi, START_BLOCK(sbi, start),
                                 (end - start) << sbi->log_blocks_per_seg);
@@ -935,6 +1036,8 @@ next:
                 start = start_segno + sbi->segs_per_sec;
                 if (start < end)
                         goto next;
+                else
+                        end = start - 1;
         }
         mutex_unlock(&dirty_i->seglist_lock);
 
@@ -946,11 +1049,62 @@ next:
                 cpc->trimmed += entry->len;
 skip:
                 list_del(&entry->list);
-                SM_I(sbi)->nr_discards -= entry->len;
+                SM_I(sbi)->dcc_info->nr_discards -= entry->len;
                 kmem_cache_free(discard_entry_slab, entry);
         }
+}
 
-        blk_finish_plug(&plug);
+static int create_discard_cmd_control(struct f2fs_sb_info *sbi)
+{
+        dev_t dev = sbi->sb->s_bdev->bd_dev;
+        struct discard_cmd_control *dcc;
+        int err = 0;
+
+        if (SM_I(sbi)->dcc_info) {
+                dcc = SM_I(sbi)->dcc_info;
+                goto init_thread;
+        }
+
+        dcc = kzalloc(sizeof(struct discard_cmd_control), GFP_KERNEL);
+        if (!dcc)
+                return -ENOMEM;
+
+        INIT_LIST_HEAD(&dcc->discard_entry_list);
+        INIT_LIST_HEAD(&dcc->discard_cmd_list);
+        mutex_init(&dcc->cmd_lock);
+        atomic_set(&dcc->submit_discard, 0);
+        dcc->nr_discards = 0;
+        dcc->max_discards = 0;
+
+        init_waitqueue_head(&dcc->discard_wait_queue);
+        SM_I(sbi)->dcc_info = dcc;
+init_thread:
+        dcc->f2fs_issue_discard = kthread_run(issue_discard_thread, sbi,
+                                "f2fs_discard-%u:%u", MAJOR(dev), MINOR(dev));
+        if (IS_ERR(dcc->f2fs_issue_discard)) {
+                err = PTR_ERR(dcc->f2fs_issue_discard);
+                kfree(dcc);
+                SM_I(sbi)->dcc_info = NULL;
+                return err;
+        }
+
+        return err;
+}
+
+static void destroy_discard_cmd_control(struct f2fs_sb_info *sbi, bool free)
+{
+        struct discard_cmd_control *dcc = SM_I(sbi)->dcc_info;
+
+        if (dcc && dcc->f2fs_issue_discard) {
+                struct task_struct *discard_thread = dcc->f2fs_issue_discard;
+
+                dcc->f2fs_issue_discard = NULL;
+                kthread_stop(discard_thread);
+        }
+        if (free) {
+                kfree(dcc);
+                SM_I(sbi)->dcc_info = NULL;
+        }
 }
 
 static bool __mark_sit_entry_dirty(struct f2fs_sb_info *sbi, unsigned int segno)
@@ -995,14 +1149,32 @@ static void update_sit_entry(struct f2fs_sb_info *sbi, block_t blkaddr, int del)
 
         /* Update valid block bitmap */
         if (del > 0) {
-                if (f2fs_test_and_set_bit(offset, se->cur_valid_map))
+                if (f2fs_test_and_set_bit(offset, se->cur_valid_map)) {
+#ifdef CONFIG_F2FS_CHECK_FS
+                        if (f2fs_test_and_set_bit(offset,
+                                                se->cur_valid_map_mir))
+                                f2fs_bug_on(sbi, 1);
+                        else
+                                WARN_ON(1);
+#else
                         f2fs_bug_on(sbi, 1);
+#endif
+                }
                 if (f2fs_discard_en(sbi) &&
                         !f2fs_test_and_set_bit(offset, se->discard_map))
                         sbi->discard_blks--;
         } else {
-                if (!f2fs_test_and_clear_bit(offset, se->cur_valid_map))
+                if (!f2fs_test_and_clear_bit(offset, se->cur_valid_map)) {
+#ifdef CONFIG_F2FS_CHECK_FS
+                        if (!f2fs_test_and_clear_bit(offset,
+                                                se->cur_valid_map_mir))
+                                f2fs_bug_on(sbi, 1);
+                        else
+                                WARN_ON(1);
+#else
                         f2fs_bug_on(sbi, 1);
+#endif
+                }
                 if (f2fs_discard_en(sbi) &&
                         f2fs_test_and_clear_bit(offset, se->discard_map))
                         sbi->discard_blks++;
@@ -1167,17 +1339,6 @@ static void write_current_sum_page(struct f2fs_sb_info *sbi,
         f2fs_put_page(page, 1);
 }
 
-static int is_next_segment_free(struct f2fs_sb_info *sbi, int type)
-{
-        struct curseg_info *curseg = CURSEG_I(sbi, type);
-        unsigned int segno = curseg->segno + 1;
-        struct free_segmap_info *free_i = FREE_I(sbi);
-
-        if (segno < MAIN_SEGS(sbi) && segno % sbi->segs_per_sec)
-                return !test_bit(segno, free_i->free_segmap);
-        return 0;
-}
-
 /*
  * Find a new segment from the free segments bitmap to right order
  * This function should be returned with success, otherwise BUG
@@ -1382,16 +1543,39 @@ static int get_ssr_segment(struct f2fs_sb_info *sbi, int type)
 {
         struct curseg_info *curseg = CURSEG_I(sbi, type);
         const struct victim_selection *v_ops = DIRTY_I(sbi)->v_ops;
+        int i, cnt;
+        bool reversed = false;
+
+        /* need_SSR() already forces to do this */
+        if (v_ops->get_victim(sbi, &(curseg)->next_segno, BG_GC, type, SSR))
+                return 1;
 
-        if (IS_NODESEG(type) || !has_not_enough_free_secs(sbi, 0, 0))
-                return v_ops->get_victim(sbi,
-                                &(curseg)->next_segno, BG_GC, type, SSR);
+        /* For node segments, let's do SSR more intensively */
+        if (IS_NODESEG(type)) {
+                if (type >= CURSEG_WARM_NODE) {
+                        reversed = true;
+                        i = CURSEG_COLD_NODE;
+                } else {
+                        i = CURSEG_HOT_NODE;
+                }
+                cnt = NR_CURSEG_NODE_TYPE;
+        } else {
+                if (type >= CURSEG_WARM_DATA) {
+                        reversed = true;
+                        i = CURSEG_COLD_DATA;
+                } else {
+                        i = CURSEG_HOT_DATA;
+                }
+                cnt = NR_CURSEG_DATA_TYPE;
+        }
 
-        /* For data segments, let's do SSR more intensively */
-        for (; type >= CURSEG_HOT_DATA; type--)
+        for (; cnt-- > 0; reversed ? i-- : i++) {
+                if (i == type)
+                        continue;
                 if (v_ops->get_victim(sbi, &(curseg)->next_segno,
-                                                BG_GC, type, SSR))
+                                                BG_GC, i, SSR))
                         return 1;
+        }
         return 0;
 }
 
@@ -1402,20 +1586,17 @@ static int get_ssr_segment(struct f2fs_sb_info *sbi, int type)
 static void allocate_segment_by_default(struct f2fs_sb_info *sbi,
                                                 int type, bool force)
 {
-        struct curseg_info *curseg = CURSEG_I(sbi, type);
-
         if (force)
                 new_curseg(sbi, type, true);
-        else if (type == CURSEG_WARM_NODE)
-                new_curseg(sbi, type, false);
-        else if (curseg->alloc_type == LFS && is_next_segment_free(sbi, type))
+        else if (!is_set_ckpt_flags(sbi, CP_CRC_RECOVERY_FLAG) &&
+                                        type == CURSEG_WARM_NODE)
                 new_curseg(sbi, type, false);
         else if (need_SSR(sbi) && get_ssr_segment(sbi, type))
                 change_curseg(sbi, type, true);
         else
                 new_curseg(sbi, type, false);
 
-        stat_inc_seg_type(sbi, curseg);
+        stat_inc_seg_type(sbi, CURSEG_I(sbi, type));
 }
 
 void allocate_new_segments(struct f2fs_sb_info *sbi)
@@ -1424,9 +1605,6 @@ void allocate_new_segments(struct f2fs_sb_info *sbi)
         unsigned int old_segno;
         int i;
 
-        if (test_opt(sbi, LFS))
-                return;
-
         for (i = CURSEG_HOT_DATA; i <= CURSEG_COLD_DATA; i++) {
                 curseg = CURSEG_I(sbi, i);
                 old_segno = curseg->segno;
@@ -1439,6 +1617,24 @@ static const struct segment_allocation default_salloc_ops = {
         .allocate_segment = allocate_segment_by_default,
 };
 
+bool exist_trim_candidates(struct f2fs_sb_info *sbi, struct cp_control *cpc)
+{
+        __u64 trim_start = cpc->trim_start;
+        bool has_candidate = false;
+
+        mutex_lock(&SIT_I(sbi)->sentry_lock);
+        for (; cpc->trim_start <= cpc->trim_end; cpc->trim_start++) {
+                if (add_discard_addrs(sbi, cpc, true)) {
+                        has_candidate = true;
+                        break;
+                }
+        }
+        mutex_unlock(&SIT_I(sbi)->sentry_lock);
+
+        cpc->trim_start = trim_start;
+        return has_candidate;
+}
+
 int f2fs_trim_fs(struct f2fs_sb_info *sbi, struct fstrim_range *range)
 {
         __u64 start = F2FS_BYTES_TO_BLK(range->start);
@@ -1573,6 +1769,8 @@ void allocate_data_block(struct f2fs_sb_info *sbi, struct page *page,
 
         *new_blkaddr = NEXT_FREE_BLKADDR(sbi, curseg);
 
+        f2fs_wait_discard_bio(sbi, *new_blkaddr);
+
         /*
          * __add_sum_entry should be resided under the curseg_mutex
          * because, this function updates a summary entry in the
@@ -1584,14 +1782,15 @@ void allocate_data_block(struct f2fs_sb_info *sbi, struct page *page,
 
         stat_inc_block_count(sbi, curseg);
 
-        if (!__has_curseg_space(sbi, type))
-                sit_i->s_ops->allocate_segment(sbi, type, false);
         /*
          * SIT information should be updated before segment allocation,
          * since SSR needs latest valid block information.
          */
         refresh_sit_entry(sbi, old_blkaddr, *new_blkaddr);
 
+        if (!__has_curseg_space(sbi, type))
+                sit_i->s_ops->allocate_segment(sbi, type, false);
+
         mutex_unlock(&sit_i->sentry_lock);
 
         if (page && IS_NODESEG(type))
@@ -1603,15 +1802,20 @@ void allocate_data_block(struct f2fs_sb_info *sbi, struct page *page,
 static void do_write_page(struct f2fs_summary *sum, struct f2fs_io_info *fio)
 {
         int type = __get_segment_type(fio->page, fio->type);
+        int err;
 
         if (fio->type == NODE || fio->type == DATA)
                 mutex_lock(&fio->sbi->wio_mutex[fio->type]);
-
+reallocate:
         allocate_data_block(fio->sbi, fio->page, fio->old_blkaddr,
                                         &fio->new_blkaddr, sum, type);
 
         /* writeout dirty page into bdev */
-        f2fs_submit_page_mbio(fio);
+        err = f2fs_submit_page_mbio(fio);
+        if (err == -EAGAIN) {
+                fio->old_blkaddr = fio->new_blkaddr;
+                goto reallocate;
+        }
 
         if (fio->type == NODE || fio->type == DATA)
                 mutex_unlock(&fio->sbi->wio_mutex[fio->type]);
@@ -1753,7 +1957,8 @@ void f2fs_wait_on_page_writeback(struct page *page,
         if (PageWriteback(page)) {
                 struct f2fs_sb_info *sbi = F2FS_P_SB(page);
 
-                f2fs_submit_merged_bio_cond(sbi, NULL, page, 0, type, WRITE);
+                f2fs_submit_merged_bio_cond(sbi, page->mapping->host,
+                                                0, page->index, type, WRITE);
                 if (ordered)
                         wait_on_page_writeback(page);
                 else
@@ -2228,7 +2433,7 @@ void flush_sit_entries(struct f2fs_sb_info *sbi, struct cp_control *cpc)
                         /* add discard candidates */
                         if (cpc->reason != CP_DISCARD) {
                                 cpc->trim_start = segno;
-                                add_discard_addrs(sbi, cpc);
+                                add_discard_addrs(sbi, cpc, false);
                         }
 
                         if (to_journal) {
@@ -2263,8 +2468,12 @@ void flush_sit_entries(struct f2fs_sb_info *sbi, struct cp_control *cpc)
         f2fs_bug_on(sbi, sit_i->dirty_sentries);
 out:
         if (cpc->reason == CP_DISCARD) {
+                __u64 trim_start = cpc->trim_start;
+
                 for (; cpc->trim_start <= cpc->trim_end; cpc->trim_start++)
-                        add_discard_addrs(sbi, cpc);
+                        add_discard_addrs(sbi, cpc, false);
+
+                cpc->trim_start = trim_start;
         }
         mutex_unlock(&sit_i->sentry_lock);
 
@@ -2276,7 +2485,7 @@ static int build_sit_info(struct f2fs_sb_info *sbi)
         struct f2fs_super_block *raw_super = F2FS_RAW_SUPER(sbi);
         struct sit_info *sit_i;
         unsigned int sit_segs, start;
-        char *src_bitmap, *dst_bitmap;
+        char *src_bitmap;
         unsigned int bitmap_size;
 
         /* allocate memory for SIT information */
@@ -2305,6 +2514,13 @@ static int build_sit_info(struct f2fs_sb_info *sbi)
                                 !sit_i->sentries[start].ckpt_valid_map)
                         return -ENOMEM;
 
+#ifdef CONFIG_F2FS_CHECK_FS
+                sit_i->sentries[start].cur_valid_map_mir
+                        = kzalloc(SIT_VBLOCK_MAP_SIZE, GFP_KERNEL);
+                if (!sit_i->sentries[start].cur_valid_map_mir)
+                        return -ENOMEM;
+#endif
+
                 if (f2fs_discard_en(sbi)) {
                         sit_i->sentries[start].discard_map
                                 = kzalloc(SIT_VBLOCK_MAP_SIZE, GFP_KERNEL);
@@ -2331,17 +2547,22 @@ static int build_sit_info(struct f2fs_sb_info *sbi)
         bitmap_size = __bitmap_size(sbi, SIT_BITMAP);
         src_bitmap = __bitmap_ptr(sbi, SIT_BITMAP);
 
-        dst_bitmap = kmemdup(src_bitmap, bitmap_size, GFP_KERNEL);
-        if (!dst_bitmap)
+        sit_i->sit_bitmap = kmemdup(src_bitmap, bitmap_size, GFP_KERNEL);
+        if (!sit_i->sit_bitmap)
                 return -ENOMEM;
 
+#ifdef CONFIG_F2FS_CHECK_FS
+        sit_i->sit_bitmap_mir = kmemdup(src_bitmap, bitmap_size, GFP_KERNEL);
+        if (!sit_i->sit_bitmap_mir)
+                return -ENOMEM;
+#endif
+
         /* init SIT information */
         sit_i->s_ops = &default_salloc_ops;
 
         sit_i->sit_base_addr = le32_to_cpu(raw_super->sit_blkaddr);
         sit_i->sit_blocks = sit_segs << sbi->log_blocks_per_seg;
         sit_i->written_valid_blocks = 0;
-        sit_i->sit_bitmap = dst_bitmap;
         sit_i->bitmap_size = bitmap_size;
         sit_i->dirty_sentries = 0;
         sit_i->sents_per_block = SIT_ENTRY_PER_BLOCK;
@@ -2626,11 +2847,6 @@ int build_segment_manager(struct f2fs_sb_info *sbi)
         sm_info->min_ipu_util = DEF_MIN_IPU_UTIL;
         sm_info->min_fsync_blocks = DEF_MIN_FSYNC_BLOCKS;
 
-        INIT_LIST_HEAD(&sm_info->discard_list);
-        INIT_LIST_HEAD(&sm_info->wait_list);
-        sm_info->nr_discards = 0;
-        sm_info->max_discards = 0;
-
         sm_info->trim_sections = DEF_BATCHED_TRIM_SECTIONS;
 
         INIT_LIST_HEAD(&sm_info->sit_entry_set);
@@ -2641,6 +2857,10 @@ int build_segment_manager(struct f2fs_sb_info *sbi)
                         return err;
         }
 
+        err = create_discard_cmd_control(sbi);
+        if (err)
+                return err;
+
         err = build_sit_info(sbi);
         if (err)
                 return err;
@@ -2734,6 +2954,9 @@ static void destroy_sit_info(struct f2fs_sb_info *sbi)
         if (sit_i->sentries) {
                 for (start = 0; start < MAIN_SEGS(sbi); start++) {
                         kfree(sit_i->sentries[start].cur_valid_map);
+#ifdef CONFIG_F2FS_CHECK_FS
+                        kfree(sit_i->sentries[start].cur_valid_map_mir);
+#endif
                         kfree(sit_i->sentries[start].ckpt_valid_map);
                         kfree(sit_i->sentries[start].discard_map);
                 }
@@ -2746,6 +2969,9 @@ static void destroy_sit_info(struct f2fs_sb_info *sbi)
 
         SM_I(sbi)->sit_info = NULL;
         kfree(sit_i->sit_bitmap);
+#ifdef CONFIG_F2FS_CHECK_FS
+        kfree(sit_i->sit_bitmap_mir);
+#endif
         kfree(sit_i);
 }
 
@@ -2756,6 +2982,7 @@ void destroy_segment_manager(struct f2fs_sb_info *sbi)
         if (!sm_info)
                 return;
         destroy_flush_cmd_control(sbi, true);
+        destroy_discard_cmd_control(sbi, true);
         destroy_dirty_segmap(sbi);
         destroy_curseg(sbi);
         destroy_free_segmap(sbi);
@@ -2771,15 +2998,15 @@ int __init create_segment_manager_caches(void)
         if (!discard_entry_slab)
                 goto fail;
 
-        bio_entry_slab = f2fs_kmem_cache_create("bio_entry",
-                        sizeof(struct bio_entry));
-        if (!bio_entry_slab)
+        discard_cmd_slab = f2fs_kmem_cache_create("discard_cmd",
+                        sizeof(struct discard_cmd));
+        if (!discard_cmd_slab)
                 goto destroy_discard_entry;
 
         sit_entry_set_slab = f2fs_kmem_cache_create("sit_entry_set",
                         sizeof(struct sit_entry_set));
         if (!sit_entry_set_slab)
-                goto destroy_bio_entry;
+                goto destroy_discard_cmd;
 
         inmem_entry_slab = f2fs_kmem_cache_create("inmem_page_entry",
                         sizeof(struct inmem_pages));
@@ -2789,8 +3016,8 @@ int __init create_segment_manager_caches(void)
 
 destroy_sit_entry_set:
         kmem_cache_destroy(sit_entry_set_slab);
-destroy_bio_entry:
-        kmem_cache_destroy(bio_entry_slab);
+destroy_discard_cmd:
+        kmem_cache_destroy(discard_cmd_slab);
 destroy_discard_entry:
         kmem_cache_destroy(discard_entry_slab);
 fail:
@@ -2800,7 +3027,7 @@ fail:
 void destroy_segment_manager_caches(void)
 {
         kmem_cache_destroy(sit_entry_set_slab);
-        kmem_cache_destroy(bio_entry_slab);
+        kmem_cache_destroy(discard_cmd_slab);
         kmem_cache_destroy(discard_entry_slab);
         kmem_cache_destroy(inmem_entry_slab);
 }
diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
index 9d44ce83acb2..5e8ad4280a50 100644
--- a/fs/f2fs/segment.h
+++ b/fs/f2fs/segment.h
@@ -164,6 +164,9 @@ struct seg_entry {
         unsigned int ckpt_valid_blocks:10;      /* # of valid blocks last cp */
         unsigned int padding:6;         /* padding */
         unsigned char *cur_valid_map;   /* validity bitmap of blocks */
+#ifdef CONFIG_F2FS_CHECK_FS
+        unsigned char *cur_valid_map_mir;       /* mirror of current valid bitmap */
+#endif
         /*
          * # of valid blocks and the validity bitmap stored in the the last
          * checkpoint pack. This information is used by the SSR mode.
@@ -186,9 +189,12 @@ struct segment_allocation {
  * the page is atomically written, and it is in inmem_pages list.
  */
 #define ATOMIC_WRITTEN_PAGE             ((unsigned long)-1)
+#define DUMMY_WRITTEN_PAGE              ((unsigned long)-2)
 
 #define IS_ATOMIC_WRITTEN_PAGE(page)                    \
                 (page_private(page) == (unsigned long)ATOMIC_WRITTEN_PAGE)
+#define IS_DUMMY_WRITTEN_PAGE(page)                     \
+                (page_private(page) == (unsigned long)DUMMY_WRITTEN_PAGE)
 
 struct inmem_pages {
         struct list_head list;
@@ -203,6 +209,9 @@ struct sit_info {
         block_t sit_blocks;             /* # of blocks used by SIT area */
         block_t written_valid_blocks;   /* # of valid blocks in main area */
         char *sit_bitmap;               /* SIT bitmap pointer */
+#ifdef CONFIG_F2FS_CHECK_FS
+        char *sit_bitmap_mir;           /* SIT bitmap mirror */
+#endif
         unsigned int bitmap_size;       /* SIT bitmap size */
 
         unsigned long *tmp_map;                 /* bitmap for temporal use */
@@ -317,6 +326,9 @@ static inline void seg_info_from_raw_sit(struct seg_entry *se,
         se->ckpt_valid_blocks = GET_SIT_VBLOCKS(rs);
         memcpy(se->cur_valid_map, rs->valid_map, SIT_VBLOCK_MAP_SIZE);
         memcpy(se->ckpt_valid_map, rs->valid_map, SIT_VBLOCK_MAP_SIZE);
+#ifdef CONFIG_F2FS_CHECK_FS
+        memcpy(se->cur_valid_map_mir, rs->valid_map, SIT_VBLOCK_MAP_SIZE);
+#endif
         se->type = GET_SIT_TYPE(rs);
         se->mtime = le64_to_cpu(rs->mtime);
 }
@@ -414,6 +426,12 @@ static inline void get_sit_bitmap(struct f2fs_sb_info *sbi,
                 void *dst_addr)
 {
         struct sit_info *sit_i = SIT_I(sbi);
+
+#ifdef CONFIG_F2FS_CHECK_FS
+        if (memcmp(sit_i->sit_bitmap, sit_i->sit_bitmap_mir,
+                                                sit_i->bitmap_size))
+                f2fs_bug_on(sbi, 1);
+#endif
         memcpy(dst_addr, sit_i->sit_bitmap, sit_i->bitmap_size);
 }
 
@@ -634,6 +652,12 @@ static inline pgoff_t current_sit_addr(struct f2fs_sb_info *sbi,
 
         check_seg_range(sbi, start);
 
+#ifdef CONFIG_F2FS_CHECK_FS
+        if (f2fs_test_bit(offset, sit_i->sit_bitmap) !=
+                        f2fs_test_bit(offset, sit_i->sit_bitmap_mir))
+                f2fs_bug_on(sbi, 1);
+#endif
+
         /* calculate sit block address */
         if (f2fs_test_bit(offset, sit_i->sit_bitmap))
                 blk_addr += sit_i->sit_blocks;
@@ -659,6 +683,9 @@ static inline void set_to_next_sit(struct sit_info *sit_i, unsigned int start)
         unsigned int block_off = SIT_BLOCK_OFFSET(start);
 
         f2fs_change_bit(block_off, sit_i->sit_bitmap);
+#ifdef CONFIG_F2FS_CHECK_FS
+        f2fs_change_bit(block_off, sit_i->sit_bitmap_mir);
+#endif
 }
 
 static inline unsigned long long get_mtime(struct f2fs_sb_info *sbi)
@@ -689,6 +716,15 @@ static inline block_t sum_blk_addr(struct f2fs_sb_info *sbi, int base, int type)
                                 - (base + 1) + type;
 }
 
+static inline bool no_fggc_candidate(struct f2fs_sb_info *sbi,
+                                                unsigned int secno)
+{
+        if (get_valid_blocks(sbi, secno, sbi->segs_per_sec) >=
+                                                sbi->fggc_threshold)
+                return true;
+        return false;
+}
+
 static inline bool sec_usage_check(struct f2fs_sb_info *sbi, unsigned int secno)
 {
         if (IS_CURSEC(sbi, secno) || (sbi->cur_victim_sec == secno))
@@ -700,8 +736,8 @@ static inline bool sec_usage_check(struct f2fs_sb_info *sbi, unsigned int secno)
  * It is very important to gather dirty pages and write at once, so that we can
  * submit a big bio without interfering other data writes.
  * By default, 512 pages for directory data,
- * 512 pages (2MB) * 3 for three types of nodes, and
- * max_bio_blocks for meta are set.
+ * 512 pages (2MB) * 8 for nodes, and
+ * 256 pages * 8 for meta are set.
  */
 static inline int nr_pages_to_skip(struct f2fs_sb_info *sbi, int type)
 {
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index a831303bb777..96fe8ed73100 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -89,6 +89,7 @@ enum {
         Opt_active_logs,
         Opt_disable_ext_identify,
         Opt_inline_xattr,
+        Opt_noinline_xattr,
         Opt_inline_data,
         Opt_inline_dentry,
         Opt_noinline_dentry,
@@ -101,6 +102,7 @@ enum {
         Opt_noinline_data,
         Opt_data_flush,
         Opt_mode,
+        Opt_io_size_bits,
         Opt_fault_injection,
         Opt_lazytime,
         Opt_nolazytime,
@@ -121,6 +123,7 @@ static match_table_t f2fs_tokens = {
         {Opt_active_logs, "active_logs=%u"},
         {Opt_disable_ext_identify, "disable_ext_identify"},
         {Opt_inline_xattr, "inline_xattr"},
+        {Opt_noinline_xattr, "noinline_xattr"},
         {Opt_inline_data, "inline_data"},
         {Opt_inline_dentry, "inline_dentry"},
         {Opt_noinline_dentry, "noinline_dentry"},
@@ -133,6 +136,7 @@ static match_table_t f2fs_tokens = {
         {Opt_noinline_data, "noinline_data"},
         {Opt_data_flush, "data_flush"},
         {Opt_mode, "mode=%s"},
+        {Opt_io_size_bits, "io_bits=%u"},
         {Opt_fault_injection, "fault_injection=%u"},
         {Opt_lazytime, "lazytime"},
         {Opt_nolazytime, "nolazytime"},
@@ -143,6 +147,7 @@ static match_table_t f2fs_tokens = {
 enum {
         GC_THREAD,      /* struct f2fs_gc_thread */
         SM_INFO,        /* struct f2fs_sm_info */
+        DCC_INFO,       /* struct discard_cmd_control */
         NM_INFO,        /* struct f2fs_nm_info */
         F2FS_SBI,       /* struct f2fs_sb_info */
 #ifdef CONFIG_F2FS_FAULT_INJECTION
@@ -166,6 +171,8 @@ static unsigned char *__struct_ptr(struct f2fs_sb_info *sbi, int struct_type)
                 return (unsigned char *)sbi->gc_thread;
         else if (struct_type == SM_INFO)
                 return (unsigned char *)SM_I(sbi);
+        else if (struct_type == DCC_INFO)
+                return (unsigned char *)SM_I(sbi)->dcc_info;
         else if (struct_type == NM_INFO)
                 return (unsigned char *)NM_I(sbi);
         else if (struct_type == F2FS_SBI)
@@ -281,7 +288,7 @@ F2FS_RW_ATTR(GC_THREAD, f2fs_gc_kthread, gc_max_sleep_time, max_sleep_time);
 F2FS_RW_ATTR(GC_THREAD, f2fs_gc_kthread, gc_no_gc_sleep_time, no_gc_sleep_time);
 F2FS_RW_ATTR(GC_THREAD, f2fs_gc_kthread, gc_idle, gc_idle);
 F2FS_RW_ATTR(SM_INFO, f2fs_sm_info, reclaim_segments, rec_prefree_segments);
-F2FS_RW_ATTR(SM_INFO, f2fs_sm_info, max_small_discards, max_discards);
+F2FS_RW_ATTR(DCC_INFO, discard_cmd_control, max_small_discards, max_discards);
 F2FS_RW_ATTR(SM_INFO, f2fs_sm_info, batched_trim_sections, trim_sections);
 F2FS_RW_ATTR(SM_INFO, f2fs_sm_info, ipu_policy, ipu_policy);
 F2FS_RW_ATTR(SM_INFO, f2fs_sm_info, min_ipu_util, min_ipu_util);
@@ -439,6 +446,9 @@ static int parse_options(struct super_block *sb, char *options)
                 case Opt_inline_xattr:
                         set_opt(sbi, INLINE_XATTR);
                         break;
+                case Opt_noinline_xattr:
+                        clear_opt(sbi, INLINE_XATTR);
+                        break;
 #else
                 case Opt_user_xattr:
                         f2fs_msg(sb, KERN_INFO,
@@ -452,6 +462,10 @@ static int parse_options(struct super_block *sb, char *options)
                         f2fs_msg(sb, KERN_INFO,
                                 "inline_xattr options not supported");
                         break;
+                case Opt_noinline_xattr:
+                        f2fs_msg(sb, KERN_INFO,
+                                "noinline_xattr options not supported");
+                        break;
 #endif
 #ifdef CONFIG_F2FS_FS_POSIX_ACL
                 case Opt_acl:
@@ -535,11 +549,23 @@ static int parse_options(struct super_block *sb, char *options)
                         }
                         kfree(name);
                         break;
+                case Opt_io_size_bits:
+                        if (args->from && match_int(args, &arg))
+                                return -EINVAL;
+                        if (arg > __ilog2_u32(BIO_MAX_PAGES)) {
+                                f2fs_msg(sb, KERN_WARNING,
+                                        "Not support %d, larger than %d",
+                                        1 << arg, BIO_MAX_PAGES);
+                                return -EINVAL;
+                        }
+                        sbi->write_io_size_bits = arg;
+                        break;
                 case Opt_fault_injection:
                         if (args->from && match_int(args, &arg))
                                 return -EINVAL;
 #ifdef CONFIG_F2FS_FAULT_INJECTION
                         f2fs_build_fault_attr(sbi, arg);
+                        set_opt(sbi, FAULT_INJECTION);
 #else
                         f2fs_msg(sb, KERN_INFO,
                                 "FAULT_INJECTION was not selected");
@@ -558,6 +584,13 @@ static int parse_options(struct super_block *sb, char *options)
                         return -EINVAL;
                 }
         }
+
+        if (F2FS_IO_SIZE_BITS(sbi) && !test_opt(sbi, LFS)) {
+                f2fs_msg(sb, KERN_ERR,
+                                "Should set mode=lfs with %uKB-sized IO",
+                                F2FS_IO_SIZE_KB(sbi));
+                return -EINVAL;
+        }
         return 0;
 }
 
@@ -591,6 +624,7 @@ static struct inode *f2fs_alloc_inode(struct super_block *sb)
 
 static int f2fs_drop_inode(struct inode *inode)
 {
+        int ret;
         /*
          * This is to avoid a deadlock condition like below.
          * writeback_single_inode(inode)
@@ -623,10 +657,12 @@ static int f2fs_drop_inode(struct inode *inode)
                         spin_lock(&inode->i_lock);
                         atomic_dec(&inode->i_count);
                 }
+                trace_f2fs_drop_inode(inode, 0);
                 return 0;
         }
-
-        return generic_drop_inode(inode);
+        ret = generic_drop_inode(inode);
+        trace_f2fs_drop_inode(inode, ret);
+        return ret;
 }
 
 int f2fs_inode_dirtied(struct inode *inode, bool sync)
@@ -750,6 +786,9 @@ static void f2fs_put_super(struct super_block *sb)
                 write_checkpoint(sbi, &cpc);
         }
 
+        /* be sure to wait for any on-going discard commands */
+        f2fs_wait_discard_bio(sbi, NULL_ADDR);
+
         /* write_checkpoint can update stat informaion */
         f2fs_destroy_stats(sbi);
 
@@ -782,7 +821,7 @@ static void f2fs_put_super(struct super_block *sb)
         kfree(sbi->raw_super);
 
         destroy_device_list(sbi);
-
+        mempool_destroy(sbi->write_io_dummy);
         destroy_percpu_info(sbi);
         kfree(sbi);
 }
@@ -882,6 +921,8 @@ static int f2fs_show_options(struct seq_file *seq, struct dentry *root)
                 seq_puts(seq, ",nouser_xattr");
         if (test_opt(sbi, INLINE_XATTR))
                 seq_puts(seq, ",inline_xattr");
+        else
+                seq_puts(seq, ",noinline_xattr");
 #endif
 #ifdef CONFIG_F2FS_FS_POSIX_ACL
         if (test_opt(sbi, POSIX_ACL))
@@ -918,6 +959,12 @@ static int f2fs_show_options(struct seq_file *seq, struct dentry *root)
         else if (test_opt(sbi, LFS))
                 seq_puts(seq, "lfs");
         seq_printf(seq, ",active_logs=%u", sbi->active_logs);
+        if (F2FS_IO_SIZE_BITS(sbi))
+                seq_printf(seq, ",io_size=%uKB", F2FS_IO_SIZE_KB(sbi));
+#ifdef CONFIG_F2FS_FAULT_INJECTION
+        if (test_opt(sbi, FAULT_INJECTION))
+                seq_puts(seq, ",fault_injection");
+#endif
 
         return 0;
 }
@@ -995,6 +1042,7 @@ static void default_options(struct f2fs_sb_info *sbi)
         sbi->active_logs = NR_CURSEG_TYPE;
 
         set_opt(sbi, BG_GC);
+        set_opt(sbi, INLINE_XATTR);
         set_opt(sbi, INLINE_DATA);
         set_opt(sbi, INLINE_DENTRY);
         set_opt(sbi, EXTENT_CACHE);
@@ -1686,36 +1734,55 @@ int f2fs_commit_super(struct f2fs_sb_info *sbi, bool recover)
 static int f2fs_scan_devices(struct f2fs_sb_info *sbi)
 {
         struct f2fs_super_block *raw_super = F2FS_RAW_SUPER(sbi);
+        unsigned int max_devices = MAX_DEVICES;
         int i;
 
-        for (i = 0; i < MAX_DEVICES; i++) {
-                if (!RDEV(i).path[0])
+        /* Initialize single device information */
+        if (!RDEV(0).path[0]) {
+                if (!bdev_is_zoned(sbi->sb->s_bdev))
                         return 0;
+                max_devices = 1;
+        }
 
-                if (i == 0) {
-                        sbi->devs = kzalloc(sizeof(struct f2fs_dev_info) *
-                                                MAX_DEVICES, GFP_KERNEL);
-                        if (!sbi->devs)
-                                return -ENOMEM;
-                }
+        /*
+         * Initialize multiple devices information, or single
+         * zoned block device information.
+         */
+        sbi->devs = kcalloc(max_devices, sizeof(struct f2fs_dev_info),
+                                GFP_KERNEL);
+        if (!sbi->devs)
+                return -ENOMEM;
 
-                memcpy(FDEV(i).path, RDEV(i).path, MAX_PATH_LEN);
-                FDEV(i).total_segments = le32_to_cpu(RDEV(i).total_segments);
-                if (i == 0) {
-                        FDEV(i).start_blk = 0;
-                        FDEV(i).end_blk = FDEV(i).start_blk +
-                                (FDEV(i).total_segments <<
-                                sbi->log_blocks_per_seg) - 1 +
-                                le32_to_cpu(raw_super->segment0_blkaddr);
-                } else {
-                        FDEV(i).start_blk = FDEV(i - 1).end_blk + 1;
-                        FDEV(i).end_blk = FDEV(i).start_blk +
-                                (FDEV(i).total_segments <<
-                                sbi->log_blocks_per_seg) - 1;
-                }
+        for (i = 0; i < max_devices; i++) {
 
-                FDEV(i).bdev = blkdev_get_by_path(FDEV(i).path,
+                if (i > 0 && !RDEV(i).path[0])
+                        break;
+
+                if (max_devices == 1) {
+                        /* Single zoned block device mount */
+                        FDEV(0).bdev =
+                                blkdev_get_by_dev(sbi->sb->s_bdev->bd_dev,
+                                        sbi->sb->s_mode, sbi->sb->s_type);
+                } else {
+                        /* Multi-device mount */
+                        memcpy(FDEV(i).path, RDEV(i).path, MAX_PATH_LEN);
+                        FDEV(i).total_segments =
+                                le32_to_cpu(RDEV(i).total_segments);
+                        if (i == 0) {
+                                FDEV(i).start_blk = 0;
+                                FDEV(i).end_blk = FDEV(i).start_blk +
+                                    (FDEV(i).total_segments <<
+                                    sbi->log_blocks_per_seg) - 1 +
+                                    le32_to_cpu(raw_super->segment0_blkaddr);
+                        } else {
+                                FDEV(i).start_blk = FDEV(i - 1).end_blk + 1;
+                                FDEV(i).end_blk = FDEV(i).start_blk +
+                                        (FDEV(i).total_segments <<
+                                        sbi->log_blocks_per_seg) - 1;
+                        }
+                        FDEV(i).bdev = blkdev_get_by_path(FDEV(i).path,
                                         sbi->sb->s_mode, sbi->sb->s_type);
+                }
                 if (IS_ERR(FDEV(i).bdev))
                         return PTR_ERR(FDEV(i).bdev);
 
@@ -1735,6 +1802,8 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi)
                                         "Failed to initialize F2FS blkzone information");
                                 return -EINVAL;
                         }
+                        if (max_devices == 1)
+                                break;
                         f2fs_msg(sbi->sb, KERN_INFO,
                                 "Mount Device [%2d]: %20s, %8u, %8x - %8x (zone: %s)",
                                 i, FDEV(i).path,
@@ -1751,6 +1820,8 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi)
                                 FDEV(i).total_segments,
                                 FDEV(i).start_blk, FDEV(i).end_blk);
         }
+        f2fs_msg(sbi->sb, KERN_INFO,
+                        "IO Block Size: %8d KB", F2FS_IO_SIZE_KB(sbi));
         return 0;
 }
 
@@ -1868,12 +1939,19 @@ try_onemore:
         if (err)
                 goto free_options;
 
+        if (F2FS_IO_SIZE(sbi) > 1) {
+                sbi->write_io_dummy =
+                        mempool_create_page_pool(2 * (F2FS_IO_SIZE(sbi) - 1), 0);
+                if (!sbi->write_io_dummy)
+                        goto free_options;
+        }
+
         /* get an inode for meta space */
         sbi->meta_inode = f2fs_iget(sb, F2FS_META_INO(sbi));
         if (IS_ERR(sbi->meta_inode)) {
                 f2fs_msg(sb, KERN_ERR, "Failed to read F2FS meta data inode");
                 err = PTR_ERR(sbi->meta_inode);
-                goto free_options;
+                goto free_io_dummy;
         }
 
         err = get_valid_checkpoint(sbi);
@@ -2048,6 +2126,8 @@ skip_recovery:
                         sbi->valid_super_block ? 1 : 2, err);
         }
 
+        f2fs_msg(sbi->sb, KERN_NOTICE, "Mounted with checkpoint version = %llx",
+                                cur_cp_version(F2FS_CKPT(sbi)));
         f2fs_update_time(sbi, CP_TIME);
         f2fs_update_time(sbi, REQ_TIME);
         return 0;
@@ -2091,6 +2171,8 @@ free_devices:
 free_meta_inode:
         make_bad_inode(sbi->meta_inode);
         iput(sbi->meta_inode);
+free_io_dummy:
+        mempool_destroy(sbi->write_io_dummy);
 free_options:
         destroy_percpu_info(sbi);
         kfree(options);
diff --git a/fs/f2fs/xattr.c b/fs/f2fs/xattr.c
index c47ce2f330a1..7298a4488f7f 100644
--- a/fs/f2fs/xattr.c
+++ b/fs/f2fs/xattr.c
@@ -217,6 +217,112 @@ static struct f2fs_xattr_entry *__find_xattr(void *base_addr, int index,
         return entry;
 }
 
+static struct f2fs_xattr_entry *__find_inline_xattr(void *base_addr,
+                                        void **last_addr, int index,
+                                        size_t len, const char *name)
+{
+        struct f2fs_xattr_entry *entry;
+        unsigned int inline_size = F2FS_INLINE_XATTR_ADDRS << 2;
+
+        list_for_each_xattr(entry, base_addr) {
+                if ((void *)entry + sizeof(__u32) > base_addr + inline_size ||
+                        (void *)XATTR_NEXT_ENTRY(entry) + sizeof(__u32) >
+                        base_addr + inline_size) {
+                        *last_addr = entry;
+                        return NULL;
+                }
+                if (entry->e_name_index != index)
+                        continue;
+                if (entry->e_name_len != len)
+                        continue;
+                if (!memcmp(entry->e_name, name, len))
+                        break;
+        }
+        return entry;
+}
+
+static int lookup_all_xattrs(struct inode *inode, struct page *ipage,
+                                unsigned int index, unsigned int len,
+                                const char *name, struct f2fs_xattr_entry **xe,
+                                void **base_addr)
+{
+        struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
+        void *cur_addr, *txattr_addr, *last_addr = NULL;
+        nid_t xnid = F2FS_I(inode)->i_xattr_nid;
+        unsigned int size = xnid ? VALID_XATTR_BLOCK_SIZE : 0;
+        unsigned int inline_size = 0;
+        int err = 0;
+
+        inline_size = inline_xattr_size(inode);
+
+        if (!size && !inline_size)
+                return -ENODATA;
+
+        txattr_addr = kzalloc(inline_size + size + sizeof(__u32),
+                                                        GFP_F2FS_ZERO);
+        if (!txattr_addr)
+                return -ENOMEM;
+
+        /* read from inline xattr */
+        if (inline_size) {
+                struct page *page = NULL;
+                void *inline_addr;
+
+                if (ipage) {
+                        inline_addr = inline_xattr_addr(ipage);
+                } else {
+                        page = get_node_page(sbi, inode->i_ino);
+                        if (IS_ERR(page)) {
+                                err = PTR_ERR(page);
+                                goto out;
+                        }
+                        inline_addr = inline_xattr_addr(page);
+                }
+                memcpy(txattr_addr, inline_addr, inline_size);
+                f2fs_put_page(page, 1);
+
+                *xe = __find_inline_xattr(txattr_addr, &last_addr,
+                                                index, len, name);
+                if (*xe)
+                        goto check;
+        }
+
+        /* read from xattr node block */
+        if (xnid) {
+                struct page *xpage;
+                void *xattr_addr;
+
+                /* The inode already has an extended attribute block. */
+                xpage = get_node_page(sbi, xnid);
+                if (IS_ERR(xpage)) {
+                        err = PTR_ERR(xpage);
+                        goto out;
+                }
+
+                xattr_addr = page_address(xpage);
+                memcpy(txattr_addr + inline_size, xattr_addr, size);
+                f2fs_put_page(xpage, 1);
+        }
+
+        if (last_addr)
+                cur_addr = XATTR_HDR(last_addr) - 1;
+        else
+                cur_addr = txattr_addr;
+
+        *xe = __find_xattr(cur_addr, index, len, name);
+check:
+        if (IS_XATTR_LAST_ENTRY(*xe)) {
+                err = -ENODATA;
+                goto out;
+        }
+
+        *base_addr = txattr_addr;
+        return 0;
+out:
+        kzfree(txattr_addr);
+        return err;
+}
+
 static int read_all_xattrs(struct inode *inode, struct page *ipage,
                                                         void **base_addr)
 {
@@ -348,23 +454,20 @@ static inline int write_all_xattrs(struct inode *inode, __u32 hsize,
         }
 
         xattr_addr = page_address(xpage);
-        memcpy(xattr_addr, txattr_addr + inline_size, PAGE_SIZE -
-                                                sizeof(struct node_footer));
+        memcpy(xattr_addr, txattr_addr + inline_size, MAX_XATTR_BLOCK_SIZE);
         set_page_dirty(xpage);
         f2fs_put_page(xpage, 1);
 
-        /* need to checkpoint during fsync */
-        F2FS_I(inode)->xattr_ver = cur_cp_version(F2FS_CKPT(sbi));
         return 0;
 }
 
 int f2fs_getxattr(struct inode *inode, int index, const char *name,
                 void *buffer, size_t buffer_size, struct page *ipage)
 {
-        struct f2fs_xattr_entry *entry;
-        void *base_addr;
+        struct f2fs_xattr_entry *entry = NULL;
         int error = 0;
-        size_t size, len;
+        unsigned int size, len;
+        void *base_addr = NULL;
 
         if (name == NULL)
                 return -EINVAL;
@@ -373,21 +476,16 @@ int f2fs_getxattr(struct inode *inode, int index, const char *name,
         if (len > F2FS_NAME_LEN)
                 return -ERANGE;
 
-        error = read_all_xattrs(inode, ipage, &base_addr);
+        error = lookup_all_xattrs(inode, ipage, index, len, name,
+                                &entry, &base_addr);
         if (error)
                 return error;
 
-        entry = __find_xattr(base_addr, index, len, name);
-        if (IS_XATTR_LAST_ENTRY(entry)) {
-                error = -ENODATA;
-                goto cleanup;
-        }
-
         size = le16_to_cpu(entry->e_value_size);
 
         if (buffer && size > buffer_size) {
                 error = -ERANGE;
-                goto cleanup;
+                goto out;
         }
 
         if (buffer) {
@@ -395,8 +493,7 @@ int f2fs_getxattr(struct inode *inode, int index, const char *name,
                 memcpy(buffer, pval, size);
         }
         error = size;
-
-cleanup:
+out:
         kzfree(base_addr);
         return error;
 }
@@ -445,6 +542,13 @@ cleanup:
         return error;
 }
 
+static bool f2fs_xattr_value_same(struct f2fs_xattr_entry *entry,
+                                        const void *value, size_t size)
+{
+        void *pval = entry->e_name + entry->e_name_len;
+        return (entry->e_value_size == size) && !memcmp(pval, value, size);
+}
+
 static int __f2fs_setxattr(struct inode *inode, int index,
                         const char *name, const void *value, size_t size,
                         struct page *ipage, int flags)
@@ -479,12 +583,17 @@ static int __f2fs_setxattr(struct inode *inode, int index,
 
         found = IS_XATTR_LAST_ENTRY(here) ? 0 : 1;
 
-        if ((flags & XATTR_REPLACE) && !found) {
+        if (found) {
+                if ((flags & XATTR_CREATE)) {
+                        error = -EEXIST;
+                        goto exit;
+                }
+
+                if (f2fs_xattr_value_same(here, value, size))
+                        goto exit;
+        } else if ((flags & XATTR_REPLACE)) {
                 error = -ENODATA;
                 goto exit;
-        } else if ((flags & XATTR_CREATE) && found) {
-                error = -EEXIST;
-                goto exit;
         }
 
         last = here;
diff --git a/fs/f2fs/xattr.h b/fs/f2fs/xattr.h
index f990de20cdcd..d5a94928c116 100644
--- a/fs/f2fs/xattr.h
+++ b/fs/f2fs/xattr.h
@@ -72,9 +72,10 @@ struct f2fs_xattr_entry {
                 for (entry = XATTR_FIRST_ENTRY(addr);\
                                 !IS_XATTR_LAST_ENTRY(entry);\
                                 entry = XATTR_NEXT_ENTRY(entry))
-
-#define MIN_OFFSET(i)   XATTR_ALIGN(inline_xattr_size(i) + PAGE_SIZE -  \
-                                sizeof(struct node_footer) - sizeof(__u32))
+#define MAX_XATTR_BLOCK_SIZE    (PAGE_SIZE - sizeof(struct node_footer))
+#define VALID_XATTR_BLOCK_SIZE  (MAX_XATTR_BLOCK_SIZE - sizeof(__u32))
+#define MIN_OFFSET(i)           XATTR_ALIGN(inline_xattr_size(i) +      \
+                                                VALID_XATTR_BLOCK_SIZE)
 
 #define MAX_VALUE_LEN(i)        (MIN_OFFSET(i) -                        \
                                 sizeof(struct f2fs_xattr_header) -      \
diff --git a/fs/nfs/cache_lib.c b/fs/nfs/cache_lib.c
index 6de15709d024..2ae676f93e6b 100644
--- a/fs/nfs/cache_lib.c
+++ b/fs/nfs/cache_lib.c
@@ -141,8 +141,7 @@ int nfs_cache_register_net(struct net *net, struct cache_detail *cd)
 
 void nfs_cache_unregister_sb(struct super_block *sb, struct cache_detail *cd)
 {
-        if (cd->u.pipefs.dir)
-                sunrpc_cache_unregister_pipefs(cd);
+        sunrpc_cache_unregister_pipefs(cd);
 }
 
 void nfs_cache_unregister_net(struct net *net, struct cache_detail *cd)
diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
index fd0284c1dc32..d051fc3583a9 100644
--- a/fs/nfs/callback_xdr.c
+++ b/fs/nfs/callback_xdr.c
@@ -83,23 +83,15 @@ static __be32 *read_buf(struct xdr_stream *xdr, size_t nbytes)
         return p;
 }
 
-static __be32 decode_string(struct xdr_stream *xdr, unsigned int *len, const char **str)
+static __be32 decode_string(struct xdr_stream *xdr, unsigned int *len,
+                const char **str, size_t maxlen)
 {
-        __be32 *p;
-
-        p = read_buf(xdr, 4);
-        if (unlikely(p == NULL))
-                return htonl(NFS4ERR_RESOURCE);
-        *len = ntohl(*p);
-
-        if (*len != 0) {
-                p = read_buf(xdr, *len);
-                if (unlikely(p == NULL))
-                        return htonl(NFS4ERR_RESOURCE);
-                *str = (const char *)p;
-        } else
-                *str = NULL;
+        ssize_t err;
 
+        err = xdr_stream_decode_opaque_inline(xdr, (void **)str, maxlen);
+        if (err < 0)
+                return cpu_to_be32(NFS4ERR_RESOURCE);
+        *len = err;
         return 0;
 }
 
@@ -162,15 +154,9 @@ static __be32 decode_compound_hdr_arg(struct xdr_stream *xdr, struct cb_compound
         __be32 *p;
         __be32 status;
 
-        status = decode_string(xdr, &hdr->taglen, &hdr->tag);
+        status = decode_string(xdr, &hdr->taglen, &hdr->tag, CB_OP_TAGLEN_MAXSZ);
         if (unlikely(status != 0))
                 return status;
-        /* We do not like overly long tags! */
-        if (hdr->taglen > CB_OP_TAGLEN_MAXSZ) {
-                printk("NFS: NFSv4 CALLBACK %s: client sent tag of length %u\n",
-                                __func__, hdr->taglen);
-                return htonl(NFS4ERR_RESOURCE);
-        }
         p = read_buf(xdr, 12);
         if (unlikely(p == NULL))
                 return htonl(NFS4ERR_RESOURCE);
@@ -582,12 +568,8 @@ out:
 
 static __be32 encode_string(struct xdr_stream *xdr, unsigned int len, const char *str)
 {
-        __be32 *p;
-
-        p = xdr_reserve_space(xdr, 4 + len);
-        if (unlikely(p == NULL))
-                return htonl(NFS4ERR_RESOURCE);
-        xdr_encode_opaque(p, str, len);
+        if (unlikely(xdr_stream_encode_opaque(xdr, str, len) < 0))
+                return cpu_to_be32(NFS4ERR_RESOURCE);
         return 0;
 }
 
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index fad81041f5ab..fb499a3f21b5 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -2002,6 +2002,29 @@ nfs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *dentry)
 }
 EXPORT_SYMBOL_GPL(nfs_link);
 
+static void
+nfs_complete_rename(struct rpc_task *task, struct nfs_renamedata *data)
+{
+        struct dentry *old_dentry = data->old_dentry;
+        struct dentry *new_dentry = data->new_dentry;
+        struct inode *old_inode = d_inode(old_dentry);
+        struct inode *new_inode = d_inode(new_dentry);
+
+        nfs_mark_for_revalidate(old_inode);
+
+        switch (task->tk_status) {
+        case 0:
+                if (new_inode != NULL)
+                        nfs_drop_nlink(new_inode);
+                d_move(old_dentry, new_dentry);
+                nfs_set_verifier(new_dentry,
+                                        nfs_save_change_attribute(data->new_dir));
+                break;
+        case -ENOENT:
+                nfs_dentry_handle_enoent(old_dentry);
+        }
+}
+
 /*
  * RENAME
  * FIXME: Some nfsds, like the Linux user space nfsd, may generate a
@@ -2084,7 +2107,8 @@ int nfs_rename(struct inode *old_dir, struct dentry *old_dentry,
         if (new_inode != NULL)
                 NFS_PROTO(new_inode)->return_delegation(new_inode);
 
-        task = nfs_async_rename(old_dir, new_dir, old_dentry, new_dentry, NULL);
+        task = nfs_async_rename(old_dir, new_dir, old_dentry, new_dentry,
+                                        nfs_complete_rename);
         if (IS_ERR(task)) {
                 error = PTR_ERR(task);
                 goto out;
@@ -2094,21 +2118,11 @@ int nfs_rename(struct inode *old_dir, struct dentry *old_dentry,
         if (error == 0)
                 error = task->tk_status;
         rpc_put_task(task);
-        nfs_mark_for_revalidate(old_inode);
 out:
         if (rehash)
                 d_rehash(rehash);
         trace_nfs_rename_exit(old_dir, old_dentry,
                         new_dir, new_dentry, error);
-        if (!error) {
-                if (new_inode != NULL)
-                        nfs_drop_nlink(new_inode);
-                d_move(old_dentry, new_dentry);
-                nfs_set_verifier(new_dentry,
-                                        nfs_save_change_attribute(new_dir));
-        } else if (error == -ENOENT)
-                nfs_dentry_handle_enoent(old_dentry);
-
         /* new dentry created? */
         if (dentry)
                 dput(dentry);
diff --git a/fs/nfs/filelayout/filelayout.c b/fs/nfs/filelayout/filelayout.c
index 18f98e08544d..44347f4bdc15 100644
--- a/fs/nfs/filelayout/filelayout.c
+++ b/fs/nfs/filelayout/filelayout.c
@@ -305,7 +305,7 @@ static void filelayout_read_prepare(struct rpc_task *task, void *data)
         }
         hdr->pgio_done_cb = filelayout_read_done_cb;
 
-        if (nfs41_setup_sequence(hdr->ds_clp->cl_session,
+        if (nfs4_setup_sequence(hdr->ds_clp,
                         &hdr->args.seq_args,
                         &hdr->res.seq_res,
                         task))
@@ -403,7 +403,7 @@ static void filelayout_write_prepare(struct rpc_task *task, void *data)
                 rpc_exit(task, 0);
                 return;
         }
-        if (nfs41_setup_sequence(hdr->ds_clp->cl_session,
+        if (nfs4_setup_sequence(hdr->ds_clp,
                         &hdr->args.seq_args,
                         &hdr->res.seq_res,
                         task))
@@ -438,7 +438,7 @@ static void filelayout_commit_prepare(struct rpc_task *task, void *data)
 {
         struct nfs_commit_data *wdata = data;
 
-        nfs41_setup_sequence(wdata->ds_clp->cl_session,
+        nfs4_setup_sequence(wdata->ds_clp,
                         &wdata->args.seq_args,
                         &wdata->res.seq_res,
                         task);
diff --git a/fs/nfs/flexfilelayout/flexfilelayout.c b/fs/nfs/flexfilelayout/flexfilelayout.c
index d6acc688df7e..42dedf2d625f 100644
--- a/fs/nfs/flexfilelayout/flexfilelayout.c
+++ b/fs/nfs/flexfilelayout/flexfilelayout.c
@@ -1053,9 +1053,6 @@ static int ff_layout_async_handle_error_v4(struct rpc_task *task,
         struct nfs_client *mds_client = mds_server->nfs_client;
         struct nfs4_slot_table *tbl = &clp->cl_session->fc_slot_table;
 
-        if (task->tk_status >= 0)
-                return 0;
-
         switch (task->tk_status) {
         /* MDS state errors */
         case -NFS4ERR_DELEG_REVOKED:
@@ -1157,9 +1154,6 @@ static int ff_layout_async_handle_error_v3(struct rpc_task *task,
 {
         struct nfs4_deviceid_node *devid = FF_LAYOUT_DEVID_NODE(lseg, idx);
 
-        if (task->tk_status >= 0)
-                return 0;
-
         switch (task->tk_status) {
         /* File access problems. Don't mark the device as unavailable */
         case -EACCES:
@@ -1195,6 +1189,13 @@ static int ff_layout_async_handle_error(struct rpc_task *task,
 {
         int vers = clp->cl_nfs_mod->rpc_vers->number;
 
+        if (task->tk_status >= 0)
+                return 0;
+
+        /* Handle the case of an invalid layout segment */
+        if (!pnfs_is_valid_lseg(lseg))
+                return -NFS4ERR_RESET_TO_PNFS;
+
         switch (vers) {
         case 3:
                 return ff_layout_async_handle_error_v3(task, lseg, idx);
@@ -1384,30 +1385,14 @@ static void ff_layout_read_prepare_v3(struct rpc_task *task, void *data)
         rpc_call_start(task);
 }
 
-static int ff_layout_setup_sequence(struct nfs_client *ds_clp,
-                                    struct nfs4_sequence_args *args,
-                                    struct nfs4_sequence_res *res,
-                                    struct rpc_task *task)
-{
-        if (ds_clp->cl_session)
-                return nfs41_setup_sequence(ds_clp->cl_session,
-                                           args,
-                                           res,
-                                           task);
-        return nfs40_setup_sequence(ds_clp->cl_slot_tbl,
-                                   args,
-                                   res,
-                                   task);
-}
-
 static void ff_layout_read_prepare_v4(struct rpc_task *task, void *data)
 {
         struct nfs_pgio_header *hdr = data;
 
-        if (ff_layout_setup_sequence(hdr->ds_clp,
-                                     &hdr->args.seq_args,
-                                     &hdr->res.seq_res,
-                                     task))
+        if (nfs4_setup_sequence(hdr->ds_clp,
+                                &hdr->args.seq_args,
+                                &hdr->res.seq_res,
+                                task))
                 return;
 
         if (ff_layout_read_prepare_common(task, hdr))
@@ -1578,10 +1563,10 @@ static void ff_layout_write_prepare_v4(struct rpc_task *task, void *data)
 {
         struct nfs_pgio_header *hdr = data;
 
-        if (ff_layout_setup_sequence(hdr->ds_clp,
-                                     &hdr->args.seq_args,
-                                     &hdr->res.seq_res,
-                                     task))
+        if (nfs4_setup_sequence(hdr->ds_clp,
+                                &hdr->args.seq_args,
+                                &hdr->res.seq_res,
+                                task))
                 return;
 
         if (ff_layout_write_prepare_common(task, hdr))
@@ -1667,10 +1652,10 @@ static void ff_layout_commit_prepare_v4(struct rpc_task *task, void *data)
 {
         struct nfs_commit_data *wdata = data;
 
-        if (ff_layout_setup_sequence(wdata->ds_clp,
-                                 &wdata->args.seq_args,
-                                 &wdata->res.seq_res,
-                                 task))
+        if (nfs4_setup_sequence(wdata->ds_clp,
+                                &wdata->args.seq_args,
+                                &wdata->res.seq_res,
+                                task))
                 return;
         ff_layout_commit_prepare_common(task, data);
 }
@@ -1965,10 +1950,7 @@ static int ff_layout_encode_ioerr(struct xdr_stream *xdr,
 static void
 encode_opaque_fixed(struct xdr_stream *xdr, const void *buf, size_t len)
 {
-        __be32 *p;
-
-        p = xdr_reserve_space(xdr, len);
-        xdr_encode_opaque_fixed(p, buf, len);
+        WARN_ON_ONCE(xdr_stream_encode_opaque_fixed(xdr, buf, len) < 0);
 }
 
 static void
@@ -2092,7 +2074,7 @@ ff_layout_free_layoutreturn(struct nfs4_xdr_opaque_data *args)
         kfree(ff_args);
 }
 
-const struct nfs4_xdr_opaque_ops layoutreturn_ops = {
+static const struct nfs4_xdr_opaque_ops layoutreturn_ops = {
         .encode = ff_layout_encode_layoutreturn,
         .free = ff_layout_free_layoutreturn,
 };
diff --git a/fs/nfs/nfs42proc.c b/fs/nfs/nfs42proc.c
index d12ff9385f49..1e486c73ec94 100644
--- a/fs/nfs/nfs42proc.c
+++ b/fs/nfs/nfs42proc.c
@@ -12,6 +12,7 @@
 #include "nfs42.h"
 #include "iostat.h"
 #include "pnfs.h"
+#include "nfs4session.h"
 #include "internal.h"
 
 #define NFSDBG_FACILITY NFSDBG_PROC
@@ -128,30 +129,26 @@ out_unlock:
         return err;
 }
 
-static ssize_t _nfs42_proc_copy(struct file *src, loff_t pos_src,
+static ssize_t _nfs42_proc_copy(struct file *src,
                                 struct nfs_lock_context *src_lock,
-                                struct file *dst, loff_t pos_dst,
+                                struct file *dst,
                                 struct nfs_lock_context *dst_lock,
-                                size_t count)
+                                struct nfs42_copy_args *args,
+                                struct nfs42_copy_res *res)
 {
-        struct nfs42_copy_args args = {
-                .src_fh         = NFS_FH(file_inode(src)),
-                .src_pos        = pos_src,
-                .dst_fh         = NFS_FH(file_inode(dst)),
-                .dst_pos        = pos_dst,
-                .count          = count,
-        };
-        struct nfs42_copy_res res;
         struct rpc_message msg = {
                 .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_COPY],
-                .rpc_argp = &args,
-                .rpc_resp = &res,
+                .rpc_argp = args,
+                .rpc_resp = res,
         };
         struct inode *dst_inode = file_inode(dst);
         struct nfs_server *server = NFS_SERVER(dst_inode);
+        loff_t pos_src = args->src_pos;
+        loff_t pos_dst = args->dst_pos;
+        size_t count = args->count;
         int status;
 
-        status = nfs4_set_rw_stateid(&args.src_stateid, src_lock->open_context,
+        status = nfs4_set_rw_stateid(&args->src_stateid, src_lock->open_context,
                                      src_lock, FMODE_READ);
         if (status)
                 return status;
@@ -161,7 +158,7 @@ static ssize_t _nfs42_proc_copy(struct file *src, loff_t pos_src,
         if (status)
                 return status;
 
-        status = nfs4_set_rw_stateid(&args.dst_stateid, dst_lock->open_context,
+        status = nfs4_set_rw_stateid(&args->dst_stateid, dst_lock->open_context,
                                      dst_lock, FMODE_WRITE);
         if (status)
                 return status;
@@ -171,22 +168,22 @@ static ssize_t _nfs42_proc_copy(struct file *src, loff_t pos_src,
                 return status;
 
         status = nfs4_call_sync(server->client, server, &msg,
-                                &args.seq_args, &res.seq_res, 0);
+                                &args->seq_args, &res->seq_res, 0);
         if (status == -ENOTSUPP)
                 server->caps &= ~NFS_CAP_COPY;
         if (status)
                 return status;
 
-        if (res.write_res.verifier.committed != NFS_FILE_SYNC) {
-                status = nfs_commit_file(dst, &res.write_res.verifier.verifier);
+        if (res->write_res.verifier.committed != NFS_FILE_SYNC) {
+                status = nfs_commit_file(dst, &res->write_res.verifier.verifier);
                 if (status)
                         return status;
         }
 
         truncate_pagecache_range(dst_inode, pos_dst,
-                                 pos_dst + res.write_res.count);
+                                 pos_dst + res->write_res.count);
 
-        return res.write_res.count;
+        return res->write_res.count;
 }
 
 ssize_t nfs42_proc_copy(struct file *src, loff_t pos_src,
@@ -196,8 +193,22 @@ ssize_t nfs42_proc_copy(struct file *src, loff_t pos_src,
         struct nfs_server *server = NFS_SERVER(file_inode(dst));
         struct nfs_lock_context *src_lock;
         struct nfs_lock_context *dst_lock;
-        struct nfs4_exception src_exception = { };
-        struct nfs4_exception dst_exception = { };
+        struct nfs42_copy_args args = {
+                .src_fh         = NFS_FH(file_inode(src)),
+                .src_pos        = pos_src,
+                .dst_fh         = NFS_FH(file_inode(dst)),
+                .dst_pos        = pos_dst,
+                .count          = count,
+        };
+        struct nfs42_copy_res res;
+        struct nfs4_exception src_exception = {
+                .inode          = file_inode(src),
+                .stateid        = &args.src_stateid,
+        };
+        struct nfs4_exception dst_exception = {
+                .inode          = file_inode(dst),
+                .stateid        = &args.dst_stateid,
+        };
         ssize_t err, err2;
 
         if (!nfs_server_capable(file_inode(dst), NFS_CAP_COPY))
@@ -207,7 +218,6 @@ ssize_t nfs42_proc_copy(struct file *src, loff_t pos_src,
         if (IS_ERR(src_lock))
                 return PTR_ERR(src_lock);
 
-        src_exception.inode = file_inode(src);
         src_exception.state = src_lock->open_context->state;
 
         dst_lock = nfs_get_lock_context(nfs_file_open_context(dst));
@@ -216,15 +226,17 @@ ssize_t nfs42_proc_copy(struct file *src, loff_t pos_src,
                 goto out_put_src_lock;
         }
 
-        dst_exception.inode = file_inode(dst);
         dst_exception.state = dst_lock->open_context->state;
 
         do {
                 inode_lock(file_inode(dst));
-                err = _nfs42_proc_copy(src, pos_src, src_lock,
-                                       dst, pos_dst, dst_lock, count);
+                err = _nfs42_proc_copy(src, src_lock,
+                                dst, dst_lock,
+                                &args, &res);
                 inode_unlock(file_inode(dst));
 
+                if (err >= 0)
+                        break;
                 if (err == -ENOTSUPP) {
                         err = -EOPNOTSUPP;
                         break;
@@ -331,9 +343,8 @@ nfs42_layoutstat_prepare(struct rpc_task *task, void *calldata)
         }
         nfs4_stateid_copy(&data->args.stateid, &lo->plh_stateid);
         spin_unlock(&inode->i_lock);
-        nfs41_setup_sequence(nfs4_get_session(server), &data->args.seq_args,
-                             &data->res.seq_res, task);
-
+        nfs4_setup_sequence(server->nfs_client, &data->args.seq_args,
+                            &data->res.seq_res, task);
 }
 
 static void
diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h
index 665165833660..af285cc27ccf 100644
--- a/fs/nfs/nfs4_fs.h
+++ b/fs/nfs/nfs4_fs.h
@@ -273,14 +273,6 @@ extern int nfs4_set_rw_stateid(nfs4_stateid *stateid,
                 fmode_t fmode);
 
 #if defined(CONFIG_NFS_V4_1)
-static inline struct nfs4_session *nfs4_get_session(const struct nfs_server *server)
-{
-        return server->nfs_client->cl_session;
-}
-
-extern int nfs41_setup_sequence(struct nfs4_session *session,
-                struct nfs4_sequence_args *args, struct nfs4_sequence_res *res,
-                struct rpc_task *task);
 extern int nfs41_sequence_done(struct rpc_task *, struct nfs4_sequence_res *);
 extern int nfs4_proc_create_session(struct nfs_client *, struct rpc_cred *);
 extern int nfs4_proc_destroy_session(struct nfs4_session *, struct rpc_cred *);
@@ -357,11 +349,6 @@ nfs4_state_protect_write(struct nfs_client *clp, struct rpc_clnt **clntp,
                 hdr->args.stable = NFS_FILE_SYNC;
 }
 #else /* CONFIG_NFS_v4_1 */
-static inline struct nfs4_session *nfs4_get_session(const struct nfs_server *server)
-{
-        return NULL;
-}
-
 static inline bool
 is_ds_only_client(struct nfs_client *clp)
 {
@@ -466,7 +453,7 @@ extern void nfs_increment_open_seqid(int status, struct nfs_seqid *seqid);
 extern void nfs_increment_lock_seqid(int status, struct nfs_seqid *seqid);
 extern void nfs_release_seqid(struct nfs_seqid *seqid);
 extern void nfs_free_seqid(struct nfs_seqid *seqid);
-extern int nfs40_setup_sequence(struct nfs4_slot_table *tbl,
+extern int nfs4_setup_sequence(const struct nfs_client *client,
                                 struct nfs4_sequence_args *args,
                                 struct nfs4_sequence_res *res,
                                 struct rpc_task *task);
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 0a0eaecf9676..1b183686c6d4 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -577,12 +577,7 @@ nfs4_async_handle_error(struct rpc_task *task, struct nfs_server *server,
 static bool _nfs4_is_integrity_protected(struct nfs_client *clp)
 {
         rpc_authflavor_t flavor = clp->cl_rpcclient->cl_auth->au_flavor;
-
-        if (flavor == RPC_AUTH_GSS_KRB5I ||
-            flavor == RPC_AUTH_GSS_KRB5P)
-                return true;
-
-        return false;
+        return (flavor == RPC_AUTH_GSS_KRB5I) || (flavor == RPC_AUTH_GSS_KRB5P);
 }
 
 static void do_renew_lease(struct nfs_client *clp, unsigned long timestamp)
@@ -622,48 +617,6 @@ static void nfs4_set_sequence_privileged(struct nfs4_sequence_args *args)
         args->sa_privileged = 1;
 }
 
-int nfs40_setup_sequence(struct nfs4_slot_table *tbl,
-                         struct nfs4_sequence_args *args,
-                         struct nfs4_sequence_res *res,
-                         struct rpc_task *task)
-{
-        struct nfs4_slot *slot;
-
-        /* slot already allocated? */
-        if (res->sr_slot != NULL)
-                goto out_start;
-
-        spin_lock(&tbl->slot_tbl_lock);
-        if (nfs4_slot_tbl_draining(tbl) && !args->sa_privileged)
-                goto out_sleep;
-
-        slot = nfs4_alloc_slot(tbl);
-        if (IS_ERR(slot)) {
-                if (slot == ERR_PTR(-ENOMEM))
-                        task->tk_timeout = HZ >> 2;
-                goto out_sleep;
-        }
-        spin_unlock(&tbl->slot_tbl_lock);
-
-        slot->privileged = args->sa_privileged ? 1 : 0;
-        args->sa_slot = slot;
-        res->sr_slot = slot;
-
-out_start:
-        rpc_call_start(task);
-        return 0;
-
-out_sleep:
-        if (args->sa_privileged)
-                rpc_sleep_on_priority(&tbl->slot_tbl_waitq, task,
-                                NULL, RPC_PRIORITY_PRIVILEGED);
-        else
-                rpc_sleep_on(&tbl->slot_tbl_waitq, task, NULL);
-        spin_unlock(&tbl->slot_tbl_lock);
-        return -EAGAIN;
-}
-EXPORT_SYMBOL_GPL(nfs40_setup_sequence);
-
 static void nfs40_sequence_free_slot(struct nfs4_sequence_res *res)
 {
         struct nfs4_slot *slot = res->sr_slot;
@@ -815,10 +768,6 @@ static int nfs41_sequence_process(struct rpc_task *task,
         case -NFS4ERR_SEQ_FALSE_RETRY:
                 ++slot->seq_nr;
                 goto retry_nowait;
-        case -NFS4ERR_DEADSESSION:
-        case -NFS4ERR_BADSESSION:
-                nfs4_schedule_session_recovery(session, res->sr_status);
-                goto retry_nowait;
         default:
                 /* Just update the slot sequence no. */
                 slot->seq_done = 1;
@@ -882,101 +831,14 @@ int nfs4_sequence_done(struct rpc_task *task, struct nfs4_sequence_res *res)
 }
 EXPORT_SYMBOL_GPL(nfs4_sequence_done);
 
-int nfs41_setup_sequence(struct nfs4_session *session,
-                                struct nfs4_sequence_args *args,
-                                struct nfs4_sequence_res *res,
-                                struct rpc_task *task)
-{
-        struct nfs4_slot *slot;
-        struct nfs4_slot_table *tbl;
-
-        dprintk("--> %s\n", __func__);
-        /* slot already allocated? */
-        if (res->sr_slot != NULL)
-                goto out_success;
-
-        tbl = &session->fc_slot_table;
-
-        task->tk_timeout = 0;
-
-        spin_lock(&tbl->slot_tbl_lock);
-        if (test_bit(NFS4_SLOT_TBL_DRAINING, &tbl->slot_tbl_state) &&
-            !args->sa_privileged) {
-                /* The state manager will wait until the slot table is empty */
-                dprintk("%s session is draining\n", __func__);
-                goto out_sleep;
-        }
-
-        slot = nfs4_alloc_slot(tbl);
-        if (IS_ERR(slot)) {
-                /* If out of memory, try again in 1/4 second */
-                if (slot == ERR_PTR(-ENOMEM))
-                        task->tk_timeout = HZ >> 2;
-                dprintk("<-- %s: no free slots\n", __func__);
-                goto out_sleep;
-        }
-        spin_unlock(&tbl->slot_tbl_lock);
-
-        slot->privileged = args->sa_privileged ? 1 : 0;
-        args->sa_slot = slot;
-
-        dprintk("<-- %s slotid=%u seqid=%u\n", __func__,
-                        slot->slot_nr, slot->seq_nr);
-
-        res->sr_slot = slot;
-        res->sr_timestamp = jiffies;
-        res->sr_status_flags = 0;
-        /*
-         * sr_status is only set in decode_sequence, and so will remain
-         * set to 1 if an rpc level failure occurs.
-         */
-        res->sr_status = 1;
-        trace_nfs4_setup_sequence(session, args);
-out_success:
-        rpc_call_start(task);
-        return 0;
-out_sleep:
-        /* Privileged tasks are queued with top priority */
-        if (args->sa_privileged)
-                rpc_sleep_on_priority(&tbl->slot_tbl_waitq, task,
-                                NULL, RPC_PRIORITY_PRIVILEGED);
-        else
-                rpc_sleep_on(&tbl->slot_tbl_waitq, task, NULL);
-        spin_unlock(&tbl->slot_tbl_lock);
-        return -EAGAIN;
-}
-EXPORT_SYMBOL_GPL(nfs41_setup_sequence);
-
-static int nfs4_setup_sequence(const struct nfs_server *server,
-                               struct nfs4_sequence_args *args,
-                               struct nfs4_sequence_res *res,
-                               struct rpc_task *task)
-{
-        struct nfs4_session *session = nfs4_get_session(server);
-        int ret = 0;
-
-        if (!session)
-                return nfs40_setup_sequence(server->nfs_client->cl_slot_tbl,
-                                            args, res, task);
-
-        dprintk("--> %s clp %p session %p sr_slot %u\n",
-                __func__, session->clp, session, res->sr_slot ?
-                        res->sr_slot->slot_nr : NFS4_NO_SLOT);
-
-        ret = nfs41_setup_sequence(session, args, res, task);
-
-        dprintk("<-- %s status=%d\n", __func__, ret);
-        return ret;
-}
-
 static void nfs41_call_sync_prepare(struct rpc_task *task, void *calldata)
 {
         struct nfs4_call_sync_data *data = calldata;
-        struct nfs4_session *session = nfs4_get_session(data->seq_server);
 
         dprintk("--> %s data->seq_server %p\n", __func__, data->seq_server);
 
-        nfs41_setup_sequence(session, data->seq_args, data->seq_res, task);
+        nfs4_setup_sequence(data->seq_server->nfs_client,
+                            data->seq_args, data->seq_res, task);
 }
 
 static void nfs41_call_sync_done(struct rpc_task *task, void *calldata)
@@ -993,15 +855,6 @@ static const struct rpc_call_ops nfs41_call_sync_ops = {
 
 #else   /* !CONFIG_NFS_V4_1 */
 
-static int nfs4_setup_sequence(const struct nfs_server *server,
-                               struct nfs4_sequence_args *args,
-                               struct nfs4_sequence_res *res,
-                               struct rpc_task *task)
-{
-        return nfs40_setup_sequence(server->nfs_client->cl_slot_tbl,
-                                    args, res, task);
-}
-
 static int nfs4_sequence_process(struct rpc_task *task, struct nfs4_sequence_res *res)
 {
         return nfs40_sequence_done(task, res);
@@ -1022,10 +875,68 @@ EXPORT_SYMBOL_GPL(nfs4_sequence_done);
 
 #endif  /* !CONFIG_NFS_V4_1 */
 
+int nfs4_setup_sequence(const struct nfs_client *client,
+                        struct nfs4_sequence_args *args,
+                        struct nfs4_sequence_res *res,
+                        struct rpc_task *task)
+{
+        struct nfs4_session *session = nfs4_get_session(client);
+        struct nfs4_slot_table *tbl  = client->cl_slot_tbl;
+        struct nfs4_slot *slot;
+
+        /* slot already allocated? */
+        if (res->sr_slot != NULL)
+                goto out_start;
+
+        if (session) {
+                tbl = &session->fc_slot_table;
+                task->tk_timeout = 0;
+        }
+
+        spin_lock(&tbl->slot_tbl_lock);
+        /* The state manager will wait until the slot table is empty */
+        if (nfs4_slot_tbl_draining(tbl) && !args->sa_privileged)
+                goto out_sleep;
+
+        slot = nfs4_alloc_slot(tbl);
+        if (IS_ERR(slot)) {
+                /* Try again in 1/4 second */
+                if (slot == ERR_PTR(-ENOMEM))
+                        task->tk_timeout = HZ >> 2;
+                goto out_sleep;
+        }
+        spin_unlock(&tbl->slot_tbl_lock);
+
+        slot->privileged = args->sa_privileged ? 1 : 0;
+        args->sa_slot = slot;
+
+        res->sr_slot = slot;
+        if (session) {
+                res->sr_timestamp = jiffies;
+                res->sr_status_flags = 0;
+                res->sr_status = 1;
+        }
+
+        trace_nfs4_setup_sequence(session, args);
+out_start:
+        rpc_call_start(task);
+        return 0;
+
+out_sleep:
+        if (args->sa_privileged)
+                rpc_sleep_on_priority(&tbl->slot_tbl_waitq, task,
+                                NULL, RPC_PRIORITY_PRIVILEGED);
+        else
+                rpc_sleep_on(&tbl->slot_tbl_waitq, task, NULL);
+        spin_unlock(&tbl->slot_tbl_lock);
+        return -EAGAIN;
+}
+EXPORT_SYMBOL_GPL(nfs4_setup_sequence);
+
 static void nfs40_call_sync_prepare(struct rpc_task *task, void *calldata)
 {
         struct nfs4_call_sync_data *data = calldata;
-        nfs4_setup_sequence(data->seq_server,
+        nfs4_setup_sequence(data->seq_server->nfs_client,
                                 data->seq_args, data->seq_res, task);
 }
 
@@ -1330,14 +1241,6 @@ static void nfs4_opendata_put(struct nfs4_opendata *p)
                 kref_put(&p->kref, nfs4_opendata_free);
 }
 
-static int nfs4_wait_for_completion_rpc_task(struct rpc_task *task)
-{
-        int ret;
-
-        ret = rpc_wait_for_completion_task(task);
-        return ret;
-}
-
 static bool nfs4_mode_match_open_stateid(struct nfs4_state *state,
                 fmode_t fmode)
 {
@@ -1732,17 +1635,15 @@ _nfs4_opendata_reclaim_to_nfs4_state(struct nfs4_opendata *data)
         int ret;
 
         if (!data->rpc_done) {
-                if (data->rpc_status) {
-                        ret = data->rpc_status;
-                        goto err;
-                }
+                if (data->rpc_status)
+                        return ERR_PTR(data->rpc_status);
                 /* cached opens have already been processed */
                 goto update;
         }
 
         ret = nfs_refresh_inode(inode, &data->f_attr);
         if (ret)
-                goto err;
+                return ERR_PTR(ret);
 
         if (data->o_res.delegation_type != 0)
                 nfs4_opendata_check_deleg(data, state);
@@ -1752,9 +1653,6 @@ update:
         atomic_inc(&state->count);
 
         return state;
-err:
-        return ERR_PTR(ret);
-
 }
 
 static struct nfs4_state *
@@ -2048,8 +1946,8 @@ static void nfs4_open_confirm_prepare(struct rpc_task *task, void *calldata)
 {
         struct nfs4_opendata *data = calldata;
 
-        nfs40_setup_sequence(data->o_arg.server->nfs_client->cl_slot_tbl,
-                             &data->c_arg.seq_args, &data->c_res.seq_res, task);
+        nfs4_setup_sequence(data->o_arg.server->nfs_client,
+                           &data->c_arg.seq_args, &data->c_res.seq_res, task);
 }
 
 static void nfs4_open_confirm_done(struct rpc_task *task, void *calldata)
@@ -2124,7 +2022,7 @@ static int _nfs4_proc_open_confirm(struct nfs4_opendata *data)
         task = rpc_run_task(&task_setup_data);
         if (IS_ERR(task))
                 return PTR_ERR(task);
-        status = nfs4_wait_for_completion_rpc_task(task);
+        status = rpc_wait_for_completion_task(task);
         if (status != 0) {
                 data->cancelled = 1;
                 smp_wmb();
@@ -2172,7 +2070,7 @@ static void nfs4_open_prepare(struct rpc_task *task, void *calldata)
                 nfs_copy_fh(&data->o_res.fh, data->o_arg.fh);
         }
         data->timestamp = jiffies;
-        if (nfs4_setup_sequence(data->o_arg.server,
+        if (nfs4_setup_sequence(data->o_arg.server->nfs_client,
                                 &data->o_arg.seq_args,
                                 &data->o_res.seq_res,
                                 task) != 0)
@@ -2289,15 +2187,15 @@ static int nfs4_run_open_task(struct nfs4_opendata *data, int isrecover)
                 data->is_recover = 1;
         }
         task = rpc_run_task(&task_setup_data);
-        if (IS_ERR(task))
-                return PTR_ERR(task);
-        status = nfs4_wait_for_completion_rpc_task(task);
-        if (status != 0) {
-                data->cancelled = 1;
-                smp_wmb();
-        } else
-                status = data->rpc_status;
-        rpc_put_task(task);
+        if (IS_ERR(task))
+                return PTR_ERR(task);
+        status = rpc_wait_for_completion_task(task);
+        if (status != 0) {
+                data->cancelled = 1;
+                smp_wmb();
+        } else
+                status = data->rpc_status;
+        rpc_put_task(task);
 
         return status;
 }
@@ -2306,7 +2204,7 @@ static int _nfs4_recover_proc_open(struct nfs4_opendata *data)
 {
         struct inode *dir = d_inode(data->dir);
         struct nfs_openres *o_res = &data->o_res;
-        int status;
+        int status;
 
         status = nfs4_run_open_task(data, 1);
         if (status != 0 || !data->rpc_done)
@@ -2314,11 +2212,8 @@ static int _nfs4_recover_proc_open(struct nfs4_opendata *data)
 
         nfs_fattr_map_and_free_names(NFS_SERVER(dir), &data->f_attr);
 
-        if (o_res->rflags & NFS4_OPEN_RESULT_CONFIRM) {
+        if (o_res->rflags & NFS4_OPEN_RESULT_CONFIRM)
                 status = _nfs4_proc_open_confirm(data);
-                if (status != 0)
-                        return status;
-        }
 
         return status;
 }
@@ -2412,11 +2307,6 @@ static int _nfs4_proc_open(struct nfs4_opendata *data)
         return 0;
 }
 
-static int nfs4_recover_expired_lease(struct nfs_server *server)
-{
-        return nfs4_client_recover_expired_lease(server->nfs_client);
-}
-
 /*
  * OPEN_EXPIRED:
  *      reclaim state on the server after a network partition.
@@ -2730,6 +2620,7 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata,
         ret = PTR_ERR(state);
         if (IS_ERR(state))
                 goto out;
+        ctx->state = state;
         if (server->caps & NFS_CAP_POSIX_LOCK)
                 set_bit(NFS_STATE_POSIX_LOCKS, &state->flags);
         if (opendata->o_res.rflags & NFS4_OPEN_RESULT_MAY_NOTIFY_LOCK)
@@ -2755,7 +2646,6 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata,
         if (ret != 0)
                 goto out;
 
-        ctx->state = state;
         if (d_inode(dentry) == state->inode) {
                 nfs_inode_attach_open_context(ctx);
                 if (read_seqcount_retry(&sp->so_reclaim_seqcount, seq))
@@ -2794,7 +2684,7 @@ static int _nfs4_do_open(struct inode *dir,
                 dprintk("nfs4_do_open: nfs4_get_state_owner failed!\n");
                 goto out_err;
         }
-        status = nfs4_recover_expired_lease(server);
+        status = nfs4_client_recover_expired_lease(server->nfs_client);
         if (status != 0)
                 goto err_put_state_owner;
         if (d_really_is_positive(dentry))
@@ -2940,12 +2830,12 @@ static int _nfs4_do_setattr(struct inode *inode,
                             struct nfs_open_context *ctx)
 {
         struct nfs_server *server = NFS_SERVER(inode);
-        struct rpc_message msg = {
+        struct rpc_message msg = {
                 .rpc_proc       = &nfs4_procedures[NFSPROC4_CLNT_SETATTR],
                 .rpc_argp       = arg,
                 .rpc_resp       = res,
                 .rpc_cred       = cred,
-        };
+        };
         struct rpc_cred *delegation_cred = NULL;
         unsigned long timestamp = jiffies;
         fmode_t fmode;
@@ -2993,18 +2883,18 @@ static int nfs4_do_setattr(struct inode *inode, struct rpc_cred *cred,
 {
         struct nfs_server *server = NFS_SERVER(inode);
         struct nfs4_state *state = ctx ? ctx->state : NULL;
-        struct nfs_setattrargs  arg = {
-                .fh             = NFS_FH(inode),
-                .iap            = sattr,
+        struct nfs_setattrargs  arg = {
+                .fh             = NFS_FH(inode),
+                .iap            = sattr,
                 .server         = server,
                 .bitmask = server->attr_bitmask,
                 .label          = ilabel,
-        };
-        struct nfs_setattrres  res = {
+        };
+        struct nfs_setattrres  res = {
                 .fattr          = fattr,
                 .label          = olabel,
                 .server         = server,
-        };
+        };
         struct nfs4_exception exception = {
                 .state = state,
                 .inode = inode,
@@ -3118,7 +3008,7 @@ static void nfs4_close_done(struct rpc_task *task, void *data)
                 }
         }
 
-        /* hmm. we are done with the inode, and in the process of freeing
+        /* hmm. we are done with the inode, and in the process of freeing
          * the state_owner. we keep this around to process errors
          */
         switch (task->tk_status) {
@@ -3234,7 +3124,7 @@ static void nfs4_close_prepare(struct rpc_task *task, void *data)
         else if (calldata->arg.bitmask == NULL)
                 calldata->res.fattr = NULL;
         calldata->timestamp = jiffies;
-        if (nfs4_setup_sequence(NFS_SERVER(inode),
+        if (nfs4_setup_sequence(NFS_SERVER(inode)->nfs_client,
                                 &calldata->arg.seq_args,
                                 &calldata->res.seq_res,
                                 task) != 0)
@@ -3522,16 +3412,11 @@ static int nfs4_lookup_root_sec(struct nfs_server *server, struct nfs_fh *fhandl
                 .pseudoflavor = flavor,
         };
         struct rpc_auth *auth;
-        int ret;
 
         auth = rpcauth_create(&auth_args, server->client);
-        if (IS_ERR(auth)) {
-                ret = -EACCES;
-                goto out;
-        }
-        ret = nfs4_lookup_root(server, fhandle, info);
-out:
-        return ret;
+        if (IS_ERR(auth))
+                return -EACCES;
+        return nfs4_lookup_root(server, fhandle, info);
 }
 
 /*
@@ -4114,7 +3999,7 @@ static void nfs4_proc_unlink_setup(struct rpc_message *msg, struct inode *dir)
 
 static void nfs4_proc_unlink_rpc_prepare(struct rpc_task *task, struct nfs_unlinkdata *data)
 {
-        nfs4_setup_sequence(NFS_SB(data->dentry->d_sb),
+        nfs4_setup_sequence(NFS_SB(data->dentry->d_sb)->nfs_client,
                         &data->args.seq_args,
                         &data->res.seq_res,
                         task);
@@ -4148,7 +4033,7 @@ static void nfs4_proc_rename_setup(struct rpc_message *msg, struct inode *dir)
 
 static void nfs4_proc_rename_rpc_prepare(struct rpc_task *task, struct nfs_renamedata *data)
 {
-        nfs4_setup_sequence(NFS_SERVER(data->old_dir),
+        nfs4_setup_sequence(NFS_SERVER(data->old_dir)->nfs_client,
                         &data->args.seq_args,
                         &data->res.seq_res,
                         task);
@@ -4723,7 +4608,7 @@ static void nfs4_proc_read_setup(struct nfs_pgio_header *hdr,
 static int nfs4_proc_pgio_rpc_prepare(struct rpc_task *task,
                                       struct nfs_pgio_header *hdr)
 {
-        if (nfs4_setup_sequence(NFS_SERVER(hdr->inode),
+        if (nfs4_setup_sequence(NFS_SERVER(hdr->inode)->nfs_client,
                         &hdr->args.seq_args,
                         &hdr->res.seq_res,
                         task))
@@ -4822,7 +4707,7 @@ static void nfs4_proc_write_setup(struct nfs_pgio_header *hdr,
 
 static void nfs4_proc_commit_rpc_prepare(struct rpc_task *task, struct nfs_commit_data *data)
 {
-        nfs4_setup_sequence(NFS_SERVER(data->inode),
+        nfs4_setup_sequence(NFS_SERVER(data->inode)->nfs_client,
                         &data->args.seq_args,
                         &data->res.seq_res,
                         task);
@@ -4975,8 +4860,8 @@ static int buf_to_pages_noslab(const void *buf, size_t buflen,
                 if (newpage == NULL)
                         goto unwind;
                 memcpy(page_address(newpage), buf, len);
-                buf += len;
-                buflen -= len;
+                buf += len;
+                buflen -= len;
                 *pages++ = newpage;
                 rc++;
         } while (buflen != 0);
@@ -5069,7 +4954,7 @@ out:
  */
 static ssize_t __nfs4_get_acl_uncached(struct inode *inode, void *buf, size_t buflen)
 {
-        struct page *pages[NFS4ACL_MAXPAGES] = {NULL, };
+        struct page *pages[NFS4ACL_MAXPAGES + 1] = {NULL, };
         struct nfs_getaclargs args = {
                 .fh = NFS_FH(inode),
                 .acl_pages = pages,
@@ -5083,13 +4968,9 @@ static ssize_t __nfs4_get_acl_uncached(struct inode *inode, void *buf, size_t bu
                 .rpc_argp = &args,
                 .rpc_resp = &res,
         };
-        unsigned int npages = DIV_ROUND_UP(buflen, PAGE_SIZE);
+        unsigned int npages = DIV_ROUND_UP(buflen, PAGE_SIZE) + 1;
         int ret = -ENOMEM, i;
 
-        /* As long as we're doing a round trip to the server anyway,
-         * let's be prepared for a page of acl data. */
-        if (npages == 0)
-                npages = 1;
         if (npages > ARRAY_SIZE(pages))
                 return -ERANGE;
 
@@ -5299,8 +5180,8 @@ static int _nfs4_do_set_security_label(struct inode *inode,
         struct nfs_server *server = NFS_SERVER(inode);
         const u32 bitmask[3] = { 0, 0, FATTR4_WORD2_SECURITY_LABEL };
         struct nfs_setattrargs arg = {
-                .fh             = NFS_FH(inode),
-                .iap            = &sattr,
+                .fh             = NFS_FH(inode),
+                .iap            = &sattr,
                 .server         = server,
                 .bitmask        = bitmask,
                 .label          = ilabel,
@@ -5311,9 +5192,9 @@ static int _nfs4_do_set_security_label(struct inode *inode,
                 .server         = server,
         };
         struct rpc_message msg = {
-                .rpc_proc       = &nfs4_procedures[NFSPROC4_CLNT_SETATTR],
-                .rpc_argp       = &arg,
-                .rpc_resp       = &res,
+                .rpc_proc       = &nfs4_procedures[NFSPROC4_CLNT_SETATTR],
+                .rpc_argp       = &arg,
+                .rpc_resp       = &res,
         };
         int status;
 
@@ -5747,7 +5628,7 @@ static void nfs4_delegreturn_prepare(struct rpc_task *task, void *data)
         if (!d_data->lr.roc && nfs4_wait_on_layoutreturn(d_data->inode, task))
                 return;
 
-        nfs4_setup_sequence(d_data->res.server,
+        nfs4_setup_sequence(d_data->res.server->nfs_client,
                         &d_data->args.seq_args,
                         &d_data->res.seq_res,
                         task);
@@ -5817,7 +5698,7 @@ static int _nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, co
                 return PTR_ERR(task);
         if (!issync)
                 goto out;
-        status = nfs4_wait_for_completion_rpc_task(task);
+        status = rpc_wait_for_completion_task(task);
         if (status != 0)
                 goto out;
         status = data->rpc_status;
@@ -5859,8 +5740,8 @@ static int _nfs4_proc_getlk(struct nfs4_state *state, int cmd, struct file_lock
         };
         struct rpc_message msg = {
                 .rpc_proc       = &nfs4_procedures[NFSPROC4_CLNT_LOCKT],
-                .rpc_argp       = &arg,
-                .rpc_resp       = &res,
+                .rpc_argp       = &arg,
+                .rpc_resp       = &res,
                 .rpc_cred       = state->owner->so_cred,
         };
         struct nfs4_lock_state *lsp;
@@ -5989,7 +5870,7 @@ static void nfs4_locku_prepare(struct rpc_task *task, void *data)
                 goto out_no_action;
         }
         calldata->timestamp = jiffies;
-        if (nfs4_setup_sequence(calldata->server,
+        if (nfs4_setup_sequence(calldata->server->nfs_client,
                                 &calldata->arg.seq_args,
                                 &calldata->res.seq_res,
                                 task) != 0)
@@ -6087,7 +5968,7 @@ static int nfs4_proc_unlck(struct nfs4_state *state, int cmd, struct file_lock *
         status = PTR_ERR(task);
         if (IS_ERR(task))
                 goto out;
-        status = nfs4_wait_for_completion_rpc_task(task);
+        status = rpc_wait_for_completion_task(task);
         rpc_put_task(task);
 out:
         request->fl_flags = fl_flags;
@@ -6174,7 +6055,7 @@ static void nfs4_lock_prepare(struct rpc_task *task, void *calldata)
                 goto out_release_open_seqid;
         }
         data->timestamp = jiffies;
-        if (nfs4_setup_sequence(data->server,
+        if (nfs4_setup_sequence(data->server->nfs_client,
                                 &data->arg.seq_args,
                                 &data->res.seq_res,
                                 task) == 0)
@@ -6314,7 +6195,7 @@ static int _nfs4_do_setlk(struct nfs4_state *state, int cmd, struct file_lock *f
         task = rpc_run_task(&task_setup_data);
         if (IS_ERR(task))
                 return PTR_ERR(task);
-        ret = nfs4_wait_for_completion_rpc_task(task);
+        ret = rpc_wait_for_completion_task(task);
         if (ret == 0) {
                 ret = data->rpc_status;
                 if (ret)
@@ -6393,8 +6274,7 @@ static int nfs41_lock_expired(struct nfs4_state *state, struct file_lock *reques
         if (test_bit(NFS_LOCK_INITIALIZED, &lsp->ls_flags) ||
             test_bit(NFS_LOCK_LOST, &lsp->ls_flags))
                 return 0;
-        status = nfs4_lock_expired(state, request);
-        return status;
+        return nfs4_lock_expired(state, request);
 }
 #endif
 
@@ -6640,8 +6520,8 @@ static void nfs4_release_lockowner_prepare(struct rpc_task *task, void *calldata
 {
         struct nfs_release_lockowner_data *data = calldata;
         struct nfs_server *server = data->server;
-        nfs40_setup_sequence(server->nfs_client->cl_slot_tbl,
-                             &data->args.seq_args, &data->res.seq_res, task);
+        nfs4_setup_sequence(server->nfs_client, &data->args.seq_args,
+                           &data->res.seq_res, task);
         data->args.lock_owner.clientid = server->nfs_client->cl_clientid;
         data->timestamp = jiffies;
 }
@@ -7232,11 +7112,9 @@ static bool
 nfs41_same_server_scope(struct nfs41_server_scope *a,
                         struct nfs41_server_scope *b)
 {
-        if (a->server_scope_sz == b->server_scope_sz &&
-            memcmp(a->server_scope, b->server_scope, a->server_scope_sz) == 0)
-                return true;
-
-        return false;
+        if (a->server_scope_sz != b->server_scope_sz)
+                return false;
+        return memcmp(a->server_scope, b->server_scope, a->server_scope_sz) == 0;
 }
 
 static void
@@ -7831,7 +7709,7 @@ static void nfs4_get_lease_time_prepare(struct rpc_task *task,
         dprintk("--> %s\n", __func__);
         /* just setup sequence, do not trigger session recovery
            since we're invoked within one */
-        nfs41_setup_sequence(data->clp->cl_session,
+        nfs4_setup_sequence(data->clp,
                         &data->args->la_seq_args,
                         &data->res->lr_seq_res,
                         task);
@@ -8202,7 +8080,7 @@ static void nfs41_sequence_prepare(struct rpc_task *task, void *data)
         args = task->tk_msg.rpc_argp;
         res = task->tk_msg.rpc_resp;
 
-        nfs41_setup_sequence(clp->cl_session, args, res, task);
+        nfs4_setup_sequence(clp, args, res, task);
 }
 
 static const struct rpc_call_ops nfs41_sequence_ops = {
@@ -8290,7 +8168,7 @@ static void nfs4_reclaim_complete_prepare(struct rpc_task *task, void *data)
 {
         struct nfs4_reclaim_complete_data *calldata = data;
 
-        nfs41_setup_sequence(calldata->clp->cl_session,
+        nfs4_setup_sequence(calldata->clp,
                         &calldata->arg.seq_args,
                         &calldata->res.seq_res,
                         task);
@@ -8382,7 +8260,7 @@ static int nfs41_proc_reclaim_complete(struct nfs_client *clp,
                 status = PTR_ERR(task);
                 goto out;
         }
-        status = nfs4_wait_for_completion_rpc_task(task);
+        status = rpc_wait_for_completion_task(task);
         if (status == 0)
                 status = task->tk_status;
         rpc_put_task(task);
@@ -8397,10 +8275,9 @@ nfs4_layoutget_prepare(struct rpc_task *task, void *calldata)
 {
         struct nfs4_layoutget *lgp = calldata;
         struct nfs_server *server = NFS_SERVER(lgp->args.inode);
-        struct nfs4_session *session = nfs4_get_session(server);
 
         dprintk("--> %s\n", __func__);
-        nfs41_setup_sequence(session, &lgp->args.seq_args,
+        nfs4_setup_sequence(server->nfs_client, &lgp->args.seq_args,
                                 &lgp->res.seq_res, task);
         dprintk("<-- %s\n", __func__);
 }
@@ -8615,7 +8492,7 @@ nfs4_proc_layoutget(struct nfs4_layoutget *lgp, long *timeout, gfp_t gfp_flags)
         task = rpc_run_task(&task_setup_data);
         if (IS_ERR(task))
                 return ERR_CAST(task);
-        status = nfs4_wait_for_completion_rpc_task(task);
+        status = rpc_wait_for_completion_task(task);
         if (status == 0) {
                 status = nfs4_layoutget_handle_exception(task, lgp, &exception);
                 *timeout = exception.timeout;
@@ -8644,7 +8521,7 @@ nfs4_layoutreturn_prepare(struct rpc_task *task, void *calldata)
         struct nfs4_layoutreturn *lrp = calldata;
 
         dprintk("--> %s\n", __func__);
-        nfs41_setup_sequence(lrp->clp->cl_session,
+        nfs4_setup_sequence(lrp->clp,
                         &lrp->args.seq_args,
                         &lrp->res.seq_res,
                         task);
@@ -8794,9 +8671,8 @@ static void nfs4_layoutcommit_prepare(struct rpc_task *task, void *calldata)
 {
         struct nfs4_layoutcommit_data *data = calldata;
         struct nfs_server *server = NFS_SERVER(data->args.inode);
-        struct nfs4_session *session = nfs4_get_session(server);
 
-        nfs41_setup_sequence(session,
+        nfs4_setup_sequence(server->nfs_client,
                         &data->args.seq_args,
                         &data->res.seq_res,
                         task);
@@ -9120,7 +8996,7 @@ struct nfs_free_stateid_data {
 static void nfs41_free_stateid_prepare(struct rpc_task *task, void *calldata)
 {
         struct nfs_free_stateid_data *data = calldata;
-        nfs41_setup_sequence(nfs4_get_session(data->server),
+        nfs4_setup_sequence(data->server->nfs_client,
                         &data->args.seq_args,
                         &data->res.seq_res,
                         task);
@@ -9232,10 +9108,8 @@ static bool nfs41_match_stateid(const nfs4_stateid *s1,
 
         if (s1->seqid == s2->seqid)
                 return true;
-        if (s1->seqid == 0 || s2->seqid == 0)
-                return true;
 
-        return false;
+        return s1->seqid == 0 || s2->seqid == 0;
 }
 
 #endif /* CONFIG_NFS_V4_1 */
diff --git a/fs/nfs/nfs4renewd.c b/fs/nfs/nfs4renewd.c
index 82e77198d17e..1f8c2ae43a8d 100644
--- a/fs/nfs/nfs4renewd.c
+++ b/fs/nfs/nfs4renewd.c
@@ -153,7 +153,7 @@ void nfs4_set_lease_period(struct nfs_client *clp,
         spin_unlock(&clp->cl_lock);
 
         /* Cap maximum reconnect timeout at 1/2 lease period */
-        rpc_cap_max_reconnect_timeout(clp->cl_rpcclient, lease >> 1);
+        rpc_set_connect_timeout(clp->cl_rpcclient, lease, lease >> 1);
 }
 
 /*
diff --git a/fs/nfs/nfs4session.h b/fs/nfs/nfs4session.h
index dae385500005..dfae4880eacb 100644
--- a/fs/nfs/nfs4session.h
+++ b/fs/nfs/nfs4session.h
@@ -103,6 +103,11 @@ static inline bool nfs4_test_locked_slot(const struct nfs4_slot_table *tbl,
         return !!test_bit(slotid, tbl->used_slots);
 }
 
+static inline struct nfs4_session *nfs4_get_session(const struct nfs_client *clp)
+{
+        return clp->cl_session;
+}
+
 #if defined(CONFIG_NFS_V4_1)
 extern void nfs41_set_target_slotid(struct nfs4_slot_table *tbl,
                 u32 target_highest_slotid);
@@ -170,6 +175,8 @@ static inline int nfs4_has_persistent_session(const struct nfs_client *clp)
         return 0;
 }
 
+#define nfs_session_id_hash(session) (0)
+
 #endif /* defined(CONFIG_NFS_V4_1) */
 #endif /* IS_ENABLED(CONFIG_NFS_V4) */
 #endif /* __LINUX_FS_NFS_NFS4SESSION_H */
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index daeb94e3acd4..8156bad6b441 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -868,7 +868,7 @@ static struct nfs4_lock_state *nfs4_get_lock_state(struct nfs4_state *state, fl_
         
         for(;;) {
                 spin_lock(&state->state_lock);
-                lsp = __nfs4_find_lock_state(state, owner, 0);
+                lsp = __nfs4_find_lock_state(state, owner, NULL);
                 if (lsp != NULL)
                         break;
                 if (new != NULL) {
diff --git a/fs/nfs/nfs4trace.h b/fs/nfs/nfs4trace.h
index cfb8f7ce5cf6..845d0eadefc9 100644
--- a/fs/nfs/nfs4trace.h
+++ b/fs/nfs/nfs4trace.h
@@ -241,38 +241,6 @@ DEFINE_NFS4_CLIENTID_EVENT(nfs4_bind_conn_to_session);
 DEFINE_NFS4_CLIENTID_EVENT(nfs4_sequence);
 DEFINE_NFS4_CLIENTID_EVENT(nfs4_reclaim_complete);
 
-TRACE_EVENT(nfs4_setup_sequence,
-                TP_PROTO(
-                        const struct nfs4_session *session,
-                        const struct nfs4_sequence_args *args
-                ),
-                TP_ARGS(session, args),
-
-                TP_STRUCT__entry(
-                        __field(unsigned int, session)
-                        __field(unsigned int, slot_nr)
-                        __field(unsigned int, seq_nr)
-                        __field(unsigned int, highest_used_slotid)
-                ),
-
-                TP_fast_assign(
-                        const struct nfs4_slot *sa_slot = args->sa_slot;
-                        __entry->session = nfs_session_id_hash(&session->sess_id);
-                        __entry->slot_nr = sa_slot->slot_nr;
-                        __entry->seq_nr = sa_slot->seq_nr;
-                        __entry->highest_used_slotid =
-                                        sa_slot->table->highest_used_slotid;
-                ),
-                TP_printk(
-                        "session=0x%08x slot_nr=%u seq_nr=%u "
-                        "highest_used_slotid=%u",
-                        __entry->session,
-                        __entry->slot_nr,
-                        __entry->seq_nr,
-                        __entry->highest_used_slotid
-                )
-);
-
 #define show_nfs4_sequence_status_flags(status) \
         __print_flags((unsigned long)status, "|", \
                 { SEQ4_STATUS_CB_PATH_DOWN, "CB_PATH_DOWN" }, \
@@ -382,6 +350,38 @@ TRACE_EVENT(nfs4_cb_sequence,
 );
 #endif /* CONFIG_NFS_V4_1 */
 
+TRACE_EVENT(nfs4_setup_sequence,
+                TP_PROTO(
+                        const struct nfs4_session *session,
+                        const struct nfs4_sequence_args *args
+                ),
+                TP_ARGS(session, args),
+
+                TP_STRUCT__entry(
+                        __field(unsigned int, session)
+                        __field(unsigned int, slot_nr)
+                        __field(unsigned int, seq_nr)
+                        __field(unsigned int, highest_used_slotid)
+                ),
+
+                TP_fast_assign(
+                        const struct nfs4_slot *sa_slot = args->sa_slot;
+                        __entry->session = session ? nfs_session_id_hash(&session->sess_id) : 0;
+                        __entry->slot_nr = sa_slot->slot_nr;
+                        __entry->seq_nr = sa_slot->seq_nr;
+                        __entry->highest_used_slotid =
+                                        sa_slot->table->highest_used_slotid;
+                ),
+                TP_printk(
+                        "session=0x%08x slot_nr=%u seq_nr=%u "
+                        "highest_used_slotid=%u",
+                        __entry->session,
+                        __entry->slot_nr,
+                        __entry->seq_nr,
+                        __entry->highest_used_slotid
+                )
+);
+
 DECLARE_EVENT_CLASS(nfs4_open_event,
                 TP_PROTO(
                         const struct nfs_open_context *ctx,
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index e9255cb453e6..f0369e362753 100644
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -169,8 +169,10 @@ static int nfs4_stat_to_errno(int);
                                 open_owner_id_maxsz + \
                                 encode_opentype_maxsz + \
                                 encode_claim_null_maxsz)
+#define decode_space_limit_maxsz        (3)
 #define decode_ace_maxsz        (3 + nfs4_owner_maxsz)
 #define decode_delegation_maxsz (1 + decode_stateid_maxsz + 1 + \
+                                decode_space_limit_maxsz + \
                                 decode_ace_maxsz)
 #define decode_change_info_maxsz        (5)
 #define decode_open_maxsz       (op_decode_hdr_maxsz + \
@@ -924,34 +926,22 @@ static __be32 *reserve_space(struct xdr_stream *xdr, size_t nbytes)
 
 static void encode_opaque_fixed(struct xdr_stream *xdr, const void *buf, size_t len)
 {
-        __be32 *p;
-
-        p = xdr_reserve_space(xdr, len);
-        xdr_encode_opaque_fixed(p, buf, len);
+        WARN_ON_ONCE(xdr_stream_encode_opaque_fixed(xdr, buf, len) < 0);
 }
 
 static void encode_string(struct xdr_stream *xdr, unsigned int len, const char *str)
 {
-        __be32 *p;
-
-        p = reserve_space(xdr, 4 + len);
-        xdr_encode_opaque(p, str, len);
+        WARN_ON_ONCE(xdr_stream_encode_opaque(xdr, str, len) < 0);
 }
 
 static void encode_uint32(struct xdr_stream *xdr, u32 n)
 {
-        __be32 *p;
-
-        p = reserve_space(xdr, 4);
-        *p = cpu_to_be32(n);
+        WARN_ON_ONCE(xdr_stream_encode_u32(xdr, n) < 0);
 }
 
 static void encode_uint64(struct xdr_stream *xdr, u64 n)
 {
-        __be32 *p;
-
-        p = reserve_space(xdr, 8);
-        xdr_encode_hyper(p, n);
+        WARN_ON_ONCE(xdr_stream_encode_u64(xdr, n) < 0);
 }
 
 static void encode_nfs4_seqid(struct xdr_stream *xdr,
@@ -2524,7 +2514,7 @@ static void nfs4_xdr_enc_getacl(struct rpc_rqst *req, struct xdr_stream *xdr,
         encode_compound_hdr(xdr, req, &hdr);
         encode_sequence(xdr, &args->seq_args, &hdr);
         encode_putfh(xdr, args->fh, &hdr);
-        replen = hdr.replen + op_decode_hdr_maxsz + 1;
+        replen = hdr.replen + op_decode_hdr_maxsz;
         encode_getattr_two(xdr, FATTR4_WORD0_ACL, 0, &hdr);
 
         xdr_inline_pages(&req->rq_rcv_buf, replen << 2,
@@ -3062,20 +3052,15 @@ static void print_overflow_msg(const char *func, const struct xdr_stream *xdr)
 
 static int decode_opaque_inline(struct xdr_stream *xdr, unsigned int *len, char **string)
 {
-        __be32 *p;
-
-        p = xdr_inline_decode(xdr, 4);
-        if (unlikely(!p))
-                goto out_overflow;
-        *len = be32_to_cpup(p);
-        p = xdr_inline_decode(xdr, *len);
-        if (unlikely(!p))
-                goto out_overflow;
-        *string = (char *)p;
+        ssize_t ret = xdr_stream_decode_opaque_inline(xdr, (void **)string,
+                        NFS4_OPAQUE_LIMIT);
+        if (unlikely(ret < 0)) {
+                if (ret == -EBADMSG)
+                        print_overflow_msg(__func__, xdr);
+                return -EIO;
+        }
+        *len = ret;
         return 0;
-out_overflow:
-        print_overflow_msg(__func__, xdr);
-        return -EIO;
 }
 
 static int decode_compound_hdr(struct xdr_stream *xdr, struct compound_hdr *hdr)
@@ -3142,7 +3127,7 @@ static int decode_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected)
 }
 
 /* Dummy routine */
-static int decode_ace(struct xdr_stream *xdr, void *ace, struct nfs_client *clp)
+static int decode_ace(struct xdr_stream *xdr, void *ace)
 {
         __be32 *p;
         unsigned int strlen;
@@ -3890,45 +3875,50 @@ out_overflow:
         return -EIO;
 }
 
+static ssize_t decode_nfs4_string(struct xdr_stream *xdr,
+                struct nfs4_string *name, gfp_t gfp_flags)
+{
+        ssize_t ret;
+
+        ret = xdr_stream_decode_string_dup(xdr, &name->data,
+                        XDR_MAX_NETOBJ, gfp_flags);
+        name->len = 0;
+        if (ret > 0)
+                name->len = ret;
+        return ret;
+}
+
 static int decode_attr_owner(struct xdr_stream *xdr, uint32_t *bitmap,
                 const struct nfs_server *server, kuid_t *uid,
                 struct nfs4_string *owner_name)
 {
-        uint32_t len;
-        __be32 *p;
-        int ret = 0;
+        ssize_t len;
+        char *p;
 
         *uid = make_kuid(&init_user_ns, -2);
         if (unlikely(bitmap[1] & (FATTR4_WORD1_OWNER - 1U)))
                 return -EIO;
-        if (likely(bitmap[1] & FATTR4_WORD1_OWNER)) {
-                p = xdr_inline_decode(xdr, 4);
-                if (unlikely(!p))
-                        goto out_overflow;
-                len = be32_to_cpup(p);
-                p = xdr_inline_decode(xdr, len);
-                if (unlikely(!p))
-                        goto out_overflow;
-                if (owner_name != NULL) {
-                        owner_name->data = kmemdup(p, len, GFP_NOWAIT);
-                        if (owner_name->data != NULL) {
-                                owner_name->len = len;
-                                ret = NFS_ATTR_FATTR_OWNER_NAME;
-                        }
-                } else if (len < XDR_MAX_NETOBJ) {
-                        if (nfs_map_name_to_uid(server, (char *)p, len, uid) == 0)
-                                ret = NFS_ATTR_FATTR_OWNER;
-                        else
-                                dprintk("%s: nfs_map_name_to_uid failed!\n",
-                                                __func__);
-                } else
-                        dprintk("%s: name too long (%u)!\n",
-                                        __func__, len);
-                bitmap[1] &= ~FATTR4_WORD1_OWNER;
+        if (!(bitmap[1] & FATTR4_WORD1_OWNER))
+                return 0;
+        bitmap[1] &= ~FATTR4_WORD1_OWNER;
+
+        if (owner_name != NULL) {
+                len = decode_nfs4_string(xdr, owner_name, GFP_NOWAIT);
+                if (len <= 0)
+                        goto out;
+                dprintk("%s: name=%s\n", __func__, owner_name->data);
+                return NFS_ATTR_FATTR_OWNER_NAME;
+        } else {
+                len = xdr_stream_decode_opaque_inline(xdr, (void **)&p,
+                                XDR_MAX_NETOBJ);
+                if (len <= 0 || nfs_map_name_to_uid(server, p, len, uid) != 0)
+                        goto out;
+                dprintk("%s: uid=%d\n", __func__, (int)from_kuid(&init_user_ns, *uid));
+                return NFS_ATTR_FATTR_OWNER;
         }
-        dprintk("%s: uid=%d\n", __func__, (int)from_kuid(&init_user_ns, *uid));
-        return ret;
-out_overflow:
+out:
+        if (len != -EBADMSG)
+                return 0;
         print_overflow_msg(__func__, xdr);
         return -EIO;
 }
@@ -3937,41 +3927,33 @@ static int decode_attr_group(struct xdr_stream *xdr, uint32_t *bitmap,
                 const struct nfs_server *server, kgid_t *gid,
                 struct nfs4_string *group_name)
 {
-        uint32_t len;
-        __be32 *p;
-        int ret = 0;
+        ssize_t len;
+        char *p;
 
         *gid = make_kgid(&init_user_ns, -2);
         if (unlikely(bitmap[1] & (FATTR4_WORD1_OWNER_GROUP - 1U)))
                 return -EIO;
-        if (likely(bitmap[1] & FATTR4_WORD1_OWNER_GROUP)) {
-                p = xdr_inline_decode(xdr, 4);
-                if (unlikely(!p))
-                        goto out_overflow;
-                len = be32_to_cpup(p);
-                p = xdr_inline_decode(xdr, len);
-                if (unlikely(!p))
-                        goto out_overflow;
-                if (group_name != NULL) {
-                        group_name->data = kmemdup(p, len, GFP_NOWAIT);
-                        if (group_name->data != NULL) {
-                                group_name->len = len;
-                                ret = NFS_ATTR_FATTR_GROUP_NAME;
-                        }
-                } else if (len < XDR_MAX_NETOBJ) {
-                        if (nfs_map_group_to_gid(server, (char *)p, len, gid) == 0)
-                                ret = NFS_ATTR_FATTR_GROUP;
-                        else
-                                dprintk("%s: nfs_map_group_to_gid failed!\n",
-                                                __func__);
-                } else
-                        dprintk("%s: name too long (%u)!\n",
-                                        __func__, len);
-                bitmap[1] &= ~FATTR4_WORD1_OWNER_GROUP;
+        if (!(bitmap[1] & FATTR4_WORD1_OWNER_GROUP))
+                return 0;
+        bitmap[1] &= ~FATTR4_WORD1_OWNER_GROUP;
+
+        if (group_name != NULL) {
+                len = decode_nfs4_string(xdr, group_name, GFP_NOWAIT);
+                if (len <= 0)
+                        goto out;
+                dprintk("%s: name=%s\n", __func__, group_name->data);
+                return NFS_ATTR_FATTR_OWNER_NAME;
+        } else {
+                len = xdr_stream_decode_opaque_inline(xdr, (void **)&p,
+                                XDR_MAX_NETOBJ);
+                if (len <= 0 || nfs_map_group_to_gid(server, p, len, gid) != 0)
+                        goto out;
+                dprintk("%s: gid=%d\n", __func__, (int)from_kgid(&init_user_ns, *gid));
+                return NFS_ATTR_FATTR_GROUP;
         }
-        dprintk("%s: gid=%d\n", __func__, (int)from_kgid(&init_user_ns, *gid));
-        return ret;
-out_overflow:
+out:
+        if (len != -EBADMSG)
+                return 0;
         print_overflow_msg(__func__, xdr);
         return -EIO;
 }
@@ -4294,15 +4276,12 @@ out_overflow:
 
 static int decode_opaque_fixed(struct xdr_stream *xdr, void *buf, size_t len)
 {
-        __be32 *p;
-
-        p = xdr_inline_decode(xdr, len);
-        if (likely(p)) {
-                memcpy(buf, p, len);
-                return 0;
+        ssize_t ret = xdr_stream_decode_opaque_fixed(xdr, buf, len);
+        if (unlikely(ret < 0)) {
+                print_overflow_msg(__func__, xdr);
+                return -EIO;
         }
-        print_overflow_msg(__func__, xdr);
-        return -EIO;
+        return 0;
 }
 
 static int decode_stateid(struct xdr_stream *xdr, nfs4_stateid *stateid)
@@ -5093,7 +5072,7 @@ static int decode_rw_delegation(struct xdr_stream *xdr,
                 if (decode_space_limit(xdr, &res->pagemod_limit) < 0)
                                 return -EIO;
         }
-        return decode_ace(xdr, NULL, res->server->nfs_client);
+        return decode_ace(xdr, NULL);
 out_overflow:
         print_overflow_msg(__func__, xdr);
         return -EIO;
@@ -5660,8 +5639,6 @@ static int decode_exchange_id(struct xdr_stream *xdr,
         status = decode_opaque_inline(xdr, &dummy, &dummy_str);
         if (unlikely(status))
                 return status;
-        if (unlikely(dummy > NFS4_OPAQUE_LIMIT))
-                return -EIO;
         memcpy(res->server_owner->major_id, dummy_str, dummy);
         res->server_owner->major_id_sz = dummy;
 
@@ -5669,8 +5646,6 @@ static int decode_exchange_id(struct xdr_stream *xdr,
         status = decode_opaque_inline(xdr, &dummy, &dummy_str);
         if (unlikely(status))
                 return status;
-        if (unlikely(dummy > NFS4_OPAQUE_LIMIT))
-                return -EIO;
         memcpy(res->server_scope->server_scope, dummy_str, dummy);
         res->server_scope->server_scope_sz = dummy;
 
@@ -5685,16 +5660,12 @@ static int decode_exchange_id(struct xdr_stream *xdr,
                 status = decode_opaque_inline(xdr, &dummy, &dummy_str);
                 if (unlikely(status))
                         return status;
-                if (unlikely(dummy > NFS4_OPAQUE_LIMIT))
-                        return -EIO;
                 memcpy(res->impl_id->domain, dummy_str, dummy);
 
                 /* nii_name */
                 status = decode_opaque_inline(xdr, &dummy, &dummy_str);
                 if (unlikely(status))
                         return status;
-                if (unlikely(dummy > NFS4_OPAQUE_LIMIT))
-                        return -EIO;
                 memcpy(res->impl_id->name, dummy_str, dummy);
 
                 /* nii_date */
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 6bca17883b93..54e0f9f2dd94 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -531,39 +531,32 @@ static void nfs_show_mountd_netid(struct seq_file *m, struct nfs_server *nfss,
                                   int showdefaults)
 {
         struct sockaddr *sap = (struct sockaddr *) &nfss->mountd_address;
+        char *proto = NULL;
 
-        seq_printf(m, ",mountproto=");
         switch (sap->sa_family) {
         case AF_INET:
                 switch (nfss->mountd_protocol) {
                 case IPPROTO_UDP:
-                        seq_printf(m, RPCBIND_NETID_UDP);
+                        proto = RPCBIND_NETID_UDP;
                         break;
                 case IPPROTO_TCP:
-                        seq_printf(m, RPCBIND_NETID_TCP);
+                        proto = RPCBIND_NETID_TCP;
                         break;
-                default:
-                        if (showdefaults)
-                                seq_printf(m, "auto");
                 }
                 break;
         case AF_INET6:
                 switch (nfss->mountd_protocol) {
                 case IPPROTO_UDP:
-                        seq_printf(m, RPCBIND_NETID_UDP6);
+                        proto = RPCBIND_NETID_UDP6;
                         break;
                 case IPPROTO_TCP:
-                        seq_printf(m, RPCBIND_NETID_TCP6);
+                        proto = RPCBIND_NETID_TCP6;
                         break;
-                default:
-                        if (showdefaults)
-                                seq_printf(m, "auto");
                 }
                 break;
-        default:
-                if (showdefaults)
-                        seq_printf(m, "auto");
         }
+        if (proto || showdefaults)
+                seq_printf(m, ",mountproto=%s", proto ?: "auto");
 }
 
 static void nfs_show_mountd_options(struct seq_file *m, struct nfs_server *nfss,
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 006068526542..e75b056f46f4 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -1785,7 +1785,7 @@ static void nfs_commit_release_pages(struct nfs_commit_data *data)
                 if (status < 0) {
                         nfs_context_set_write_error(req->wb_context, status);
                         nfs_inode_remove_request(req);
-                        dprintk(", error = %d\n", status);
+                        dprintk_cont(", error = %d\n", status);
                         goto next;
                 }
 
@@ -1794,11 +1794,11 @@ static void nfs_commit_release_pages(struct nfs_commit_data *data)
                 if (!nfs_write_verifier_cmp(&req->wb_verf, &data->verf.verifier)) {
                         /* We have a match */
                         nfs_inode_remove_request(req);
-                        dprintk(" OK\n");
+                        dprintk_cont(" OK\n");
                         goto next;
                 }
                 /* We have a mismatch. Write the page again */
-                dprintk(" mismatch\n");
+                dprintk_cont(" mismatch\n");
                 nfs_mark_request_dirty(req);
                 set_bit(NFS_CONTEXT_RESEND_WRITES, &req->wb_context->flags);
         next:
diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
index 76e28c229805..0efef9cf014f 100644
--- a/include/linux/compiler-gcc.h
+++ b/include/linux/compiler-gcc.h
@@ -200,8 +200,8 @@
 #ifdef CONFIG_STACK_VALIDATION
 #define annotate_unreachable() ({                                       \
         asm("%c0:\t\n"                                                  \
-            ".pushsection __unreachable, \"a\"\t\n"                     \
-            ".long %c0b\t\n"                                            \
+            ".pushsection .discard.unreachable\t\n"                     \
+            ".long %c0b - .\t\n"                                        \
             ".popsection\t\n" : : "i" (__LINE__));                      \
 })
 #else
diff --git a/include/linux/f2fs_fs.h b/include/linux/f2fs_fs.h
index cea41a124a80..e2d239ed4c60 100644
--- a/include/linux/f2fs_fs.h
+++ b/include/linux/f2fs_fs.h
@@ -36,6 +36,12 @@
 #define F2FS_NODE_INO(sbi)      (sbi->node_ino_num)
 #define F2FS_META_INO(sbi)      (sbi->meta_ino_num)
 
+#define F2FS_IO_SIZE(sbi)       (1 << (sbi)->write_io_size_bits) /* Blocks */
+#define F2FS_IO_SIZE_KB(sbi)    (1 << ((sbi)->write_io_size_bits + 2)) /* KB */
+#define F2FS_IO_SIZE_BYTES(sbi) (1 << ((sbi)->write_io_size_bits + 12)) /* B */
+#define F2FS_IO_SIZE_BITS(sbi)  ((sbi)->write_io_size_bits) /* power of 2 */
+#define F2FS_IO_SIZE_MASK(sbi)  (F2FS_IO_SIZE(sbi) - 1)
+
 /* This flag is used by node and meta inodes, and by recovery */
 #define GFP_F2FS_ZERO           (GFP_NOFS | __GFP_ZERO)
 #define GFP_F2FS_HIGH_ZERO      (GFP_NOFS | __GFP_ZERO | __GFP_HIGHMEM)
@@ -108,6 +114,7 @@ struct f2fs_super_block {
 /*
  * For checkpoint
  */
+#define CP_NAT_BITS_FLAG        0x00000080
 #define CP_CRC_RECOVERY_FLAG    0x00000040
 #define CP_FASTBOOT_FLAG        0x00000020
 #define CP_FSCK_FLAG            0x00000010
@@ -272,6 +279,7 @@ struct f2fs_node {
  * For NAT entries
  */
 #define NAT_ENTRY_PER_BLOCK (PAGE_SIZE / sizeof(struct f2fs_nat_entry))
+#define NAT_ENTRY_BITMAP_SIZE   ((NAT_ENTRY_PER_BLOCK + 7) / 8)
 
 struct f2fs_nat_entry {
         __u8 version;           /* latest version of cached nat entry */
diff --git a/include/linux/frame.h b/include/linux/frame.h
index e6baaba3f1ae..d772c61c31da 100644
--- a/include/linux/frame.h
+++ b/include/linux/frame.h
@@ -11,7 +11,7 @@
  * For more information, see tools/objtool/Documentation/stack-validation.txt.
  */
 #define STACK_FRAME_NON_STANDARD(func) \
-        static void __used __section(__func_stack_frame_non_standard) \
+        static void __used __section(.discard.func_stack_frame_non_standard) \
                 *__func_stack_frame_non_standard_##func = func
 
 #else /* !CONFIG_STACK_VALIDATION */
diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h
index c15373894a42..b37dee3acaba 100644
--- a/include/linux/lockd/lockd.h
+++ b/include/linux/lockd/lockd.h
@@ -355,7 +355,8 @@ static inline int nlm_privileged_requester(const struct svc_rqst *rqstp)
 static inline int nlm_compare_locks(const struct file_lock *fl1,
                                     const struct file_lock *fl2)
 {
-        return  fl1->fl_pid   == fl2->fl_pid
+        return file_inode(fl1->fl_file) == file_inode(fl2->fl_file)
+             && fl1->fl_pid   == fl2->fl_pid
              && fl1->fl_owner == fl2->fl_owner
              && fl1->fl_start == fl2->fl_start
              && fl1->fl_end   == fl2->fl_end
diff --git a/include/linux/pwm.h b/include/linux/pwm.h
index 2c6c5114c089..08fad7c6a471 100644
--- a/include/linux/pwm.h
+++ b/include/linux/pwm.h
@@ -287,8 +287,6 @@ struct pwm_ops {
  * @pwms: array of PWM devices allocated by the framework
  * @of_xlate: request a PWM device given a device tree PWM specifier
  * @of_pwm_n_cells: number of cells expected in the device tree PWM specifier
- * @can_sleep: must be true if the .config(), .enable() or .disable()
- *             operations may sleep
  */
 struct pwm_chip {
         struct device *dev;
@@ -302,7 +300,6 @@ struct pwm_chip {
         struct pwm_device * (*of_xlate)(struct pwm_chip *pc,
                                         const struct of_phandle_args *args);
         unsigned int of_pwm_n_cells;
-        bool can_sleep;
 };
 
 /**
@@ -451,8 +448,6 @@ struct pwm_device *devm_pwm_get(struct device *dev, const char *con_id);
 struct pwm_device *devm_of_pwm_get(struct device *dev, struct device_node *np,
                                    const char *con_id);
 void devm_pwm_put(struct device *dev, struct pwm_device *pwm);
-
-bool pwm_can_sleep(struct pwm_device *pwm);
 #else
 static inline struct pwm_device *pwm_request(int pwm_id, const char *label)
 {
@@ -566,11 +561,6 @@ static inline struct pwm_device *devm_of_pwm_get(struct device *dev,
 static inline void devm_pwm_put(struct device *dev, struct pwm_device *pwm)
 {
 }
-
-static inline bool pwm_can_sleep(struct pwm_device *pwm)
-{
-        return false;
-}
 #endif
 
 static inline void pwm_apply_args(struct pwm_device *pwm)
@@ -613,18 +603,25 @@ struct pwm_lookup {
         const char *con_id;
         unsigned int period;
         enum pwm_polarity polarity;
+        const char *module; /* optional, may be NULL */
 };
 
-#define PWM_LOOKUP(_provider, _index, _dev_id, _con_id, _period, _polarity) \
-        {                                               \
-                .provider = _provider,                  \
-                .index = _index,                        \
-                .dev_id = _dev_id,                      \
-                .con_id = _con_id,                      \
-                .period = _period,                      \
-                .polarity = _polarity                   \
+#define PWM_LOOKUP_WITH_MODULE(_provider, _index, _dev_id, _con_id,     \
+                               _period, _polarity, _module)             \
+        {                                                               \
+                .provider = _provider,                                  \
+                .index = _index,                                        \
+                .dev_id = _dev_id,                                      \
+                .con_id = _con_id,                                      \
+                .period = _period,                                      \
+                .polarity = _polarity,                                  \
+                .module = _module,                                      \
         }
 
+#define PWM_LOOKUP(_provider, _index, _dev_id, _con_id, _period, _polarity) \
+        PWM_LOOKUP_WITH_MODULE(_provider, _index, _dev_id, _con_id, _period, \
+                               _polarity, NULL)
+
 #if IS_ENABLED(CONFIG_PWM)
 void pwm_add_table(struct pwm_lookup *table, size_t num);
 void pwm_remove_table(struct pwm_lookup *table, size_t num);
diff --git a/include/linux/sunrpc/auth.h b/include/linux/sunrpc/auth.h
index b1bc62ba20a2..8fd3504946ad 100644
--- a/include/linux/sunrpc/auth.h
+++ b/include/linux/sunrpc/auth.h
@@ -32,6 +32,7 @@
  */
 #define UNX_MAXNODENAME __NEW_UTS_LEN
 #define UNX_CALLSLACK   (21 + XDR_QUADLEN(UNX_MAXNODENAME))
+#define UNX_NGROUPS     16
 
 struct rpcsec_gss_info;
 
@@ -63,9 +64,6 @@ struct rpc_cred {
         struct rcu_head         cr_rcu;
         struct rpc_auth *       cr_auth;
         const struct rpc_credops *cr_ops;
-#if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
-        unsigned long           cr_magic;       /* 0x0f4aa4f0 */
-#endif
         unsigned long           cr_expire;      /* when to gc */
         unsigned long           cr_flags;       /* various flags */
         atomic_t                cr_count;       /* ref count */
@@ -79,8 +77,6 @@ struct rpc_cred {
 #define RPCAUTH_CRED_HASHED     2
 #define RPCAUTH_CRED_NEGATIVE   3
 
-#define RPCAUTH_CRED_MAGIC      0x0f4aa4f0
-
 /* rpc_auth au_flags */
 #define RPCAUTH_AUTH_NO_CRKEY_TIMEOUT   0x0001 /* underlying cred has no key timeout */
 
diff --git a/include/linux/sunrpc/cache.h b/include/linux/sunrpc/cache.h
index 20d157a518a7..270bad0e1bed 100644
--- a/include/linux/sunrpc/cache.h
+++ b/include/linux/sunrpc/cache.h
@@ -63,15 +63,6 @@ struct cache_head {
 
 #define CACHE_NEW_EXPIRY 120    /* keep new things pending confirmation for 120 seconds */
 
-struct cache_detail_procfs {
-        struct proc_dir_entry   *proc_ent;
-        struct proc_dir_entry   *flush_ent, *channel_ent, *content_ent;
-};
-
-struct cache_detail_pipefs {
-        struct dentry *dir;
-};
-
 struct cache_detail {
         struct module *         owner;
         int                     hash_size;
@@ -123,9 +114,9 @@ struct cache_detail {
         time_t                  last_warn;              /* when we last warned about no readers */
 
         union {
-                struct cache_detail_procfs procfs;
-                struct cache_detail_pipefs pipefs;
-        } u;
+                struct proc_dir_entry   *procfs;
+                struct dentry           *pipefs;
+        };
         struct net              *net;
 };
 
diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
index 333ad11b3dd9..6095ecba0dde 100644
--- a/include/linux/sunrpc/clnt.h
+++ b/include/linux/sunrpc/clnt.h
@@ -182,7 +182,6 @@ int		rpc_protocol(struct rpc_clnt *);
 struct net *    rpc_net_ns(struct rpc_clnt *);
 size_t          rpc_max_payload(struct rpc_clnt *);
 size_t          rpc_max_bc_payload(struct rpc_clnt *);
-unsigned long   rpc_get_timeout(struct rpc_clnt *clnt);
 void            rpc_force_rebind(struct rpc_clnt *);
 size_t          rpc_peeraddr(struct rpc_clnt *, struct sockaddr *, size_t);
 const char      *rpc_peeraddr2str(struct rpc_clnt *, enum rpc_display_format_t);
@@ -202,8 +201,9 @@ int		rpc_clnt_add_xprt(struct rpc_clnt *, struct xprt_create *,
                                 struct rpc_xprt *,
                                 void *),
                         void *data);
-void            rpc_cap_max_reconnect_timeout(struct rpc_clnt *clnt,
-                        unsigned long timeo);
+void            rpc_set_connect_timeout(struct rpc_clnt *clnt,
+                        unsigned long connect_timeout,
+                        unsigned long reconnect_timeout);
 
 int             rpc_clnt_setup_test_and_add_xprt(struct rpc_clnt *,
                         struct rpc_xprt_switch *,
diff --git a/include/linux/sunrpc/debug.h b/include/linux/sunrpc/debug.h
index 59a7889e15db..8da0f37f3bdc 100644
--- a/include/linux/sunrpc/debug.h
+++ b/include/linux/sunrpc/debug.h
@@ -20,33 +20,55 @@ extern unsigned int		nfsd_debug;
 extern unsigned int             nlm_debug;
 #endif
 
-#define dprintk(args...)        dfprintk(FACILITY, ## args)
-#define dprintk_rcu(args...)    dfprintk_rcu(FACILITY, ## args)
+#define dprintk(fmt, ...)                                               \
+        dfprintk(FACILITY, fmt, ##__VA_ARGS__)
+#define dprintk_cont(fmt, ...)                                          \
+        dfprintk_cont(FACILITY, fmt, ##__VA_ARGS__)
+#define dprintk_rcu(fmt, ...)                                           \
+        dfprintk_rcu(FACILITY, fmt, ##__VA_ARGS__)
+#define dprintk_rcu_cont(fmt, ...)                                      \
+        dfprintk_rcu_cont(FACILITY, fmt, ##__VA_ARGS__)
 
 #undef ifdebug
 #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
 # define ifdebug(fac)           if (unlikely(rpc_debug & RPCDBG_##fac))
 
-# define dfprintk(fac, args...) \
-        do { \
-                ifdebug(fac) \
-                        printk(KERN_DEFAULT args); \
-        } while (0)
-
-# define dfprintk_rcu(fac, args...)     \
-        do { \
-                ifdebug(fac) { \
-                        rcu_read_lock(); \
-                        printk(KERN_DEFAULT args); \
-                        rcu_read_unlock(); \
-                } \
-        } while (0)
+# define dfprintk(fac, fmt, ...)                                        \
+do {                                                                    \
+        ifdebug(fac)                                                    \
+                printk(KERN_DEFAULT fmt, ##__VA_ARGS__);                \
+} while (0)
+
+# define dfprintk_cont(fac, fmt, ...)                                   \
+do {                                                                    \
+        ifdebug(fac)                                                    \
+                printk(KERN_CONT fmt, ##__VA_ARGS__);                   \
+} while (0)
+
+# define dfprintk_rcu(fac, fmt, ...)                                    \
+do {                                                                    \
+        ifdebug(fac) {                                                  \
+                rcu_read_lock();                                        \
+                printk(KERN_DEFAULT fmt, ##__VA_ARGS__);                \
+                rcu_read_unlock();                                      \
+        }                                                               \
+} while (0)
+
+# define dfprintk_rcu_cont(fac, fmt, ...)                               \
+do {                                                                    \
+        ifdebug(fac) {                                                  \
+                rcu_read_lock();                                        \
+                printk(KERN_CONT fmt, ##__VA_ARGS__);                   \
+                rcu_read_unlock();                                      \
+        }                                                               \
+} while (0)
 
 # define RPC_IFDEBUG(x)         x
 #else
 # define ifdebug(fac)           if (0)
-# define dfprintk(fac, args...) do {} while (0)
-# define dfprintk_rcu(fac, args...)     do {} while (0)
+# define dfprintk(fac, fmt, ...)        do {} while (0)
+# define dfprintk_cont(fac, fmt, ...)   do {} while (0)
+# define dfprintk_rcu(fac, fmt, ...)    do {} while (0)
 # define RPC_IFDEBUG(x)
 #endif
 
diff --git a/include/linux/sunrpc/xdr.h b/include/linux/sunrpc/xdr.h
index 56c48c884a24..054c8cde18f3 100644
--- a/include/linux/sunrpc/xdr.h
+++ b/include/linux/sunrpc/xdr.h
@@ -242,6 +242,185 @@ extern unsigned int xdr_read_pages(struct xdr_stream *xdr, unsigned int len);
 extern void xdr_enter_page(struct xdr_stream *xdr, unsigned int len);
 extern int xdr_process_buf(struct xdr_buf *buf, unsigned int offset, unsigned int len, int (*actor)(struct scatterlist *, void *), void *data);
 
+ssize_t xdr_stream_decode_string_dup(struct xdr_stream *xdr, char **str,
+                size_t maxlen, gfp_t gfp_flags);
+/**
+ * xdr_align_size - Calculate padded size of an object
+ * @n: Size of an object being XDR encoded (in bytes)
+ *
+ * Return value:
+ *   Size (in bytes) of the object including xdr padding
+ */
+static inline size_t
+xdr_align_size(size_t n)
+{
+        const size_t mask = sizeof(__u32) - 1;
+
+        return (n + mask) & ~mask;
+}
+
+/**
+ * xdr_stream_encode_u32 - Encode a 32-bit integer
+ * @xdr: pointer to xdr_stream
+ * @n: integer to encode
+ *
+ * Return values:
+ *   On success, returns length in bytes of XDR buffer consumed
+ *   %-EMSGSIZE on XDR buffer overflow
+ */
+static inline ssize_t
+xdr_stream_encode_u32(struct xdr_stream *xdr, __u32 n)
+{
+        const size_t len = sizeof(n);
+        __be32 *p = xdr_reserve_space(xdr, len);
+
+        if (unlikely(!p))
+                return -EMSGSIZE;
+        *p = cpu_to_be32(n);
+        return len;
+}
+
+/**
+ * xdr_stream_encode_u64 - Encode a 64-bit integer
+ * @xdr: pointer to xdr_stream
+ * @n: 64-bit integer to encode
+ *
+ * Return values:
+ *   On success, returns length in bytes of XDR buffer consumed
+ *   %-EMSGSIZE on XDR buffer overflow
+ */
+static inline ssize_t
+xdr_stream_encode_u64(struct xdr_stream *xdr, __u64 n)
+{
+        const size_t len = sizeof(n);
+        __be32 *p = xdr_reserve_space(xdr, len);
+
+        if (unlikely(!p))
+                return -EMSGSIZE;
+        xdr_encode_hyper(p, n);
+        return len;
+}
+
+/**
+ * xdr_stream_encode_opaque_fixed - Encode fixed length opaque xdr data
+ * @xdr: pointer to xdr_stream
+ * @ptr: pointer to opaque data object
+ * @len: size of object pointed to by @ptr
+ *
+ * Return values:
+ *   On success, returns length in bytes of XDR buffer consumed
+ *   %-EMSGSIZE on XDR buffer overflow
+ */
+static inline ssize_t
+xdr_stream_encode_opaque_fixed(struct xdr_stream *xdr, const void *ptr, size_t len)
+{
+        __be32 *p = xdr_reserve_space(xdr, len);
+
+        if (unlikely(!p))
+                return -EMSGSIZE;
+        xdr_encode_opaque_fixed(p, ptr, len);
+        return xdr_align_size(len);
+}
+
+/**
+ * xdr_stream_encode_opaque - Encode variable length opaque xdr data
+ * @xdr: pointer to xdr_stream
+ * @ptr: pointer to opaque data object
+ * @len: size of object pointed to by @ptr
+ *
+ * Return values:
+ *   On success, returns length in bytes of XDR buffer consumed
+ *   %-EMSGSIZE on XDR buffer overflow
+ */
+static inline ssize_t
+xdr_stream_encode_opaque(struct xdr_stream *xdr, const void *ptr, size_t len)
+{
+        size_t count = sizeof(__u32) + xdr_align_size(len);
+        __be32 *p = xdr_reserve_space(xdr, count);
+
+        if (unlikely(!p))
+                return -EMSGSIZE;
+        xdr_encode_opaque(p, ptr, len);
+        return count;
+}
+
+/**
+ * xdr_stream_decode_u32 - Decode a 32-bit integer
+ * @xdr: pointer to xdr_stream
+ * @ptr: location to store integer
+ *
+ * Return values:
+ *   %0 on success
+ *   %-EBADMSG on XDR buffer overflow
+ */
+static inline ssize_t
+xdr_stream_decode_u32(struct xdr_stream *xdr, __u32 *ptr)
+{
+        const size_t count = sizeof(*ptr);
+        __be32 *p = xdr_inline_decode(xdr, count);
+
+        if (unlikely(!p))
+                return -EBADMSG;
+        *ptr = be32_to_cpup(p);
+        return 0;
+}
+
+/**
+ * xdr_stream_decode_opaque_fixed - Decode fixed length opaque xdr data
+ * @xdr: pointer to xdr_stream
+ * @ptr: location to store data
+ * @len: size of buffer pointed to by @ptr
+ *
+ * Return values:
+ *   On success, returns size of object stored in @ptr
+ *   %-EBADMSG on XDR buffer overflow
+ */
+static inline ssize_t
+xdr_stream_decode_opaque_fixed(struct xdr_stream *xdr, void *ptr, size_t len)
+{
+        __be32 *p = xdr_inline_decode(xdr, len);
+
+        if (unlikely(!p))
+                return -EBADMSG;
+        xdr_decode_opaque_fixed(p, ptr, len);
+        return len;
+}
+
+/**
+ * xdr_stream_decode_opaque_inline - Decode variable length opaque xdr data
+ * @xdr: pointer to xdr_stream
+ * @ptr: location to store pointer to opaque data
+ * @maxlen: maximum acceptable object size
+ *
+ * Note: the pointer stored in @ptr cannot be assumed valid after the XDR
+ * buffer has been destroyed, or even after calling xdr_inline_decode()
+ * on @xdr. It is therefore expected that the object it points to should
+ * be processed immediately.
+ *
+ * Return values:
+ *   On success, returns size of object stored in *@ptr
+ *   %-EBADMSG on XDR buffer overflow
+ *   %-EMSGSIZE if the size of the object would exceed @maxlen
+ */
+static inline ssize_t
+xdr_stream_decode_opaque_inline(struct xdr_stream *xdr, void **ptr, size_t maxlen)
+{
+        __be32 *p;
+        __u32 len;
+
+        *ptr = NULL;
+        if (unlikely(xdr_stream_decode_u32(xdr, &len) < 0))
+                return -EBADMSG;
+        if (len != 0) {
+                p = xdr_inline_decode(xdr, len);
+                if (unlikely(!p))
+                        return -EBADMSG;
+                if (unlikely(len > maxlen))
+                        return -EMSGSIZE;
+                *ptr = p;
+        }
+        return len;
+}
 #endif /* __KERNEL__ */
 
 #endif /* _SUNRPC_XDR_H_ */
diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h
index a5da60b24d83..eab1c749e192 100644
--- a/include/linux/sunrpc/xprt.h
+++ b/include/linux/sunrpc/xprt.h
@@ -137,6 +137,9 @@ struct rpc_xprt_ops {
         void            (*release_request)(struct rpc_task *task);
         void            (*close)(struct rpc_xprt *xprt);
         void            (*destroy)(struct rpc_xprt *xprt);
+        void            (*set_connect_timeout)(struct rpc_xprt *xprt,
+                                        unsigned long connect_timeout,
+                                        unsigned long reconnect_timeout);
         void            (*print_stats)(struct rpc_xprt *xprt, struct seq_file *seq);
         int             (*enable_swap)(struct rpc_xprt *xprt);
         void            (*disable_swap)(struct rpc_xprt *xprt);
@@ -221,6 +224,7 @@ struct rpc_xprt {
         struct timer_list       timer;
         unsigned long           last_used,
                                 idle_timeout,
+                                connect_timeout,
                                 max_reconnect_timeout;
 
         /*
diff --git a/include/linux/sunrpc/xprtsock.h b/include/linux/sunrpc/xprtsock.h
index bef3fb0abb8f..c9959d7e3579 100644
--- a/include/linux/sunrpc/xprtsock.h
+++ b/include/linux/sunrpc/xprtsock.h
@@ -55,6 +55,8 @@ struct sock_xprt {
         size_t                  rcvsize,
                                 sndsize;
 
+        struct rpc_timeout      tcp_timeout;
+
         /*
          * Saved socket callback addresses
          */
@@ -81,6 +83,7 @@ struct sock_xprt {
 
 #define XPRT_SOCK_CONNECTING    1U
 #define XPRT_SOCK_DATA_READY    (2)
+#define XPRT_SOCK_UPD_TIMEOUT   (3)
 
 #endif /* __KERNEL__ */
 
diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index e275e98bdceb..dab11f97e1c6 100644
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -194,7 +194,7 @@ struct thermal_attr {
  * @governor:   pointer to the governor for this thermal zone
  * @governor_data:      private pointer for governor data
  * @thermal_instances:  list of &struct thermal_instance of this thermal zone
- * @idr:        &struct idr to generate unique id for this zone's cooling
+ * @ida:        &struct ida to generate unique id for this zone's cooling
  *              devices
  * @lock:       lock to protect thermal_instances list
  * @node:       node in thermal_tz_list (in thermal_core.c)
@@ -227,7 +227,7 @@ struct thermal_zone_device {
         struct thermal_governor *governor;
         void *governor_data;
         struct list_head thermal_instances;
-        struct idr idr;
+        struct ida ida;
         struct mutex lock;
         struct list_head node;
         struct delayed_work poll_queue;
diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h
index 01b3c9869a0d..c80fcad0a6c9 100644
--- a/include/trace/events/f2fs.h
+++ b/include/trace/events/f2fs.h
@@ -6,8 +6,8 @@
 
 #include <linux/tracepoint.h>
 
-#define show_dev(entry)         MAJOR(entry->dev), MINOR(entry->dev)
-#define show_dev_ino(entry)     show_dev(entry), (unsigned long)entry->ino
+#define show_dev(dev)           MAJOR(dev), MINOR(dev)
+#define show_dev_ino(entry)     show_dev(entry->dev), (unsigned long)entry->ino
 
 TRACE_DEFINE_ENUM(NODE);
 TRACE_DEFINE_ENUM(DATA);
@@ -55,25 +55,35 @@ TRACE_DEFINE_ENUM(CP_DISCARD);
                 { IPU,          "IN-PLACE" },                           \
                 { OPU,          "OUT-OF-PLACE" })
 
-#define F2FS_BIO_FLAG_MASK(t)   (t & (REQ_RAHEAD | REQ_PREFLUSH | REQ_FUA))
-#define F2FS_BIO_EXTRA_MASK(t)  (t & (REQ_META | REQ_PRIO))
-
-#define show_bio_type(op_flags) show_bio_op_flags(op_flags),            \
-                                                show_bio_extra(op_flags)
+#define F2FS_OP_FLAGS (REQ_RAHEAD | REQ_SYNC | REQ_PREFLUSH | REQ_META |\
+                        REQ_PRIO)
+#define F2FS_BIO_FLAG_MASK(t)   (t & F2FS_OP_FLAGS)
+
+#define show_bio_type(op,op_flags)      show_bio_op(op),                \
+                                                show_bio_op_flags(op_flags)
+
+#define show_bio_op(op)                                                 \
+        __print_symbolic(op,                                            \
+                { REQ_OP_READ,                  "READ" },               \
+                { REQ_OP_WRITE,                 "WRITE" },              \
+                { REQ_OP_FLUSH,                 "FLUSH" },              \
+                { REQ_OP_DISCARD,               "DISCARD" },            \
+                { REQ_OP_ZONE_REPORT,           "ZONE_REPORT" },        \
+                { REQ_OP_SECURE_ERASE,          "SECURE_ERASE" },       \
+                { REQ_OP_ZONE_RESET,            "ZONE_RESET" },         \
+                { REQ_OP_WRITE_SAME,            "WRITE_SAME" },         \
+                { REQ_OP_WRITE_ZEROES,          "WRITE_ZEROES" })
 
 #define show_bio_op_flags(flags)                                        \
         __print_symbolic(F2FS_BIO_FLAG_MASK(flags),                     \
-                { 0,                    "WRITE" },                      \
-                { REQ_RAHEAD,           "READAHEAD" },                  \
-                { REQ_SYNC,             "REQ_SYNC" },                   \
-                { REQ_PREFLUSH,         "REQ_PREFLUSH" },               \
-                { REQ_FUA,              "REQ_FUA" })
-
-#define show_bio_extra(type)                                            \
-        __print_symbolic(F2FS_BIO_EXTRA_MASK(type),                     \
+                { REQ_RAHEAD,           "(RA)" },                       \
+                { REQ_SYNC,             "(S)" },                        \
+                { REQ_SYNC | REQ_PRIO,  "(SP)" },                       \
                 { REQ_META,             "(M)" },                        \
-                { REQ_PRIO,             "(P)" },                        \
                 { REQ_META | REQ_PRIO,  "(MP)" },                       \
+                { REQ_SYNC | REQ_PREFLUSH , "(SF)" },                   \
+                { REQ_SYNC | REQ_META | REQ_PRIO, "(SMP)" },            \
+                { REQ_PREFLUSH | REQ_META | REQ_PRIO, "(FMP)" },        \
                 { 0, " \b" })
 
 #define show_data_type(type)                                            \
@@ -235,7 +245,7 @@ TRACE_EVENT(f2fs_sync_fs,
         ),
 
         TP_printk("dev = (%d,%d), superblock is %s, wait = %d",
-                show_dev(__entry),
+                show_dev(__entry->dev),
                 __entry->dirty ? "dirty" : "not dirty",
                 __entry->wait)
 );
@@ -305,6 +315,13 @@ DEFINE_EVENT(f2fs__inode_exit, f2fs_unlink_exit,
         TP_ARGS(inode, ret)
 );
 
+DEFINE_EVENT(f2fs__inode_exit, f2fs_drop_inode,
+
+        TP_PROTO(struct inode *inode, int ret),
+
+        TP_ARGS(inode, ret)
+);
+
 DEFINE_EVENT(f2fs__inode, f2fs_truncate,
 
         TP_PROTO(struct inode *inode),
@@ -534,7 +551,7 @@ TRACE_EVENT(f2fs_background_gc,
         ),
 
         TP_printk("dev = (%d,%d), wait_ms = %ld, prefree = %u, free = %u",
-                show_dev(__entry),
+                show_dev(__entry->dev),
                 __entry->wait_ms,
                 __entry->prefree,
                 __entry->free)
@@ -555,6 +572,7 @@ TRACE_EVENT(f2fs_get_victim,
                 __field(int,    alloc_mode)
                 __field(int,    gc_mode)
                 __field(unsigned int,   victim)
+                __field(unsigned int,   cost)
                 __field(unsigned int,   ofs_unit)
                 __field(unsigned int,   pre_victim)
                 __field(unsigned int,   prefree)
@@ -568,20 +586,23 @@ TRACE_EVENT(f2fs_get_victim,
                 __entry->alloc_mode     = p->alloc_mode;
                 __entry->gc_mode        = p->gc_mode;
                 __entry->victim         = p->min_segno;
+                __entry->cost           = p->min_cost;
                 __entry->ofs_unit       = p->ofs_unit;
                 __entry->pre_victim     = pre_victim;
                 __entry->prefree        = prefree;
                 __entry->free           = free;
         ),
 
-        TP_printk("dev = (%d,%d), type = %s, policy = (%s, %s, %s), victim = %u "
-                "ofs_unit = %u, pre_victim_secno = %d, prefree = %u, free = %u",
-                show_dev(__entry),
+        TP_printk("dev = (%d,%d), type = %s, policy = (%s, %s, %s), "
+                "victim = %u, cost = %u, ofs_unit = %u, "
+                "pre_victim_secno = %d, prefree = %u, free = %u",
+                show_dev(__entry->dev),
                 show_data_type(__entry->type),
                 show_gc_type(__entry->gc_type),
                 show_alloc_mode(__entry->alloc_mode),
                 show_victim_policy(__entry->gc_mode),
                 __entry->victim,
+                __entry->cost,
                 __entry->ofs_unit,
                 (int)__entry->pre_victim,
                 __entry->prefree,
@@ -713,7 +734,7 @@ TRACE_EVENT(f2fs_reserve_new_blocks,
         ),
 
         TP_printk("dev = (%d,%d), nid = %u, ofs_in_node = %u, count = %llu",
-                show_dev(__entry),
+                show_dev(__entry->dev),
                 (unsigned int)__entry->nid,
                 __entry->ofs_in_node,
                 (unsigned long long)__entry->count)
@@ -753,7 +774,7 @@ DECLARE_EVENT_CLASS(f2fs__submit_page_bio,
                 (unsigned long)__entry->index,
                 (unsigned long long)__entry->old_blkaddr,
                 (unsigned long long)__entry->new_blkaddr,
-                show_bio_type(__entry->op_flags),
+                show_bio_type(__entry->op, __entry->op_flags),
                 show_block_type(__entry->type))
 );
 
@@ -775,15 +796,15 @@ DEFINE_EVENT_CONDITION(f2fs__submit_page_bio, f2fs_submit_page_mbio,
         TP_CONDITION(page->mapping)
 );
 
-DECLARE_EVENT_CLASS(f2fs__submit_bio,
+DECLARE_EVENT_CLASS(f2fs__bio,
 
-        TP_PROTO(struct super_block *sb, struct f2fs_io_info *fio,
-                                                struct bio *bio),
+        TP_PROTO(struct super_block *sb, int type, struct bio *bio),
 
-        TP_ARGS(sb, fio, bio),
+        TP_ARGS(sb, type, bio),
 
         TP_STRUCT__entry(
                 __field(dev_t,  dev)
+                __field(dev_t,  target)
                 __field(int,    op)
                 __field(int,    op_flags)
                 __field(int,    type)
@@ -793,37 +814,55 @@ DECLARE_EVENT_CLASS(f2fs__submit_bio,
 
         TP_fast_assign(
                 __entry->dev            = sb->s_dev;
-                __entry->op             = fio->op;
-                __entry->op_flags       = fio->op_flags;
-                __entry->type           = fio->type;
+                __entry->target         = bio->bi_bdev->bd_dev;
+                __entry->op             = bio_op(bio);
+                __entry->op_flags       = bio->bi_opf;
+                __entry->type           = type;
                 __entry->sector         = bio->bi_iter.bi_sector;
                 __entry->size           = bio->bi_iter.bi_size;
         ),
 
-        TP_printk("dev = (%d,%d), rw = %s%s, %s, sector = %lld, size = %u",
-                show_dev(__entry),
-                show_bio_type(__entry->op_flags),
+        TP_printk("dev = (%d,%d)/(%d,%d), rw = %s%s, %s, sector = %lld, size = %u",
+                show_dev(__entry->target),
+                show_dev(__entry->dev),
+                show_bio_type(__entry->op, __entry->op_flags),
                 show_block_type(__entry->type),
                 (unsigned long long)__entry->sector,
                 __entry->size)
 );
 
-DEFINE_EVENT_CONDITION(f2fs__submit_bio, f2fs_submit_write_bio,
+DEFINE_EVENT_CONDITION(f2fs__bio, f2fs_prepare_write_bio,
+
+        TP_PROTO(struct super_block *sb, int type, struct bio *bio),
+
+        TP_ARGS(sb, type, bio),
+
+        TP_CONDITION(bio)
+);
+
+DEFINE_EVENT_CONDITION(f2fs__bio, f2fs_prepare_read_bio,
 
-        TP_PROTO(struct super_block *sb, struct f2fs_io_info *fio,
-                                                        struct bio *bio),
+        TP_PROTO(struct super_block *sb, int type, struct bio *bio),
 
-        TP_ARGS(sb, fio, bio),
+        TP_ARGS(sb, type, bio),
 
         TP_CONDITION(bio)
 );
 
-DEFINE_EVENT_CONDITION(f2fs__submit_bio, f2fs_submit_read_bio,
+DEFINE_EVENT_CONDITION(f2fs__bio, f2fs_submit_read_bio,
 
-        TP_PROTO(struct super_block *sb, struct f2fs_io_info *fio,
-                                                        struct bio *bio),
+        TP_PROTO(struct super_block *sb, int type, struct bio *bio),
 
-        TP_ARGS(sb, fio, bio),
+        TP_ARGS(sb, type, bio),
+
+        TP_CONDITION(bio)
+);
+
+DEFINE_EVENT_CONDITION(f2fs__bio, f2fs_submit_write_bio,
+
+        TP_PROTO(struct super_block *sb, int type, struct bio *bio),
+
+        TP_ARGS(sb, type, bio),
 
         TP_CONDITION(bio)
 );
@@ -1082,16 +1121,16 @@ TRACE_EVENT(f2fs_write_checkpoint,
         ),
 
         TP_printk("dev = (%d,%d), checkpoint for %s, state = %s",
-                show_dev(__entry),
+                show_dev(__entry->dev),
                 show_cpreason(__entry->reason),
                 __entry->msg)
 );
 
 TRACE_EVENT(f2fs_issue_discard,
 
-        TP_PROTO(struct super_block *sb, block_t blkstart, block_t blklen),
+        TP_PROTO(struct block_device *dev, block_t blkstart, block_t blklen),
 
-        TP_ARGS(sb, blkstart, blklen),
+        TP_ARGS(dev, blkstart, blklen),
 
         TP_STRUCT__entry(
                 __field(dev_t,  dev)
@@ -1100,22 +1139,22 @@ TRACE_EVENT(f2fs_issue_discard,
         ),
 
         TP_fast_assign(
-                __entry->dev    = sb->s_dev;
+                __entry->dev    = dev->bd_dev;
                 __entry->blkstart = blkstart;
                 __entry->blklen = blklen;
         ),
 
         TP_printk("dev = (%d,%d), blkstart = 0x%llx, blklen = 0x%llx",
-                show_dev(__entry),
+                show_dev(__entry->dev),
                 (unsigned long long)__entry->blkstart,
                 (unsigned long long)__entry->blklen)
 );
 
 TRACE_EVENT(f2fs_issue_reset_zone,
 
-        TP_PROTO(struct super_block *sb, block_t blkstart),
+        TP_PROTO(struct block_device *dev, block_t blkstart),
 
-        TP_ARGS(sb, blkstart),
+        TP_ARGS(dev, blkstart),
 
         TP_STRUCT__entry(
                 __field(dev_t,  dev)
@@ -1123,21 +1162,21 @@ TRACE_EVENT(f2fs_issue_reset_zone,
         ),
 
         TP_fast_assign(
-                __entry->dev    = sb->s_dev;
+                __entry->dev    = dev->bd_dev;
                 __entry->blkstart = blkstart;
         ),
 
         TP_printk("dev = (%d,%d), reset zone at block = 0x%llx",
-                show_dev(__entry),
+                show_dev(__entry->dev),
                 (unsigned long long)__entry->blkstart)
 );
 
 TRACE_EVENT(f2fs_issue_flush,
 
-        TP_PROTO(struct super_block *sb, unsigned int nobarrier,
+        TP_PROTO(struct block_device *dev, unsigned int nobarrier,
                                         unsigned int flush_merge),
 
-        TP_ARGS(sb, nobarrier, flush_merge),
+        TP_ARGS(dev, nobarrier, flush_merge),
 
         TP_STRUCT__entry(
                 __field(dev_t,  dev)
@@ -1146,13 +1185,13 @@ TRACE_EVENT(f2fs_issue_flush,
         ),
 
         TP_fast_assign(
-                __entry->dev    = sb->s_dev;
+                __entry->dev    = dev->bd_dev;
                 __entry->nobarrier = nobarrier;
                 __entry->flush_merge = flush_merge;
         ),
 
         TP_printk("dev = (%d,%d), %s %s",
-                show_dev(__entry),
+                show_dev(__entry->dev),
                 __entry->nobarrier ? "skip (nobarrier)" : "issue",
                 __entry->flush_merge ? " with flush_merge" : "")
 );
@@ -1267,7 +1306,7 @@ TRACE_EVENT(f2fs_shrink_extent_tree,
         ),
 
         TP_printk("dev = (%d,%d), shrunk: node_cnt = %u, tree_cnt = %u",
-                show_dev(__entry),
+                show_dev(__entry->dev),
                 __entry->node_cnt,
                 __entry->tree_cnt)
 );
@@ -1314,7 +1353,7 @@ DECLARE_EVENT_CLASS(f2fs_sync_dirty_inodes,
         ),
 
         TP_printk("dev = (%d,%d), %s, dirty count = %lld",
-                show_dev(__entry),
+                show_dev(__entry->dev),
                 show_file_type(__entry->type),
                 __entry->count)
 );
diff --git a/net/sunrpc/auth.c b/net/sunrpc/auth.c
index 2bff63a73cf8..a1ee933e3029 100644
--- a/net/sunrpc/auth.c
+++ b/net/sunrpc/auth.c
@@ -464,8 +464,10 @@ rpcauth_prune_expired(struct list_head *free, int nr_to_scan)
                  * Note that the cred_unused list must be time-ordered.
                  */
                 if (time_in_range(cred->cr_expire, expired, jiffies) &&
-                    test_bit(RPCAUTH_CRED_HASHED, &cred->cr_flags) != 0)
+                    test_bit(RPCAUTH_CRED_HASHED, &cred->cr_flags) != 0) {
+                        freed = SHRINK_STOP;
                         break;
+                }
 
                 list_del_init(&cred->cr_lru);
                 number_cred_unused--;
@@ -520,7 +522,7 @@ static unsigned long
 rpcauth_cache_shrink_count(struct shrinker *shrink, struct shrink_control *sc)
 
 {
-        return (number_cred_unused / 100) * sysctl_vfs_cache_pressure;
+        return number_cred_unused * sysctl_vfs_cache_pressure / 100;
 }
 
 static void
@@ -646,9 +648,6 @@ rpcauth_init_cred(struct rpc_cred *cred, const struct auth_cred *acred,
         cred->cr_auth = auth;
         cred->cr_ops = ops;
         cred->cr_expire = jiffies;
-#if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
-        cred->cr_magic = RPCAUTH_CRED_MAGIC;
-#endif
         cred->cr_uid = acred->uid;
 }
 EXPORT_SYMBOL_GPL(rpcauth_init_cred);
@@ -876,8 +875,12 @@ int __init rpcauth_init_module(void)
         err = rpc_init_generic_auth();
         if (err < 0)
                 goto out2;
-        register_shrinker(&rpc_cred_shrinker);
+        err = register_shrinker(&rpc_cred_shrinker);
+        if (err < 0)
+                goto out3;
         return 0;
+out3:
+        rpc_destroy_generic_auth();
 out2:
         rpc_destroy_authunix();
 out1:
diff --git a/net/sunrpc/auth_null.c b/net/sunrpc/auth_null.c
index 4d17376b2acb..5f3d527dff65 100644
--- a/net/sunrpc/auth_null.c
+++ b/net/sunrpc/auth_null.c
@@ -139,7 +139,4 @@ struct rpc_cred null_cred = {
         .cr_ops         = &null_credops,
         .cr_count       = ATOMIC_INIT(1),
         .cr_flags       = 1UL << RPCAUTH_CRED_UPTODATE,
-#if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
-        .cr_magic       = RPCAUTH_CRED_MAGIC,
-#endif
 };
diff --git a/net/sunrpc/auth_unix.c b/net/sunrpc/auth_unix.c
index 306fc0f54596..82337e1ec9cd 100644
--- a/net/sunrpc/auth_unix.c
+++ b/net/sunrpc/auth_unix.c
@@ -14,12 +14,10 @@
 #include <linux/sunrpc/auth.h>
 #include <linux/user_namespace.h>
 
-#define NFS_NGROUPS     16
-
 struct unx_cred {
         struct rpc_cred         uc_base;
         kgid_t                  uc_gid;
-        kgid_t                  uc_gids[NFS_NGROUPS];
+        kgid_t                  uc_gids[UNX_NGROUPS];
 };
 #define uc_uid                  uc_base.cr_uid
 
@@ -82,13 +80,13 @@ unx_create_cred(struct rpc_auth *auth, struct auth_cred *acred, int flags, gfp_t
 
         if (acred->group_info != NULL)
                 groups = acred->group_info->ngroups;
-        if (groups > NFS_NGROUPS)
-                groups = NFS_NGROUPS;
+        if (groups > UNX_NGROUPS)
+                groups = UNX_NGROUPS;
 
         cred->uc_gid = acred->gid;
         for (i = 0; i < groups; i++)
                 cred->uc_gids[i] = acred->group_info->gid[i];
-        if (i < NFS_NGROUPS)
+        if (i < UNX_NGROUPS)
                 cred->uc_gids[i] = INVALID_GID;
 
         return &cred->uc_base;
@@ -132,12 +130,12 @@ unx_match(struct auth_cred *acred, struct rpc_cred *rcred, int flags)
 
         if (acred->group_info != NULL)
                 groups = acred->group_info->ngroups;
-        if (groups > NFS_NGROUPS)
-                groups = NFS_NGROUPS;
+        if (groups > UNX_NGROUPS)
+                groups = UNX_NGROUPS;
         for (i = 0; i < groups ; i++)
                 if (!gid_eq(cred->uc_gids[i], acred->group_info->gid[i]))
                         return 0;
-        if (groups < NFS_NGROUPS && gid_valid(cred->uc_gids[groups]))
+        if (groups < UNX_NGROUPS && gid_valid(cred->uc_gids[groups]))
                 return 0;
         return 1;
 }
@@ -166,7 +164,7 @@ unx_marshal(struct rpc_task *task, __be32 *p)
         *p++ = htonl((u32) from_kuid(&init_user_ns, cred->uc_uid));
         *p++ = htonl((u32) from_kgid(&init_user_ns, cred->uc_gid));
         hold = p++;
-        for (i = 0; i < 16 && gid_valid(cred->uc_gids[i]); i++)
+        for (i = 0; i < UNX_NGROUPS && gid_valid(cred->uc_gids[i]); i++)
                 *p++ = htonl((u32) from_kgid(&init_user_ns, cred->uc_gids[i]));
         *hold = htonl(p - hold - 1);            /* gid array length */
         *base = htonl((p - base - 1) << 2);     /* cred length */
diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c
index d8639da06d9c..79d55d949d9a 100644
--- a/net/sunrpc/cache.c
+++ b/net/sunrpc/cache.c
@@ -728,7 +728,7 @@ void cache_clean_deferred(void *owner)
 /*
  * communicate with user-space
  *
- * We have a magic /proc file - /proc/sunrpc/<cachename>/channel.
+ * We have a magic /proc file - /proc/net/rpc/<cachename>/channel.
  * On read, you get a full request, or block.
  * On write, an update request is processed.
  * Poll works if anything to read, and always allows write.
@@ -1283,7 +1283,7 @@ EXPORT_SYMBOL_GPL(qword_get);
 
 
 /*
- * support /proc/sunrpc/cache/$CACHENAME/content
+ * support /proc/net/rpc/$CACHENAME/content
  * as a seqfile.
  * We call ->cache_show passing NULL for the item to
  * get a header, then pass each real item in the cache
@@ -1438,20 +1438,11 @@ static ssize_t read_flush(struct file *file, char __user *buf,
                           struct cache_detail *cd)
 {
         char tbuf[22];
-        unsigned long p = *ppos;
         size_t len;
 
-        snprintf(tbuf, sizeof(tbuf), "%lu\n", convert_to_wallclock(cd->flush_time));
-        len = strlen(tbuf);
-        if (p >= len)
-                return 0;
-        len -= p;
-        if (len > count)
-                len = count;
-        if (copy_to_user(buf, (void*)(tbuf+p), len))
-                return -EFAULT;
-        *ppos += len;
-        return len;
+        len = snprintf(tbuf, sizeof(tbuf), "%lu\n",
+                        convert_to_wallclock(cd->flush_time));
+        return simple_read_from_buffer(buf, count, ppos, tbuf, len);
 }
 
 static ssize_t write_flush(struct file *file, const char __user *buf,
@@ -1611,21 +1602,12 @@ static const struct file_operations cache_flush_operations_procfs = {
         .llseek         = no_llseek,
 };
 
-static void remove_cache_proc_entries(struct cache_detail *cd, struct net *net)
+static void remove_cache_proc_entries(struct cache_detail *cd)
 {
-        struct sunrpc_net *sn;
-
-        if (cd->u.procfs.proc_ent == NULL)
-                return;
-        if (cd->u.procfs.flush_ent)
-                remove_proc_entry("flush", cd->u.procfs.proc_ent);
-        if (cd->u.procfs.channel_ent)
-                remove_proc_entry("channel", cd->u.procfs.proc_ent);
-        if (cd->u.procfs.content_ent)
-                remove_proc_entry("content", cd->u.procfs.proc_ent);
-        cd->u.procfs.proc_ent = NULL;
-        sn = net_generic(net, sunrpc_net_id);
-        remove_proc_entry(cd->name, sn->proc_net_rpc);
+        if (cd->procfs) {
+                proc_remove(cd->procfs);
+                cd->procfs = NULL;
+        }
 }
 
 #ifdef CONFIG_PROC_FS
@@ -1635,38 +1617,30 @@ static int create_cache_proc_entries(struct cache_detail *cd, struct net *net)
         struct sunrpc_net *sn;
 
         sn = net_generic(net, sunrpc_net_id);
-        cd->u.procfs.proc_ent = proc_mkdir(cd->name, sn->proc_net_rpc);
-        if (cd->u.procfs.proc_ent == NULL)
+        cd->procfs = proc_mkdir(cd->name, sn->proc_net_rpc);
+        if (cd->procfs == NULL)
                 goto out_nomem;
-        cd->u.procfs.channel_ent = NULL;
-        cd->u.procfs.content_ent = NULL;
 
         p = proc_create_data("flush", S_IFREG|S_IRUSR|S_IWUSR,
-                             cd->u.procfs.proc_ent,
-                             &cache_flush_operations_procfs, cd);
-        cd->u.procfs.flush_ent = p;
+                             cd->procfs, &cache_flush_operations_procfs, cd);
         if (p == NULL)
                 goto out_nomem;
 
         if (cd->cache_request || cd->cache_parse) {
                 p = proc_create_data("channel", S_IFREG|S_IRUSR|S_IWUSR,
-                                     cd->u.procfs.proc_ent,
-                                     &cache_file_operations_procfs, cd);
-                cd->u.procfs.channel_ent = p;
+                                cd->procfs, &cache_file_operations_procfs, cd);
                 if (p == NULL)
                         goto out_nomem;
         }
         if (cd->cache_show) {
                 p = proc_create_data("content", S_IFREG|S_IRUSR,
-                                cd->u.procfs.proc_ent,
-                                &content_file_operations_procfs, cd);
-                cd->u.procfs.content_ent = p;
+                                cd->procfs, &content_file_operations_procfs, cd);
                 if (p == NULL)
                         goto out_nomem;
         }
         return 0;
 out_nomem:
-        remove_cache_proc_entries(cd, net);
+        remove_cache_proc_entries(cd);
         return -ENOMEM;
 }
 #else /* CONFIG_PROC_FS */
@@ -1695,7 +1669,7 @@ EXPORT_SYMBOL_GPL(cache_register_net);
 
 void cache_unregister_net(struct cache_detail *cd, struct net *net)
 {
-        remove_cache_proc_entries(cd, net);
+        remove_cache_proc_entries(cd);
         sunrpc_destroy_cache_detail(cd);
 }
 EXPORT_SYMBOL_GPL(cache_unregister_net);
@@ -1854,15 +1828,17 @@ int sunrpc_cache_register_pipefs(struct dentry *parent,
         struct dentry *dir = rpc_create_cache_dir(parent, name, umode, cd);
         if (IS_ERR(dir))
                 return PTR_ERR(dir);
-        cd->u.pipefs.dir = dir;
+        cd->pipefs = dir;
         return 0;
 }
 EXPORT_SYMBOL_GPL(sunrpc_cache_register_pipefs);
 
 void sunrpc_cache_unregister_pipefs(struct cache_detail *cd)
 {
-        rpc_remove_cache_dir(cd->u.pipefs.dir);
-        cd->u.pipefs.dir = NULL;
+        if (cd->pipefs) {
+                rpc_remove_cache_dir(cd->pipefs);
+                cd->pipefs = NULL;
+        }
 }
 EXPORT_SYMBOL_GPL(sunrpc_cache_unregister_pipefs);
 
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 1dc9f3bac099..52da3ce54bb5 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -1453,21 +1453,6 @@ size_t rpc_max_bc_payload(struct rpc_clnt *clnt)
 EXPORT_SYMBOL_GPL(rpc_max_bc_payload);
 
 /**
- * rpc_get_timeout - Get timeout for transport in units of HZ
- * @clnt: RPC client to query
- */
-unsigned long rpc_get_timeout(struct rpc_clnt *clnt)
-{
-        unsigned long ret;
-
-        rcu_read_lock();
-        ret = rcu_dereference(clnt->cl_xprt)->timeout->to_initval;
-        rcu_read_unlock();
-        return ret;
-}
-EXPORT_SYMBOL_GPL(rpc_get_timeout);
-
-/**
  * rpc_force_rebind - force transport to check that remote port is unchanged
  * @clnt: client to rebind
  *
@@ -2699,6 +2684,7 @@ int rpc_clnt_add_xprt(struct rpc_clnt *clnt,
 {
         struct rpc_xprt_switch *xps;
         struct rpc_xprt *xprt;
+        unsigned long connect_timeout;
         unsigned long reconnect_timeout;
         unsigned char resvport;
         int ret = 0;
@@ -2711,6 +2697,7 @@ int rpc_clnt_add_xprt(struct rpc_clnt *clnt,
                 return -EAGAIN;
         }
         resvport = xprt->resvport;
+        connect_timeout = xprt->connect_timeout;
         reconnect_timeout = xprt->max_reconnect_timeout;
         rcu_read_unlock();
 
@@ -2720,7 +2707,10 @@ int rpc_clnt_add_xprt(struct rpc_clnt *clnt,
                 goto out_put_switch;
         }
         xprt->resvport = resvport;
-        xprt->max_reconnect_timeout = reconnect_timeout;
+        if (xprt->ops->set_connect_timeout != NULL)
+                xprt->ops->set_connect_timeout(xprt,
+                                connect_timeout,
+                                reconnect_timeout);
 
         rpc_xprt_switch_set_roundrobin(xps);
         if (setup) {
@@ -2737,26 +2727,39 @@ out_put_switch:
 }
 EXPORT_SYMBOL_GPL(rpc_clnt_add_xprt);
 
+struct connect_timeout_data {
+        unsigned long connect_timeout;
+        unsigned long reconnect_timeout;
+};
+
 static int
-rpc_xprt_cap_max_reconnect_timeout(struct rpc_clnt *clnt,
+rpc_xprt_set_connect_timeout(struct rpc_clnt *clnt,
                 struct rpc_xprt *xprt,
                 void *data)
 {
-        unsigned long timeout = *((unsigned long *)data);
+        struct connect_timeout_data *timeo = data;
 
-        if (timeout < xprt->max_reconnect_timeout)
-                xprt->max_reconnect_timeout = timeout;
+        if (xprt->ops->set_connect_timeout)
+                xprt->ops->set_connect_timeout(xprt,
+                                timeo->connect_timeout,
+                                timeo->reconnect_timeout);
         return 0;
 }
 
 void
-rpc_cap_max_reconnect_timeout(struct rpc_clnt *clnt, unsigned long timeo)
+rpc_set_connect_timeout(struct rpc_clnt *clnt,
+                unsigned long connect_timeout,
+                unsigned long reconnect_timeout)
 {
+        struct connect_timeout_data timeout = {
+                .connect_timeout = connect_timeout,
+                .reconnect_timeout = reconnect_timeout,
+        };
         rpc_clnt_iterate_for_each_xprt(clnt,
-                        rpc_xprt_cap_max_reconnect_timeout,
-                        &timeo);
+                        rpc_xprt_set_connect_timeout,
+                        &timeout);
 }
-EXPORT_SYMBOL_GPL(rpc_cap_max_reconnect_timeout);
+EXPORT_SYMBOL_GPL(rpc_set_connect_timeout);
 
 void rpc_clnt_xprt_switch_put(struct rpc_clnt *clnt)
 {
diff --git a/net/sunrpc/debugfs.c b/net/sunrpc/debugfs.c
index e7b4d93566df..c8fd0b6c1618 100644
--- a/net/sunrpc/debugfs.c
+++ b/net/sunrpc/debugfs.c
@@ -16,11 +16,6 @@ static struct dentry *rpc_xprt_dir;
 
 unsigned int rpc_inject_disconnect;
 
-struct rpc_clnt_iter {
-        struct rpc_clnt *clnt;
-        loff_t          pos;
-};
-
 static int
 tasks_show(struct seq_file *f, void *v)
 {
@@ -47,12 +42,10 @@ static void *
 tasks_start(struct seq_file *f, loff_t *ppos)
         __acquires(&clnt->cl_lock)
 {
-        struct rpc_clnt_iter *iter = f->private;
+        struct rpc_clnt *clnt = f->private;
         loff_t pos = *ppos;
-        struct rpc_clnt *clnt = iter->clnt;
         struct rpc_task *task;
 
-        iter->pos = pos + 1;
         spin_lock(&clnt->cl_lock);
         list_for_each_entry(task, &clnt->cl_tasks, tk_task)
                 if (pos-- == 0)
@@ -63,12 +56,10 @@ tasks_start(struct seq_file *f, loff_t *ppos)
 static void *
 tasks_next(struct seq_file *f, void *v, loff_t *pos)
 {
-        struct rpc_clnt_iter *iter = f->private;
-        struct rpc_clnt *clnt = iter->clnt;
+        struct rpc_clnt *clnt = f->private;
         struct rpc_task *task = v;
         struct list_head *next = task->tk_task.next;
 
-        ++iter->pos;
         ++*pos;
 
         /* If there's another task on list, return it */
@@ -81,9 +72,7 @@ static void
 tasks_stop(struct seq_file *f, void *v)
         __releases(&clnt->cl_lock)
 {
-        struct rpc_clnt_iter *iter = f->private;
-        struct rpc_clnt *clnt = iter->clnt;
-
+        struct rpc_clnt *clnt = f->private;
         spin_unlock(&clnt->cl_lock);
 }
 
@@ -96,17 +85,13 @@ static const struct seq_operations tasks_seq_operations = {
 
 static int tasks_open(struct inode *inode, struct file *filp)
 {
-        int ret = seq_open_private(filp, &tasks_seq_operations,
-                                        sizeof(struct rpc_clnt_iter));
-
+        int ret = seq_open(filp, &tasks_seq_operations);
         if (!ret) {
                 struct seq_file *seq = filp->private_data;
-                struct rpc_clnt_iter *iter = seq->private;
-
-                iter->clnt = inode->i_private;
+                struct rpc_clnt *clnt = seq->private = inode->i_private;
 
-                if (!atomic_inc_not_zero(&iter->clnt->cl_count)) {
-                        seq_release_private(inode, filp);
+                if (!atomic_inc_not_zero(&clnt->cl_count)) {
+                        seq_release(inode, filp);
                         ret = -EINVAL;
                 }
         }
@@ -118,10 +103,10 @@ static int
 tasks_release(struct inode *inode, struct file *filp)
 {
         struct seq_file *seq = filp->private_data;
-        struct rpc_clnt_iter *iter = seq->private;
+        struct rpc_clnt *clnt = seq->private;
 
-        rpc_release_client(iter->clnt);
-        return seq_release_private(inode, filp);
+        rpc_release_client(clnt);
+        return seq_release(inode, filp);
 }
 
 static const struct file_operations tasks_fops = {
diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c
index 64af4f034de6..f81eaa8e0888 100644
--- a/net/sunrpc/svcauth_unix.c
+++ b/net/sunrpc/svcauth_unix.c
@@ -403,7 +403,7 @@ svcauth_unix_info_release(struct svc_xprt *xpt)
 /****************************************************************************
  * auth.unix.gid cache
  * simple cache to map a UID to a list of GIDs
- * because AUTH_UNIX aka AUTH_SYS has a max of 16
+ * because AUTH_UNIX aka AUTH_SYS has a max of UNX_NGROUPS
  */
 #define GID_HASHBITS    8
 #define GID_HASHMAX     (1<<GID_HASHBITS)
@@ -810,7 +810,7 @@ svcauth_unix_accept(struct svc_rqst *rqstp, __be32 *authp)
         cred->cr_uid = make_kuid(&init_user_ns, svc_getnl(argv)); /* uid */
         cred->cr_gid = make_kgid(&init_user_ns, svc_getnl(argv)); /* gid */
         slen = svc_getnl(argv);                 /* gids length */
-        if (slen > 16 || (len -= (slen + 2)*4) < 0)
+        if (slen > UNX_NGROUPS || (len -= (slen + 2)*4) < 0)
                 goto badcred;
         cred->cr_group_info = groups_alloc(slen);
         if (cred->cr_group_info == NULL)
diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c
index 7f1071e103ca..1f7082144e01 100644
--- a/net/sunrpc/xdr.c
+++ b/net/sunrpc/xdr.c
@@ -1518,3 +1518,37 @@ out:
 }
 EXPORT_SYMBOL_GPL(xdr_process_buf);
 
+/**
+ * xdr_stream_decode_string_dup - Decode and duplicate variable length string
+ * @xdr: pointer to xdr_stream
+ * @str: location to store pointer to string
+ * @maxlen: maximum acceptable string length
+ * @gfp_flags: GFP mask to use
+ *
+ * Return values:
+ *   On success, returns length of NUL-terminated string stored in *@ptr
+ *   %-EBADMSG on XDR buffer overflow
+ *   %-EMSGSIZE if the size of the string would exceed @maxlen
+ *   %-ENOMEM on memory allocation failure
+ */
+ssize_t xdr_stream_decode_string_dup(struct xdr_stream *xdr, char **str,
+                size_t maxlen, gfp_t gfp_flags)
+{
+        void *p;
+        ssize_t ret;
+
+        ret = xdr_stream_decode_opaque_inline(xdr, &p, maxlen);
+        if (ret > 0) {
+                char *s = kmalloc(ret + 1, gfp_flags);
+                if (s != NULL) {
+                        memcpy(s, p, ret);
+                        s[ret] = '\0';
+                        *str = s;
+                        return strlen(s);
+                }
+                ret = -ENOMEM;
+        }
+        *str = NULL;
+        return ret;
+}
+EXPORT_SYMBOL_GPL(xdr_stream_decode_string_dup);
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index 9a6be030ca7d..b530a2852ba8 100644
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -897,13 +897,11 @@ static void xprt_timer(struct rpc_task *task)
                 return;
         dprintk("RPC: %5u xprt_timer\n", task->tk_pid);
 
-        spin_lock_bh(&xprt->transport_lock);
         if (!req->rq_reply_bytes_recvd) {
                 if (xprt->ops->timer)
                         xprt->ops->timer(xprt, task);
         } else
                 task->tk_status = 0;
-        spin_unlock_bh(&xprt->transport_lock);
 }
 
 /**
diff --git a/net/sunrpc/xprtrdma/fmr_ops.c b/net/sunrpc/xprtrdma/fmr_ops.c
index 1ebb09e1ac4f..59e64025ed96 100644
--- a/net/sunrpc/xprtrdma/fmr_ops.c
+++ b/net/sunrpc/xprtrdma/fmr_ops.c
@@ -310,10 +310,7 @@ fmr_op_unmap_safe(struct rpcrdma_xprt *r_xprt, struct rpcrdma_req *req,
         struct rpcrdma_mw *mw;
 
         while (!list_empty(&req->rl_registered)) {
-                mw = list_first_entry(&req->rl_registered,
-                                      struct rpcrdma_mw, mw_list);
-                list_del_init(&mw->mw_list);
-
+                mw = rpcrdma_pop_mw(&req->rl_registered);
                 if (sync)
                         fmr_op_recover_mr(mw);
                 else
diff --git a/net/sunrpc/xprtrdma/frwr_ops.c b/net/sunrpc/xprtrdma/frwr_ops.c
index 47bed5333c7f..f81dd93176c0 100644
--- a/net/sunrpc/xprtrdma/frwr_ops.c
+++ b/net/sunrpc/xprtrdma/frwr_ops.c
@@ -466,8 +466,8 @@ frwr_op_unmap_sync(struct rpcrdma_xprt *r_xprt, struct rpcrdma_req *req)
         struct ib_send_wr *first, **prev, *last, *bad_wr;
         struct rpcrdma_rep *rep = req->rl_reply;
         struct rpcrdma_ia *ia = &r_xprt->rx_ia;
-        struct rpcrdma_mw *mw, *tmp;
         struct rpcrdma_frmr *f;
+        struct rpcrdma_mw *mw;
         int count, rc;
 
         dprintk("RPC:       %s: req %p\n", __func__, req);
@@ -534,10 +534,10 @@ frwr_op_unmap_sync(struct rpcrdma_xprt *r_xprt, struct rpcrdma_req *req)
          * them to the free MW list.
          */
 unmap:
-        list_for_each_entry_safe(mw, tmp, &req->rl_registered, mw_list) {
+        while (!list_empty(&req->rl_registered)) {
+                mw = rpcrdma_pop_mw(&req->rl_registered);
                 dprintk("RPC:       %s: DMA unmapping frmr %p\n",
                         __func__, &mw->frmr);
-                list_del_init(&mw->mw_list);
                 ib_dma_unmap_sg(ia->ri_device,
                                 mw->mw_sg, mw->mw_nents, mw->mw_dir);
                 rpcrdma_put_mw(r_xprt, mw);
@@ -571,10 +571,7 @@ frwr_op_unmap_safe(struct rpcrdma_xprt *r_xprt, struct rpcrdma_req *req,
         struct rpcrdma_mw *mw;
 
         while (!list_empty(&req->rl_registered)) {
-                mw = list_first_entry(&req->rl_registered,
-                                      struct rpcrdma_mw, mw_list);
-                list_del_init(&mw->mw_list);
-
+                mw = rpcrdma_pop_mw(&req->rl_registered);
                 if (sync)
                         frwr_op_recover_mr(mw);
                 else
diff --git a/net/sunrpc/xprtrdma/rpc_rdma.c b/net/sunrpc/xprtrdma/rpc_rdma.c
index c52e0f2ffe52..a044be2d6ad7 100644
--- a/net/sunrpc/xprtrdma/rpc_rdma.c
+++ b/net/sunrpc/xprtrdma/rpc_rdma.c
@@ -125,14 +125,34 @@ void rpcrdma_set_max_header_sizes(struct rpcrdma_xprt *r_xprt)
 /* The client can send a request inline as long as the RPCRDMA header
  * plus the RPC call fit under the transport's inline limit. If the
  * combined call message size exceeds that limit, the client must use
- * the read chunk list for this operation.
+ * a Read chunk for this operation.
+ *
+ * A Read chunk is also required if sending the RPC call inline would
+ * exceed this device's max_sge limit.
  */
 static bool rpcrdma_args_inline(struct rpcrdma_xprt *r_xprt,
                                 struct rpc_rqst *rqst)
 {
-        struct rpcrdma_ia *ia = &r_xprt->rx_ia;
+        struct xdr_buf *xdr = &rqst->rq_snd_buf;
+        unsigned int count, remaining, offset;
+
+        if (xdr->len > r_xprt->rx_ia.ri_max_inline_write)
+                return false;
+
+        if (xdr->page_len) {
+                remaining = xdr->page_len;
+                offset = xdr->page_base & ~PAGE_MASK;
+                count = 0;
+                while (remaining) {
+                        remaining -= min_t(unsigned int,
+                                           PAGE_SIZE - offset, remaining);
+                        offset = 0;
+                        if (++count > r_xprt->rx_ia.ri_max_send_sges)
+                                return false;
+                }
+        }
 
-        return rqst->rq_snd_buf.len <= ia->ri_max_inline_write;
+        return true;
 }
 
 /* The client can't know how large the actual reply will be. Thus it
@@ -186,9 +206,9 @@ rpcrdma_convert_kvec(struct kvec *vec, struct rpcrdma_mr_seg *seg, int n)
  */
 
 static int
-rpcrdma_convert_iovs(struct xdr_buf *xdrbuf, unsigned int pos,
-        enum rpcrdma_chunktype type, struct rpcrdma_mr_seg *seg,
-        bool reminv_expected)
+rpcrdma_convert_iovs(struct rpcrdma_xprt *r_xprt, struct xdr_buf *xdrbuf,
+                     unsigned int pos, enum rpcrdma_chunktype type,
+                     struct rpcrdma_mr_seg *seg)
 {
         int len, n, p, page_base;
         struct page **ppages;
@@ -226,22 +246,21 @@ rpcrdma_convert_iovs(struct xdr_buf *xdrbuf, unsigned int pos,
         if (len && n == RPCRDMA_MAX_SEGS)
                 goto out_overflow;
 
-        /* When encoding the read list, the tail is always sent inline */
-        if (type == rpcrdma_readch)
+        /* When encoding a Read chunk, the tail iovec contains an
+         * XDR pad and may be omitted.
+         */
+        if (type == rpcrdma_readch && r_xprt->rx_ia.ri_implicit_roundup)
                 return n;
 
-        /* When encoding the Write list, some servers need to see an extra
-         * segment for odd-length Write chunks. The upper layer provides
-         * space in the tail iovec for this purpose.
+        /* When encoding a Write chunk, some servers need to see an
+         * extra segment for non-XDR-aligned Write chunks. The upper
+         * layer provides space in the tail iovec that may be used
+         * for this purpose.
          */
-        if (type == rpcrdma_writech && reminv_expected)
+        if (type == rpcrdma_writech && r_xprt->rx_ia.ri_implicit_roundup)
                 return n;
 
         if (xdrbuf->tail[0].iov_len) {
-                /* the rpcrdma protocol allows us to omit any trailing
-                 * xdr pad bytes, saving the server an RDMA operation. */
-                if (xdrbuf->tail[0].iov_len < 4 && xprt_rdma_pad_optimize)
-                        return n;
                 n = rpcrdma_convert_kvec(&xdrbuf->tail[0], seg, n);
                 if (n == RPCRDMA_MAX_SEGS)
                         goto out_overflow;
@@ -293,7 +312,8 @@ rpcrdma_encode_read_list(struct rpcrdma_xprt *r_xprt,
         if (rtype == rpcrdma_areadch)
                 pos = 0;
         seg = req->rl_segments;
-        nsegs = rpcrdma_convert_iovs(&rqst->rq_snd_buf, pos, rtype, seg, false);
+        nsegs = rpcrdma_convert_iovs(r_xprt, &rqst->rq_snd_buf, pos,
+                                     rtype, seg);
         if (nsegs < 0)
                 return ERR_PTR(nsegs);
 
@@ -302,7 +322,7 @@ rpcrdma_encode_read_list(struct rpcrdma_xprt *r_xprt,
                                                  false, &mw);
                 if (n < 0)
                         return ERR_PTR(n);
-                list_add(&mw->mw_list, &req->rl_registered);
+                rpcrdma_push_mw(mw, &req->rl_registered);
 
                 *iptr++ = xdr_one;      /* item present */
 
@@ -355,10 +375,9 @@ rpcrdma_encode_write_list(struct rpcrdma_xprt *r_xprt, struct rpcrdma_req *req,
         }
 
         seg = req->rl_segments;
-        nsegs = rpcrdma_convert_iovs(&rqst->rq_rcv_buf,
+        nsegs = rpcrdma_convert_iovs(r_xprt, &rqst->rq_rcv_buf,
                                      rqst->rq_rcv_buf.head[0].iov_len,
-                                     wtype, seg,
-                                     r_xprt->rx_ia.ri_reminv_expected);
+                                     wtype, seg);
         if (nsegs < 0)
                 return ERR_PTR(nsegs);
 
@@ -371,7 +390,7 @@ rpcrdma_encode_write_list(struct rpcrdma_xprt *r_xprt, struct rpcrdma_req *req,
                                                  true, &mw);
                 if (n < 0)
                         return ERR_PTR(n);
-                list_add(&mw->mw_list, &req->rl_registered);
+                rpcrdma_push_mw(mw, &req->rl_registered);
 
                 iptr = xdr_encode_rdma_segment(iptr, mw);
 
@@ -423,8 +442,7 @@ rpcrdma_encode_reply_chunk(struct rpcrdma_xprt *r_xprt,
         }
 
         seg = req->rl_segments;
-        nsegs = rpcrdma_convert_iovs(&rqst->rq_rcv_buf, 0, wtype, seg,
-                                     r_xprt->rx_ia.ri_reminv_expected);
+        nsegs = rpcrdma_convert_iovs(r_xprt, &rqst->rq_rcv_buf, 0, wtype, seg);
         if (nsegs < 0)
                 return ERR_PTR(nsegs);
 
@@ -437,7 +455,7 @@ rpcrdma_encode_reply_chunk(struct rpcrdma_xprt *r_xprt,
                                                  true, &mw);
                 if (n < 0)
                         return ERR_PTR(n);
-                list_add(&mw->mw_list, &req->rl_registered);
+                rpcrdma_push_mw(mw, &req->rl_registered);
 
                 iptr = xdr_encode_rdma_segment(iptr, mw);
 
@@ -741,13 +759,13 @@ rpcrdma_marshal_req(struct rpc_rqst *rqst)
         iptr = headerp->rm_body.rm_chunks;
         iptr = rpcrdma_encode_read_list(r_xprt, req, rqst, iptr, rtype);
         if (IS_ERR(iptr))
-                goto out_unmap;
+                goto out_err;
         iptr = rpcrdma_encode_write_list(r_xprt, req, rqst, iptr, wtype);
         if (IS_ERR(iptr))
-                goto out_unmap;
+                goto out_err;
         iptr = rpcrdma_encode_reply_chunk(r_xprt, req, rqst, iptr, wtype);
         if (IS_ERR(iptr))
-                goto out_unmap;
+                goto out_err;
         hdrlen = (unsigned char *)iptr - (unsigned char *)headerp;
 
         dprintk("RPC: %5u %s: %s/%s: hdrlen %zd rpclen %zd\n",
@@ -758,12 +776,14 @@ rpcrdma_marshal_req(struct rpc_rqst *rqst)
         if (!rpcrdma_prepare_send_sges(&r_xprt->rx_ia, req, hdrlen,
                                        &rqst->rq_snd_buf, rtype)) {
                 iptr = ERR_PTR(-EIO);
-                goto out_unmap;
+                goto out_err;
         }
         return 0;
 
-out_unmap:
-        r_xprt->rx_ia.ri_ops->ro_unmap_safe(r_xprt, req, false);
+out_err:
+        pr_err("rpcrdma: rpcrdma_marshal_req failed, status %ld\n",
+               PTR_ERR(iptr));
+        r_xprt->rx_stats.failed_marshal_count++;
         return PTR_ERR(iptr);
 }
 
diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c
index 534c178d2a7e..c717f5410776 100644
--- a/net/sunrpc/xprtrdma/transport.c
+++ b/net/sunrpc/xprtrdma/transport.c
@@ -67,7 +67,7 @@ unsigned int xprt_rdma_max_inline_read = RPCRDMA_DEF_INLINE;
 static unsigned int xprt_rdma_max_inline_write = RPCRDMA_DEF_INLINE;
 static unsigned int xprt_rdma_inline_write_padding;
 static unsigned int xprt_rdma_memreg_strategy = RPCRDMA_FRMR;
-                int xprt_rdma_pad_optimize = 1;
+                int xprt_rdma_pad_optimize = 0;
 
 #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
 
@@ -709,10 +709,6 @@ xprt_rdma_send_request(struct rpc_task *task)
         return 0;
 
 failed_marshal:
-        dprintk("RPC:       %s: rpcrdma_marshal_req failed, status %i\n",
-                __func__, rc);
-        if (rc == -EIO)
-                r_xprt->rx_stats.failed_marshal_count++;
         if (rc != -ENOTCONN)
                 return rc;
 drop_connection:
diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c
index 11d07748f699..81cd31acf690 100644
--- a/net/sunrpc/xprtrdma/verbs.c
+++ b/net/sunrpc/xprtrdma/verbs.c
@@ -54,6 +54,7 @@
 #include <linux/sunrpc/svc_rdma.h>
 #include <asm/bitops.h>
 #include <linux/module.h> /* try_module_get()/module_put() */
+#include <rdma/ib_cm.h>
 
 #include "xprt_rdma.h"
 
@@ -208,6 +209,7 @@ rpcrdma_update_connect_private(struct rpcrdma_xprt *r_xprt,
 
         /* Default settings for RPC-over-RDMA Version One */
         r_xprt->rx_ia.ri_reminv_expected = false;
+        r_xprt->rx_ia.ri_implicit_roundup = xprt_rdma_pad_optimize;
         rsize = RPCRDMA_V1_DEF_INLINE_SIZE;
         wsize = RPCRDMA_V1_DEF_INLINE_SIZE;
 
@@ -215,6 +217,7 @@ rpcrdma_update_connect_private(struct rpcrdma_xprt *r_xprt,
             pmsg->cp_magic == rpcrdma_cmp_magic &&
             pmsg->cp_version == RPCRDMA_CMP_VERSION) {
                 r_xprt->rx_ia.ri_reminv_expected = true;
+                r_xprt->rx_ia.ri_implicit_roundup = true;
                 rsize = rpcrdma_decode_buffer_size(pmsg->cp_send_size);
                 wsize = rpcrdma_decode_buffer_size(pmsg->cp_recv_size);
         }
@@ -277,7 +280,14 @@ rpcrdma_conn_upcall(struct rdma_cm_id *id, struct rdma_cm_event *event)
                 connstate = -ENETDOWN;
                 goto connected;
         case RDMA_CM_EVENT_REJECTED:
+#if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
+                pr_info("rpcrdma: connection to %pIS:%u on %s rejected: %s\n",
+                        sap, rpc_get_port(sap), ia->ri_device->name,
+                        rdma_reject_msg(id, event->status));
+#endif
                 connstate = -ECONNREFUSED;
+                if (event->status == IB_CM_REJ_STALE_CONN)
+                        connstate = -EAGAIN;
                 goto connected;
         case RDMA_CM_EVENT_DISCONNECTED:
                 connstate = -ECONNABORTED;
@@ -486,18 +496,19 @@ rpcrdma_ia_close(struct rpcrdma_ia *ia)
  */
 int
 rpcrdma_ep_create(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia,
-                                struct rpcrdma_create_data_internal *cdata)
+                  struct rpcrdma_create_data_internal *cdata)
 {
         struct rpcrdma_connect_private *pmsg = &ep->rep_cm_private;
+        unsigned int max_qp_wr, max_sge;
         struct ib_cq *sendcq, *recvcq;
-        unsigned int max_qp_wr;
         int rc;
 
-        if (ia->ri_device->attrs.max_sge < RPCRDMA_MAX_SEND_SGES) {
-                dprintk("RPC:       %s: insufficient sge's available\n",
-                        __func__);
+        max_sge = min(ia->ri_device->attrs.max_sge, RPCRDMA_MAX_SEND_SGES);
+        if (max_sge < RPCRDMA_MIN_SEND_SGES) {
+                pr_warn("rpcrdma: HCA provides only %d send SGEs\n", max_sge);
                 return -ENOMEM;
         }
+        ia->ri_max_send_sges = max_sge - RPCRDMA_MIN_SEND_SGES;
 
         if (ia->ri_device->attrs.max_qp_wr <= RPCRDMA_BACKWARD_WRS) {
                 dprintk("RPC:       %s: insufficient wqe's available\n",
@@ -522,7 +533,7 @@ rpcrdma_ep_create(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia,
         ep->rep_attr.cap.max_recv_wr = cdata->max_requests;
         ep->rep_attr.cap.max_recv_wr += RPCRDMA_BACKWARD_WRS;
         ep->rep_attr.cap.max_recv_wr += 1;      /* drain cqe */
-        ep->rep_attr.cap.max_send_sge = RPCRDMA_MAX_SEND_SGES;
+        ep->rep_attr.cap.max_send_sge = max_sge;
         ep->rep_attr.cap.max_recv_sge = 1;
         ep->rep_attr.cap.max_inline_data = 0;
         ep->rep_attr.sq_sig_type = IB_SIGNAL_REQ_WR;
@@ -640,20 +651,21 @@ rpcrdma_ep_destroy(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia)
 int
 rpcrdma_ep_connect(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia)
 {
+        struct rpcrdma_xprt *r_xprt = container_of(ia, struct rpcrdma_xprt,
+                                                   rx_ia);
         struct rdma_cm_id *id, *old;
+        struct sockaddr *sap;
+        unsigned int extras;
         int rc = 0;
-        int retry_count = 0;
 
         if (ep->rep_connected != 0) {
-                struct rpcrdma_xprt *xprt;
 retry:
                 dprintk("RPC:       %s: reconnecting...\n", __func__);
 
                 rpcrdma_ep_disconnect(ep, ia);
 
-                xprt = container_of(ia, struct rpcrdma_xprt, rx_ia);
-                id = rpcrdma_create_id(xprt, ia,
-                                (struct sockaddr *)&xprt->rx_data.addr);
+                sap = (struct sockaddr *)&r_xprt->rx_data.addr;
+                id = rpcrdma_create_id(r_xprt, ia, sap);
                 if (IS_ERR(id)) {
                         rc = -EHOSTUNREACH;
                         goto out;
@@ -708,51 +720,18 @@ retry:
         }
 
         wait_event_interruptible(ep->rep_connect_wait, ep->rep_connected != 0);
-
-        /*
-         * Check state. A non-peer reject indicates no listener
-         * (ECONNREFUSED), which may be a transient state. All
-         * others indicate a transport condition which has already
-         * undergone a best-effort.
-         */
-        if (ep->rep_connected == -ECONNREFUSED &&
-            ++retry_count <= RDMA_CONNECT_RETRY_MAX) {
-                dprintk("RPC:       %s: non-peer_reject, retry\n", __func__);
-                goto retry;
-        }
         if (ep->rep_connected <= 0) {
-                /* Sometimes, the only way to reliably connect to remote
-                 * CMs is to use same nonzero values for ORD and IRD. */
-                if (retry_count++ <= RDMA_CONNECT_RETRY_MAX + 1 &&
-                    (ep->rep_remote_cma.responder_resources == 0 ||
-                     ep->rep_remote_cma.initiator_depth !=
-                                ep->rep_remote_cma.responder_resources)) {
-                        if (ep->rep_remote_cma.responder_resources == 0)
-                                ep->rep_remote_cma.responder_resources = 1;
-                        ep->rep_remote_cma.initiator_depth =
-                                ep->rep_remote_cma.responder_resources;
+                if (ep->rep_connected == -EAGAIN)
                         goto retry;
-                }
                 rc = ep->rep_connected;
-        } else {
-                struct rpcrdma_xprt *r_xprt;
-                unsigned int extras;
-
-                dprintk("RPC:       %s: connected\n", __func__);
-
-                r_xprt = container_of(ia, struct rpcrdma_xprt, rx_ia);
-                extras = r_xprt->rx_buf.rb_bc_srv_max_requests;
-
-                if (extras) {
-                        rc = rpcrdma_ep_post_extra_recv(r_xprt, extras);
-                        if (rc) {
-                                pr_warn("%s: rpcrdma_ep_post_extra_recv: %i\n",
-                                        __func__, rc);
-                                rc = 0;
-                        }
-                }
+                goto out;
         }
 
+        dprintk("RPC:       %s: connected\n", __func__);
+        extras = r_xprt->rx_buf.rb_bc_srv_max_requests;
+        if (extras)
+                rpcrdma_ep_post_extra_recv(r_xprt, extras);
+
 out:
         if (rc)
                 ep->rep_connected = rc;
@@ -797,9 +776,7 @@ rpcrdma_mr_recovery_worker(struct work_struct *work)
 
         spin_lock(&buf->rb_recovery_lock);
         while (!list_empty(&buf->rb_stale_mrs)) {
-                mw = list_first_entry(&buf->rb_stale_mrs,
-                                      struct rpcrdma_mw, mw_list);
-                list_del_init(&mw->mw_list);
+                mw = rpcrdma_pop_mw(&buf->rb_stale_mrs);
                 spin_unlock(&buf->rb_recovery_lock);
 
                 dprintk("RPC:       %s: recovering MR %p\n", __func__, mw);
@@ -817,7 +794,7 @@ rpcrdma_defer_mr_recovery(struct rpcrdma_mw *mw)
         struct rpcrdma_buffer *buf = &r_xprt->rx_buf;
 
         spin_lock(&buf->rb_recovery_lock);
-        list_add(&mw->mw_list, &buf->rb_stale_mrs);
+        rpcrdma_push_mw(mw, &buf->rb_stale_mrs);
         spin_unlock(&buf->rb_recovery_lock);
 
         schedule_delayed_work(&buf->rb_recovery_worker, 0);
@@ -1093,11 +1070,8 @@ rpcrdma_get_mw(struct rpcrdma_xprt *r_xprt)
         struct rpcrdma_mw *mw = NULL;
 
         spin_lock(&buf->rb_mwlock);
-        if (!list_empty(&buf->rb_mws)) {
-                mw = list_first_entry(&buf->rb_mws,
-                                      struct rpcrdma_mw, mw_list);
-                list_del_init(&mw->mw_list);
-        }
+        if (!list_empty(&buf->rb_mws))
+                mw = rpcrdma_pop_mw(&buf->rb_mws);
         spin_unlock(&buf->rb_mwlock);
 
         if (!mw)
@@ -1120,7 +1094,7 @@ rpcrdma_put_mw(struct rpcrdma_xprt *r_xprt, struct rpcrdma_mw *mw)
         struct rpcrdma_buffer *buf = &r_xprt->rx_buf;
 
         spin_lock(&buf->rb_mwlock);
-        list_add_tail(&mw->mw_list, &buf->rb_mws);
+        rpcrdma_push_mw(mw, &buf->rb_mws);
         spin_unlock(&buf->rb_mwlock);
 }
 
diff --git a/net/sunrpc/xprtrdma/xprt_rdma.h b/net/sunrpc/xprtrdma/xprt_rdma.h
index e35efd4ac1e4..171a35116de9 100644
--- a/net/sunrpc/xprtrdma/xprt_rdma.h
+++ b/net/sunrpc/xprtrdma/xprt_rdma.h
@@ -74,7 +74,9 @@ struct rpcrdma_ia {
         unsigned int            ri_max_frmr_depth;
         unsigned int            ri_max_inline_write;
         unsigned int            ri_max_inline_read;
+        unsigned int            ri_max_send_sges;
         bool                    ri_reminv_expected;
+        bool                    ri_implicit_roundup;
         enum ib_mr_type         ri_mrtype;
         struct ib_qp_attr       ri_qp_attr;
         struct ib_qp_init_attr  ri_qp_init_attr;
@@ -303,15 +305,19 @@ struct rpcrdma_mr_seg {		/* chunk descriptors */
         char            *mr_offset;     /* kva if no page, else offset */
 };
 
-/* Reserve enough Send SGEs to send a maximum size inline request:
+/* The Send SGE array is provisioned to send a maximum size
+ * inline request:
  * - RPC-over-RDMA header
  * - xdr_buf head iovec
- * - RPCRDMA_MAX_INLINE bytes, possibly unaligned, in pages
+ * - RPCRDMA_MAX_INLINE bytes, in pages
  * - xdr_buf tail iovec
+ *
+ * The actual number of array elements consumed by each RPC
+ * depends on the device's max_sge limit.
  */
 enum {
-        RPCRDMA_MAX_SEND_PAGES = PAGE_SIZE + RPCRDMA_MAX_INLINE - 1,
-        RPCRDMA_MAX_PAGE_SGES = (RPCRDMA_MAX_SEND_PAGES >> PAGE_SHIFT) + 1,
+        RPCRDMA_MIN_SEND_SGES = 3,
+        RPCRDMA_MAX_PAGE_SGES = RPCRDMA_MAX_INLINE >> PAGE_SHIFT,
         RPCRDMA_MAX_SEND_SGES = 1 + 1 + RPCRDMA_MAX_PAGE_SGES + 1,
 };
 
@@ -348,6 +354,22 @@ rpcr_to_rdmar(struct rpc_rqst *rqst)
         return rqst->rq_xprtdata;
 }
 
+static inline void
+rpcrdma_push_mw(struct rpcrdma_mw *mw, struct list_head *list)
+{
+        list_add_tail(&mw->mw_list, list);
+}
+
+static inline struct rpcrdma_mw *
+rpcrdma_pop_mw(struct list_head *list)
+{
+        struct rpcrdma_mw *mw;
+
+        mw = list_first_entry(list, struct rpcrdma_mw, mw_list);
+        list_del(&mw->mw_list);
+        return mw;
+}
+
 /*
  * struct rpcrdma_buffer -- holds list/queue of pre-registered memory for
  * inline requests/replies, and client/server credits.
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 956c7bce80d1..16aff8ddc16f 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -52,6 +52,8 @@
 #include "sunrpc.h"
 
 static void xs_close(struct rpc_xprt *xprt);
+static void xs_tcp_set_socket_timeouts(struct rpc_xprt *xprt,
+                struct socket *sock);
 
 /*
  * xprtsock tunables
@@ -666,6 +668,9 @@ static int xs_tcp_send_request(struct rpc_task *task)
         if (task->tk_flags & RPC_TASK_SENT)
                 zerocopy = false;
 
+        if (test_bit(XPRT_SOCK_UPD_TIMEOUT, &transport->sock_state))
+                xs_tcp_set_socket_timeouts(xprt, transport->sock);
+
         /* Continue transmitting the packet/record. We must be careful
          * to cope with writespace callbacks arriving _after_ we have
          * called sendmsg(). */
@@ -1734,7 +1739,9 @@ static void xs_udp_set_buffer_size(struct rpc_xprt *xprt, size_t sndsize, size_t
  */
 static void xs_udp_timer(struct rpc_xprt *xprt, struct rpc_task *task)
 {
+        spin_lock_bh(&xprt->transport_lock);
         xprt_adjust_cwnd(xprt, task, -ETIMEDOUT);
+        spin_unlock_bh(&xprt->transport_lock);
 }
 
 static unsigned short xs_get_random_port(void)
@@ -2235,6 +2242,66 @@ static void xs_tcp_shutdown(struct rpc_xprt *xprt)
                 xs_reset_transport(transport);
 }
 
+static void xs_tcp_set_socket_timeouts(struct rpc_xprt *xprt,
+                struct socket *sock)
+{
+        struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt);
+        unsigned int keepidle;
+        unsigned int keepcnt;
+        unsigned int opt_on = 1;
+        unsigned int timeo;
+
+        spin_lock_bh(&xprt->transport_lock);
+        keepidle = DIV_ROUND_UP(xprt->timeout->to_initval, HZ);
+        keepcnt = xprt->timeout->to_retries + 1;
+        timeo = jiffies_to_msecs(xprt->timeout->to_initval) *
+                (xprt->timeout->to_retries + 1);
+        clear_bit(XPRT_SOCK_UPD_TIMEOUT, &transport->sock_state);
+        spin_unlock_bh(&xprt->transport_lock);
+
+        /* TCP Keepalive options */
+        kernel_setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE,
+                        (char *)&opt_on, sizeof(opt_on));
+        kernel_setsockopt(sock, SOL_TCP, TCP_KEEPIDLE,
+                        (char *)&keepidle, sizeof(keepidle));
+        kernel_setsockopt(sock, SOL_TCP, TCP_KEEPINTVL,
+                        (char *)&keepidle, sizeof(keepidle));
+        kernel_setsockopt(sock, SOL_TCP, TCP_KEEPCNT,
+                        (char *)&keepcnt, sizeof(keepcnt));
+
+        /* TCP user timeout (see RFC5482) */
+        kernel_setsockopt(sock, SOL_TCP, TCP_USER_TIMEOUT,
+                        (char *)&timeo, sizeof(timeo));
+}
+
+static void xs_tcp_set_connect_timeout(struct rpc_xprt *xprt,
+                unsigned long connect_timeout,
+                unsigned long reconnect_timeout)
+{
+        struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt);
+        struct rpc_timeout to;
+        unsigned long initval;
+
+        spin_lock_bh(&xprt->transport_lock);
+        if (reconnect_timeout < xprt->max_reconnect_timeout)
+                xprt->max_reconnect_timeout = reconnect_timeout;
+        if (connect_timeout < xprt->connect_timeout) {
+                memcpy(&to, xprt->timeout, sizeof(to));
+                initval = DIV_ROUND_UP(connect_timeout, to.to_retries + 1);
+                /* Arbitrary lower limit */
+                if (initval <  XS_TCP_INIT_REEST_TO << 1)
+                        initval = XS_TCP_INIT_REEST_TO << 1;
+                to.to_initval = initval;
+                to.to_maxval = initval;
+                memcpy(&transport->tcp_timeout, &to,
+                                sizeof(transport->tcp_timeout));
+                xprt->timeout = &transport->tcp_timeout;
+                xprt->connect_timeout = connect_timeout;
+        }
+        set_bit(XPRT_SOCK_UPD_TIMEOUT, &transport->sock_state);
+        spin_unlock_bh(&xprt->transport_lock);
+}
+
 static int xs_tcp_finish_connecting(struct rpc_xprt *xprt, struct socket *sock)
 {
         struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt);
@@ -2242,22 +2309,8 @@ static int xs_tcp_finish_connecting(struct rpc_xprt *xprt, struct socket *sock)
 
         if (!transport->inet) {
                 struct sock *sk = sock->sk;
-                unsigned int keepidle = xprt->timeout->to_initval / HZ;
-                unsigned int keepcnt = xprt->timeout->to_retries + 1;
-                unsigned int opt_on = 1;
-                unsigned int timeo;
                 unsigned int addr_pref = IPV6_PREFER_SRC_PUBLIC;
 
-                /* TCP Keepalive options */
-                kernel_setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE,
-                                (char *)&opt_on, sizeof(opt_on));
-                kernel_setsockopt(sock, SOL_TCP, TCP_KEEPIDLE,
-                                (char *)&keepidle, sizeof(keepidle));
-                kernel_setsockopt(sock, SOL_TCP, TCP_KEEPINTVL,
-                                (char *)&keepidle, sizeof(keepidle));
-                kernel_setsockopt(sock, SOL_TCP, TCP_KEEPCNT,
-                                (char *)&keepcnt, sizeof(keepcnt));
-
                 /* Avoid temporary address, they are bad for long-lived
                  * connections such as NFS mounts.
                  * RFC4941, section 3.6 suggests that:
@@ -2268,11 +2321,7 @@ static int xs_tcp_finish_connecting(struct rpc_xprt *xprt, struct socket *sock)
                 kernel_setsockopt(sock, SOL_IPV6, IPV6_ADDR_PREFERENCES,
                                 (char *)&addr_pref, sizeof(addr_pref));
 
-                /* TCP user timeout (see RFC5482) */
-                timeo = jiffies_to_msecs(xprt->timeout->to_initval) *
-                        (xprt->timeout->to_retries + 1);
-                kernel_setsockopt(sock, SOL_TCP, TCP_USER_TIMEOUT,
-                                (char *)&timeo, sizeof(timeo));
+                xs_tcp_set_socket_timeouts(xprt, sock);
 
                 write_lock_bh(&sk->sk_callback_lock);
 
@@ -2721,6 +2770,7 @@ static struct rpc_xprt_ops xs_tcp_ops = {
         .set_retrans_timeout    = xprt_set_retrans_timeout_def,
         .close                  = xs_tcp_shutdown,
         .destroy                = xs_destroy,
+        .set_connect_timeout    = xs_tcp_set_connect_timeout,
         .print_stats            = xs_tcp_print_stats,
         .enable_swap            = xs_enable_swap,
         .disable_swap           = xs_disable_swap,
@@ -3007,6 +3057,8 @@ static struct rpc_xprt *xs_setup_tcp(struct xprt_create *args)
         xprt->timeout = &xs_tcp_default_timeout;
 
         xprt->max_reconnect_timeout = xprt->timeout->to_maxval;
+        xprt->connect_timeout = xprt->timeout->to_initval *
+                (xprt->timeout->to_retries + 1);
 
         INIT_WORK(&transport->recv_worker, xs_tcp_data_receive_workfn);
         INIT_DELAYED_WORK(&transport->connect_worker, xs_tcp_setup_socket);
@@ -3209,7 +3261,9 @@ static int param_set_uint_minmax(const char *val,
         if (!val)
                 return -EINVAL;
         ret = kstrtouint(val, 0, &num);
-        if (ret == -EINVAL || num < min || num > max)
+        if (ret)
+                return ret;
+        if (num < min || num > max)
                 return -EINVAL;
         *((unsigned int *)kp->arg) = num;
         return 0;
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 4dedd0d3d3a7..30d752a4a6a6 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -854,6 +854,7 @@ static const char *const section_white_list[] =
         ".cmem*",                       /* EZchip */
         ".fmt_slot*",                   /* EZchip */
         ".gnu.lto*",
+        ".discard.*",
         NULL
 };
 
diff --git a/scripts/module-common.lds b/scripts/module-common.lds
index 73a2c7da0e55..cf7e52e4781b 100644
--- a/scripts/module-common.lds
+++ b/scripts/module-common.lds
@@ -4,7 +4,10 @@
  * combine them automatically.
  */
 SECTIONS {
-        /DISCARD/ : { *(.discard) }
+        /DISCARD/ : {
+                *(.discard)
+                *(.discard.*)
+        }
 
         __ksymtab               0 : { *(SORT(___ksymtab+*)) }
         __ksymtab_gpl           0 : { *(SORT(___ksymtab_gpl+*)) }
diff --git a/sound/core/seq/seq_fifo.c b/sound/core/seq/seq_fifo.c
index 1d5acbe0c08b..86240d02b530 100644
--- a/sound/core/seq/seq_fifo.c
+++ b/sound/core/seq/seq_fifo.c
@@ -135,6 +135,7 @@ int snd_seq_fifo_event_in(struct snd_seq_fifo *f,
         f->tail = cell;
         if (f->head == NULL)
                 f->head = cell;
+        cell->next = NULL;
         f->cells++;
         spin_unlock_irqrestore(&f->lock, flags);
 
@@ -214,6 +215,8 @@ void snd_seq_fifo_cell_putback(struct snd_seq_fifo *f,
                 spin_lock_irqsave(&f->lock, flags);
                 cell->next = f->head;
                 f->head = cell;
+                if (!f->tail)
+                        f->tail = cell;
                 f->cells++;
                 spin_unlock_irqrestore(&f->lock, flags);
         }
diff --git a/sound/core/timer.c b/sound/core/timer.c
index fc144f43faa6..ad153149b231 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -1702,9 +1702,21 @@ static int snd_timer_user_params(struct file *file,
                 return -EBADFD;
         if (copy_from_user(&params, _params, sizeof(params)))
                 return -EFAULT;
-        if (!(t->hw.flags & SNDRV_TIMER_HW_SLAVE) && params.ticks < 1) {
-                err = -EINVAL;
-                goto _end;
+        if (!(t->hw.flags & SNDRV_TIMER_HW_SLAVE)) {
+                u64 resolution;
+
+                if (params.ticks < 1) {
+                        err = -EINVAL;
+                        goto _end;
+                }
+
+                /* Don't allow resolution less than 1ms */
+                resolution = snd_timer_resolution(tu->timeri);
+                resolution *= params.ticks;
+                if (resolution < 1000000) {
+                        err = -EINVAL;
+                        goto _end;
+                }
         }
         if (params.queue_size > 0 &&
             (params.queue_size < 32 || params.queue_size > 1024)) {
diff --git a/sound/pci/ctxfi/cthw20k1.c b/sound/pci/ctxfi/cthw20k1.c
index 9667cbfb0ca2..ab4cdab5cfa5 100644
--- a/sound/pci/ctxfi/cthw20k1.c
+++ b/sound/pci/ctxfi/cthw20k1.c
@@ -27,12 +27,6 @@
 #include "cthw20k1.h"
 #include "ct20k1reg.h"
 
-#if BITS_PER_LONG == 32
-#define CT_XFI_DMA_MASK         DMA_BIT_MASK(32) /* 32 bit PTE */
-#else
-#define CT_XFI_DMA_MASK         DMA_BIT_MASK(64) /* 64 bit PTE */
-#endif
-
 struct hw20k1 {
         struct hw hw;
         spinlock_t reg_20k1_lock;
@@ -1904,19 +1898,18 @@ static int hw_card_start(struct hw *hw)
 {
         int err;
         struct pci_dev *pci = hw->pci;
+        const unsigned int dma_bits = BITS_PER_LONG;
 
         err = pci_enable_device(pci);
         if (err < 0)
                 return err;
 
         /* Set DMA transfer mask */
-        if (dma_set_mask(&pci->dev, CT_XFI_DMA_MASK) < 0 ||
-            dma_set_coherent_mask(&pci->dev, CT_XFI_DMA_MASK) < 0) {
-                dev_err(hw->card->dev,
-                        "architecture does not support PCI busmaster DMA with mask 0x%llx\n",
-                        CT_XFI_DMA_MASK);
-                err = -ENXIO;
-                goto error1;
+        if (dma_set_mask(&pci->dev, DMA_BIT_MASK(dma_bits))) {
+                dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(dma_bits));
+        } else {
+                dma_set_mask(&pci->dev, DMA_BIT_MASK(32));
+                dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(32));
         }
 
         if (!hw->io_base) {
diff --git a/sound/pci/ctxfi/cthw20k2.c b/sound/pci/ctxfi/cthw20k2.c
index 6414ecf93efa..18ee7768b7c4 100644
--- a/sound/pci/ctxfi/cthw20k2.c
+++ b/sound/pci/ctxfi/cthw20k2.c
@@ -26,12 +26,6 @@
 #include "cthw20k2.h"
 #include "ct20k2reg.h"
 
-#if BITS_PER_LONG == 32
-#define CT_XFI_DMA_MASK         DMA_BIT_MASK(32) /* 32 bit PTE */
-#else
-#define CT_XFI_DMA_MASK         DMA_BIT_MASK(64) /* 64 bit PTE */
-#endif
-
 struct hw20k2 {
         struct hw hw;
         /* for i2c */
@@ -2029,19 +2023,18 @@ static int hw_card_start(struct hw *hw)
         int err = 0;
         struct pci_dev *pci = hw->pci;
         unsigned int gctl;
+        const unsigned int dma_bits = BITS_PER_LONG;
 
         err = pci_enable_device(pci);
         if (err < 0)
                 return err;
 
         /* Set DMA transfer mask */
-        if (dma_set_mask(&pci->dev, CT_XFI_DMA_MASK) < 0 ||
-            dma_set_coherent_mask(&pci->dev, CT_XFI_DMA_MASK) < 0) {
-                dev_err(hw->card->dev,
-                        "architecture does not support PCI busmaster DMA with mask 0x%llx\n",
-                        CT_XFI_DMA_MASK);
-                err = -ENXIO;
-                goto error1;
+        if (!dma_set_mask(&pci->dev, DMA_BIT_MASK(dma_bits))) {
+                dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(dma_bits));
+        } else {
+                dma_set_mask(&pci->dev, DMA_BIT_MASK(32));
+                dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(32));
         }
 
         if (!hw->io_base) {
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 16108f0eb688..c8256a89375a 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -2255,6 +2255,9 @@ static const struct pci_device_id azx_ids[] = {
         /* Broxton-T */
         { PCI_DEVICE(0x8086, 0x1a98),
           .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BROXTON },
+        /* Gemini-Lake */
+        { PCI_DEVICE(0x8086, 0x3198),
+          .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BROXTON },
         /* Haswell */
         { PCI_DEVICE(0x8086, 0x0a0c),
           .driver_data = AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL },
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index fd5efa72a68b..1461ef8eb749 100644
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -3800,6 +3800,7 @@ HDA_CODEC_ENTRY(0x80862808, "Broadwell HDMI",	patch_i915_hsw_hdmi),
 HDA_CODEC_ENTRY(0x80862809, "Skylake HDMI",     patch_i915_hsw_hdmi),
 HDA_CODEC_ENTRY(0x8086280a, "Broxton HDMI",     patch_i915_hsw_hdmi),
 HDA_CODEC_ENTRY(0x8086280b, "Kabylake HDMI",    patch_i915_hsw_hdmi),
+HDA_CODEC_ENTRY(0x8086280d, "Geminilake HDMI",  patch_i915_hsw_hdmi),
 HDA_CODEC_ENTRY(0x80862880, "CedarTrail HDMI",  patch_generic_hdmi),
 HDA_CODEC_ENTRY(0x80862882, "Valleyview2 HDMI", patch_i915_byt_hdmi),
 HDA_CODEC_ENTRY(0x80862883, "Braswell HDMI",    patch_i915_byt_hdmi),
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 73a00460b5c1..4e112221d825 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -5606,6 +5606,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
         SND_PCI_QUIRK(0x1028, 0x0725, "Dell Inspiron 3162", ALC255_FIXUP_DELL_SPK_NOISE),
         SND_PCI_QUIRK(0x1028, 0x075b, "Dell XPS 13 9360", ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE),
         SND_PCI_QUIRK(0x1028, 0x075d, "Dell AIO", ALC298_FIXUP_SPK_VOLUME),
+        SND_PCI_QUIRK(0x1028, 0x0798, "Dell Inspiron 17 7000 Gaming", ALC256_FIXUP_DELL_INSPIRON_7559_SUBWOOFER),
         SND_PCI_QUIRK(0x1028, 0x164a, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1028, 0x164b, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC2),
@@ -5724,6 +5725,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
         SND_PCI_QUIRK(0x17aa, 0x2233, "Thinkpad", ALC292_FIXUP_TPT460),
         SND_PCI_QUIRK(0x17aa, 0x30bb, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY),
         SND_PCI_QUIRK(0x17aa, 0x30e2, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY),
+        SND_PCI_QUIRK(0x17aa, 0x3112, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY),
         SND_PCI_QUIRK(0x17aa, 0x3902, "Lenovo E50-80", ALC269_FIXUP_DMIC_THINKPAD_ACPI),
         SND_PCI_QUIRK(0x17aa, 0x3977, "IdeaPad S210", ALC283_FIXUP_INT_MIC),
         SND_PCI_QUIRK(0x17aa, 0x3978, "IdeaPad Y410P", ALC269_FIXUP_NO_SHUTUP),
diff --git a/tools/objtool/builtin-check.c b/tools/objtool/builtin-check.c
index 5fc52ee3264c..4cfdbb5b6967 100644
--- a/tools/objtool/builtin-check.c
+++ b/tools/objtool/builtin-check.c
@@ -339,13 +339,13 @@ static int add_dead_ends(struct objtool_file *file)
         struct instruction *insn;
         bool found;
 
-        sec = find_section_by_name(file->elf, ".rela__unreachable");
+        sec = find_section_by_name(file->elf, ".rela.discard.unreachable");
         if (!sec)
                 return 0;
 
         list_for_each_entry(rela, &sec->rela_list, list) {
                 if (rela->sym->type != STT_SECTION) {
-                        WARN("unexpected relocation symbol type in .rela__unreachable");
+                        WARN("unexpected relocation symbol type in %s", sec->name);
                         return -1;
                 }
                 insn = find_insn(file, rela->sym->sec, rela->addend);
@@ -1272,7 +1272,7 @@ int cmd_check(int argc, const char **argv)
 
         INIT_LIST_HEAD(&file.insn_list);
         hash_init(file.insn_hash);
-        file.whitelist = find_section_by_name(file.elf, "__func_stack_frame_non_standard");
+        file.whitelist = find_section_by_name(file.elf, ".discard.func_stack_frame_non_standard");
         file.rodata = find_section_by_name(file.elf, ".rodata");
         file.ignore_unreachables = false;
         file.c_file = find_section_by_name(file.elf, ".comment");