Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

Pull powerpc update from Benjamin Herrenschmidt:
 "The main highlights this time around are:

   - A pile of addition POWER8 bits and nits, such as updated
     performance counter support (Michael Ellerman), new branch history
     buffer support (Anshuman Khandual), base support for the new PCI
     host bridge when not using the hypervisor (Gavin Shan) and other
     random related bits and fixes from various contributors.

   - Some rework of our page table format by Aneesh Kumar which fixes a
     thing or two and paves the way for THP support.  THP itself will
     not make it this time around however.

   - More Freescale updates, including Altivec support on the new e6500
     cores, new PCI controller support, and a pile of new boards support
     and updates.

   - The usual batch of trivial cleanups & fixes"

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (156 commits)
  powerpc: Fix build error for book3e
  powerpc: Context switch the new EBB SPRs
  powerpc: Turn on the EBB H/FSCR bits
  powerpc: Replace CPU_FTR_BCTAR with CPU_FTR_ARCH_207S
  powerpc: Setup BHRB instructions facility in HFSCR for POWER8
  powerpc: Fix interrupt range check on debug exception
  powerpc: Update tlbie/tlbiel as per ISA doc
  powerpc: Print page size info during boot
  powerpc: print both base and actual page size on hash failure
  powerpc: Fix hpte_decode to use the correct decoding for page sizes
  powerpc: Decode the pte-lp-encoding bits correctly.
  powerpc: Use encode avpn where we need only avpn values
  powerpc: Reduce PTE table memory wastage
  powerpc: Move the pte free routines from common header
  powerpc: Reduce the PTE_INDEX_SIZE
  powerpc: Switch 16GB and 16MB explicit hugepages to a different page table format
  powerpc: New hugepage directory format
  powerpc: Don't truncate pgd_index wrongly
  powerpc: Don't hard code the size of pte page
  powerpc: Save DAR and DSISR in pt_regs on MCE
  ...

5 files changed, 18 insertions, 66 deletions

diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
index 9c6b96414862..b3b2d36c009e 100644
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@ -120,11 +120,7 @@ static void smu_start_cmd(void)
 
         DPRINTK("SMU: starting cmd %x, %d bytes data\n", cmd->cmd,
                 cmd->data_len);
-        DPRINTK("SMU: data buffer: %02x %02x %02x %02x %02x %02x %02x %02x\n",
-                ((u8 *)cmd->data_buf)[0], ((u8 *)cmd->data_buf)[1],
-                ((u8 *)cmd->data_buf)[2], ((u8 *)cmd->data_buf)[3],
-                ((u8 *)cmd->data_buf)[4], ((u8 *)cmd->data_buf)[5],
-                ((u8 *)cmd->data_buf)[6], ((u8 *)cmd->data_buf)[7]);
+        DPRINTK("SMU: data buffer: %8ph\n", cmd->data_buf);
 
         /* Fill the SMU command buffer */
         smu->cmd_buf->cmd = cmd->cmd;
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index c31fbab6aa82..283e1b53c6be 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -750,8 +750,9 @@ done_battery_state_smart(struct adb_request* req)
                                 voltage = (req->reply[8] << 8) | req->reply[9];
                                 break;
                         default:
-                                printk(KERN_WARNING "pmu.c : unrecognized battery info, len: %d, %02x %02x %02x %02x\n",
-                                        req->reply_len, req->reply[0], req->reply[1], req->reply[2], req->reply[3]);
+                                pr_warn("pmu.c: unrecognized battery info, "
+                                        "len: %d, %4ph\n", req->reply_len,
+                                                           req->reply);
                                 break;
                 }
         }
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 43ece5d41d36..631aeb7d2d2d 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -990,7 +990,6 @@ int pci_setup_device(struct pci_dev *dev)
         dev->sysdata = dev->bus->sysdata;
         dev->dev.parent = dev->bus->bridge;
         dev->dev.bus = &pci_bus_type;
-        dev->dev.type = &pci_dev_type;
         dev->hdr_type = hdr_type & 0x7f;
         dev->multifunction = !!(hdr_type & 0x80);
         dev->error_state = pci_channel_io_normal;
@@ -1210,6 +1209,7 @@ struct pci_dev *alloc_pci_dev(void)
                 return NULL;
 
         INIT_LIST_HEAD(&dev->bus_list);
+        dev->dev.type = &pci_dev_type;
 
         return dev;
 }
diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
index 5d66e5585f97..9b86a01af631 100644
--- a/drivers/pnp/pnpbios/core.c
+++ b/drivers/pnp/pnpbios/core.c
@@ -513,10 +513,6 @@ static int __init pnpbios_init(void)
 {
         int ret;
 
-#if defined(CONFIG_PPC)
-        if (check_legacy_ioport(PNPBIOS_BASE))
-                return -ENODEV;
-#endif
         if (pnpbios_disabled || dmi_check_system(pnpbios_dmi_table) ||
             paravirt_enabled()) {
                 printk(KERN_INFO "PnPBIOS: Disabled\n");
@@ -570,10 +566,7 @@ fs_initcall(pnpbios_init);
 static int __init pnpbios_thread_init(void)
 {
         struct task_struct *task;
-#if defined(CONFIG_PPC)
-        if (check_legacy_ioport(PNPBIOS_BASE))
-                return 0;
-#endif
+
         if (pnpbios_disabled)
                 return 0;
 
diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c
index c3dbbe6e3acf..97db3ba8f237 100644
--- a/drivers/video/cirrusfb.c
+++ b/drivers/video/cirrusfb.c
@@ -53,12 +53,6 @@
 #ifdef CONFIG_AMIGA
 #include <asm/amigahw.h>
 #endif
-#ifdef CONFIG_PPC_PREP
-#include <asm/machdep.h>
-#define isPReP machine_is(prep)
-#else
-#define isPReP 0
-#endif
 
 #include <video/vga.h>
 #include <video/cirrus.h>
@@ -557,30 +551,18 @@ static int cirrusfb_check_var(struct fb_var_screeninfo *var,
                 break;
 
         case 16:
-                if (isPReP) {
-                        var->red.offset = 2;
-                        var->green.offset = -3;
-                        var->blue.offset = 8;
-                } else {
-                        var->red.offset = 11;
-                        var->green.offset = 5;
-                        var->blue.offset = 0;
-                }
+                var->red.offset = 11;
+                var->green.offset = 5;
+                var->blue.offset = 0;
                 var->red.length = 5;
                 var->green.length = 6;
                 var->blue.length = 5;
                 break;
 
         case 24:
-                if (isPReP) {
-                        var->red.offset = 0;
-                        var->green.offset = 8;
-                        var->blue.offset = 16;
-                } else {
-                        var->red.offset = 16;
-                        var->green.offset = 8;
-                        var->blue.offset = 0;
-                }
+                var->red.offset = 16;
+                var->green.offset = 8;
+                var->blue.offset = 0;
                 var->red.length = 8;
                 var->green.length = 8;
                 var->blue.length = 8;
@@ -1874,17 +1856,6 @@ static void cirrusfb_imageblit(struct fb_info *info,
         }
 }
 
-#ifdef CONFIG_PPC_PREP
-#define PREP_VIDEO_BASE ((volatile unsigned long) 0xC0000000)
-#define PREP_IO_BASE    ((volatile unsigned char *) 0x80000000)
-static void get_prep_addrs(unsigned long *display, unsigned long *registers)
-{
-        *display = PREP_VIDEO_BASE;
-        *registers = (unsigned long) PREP_IO_BASE;
-}
-
-#endif                          /* CONFIG_PPC_PREP */
-
 #ifdef CONFIG_PCI
 static int release_io_ports;
 
@@ -2139,21 +2110,12 @@ static int cirrusfb_pci_register(struct pci_dev *pdev,
         dev_dbg(info->device, " base address 1 is 0x%Lx\n",
                 (unsigned long long)pdev->resource[1].start);
 
-        if (isPReP) {
-                pci_write_config_dword(pdev, PCI_BASE_ADDRESS_0, 0x00000000);
-#ifdef CONFIG_PPC_PREP
-                get_prep_addrs(&board_addr, &info->fix.mmio_start);
-#endif
-        /* PReP dies if we ioremap the IO registers, but it works w/out... */
-                cinfo->regbase = (char __iomem *) info->fix.mmio_start;
-        } else {
-                dev_dbg(info->device,
-                        "Attempt to get PCI info for Cirrus Graphics Card\n");
-                get_pci_addrs(pdev, &board_addr, &info->fix.mmio_start);
-                /* FIXME: this forces VGA.  alternatives? */
-                cinfo->regbase = NULL;
-                cinfo->laguna_mmio = ioremap(info->fix.mmio_start, 0x1000);
-        }
+        dev_dbg(info->device,
+                "Attempt to get PCI info for Cirrus Graphics Card\n");
+        get_pci_addrs(pdev, &board_addr, &info->fix.mmio_start);
+        /* FIXME: this forces VGA.  alternatives? */
+        cinfo->regbase = NULL;
+        cinfo->laguna_mmio = ioremap(info->fix.mmio_start, 0x1000);
 
         dev_dbg(info->device, "Board address: 0x%lx, register address: 0x%lx\n",
                 board_addr, info->fix.mmio_start);