m68k: coldfire: create internal register access defines
Subsystems (3)
Greg Ungerer
maintainerThe readx/writex family of IO access functions for ColdFire are non-standard. They return native endian data for multi-byte access, which on m68k/ColdFire is big-endian byte order. A number of places need fixing to change readx/writex to be more standard - a lot of the CPU/SoC architecture specific code and a number of drivers.
The existing ColdFire CPU/SoC architecture code is inconsistent in how it accesses SoC hardware module registers. Both readx/writex and __raw_readx/__raw_writex are used across the code base. To clean this up this set of patches moves to an internal set of access defines for the CPU/SoC architecture code. The following are defined and used for all internal register access:
8 bit read --> mcf_read8
8 bit write --> mcf_write8
16 bit read --> mcf_read16
16 bit write --> mcf_write16
32 bit read --> mcf_read32
32 bit write --> mcf_write32To ease review I have broken the changes up a little, grouping major blocks together instead of one huge patch.
--- arch/m68k/coldfire/clk.c | 8 +- arch/m68k/coldfire/device.c | 8 +- arch/m68k/coldfire/dma_timer.c | 12 +-- arch/m68k/coldfire/intc-2.c | 30 ++++----- arch/m68k/coldfire/intc-5249.c | 10 +-- arch/m68k/coldfire/intc-525x.c | 12 +-- arch/m68k/coldfire/intc-5272.c | 20 +++--- arch/m68k/coldfire/intc-simr.c | 38 ++++++------ arch/m68k/coldfire/intc.c | 28 ++++----- arch/m68k/coldfire/m5206.c | 2 arch/m68k/coldfire/m520x.c | 26 ++++---- arch/m68k/coldfire/m523x.c | 12 +-- arch/m68k/coldfire/m5249.c | 16 ++--- arch/m68k/coldfire/m525x.c | 12 +-- arch/m68k/coldfire/m5272.c | 16 ++--- arch/m68k/coldfire/m527x.c | 40 ++++++------- arch/m68k/coldfire/m528x.c | 28 ++++----- arch/m68k/coldfire/m5307.c | 2 arch/m68k/coldfire/m53xx.c | 122 ++++++++++++++++++++-------------------- arch/m68k/coldfire/m5407.c | 2 arch/m68k/coldfire/m5441x.c | 12 +-- arch/m68k/coldfire/m54xx.c | 18 ++--- arch/m68k/coldfire/nettel.c | 16 ++--- arch/m68k/coldfire/pci.c | 56 +++++++++--------- arch/m68k/coldfire/pit.c | 20 +++--- arch/m68k/coldfire/reset.c | 4 - arch/m68k/coldfire/sltimers.c | 18 ++--- arch/m68k/coldfire/stmark2.c | 12 +-- arch/m68k/coldfire/timers.c | 38 ++++++------ arch/m68k/include/asm/io_no.h | 16 +++++ arch/m68k/include/asm/mcfgpio.h | 12 +-- arch/m68k/include/asm/nettel.h | 4 -
Greg Ungerer
maintainerPATCH 1/7 m68k: coldfire: create IO access functions for internal registers
From: Greg Ungerer <[email protected]>
The internal peripheral registers contained in all varieties of ColdFire SoCs require simple big endian access ranging in sizes from 8, 16 and 32 bit. Currently there is a mixture of IO access methods used across the various CPU support code, some using readx/writex and some using the simpler __raw_readx/__raw_writew.
The readx/writex use cases are particularly kludgy in that they contain code to differentiate internal register access and other general attached peripheral register access - say on a PCI bus. In effect this means that the readx/writex family for ColdFire is non-standard. This ultimately ends up causing problems with definitions of other IO access support functions like ioreadx/ioreadxbe/iowritex/iowritexbe which in the generic case are defined in terms of readx/writex.
Create a set of internal only register access methods to ultimately replace all internal register access code. The new access functions mirror the existing readx/writex family but using the preferred 8/16/32 suffixes.
--- arch/m68k/include/asm/io_no.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
arch/m68k/include/asm/io_no.h +16 -0
@@ -107,6 +107,22 @@ static inline void writel(u32 value, volatile void __iomem *addr)#endif /* IOMEMBASE */ +#if defined(CONFIG_COLDFIRE ) +/* +* The ColdFire internal peripheral registers are big-endian, so you +* cannot use the conventional little-endian readb/readw/readl and +* writeb/writew/writel access functions. Define a family of access +* functions to give correct endian access that can be used by all +* architecture code. +*/ +#define mcf_read8 __raw_readb +#define mcf_read16 __raw_readw +#define mcf_read32 __raw_readl +#define mcf_write8 __raw_writeb +#define mcf_write16 __raw_writew +#define mcf_write32 __raw_writel +#endif /* CONFIG_COLDFIRE */ +#if defined(CONFIG_PCI )/* * Support for PCI bus access uses the asm-generic access functions.
Signature · 1 line
2.54.0
Geert Uytterhoeven
maintainerRe: [PATCH 1/7] m68k: coldfire: create IO access functions for internal registers
Hi Greg,
Quoted 16 lines · Greg Ungerer
From: Greg Ungerer <[email protected]>
The internal peripheral registers contained in all varieties of ColdFire SoCs require simple big endian access ranging in sizes from 8, 16 and 32 bit. Currently there is a mixture of IO access methods used across the various CPU support code, some using readx/writex and some using the simpler __raw_readx/__raw_writew.
The readx/writex use cases are particularly kludgy in that they contain code to differentiate internal register access and other general attached peripheral register access - say on a PCI bus. In effect this means that the readx/writex family for ColdFire is non-standard. This ultimately ends up causing problems with definitions of other IO access support functions like ioreadx/ioreadxbe/iowritex/iowritexbe which in the generic case are defined in terms of readx/writex.
Quoted 6 lines
Create a set of internal only register access methods to ultimately replace all internal register access code. The new access functions mirror the existing readx/writex family but using the preferred 8/16/32 suffixes.
Signed-off-by Greg Ungerer <[email protected]>
Thanks for your patch!
Quoted 10 lines
arch/m68k/include/asm/io_no.h +4
-0@@ -107,6 +107,22 @@ static inline void writel(u32 value, volatile void __iomem *addr)#endif /* IOMEMBASE */ +#if defined(CONFIG_COLDFIRE ) +/* +* The ColdFire internal peripheral registers are big-endian, so you +* cannot use the conventional little-endian readb/readw/readl and
arch/m68k/include/asm/io_no.h static inline void writel(u32 value, volatile void __iomem *addr) · line 123
Quoted 10 lines
arch/m68k/include/asm/io_no.h +10
-0+* writeb/writew/writel access functions. Define a family of access +* functions to give correct endian access that can be used by all +* architecture code. +*/ +#define mcf_read8 __raw_readb +#define mcf_read16 __raw_readw +#define mcf_read32 __raw_readl +#define mcf_write8 __raw_writeb +#define mcf_write16 __raw_writew +#define mcf_write32 __raw_writel
Why not call them io{read,write}{8,16be,32be}(), like parisc, powerpc, and sparc, do? Sparc seems to be the closest match:
https://elixir.bootlin.com/linux/v7.0.1/source/arch/sparc/include/asm/io_64.h#L439
arch/m68k/include/asm/io_no.h static inline void writel(u32 value, volatile void __iomem *addr) · line 128
Quoted 5 lines
arch/m68k/include/asm/io_no.h +2
-0+#endif /* CONFIG_COLDFIRE */ +#if defined(CONFIG_PCI )/* * Support for PCI bus access uses the asm-generic access functions.
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
Re: [PATCH 1/7] m68k: coldfire: create IO access functions for internal registers
Quoted 17 lines · Geert Uytterhoeven
Quoted 16 lines · Greg Ungerer
arch/m68k/include/asm/io_no.h +10
-0@@ -107,6 +107,22 @@ static inline void writel(u32 value, volatile void __iomem *addr)#endif /* IOMEMBASE */ +#if defined(CONFIG_COLDFIRE ) +/* +* The ColdFire internal peripheral registers are big-endian, so you +* cannot use the conventional little-endian readb/readw/readl and +* writeb/writew/writel access functions. Define a family of access +* functions to give correct endian access that can be used by all +* architecture code. +*/ +#define mcf_read8 __raw_readb +#define mcf_read16 __raw_readw
Quoted 8 lines
arch/m68k/include/asm/io_no.h static inline void writel(u32 value, volatile void __iomem *addr) · line 123
Quoted 4 lines
arch/m68k/include/asm/io_no.h +4
-0+#define mcf_read32 __raw_readl +#define mcf_write8 __raw_writeb +#define mcf_write16 __raw_writew +#define mcf_write32 __raw_writelWhy not call them io{read,write}{8,16be,32be}(), like parisc, powerpc, and sparc, do? Sparc seems to be the closest match:
https://elixir.bootlin.com/linux/v7.0.1/source/arch/sparc/include/asm/io_64.h#L439
I think that would be the right choice for introducing these from scratch, but we can't easily change the existing code in small steps, for two reasons:
- the asm-generic/io.h already provides ioread32be() etc functions, and these are used today on some of the coldfire drivers, but by accident these have little-endian semantics (since readl() is big-endian here), and at least one driver relies on it being that way.
- readl32be() really wants an 'void __iomem *' pointer, and we should not have architectures that do something different here. The coldfire __raw_readl() accepts both pointer and integer (phys_addr_t etc) addresses at the moment, and the arch/m68k/coldfire code for nommu targets uses that. Changing these to use ioremap() and pass pointers would be a much bigger change.
Arnd
Greg Ungerer
maintainerRe: [PATCH 1/7] m68k: coldfire: create IO access functions for internal registers
Hi Arnd, Geert,
Quoted 37 lines · Arnd Bergmann
Quoted 17 lines · Geert Uytterhoeven
Quoted 16 lines · Greg Ungerer
arch/m68k/include/asm/io_no.h +10
-0@@ -107,6 +107,22 @@ static inline void writel(u32 value, volatile void __iomem *addr)#endif /* IOMEMBASE */ +#if defined(CONFIG_COLDFIRE ) +/* +* The ColdFire internal peripheral registers are big-endian, so you +* cannot use the conventional little-endian readb/readw/readl and +* writeb/writew/writel access functions. Define a family of access +* functions to give correct endian access that can be used by all +* architecture code. +*/ +#define mcf_read8 __raw_readb +#define mcf_read16 __raw_readwQuoted 8 lines
arch/m68k/include/asm/io_no.h static inline void writel(u32 value, volatile void __iomem *addr) · line 123
Quoted 4 lines
arch/m68k/include/asm/io_no.h +4
-0+#define mcf_read32 __raw_readl +#define mcf_write8 __raw_writeb +#define mcf_write16 __raw_writew +#define mcf_write32 __raw_writelWhy not call them io{read,write}{8,16be,32be}(), like parisc, powerpc, and sparc, do? Sparc seems to be the closest match:
https://elixir.bootlin.com/linux/v7.0.1/source/arch/sparc/include/asm/io_64.h#L439I think that would be the right choice for introducing these from scratch, but we can't easily change the existing code in small steps, for two reasons:
- the
asm-generic/io.halready providesioread32be()etc functions, and these are used today on some of the coldfire drivers, but by accident these have little-endian semantics (sincereadl()is big-endian here), and at least one driver relies on it being that way.
Quoted 6 lines
-
readl32be()really wants an 'void__iomem*' pointer, and we should not have architectures that do something different here. The coldfire__raw_readl()accepts both pointer and integer (phys_addr_tetc) addresses at the moment, and thearch/m68k/coldfirecode for nommu targets uses that. Changing these to useioremap()and pass pointers would be a much bigger change.
Yes, exactly. I steered clear of reusing anything that already existed. Especially since the existing broken ones are actually used in drivers.
Regards
Greg
Greg Ungerer
maintainerPATCH 2/7 m68k: coldfire: use ColdFire specific IO access in headers
In reply to Greg UngererFrom: Greg Ungerer <[email protected]>
Convert all m68k/coldfire specific header file code to only use the newly created internal register access methods. This is replacing the mixed and inconsistent use of readx/writex and __raw_readx/__raw_writex for internal SoC registers.
--- arch/m68k/include/asm/mcfgpio.h | 12 ++++++------ arch/m68k/include/asm/nettel.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-)
arch/m68k/include/asm/mcfgpio.h +6 -6
@@ -95,8 +95,8 @@ static inline void gpio_free(unsigned gpio)#define MCFGPIO_PORTTYPE u8#define MCFGPIO_PORTSIZE 8 -#define mcfgpio_read (port) __raw_readb(port) -#define mcfgpio_write (data, port) __raw_writeb(data, port) +#define mcfgpio_read (port) mcf_read8(port) +#define mcfgpio_write (data, port) mcf_write8(data, port)#elif defined(CONFIG_M5307 ) || defined(CONFIG_M5407 ) || defined(CONFIG_M5272 )
@@ -104,8 +104,8 @@ static inline void gpio_free(unsigned gpio)#define MCFGPIO_PORTTYPE u16#define MCFGPIO_PORTSIZE 16 -#define mcfgpio_read (port) __raw_readw(port) -#define mcfgpio_write (data, port) __raw_writew(data, port) +#define mcfgpio_read (port) mcf_read16(port) +#define mcfgpio_write (data, port) mcf_write16(data, port)#elif defined(CONFIG_M5249 ) || defined(CONFIG_M525x)
@@ -113,8 +113,8 @@ static inline void gpio_free(unsigned gpio)#define MCFGPIO_PORTTYPE u32#define MCFGPIO_PORTSIZE 32 -#define mcfgpio_read (port) __raw_readl(port) -#define mcfgpio_write (data, port) __raw_writel(data, port) +#define mcfgpio_read (port) mcf_read32(port) +#define mcfgpio_write (data, port) mcf_write32(data, port)#endif
arch/m68k/include/asm/nettel.h +2 -2
@@ -87,12 +87,12 @@ static __inline__ void mcf_setppdata(unsigned int mask, unsigned int bits)*/ static __inline__unsigned int mcf_getppdata (void ) { -return readw (MCFSIM_PBDAT ); +return mcf_read16 (MCFSIM_PBDAT ); }static __inline__void mcf_setppdata (unsigned int mask,unsigned int bits) { -writew ((readw (MCFSIM_PBDAT ) & ~mask) | bits,MCFSIM_PBDAT ); +mcf_write16 ((mcf_read16 (MCFSIM_PBDAT ) & ~mask) | bits,MCFSIM_PBDAT ); }#endif
Signature · 1 line
2.54.0
Greg Ungerer
maintainerPATCH 3/7 m68k: coldfire: use ColdFire specifc IO access in interrupt code
In reply to Greg UngererFrom: Greg Ungerer <[email protected]>
Convert all coldfire specific interrupt setup code to only use the newly created internal register access methods. This is replacing the mixed and inconsistent use of readx/writex and __raw_readx/__raw_writex for internal SoC registers.
--- arch/m68k/coldfire/intc-2.c | 30 +++++++++++++-------------- arch/m68k/coldfire/intc-5249.c | 10 ++++----- arch/m68k/coldfire/intc-525x.c | 12 +++++------ arch/m68k/coldfire/intc-5272.c | 20 +++++++++--------- arch/m68k/coldfire/intc-simr.c | 38 +++++++++++++++++----------------- arch/m68k/coldfire/intc.c | 28 ++++++++++++------------- 6 files changed, 69 insertions(+), 69 deletions(-)
arch/m68k/coldfire/intc-2.c +15 -15
@@ -61,8 +61,8 @@ static void intc_irq_mask(struct irq_data *d) imraddr += (irq &0x20 ) ?MCFINTC_IMRH :MCFINTC_IMRL ; imrbit =0x1 << (irq &0x1f ); - val =__raw_readl (imraddr); -__raw_writel (val | imrbit, imraddr); + val =mcf_read32 (imraddr); +mcf_write32 (val | imrbit, imraddr); }static void intc_irq_unmask (struct irq_data *d)
@@ -83,8 +83,8 @@ static void intc_irq_unmask(struct irq_data *d)if ((irq &0x20 ) ==0 ) imrbit |=0x1 ; - val =__raw_readl (imraddr); -__raw_writel (val & ~imrbit, imraddr); + val =mcf_read32 (imraddr); +mcf_write32 (val & ~imrbit, imraddr); }/*
@@ -97,7 +97,7 @@ static void intc_irq_ack(struct irq_data *d) {unsigned int irq = d->irq; -__raw_writeb (0x1 << (irq -EINT0 ),MCFEPORT_EPFR ); +mcf_write8 (0x1 << (irq -EINT0 ),MCFEPORT_EPFR ); }/*
@@ -120,8 +120,8 @@ static unsigned int intc_irq_startup(struct irq_data *d) icraddr =MCFICM_INTC0 ;#endif icraddr +=MCFINTC_ICR0 + (irq &0x3f ); -if (__raw_readb (icraddr) ==0 ) -__raw_writeb (intc_intpri--, icraddr); +if (mcf_read8 (icraddr) ==0 ) +mcf_write8 (intc_intpri--, icraddr); irq = d->irq;if ((irq >=EINT1 ) && (irq <=EINT7 )) {
@@ -130,12 +130,12 @@ static unsigned int intc_irq_startup(struct irq_data *d) irq -=EINT0 ;/* Set EPORT line as input */ - v =__raw_readb (MCFEPORT_EPDDR ); -__raw_writeb (v & ~(0x1 << irq),MCFEPORT_EPDDR ); + v =mcf_read8 (MCFEPORT_EPDDR ); +mcf_write8 (v & ~(0x1 << irq),MCFEPORT_EPDDR );/* Set EPORT line as interrupt source */ - v =__raw_readb (MCFEPORT_EPIER ); -__raw_writeb (v | (0x1 << irq),MCFEPORT_EPIER ); + v =mcf_read8 (MCFEPORT_EPIER ); +mcf_write8 (v | (0x1 << irq),MCFEPORT_EPIER ); }intc_irq_unmask (d);
@@ -167,9 +167,9 @@ static int intc_irq_set_type(struct irq_data *d, unsigned int type)irq_set_handler (irq, handle_edge_irq); irq -=EINT0 ; - pa =__raw_readw (MCFEPORT_EPPAR ); + pa =mcf_read16 (MCFEPORT_EPPAR ); pa = (pa & ~(0x3 << (irq *2 ))) | (tb << (irq *2 )); -__raw_writew (pa,MCFEPORT_EPPAR ); +mcf_write16 (pa,MCFEPORT_EPPAR );return 0 ; }
@@ -195,9 +195,9 @@ void __init init_IRQ(void)int irq;/* Mask all interrupt sources */ -__raw_writel (0x1 ,MCFICM_INTC0 +MCFINTC_IMRL ); +mcf_write32 (0x1 ,MCFICM_INTC0 +MCFINTC_IMRL );#ifdef MCFICM_INTC1 -__raw_writel (0x1 ,MCFICM_INTC1 +MCFINTC_IMRL ); +mcf_write32 (0x1 ,MCFICM_INTC1 +MCFINTC_IMRL );#endif for (irq =MCFINT_VECBASE ; (irq <MCFINT_VECBASE +NR_VECS ); irq++) {
arch/m68k/coldfire/intc-5249.c +5 -5
@@ -20,22 +20,22 @@static void intc2_irq_gpio_mask (struct irq_data *d) {u32 imr; - imr =readl (MCFSIM2_GPIOINTENABLE ); + imr =mcf_read32 (MCFSIM2_GPIOINTENABLE ); imr &= ~(0x1 << (d->irq -MCF_IRQ_GPIO0 )); -writel (imr,MCFSIM2_GPIOINTENABLE ); +mcf_write32 (imr,MCFSIM2_GPIOINTENABLE ); }static void intc2_irq_gpio_unmask (struct irq_data *d) {u32 imr; - imr =readl (MCFSIM2_GPIOINTENABLE ); + imr =mcf_read32 (MCFSIM2_GPIOINTENABLE ); imr |= (0x1 << (d->irq -MCF_IRQ_GPIO0 )); -writel (imr,MCFSIM2_GPIOINTENABLE ); +mcf_write32 (imr,MCFSIM2_GPIOINTENABLE ); }static void intc2_irq_gpio_ack (struct irq_data *d) { -writel (0x1 << (d->irq -MCF_IRQ_GPIO0 ),MCFSIM2_GPIOINTCLEAR ); +mcf_write32 (0x1 << (d->irq -MCF_IRQ_GPIO0 ),MCFSIM2_GPIOINTCLEAR ); }static struct irq_chip intc2_irq_gpio_chip = {
arch/m68k/coldfire/intc-525x.c +6 -6
@@ -20,7 +20,7 @@static void intc2_irq_gpio_mask (struct irq_data *d) { -u32 imr =readl (MCFSIM2_GPIOINTENABLE ); +u32 imr =mcf_read32 (MCFSIM2_GPIOINTENABLE );u32 type =irqd_get_trigger_type (d);int irq = d->irq -MCF_IRQ_GPIO0 ;
@@ -28,12 +28,12 @@ static void intc2_irq_gpio_mask(struct irq_data *d) imr &= ~(0x001 << irq);if (type &IRQ_TYPE_EDGE_FALLING ) imr &= ~(0x100 << irq); -writel (imr,MCFSIM2_GPIOINTENABLE ); +mcf_write32 (imr,MCFSIM2_GPIOINTENABLE ); }static void intc2_irq_gpio_unmask (struct irq_data *d) { -u32 imr =readl (MCFSIM2_GPIOINTENABLE ); +u32 imr =mcf_read32 (MCFSIM2_GPIOINTENABLE );u32 type =irqd_get_trigger_type (d);int irq = d->irq -MCF_IRQ_GPIO0 ;
@@ -41,7 +41,7 @@ static void intc2_irq_gpio_unmask(struct irq_data *d) imr |= (0x001 << irq);if (type &IRQ_TYPE_EDGE_FALLING ) imr |= (0x100 << irq); -writel (imr,MCFSIM2_GPIOINTENABLE ); +mcf_write32 (imr,MCFSIM2_GPIOINTENABLE ); }static void intc2_irq_gpio_ack (struct irq_data *d)
@@ -54,7 +54,7 @@ static void intc2_irq_gpio_ack(struct irq_data *d) imr |= (0x001 << irq);if (type &IRQ_TYPE_EDGE_FALLING ) imr |= (0x100 << irq); -writel (imr,MCFSIM2_GPIOINTCLEAR ); +mcf_write32 (imr,MCFSIM2_GPIOINTCLEAR ); }static int intc2_irq_gpio_set_type (struct irq_data *d,unsigned int f)
@@ -77,7 +77,7 @@ static int __init mcf_intc2_init(void)int irq;/* set the interrupt base for the second interrupt controller */ -writel (MCFINTC2_VECBASE ,MCFINTC2_INTBASE ); +mcf_write32 (MCFINTC2_VECBASE ,MCFINTC2_INTBASE );/* GPIO interrupt sources */ for (irq =MCF_IRQ_GPIO0 ; (irq <=MCF_IRQ_GPIO6 ); irq++) {
arch/m68k/coldfire/intc-5272.c +10 -10
@@ -86,7 +86,7 @@ static void intc_irq_mask(struct irq_data *d)u32 v; irq -=MCFINT_VECBASE ; v =0x8 << intc_irqmap[irq].index; -writel (v, intc_irqmap[irq].icr); +mcf_write32 (v, intc_irqmap[irq].icr); } }
@@ -98,7 +98,7 @@ static void intc_irq_unmask(struct irq_data *d)u32 v; irq -=MCFINT_VECBASE ; v =0xd << intc_irqmap[irq].index; -writel (v, intc_irqmap[irq].icr); +mcf_write32 (v, intc_irqmap[irq].icr); } }
@@ -111,10 +111,10 @@ static void intc_irq_ack(struct irq_data *d) irq -=MCFINT_VECBASE ;if (intc_irqmap[irq].ack) {u32 v; - v =readl (intc_irqmap[irq].icr); + v =mcf_read32 (intc_irqmap[irq].icr); v &= (0x7 << intc_irqmap[irq].index); v |= (0x8 << intc_irqmap[irq].index); -writel (v, intc_irqmap[irq].icr); +mcf_write32 (v, intc_irqmap[irq].icr); } } }
@@ -127,12 +127,12 @@ static int intc_irq_set_type(struct irq_data *d, unsigned int type) irq -=MCFINT_VECBASE ;if (intc_irqmap[irq].ack) {u32 v; - v =readl (MCFSIM_PITR ); + v =mcf_read32 (MCFSIM_PITR );if (type ==IRQ_TYPE_EDGE_FALLING ) v &= ~(0x1 << (32 - irq));else v |= (0x1 << (32 - irq)); -writel (v,MCFSIM_PITR ); +mcf_write32 (v,MCFSIM_PITR ); } }return 0 ;
@@ -163,10 +163,10 @@ void __init init_IRQ(void)int irq, edge;/* Mask all interrupt sources */ -writel (0x88888888 ,MCFSIM_ICR1 ); -writel (0x88888888 ,MCFSIM_ICR2 ); -writel (0x88888888 ,MCFSIM_ICR3 ); -writel (0x88888888 ,MCFSIM_ICR4 ); +mcf_write32 (0x88888888 ,MCFSIM_ICR1 ); +mcf_write32 (0x88888888 ,MCFSIM_ICR2 ); +mcf_write32 (0x88888888 ,MCFSIM_ICR3 ); +mcf_write32 (0x88888888 ,MCFSIM_ICR4 );for (irq =0 ; (irq <NR_IRQS ); irq++) {irq_set_chip (irq, &intc_irq_chip);
arch/m68k/coldfire/intc-simr.c +19 -19
@@ -69,11 +69,11 @@ static void intc_irq_mask(struct irq_data *d)unsigned int irq = d->irq -MCFINT_VECBASE ;if (MCFINTC2_SIMR && (irq >127 )) -__raw_writeb (irq -128 ,MCFINTC2_SIMR ); +mcf_write8 (irq -128 ,MCFINTC2_SIMR );else if (MCFINTC1_SIMR && (irq >63 )) -__raw_writeb (irq -64 ,MCFINTC1_SIMR ); +mcf_write8 (irq -64 ,MCFINTC1_SIMR );else -__raw_writeb (irq,MCFINTC0_SIMR ); +mcf_write8 (irq,MCFINTC0_SIMR ); }static void intc_irq_unmask (struct irq_data *d)
@@ -81,18 +81,18 @@ static void intc_irq_unmask(struct irq_data *d)unsigned int irq = d->irq -MCFINT_VECBASE ;if (MCFINTC2_CIMR && (irq >127 )) -__raw_writeb (irq -128 ,MCFINTC2_CIMR ); +mcf_write8 (irq -128 ,MCFINTC2_CIMR );else if (MCFINTC1_CIMR && (irq >63 )) -__raw_writeb (irq -64 ,MCFINTC1_CIMR ); +mcf_write8 (irq -64 ,MCFINTC1_CIMR );else -__raw_writeb (irq,MCFINTC0_CIMR ); +mcf_write8 (irq,MCFINTC0_CIMR ); }static void intc_irq_ack (struct irq_data *d) {unsigned int ebit =irq2ebit (d->irq); -__raw_writeb (0x1 << ebit,MCFEPORT_EPFR ); +mcf_write8 (0x1 << ebit,MCFEPORT_EPFR ); }static unsigned int intc_irq_startup (struct irq_data *d)
@@ -105,22 +105,22 @@ static unsigned int intc_irq_startup(struct irq_data *d)#if defined(MCFEPORT_EPDDR )/* Set EPORT line as input */ - v =__raw_readb (MCFEPORT_EPDDR ); -__raw_writeb (v & ~(0x1 << ebit),MCFEPORT_EPDDR ); + v =mcf_read8 (MCFEPORT_EPDDR ); +mcf_write8 (v & ~(0x1 << ebit),MCFEPORT_EPDDR );#endif /* Set EPORT line as interrupt source */ - v =__raw_readb (MCFEPORT_EPIER ); -__raw_writeb (v | (0x1 << ebit),MCFEPORT_EPIER ); + v =mcf_read8 (MCFEPORT_EPIER ); +mcf_write8 (v | (0x1 << ebit),MCFEPORT_EPIER ); } irq -=MCFINT_VECBASE ;if (MCFINTC2_ICR0 && (irq >127 )) -__raw_writeb (5 ,MCFINTC2_ICR0 + irq -128 ); +mcf_write8 (5 ,MCFINTC2_ICR0 + irq -128 );else if (MCFINTC1_ICR0 && (irq >63 )) -__raw_writeb (5 ,MCFINTC1_ICR0 + irq -64 ); +mcf_write8 (5 ,MCFINTC1_ICR0 + irq -64 );else -__raw_writeb (5 ,MCFINTC0_ICR0 + irq); +mcf_write8 (5 ,MCFINTC0_ICR0 + irq);intc_irq_unmask (d);return 0 ;
@@ -151,9 +151,9 @@ static int intc_irq_set_type(struct irq_data *d, unsigned int type)irq_set_handler (irq, handle_edge_irq); ebit =irq2ebit (irq) *2 ; - pa =__raw_readw (MCFEPORT_EPPAR ); + pa =mcf_read16 (MCFEPORT_EPPAR ); pa = (pa & ~(0x3 << ebit)) | (tb << ebit); -__raw_writew (pa,MCFEPORT_EPPAR ); +mcf_write16 (pa,MCFEPORT_EPPAR );return 0 ; }
@@ -179,11 +179,11 @@ void __init init_IRQ(void)int irq, eirq;/* Mask all interrupt sources */ -__raw_writeb (0xff ,MCFINTC0_SIMR ); +mcf_write8 (0xff ,MCFINTC0_SIMR );if (MCFINTC1_SIMR ) -__raw_writeb (0xff ,MCFINTC1_SIMR ); +mcf_write8 (0xff ,MCFINTC1_SIMR );if (MCFINTC2_SIMR ) -__raw_writeb (0xff ,MCFINTC2_SIMR ); +mcf_write8 (0xff ,MCFINTC2_SIMR ); eirq =MCFINT_VECBASE +64 + (MCFINTC1_ICR0 ?64 :0 ) + (MCFINTC2_ICR0 ?64 :0 );
arch/m68k/coldfire/intc.c +14 -14
@@ -45,23 +45,23 @@ unsigned char mcf_irq2imr[NR_IRQS];void mcf_setimr (int index) {u16 imr; - imr =__raw_readw (MCFSIM_IMR ); -__raw_writew (imr | (0x1 << index),MCFSIM_IMR ); + imr =mcf_read16 (MCFSIM_IMR ); +mcf_write16 (imr | (0x1 << index),MCFSIM_IMR ); }void mcf_clrimr (int index) {u16 imr; - imr =__raw_readw (MCFSIM_IMR ); -__raw_writew (imr & ~(0x1 << index),MCFSIM_IMR ); + imr =mcf_read16 (MCFSIM_IMR ); +mcf_write16 (imr & ~(0x1 << index),MCFSIM_IMR ); }static void mcf_maskimr (unsigned int mask) {u16 imr; - imr =__raw_readw (MCFSIM_IMR ); + imr =mcf_read16 (MCFSIM_IMR ); imr |= mask; -__raw_writew (imr,MCFSIM_IMR ); +mcf_write16 (imr,MCFSIM_IMR ); }#else
@@ -69,23 +69,23 @@ static void mcf_maskimr(unsigned int mask)void mcf_setimr (int index) {u32 imr; - imr =__raw_readl (MCFSIM_IMR ); -__raw_writel (imr | (0x1 << index),MCFSIM_IMR ); + imr =mcf_read32 (MCFSIM_IMR ); +mcf_write32 (imr | (0x1 << index),MCFSIM_IMR ); }void mcf_clrimr (int index) {u32 imr; - imr =__raw_readl (MCFSIM_IMR ); -__raw_writel (imr & ~(0x1 << index),MCFSIM_IMR ); + imr =mcf_read32 (MCFSIM_IMR ); +mcf_write32 (imr & ~(0x1 << index),MCFSIM_IMR ); }static void mcf_maskimr (unsigned int mask) {u32 imr; - imr =__raw_readl (MCFSIM_IMR ); + imr =mcf_read32 (MCFSIM_IMR ); imr |= mask; -__raw_writel (imr,MCFSIM_IMR ); +mcf_write32 (imr,MCFSIM_IMR ); }#endif
@@ -104,9 +104,9 @@ void mcf_autovector(int irq)#ifdef MCFSIM_AVR if ((irq >=EIRQ1 ) && (irq <=EIRQ7 )) {u8 avec; - avec =__raw_readb (MCFSIM_AVR ); + avec =mcf_read8 (MCFSIM_AVR ); avec |= (0x1 << (irq -EIRQ1 +1 )); -__raw_writeb (avec,MCFSIM_AVR ); +mcf_write8 (avec,MCFSIM_AVR ); }#endif }
Signature · 1 line
2.54.0
Greg Ungerer
maintainerPATCH 4/7 m68k: coldfire: use ColdFire specifc IO access in timer code
In reply to Greg UngererFrom: Greg Ungerer <[email protected]>
Convert all coldfire specific timer setup code to only use the newly created internal register access methods. This is replacing the mixed and inconsistent use of readx/writex and __raw_readx/__raw_writex for internal SoC registers.
--- arch/m68k/coldfire/dma_timer.c | 12 ++++++------ arch/m68k/coldfire/pit.c | 20 ++++++++++---------- arch/m68k/coldfire/sltimers.c | 18 +++++++++--------- arch/m68k/coldfire/timers.c | 26 +++++++++++++------------- 4 files changed, 38 insertions(+), 38 deletions(-)
arch/m68k/coldfire/dma_timer.c +6 -6
@@ -37,7 +37,7 @@static u64 cf_dt_get_cycles (struct clocksource *cs) { -return __raw_readl (DTCN0 ); +return mcf_read32 (DTCN0 ); }static struct clocksource clocksource_cf_dt = {
@@ -56,10 +56,10 @@ static int __init init_cf_dt_clocksource(void)* get a ~213 ns resolution and the 32bit register will overflow almost * every 15 minutes. */ -__raw_writeb (0x00 ,DTXMR0 ); -__raw_writeb (0x00 ,DTER0 ); -__raw_writel (0x00000000 ,DTRR0 ); -__raw_writew (DMA_DTMR_CLK_DIV_16 |DMA_DTMR_ENABLE ,DTMR0 ); +mcf_write8 (0x00 ,DTXMR0 ); +mcf_write8 (0x00 ,DTER0 ); +mcf_write32 (0x00000000 ,DTRR0 ); +mcf_write16 (DMA_DTMR_CLK_DIV_16 |DMA_DTMR_ENABLE ,DTMR0 );return clocksource_register_hz (&clocksource_cf_dt,DMA_FREQ ); }
@@ -76,7 +76,7 @@ static unsigned long long cycles2ns(unsigned long cycl)unsigned long long sched_clock (void ) { -unsigned long cycl =__raw_readl (DTCN0 ); +unsigned long cycl =mcf_read32 (DTCN0 );return cycles2ns (cycl); }
arch/m68k/coldfire/pit.c +10 -10
@@ -45,9 +45,9 @@ static u32 pit_cnt;static int cf_pit_set_periodic (struct clock_event_device *evt) { -__raw_writew (MCFPIT_PCSR_DISABLE ,TA (MCFPIT_PCSR )); -__raw_writew (PIT_CYCLES_PER_JIFFY ,TA (MCFPIT_PMR )); -__raw_writew (MCFPIT_PCSR_EN |MCFPIT_PCSR_PIE | +mcf_write16 (MCFPIT_PCSR_DISABLE ,TA (MCFPIT_PCSR )); +mcf_write16 (PIT_CYCLES_PER_JIFFY ,TA (MCFPIT_PMR )); +mcf_write16 (MCFPIT_PCSR_EN |MCFPIT_PCSR_PIE |MCFPIT_PCSR_OVW |MCFPIT_PCSR_RLD |MCFPIT_PCSR_CLK64 ,TA (MCFPIT_PCSR ));return 0 ;
@@ -55,15 +55,15 @@ static int cf_pit_set_periodic(struct clock_event_device *evt)static int cf_pit_set_oneshot (struct clock_event_device *evt) { -__raw_writew (MCFPIT_PCSR_DISABLE ,TA (MCFPIT_PCSR )); -__raw_writew (MCFPIT_PCSR_EN |MCFPIT_PCSR_PIE | +mcf_write16 (MCFPIT_PCSR_DISABLE ,TA (MCFPIT_PCSR )); +mcf_write16 (MCFPIT_PCSR_EN |MCFPIT_PCSR_PIE |MCFPIT_PCSR_OVW |MCFPIT_PCSR_CLK64 ,TA (MCFPIT_PCSR ));return 0 ; }static int cf_pit_shutdown (struct clock_event_device *evt) { -__raw_writew (MCFPIT_PCSR_DISABLE ,TA (MCFPIT_PCSR )); +mcf_write16 (MCFPIT_PCSR_DISABLE ,TA (MCFPIT_PCSR ));return 0 ; }
@@ -75,7 +75,7 @@ static int cf_pit_shutdown(struct clock_event_device *evt)static int cf_pit_next_event (unsigned long delta,struct clock_event_device *evt) { -__raw_writew (delta,TA (MCFPIT_PMR )); +mcf_write16 (delta,TA (MCFPIT_PMR ));return 0 ; }
@@ -101,8 +101,8 @@ static irqreturn_t pit_tick(int irq, void *dummy)u16 pcsr;/* Reset the ColdFire timer */ - pcsr =__raw_readw (TA (MCFPIT_PCSR )); -__raw_writew (pcsr |MCFPIT_PCSR_PIF ,TA (MCFPIT_PCSR )); + pcsr =mcf_read16 (TA (MCFPIT_PCSR )); +mcf_write16 (pcsr |MCFPIT_PCSR_PIF ,TA (MCFPIT_PCSR )); pit_cnt +=PIT_CYCLES_PER_JIFFY ; evt->event_handler (evt);
@@ -118,7 +118,7 @@ static u64 pit_read_clk(struct clocksource *cs)u16 pcntr;local_irq_save (flags); - pcntr =__raw_readw (TA (MCFPIT_PCNTR )); + pcntr =mcf_read16 (TA (MCFPIT_PCNTR )); cycles = pit_cnt;local_irq_restore (flags);
arch/m68k/coldfire/sltimers.c +9 -9
@@ -44,7 +44,7 @@irqreturn_t mcfslt_profile_tick (int irq,void *dummy) {/* Reset Slice Timer 1 */ -__raw_writel (MCFSLT_SSR_BE |MCFSLT_SSR_TE ,PA (MCFSLT_SSR )); +mcf_write32 (MCFSLT_SSR_BE |MCFSLT_SSR_TE ,PA (MCFSLT_SSR ));if (current->pid)profile_tick (CPU_PROFILING );return IRQ_HANDLED ;
@@ -65,8 +65,8 @@ void mcfslt_profile_init(void) }/* Set up TIMER 2 as high speed profile clock */ -__raw_writel (MCF_BUSCLK /PROFILEHZ -1 ,PA (MCFSLT_STCNT )); -__raw_writel (MCFSLT_SCR_RUN |MCFSLT_SCR_IEN |MCFSLT_SCR_TEN , +mcf_write32 (MCF_BUSCLK /PROFILEHZ -1 ,PA (MCFSLT_STCNT )); +mcf_write32 (MCFSLT_SCR_RUN |MCFSLT_SCR_IEN |MCFSLT_SCR_TEN ,PA (MCFSLT_SCR )); }
@@ -86,7 +86,7 @@ static u32 mcfslt_cnt;static irqreturn_t mcfslt_tick (int irq,void *dummy) {/* Reset Slice Timer 0 */ -__raw_writel (MCFSLT_SSR_BE |MCFSLT_SSR_TE ,TA (MCFSLT_SSR )); +mcf_write32 (MCFSLT_SSR_BE |MCFSLT_SSR_TE ,TA (MCFSLT_SSR )); mcfslt_cnt += mcfslt_cycles_per_jiffy;legacy_timer_tick (1 );return IRQ_HANDLED ;
@@ -98,11 +98,11 @@ static u64 mcfslt_read_clk(struct clocksource *cs)u32 cycles, scnt;local_irq_save (flags); - scnt =__raw_readl (TA (MCFSLT_SCNT )); + scnt =mcf_read32 (TA (MCFSLT_SCNT )); cycles = mcfslt_cnt; -if (__raw_readl (TA (MCFSLT_SSR )) &MCFSLT_SSR_TE ) { +if (mcf_read32 (TA (MCFSLT_SSR )) &MCFSLT_SSR_TE ) { cycles += mcfslt_cycles_per_jiffy; - scnt =__raw_readl (TA (MCFSLT_SCNT )); + scnt =mcf_read32 (TA (MCFSLT_SCNT )); }local_irq_restore (flags);
@@ -129,8 +129,8 @@ void hw_timer_init(void)* STCNT + 1 steps for 1 tick, not STCNT. So if you want * n cycles, initialize STCNT with n - 1. */ -__raw_writel (mcfslt_cycles_per_jiffy -1 ,TA (MCFSLT_STCNT )); -__raw_writel (MCFSLT_SCR_RUN |MCFSLT_SCR_IEN |MCFSLT_SCR_TEN , +mcf_write32 (mcfslt_cycles_per_jiffy -1 ,TA (MCFSLT_STCNT )); +mcf_write32 (MCFSLT_SCR_RUN |MCFSLT_SCR_IEN |MCFSLT_SCR_TEN ,TA (MCFSLT_SCR ));/* initialize mcfslt_cnt knowing that slice timers count down */ mcfslt_cnt = mcfslt_cycles_per_jiffy;
arch/m68k/coldfire/timers.c +13 -13
@@ -38,11 +38,11 @@void coldfire_profile_init (void );#if defined(CONFIG_M53xx) || defined(CONFIG_M5441x) -#define __raw_readtrr __raw_readl -#define __raw_writetrr __raw_writel +#define __raw_readtrr mcf_read32 +#define __raw_writetrr mcf_write32#else -#define __raw_readtrr __raw_readw -#define __raw_writetrr __raw_writew +#define __raw_readtrr mcf_read16 +#define __raw_writetrr mcf_write16#endif static u32 mcftmr_cycles_per_jiffy;
@@ -54,13 +54,13 @@ static void init_timer_irq(void) {#ifdef MCFSIM_ICR_AUTOVEC /* Timer1 is always used as system timer */ -writeb (MCFSIM_ICR_AUTOVEC |MCFSIM_ICR_LEVEL6 |MCFSIM_ICR_PRI3 , +mcf_write8 (MCFSIM_ICR_AUTOVEC |MCFSIM_ICR_LEVEL6 |MCFSIM_ICR_PRI3 ,MCFSIM_TIMER1ICR );mcf_mapirq2imr (MCF_IRQ_TIMER ,MCFINTC_TIMER1 );#ifdef CONFIG_HIGHPROFILE /* Timer2 is to be used as a high speed profile timer */ -writeb (MCFSIM_ICR_AUTOVEC |MCFSIM_ICR_LEVEL7 |MCFSIM_ICR_PRI3 , +mcf_write8 (MCFSIM_ICR_AUTOVEC |MCFSIM_ICR_LEVEL7 |MCFSIM_ICR_PRI3 ,MCFSIM_TIMER2ICR );mcf_mapirq2imr (MCF_IRQ_PROFILER ,MCFINTC_TIMER2 );#endif
@@ -72,7 +72,7 @@ static void init_timer_irq(void)static irqreturn_t mcftmr_tick (int irq,void *dummy) {/* Reset the ColdFire timer */ -__raw_writeb (MCFTIMER_TER_CAP |MCFTIMER_TER_REF ,TA (MCFTIMER_TER )); +mcf_write8 (MCFTIMER_TER_CAP |MCFTIMER_TER_REF ,TA (MCFTIMER_TER )); mcftmr_cnt += mcftmr_cycles_per_jiffy;legacy_timer_tick (1 );
@@ -88,7 +88,7 @@ static u64 mcftmr_read_clk(struct clocksource *cs)u16 tcn;local_irq_save (flags); - tcn =__raw_readw (TA (MCFTIMER_TCN )); + tcn =mcf_read16 (TA (MCFTIMER_TCN )); cycles = mcftmr_cnt;local_irq_restore (flags);
@@ -111,7 +111,7 @@ void hw_timer_init(void) {int r; -__raw_writew (MCFTIMER_TMR_DISABLE ,TA (MCFTIMER_TMR )); +mcf_write16 (MCFTIMER_TMR_DISABLE ,TA (MCFTIMER_TMR )); mcftmr_cycles_per_jiffy =FREQ /HZ ;/* * The coldfire timer runs from 0 to TRR included, then 0
@@ -120,7 +120,7 @@ void hw_timer_init(void)* initialize TRR with n - 1. */ __raw_writetrr (mcftmr_cycles_per_jiffy -1 ,TA (MCFTIMER_TRR )); -__raw_writew (MCFTIMER_TMR_ENORI |MCFTIMER_TMR_CLK16 | +mcf_write16 (MCFTIMER_TMR_ENORI |MCFTIMER_TMR_CLK16 |MCFTIMER_TMR_RESTART |MCFTIMER_TMR_ENABLE ,TA (MCFTIMER_TMR ));clocksource_register_hz (&mcftmr_clk,FREQ );
@@ -158,7 +158,7 @@ void hw_timer_init(void)irqreturn_t coldfire_profile_tick (int irq,void *dummy) {/* Reset ColdFire timer2 */ -__raw_writeb (MCFTIMER_TER_CAP |MCFTIMER_TER_REF ,PA (MCFTIMER_TER )); +mcf_write8 (MCFTIMER_TER_CAP |MCFTIMER_TER_REF ,PA (MCFTIMER_TER ));if (current->pid)profile_tick (CPU_PROFILING );return IRQ_HANDLED ;
@@ -174,10 +174,10 @@ void coldfire_profile_init(void) PROFILEHZ);/* Set up TIMER 2 as high speed profile clock */ -__raw_writew (MCFTIMER_TMR_DISABLE ,PA (MCFTIMER_TMR )); +mcf_write16 (MCFTIMER_TMR_DISABLE ,PA (MCFTIMER_TMR ));__raw_writetrr (((MCF_BUSCLK /16 ) /PROFILEHZ ),PA (MCFTIMER_TRR )); -__raw_writew (MCFTIMER_TMR_ENORI |MCFTIMER_TMR_CLK16 | +mcf_write16 (MCFTIMER_TMR_ENORI |MCFTIMER_TMR_CLK16 |MCFTIMER_TMR_RESTART |MCFTIMER_TMR_ENABLE ,PA (MCFTIMER_TMR )); ret = request_irq(MCF_IRQ_PROFILER, coldfire_profile_tick, IRQF_TIMER,
Signature · 1 line
2.54.0
Greg Ungerer
maintainerPATCH 5/7 m68k: coldfire: rename timer register access defines
In reply to Greg UngererFrom: Greg Ungerer <[email protected]>
With the basic ColdFire IO register functions now consistently named with a "mcf_read"/"mcf_write" prefix it makes sense to name the timers internal access defines the same way. Convert the local __raw_readtrr and __raw_writetrr defines to use the consistent prefixes too. Thus the change is:
__raw_readtrr --> mcf_readtrr
__raw_writetrr --> mcf_writetrr--- arch/m68k/coldfire/timers.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
arch/m68k/coldfire/timers.c +6 -6
@@ -38,11 +38,11 @@void coldfire_profile_init (void );#if defined(CONFIG_M53xx) || defined(CONFIG_M5441x) -#define __raw_readtrr mcf_read32 -#define __raw_writetrr mcf_write32 +#define mcf_readtrr mcf_read32 +#define mcf_writetrr mcf_write32#else -#define __raw_readtrr mcf_read16 -#define __raw_writetrr mcf_write16 +#define mcf_readtrr mcf_read16 +#define mcf_writetrr mcf_write16#endif static u32 mcftmr_cycles_per_jiffy;
@@ -119,7 +119,7 @@ void hw_timer_init(void)* for 1 tick, not TRR. So if you want n cycles, * initialize TRR with n - 1. */ -__raw_writetrr (mcftmr_cycles_per_jiffy -1 ,TA (MCFTIMER_TRR )); +mcf_writetrr (mcftmr_cycles_per_jiffy -1 ,TA (MCFTIMER_TRR ));mcf_write16 (MCFTIMER_TMR_ENORI |MCFTIMER_TMR_CLK16 |MCFTIMER_TMR_RESTART |MCFTIMER_TMR_ENABLE ,TA (MCFTIMER_TMR ));
@@ -176,7 +176,7 @@ void coldfire_profile_init(void)/* Set up TIMER 2 as high speed profile clock */ mcf_write16 (MCFTIMER_TMR_DISABLE ,PA (MCFTIMER_TMR )); -__raw_writetrr (((MCF_BUSCLK /16 ) /PROFILEHZ ),PA (MCFTIMER_TRR )); +mcf_writetrr (((MCF_BUSCLK /16 ) /PROFILEHZ ),PA (MCFTIMER_TRR ));mcf_write16 (MCFTIMER_TMR_ENORI |MCFTIMER_TMR_CLK16 |MCFTIMER_TMR_RESTART |MCFTIMER_TMR_ENABLE ,PA (MCFTIMER_TMR ));
Signature · 1 line
2.54.0
Greg Ungerer
maintainerPATCH 6/7 m68k: coldfire: use ColdFire specifc IO access in system code
In reply to Greg UngererFrom: Greg Ungerer <[email protected]>
Convert all coldfire specific system setup code to only use the newly created internal register access methods. This is replacing the mixed and inconsistent use of readx/writex and __raw_readx/__raw_writex for internal SoC registers.
--- arch/m68k/coldfire/clk.c | 8 +++--- arch/m68k/coldfire/device.c | 8 +++--- arch/m68k/coldfire/pci.c | 56 ++++++++++++++++++------------------- arch/m68k/coldfire/reset.c | 4 +-- 4 files changed, 38 insertions(+), 38 deletions(-)
arch/m68k/coldfire/clk.c +4 -4
@@ -42,12 +42,12 @@ void __clk_init_disabled(struct clk *clk)static void __clk_enable0 (struct clk *clk) { -__raw_writeb (clk->slot,MCFPM_PPMCR0 ); +mcf_write8 (clk->slot,MCFPM_PPMCR0 ); }static void __clk_disable0 (struct clk *clk) { -__raw_writeb (clk->slot,MCFPM_PPMSR0 ); +mcf_write8 (clk->slot,MCFPM_PPMSR0 ); }struct clk_ops clk_ops0 = {
@@ -58,12 +58,12 @@ struct clk_ops clk_ops0 = {#ifdef MCFPM_PPMCR1 static void __clk_enable1 (struct clk *clk) { -__raw_writeb (clk->slot,MCFPM_PPMCR1 ); +mcf_write8 (clk->slot,MCFPM_PPMCR1 ); }static void __clk_disable1 (struct clk *clk) { -__raw_writeb (clk->slot,MCFPM_PPMSR1 ); +mcf_write8 (clk->slot,MCFPM_PPMSR1 ); } struct clk_ops clk_ops1 = {
arch/m68k/coldfire/device.c +4 -4
@@ -669,13 +669,13 @@ static void __init mcf_uart_set_irq(void) {#ifdef MCFUART_UIVR /* UART0 interrupt setup */ -writeb (MCFSIM_ICR_LEVEL6 |MCFSIM_ICR_PRI1 ,MCFSIM_UART1ICR ); -writeb (MCF_IRQ_UART0 ,MCFUART_BASE0 +MCFUART_UIVR ); +mcf_write8 (MCFSIM_ICR_LEVEL6 |MCFSIM_ICR_PRI1 ,MCFSIM_UART1ICR ); +mcf_write8 (MCF_IRQ_UART0 ,MCFUART_BASE0 +MCFUART_UIVR );mcf_mapirq2imr (MCF_IRQ_UART0 ,MCFINTC_UART0 );/* UART1 interrupt setup */ -writeb (MCFSIM_ICR_LEVEL6 |MCFSIM_ICR_PRI2 ,MCFSIM_UART2ICR ); -writeb (MCF_IRQ_UART1 ,MCFUART_BASE1 +MCFUART_UIVR ); +mcf_write8 (MCFSIM_ICR_LEVEL6 |MCFSIM_ICR_PRI2 ,MCFSIM_UART2ICR ); +mcf_write8 (MCF_IRQ_UART1 ,MCFUART_BASE1 +MCFUART_UIVR );mcf_mapirq2imr (MCF_IRQ_UART1 ,MCFINTC_UART1 );#endif }
arch/m68k/coldfire/pci.c +28 -28
127 lines not on this page · raw message
arch/m68k/coldfire/reset.c +2 -2
@@ -27,7 +27,7 @@ static void mcf_cpu_reset(void) {local_irq_disable ();/* Set watchdog to soft reset, and enabled */ -__raw_writeb (0xc0 ,MCFSIM_SYPCR ); +mcf_write8 (0xc0 ,MCFSIM_SYPCR );for (;;)/* wait for watchdog to timeout */ ; }
@@ -37,7 +37,7 @@ static void mcf_cpu_reset(void)static void mcf_cpu_reset (void ) {local_irq_disable (); -__raw_writeb (MCF_RCR_SWRESET ,MCF_RCR ); +mcf_write8 (MCF_RCR_SWRESET ,MCF_RCR ); }#endif
Signature · 1 line
2.54.0
Greg Ungerer
maintainerPATCH 7/7 m68k: coldfire: use ColdFire specifc IO access in SoC code
In reply to Greg UngererFrom: Greg Ungerer <[email protected]>
Convert all coldfire specific SoC/board setup code to only use the newly created internal register access methods. This is replacing the mixed and inconsistent use of readx/writex and __raw_readx/__raw_writex for internal SoC registers.
--- arch/m68k/coldfire/m5206.c | 2 +- arch/m68k/coldfire/m520x.c | 26 ++++---- arch/m68k/coldfire/m523x.c | 12 ++-- arch/m68k/coldfire/m5249.c | 16 ++--- arch/m68k/coldfire/m525x.c | 12 ++-- arch/m68k/coldfire/m5272.c | 16 ++--- arch/m68k/coldfire/m527x.c | 40 ++++++------ arch/m68k/coldfire/m528x.c | 28 ++++---- arch/m68k/coldfire/m5307.c | 2 +- arch/m68k/coldfire/m53xx.c | 122 +++++++++++++++++------------------ arch/m68k/coldfire/m5407.c | 2 +- arch/m68k/coldfire/m5441x.c | 12 ++-- arch/m68k/coldfire/m54xx.c | 18 +++--- arch/m68k/coldfire/nettel.c | 16 ++--- arch/m68k/coldfire/stmark2.c | 12 ++-- 15 files changed, 168 insertions(+), 168 deletions(-)
arch/m68k/coldfire/m5206.c +1 -1
@@ -40,7 +40,7 @@ static struct clk_lookup m5206_clk_lookup[] = {static void __init m5206_i2c_init (void ) {#if IS_ENABLED (CONFIG_I2C_IMX ) -writeb (MCFSIM_ICR_AUTOVEC |MCFSIM_ICR_LEVEL5 |MCFSIM_ICR_PRI0 , +mcf_write8 (MCFSIM_ICR_AUTOVEC |MCFSIM_ICR_LEVEL5 |MCFSIM_ICR_PRI0 ,MCFSIM_I2CICR );mcf_mapirq2imr (MCF_IRQ_I2C0 ,MCFINTC_I2C );#endif /* IS_ENABLED(CONFIG_I2C_IMX) */
arch/m68k/coldfire/m520x.c +13 -13
@@ -125,11 +125,11 @@ static void __init m520x_qspi_init(void)#if IS_ENABLED (CONFIG_SPI_COLDFIRE_QSPI )u16 par;/* setup Port QS for QSPI with gpio CS control */ -writeb (0x3f ,MCF_GPIO_PAR_QSPI ); +mcf_write8 (0x3f ,MCF_GPIO_PAR_QSPI );/* make U1CTS and U2RTS gpio for cs_control */ - par =readw (MCF_GPIO_PAR_UART ); + par =mcf_read16 (MCF_GPIO_PAR_UART ); par &=0x00ff ; -writew (par,MCF_GPIO_PAR_UART ); +mcf_write16 (par,MCF_GPIO_PAR_UART );#endif /* IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) */ }
@@ -142,9 +142,9 @@ static void __init m520x_i2c_init(void)/* setup Port FECI2C Pin Assignment Register for I2C */ /* set PAR_SCL to SCL and PAR_SDA to SDA */ - par =readb (MCF_GPIO_PAR_FECI2C ); + par =mcf_read8 (MCF_GPIO_PAR_FECI2C ); par |=0x0f ; -writeb (par,MCF_GPIO_PAR_FECI2C ); +mcf_write8 (par,MCF_GPIO_PAR_FECI2C );#endif /* IS_ENABLED(CONFIG_I2C_IMX) */ }
@@ -156,17 +156,17 @@ static void __init m520x_uarts_init(void)u8 par2;/* UART0 and UART1 GPIO pin setup */ - par =readw (MCF_GPIO_PAR_UART ); + par =mcf_read16 (MCF_GPIO_PAR_UART ); par |=MCF_GPIO_PAR_UART_PAR_UTXD0 |MCF_GPIO_PAR_UART_PAR_URXD0 ; par |=MCF_GPIO_PAR_UART_PAR_UTXD1 |MCF_GPIO_PAR_UART_PAR_URXD1 ; -writew (par,MCF_GPIO_PAR_UART ); +mcf_write16 (par,MCF_GPIO_PAR_UART );/* UART1 GPIO pin setup */ - par2 =readb (MCF_GPIO_PAR_FECI2C ); + par2 =mcf_read8 (MCF_GPIO_PAR_FECI2C ); par2 &= ~0x0F ; par2 |=MCF_GPIO_PAR_FECI2C_PAR_SCL_UTXD2 |MCF_GPIO_PAR_FECI2C_PAR_SDA_URXD2 ; -writeb (par2,MCF_GPIO_PAR_FECI2C ); +mcf_write8 (par2,MCF_GPIO_PAR_FECI2C ); }/***************************************************************************/
@@ -176,11 +176,11 @@ static void __init m520x_fec_init(void)u8 v;/* Set multi-function pins to ethernet mode */ - v =readb (MCF_GPIO_PAR_FEC ); -writeb (v |0xf0 ,MCF_GPIO_PAR_FEC ); + v =mcf_read8 (MCF_GPIO_PAR_FEC ); +mcf_write8 (v |0xf0 ,MCF_GPIO_PAR_FEC ); - v =readb (MCF_GPIO_PAR_FECI2C ); -writeb (v |0x0f ,MCF_GPIO_PAR_FECI2C ); + v =mcf_read8 (MCF_GPIO_PAR_FECI2C ); +mcf_write8 (v |0x0f ,MCF_GPIO_PAR_FECI2C ); }/***************************************************************************/
arch/m68k/coldfire/m523x.c +6 -6
@@ -51,11 +51,11 @@ static void __init m523x_qspi_init(void)u16 par;/* setup QSPS pins for QSPI with gpio CS control */ -writeb (0x1f ,MCFGPIO_PAR_QSPI ); +mcf_write8 (0x1f ,MCFGPIO_PAR_QSPI );/* and CS2 & CS3 as gpio */ - par =readw (MCFGPIO_PAR_TIMER ); + par =mcf_read16 (MCFGPIO_PAR_TIMER ); par &=0x3f3f ; -writew (par,MCFGPIO_PAR_TIMER ); +mcf_write16 (par,MCFGPIO_PAR_TIMER );#endif /* IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) */ }
@@ -68,9 +68,9 @@ static void __init m523x_i2c_init(void)/* setup Port AS Pin Assignment Register for I2C */ /* set PASPA0 to SCL and PASPA1 to SDA */ - par =readb (MCFGPIO_PAR_FECI2C ); + par =mcf_read8 (MCFGPIO_PAR_FECI2C ); par |=0x0f ; -writeb (par,MCFGPIO_PAR_FECI2C ); +mcf_write8 (par,MCFGPIO_PAR_FECI2C );#endif /* IS_ENABLED(CONFIG_I2C_IMX) */ }
@@ -79,7 +79,7 @@ static void __init m523x_i2c_init(void)static void __init m523x_fec_init (void ) {/* Set multi-function pins to ethernet use */ -writeb (readb (MCFGPIO_PAR_FECI2C ) |0xf0 ,MCFGPIO_PAR_FECI2C ); +mcf_write8 (read8 (MCFGPIO_PAR_FECI2C ) |0xf0 ,MCFGPIO_PAR_FECI2C ); }/***************************************************************************/
arch/m68k/coldfire/m5249.c +8 -8
@@ -75,7 +75,7 @@ static void __init m5249_qspi_init(void) {#if IS_ENABLED (CONFIG_SPI_COLDFIRE_QSPI )/* QSPI irq setup */ -writeb (MCFSIM_ICR_AUTOVEC |MCFSIM_ICR_LEVEL4 |MCFSIM_ICR_PRI0 , +mcf_write8 (MCFSIM_ICR_AUTOVEC |MCFSIM_ICR_LEVEL4 |MCFSIM_ICR_PRI0 ,MCFSIM_QSPIICR );mcf_mapirq2imr (MCF_IRQ_QSPI ,MCFINTC_QSPI );#endif /* IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) */
@@ -89,15 +89,15 @@ static void __init m5249_i2c_init(void)u32 r;/* first I2C controller uses regular irq setup */ -writeb (MCFSIM_ICR_AUTOVEC |MCFSIM_ICR_LEVEL5 |MCFSIM_ICR_PRI0 , +mcf_write8 (MCFSIM_ICR_AUTOVEC |MCFSIM_ICR_LEVEL5 |MCFSIM_ICR_PRI0 ,MCFSIM_I2CICR );mcf_mapirq2imr (MCF_IRQ_I2C0 ,MCFINTC_I2C );/* second I2C controller is completely different */ - r =readl (MCFINTC2_INTPRI_REG (MCF_IRQ_I2C1 )); + r =mcf_read32 (MCFINTC2_INTPRI_REG (MCF_IRQ_I2C1 )); r &= ~MCFINTC2_INTPRI_BITS (0xf ,MCF_IRQ_I2C1 ); r |=MCFINTC2_INTPRI_BITS (0x5 ,MCF_IRQ_I2C1 ); -writel (r,MCFINTC2_INTPRI_REG (MCF_IRQ_I2C1 )); +mcf_write32 (r,MCFINTC2_INTPRI_REG (MCF_IRQ_I2C1 ));#endif /* CONFIG_I2C_IMX */ }
@@ -110,11 +110,11 @@ static void __init m5249_smc91x_init(void)u32 gpio;/* Set the GPIO line as interrupt source for smc91x device */ - gpio =readl (MCFSIM2_GPIOINTENABLE ); -writel (gpio |0x40 ,MCFSIM2_GPIOINTENABLE ); + gpio =mcf_read32 (MCFSIM2_GPIOINTENABLE ); +mcf_write32 (gpio |0x40 ,MCFSIM2_GPIOINTENABLE ); - gpio =readl (MCFINTC2_INTPRI5 ); - writel(gpio | 0x04000000, MCFINTC2_INTPRI5); + gpio =mcf_read32 (MCFINTC2_INTPRI5 ); + mcf_write32(gpio | 0x04000000, MCFINTC2_INTPRI5); }#endif /* CONFIG_M5249C3 */
arch/m68k/coldfire/m525x.c +6 -6
@@ -44,12 +44,12 @@ static void __init m525x_qspi_init(void)#if IS_ENABLED (CONFIG_SPI_COLDFIRE_QSPI )/* set the GPIO function for the qspi cs gpios */ /* FIXME: replace with pinmux/pinctl support */ -u32 f =readl (MCFSIM2_GPIOFUNC ); +u32 f =mcf_read32 (MCFSIM2_GPIOFUNC ); f |= (1 <<MCFQSPI_CS2 ) | (1 <<MCFQSPI_CS1 ) | (1 <<MCFQSPI_CS0 ); -writel (f,MCFSIM2_GPIOFUNC ); +mcf_write32 (f,MCFSIM2_GPIOFUNC );/* QSPI irq setup */ -writeb (MCFSIM_ICR_AUTOVEC |MCFSIM_ICR_LEVEL4 |MCFSIM_ICR_PRI0 , +mcf_write8 (MCFSIM_ICR_AUTOVEC |MCFSIM_ICR_LEVEL4 |MCFSIM_ICR_PRI0 ,MCFSIM_QSPIICR );mcf_mapirq2imr (MCF_IRQ_QSPI ,MCFINTC_QSPI );#endif /* IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) */
@@ -61,15 +61,15 @@ static void __init m525x_i2c_init(void)u32 r;/* first I2C controller uses regular irq setup */ -writeb (MCFSIM_ICR_AUTOVEC |MCFSIM_ICR_LEVEL5 |MCFSIM_ICR_PRI0 , +mcf_write8 (MCFSIM_ICR_AUTOVEC |MCFSIM_ICR_LEVEL5 |MCFSIM_ICR_PRI0 ,MCFSIM_I2CICR );mcf_mapirq2imr (MCF_IRQ_I2C0 ,MCFINTC_I2C );/* second I2C controller is completely different */ - r =readl (MCFINTC2_INTPRI_REG (MCF_IRQ_I2C1 )); + r =mcf_read32 (MCFINTC2_INTPRI_REG (MCF_IRQ_I2C1 )); r &= ~MCFINTC2_INTPRI_BITS (0xf ,MCF_IRQ_I2C1 ); r |=MCFINTC2_INTPRI_BITS (0x5 ,MCF_IRQ_I2C1 ); -writel (r,MCFINTC2_INTPRI_REG (MCF_IRQ_I2C1 )); +mcf_write32 (r,MCFINTC2_INTPRI_REG (MCF_IRQ_I2C1 ));#endif /* IS_ENABLED(CONFIG_I2C_IMX) */ }
arch/m68k/coldfire/m5272.c +8 -8
@@ -55,13 +55,13 @@ static void __init m5272_uarts_init(void)u32 v;/* Enable the output lines for the serial ports */ - v =readl (MCFSIM_PBCNT ); + v =mcf_read32 (MCFSIM_PBCNT ); v = (v & ~0x000000ff ) |0x00000055 ; -writel (v,MCFSIM_PBCNT ); +mcf_write32 (v,MCFSIM_PBCNT ); - v =readl (MCFSIM_PDCNT ); + v =mcf_read32 (MCFSIM_PDCNT ); v = (v & ~0x000003fc ) |0x000002a8 ; -writel (v,MCFSIM_PDCNT ); +mcf_write32 (v,MCFSIM_PDCNT ); }/***************************************************************************/
@@ -70,9 +70,9 @@ static void m5272_cpu_reset(void) {local_irq_disable ();/* Set watchdog to reset, and enabled */ -__raw_writew (0 ,MCFSIM_WIRR ); -__raw_writew (1 ,MCFSIM_WRRR ); -__raw_writew (0 ,MCFSIM_WCR ); +mcf_write16 (0 ,MCFSIM_WIRR ); +mcf_write16 (1 ,MCFSIM_WRRR ); +mcf_write16 (0 ,MCFSIM_WCR );for (;;)/* wait for watchdog to timeout */ ; }
@@ -83,7 +83,7 @@ void __init config_BSP(char *commandp, int size) {#if defined (CONFIG_MOD5272 )/* Set base of device vectors to be 64 */ -writeb (0x40 ,MCFSIM_PIVR ); +mcf_write8 (0x40 ,MCFSIM_PIVR );#endif #if defined(CONFIG_NETtel) || defined(CONFIG_SCALES )
arch/m68k/coldfire/m527x.c +20 -20
@@ -54,14 +54,14 @@ static void __init m527x_qspi_init(void)u16 par;/* setup QSPS pins for QSPI with gpio CS control */ -writeb (0x1f ,MCFGPIO_PAR_QSPI ); +mcf_write8 (0x1f ,MCFGPIO_PAR_QSPI );/* and CS2 & CS3 as gpio */ - par =readw (MCFGPIO_PAR_TIMER ); + par =mcf_read16 (MCFGPIO_PAR_TIMER ); par &=0x3f3f ; -writew (par,MCFGPIO_PAR_TIMER ); +mcf_write16 (par,MCFGPIO_PAR_TIMER );#elif defined(CONFIG_M5275 )/* setup QSPS pins for QSPI with gpio CS control */ -writew (0x003e ,MCFGPIO_PAR_QSPI ); +mcf_write16 (0x003e ,MCFGPIO_PAR_QSPI );#endif #endif /* IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) */ }
@@ -76,17 +76,17 @@ static void __init m527x_i2c_init(void)/* setup Port FECI2C Pin Assignment Register for I2C */ /* set PAR_SCL to SCL and PAR_SDA to SDA */ - par =readb (MCFGPIO_PAR_FECI2C ); + par =mcf_read8 (MCFGPIO_PAR_FECI2C ); par |=0x0f ; -writeb (par,MCFGPIO_PAR_FECI2C ); +mcf_write8 (par,MCFGPIO_PAR_FECI2C );#elif defined(CONFIG_M5275 )u16 par;/* setup Port FECI2C Pin Assignment Register for I2C */ /* set PAR_SCL to SCL and PAR_SDA to SDA */ - par =readw (MCFGPIO_PAR_FECI2C ); + par =mcf_read16 (MCFGPIO_PAR_FECI2C ); par |=0x0f ; -writew (par,MCFGPIO_PAR_FECI2C ); +mcf_write16 (par,MCFGPIO_PAR_FECI2C );#endif #endif /* IS_ENABLED(CONFIG_I2C_IMX) */ }
@@ -100,9 +100,9 @@ static void __init m527x_uarts_init(void)/* * External Pin Mask Setting & Enable External Pin for Interface */ - sepmask =readw (MCFGPIO_PAR_UART ); + sepmask =mcf_read16 (MCFGPIO_PAR_UART ); sepmask |=UART0_ENABLE_MASK |UART1_ENABLE_MASK |UART2_ENABLE_MASK ; -writew (sepmask,MCFGPIO_PAR_UART ); +mcf_write16 (sepmask,MCFGPIO_PAR_UART ); }/***************************************************************************/
@@ -113,21 +113,21 @@ static void __init m527x_fec_init(void)/* Set multi-function pins to ethernet mode for fec0 */ #if defined(CONFIG_M5271 ) - v =readb (MCFGPIO_PAR_FECI2C ); -writeb (v |0xf0 ,MCFGPIO_PAR_FECI2C ); + v =mcf_read8 (MCFGPIO_PAR_FECI2C ); +mcf_write8 (v |0xf0 ,MCFGPIO_PAR_FECI2C );#else u16 par; - par =readw (MCFGPIO_PAR_FECI2C ); -writew (par |0xf00 ,MCFGPIO_PAR_FECI2C ); - v =readb (MCFGPIO_PAR_FEC0HL ); -writeb (v |0xc0 ,MCFGPIO_PAR_FEC0HL ); + par =mcf_read16 (MCFGPIO_PAR_FECI2C ); +mcf_write16 (par |0xf00 ,MCFGPIO_PAR_FECI2C ); + v =mcf_read8 (MCFGPIO_PAR_FEC0HL ); +mcf_write8 (v |0xc0 ,MCFGPIO_PAR_FEC0HL );/* Set multi-function pins to ethernet mode for fec1 */ - par =readw (MCFGPIO_PAR_FECI2C ); -writew (par |0xa0 ,MCFGPIO_PAR_FECI2C ); - v =readb (MCFGPIO_PAR_FEC1HL ); -writeb (v |0xc0 ,MCFGPIO_PAR_FEC1HL ); + par =mcf_read16 (MCFGPIO_PAR_FECI2C ); +mcf_write16 (par |0xa0 ,MCFGPIO_PAR_FECI2C ); + v =mcf_read8 (MCFGPIO_PAR_FEC1HL ); +mcf_write8 (v |0xc0 ,MCFGPIO_PAR_FEC1HL );#endif }
arch/m68k/coldfire/m528x.c +14 -14
@@ -51,7 +51,7 @@ static void __init m528x_qspi_init(void) {#if IS_ENABLED (CONFIG_SPI_COLDFIRE_QSPI )/* setup Port QS for QSPI with gpio CS control */ -__raw_writeb (0x07 ,MCFGPIO_PQSPAR ); +mcf_write8 (0x07 ,MCFGPIO_PQSPAR );#endif /* IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) */ }
@@ -64,9 +64,9 @@ static void __init m528x_i2c_init(void)/* setup Port AS Pin Assignment Register for I2C */ /* set PASPA0 to SCL and PASPA1 to SDA */ - paspar =readw (MCFGPIO_PASPAR ); + paspar =mcf_read16 (MCFGPIO_PASPAR ); paspar |=0xF ; -writew (paspar,MCFGPIO_PASPAR ); +mcf_write16 (paspar,MCFGPIO_PASPAR );#endif /* IS_ENABLED(CONFIG_I2C_IMX) */ }
@@ -77,9 +77,9 @@ static void __init m528x_uarts_init(void)u8 port;/* make sure PUAPAR is set for UART0 and UART1 */ - port =readb (MCFGPIO_PUAPAR ); + port =mcf_read8 (MCFGPIO_PUAPAR ); port |=0x03 | (0x03 <<2 ); -writeb (port,MCFGPIO_PUAPAR ); +mcf_write8 (port,MCFGPIO_PUAPAR ); }/***************************************************************************/
@@ -89,9 +89,9 @@ static void __init m528x_fec_init(void)u16 v16;/* Set multi-function pins to ethernet mode for fec0 */ - v16 =readw (MCFGPIO_PASPAR ); -writew (v16 |0xf00 ,MCFGPIO_PASPAR ); -writeb (0xc0 ,MCFGPIO_PEHLPAR ); + v16 =mcf_read16 (MCFGPIO_PASPAR ); +mcf_write16 (v16 |0xf00 ,MCFGPIO_PASPAR ); +mcf_write8 (0xc0 ,MCFGPIO_PEHLPAR ); }/***************************************************************************/
@@ -99,8 +99,8 @@ static void __init m528x_fec_init(void)#ifdef CONFIG_WILDFIRE void wildfire_halt (void ) { -writeb (0 ,0x30000007 ); -writeb (0x2 ,0x30000007 ); +mcf_write8 (0 ,0x30000007 ); +mcf_write8 (0x2 ,0x30000007 ); }#endif
@@ -110,14 +110,14 @@ void wildfiremod_halt(void)printk (KERN_INFO "WildFireMod hibernating...\n" );/* Set portE.5 to Digital IO */ -writew (readw (MCFGPIO_PEPAR ) & ~(1 << (5 *2 )),MCFGPIO_PEPAR ); +mcf_write16 (read16 (MCFGPIO_PEPAR ) & ~(1 << (5 *2 )),MCFGPIO_PEPAR );/* Make portE.5 an output */ -writeb (readb (MCFGPIO_PDDR_E ) | (1 <<5 ),MCFGPIO_PDDR_E ); +mcf_write8 (read8 (MCFGPIO_PDDR_E ) | (1 <<5 ),MCFGPIO_PDDR_E );/* Now toggle portE.5 from low to high */ -writeb (readb (MCFGPIO_PODR_E ) & ~(1 <<5 ),MCFGPIO_PODR_E ); -writeb (readb (MCFGPIO_PODR_E ) | (1 <<5 ),MCFGPIO_PODR_E ); +mcf_write8 (read8 (MCFGPIO_PODR_E ) & ~(1 <<5 ),MCFGPIO_PODR_E ); +mcf_write8 (read8 (MCFGPIO_PODR_E ) | (1 <<5 ),MCFGPIO_PODR_E );printk (KERN_EMERG "Failed to hibernate. Halting!\n" ); }
arch/m68k/coldfire/m5307.c +1 -1
@@ -49,7 +49,7 @@ static struct clk_lookup m5307_clk_lookup[] = {static void __init m5307_i2c_init (void ) {#if IS_ENABLED (CONFIG_I2C_IMX ) -writeb (MCFSIM_ICR_AUTOVEC |MCFSIM_ICR_LEVEL5 |MCFSIM_ICR_PRI0 , +mcf_write8 (MCFSIM_ICR_AUTOVEC |MCFSIM_ICR_LEVEL5 |MCFSIM_ICR_PRI0 ,MCFSIM_I2CICR );mcf_mapirq2imr (MCF_IRQ_I2C0 ,MCFINTC_I2C );#endif /* IS_ENABLED(CONFIG_I2C_IMX) */
arch/m68k/coldfire/m53xx.c +61 -61
318 lines not on this page · raw message
arch/m68k/coldfire/m5407.c +1 -1
@@ -40,7 +40,7 @@ static struct clk_lookup m5407_clk_lookup[] = {static void __init m5407_i2c_init (void ) {#if IS_ENABLED (CONFIG_I2C_IMX ) -writeb (MCFSIM_ICR_AUTOVEC |MCFSIM_ICR_LEVEL5 |MCFSIM_ICR_PRI0 , +mcf_write8 (MCFSIM_ICR_AUTOVEC |MCFSIM_ICR_LEVEL5 |MCFSIM_ICR_PRI0 ,MCFSIM_I2CICR );mcf_mapirq2imr (MCF_IRQ_I2C0 ,MCFINTC_I2C );#endif /* IS_ENABLED(CONFIG_I2C_IMX) */
arch/m68k/coldfire/m5441x.c +6 -6
@@ -201,12 +201,12 @@ static struct clk * const disable_clks[] __initconst = {static void __clk_enable2 (struct clk *clk) { -__raw_writel (__raw_readl (MCFSDHC_CLK ) | (1 << clk->slot),MCFSDHC_CLK ); +mcf_write32 (mcf_read32 (MCFSDHC_CLK ) | (1 << clk->slot),MCFSDHC_CLK ); }static void __clk_disable2 (struct clk *clk) { -__raw_writel (__raw_readl (MCFSDHC_CLK ) & ~(1 << clk->slot),MCFSDHC_CLK ); +mcf_write32 (mcf_read32 (MCFSDHC_CLK ) & ~(1 << clk->slot),MCFSDHC_CLK ); }struct clk_ops clk_ops2 = {
@@ -229,14 +229,14 @@ static void __init m5441x_clk_init(void)static void __init m5441x_uarts_init (void ) { -__raw_writeb (0x0f ,MCFGPIO_PAR_UART0 ); -__raw_writeb (0x00 ,MCFGPIO_PAR_UART1 ); -__raw_writeb (0x00 ,MCFGPIO_PAR_UART2 ); +mcf_write8 (0x0f ,MCFGPIO_PAR_UART0 ); +mcf_write8 (0x00 ,MCFGPIO_PAR_UART1 ); +mcf_write8 (0x00 ,MCFGPIO_PAR_UART2 ); }static void __init m5441x_fec_init (void ) { -__raw_writeb (0x03 ,MCFGPIO_PAR_FEC ); +mcf_write8 (0x03 ,MCFGPIO_PAR_FEC ); }void __init config_BSP (char *commandp,int size)
arch/m68k/coldfire/m54xx.c +9 -9
@@ -51,12 +51,12 @@ static struct clk_lookup m54xx_clk_lookup[] = {static void __init m54xx_uarts_init (void ) {/* enable io pins */ -__raw_writeb (MCF_PAR_PSC_TXD |MCF_PAR_PSC_RXD ,MCFGPIO_PAR_PSC0 ); -__raw_writeb (MCF_PAR_PSC_TXD |MCF_PAR_PSC_RXD |MCF_PAR_PSC_RTS_RTS , +mcf_write8 (MCF_PAR_PSC_TXD |MCF_PAR_PSC_RXD ,MCFGPIO_PAR_PSC0 ); +mcf_write8 (MCF_PAR_PSC_TXD |MCF_PAR_PSC_RXD |MCF_PAR_PSC_RTS_RTS ,MCFGPIO_PAR_PSC1 ); -__raw_writeb (MCF_PAR_PSC_TXD |MCF_PAR_PSC_RXD |MCF_PAR_PSC_RTS_RTS | +mcf_write8 (MCF_PAR_PSC_TXD |MCF_PAR_PSC_RXD |MCF_PAR_PSC_RTS_RTS |MCF_PAR_PSC_CTS_CTS ,MCFGPIO_PAR_PSC2 ); -__raw_writeb (MCF_PAR_PSC_TXD |MCF_PAR_PSC_RXD ,MCFGPIO_PAR_PSC3 ); +mcf_write8 (MCF_PAR_PSC_TXD |MCF_PAR_PSC_RXD ,MCFGPIO_PAR_PSC3 ); }/***************************************************************************/
@@ -67,9 +67,9 @@ static void __init m54xx_i2c_init(void)u32 r;/* set the fec/i2c/irq pin assignment register for i2c */ - r =readl (MCF_PAR_FECI2CIRQ ); + r =mcf_read32 (MCF_PAR_FECI2CIRQ ); r |=MCF_PAR_FECI2CIRQ_SDA |MCF_PAR_FECI2CIRQ_SCL ; -writel (r,MCF_PAR_FECI2CIRQ ); +mcf_write32 (r,MCF_PAR_FECI2CIRQ );#endif /* IS_ENABLED(CONFIG_I2C_IMX) */ }
@@ -79,9 +79,9 @@ static void mcf54xx_reset(void) {/* disable interrupts and enable the watchdog */ asm("movew #0x2700, %sr\n" ); -__raw_writel (0 ,MCF_GPT_GMS0 ); -__raw_writel (MCF_GPT_GCIR_CNT (1 ),MCF_GPT_GCIR0 ); -__raw_writel (MCF_GPT_GMS_WDEN |MCF_GPT_GMS_CE |MCF_GPT_GMS_TMS (4 ), +mcf_write32 (0 ,MCF_GPT_GMS0 ); +mcf_write32 (MCF_GPT_GCIR_CNT (1 ),MCF_GPT_GCIR0 ); +mcf_write32 (MCF_GPT_GMS_WDEN |MCF_GPT_GMS_CE |MCF_GPT_GMS_TMS (4 ),MCF_GPT_GMS0 ); }
arch/m68k/coldfire/nettel.c +8 -8
@@ -106,10 +106,10 @@ static void __init nettel_smc91x_setmac(unsigned int ioaddr, unsigned int flashaif ((macp[0 ] ==0xffff ) && (macp[1 ] ==0xffff ) && (macp[2 ] ==0xffff )) macp = (u16 *) &nettel_macdefault[0 ]; -writew (1 ,NETTEL_SMC0_ADDR + SMC91xx_BANKSELECT); -writew (macp[0 ], ioaddr + SMC91xx_BASEMAC); -writew (macp[1 ], ioaddr + SMC91xx_BASEMAC +2 ); -writew (macp[2 ], ioaddr + SMC91xx_BASEMAC +4 ); +mcf_write16 (1 ,NETTEL_SMC0_ADDR + SMC91xx_BANKSELECT); +mcf_write16 (macp[0 ], ioaddr + SMC91xx_BASEMAC); +mcf_write16 (macp[1 ], ioaddr + SMC91xx_BASEMAC +2 ); +mcf_write16 (macp[2 ], ioaddr + SMC91xx_BASEMAC +4 ); }/***************************************************************************/
@@ -122,14 +122,14 @@ static void __init nettel_smc91x_setmac(unsigned int ioaddr, unsigned int flashastatic void __init nettel_smc91x_init (void ) { -writew (0x00ec ,MCFSIM_PADDR ); +mcf_write16 (0x00ec ,MCFSIM_PADDR );mcf_setppdata (0 ,0x0080 ); -writew (1 ,NETTEL_SMC0_ADDR + SMC91xx_BANKSELECT); -writew (0x0067 ,NETTEL_SMC0_ADDR + SMC91xx_BASEADDR); +mcf_write16 (1 ,NETTEL_SMC0_ADDR + SMC91xx_BANKSELECT); +mcf_write16 (0x0067 ,NETTEL_SMC0_ADDR + SMC91xx_BASEADDR);mcf_setppdata (0x0080 ,0 );/* Set correct chip select timing for SMC9196 accesses */ -writew (0x1180 ,MCFSIM_CSCR3 ); +mcf_write16 (0x1180 ,MCFSIM_CSCR3 );/* Set the SMC interrupts to be auto-vectored */ mcf_autovector (NETTEL_SMC0_IRQ );
arch/m68k/coldfire/stmark2.c +6 -6
@@ -104,16 +104,16 @@ static struct platform_device *stmark2_devices[] __initdata = {static int __init init_stmark2 (void ) {/* DSPI0, all pins as DSPI, and using CS1 */ -__raw_writeb (0x80 ,MCFGPIO_PAR_DSPIOWL ); -__raw_writeb (0xfc ,MCFGPIO_PAR_DSPIOWH ); +mcf_write8 (0x80 ,MCFGPIO_PAR_DSPIOWL ); +mcf_write8 (0xfc ,MCFGPIO_PAR_DSPIOWH );/* Board gpio setup */ -__raw_writeb (0x00 ,MCFGPIO_PAR_BE ); -__raw_writeb (0x00 ,MCFGPIO_PAR_FBCTL ); -__raw_writeb (0x00 ,MCFGPIO_PAR_CS ); +mcf_write8 (0x00 ,MCFGPIO_PAR_BE ); +mcf_write8 (0x00 ,MCFGPIO_PAR_FBCTL ); +mcf_write8 (0x00 ,MCFGPIO_PAR_CS );/* CAN pads */ -__raw_writeb (0x50 ,MCFGPIO_PAR_CANI2C ); +mcf_write8 (0x50 ,MCFGPIO_PAR_CANI2C );platform_add_devices (stmark2_devices,ARRAY_SIZE (stmark2_devices));
Signature · 1 line
2.54.0
Arnd Bergmann
Reviewed-byQuoted 20 lines · Greg Ungerer
The readx/writex family of IO access functions for ColdFire are non-standard. They return native endian data for multi-byte access, which on m68k/ColdFire is big-endian byte order. A number of places need fixing to change readx/writex to be more standard - a lot of the CPU/SoC architecture specific code and a number of drivers.
The existing ColdFire CPU/SoC architecture code is inconsistent in how it accesses SoC hardware module registers. Both readx/writex and __raw_readx/__raw_writex are used across the code base. To clean this up this set of patches moves to an internal set of access defines for the CPU/SoC architecture code. The following are defined and used for all internal register access:
8 bit read --> mcf_read8 8 bit write --> mcf_write8 16 bit read --> mcf_read16 16 bit write --> mcf_write16 32 bit read --> mcf_read32 32 bit write --> mcf_write32
Quoted 2 lines
To ease review I have broken the changes up a little, grouping major blocks together instead of one huge patch.
These all look good to me,
There are still open questions about how to continue from here to change the existing readl() and ioread32be() style helpers to have normal endianess and type characteristics without breaking things, but this is a good step in that direction.
Arnd
Greg Ungerer
maintainerHi Arnd,
Quoted 21 lines · Arnd Bergmann
Quoted 20 lines · Greg Ungerer
The readx/writex family of IO access functions for ColdFire are non-standard. They return native endian data for multi-byte access, which on m68k/ColdFire is big-endian byte order. A number of places need fixing to change readx/writex to be more standard - a lot of the CPU/SoC architecture specific code and a number of drivers.
The existing ColdFire CPU/SoC architecture code is inconsistent in how it accesses SoC hardware module registers. Both readx/writex and __raw_readx/__raw_writex are used across the code base. To clean this up this set of patches moves to an internal set of access defines for the CPU/SoC architecture code. The following are defined and used for all internal register access:
8 bit read --> mcf_read8 8 bit write --> mcf_write8 16 bit read --> mcf_read16 16 bit write --> mcf_write16 32 bit read --> mcf_read32 32 bit write --> mcf_write32
Quoted 6 lines
Quoted 2 lines
To ease review I have broken the changes up a little, grouping major blocks together instead of one huge patch.
These all look good to me,
Reviewed-by Arnd Bergmann <[email protected]>
Thanks.
Quoted 4 lines
There are still open questions about how to continue from here to change the existing
readl()andioread32be()style helpers to have normal endianess and type characteristics without breaking things, but this is a good step in that direction.
I have been playing with one idea. I have been working through the affected drivers and changing them to use raw primitives only for their IO access on ColdFire (so only the __raw_readx/__raw_writex macros). My thinking is that these can then be pushed via driver subsystem maintainers if and when they are ready. When all are affected drivers are fixed then we can correct the definitions in arch/m68k/include/asm/io_no.h. At a later time if we choose we can then make changes to effected drivers again to use the now corrected readx/writex family.
At least this way we can keep everything working and avoid a single patch that makes changes to io_no.h and drivers across multiple subsystems in one go. What do you think?
So far I have modified the fec and smc91x ethernet drivers in this way. That was strait forward, though I may get a little resistance in the fec driver since I abstracted the IO access from readl/writel to local internal functions to keep it clean and avoid redefining readl/wrtel. But the change is simple in concept. I am working through the handful of other drivers that we identified.
Regards
Greg
Quoted 16 lines · Greg Ungerer
Quoted 4 lines · Arnd Bergmann
There are still open questions about how to continue from here to change the existing
readl()andioread32be()style helpers to have normal endianess and type characteristics without breaking things, but this is a good step in that direction.I have been playing with one idea. I have been working through the affected drivers and changing them to use raw primitives only for their IO access on ColdFire (so only the __raw_readx/__raw_writex macros). My thinking is that these can then be pushed via driver subsystem maintainers if and when they are ready. When all are affected drivers are fixed then we can correct the definitions in
arch/m68k/include/asm/io_no.h. At a later time if we choose we can then make changes to effected drivers again to use the now corrected readx/writex family.
Quoted 3 lines
At least this way we can keep everything working and avoid a single patch that makes changes to
io_no.hand drivers across multiple subsystems in one go. What do you think?
I think that should work for most of them, but perhaps not for the spi-fsl-dspi with its extra abstraction through regmap-mmio.
I would probably still do an atomic change for that one, adding the explict regmap endianess flag at the same time as redefining the readl() function. As long as it's only one or two drivers that need this, the change should still be simple enough to merge with the respective subsystem maintainer Ack.
Quoted 6 lines
So far I have modified the fec and smc91x ethernet drivers in this way. That was strait forward, though I may get a little resistance in the fec driver since I abstracted the IO access from readl/writel to local internal functions to keep it clean and avoid redefining readl/wrtel. But the change is simple in concept. I am working through the handful of other drivers that we identified.
Ok.
Arnd