iomap: Fix 64 bits resources on 32 bits
Subsystems (8)
PATCH 1/1 iomap: Fix 64 bits resources on 32 bits
Almost all implementations of pci_iomap() in the kernel, including the generic lib/iomap.c one, copies the content of a struct resource into unsigned long's which will break on 32 bits platforms with 64 bits resources.
This fixes all definitions of pci_iomap() to use resource_size_t. I also "fixed" the 64bits arch for consistency.
Signed-off-by Benjamin Herrenschmidt <[email protected]>
---
arch/alpha/kernel/pci.c | 4 ++-- arch/arm/mm/iomap.c | 4 ++-- arch/frv/mb93090-mb00/pci-iomap.c | 4 ++-- arch/mips/lib/iomap-pci.c | 4 ++-- arch/mn10300/unit-asb2305/pci-iomap.c | 4 ++-- arch/parisc/lib/iomap.c | 4 ++-- arch/ppc/kernel/pci.c | 4 ++-- arch/sh/drivers/pci/pci.c | 4 ++-- arch/sparc/lib/iomap.c | 4 ++-- arch/sparc64/lib/iomap.c | 4 ++-- arch/v850/kernel/rte_mb_a_pci.c | 4 ++-- lib/iomap.c | 4 ++-- 12 files changed, 24 insertions(+), 24 deletions(-)
lib/iomap.c +2 -2
@@ -256,8 +256,8 @@ EXPORT_SYMBOL(ioport_unmap);* */ void __iomem *pci_iomap (struct pci_dev *dev,int bar,unsigned long maxlen) { -unsigned long start =pci_resource_start (dev, bar); -unsigned long len =pci_resource_len (dev, bar); +resource_size_t start =pci_resource_start (dev, bar); +resource_size_t len =pci_resource_len (dev, bar);unsigned long flags =pci_resource_flags (dev, bar);if (!len || !start)
arch/alpha/kernel/pci.c +2 -2
@@ -547,8 +547,8 @@ sys_pciconfig_iobase(long which, unsignevoid __iomem *pci_iomap (struct pci_dev *dev,int bar,unsigned long maxlen) { -unsigned long start =pci_resource_start (dev, bar); -unsigned long len =pci_resource_len (dev, bar); +resource_size_t start =pci_resource_start (dev, bar); +resource_size_t len =pci_resource_len (dev, bar);unsigned long flags =pci_resource_flags (dev, bar);if (!len || !start)
arch/arm/mm/iomap.c +2 -2
@@ -26,8 +26,8 @@ EXPORT_SYMBOL(ioport_unmap);#ifdef CONFIG_PCI void __iomem *pci_iomap (struct pci_dev *dev,int bar,unsigned long maxlen) { -unsigned long start =pci_resource_start (dev, bar); -unsigned long len =pci_resource_len (dev, bar); +resource_size_t start =pci_resource_start (dev, bar); +resource_size_t len =pci_resource_len (dev, bar);unsigned long flags =pci_resource_flags (dev, bar);if (!len || !start)
arch/frv/mb93090-mb00/pci-iomap.c +2 -2
@@ -13,8 +13,8 @@void __iomem *pci_iomap (struct pci_dev *dev,int bar,unsigned long maxlen) { -unsigned long start =pci_resource_start (dev, bar); -unsigned long len =pci_resource_len (dev, bar); +resource_size_t start =pci_resource_start (dev, bar); +resource_size_t len =pci_resource_len (dev, bar);unsigned long flags =pci_resource_flags (dev, bar);if (!len || !start)
arch/mips/lib/iomap-pci.c +2 -2
@@ -45,8 +45,8 @@ static void __iomem *ioport_map_pci(stru*/ void __iomem *pci_iomap (struct pci_dev *dev,int bar,unsigned long maxlen) { -unsigned long start =pci_resource_start (dev, bar); -unsigned long len =pci_resource_len (dev, bar); +resource_size_t start =pci_resource_start (dev, bar); +resource_size_t len =pci_resource_len (dev, bar);unsigned long flags =pci_resource_flags (dev, bar);if (!len || !start)
arch/parisc/lib/iomap.c +2 -2
@@ -438,8 +438,8 @@ void ioport_unmap(void __iomem *addr)/* Create a virtual mapping cookie for a PCI BAR (memory or IO) */ void __iomem *pci_iomap (struct pci_dev *dev,int bar,unsigned long maxlen) { -unsigned long start =pci_resource_start (dev, bar); -unsigned long len =pci_resource_len (dev, bar); +resource_size_t start =pci_resource_start (dev, bar); +resource_size_t len =pci_resource_len (dev, bar);unsigned long flags =pci_resource_flags (dev, bar);if (!len || !start)
arch/sh/drivers/pci/pci.c +2 -2
@@ -191,8 +191,8 @@ void __init pcibios_update_irq(struct pcvoid __iomem *pci_iomap (struct pci_dev *dev,int bar,unsigned long maxlen) { -unsigned long start =pci_resource_start (dev, bar); -unsigned long len =pci_resource_len (dev, bar); +resource_size_t start =pci_resource_start (dev, bar); +resource_size_t len =pci_resource_len (dev, bar);unsigned long flags =pci_resource_flags (dev, bar);if (unlikely (!len || !start))
arch/mn10300/unit-asb2305/pci-iomap.c +2 -2
@@ -16,8 +16,8 @@*/ void __iomem *pci_iomap (struct pci_dev *dev,int bar,unsigned long maxlen) { -unsigned long start =pci_resource_start (dev, bar); -unsigned long len =pci_resource_len (dev, bar); +resource_size_t start =pci_resource_start (dev, bar); +resource_size_t len =pci_resource_len (dev, bar);unsigned long flags =pci_resource_flags (dev, bar);if (!len || !start)
arch/ppc/kernel/pci.c +2 -2
@@ -1176,8 +1176,8 @@ void __init pci_init_resource(struct resvoid __iomem *pci_iomap (struct pci_dev *dev,int bar,unsigned long max) { -unsigned long start =pci_resource_start (dev, bar); -unsigned long len =pci_resource_len (dev, bar); +resource_size_t start =pci_resource_start (dev, bar); +resource_size_t len =pci_resource_len (dev, bar);unsigned long flags =pci_resource_flags (dev, bar);if (!len)
arch/sparc/lib/iomap.c +2 -2
@@ -21,8 +21,8 @@ EXPORT_SYMBOL(ioport_unmap);/* Create a virtual mapping cookie for a PCI BAR (memory or IO) */ void __iomem *pci_iomap (struct pci_dev *dev,int bar,unsigned long maxlen) { -unsigned long start =pci_resource_start (dev, bar); -unsigned long len =pci_resource_len (dev, bar); +resource_size_t start =pci_resource_start (dev, bar); +resource_size_t len =pci_resource_len (dev, bar);unsigned long flags =pci_resource_flags (dev, bar);if (!len || !start)
arch/sparc64/lib/iomap.c +2 -2
@@ -21,8 +21,8 @@ EXPORT_SYMBOL(ioport_unmap);/* Create a virtual mapping cookie for a PCI BAR (memory or IO) */ void __iomem *pci_iomap (struct pci_dev *dev,int bar,unsigned long maxlen) { -unsigned long start =pci_resource_start (dev, bar); -unsigned long len =pci_resource_len (dev, bar); +resource_size_t start =pci_resource_start (dev, bar); +resource_size_t len =pci_resource_len (dev, bar);unsigned long flags =pci_resource_flags (dev, bar);if (!len || !start)
arch/v850/kernel/rte_mb_a_pci.c +2 -2
@@ -790,8 +790,8 @@ pci_free_consistent (struct pci_dev *pdevoid __iomem *pci_iomap (struct pci_dev *dev,int bar,unsigned long max) { -unsigned long start =pci_resource_start (dev, bar); -unsigned long len =pci_resource_len (dev, bar); +resource_size_t start =pci_resource_start (dev, bar); +resource_size_t len =pci_resource_len (dev, bar);if (!start || len ==0 )return 0 ;