| Message ID | 20190620221224.27352-1-paul.burton@mips.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 262e4c3893aca09d1749790880d6b9bdb047c0b9 |
| Headers | show |
| Series | FDDI: defza: Include linux/io-64-nonatomic-lo-hi.h | expand |
On Thu, 20 Jun 2019, Paul Burton wrote: > Maciej, David, if you'd be happy to provide an Ack so that I can take > this through the mips-next branch that would be great; that'll let me > apply it prior to the asm/io.h change. Acked-by: Maciej W. Rozycki <macro@linux-mips.org> Sure, thanks for doing this work. Maciej
From: Paul Burton <paul.burton@mips.com> Date: Thu, 20 Jun 2019 22:13:58 +0000 > Currently arch/mips/include/asm/io.h provides 64b memory accessor > functions such as readq & writeq even on MIPS32 platforms where those > accessors cannot actually perform a 64b memory access. They instead > BUG(). This is unfortunate for drivers which either #ifdef on the > presence of these accessors, or can function with non-atomic > implementations of them found in either linux/io-64-nonatomic-lo-hi.h or > linux/io-64-nonatomic-hi-lo.h. As such we're preparing to remove the > definitions of these 64b accessor functions for MIPS32 kernels. > > In preparation for this, include linux/io-64-nonatomic-lo-hi.h in > defza.c in order to provide a non-atomic implementation of the > readq_relaxed & writeq_relaxed functions that are used by this code. In > practice this will have no runtime effect, since use of the 64b accessor > functions is conditional upon sizeof(unsigned long) == 8, ie. upon > CONFIG_64BIT=y. This means the calls to these non-atomic readq & writeq > implementations will be optimized out anyway, but we need their > definitions to keep the compiler happy. > > For 64bit kernels using this code this change should also have no effect > because asm/io.h will continue to provide the definitions of > readq_relaxed & writeq_relaxed, which linux/io-64-nonatomic-lo-hi.h > checks for before defining itself. > > Signed-off-by: Paul Burton <paul.burton@mips.com> ... > Maciej, David, if you'd be happy to provide an Ack so that I can take > this through the mips-next branch that would be great; that'll let me > apply it prior to the asm/io.h change. Acked-by: David S. Miller <davem@davemloft.net>
Hello, Paul Burton wrote: > Currently arch/mips/include/asm/io.h provides 64b memory accessor > functions such as readq & writeq even on MIPS32 platforms where those > accessors cannot actually perform a 64b memory access. They instead > BUG(). This is unfortunate for drivers which either #ifdef on the > presence of these accessors, or can function with non-atomic > implementations of them found in either linux/io-64-nonatomic-lo-hi.h or > linux/io-64-nonatomic-hi-lo.h. As such we're preparing to remove the > definitions of these 64b accessor functions for MIPS32 kernels. > > In preparation for this, include linux/io-64-nonatomic-lo-hi.h in > defza.c in order to provide a non-atomic implementation of the > readq_relaxed & writeq_relaxed functions that are used by this code. In > practice this will have no runtime effect, since use of the 64b accessor > functions is conditional upon sizeof(unsigned long) == 8, ie. upon > CONFIG_64BIT=y. This means the calls to these non-atomic readq & writeq > implementations will be optimized out anyway, but we need their > definitions to keep the compiler happy. > > For 64bit kernels using this code this change should also have no effect > because asm/io.h will continue to provide the definitions of > readq_relaxed & writeq_relaxed, which linux/io-64-nonatomic-lo-hi.h > checks for before defining itself. > > Signed-off-by: Paul Burton <paul.burton@mips.com> > Cc: Serge Semin <Sergey.Semin@t-platforms.ru> > Cc: "Maciej W. Rozycki" <macro@linux-mips.org> > Cc: "David S. Miller" <davem@davemloft.net> > Cc: netdev@vger.kernel.org > Cc: linux-mips@vger.kernel.org > Cc: linux-kernel@vger.kernel.org > Acked-by: Maciej W. Rozycki <macro@linux-mips.org> > Acked-by: David S. Miller <davem@davemloft.net> Applied to mips-next. Thanks, Paul [ This message was auto-generated; if you believe anything is incorrect then please email paul.burton@mips.com to report it. ]
diff --git a/drivers/net/fddi/defza.c b/drivers/net/fddi/defza.c index c5cae8e74dc4..060712c666bf 100644 --- a/drivers/net/fddi/defza.c +++ b/drivers/net/fddi/defza.c @@ -33,6 +33,7 @@ #include <linux/init.h> #include <linux/interrupt.h> #include <linux/io.h> +#include <linux/io-64-nonatomic-lo-hi.h> #include <linux/ioport.h> #include <linux/kernel.h> #include <linux/list.h>
Currently arch/mips/include/asm/io.h provides 64b memory accessor functions such as readq & writeq even on MIPS32 platforms where those accessors cannot actually perform a 64b memory access. They instead BUG(). This is unfortunate for drivers which either #ifdef on the presence of these accessors, or can function with non-atomic implementations of them found in either linux/io-64-nonatomic-lo-hi.h or linux/io-64-nonatomic-hi-lo.h. As such we're preparing to remove the definitions of these 64b accessor functions for MIPS32 kernels. In preparation for this, include linux/io-64-nonatomic-lo-hi.h in defza.c in order to provide a non-atomic implementation of the readq_relaxed & writeq_relaxed functions that are used by this code. In practice this will have no runtime effect, since use of the 64b accessor functions is conditional upon sizeof(unsigned long) == 8, ie. upon CONFIG_64BIT=y. This means the calls to these non-atomic readq & writeq implementations will be optimized out anyway, but we need their definitions to keep the compiler happy. For 64bit kernels using this code this change should also have no effect because asm/io.h will continue to provide the definitions of readq_relaxed & writeq_relaxed, which linux/io-64-nonatomic-lo-hi.h checks for before defining itself. Signed-off-by: Paul Burton <paul.burton@mips.com> Cc: Serge Semin <Sergey.Semin@t-platforms.ru> Cc: "Maciej W. Rozycki" <macro@linux-mips.org> Cc: "David S. Miller" <davem@davemloft.net> Cc: netdev@vger.kernel.org Cc: linux-mips@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- Maciej, David, if you'd be happy to provide an Ack so that I can take this through the mips-next branch that would be great; that'll let me apply it prior to the asm/io.h change. --- drivers/net/fddi/defza.c | 1 + 1 file changed, 1 insertion(+)