m68k: io: Fix io{read,write}{16,32}be() for Coldfire peripherals
Geert Uytterhoeven
maintainerPATCH 1/1 m68k: io: Fix io{read,write}{16,32}be() for Coldfire peripherals
The generic definitions of mmio_{read,write}{16,32}be() in lib/iomap.c assume that the {read,write}[wl]() I/O accessors always use little endian accesses, and swap the result.
However, the Coldfire versions of the {read,write}[wl]() I/O accessors are special, in that they use native big endian instead of little endian for accesses to the on-SoC peripheral block, thus violating the assumption.
Fix this by providing our own variants, using the raw accessors, reinstating the old behavior. This is fine on m68k, as no special barriers are needed, and also avoids swapping data twice.
---
This can be reverted later, after this oddity of the Coldfire I/O support has been fixed, and drivers have been updated.
--- arch/m68k/include/asm/io.h | 6 ++++++ 1 file changed, 6 insertions(+)
arch/m68k/include/asm/io.h +6 -0
@@ -8,6 +8,12 @@#include <asm/io_mm.h> #endif +#define mmio_read16be (addr) __raw_readw(addr) +#define mmio_read32be (addr) __raw_readl(addr) + +#define mmio_write16be (val, port) __raw_writew((val), (port)) +#define mmio_write32be (val, port) __raw_writel((val), (port)) +#include <asm-generic/io.h> #endif /* _M68K_IO_H */
Signature · 1 line
2.17.1
Quoted 28 lines · Geert Uytterhoeven
The generic definitions of mmio_{read,write}{16,32}be() in
lib/iomap.cassume that the {read,write}[wl]() I/O accessors always use little endian accesses, and swap the result.However, the Coldfire versions of the {read,write}[wl]() I/O accessors are special, in that they use native big endian instead of little endian for accesses to the on-SoC peripheral block, thus violating the assumption.
Fix this by providing our own variants, using the raw accessors, reinstating the old behavior. This is fine on m68k, as no special barriers are needed, and also avoids swapping data twice.
Reported-by Angelo Dureghello <[email protected]>Fixes aecc787c06f4300f ("iomap: Use non-raw io functions for io{read|write}XXbe")Signed-off-by Geert Uytterhoeven <[email protected]>---
This can be reverted later, after this oddity of the Coldfire I/O support has been fixed, and drivers have been updated.--- arch/m68k/include/asm/io.h | 6 ++++++ 1 file changed, 6 insertions(+)arch/m68k/include/asm/io.h +0
-0
arch/m68k/include/asm/io.h line 17
Quoted 10 lines
arch/m68k/include/asm/io.h +6
-0@@ -8,6 +8,12 @@#include <asm/io_mm.h> #endif +#define mmio_read16be (addr) __raw_readw(addr) +#define mmio_read32be (addr) __raw_readl(addr) + +#define mmio_write16be (val, port) __raw_writew((val), (port)) +#define mmio_write32be (val, port) __raw_writel((val), (port)) +#include <asm-generic/io.h>
This looks correct to me, but there are two points that stick out to me:
- why do you only do this for mmio and not for pio?
- why do you even use the generic_iomap wrappers rather than the trivial asm-generic versions of those functions?
Arnd
Hi,
Quoted 43 lines · Arnd Bergmann
Quoted 28 lines · Geert Uytterhoeven
The generic definitions of mmio_{read,write}{16,32}be() in
lib/iomap.cassume that the {read,write}[wl]() I/O accessors always use little endian accesses, and swap the result.However, the Coldfire versions of the {read,write}[wl]() I/O accessors are special, in that they use native big endian instead of little endian for accesses to the on-SoC peripheral block, thus violating the assumption.
Fix this by providing our own variants, using the raw accessors, reinstating the old behavior. This is fine on m68k, as no special barriers are needed, and also avoids swapping data twice.
Reported-by Angelo Dureghello <[email protected]>Fixes aecc787c06f4300f ("iomap: Use non-raw io functions for io{read|write}XXbe")Signed-off-by Geert Uytterhoeven <[email protected]>---
This can be reverted later, after this oddity of the Coldfire I/O support has been fixed, and drivers have been updated.--- arch/m68k/include/asm/io.h | 6 ++++++ 1 file changed, 6 insertions(+)arch/m68k/include/asm/io.h +0
-0arch/m68k/include/asm/io.h line 17
Quoted 10 lines
arch/m68k/include/asm/io.h +6
-0@@ -8,6 +8,12 @@#include <asm/io_mm.h> #endif +#define mmio_read16be (addr) __raw_readw(addr) +#define mmio_read32be (addr) __raw_readl(addr) + +#define mmio_write16be (val, port) __raw_writew((val), (port)) +#define mmio_write32be (val, port) __raw_writel((val), (port)) +#include <asm-generic/io.h> This looks correct to me, but there are two points that stick out to me:
Quoted 5 lines
- why do you only do this for mmio and not for pio?
- why do you even use thegeneric_iomapwrappers rather than the trivial asm-generic versions of those functions?Arnd
At least i applied it and it works properly, dspi / dma drivers are back working.
Thanks,
Regards
Angelo
Geert Uytterhoeven
maintainerHi Arnd,
Quoted 42 lines · Arnd Bergmann
Quoted 27 lines · Geert Uytterhoeven
The generic definitions of mmio_{read,write}{16,32}be() in
lib/iomap.cassume that the {read,write}[wl]() I/O accessors always use little endian accesses, and swap the result.However, the Coldfire versions of the {read,write}[wl]() I/O accessors are special, in that they use native big endian instead of little endian for accesses to the on-SoC peripheral block, thus violating the assumption.
Fix this by providing our own variants, using the raw accessors, reinstating the old behavior. This is fine on m68k, as no special barriers are needed, and also avoids swapping data twice.
Reported-by Angelo Dureghello <[email protected]>Fixes aecc787c06f4300f ("iomap: Use non-raw io functions for io{read|write}XXbe")Signed-off-by Geert Uytterhoeven <[email protected]>---
This can be reverted later, after this oddity of the Coldfire I/O support has been fixed, and drivers have been updated.--- arch/m68k/include/asm/io.h | 6 ++++++ 1 file changed, 6 insertions(+)arch/m68k/include/asm/io.h +0
-0arch/m68k/include/asm/io.h line 17
Quoted 10 lines
arch/m68k/include/asm/io.h +6
-0@@ -8,6 +8,12 @@#include <asm/io_mm.h> #endif +#define mmio_read16be (addr) __raw_readw(addr) +#define mmio_read32be (addr) __raw_readl(addr) + +#define mmio_write16be (val, port) __raw_writew((val), (port)) +#define mmio_write32be (val, port) __raw_writel((val), (port)) +#include <asm-generic/io.h> This looks correct to me, but there are two points that stick out to me:
Quoted 1 line
- why do you only do this for mmio and not for pio?
Because no one had a need for it? ;-)
Now seriously, m68k only has MMIO, no PIO. Any PIO, if used, is for ISA or PCMCIA I/O accesses, which are little endian.
Quoted 2 lines
- why do you even use the
generic_iomapwrappers rather than the trivial asm-generic versions of those functions?
Looking at git history, that was done to fix some link errors, which no longer seem to happen with the more mature asm-generic infrastructure we have now.
So probably we can drop the selection of GENERIC_IOMAP and inclusion of <asm-generic/iomap.h>, after fixing a few compiler warnings like:
include/asm-generic/io.h: In function ‘ioread8_rep’ arch/m68k/include/asm/io_mm.h:371:44: warning: passing argument 1
of ‘raw_insb’ discard ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
#define readsb(port, buf, nr) raw_insb((port), (u8 *)(buf), (nr))
arch/m68k/include/asm/raw_io.h:101:50: note: expected ‘volatile u8*’ {aka ‘volatile unsigned char *’} but argument is of type ‘const volatile void *’
static inline void raw_insb(volatile u8 __iomem *port, u8 *buf,
unsigned int len)
and some regression testing, of course.
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Quoted 10 lines · Geert Uytterhoeven
Quoted 4 lines · Arnd Bergmann
On Mon, Apr 29, 2019 at 10:19 AM Geert Uytterhoeven
This looks correct to me, but there are two points that stick out to me:- why do you only do this for mmio and not for pio?
Because no one had a need for it? ;-)
Now seriously, m68k only has MMIO, no PIO. Any PIO, if used, is for ISA or PCMCIA I/O accesses, which are little endian.
I suppose the majority of PIO operations are single-byte only, so endianess doesn't apply at all ;-). You are certainly right that big-endian PIO access has close to zero uses in the kernel (I could not find any either).
If you don't have ISA or PCMCIA devices, then using the trivial readl/writel based wrappers is clearly the easiest way.
If you do have PIO based devices, then defining pio_read16be etc would save a few bytes in lib/iomap.c.
Quoted 14 lines
Quoted 2 lines
- why do you even use the
generic_iomapwrappers rather than the trivial asm-generic versions of those functions?Looking at git history, that was done to fix some link errors, which no longer seem to happen with the more mature asm-generic infrastructure we have now.
So probably we can drop the selection of
GENERIC_IOMAPand inclusion of <asm-generic/iomap.h>, after fixing a few compiler warnings like:
include/asm-generic/io.h: In function ‘ioread8_rep’arch/m68k/include/asm/io_mm.h:371:44: warning: passing argument 1
of ‘raw_insb’ discard ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
Quoted 6 lines
#define readsb(port, buf, nr) raw_insb((port), (u8 *)(buf), (nr)) arch/m68k/include/asm/raw_io.h:101:50: note: expected ‘volatile u8*’ {aka ‘volatile unsigned char *’} but argument is of type ‘const volatile void *’
static inline void raw_insb(volatile u8__iomem*port, u8 *buf,
unsigned int len)
Those should just be missing 'volatile' and 'const' modifiers on the arguments.
Arnd
Hi Greg (and all),
couldn't seen any follow up on this patch. I tested it and at least for mcf5441x it works properly and solves all issues.
Do you think it may be accepted as an initial fix ?
Regards,
Angelo
Quoted 42 lines · Geert Uytterhoeven
The generic definitions of mmio_{read,write}{16,32}be() in
lib/iomap.cassume that the {read,write}[wl]() I/O accessors always use little endian accesses, and swap the result.However, the Coldfire versions of the {read,write}[wl]() I/O accessors are special, in that they use native big endian instead of little endian for accesses to the on-SoC peripheral block, thus violating the assumption.
Fix this by providing our own variants, using the raw accessors, reinstating the old behavior. This is fine on m68k, as no special barriers are needed, and also avoids swapping data twice.
Reported-by Angelo Dureghello <[email protected]>Fixes aecc787c06f4300f ("iomap: Use non-raw io functions for io{read|write}XXbe")Signed-off-by Geert Uytterhoeven <[email protected]>---
This can be reverted later, after this oddity of the Coldfire I/O support has been fixed, and drivers have been updated.--- arch/m68k/include/asm/io.h | 6 ++++++ 1 file changed, 6 insertions(+)arch/m68k/include/asm/io.h +6
-0@@ -8,6 +8,12 @@#include <asm/io_mm.h> #endif +#define mmio_read16be (addr) __raw_readw(addr) +#define mmio_read32be (addr) __raw_readl(addr) + +#define mmio_write16be (val, port) __raw_writew((val), (port)) +#define mmio_write32be (val, port) __raw_writel((val), (port)) +#include <asm-generic/io.h> #endif /* _M68K_IO_H */ Signature · 1 line
2.17.1
Hi Angelo,
Quoted 4 lines · Angelo Dureghello
couldn't seen any follow up on this patch. I tested it and at least for mcf5441x it works properly and solves all issues.
Do you think it may be accepted as an initial fix ?
I'll add it to the m68knommu git tree.
Seeing as you wrote it Geert I assume you have no problem with that? :-)
Regards
Greg
Quoted 44 lines · Geert Uytterhoeven
Quoted 42 lines
The generic definitions of mmio_{read,write}{16,32}be() in
lib/iomap.cassume that the {read,write}[wl]() I/O accessors always use little endian accesses, and swap the result.However, the Coldfire versions of the {read,write}[wl]() I/O accessors are special, in that they use native big endian instead of little endian for accesses to the on-SoC peripheral block, thus violating the assumption.
Fix this by providing our own variants, using the raw accessors, reinstating the old behavior. This is fine on m68k, as no special barriers are needed, and also avoids swapping data twice.
Reported-by Angelo Dureghello <[email protected]>Fixes aecc787c06f4300f ("iomap: Use non-raw io functions for io{read|write}XXbe")Signed-off-by Geert Uytterhoeven <[email protected]>---
This can be reverted later, after this oddity of the Coldfire I/O support has been fixed, and drivers have been updated.--- arch/m68k/include/asm/io.h | 6 ++++++ 1 file changed, 6 insertions(+)arch/m68k/include/asm/io.h +6
-0@@ -8,6 +8,12 @@#include <asm/io_mm.h> #endif +#define mmio_read16be (addr) __raw_readw(addr) +#define mmio_read32be (addr) __raw_readl(addr) + +#define mmio_write16be (val, port) __raw_writew((val), (port)) +#define mmio_write32be (val, port) __raw_writel((val), (port)) +#include <asm-generic/io.h> #endif /* _M68K_IO_H */ Signature · 1 line
2.17.1
Geert Uytterhoeven
maintainerHi Greg,
Quoted 8 lines · Greg Ungerer
Quoted 4 lines · Angelo Dureghello
couldn't seen any follow up on this patch. I tested it and at least for mcf5441x it works properly and solves all issues.
Do you think it may be accepted as an initial fix ?
I'll add it to the m68knommu git tree.
Seeing as you wrote it Geert I assume you have no problem with that? :-)
Actually I wanted to look into the issues pointed out by Arnd, but didn't get to that yet...
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Hi Geert,
Quoted 5 lines · Geert Uytterhoeven
Quoted 4 lines · Greg Ungerer
Quoted 3 lines · Angelo Dureghello
couldn't seen any follow up on this patch. I tested it and at least for mcf5441x it works properly and solves all issues.
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
Do you think it may be accepted as an initial fix ?
I'll add it to the m68knommu git tree.
Seeing as you wrote it Geert I assume you have no problem with that? :-)Actually I wanted to look into the issues pointed out by Arnd, but didn't get to that yet...
Ok, no worries. I won't do anything with this right now then.
Regards
Greg