On Wed, Apr 20, 2016 at 04:09:05PM +0200, Andrew Jones wrote:
> On Wed, Apr 20, 2016 at 03:18:53PM +0200, Alexander Gordeev wrote:
> > Cc: Andrew Jones <drjones@xxxxxxxxxx>
> > Cc: Thomas Huth <thuth@xxxxxxxxxx>
> > Cc: Radim Krčmář <rkrcmar@xxxxxxxxxx>
> > Signed-off-by: Alexander Gordeev <agordeev@xxxxxxxxxx>
> > ---
> > lib/asm-generic/io.h | 42 ++++++++++++++++++++++++++++++++++++++++++
> > lib/x86/asm/io.h | 30 ++++++++++++++++++------------
> > 2 files changed, 60 insertions(+), 12 deletions(-)
> >
> > diff --git a/lib/asm-generic/io.h b/lib/asm-generic/io.h
> > index 3585ac0..5c29ece 100644
> > --- a/lib/asm-generic/io.h
> > +++ b/lib/asm-generic/io.h
> > @@ -152,6 +152,48 @@ static inline u64 __bswap64(u64 x)
> > #define writeq(b, addr) \
> > ({ wmb(); __raw_writeq(cpu_to_le64(b), addr); })
> >
> > +#ifndef inb
> > +static inline uint8_t inb(unsigned long port)
> > +{
> > + return readb((const volatile void __iomem *)port);
> > +}
> > +#endif
> > +
> > +#ifndef inw
> > +static inline uint16_t inw(unsigned long port)
> > +{
> > + return readw((const volatile void __iomem *)port);
> > +}
> > +#endif
> > +
> > +#ifndef inl
> > +static inline uint32_t inl(unsigned long port)
> > +{
> > + return readl((const volatile void __iomem *)port);
> > +}
> > +#endif
> > +
> > +#ifndef outb
> > +static inline void outb(uint8_t value, unsigned long port)
> > +{
> > + writeb(value, (volatile void __iomem *)port);
> > +}
> > +#endif
> > +
> > +#ifndef outw
> > +static inline void outw(uint16_t value, unsigned long port)
> > +{
> > + writew(value, (volatile void __iomem *)port);
> > +}
> > +#endif
> > +
> > +#ifndef outl
> > +static inline void outl(uint32_t value, unsigned long port)
> > +{
> > + writel(value, (volatile void __iomem *)port);
> > +}
> > +#endif
> > +
> > #ifndef ioremap
> > static inline void *ioremap(u64 phys_addr, size_t size __unused)
> > {
> > diff --git a/lib/x86/asm/io.h b/lib/x86/asm/io.h
> > index 74451d5..03f41af 100644
> > --- a/lib/x86/asm/io.h
> > +++ b/lib/x86/asm/io.h
> > @@ -4,40 +4,46 @@
> > #include "asm/page.h"
> > #include "asm/barrier.h"
> >
> > -static inline unsigned char inb(unsigned short port)
> > +#define inb inb
> > +static inline uint8_t inb(unsigned long port)
> > {
> > unsigned char value;
> > - asm volatile("inb %w1, %0" : "=a" (value) : "Nd" (port));
> > + asm volatile("inb %w1, %0" : "=a" (value) : "Nd" ((unsigned short)port));
> > return value;
> > }
> >
> > -static inline unsigned short inw(unsigned short port)
> > +#define inw inw
> > +static inline uint16_t inw(unsigned long port)
> > {
> > unsigned short value;
> > - asm volatile("inw %w1, %0" : "=a" (value) : "Nd" (port));
> > + asm volatile("inw %w1, %0" : "=a" (value) : "Nd" ((unsigned short)port));
> > return value;
> > }
> >
> > -static inline unsigned int inl(unsigned short port)
> > +#define inl inl
> > +static inline uint32_t inl(unsigned long port)
> > {
> > unsigned int value;
> > - asm volatile("inl %w1, %0" : "=a" (value) : "Nd" (port));
> > + asm volatile("inl %w1, %0" : "=a" (value) : "Nd" ((unsigned short)port));
> > return value;
> > }
> >
> > -static inline void outb(unsigned char value, unsigned short port)
> > +#define outb outb
> > +static inline void outb(uint8_t value, unsigned long port)
> > {
> > - asm volatile("outb %b0, %w1" : : "a"(value), "Nd"(port));
> > + asm volatile("outb %b0, %w1" : : "a"(value), "Nd"((unsigned short)port));
> > }
> >
> > -static inline void outw(unsigned short value, unsigned short port)
> > +#define outw outw
> > +static inline void outw(uint16_t value, unsigned long port)
> > {
> > - asm volatile("outw %w0, %w1" : : "a"(value), "Nd"(port));
> > + asm volatile("outw %w0, %w1" : : "a"(value), "Nd"((unsigned short)port));
> > }
> >
> > -static inline void outl(unsigned int value, unsigned short port)
> > +#define outl outl
> > +static inline void outl(uint32_t value, unsigned long port)
> > {
> > - asm volatile("outl %0, %w1" : : "a"(value), "Nd"(port));
> > + asm volatile("outl %0, %w1" : : "a"(value), "Nd"((unsigned short)port));
> > }
> >
> > #include <asm-generic/io.h>
> > --
> > 1.8.3.1
> >
>
> I'm not sure we need this patch, and I know Radim didn't like it when
> I've proposed it in the past :-)
It is not required for this series as there are no consumers, indeed.
But it will be needed for the PCI series anyway :)
> drew
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
