staging/xgifb: fix addressing issues on platform with long physical addressing

Some platforms (e.g. ppc460ex) have 36-bit physical addressing, while
sizeof(unsigned long) == 4. Adapt xgifb driver to use phys_addr_t for
physical address variables instead of unsigned long.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c
index c55240b..1c93a03 100644 (file)
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@ -1910,8 +1910,8 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
        xgifb_info->mmio_base = pci_resource_start(pdev, 1);
        xgifb_info->mmio_size = pci_resource_len(pdev, 1);
        xgifb_info->vga_base = pci_resource_start(pdev, 2) + 0x30;
-       pr_info("Relocate IO address: %lx [%08lx]\n",
-              (unsigned long)pci_resource_start(pdev, 2),
+       pr_info("Relocate IO address: %Lx [%08lx]\n",
+              (u64) pci_resource_start(pdev, 2),
               xgifb_info->vga_base);
 
        if (pci_enable_device(pdev)) {
@@ -2003,13 +2003,13 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
        xgifb_info->mmio_vbase = ioremap(xgifb_info->mmio_base,
                                            xgifb_info->mmio_size);
 
-       pr_info("Framebuffer at 0x%lx, mapped to 0x%p, size %dk\n",
-              xgifb_info->video_base,
+       pr_info("Framebuffer at 0x%Lx, mapped to 0x%p, size %dk\n",
+              (u64) xgifb_info->video_base,
               xgifb_info->video_vbase,
               xgifb_info->video_size / 1024);
 
-       pr_info("MMIO at 0x%lx, mapped to 0x%p, size %ldk\n",
-              xgifb_info->mmio_base, xgifb_info->mmio_vbase,
+       pr_info("MMIO at 0x%Lx, mapped to 0x%p, size %ldk\n",
+              (u64) xgifb_info->mmio_base, xgifb_info->mmio_vbase,
               xgifb_info->mmio_size / 1024);
 
        pci_set_drvdata(pdev, xgifb_info);

diff --git a/drivers/staging/xgifb/XGIfb.h b/drivers/staging/xgifb/XGIfb.h
index 37bb730..bea222d 100644 (file)
--- a/drivers/staging/xgifb/XGIfb.h
+++ b/drivers/staging/xgifb/XGIfb.h
@@ -66,9 +66,9 @@ struct xgifb_video_info {
 
        int           chip_id;
        unsigned int  video_size;
-       unsigned long video_base;
+       phys_addr_t   video_base;
        void __iomem *video_vbase;
-       unsigned long mmio_base;
+       phys_addr_t   mmio_base;
        unsigned long mmio_size;
        void __iomem *mmio_vbase;
        unsigned long vga_base;