Skip to contentSkip to conversation

arch: m68k: include: asm: the 3rd parameter of 'insl' and 'outsl' need '<< 2'

PATCH In review Chen Gang 5 participants 15 messages May 30, 2013 – Jun 6, 2013

Subsystems (2)
lore
Share & tools
lore

Chen Gang

author
#0 lore raw

PATCH 1/1 arch: m68k: include: asm: the 3rd parameter of 'insl' and 'outsl' need '<< 2'

According to the original implementation in 2009, 'insl' and 'outsl' need '<< 2'.

Also add '#ifdef' to avoid multiple defination, and beautify code to pass "./scripts/checkpatch.pl"

The related git number:
for parport.h: "4914802 m68k,m68knommu: merge header files" in 2009 for io_mm.h: "84b16b7 m68k/atari: ROM port ISA adapter support" in Apr 6 2013

The related warning (make EXTRA_CFLAG=-W ARCH=m68k allmodconfig):
arch/m68k/include/asm/parport.h:14:0: warning: "insl" redefined [enabled by default] arch/m68k/include/asm/io_mm.h:403:0: note: this is the location of the previous definition arch/m68k/include/asm/parport.h:15:0: warning: "outsl" redefined [enabled by default] arch/m68k/include/asm/io_mm.h:406:0: note: this is the location of the previous definition

---
 arch/m68k/include/asm/io_mm.h   |    5 +++--
 arch/m68k/include/asm/parport.h |    9 +++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)
arch/m68k/include/asm/io_mm.h +3 -2
index ffdf54f4..66be3b2 100644
@@ -400,10 +400,11 @@ static inline void isa_delay(void)
 
 #define insb(port, buf, nr)	((port) < 1024 ? isa_rom_insb((port), (buf), (nr)) : isa_insb((port), (buf), (nr)))
 #define insw(port, buf, nr)	((port) < 1024 ? isa_rom_insw((port), (buf), (nr)) : isa_insw((port), (buf), (nr)))
-#define insl			isa_insl
+#define insl(port, buf, len)	isa_insb((port), (buf), (len) << 2)
+
 #define outsb(port, buf, nr)	((port) < 1024 ? isa_rom_outsb((port), (buf), (nr)) : isa_outsb((port), (buf), (nr)))
 #define outsw(port, buf, nr)	((port) < 1024 ? isa_rom_outsw((port), (buf), (nr)) : isa_outsw((port), (buf), (nr)))
-#define outsl			isa_outsl
+#define outsl(port, buf, len)	isa_outsb((port), (buf), (len) << 2)
 
 #define readb(addr)		in_8(addr)
 #define writeb(val, addr)	out_8((addr), (val))
arch/m68k/include/asm/parport.h +7 -2
index 5ea75e6..e8e4a2a 100644
@@ -11,8 +11,13 @@
 #ifndef _ASM_M68K_PARPORT_H
 #define _ASM_M68K_PARPORT_H 1
 
-#define insl(port,buf,len)   isa_insb(port,buf,(len)<<2)
-#define outsl(port,buf,len)  isa_outsb(port,buf,(len)<<2)
+#ifndef insl
+#define insl(port, buf, len)   isa_insb((port), (buf), (len) << 2)
+#endif
+
+#ifndef outsl
+#define outsl(port, buf, len)  isa_outsb((port), (buf), (len) << 2)
+#endif
 
 /* no dma, or IRQ autoprobing */
 static int parport_pc_find_isa_ports (int autoirq, int autodma);
Signature · 1 line
1.7.7.6
#1 lore raw
Quoted 2 lines · Chen Gang

According to the original implementation in 2009, 'insl' and 'outsl' need '<< 2'.

Sorry, now I'm confused. Which original implementation? I can't find this one using "<< 2"?

Quoted 25 lines

Also add '#ifdef' to avoid multiple defination, and beautify code to pass "./scripts/checkpatch.pl"

The related git number:
for parport.h: "4914802 m68k,m68knommu: merge header files" in 2009 for io_mm.h: "84b16b7 m68k/atari: ROM port ISA adapter support" in Apr 6 2013

The related warning (make EXTRA_CFLAG=-W ARCH=m68k allmodconfig):
arch/m68k/include/asm/parport.h:14:0: warning: "insl" redefined [enabled by default] arch/m68k/include/asm/io_mm.h:403:0: note: this is the location of the previous definition arch/m68k/include/asm/parport.h:15:0: warning: "outsl" redefined [enabled by default] arch/m68k/include/asm/io_mm.h:406:0: note: this is the location of the previous definition

---
 arch/m68k/include/asm/io_mm.h   |    5 +++--
 arch/m68k/include/asm/parport.h |    9 +++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)
arch/m68k/include/asm/io_mm.h +0 -0
index ffdf54f4..66be3b2 100644

arch/m68k/include/asm/io_mm.h static inline void isa_delay(void) · line 403

Quoted 5 lines
arch/m68k/include/asm/io_mm.h +1 -1
@@ -400,10 +400,11 @@ static inline void isa_delay(void)
 
 #define insb(port, buf, nr)    ((port) < 1024 ? isa_rom_insb((port), (buf), (nr)) : isa_insb((port), (buf), (nr)))
 #define insw(port, buf, nr)    ((port) < 1024 ? isa_rom_insw((port), (buf), (nr)) : isa_insw((port), (buf), (nr)))
-#define insl                   isa_insl
+#define insl(port, buf, len)   isa_insb((port), (buf), (len) << 2)

Oops, changes from 32-bit accesses to byte accesses?

Quoted 14 lines
arch/m68k/include/asm/io_mm.h +1 -1
 #define outsb(port, buf, nr)   ((port) < 1024 ? isa_rom_outsb((port), (buf), (nr)) : isa_outsb((port), (buf), (nr)))
 #define outsw(port, buf, nr)   ((port) < 1024 ? isa_rom_outsw((port), (buf), (nr)) : isa_outsw((port), (buf), (nr)))
-#define outsl                  isa_outsl
+#define outsl(port, buf, len)  isa_outsb((port), (buf), (len) << 2)
 
 #define readb(addr)            in_8(addr)
 #define writeb(val, addr)      out_8((addr), (val))
arch/m68k/include/asm/parport.h +0 -0
index 5ea75e6..e8e4a2a 100644
@@ -11,8 +11,13 @@
 #ifndef _ASM_M68K_PARPORT_H
 #define _ASM_M68K_PARPORT_H 1

arch/m68k/include/asm/parport.h line 20

Quoted 10 lines
arch/m68k/include/asm/parport.h +7 -2
 
-#define insl(port,buf,len)   isa_insb(port,buf,(len)<<2)
-#define outsl(port,buf,len)  isa_outsb(port,buf,(len)<<2)
+#ifndef insl
+#define insl(port, buf, len)   isa_insb((port), (buf), (len) << 2)
+#endif
+
+#ifndef outsl
+#define outsl(port, buf, len)  isa_outsb((port), (buf), (len) << 2)
+#endif

Now the (re)definitions are identical to the originals, so they can just be removed. But the ones in <asm/io.h> are not correct anymore, IMHO.

Gr{oetje,eeting}s,

Geert

--
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

#2 lore raw
In reply to Chen Gang
Quoted 2 lines · Chen Gang

According to the original implementation in 2009, 'insl' and 'outsl' need '<< 2'.

Sorry, now I'm confused. Which original implementation? I can't find this one using "<< 2"?

Quoted 25 lines

Also add '#ifdef' to avoid multiple defination, and beautify code to pass "./scripts/checkpatch.pl"

The related git number:
for parport.h: "4914802 m68k,m68knommu: merge header files" in 2009 for io_mm.h: "84b16b7 m68k/atari: ROM port ISA adapter support" in Apr 6 2013

The related warning (make EXTRA_CFLAG=-W ARCH=m68k allmodconfig):
arch/m68k/include/asm/parport.h:14:0: warning: "insl" redefined [enabled by default] arch/m68k/include/asm/io_mm.h:403:0: note: this is the location of the previous definition arch/m68k/include/asm/parport.h:15:0: warning: "outsl" redefined [enabled by default] arch/m68k/include/asm/io_mm.h:406:0: note: this is the location of the previous definition

---
 arch/m68k/include/asm/io_mm.h   |    5 +++--
 arch/m68k/include/asm/parport.h |    9 +++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)
arch/m68k/include/asm/io_mm.h +0 -0
index ffdf54f4..66be3b2 100644

arch/m68k/include/asm/io_mm.h static inline void isa_delay(void) · line 403

Quoted 5 lines
arch/m68k/include/asm/io_mm.h +1 -1
@@ -400,10 +400,11 @@ static inline void isa_delay(void)
 
 #define insb(port, buf, nr)    ((port) < 1024 ? isa_rom_insb((port), (buf), (nr)) : isa_insb((port), (buf), (nr)))
 #define insw(port, buf, nr)    ((port) < 1024 ? isa_rom_insw((port), (buf), (nr)) : isa_insw((port), (buf), (nr)))
-#define insl                   isa_insl
+#define insl(port, buf, len)   isa_insb((port), (buf), (len) << 2)

Oops, changes from 32-bit accesses to byte accesses?

Quoted 14 lines
arch/m68k/include/asm/io_mm.h +1 -1
 #define outsb(port, buf, nr)   ((port) < 1024 ? isa_rom_outsb((port), (buf), (nr)) : isa_outsb((port), (buf), (nr)))
 #define outsw(port, buf, nr)   ((port) < 1024 ? isa_rom_outsw((port), (buf), (nr)) : isa_outsw((port), (buf), (nr)))
-#define outsl                  isa_outsl
+#define outsl(port, buf, len)  isa_outsb((port), (buf), (len) << 2)
 
 #define readb(addr)            in_8(addr)
 #define writeb(val, addr)      out_8((addr), (val))
arch/m68k/include/asm/parport.h +0 -0
index 5ea75e6..e8e4a2a 100644
@@ -11,8 +11,13 @@
 #ifndef _ASM_M68K_PARPORT_H
 #define _ASM_M68K_PARPORT_H 1

arch/m68k/include/asm/parport.h line 20

Quoted 10 lines
arch/m68k/include/asm/parport.h +7 -2
 
-#define insl(port,buf,len)   isa_insb(port,buf,(len)<<2)
-#define outsl(port,buf,len)  isa_outsb(port,buf,(len)<<2)
+#ifndef insl
+#define insl(port, buf, len)   isa_insb((port), (buf), (len) << 2)
+#endif
+
+#ifndef outsl
+#define outsl(port, buf, len)  isa_outsb((port), (buf), (len) << 2)
+#endif

Now the (re)definitions are identical to the originals, so they can just be removed. But the ones in <asm/io.h> are not correct anymore, IMHO.

Gr{oetje,eeting}s,

Geert

--
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

#3 lore raw

Geert ,

Quoted 11 lines
Quoted 11 lines

The related git number:
for parport.h: "4914802 m68k,m68knommu: merge header files" in 2009 for io_mm.h: "84b16b7 m68k/atari: ROM port ISA adapter support" in Apr 6 2013

The related warning (make EXTRA_CFLAG=-W ARCH=m68k allmodconfig):
arch/m68k/include/asm/parport.h:14:0: warning: "insl" redefined [enabled by default] arch/m68k/include/asm/io_mm.h:403:0: note: this is the location of the previous definition arch/m68k/include/asm/parport.h:15:0: warning: "outsl" redefined [enabled by default] arch/m68k/include/asm/io_mm.h:406:0: note: this is the location of the previous definition

Is that the same problem Thorsten reported recently? parport.h should either use what the arch io.h include defined, or (in the case of Q40 on m68k) undef and redefine as needed.

Quoted 13 lines
Quoted 13 lines
---
 arch/m68k/include/asm/io_mm.h   |    5 +++--
 arch/m68k/include/asm/parport.h |    9 +++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)
arch/m68k/include/asm/io_mm.h +0 -0
index ffdf54f4..66be3b2 100644
@@ -400,10 +400,11 @@ static inline void isa_delay(void)
 
Quoted 8 lines

arch/m68k/include/asm/io_mm.h static inline void isa_delay(void) · line 408

Quoted 5 lines
arch/m68k/include/asm/io_mm.h +1 -1
 #define insb(port, buf, nr)    ((port) < 1024 ? isa_rom_insb((port), (buf), (nr)) : isa_insb((port), (buf), (nr)))
 #define insw(port, buf, nr)    ((port) < 1024 ? isa_rom_insw((port), (buf), (nr)) : isa_insw((port), (buf), (nr)))
-#define insl                   isa_insl
+#define insl(port, buf, len)   isa_insb((port), (buf), (len) << 2)
 

Oops, changes from 32-bit accesses to byte accesses?

That's in the Atari specific branch - please explain why you think this needs to be done. Has this patch been tested by running on ARAnyM, at least?

Unless this has been properly tested on Atari (hardware), please leave as-is.

Quoted 16 lines
Quoted 16 lines
arch/m68k/include/asm/io_mm.h +1 -1
 #define outsb(port, buf, nr)   ((port) < 1024 ? isa_rom_outsb((port), (buf), (nr)) : isa_outsb((port), (buf), (nr)))
 #define outsw(port, buf, nr)   ((port) < 1024 ? isa_rom_outsw((port), (buf), (nr)) : isa_outsw((port), (buf), (nr)))
-#define outsl                  isa_outsl
+#define outsl(port, buf, len)  isa_outsb((port), (buf), (len) << 2)
 
 #define readb(addr)            in_8(addr)
 #define writeb(val, addr)      out_8((addr), (val))
arch/m68k/include/asm/parport.h +0 -0
index 5ea75e6..e8e4a2a 100644
@@ -11,8 +11,13 @@
 #ifndef _ASM_M68K_PARPORT_H
 #define _ASM_M68K_PARPORT_H 1
 
Quoted 10 lines

arch/m68k/include/asm/parport.h line 21

Quoted 10 lines
arch/m68k/include/asm/parport.h +7 -2
-#define insl(port,buf,len)   isa_insb(port,buf,(len)<<2)
-#define outsl(port,buf,len)  isa_outsb(port,buf,(len)<<2)
+#ifndef insl
+#define insl(port, buf, len)   isa_insb((port), (buf), (len) << 2)
+#endif
+
+#ifndef outsl
+#define outsl(port, buf, len)  isa_outsb((port), (buf), (len) << 2)
+#endif
 

I think that should read
#undef insl
#define insl(port,buf,len) isa_insb(port,buf,(len)<<2)

instead. I distinctly remember this brought up a few weeks ago.

Quoted 3 lines

Now the (re)definitions are identical to the originals, so they can just be removed. But the ones in <asm/io.h> are not correct anymore, IMHO.

Seconded.

Cheers,

Michael

#4 lore raw
In reply to Geert Uytterhoeven

Geert ,

Quoted 11 lines
Quoted 11 lines

The related git number:
for parport.h: "4914802 m68k,m68knommu: merge header files" in 2009 for io_mm.h: "84b16b7 m68k/atari: ROM port ISA adapter support" in Apr 6 2013

The related warning (make EXTRA_CFLAG=-W ARCH=m68k allmodconfig):
arch/m68k/include/asm/parport.h:14:0: warning: "insl" redefined [enabled by default] arch/m68k/include/asm/io_mm.h:403:0: note: this is the location of the previous definition arch/m68k/include/asm/parport.h:15:0: warning: "outsl" redefined [enabled by default] arch/m68k/include/asm/io_mm.h:406:0: note: this is the location of the previous definition

Is that the same problem Thorsten reported recently? parport.h should either use what the arch io.h include defined, or (in the case of Q40 on m68k) undef and redefine as needed.

Quoted 13 lines
Quoted 13 lines
---
 arch/m68k/include/asm/io_mm.h   |    5 +++--
 arch/m68k/include/asm/parport.h |    9 +++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)
arch/m68k/include/asm/io_mm.h +0 -0
index ffdf54f4..66be3b2 100644
@@ -400,10 +400,11 @@ static inline void isa_delay(void)
 
Quoted 8 lines

arch/m68k/include/asm/io_mm.h static inline void isa_delay(void) · line 408

Quoted 5 lines
arch/m68k/include/asm/io_mm.h +1 -1
 #define insb(port, buf, nr)    ((port) < 1024 ? isa_rom_insb((port), (buf), (nr)) : isa_insb((port), (buf), (nr)))
 #define insw(port, buf, nr)    ((port) < 1024 ? isa_rom_insw((port), (buf), (nr)) : isa_insw((port), (buf), (nr)))
-#define insl                   isa_insl
+#define insl(port, buf, len)   isa_insb((port), (buf), (len) << 2)
 

Oops, changes from 32-bit accesses to byte accesses?

That's in the Atari specific branch - please explain why you think this needs to be done. Has this patch been tested by running on ARAnyM, at least?

Unless this has been properly tested on Atari (hardware), please leave as-is.

Quoted 16 lines
Quoted 16 lines
arch/m68k/include/asm/io_mm.h +1 -1
 #define outsb(port, buf, nr)   ((port) < 1024 ? isa_rom_outsb((port), (buf), (nr)) : isa_outsb((port), (buf), (nr)))
 #define outsw(port, buf, nr)   ((port) < 1024 ? isa_rom_outsw((port), (buf), (nr)) : isa_outsw((port), (buf), (nr)))
-#define outsl                  isa_outsl
+#define outsl(port, buf, len)  isa_outsb((port), (buf), (len) << 2)
 
 #define readb(addr)            in_8(addr)
 #define writeb(val, addr)      out_8((addr), (val))
arch/m68k/include/asm/parport.h +0 -0
index 5ea75e6..e8e4a2a 100644
@@ -11,8 +11,13 @@
 #ifndef _ASM_M68K_PARPORT_H
 #define _ASM_M68K_PARPORT_H 1
 
Quoted 10 lines

arch/m68k/include/asm/parport.h line 21

Quoted 10 lines
arch/m68k/include/asm/parport.h +7 -2
-#define insl(port,buf,len)   isa_insb(port,buf,(len)<<2)
-#define outsl(port,buf,len)  isa_outsb(port,buf,(len)<<2)
+#ifndef insl
+#define insl(port, buf, len)   isa_insb((port), (buf), (len) << 2)
+#endif
+
+#ifndef outsl
+#define outsl(port, buf, len)  isa_outsb((port), (buf), (len) << 2)
+#endif
 

I think that should read
#undef insl
#define insl(port,buf,len) isa_insb(port,buf,(len)<<2)

instead. I distinctly remember this brought up a few weeks ago.

Quoted 3 lines

Now the (re)definitions are identical to the originals, so they can just be removed. But the ones in <asm/io.h> are not correct anymore, IMHO.

Seconded.

Cheers,

Michael

#5 lore raw

All,

Quoted 17 lines

Geert ,

Quoted 6 lines
Quoted 6 lines

The related git number:
for parport.h: "4914802 m68k,m68knommu: merge header files" in 2009 for io_mm.h: "84b16b7 m68k/atari: ROM port ISA adapter support" in
Apr 6 2013

Quoted 10 lines
Quoted 10 lines

The related warning (make EXTRA_CFLAG=-W ARCH=m68k allmodconfig):
arch/m68k/include/asm/parport.h:14:0: warning: "insl" redefined
[enabled by default]
arch/m68k/include/asm/io_mm.h:403:0: note: this is the location of
the previous definition
arch/m68k/include/asm/parport.h:15:0: warning: "outsl" redefined
[enabled by default]
arch/m68k/include/asm/io_mm.h:406:0: note: this is the location of
the previous definition

Quoted 1 line

Is that the same problem Thorsten reported recently? parport.h should either use what the arch io.h include defined, or (in the case of Q40 on m68k) undef and redefine as needed.

It appears this is the same issue, see message ID [email protected] to linux-m68k (May 12th, by Thorsten Glaser).

This _only_ applies to use of insl/outsl macros in parport_pc.h, which is only used by Q40 on m68k. I see no reason to change anything in io.h to cope with this warning.

Cheers,

Michael

Quoted 75 lines
Quoted 13 lines
Quoted 13 lines
---
 arch/m68k/include/asm/io_mm.h   |    5 +++--
 arch/m68k/include/asm/parport.h |    9 +++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)
arch/m68k/include/asm/io_mm.h +0 -0
index ffdf54f4..66be3b2 100644
@@ -400,10 +400,11 @@ static inline void isa_delay(void)
 
Quoted 10 lines

arch/m68k/include/asm/io_mm.h static inline void isa_delay(void) · line 406

Quoted 7 lines
arch/m68k/include/asm/io_mm.h +1 -1
 #define insb(port, buf, nr)    ((port) < 1024 ? 
 isa_rom_insb((port), (buf), (nr)) : isa_insb((port), (buf), (nr)))
 #define insw(port, buf, nr)    ((port) < 1024 ? 
 isa_rom_insw((port), (buf), (nr)) : isa_insw((port), (buf), (nr)))
-#define insl                   isa_insl
+#define insl(port, buf, len)   isa_insb((port), (buf), (len) << 2)
 

Oops, changes from 32-bit accesses to byte accesses?

That's in the Atari specific branch - please explain why you think this needs to be done. Has this patch been tested by running on ARAnyM, at least?

Unless this has been properly tested on Atari (hardware), please leave as-is.

Quoted 18 lines
Quoted 18 lines
arch/m68k/include/asm/io_mm.h +0 -0
 #define outsb(port, buf, nr)   ((port) < 1024 ? 
 isa_rom_outsb((port), (buf), (nr)) : isa_outsb((port), (buf), (nr)))
 #define outsw(port, buf, nr)   ((port) < 1024 ? 

isa_rom_outsw((port), (buf), (nr)) : isa_outsw((port), (buf), (nr)))

arch/m68k/include/asm/io_mm.h +1 -1
-#define outsl                  isa_outsl
+#define outsl(port, buf, len)  isa_outsb((port), (buf), (len) << 2)
 
 #define readb(addr)            in_8(addr)
 #define writeb(val, addr)      out_8((addr), (val))
arch/m68k/include/asm/parport.h +0 -0
index 5ea75e6..e8e4a2a 100644
@@ -11,8 +11,13 @@
 #ifndef _ASM_M68K_PARPORT_H
 #define _ASM_M68K_PARPORT_H 1
 
Quoted 10 lines

arch/m68k/include/asm/parport.h line 21

Quoted 10 lines
arch/m68k/include/asm/parport.h +7 -2
-#define insl(port,buf,len)   isa_insb(port,buf,(len)<<2)
-#define outsl(port,buf,len)  isa_outsb(port,buf,(len)<<2)
+#ifndef insl
+#define insl(port, buf, len)   isa_insb((port), (buf), (len) << 2)
+#endif
+
+#ifndef outsl
+#define outsl(port, buf, len)  isa_outsb((port), (buf), (len) << 2)
+#endif
 

I think that should read
#undef insl
#define insl(port,buf,len) isa_insb(port,buf,(len)<<2)

instead. I distinctly remember this brought up a few weeks ago.

Quoted 3 lines

Now the (re)definitions are identical to the originals, so they can just be removed. But the ones in <asm/io.h> are not correct anymore, IMHO.

Seconded.

Cheers,

Michael

Signature · 3 lines
To unsubscribe from this list: send the line "unsubscribe linux-m68k" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
author
#6 lore raw
Quoted 21 lines · schmitz

All,

Quoted 17 lines

Geert ,

Quoted 6 lines
Quoted 6 lines

The related git number:
for parport.h: "4914802 m68k,m68knommu: merge header files" in 2009 for io_mm.h: "84b16b7 m68k/atari: ROM port ISA adapter support" in
Apr 6 2013

Quoted 10 lines
Quoted 10 lines

The related warning (make EXTRA_CFLAG=-W ARCH=m68k allmodconfig):
arch/m68k/include/asm/parport.h:14:0: warning: "insl" redefined
[enabled by default]
arch/m68k/include/asm/io_mm.h:403:0: note: this is the location of
the previous definition
arch/m68k/include/asm/parport.h:15:0: warning: "outsl" redefined
[enabled by default]
arch/m68k/include/asm/io_mm.h:406:0: note: this is the location of
the previous definition

Quoted 3 lines

Is that the same problem Thorsten reported recently? parport.h should either use what the arch io.h include defined, or (in the case of Q40 on m68k) undef and redefine as needed.

Quoted 7 lines

It appears this is the same issue, see message ID [email protected] to linux-m68k (May 12th, by Thorsten Glaser).

This _only_ applies to use of insl/outsl macros in parport_pc.h, which is only used by Q40 on m68k. I see no reason to change anything in io.h to cope with this warning.

It sounds reasonable.

And excuse me, could you provide the related link directly ? I don't know how to see the detail of '[email protected]'.

Thanks.

Signature · 3 lines
Chen Gang

Asianux Corporation
author
#7 lore raw
In reply to schmitz
Quoted 21 lines · schmitz

All,

Quoted 17 lines

Geert ,

Quoted 6 lines
Quoted 6 lines

The related git number:
for parport.h: "4914802 m68k,m68knommu: merge header files" in 2009 for io_mm.h: "84b16b7 m68k/atari: ROM port ISA adapter support" in
Apr 6 2013

Quoted 10 lines
Quoted 10 lines

The related warning (make EXTRA_CFLAG=-W ARCH=m68k allmodconfig):
arch/m68k/include/asm/parport.h:14:0: warning: "insl" redefined
[enabled by default]
arch/m68k/include/asm/io_mm.h:403:0: note: this is the location of
the previous definition
arch/m68k/include/asm/parport.h:15:0: warning: "outsl" redefined
[enabled by default]
arch/m68k/include/asm/io_mm.h:406:0: note: this is the location of
the previous definition

Quoted 3 lines

Is that the same problem Thorsten reported recently? parport.h should either use what the arch io.h include defined, or (in the case of Q40 on m68k) undef and redefine as needed.

Quoted 7 lines

It appears this is the same issue, see message ID [email protected] to linux-m68k (May 12th, by Thorsten Glaser).

This _only_ applies to use of insl/outsl macros in parport_pc.h, which is only used by Q40 on m68k. I see no reason to change anything in io.h to cope with this warning.

It sounds reasonable.

And excuse me, could you provide the related link directly ? I don't know how to see the detail of '[email protected]'.

Thanks.

Signature · 3 lines
Chen Gang

Asianux Corporation
#8 lore raw
Quoted 23 lines · Chen Gang
Quoted 22 lines · schmitz
Quoted 15 lines
Quoted 5 lines
Quoted 5 lines

The related git number:
for parport.h: "4914802 m68k,m68knommu: merge header files" in 2009 for io_mm.h: "84b16b7 m68k/atari: ROM port ISA adapter support" in
Apr 6 2013

Quoted 10 lines
Quoted 10 lines

The related warning (make EXTRA_CFLAG=-W ARCH=m68k allmodconfig):
arch/m68k/include/asm/parport.h:14:0: warning: "insl" redefined
[enabled by default]
arch/m68k/include/asm/io_mm.h:403:0: note: this is the location of
the previous definition
arch/m68k/include/asm/parport.h:15:0: warning: "outsl" redefined
[enabled by default]
arch/m68k/include/asm/io_mm.h:406:0: note: this is the location of
the previous definition

Quoted 3 lines

Is that the same problem Thorsten reported recently? parport.h should either use what the arch io.h include defined, or (in the case of Q40 on m68k) undef and redefine as needed.

It appears this is the same issue, see message ID [email protected] to linux-m68k (May 12th, by Thorsten Glaser).

Quoted 8 lines
Quoted 3 lines

This _only_ applies to use of insl/outsl macros in parport_pc.h, which is only used by Q40 on m68k. I see no reason to change anything in io.h to cope with this warning.

It sounds reasonable.

And excuse me, could you provide the related link directly ? I don't know how to see the detail of '[email protected]'.

http://www.spinics.net/lists/linux-m68k/msg06041.html

Gr{oetje,eeting}s,

Geert

--
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

author
#9 lore raw
Quoted 3 lines · Geert Uytterhoeven
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

This _only_ applies to use of insl/outsl macros in parport_pc.h, which is only used by Q40 on m68k. I see no reason to change anything in io.h to cope with this warning.

I guess your meaning is :

----------------------------diff begin----------------------------------

arch/m68k/include/asm/parport.h +11 -0
index 5ea75e6..dd1672a 100644
@@ -11,9 +11,20 @@
 #ifndef _ASM_M68K_PARPORT_H
 #define _ASM_M68K_PARPORT_H 1
 
+#ifdef CONFIG_Q40 /* for Q40, need redefine insl/outsl */
+
+#ifdef insl
+#undef insl
+#endif
 #define insl(port,buf,len)   isa_insb(port,buf,(len)<<2)
+
+#ifdef outsl
+#undef outsl
+#endif
 #define outsl(port,buf,len)  isa_outsb(port,buf,(len)<<2)
 
+#endif /* CONFIG_Q40 */
+
 /* no dma, or IRQ autoprobing */
 static int parport_pc_find_isa_ports (int autoirq, int autodma);
 static int parport_pc_find_nonpci_ports (int autoirq, int autodma)

----------------------------diff end------------------------------------

Quoted 6 lines
Quoted 5 lines
Quoted 5 lines

It sounds reasonable.

And excuse me, could you provide the related link directly ? I don't know how to see the detail of '[email protected]'.

http://www.spinics.net/lists/linux-m68k/msg06041.html

OK, thanks. And sorry for replying late (during these days, I have to do another things, and almost can not connect net).

It seems already has another related patch for it, and it is just applying.

So need I send it again ?

Thanks.

Signature · 3 lines
Chen Gang

Asianux Corporation
#10 lore raw

Chen,

Quoted 29 lines · Geert Uytterhoeven
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines

This _only_ applies to use of insl/outsl macros in parport_pc.h, which is only used by Q40 on m68k. I see no reason to change anything in io.h to cope with this warning.

I guess your meaning is :

----------------------------diff begin----------------------------------

arch/m68k/include/asm/parport.h +8 -0
index 5ea75e6..dd1672a 100644
@@ -11,9 +11,20 @@
 #ifndef _ASM_M68K_PARPORT_H
 #define _ASM_M68K_PARPORT_H 1
 
+#ifdef CONFIG_Q40 /* for Q40, need redefine insl/outsl */
+
+#ifdef insl
+#undef insl
+#endif
 #define insl(port,buf,len)   isa_insb(port,buf,(len)<<2)
+
+#ifdef outsl
+#undef outsl

arch/m68k/include/asm/parport.h

Quoted 10 lines
arch/m68k/include/asm/parport.h +3 -1
+#endif
 #define outsl(port,buf,len)  isa_outsb(port,buf,(len)<<2)
 
+#endif /* CONFIG_Q40 */
+
 /* no dma, or IRQ autoprobing */
 static int parport_pc_find_isa_ports (int autoirq, int autodma);
 static int parport_pc_find_nonpci_ports (int autoirq, int autodma)
 
----------------------------diff end------------------------------------

No need for the #ifdef CONFIG_Q40 - Q40 is the only m68k subarch that builds the parport_pc module (which includes parport.h), IIRC. Is that correct, Thorsten?

Quoted 12 lines
Quoted 7 lines
Quoted 5 lines
Quoted 5 lines

It sounds reasonable.

And excuse me, could you provide the related link directly ? I don't know how to see the detail of '[email protected]'.

http://www.spinics.net/lists/linux-m68k/msg06041.html

OK, thanks. And sorry for replying late (during these days, I have to do another things, and almost can not connect net).

Thanks indeed for the link, Geert. I haven't yet had time to test whether the io.h patch would interfere with Atari IDE or other drivers's use of these macros - maybe this weekend.

Quoted 6 lines

It seems already has another related patch for it, and it is just applying.

So need I send it again ?

I think Thorsten submitted a patch to that effect? If so, yours should not be necessary.

Regards,

Michael

#11 lore raw
In reply to Chen Gang

Chen,

Quoted 29 lines · Geert Uytterhoeven
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines

This _only_ applies to use of insl/outsl macros in parport_pc.h, which is only used by Q40 on m68k. I see no reason to change anything in io.h to cope with this warning.

I guess your meaning is :

----------------------------diff begin----------------------------------

arch/m68k/include/asm/parport.h +8 -0
index 5ea75e6..dd1672a 100644
@@ -11,9 +11,20 @@
 #ifndef _ASM_M68K_PARPORT_H
 #define _ASM_M68K_PARPORT_H 1
 
+#ifdef CONFIG_Q40 /* for Q40, need redefine insl/outsl */
+
+#ifdef insl
+#undef insl
+#endif
 #define insl(port,buf,len)   isa_insb(port,buf,(len)<<2)
+
+#ifdef outsl
+#undef outsl

arch/m68k/include/asm/parport.h

Quoted 10 lines
arch/m68k/include/asm/parport.h +3 -1
+#endif
 #define outsl(port,buf,len)  isa_outsb(port,buf,(len)<<2)
 
+#endif /* CONFIG_Q40 */
+
 /* no dma, or IRQ autoprobing */
 static int parport_pc_find_isa_ports (int autoirq, int autodma);
 static int parport_pc_find_nonpci_ports (int autoirq, int autodma)
 
----------------------------diff end------------------------------------

No need for the #ifdef CONFIG_Q40 - Q40 is the only m68k subarch that builds the parport_pc module (which includes parport.h), IIRC. Is that correct, Thorsten?

Quoted 12 lines
Quoted 7 lines
Quoted 5 lines
Quoted 5 lines

It sounds reasonable.

And excuse me, could you provide the related link directly ? I don't know how to see the detail of '[email protected]'.

http://www.spinics.net/lists/linux-m68k/msg06041.html

OK, thanks. And sorry for replying late (during these days, I have to do another things, and almost can not connect net).

Thanks indeed for the link, Geert. I haven't yet had time to test whether the io.h patch would interfere with Atari IDE or other drivers's use of these macros - maybe this weekend.

Quoted 6 lines

It seems already has another related patch for it, and it is just applying.

So need I send it again ?

I think Thorsten submitted a patch to that effect? If so, yours should not be necessary.

Regards,

Michael

author
#12 lore raw
Quoted 8 lines · schmitz
Quoted 6 lines

It seems already has another related patch for it, and it is just applying.

So need I send it again ?

I think Thorsten submitted a patch to that effect? If so, yours should not be necessary.

OK, thanks.

And also thank Geert.

Signature · 3 lines
Chen Gang

Asianux Corporation
#13 lore raw
In reply to schmitz

schmitz dixit:

Quoted 3 lines

No need for the #ifdef CONFIG_Q40 - Q40 is the only m68k subarch that builds the parport_pc module (which includes parport.h), IIRC. Is that correct, Thorsten?

The header is included outside of Q40. There is no Q40 kernel in Debian (yet). So, no.

bye,
//mirabilos

Signature · 4 lines
17:08⎜«Vutral» früher gabs keine packenden smartphones und so
17:08⎜«Vutral» heute gibts frauen die sind facebooksüchtig
17:10⎜«Vutral» aber auch traurig; früher warst du als nerd voll am arsch
17:10⎜«Vutral» heute bist du als nerd der einzige der wirklich damit klarkommt
#14 lore raw

Thorsten,

Quoted 6 lines
Quoted 3 lines

No need for the #ifdef CONFIG_Q40 - Q40 is the only m68k subarch that builds the parport_pc module (which includes parport.h), IIRC. Is that correct, Thorsten?

The header is included outside of Q40. There is no Q40 kernel in Debian (yet). So, no.

OK, so it's the Amiga use of parport_pc that you had issues with. I really should stop
relying on my increasingly fuzzy memory.

Looking at the arch defconfigs, neither Amiga or Atari defines CONFIG_PARPORT_PC.
Is this driver used on any m68k subarch at all? At this stage I'm not even certain it is
in fact used on Q40.

Anyway, back to the patch at hand: any change to parport_pc.h should not affect m68k at all,
so you're free to patch this any way you please.

Changes to m68k asm/io.h should be avoided unless shown to cause no harm to existing drivers.
I can't see direct use of insl/outsl in Atari m68k drivers I checked, but due to the slightly tangled
nature of m68k io.h, these may get pulled in through macros yet. I'd prefer the code stays as-is.

Regards,

Michael

2013/6/6 Thorsten Glaser <[email protected]>:

Quoted 16 lines

schmitz dixit:

Quoted 3 lines

No need for the #ifdef CONFIG_Q40 - Q40 is the only m68k subarch that builds the parport_pc module (which includes parport.h), IIRC. Is that correct, Thorsten?

The header is included outside of Q40. There is no Q40 kernel in Debian (yet). So, no.

bye,
//mirabilos
--
17:08⎜«Vutral» früher gabs keine packenden smartphones und so 17:08⎜«Vutral» heute gibts frauen die sind facebooksüchtig 17:10⎜«Vutral» aber auch traurig; früher warst du als nerd voll am arsch 17:10⎜«Vutral» heute bist du als nerd der einzige der wirklich damit klarkommt