Thanks for your patch!
[dropping netdev for discussion of m68k IO accessor details]
Am 16.09.2018 um 08:40 schrieb ALeX Kazik:
This adds an option to change the (10 MBit only) "apne" driver to support
the 10/100 Mbit cards (e.g. Netgear FA411, CNet Singlepoint) instead.
A new configure option is added as a bool to the apne driver to change the
behaviour to support some new cards instead.
The option can be only enabled if no other 8390 driver is active because the
8390 library is modified when activated.
The patch is initially from http://www.g-mb.de/pcmcia_e.html and adapted by
me from the 2.6 version.
The contained reset fix is required to use a pcmcia card after a reset/reboot,
and is also only activated with new option. (Background, as far as I
understood it: The pcmcia reset line is not connected and after a reset/reboot
the pcmcia card is in an undefined state and needs a manual reset.)
This reset patch is probably useful to all Amiga pcmcia drivers (network and
other) but since I do not own any other card I can't verify that.
Signed-off-by: ALeX Kazik <alex@xxxxxxxx>
Tested-by: ALeX Kazik <alex@xxxxxxxx>
diff -urp linux-4.18.7/drivers/net/ethernet/8390/8390.h linux-4.18.7-patched/drivers/net/ethernet/8390/8390.h
--- linux-4.18.7/drivers/net/ethernet/8390/8390.h 2018-09-09 10:32:43.000000000 +0200
+++ linux-4.18.7-patched/drivers/net/ethernet/8390/8390.h 2018-09-15 14:51:00.000000000 +0200
@@ -222,4 +222,21 @@ struct ei_device {
#define ENTSR_CDH 0x40 /* The collision detect "heartbeat" signal was lost. */
#define ENTSR_OWC 0x80 /* There was an out-of-window collision. */
+/* Change the driver to support word access instead of byte access.
+ * Cards that work with byte access will not work with word access.
+ */
+#ifdef CONFIG_APNE100MBIT
+/* redefine inb to do word accesses */
+#undef inb
+#define inb(x) ((x) & 1 ? inw((x) - 1) & 0xff : inw(x) >> 8)
+#undef inb_p
+#define inb_p(x) inb(x)
+
+/* The following redefinition of outb isn't necessary, but may be faster on
+ * slow processors.
+ */
+#undef outb
+#define outb(x, y) raw_outb(x, (y) + GAYLE_IO + (((y) & 1) ? GAYLE_ODD : 0))
+#endif
+
I wonder whether this hunk could be moved to arch/m68k/include/asm/io_mm.h?
As far as I can see, inb() and outb() won't be used by any other driver
than apne.c on Amiga. IDE uses MMIO accessors these days so no conflict
there. Other Amiga network drivers use raw_io accessors. Can you
remember any other users of inb()/outb() on Amiga, Geert?
On that note - I struggle to remember why the IO accessor macros end up
using in_8() and the like when Atari ROM port IO support is configured.
The inline address translation macros are not in effect in that case.
The comment in io_mm.h suggests this was for the benefit of the IDE
driver on Atari, but that has long since been converted to MMIO. I
believe the use of in_8() etc. is no longer necessary there, and could
be replaced by isa_inb() etc.
More cleanup of io_mm.h will be required to allow compiling a kernel
with both Amiga PCMCIA and Atari ROM port network adapter support
present at the same time, though.
Cheers,
Michael
#endif /* _8390_h */
Only in linux-4.18.7-patched/drivers/net/ethernet/8390/: 8390.h.orig
diff -urp linux-4.18.7/drivers/net/ethernet/8390/Kconfig linux-4.18.7-patched/drivers/net/ethernet/8390/Kconfig
--- linux-4.18.7/drivers/net/ethernet/8390/Kconfig 2018-09-09 10:32:43.000000000 +0200
+++ linux-4.18.7-patched/drivers/net/ethernet/8390/Kconfig 2018-09-15 14:34:18.000000000 +0200
@@ -142,6 +142,22 @@ config APNE
To compile this driver as a module, choose M here: the module
will be called apne.
+if APNE
+config APNE100MBIT
+ bool "PCMCIA NE2000 100MBit support"
+ default n
+ depends on ARM_ETHERH=n && AX88796=n && HYDRA=n && MAC8390=n
+ depends on MCF8390=n && NE2000=n && NE2K_PCI=n && PCMCIA_AXNET=n
+ depends on PCMCIA_PCNET=n && STNIC=n && ULTRA=n && WD80x3=n
+ depends on XSURF100=n && ZORRO8390=n
+ ---help---
+ This changes the driver to support ONLY 10/100Mbit cards (e.g. Netgear
+ FA411, CNet Singlepoint).
+ Cards that worked with the original version won't with this version.
+
+ Say N, unless you absolutely know what you are doing.
+endif
+
config PCMCIA_PCNET
tristate "NE2000 compatible PCMCIA support"
depends on PCMCIA
diff -urp linux-4.18.7/drivers/net/ethernet/8390/apne.c linux-4.18.7-patched/drivers/net/ethernet/8390/apne.c
--- linux-4.18.7/drivers/net/ethernet/8390/apne.c 2018-09-09 10:32:43.000000000 +0200
+++ linux-4.18.7-patched/drivers/net/ethernet/8390/apne.c 2018-09-15 14:48:27.000000000 +0200
@@ -590,6 +590,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);
+ }
+#endif
+
pcmcia_reset();
pcmcia_program_voltage(PCMCIA_0V);
pcmcia_access_speed(PCMCIA_SPEED_250NS);
