Skip to content

Commit

Permalink
iomap: fix 64 bits resources on 32 bits
Browse files Browse the repository at this point in the history 
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 <benh@kernel.crashing.org>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Benjamin Herrenschmidt authored and Linus Torvalds committed Apr 29, 2008
1 parent 626adeb commit b70d3a2
Show file tree
Hide file tree
Showing 12 changed files with 23 additions and 23 deletions.
4 changes: 2 additions & 2 deletions arch/alpha/kernel/pci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -514,8 +514,8 @@ sys_pciconfig_iobase(long which, unsigned long bus, unsigned long dfn)

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)
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mm/iomap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions arch/frv/mb93090-mb00/pci-iomap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions arch/mips/lib/iomap-pci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ static void __iomem *ioport_map_pci(struct pci_dev *dev,
*/
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)
Expand Down
4 changes: 2 additions & 2 deletions arch/mn10300/unit-asb2305/pci-iomap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions arch/parisc/lib/iomap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions arch/ppc/kernel/pci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1121,8 +1121,8 @@ void __init pci_init_resource(struct resource *res, resource_size_t start,

void __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)
Expand Down
4 changes: 2 additions & 2 deletions arch/sh/drivers/pci/pci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,8 @@ void __init pcibios_update_irq(struct pci_dev *dev, int irq)

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 (unlikely(!len || !start))
Expand Down
4 changes: 2 additions & 2 deletions arch/sparc/lib/iomap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions arch/sparc64/lib/iomap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions arch/v850/kernel/rte_mb_a_pci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -790,8 +790,8 @@ pci_free_consistent (struct pci_dev *pdev, size_t size, void *cpu_addr,

void __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;
Expand Down
2 changes: 1 addition & 1 deletion lib/iomap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ EXPORT_SYMBOL(ioport_unmap);
void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
{
resource_size_t start = pci_resource_start(dev, bar);
unsigned long len = pci_resource_len(dev, bar);
resource_size_t len = pci_resource_len(dev, bar);
unsigned long flags = pci_resource_flags(dev, bar);

if (!len || !start)
Expand Down

0 comments on commit b70d3a2

Please sign in to comment.