Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SERIAL] sunsu: Fix section mismatch warnings.
  [SPARC64]: pgtable_cache_init() should be __init.
  [SPARC64]: Fix section mismatch warnings in arch/sparc64/kernel/prom.c
  [SPARC64]: Fix section mismatch warnings in arch/sparc64/kernel/pci.c
  [SPARC64]: Fix section mismatch warnings in arch/sparc64/kernel/console.c
  [MM]: sparse_init() should be __init.
  [SPARC64]: Update defconfig.
  [VIDEO]: Add Sun XVR-2500 framebuffer driver.
  [VIDEO]: Add Sun XVR-500 framebuffer driver.
  [SPARC64]: SUN4U PCI-E controller support.
  [SPARC]: Fix comment typo in smp4m_blackbox_current().
  [SCSI] SUNESP: sun_esp.c needs linux/delay.h

Fix up conflict in arch/sparc64/mm/init.c manually due to removal of
pgtable_cache_init() through the -mm patches (even though that patch was
also by David ;)

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

8 files changed, 609 insertions, 75 deletions

diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig
index 120c9c33b7a6..37c2d3695658 100644
--- a/arch/sparc64/defconfig
+++ b/arch/sparc64/defconfig
@@ -1,15 +1,16 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-rc4
-# Sat Mar 17 14:18:44 2007
+# Linux kernel version: 2.6.21
+# Sun May  6 22:46:54 2007
 #
 CONFIG_SPARC=y
 CONFIG_SPARC64=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_64BIT=y
 CONFIG_MMU=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_TIME_INTERPOLATION=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
@@ -108,6 +109,9 @@ CONFIG_GENERIC_HARDIRQS=y
 #
 # General machine setup
 #
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
 # CONFIG_SMP is not set
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_TABLE=m
@@ -140,8 +144,7 @@ CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_SPARSEMEM_MANUAL=y
 CONFIG_SPARSEMEM=y
 CONFIG_HAVE_MEMORY_PRESENT=y
-# CONFIG_SPARSEMEM_STATIC is not set
-CONFIG_SPARSEMEM_EXTREME=y
+CONFIG_SPARSEMEM_STATIC=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_RESOURCES_64BIT=y
 CONFIG_ZONE_DMA_FLAG=0
@@ -151,6 +154,7 @@ CONFIG_SUN_AUXIO=y
 CONFIG_SUN_IO=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
+CONFIG_ARCH_SUPPORTS_MSI=y
 CONFIG_PCI_MSI=y
 # CONFIG_PCI_DEBUG is not set
 CONFIG_SUN_OPENPROMFS=m
@@ -178,7 +182,6 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
@@ -219,6 +222,7 @@ CONFIG_IPV6=m
 CONFIG_IPV6_PRIVACY=y
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_IPV6_OPTIMISTIC_DAD=y
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
 CONFIG_INET6_IPCOMP=m
@@ -292,6 +296,14 @@ CONFIG_NET_TCPPROBE=m
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
 
 #
@@ -312,10 +324,6 @@ CONFIG_FW_LOADER=y
 # Connector - unified userspace <-> kernelspace linker
 #
 CONFIG_CONNECTOR=m
-
-#
-# Memory Technology Devices (MTD)
-#
 # CONFIG_MTD is not set
 
 #
@@ -383,7 +391,6 @@ CONFIG_BLK_DEV_IDEPCI=y
 # CONFIG_BLK_DEV_OPTI621 is not set
 CONFIG_BLK_DEV_IDEDMA_PCI=y
 # CONFIG_BLK_DEV_IDEDMA_FORCED is not set
-CONFIG_IDEDMA_PCI_AUTO=y
 CONFIG_IDEDMA_ONLYDISK=y
 # CONFIG_BLK_DEV_AEC62XX is not set
 CONFIG_BLK_DEV_ALI15X3=y
@@ -413,7 +420,6 @@ CONFIG_BLK_DEV_ALI15X3=y
 # CONFIG_IDE_ARM is not set
 CONFIG_BLK_DEV_IDEDMA=y
 # CONFIG_IDEDMA_IVB is not set
-CONFIG_IDEDMA_AUTO=y
 # CONFIG_BLK_DEV_HD is not set
 
 #
@@ -443,6 +449,7 @@ CONFIG_SCSI_MULTI_LUN=y
 CONFIG_SCSI_CONSTANTS=y
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
 
 #
 # SCSI Transports
@@ -485,6 +492,7 @@ CONFIG_ISCSI_TCP=m
 # CONFIG_SCSI_DC395x is not set
 # CONFIG_SCSI_DC390T is not set
 # CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_ESP_CORE is not set
 # CONFIG_SCSI_SUNESP is not set
 # CONFIG_SCSI_SRP is not set
 
@@ -628,9 +636,10 @@ CONFIG_BNX2=m
 # CONFIG_TR is not set
 
 #
-# Wireless LAN (non-hamradio)
+# Wireless LAN
 #
-# CONFIG_NET_RADIO is not set
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
 
 #
 # Wan interfaces
@@ -695,6 +704,12 @@ CONFIG_KEYBOARD_LKKBD=m
 # CONFIG_KEYBOARD_STOWAWAY is not set
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=y
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
 CONFIG_MOUSE_SERIAL=y
 # CONFIG_MOUSE_VSXXXAA is not set
 # CONFIG_INPUT_JOYSTICK is not set
@@ -702,6 +717,7 @@ CONFIG_MOUSE_SERIAL=y
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_SPARCSPKR=y
 # CONFIG_INPUT_UINPUT is not set
+# CONFIG_INPUT_POLLDEV is not set
 
 #
 # Hardware I/O ports
@@ -763,11 +779,8 @@ CONFIG_RTC=y
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
-
-#
-# I2C support
-#
 CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
 # CONFIG_I2C_CHARDEV is not set
 
 #
@@ -791,17 +804,17 @@ CONFIG_I2C_ALGOBIT=y
 # CONFIG_I2C_NFORCE2 is not set
 # CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_PASEMI is not set
 # CONFIG_I2C_PROSAVAGE is not set
 # CONFIG_I2C_SAVAGE4 is not set
+# CONFIG_I2C_SIMTEC is not set
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
 # CONFIG_I2C_STUB is not set
+# CONFIG_I2C_TINY_USB is not set
 # CONFIG_I2C_VIA is not set
 # CONFIG_I2C_VIAPRO is not set
 # CONFIG_I2C_VOODOO3 is not set
-# CONFIG_I2C_PCA_ISA is not set
 
 #
 # Miscellaneous I2C Chip support
@@ -912,7 +925,7 @@ CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_TILEBLITTING=y
 
 #
-# Frambuffer hardware drivers
+# Frame buffer hardware drivers
 #
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_PM2 is not set
@@ -937,6 +950,8 @@ CONFIG_FB_RADEON_I2C=y
 # CONFIG_FB_3DFX is not set
 # CONFIG_FB_VOODOO1 is not set
 # CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_XVR500 is not set
+# CONFIG_FB_XVR2500 is not set
 # CONFIG_FB_PCI is not set
 # CONFIG_FB_VIRTUAL is not set
 
@@ -1094,6 +1109,14 @@ CONFIG_HID=y
 # CONFIG_HID_DEBUG is not set
 
 #
+# USB Input Devices
+#
+CONFIG_USB_HID=y
+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
+# CONFIG_HID_FF is not set
+CONFIG_USB_HIDDEV=y
+
+#
 # USB support
 #
 CONFIG_USB_ARCH_HAS_HCD=y
@@ -1106,6 +1129,7 @@ CONFIG_USB=y
 # Miscellaneous USB options
 #
 CONFIG_USB_DEVICEFS=y
+# CONFIG_USB_DEVICE_CLASS is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_OTG is not set
 
@@ -1156,10 +1180,6 @@ CONFIG_USB_STORAGE=m
 #
 # USB Input Devices
 #
-CONFIG_USB_HID=y
-# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-# CONFIG_HID_FF is not set
-CONFIG_USB_HIDDEV=y
 # CONFIG_USB_AIPTEK is not set
 # CONFIG_USB_WACOM is not set
 # CONFIG_USB_ACECAD is not set
@@ -1524,6 +1544,7 @@ CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_CBC=y
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_LRW=m
+# CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_DES=y
 CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_BLOWFISH=m
diff --git a/arch/sparc64/kernel/Makefile b/arch/sparc64/kernel/Makefile
index eff0c01d3579..6bf6fb65bc20 100644
--- a/arch/sparc64/kernel/Makefile
+++ b/arch/sparc64/kernel/Makefile
@@ -17,7 +17,7 @@ obj-y		:= process.o setup.o cpu.o idprom.o \
 obj-$(CONFIG_STACKTRACE) += stacktrace.o
 obj-$(CONFIG_PCI)        += ebus.o isa.o pci_common.o pci_iommu.o \
                             pci_psycho.o pci_sabre.o pci_schizo.o \
-                            pci_sun4v.o pci_sun4v_asm.o
+                            pci_sun4v.o pci_sun4v_asm.o pci_fire.o
 obj-$(CONFIG_SMP)        += smp.o trampoline.o
 obj-$(CONFIG_SPARC32_COMPAT) += sys32.o sys_sparc32.o signal32.o
 obj-$(CONFIG_BINFMT_ELF32) += binfmt_elf32.o
diff --git a/arch/sparc64/kernel/central.c b/arch/sparc64/kernel/central.c
index c65b2f9c98d8..8230099f0d8a 100644
--- a/arch/sparc64/kernel/central.c
+++ b/arch/sparc64/kernel/central.c
@@ -98,7 +98,7 @@ void apply_central_ranges(struct linux_central *central,
                             central->num_central_ranges);
 }
 
-void * __init central_alloc_bootmem(unsigned long size)
+static void * __init central_alloc_bootmem(unsigned long size)
 {
         void *ret;
 
@@ -116,7 +116,7 @@ static unsigned long prom_reg_to_paddr(struct linux_prom_registers *r)
         return ret | (unsigned long) r->phys_addr;
 }
 
-static void probe_other_fhcs(void)
+static void __init probe_other_fhcs(void)
 {
         struct device_node *dp;
         const struct linux_prom64_registers *fpregs;
@@ -298,7 +298,7 @@ static void init_all_fhc_hw(void)
 
 }
 
-void central_probe(void)
+void __init central_probe(void)
 {
         struct linux_prom_registers fpregs[6];
         const struct linux_prom_registers *pr;
diff --git a/arch/sparc64/kernel/irq.c b/arch/sparc64/kernel/irq.c
index 6241e3dbbd57..3edc18e1b818 100644
--- a/arch/sparc64/kernel/irq.c
+++ b/arch/sparc64/kernel/irq.c
@@ -279,7 +279,7 @@ static void sun4u_irq_enable(unsigned int virt_irq)
         struct irq_handler_data *data = get_irq_chip_data(virt_irq);
 
         if (likely(data)) {
-                unsigned long cpuid, imap;
+                unsigned long cpuid, imap, val;
                 unsigned int tid;
 
                 cpuid = irq_choose_cpu(virt_irq);
@@ -287,7 +287,11 @@ static void sun4u_irq_enable(unsigned int virt_irq)
 
                 tid = sun4u_compute_tid(imap, cpuid);
 
-                upa_writel(tid | IMAP_VALID, imap);
+                val = upa_readq(imap);
+                val &= ~(IMAP_TID_UPA | IMAP_TID_JBUS |
+                         IMAP_AID_SAFARI | IMAP_NID_SAFARI);
+                val |= tid | IMAP_VALID;
+                upa_writeq(val, imap);
         }
 }
 
@@ -297,10 +301,10 @@ static void sun4u_irq_disable(unsigned int virt_irq)
 
         if (likely(data)) {
                 unsigned long imap = data->imap;
-                u32 tmp = upa_readl(imap);
+                u32 tmp = upa_readq(imap);
 
                 tmp &= ~IMAP_VALID;
-                upa_writel(tmp, imap);
+                upa_writeq(tmp, imap);
         }
 }
 
@@ -309,7 +313,7 @@ static void sun4u_irq_end(unsigned int virt_irq)
         struct irq_handler_data *data = get_irq_chip_data(virt_irq);
 
         if (likely(data))
-                upa_writel(ICLR_IDLE, data->iclr);
+                upa_writeq(ICLR_IDLE, data->iclr);
 }
 
 static void sun4v_irq_enable(unsigned int virt_irq)
@@ -465,7 +469,7 @@ unsigned int build_irq(int inofixup, unsigned long iclr, unsigned long imap)
 
         BUG_ON(tlb_type == hypervisor);
 
-        ino = (upa_readl(imap) & (IMAP_IGN | IMAP_INO)) + inofixup;
+        ino = (upa_readq(imap) & (IMAP_IGN | IMAP_INO)) + inofixup;
         bucket = &ivector_table[ino];
         if (!bucket->virt_irq) {
                 bucket->virt_irq = virt_irq_alloc(__irq(bucket));
diff --git a/arch/sparc64/kernel/pci.c b/arch/sparc64/kernel/pci.c
index 9a549547cb2b..af2c7ff01eeb 100644
--- a/arch/sparc64/kernel/pci.c
+++ b/arch/sparc64/kernel/pci.c
@@ -190,6 +190,7 @@ extern void schizo_init(struct device_node *, const char *);
 extern void schizo_plus_init(struct device_node *, const char *);
 extern void tomatillo_init(struct device_node *, const char *);
 extern void sun4v_pci_init(struct device_node *, const char *);
+extern void fire_pci_init(struct device_node *, const char *);
 
 static struct {
         char *model_name;
@@ -207,6 +208,7 @@ static struct {
         { "SUNW,tomatillo", tomatillo_init },
         { "pci108e,a801", tomatillo_init },
         { "SUNW,sun4v-pci", sun4v_pci_init },
+        { "pciex108e,80f0", fire_pci_init },
 };
 #define PCI_NUM_CONTROLLER_TYPES (sizeof(pci_controller_table) / \
                                   sizeof(pci_controller_table[0]))
@@ -436,6 +438,13 @@ struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm,
         printk("    class: 0x%x device name: %s\n",
                dev->class, pci_name(dev));
 
+        /* I have seen IDE devices which will not respond to
+         * the bmdma simplex check reads if bus mastering is
+         * disabled.
+         */
+        if ((dev->class >> 8) == PCI_CLASS_STORAGE_IDE)
+                pci_set_master(dev);
+
         dev->current_state = 4;         /* unknown power state */
         dev->error_state = pci_channel_io_normal;
 
@@ -468,7 +477,7 @@ struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm,
         return dev;
 }
 
-static void __init apb_calc_first_last(u8 map, u32 *first_p, u32 *last_p)
+static void __devinit apb_calc_first_last(u8 map, u32 *first_p, u32 *last_p)
 {
         u32 idx, first, last;
 
@@ -497,9 +506,9 @@ static void __init pci_resource_adjust(struct resource *res,
 /* Cook up fake bus resources for SUNW,simba PCI bridges which lack
  * a proper 'ranges' property.
  */
-static void __init apb_fake_ranges(struct pci_dev *dev,
-                                   struct pci_bus *bus,
-                                   struct pci_pbm_info *pbm)
+static void __devinit apb_fake_ranges(struct pci_dev *dev,
+                                      struct pci_bus *bus,
+                                      struct pci_pbm_info *pbm)
 {
         struct resource *res;
         u32 first, last;
@@ -522,15 +531,15 @@ static void __init apb_fake_ranges(struct pci_dev *dev,
         pci_resource_adjust(res, &pbm->mem_space);
 }
 
-static void __init pci_of_scan_bus(struct pci_pbm_info *pbm,
-                                   struct device_node *node,
-                                   struct pci_bus *bus);
+static void __devinit pci_of_scan_bus(struct pci_pbm_info *pbm,
+                                      struct device_node *node,
+                                      struct pci_bus *bus);
 
 #define GET_64BIT(prop, i)      ((((u64) (prop)[(i)]) << 32) | (prop)[(i)+1])
 
-void __devinit of_scan_pci_bridge(struct pci_pbm_info *pbm,
-                                  struct device_node *node,
-                                  struct pci_dev *dev)
+static void __devinit of_scan_pci_bridge(struct pci_pbm_info *pbm,
+                                         struct device_node *node,
+                                         struct pci_dev *dev)
 {
         struct pci_bus *bus;
         const u32 *busrange, *ranges;
@@ -629,9 +638,9 @@ simba_cont:
         pci_of_scan_bus(pbm, node, bus);
 }
 
-static void __init pci_of_scan_bus(struct pci_pbm_info *pbm,
-                                   struct device_node *node,
-                                   struct pci_bus *bus)
+static void __devinit pci_of_scan_bus(struct pci_pbm_info *pbm,
+                                      struct device_node *node,
+                                      struct pci_bus *bus)
 {
         struct device_node *child;
         const u32 *reg;
@@ -733,7 +742,7 @@ int pci_host_bridge_write_pci_cfg(struct pci_bus *bus_dev,
         return PCIBIOS_SUCCESSFUL;
 }
 
-struct pci_bus * __init pci_scan_one_pbm(struct pci_pbm_info *pbm)
+struct pci_bus * __devinit pci_scan_one_pbm(struct pci_pbm_info *pbm)
 {
         struct pci_controller_info *p = pbm->parent;
         struct device_node *node = pbm->prom_node;
diff --git a/arch/sparc64/kernel/pci_fire.c b/arch/sparc64/kernel/pci_fire.c
new file mode 100644
index 000000000000..0fe626631e12
--- /dev/null
+++ b/arch/sparc64/kernel/pci_fire.c
@@ -0,0 +1,418 @@
+/* pci_fire.c: Sun4u platform PCI-E controller support.
+ *
+ * Copyright (C) 2007 David S. Miller (davem@davemloft.net)
+ */
+#include <linux/kernel.h>
+#include <linux/pci.h>
+#include <linux/slab.h>
+#include <linux/init.h>
+
+#include <asm/pbm.h>
+#include <asm/oplib.h>
+#include <asm/prom.h>
+
+#include "pci_impl.h"
+
+#define fire_read(__reg) \
+({      u64 __ret; \
+        __asm__ __volatile__("ldxa [%1] %2, %0" \
+                             : "=r" (__ret) \
+                             : "r" (__reg), "i" (ASI_PHYS_BYPASS_EC_E) \
+                             : "memory"); \
+        __ret; \
+})
+#define fire_write(__reg, __val) \
+        __asm__ __volatile__("stxa %0, [%1] %2" \
+                             : /* no outputs */ \
+                             : "r" (__val), "r" (__reg), \
+                               "i" (ASI_PHYS_BYPASS_EC_E) \
+                             : "memory")
+
+/* Fire config space address format is nearly identical to
+ * that of SCHIZO and PSYCHO, except that in order to accomodate
+ * PCI-E extended config space the encoding can handle 12 bits
+ * of register address:
+ *
+ *  32     28 27 20 19    15 14      12 11  2  1 0
+ * -------------------------------------------------
+ * |0 0 0 0 0| bus | device | function | reg | 0 0 |
+ * -------------------------------------------------
+ */
+#define FIRE_CONFIG_BASE(PBM)   ((PBM)->config_space)
+#define FIRE_CONFIG_ENCODE(BUS, DEVFN, REG)     \
+        (((unsigned long)(BUS)   << 20) |       \
+         ((unsigned long)(DEVFN) << 12)  |      \
+         ((unsigned long)(REG)))
+
+static void *fire_pci_config_mkaddr(struct pci_pbm_info *pbm,
+                                      unsigned char bus,
+                                      unsigned int devfn,
+                                      int where)
+{
+        if (!pbm)
+                return NULL;
+        return (void *)
+                (FIRE_CONFIG_BASE(pbm) |
+                 FIRE_CONFIG_ENCODE(bus, devfn, where));
+}
+
+/* FIRE PCI configuration space accessors. */
+
+static int fire_read_pci_cfg(struct pci_bus *bus_dev, unsigned int devfn,
+                             int where, int size, u32 *value)
+{
+        struct pci_pbm_info *pbm = bus_dev->sysdata;
+        unsigned char bus = bus_dev->number;
+        u32 *addr;
+        u16 tmp16;
+        u8 tmp8;
+
+        if (bus_dev == pbm->pci_bus && devfn == 0x00)
+                return pci_host_bridge_read_pci_cfg(bus_dev, devfn, where,
+                                                    size, value);
+        switch (size) {
+        case 1:
+                *value = 0xff;
+                break;
+        case 2:
+                *value = 0xffff;
+                break;
+        case 4:
+                *value = 0xffffffff;
+                break;
+        }
+
+        addr = fire_pci_config_mkaddr(pbm, bus, devfn, where);
+        if (!addr)
+                return PCIBIOS_SUCCESSFUL;
+
+        switch (size) {
+        case 1:
+                pci_config_read8((u8 *)addr, &tmp8);
+                *value = tmp8;
+                break;
+
+        case 2:
+                if (where & 0x01) {
+                        printk("pci_read_config_word: misaligned reg [%x]\n",
+                               where);
+                        return PCIBIOS_SUCCESSFUL;
+                }
+                pci_config_read16((u16 *)addr, &tmp16);
+                *value = tmp16;
+                break;
+
+        case 4:
+                if (where & 0x03) {
+                        printk("pci_read_config_dword: misaligned reg [%x]\n",
+                               where);
+                        return PCIBIOS_SUCCESSFUL;
+                }
+
+                pci_config_read32(addr, value);
+                break;
+        }
+        return PCIBIOS_SUCCESSFUL;
+}
+
+static int fire_write_pci_cfg(struct pci_bus *bus_dev, unsigned int devfn,
+                              int where, int size, u32 value)
+{
+        struct pci_pbm_info *pbm = bus_dev->sysdata;
+        unsigned char bus = bus_dev->number;
+        u32 *addr;
+
+        if (bus_dev == pbm->pci_bus && devfn == 0x00)
+                return pci_host_bridge_write_pci_cfg(bus_dev, devfn, where,
+                                                     size, value);
+        addr = fire_pci_config_mkaddr(pbm, bus, devfn, where);
+        if (!addr)
+                return PCIBIOS_SUCCESSFUL;
+
+        switch (size) {
+        case 1:
+                pci_config_write8((u8 *)addr, value);
+                break;
+
+        case 2:
+                if (where & 0x01) {
+                        printk("pci_write_config_word: misaligned reg [%x]\n",
+                               where);
+                        return PCIBIOS_SUCCESSFUL;
+                }
+                pci_config_write16((u16 *)addr, value);
+                break;
+
+        case 4:
+                if (where & 0x03) {
+                        printk("pci_write_config_dword: misaligned reg [%x]\n",
+                               where);
+                        return PCIBIOS_SUCCESSFUL;
+                }
+
+                pci_config_write32(addr, value);
+        }
+        return PCIBIOS_SUCCESSFUL;
+}
+
+static struct pci_ops pci_fire_ops = {
+        .read   =       fire_read_pci_cfg,
+        .write  =       fire_write_pci_cfg,
+};
+
+static void pbm_scan_bus(struct pci_controller_info *p,
+                         struct pci_pbm_info *pbm)
+{
+        pbm->pci_bus = pci_scan_one_pbm(pbm);
+}
+
+static void pci_fire_scan_bus(struct pci_controller_info *p)
+{
+        struct device_node *dp;
+
+        if ((dp = p->pbm_A.prom_node) != NULL)
+                pbm_scan_bus(p, &p->pbm_A);
+
+        if ((dp = p->pbm_B.prom_node) != NULL)
+                pbm_scan_bus(p, &p->pbm_B);
+
+        /* XXX register error interrupt handlers XXX */
+}
+
+#define FIRE_IOMMU_CONTROL      0x40000UL
+#define FIRE_IOMMU_TSBBASE      0x40008UL
+#define FIRE_IOMMU_FLUSH        0x40100UL
+#define FIRE_IOMMU_FLUSHINV     0x40100UL
+
+static void pci_fire_pbm_iommu_init(struct pci_pbm_info *pbm)
+{
+        struct iommu *iommu = pbm->iommu;
+        u32 vdma[2], dma_mask;
+        u64 control;
+        int tsbsize;
+
+        /* No virtual-dma property on these guys, use largest size.  */
+        vdma[0] = 0xc0000000; /* base */
+        vdma[1] = 0x40000000; /* size */
+        dma_mask = 0xffffffff;
+        tsbsize = 128;
+
+        /* Register addresses. */
+        iommu->iommu_control  = pbm->pbm_regs + FIRE_IOMMU_CONTROL;
+        iommu->iommu_tsbbase  = pbm->pbm_regs + FIRE_IOMMU_TSBBASE;
+        iommu->iommu_flush    = pbm->pbm_regs + FIRE_IOMMU_FLUSH;
+        iommu->iommu_flushinv = pbm->pbm_regs + FIRE_IOMMU_FLUSHINV;
+
+        /* We use the main control/status register of FIRE as the write
+         * completion register.
+         */
+        iommu->write_complete_reg = pbm->controller_regs + 0x410000UL;
+
+        /*
+         * Invalidate TLB Entries.
+         */
+        fire_write(iommu->iommu_flushinv, ~(u64)0);
+
+        pci_iommu_table_init(iommu, tsbsize * 8 * 1024, vdma[0], dma_mask);
+
+        fire_write(iommu->iommu_tsbbase, __pa(iommu->page_table) | 0x7UL);
+
+        control = fire_read(iommu->iommu_control);
+        control |= (0x00000400 /* TSB cache snoop enable */     |
+                    0x00000300 /* Cache mode */                 |
+                    0x00000002 /* Bypass enable */              |
+                    0x00000001 /* Translation enable */);
+        fire_write(iommu->iommu_control, control);
+}
+
+/* Based at pbm->controller_regs */
+#define FIRE_PARITY_CONTROL     0x470010UL
+#define  FIRE_PARITY_ENAB       0x8000000000000000UL
+#define FIRE_FATAL_RESET_CTL    0x471028UL
+#define  FIRE_FATAL_RESET_SPARE 0x0000000004000000UL
+#define  FIRE_FATAL_RESET_MB    0x0000000002000000UL
+#define  FIRE_FATAL_RESET_CPE   0x0000000000008000UL
+#define  FIRE_FATAL_RESET_APE   0x0000000000004000UL
+#define  FIRE_FATAL_RESET_PIO   0x0000000000000040UL
+#define  FIRE_FATAL_RESET_JW    0x0000000000000004UL
+#define  FIRE_FATAL_RESET_JI    0x0000000000000002UL
+#define  FIRE_FATAL_RESET_JR    0x0000000000000001UL
+#define FIRE_CORE_INTR_ENABLE   0x471800UL
+
+/* Based at pbm->pbm_regs */
+#define FIRE_TLU_CTRL           0x80000UL
+#define  FIRE_TLU_CTRL_TIM      0x00000000da000000UL
+#define  FIRE_TLU_CTRL_QDET     0x0000000000000100UL
+#define  FIRE_TLU_CTRL_CFG      0x0000000000000001UL
+#define FIRE_TLU_DEV_CTRL       0x90008UL
+#define FIRE_TLU_LINK_CTRL      0x90020UL
+#define FIRE_TLU_LINK_CTRL_CLK  0x0000000000000040UL
+#define FIRE_LPU_RESET          0xe2008UL
+#define FIRE_LPU_LLCFG          0xe2200UL
+#define  FIRE_LPU_LLCFG_VC0     0x0000000000000100UL
+#define FIRE_LPU_FCTRL_UCTRL    0xe2240UL
+#define  FIRE_LPU_FCTRL_UCTRL_N 0x0000000000000002UL
+#define  FIRE_LPU_FCTRL_UCTRL_P 0x0000000000000001UL
+#define FIRE_LPU_TXL_FIFOP      0xe2430UL
+#define FIRE_LPU_LTSSM_CFG2     0xe2788UL
+#define FIRE_LPU_LTSSM_CFG3     0xe2790UL
+#define FIRE_LPU_LTSSM_CFG4     0xe2798UL
+#define FIRE_LPU_LTSSM_CFG5     0xe27a0UL
+#define FIRE_DMC_IENAB          0x31800UL
+#define FIRE_DMC_DBG_SEL_A      0x53000UL
+#define FIRE_DMC_DBG_SEL_B      0x53008UL
+#define FIRE_PEC_IENAB          0x51800UL
+
+static void pci_fire_hw_init(struct pci_pbm_info *pbm)
+{
+        u64 val;
+
+        fire_write(pbm->controller_regs + FIRE_PARITY_CONTROL,
+                   FIRE_PARITY_ENAB);
+
+        fire_write(pbm->controller_regs + FIRE_FATAL_RESET_CTL,
+                   (FIRE_FATAL_RESET_SPARE |
+                    FIRE_FATAL_RESET_MB |
+                    FIRE_FATAL_RESET_CPE |
+                    FIRE_FATAL_RESET_APE |
+                    FIRE_FATAL_RESET_PIO |
+                    FIRE_FATAL_RESET_JW |
+                    FIRE_FATAL_RESET_JI |
+                    FIRE_FATAL_RESET_JR));
+
+        fire_write(pbm->controller_regs + FIRE_CORE_INTR_ENABLE, ~(u64)0);
+
+        val = fire_read(pbm->pbm_regs + FIRE_TLU_CTRL);
+        val |= (FIRE_TLU_CTRL_TIM |
+                FIRE_TLU_CTRL_QDET |
+                FIRE_TLU_CTRL_CFG);
+        fire_write(pbm->pbm_regs + FIRE_TLU_CTRL, val);
+        fire_write(pbm->pbm_regs + FIRE_TLU_DEV_CTRL, 0);
+        fire_write(pbm->pbm_regs + FIRE_TLU_LINK_CTRL,
+                   FIRE_TLU_LINK_CTRL_CLK);
+
+        fire_write(pbm->pbm_regs + FIRE_LPU_RESET, 0);
+        fire_write(pbm->pbm_regs + FIRE_LPU_LLCFG,
+                   FIRE_LPU_LLCFG_VC0);
+        fire_write(pbm->pbm_regs + FIRE_LPU_FCTRL_UCTRL,
+                   (FIRE_LPU_FCTRL_UCTRL_N |
+                    FIRE_LPU_FCTRL_UCTRL_P));
+        fire_write(pbm->pbm_regs + FIRE_LPU_TXL_FIFOP,
+                   ((0xffff << 16) | (0x0000 << 0)));
+        fire_write(pbm->pbm_regs + FIRE_LPU_LTSSM_CFG2, 3000000);
+        fire_write(pbm->pbm_regs + FIRE_LPU_LTSSM_CFG3, 500000);
+        fire_write(pbm->pbm_regs + FIRE_LPU_LTSSM_CFG4,
+                   (2 << 16) | (140 << 8));
+        fire_write(pbm->pbm_regs + FIRE_LPU_LTSSM_CFG5, 0);
+
+        fire_write(pbm->pbm_regs + FIRE_DMC_IENAB, ~(u64)0);
+        fire_write(pbm->pbm_regs + FIRE_DMC_DBG_SEL_A, 0);
+        fire_write(pbm->pbm_regs + FIRE_DMC_DBG_SEL_B, 0);
+
+        fire_write(pbm->pbm_regs + FIRE_PEC_IENAB, ~(u64)0);
+}
+
+static void pci_fire_pbm_init(struct pci_controller_info *p,
+                                struct device_node *dp, u32 portid)
+{
+        const struct linux_prom64_registers *regs;
+        struct pci_pbm_info *pbm;
+        const u32 *ino_bitmap;
+        const unsigned int *busrange;
+
+        if ((portid & 1) == 0)
+                pbm = &p->pbm_A;
+        else
+                pbm = &p->pbm_B;
+
+        pbm->portid = portid;
+        pbm->parent = p;
+        pbm->prom_node = dp;
+        pbm->name = dp->full_name;
+
+        regs = of_get_property(dp, "reg", NULL);
+        pbm->pbm_regs = regs[0].phys_addr;
+        pbm->controller_regs = regs[1].phys_addr - 0x410000UL;
+
+        printk("%s: SUN4U PCIE Bus Module\n", pbm->name);
+
+        pci_determine_mem_io_space(pbm);
+
+        ino_bitmap = of_get_property(dp, "ino-bitmap", NULL);
+        pbm->ino_bitmap = (((u64)ino_bitmap[1] << 32UL) |
+                           ((u64)ino_bitmap[0] <<  0UL));
+
+        busrange = of_get_property(dp, "bus-range", NULL);
+        pbm->pci_first_busno = busrange[0];
+        pbm->pci_last_busno = busrange[1];
+
+        pci_fire_hw_init(pbm);
+        pci_fire_pbm_iommu_init(pbm);
+}
+
+static inline int portid_compare(u32 x, u32 y)
+{
+        if (x == (y ^ 1))
+                return 1;
+        return 0;
+}
+
+void fire_pci_init(struct device_node *dp, const char *model_name)
+{
+        struct pci_controller_info *p;
+        u32 portid = of_getintprop_default(dp, "portid", 0xff);
+        struct iommu *iommu;
+
+        for (p = pci_controller_root; p; p = p->next) {
+                struct pci_pbm_info *pbm;
+
+                if (p->pbm_A.prom_node && p->pbm_B.prom_node)
+                        continue;
+
+                pbm = (p->pbm_A.prom_node ?
+                       &p->pbm_A :
+                       &p->pbm_B);
+
+                if (portid_compare(pbm->portid, portid)) {
+                        pci_fire_pbm_init(p, dp, portid);
+                        return;
+                }
+        }
+
+        p = kzalloc(sizeof(struct pci_controller_info), GFP_ATOMIC);
+        if (!p)
+                goto fatal_memory_error;
+
+        iommu = kzalloc(sizeof(struct iommu), GFP_ATOMIC);
+        if (!iommu)
+                goto fatal_memory_error;
+
+        p->pbm_A.iommu = iommu;
+
+        iommu = kzalloc(sizeof(struct iommu), GFP_ATOMIC);
+        if (!iommu)
+                goto fatal_memory_error;
+
+        p->pbm_B.iommu = iommu;
+
+        p->next = pci_controller_root;
+        pci_controller_root = p;
+
+        p->index = pci_num_controllers++;
+
+        p->scan_bus = pci_fire_scan_bus;
+        /* XXX MSI support XXX */
+        p->pci_ops = &pci_fire_ops;
+
+        /* Like PSYCHO and SCHIZO we have a 2GB aligned area
+         * for memory space.
+         */
+        pci_memspace_mask = 0x7fffffffUL;
+
+        pci_fire_pbm_init(p, dp, portid);
+        return;
+
+fatal_memory_error:
+        prom_printf("PCI_FIRE: Fatal memory allocation error.\n");
+        prom_halt();
+}
diff --git a/arch/sparc64/kernel/pci_iommu.c b/arch/sparc64/kernel/pci_iommu.c
index 66712772f494..9e405cbbcb0d 100644
--- a/arch/sparc64/kernel/pci_iommu.c
+++ b/arch/sparc64/kernel/pci_iommu.c
@@ -37,17 +37,21 @@
 /* Must be invoked under the IOMMU lock. */
 static void __iommu_flushall(struct iommu *iommu)
 {
-        unsigned long tag;
-        int entry;
+        if (iommu->iommu_flushinv) {
+                pci_iommu_write(iommu->iommu_flushinv, ~(u64)0);
+        } else {
+                unsigned long tag;
+                int entry;
 
-        tag = iommu->iommu_flush + (0xa580UL - 0x0210UL);
-        for (entry = 0; entry < 16; entry++) {
-                pci_iommu_write(tag, 0);
-                tag += 8;
-        }
+                tag = iommu->iommu_flush + (0xa580UL - 0x0210UL);
+                for (entry = 0; entry < 16; entry++) {
+                        pci_iommu_write(tag, 0);
+                        tag += 8;
+                }
 
-        /* Ensure completion of previous PIO writes. */
-        (void) pci_iommu_read(iommu->write_complete_reg);
+                /* Ensure completion of previous PIO writes. */
+                (void) pci_iommu_read(iommu->write_complete_reg);
+        }
 }
 
 #define IOPTE_CONSISTENT(CTX) \
diff --git a/arch/sparc64/kernel/prom.c b/arch/sparc64/kernel/prom.c
index 5e1fcd05160d..c54d4d8af014 100644
--- a/arch/sparc64/kernel/prom.c
+++ b/arch/sparc64/kernel/prom.c
@@ -386,11 +386,9 @@ static unsigned int psycho_irq_build(struct device_node *dp,
 
         /* Now build the IRQ bucket. */
         imap = controller_regs + imap_off;
-        imap += 4;
 
         iclr_off = psycho_iclr_offset(ino);
         iclr = controller_regs + iclr_off;
-        iclr += 4;
 
         if ((ino & 0x20) == 0)
                 inofixup = ino & 0x03;
@@ -398,7 +396,7 @@ static unsigned int psycho_irq_build(struct device_node *dp,
         return build_irq(inofixup, iclr, imap);
 }
 
-static void psycho_irq_trans_init(struct device_node *dp)
+static void __init psycho_irq_trans_init(struct device_node *dp)
 {
         const struct linux_prom64_registers *regs;
 
@@ -613,11 +611,9 @@ static unsigned int sabre_irq_build(struct device_node *dp,
 
         /* Now build the IRQ bucket. */
         imap = controller_regs + imap_off;
-        imap += 4;
 
         iclr_off = sabre_iclr_offset(ino);
         iclr = controller_regs + iclr_off;
-        iclr += 4;
 
         if ((ino & 0x20) == 0)
                 inofixup = ino & 0x03;
@@ -640,7 +636,7 @@ static unsigned int sabre_irq_build(struct device_node *dp,
         return virt_irq;
 }
 
-static void sabre_irq_trans_init(struct device_node *dp)
+static void __init sabre_irq_trans_init(struct device_node *dp)
 {
         const struct linux_prom64_registers *regs;
         struct sabre_irq_data *irq_data;
@@ -679,13 +675,14 @@ static unsigned long schizo_iclr_offset(unsigned long ino)
 static unsigned long schizo_ino_to_iclr(unsigned long pbm_regs,
                                         unsigned int ino)
 {
-        return pbm_regs + schizo_iclr_offset(ino) + 4;
+
+        return pbm_regs + schizo_iclr_offset(ino);
 }
 
 static unsigned long schizo_ino_to_imap(unsigned long pbm_regs,
                                         unsigned int ino)
 {
-        return pbm_regs + schizo_imap_offset(ino) + 4;
+        return pbm_regs + schizo_imap_offset(ino);
 }
 
 #define schizo_read(__reg) \
@@ -796,7 +793,8 @@ static unsigned int schizo_irq_build(struct device_node *dp,
         return virt_irq;
 }
 
-static void __schizo_irq_trans_init(struct device_node *dp, int is_tomatillo)
+static void __init __schizo_irq_trans_init(struct device_node *dp,
+                                           int is_tomatillo)
 {
         const struct linux_prom64_registers *regs;
         struct schizo_irq_data *irq_data;
@@ -818,12 +816,12 @@ static void __schizo_irq_trans_init(struct device_node *dp, int is_tomatillo)
         irq_data->chip_version = of_getintprop_default(dp, "version#", 0);
 }
 
-static void schizo_irq_trans_init(struct device_node *dp)
+static void __init schizo_irq_trans_init(struct device_node *dp)
 {
         __schizo_irq_trans_init(dp, 0);
 }
 
-static void tomatillo_irq_trans_init(struct device_node *dp)
+static void __init tomatillo_irq_trans_init(struct device_node *dp)
 {
         __schizo_irq_trans_init(dp, 1);
 }
@@ -837,7 +835,7 @@ static unsigned int pci_sun4v_irq_build(struct device_node *dp,
         return sun4v_build_irq(devhandle, devino);
 }
 
-static void pci_sun4v_irq_trans_init(struct device_node *dp)
+static void __init pci_sun4v_irq_trans_init(struct device_node *dp)
 {
         const struct linux_prom64_registers *regs;
 
@@ -848,6 +846,85 @@ static void pci_sun4v_irq_trans_init(struct device_node *dp)
         dp->irq_trans->data = (void *) (unsigned long)
                 ((regs->phys_addr >> 32UL) & 0x0fffffff);
 }
+
+struct fire_irq_data {
+        unsigned long pbm_regs;
+        u32 portid;
+};
+
+#define FIRE_IMAP_BASE  0x001000
+#define FIRE_ICLR_BASE  0x001400
+
+static unsigned long fire_imap_offset(unsigned long ino)
+{
+        return FIRE_IMAP_BASE + (ino * 8UL);
+}
+
+static unsigned long fire_iclr_offset(unsigned long ino)
+{
+        return FIRE_ICLR_BASE + (ino * 8UL);
+}
+
+static unsigned long fire_ino_to_iclr(unsigned long pbm_regs,
+                                            unsigned int ino)
+{
+        return pbm_regs + fire_iclr_offset(ino);
+}
+
+static unsigned long fire_ino_to_imap(unsigned long pbm_regs,
+                                            unsigned int ino)
+{
+        return pbm_regs + fire_imap_offset(ino);
+}
+
+static unsigned int fire_irq_build(struct device_node *dp,
+                                         unsigned int ino,
+                                         void *_data)
+{
+        struct fire_irq_data *irq_data = _data;
+        unsigned long pbm_regs = irq_data->pbm_regs;
+        unsigned long imap, iclr;
+        unsigned long int_ctrlr;
+
+        ino &= 0x3f;
+
+        /* Now build the IRQ bucket. */
+        imap = fire_ino_to_imap(pbm_regs, ino);
+        iclr = fire_ino_to_iclr(pbm_regs, ino);
+
+        /* Set the interrupt controller number.  */
+        int_ctrlr = 1 << 6;
+        upa_writeq(int_ctrlr, imap);
+
+        /* The interrupt map registers do not have an INO field
+         * like other chips do.  They return zero in the INO
+         * field, and the interrupt controller number is controlled
+         * in bits 6 thru 9.  So in order for build_irq() to get
+         * the INO right we pass it in as part of the fixup
+         * which will get added to the map register zero value
+         * read by build_irq().
+         */
+        ino |= (irq_data->portid << 6);
+        ino -= int_ctrlr;
+        return build_irq(ino, iclr, imap);
+}
+
+static void __init fire_irq_trans_init(struct device_node *dp)
+{
+        const struct linux_prom64_registers *regs;
+        struct fire_irq_data *irq_data;
+
+        dp->irq_trans = prom_early_alloc(sizeof(struct of_irq_controller));
+        dp->irq_trans->irq_build = fire_irq_build;
+
+        irq_data = prom_early_alloc(sizeof(struct fire_irq_data));
+
+        regs = of_get_property(dp, "reg", NULL);
+        dp->irq_trans->data = irq_data;
+
+        irq_data->pbm_regs = regs[0].phys_addr;
+        irq_data->portid = of_getintprop_default(dp, "portid", 0);
+}
 #endif /* CONFIG_PCI */
 
 #ifdef CONFIG_SBUS
@@ -995,7 +1072,7 @@ static unsigned int sbus_of_build_irq(struct device_node *dp,
         return build_irq(sbus_level, iclr, imap);
 }
 
-static void sbus_irq_trans_init(struct device_node *dp)
+static void __init sbus_irq_trans_init(struct device_node *dp)
 {
         const struct linux_prom64_registers *regs;
 
@@ -1042,7 +1119,7 @@ static unsigned int central_build_irq(struct device_node *dp,
         return build_irq(0, iclr, imap);
 }
 
-static void central_irq_trans_init(struct device_node *dp)
+static void __init central_irq_trans_init(struct device_node *dp)
 {
         dp->irq_trans = prom_early_alloc(sizeof(struct of_irq_controller));
         dp->irq_trans->irq_build = central_build_irq;
@@ -1056,7 +1133,7 @@ struct irq_trans {
 };
 
 #ifdef CONFIG_PCI
-static struct irq_trans pci_irq_trans_table[] = {
+static struct irq_trans __initdata pci_irq_trans_table[] = {
         { "SUNW,sabre", sabre_irq_trans_init },
         { "pci108e,a000", sabre_irq_trans_init },
         { "pci108e,a001", sabre_irq_trans_init },
@@ -1069,6 +1146,7 @@ static struct irq_trans pci_irq_trans_table[] = {
         { "SUNW,tomatillo", tomatillo_irq_trans_init },
         { "pci108e,a801", tomatillo_irq_trans_init },
         { "SUNW,sun4v-pci", pci_sun4v_irq_trans_init },
+        { "pciex108e,80f0", fire_irq_trans_init },
 };
 #endif
 
@@ -1081,7 +1159,7 @@ static unsigned int sun4v_vdev_irq_build(struct device_node *dp,
         return sun4v_build_irq(devhandle, devino);
 }
 
-static void sun4v_vdev_irq_trans_init(struct device_node *dp)
+static void __init sun4v_vdev_irq_trans_init(struct device_node *dp)
 {
         const struct linux_prom64_registers *regs;
 
@@ -1093,7 +1171,7 @@ static void sun4v_vdev_irq_trans_init(struct device_node *dp)
                 ((regs->phys_addr >> 32UL) & 0x0fffffff);
 }
 
-static void irq_trans_init(struct device_node *dp)
+static void __init irq_trans_init(struct device_node *dp)
 {
 #ifdef CONFIG_PCI
         const char *model;