make io{read|write}64 globally usable
Subsystems (7)
v5 cover make io{read|write}64 globally usable
Changes since v4:
- Add functions so the powerpc implementation of iomap.c compiles. (As noticed by Horia)
Changes since v3:
- I noticed powerpc didn't use the appropriate functions seeing readq/writeq were not defined when iomap.h was included. Thus I've included a patch to adjust this
- Fixed some mistakes with a couple of the defines in io-64-nonatomic* headers
- Fixed a typo noticed by Horia.
(earlier versions were drastically different)
Horia Geantă (1):
crypto: caam: cleanup CONFIG_64BIT ifdefs when using io{read|write}64
Logan Gunthorpe (5):
powerpc: io.h: move iomap.h include so that it can use readq/writeq
defs
powerpc: iomap.c: introduce io{read|write}64_{lo_hi|hi_lo}
iomap: introduce io{read|write}64_{lo_hi|hi_lo}
io-64-nonatomic: add io{read|write}64[be]{_lo_hi|_hi_lo} macros
ntb: ntb_hw_intel: use io-64-nonatomic instead of in-driver hacks
arch/powerpc/include/asm/io.h | 6 +- arch/powerpc/kernel/iomap.c | 40 +++++++++++ drivers/crypto/caam/regs.h | 35 ++------- drivers/ntb/hw/intel/ntb_hw_intel.c | 30 +------- include/asm-generic/iomap.h | 26 +++++-- include/linux/io-64-nonatomic-hi-lo.h | 60 ++++++++++++++++ include/linux/io-64-nonatomic-lo-hi.h | 60 ++++++++++++++++ lib/iomap.c | 132 ++++++++++++++++++++++++++++++++++ 8 files changed, 322 insertions(+), 67 deletions(-)
--
2.11.0
PATCH v5 1/6 powerpc: io.h: move iomap.h include so that it can use readq/writeq defs
Subsequent patches in this series makes use of the readq and writeq defines in iomap.h. However, as is, they get missed on the powerpc platform seeing the include comes before the define. This patch moves the include down to fix this.
--- arch/powerpc/include/asm/io.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/include/asm/io.h +2 -2
@@ -33,8 +33,6 @@ extern struct pci_dev *isa_bridge_pcidev;#include <asm/mmu.h> #include <asm/ppc_asm.h> -#include <asm-generic/iomap.h> -#ifdef CONFIG_PPC64 #include <asm/paca.h> #endif
@@ -663,6 +661,8 @@ static inline void name at \#define writel_relaxed (v, addr) writel(v, addr)#define writeq_relaxed (v, addr) writeq(v, addr) +#include <asm-generic/iomap.h> +#ifdef CONFIG_PPC32 #define mmiowb ()#else
Signature · 1 line
2.11.0
PATCH v5 2/6 powerpc: iomap.c: introduce io{read|write}64_{lo_hi|hi_lo}
In reply to Logan GunthorpeThese functions will be introduced into the generic iomap.c so they can deal with PIO accesses in hi-lo/lo-hi variants. Thus, the powerpc version of iomap.c will need to provide the same functions even though, in this arch, they are identical to the regular io{read|write}64 functions.
--- arch/powerpc/kernel/iomap.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+)
arch/powerpc/kernel/iomap.c +40 -0
@@ -44,12 +44,32 @@ u64 ioread64(void __iomem *addr) {return readq (addr); } +u64 ioread64_lo_hi (void __iomem *addr) +{ +return readq (addr); +} +u64 ioread64_hi_lo (void __iomem *addr) +{ +return readq (addr); +}u64 ioread64be (void __iomem *addr) {return readq_be (addr); } +u64 ioread64be_lo_hi (void __iomem *addr) +{ +return readq_be (addr); +} +u64 ioread64be_hi_lo (void __iomem *addr) +{ +return readq_be (addr); +}EXPORT_SYMBOL (ioread64); +EXPORT_SYMBOL (ioread64_lo_hi); +EXPORT_SYMBOL (ioread64_hi_lo);EXPORT_SYMBOL (ioread64be); +EXPORT_SYMBOL (ioread64be_lo_hi); +EXPORT_SYMBOL (ioread64be_hi_lo);#endif /* __powerpc64__ */ void iowrite8 (u8 val,void __iomem *addr)
@@ -82,12 +102,32 @@ void iowrite64(u64 val, void __iomem *addr) {writeq (val, addr); } +void iowrite64_lo_hi (u64 val,void __iomem *addr) +{ +writeq (val, addr); +} +void iowrite64_hi_lo (u64 val,void __iomem *addr) +{ +writeq (val, addr); +}void iowrite64be (u64 val,void __iomem *addr) {writeq_be (val, addr); } +void iowrite64be_lo_hi (u64 val,void __iomem *addr) +{ +writeq_be (val, addr); +} +void iowrite64be_hi_lo (u64 val,void __iomem *addr) +{ +writeq_be (val, addr); +}EXPORT_SYMBOL (iowrite64); +EXPORT_SYMBOL (iowrite64_lo_hi); +EXPORT_SYMBOL (iowrite64_hi_lo);EXPORT_SYMBOL (iowrite64be); +EXPORT_SYMBOL (iowrite64be_lo_hi); +EXPORT_SYMBOL (iowrite64be_hi_lo);#endif /* __powerpc64__ */ /*
Signature · 1 line
2.11.0
PATCH v5 3/6 iomap: introduce io{read|write}64_{lo_hi|hi_lo}
In reply to Logan GunthorpeIn order to provide non-atomic functions for io{read|write}64 that will use readq and writeq when appropriate. We define a number of variants of these functions in the generic iomap that will do non-atomic operations on pio but atomic operations on mmio.
These functions are only defined if readq and writeq are defined. If they are not, then the wrappers that always use non-atomic operations from include/linux/io-64-nonatomic*.h will be used.
--- arch/powerpc/include/asm/io.h | 2 + include/asm-generic/iomap.h | 26 +++++++-- lib/iomap.c | 132 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 154 insertions(+), 6 deletions(-)
arch/powerpc/include/asm/io.h +2 -0
@@ -788,8 +788,10 @@ extern void __iounmap_at(void *ea, unsigned long size);#define mmio_read16be (addr) readw_be(addr)#define mmio_read32be (addr) readl_be(addr) +#define mmio_read64be (addr) readq_be(addr)#define mmio_write16be (val, addr) writew_be(val, addr)#define mmio_write32be (val, addr) writel_be(val, addr) +#define mmio_write64be (val, addr) writeq_be(val, addr)#define mmio_insb (addr, dst, count) readsb(addr, dst, count)#define mmio_insw (addr, dst, count) readsw(addr, dst, count)#define mmio_insl (addr, dst, count) readsl(addr, dst, count)
include/asm-generic/iomap.h +20 -6
@@ -30,9 +30,16 @@ extern unsigned int ioread16(void __iomem *);extern unsigned int ioread16be (void __iomem *);extern unsigned int ioread32 (void __iomem *);extern unsigned int ioread32be (void __iomem *); -#ifdef CONFIG_64BIT -extern u64 ioread64 (void __iomem *); -extern u64 ioread64be (void __iomem *); + +#ifdef readq +#define ioread64_lo_hi ioread64_lo_hi +#define ioread64_hi_lo ioread64_hi_lo +#define ioread64be_lo_hi ioread64be_lo_hi +#define ioread64be_hi_lo ioread64be_hi_lo +extern u64 ioread64_lo_hi (void __iomem *addr); +extern u64 ioread64_hi_lo (void __iomem *addr); +extern u64 ioread64be_lo_hi (void __iomem *addr); +extern u64 ioread64be_hi_lo (void __iomem *addr);#endif extern void iowrite8 (u8 ,void __iomem *);
@@ -40,9 +47,16 @@ extern void iowrite16(u16, void __iomem *);extern void iowrite16be (u16 ,void __iomem *);extern void iowrite32 (u32 ,void __iomem *);extern void iowrite32be (u32 ,void __iomem *); -#ifdef CONFIG_64BIT -extern void iowrite64 (u64 ,void __iomem *); -extern void iowrite64be (u64 ,void __iomem *); + +#ifdef writeq +#define iowrite64_lo_hi iowrite64_lo_hi +#define iowrite64_hi_lo iowrite64_hi_lo +#define iowrite64be_lo_hi iowrite64be_lo_hi +#define iowrite64be_hi_lo iowrite64be_hi_lo +extern void iowrite64_lo_hi (u64 val,void __iomem *addr); +extern void iowrite64_hi_lo (u64 val,void __iomem *addr); +extern void iowrite64be_lo_hi (u64 val,void __iomem *addr); +extern void iowrite64be_hi_lo (u64 val,void __iomem *addr);#endif /*
lib/iomap.c +132 -0
156 lines not on this page · raw message
Signature · 1 line
2.11.0
Re: [PATCH v5 3/6] iomap: introduce io{read|write}64_{lo_hi|hi_lo}
Quoted 8 lines · Logan Gunthorpe
In order to provide non-atomic functions for io{read|write}64 that will use readq and writeq when appropriate. We define a number of variants of these functions in the generic iomap that will do non-atomic operations on pio but atomic operations on mmio.
These functions are only defined if readq and writeq are defined. If they are not, then the wrappers that always use non-atomic operations from
include/linux/io-64-nonatomic*.hwill be used.
Don't you see here a slight problem?
In some cases we want to substitute atomic in favour of non-atomic when both are defined.
So, please don't do this "smartly".
lib/iomap.c EXPORT_SYMBOL(ioread16be); · line 148
Quoted 5 lines
lib/iomap.c +5
-0+u64 ioread64_lo_hi (void __iomem *addr) +{ + IO_COND(addr, return pio_read64_lo_hi(port), return readq(addr)); +return 0xffffffffffffffffLL ; +}
U missed u.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v5 3/6] iomap: introduce io{read|write}64_{lo_hi|hi_lo}
Quoted 10 lines · Andy Shevchenko
Quoted 8 lines · Logan Gunthorpe
In order to provide non-atomic functions for io{read|write}64 that will use readq and writeq when appropriate. We define a number of variants of these functions in the generic iomap that will do non-atomic operations on pio but atomic operations on mmio.
These functions are only defined if readq and writeq are defined. If they are not, then the wrappers that always use non-atomic operations from
include/linux/io-64-nonatomic*.hwill be used.
Quoted 5 lines
Don't you see here a slight problem?
In some cases we want to substitute atomic in favour of non-atomic when both are defined.
So, please don't do this "smartly".
I'm not sure what you mean here. The driver should use ioread64 and include an io-64-nonatomic header. Then there are three cases:
1) The arch has no atomic 64 bit io operations defined. In this case it uses the non-atomic inline function in the io-64-nonatomic header.
2) The arch uses CONFIG_GENERIC_IOMAP and has readq defined, but not ioread64 defined (likely because pio can't do atomic 64 bit operations but mmio can). In this case we need to use the ioread64_xx functions defined in iomap.c which do atomic mmio and non-atomic pio.
3) The arch has ioread64 defined so the atomic operation is used.
Quoted 7 lines
lib/iomap.c EXPORT_SYMBOL(ioread16be); · line 148
Quoted 5 lines
lib/iomap.c +5
-0+u64 ioread64_lo_hi (void __iomem *addr) +{ + IO_COND(addr, return pio_read64_lo_hi(port), return readq(addr)); +return 0xffffffffffffffffLL ; +}U missed u.
I'll fix this in the next revision.
Thanks,
Logan
Re: [PATCH v5 3/6] iomap: introduce io{read|write}64_{lo_hi|hi_lo}
Quoted 17 lines · Logan Gunthorpe
Quoted 10 lines · Andy Shevchenko
Quoted 8 lines · Logan Gunthorpe
In order to provide non-atomic functions for io{read|write}64 that will use readq and writeq when appropriate. We define a number of variants of these functions in the generic iomap that will do non-atomic operations on pio but atomic operations on mmio.
These functions are only defined if readq and writeq are defined. If they are not, then the wrappers that always use non-atomic operations from
include/linux/io-64-nonatomic*.hwill be used.Quoted 5 lines
Don't you see here a slight problem?
In some cases we want to substitute atomic in favour of non-atomic when both are defined.
So, please don't do this "smartly".
Quoted 5 lines
I'm not sure what you mean here. The driver should use ioread64 and include an io-64-nonatomic header. Then there are three cases:
1) The arch has no atomic 64 bit io operations defined. In this case it uses the non-atomic inline function in the io-64-nonatomic header.
Okay
Quoted 4 lines
2) The arch uses
CONFIG_GENERIC_IOMAPand has readq defined, but not ioread64 defined (likely because pio can't do atomic 64 bit operations but mmio can). In this case we need to use theioread64_xxfunctions defined iniomap.cwhich do atomic mmio and non-atomic pio.
Not okay.
Some drivers (hardware) would like to have non-atomic MMIO accesses when readq() defined
Quoted 1 line
3) The arch has ioread64 defined so the atomic operation is used.
Not okay. Same reason as above.
In case of readq() / writeq() it's defined by the order of inclusion:
1)
include <...non-atomic...>
include <linux/io.h>
Always non-atomic will be used.
2)
include <linux/io.h>
include <...non-atomic...>
Auto switch like you described.
I don't like above solution, since it's fragile, but few drivers depend on that.
If you wish to do it always like 2) perhaps we need to split accessors to ones for fixed bus width and ones for atomic/non-atomic cases. OTOH, it would be done by introducingmemcpyXX_fromio()memcpyXX_toio()memsetXX_io()
Where XX = 64, 32, 16, 8.
Note, that ioreadXX_rep() is not the same as above.
P.S. I have done a table of comparison between IO accessors in Linux kernel and it looks hell out of being consistent.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v5 3/6] iomap: introduce io{read|write}64_{lo_hi|hi_lo}
Quoted 2 lines · Andy Shevchenko
Some drivers (hardware) would like to have non-atomic MMIO accesses when
readq()defined
Huh? But that's the whole point of the io64-nonatomic header. If a driver wants a specific non-atomic access they should just code two 32 bit accesses.
Quoted 7 lines
In case of
readq()/writeq()it's defined by the order of inclusion:1)
include <...non-atomic...>
include <linux/io.h>Always non-atomic will be used.
I'm afraid you're wrong about this. The io-64-nonatomic-xx header includes linux/io.h. Thus the order of the includes doesn't matter and it will always auto switch. In any case, making an interface do different things depending on the order of include files is *completely* insane.
Quoted 2 lines
P.S. I have done a table of comparison between IO accessors in Linux kernel and it looks hell out of being consistent.
There are a few corner oddities but it's really not that bad. Most things are done for a reason if you dig into them.
Logan
Re: [PATCH v5 3/6] iomap: introduce io{read|write}64_{lo_hi|hi_lo}
Quoted 7 lines · Logan Gunthorpe
Quoted 2 lines · Andy Shevchenko
Some drivers (hardware) would like to have non-atomic MMIO accesses when
readq()definedHuh? But that's the whole point of the io64-nonatomic header. If a driver wants a specific non-atomic access they should just code two 32 bit accesses.
You mean to call them directly as lo_hi_XXX() or hi_lo_XXX() ? Yes it would work.
Quoted 6 lines
Quoted 6 lines
In case of
readq()/writeq()it's defined by the order of inclusion:1)
include <...non-atomic...>
include <linux/io.h>
Quoted 7 lines
Quoted 1 line
Always non-atomic will be used.
I'm afraid you're wrong about this. The io-64-nonatomic-xx header includes
linux/io.h. Thus the order of the includes doesn't matter and it will always auto switch. In any case, making an interface do different things depending on the order of include files is *completely* insane.
Yes, you are right. I was thinking about something unrelated.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v5 3/6] iomap: introduce io{read|write}64_{lo_hi|hi_lo}
Quoted 11 lines · Andy Shevchenko
Quoted 7 lines · Logan Gunthorpe
Quoted 2 lines · Andy Shevchenko
Some drivers (hardware) would like to have non-atomic MMIO accesses when
readq()definedHuh? But that's the whole point of the io64-nonatomic header. If a driver wants a specific non-atomic access they should just code two 32 bit accesses.
You mean to call them directly as
lo_hi_XXX()orhi_lo_XXX()? Yes it would work.
I suppose you could do that too but I really meant just using two io32 calls. That's the most explicit way to indicate you want a non-atomic access.
Logan
Re: [PATCH v5 3/6] iomap: introduce io{read|write}64_{lo_hi|hi_lo}
Quoted 10 lines · Logan Gunthorpe
Quoted 8 lines · Andy Shevchenko
Quoted 7 lines · Logan Gunthorpe
Quoted 2 lines · Andy Shevchenko
Some drivers (hardware) would like to have non-atomic MMIO accesses when
readq()definedHuh? But that's the whole point of the io64-nonatomic header. If a driver wants a specific non-atomic access they should just code two 32 bit accesses.
Quoted 6 lines
Quoted 2 lines
You mean to call them directly as
lo_hi_XXX()orhi_lo_XXX()? Yes it would work.I suppose you could do that too but I really meant just using two io32 calls. That's the most explicit way to indicate you want a non-atomic access.
Per commit 3a044178cccf they are exactly created for this kind of cases.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v5 3/6] iomap: introduce io{read|write}64_{lo_hi|hi_lo}
Quoted 3 lines · Andy Shevchenko
Per commit
3a044178cccfthey are exactly created for this kind of cases.
Sure, ok, and my patchset provides the same set of functions to satisfy such a use.
Logan
Re: [PATCH v5 3/6] iomap: introduce io{read|write}64_{lo_hi|hi_lo}
Quoted 9 lines · Logan Gunthorpe
Quoted 3 lines · Andy Shevchenko
Per commit
3a044178cccfthey are exactly created for this kind of cases.Sure, ok, and my patchset provides the same set of functions to satisfy such a use.
Okay, please, Cc me for next version, I think I need fresh view on it. Thanks!
Signature · 2 lines
With Best Regards, Andy Shevchenko
PATCH v5 4/6 io-64-nonatomic: add io{read|write}64[be]{_lo_hi|_hi_lo} macros
In reply to Logan GunthorpeThis patch adds generic io{read|write}64[be]{_lo_hi|_hi_lo} macros if they are not already defined by the architecture. (As they are provided by the generic iomap library).
The patch also points io{read|write}64[be] to the variant specified by the header name.
This is because new drivers are encouraged to use ioreadXX, et al instead of readX[1], et al -- and mixing ioreadXX with readq is pretty ugly.
[1] ldd3: section 9.4.2
--- include/linux/io-64-nonatomic-hi-lo.h | 60 +++++++++++++++++++++++++++++++++++ include/linux/io-64-nonatomic-lo-hi.h | 60 +++++++++++++++++++++++++++++++++++ 2 files changed, 120 insertions(+)
include/linux/io-64-nonatomic-hi-lo.h +60 -0
@@ -54,4 +54,64 @@ static inline void hi_lo_writeq_relaxed(__u64 val, volatile void __iomem *addr)#define writeq_relaxed hi_lo_writeq_relaxed#endif +#ifndef ioread64_hi_lo +#define ioread64_hi_lo ioread64_hi_lo +static inline u64 ioread64_hi_lo (void __iomem *addr) +{ +u32 low, high; + + high =ioread32 (addr +sizeof (u32)); + low =ioread32 (addr); + +return low + ((u64 )high <<32 ); +} +#endif + +#ifndef iowrite64_hi_lo +#define iowrite64_hi_lo iowrite64_hi_lo +static inline void iowrite64_hi_lo (u64 val,void __iomem *addr) +{ +iowrite32 (val >>32 , addr +sizeof (u32)); +iowrite32 (val, addr); +} +#endif + +#ifndef ioread64be_hi_lo +#define ioread64be_hi_lo ioread64be_hi_lo +static inline u64 ioread64be_hi_lo (void __iomem *addr) +{ +u32 low, high; + + high =ioread32be (addr); + low =ioread32be (addr +sizeof (u32)); + +return low + ((u64 )high <<32 ); +} +#endif + +#ifndef iowrite64be_hi_lo +#define iowrite64be_hi_lo iowrite64be_hi_lo +static inline void iowrite64be_hi_lo (u64 val,void __iomem *addr) +{ +iowrite32be (val >>32 , addr); +iowrite32be (val, addr +sizeof (u32)); +} +#endif + +#ifndef ioread64 +#define ioread64 ioread64_hi_lo +#endif + +#ifndef iowrite64 +#define iowrite64 iowrite64_hi_lo +#endif + +#ifndef ioread64be +#define ioread64be ioread64be_hi_lo +#endif + +#ifndef iowrite64be +#define iowrite64be iowrite64be_hi_lo +#endif +#endif /* _LINUX_IO_64_NONATOMIC_HI_LO_H_ */
include/linux/io-64-nonatomic-lo-hi.h +60 -0
64 lines not on this page · raw message
Signature · 1 line
2.11.0
PATCH v5 5/6 ntb: ntb_hw_intel: use io-64-nonatomic instead of in-driver hacks
In reply to Logan GunthorpeNow that ioread64 and iowrite64 are available in io-64-nonatomic, we can remove the hack at the top of ntb_hw_intel.c and replace it with an include.
--- drivers/ntb/hw/intel/ntb_hw_intel.c | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-)
drivers/ntb/hw/intel/ntb_hw_intel.c +1 -29
@@ -59,6 +59,7 @@#include <linux/random.h> #include <linux/slab.h> #include <linux/ntb.h> +#include <linux/io-64-nonatomic-lo-hi.h> #include "ntb_hw_intel.h"
@@ -155,35 +156,6 @@ MODULE_PARM_DESC(xeon_b2b_dsd_bar5_addr32,static inline enum ntb_topo xeon_ppd_topo (struct intel_ntb_dev *ndev,u8 ppd);static int xeon_init_isr (struct intel_ntb_dev *ndev); -#ifndef ioread64 -#ifdef readq -#define ioread64 readq -#else -#define ioread64 _ioread64 -static inline u64 _ioread64 (void __iomem *mmio) -{ -u64 low, high; - - low =ioread32 (mmio); - high =ioread32 (mmio +sizeof (u32)); -return low | (high <<32 ); -} -#endif -#endif - -#ifndef iowrite64 -#ifdef writeq -#define iowrite64 writeq -#else -#define iowrite64 _iowrite64 -static inline void _iowrite64 (u64 val,void __iomem *mmio) -{ -iowrite32 (val, mmio); -iowrite32 (val >>32 , mmio +sizeof (u32)); -} -#endif -#endif -static inline int pdev_is_atom (struct pci_dev *pdev) {switch (pdev->device) {
Signature · 1 line
2.11.0
Re: [PATCH v5 5/6] ntb: ntb_hw_intel: use io-64-nonatomic instead of in-driver hacks
Quoted 6 lines · Logan Gunthorpe
Now that ioread64 and iowrite64 are available in io-64-nonatomic, we can remove the hack at the top of
ntb_hw_intel.cand replace it with an include.Signed-off-by Logan Gunthorpe <[email protected]>Cc Jon Mason <[email protected]>
This is okay by me, but I'm assuming that this patch will go through as part of the series (and not via my tree). If this changes, please let me know.
Quoted 1 line
Cc Allen Hubbe <[email protected]>
You already have Allen's Ack below. So, you can remove this :)
Quoted 63 lines
Acked-by Dave Jiang <[email protected]>Acked-by Allen Hubbe <[email protected]>--- drivers/ntb/hw/intel/ntb_hw_intel.c | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-)drivers/ntb/hw/intel/ntb_hw_intel.c +1
-29@@ -59,6 +59,7 @@#include <linux/random.h> #include <linux/slab.h> #include <linux/ntb.h> +#include <linux/io-64-nonatomic-lo-hi.h> #include "ntb_hw_intel.h" @@ -155,35 +156,6 @@ MODULE_PARM_DESC(xeon_b2b_dsd_bar5_addr32,static inline enum ntb_topo xeon_ppd_topo (struct intel_ntb_dev *ndev,u8 ppd);static int xeon_init_isr (struct intel_ntb_dev *ndev); -#ifndef ioread64 -#ifdef readq -#define ioread64 readq -#else -#define ioread64 _ioread64 -static inline u64 _ioread64 (void __iomem *mmio) -{ -u64 low, high; - - low =ioread32 (mmio); - high =ioread32 (mmio +sizeof (u32)); -return low | (high <<32 ); -} -#endif -#endif - -#ifndef iowrite64 -#ifdef writeq -#define iowrite64 writeq -#else -#define iowrite64 _iowrite64 -static inline void _iowrite64 (u64 val,void __iomem *mmio) -{ -iowrite32 (val, mmio); -iowrite32 (val >>32 , mmio +sizeof (u32)); -} -#endif -#endif -static inline int pdev_is_atom (struct pci_dev *pdev) {switch (pdev->device) {Signature · 8 lines
2.11.0 -- You received this message because you are subscribed to the Google Groups "linux-ntb" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/linux-ntb/20170726231917.6073-6-logang%40deltatee.com. For more options, visit https://groups.google.com/d/optout.
PATCH v5 6/6 crypto: caam: cleanup CONFIG_64BIT ifdefs when using io{read|write}64
In reply to Logan GunthorpeFrom: Horia Geantă <[email protected]>
We can now make use of the io-64-nonatomic-lo-hi header to always provide 64 bit IO operations. So this patch cleans up the extra CONFIG_64BIT ifdefs.
To be consistent with CAAM engine HW spec: in case of 64-bit registers, irrespective of device endianness, the lower address should be read from / written to first, followed by the upper address. Indeed the I/O accessors in CAAM driver currently don't follow the spec, however this is a good opportunity to fix the code.
--- drivers/crypto/caam/regs.h | 35 +++++------------------------------ 1 file changed, 5 insertions(+), 30 deletions(-)
drivers/crypto/caam/regs.h +5 -30
@@ -9,7 +9,7 @@#include <linux/types.h> #include <linux/bitops.h> -#include <linux/io.h> +#include <linux/io-64-nonatomic-lo-hi.h> /* * Architecture-specific register access methods
@@ -134,50 +134,25 @@ static inline void clrsetbits_32(void __iomem *reg, u32 clear, u32 set)* base + 0x0000 : least-significant 32 bits * base + 0x0004 : most-significant 32 bits */ -#ifdef CONFIG_64BIT static inline void wr_reg64 (void __iomem *reg,u64 data) { +#ifndef CONFIG_CRYPTO_DEV_FSL_CAAM_IMX if (caam_little_end)iowrite64 (data, reg); else -iowrite64be (data, reg); -} - -static inline u64 rd_reg64 (void __iomem *reg) -{ -if (caam_little_end) -return ioread64 (reg); -else -return ioread64be (reg); -} - -#else /* CONFIG_64BIT */ -static inline void wr_reg64 (void __iomem *reg,u64 data) -{ -#ifndef CONFIG_CRYPTO_DEV_FSL_CAAM_IMX -if (caam_little_end) { -wr_reg32 ((u32 __iomem *)(reg) +1 , data >>32 ); -wr_reg32 ((u32 __iomem *)(reg), data); - } else#endif - { -wr_reg32 ((u32 __iomem *)(reg), data >>32 ); -wr_reg32 ((u32 __iomem *)(reg) +1 , data); - } +iowrite64be (data, reg); }static inline u64 rd_reg64 (void __iomem *reg) {#ifndef CONFIG_CRYPTO_DEV_FSL_CAAM_IMX if (caam_little_end) -return ((u64 )rd_reg32 ((u32 __iomem *)(reg) +1 ) <<32 | - (u64 )rd_reg32 ((u32 __iomem *)(reg))); +return ioread64 (reg); else#endif -return ((u64 )rd_reg32 ((u32 __iomem *)(reg)) <<32 | - (u64 )rd_reg32 ((u32 __iomem *)(reg) +1 )); +return ioread64be (reg); } -#endif /* CONFIG_64BIT */ #ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT #ifdef CONFIG_SOC_IMX7D
Signature · 1 line
2.11.0
Quoted 3 lines · Logan Gunthorpe
Changes since v4:
- Add functions so the powerpc implementation ofiomap.ccompiles. (As noticed by Horia)
more exactly: crypto self-tests pass on CAAM crypto engine on NXP platforms LS1046A (ARMv8 A53), T1040 (PPC64 e5500), P4080 (PPC e500mc).
Quoted 37 lines
Changes since v3:
- I noticed powerpc didn't use the appropriate functions seeing readq/writeq were not defined when
iomap.hwas included. Thus I've included a patch to adjust this
- Fixed some mistakes with a couple of the defines in io-64-nonatomic* headers
- Fixed a typo noticed by Horia.(earlier versions were drastically different)
Horia Geantă (1):
crypto: caam: cleanupCONFIG_64BITifdefs when using io{read|write}64Logan Gunthorpe (5):
powerpc:io.h: moveiomap.hinclude so that it can use readq/writeq
defs
powerpc:iomap.c: introduce io{read|write}64_{lo_hi|hi_lo}
iomap: introduce io{read|write}64_{lo_hi|hi_lo}
io-64-nonatomic: add io{read|write}64[be]{_lo_hi|_hi_lo} macros
ntb:ntb_hw_intel: use io-64-nonatomic instead of in-driver hacksarch/powerpc/include/asm/io.h | 6 +- arch/powerpc/kernel/iomap.c | 40 +++++++++++ drivers/crypto/caam/regs.h | 35 ++------- drivers/ntb/hw/intel/ntb_hw_intel.c | 30 +------- include/asm-generic/iomap.h | 26 +++++-- include/linux/io-64-nonatomic-hi-lo.h | 60 ++++++++++++++++ include/linux/io-64-nonatomic-lo-hi.h | 60 ++++++++++++++++ lib/iomap.c | 132 ++++++++++++++++++++++++++++++++++ 8 files changed, 322 insertions(+), 67 deletions(-)--
2.11.0