From: Michael Schmitz <schmitzmic@gmail.com>
To: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Linux/m68k <linux-m68k@vger.kernel.org>,
linux-ide@vger.kernel.org, Finn Thain <fthain@linux-m68k.org>
Subject: Re: [PATCH] m68k: Fix multiplatform ISA support
Date: Mon, 7 Jun 2021 20:17:01 +1200 [thread overview]
Message-ID: <8b867324-b6a5-a0a8-a120-5b95f8b55c3e@gmail.com> (raw)
In-Reply-To: <CAMuHMdWxYJ-ZvbTUhcnye=3ztCp7qTHpX0aqLWKtXk2NEZx+Vg@mail.gmail.com>
Hi Geert,
thanks for your review!
Am 07.06.2021 um 19:49 schrieb Geert Uytterhoeven:
> Hi Michael,
>
> On Sun, Jun 6, 2021 at 7:28 AM Michael Schmitz <schmitzmic@gmail.com> wrote:
>> Current io_mm.h uses address translation and ROM port IO primitives when
>> port addresses are below 1024, and raw untranslated MMIO IO primitives
>> else when CONFIG_ATARI_ROM_ISA is set. This is done regardless of the
>> m68k machine type a multi-platform kernel runs on. As a consequence,
>> the Q40 IDE driver in multiplatform kernels cannot work.
>> Conversely, the Atari IDE driver uses wrong address translation if a
>> multiplatform Q40 and Atari kernel does _not_ set CONFIG_ATARI_ROM_ISA.
>>
>> Replace MMIO by ISA IO primitives for addresses > 1024 (if isa_type
>> is ISA_TYPE_ENEC), and change the ISA address translation used for
>> Atari to a no-op for those addresses.
>>
>> Switch readb()/writeb() and readw()/writew() to their ISA equivalents
>> also. Change the address translation functions to return the identity
>> translation if CONFIG_ATARI_ROM_ISA is not defined, and set MULTI_ISA
>> for kernels where Q40 and Atari are both configured so this can actually
>> work (isa_type set to Q40 at compile time else).
>
> Thanks for your patch!
>
>> Fixes: 84b16b7b0d5c818fadc731a69965dc76dce0c91e
>
> Fixes: 84b16b7b0d5c818f ("m68k/atari: ROM port ISA adapter support")
>
> Hint:
>
> $ git help fixes
> 'fixes' is aliased to 'show --format='Fixes: %h ("%s")' -s'
> $ git fixes 84b16b7b0d5c818fadc731a69965dc76dce0c91e
> Fixes: 84b16b7b0d5c818f ("m68k/atari: ROM port ISA adapter support")
Thanks, I'll change that.
>> Signed-off-by: Michael Schmitz <schmitzmic@gmail.com>
>
>> --- a/arch/m68k/include/asm/io_mm.h
>> +++ b/arch/m68k/include/asm/io_mm.h
>> @@ -113,7 +117,7 @@
>>
>> #ifdef MULTI_ISA
>> extern int isa_type;
>> -extern int isa_sex;
>> +extern int isa_sex; /* Atari relies on this to be zero-initialized */
>
> Shouldn't that comment be next to its definition in
> arch/m68k/kernel/setup_mm.c?
I ended up dropping changes to that file, and would rather omit the
comment here than touching setup_mm.c just for the sake of adding a
comment.
We might omit the isa_sex = 0 stuff in setup_mm.c altogether, OTOH ...
>
>> @@ -135,9 +139,11 @@ static inline u8 __iomem *isa_itb(unsigned long addr)
>> case ISA_TYPE_AG: return (u8 __iomem *)AG_ISA_IO_B(addr);
>> #endif
>> #ifdef CONFIG_ATARI_ROM_ISA
>> - case ISA_TYPE_ENEC: return (u8 __iomem *)ENEC_ISA_IO_B(addr);
>> + case ISA_TYPE_ENEC: if (addr < 1024)
>> + return (u8 __iomem *)ENEC_ISA_IO_B(addr);
>> + fallthrough; /* not ROM port? fallback below! */
>> #endif
>> - default: return NULL; /* avoid warnings, just in case */
>> + default: return (u8 __iomem *)(addr); /* avoid warnings, just in case */
>> }
>
> Moving the default out of the switch() statement, as suggested by Finn,
> would make this more future-proof, as any case (not just the last one)
> can fall through to the default, using break.
OK, I take that to indicate the default may be changed in that way, and
will move it outside the switch().
Cheers,
Michael
>
> Gr{oetje,eeting}s,
>
> Geert
>
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
>
> 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
>
next prev parent reply other threads:[~2021-06-07 8:17 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
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 [this message]
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=8b867324-b6a5-a0a8-a120-5b95f8b55c3e@gmail.com \
--to=schmitzmic@gmail.com \
--cc=fthain@linux-m68k.org \
--cc=geert@linux-m68k.org \
--cc=linux-ide@vger.kernel.org \
--cc=linux-m68k@vger.kernel.org \
/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).