33 files changed, 1195 insertions, 787 deletions
diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
index 93e1465c8496..f5995a912213 100644
--- a/arch/powerpc/kernel/asm-offsets.c
+++ b/arch/powerpc/kernel/asm-offsets.c
@@ -248,6 +248,7 @@ int main(void)
 #endif
        DEFINE(PACAHWCPUID, offsetof(struct paca_struct, hw_cpu_id));
        DEFINE(PACAKEXECSTATE, offsetof(struct paca_struct, kexec_state));
+        DEFINE(PACA_DSCR, offsetof(struct paca_struct, dscr_default));
        DEFINE(PACA_STARTTIME, offsetof(struct paca_struct, starttime));
        DEFINE(PACA_STARTTIME_USER, offsetof(struct paca_struct, starttime_user));
        DEFINE(PACA_USER_TIME, offsetof(struct paca_struct, user_time));
diff --git a/arch/powerpc/kernel/cpu_setup_fsl_booke.S b/arch/powerpc/kernel/cpu_setup_fsl_booke.S
index cc2d8962e090..4f1393d20079 100644
--- a/arch/powerpc/kernel/cpu_setup_fsl_booke.S
+++ b/arch/powerpc/kernel/cpu_setup_fsl_booke.S
@@ -94,12 +94,12 @@ _GLOBAL(setup_altivec_idle)
 _GLOBAL(__setup_cpu_e6500)
        mflr    r6
 #ifdef CONFIG_PPC64
-        bl      .setup_altivec_ivors
+        bl      setup_altivec_ivors
        /* Touch IVOR42 only if the CPU supports E.HV category */
        mfspr   r10,SPRN_MMUCFG
        rlwinm. r10,r10,0,MMUCFG_LPIDSIZE
        beq     1f
-        bl      .setup_lrat_ivor
+        bl      setup_lrat_ivor
 1:
 #endif
        bl      setup_pw20_idle
@@ -164,15 +164,15 @@ _GLOBAL(__setup_cpu_e5500)
 #ifdef CONFIG_PPC_BOOK3E_64
 _GLOBAL(__restore_cpu_e6500)
        mflr    r5
-        bl      .setup_altivec_ivors
+        bl      setup_altivec_ivors
        /* Touch IVOR42 only if the CPU supports E.HV category */
        mfspr   r10,SPRN_MMUCFG
        rlwinm. r10,r10,0,MMUCFG_LPIDSIZE
        beq     1f
-        bl      .setup_lrat_ivor
+        bl      setup_lrat_ivor
 1:
-        bl      .setup_pw20_idle
+        bl      setup_pw20_idle
-        bl      .setup_altivec_idle
+        bl      setup_altivec_idle
        bl      __restore_cpu_e5500
        mtlr    r5
        blr
@@ -181,9 +181,9 @@ _GLOBAL(__restore_cpu_e5500)
        mflr    r4
        bl      __e500_icache_setup
        bl      __e500_dcache_setup
-        bl      .__setup_base_ivors
+        bl      __setup_base_ivors
-        bl      .setup_perfmon_ivor
+        bl      setup_perfmon_ivor
-        bl      .setup_doorbell_ivors
+        bl      setup_doorbell_ivors
        /*
         * We only want to touch IVOR38-41 if we're running on hardware
         * that supports category E.HV.  The architectural way to determine
@@ -192,7 +192,7 @@ _GLOBAL(__restore_cpu_e5500)
        mfspr   r10,SPRN_MMUCFG
        rlwinm. r10,r10,0,MMUCFG_LPIDSIZE
        beq     1f
-        bl      .setup_ehv_ivors
+        bl      setup_ehv_ivors
 1:
        mtlr    r4
        blr
@@ -201,9 +201,9 @@ _GLOBAL(__setup_cpu_e5500)
        mflr    r5
        bl      __e500_icache_setup
        bl      __e500_dcache_setup
-        bl      .__setup_base_ivors
+        bl      __setup_base_ivors
-        bl      .setup_perfmon_ivor
+        bl      setup_perfmon_ivor
-        bl      .setup_doorbell_ivors
+        bl      setup_doorbell_ivors
        /*
         * We only want to touch IVOR38-41 if we're running on hardware
         * that supports category E.HV.  The architectural way to determine
@@ -212,7 +212,7 @@ _GLOBAL(__setup_cpu_e5500)
        mfspr   r10,SPRN_MMUCFG
        rlwinm. r10,r10,0,MMUCFG_LPIDSIZE
        beq     1f
-        bl      .setup_ehv_ivors
+        bl      setup_ehv_ivors
        b       2f
 1:
        ld      r10,CPU_SPEC_FEATURES(r4)
diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c
index e7b76a6bf150..7051ea3101b9 100644
--- a/arch/powerpc/kernel/eeh.c
+++ b/arch/powerpc/kernel/eeh.c
@@ -22,6 +22,7 @@
 */
 #include <linux/delay.h>
+#include <linux/debugfs.h>
 #include <linux/sched.h>
 #include <linux/init.h>
 #include <linux/list.h>
@@ -35,6 +36,7 @@
 #include <linux/of.h>
 #include <linux/atomic.h>
+#include <asm/debug.h>
 #include <asm/eeh.h>
 #include <asm/eeh_event.h>
 #include <asm/io.h>
@@ -87,22 +89,21 @@
 /* Time to wait for a PCI slot to report status, in milliseconds */
 #define PCI_BUS_RESET_WAIT_MSEC (5*60*1000)
-/* Platform dependent EEH operations */
-struct eeh_ops *eeh_ops = NULL;
-bool eeh_subsystem_enabled = false;
-EXPORT_SYMBOL(eeh_subsystem_enabled);
 /*
- * EEH probe mode support. The intention is to support multiple
+ * EEH probe mode support, which is part of the flags,
- * platforms for EEH. Some platforms like pSeries do PCI emunation
+ * is to support multiple platforms for EEH. Some platforms
- * based on device tree. However, other platforms like powernv probe
+ * like pSeries do PCI emunation based on device tree.
- * PCI devices from hardware. The flag is used to distinguish that.
+ * However, other platforms like powernv probe PCI devices
- * In addition, struct eeh_ops::probe would be invoked for particular
+ * from hardware. The flag is used to distinguish that.
- * OF node or PCI device so that the corresponding PE would be created
+ * In addition, struct eeh_ops::probe would be invoked for
- * there.
+ * particular OF node or PCI device so that the corresponding
+ * PE would be created there.
 */
-int eeh_probe_mode;
+int eeh_subsystem_flags;
+EXPORT_SYMBOL(eeh_subsystem_flags);
+/* Platform dependent EEH operations */
+struct eeh_ops *eeh_ops = NULL;
 /* Lock to avoid races due to multiple reports of an error */
 DEFINE_RAW_SPINLOCK(confirm_error_lock);
@@ -133,6 +134,15 @@ static struct eeh_stats eeh_stats;
 #define IS_BRIDGE(class_code) (((class_code)<<16) == PCI_BASE_CLASS_BRIDGE)
+static int __init eeh_setup(char *str)
+{
+        if (!strcmp(str, "off"))
+                eeh_subsystem_flags |= EEH_FORCE_DISABLED;
+        return 1;
+}
+__setup("eeh=", eeh_setup);
 /**
 * eeh_gather_pci_data - Copy assorted PCI config space registers to buff
 * @edev: device to report data for
@@ -145,73 +155,67 @@ static struct eeh_stats eeh_stats;
 static size_t eeh_gather_pci_data(struct eeh_dev *edev, char * buf, size_t len)
 {
        struct device_node *dn = eeh_dev_to_of_node(edev);
-        struct pci_dev *dev = eeh_dev_to_pci_dev(edev);
        u32 cfg;
        int cap, i;
        int n = 0;
        n += scnprintf(buf+n, len-n, "%s\n", dn->full_name);
-        printk(KERN_WARNING "EEH: of node=%s\n", dn->full_name);
+        pr_warn("EEH: of node=%s\n", dn->full_name);
        eeh_ops->read_config(dn, PCI_VENDOR_ID, 4, &cfg);
        n += scnprintf(buf+n, len-n, "dev/vend:%08x\n", cfg);
-        printk(KERN_WARNING "EEH: PCI device/vendor: %08x\n", cfg);
+        pr_warn("EEH: PCI device/vendor: %08x\n", cfg);
        eeh_ops->read_config(dn, PCI_COMMAND, 4, &cfg);
        n += scnprintf(buf+n, len-n, "cmd/stat:%x\n", cfg);
-        printk(KERN_WARNING "EEH: PCI cmd/status register: %08x\n", cfg);
+        pr_warn("EEH: PCI cmd/status register: %08x\n", cfg);
-        if (!dev) {
-                printk(KERN_WARNING "EEH: no PCI device for this of node\n");
-                return n;
-        }
        /* Gather bridge-specific registers */
-        if (dev->class >> 16 == PCI_BASE_CLASS_BRIDGE) {
+        if (edev->mode & EEH_DEV_BRIDGE) {
                eeh_ops->read_config(dn, PCI_SEC_STATUS, 2, &cfg);
                n += scnprintf(buf+n, len-n, "sec stat:%x\n", cfg);
-                printk(KERN_WARNING "EEH: Bridge secondary status: %04x\n", cfg);
+                pr_warn("EEH: Bridge secondary status: %04x\n", cfg);
                eeh_ops->read_config(dn, PCI_BRIDGE_CONTROL, 2, &cfg);
                n += scnprintf(buf+n, len-n, "brdg ctl:%x\n", cfg);
-                printk(KERN_WARNING "EEH: Bridge control: %04x\n", cfg);
+                pr_warn("EEH: Bridge control: %04x\n", cfg);
        }
        /* Dump out the PCI-X command and status regs */
-        cap = pci_find_capability(dev, PCI_CAP_ID_PCIX);
+        cap = edev->pcix_cap;
        if (cap) {
                eeh_ops->read_config(dn, cap, 4, &cfg);
                n += scnprintf(buf+n, len-n, "pcix-cmd:%x\n", cfg);
-                printk(KERN_WARNING "EEH: PCI-X cmd: %08x\n", cfg);
+                pr_warn("EEH: PCI-X cmd: %08x\n", cfg);
                eeh_ops->read_config(dn, cap+4, 4, &cfg);
                n += scnprintf(buf+n, len-n, "pcix-stat:%x\n", cfg);
-                printk(KERN_WARNING "EEH: PCI-X status: %08x\n", cfg);
+                pr_warn("EEH: PCI-X status: %08x\n", cfg);
        }
-        /* If PCI-E capable, dump PCI-E cap 10, and the AER */
+        /* If PCI-E capable, dump PCI-E cap 10 */
-        if (pci_is_pcie(dev)) {
+        cap = edev->pcie_cap;
+        if (cap) {
                n += scnprintf(buf+n, len-n, "pci-e cap10:\n");
-                printk(KERN_WARNING
+                pr_warn("EEH: PCI-E capabilities and status follow:\n");
-                       "EEH: PCI-E capabilities and status follow:\n");
                for (i=0; i<=8; i++) {
-                        eeh_ops->read_config(dn, dev->pcie_cap+4*i, 4, &cfg);
+                        eeh_ops->read_config(dn, cap+4*i, 4, &cfg);
                        n += scnprintf(buf+n, len-n, "%02x:%x\n", 4*i, cfg);
-                        printk(KERN_WARNING "EEH: PCI-E %02x: %08x\n", i, cfg);
+                        pr_warn("EEH: PCI-E %02x: %08x\n", i, cfg);
                }
+        }
-                cap = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ERR);
+        /* If AER capable, dump it */
-                if (cap) {
+        cap = edev->aer_cap;
-                        n += scnprintf(buf+n, len-n, "pci-e AER:\n");
+        if (cap) {
-                        printk(KERN_WARNING
+                n += scnprintf(buf+n, len-n, "pci-e AER:\n");
-                               "EEH: PCI-E AER capability register set follows:\n");
+                pr_warn("EEH: PCI-E AER capability register set follows:\n");
-                        for (i=0; i<14; i++) {
+                for (i=0; i<14; i++) {
-                                eeh_ops->read_config(dn, cap+4*i, 4, &cfg);
+                        eeh_ops->read_config(dn, cap+4*i, 4, &cfg);
-                                n += scnprintf(buf+n, len-n, "%02x:%x\n", 4*i, cfg);
+                        n += scnprintf(buf+n, len-n, "%02x:%x\n", 4*i, cfg);
-                                printk(KERN_WARNING "EEH: PCI-E AER %02x: %08x\n", i, cfg);
+                        pr_warn("EEH: PCI-E AER %02x: %08x\n", i, cfg);
-                        }
                }
        }
@@ -232,21 +236,19 @@ void eeh_slot_error_detail(struct eeh_pe *pe, int severity)
 {
        size_t loglen = 0;
        struct eeh_dev *edev, *tmp;
-        bool valid_cfg_log = true;
        /*
         * When the PHB is fenced or dead, it's pointless to collect
         * the data from PCI config space because it should return
         * 0xFF's. For ER, we still retrieve the data from the PCI
         * config space.
+         *
+         * For pHyp, we have to enable IO for log retrieval. Otherwise,
+         * 0xFF's is always returned from PCI config space.
         */
-        if (eeh_probe_mode_dev() &&
+        if (!(pe->type & EEH_PE_PHB)) {
-            (pe->type & EEH_PE_PHB) &&
+                if (eeh_probe_mode_devtree())
-            (pe->state & (EEH_PE_ISOLATED | EEH_PE_PHB_DEAD)))
+                        eeh_pci_enable(pe, EEH_OPT_THAW_MMIO);
-                valid_cfg_log = false;
-        if (valid_cfg_log) {
-                eeh_pci_enable(pe, EEH_OPT_THAW_MMIO);
                eeh_ops->configure_bridge(pe);
                eeh_pe_restore_bars(pe);
@@ -309,7 +311,7 @@ static int eeh_phb_check_failure(struct eeh_pe *pe)
        /* If the PHB has been in problematic state */
        eeh_serialize_lock(&flags);
-        if (phb_pe->state & (EEH_PE_ISOLATED | EEH_PE_PHB_DEAD)) {
+        if (phb_pe->state & EEH_PE_ISOLATED) {
                ret = 0;
                goto out;
        }
@@ -515,16 +517,42 @@ EXPORT_SYMBOL(eeh_check_failure);
 */
 int eeh_pci_enable(struct eeh_pe *pe, int function)
 {
-        int rc;
+        int rc, flags = (EEH_STATE_MMIO_ACTIVE | EEH_STATE_DMA_ACTIVE);
+        /*
+         * pHyp doesn't allow to enable IO or DMA on unfrozen PE.
+         * Also, it's pointless to enable them on unfrozen PE. So
+         * we have the check here.
+         */
+        if (function == EEH_OPT_THAW_MMIO ||
+            function == EEH_OPT_THAW_DMA) {
+                rc = eeh_ops->get_state(pe, NULL);
+                if (rc < 0)
+                        return rc;
+                /* Needn't to enable or already enabled */
+                if ((rc == EEH_STATE_NOT_SUPPORT) ||
+                    ((rc & flags) == flags))
+                        return 0;
+        }
        rc = eeh_ops->set_option(pe, function);
        if (rc)
-                pr_warning("%s: Unexpected state change %d on PHB#%d-PE#%x, err=%d\n",
+                pr_warn("%s: Unexpected state change %d on "
-                        __func__, function, pe->phb->global_number, pe->addr, rc);
+                        "PHB#%d-PE#%x, err=%d\n",
+                        __func__, function, pe->phb->global_number,
+                        pe->addr, rc);
        rc = eeh_ops->wait_state(pe, PCI_BUS_RESET_WAIT_MSEC);
-        if (rc > 0 && (rc & EEH_STATE_MMIO_ENABLED) &&
+        if (rc <= 0)
-           (function == EEH_OPT_THAW_MMIO))
+                return rc;
+        if ((function == EEH_OPT_THAW_MMIO) &&
+            (rc & EEH_STATE_MMIO_ENABLED))
+                return 0;
+        if ((function == EEH_OPT_THAW_DMA) &&
+            (rc & EEH_STATE_DMA_ENABLED))
                return 0;
        return rc;
@@ -612,26 +640,7 @@ static void eeh_reset_pe_once(struct eeh_pe *pe)
        else
                eeh_ops->reset(pe, EEH_RESET_HOT);
-        /* The PCI bus requires that the reset be held high for at least
-         * a 100 milliseconds. We wait a bit longer 'just in case'.
-         */
-#define PCI_BUS_RST_HOLD_TIME_MSEC 250
-        msleep(PCI_BUS_RST_HOLD_TIME_MSEC);
-        /* We might get hit with another EEH freeze as soon as the
-         * pci slot reset line is dropped. Make sure we don't miss
-         * these, and clear the flag now.
-         */
-        eeh_pe_state_clear(pe, EEH_PE_ISOLATED);
        eeh_ops->reset(pe, EEH_RESET_DEACTIVATE);
-        /* After a PCI slot has been reset, the PCI Express spec requires
-         * a 1.5 second idle time for the bus to stabilize, before starting
-         * up traffic.
-         */
-#define PCI_BUS_SETTLE_TIME_MSEC 1800
-        msleep(PCI_BUS_SETTLE_TIME_MSEC);
 }
 /**
@@ -651,6 +660,10 @@ int eeh_reset_pe(struct eeh_pe *pe)
        for (i=0; i<3; i++) {
                eeh_reset_pe_once(pe);
+                /*
+                 * EEH_PE_ISOLATED is expected to be removed after
+                 * BAR restore.
+                 */
                rc = eeh_ops->wait_state(pe, PCI_BUS_RESET_WAIT_MSEC);
                if ((rc & flags) == flags)
                        return 0;
@@ -826,8 +839,8 @@ int eeh_init(void)
                        &hose_list, list_node)
                        pci_walk_bus(hose->bus, eeh_ops->dev_probe, NULL);
        } else {
-                pr_warning("%s: Invalid probe mode %d\n",
+                pr_warn("%s: Invalid probe mode %x",
-                           __func__, eeh_probe_mode);
+                        __func__, eeh_subsystem_flags);
                return -EINVAL;
        }
@@ -1102,10 +1115,45 @@ static const struct file_operations proc_eeh_operations = {
        .release   = single_release,
 };
+#ifdef CONFIG_DEBUG_FS
+static int eeh_enable_dbgfs_set(void *data, u64 val)
+{
+        if (val)
+                eeh_subsystem_flags &= ~EEH_FORCE_DISABLED;
+        else
+                eeh_subsystem_flags |= EEH_FORCE_DISABLED;
+        /* Notify the backend */
+        if (eeh_ops->post_init)
+                eeh_ops->post_init();
+        return 0;
+}
+static int eeh_enable_dbgfs_get(void *data, u64 *val)
+{
+        if (eeh_enabled())
+                *val = 0x1ul;
+        else
+                *val = 0x0ul;
+        return 0;
+}
+DEFINE_SIMPLE_ATTRIBUTE(eeh_enable_dbgfs_ops, eeh_enable_dbgfs_get,
+                        eeh_enable_dbgfs_set, "0x%llx\n");
+#endif
 static int __init eeh_init_proc(void)
 {
-        if (machine_is(pseries) || machine_is(powernv))
+        if (machine_is(pseries) || machine_is(powernv)) {
                proc_create("powerpc/eeh", 0, NULL, &proc_eeh_operations);
+#ifdef CONFIG_DEBUG_FS
+                debugfs_create_file("eeh_enable", 0600,
+                                    powerpc_debugfs_root, NULL,
+                                    &eeh_enable_dbgfs_ops);
+#endif
+        }
        return 0;
 }
 __initcall(eeh_init_proc);
diff --git a/arch/powerpc/kernel/eeh_driver.c b/arch/powerpc/kernel/eeh_driver.c
index bb61ca58ca6d..7100a5b96e70 100644
--- a/arch/powerpc/kernel/eeh_driver.c
+++ b/arch/powerpc/kernel/eeh_driver.c
@@ -171,6 +171,15 @@ static void eeh_enable_irq(struct pci_dev *dev)
        }
 }
+static bool eeh_dev_removed(struct eeh_dev *edev)
+{
+        /* EEH device removed ? */
+        if (!edev || (edev->mode & EEH_DEV_REMOVED))
+                return true;
+        return false;
+}
 /**
 * eeh_report_error - Report pci error to each device driver
 * @data: eeh device
@@ -187,10 +196,8 @@ static void *eeh_report_error(void *data, void *userdata)
        enum pci_ers_result rc, *res = userdata;
        struct pci_driver *driver;
-        /* We might not have the associated PCI device,
+        if (!dev || eeh_dev_removed(edev))
-         * then we should continue for next one.
+                return NULL;
-         */
-        if (!dev) return NULL;
        dev->error_state = pci_channel_io_frozen;
        driver = eeh_pcid_get(dev);
@@ -230,6 +237,9 @@ static void *eeh_report_mmio_enabled(void *data, void *userdata)
        enum pci_ers_result rc, *res = userdata;
        struct pci_driver *driver;
+        if (!dev || eeh_dev_removed(edev))
+                return NULL;
        driver = eeh_pcid_get(dev);
        if (!driver) return NULL;
@@ -267,7 +277,8 @@ static void *eeh_report_reset(void *data, void *userdata)
        enum pci_ers_result rc, *res = userdata;
        struct pci_driver *driver;
-        if (!dev) return NULL;
+        if (!dev || eeh_dev_removed(edev))
+                return NULL;
        dev->error_state = pci_channel_io_normal;
        driver = eeh_pcid_get(dev);
@@ -307,7 +318,8 @@ static void *eeh_report_resume(void *data, void *userdata)
        struct pci_dev *dev = eeh_dev_to_pci_dev(edev);
        struct pci_driver *driver;
-        if (!dev) return NULL;
+        if (!dev || eeh_dev_removed(edev))
+                return NULL;
        dev->error_state = pci_channel_io_normal;
        driver = eeh_pcid_get(dev);
@@ -343,7 +355,8 @@ static void *eeh_report_failure(void *data, void *userdata)
        struct pci_dev *dev = eeh_dev_to_pci_dev(edev);
        struct pci_driver *driver;
-        if (!dev) return NULL;
+        if (!dev || eeh_dev_removed(edev))
+                return NULL;
        dev->error_state = pci_channel_io_perm_failure;
        driver = eeh_pcid_get(dev);
@@ -380,6 +393,16 @@ static void *eeh_rmv_device(void *data, void *userdata)
        if (!dev || (dev->hdr_type & PCI_HEADER_TYPE_BRIDGE))
                return NULL;
+        /*
+         * We rely on count-based pcibios_release_device() to
+         * detach permanently offlined PEs. Unfortunately, that's
+         * not reliable enough. We might have the permanently
+         * offlined PEs attached, but we needn't take care of
+         * them and their child devices.
+         */
+        if (eeh_dev_removed(edev))
+                return NULL;
        driver = eeh_pcid_get(dev);
        if (driver) {
                eeh_pcid_put(dev);
@@ -417,6 +440,36 @@ static void *eeh_pe_detach_dev(void *data, void *userdata)
        return NULL;
 }
+/*
+ * Explicitly clear PE's frozen state for PowerNV where
+ * we have frozen PE until BAR restore is completed. It's
+ * harmless to clear it for pSeries. To be consistent with
+ * PE reset (for 3 times), we try to clear the frozen state
+ * for 3 times as well.
+ */
+static int eeh_clear_pe_frozen_state(struct eeh_pe *pe)
+{
+        int i, rc;
+        for (i = 0; i < 3; i++) {
+                rc = eeh_pci_enable(pe, EEH_OPT_THAW_MMIO);
+                if (rc)
+                        continue;
+                rc = eeh_pci_enable(pe, EEH_OPT_THAW_DMA);
+                if (!rc)
+                        break;
+        }
+        /* The PE has been isolated, clear it */
+        if (rc)
+                pr_warn("%s: Can't clear frozen PHB#%x-PE#%x (%d)\n",
+                        __func__, pe->phb->global_number, pe->addr, rc);
+        else
+                eeh_pe_state_clear(pe, EEH_PE_ISOLATED);
+        return rc;
+}
 /**
 * eeh_reset_device - Perform actual reset of a pci slot
 * @pe: EEH PE
@@ -451,19 +504,33 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus)
                eeh_pe_dev_traverse(pe, eeh_rmv_device, &removed);
        }
-        /* Reset the pci controller. (Asserts RST#; resets config space).
+        /*
+         * Reset the pci controller. (Asserts RST#; resets config space).
         * Reconfigure bridges and devices. Don't try to bring the system
         * up if the reset failed for some reason.
+         *
+         * During the reset, it's very dangerous to have uncontrolled PCI
+         * config accesses. So we prefer to block them. However, controlled
+         * PCI config accesses initiated from EEH itself are allowed.
         */
+        eeh_pe_state_mark(pe, EEH_PE_RESET);
        rc = eeh_reset_pe(pe);
-        if (rc)
+        if (rc) {
+                eeh_pe_state_clear(pe, EEH_PE_RESET);
                return rc;
+        }
        pci_lock_rescan_remove();
        /* Restore PE */
        eeh_ops->configure_bridge(pe);
        eeh_pe_restore_bars(pe);
+        eeh_pe_state_clear(pe, EEH_PE_RESET);
+        /* Clear frozen state */
+        rc = eeh_clear_pe_frozen_state(pe);
+        if (rc)
+                return rc;
        /* Give the system 5 seconds to finish running the user-space
         * hotplug shutdown scripts, e.g. ifdown for ethernet.  Yes,
@@ -573,7 +640,6 @@ static void eeh_handle_normal_event(struct eeh_pe *pe)
                        result = PCI_ERS_RESULT_NEED_RESET;
                } else {
                        pr_info("EEH: Notify device drivers to resume I/O\n");
-                        result = PCI_ERS_RESULT_NONE;
                        eeh_pe_dev_traverse(pe, eeh_report_mmio_enabled, &result);
                }
        }
@@ -585,10 +651,17 @@ static void eeh_handle_normal_event(struct eeh_pe *pe)
                if (rc < 0)
                        goto hard_fail;
-                if (rc)
+                if (rc) {
                        result = PCI_ERS_RESULT_NEED_RESET;
-                else
+                } else {
+                        /*
+                         * We didn't do PE reset for the case. The PE
+                         * is still in frozen state. Clear it before
+                         * resuming the PE.
+                         */
+                        eeh_pe_state_clear(pe, EEH_PE_ISOLATED);
                        result = PCI_ERS_RESULT_RECOVERED;
+                }
        }
        /* If any device has a hard failure, then shut off everything. */
@@ -650,8 +723,17 @@ perm_error:
        /* Notify all devices that they're about to go down. */
        eeh_pe_dev_traverse(pe, eeh_report_failure, NULL);
-        /* Shut down the device drivers for good. */
+        /* Mark the PE to be removed permanently */
+        pe->freeze_count = EEH_MAX_ALLOWED_FREEZES + 1;
+        /*
+         * Shut down the device drivers for good. We mark
+         * all removed devices correctly to avoid access
+         * the their PCI config any more.
+         */
        if (frozen_bus) {
+                eeh_pe_dev_mode_mark(pe, EEH_DEV_REMOVED);
                pci_lock_rescan_remove();
                pcibios_remove_pci_devices(frozen_bus);
                pci_unlock_rescan_remove();
@@ -682,8 +764,7 @@ static void eeh_handle_special_event(void)
                                phb_pe = eeh_phb_pe_get(hose);
                                if (!phb_pe) continue;
-                                eeh_pe_state_mark(phb_pe,
+                                eeh_pe_state_mark(phb_pe, EEH_PE_ISOLATED);
-                                        EEH_PE_ISOLATED | EEH_PE_PHB_DEAD);
                        }
                        eeh_serialize_unlock(flags);
@@ -699,8 +780,7 @@ static void eeh_handle_special_event(void)
                        eeh_remove_event(pe);
                        if (rc == EEH_NEXT_ERR_DEAD_PHB)
-                                eeh_pe_state_mark(pe,
+                                eeh_pe_state_mark(pe, EEH_PE_ISOLATED);
-                                        EEH_PE_ISOLATED | EEH_PE_PHB_DEAD);
                        else
                                eeh_pe_state_mark(pe,
                                        EEH_PE_ISOLATED | EEH_PE_RECOVERING);
@@ -724,12 +804,14 @@ static void eeh_handle_special_event(void)
                if (rc == EEH_NEXT_ERR_FROZEN_PE ||
                    rc == EEH_NEXT_ERR_FENCED_PHB) {
                        eeh_handle_normal_event(pe);
+                        eeh_pe_state_clear(pe, EEH_PE_RECOVERING);
                } else {
                        pci_lock_rescan_remove();
                        list_for_each_entry(hose, &hose_list, list_node) {
                                phb_pe = eeh_phb_pe_get(hose);
                                if (!phb_pe ||
-                                    !(phb_pe->state & EEH_PE_PHB_DEAD))
+                                    !(phb_pe->state & EEH_PE_ISOLATED) ||
+                                    (phb_pe->state & EEH_PE_RECOVERING))
                                        continue;
                                /* Notify all devices to be down */
diff --git a/arch/powerpc/kernel/eeh_pe.c b/arch/powerpc/kernel/eeh_pe.c
index f0c353fa655a..995c2a284630 100644
--- a/arch/powerpc/kernel/eeh_pe.c
+++ b/arch/powerpc/kernel/eeh_pe.c
@@ -503,13 +503,17 @@ static void *__eeh_pe_state_mark(void *data, void *flag)
        struct eeh_dev *edev, *tmp;
        struct pci_dev *pdev;
-        /*
+        /* Keep the state of permanently removed PE intact */
-         * Mark the PE with the indicated state. Also,
+        if ((pe->freeze_count > EEH_MAX_ALLOWED_FREEZES) &&
-         * the associated PCI device will be put into
+            (state & (EEH_PE_ISOLATED | EEH_PE_RECOVERING)))
-         * I/O frozen state to avoid I/O accesses from
+                return NULL;
-         * the PCI device driver.
-         */
        pe->state |= state;
+        /* Offline PCI devices if applicable */
+        if (state != EEH_PE_ISOLATED)
+                return NULL;
        eeh_pe_for_each_dev(pe, edev, tmp) {
                pdev = eeh_dev_to_pci_dev(edev);
                if (pdev)
@@ -532,6 +536,27 @@ void eeh_pe_state_mark(struct eeh_pe *pe, int state)
        eeh_pe_traverse(pe, __eeh_pe_state_mark, &state);
 }
+static void *__eeh_pe_dev_mode_mark(void *data, void *flag)
+{
+        struct eeh_dev *edev = data;
+        int mode = *((int *)flag);
+        edev->mode |= mode;
+        return NULL;
+}
+/**
+ * eeh_pe_dev_state_mark - Mark state for all device under the PE
+ * @pe: EEH PE
+ *
+ * Mark specific state for all child devices of the PE.
+ */
+void eeh_pe_dev_mode_mark(struct eeh_pe *pe, int mode)
+{
+        eeh_pe_dev_traverse(pe, __eeh_pe_dev_mode_mark, &mode);
+}
 /**
 * __eeh_pe_state_clear - Clear state for the PE
 * @data: EEH PE
@@ -546,8 +571,16 @@ static void *__eeh_pe_state_clear(void *data, void *flag)
        struct eeh_pe *pe = (struct eeh_pe *)data;
        int state = *((int *)flag);
+        /* Keep the state of permanently removed PE intact */
+        if ((pe->freeze_count > EEH_MAX_ALLOWED_FREEZES) &&
+            (state & EEH_PE_ISOLATED))
+                return NULL;
        pe->state &= ~state;
-        pe->check_count = 0;
+        /* Clear check count since last isolation */
+        if (state & EEH_PE_ISOLATED)
+                pe->check_count = 0;
        return NULL;
 }
diff --git a/arch/powerpc/kernel/eeh_sysfs.c b/arch/powerpc/kernel/eeh_sysfs.c
index 5d753d4f2c75..e2595ba4b720 100644
--- a/arch/powerpc/kernel/eeh_sysfs.c
+++ b/arch/powerpc/kernel/eeh_sysfs.c
@@ -59,6 +59,9 @@ void eeh_sysfs_add_device(struct pci_dev *pdev)
        struct eeh_dev *edev = pci_dev_to_eeh_dev(pdev);
        int rc=0;
+        if (!eeh_enabled())
+                return;
        if (edev && (edev->mode & EEH_DEV_SYSFS))
                return;
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
index 662c6dd98072..911d45366f59 100644
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -39,8 +39,8 @@
 * System calls.
 */
        .section        ".toc","aw"
-.SYS_CALL_TABLE:
+SYS_CALL_TABLE:
-        .tc .sys_call_table[TC],.sys_call_table
+        .tc sys_call_table[TC],sys_call_table
 /* This value is used to mark exception frames on the stack. */
 exception_marker:
@@ -106,7 +106,7 @@ BEGIN_FW_FTR_SECTION
        LDX_BE  r10,0,r10               /* get log write index */
        cmpd    cr1,r11,r10
        beq+    cr1,33f
-        bl      .accumulate_stolen_time
+        bl      accumulate_stolen_time
        REST_GPR(0,r1)
        REST_4GPRS(3,r1)
        REST_2GPRS(7,r1)
@@ -143,7 +143,7 @@ END_FW_FTR_SECTION_IFSET(FW_FEATURE_SPLPAR)
        std     r10,SOFTE(r1)
 #ifdef SHOW_SYSCALLS
-        bl      .do_show_syscall
+        bl      do_show_syscall
        REST_GPR(0,r1)
        REST_4GPRS(3,r1)
        REST_2GPRS(7,r1)
@@ -162,7 +162,7 @@ system_call:			/* label this so stack traces look sane */
 * Need to vector to 32 Bit or default sys_call_table here,
 * based on caller's run-mode / personality.
 */
-        ld      r11,.SYS_CALL_TABLE@toc(2)
+        ld      r11,SYS_CALL_TABLE@toc(2)
        andi.   r10,r10,_TIF_32BIT
        beq     15f
        addi    r11,r11,8       /* use 32-bit syscall entries */
@@ -174,14 +174,14 @@ system_call:			/* label this so stack traces look sane */
        clrldi  r8,r8,32
 15:
        slwi    r0,r0,4
-        ldx     r10,r11,r0      /* Fetch system call handler [ptr] */
+        ldx     r12,r11,r0      /* Fetch system call handler [ptr] */
-        mtctr   r10
+        mtctr   r12
        bctrl                   /* Call handler */
 syscall_exit:
        std     r3,RESULT(r1)
 #ifdef SHOW_SYSCALLS
-        bl      .do_show_syscall_exit
+        bl      do_show_syscall_exit
        ld      r3,RESULT(r1)
 #endif
        CURRENT_THREAD_INFO(r12, r1)
@@ -248,9 +248,9 @@ syscall_error:
        
 /* Traced system call support */
 syscall_dotrace:
-        bl      .save_nvgprs
+        bl      save_nvgprs
        addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .do_syscall_trace_enter
+        bl      do_syscall_trace_enter
        /*
         * Restore argument registers possibly just changed.
         * We use the return value of do_syscall_trace_enter
@@ -308,7 +308,7 @@ syscall_exit_work:
 4:      /* Anything else left to do? */
        SET_DEFAULT_THREAD_PPR(r3, r10)         /* Set thread.ppr = 3 */
        andi.   r0,r9,(_TIF_SYSCALL_T_OR_A|_TIF_SINGLESTEP)
-        beq     .ret_from_except_lite
+        beq     ret_from_except_lite
        /* Re-enable interrupts */
 #ifdef CONFIG_PPC_BOOK3E
@@ -319,10 +319,10 @@ syscall_exit_work:
        mtmsrd  r10,1
 #endif /* CONFIG_PPC_BOOK3E */
-        bl      .save_nvgprs
+        bl      save_nvgprs
        addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .do_syscall_trace_leave
+        bl      do_syscall_trace_leave
-        b       .ret_from_except
+        b       ret_from_except
 /* Save non-volatile GPRs, if not already saved. */
 _GLOBAL(save_nvgprs)
@@ -345,52 +345,48 @@ _GLOBAL(save_nvgprs)
 */
 _GLOBAL(ppc_fork)
-        bl      .save_nvgprs
+        bl      save_nvgprs
-        bl      .sys_fork
+        bl      sys_fork
        b       syscall_exit
 _GLOBAL(ppc_vfork)
-        bl      .save_nvgprs
+        bl      save_nvgprs
-        bl      .sys_vfork
+        bl      sys_vfork
        b       syscall_exit
 _GLOBAL(ppc_clone)
-        bl      .save_nvgprs
+        bl      save_nvgprs
-        bl      .sys_clone
+        bl      sys_clone
        b       syscall_exit
 _GLOBAL(ppc32_swapcontext)
-        bl      .save_nvgprs
+        bl      save_nvgprs
-        bl      .compat_sys_swapcontext
+        bl      compat_sys_swapcontext
        b       syscall_exit
 _GLOBAL(ppc64_swapcontext)
-        bl      .save_nvgprs
+        bl      save_nvgprs
-        bl      .sys_swapcontext
+        bl      sys_swapcontext
        b       syscall_exit
 _GLOBAL(ret_from_fork)
-        bl      .schedule_tail
+        bl      schedule_tail
        REST_NVGPRS(r1)
        li      r3,0
        b       syscall_exit
 _GLOBAL(ret_from_kernel_thread)
-        bl      .schedule_tail
+        bl      schedule_tail
        REST_NVGPRS(r1)
-        ld      r14, 0(r14)
        mtlr    r14
        mr      r3,r15
+#if defined(_CALL_ELF) && _CALL_ELF == 2
+        mr      r12,r14
+#endif
        blrl
        li      r3,0
        b       syscall_exit
-        .section        ".toc","aw"
-DSCR_DEFAULT:
-        .tc dscr_default[TC],dscr_default
-        .section        ".text"
 /*
 * This routine switches between two different tasks.  The process
 * state of one is saved on its kernel stack.  Then the state
@@ -575,11 +571,10 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
 #ifdef CONFIG_PPC64
 BEGIN_FTR_SECTION
        lwz     r6,THREAD_DSCR_INHERIT(r4)
-        ld      r7,DSCR_DEFAULT@toc(2)
        ld      r0,THREAD_DSCR(r4)
        cmpwi   r6,0
        bne     1f
-        ld      r0,0(r7)
+        ld      r0,PACA_DSCR(r13)
 1:
 BEGIN_FTR_SECTION_NESTED(70)
        mfspr   r8, SPRN_FSCR
@@ -611,7 +606,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_DSCR)
 _GLOBAL(ret_from_except)
        ld      r11,_TRAP(r1)
        andi.   r0,r11,1
-        bne     .ret_from_except_lite
+        bne     ret_from_except_lite
        REST_NVGPRS(r1)
 _GLOBAL(ret_from_except_lite)
@@ -661,23 +656,23 @@ _GLOBAL(ret_from_except_lite)
 #endif
 1:      andi.   r0,r4,_TIF_NEED_RESCHED
        beq     2f
-        bl      .restore_interrupts
+        bl      restore_interrupts
        SCHEDULE_USER
-        b       .ret_from_except_lite
+        b       ret_from_except_lite
 2:
 #ifdef CONFIG_PPC_TRANSACTIONAL_MEM
        andi.   r0,r4,_TIF_USER_WORK_MASK & ~_TIF_RESTORE_TM
        bne     3f              /* only restore TM if nothing else to do */
        addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .restore_tm_state
+        bl      restore_tm_state
        b       restore
 3:
 #endif
-        bl      .save_nvgprs
+        bl      save_nvgprs
-        bl      .restore_interrupts
+        bl      restore_interrupts
        addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .do_notify_resume
+        bl      do_notify_resume
-        b       .ret_from_except
+        b       ret_from_except
 resume_kernel:
        /* check current_thread_info, _TIF_EMULATE_STACK_STORE */
@@ -730,7 +725,7 @@ resume_kernel:
         * sure we are soft-disabled first and reconcile irq state.
         */
        RECONCILE_IRQ_STATE(r3,r4)
-1:      bl      .preempt_schedule_irq
+1:      bl      preempt_schedule_irq
        /* Re-test flags and eventually loop */
        CURRENT_THREAD_INFO(r9, r1)
@@ -792,7 +787,7 @@ restore_no_replay:
         */
 do_restore:
 #ifdef CONFIG_PPC_BOOK3E
-        b       .exception_return_book3e
+        b       exception_return_book3e
 #else
        /*
         * Clear the reservation. If we know the CPU tracks the address of
@@ -907,7 +902,7 @@ restore_check_irq_replay:
         *
         * Still, this might be useful for things like hash_page
         */
-        bl      .__check_irq_replay
+        bl      __check_irq_replay
        cmpwi   cr0,r3,0
        beq     restore_no_replay
 
@@ -928,13 +923,13 @@ restore_check_irq_replay:
        cmpwi   cr0,r3,0x500
        bne     1f
        addi    r3,r1,STACK_FRAME_OVERHEAD;
-        bl      .do_IRQ
+        bl      do_IRQ
-        b       .ret_from_except
+        b       ret_from_except
 1:      cmpwi   cr0,r3,0x900
        bne     1f
        addi    r3,r1,STACK_FRAME_OVERHEAD;
-        bl      .timer_interrupt
+        bl      timer_interrupt
-        b       .ret_from_except
+        b       ret_from_except
 #ifdef CONFIG_PPC_DOORBELL
 1:
 #ifdef CONFIG_PPC_BOOK3E
@@ -948,14 +943,14 @@ restore_check_irq_replay:
 #endif /* CONFIG_PPC_BOOK3E */
        bne     1f
        addi    r3,r1,STACK_FRAME_OVERHEAD;
-        bl      .doorbell_exception
+        bl      doorbell_exception
-        b       .ret_from_except
+        b       ret_from_except
 #endif /* CONFIG_PPC_DOORBELL */
-1:      b       .ret_from_except /* What else to do here ? */
+1:      b       ret_from_except /* What else to do here ? */
 
 unrecov_restore:
        addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .unrecoverable_exception
+        bl      unrecoverable_exception
        b       unrecov_restore
 #ifdef CONFIG_PPC_RTAS
@@ -1021,7 +1016,7 @@ _GLOBAL(enter_rtas)
        std     r6,PACASAVEDMSR(r13)
        /* Setup our real return addr */        
-        LOAD_REG_ADDR(r4,.rtas_return_loc)
+        LOAD_REG_ADDR(r4,rtas_return_loc)
        clrldi  r4,r4,2                 /* convert to realmode address */
        mtlr    r4
@@ -1045,7 +1040,7 @@ _GLOBAL(enter_rtas)
        rfid
        b       .       /* prevent speculative execution */
-_STATIC(rtas_return_loc)
+rtas_return_loc:
        FIXUP_ENDIAN
        /* relocation is off at this point */
@@ -1054,7 +1049,7 @@ _STATIC(rtas_return_loc)
        bcl     20,31,$+4
 0:      mflr    r3
-        ld      r3,(1f-0b)(r3)          /* get &.rtas_restore_regs */
+        ld      r3,(1f-0b)(r3)          /* get &rtas_restore_regs */
        mfmsr   r6
        li      r0,MSR_RI
@@ -1071,9 +1066,9 @@ _STATIC(rtas_return_loc)
        b       .       /* prevent speculative execution */
        .align  3
-1:      .llong  .rtas_restore_regs
+1:      .llong  rtas_restore_regs
-_STATIC(rtas_restore_regs)
+rtas_restore_regs:
        /* relocation is on at this point */
        REST_GPR(2, r1)                 /* Restore the TOC */
        REST_GPR(13, r1)                /* Restore paca */
@@ -1173,7 +1168,7 @@ _GLOBAL(mcount)
 _GLOBAL(_mcount)
        blr
-_GLOBAL(ftrace_caller)
+_GLOBAL_TOC(ftrace_caller)
        /* Taken from output of objdump from lib64/glibc */
        mflr    r3
        ld      r11, 0(r1)
@@ -1197,10 +1192,7 @@ _GLOBAL(ftrace_graph_stub)
 _GLOBAL(ftrace_stub)
        blr
 #else
-_GLOBAL(mcount)
+_GLOBAL_TOC(_mcount)
-        blr
-_GLOBAL(_mcount)
        /* Taken from output of objdump from lib64/glibc */
        mflr    r3
        ld      r11, 0(r1)
@@ -1238,7 +1230,7 @@ _GLOBAL(ftrace_graph_caller)
        ld      r11, 112(r1)
        addi    r3, r11, 16
-        bl      .prepare_ftrace_return
+        bl      prepare_ftrace_return
        nop
        ld      r0, 128(r1)
@@ -1254,7 +1246,7 @@ _GLOBAL(return_to_handler)
        mr      r31, r1
        stdu    r1, -112(r1)
-        bl      .ftrace_return_to_handler
+        bl      ftrace_return_to_handler
        nop
        /* return value has real return address */
@@ -1284,7 +1276,7 @@ _GLOBAL(mod_return_to_handler)
         */
        ld      r2, PACATOC(r13)
-        bl      .ftrace_return_to_handler
+        bl      ftrace_return_to_handler
        nop
        /* return value has real return address */
diff --git a/arch/powerpc/kernel/epapr_paravirt.c b/arch/powerpc/kernel/epapr_paravirt.c
index 60d1a2259dbe..59e4ba74975d 100644
--- a/arch/powerpc/kernel/epapr_paravirt.c
+++ b/arch/powerpc/kernel/epapr_paravirt.c
@@ -30,6 +30,7 @@ extern u32 epapr_ev_idle_start[];
 #endif
 bool epapr_paravirt_enabled;
+static bool __maybe_unused epapr_has_idle;
 static int __init early_init_dt_scan_epapr(unsigned long node,
                                           const char *uname,
@@ -56,7 +57,7 @@ static int __init early_init_dt_scan_epapr(unsigned long node,
 #if !defined(CONFIG_64BIT) || defined(CONFIG_PPC_BOOK3E_64)
        if (of_get_flat_dt_prop(node, "has-idle", NULL))
-                ppc_md.power_save = epapr_ev_idle;
+                epapr_has_idle = true;
 #endif
        epapr_paravirt_enabled = true;
@@ -71,3 +72,14 @@ int __init epapr_paravirt_early_init(void)
        return 0;
 }
+static int __init epapr_idle_init(void)
+{
+#if !defined(CONFIG_64BIT) || defined(CONFIG_PPC_BOOK3E_64)
+        if (epapr_has_idle)
+                ppc_md.power_save = epapr_ev_idle;
+#endif
+        return 0;
+}
+postcore_initcall(epapr_idle_init);
diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
index c1bee3ce9d1f..771b4e92e5d9 100644
--- a/arch/powerpc/kernel/exceptions-64e.S
+++ b/arch/powerpc/kernel/exceptions-64e.S
@@ -499,7 +499,7 @@ exc_##n##_bad_stack:							    \
        CHECK_NAPPING();                                                \
        addi    r3,r1,STACK_FRAME_OVERHEAD;                             \
        bl      hdlr;                                                   \
-        b       .ret_from_except_lite;
+        b       ret_from_except_lite;
 /* This value is used to mark exception frames on the stack. */
        .section        ".toc","aw"
@@ -550,11 +550,11 @@ interrupt_end_book3e:
        CRIT_EXCEPTION_PROLOG(0x100, BOOKE_INTERRUPT_CRITICAL,
                              PROLOG_ADDITION_NONE)
        EXCEPTION_COMMON_CRIT(0x100)
-        bl      .save_nvgprs
+        bl      save_nvgprs
        bl      special_reg_save
        CHECK_NAPPING();
        addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .unknown_exception
+        bl      unknown_exception
        b       ret_from_crit_except
 /* Machine Check Interrupt */
@@ -562,11 +562,11 @@ interrupt_end_book3e:
        MC_EXCEPTION_PROLOG(0x000, BOOKE_INTERRUPT_MACHINE_CHECK,
                            PROLOG_ADDITION_NONE)
        EXCEPTION_COMMON_MC(0x000)
-        bl      .save_nvgprs
+        bl      save_nvgprs
        bl      special_reg_save
        CHECK_NAPPING();
        addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .machine_check_exception
+        bl      machine_check_exception
        b       ret_from_mc_except
 /* Data Storage Interrupt */
@@ -591,7 +591,7 @@ interrupt_end_book3e:
 /* External Input Interrupt */
        MASKABLE_EXCEPTION(0x500, BOOKE_INTERRUPT_EXTERNAL,
-                           external_input, .do_IRQ, ACK_NONE)
+                           external_input, do_IRQ, ACK_NONE)
 /* Alignment */
        START_EXCEPTION(alignment);
@@ -612,9 +612,9 @@ interrupt_end_book3e:
        std     r14,_DSISR(r1)
        addi    r3,r1,STACK_FRAME_OVERHEAD
        ld      r14,PACA_EXGEN+EX_R14(r13)
-        bl      .save_nvgprs
+        bl      save_nvgprs
-        bl      .program_check_exception
+        bl      program_check_exception
-        b       .ret_from_except
+        b       ret_from_except
 /* Floating Point Unavailable Interrupt */
        START_EXCEPTION(fp_unavailable);
@@ -625,13 +625,13 @@ interrupt_end_book3e:
        ld      r12,_MSR(r1)
        andi.   r0,r12,MSR_PR;
        beq-    1f
-        bl      .load_up_fpu
+        bl      load_up_fpu
        b       fast_exception_return
 1:      INTS_DISABLE
-        bl      .save_nvgprs
+        bl      save_nvgprs
        addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .kernel_fp_unavailable_exception
+        bl      kernel_fp_unavailable_exception
-        b       .ret_from_except
+        b       ret_from_except
 /* Altivec Unavailable Interrupt */
        START_EXCEPTION(altivec_unavailable);
@@ -644,16 +644,16 @@ BEGIN_FTR_SECTION
        ld      r12,_MSR(r1)
        andi.   r0,r12,MSR_PR;
        beq-    1f
-        bl      .load_up_altivec
+        bl      load_up_altivec
        b       fast_exception_return
 1:
 END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
 #endif
        INTS_DISABLE
-        bl      .save_nvgprs
+        bl      save_nvgprs
        addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .altivec_unavailable_exception
+        bl      altivec_unavailable_exception
-        b       .ret_from_except
+        b       ret_from_except
 /* AltiVec Assist */
        START_EXCEPTION(altivec_assist);
@@ -662,39 +662,39 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
                                PROLOG_ADDITION_NONE)
        EXCEPTION_COMMON(0x220)
        INTS_DISABLE
-        bl      .save_nvgprs
+        bl      save_nvgprs
        addi    r3,r1,STACK_FRAME_OVERHEAD
 #ifdef CONFIG_ALTIVEC
 BEGIN_FTR_SECTION
-        bl      .altivec_assist_exception
+        bl      altivec_assist_exception
 END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
 #else
-        bl      .unknown_exception
+        bl      unknown_exception
 #endif
-        b       .ret_from_except
+        b       ret_from_except
 /* Decrementer Interrupt */
        MASKABLE_EXCEPTION(0x900, BOOKE_INTERRUPT_DECREMENTER,
-                           decrementer, .timer_interrupt, ACK_DEC)
+                           decrementer, timer_interrupt, ACK_DEC)
 /* Fixed Interval Timer Interrupt */
        MASKABLE_EXCEPTION(0x980, BOOKE_INTERRUPT_FIT,
-                           fixed_interval, .unknown_exception, ACK_FIT)
+                           fixed_interval, unknown_exception, ACK_FIT)
 /* Watchdog Timer Interrupt */
        START_EXCEPTION(watchdog);
        CRIT_EXCEPTION_PROLOG(0x9f0, BOOKE_INTERRUPT_WATCHDOG,
                              PROLOG_ADDITION_NONE)
        EXCEPTION_COMMON_CRIT(0x9f0)
-        bl      .save_nvgprs
+        bl      save_nvgprs
        bl      special_reg_save
        CHECK_NAPPING();
        addi    r3,r1,STACK_FRAME_OVERHEAD
 #ifdef CONFIG_BOOKE_WDT
-        bl      .WatchdogException
+        bl      WatchdogException
 #else
-        bl      .unknown_exception
+        bl      unknown_exception
 #endif
        b       ret_from_crit_except
@@ -712,10 +712,10 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
                                PROLOG_ADDITION_NONE)
        EXCEPTION_COMMON(0xf20)
        INTS_DISABLE
-        bl      .save_nvgprs
+        bl      save_nvgprs
        addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .unknown_exception
+        bl      unknown_exception
-        b       .ret_from_except
+        b       ret_from_except
 /* Debug exception as a critical interrupt*/
        START_EXCEPTION(debug_crit);
@@ -774,9 +774,9 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
        mr      r4,r14
        ld      r14,PACA_EXCRIT+EX_R14(r13)
        ld      r15,PACA_EXCRIT+EX_R15(r13)
-        bl      .save_nvgprs
+        bl      save_nvgprs
-        bl      .DebugException
+        bl      DebugException
-        b       .ret_from_except
+        b       ret_from_except
 kernel_dbg_exc:
        b       .       /* NYI */
@@ -839,9 +839,9 @@ kernel_dbg_exc:
        mr      r4,r14
        ld      r14,PACA_EXDBG+EX_R14(r13)
        ld      r15,PACA_EXDBG+EX_R15(r13)
-        bl      .save_nvgprs
+        bl      save_nvgprs
-        bl      .DebugException
+        bl      DebugException
-        b       .ret_from_except
+        b       ret_from_except
        START_EXCEPTION(perfmon);
        NORMAL_EXCEPTION_PROLOG(0x260, BOOKE_INTERRUPT_PERFORMANCE_MONITOR,
@@ -850,23 +850,23 @@ kernel_dbg_exc:
        INTS_DISABLE
        CHECK_NAPPING()
        addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .performance_monitor_exception
+        bl      performance_monitor_exception
-        b       .ret_from_except_lite
+        b       ret_from_except_lite
 /* Doorbell interrupt */
        MASKABLE_EXCEPTION(0x280, BOOKE_INTERRUPT_DOORBELL,
-                           doorbell, .doorbell_exception, ACK_NONE)
+                           doorbell, doorbell_exception, ACK_NONE)
 /* Doorbell critical Interrupt */
        START_EXCEPTION(doorbell_crit);
        CRIT_EXCEPTION_PROLOG(0x2a0, BOOKE_INTERRUPT_DOORBELL_CRITICAL,
                              PROLOG_ADDITION_NONE)
        EXCEPTION_COMMON_CRIT(0x2a0)
-        bl      .save_nvgprs
+        bl      save_nvgprs
        bl      special_reg_save
        CHECK_NAPPING();
        addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .unknown_exception
+        bl      unknown_exception
        b       ret_from_crit_except
 /*
@@ -878,21 +878,21 @@ kernel_dbg_exc:
                                PROLOG_ADDITION_NONE)
        EXCEPTION_COMMON(0x2c0)
        addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .save_nvgprs
+        bl      save_nvgprs
        INTS_RESTORE_HARD
-        bl      .unknown_exception
+        bl      unknown_exception
-        b       .ret_from_except
+        b       ret_from_except
 /* Guest Doorbell critical Interrupt */
        START_EXCEPTION(guest_doorbell_crit);
        CRIT_EXCEPTION_PROLOG(0x2e0, BOOKE_INTERRUPT_GUEST_DBELL_CRIT,
                              PROLOG_ADDITION_NONE)
        EXCEPTION_COMMON_CRIT(0x2e0)
-        bl      .save_nvgprs
+        bl      save_nvgprs
        bl      special_reg_save
        CHECK_NAPPING();
        addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .unknown_exception
+        bl      unknown_exception
        b       ret_from_crit_except
 /* Hypervisor call */
@@ -901,10 +901,10 @@ kernel_dbg_exc:
                                PROLOG_ADDITION_NONE)
        EXCEPTION_COMMON(0x310)
        addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .save_nvgprs
+        bl      save_nvgprs
        INTS_RESTORE_HARD
-        bl      .unknown_exception
+        bl      unknown_exception
-        b       .ret_from_except
+        b       ret_from_except
 /* Embedded Hypervisor priviledged  */
        START_EXCEPTION(ehpriv);
@@ -912,10 +912,10 @@ kernel_dbg_exc:
                                PROLOG_ADDITION_NONE)
        EXCEPTION_COMMON(0x320)
        addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .save_nvgprs
+        bl      save_nvgprs
        INTS_RESTORE_HARD
-        bl      .unknown_exception
+        bl      unknown_exception
-        b       .ret_from_except
+        b       ret_from_except
 /* LRAT Error interrupt */
        START_EXCEPTION(lrat_error);
@@ -1014,16 +1014,16 @@ storage_fault_common:
        mr      r5,r15
        ld      r14,PACA_EXGEN+EX_R14(r13)
        ld      r15,PACA_EXGEN+EX_R15(r13)
-        bl      .do_page_fault
+        bl      do_page_fault
        cmpdi   r3,0
        bne-    1f
-        b       .ret_from_except_lite
+        b       ret_from_except_lite
-1:      bl      .save_nvgprs
+1:      bl      save_nvgprs
        mr      r5,r3
        addi    r3,r1,STACK_FRAME_OVERHEAD
        ld      r4,_DAR(r1)
-        bl      .bad_page_fault
+        bl      bad_page_fault
-        b       .ret_from_except
+        b       ret_from_except
 /*
 * Alignment exception doesn't fit entirely in the 0x100 bytes so it
@@ -1035,10 +1035,10 @@ alignment_more:
        addi    r3,r1,STACK_FRAME_OVERHEAD
        ld      r14,PACA_EXGEN+EX_R14(r13)
        ld      r15,PACA_EXGEN+EX_R15(r13)
-        bl      .save_nvgprs
+        bl      save_nvgprs
        INTS_RESTORE_HARD
-        bl      .alignment_exception
+        bl      alignment_exception
-        b       .ret_from_except
+        b       ret_from_except
 /*
 * We branch here from entry_64.S for the last stage of the exception
@@ -1172,7 +1172,7 @@ bad_stack_book3e:
        std     r12,0(r11)
        ld      r2,PACATOC(r13)
 1:      addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .kernel_bad_stack
+        bl      kernel_bad_stack
        b       1b
 /*
@@ -1521,13 +1521,13 @@ _GLOBAL(start_initialization_book3e)
         * and always use AS 0, so we just set it up to match our link
         * address and never use 0 based addresses.
         */
-        bl      .initial_tlb_book3e
+        bl      initial_tlb_book3e
        /* Init global core bits */
-        bl      .init_core_book3e
+        bl      init_core_book3e
        /* Init per-thread bits */
-        bl      .init_thread_book3e
+        bl      init_thread_book3e
        /* Return to common init code */
        tovirt(r28,r28)
@@ -1548,7 +1548,7 @@ _GLOBAL(start_initialization_book3e)
 */
 _GLOBAL(book3e_secondary_core_init_tlb_set)
        li      r4,1
-        b       .generic_secondary_smp_init
+        b       generic_secondary_smp_init
 _GLOBAL(book3e_secondary_core_init)
        mflr    r28
@@ -1558,18 +1558,18 @@ _GLOBAL(book3e_secondary_core_init)
        bne     2f
        /* Setup TLB for this core */
-        bl      .initial_tlb_book3e
+        bl      initial_tlb_book3e
        /* We can return from the above running at a different
         * address, so recalculate r2 (TOC)
         */
-        bl      .relative_toc
+        bl      relative_toc
        /* Init global core bits */
-2:      bl      .init_core_book3e
+2:      bl      init_core_book3e
        /* Init per-thread bits */
-3:      bl      .init_thread_book3e
+3:      bl      init_thread_book3e
        /* Return to common init code at proper virtual address.
         *
@@ -1596,14 +1596,14 @@ _GLOBAL(book3e_secondary_thread_init)
        mflr    r28
        b       3b
-_STATIC(init_core_book3e)
+init_core_book3e:
        /* Establish the interrupt vector base */
        LOAD_REG_IMMEDIATE(r3, interrupt_base_book3e)
        mtspr   SPRN_IVPR,r3
        sync
        blr
-_STATIC(init_thread_book3e)
+init_thread_book3e:
        lis     r3,(SPRN_EPCR_ICM | SPRN_EPCR_GICM)@h
        mtspr   SPRN_EPCR,r3
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index 3afd3915921a..20f11eb4dff7 100644
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -132,12 +132,12 @@ BEGIN_FTR_SECTION
 #endif
        beq     cr1,2f
-        b       .power7_wakeup_noloss
+        b       power7_wakeup_noloss
-2:      b       .power7_wakeup_loss
+2:      b       power7_wakeup_loss
        /* Fast Sleep wakeup on PowerNV */
 8:      GET_PACA(r13)
-        b       .power7_wakeup_tb_loss
+        b       power7_wakeup_tb_loss
 9:
 END_FTR_SECTION_IFSET(CPU_FTR_HVMODE | CPU_FTR_ARCH_206)
@@ -211,16 +211,16 @@ data_access_slb_pSeries:
 #endif /* __DISABLED__ */
        mfspr   r12,SPRN_SRR1
 #ifndef CONFIG_RELOCATABLE
-        b       .slb_miss_realmode
+        b       slb_miss_realmode
 #else
        /*
-         * We can't just use a direct branch to .slb_miss_realmode
+         * We can't just use a direct branch to slb_miss_realmode
         * because the distance from here to there depends on where
         * the kernel ends up being put.
         */
        mfctr   r11
        ld      r10,PACAKBASE(r13)
-        LOAD_HANDLER(r10, .slb_miss_realmode)
+        LOAD_HANDLER(r10, slb_miss_realmode)
        mtctr   r10
        bctr
 #endif
@@ -243,11 +243,11 @@ instruction_access_slb_pSeries:
 #endif /* __DISABLED__ */
        mfspr   r12,SPRN_SRR1
 #ifndef CONFIG_RELOCATABLE
-        b       .slb_miss_realmode
+        b       slb_miss_realmode
 #else
        mfctr   r11
        ld      r10,PACAKBASE(r13)
-        LOAD_HANDLER(r10, .slb_miss_realmode)
+        LOAD_HANDLER(r10, slb_miss_realmode)
        mtctr   r10
        bctr
 #endif
@@ -524,7 +524,7 @@ do_stab_bolted_pSeries:
        std     r12,PACA_EXSLB+EX_R12(r13)
        GET_SCRATCH0(r10)
        std     r10,PACA_EXSLB+EX_R13(r13)
-        EXCEPTION_PROLOG_PSERIES_1(.do_stab_bolted, EXC_STD)
+        EXCEPTION_PROLOG_PSERIES_1(do_stab_bolted, EXC_STD)
        KVM_HANDLER_SKIP(PACA_EXGEN, EXC_STD, 0x300)
        KVM_HANDLER_SKIP(PACA_EXSLB, EXC_STD, 0x380)
@@ -769,38 +769,38 @@ kvmppc_skip_Hinterrupt:
 /*** Common interrupt handlers ***/
-        STD_EXCEPTION_COMMON(0x100, system_reset, .system_reset_exception)
+        STD_EXCEPTION_COMMON(0x100, system_reset, system_reset_exception)
        STD_EXCEPTION_COMMON_ASYNC(0x500, hardware_interrupt, do_IRQ)
-        STD_EXCEPTION_COMMON_ASYNC(0x900, decrementer, .timer_interrupt)
+        STD_EXCEPTION_COMMON_ASYNC(0x900, decrementer, timer_interrupt)
-        STD_EXCEPTION_COMMON(0x980, hdecrementer, .hdec_interrupt)
+        STD_EXCEPTION_COMMON(0x980, hdecrementer, hdec_interrupt)
 #ifdef CONFIG_PPC_DOORBELL
-        STD_EXCEPTION_COMMON_ASYNC(0xa00, doorbell_super, .doorbell_exception)
+        STD_EXCEPTION_COMMON_ASYNC(0xa00, doorbell_super, doorbell_exception)
 #else
-        STD_EXCEPTION_COMMON_ASYNC(0xa00, doorbell_super, .unknown_exception)
+        STD_EXCEPTION_COMMON_ASYNC(0xa00, doorbell_super, unknown_exception)
 #endif
-        STD_EXCEPTION_COMMON(0xb00, trap_0b, .unknown_exception)
+        STD_EXCEPTION_COMMON(0xb00, trap_0b, unknown_exception)
-        STD_EXCEPTION_COMMON(0xd00, single_step, .single_step_exception)
+        STD_EXCEPTION_COMMON(0xd00, single_step, single_step_exception)
-        STD_EXCEPTION_COMMON(0xe00, trap_0e, .unknown_exception)
+        STD_EXCEPTION_COMMON(0xe00, trap_0e, unknown_exception)
-        STD_EXCEPTION_COMMON(0xe40, emulation_assist, .emulation_assist_interrupt)
+        STD_EXCEPTION_COMMON(0xe40, emulation_assist, emulation_assist_interrupt)
-        STD_EXCEPTION_COMMON(0xe60, hmi_exception, .unknown_exception)
+        STD_EXCEPTION_COMMON(0xe60, hmi_exception, unknown_exception)
 #ifdef CONFIG_PPC_DOORBELL
-        STD_EXCEPTION_COMMON_ASYNC(0xe80, h_doorbell, .doorbell_exception)
+        STD_EXCEPTION_COMMON_ASYNC(0xe80, h_doorbell, doorbell_exception)
 #else
-        STD_EXCEPTION_COMMON_ASYNC(0xe80, h_doorbell, .unknown_exception)
+        STD_EXCEPTION_COMMON_ASYNC(0xe80, h_doorbell, unknown_exception)
 #endif
-        STD_EXCEPTION_COMMON_ASYNC(0xf00, performance_monitor, .performance_monitor_exception)
+        STD_EXCEPTION_COMMON_ASYNC(0xf00, performance_monitor, performance_monitor_exception)
-        STD_EXCEPTION_COMMON(0x1300, instruction_breakpoint, .instruction_breakpoint_exception)
+        STD_EXCEPTION_COMMON(0x1300, instruction_breakpoint, instruction_breakpoint_exception)
-        STD_EXCEPTION_COMMON(0x1502, denorm, .unknown_exception)
+        STD_EXCEPTION_COMMON(0x1502, denorm, unknown_exception)
 #ifdef CONFIG_ALTIVEC
-        STD_EXCEPTION_COMMON(0x1700, altivec_assist, .altivec_assist_exception)
+        STD_EXCEPTION_COMMON(0x1700, altivec_assist, altivec_assist_exception)
 #else
-        STD_EXCEPTION_COMMON(0x1700, altivec_assist, .unknown_exception)
+        STD_EXCEPTION_COMMON(0x1700, altivec_assist, unknown_exception)
 #endif
 #ifdef CONFIG_CBE_RAS
-        STD_EXCEPTION_COMMON(0x1200, cbe_system_error, .cbe_system_error_exception)
+        STD_EXCEPTION_COMMON(0x1200, cbe_system_error, cbe_system_error_exception)
-        STD_EXCEPTION_COMMON(0x1600, cbe_maintenance, .cbe_maintenance_exception)
+        STD_EXCEPTION_COMMON(0x1600, cbe_maintenance, cbe_maintenance_exception)
-        STD_EXCEPTION_COMMON(0x1800, cbe_thermal, .cbe_thermal_exception)
+        STD_EXCEPTION_COMMON(0x1800, cbe_thermal, cbe_thermal_exception)
 #endif /* CONFIG_CBE_RAS */
        /*
@@ -829,16 +829,16 @@ data_access_slb_relon_pSeries:
        mfspr   r3,SPRN_DAR
        mfspr   r12,SPRN_SRR1
 #ifndef CONFIG_RELOCATABLE
-        b       .slb_miss_realmode
+        b       slb_miss_realmode
 #else
        /*
-         * We can't just use a direct branch to .slb_miss_realmode
+         * We can't just use a direct branch to slb_miss_realmode
         * because the distance from here to there depends on where
         * the kernel ends up being put.
         */
        mfctr   r11
        ld      r10,PACAKBASE(r13)
-        LOAD_HANDLER(r10, .slb_miss_realmode)
+        LOAD_HANDLER(r10, slb_miss_realmode)
        mtctr   r10
        bctr
 #endif
@@ -854,11 +854,11 @@ instruction_access_slb_relon_pSeries:
        mfspr   r3,SPRN_SRR0            /* SRR0 is faulting address */
        mfspr   r12,SPRN_SRR1
 #ifndef CONFIG_RELOCATABLE
-        b       .slb_miss_realmode
+        b       slb_miss_realmode
 #else
        mfctr   r11
        ld      r10,PACAKBASE(r13)
-        LOAD_HANDLER(r10, .slb_miss_realmode)
+        LOAD_HANDLER(r10, slb_miss_realmode)
        mtctr   r10
        bctr
 #endif
@@ -966,7 +966,7 @@ system_call_entry:
        b       system_call_common
 ppc64_runlatch_on_trampoline:
-        b       .__ppc64_runlatch_on
+        b       __ppc64_runlatch_on
 /*
 * Here we have detected that the kernel stack pointer is bad.
@@ -1025,7 +1025,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_CFAR)
        std     r12,RESULT(r1)
        std     r11,STACK_FRAME_OVERHEAD-16(r1)
 1:      addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .kernel_bad_stack
+        bl      kernel_bad_stack
        b       1b
 /*
@@ -1046,7 +1046,7 @@ data_access_common:
        ld      r3,PACA_EXGEN+EX_DAR(r13)
        lwz     r4,PACA_EXGEN+EX_DSISR(r13)
        li      r5,0x300
-        b       .do_hash_page           /* Try to handle as hpte fault */
+        b       do_hash_page            /* Try to handle as hpte fault */
        .align  7
        .globl  h_data_storage_common
@@ -1056,11 +1056,11 @@ h_data_storage_common:
        mfspr   r10,SPRN_HDSISR
        stw     r10,PACA_EXGEN+EX_DSISR(r13)
        EXCEPTION_PROLOG_COMMON(0xe00, PACA_EXGEN)
-        bl      .save_nvgprs
+        bl      save_nvgprs
        DISABLE_INTS
        addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .unknown_exception
+        bl      unknown_exception
-        b       .ret_from_except
+        b       ret_from_except
        .align  7
        .globl instruction_access_common
@@ -1071,9 +1071,9 @@ instruction_access_common:
        ld      r3,_NIP(r1)
        andis.  r4,r12,0x5820
        li      r5,0x400
-        b       .do_hash_page           /* Try to handle as hpte fault */
+        b       do_hash_page            /* Try to handle as hpte fault */
-        STD_EXCEPTION_COMMON(0xe20, h_instr_storage, .unknown_exception)
+        STD_EXCEPTION_COMMON(0xe20, h_instr_storage, unknown_exception)
 /*
 * Here is the common SLB miss user that is used when going to virtual
@@ -1088,7 +1088,7 @@ slb_miss_user_common:
        stw     r9,PACA_EXGEN+EX_CCR(r13)
        std     r10,PACA_EXGEN+EX_LR(r13)
        std     r11,PACA_EXGEN+EX_SRR0(r13)
-        bl      .slb_allocate_user
+        bl      slb_allocate_user
        ld      r10,PACA_EXGEN+EX_LR(r13)
        ld      r3,PACA_EXGEN+EX_R3(r13)
@@ -1131,9 +1131,9 @@ slb_miss_fault:
 unrecov_user_slb:
        EXCEPTION_PROLOG_COMMON(0x4200, PACA_EXGEN)
        DISABLE_INTS
-        bl      .save_nvgprs
+        bl      save_nvgprs
 1:      addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .unrecoverable_exception
+        bl      unrecoverable_exception
        b       1b
 #endif /* __DISABLED__ */
@@ -1158,10 +1158,10 @@ machine_check_common:
        lwz     r4,PACA_EXGEN+EX_DSISR(r13)
        std     r3,_DAR(r1)
        std     r4,_DSISR(r1)
-        bl      .save_nvgprs
+        bl      save_nvgprs
        addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .machine_check_exception
+        bl      machine_check_exception
-        b       .ret_from_except
+        b       ret_from_except
        .align  7
        .globl alignment_common
@@ -1175,31 +1175,31 @@ alignment_common:
        lwz     r4,PACA_EXGEN+EX_DSISR(r13)
        std     r3,_DAR(r1)
        std     r4,_DSISR(r1)
-        bl      .save_nvgprs
+        bl      save_nvgprs
        DISABLE_INTS
        addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .alignment_exception
+        bl      alignment_exception
-        b       .ret_from_except
+        b       ret_from_except
        .align  7
        .globl program_check_common
 program_check_common:
        EXCEPTION_PROLOG_COMMON(0x700, PACA_EXGEN)
-        bl      .save_nvgprs
+        bl      save_nvgprs
        DISABLE_INTS
        addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .program_check_exception
+        bl      program_check_exception
-        b       .ret_from_except
+        b       ret_from_except
        .align  7
        .globl fp_unavailable_common
 fp_unavailable_common:
        EXCEPTION_PROLOG_COMMON(0x800, PACA_EXGEN)
        bne     1f                      /* if from user, just load it up */
-        bl      .save_nvgprs
+        bl      save_nvgprs
        DISABLE_INTS
        addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .kernel_fp_unavailable_exception
+        bl      kernel_fp_unavailable_exception
        BUG_OPCODE
 1:
 #ifdef CONFIG_PPC_TRANSACTIONAL_MEM
@@ -1211,15 +1211,15 @@ BEGIN_FTR_SECTION
        bne-    2f
 END_FTR_SECTION_IFSET(CPU_FTR_TM)
 #endif
-        bl      .load_up_fpu
+        bl      load_up_fpu
        b       fast_exception_return
 #ifdef CONFIG_PPC_TRANSACTIONAL_MEM
 2:      /* User process was in a transaction */
-        bl      .save_nvgprs
+        bl      save_nvgprs
        DISABLE_INTS
        addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .fp_unavailable_tm
+        bl      fp_unavailable_tm
-        b       .ret_from_except
+        b       ret_from_except
 #endif
        .align  7
        .globl altivec_unavailable_common
@@ -1237,24 +1237,24 @@ BEGIN_FTR_SECTION
        bne-    2f
  END_FTR_SECTION_NESTED(CPU_FTR_TM, CPU_FTR_TM, 69)
 #endif
-        bl      .load_up_altivec
+        bl      load_up_altivec
        b       fast_exception_return
 #ifdef CONFIG_PPC_TRANSACTIONAL_MEM
 2:      /* User process was in a transaction */
-        bl      .save_nvgprs
+        bl      save_nvgprs
        DISABLE_INTS
        addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .altivec_unavailable_tm
+        bl      altivec_unavailable_tm
-        b       .ret_from_except
+        b       ret_from_except
 #endif
 1:
 END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
 #endif
-        bl      .save_nvgprs
+        bl      save_nvgprs
        DISABLE_INTS
        addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .altivec_unavailable_exception
+        bl      altivec_unavailable_exception
-        b       .ret_from_except
+        b       ret_from_except
        .align  7
        .globl vsx_unavailable_common
@@ -1272,26 +1272,26 @@ BEGIN_FTR_SECTION
        bne-    2f
  END_FTR_SECTION_NESTED(CPU_FTR_TM, CPU_FTR_TM, 69)
 #endif
-        b       .load_up_vsx
+        b       load_up_vsx
 #ifdef CONFIG_PPC_TRANSACTIONAL_MEM
 2:      /* User process was in a transaction */
-        bl      .save_nvgprs
+        bl      save_nvgprs
        DISABLE_INTS
        addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .vsx_unavailable_tm
+        bl      vsx_unavailable_tm
-        b       .ret_from_except
+        b       ret_from_except
 #endif
 1:
 END_FTR_SECTION_IFSET(CPU_FTR_VSX)
 #endif
-        bl      .save_nvgprs
+        bl      save_nvgprs
        DISABLE_INTS
        addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .vsx_unavailable_exception
+        bl      vsx_unavailable_exception
-        b       .ret_from_except
+        b       ret_from_except
-        STD_EXCEPTION_COMMON(0xf60, facility_unavailable, .facility_unavailable_exception)
+        STD_EXCEPTION_COMMON(0xf60, facility_unavailable, facility_unavailable_exception)
-        STD_EXCEPTION_COMMON(0xf80, hv_facility_unavailable, .facility_unavailable_exception)
+        STD_EXCEPTION_COMMON(0xf80, hv_facility_unavailable, facility_unavailable_exception)
        .align  7
        .globl  __end_handlers
@@ -1386,9 +1386,9 @@ _GLOBAL(opal_mc_secondary_handler)
 machine_check_handle_early:
        std     r0,GPR0(r1)     /* Save r0 */
        EXCEPTION_PROLOG_COMMON_3(0x200)
-        bl      .save_nvgprs
+        bl      save_nvgprs
        addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .machine_check_early
+        bl      machine_check_early
        ld      r12,_MSR(r1)
 #ifdef  CONFIG_PPC_P7_NAP
        /*
@@ -1408,11 +1408,11 @@ machine_check_handle_early:
        /* Supervisor state loss */
        li      r0,1
        stb     r0,PACA_NAPSTATELOST(r13)
-3:      bl      .machine_check_queue_event
+3:      bl      machine_check_queue_event
        MACHINE_CHECK_HANDLER_WINDUP
        GET_PACA(r13)
        ld      r1,PACAR1(r13)
-        b       .power7_enter_nap_mode
+        b       power7_enter_nap_mode
 4:
 #endif
        /*
@@ -1444,7 +1444,7 @@ machine_check_handle_early:
        andi.   r11,r12,MSR_RI
        bne     2f
 1:      addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .unrecoverable_exception
+        bl      unrecoverable_exception
        b       1b
 2:
        /*
@@ -1452,7 +1452,7 @@ machine_check_handle_early:
         * Queue up the MCE event so that we can log it later, while
         * returning from kernel or opal call.
         */
-        bl      .machine_check_queue_event
+        bl      machine_check_queue_event
        MACHINE_CHECK_HANDLER_WINDUP
        rfid
 9:
@@ -1468,7 +1468,7 @@ machine_check_handle_early:
 * r3 is saved in paca->slb_r3
 * We assume we aren't going to take any exceptions during this procedure.
 */
-_GLOBAL(slb_miss_realmode)
+slb_miss_realmode:
        mflr    r10
 #ifdef CONFIG_RELOCATABLE
        mtctr   r11
@@ -1477,7 +1477,7 @@ _GLOBAL(slb_miss_realmode)
        stw     r9,PACA_EXSLB+EX_CCR(r13)       /* save CR in exc. frame */
        std     r10,PACA_EXSLB+EX_LR(r13)       /* save LR */
-        bl      .slb_allocate_realmode
+        bl      slb_allocate_realmode
        /* All done -- return from exception. */
@@ -1517,9 +1517,9 @@ _GLOBAL(slb_miss_realmode)
 unrecov_slb:
        EXCEPTION_PROLOG_COMMON(0x4100, PACA_EXSLB)
        DISABLE_INTS
-        bl      .save_nvgprs
+        bl      save_nvgprs
 1:      addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .unrecoverable_exception
+        bl      unrecoverable_exception
        b       1b
@@ -1536,7 +1536,7 @@ power4_fixup_nap:
 * Hash table stuff
 */
        .align  7
-_STATIC(do_hash_page)
+do_hash_page:
        std     r3,_DAR(r1)
        std     r4,_DSISR(r1)
@@ -1573,7 +1573,7 @@ END_MMU_FTR_SECTION_IFCLR(MMU_FTR_SLB)
         *
         * at return r3 = 0 for success, 1 for page fault, negative for error
         */
-        bl      .hash_page              /* build HPTE if possible */
+        bl      hash_page               /* build HPTE if possible */
        cmpdi   r3,0                    /* see if hash_page succeeded */
        /* Success */
@@ -1587,35 +1587,35 @@ handle_page_fault:
 11:     ld      r4,_DAR(r1)
        ld      r5,_DSISR(r1)
        addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .do_page_fault
+        bl      do_page_fault
        cmpdi   r3,0
        beq+    12f
-        bl      .save_nvgprs
+        bl      save_nvgprs
        mr      r5,r3
        addi    r3,r1,STACK_FRAME_OVERHEAD
        lwz     r4,_DAR(r1)
-        bl      .bad_page_fault
+        bl      bad_page_fault
-        b       .ret_from_except
+        b       ret_from_except
 /* We have a data breakpoint exception - handle it */
 handle_dabr_fault:
-        bl      .save_nvgprs
+        bl      save_nvgprs
        ld      r4,_DAR(r1)
        ld      r5,_DSISR(r1)
        addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .do_break
+        bl      do_break
-12:     b       .ret_from_except_lite
+12:     b       ret_from_except_lite
 /* We have a page fault that hash_page could handle but HV refused
 * the PTE insertion
 */
-13:     bl      .save_nvgprs
+13:     bl      save_nvgprs
        mr      r5,r3
        addi    r3,r1,STACK_FRAME_OVERHEAD
        ld      r4,_DAR(r1)
-        bl      .low_hash_fault
+        bl      low_hash_fault
-        b       .ret_from_except
+        b       ret_from_except
 /*
 * We come here as a result of a DSI at a point where we don't want
@@ -1624,16 +1624,16 @@ handle_dabr_fault:
 * were soft-disabled.  We want to invoke the exception handler for
 * the access, or panic if there isn't a handler.
 */
-77:     bl      .save_nvgprs
+77:     bl      save_nvgprs
        mr      r4,r3
        addi    r3,r1,STACK_FRAME_OVERHEAD
        li      r5,SIGSEGV
-        bl      .bad_page_fault
+        bl      bad_page_fault
-        b       .ret_from_except
+        b       ret_from_except
        /* here we have a segment miss */
 do_ste_alloc:
-        bl      .ste_allocate           /* try to insert stab entry */
+        bl      ste_allocate            /* try to insert stab entry */
        cmpdi   r3,0
        bne-    handle_page_fault
        b       fast_exception_return
@@ -1646,7 +1646,7 @@ do_ste_alloc:
 * We assume (DAR >> 60) == 0xc.
 */
        .align  7
-_GLOBAL(do_stab_bolted)
+do_stab_bolted:
        stw     r9,PACA_EXSLB+EX_CCR(r13)       /* save CR in exc. frame */
        std     r11,PACA_EXSLB+EX_SRR0(r13)     /* save SRR0 in exc. frame */
        mfspr   r11,SPRN_DAR                    /* ea */
diff --git a/arch/powerpc/kernel/fadump.c b/arch/powerpc/kernel/fadump.c
index 7213d930918d..742694c1d852 100644
--- a/arch/powerpc/kernel/fadump.c
+++ b/arch/powerpc/kernel/fadump.c
@@ -69,7 +69,7 @@ int __init early_init_dt_scan_fw_dump(unsigned long node,
         */
        token = of_get_flat_dt_prop(node, "ibm,configure-kernel-dump", NULL);
        if (!token)
-                return 0;
+                return 1;
        fw_dump.fadump_supported = 1;
        fw_dump.ibm_configure_kernel_dump = *token;
@@ -92,7 +92,7 @@ int __init early_init_dt_scan_fw_dump(unsigned long node,
                                        &size);
        if (!sections)
-                return 0;
+                return 1;
        num_sections = size / (3 * sizeof(u32));
@@ -110,6 +110,7 @@ int __init early_init_dt_scan_fw_dump(unsigned long node,
                        break;
                }
        }
        return 1;
 }
@@ -645,7 +646,7 @@ static int __init fadump_build_cpu_notes(const struct fadump_mem_struct *fdm)
                }
                /* Lower 4 bytes of reg_value contains logical cpu id */
                cpu = reg_entry->reg_value & FADUMP_CPU_ID_MASK;
-                if (!cpumask_test_cpu(cpu, &fdh->cpu_online_mask)) {
+                if (fdh && !cpumask_test_cpu(cpu, &fdh->cpu_online_mask)) {
                        SKIP_TO_NEXT_CPU(reg_entry);
                        continue;
                }
@@ -662,9 +663,11 @@ static int __init fadump_build_cpu_notes(const struct fadump_mem_struct *fdm)
        }
        fadump_final_note(note_buf);
-        pr_debug("Updating elfcore header (%llx) with cpu notes\n",
+        if (fdh) {
+                pr_debug("Updating elfcore header (%llx) with cpu notes\n",
                                                        fdh->elfcorehdr_addr);
-        fadump_update_elfcore_header((char *)__va(fdh->elfcorehdr_addr));
+                fadump_update_elfcore_header((char *)__va(fdh->elfcorehdr_addr));
+        }
        return 0;
 error_out:
diff --git a/arch/powerpc/kernel/ftrace.c b/arch/powerpc/kernel/ftrace.c
index 6a014c763cc7..f202d0731b06 100644
--- a/arch/powerpc/kernel/ftrace.c
+++ b/arch/powerpc/kernel/ftrace.c
@@ -105,11 +105,9 @@ __ftrace_make_nop(struct module *mod,
                  struct dyn_ftrace *rec, unsigned long addr)
 {
        unsigned int op;
-        unsigned int jmp[5];
        unsigned long ptr;
        unsigned long ip = rec->ip;
-        unsigned long tramp;
+        void *tramp;
-        int offset;
        /* read where this goes */
        if (probe_kernel_read(&op, (void *)ip, sizeof(int)))
@@ -122,96 +120,41 @@ __ftrace_make_nop(struct module *mod,
        }
        /* lets find where the pointer goes */
-        tramp = find_bl_target(ip, op);
+        tramp = (void *)find_bl_target(ip, op);
-        /*
-         * On PPC64 the trampoline looks like:
-         * 0x3d, 0x82, 0x00, 0x00,    addis   r12,r2, <high>
-         * 0x39, 0x8c, 0x00, 0x00,    addi    r12,r12, <low>
-         *   Where the bytes 2,3,6 and 7 make up the 32bit offset
-         *   to the TOC that holds the pointer.
-         *   to jump to.
-         * 0xf8, 0x41, 0x00, 0x28,    std     r2,40(r1)
-         * 0xe9, 0x6c, 0x00, 0x20,    ld      r11,32(r12)
-         *   The actually address is 32 bytes from the offset
-         *   into the TOC.
-         * 0xe8, 0x4c, 0x00, 0x28,    ld      r2,40(r12)
-         */
-        pr_devel("ip:%lx jumps to %lx r2: %lx", ip, tramp, mod->arch.toc);
-        /* Find where the trampoline jumps to */
-        if (probe_kernel_read(jmp, (void *)tramp, sizeof(jmp))) {
-                printk(KERN_ERR "Failed to read %lx\n", tramp);
-                return -EFAULT;
-        }
-        pr_devel(" %08x %08x", jmp[0], jmp[1]);
+        pr_devel("ip:%lx jumps to %p", ip, tramp);
-        /* verify that this is what we expect it to be */
+        if (!is_module_trampoline(tramp)) {
-        if (((jmp[0] & 0xffff0000) != 0x3d820000) ||
-            ((jmp[1] & 0xffff0000) != 0x398c0000) ||
-            (jmp[2] != 0xf8410028) ||
-            (jmp[3] != 0xe96c0020) ||
-            (jmp[4] != 0xe84c0028)) {
                printk(KERN_ERR "Not a trampoline\n");
                return -EINVAL;
        }
-        /* The bottom half is signed extended */
+        if (module_trampoline_target(mod, tramp, &ptr)) {
-        offset = ((unsigned)((unsigned short)jmp[0]) << 16) +
+                printk(KERN_ERR "Failed to get trampoline target\n");
-                (int)((short)jmp[1]);
-        pr_devel(" %x ", offset);
-        /* get the address this jumps too */
-        tramp = mod->arch.toc + offset + 32;
-        pr_devel("toc: %lx", tramp);
-        if (probe_kernel_read(jmp, (void *)tramp, 8)) {
-                printk(KERN_ERR "Failed to read %lx\n", tramp);
                return -EFAULT;
        }
-        pr_devel(" %08x %08x\n", jmp[0], jmp[1]);
+        pr_devel("trampoline target %lx", ptr);
-#ifdef __LITTLE_ENDIAN__
-        ptr = ((unsigned long)jmp[1] << 32) + jmp[0];
-#else
-        ptr = ((unsigned long)jmp[0] << 32) + jmp[1];
-#endif
        /* This should match what was called */
        if (ptr != ppc_function_entry((void *)addr)) {
-                printk(KERN_ERR "addr does not match %lx\n", ptr);
+                printk(KERN_ERR "addr %lx does not match expected %lx\n",
+                        ptr, ppc_function_entry((void *)addr));
                return -EINVAL;
        }
        /*
-         * We want to nop the line, but the next line is
+         * Our original call site looks like:
-         *  0xe8, 0x41, 0x00, 0x28   ld r2,40(r1)
+         *
-         * This needs to be turned to a nop too.
+         * bl <tramp>
-         */
+         * ld r2,XX(r1)
-        if (probe_kernel_read(&op, (void *)(ip+4), MCOUNT_INSN_SIZE))
+         *
-                return -EFAULT;
+         * Milton Miller pointed out that we can not simply nop the branch.
+         * If a task was preempted when calling a trace function, the nops
-        if (op != 0xe8410028) {
+         * will remove the way to restore the TOC in r2 and the r2 TOC will
-                printk(KERN_ERR "Next line is not ld! (%08x)\n", op);
+         * get corrupted.
-                return -EINVAL;
+         *
-        }
+         * Use a b +8 to jump over the load.
-        /*
-         * Milton Miller pointed out that we can not blindly do nops.
-         * If a task was preempted when calling a trace function,
-         * the nops will remove the way to restore the TOC in r2
-         * and the r2 TOC will get corrupted.
-         */
-        /*
-         * Replace:
-         *   bl <tramp>  <==== will be replaced with "b 1f"
-         *   ld r2,40(r1)
-         *  1:
         */
        op = 0x48000008;        /* b +8 */
@@ -349,19 +292,24 @@ static int
 __ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)
 {
        unsigned int op[2];
-        unsigned long ip = rec->ip;
+        void *ip = (void *)rec->ip;
        /* read where this goes */
-        if (probe_kernel_read(op, (void *)ip, MCOUNT_INSN_SIZE * 2))
+        if (probe_kernel_read(op, ip, sizeof(op)))
                return -EFAULT;
        /*
-         * It should be pointing to two nops or
+         * We expect to see:
-         *  b +8; ld r2,40(r1)
+         *
+         * b +8
+         * ld r2,XX(r1)
+         *
+         * The load offset is different depending on the ABI. For simplicity
+         * just mask it out when doing the compare.
         */
-        if (((op[0] != 0x48000008) || (op[1] != 0xe8410028)) &&
+        if ((op[0] != 0x48000008) || ((op[1] & 0xffff00000) != 0xe8410000)) {
-            ((op[0] != PPC_INST_NOP) || (op[1] != PPC_INST_NOP))) {
+                printk(KERN_ERR "Unexpected call sequence: %x %x\n",
-                printk(KERN_ERR "Expected NOPs but have %x %x\n", op[0], op[1]);
+                        op[0], op[1]);
                return -EINVAL;
        }
@@ -371,23 +319,16 @@ __ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)
                return -EINVAL;
        }
-        /* create the branch to the trampoline */
+        /* Ensure branch is within 24 bits */
-        op[0] = create_branch((unsigned int *)ip,
+        if (create_branch(ip, rec->arch.mod->arch.tramp, BRANCH_SET_LINK)) {
-                              rec->arch.mod->arch.tramp, BRANCH_SET_LINK);
+                printk(KERN_ERR "Branch out of range");
-        if (!op[0]) {
-                printk(KERN_ERR "REL24 out of range!\n");
                return -EINVAL;
        }
-        /* ld r2,40(r1) */
+        if (patch_branch(ip, rec->arch.mod->arch.tramp, BRANCH_SET_LINK)) {
-        op[1] = 0xe8410028;
+                printk(KERN_ERR "REL24 out of range!\n");
+                return -EINVAL;
-        pr_devel("write to %lx\n", rec->ip);
+        }
-        if (probe_kernel_write((void *)ip, op, MCOUNT_INSN_SIZE * 2))
-                return -EPERM;
-        flush_icache_range(ip, ip + 8);
        return 0;
 }
diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S
index b7363bd42452..a95145d7f61b 100644
--- a/arch/powerpc/kernel/head_64.S
+++ b/arch/powerpc/kernel/head_64.S
@@ -70,16 +70,15 @@ _GLOBAL(__start)
        /* NOP this out unconditionally */
 BEGIN_FTR_SECTION
        FIXUP_ENDIAN
-        b       .__start_initialization_multiplatform
+        b       __start_initialization_multiplatform
 END_FTR_SECTION(0, 1)
        /* Catch branch to 0 in real mode */
        trap
-        /* Secondary processors spin on this value until it becomes nonzero.
+        /* Secondary processors spin on this value until it becomes non-zero.
-         * When it does it contains the real address of the descriptor
+         * When non-zero, it contains the real address of the function the cpu
-         * of the function that the cpu should jump to to continue
+         * should jump to.
-         * initialization.
         */
        .balign 8
        .globl  __secondary_hold_spinloop
@@ -140,16 +139,15 @@ __secondary_hold:
        tovirt(r26,r26)
 #endif
        /* All secondary cpus wait here until told to start. */
-100:    ld      r4,__secondary_hold_spinloop-_stext(r26)
+100:    ld      r12,__secondary_hold_spinloop-_stext(r26)
-        cmpdi   0,r4,0
+        cmpdi   0,r12,0
        beq     100b
 #if defined(CONFIG_SMP) || defined(CONFIG_KEXEC)
 #ifdef CONFIG_PPC_BOOK3E
-        tovirt(r4,r4)
+        tovirt(r12,r12)
 #endif
-        ld      r4,0(r4)                /* deref function descriptor */
+        mtctr   r12
-        mtctr   r4
        mr      r3,r24
        /*
         * it may be the case that other platforms have r4 right to
@@ -186,16 +184,16 @@ _GLOBAL(generic_secondary_thread_init)
        mr      r24,r3
        /* turn on 64-bit mode */
-        bl      .enable_64b_mode
+        bl      enable_64b_mode
        /* get a valid TOC pointer, wherever we're mapped at */
-        bl      .relative_toc
+        bl      relative_toc
        tovirt(r2,r2)
 #ifdef CONFIG_PPC_BOOK3E
        /* Book3E initialization */
        mr      r3,r24
-        bl      .book3e_secondary_thread_init
+        bl      book3e_secondary_thread_init
 #endif
        b       generic_secondary_common_init
@@ -214,17 +212,17 @@ _GLOBAL(generic_secondary_smp_init)
        mr      r25,r4
        /* turn on 64-bit mode */
-        bl      .enable_64b_mode
+        bl      enable_64b_mode
        /* get a valid TOC pointer, wherever we're mapped at */
-        bl      .relative_toc
+        bl      relative_toc
        tovirt(r2,r2)
 #ifdef CONFIG_PPC_BOOK3E
        /* Book3E initialization */
        mr      r3,r24
        mr      r4,r25
-        bl      .book3e_secondary_core_init
+        bl      book3e_secondary_core_init
 #endif
 generic_secondary_common_init:
@@ -236,7 +234,7 @@ generic_secondary_common_init:
        ld      r13,0(r13)              /* Get base vaddr of paca array  */
 #ifndef CONFIG_SMP
        addi    r13,r13,PACA_SIZE       /* know r13 if used accidentally */
-        b       .kexec_wait             /* wait for next kernel if !SMP  */
+        b       kexec_wait              /* wait for next kernel if !SMP  */
 #else
        LOAD_REG_ADDR(r7, nr_cpu_ids)   /* Load nr_cpu_ids address       */
        lwz     r7,0(r7)                /* also the max paca allocated   */
@@ -250,7 +248,7 @@ generic_secondary_common_init:
        blt     1b
        mr      r3,r24                  /* not found, copy phys to r3    */
-        b       .kexec_wait             /* next kernel might do better   */
+        b       kexec_wait              /* next kernel might do better   */
 2:      SET_PACA(r13)
 #ifdef CONFIG_PPC_BOOK3E
@@ -264,11 +262,13 @@ generic_secondary_common_init:
        /* See if we need to call a cpu state restore handler */
        LOAD_REG_ADDR(r23, cur_cpu_spec)
        ld      r23,0(r23)
-        ld      r23,CPU_SPEC_RESTORE(r23)
+        ld      r12,CPU_SPEC_RESTORE(r23)
-        cmpdi   0,r23,0
+        cmpdi   0,r12,0
        beq     3f
-        ld      r23,0(r23)
+#if !defined(_CALL_ELF) || _CALL_ELF != 2
-        mtctr   r23
+        ld      r12,0(r12)
+#endif
+        mtctr   r12
        bctrl
 3:      LOAD_REG_ADDR(r3, spinning_secondaries) /* Decrement spinning_secondaries */
@@ -299,7 +299,7 @@ generic_secondary_common_init:
 * Assumes we're mapped EA == RA if the MMU is on.
 */
 #ifdef CONFIG_PPC_BOOK3S
-_STATIC(__mmu_off)
+__mmu_off:
        mfmsr   r3
        andi.   r0,r3,MSR_IR|MSR_DR
        beqlr
@@ -324,12 +324,12 @@ _STATIC(__mmu_off)
 *                 DT block, r4 is a physical pointer to the kernel itself
 *
 */
-_GLOBAL(__start_initialization_multiplatform)
+__start_initialization_multiplatform:
        /* Make sure we are running in 64 bits mode */
-        bl      .enable_64b_mode
+        bl      enable_64b_mode
        /* Get TOC pointer (current runtime address) */
-        bl      .relative_toc
+        bl      relative_toc
        /* find out where we are now */
        bcl     20,31,$+4
@@ -342,7 +342,7 @@ _GLOBAL(__start_initialization_multiplatform)
         */
        cmpldi  cr0,r5,0
        beq     1f
-        b       .__boot_from_prom               /* yes -> prom */
+        b       __boot_from_prom                /* yes -> prom */
 1:
        /* Save parameters */
        mr      r31,r3
@@ -354,8 +354,8 @@ _GLOBAL(__start_initialization_multiplatform)
 #endif
 #ifdef CONFIG_PPC_BOOK3E
-        bl      .start_initialization_book3e
+        bl      start_initialization_book3e
-        b       .__after_prom_start
+        b       __after_prom_start
 #else
        /* Setup some critical 970 SPRs before switching MMU off */
        mfspr   r0,SPRN_PVR
@@ -368,15 +368,15 @@ _GLOBAL(__start_initialization_multiplatform)
        beq     1f
        cmpwi   r0,0x45         /* 970GX */
        bne     2f
-1:      bl      .__cpu_preinit_ppc970
+1:      bl      __cpu_preinit_ppc970
 2:
        /* Switch off MMU if not already off */
-        bl      .__mmu_off
+        bl      __mmu_off
-        b       .__after_prom_start
+        b       __after_prom_start
 #endif /* CONFIG_PPC_BOOK3E */
-_INIT_STATIC(__boot_from_prom)
+__boot_from_prom:
 #ifdef CONFIG_PPC_OF_BOOT_TRAMPOLINE
        /* Save parameters */
        mr      r31,r3
@@ -395,7 +395,7 @@ _INIT_STATIC(__boot_from_prom)
 #ifdef CONFIG_RELOCATABLE
        /* Relocate code for where we are now */
        mr      r3,r26
-        bl      .relocate
+        bl      relocate
 #endif
        /* Restore parameters */
@@ -407,14 +407,14 @@ _INIT_STATIC(__boot_from_prom)
        /* Do all of the interaction with OF client interface */
        mr      r8,r26
-        bl      .prom_init
+        bl      prom_init
 #endif /* #CONFIG_PPC_OF_BOOT_TRAMPOLINE */
        /* We never return. We also hit that trap if trying to boot
         * from OF while CONFIG_PPC_OF_BOOT_TRAMPOLINE isn't selected */
        trap
-_STATIC(__after_prom_start)
+__after_prom_start:
 #ifdef CONFIG_RELOCATABLE
        /* process relocations for the final address of the kernel */
        lis     r25,PAGE_OFFSET@highest /* compute virtual base of kernel */
@@ -424,7 +424,7 @@ _STATIC(__after_prom_start)
        bne     1f
        add     r25,r25,r26
 1:      mr      r3,r25
-        bl      .relocate
+        bl      relocate
 #endif
 /*
@@ -464,12 +464,12 @@ _STATIC(__after_prom_start)
        lis     r5,(copy_to_here - _stext)@ha
        addi    r5,r5,(copy_to_here - _stext)@l /* # bytes of memory to copy */
-        bl      .copy_and_flush         /* copy the first n bytes        */
+        bl      copy_and_flush          /* copy the first n bytes        */
                                        /* this includes the code being  */
                                        /* executed here.                */
        addis   r8,r3,(4f - _stext)@ha  /* Jump to the copy of this code */
-        addi    r8,r8,(4f - _stext)@l   /* that we just made */
+        addi    r12,r8,(4f - _stext)@l  /* that we just made */
-        mtctr   r8
+        mtctr   r12
        bctr
 .balign 8
@@ -478,9 +478,9 @@ p_end:	.llong	_end - _stext
 4:      /* Now copy the rest of the kernel up to _end */
        addis   r5,r26,(p_end - _stext)@ha
        ld      r5,(p_end - _stext)@l(r5)       /* get _end */
-5:      bl      .copy_and_flush         /* copy the rest */
+5:      bl      copy_and_flush          /* copy the rest */
-9:      b       .start_here_multiplatform
+9:      b       start_here_multiplatform
 /*
 * Copy routine used to copy the kernel to start at physical address 0
@@ -544,7 +544,7 @@ __secondary_start_pmac_0:
        
 _GLOBAL(pmac_secondary_start)
        /* turn on 64-bit mode */
-        bl      .enable_64b_mode
+        bl      enable_64b_mode
        li      r0,0
        mfspr   r3,SPRN_HID4
@@ -556,11 +556,11 @@ _GLOBAL(pmac_secondary_start)
        slbia
        /* get TOC pointer (real address) */
-        bl      .relative_toc
+        bl      relative_toc
        tovirt(r2,r2)
        /* Copy some CPU settings from CPU 0 */
-        bl      .__restore_cpu_ppc970
+        bl      __restore_cpu_ppc970
        /* pSeries do that early though I don't think we really need it */
        mfmsr   r3
@@ -619,7 +619,7 @@ __secondary_start:
        std     r14,PACAKSAVE(r13)
        /* Do early setup for that CPU (stab, slb, hash table pointer) */
-        bl      .early_setup_secondary
+        bl      early_setup_secondary
        /*
         * setup the new stack pointer, but *don't* use this until
@@ -639,7 +639,7 @@ __secondary_start:
        stb     r0,PACAIRQHAPPENED(r13)
        /* enable MMU and jump to start_secondary */
-        LOAD_REG_ADDR(r3, .start_secondary_prolog)
+        LOAD_REG_ADDR(r3, start_secondary_prolog)
        LOAD_REG_IMMEDIATE(r4, MSR_KERNEL)
        mtspr   SPRN_SRR0,r3
@@ -652,11 +652,11 @@ __secondary_start:
 * zero the stack back-chain pointer and get the TOC virtual address
 * before going into C code.
 */
-_GLOBAL(start_secondary_prolog)
+start_secondary_prolog:
        ld      r2,PACATOC(r13)
        li      r3,0
        std     r3,0(r1)                /* Zero the stack frame pointer */
-        bl      .start_secondary
+        bl      start_secondary
        b       .
 /*
 * Reset stack pointer and call start_secondary
@@ -667,14 +667,14 @@ _GLOBAL(start_secondary_resume)
        ld      r1,PACAKSAVE(r13)       /* Reload kernel stack pointer */
        li      r3,0
        std     r3,0(r1)                /* Zero the stack frame pointer */
-        bl      .start_secondary
+        bl      start_secondary
        b       .
 #endif
 /*
 * This subroutine clobbers r11 and r12
 */
-_GLOBAL(enable_64b_mode)
+enable_64b_mode:
        mfmsr   r11                     /* grab the current MSR */
 #ifdef CONFIG_PPC_BOOK3E
        oris    r11,r11,0x8000          /* CM bit set, we'll set ICM later */
@@ -715,9 +715,9 @@ p_toc:	.llong	__toc_start + 0x8000 - 0b
 /*
 * This is where the main kernel code starts.
 */
-_INIT_STATIC(start_here_multiplatform)
+start_here_multiplatform:
        /* set up the TOC */
-        bl      .relative_toc
+        bl      relative_toc
        tovirt(r2,r2)
        /* Clear out the BSS. It may have been done in prom_init,
@@ -776,9 +776,9 @@ _INIT_STATIC(start_here_multiplatform)
        /* Restore parameters passed from prom_init/kexec */
        mr      r3,r31
-        bl      .early_setup            /* also sets r13 and SPRG_PACA */
+        bl      early_setup             /* also sets r13 and SPRG_PACA */
-        LOAD_REG_ADDR(r3, .start_here_common)
+        LOAD_REG_ADDR(r3, start_here_common)
        ld      r4,PACAKMSR(r13)
        mtspr   SPRN_SRR0,r3
        mtspr   SPRN_SRR1,r4
@@ -786,7 +786,8 @@ _INIT_STATIC(start_here_multiplatform)
        b       .       /* prevent speculative execution */
        
        /* This is where all platforms converge execution */
-_INIT_GLOBAL(start_here_common)
+start_here_common:
        /* relocation is on at this point */
        std     r1,PACAKSAVE(r13)
@@ -794,7 +795,7 @@ _INIT_GLOBAL(start_here_common)
        ld      r2,PACATOC(r13)
        /* Do more system initializations in virtual mode */
-        bl      .setup_system
+        bl      setup_system
        /* Mark interrupts soft and hard disabled (they might be enabled
         * in the PACA when doing hotplug)
@@ -805,7 +806,7 @@ _INIT_GLOBAL(start_here_common)
        stb     r0,PACAIRQHAPPENED(r13)
        /* Generic kernel entry */
-        bl      .start_kernel
+        bl      start_kernel
        /* Not reached */
        BUG_OPCODE
diff --git a/arch/powerpc/kernel/hw_breakpoint.c b/arch/powerpc/kernel/hw_breakpoint.c
index b0a1792279bb..0bb5918faaaf 100644
--- a/arch/powerpc/kernel/hw_breakpoint.c
+++ b/arch/powerpc/kernel/hw_breakpoint.c
@@ -72,7 +72,7 @@ int arch_install_hw_breakpoint(struct perf_event *bp)
         * If so, DABR will be populated in single_step_dabr_instruction().
         */
        if (current->thread.last_hit_ubp != bp)
-                set_breakpoint(info);
+                __set_breakpoint(info);
        return 0;
 }
@@ -198,7 +198,7 @@ void thread_change_pc(struct task_struct *tsk, struct pt_regs *regs)
        info = counter_arch_bp(tsk->thread.last_hit_ubp);
        regs->msr &= ~MSR_SE;
-        set_breakpoint(info);
+        __set_breakpoint(info);
        tsk->thread.last_hit_ubp = NULL;
 }
@@ -284,7 +284,7 @@ int __kprobes hw_breakpoint_handler(struct die_args *args)
        if (!(info->type & HW_BRK_TYPE_EXTRANEOUS_IRQ))
                perf_bp_event(bp, regs);
-        set_breakpoint(info);
+        __set_breakpoint(info);
 out:
        rcu_read_unlock();
        return rc;
@@ -316,7 +316,7 @@ int __kprobes single_step_dabr_instruction(struct die_args *args)
        if (!(info->type & HW_BRK_TYPE_EXTRANEOUS_IRQ))
                perf_bp_event(bp, regs);
-        set_breakpoint(info);
+        __set_breakpoint(info);
        current->thread.last_hit_ubp = NULL;
        /*
diff --git a/arch/powerpc/kernel/idle_book3e.S b/arch/powerpc/kernel/idle_book3e.S
index bfb73cc209ce..48c21acef915 100644
--- a/arch/powerpc/kernel/idle_book3e.S
+++ b/arch/powerpc/kernel/idle_book3e.S
@@ -43,7 +43,7 @@ _GLOBAL(\name)
         */
 #ifdef CONFIG_TRACE_IRQFLAGS
        stdu    r1,-128(r1)
-        bl      .trace_hardirqs_on
+        bl      trace_hardirqs_on
        addi    r1,r1,128
 #endif
        li      r0,1
diff --git a/arch/powerpc/kernel/idle_power4.S b/arch/powerpc/kernel/idle_power4.S
index e3edaa189911..f57a19348bdd 100644
--- a/arch/powerpc/kernel/idle_power4.S
+++ b/arch/powerpc/kernel/idle_power4.S
@@ -46,7 +46,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_CAN_NAP)
        mflr    r0
        std     r0,16(r1)
        stdu    r1,-128(r1)
-        bl      .trace_hardirqs_on
+        bl      trace_hardirqs_on
        addi    r1,r1,128
        ld      r0,16(r1)
        mtlr    r0
diff --git a/arch/powerpc/kernel/idle_power7.S b/arch/powerpc/kernel/idle_power7.S
index c3ab86975614..2480256272d4 100644
--- a/arch/powerpc/kernel/idle_power7.S
+++ b/arch/powerpc/kernel/idle_power7.S
@@ -39,6 +39,10 @@
 * Pass requested state in r3:
 *      0 - nap
 *      1 - sleep
+ *
+ * To check IRQ_HAPPENED in r4
+ *      0 - don't check
+ *      1 - check
 */
 _GLOBAL(power7_powersave_common)
        /* Use r3 to pass state nap/sleep/winkle */
@@ -58,7 +62,7 @@ _GLOBAL(power7_powersave_common)
        /* Make sure FPU, VSX etc... are flushed as we may lose
         * state when going to nap mode
         */
-        bl      .discard_lazy_cpu_state
+        bl      discard_lazy_cpu_state
 #endif /* CONFIG_SMP */
        /* Hard disable interrupts */
@@ -71,6 +75,8 @@ _GLOBAL(power7_powersave_common)
        lbz     r0,PACAIRQHAPPENED(r13)
        cmpwi   cr0,r0,0
        beq     1f
+        cmpwi   cr0,r4,0
+        beq     1f
        addi    r1,r1,INT_FRAME_SIZE
        ld      r0,16(r1)
        mtlr    r0
@@ -114,15 +120,18 @@ _GLOBAL(power7_idle)
        lwz     r4,ADDROFF(powersave_nap)(r3)
        cmpwi   0,r4,0
        beqlr
+        li      r3, 1
        /* fall through */
 _GLOBAL(power7_nap)
+        mr      r4,r3
        li      r3,0
        b       power7_powersave_common
        /* No return */
 _GLOBAL(power7_sleep)
        li      r3,1
+        li      r4,0
        b       power7_powersave_common
        /* No return */
@@ -168,7 +177,7 @@ _GLOBAL(power7_wakeup_loss)
 _GLOBAL(power7_wakeup_noloss)
        lbz     r0,PACA_NAPSTATELOST(r13)
        cmpwi   r0,0
-        bne     .power7_wakeup_loss
+        bne     power7_wakeup_loss
        ld      r1,PACAR1(r13)
        ld      r4,_MSR(r1)
        ld      r5,_NIP(r1)
diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c
index 40bd7bd4e19a..936258881c98 100644
--- a/arch/powerpc/kernel/legacy_serial.c
+++ b/arch/powerpc/kernel/legacy_serial.c
@@ -48,6 +48,9 @@ static struct of_device_id legacy_serial_parents[] __initdata = {
 static unsigned int legacy_serial_count;
 static int legacy_serial_console = -1;
+static const upf_t legacy_port_flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST |
+        UPF_SHARE_IRQ | UPF_FIXED_PORT;
 static unsigned int tsi_serial_in(struct uart_port *p, int offset)
 {
        unsigned int tmp;
@@ -71,8 +74,9 @@ static int __init add_legacy_port(struct device_node *np, int want_index,
                                  phys_addr_t taddr, unsigned long irq,
                                  upf_t flags, int irq_check_parent)
 {
-        const __be32 *clk, *spd;
+        const __be32 *clk, *spd, *rs;
        u32 clock = BASE_BAUD * 16;
+        u32 shift = 0;
        int index;
        /* get clock freq. if present */
@@ -83,6 +87,11 @@ static int __init add_legacy_port(struct device_node *np, int want_index,
        /* get default speed if present */
        spd = of_get_property(np, "current-speed", NULL);
+        /* get register shift if present */
+        rs = of_get_property(np, "reg-shift", NULL);
+        if (rs && *rs)
+                shift = be32_to_cpup(rs);
        /* If we have a location index, then try to use it */
        if (want_index >= 0 && want_index < MAX_LEGACY_SERIAL_PORTS)
                index = want_index;
@@ -126,6 +135,7 @@ static int __init add_legacy_port(struct device_node *np, int want_index,
        legacy_serial_ports[index].uartclk = clock;
        legacy_serial_ports[index].irq = irq;
        legacy_serial_ports[index].flags = flags;
+        legacy_serial_ports[index].regshift = shift;
        legacy_serial_infos[index].taddr = taddr;
        legacy_serial_infos[index].np = of_node_get(np);
        legacy_serial_infos[index].clock = clock;
@@ -153,8 +163,6 @@ static int __init add_legacy_soc_port(struct device_node *np,
 {
        u64 addr;
        const __be32 *addrp;
-        upf_t flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_SHARE_IRQ
-                | UPF_FIXED_PORT;
        struct device_node *tsi = of_get_parent(np);
        /* We only support ports that have a clock frequency properly
@@ -163,9 +171,8 @@ static int __init add_legacy_soc_port(struct device_node *np,
        if (of_get_property(np, "clock-frequency", NULL) == NULL)
                return -1;
-        /* if reg-shift or offset, don't try to use it */
+        /* if reg-offset don't try to use it */
-        if ((of_get_property(np, "reg-shift", NULL) != NULL) ||
+        if ((of_get_property(np, "reg-offset", NULL) != NULL))
-                (of_get_property(np, "reg-offset", NULL) != NULL))
                return -1;
        /* if rtas uses this device, don't try to use it as well */
@@ -185,9 +192,11 @@ static int __init add_legacy_soc_port(struct device_node *np,
         * IO port value. It will be fixed up later along with the irq
         */
        if (tsi && !strcmp(tsi->type, "tsi-bridge"))
-                return add_legacy_port(np, -1, UPIO_TSI, addr, addr, NO_IRQ, flags, 0);
+                return add_legacy_port(np, -1, UPIO_TSI, addr, addr,
+                                       NO_IRQ, legacy_port_flags, 0);
        else
-                return add_legacy_port(np, -1, UPIO_MEM, addr, addr, NO_IRQ, flags, 0);
+                return add_legacy_port(np, -1, UPIO_MEM, addr, addr,
+                                       NO_IRQ, legacy_port_flags, 0);
 }
 static int __init add_legacy_isa_port(struct device_node *np,
@@ -233,7 +242,7 @@ static int __init add_legacy_isa_port(struct device_node *np,
        /* Add port, irq will be dealt with later */
        return add_legacy_port(np, index, UPIO_PORT, be32_to_cpu(reg[1]),
-                               taddr, NO_IRQ, UPF_BOOT_AUTOCONF, 0);
+                               taddr, NO_IRQ, legacy_port_flags, 0);
 }
@@ -306,7 +315,7 @@ static int __init add_legacy_pci_port(struct device_node *np,
         * IO port value. It will be fixed up later along with the irq
         */
        return add_legacy_port(np, index, iotype, base, addr, NO_IRQ,
-                               UPF_BOOT_AUTOCONF, np != pci_dev);
+                               legacy_port_flags, np != pci_dev);
 }
 #endif
@@ -315,17 +324,20 @@ static void __init setup_legacy_serial_console(int console)
        struct legacy_serial_info *info = &legacy_serial_infos[console];
        struct plat_serial8250_port *port = &legacy_serial_ports[console];
        void __iomem *addr;
+        unsigned int stride;
+        stride = 1 << port->regshift;
        /* Check if a translated MMIO address has been found */
        if (info->taddr) {
                addr = ioremap(info->taddr, 0x1000);
                if (addr == NULL)
                        return;
-                udbg_uart_init_mmio(addr, 1);
+                udbg_uart_init_mmio(addr, stride);
        } else {
                /* Check if it's PIO and we support untranslated PIO */
                if (port->iotype == UPIO_PORT && isa_io_special)
-                        udbg_uart_init_pio(port->iobase, 1);
+                        udbg_uart_init_pio(port->iobase, stride);
                else
                        return;
        }
diff --git a/arch/powerpc/kernel/misc_64.S b/arch/powerpc/kernel/misc_64.S
index 3d0249599d52..4e314b90c75d 100644
--- a/arch/powerpc/kernel/misc_64.S
+++ b/arch/powerpc/kernel/misc_64.S
@@ -34,7 +34,7 @@ _GLOBAL(call_do_softirq)
        std     r0,16(r1)
        stdu    r1,THREAD_SIZE-STACK_FRAME_OVERHEAD(r3)
        mr      r1,r3
-        bl      .__do_softirq
+        bl      __do_softirq
        ld      r1,0(r1)
        ld      r0,16(r1)
        mtlr    r0
@@ -45,7 +45,7 @@ _GLOBAL(call_do_irq)
        std     r0,16(r1)
        stdu    r1,THREAD_SIZE-STACK_FRAME_OVERHEAD(r4)
        mr      r1,r4
-        bl      .__do_irq
+        bl      __do_irq
        ld      r1,0(r1)
        ld      r0,16(r1)
        mtlr    r0
@@ -506,7 +506,7 @@ _GLOBAL(kexec_smp_wait)
        stb     r4,PACAKEXECSTATE(r13)
        SYNC
-        b       .kexec_wait
+        b       kexec_wait
 /*
 * switch to real mode (turn mmu off)
@@ -576,7 +576,7 @@ _GLOBAL(kexec_sequence)
        /* copy dest pages, flush whole dest image */
        mr      r3,r29
-        bl      .kexec_copy_flush       /* (image) */
+        bl      kexec_copy_flush        /* (image) */
        /* turn off mmu */
        bl      real_mode
@@ -586,7 +586,7 @@ _GLOBAL(kexec_sequence)
        mr      r4,r30          /* start, aka phys mem offset */
        li      r5,0x100
        li      r6,0
-        bl      .copy_and_flush /* (dest, src, copy limit, start offset) */
+        bl      copy_and_flush  /* (dest, src, copy limit, start offset) */
 1:      /* assume normal blr return */
        /* release other cpus to the new kernel secondary start at 0x60 */
@@ -595,8 +595,12 @@ _GLOBAL(kexec_sequence)
        stw     r6,kexec_flag-1b(5)
        /* clear out hardware hash page table and tlb */
-        ld      r5,0(r27)               /* deref function descriptor */
+#if !defined(_CALL_ELF) || _CALL_ELF != 2
-        mtctr   r5
+        ld      r12,0(r27)              /* deref function descriptor */
+#else
+        mr      r12,r27
+#endif
+        mtctr   r12
        bctrl                           /* ppc_md.hpte_clear_all(void); */
 /*
@@ -630,3 +634,31 @@ _GLOBAL(kexec_sequence)
        li      r5,0
        blr     /* image->start(physid, image->start, 0); */
 #endif /* CONFIG_KEXEC */
+#ifdef CONFIG_MODULES
+#if defined(_CALL_ELF) && _CALL_ELF == 2
+#ifdef CONFIG_MODVERSIONS
+.weak __crc_TOC.
+.section "___kcrctab+TOC.","a"
+.globl __kcrctab_TOC.
+__kcrctab_TOC.:
+        .llong  __crc_TOC.
+#endif
+/*
+ * Export a fake .TOC. since both modpost and depmod will complain otherwise.
+ * Both modpost and depmod strip the leading . so we do the same here.
+ */
+.section "__ksymtab_strings","a"
+__kstrtab_TOC.:
+        .asciz "TOC."
+.section "___ksymtab+TOC.","a"
+/* This symbol name is important: it's used by modpost to find exported syms */
+.globl __ksymtab_TOC.
+__ksymtab_TOC.:
+        .llong 0 /* .value */
+        .llong __kstrtab_TOC.
+#endif /* ELFv2 */
+#endif /* MODULES */
diff --git a/arch/powerpc/kernel/module_64.c b/arch/powerpc/kernel/module_64.c
index 12664c130d73..077d2ce6c5a7 100644
--- a/arch/powerpc/kernel/module_64.c
+++ b/arch/powerpc/kernel/module_64.c
@@ -22,6 +22,7 @@
 #include <linux/vmalloc.h>
 #include <linux/ftrace.h>
 #include <linux/bug.h>
+#include <linux/uaccess.h>
 #include <asm/module.h>
 #include <asm/firmware.h>
 #include <asm/code-patching.h>
@@ -41,46 +42,170 @@
 #define DEBUGP(fmt , ...)
 #endif
+#if defined(_CALL_ELF) && _CALL_ELF == 2
+#define R2_STACK_OFFSET 24
+/* An address is simply the address of the function. */
+typedef unsigned long func_desc_t;
+static func_desc_t func_desc(unsigned long addr)
+{
+        return addr;
+}
+static unsigned long func_addr(unsigned long addr)
+{
+        return addr;
+}
+static unsigned long stub_func_addr(func_desc_t func)
+{
+        return func;
+}
+/* PowerPC64 specific values for the Elf64_Sym st_other field.  */
+#define STO_PPC64_LOCAL_BIT     5
+#define STO_PPC64_LOCAL_MASK    (7 << STO_PPC64_LOCAL_BIT)
+#define PPC64_LOCAL_ENTRY_OFFSET(other)                                 \
+ (((1 << (((other) & STO_PPC64_LOCAL_MASK) >> STO_PPC64_LOCAL_BIT)) >> 2) << 2)
+static unsigned int local_entry_offset(const Elf64_Sym *sym)
+{
+        /* sym->st_other indicates offset to local entry point
+         * (otherwise it will assume r12 is the address of the start
+         * of function and try to derive r2 from it). */
+        return PPC64_LOCAL_ENTRY_OFFSET(sym->st_other);
+}
+#else
+#define R2_STACK_OFFSET 40
+/* An address is address of the OPD entry, which contains address of fn. */
+typedef struct ppc64_opd_entry func_desc_t;
+static func_desc_t func_desc(unsigned long addr)
+{
+        return *(struct ppc64_opd_entry *)addr;
+}
+static unsigned long func_addr(unsigned long addr)
+{
+        return func_desc(addr).funcaddr;
+}
+static unsigned long stub_func_addr(func_desc_t func)
+{
+        return func.funcaddr;
+}
+static unsigned int local_entry_offset(const Elf64_Sym *sym)
+{
+        return 0;
+}
+#endif
 /* Like PPC32, we need little trampolines to do > 24-bit jumps (into
   the kernel itself).  But on PPC64, these need to be used for every
   jump, actually, to reset r2 (TOC+0x8000). */
 struct ppc64_stub_entry
 {
-        /* 28 byte jump instruction sequence (7 instructions) */
+        /* 28 byte jump instruction sequence (7 instructions). We only
-        unsigned char jump[28];
+         * need 6 instructions on ABIv2 but we always allocate 7 so
-        unsigned char unused[4];
+         * so we don't have to modify the trampoline load instruction. */
+        u32 jump[7];
+        u32 unused;
        /* Data for the above code */
-        struct ppc64_opd_entry opd;
+        func_desc_t funcdata;
 };
-/* We use a stub to fix up r2 (TOC ptr) and to jump to the (external)
+/*
-   function which may be more than 24-bits away.  We could simply
+ * PPC64 uses 24 bit jumps, but we need to jump into other modules or
-   patch the new r2 value and function pointer into the stub, but it's
+ * the kernel which may be further.  So we jump to a stub.
-   significantly shorter to put these values at the end of the stub
+ *
-   code, and patch the stub address (32-bits relative to the TOC ptr,
+ * For ELFv1 we need to use this to set up the new r2 value (aka TOC
-   r2) into the stub. */
+ * pointer).  For ELFv2 it's the callee's responsibility to set up the
-static struct ppc64_stub_entry ppc64_stub =
+ * new r2, but for both we need to save the old r2.
-{ .jump = {
+ *
-#ifdef __LITTLE_ENDIAN__
+ * We could simply patch the new r2 value and function pointer into
-        0x00, 0x00, 0x82, 0x3d, /* addis   r12,r2, <high> */
+ * the stub, but it's significantly shorter to put these values at the
-        0x00, 0x00, 0x8c, 0x39, /* addi    r12,r12, <low> */
+ * end of the stub code, and patch the stub address (32-bits relative
-        /* Save current r2 value in magic place on the stack. */
+ * to the TOC ptr, r2) into the stub.
-        0x28, 0x00, 0x41, 0xf8, /* std     r2,40(r1) */
+ */
-        0x20, 0x00, 0x6c, 0xe9, /* ld      r11,32(r12) */
-        0x28, 0x00, 0x4c, 0xe8, /* ld      r2,40(r12) */
+static u32 ppc64_stub_insns[] = {
-        0xa6, 0x03, 0x69, 0x7d, /* mtctr   r11 */
+        0x3d620000,                     /* addis   r11,r2, <high> */
-        0x20, 0x04, 0x80, 0x4e  /* bctr */
+        0x396b0000,                     /* addi    r11,r11, <low> */
-#else
-        0x3d, 0x82, 0x00, 0x00, /* addis   r12,r2, <high> */
-        0x39, 0x8c, 0x00, 0x00, /* addi    r12,r12, <low> */
        /* Save current r2 value in magic place on the stack. */
-        0xf8, 0x41, 0x00, 0x28, /* std     r2,40(r1) */
+        0xf8410000|R2_STACK_OFFSET,     /* std     r2,R2_STACK_OFFSET(r1) */
-        0xe9, 0x6c, 0x00, 0x20, /* ld      r11,32(r12) */
+        0xe98b0020,                     /* ld      r12,32(r11) */
-        0xe8, 0x4c, 0x00, 0x28, /* ld      r2,40(r12) */
+#if !defined(_CALL_ELF) || _CALL_ELF != 2
-        0x7d, 0x69, 0x03, 0xa6, /* mtctr   r11 */
+        /* Set up new r2 from function descriptor */
-        0x4e, 0x80, 0x04, 0x20  /* bctr */
+        0xe84b0028,                     /* ld      r2,40(r11) */
+#endif
+        0x7d8903a6,                     /* mtctr   r12 */
+        0x4e800420                      /* bctr */
+};
+#ifdef CONFIG_DYNAMIC_FTRACE
+static u32 ppc64_stub_mask[] = {
+        0xffff0000,
+        0xffff0000,
+        0xffffffff,
+        0xffffffff,
+#if !defined(_CALL_ELF) || _CALL_ELF != 2
+        0xffffffff,
+#endif
+        0xffffffff,
+        0xffffffff
+};
+bool is_module_trampoline(u32 *p)
+{
+        unsigned int i;
+        u32 insns[ARRAY_SIZE(ppc64_stub_insns)];
+        BUILD_BUG_ON(sizeof(ppc64_stub_insns) != sizeof(ppc64_stub_mask));
+        if (probe_kernel_read(insns, p, sizeof(insns)))
+                return -EFAULT;
+        for (i = 0; i < ARRAY_SIZE(ppc64_stub_insns); i++) {
+                u32 insna = insns[i];
+                u32 insnb = ppc64_stub_insns[i];
+                u32 mask = ppc64_stub_mask[i];
+                if ((insna & mask) != (insnb & mask))
+                        return false;
+        }
+        return true;
+}
+int module_trampoline_target(struct module *mod, u32 *trampoline,
+                             unsigned long *target)
+{
+        u32 buf[2];
+        u16 upper, lower;
+        long offset;
+        void *toc_entry;
+        if (probe_kernel_read(buf, trampoline, sizeof(buf)))
+                return -EFAULT;
+        upper = buf[0] & 0xffff;
+        lower = buf[1] & 0xffff;
+        /* perform the addis/addi, both signed */
+        offset = ((short)upper << 16) + (short)lower;
+        /*
+         * Now get the address this trampoline jumps to. This
+         * is always 32 bytes into our trampoline stub.
+         */
+        toc_entry = (void *)mod->arch.toc + offset + 32;
+        if (probe_kernel_read(target, toc_entry, sizeof(*target)))
+                return -EFAULT;
+        return 0;
+}
 #endif
-} };
 /* Count how many different 24-bit relocations (different symbol,
   different addend) */
@@ -183,6 +308,7 @@ static unsigned long get_stubs_size(const Elf64_Ehdr *hdr,
        return relocs * sizeof(struct ppc64_stub_entry);
 }
+/* Still needed for ELFv2, for .TOC. */
 static void dedotify_versions(struct modversion_info *vers,
                              unsigned long size)
 {
@@ -193,7 +319,7 @@ static void dedotify_versions(struct modversion_info *vers,
                        memmove(vers->name, vers->name+1, strlen(vers->name));
 }
-/* Undefined symbols which refer to .funcname, hack to funcname */
+/* Undefined symbols which refer to .funcname, hack to funcname (or .TOC.) */
 static void dedotify(Elf64_Sym *syms, unsigned int numsyms, char *strtab)
 {
        unsigned int i;
@@ -207,6 +333,24 @@ static void dedotify(Elf64_Sym *syms, unsigned int numsyms, char *strtab)
        }
 }
+static Elf64_Sym *find_dot_toc(Elf64_Shdr *sechdrs,
+                               const char *strtab,
+                               unsigned int symindex)
+{
+        unsigned int i, numsyms;
+        Elf64_Sym *syms;
+        syms = (Elf64_Sym *)sechdrs[symindex].sh_addr;
+        numsyms = sechdrs[symindex].sh_size / sizeof(Elf64_Sym);
+        for (i = 1; i < numsyms; i++) {
+                if (syms[i].st_shndx == SHN_UNDEF
+                    && strcmp(strtab + syms[i].st_name, "TOC.") == 0)
+                        return &syms[i];
+        }
+        return NULL;
+}
 int module_frob_arch_sections(Elf64_Ehdr *hdr,
                              Elf64_Shdr *sechdrs,
                              char *secstrings,
@@ -271,21 +415,12 @@ static inline unsigned long my_r2(Elf64_Shdr *sechdrs, struct module *me)
 /* Patch stub to reference function and correct r2 value. */
 static inline int create_stub(Elf64_Shdr *sechdrs,
                              struct ppc64_stub_entry *entry,
-                              struct ppc64_opd_entry *opd,
+                              unsigned long addr,
                              struct module *me)
 {
-        Elf64_Half *loc1, *loc2;
        long reladdr;
-        *entry = ppc64_stub;
+        memcpy(entry->jump, ppc64_stub_insns, sizeof(ppc64_stub_insns));
-#ifdef __LITTLE_ENDIAN__
-        loc1 = (Elf64_Half *)&entry->jump[0];
-        loc2 = (Elf64_Half *)&entry->jump[4];
-#else
-        loc1 = (Elf64_Half *)&entry->jump[2];
-        loc2 = (Elf64_Half *)&entry->jump[6];
-#endif
        /* Stub uses address relative to r2. */
        reladdr = (unsigned long)entry - my_r2(sechdrs, me);
@@ -296,35 +431,33 @@ static inline int create_stub(Elf64_Shdr *sechdrs,
        }
        DEBUGP("Stub %p get data from reladdr %li\n", entry, reladdr);
-        *loc1 = PPC_HA(reladdr);
+        entry->jump[0] |= PPC_HA(reladdr);
-        *loc2 = PPC_LO(reladdr);
+        entry->jump[1] |= PPC_LO(reladdr);
-        entry->opd.funcaddr = opd->funcaddr;
+        entry->funcdata = func_desc(addr);
-        entry->opd.r2 = opd->r2;
        return 1;
 }
-/* Create stub to jump to function described in this OPD: we need the
+/* Create stub to jump to function described in this OPD/ptr: we need the
   stub to set up the TOC ptr (r2) for the function. */
 static unsigned long stub_for_addr(Elf64_Shdr *sechdrs,
-                                   unsigned long opdaddr,
+                                   unsigned long addr,
                                   struct module *me)
 {
        struct ppc64_stub_entry *stubs;
-        struct ppc64_opd_entry *opd = (void *)opdaddr;
        unsigned int i, num_stubs;
        num_stubs = sechdrs[me->arch.stubs_section].sh_size / sizeof(*stubs);
        /* Find this stub, or if that fails, the next avail. entry */
        stubs = (void *)sechdrs[me->arch.stubs_section].sh_addr;
-        for (i = 0; stubs[i].opd.funcaddr; i++) {
+        for (i = 0; stub_func_addr(stubs[i].funcdata); i++) {
                BUG_ON(i >= num_stubs);
-                if (stubs[i].opd.funcaddr == opd->funcaddr)
+                if (stub_func_addr(stubs[i].funcdata) == func_addr(addr))
                        return (unsigned long)&stubs[i];
        }
-        if (!create_stub(sechdrs, &stubs[i], opd, me))
+        if (!create_stub(sechdrs, &stubs[i], addr, me))
                return 0;
        return (unsigned long)&stubs[i];
@@ -339,7 +472,8 @@ static int restore_r2(u32 *instruction, struct module *me)
                       me->name, *instruction);
                return 0;
        }
-        *instruction = 0xe8410028;      /* ld r2,40(r1) */
+        /* ld r2,R2_STACK_OFFSET(r1) */
+        *instruction = 0xe8410000 | R2_STACK_OFFSET;
        return 1;
 }
@@ -357,6 +491,17 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
        DEBUGP("Applying ADD relocate section %u to %u\n", relsec,
               sechdrs[relsec].sh_info);
+        /* First time we're called, we can fix up .TOC. */
+        if (!me->arch.toc_fixed) {
+                sym = find_dot_toc(sechdrs, strtab, symindex);
+                /* It's theoretically possible that a module doesn't want a
+                 * .TOC. so don't fail it just for that. */
+                if (sym)
+                        sym->st_value = my_r2(sechdrs, me);
+                me->arch.toc_fixed = true;
+        }
        for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rela); i++) {
                /* This is where to make the change */
                location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
@@ -453,7 +598,8 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
                                        return -ENOENT;
                                if (!restore_r2((u32 *)location + 1, me))
                                        return -ENOEXEC;
-                        }
+                        } else
+                                value += local_entry_offset(sym);
                        /* Convert value to relative */
                        value -= (unsigned long)location;
@@ -474,6 +620,31 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
                        *location = value - (unsigned long)location;
                        break;
+                case R_PPC64_TOCSAVE:
+                        /*
+                         * Marker reloc indicates we don't have to save r2.
+                         * That would only save us one instruction, so ignore
+                         * it.
+                         */
+                        break;
+                case R_PPC64_REL16_HA:
+                        /* Subtract location pointer */
+                        value -= (unsigned long)location;
+                        value = ((value + 0x8000) >> 16);
+                        *((uint16_t *) location)
+                                = (*((uint16_t *) location) & ~0xffff)
+                                | (value & 0xffff);
+                        break;
+                case R_PPC64_REL16_LO:
+                        /* Subtract location pointer */
+                        value -= (unsigned long)location;
+                        *((uint16_t *) location)
+                                = (*((uint16_t *) location) & ~0xffff)
+                                | (value & 0xffff);
+                        break;
                default:
                        printk("%s: Unknown ADD relocation: %lu\n",
                               me->name,
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index 24d342e91790..b49c72fd7f16 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -21,6 +21,7 @@
 #include <linux/string.h>
 #include <linux/init.h>
 #include <linux/bootmem.h>
+#include <linux/delay.h>
 #include <linux/export.h>
 #include <linux/of_address.h>
 #include <linux/of_pci.h>
@@ -120,6 +121,25 @@ resource_size_t pcibios_window_alignment(struct pci_bus *bus,
        return 1;
 }
+void pcibios_reset_secondary_bus(struct pci_dev *dev)
+{
+        u16 ctrl;
+        if (ppc_md.pcibios_reset_secondary_bus) {
+                ppc_md.pcibios_reset_secondary_bus(dev);
+                return;
+        }
+        pci_read_config_word(dev, PCI_BRIDGE_CONTROL, &ctrl);
+        ctrl |= PCI_BRIDGE_CTL_BUS_RESET;
+        pci_write_config_word(dev, PCI_BRIDGE_CONTROL, ctrl);
+        msleep(2);
+        ctrl &= ~PCI_BRIDGE_CTL_BUS_RESET;
+        pci_write_config_word(dev, PCI_BRIDGE_CONTROL, ctrl);
+        ssleep(1);
+}
 static resource_size_t pcibios_io_size(const struct pci_controller *hose)
 {
 #ifdef CONFIG_PPC64
@@ -646,60 +666,36 @@ void pci_resource_to_user(const struct pci_dev *dev, int bar,
 void pci_process_bridge_OF_ranges(struct pci_controller *hose,
                                  struct device_node *dev, int primary)
 {
-        const __be32 *ranges;
-        int rlen;
-        int pna = of_n_addr_cells(dev);
-        int np = pna + 5;
        int memno = 0;
-        u32 pci_space;
-        unsigned long long pci_addr, cpu_addr, pci_next, cpu_next, size;
        struct resource *res;
+        struct of_pci_range range;
+        struct of_pci_range_parser parser;
        printk(KERN_INFO "PCI host bridge %s %s ranges:\n",
               dev->full_name, primary ? "(primary)" : "");
-        /* Get ranges property */
+        /* Check for ranges property */
-        ranges = of_get_property(dev, "ranges", &rlen);
+        if (of_pci_range_parser_init(&parser, dev))
-        if (ranges == NULL)
                return;
        /* Parse it */
-        while ((rlen -= np * 4) >= 0) {
+        for_each_of_pci_range(&parser, &range) {
-                /* Read next ranges element */
-                pci_space = of_read_number(ranges, 1);
-                pci_addr = of_read_number(ranges + 1, 2);
-                cpu_addr = of_translate_address(dev, ranges + 3);
-                size = of_read_number(ranges + pna + 3, 2);
-                ranges += np;
                /* If we failed translation or got a zero-sized region
                 * (some FW try to feed us with non sensical zero sized regions
                 * such as power3 which look like some kind of attempt at exposing
                 * the VGA memory hole)
                 */
-                if (cpu_addr == OF_BAD_ADDR || size == 0)
+                if (range.cpu_addr == OF_BAD_ADDR || range.size == 0)
                        continue;
-                /* Now consume following elements while they are contiguous */
-                for (; rlen >= np * sizeof(u32);
-                     ranges += np, rlen -= np * 4) {
-                        if (of_read_number(ranges, 1) != pci_space)
-                                break;
-                        pci_next = of_read_number(ranges + 1, 2);
-                        cpu_next = of_translate_address(dev, ranges + 3);
-                        if (pci_next != pci_addr + size ||
-                            cpu_next != cpu_addr + size)
-                                break;
-                        size += of_read_number(ranges + pna + 3, 2);
-                }
                /* Act based on address space type */
                res = NULL;
-                switch ((pci_space >> 24) & 0x3) {
+                switch (range.flags & IORESOURCE_TYPE_BITS) {
-                case 1:         /* PCI IO space */
+                case IORESOURCE_IO:
                        printk(KERN_INFO
                               "  IO 0x%016llx..0x%016llx -> 0x%016llx\n",
-                               cpu_addr, cpu_addr + size - 1, pci_addr);
+                               range.cpu_addr, range.cpu_addr + range.size - 1,
+                               range.pci_addr);
                        /* We support only one IO range */
                        if (hose->pci_io_size) {
@@ -709,11 +705,12 @@ void pci_process_bridge_OF_ranges(struct pci_controller *hose,
                        }
 #ifdef CONFIG_PPC32
                        /* On 32 bits, limit I/O space to 16MB */
-                        if (size > 0x01000000)
+                        if (range.size > 0x01000000)
-                                size = 0x01000000;
+                                range.size = 0x01000000;
                        /* 32 bits needs to map IOs here */
-                        hose->io_base_virt = ioremap(cpu_addr, size);
+                        hose->io_base_virt = ioremap(range.cpu_addr,
+                                                range.size);
                        /* Expect trouble if pci_addr is not 0 */
                        if (primary)
@@ -723,20 +720,20 @@ void pci_process_bridge_OF_ranges(struct pci_controller *hose,
                        /* pci_io_size and io_base_phys always represent IO
                         * space starting at 0 so we factor in pci_addr
                         */
-                        hose->pci_io_size = pci_addr + size;
+                        hose->pci_io_size = range.pci_addr + range.size;
-                        hose->io_base_phys = cpu_addr - pci_addr;
+                        hose->io_base_phys = range.cpu_addr - range.pci_addr;
                        /* Build resource */
                        res = &hose->io_resource;
-                        res->flags = IORESOURCE_IO;
+                        range.cpu_addr = range.pci_addr;
-                        res->start = pci_addr;
                        break;
-                case 2:         /* PCI Memory space */
+                case IORESOURCE_MEM:
-                case 3:         /* PCI 64 bits Memory space */
                        printk(KERN_INFO
                               " MEM 0x%016llx..0x%016llx -> 0x%016llx %s\n",
-                               cpu_addr, cpu_addr + size - 1, pci_addr,
+                               range.cpu_addr, range.cpu_addr + range.size - 1,
-                               (pci_space & 0x40000000) ? "Prefetch" : "");
+                               range.pci_addr,
+                               (range.pci_space & 0x40000000) ?
+                               "Prefetch" : "");
                        /* We support only 3 memory ranges */
                        if (memno >= 3) {
@@ -745,28 +742,21 @@ void pci_process_bridge_OF_ranges(struct pci_controller *hose,
                                continue;
                        }
                        /* Handles ISA memory hole space here */
-                        if (pci_addr == 0) {
+                        if (range.pci_addr == 0) {
                                if (primary || isa_mem_base == 0)
-                                        isa_mem_base = cpu_addr;
+                                        isa_mem_base = range.cpu_addr;
-                                hose->isa_mem_phys = cpu_addr;
+                                hose->isa_mem_phys = range.cpu_addr;
-                                hose->isa_mem_size = size;
+                                hose->isa_mem_size = range.size;
                        }
                        /* Build resource */
-                        hose->mem_offset[memno] = cpu_addr - pci_addr;
+                        hose->mem_offset[memno] = range.cpu_addr -
+                                                        range.pci_addr;
                        res = &hose->mem_resources[memno++];
-                        res->flags = IORESOURCE_MEM;
-                        if (pci_space & 0x40000000)
-                                res->flags |= IORESOURCE_PREFETCH;
-                        res->start = cpu_addr;
                        break;
                }
                if (res != NULL) {
-                        res->name = dev->full_name;
+                        of_pci_range_to_resource(&range, dev, res);
-                        res->end = res->start + size - 1;
-                        res->parent = NULL;
-                        res->sibling = NULL;
-                        res->child = NULL;
                }
        }
 }
diff --git a/arch/powerpc/kernel/pci_of_scan.c b/arch/powerpc/kernel/pci_of_scan.c
index 059e244484fe..44562aa97f16 100644
--- a/arch/powerpc/kernel/pci_of_scan.c
+++ b/arch/powerpc/kernel/pci_of_scan.c
@@ -304,6 +304,9 @@ static struct pci_dev *of_scan_pci_dev(struct pci_bus *bus,
        struct pci_dev *dev = NULL;
        const __be32 *reg;
        int reglen, devfn;
+#ifdef CONFIG_EEH
+        struct eeh_dev *edev = of_node_to_eeh_dev(dn);
+#endif
        pr_debug("  * %s\n", dn->full_name);
        if (!of_device_is_available(dn))
@@ -321,6 +324,12 @@ static struct pci_dev *of_scan_pci_dev(struct pci_bus *bus,
                return dev;
        }
+        /* Device removed permanently ? */
+#ifdef CONFIG_EEH
+        if (edev && (edev->mode & EEH_DEV_REMOVED))
+                return NULL;
+#endif
        /* create a new pci_dev for this device */
        dev = of_create_pci_dev(dn, bus, devfn);
        if (!dev)
diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c
index 450850a49dce..48d17d6fca5b 100644
--- a/arch/powerpc/kernel/ppc_ksyms.c
+++ b/arch/powerpc/kernel/ppc_ksyms.c
@@ -155,9 +155,7 @@ EXPORT_SYMBOL(__cmpdi2);
 #endif
 long long __bswapdi2(long long);
 EXPORT_SYMBOL(__bswapdi2);
-#ifdef __BIG_ENDIAN__
 EXPORT_SYMBOL(memcpy);
-#endif
 EXPORT_SYMBOL(memset);
 EXPORT_SYMBOL(memmove);
 EXPORT_SYMBOL(memcmp);
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index 31d021506d21..8a1edbe26b8f 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -54,6 +54,7 @@
 #ifdef CONFIG_PPC64
 #include <asm/firmware.h>
 #endif
+#include <asm/code-patching.h>
 #include <linux/kprobes.h>
 #include <linux/kdebug.h>
@@ -495,14 +496,21 @@ static inline int set_dawr(struct arch_hw_breakpoint *brk)
        return 0;
 }
-int set_breakpoint(struct arch_hw_breakpoint *brk)
+void __set_breakpoint(struct arch_hw_breakpoint *brk)
 {
        __get_cpu_var(current_brk) = *brk;
        if (cpu_has_feature(CPU_FTR_DAWR))
-                return set_dawr(brk);
+                set_dawr(brk);
+        else
+                set_dabr(brk);
+}
-        return set_dabr(brk);
+void set_breakpoint(struct arch_hw_breakpoint *brk)
+{
+        preempt_disable();
+        __set_breakpoint(brk);
+        preempt_enable();
 }
 #ifdef CONFIG_PPC64
@@ -834,7 +842,7 @@ struct task_struct *__switch_to(struct task_struct *prev,
 */
 #ifndef CONFIG_HAVE_HW_BREAKPOINT
        if (unlikely(!hw_brk_match(&__get_cpu_var(current_brk), &new->thread.hw_brk)))
-                set_breakpoint(&new->thread.hw_brk);
+                __set_breakpoint(&new->thread.hw_brk);
 #endif /* CONFIG_HAVE_HW_BREAKPOINT */
 #endif
@@ -1108,7 +1116,9 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
                struct thread_info *ti = (void *)task_stack_page(p);
                memset(childregs, 0, sizeof(struct pt_regs));
                childregs->gpr[1] = sp + sizeof(struct pt_regs);
-                childregs->gpr[14] = usp;       /* function */
+                /* function */
+                if (usp)
+                        childregs->gpr[14] = ppc_function_entry((void *)usp);
 #ifdef CONFIG_PPC64
                clear_tsk_thread_flag(p, TIF_32BIT);
                childregs->softe = 1;
@@ -1187,17 +1197,7 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
        if (cpu_has_feature(CPU_FTR_HAS_PPR))
                p->thread.ppr = INIT_PPR;
 #endif
-        /*
+        kregs->nip = ppc_function_entry(f);
-         * The PPC64 ABI makes use of a TOC to contain function 
-         * pointers.  The function (ret_from_except) is actually a pointer
-         * to the TOC entry.  The first entry is a pointer to the actual
-         * function.
-         */
-#ifdef CONFIG_PPC64
-        kregs->nip = *((unsigned long *)f);
-#else
-        kregs->nip = (unsigned long)f;
-#endif
        return 0;
 }
diff --git a/arch/powerpc/kernel/prom_init_check.sh b/arch/powerpc/kernel/prom_init_check.sh
index b0c263da219a..77aa1e95e904 100644
--- a/arch/powerpc/kernel/prom_init_check.sh
+++ b/arch/powerpc/kernel/prom_init_check.sh
@@ -23,7 +23,7 @@ strcmp strcpy strlcpy strlen strncmp strstr logo_linux_clut224
 reloc_got2 kernstart_addr memstart_addr linux_banner _stext
 opal_query_takeover opal_do_takeover opal_enter_rtas opal_secondary_entry
 boot_command_line __prom_init_toc_start __prom_init_toc_end
-btext_setup_display"
+btext_setup_display TOC."
 NM="$1"
 OBJ="$2"
diff --git a/arch/powerpc/kernel/rtas_pci.c b/arch/powerpc/kernel/rtas_pci.c
index 7d4c7172f38e..c168337aef9d 100644
--- a/arch/powerpc/kernel/rtas_pci.c
+++ b/arch/powerpc/kernel/rtas_pci.c
@@ -80,10 +80,6 @@ int rtas_read_config(struct pci_dn *pdn, int where, int size, u32 *val)
        if (ret)
                return PCIBIOS_DEVICE_NOT_FOUND;
-        if (returnval == EEH_IO_ERROR_VALUE(size) &&
-            eeh_dev_check_failure(of_node_to_eeh_dev(pdn->node)))
-                return PCIBIOS_DEVICE_NOT_FOUND;
        return PCIBIOS_SUCCESSFUL;
 }
@@ -92,18 +88,39 @@ static int rtas_pci_read_config(struct pci_bus *bus,
                                int where, int size, u32 *val)
 {
        struct device_node *busdn, *dn;
+        struct pci_dn *pdn;
-        busdn = pci_bus_to_OF_node(bus);
+        bool found = false;
+#ifdef CONFIG_EEH
+        struct eeh_dev *edev;
+#endif
+        int ret;
        /* Search only direct children of the bus */
+        *val = 0xFFFFFFFF;
+        busdn = pci_bus_to_OF_node(bus);
        for (dn = busdn->child; dn; dn = dn->sibling) {
-                struct pci_dn *pdn = PCI_DN(dn);
+                pdn = PCI_DN(dn);
                if (pdn && pdn->devfn == devfn
-                    && of_device_is_available(dn))
+                    && of_device_is_available(dn)) {
-                        return rtas_read_config(pdn, where, size, val);
+                        found = true;
+                        break;
+                }
        }
-        return PCIBIOS_DEVICE_NOT_FOUND;
+        if (!found)
+                return PCIBIOS_DEVICE_NOT_FOUND;
+#ifdef CONFIG_EEH
+        edev = of_node_to_eeh_dev(dn);
+        if (edev && edev->pe && edev->pe->state & EEH_PE_RESET)
+                return PCIBIOS_DEVICE_NOT_FOUND;
+#endif
+        ret = rtas_read_config(pdn, where, size, val);
+        if (*val == EEH_IO_ERROR_VALUE(size) &&
+            eeh_dev_check_failure(of_node_to_eeh_dev(dn)))
+                return PCIBIOS_DEVICE_NOT_FOUND;
+        return ret;
 }
 int rtas_write_config(struct pci_dn *pdn, int where, int size, u32 val)
@@ -136,17 +153,34 @@ static int rtas_pci_write_config(struct pci_bus *bus,
                                 int where, int size, u32 val)
 {
        struct device_node *busdn, *dn;
+        struct pci_dn *pdn;
-        busdn = pci_bus_to_OF_node(bus);
+        bool found = false;
+#ifdef CONFIG_EEH
+        struct eeh_dev *edev;
+#endif
+        int ret;
        /* Search only direct children of the bus */
+        busdn = pci_bus_to_OF_node(bus);
        for (dn = busdn->child; dn; dn = dn->sibling) {
-                struct pci_dn *pdn = PCI_DN(dn);
+                pdn = PCI_DN(dn);
                if (pdn && pdn->devfn == devfn
-                    && of_device_is_available(dn))
+                    && of_device_is_available(dn)) {
-                        return rtas_write_config(pdn, where, size, val);
+                        found = true;
+                        break;
+                }
        }
-        return PCIBIOS_DEVICE_NOT_FOUND;
+        if (!found)
+                return PCIBIOS_DEVICE_NOT_FOUND;
+#ifdef CONFIG_EEH
+        edev = of_node_to_eeh_dev(dn);
+        if (edev && edev->pe && (edev->pe->state & EEH_PE_RESET))
+                return PCIBIOS_DEVICE_NOT_FOUND;
+#endif
+        ret = rtas_write_config(pdn, where, size, val);
+        return ret;
 }
 static struct pci_ops rtas_pci_ops = {
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index 79b7612ac6fa..aa0f5edd8570 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -212,6 +212,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
 {
        unsigned long cpu_id = (unsigned long)v - 1;
        unsigned int pvr;
+        unsigned long proc_freq;
        unsigned short maj;
        unsigned short min;
@@ -263,12 +264,19 @@ static int show_cpuinfo(struct seq_file *m, void *v)
 #endif /* CONFIG_TAU */
        /*
-         * Assume here that all clock rates are the same in a
+         * Platforms that have variable clock rates, should implement
-         * smp system.  -- Cort
+         * the method ppc_md.get_proc_freq() that reports the clock
+         * rate of a given cpu. The rest can use ppc_proc_freq to
+         * report the clock rate that is same across all cpus.
         */
-        if (ppc_proc_freq)
+        if (ppc_md.get_proc_freq)
+                proc_freq = ppc_md.get_proc_freq(cpu_id);
+        else
+                proc_freq = ppc_proc_freq;
+        if (proc_freq)
                seq_printf(m, "clock\t\t: %lu.%06luMHz\n",
-                           ppc_proc_freq / 1000000, ppc_proc_freq % 1000000);
+                           proc_freq / 1000000, proc_freq % 1000000);
        if (ppc_md.show_percpuinfo != NULL)
                ppc_md.show_percpuinfo(m, cpu_id);
@@ -382,9 +390,10 @@ void __init check_for_initrd(void)
 #ifdef CONFIG_SMP
-int threads_per_core, threads_shift;
+int threads_per_core, threads_per_subcore, threads_shift;
 cpumask_t threads_core_mask;
 EXPORT_SYMBOL_GPL(threads_per_core);
+EXPORT_SYMBOL_GPL(threads_per_subcore);
 EXPORT_SYMBOL_GPL(threads_shift);
 EXPORT_SYMBOL_GPL(threads_core_mask);
@@ -393,6 +402,7 @@ static void __init cpu_init_thread_core_maps(int tpc)
        int i;
        threads_per_core = tpc;
+        threads_per_subcore = tpc;
        cpumask_clear(&threads_core_mask);
        /* This implementation only supports power of 2 number of threads
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index fbe24377eda3..ee082d771178 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -36,6 +36,7 @@
 #include <linux/lockdep.h>
 #include <linux/memblock.h>
 #include <linux/hugetlb.h>
+#include <linux/memory.h>
 #include <asm/io.h>
 #include <asm/kdump.h>
@@ -341,7 +342,7 @@ void smp_release_cpus(void)
        ptr  = (unsigned long *)((unsigned long)&__secondary_hold_spinloop
                        - PHYSICAL_START);
-        *ptr = __pa(generic_secondary_smp_init);
+        *ptr = ppc_function_entry(generic_secondary_smp_init);
        /* And wait a bit for them to catch up */
        for (i = 0; i < 100000; i++) {
@@ -780,6 +781,15 @@ void __init setup_per_cpu_areas(void)
 }
 #endif
+#ifdef CONFIG_MEMORY_HOTPLUG_SPARSE
+unsigned long memory_block_size_bytes(void)
+{
+        if (ppc_md.memory_block_size)
+                return ppc_md.memory_block_size();
+        return MIN_MEMORY_BLOCK_SIZE;
+}
+#endif
 #if defined(CONFIG_PPC_INDIRECT_PIO) || defined(CONFIG_PPC_INDIRECT_MMIO)
 struct ppc_pci_io ppc_pci_io;
diff --git a/arch/powerpc/kernel/signal.c b/arch/powerpc/kernel/signal.c
index 8fc4177ed65a..1c794cef2883 100644
--- a/arch/powerpc/kernel/signal.c
+++ b/arch/powerpc/kernel/signal.c
@@ -134,7 +134,7 @@ static int do_signal(struct pt_regs *regs)
         */
        if (current->thread.hw_brk.address &&
                current->thread.hw_brk.type)
-                set_breakpoint(&current->thread.hw_brk);
+                __set_breakpoint(&current->thread.hw_brk);
 #endif
        /* Re-enable the breakpoints for the signal stack */
        thread_change_pc(current, regs);
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 10ffffef0414..7753af2d2613 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -36,6 +36,7 @@
 #include <linux/atomic.h>
 #include <asm/irq.h>
 #include <asm/hw_irq.h>
+#include <asm/kvm_ppc.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/prom.h>
@@ -390,6 +391,7 @@ void smp_prepare_boot_cpu(void)
 #ifdef CONFIG_PPC64
        paca[boot_cpuid].__current = current;
 #endif
+        set_numa_node(numa_cpu_lookup_table[boot_cpuid]);
        current_set[boot_cpuid] = task_thread_info(current);
 }
@@ -457,38 +459,9 @@ int generic_check_cpu_restart(unsigned int cpu)
        return per_cpu(cpu_state, cpu) == CPU_UP_PREPARE;
 }
-static atomic_t secondary_inhibit_count;
+static bool secondaries_inhibited(void)
-/*
- * Don't allow secondary CPU threads to come online
- */
-void inhibit_secondary_onlining(void)
 {
-        /*
+        return kvm_hv_mode_active();
-         * This makes secondary_inhibit_count stable during cpu
-         * online/offline operations.
-         */
-        get_online_cpus();
-        atomic_inc(&secondary_inhibit_count);
-        put_online_cpus();
-}
-EXPORT_SYMBOL_GPL(inhibit_secondary_onlining);
-/*
- * Allow secondary CPU threads to come online again
- */
-void uninhibit_secondary_onlining(void)
-{
-        get_online_cpus();
-        atomic_dec(&secondary_inhibit_count);
-        put_online_cpus();
-}
-EXPORT_SYMBOL_GPL(uninhibit_secondary_onlining);
-static int secondaries_inhibited(void)
-{
-        return atomic_read(&secondary_inhibit_count);
 }
 #else /* HOTPLUG_CPU */
@@ -517,7 +490,7 @@ int __cpu_up(unsigned int cpu, struct task_struct *tidle)
         * Don't allow secondary threads to come online if inhibited
         */
        if (threads_per_core > 1 && secondaries_inhibited() &&
-            cpu % threads_per_core != 0)
+            cpu_thread_in_subcore(cpu))
                return -EBUSY;
        if (smp_ops == NULL ||
@@ -750,6 +723,12 @@ void start_secondary(void *unused)
        }
        traverse_core_siblings(cpu, true);
+        /*
+         * numa_node_id() works after this.
+         */
+        set_numa_node(numa_cpu_lookup_table[cpu]);
+        set_numa_mem(local_memory_node(numa_cpu_lookup_table[cpu]));
        smp_wmb();
        notify_cpu_starting(cpu);
        set_cpu_online(cpu, true);
diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c
index d90d4b7810d6..67fd2fd2620a 100644
--- a/arch/powerpc/kernel/sysfs.c
+++ b/arch/powerpc/kernel/sysfs.c
@@ -404,7 +404,7 @@ void ppc_enable_pmcs(void)
 }
 EXPORT_SYMBOL(ppc_enable_pmcs);
-#define __SYSFS_SPRSETUP(NAME, ADDRESS, EXTRA) \
+#define __SYSFS_SPRSETUP_READ_WRITE(NAME, ADDRESS, EXTRA) \
 static void read_##NAME(void *val) \
 { \
        *(unsigned long *)val = mfspr(ADDRESS); \
@@ -413,7 +413,9 @@ static void write_##NAME(void *val) \
 { \
        EXTRA; \
        mtspr(ADDRESS, *(unsigned long *)val);  \
-} \
+}
+#define __SYSFS_SPRSETUP_SHOW_STORE(NAME) \
 static ssize_t show_##NAME(struct device *dev, \
                        struct device_attribute *attr, \
                        char *buf) \
@@ -436,10 +438,15 @@ static ssize_t __used \
        return count; \
 }
-#define SYSFS_PMCSETUP(NAME, ADDRESS)   \
+#define SYSFS_PMCSETUP(NAME, ADDRESS) \
-        __SYSFS_SPRSETUP(NAME, ADDRESS, ppc_enable_pmcs())
+        __SYSFS_SPRSETUP_READ_WRITE(NAME, ADDRESS, ppc_enable_pmcs()) \
-#define SYSFS_SPRSETUP(NAME, ADDRESS)   \
+        __SYSFS_SPRSETUP_SHOW_STORE(NAME)
-        __SYSFS_SPRSETUP(NAME, ADDRESS, )
+#define SYSFS_SPRSETUP(NAME, ADDRESS) \
+        __SYSFS_SPRSETUP_READ_WRITE(NAME, ADDRESS, ) \
+        __SYSFS_SPRSETUP_SHOW_STORE(NAME)
+#define SYSFS_SPRSETUP_SHOW_STORE(NAME) \
+        __SYSFS_SPRSETUP_SHOW_STORE(NAME)
 /* Let's define all possible registers, we'll only hook up the ones
 * that are implemented on the current processor
@@ -477,7 +484,6 @@ SYSFS_PMCSETUP(pmc8, SPRN_PMC8);
 SYSFS_PMCSETUP(mmcra, SPRN_MMCRA);
 SYSFS_SPRSETUP(purr, SPRN_PURR);
 SYSFS_SPRSETUP(spurr, SPRN_SPURR);
-SYSFS_SPRSETUP(dscr, SPRN_DSCR);
 SYSFS_SPRSETUP(pir, SPRN_PIR);
 /*
@@ -487,12 +493,27 @@ SYSFS_SPRSETUP(pir, SPRN_PIR);
 */
 static DEVICE_ATTR(mmcra, 0600, show_mmcra, store_mmcra);
 static DEVICE_ATTR(spurr, 0400, show_spurr, NULL);
-static DEVICE_ATTR(dscr, 0600, show_dscr, store_dscr);
 static DEVICE_ATTR(purr, 0400, show_purr, store_purr);
 static DEVICE_ATTR(pir, 0400, show_pir, NULL);
-unsigned long dscr_default = 0;
+static unsigned long dscr_default;
-EXPORT_SYMBOL(dscr_default);
+static void read_dscr(void *val)
+{
+        *(unsigned long *)val = get_paca()->dscr_default;
+}
+static void write_dscr(void *val)
+{
+        get_paca()->dscr_default = *(unsigned long *)val;
+        if (!current->thread.dscr_inherit) {
+                current->thread.dscr = *(unsigned long *)val;
+                mtspr(SPRN_DSCR, *(unsigned long *)val);
+        }
+}
+SYSFS_SPRSETUP_SHOW_STORE(dscr);
+static DEVICE_ATTR(dscr, 0600, show_dscr, store_dscr);
 static void add_write_permission_dev_attr(struct device_attribute *attr)
 {
@@ -505,14 +526,6 @@ static ssize_t show_dscr_default(struct device *dev,
        return sprintf(buf, "%lx\n", dscr_default);
 }
-static void update_dscr(void *dummy)
-{
-        if (!current->thread.dscr_inherit) {
-                current->thread.dscr = dscr_default;
-                mtspr(SPRN_DSCR, dscr_default);
-        }
-}
 static ssize_t __used store_dscr_default(struct device *dev,
                struct device_attribute *attr, const char *buf,
                size_t count)
@@ -525,7 +538,7 @@ static ssize_t __used store_dscr_default(struct device *dev,
                return -EINVAL;
        dscr_default = val;
-        on_each_cpu(update_dscr, NULL, 1);
+        on_each_cpu(write_dscr, &val, 1);
        return count;
 }
diff --git a/arch/powerpc/kernel/systbl.S b/arch/powerpc/kernel/systbl.S
index 93219c34af32..895c50ca943c 100644
--- a/arch/powerpc/kernel/systbl.S
+++ b/arch/powerpc/kernel/systbl.S
@@ -17,12 +17,12 @@
 #include <asm/ppc_asm.h>
 #ifdef CONFIG_PPC64
-#define SYSCALL(func)           .llong  .sys_##func,.sys_##func
+#define SYSCALL(func)           .llong  DOTSYM(sys_##func),DOTSYM(sys_##func)
-#define COMPAT_SYS(func)        .llong  .sys_##func,.compat_sys_##func
+#define COMPAT_SYS(func)        .llong  DOTSYM(sys_##func),DOTSYM(compat_sys_##func)
-#define PPC_SYS(func)           .llong  .ppc_##func,.ppc_##func
+#define PPC_SYS(func)           .llong  DOTSYM(ppc_##func),DOTSYM(ppc_##func)
-#define OLDSYS(func)            .llong  .sys_ni_syscall,.sys_ni_syscall
+#define OLDSYS(func)            .llong  DOTSYM(sys_ni_syscall),DOTSYM(sys_ni_syscall)
-#define SYS32ONLY(func)         .llong  .sys_ni_syscall,.compat_sys_##func
+#define SYS32ONLY(func)         .llong  DOTSYM(sys_ni_syscall),DOTSYM(compat_sys_##func)
-#define SYSX(f, f3264, f32)     .llong  .f,.f3264
+#define SYSX(f, f3264, f32)     .llong  DOTSYM(f),DOTSYM(f3264)
 #else
 #define SYSCALL(func)           .long   sys_##func
 #define COMPAT_SYS(func)        .long   sys_##func
@@ -36,6 +36,8 @@
 #define PPC_SYS_SPU(func)       PPC_SYS(func)
 #define SYSX_SPU(f, f3264, f32) SYSX(f, f3264, f32)
+.section .rodata,"a"
 #ifdef CONFIG_PPC64
 #define sys_sigpending  sys_ni_syscall
 #define sys_old_getrlimit sys_ni_syscall
@@ -43,5 +45,7 @@
        .p2align        3
 #endif
-_GLOBAL(sys_call_table)
+.globl sys_call_table
+sys_call_table:
 #include <asm/systbl.h>
diff --git a/arch/powerpc/kernel/tm.S b/arch/powerpc/kernel/tm.S
index 03567c05950a..2a324f4cb1b9 100644
--- a/arch/powerpc/kernel/tm.S
+++ b/arch/powerpc/kernel/tm.S
@@ -10,6 +10,7 @@
 #include <asm/ppc-opcode.h>
 #include <asm/ptrace.h>
 #include <asm/reg.h>
+#include <asm/bug.h>
 #ifdef CONFIG_VSX
 /* See fpu.S, this is borrowed from there */
@@ -41,7 +42,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_VSX);		\
 /* Stack frame offsets for local variables. */
 #define TM_FRAME_L0     TM_FRAME_SIZE-16
 #define TM_FRAME_L1     TM_FRAME_SIZE-8
-#define STACK_PARAM(x)  (48+((x)*8))
 /* In order to access the TM SPRs, TM must be enabled.  So, do so: */
@@ -78,12 +78,6 @@ _GLOBAL(tm_abort)
        TABORT(R3)
        blr
-        .section        ".toc","aw"
-DSCR_DEFAULT:
-        .tc dscr_default[TC],dscr_default
-        .section        ".text"
 /* void tm_reclaim(struct thread_struct *thread,
 *                 unsigned long orig_msr,
 *                 uint8_t cause)
@@ -108,12 +102,12 @@ _GLOBAL(tm_reclaim)
        mflr    r0
        stw     r6, 8(r1)
        std     r0, 16(r1)
-        std     r2, 40(r1)
+        std     r2, STK_GOT(r1)
        stdu    r1, -TM_FRAME_SIZE(r1)
        /* We've a struct pt_regs at [r1+STACK_FRAME_OVERHEAD]. */
-        std     r3, STACK_PARAM(0)(r1)
+        std     r3, STK_PARAM(R3)(r1)
        SAVE_NVGPRS(r1)
        /* We need to setup MSR for VSX register save instructions.  Here we
@@ -175,6 +169,13 @@ dont_backup_vec:
        stfd    fr0,FPSTATE_FPSCR(r7)
 dont_backup_fp:
+        /* Do sanity check on MSR to make sure we are suspended */
+        li      r7, (MSR_TS_S)@higher
+        srdi    r6, r14, 32
+        and     r6, r6, r7
+1:      tdeqi   r6, 0
+        EMIT_BUG_ENTRY 1b,__FILE__,__LINE__,0
        /* The moment we treclaim, ALL of our GPRs will switch
         * to user register state.  (FPRs, CCR etc. also!)
         * Use an sprg and a tm_scratch in the PACA to shuffle.
@@ -202,7 +203,7 @@ dont_backup_fp:
        /* Now get some more GPRS free */
        std     r7, GPR7(r1)                    /* Temporary stash */
        std     r12, GPR12(r1)                  /* ''   ''    ''   */
-        ld      r12, STACK_PARAM(0)(r1)         /* Param 0, thread_struct * */
+        ld      r12, STK_PARAM(R3)(r1)          /* Param 0, thread_struct * */
        std     r11, THREAD_TM_PPR(r12)         /* Store PPR and free r11 */
@@ -289,11 +290,10 @@ dont_backup_fp:
        ld      r0, 16(r1)
        mtcr    r4
        mtlr    r0
-        ld      r2, 40(r1)
+        ld      r2, STK_GOT(r1)
-        /* Load system default DSCR */
+        /* Load CPU's default DSCR */
-        ld      r4, DSCR_DEFAULT@toc(r2)
+        ld      r0, PACA_DSCR(r13)
-        ld      r0, 0(r4)
        mtspr   SPRN_DSCR, r0
        blr
@@ -312,7 +312,7 @@ _GLOBAL(__tm_recheckpoint)
        mflr    r0
        stw     r5, 8(r1)
        std     r0, 16(r1)
-        std     r2, 40(r1)
+        std     r2, STK_GOT(r1)
        stdu    r1, -TM_FRAME_SIZE(r1)
        /* We've a struct pt_regs at [r1+STACK_FRAME_OVERHEAD].
@@ -320,8 +320,6 @@ _GLOBAL(__tm_recheckpoint)
         */
        SAVE_NVGPRS(r1)
-        std     r1, PACAR1(r13)
        /* Load complete register state from ts_ckpt* registers */
        addi    r7, r3, PT_CKPT_REGS            /* Thread's ckpt_regs */
@@ -385,12 +383,10 @@ restore_gprs:
        /* ******************** CR,LR,CCR,MSR ********** */
        ld      r4, _CTR(r7)
        ld      r5, _LINK(r7)
-        ld      r6, _CCR(r7)
        ld      r8, _XER(r7)
        mtctr   r4
        mtlr    r5
-        mtcr    r6
        mtxer   r8
        /* ******************** TAR ******************** */
@@ -406,7 +402,8 @@ restore_gprs:
        li      r4, 0
        mtmsrd  r4, 1
-        REST_4GPRS(0, r7)                       /* GPR0-3 */
+        REST_GPR(0, r7)                         /* GPR0 */
+        REST_2GPRS(2, r7)                       /* GPR2-3 */
        REST_GPR(4, r7)                         /* GPR4 */
        REST_4GPRS(8, r7)                       /* GPR8-11 */
        REST_2GPRS(12, r7)                      /* GPR12-13 */
@@ -418,6 +415,31 @@ restore_gprs:
        mtspr   SPRN_DSCR, r5
        mtspr   SPRN_PPR, r6
+        /* Do final sanity check on TEXASR to make sure FS is set.  Do this
+         * here before we load up the userspace r1 so any bugs we hit will get
+         * a call chain */
+        mfspr   r5, SPRN_TEXASR
+        srdi    r5, r5, 16
+        li      r6, (TEXASR_FS)@h
+        and     r6, r6, r5
+1:      tdeqi   r6, 0
+        EMIT_BUG_ENTRY 1b,__FILE__,__LINE__,0
+        /* Do final sanity check on MSR to make sure we are not transactional
+         * or suspended
+         */
+        mfmsr   r6
+        li      r5, (MSR_TS_MASK)@higher
+        srdi    r6, r6, 32
+        and     r6, r6, r5
+1:      tdnei   r6, 0
+        EMIT_BUG_ENTRY 1b,__FILE__,__LINE__,0
+        /* Restore CR */
+        ld      r6, _CCR(r7)
+        mtcr    r6
+        REST_GPR(1, r7)                         /* GPR1 */
        REST_GPR(5, r7)                         /* GPR5-7 */
        REST_GPR(6, r7)
        ld      r7, GPR7(r7)
@@ -448,11 +470,10 @@ restore_gprs:
        ld      r0, 16(r1)
        mtcr    r4
        mtlr    r0
-        ld      r2, 40(r1)
+        ld      r2, STK_GOT(r1)
-        /* Load system default DSCR */
+        /* Load CPU's default DSCR */
-        ld      r4, DSCR_DEFAULT@toc(r2)
+        ld      r0, PACA_DSCR(r13)
-        ld      r0, 0(r4)
        mtspr   SPRN_DSCR, r0
        blr