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>,
ALeX Kazik <alex@kazik.de>
Subject: Re: [PATCH RFC 2/2] net/8390: apne.c - add 100 Mbit support to apne.c driver
Date: Mon, 7 Jun 2021 20:40:45 +1200 [thread overview]
Message-ID: <d6268e39-295d-f9a4-862c-738803168f03@gmail.com> (raw)
In-Reply-To: <CAMuHMdXEs874y3nBjVNt8TQP-AMLTRMFgh+1wMt2xyJP3W_+Dg@mail.gmail.com>
Hi Geert,
Am 07.06.2021 um 20:08 schrieb Geert Uytterhoeven:
> Hi Michael,
>
> On Sun, Jun 6, 2021 at 7:54 AM Michael Schmitz <schmitzmic@gmail.com> wrote:
>> Add Kconfig option, module parameter and PCMCIA reset code
>> required to support 100 Mbit PCMCIA ethernet cards on Amiga.
>>
>> 10 Mbit and 100 Mbit mode are supported by the same module.
>> A module parameter switches Amiga ISA IO accessors to word
>> access by changing isa_type at runtime. Additional code to
>> reset the PCMCIA hardware is also added to the driver probe.
>>
>> Patch modified after patch "[PATCH RFC net-next] Amiga PCMCIA
>> 100 MBit card support" submitted to netdev 2018/09/16 by Alex
>> Kazik <alex@kazik.de>.
>>
>> Signed-off-by: Michael Schmitz <schmitzmic@gmail.com>
>
> Thanks for your patch!
>
>> --- a/drivers/net/ethernet/8390/Kconfig
>> +++ b/drivers/net/ethernet/8390/Kconfig
>> @@ -143,6 +143,19 @@ config APNE
>> To compile this driver as a module, choose M here: the module
>> will be called apne.
>>
>> +if APNE
>
> Please use "depends on APNE" instead of an if/endif block, as there's
> only a single symbol to cover.
True - I had copied that straight from Alex' patch ..
>
>> +config APNE100MBIT
>> + bool "PCMCIA NE2000 100MBit support"
>> + default n
>> + ---help---
>> + This changes the driver to support 10/100Mbit cards (e.g. Netgear
>> + FA411, CNet Singlepoint). 10 MBit cards and 100 MBit cards are
>> + supported by the same driver.
>> +
>> + To activate 100 Mbit support at runtime, use the apne100 module
>> + parameter.
>
> Trailing space.
And ---help--- did confuse kbuild, as I found out.
>> +endif
>> +
>> config PCMCIA_PCNET
>> tristate "NE2000 compatible PCMCIA support"
>> depends on PCMCIA
>> diff --git a/drivers/net/ethernet/8390/apne.c b/drivers/net/ethernet/8390/apne.c
>> index fe6c834..9648e45 100644
>> --- a/drivers/net/ethernet/8390/apne.c
>> +++ b/drivers/net/ethernet/8390/apne.c
>> @@ -120,6 +120,10 @@ static u32 apne_msg_enable;
>> module_param_named(msg_enable, apne_msg_enable, uint, 0444);
>> MODULE_PARM_DESC(msg_enable, "Debug message level (see linux/netdevice.h for bitmap)");
>>
>> +static u32 apne_100_mbit;
>> +module_param_named(apne_100_mbit, uint, 0);
>> +MODULE_PARM_DESC(apne_100_mbit, "Enable 100 Mbit support");
>
> Shouldn't this depend on CONFIG_APNE100MBIT, too?
> Perhaps we shouldn't bother with the config symbol, and include this
> unconditionally?
At least the parameter should not hurt - this is entirely untested so
I'd hate to break APNE by including the io_mm.h changes unconditionally.
>> +
>> struct net_device * __init apne_probe(int unit)
>> {
>> struct net_device *dev;
>> @@ -139,6 +143,9 @@ struct net_device * __init apne_probe(int unit)
>> if ( !(AMIGAHW_PRESENT(PCMCIA)) )
>> return ERR_PTR(-ENODEV);
>>
>> + if (apne_100_mbit)
>> + isa_type = ISA_TYPE_AG100;
>
> Likewise.
And that one breaks if 16 bit support isn't always enabled. I'll
conditionalize it.
> Can we enable this automatically when needed, based on the chip
> detected?
I wondered about that - we'd have to poke the chip with 16 bit IO if 8
bit IO fails, no idea what side effects that would have.
Maybe retrying the card reset in apne_probe1 again after changing
isa_type would work, but someone would have to try that and report back.
> + spaces instead of TABs (scripts/checkpatch.pl is your friend).
Thanks, I'll fix that. Got sloppy with checkpatch, sorry.
>
>> +
>> pr_info("Looking for PCMCIA ethernet card : ");
>>
>> /* check if a card is inserted */
>> @@ -590,6 +597,16 @@ static int init_pcmcia(void)
>> #endif
>> u_long offset;
>>
>> +#ifdef CONFIG_APNE100MBIT
>> + /* reset card (idea taken from CardReset by Artur Pogoda) */
>> + {
>> + u_char tmp = gayle.intreq;
>> +
>> + gayle.intreq = 0xff; mdelay(1);
>> + gayle.intreq = tmp; mdelay(300);
>> + }
>
> Is this safe for all cards?
I _think_ so, but this really is a question for Alex and others involved
in developing the original patch. (The original patch had that
conditionalized as well so I might be wrong ...)
I'll send v2 once I've fixed these all up...
Cheers,
Michael
>> +#endif
>> +
>> pcmcia_reset();
>> pcmcia_program_voltage(PCMCIA_0V);
>> pcmcia_access_speed(PCMCIA_SPEED_250NS);
>
> Gr{oetje,eeting}s,
>
> Geert
>
next prev parent reply other threads:[~2021-06-07 8:41 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 [this message]
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=d6268e39-295d-f9a4-862c-738803168f03@gmail.com \
--to=schmitzmic@gmail.com \
--cc=alex@kazik.de \
--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).