Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
  [PARISC] MAINTAINERS
  [PARISC] Make ioremap default to _nocache
  [PARISC] Add new entries to the syscall table
  [PARISC] Further work for multiple page sizes
  [PARISC] Fix up hil_kbd.c mismerge
  [PARISC] defconfig updates
  [PARISC] Document that we tolerate "Relaxed Ordering"
  [PARISC] Misc. janitorial work
  [PARISC] EISA regions must be mapped NO_CACHE
  [PARISC] OSS ad1889: Match register names with ALSA driver

4 files changed, 36 insertions, 17 deletions

diff --git a/drivers/input/keyboard/hil_kbd.c b/drivers/input/keyboard/hil_kbd.c
index 1dca3cf42a54..2e4abdc26367 100644
--- a/drivers/input/keyboard/hil_kbd.c
+++ b/drivers/input/keyboard/hil_kbd.c
@@ -350,11 +350,11 @@ static int hil_kbd_connect(struct serio *serio, struct serio_driver *drv)
         return 0;
  bail2:
         serio_close(serio);
+        serio_set_drvdata(serio, NULL);
  bail1:
         input_free_device(kbd->dev);
  bail0:
         kfree(kbd);
-        serio_set_drvdata(serio, NULL);
         return -EIO;
 }
 
diff --git a/drivers/parisc/pdc_stable.c b/drivers/parisc/pdc_stable.c
index 4e53be9c03ab..bbeabe3fc4c6 100644
--- a/drivers/parisc/pdc_stable.c
+++ b/drivers/parisc/pdc_stable.c
@@ -535,7 +535,7 @@ pdcs_auto_read(struct subsystem *entry, char *buf, int knob)
 {
         char *out = buf;
         struct pdcspath_entry *pathentry;
-        
+
         if (!entry || !buf)
                 return -EINVAL;
 
diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c
index 42b32ff2fca6..278f325021ee 100644
--- a/drivers/parisc/sba_iommu.c
+++ b/drivers/parisc/sba_iommu.c
@@ -178,6 +178,11 @@ extern struct proc_dir_entry * proc_mckinley_root;
 #define ROPE6_CTL       0x230
 #define ROPE7_CTL       0x238
 
+#define IOC_ROPE0_CFG   0x500   /* pluto only */
+#define   IOC_ROPE_AO     0x10  /* Allow "Relaxed Ordering" */
+
+
+
 #define HF_ENABLE       0x40
 
 
@@ -1759,19 +1764,33 @@ printk("sba_hw_init(): mem_boot 0x%x 0x%x 0x%x 0x%x\n", PAGE0->mem_boot.hpa,
 
         sba_dev->num_ioc = num_ioc;
         for (i = 0; i < num_ioc; i++) {
-                /*
-                ** Make sure the box crashes if we get any errors on a rope.
-                */
-                WRITE_REG(HF_ENABLE, sba_dev->ioc[i].ioc_hpa + ROPE0_CTL);
-                WRITE_REG(HF_ENABLE, sba_dev->ioc[i].ioc_hpa + ROPE1_CTL);
-                WRITE_REG(HF_ENABLE, sba_dev->ioc[i].ioc_hpa + ROPE2_CTL);
-                WRITE_REG(HF_ENABLE, sba_dev->ioc[i].ioc_hpa + ROPE3_CTL);
-                WRITE_REG(HF_ENABLE, sba_dev->ioc[i].ioc_hpa + ROPE4_CTL);
-                WRITE_REG(HF_ENABLE, sba_dev->ioc[i].ioc_hpa + ROPE5_CTL);
-                WRITE_REG(HF_ENABLE, sba_dev->ioc[i].ioc_hpa + ROPE6_CTL);
-                WRITE_REG(HF_ENABLE, sba_dev->ioc[i].ioc_hpa + ROPE7_CTL);
-
-                /* flush out the writes */
+                unsigned long ioc_hpa = sba_dev->ioc[i].ioc_hpa;
+                unsigned int j;
+
+                for (j=0; j < sizeof(u64) * ROPES_PER_IOC; j+=sizeof(u64)) {
+
+                        /*
+                         * Clear ROPE(N)_CONFIG AO bit.
+                         * Disables "NT Ordering" (~= !"Relaxed Ordering")
+                         * Overrides bit 1 in DMA Hint Sets.
+                         * Improves netperf UDP_STREAM by ~10% for bcm5701.
+                         */
+                        if (IS_PLUTO(sba_dev->iodc)) {
+                                unsigned long rope_cfg, cfg_val;
+
+                                rope_cfg = ioc_hpa + IOC_ROPE0_CFG + j;
+                                cfg_val = READ_REG(rope_cfg);
+                                cfg_val &= ~IOC_ROPE_AO;
+                                WRITE_REG(cfg_val, rope_cfg);
+                        }
+
+                        /*
+                        ** Make sure the box crashes on rope errors.
+                        */
+                        WRITE_REG(HF_ENABLE, ioc_hpa + ROPE0_CTL + j);
+                }
+
+                /* flush out the last writes */
                 READ_REG(sba_dev->ioc[i].ioc_hpa + ROPE7_CTL);
 
                 DBG_INIT("      ioc[%d] ROPE_CFG 0x%Lx  ROPE_DBG 0x%Lx\n",
diff --git a/drivers/parisc/superio.c b/drivers/parisc/superio.c
index 719b863bc20e..828eb45062de 100644
--- a/drivers/parisc/superio.c
+++ b/drivers/parisc/superio.c
@@ -155,7 +155,7 @@ superio_init(struct pci_dev *pcidev)
         struct pci_dev *pdev = sio->lio_pdev;
         u16 word;
 
-        if (sio->suckyio_irq_enabled)                                       
+        if (sio->suckyio_irq_enabled)
                 return;
 
         BUG_ON(!pdev);
@@ -194,7 +194,7 @@ superio_init(struct pci_dev *pcidev)
         request_region (sio->acpi_base, 0x1f, "acpi");
 
         /* Enable the legacy I/O function */
-        pci_read_config_word (pdev, PCI_COMMAND, &word);
+        pci_read_config_word (pdev, PCI_COMMAND, &word);
         word |= PCI_COMMAND_SERR | PCI_COMMAND_PARITY | PCI_COMMAND_IO;
         pci_write_config_word (pdev, PCI_COMMAND, word);