| Message ID | 1393506599-11561-2-git-send-email-Liviu.Dudau@arm.com |
|---|---|
| State | Deferred |
| Headers | show |
On Thursday 27 February 2014 13:09:57 Liviu Dudau wrote: > The inline version of ioport_map() that gets used when !CONFIG_GENERIC_IOMAP > 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. > > Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com> > > Acked-by: Arnd Bergmann <arnd@arndb.de> -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h index d5afe96..df72051 100644 --- 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 (void __iomem *)(PCI_IOBASE + (port & IO_SPACE_LIMIT)); } static inline void ioport_unmap(void __iomem *p)
The inline version of ioport_map() that gets used when !CONFIG_GENERIC_IOMAP 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. Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com>