diff options
| author | Octavian Purdila <octavian.purdila@intel.com> | 2014-05-12 17:55:05 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-15 22:19:00 +0200 |
| commit | f10d8434201859d5ad7f51032dcd2d0c09e85ee2 (patch) | |
| tree | d063c057509a94a571c250567ec8601e9c85204e /drivers/platform/goldfish | |
| parent | goldfish: fix kernel panic when using multiple adb connection (diff) | |
| download | linux-f10d8434201859d5ad7f51032dcd2d0c09e85ee2.tar.xz linux-f10d8434201859d5ad7f51032dcd2d0c09e85ee2.zip | |
goldfish: add support for 64bit to the virtual bus
This patchs adds a new register to pass the upper 32bits for the
device name address when running in 64bit mode.
Signed-off-by: Octavian Purdila <octavian.purdila@intel.com>
Signed-off-by: Jun Tian <jun.j.tian@intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/platform/goldfish')
| -rw-r--r-- | drivers/platform/goldfish/pdev_bus.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/platform/goldfish/pdev_bus.c b/drivers/platform/goldfish/pdev_bus.c index 4eb2bb34790d..eb254400c44a 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)(u64)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; |