From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l6V1z-0003ZA-RS for barebox@lists.infradead.org; Mon, 01 Feb 2021 08:58:01 +0000 Date: Mon, 1 Feb 2021 09:57:58 +0100 Message-ID: <20210201085758.GM19583@pengutronix.de> References: <20210129161116.9971-1-a.fatoum@pengutronix.de> <20210129161116.9971-4-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210129161116.9971-4-a.fatoum@pengutronix.de> From: Sascha Hauer List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: Re: [PATCH 4/8] asm-generic: io.h: remove wrong use of IOMEM To: Ahmad Fatoum Cc: barebox@lists.infradead.org On Fri, Jan 29, 2021 at 05:11:12PM +0100, Ahmad Fatoum wrote: > addr is already __iomem, but we need to force strip that away to use it > as normal pointer. Define __io_virt like Linux does and use it. > > Signed-off-by: Ahmad Fatoum > --- > include/asm-generic/io.h | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h > index 150a97645b6b..a4b0dc4b4337 100644 > --- a/include/asm-generic/io.h > +++ b/include/asm-generic/io.h > @@ -425,6 +425,8 @@ static inline void iowrite64be(u64 value, volatile void __iomem *addr) > #define IOMEM(addr) ((void __force __iomem *)(addr)) > #endif > > +#define __io_virt(x) ((void __force *)(x)) > + > #ifndef memset_io > #define memset_io memset_io > /** > @@ -438,7 +440,7 @@ static inline void iowrite64be(u64 value, volatile void __iomem *addr) > static inline void memset_io(volatile void __iomem *addr, int value, > size_t size) > { > - memset(IOMEM(addr), value, size); > + memset(__io_virt(addr), value, size); > } Why did you add it differently than Linux in the first place? Should this be merged into 2/8? Sascha -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox