From: Finn Thain <fthain@linux-m68k.org>
To: Michael Schmitz <schmitzmic@gmail.com>
Cc: Brad Boyer <flar@allandria.com>,
linux-m68k@vger.kernel.org, geert@linux-m68k.org,
linux-ide@vger.kernel.org, ALeX Kazik <alex@kazik.de>
Subject: Re: [PATCH RFC 1/2] m68k: io_mm.h: conditionalize ISA address translation on Atari
Date: Sun, 6 Jun 2021 14:53:26 +1000 (AEST) [thread overview]
Message-ID: <bfce51f-a393-7c3e-77f0-a99595a0d037@linux-m68k.org> (raw)
In-Reply-To: <5bed9868-2cb6-6604-abb9-faa9361fa3e3@gmail.com>
On Sun, 6 Jun 2021, Michael Schmitz wrote:
>
> 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 */
IMHO this would be simpler if that #define was unconditional like the
others.
> +#define MULTI_ISA 1
Hmm...
> +#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
I wonder whether that 'fallthrough' is needed. One would hope not...
> #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
> +
Would (port & ~1) be faster than (port - 1) here?
Also, I don't think you need '#if defined' here. When
!defined(CONFIG_AMIGA_PCMCIA_100), I think ISA_TYPE should be a
compile-time constant 0, and the dead code will get tossed out anyway.
> #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?
Note that isa_type is never assigned to ISA_TYPE_AG100 in
arch/m68k/kernel/setup_mm.c which means (IIUC) this patch won't take
effect with MULTI_ISA == 1.
next prev parent reply other threads:[~2021-06-06 4:53 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CAMuHMdUskb3oicq8Kbf6MY_4mn4-Y1pJ-om4fny7k48gndscgg@mail.gmail.com>
2021-06-02 5:21 ` [PATCH RFC 0/2] Fix m68k multiplatform ISA support Michael Schmitz
2021-06-02 5:21 ` [PATCH RFC 1/2] m68k: io_mm.h: conditionalize ISA address translation on Atari Michael Schmitz
2021-06-03 8:23 ` Finn Thain
2021-06-04 0:19 ` Michael Schmitz
2021-06-04 5:55 ` Finn Thain
2021-06-04 7:30 ` Michael Schmitz
2021-06-04 22:49 ` Brad Boyer
2021-06-05 1:41 ` Michael Schmitz
2021-06-05 6:04 ` Brad Boyer
2021-06-05 22:05 ` Michael Schmitz
2021-06-06 2:18 ` Michael Schmitz
2021-06-06 4:53 ` Finn Thain [this message]
2021-06-06 5:42 ` Michael Schmitz
2021-06-06 23:51 ` Brad Boyer
2021-06-06 5:54 ` [PATCH RFC 0/2] Add APNE PCMCIA 100 Mbit support Michael Schmitz
2021-06-06 5:54 ` [PATCH RFC 1/2] m68k: io_mm.h - add APNE 100 MBit support Michael Schmitz
2021-06-07 8:01 ` Geert Uytterhoeven
2021-06-07 8:20 ` Michael Schmitz
2021-06-07 11:15 ` Geert Uytterhoeven
2021-06-07 19:57 ` Michael Schmitz
2021-06-08 6:42 ` Geert Uytterhoeven
2021-06-08 21:55 ` Michael Schmitz
2021-06-09 6:33 ` Geert Uytterhoeven
2021-06-08 21:56 ` Michael Schmitz
2021-06-06 5:54 ` [PATCH RFC 2/2] net/8390: apne.c - add 100 Mbit support to apne.c driver Michael Schmitz
2021-06-07 8:08 ` Geert Uytterhoeven
2021-06-07 8:40 ` Michael Schmitz
2021-06-07 8:46 ` ALeX Kazik
2021-06-08 3:10 ` Michael Schmitz
2021-06-07 8:37 ` Geert Uytterhoeven
2021-06-07 12:56 ` Geert Uytterhoeven
2021-06-09 7:36 ` [PATCH v1 0/2] Add APNE PCMCIA 100 Mbit support Michael Schmitz
2021-06-09 7:36 ` [PATCH v1 1/2] m68k: io_mm.h - add APNE 100 MBit support Michael Schmitz
2021-06-09 8:04 ` Andreas Schwab
2021-06-09 21:54 ` Michael Schmitz
2021-06-10 1:09 ` Finn Thain
2021-06-10 7:32 ` Geert Uytterhoeven
2021-06-11 2:15 ` Michael Schmitz
2021-06-10 8:53 ` Andreas Schwab
2021-06-09 7:36 ` [PATCH v1 2/2] net/8390: apne.c - add 100 Mbit support to apne.c driver Michael Schmitz
2021-06-10 2:09 ` [PATCH v2 0/2] Add APNE PCMCIA 100 Mbit support Michael Schmitz
2021-06-10 2:09 ` [PATCH v2 1/2] m68k: io_mm.h - add APNE 100 MBit support Michael Schmitz
2021-06-10 2:09 ` [PATCH v2 2/2] net/8390: apne.c - add 100 Mbit support to apne.c driver Michael Schmitz
2021-06-16 21:11 ` [PATCH v2 0/2] Add APNE PCMCIA 100 Mbit support ALeX Kazik
2021-06-17 1:10 ` Michael Schmitz
2021-06-04 7:54 ` [PATCH RFC 1/2] m68k: io_mm.h: conditionalize ISA address translation on Atari Geert Uytterhoeven
2021-06-04 21:36 ` Michael Schmitz
2021-06-04 23:31 ` Finn Thain
2021-06-05 0:24 ` Finn Thain
2021-06-05 3:48 ` Michael Schmitz
2021-06-09 6:35 ` Geert Uytterhoeven
2021-06-09 7:20 ` Michael Schmitz
2021-06-02 5:21 ` [PATCH RFC 2/2] m68k: setup_mm.c: set isa_sex for Atari if ATARI_ROM_ISA not used Michael Schmitz
2021-06-02 7:09 ` Geert Uytterhoeven
2021-06-02 8:21 ` Michael Schmitz
2021-06-03 8:29 ` Finn Thain
2021-06-04 3:02 ` Michael Schmitz
2021-06-06 5:28 ` [PATCH] m68k: Fix multiplatform ISA support Michael Schmitz
2021-06-07 7:49 ` Geert Uytterhoeven
2021-06-07 8:17 ` Michael Schmitz
2021-06-09 7:22 ` [PATCH v2] m68k: io_mm.h: conditionalize ISA address translation on Atari Michael Schmitz
2021-06-09 7:57 ` Andreas Schwab
2021-06-09 21:43 ` Michael Schmitz
2021-06-10 2:04 ` [PATCH v3] " Michael Schmitz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=bfce51f-a393-7c3e-77f0-a99595a0d037@linux-m68k.org \
--to=fthain@linux-m68k.org \
--cc=alex@kazik.de \
--cc=flar@allandria.com \
--cc=geert@linux-m68k.org \
--cc=linux-ide@vger.kernel.org \
--cc=linux-m68k@vger.kernel.org \
--cc=schmitzmic@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).