asm-generic/io.h: Fix ioport_map() for !CONFIG_GENERIC_IOMAP

dliviu · bjorn-helgaas · commit 112eeaa7f87b · 2014-09-30T09:42:44.000-06:00
The !CONFIG_GENERIC_IOMAP version of ioport_map() is wrong.  It returns a
mapped, i.e., virtual, address that can start from zero and completely
ignores the PCI_IOBASE and IO_SPACE_LIMIT that most architectures that use
!CONFIG_GENERIC_MAP define.

Tested-by: Tanmay Inamdar &lt;tinamdar@apm.com&gt;
Signed-off-by: Liviu Dudau &lt;Liviu.Dudau@arm.com&gt;
Signed-off-by: Bjorn Helgaas &lt;bhelgaas@google.com&gt;
Reviewed-by: Catalin Marinas &lt;catalin.marinas@arm.com&gt;
Acked-by: Arnd Bergmann &lt;arnd@arndb.de&gt;
diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
@@ -331,7 +331,7 @@ static inline void iounmap(void __iomem *addr)
 #ifndef CONFIG_GENERIC_IOMAP
 static inline void __iomem *ioport_map(unsigned long port, unsigned int nr)
 {
-	return (void __iomem *) port;
+	return PCI_IOBASE + (port & IO_SPACE_LIMIT);
 }
 
 static inline void ioport_unmap(void __iomem *p)

Original file line number	Diff line number	Diff line change
`@@ -331,7 +331,7 @@ static inline void iounmap(void __iomem *addr)`
`331`	`331`	`#ifndef CONFIG_GENERIC_IOMAP`
`332`	`332`	`static inline void __iomem *ioport_map(unsigned long port, unsigned int nr)`
`333`	`333`	`{`
`334`		`- return (void __iomem *) port;`
	`334`	`+ return PCI_IOBASE + (port & IO_SPACE_LIMIT);`
`335`	`335`	`}`
`336`	`336`
`337`	`337`	`static inline void ioport_unmap(void __iomem *p)`