From c1bc97f8f498a2bfab63ceef761fb0e88ef7c065 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Mon, 28 Apr 2014 20:50:56 +0100 Subject: goldfish bus: don't call request_mem_region This is a bug fix that has been lurking in the Google tree but not pushed upstream. From: Octavian Purdila The memory region is already reserved in goldfish_init() during platform init. Signed-off-by: Octavian Purdila Signed-off-by: Jun Tian Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman --- drivers/platform/goldfish/pdev_bus.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'drivers/platform/goldfish/pdev_bus.c') diff --git a/drivers/platform/goldfish/pdev_bus.c b/drivers/platform/goldfish/pdev_bus.c index 92cc4cfafde5..4eb2bb34790d 100644 --- a/drivers/platform/goldfish/pdev_bus.c +++ b/drivers/platform/goldfish/pdev_bus.c @@ -184,11 +184,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; -- cgit v1.2.3 From f10d8434201859d5ad7f51032dcd2d0c09e85ee2 Mon Sep 17 00:00:00 2001 From: Octavian Purdila Date: Mon, 12 May 2014 16:55:05 +0100 Subject: 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 Signed-off-by: Jun Tian Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman --- drivers/platform/goldfish/pdev_bus.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'drivers/platform/goldfish/pdev_bus.c') 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; -- cgit v1.2.3 From f2dbdf625ddc98fece71a79d78d0981204e933ee Mon Sep 17 00:00:00 2001 From: Octavian Purdila Date: Fri, 16 May 2014 08:24:58 +0300 Subject: goldfish: bus: fix warnings for 32bit builds drivers/platform/goldfish/pdev_bus.c: In function 'goldfish_new_pdev': drivers/platform/goldfish/pdev_bus.c:136:14: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] writel((u32)(u64)name, pdev_bus_base + PDEV_BUS_GET_NAME); Reported-by: Fengguang Wu Cc: Jun Tian Acked-by: Alan Cox Signed-off-by: Octavian Purdila Signed-off-by: Greg Kroah-Hartman --- drivers/platform/goldfish/pdev_bus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/platform/goldfish/pdev_bus.c') diff --git a/drivers/platform/goldfish/pdev_bus.c b/drivers/platform/goldfish/pdev_bus.c index eb254400c44a..8c43589c3edb 100644 --- a/drivers/platform/goldfish/pdev_bus.c +++ b/drivers/platform/goldfish/pdev_bus.c @@ -133,7 +133,7 @@ static int goldfish_new_pdev(void) #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); + 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; -- cgit v1.2.3