From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexander Gordeev Subject: Re: [PATCH 7/9] io: Introduce generic IO accessors Date: Thu, 21 Apr 2016 08:37:26 +0200 Message-ID: <20160421063726.GC3725@agordeev.lab.eng.brq.redhat.com> References: <3d2b59e696bf88defcb85877c72889d0e0019a10.1461155725.git.agordeev@redhat.com> <20160420140905.bmtwxhqqzf4rb5o3@hawk.localdomain> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: kvm@vger.kernel.org, Thomas Huth , Radim =?utf-8?B?S3LEjW3DocWZ?= To: Andrew Jones Return-path: Received: from mx1.redhat.com ([209.132.183.28]:46297 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751796AbcDUGiX (ORCPT ); Thu, 21 Apr 2016 02:38:23 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D208A10F1BA for ; Thu, 21 Apr 2016 06:38:22 +0000 (UTC) Content-Disposition: inline In-Reply-To: <20160420140905.bmtwxhqqzf4rb5o3@hawk.localdomain> Sender: kvm-owner@vger.kernel.org List-ID: 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 > > Cc: Thomas Huth > > Cc: Radim Kr=C4=8Dm=C3=A1=C5=99 > > Signed-off-by: Alexander Gordeev > > --- > > lib/asm-generic/io.h | 42 ++++++++++++++++++++++++++++++++++++++++= ++ > > lib/x86/asm/io.h | 30 ++++++++++++++++++------------ > > 2 files changed, 60 insertions(+), 12 deletions(-) > >=20 > > 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); }) > > =20 > > +#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" > > =20 > > -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" : "=3Da" (value) : "Nd" (port)); > > + asm volatile("inb %w1, %0" : "=3Da" (value) : "Nd" ((unsigned = short)port)); > > return value; > > } > > =20 > > -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" : "=3Da" (value) : "Nd" (port)); > > + asm volatile("inw %w1, %0" : "=3Da" (value) : "Nd" ((unsigned = short)port)); > > return value; > > } > > =20 > > -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" : "=3Da" (value) : "Nd" (port)); > > + asm volatile("inl %w1, %0" : "=3Da" (value) : "Nd" ((unsigned = short)port)); > > return value; > > } > > =20 > > -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 sh= ort)port)); > > } > > =20 > > -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 sh= ort)port)); > > } > > =20 > > -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 sho= rt)port)); > > } > > =20 > > #include > > --=20 > > 1.8.3.1 > > >=20 > 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=20