Re: [PATCH RFC 1/2] m68k: io_mm.h: conditionalize ISA address translation on Atari

Michael Schmitz
2021-06-06T02:19:44Z

Hi Brad,

Am 05.06.2021 um 18:04 schrieb Brad Boyer:
> On Sat, Jun 05, 2021 at 01:41:22PM +1200, Michael Schmitz wrote:
>> Am 05.06.2021 um 10:49 schrieb Brad Boyer:
>>> I don't see anything in drivers/pcmcia that is obviously an m68k
>>> system even though I'm pretty sure I remember discussions of supporting
>>> such hardware in the past.
>>
>> There's the APNE driver (Amiga PCMCIA NE2000 clone), which is already
>> catered for by the current code in io_mm.h. I remember seeing patches for
>> that driver that would allow support of a variant of the APNE card that were
>> hard to integrate in the current NE clone code framework. Didn't consider
>> adding another isa_type for that card at the time - I'll revisit these
>> patches if I can find them again.

Refreshed my memory - Alex submitted a patch to netdev three years ago
that essentially boiled down to changing our isa_inb() to use isa_inw().

This patch to io_mm.h (on top of my current patch), plus setting
isa_type to ISA_TPYE_AG100 using a module parameter, should do the trick:

diff --git a/arch/m68k/include/asm/io_mm.h b/arch/m68k/include/asm/io_mm.h
index f6b487b..6f79a5e 100644
--- a/arch/m68k/include/asm/io_mm.h
+++ b/arch/m68k/include/asm/io_mm.h
@@ -102,6 +102,11 @@
#define ISA_TYPE_AG (2)
#define ISA_TYPE_ENEC (3)

+#if defined(CONFIG_AMIGA_PCMCIA_100)
+#define ISA_TYPE_AG100 (4) /* for 100 MBit APNE card */
+#define MULTI_ISA 1
+#endif
+
#if defined(CONFIG_Q40) && !defined(MULTI_ISA)
#define ISA_TYPE ISA_TYPE_Q40
#define ISA_SEX 0
@@ -135,6 +140,9 @@ static inline u8 __iomem *isa_itb(unsigned long addr)
#ifdef CONFIG_Q40
case ISA_TYPE_Q40: return (u8 __iomem *)Q40_ISA_IO_B(addr);
#endif
+#if defined(CONFIG_AMIGA_PCMCIA_100)
+ case ISA_TYPE_AG100: fallthrough;
+#endif
#ifdef CONFIG_AMIGA_PCMCIA
case ISA_TYPE_AG: return (u8 __iomem *)AG_ISA_IO_B(addr);
#endif
@@ -153,6 +161,9 @@ static inline u16 __iomem *isa_itw(unsigned long addr)
#ifdef CONFIG_Q40
case ISA_TYPE_Q40: return (u16 __iomem *)Q40_ISA_IO_W(addr);
#endif
+#if defined(CONFIG_AMIGA_PCMCIA_100)
+ case ISA_TYPE_AG100: fallthrough;
+#endif
#ifdef CONFIG_AMIGA_PCMCIA
case ISA_TYPE_AG: return (u16 __iomem *)AG_ISA_IO_W(addr);
#endif
@@ -168,6 +179,9 @@ static inline u32 __iomem *isa_itl(unsigned long addr)
{
switch(ISA_TYPE)
{
+#if defined(CONFIG_AMIGA_PCMCIA_100)
+ case ISA_TYPE_AG100: fallthrough;
+#endif
#ifdef CONFIG_AMIGA_PCMCIA
case ISA_TYPE_AG: return (u32 __iomem *)AG_ISA_IO_W(addr);
#endif
@@ -181,6 +195,9 @@ static inline u8 __iomem *isa_mtb(unsigned long addr)
#ifdef CONFIG_Q40
case ISA_TYPE_Q40: return (u8 __iomem *)Q40_ISA_MEM_B(addr);
#endif
+#if defined(CONFIG_AMIGA_PCMCIA_100)
+ case ISA_TYPE_AG100: fallthrough;
+#endif
#ifdef CONFIG_AMIGA_PCMCIA
case ISA_TYPE_AG: return (u8 __iomem *)addr;
#endif
@@ -199,6 +216,9 @@ static inline u16 __iomem *isa_mtw(unsigned long addr)
#ifdef CONFIG_Q40
case ISA_TYPE_Q40: return (u16 __iomem *)Q40_ISA_MEM_W(addr);
#endif
+#if defined(CONFIG_AMIGA_PCMCIA_100)
+ case ISA_TYPE_AG100: fallthrough;
+#endif
#ifdef CONFIG_AMIGA_PCMCIA
case ISA_TYPE_AG: return (u16 __iomem *)addr;
#endif
@@ -219,6 +239,11 @@ static inline u16 __iomem *isa_mtw(unsigned long addr)
#define isa_outw(val,port) (ISA_SEX ? out_be16(isa_itw(port),(val)) :
out_le16(isa_itw(port),(val)))
#define isa_outl(val,port) (ISA_SEX ? out_be32(isa_itl(port),(val)) :
out_le32(isa_itl(port),(val)))

+#if defined(CONFIG_AMIGA_PCMCIA_100)
+#undef isa_inb
+#define isa_inb(port) ((ISA_TYPE == ISA_TYPE_AG100) ? ((port) & 1
? isa_inw((port) - 1) & 0xff : isa_inw(port) >> 8) : in_8(isa_itb(port))
+#endif
+
#define isa_readb(p) in_8(isa_mtb((unsigned long)(p)))
#define isa_readw(p) \
(ISA_SEX ? in_be16(isa_mtw((unsigned long)(p))) \

(linebreak-mangled, sorry).

The card reset patch hunk from Alex' patch can probably go into the APNE
driver regardless?

It's been quite a while - can you still try and build/test this change,
Alex?

Cheers,

Michael