17 files changed, 430 insertions, 89 deletions

diff --git a/arch/powerpc/platforms/chrp/setup.c b/arch/powerpc/platforms/chrp/setup.c
index 4099ddab9205..dda5f2c72c25 100644
--- a/arch/powerpc/platforms/chrp/setup.c
+++ b/arch/powerpc/platforms/chrp/setup.c
@@ -257,6 +257,13 @@ void __init chrp_setup_arch(void)
         if (rtas_token("display-character") >= 0)
                 ppc_md.progress = rtas_progress;
 
+        /* use RTAS time-of-day routines if available */
+        if (rtas_token("get-time-of-day") != RTAS_UNKNOWN_SERVICE) {
+                ppc_md.get_boot_time    = rtas_get_boot_time;
+                ppc_md.get_rtc_time     = rtas_get_rtc_time;
+                ppc_md.set_rtc_time     = rtas_set_rtc_time;
+        }
+
 #ifdef CONFIG_BOOTX_TEXT
         if (ppc_md.progress == NULL && boot_text_mapped)
                 ppc_md.progress = btext_progress;
@@ -505,9 +512,11 @@ void __init chrp_init(void)
         ppc_md.halt           = rtas_halt;
 
         ppc_md.time_init      = chrp_time_init;
+        ppc_md.calibrate_decr = chrp_calibrate_decr;
+
+        /* this may get overridden with rtas routines later... */
         ppc_md.set_rtc_time   = chrp_set_rtc_time;
         ppc_md.get_rtc_time   = chrp_get_rtc_time;
-        ppc_md.calibrate_decr = chrp_calibrate_decr;
 
 #ifdef CONFIG_SMP
         smp_ops = &chrp_smp_ops;
diff --git a/arch/powerpc/platforms/chrp/smp.c b/arch/powerpc/platforms/chrp/smp.c
index bb2315997d45..b616053bc331 100644
--- a/arch/powerpc/platforms/chrp/smp.c
+++ b/arch/powerpc/platforms/chrp/smp.c
@@ -34,6 +34,7 @@
 #include <asm/machdep.h>
 #include <asm/smp.h>
 #include <asm/mpic.h>
+#include <asm/rtas.h>
 
 static void __devinit smp_chrp_kick_cpu(int nr)
 {
diff --git a/arch/powerpc/platforms/chrp/time.c b/arch/powerpc/platforms/chrp/time.c
index 9e53535ddb82..737ee5d9f0aa 100644
--- a/arch/powerpc/platforms/chrp/time.c
+++ b/arch/powerpc/platforms/chrp/time.c
@@ -87,7 +87,6 @@ int chrp_set_rtc_time(struct rtc_time *tmarg)
 
         chrp_cmos_clock_write((save_freq_select|RTC_DIV_RESET2), RTC_FREQ_SELECT);
 
-        tm.tm_year -= 1900;
         if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {
                 BIN_TO_BCD(tm.tm_sec);
                 BIN_TO_BCD(tm.tm_min);
@@ -156,7 +155,7 @@ void chrp_get_rtc_time(struct rtc_time *tm)
                 BCD_TO_BIN(mon);
                 BCD_TO_BIN(year);
         }
-        if ((year += 1900) < 1970)
+        if (year < 70)
                 year += 100;
         tm->tm_sec = sec;
         tm->tm_min = min;
diff --git a/arch/powerpc/platforms/iseries/irq.c b/arch/powerpc/platforms/iseries/irq.c
index 01090e9ce0cf..a58daa153686 100644
--- a/arch/powerpc/platforms/iseries/irq.c
+++ b/arch/powerpc/platforms/iseries/irq.c
@@ -42,13 +42,6 @@
 #include "irq.h"
 #include "call_pci.h"
 
-/* This maps virtual irq numbers to real irqs */
-unsigned int virt_irq_to_real_map[NR_IRQS];
-
-/* The next available virtual irq number */
-/* Note: the pcnet32 driver assumes irq numbers < 2 aren't valid. :( */
-static int next_virtual_irq = 2;
-
 static long Pci_Interrupt_Count;
 static long Pci_Event_Count;
 
@@ -350,26 +343,14 @@ static hw_irq_controller iSeries_IRQ_handler = {
 int __init iSeries_allocate_IRQ(HvBusNumber busNumber,
                 HvSubBusNumber subBusNumber, HvAgentId deviceId)
 {
-        unsigned int realirq, virtirq;
+        int virtirq;
+        unsigned int realirq;
         u8 idsel = (deviceId >> 4);
         u8 function = deviceId & 7;
 
-        virtirq = next_virtual_irq++;
         realirq = ((busNumber - 1) << 6) + ((idsel - 1) << 3) + function;
-        virt_irq_to_real_map[virtirq] = realirq;
+        virtirq = virt_irq_create_mapping(realirq);
 
         irq_desc[virtirq].handler = &iSeries_IRQ_handler;
         return virtirq;
 }
-
-int virt_irq_create_mapping(unsigned int real_irq)
-{
-        BUG(); /* Don't call this on iSeries, yet */
-
-        return 0;
-}
-
-void virt_irq_init(void)
-{
-        return;
-}
diff --git a/arch/powerpc/platforms/iseries/pci.c b/arch/powerpc/platforms/iseries/pci.c
index 4b75131773a6..dafc518fbb83 100644
--- a/arch/powerpc/platforms/iseries/pci.c
+++ b/arch/powerpc/platforms/iseries/pci.c
@@ -244,10 +244,9 @@ unsigned long __init find_and_init_phbs(void)
                 if (ret == 0) {
                         printk("bus %d appears to exist\n", bus);
 
-                        phb = (struct pci_controller *)kmalloc(sizeof(struct pci_controller), GFP_KERNEL);
+                        phb = pcibios_alloc_controller(NULL);
                         if (phb == NULL)
                                 return -ENOMEM;
-                        pci_setup_pci_controller(phb);
 
                         phb->pci_mem_offset = phb->local_number = bus;
                         phb->first_busno = bus;
diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c
index 6a29f301436b..da26639190db 100644
--- a/arch/powerpc/platforms/iseries/setup.c
+++ b/arch/powerpc/platforms/iseries/setup.c
@@ -39,7 +39,6 @@
 #include <asm/sections.h>
 #include <asm/iommu.h>
 #include <asm/firmware.h>
-#include <asm/systemcfg.h>
 #include <asm/system.h>
 #include <asm/time.h>
 #include <asm/paca.h>
@@ -548,8 +547,6 @@ static unsigned long __init build_iSeries_Memory_Map(void)
  */
 static void __init iSeries_setup_arch(void)
 {
-        unsigned procIx = get_paca()->lppaca.dyn_hv_phys_proc_index;
-
         if (get_paca()->lppaca.shared_proc) {
                 ppc_md.idle_loop = iseries_shared_idle;
                 printk(KERN_INFO "Using shared processor idle loop\n");
@@ -565,9 +562,6 @@ static void __init iSeries_setup_arch(void)
                         itVpdAreas.xSlicMaxLogicalProcs);
         printk("Max physical processors = %d\n",
                         itVpdAreas.xSlicMaxPhysicalProcs);
-
-        _systemcfg->processor = xIoHriProcessorVpd[procIx].xPVR;
-        printk("Processor version = %x\n", _systemcfg->processor);
 }
 
 static void iSeries_show_cpuinfo(struct seq_file *m)
diff --git a/arch/powerpc/platforms/maple/pci.c b/arch/powerpc/platforms/maple/pci.c
index 895aeb3f75d0..f40451da037c 100644
--- a/arch/powerpc/platforms/maple/pci.c
+++ b/arch/powerpc/platforms/maple/pci.c
@@ -326,26 +326,12 @@ static int __init add_bridge(struct device_node *dev)
                 dev->full_name);
         }
 
-        hose = alloc_bootmem(sizeof(struct pci_controller));
+        hose = pcibios_alloc_controller(dev);
         if (hose == NULL)
                 return -ENOMEM;
-        pci_setup_pci_controller(hose);
-
-        hose->arch_data = dev;
         hose->first_busno = bus_range ? bus_range[0] : 0;
         hose->last_busno = bus_range ? bus_range[1] : 0xff;
 
-        of_prop = alloc_bootmem(sizeof(struct property) +
-                                sizeof(hose->global_number));
-        if (of_prop) {
-                memset(of_prop, 0, sizeof(struct property));
-                of_prop->name = "linux,pci-domain";
-                of_prop->length = sizeof(hose->global_number);
-                of_prop->value = (unsigned char *)&of_prop[1];
-                memcpy(of_prop->value, &hose->global_number, sizeof(hose->global_number));
-                prom_add_property(dev, of_prop);
-        }
-
         disp_name = NULL;
         if (device_is_compatible(dev, "u3-agp")) {
                 setup_u3_agp(hose);
diff --git a/arch/powerpc/platforms/maple/time.c b/arch/powerpc/platforms/maple/time.c
index 40fc07a8e606..15846cc938ac 100644
--- a/arch/powerpc/platforms/maple/time.c
+++ b/arch/powerpc/platforms/maple/time.c
@@ -158,6 +158,11 @@ int maple_set_rtc_time(struct rtc_time *tm)
         return 0;
 }
 
+static struct resource rtc_iores = {
+        .name = "rtc",
+        .flags = IORESOURCE_BUSY,
+};
+
 unsigned long __init maple_get_boot_time(void)
 {
         struct rtc_time tm;
@@ -172,7 +177,11 @@ unsigned long __init maple_get_boot_time(void)
                 printk(KERN_INFO "Maple: No device node for RTC, assuming "
                        "legacy address (0x%x)\n", maple_rtc_addr);
         }
-        
+
+        rtc_iores.start = maple_rtc_addr;
+        rtc_iores.end = maple_rtc_addr + 7;
+        request_resource(&ioport_resource, &rtc_iores);
+
         maple_get_rtc_time(&tm);
         return mktime(tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday,
                       tm.tm_hour, tm.tm_min, tm.tm_sec);
diff --git a/arch/powerpc/platforms/powermac/feature.c b/arch/powerpc/platforms/powermac/feature.c
index 10f1d942c661..0d7fa00fcb00 100644
--- a/arch/powerpc/platforms/powermac/feature.c
+++ b/arch/powerpc/platforms/powermac/feature.c
@@ -2362,6 +2362,14 @@ static struct pmac_mb_def pmac_mb_defs[] = {
                 PMAC_TYPE_UNKNOWN_INTREPID,     intrepid_features,
                 PMAC_MB_MAY_SLEEP | PMAC_MB_HAS_FW_POWER | PMAC_MB_MOBILE,
         },
+        {       "PowerBook5,8",                 "PowerBook G4 15\"",
+                PMAC_TYPE_UNKNOWN_INTREPID,     intrepid_features,
+                PMAC_MB_MAY_SLEEP | PMAC_MB_HAS_FW_POWER | PMAC_MB_MOBILE,
+        },
+        {       "PowerBook5,9",                 "PowerBook G4 17\"",
+                PMAC_TYPE_UNKNOWN_INTREPID,     intrepid_features,
+                PMAC_MB_MAY_SLEEP | PMAC_MB_HAS_FW_POWER | PMAC_MB_MOBILE,
+        },
         {       "PowerBook6,1",                 "PowerBook G4 12\"",
                 PMAC_TYPE_UNKNOWN_INTREPID,     intrepid_features,
                 PMAC_MB_MAY_SLEEP | PMAC_MB_HAS_FW_POWER | PMAC_MB_MOBILE,
diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c
index dfd41b9781a9..443be526cde7 100644
--- a/arch/powerpc/platforms/powermac/pci.c
+++ b/arch/powerpc/platforms/powermac/pci.c
@@ -640,15 +640,16 @@ static void __init setup_u3_ht(struct pci_controller* hose)
          * the reg address cell, we shall fix that by killing struct
          * reg_property and using some accessor functions instead
          */
-        hose->cfg_data = (volatile unsigned char *)ioremap(0xf2000000, 0x02000000);
+        hose->cfg_data = (volatile unsigned char *)ioremap(0xf2000000,
+                                                           0x02000000);
 
         /*
-         * /ht node doesn't expose a "ranges" property, so we "remove" regions that
-         * have been allocated to AGP. So far, this version of the code doesn't assign
-         * any of the 0xfxxxxxxx "fine" memory regions to /ht.
-         * We need to fix that sooner or later by either parsing all child "ranges"
-         * properties or figuring out the U3 address space decoding logic and
-         * then read its configuration register (if any).
+         * /ht node doesn't expose a "ranges" property, so we "remove"
+         * regions that have been allocated to AGP. So far, this version of
+         * the code doesn't assign any of the 0xfxxxxxxx "fine" memory regions
+         * to /ht. We need to fix that sooner or later by either parsing all
+         * child "ranges" properties or figuring out the U3 address space
+         * decoding logic and then read its configuration register (if any).
          */
         hose->io_base_phys = 0xf4000000;
         hose->pci_io_size = 0x00400000;
@@ -671,10 +672,10 @@ static void __init setup_u3_ht(struct pci_controller* hose)
                 return;
         }
 
-        /* We "remove" the AGP resources from the resources allocated to HT, that
-         * is we create "holes". However, that code does assumptions that so far
-         * happen to be true (cross fingers...), typically that resources in the
-         * AGP node are properly ordered
+        /* We "remove" the AGP resources from the resources allocated to HT,
+         * that is we create "holes". However, that code does assumptions
+         * that so far happen to be true (cross fingers...), typically that
+         * resources in the AGP node are properly ordered
          */
         cur = 0;
         for (i=0; i<3; i++) {
@@ -684,23 +685,30 @@ static void __init setup_u3_ht(struct pci_controller* hose)
                 /* We don't care about "fine" resources */
                 if (res->start >= 0xf0000000)
                         continue;
-                /* Check if it's just a matter of "shrinking" us in one direction */
+                /* Check if it's just a matter of "shrinking" us in one
+                 * direction
+                 */
                 if (hose->mem_resources[cur].start == res->start) {
                         DBG("U3/HT: shrink start of %d, %08lx -> %08lx\n",
-                            cur, hose->mem_resources[cur].start, res->end + 1);
+                            cur, hose->mem_resources[cur].start,
+                            res->end + 1);
                         hose->mem_resources[cur].start = res->end + 1;
                         continue;
                 }
                 if (hose->mem_resources[cur].end == res->end) {
                         DBG("U3/HT: shrink end of %d, %08lx -> %08lx\n",
-                            cur, hose->mem_resources[cur].end, res->start - 1);
+                            cur, hose->mem_resources[cur].end,
+                            res->start - 1);
                         hose->mem_resources[cur].end = res->start - 1;
                         continue;
                 }
                 /* No, it's not the case, we need a hole */
                 if (cur == 2) {
-                        /* not enough resources for a hole, we drop part of the range */
-                        printk(KERN_WARNING "Running out of resources for /ht host !\n");
+                        /* not enough resources for a hole, we drop part
+                         * of the range
+                         */
+                        printk(KERN_WARNING "Running out of resources"
+                               " for /ht host !\n");
                         hose->mem_resources[cur].end = res->start - 1;
                         continue;
                 }
@@ -714,17 +722,6 @@ static void __init setup_u3_ht(struct pci_controller* hose)
                 hose->mem_resources[cur-1].end = res->start - 1;
         }
 }
-
-/* XXX this needs to be converged between ppc32 and ppc64... */
-static struct pci_controller * __init pcibios_alloc_controller(void)
-{
-        struct pci_controller *hose;
-
-        hose = alloc_bootmem(sizeof(struct pci_controller));
-        if (hose)
-                pci_setup_pci_controller(hose);
-        return hose;
-}
 #endif
 
 /*
@@ -756,11 +753,16 @@ static int __init add_bridge(struct device_node *dev)
 #endif
         bus_range = (int *) get_property(dev, "bus-range", &len);
         if (bus_range == NULL || len < 2 * sizeof(int)) {
-                printk(KERN_WARNING "Can't get bus-range for %s, assume bus 0\n",
-                               dev->full_name);
+                printk(KERN_WARNING "Can't get bus-range for %s, assume"
+                       " bus 0\n", dev->full_name);
         }
 
+        /* XXX Different prototypes, to be merged */
+#ifdef CONFIG_PPC64
+        hose = pcibios_alloc_controller(dev);
+#else
         hose = pcibios_alloc_controller();
+#endif
         if (!hose)
                 return -ENOMEM;
         hose->arch_data = dev;
@@ -768,7 +770,7 @@ static int __init add_bridge(struct device_node *dev)
         hose->last_busno = bus_range ? bus_range[1] : 0xff;
 
         disp_name = NULL;
-#ifdef CONFIG_POWER4
+#ifdef CONFIG_PPC64
         if (device_is_compatible(dev, "u3-agp")) {
                 setup_u3_agp(hose);
                 disp_name = "U3-AGP";
diff --git a/arch/powerpc/platforms/powermac/time.c b/arch/powerpc/platforms/powermac/time.c
index 5947b21a8588..feb0a94e7819 100644
--- a/arch/powerpc/platforms/powermac/time.c
+++ b/arch/powerpc/platforms/powermac/time.c
@@ -102,7 +102,7 @@ static unsigned long from_rtc_time(struct rtc_time *tm)
 static unsigned long cuda_get_time(void)
 {
         struct adb_request req;
-        unsigned long now;
+        unsigned int now;
 
         if (cuda_request(&req, NULL, 2, CUDA_PACKET, CUDA_GET_TIME) < 0)
                 return 0;
@@ -113,7 +113,7 @@ static unsigned long cuda_get_time(void)
                        req.reply_len);
         now = (req.reply[3] << 24) + (req.reply[4] << 16)
                 + (req.reply[5] << 8) + req.reply[6];
-        return now - RTC_OFFSET;
+        return ((unsigned long)now) - RTC_OFFSET;
 }
 
 #define cuda_get_rtc_time(tm)   to_rtc_time(cuda_get_time(), (tm))
@@ -146,7 +146,7 @@ static int cuda_set_rtc_time(struct rtc_time *tm)
 static unsigned long pmu_get_time(void)
 {
         struct adb_request req;
-        unsigned long now;
+        unsigned int now;
 
         if (pmu_request(&req, NULL, 1, PMU_READ_RTC) < 0)
                 return 0;
@@ -156,7 +156,7 @@ static unsigned long pmu_get_time(void)
                        req.reply_len);
         now = (req.reply[0] << 24) + (req.reply[1] << 16)
                 + (req.reply[2] << 8) + req.reply[3];
-        return now - RTC_OFFSET;
+        return ((unsigned long)now) - RTC_OFFSET;
 }
 
 #define pmu_get_rtc_time(tm)    to_rtc_time(pmu_get_time(), (tm))
@@ -199,6 +199,7 @@ static unsigned long smu_get_time(void)
 #define smu_set_rtc_time(tm, spin)      0
 #endif
 
+/* Can't be __init, it's called when suspending and resuming */
 unsigned long pmac_get_boot_time(void)
 {
         /* Get the time from the RTC, used only at boot time */
diff --git a/arch/powerpc/platforms/pseries/Makefile b/arch/powerpc/platforms/pseries/Makefile
index e7ca5b1f591e..06d5ef501218 100644
--- a/arch/powerpc/platforms/pseries/Makefile
+++ b/arch/powerpc/platforms/pseries/Makefile
@@ -4,4 +4,7 @@ obj-$(CONFIG_SMP)	+= smp.o
 obj-$(CONFIG_IBMVIO)    += vio.o
 obj-$(CONFIG_XICS)      += xics.o
 obj-$(CONFIG_SCANLOG)   += scanlog.o
-obj-$(CONFIG_EEH)    += eeh.o eeh_event.o
+obj-$(CONFIG_EEH)       += eeh.o eeh_event.o
+
+obj-$(CONFIG_HVC_CONSOLE)       += hvconsole.o
+obj-$(CONFIG_HVCS)              += hvcserver.o
diff --git a/arch/powerpc/platforms/pseries/eeh.c b/arch/powerpc/platforms/pseries/eeh.c
index 79de2310e70b..c8d2a40dc5b4 100644
--- a/arch/powerpc/platforms/pseries/eeh.c
+++ b/arch/powerpc/platforms/pseries/eeh.c
@@ -86,7 +86,8 @@ static int ibm_read_slot_reset_state;
 static int ibm_read_slot_reset_state2;
 static int ibm_slot_error_detail;
 
-static int eeh_subsystem_enabled;
+int eeh_subsystem_enabled;
+EXPORT_SYMBOL(eeh_subsystem_enabled);
 
 /* Lock to avoid races due to multiple reports of an error */
 static DEFINE_SPINLOCK(confirm_error_lock);
diff --git a/arch/powerpc/platforms/pseries/hvconsole.c b/arch/powerpc/platforms/pseries/hvconsole.c
new file mode 100644
index 000000000000..138e128a3886
--- /dev/null
+++ b/arch/powerpc/platforms/pseries/hvconsole.c
@@ -0,0 +1,74 @@
+/*
+ * hvconsole.c
+ * Copyright (C) 2004 Hollis Blanchard, IBM Corporation
+ * Copyright (C) 2004 IBM Corporation
+ *
+ * Additional Author(s):
+ *  Ryan S. Arnold <rsa@us.ibm.com>
+ *
+ * LPAR console support.
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <asm/hvcall.h>
+#include <asm/hvconsole.h>
+
+/**
+ * hvc_get_chars - retrieve characters from firmware for denoted vterm adatper
+ * @vtermno: The vtermno or unit_address of the adapter from which to fetch the
+ *      data.
+ * @buf: The character buffer into which to put the character data fetched from
+ *      firmware.
+ * @count: not used?
+ */
+int hvc_get_chars(uint32_t vtermno, char *buf, int count)
+{
+        unsigned long got;
+
+        if (plpar_hcall(H_GET_TERM_CHAR, vtermno, 0, 0, 0, &got,
+                (unsigned long *)buf, (unsigned long *)buf+1) == H_Success)
+                return got;
+        return 0;
+}
+
+EXPORT_SYMBOL(hvc_get_chars);
+
+
+/**
+ * hvc_put_chars: send characters to firmware for denoted vterm adapter
+ * @vtermno: The vtermno or unit_address of the adapter from which the data
+ *      originated.
+ * @buf: The character buffer that contains the character data to send to
+ *      firmware.
+ * @count: Send this number of characters.
+ */
+int hvc_put_chars(uint32_t vtermno, const char *buf, int count)
+{
+        unsigned long *lbuf = (unsigned long *) buf;
+        long ret;
+
+        ret = plpar_hcall_norets(H_PUT_TERM_CHAR, vtermno, count, lbuf[0],
+                                 lbuf[1]);
+        if (ret == H_Success)
+                return count;
+        if (ret == H_Busy)
+                return 0;
+        return -EIO;
+}
+
+EXPORT_SYMBOL(hvc_put_chars);
diff --git a/arch/powerpc/platforms/pseries/hvcserver.c b/arch/powerpc/platforms/pseries/hvcserver.c
new file mode 100644
index 000000000000..4d584172055a
--- /dev/null
+++ b/arch/powerpc/platforms/pseries/hvcserver.c
@@ -0,0 +1,251 @@
+/*
+ * hvcserver.c
+ * Copyright (C) 2004 Ryan S Arnold, IBM Corporation
+ *
+ * PPC64 virtual I/O console server support.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ */
+
+#include <linux/kernel.h>
+#include <linux/list.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+
+#include <asm/hvcall.h>
+#include <asm/hvcserver.h>
+#include <asm/io.h>
+
+#define HVCS_ARCH_VERSION "1.0.0"
+
+MODULE_AUTHOR("Ryan S. Arnold <rsa@us.ibm.com>");
+MODULE_DESCRIPTION("IBM hvcs ppc64 API");
+MODULE_LICENSE("GPL");
+MODULE_VERSION(HVCS_ARCH_VERSION);
+
+/*
+ * Convert arch specific return codes into relevant errnos.  The hvcs
+ * functions aren't performance sensitive, so this conversion isn't an
+ * issue.
+ */
+int hvcs_convert(long to_convert)
+{
+        switch (to_convert) {
+                case H_Success:
+                        return 0;
+                case H_Parameter:
+                        return -EINVAL;
+                case H_Hardware:
+                        return -EIO;
+                case H_Busy:
+                case H_LongBusyOrder1msec:
+                case H_LongBusyOrder10msec:
+                case H_LongBusyOrder100msec:
+                case H_LongBusyOrder1sec:
+                case H_LongBusyOrder10sec:
+                case H_LongBusyOrder100sec:
+                        return -EBUSY;
+                case H_Function: /* fall through */
+                default:
+                        return -EPERM;
+        }
+}
+
+/**
+ * hvcs_free_partner_info - free pi allocated by hvcs_get_partner_info
+ * @head: list_head pointer for an allocated list of partner info structs to
+ *      free.
+ *
+ * This function is used to free the partner info list that was returned by
+ * calling hvcs_get_partner_info().
+ */
+int hvcs_free_partner_info(struct list_head *head)
+{
+        struct hvcs_partner_info *pi;
+        struct list_head *element;
+
+        if (!head)
+                return -EINVAL;
+
+        while (!list_empty(head)) {
+                element = head->next;
+                pi = list_entry(element, struct hvcs_partner_info, node);
+                list_del(element);
+                kfree(pi);
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL(hvcs_free_partner_info);
+
+/* Helper function for hvcs_get_partner_info */
+int hvcs_next_partner(uint32_t unit_address,
+                unsigned long last_p_partition_ID,
+                unsigned long last_p_unit_address, unsigned long *pi_buff)
+
+{
+        long retval;
+        retval = plpar_hcall_norets(H_VTERM_PARTNER_INFO, unit_address,
+                        last_p_partition_ID,
+                                last_p_unit_address, virt_to_phys(pi_buff));
+        return hvcs_convert(retval);
+}
+
+/**
+ * hvcs_get_partner_info - Get all of the partner info for a vty-server adapter
+ * @unit_address: The unit_address of the vty-server adapter for which this
+ *      function is fetching partner info.
+ * @head: An initialized list_head pointer to an empty list to use to return the
+ *      list of partner info fetched from the hypervisor to the caller.
+ * @pi_buff: A page sized buffer pre-allocated prior to calling this function
+ *      that is to be used to be used by firmware as an iterator to keep track
+ *      of the partner info retrieval.
+ *
+ * This function returns non-zero on success, or if there is no partner info.
+ *
+ * The pi_buff is pre-allocated prior to calling this function because this
+ * function may be called with a spin_lock held and kmalloc of a page is not
+ * recommended as GFP_ATOMIC.
+ *
+ * The first long of this buffer is used to store a partner unit address.  The
+ * second long is used to store a partner partition ID and starting at
+ * pi_buff[2] is the 79 character Converged Location Code (diff size than the
+ * unsigned longs, hence the casting mumbo jumbo you see later).
+ *
+ * Invocation of this function should always be followed by an invocation of
+ * hvcs_free_partner_info() using a pointer to the SAME list head instance
+ * that was passed as a parameter to this function.
+ */
+int hvcs_get_partner_info(uint32_t unit_address, struct list_head *head,
+                unsigned long *pi_buff)
+{
+        /*
+         * Dealt with as longs because of the hcall interface even though the
+         * values are uint32_t.
+         */
+        unsigned long   last_p_partition_ID;
+        unsigned long   last_p_unit_address;
+        struct hvcs_partner_info *next_partner_info = NULL;
+        int more = 1;
+        int retval;
+
+        memset(pi_buff, 0x00, PAGE_SIZE);
+        /* invalid parameters */
+        if (!head || !pi_buff)
+                return -EINVAL;
+
+        last_p_partition_ID = last_p_unit_address = ~0UL;
+        INIT_LIST_HEAD(head);
+
+        do {
+                retval = hvcs_next_partner(unit_address, last_p_partition_ID,
+                                last_p_unit_address, pi_buff);
+                if (retval) {
+                        /*
+                         * Don't indicate that we've failed if we have
+                         * any list elements.
+                         */
+                        if (!list_empty(head))
+                                return 0;
+                        return retval;
+                }
+
+                last_p_partition_ID = pi_buff[0];
+                last_p_unit_address = pi_buff[1];
+
+                /* This indicates that there are no further partners */
+                if (last_p_partition_ID == ~0UL
+                                && last_p_unit_address == ~0UL)
+                        break;
+
+                /* This is a very small struct and will be freed soon in
+                 * hvcs_free_partner_info(). */
+                next_partner_info = kmalloc(sizeof(struct hvcs_partner_info),
+                                GFP_ATOMIC);
+
+                if (!next_partner_info) {
+                        printk(KERN_WARNING "HVCONSOLE: kmalloc() failed to"
+                                " allocate partner info struct.\n");
+                        hvcs_free_partner_info(head);
+                        return -ENOMEM;
+                }
+
+                next_partner_info->unit_address
+                        = (unsigned int)last_p_unit_address;
+                next_partner_info->partition_ID
+                        = (unsigned int)last_p_partition_ID;
+
+                /* copy the Null-term char too */
+                strncpy(&next_partner_info->location_code[0],
+                        (char *)&pi_buff[2],
+                        strlen((char *)&pi_buff[2]) + 1);
+
+                list_add_tail(&(next_partner_info->node), head);
+                next_partner_info = NULL;
+
+        } while (more);
+
+        return 0;
+}
+EXPORT_SYMBOL(hvcs_get_partner_info);
+
+/**
+ * hvcs_register_connection - establish a connection between this vty-server and
+ *      a vty.
+ * @unit_address: The unit address of the vty-server adapter that is to be
+ *      establish a connection.
+ * @p_partition_ID: The partition ID of the vty adapter that is to be connected.
+ * @p_unit_address: The unit address of the vty adapter to which the vty-server
+ *      is to be connected.
+ *
+ * If this function is called once and -EINVAL is returned it may
+ * indicate that the partner info needs to be refreshed for the
+ * target unit address at which point the caller must invoke
+ * hvcs_get_partner_info() and then call this function again.  If,
+ * for a second time, -EINVAL is returned then it indicates that
+ * there is probably already a partner connection registered to a
+ * different vty-server adapter.  It is also possible that a second
+ * -EINVAL may indicate that one of the parms is not valid, for
+ * instance if the link was removed between the vty-server adapter
+ * and the vty adapter that you are trying to open.  Don't shoot the
+ * messenger.  Firmware implemented it this way.
+ */
+int hvcs_register_connection( uint32_t unit_address,
+                uint32_t p_partition_ID, uint32_t p_unit_address)
+{
+        long retval;
+        retval = plpar_hcall_norets(H_REGISTER_VTERM, unit_address,
+                                p_partition_ID, p_unit_address);
+        return hvcs_convert(retval);
+}
+EXPORT_SYMBOL(hvcs_register_connection);
+
+/**
+ * hvcs_free_connection - free the connection between a vty-server and vty
+ * @unit_address: The unit address of the vty-server that is to have its
+ *      connection severed.
+ *
+ * This function is used to free the partner connection between a vty-server
+ * adapter and a vty adapter.
+ *
+ * If -EBUSY is returned continue to call this function until 0 is returned.
+ */
+int hvcs_free_connection(uint32_t unit_address)
+{
+        long retval;
+        retval = plpar_hcall_norets(H_FREE_VTERM, unit_address);
+        return hvcs_convert(retval);
+}
+EXPORT_SYMBOL(hvcs_free_connection);
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index 31990829310c..4a465f067ede 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -200,14 +200,12 @@ static void __init pSeries_setup_arch(void)
         if (ppc64_interrupt_controller == IC_OPEN_PIC) {
                 ppc_md.init_IRQ       = pSeries_init_mpic;
                 ppc_md.get_irq        = mpic_get_irq;
-                ppc_md.cpu_irq_down   = mpic_teardown_this_cpu;
                 /* Allocate the mpic now, so that find_and_init_phbs() can
                  * fill the ISUs */
                 pSeries_setup_mpic();
         } else {
                 ppc_md.init_IRQ       = xics_init_IRQ;
                 ppc_md.get_irq        = xics_get_irq;
-                ppc_md.cpu_irq_down   = xics_teardown_cpu;
         }
 
 #ifdef CONFIG_SMP
@@ -506,7 +504,7 @@ static void pseries_dedicated_idle(void)
                 lpaca->lppaca.idle = 1;
 
                 if (!need_resched()) {
-                        start_snooze = __get_tb() +
+                        start_snooze = get_tb() +
                                 *smt_snooze_delay * tb_ticks_per_usec;
 
                         while (!need_resched() && !cpu_is_offline(cpu)) {
@@ -520,7 +518,7 @@ static void pseries_dedicated_idle(void)
                                 HMT_very_low();
 
                                 if (*smt_snooze_delay != 0 &&
-                                    __get_tb() > start_snooze) {
+                                    get_tb() > start_snooze) {
                                         HMT_medium();
                                         dedicated_idle_sleep(cpu);
                                 }
@@ -595,6 +593,27 @@ static int pSeries_pci_probe_mode(struct pci_bus *bus)
         return PCI_PROBE_NORMAL;
 }
 
+#ifdef CONFIG_KEXEC
+static void pseries_kexec_cpu_down(int crash_shutdown, int secondary)
+{
+        /* Don't risk a hypervisor call if we're crashing */
+        if (!crash_shutdown) {
+                unsigned long vpa = __pa(&get_paca()->lppaca);
+
+                if (unregister_vpa(hard_smp_processor_id(), vpa)) {
+                        printk("VPA deregistration of cpu %u (hw_cpu_id %d) "
+                                        "failed\n", smp_processor_id(),
+                                        hard_smp_processor_id());
+                }
+        }
+
+        if (ppc64_interrupt_controller == IC_OPEN_PIC)
+                mpic_teardown_this_cpu(secondary);
+        else
+                xics_teardown_cpu(secondary);
+}
+#endif
+
 struct machdep_calls __initdata pSeries_md = {
         .probe                  = pSeries_probe,
         .setup_arch             = pSeries_setup_arch,
@@ -617,4 +636,7 @@ struct machdep_calls __initdata pSeries_md = {
         .check_legacy_ioport    = pSeries_check_legacy_ioport,
         .system_reset_exception = pSeries_system_reset_exception,
         .machine_check_exception = pSeries_machine_check_exception,
+#ifdef CONFIG_KEXEC
+        .kexec_cpu_down         = pseries_kexec_cpu_down,
+#endif
 };
diff --git a/arch/powerpc/platforms/pseries/smp.c b/arch/powerpc/platforms/pseries/smp.c
index 5800cde7d5ad..25181c594d73 100644
--- a/arch/powerpc/platforms/pseries/smp.c
+++ b/arch/powerpc/platforms/pseries/smp.c
@@ -51,6 +51,7 @@
 #include "plpar_wrappers.h"
 
 #ifdef DEBUG
+#include <asm/udbg.h>
 #define DBG(fmt...) udbg_printf(fmt)
 #else
 #define DBG(fmt...)