Merge tag 'staging-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging into next

Pull staging driver updates from Greg KH:
 "Here is the big staging driver pull request for 3.16-rc1.

  Lots of stuff here, tons of cleanup patches, a few new drivers, and
  some removed as well, but I think we are still adding a few thousand
  more lines than we remove, due to the new drivers being bigger than
  the ones deleted.

  One notible bit of work did stand out, Jes Sorensen has gone on a
  tear, fixing up a wireless driver to be "more sane" than it originally
  was from the vendor, with over 500 patches merged here.  Good stuff,
  and a number of users laptops are better off for it.

  All of this has been in linux-next for a while"

* tag 'staging-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1703 commits)
  staging: skein: fix sparse warning for static declarations
  staging/mt29f_spinand: coding style fixes
  staging: silicom: fix sparse warning for static variable
  staging: lustre: Fix coding style
  staging: android: binder.c: Use more appropriate functions for euid retrieval
  staging: lustre: fix integer as NULL pointer warnings
  Revert "staging: dgap: remove unneeded kfree() in dgap_tty_register_ports()"
  Staging: rtl8192u: r8192U_wx.c Fixed a misplaced brace
  staging: ion: shrink highmem pages on kswapd
  staging: ion: use compound pages on high order pages for system heap
  staging: ion: remove struct ion_page_pool_item
  staging: ion: simplify ion_page_pool_total()
  staging: ion: tidy up a bit
  staging: rtl8723au: Remove redundant casting in usb_ops_linux.c
  staging: rtl8723au: Remove redundant casting in rtl8723a_hal_init.c
  staging: rtl8723au: Remove redundant casting in rtw_xmit.c
  staging: rtl8723au: Remove redundant casting in rtw_wlan_util.c
  staging: rtl8723au: Remove redundant casting in rtw_sta_mgt.c
  staging: rtl8723au: Remove redundant casting in rtw_recv.c
  staging: rtl8723au: Remove redundant casting in rtw_mlme.c
  ...

2 files changed, 30 insertions, 15 deletions

diff --git a/drivers/platform/goldfish/goldfish_pipe.c b/drivers/platform/goldfish/goldfish_pipe.c
index 4f5aa831f549..d9a09d9637d9 100644
--- a/drivers/platform/goldfish/goldfish_pipe.c
+++ b/drivers/platform/goldfish/goldfish_pipe.c
@@ -56,6 +56,7 @@
 #include <linux/bitops.h>
 #include <linux/slab.h>
 #include <linux/io.h>
+#include <linux/goldfish.h>
 
 /*
  * IMPORTANT: The following constants must match the ones used and defined
@@ -66,8 +67,10 @@
 #define PIPE_REG_COMMAND                0x00  /* write: value = command */
 #define PIPE_REG_STATUS                 0x04  /* read */
 #define PIPE_REG_CHANNEL                0x08  /* read/write: channel id */
+#define PIPE_REG_CHANNEL_HIGH           0x30  /* read/write: channel id */
 #define PIPE_REG_SIZE                   0x0c  /* read/write: buffer size */
 #define PIPE_REG_ADDRESS                0x10  /* write: physical address */
+#define PIPE_REG_ADDRESS_HIGH           0x34  /* write: physical address */
 #define PIPE_REG_WAKES                  0x14  /* read: wake flags */
 #define PIPE_REG_PARAMS_ADDR_LOW        0x18  /* read/write: batch data address */
 #define PIPE_REG_PARAMS_ADDR_HIGH       0x1c  /* read/write: batch data address */
@@ -109,9 +112,9 @@
 #define PIPE_WAKE_WRITE        (1 << 2)  /* pipe can now be written to */
 
 struct access_params {
-        u32 channel;
+        unsigned long channel;
         u32 size;
-        u32 address;
+        unsigned long address;
         u32 cmd;
         u32 result;
         /* reserved for future extension */
@@ -149,13 +152,14 @@ enum {
 
 
 static u32 goldfish_cmd_status(struct goldfish_pipe *pipe, u32 cmd)
-{ 
+{
         unsigned long flags;
         u32 status;
         struct goldfish_pipe_dev *dev = pipe->dev;
 
         spin_lock_irqsave(&dev->lock, flags);
-        writel((u32)pipe, dev->base + PIPE_REG_CHANNEL);
+        gf_write64((u64)(unsigned long)pipe, dev->base + PIPE_REG_CHANNEL,
+                                dev->base + PIPE_REG_CHANNEL_HIGH);
         writel(cmd, dev->base + PIPE_REG_COMMAND);
         status = readl(dev->base + PIPE_REG_STATUS);
         spin_unlock_irqrestore(&dev->lock, flags);
@@ -163,12 +167,13 @@ static u32 goldfish_cmd_status(struct goldfish_pipe *pipe, u32 cmd)
 }
 
 static void goldfish_cmd(struct goldfish_pipe *pipe, u32 cmd)
-{ 
+{
         unsigned long flags;
         struct goldfish_pipe_dev *dev = pipe->dev;
 
         spin_lock_irqsave(&dev->lock, flags);
-        writel((u32)pipe, dev->base + PIPE_REG_CHANNEL);
+        gf_write64((u64)(unsigned long)pipe, dev->base + PIPE_REG_CHANNEL,
+                                dev->base + PIPE_REG_CHANNEL_HIGH);
         writel(cmd, dev->base + PIPE_REG_COMMAND);
         spin_unlock_irqrestore(&dev->lock, flags);
 }
@@ -322,9 +327,12 @@ static ssize_t goldfish_pipe_read_write(struct file *filp, char __user *buffer,
                 spin_lock_irqsave(&dev->lock, irq_flags);
                 if (access_with_param(dev, CMD_WRITE_BUFFER + cmd_offset,
                                 address, avail, pipe, &status)) {
-                        writel((u32)pipe, dev->base + PIPE_REG_CHANNEL);
+                        gf_write64((u64)(unsigned long)pipe,
+                                   dev->base + PIPE_REG_CHANNEL,
+                                   dev->base + PIPE_REG_CHANNEL_HIGH);
                         writel(avail, dev->base + PIPE_REG_SIZE);
-                        writel(address, dev->base + PIPE_REG_ADDRESS);
+                        gf_write64(address, dev->base + PIPE_REG_ADDRESS,
+                                dev->base + PIPE_REG_ADDRESS_HIGH);
                         writel(CMD_WRITE_BUFFER + cmd_offset,
                                         dev->base + PIPE_REG_COMMAND);
                         status = readl(dev->base + PIPE_REG_STATUS);
@@ -447,7 +455,15 @@ static irqreturn_t goldfish_pipe_interrupt(int irq, void *dev_id)
                 /* First read the channel, 0 means the end of the list */
                 struct goldfish_pipe *pipe;
                 unsigned long wakes;
-                unsigned long channel = readl(dev->base + PIPE_REG_CHANNEL);
+                unsigned long channel = 0;
+
+#ifdef CONFIG_64BIT
+                channel = (u64)readl(dev->base + PIPE_REG_CHANNEL_HIGH) << 32;
+
+                if (channel == 0)
+                        break;
+#endif
+                channel |= readl(dev->base + PIPE_REG_CHANNEL);
 
                 if (channel == 0)
                         break;
diff --git a/drivers/platform/goldfish/pdev_bus.c b/drivers/platform/goldfish/pdev_bus.c
index 92cc4cfafde5..8c43589c3edb 100644
--- a/drivers/platform/goldfish/pdev_bus.c
+++ b/drivers/platform/goldfish/pdev_bus.c
@@ -36,6 +36,7 @@
 #define PDEV_BUS_IO_SIZE        (0x14)
 #define PDEV_BUS_IRQ            (0x18)
 #define PDEV_BUS_IRQ_COUNT      (0x1c)
+#define PDEV_BUS_GET_NAME_HIGH  (0x20)
 
 struct pdev_bus_dev {
         struct list_head list;
@@ -129,7 +130,10 @@ static int goldfish_new_pdev(void)
         dev->pdev.dev.dma_mask = (void *)(dev->pdev.name + name_len + 1);
         *dev->pdev.dev.dma_mask = ~0;
 
-        writel((unsigned long)name, pdev_bus_base + PDEV_BUS_GET_NAME);
+#ifdef CONFIG_64BIT
+        writel((u32)((u64)name>>32), pdev_bus_base + PDEV_BUS_GET_NAME_HIGH);
+#endif
+        writel((u32)(unsigned long)name, pdev_bus_base + PDEV_BUS_GET_NAME);
         name[name_len] = '\0';
         dev->pdev.id = readl(pdev_bus_base + PDEV_BUS_ID);
         dev->pdev.resource[0].start = base;
@@ -184,11 +188,6 @@ static int goldfish_pdev_bus_probe(struct platform_device *pdev)
         pdev_bus_addr = r->start;
         pdev_bus_len = resource_size(r);
 
-        if (request_mem_region(pdev_bus_addr, pdev_bus_len, "goldfish")) {
-                dev_err(&pdev->dev, "unable to reserve Goldfish MMIO.\n");
-                return -EBUSY;
-        }
-
         pdev_bus_base = ioremap(pdev_bus_addr, pdev_bus_len);
         if (pdev_bus_base == NULL) {
                 ret = -ENOMEM;