Hi Michael,
On Thu, Jun 17, 2021 at 9:33 PM Michael Schmitz <schmitzmic@xxxxxxxxx> wrote:
On 17/06/21 6:51 pm, Finn Thain wrote:
On Thu, 17 Jun 2021, Michael Schmitz 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@xxxxxxxx>.
CC: netdev@xxxxxxxxxxxxxxx
Tested-by: Alex Kazik <alex@xxxxxxxx>
Signed-off-by: Michael Schmitz <schmitzmic@xxxxxxxxx>
--- a/drivers/net/ethernet/8390/apne.c
+++ b/drivers/net/ethernet/8390/apne.c
@@ -120,6 +120,12 @@ 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)");
+#ifdef CONFIG_APNE100MBIT
+static bool apne_100_mbit;
+module_param_named(apne_100_mbit_msg, apne_100_mbit, bool, 0444);
+MODULE_PARM_DESC(apne_100_mbit_msg, "Enable 100 Mbit support");
+#endif
+
struct net_device * __init apne_probe(int unit)
{
struct net_device *dev;
@@ -139,6 +145,11 @@ struct net_device * __init apne_probe(int unit)
if ( !(AMIGAHW_PRESENT(PCMCIA)) )
return ERR_PTR(-ENODEV);
+#ifdef CONFIG_APNE100MBIT
+ if (apne_100_mbit)
+ isa_type = ISA_TYPE_AG16;
+#endif
+
I think isa_type has to be assigned unconditionally otherwise it can't be
reset for 10 mbit cards. Therefore, the AMIGAHW_PRESENT(PCMCIA) logic in
arch/m68k/kernel/setup_mm.c probably should move here.
Good catch! I am uncertain though as to whether replacing a 100 Mbit
card by a 10 Mbit one at run time is a common use case (or even
possible, given constraints of the Amiga PCMCIA interface?), but it
ought to work even if rarely used.
Given it's PCMCIA, I guess that's a possibility.
Furthermore, always setting isa_type means the user can recover from
a mistake by unloading the module, and modprobe'ing again with the
correct parameter.
For the builtin-case, that needs a s/0444/0644/ change, though.
The comment there says isa_type must be set as early as possible, so I'd
rather leave that alone, and add an 'else' clause here.
This of course raise the question whether we ought to move the entire
isa_type handling into arch code instead - make it a generic
amiga_pcmcia_16bit option settable via sysfs. There may be other 16 bit
cards that require the same treatment, and duplicating PCMCIA mode
switching all over the place could be avoided. Opinions?
Indeed.
Still, can we autodetect in the driver?
I'm wondering how this is handled on PCs with PCMCIA, or if there
really is something special about Amiga PCMCIA hardware...
And I'd really like to get rid of the CONFIG_APNE100MBIT option,
i.e. always include the support, if possible.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx
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
