On Fri, Apr 5, 2024, at 20:36, Michael Schmitz wrote:
Am 05.04.2024 um 23:16 schrieb Geert Uytterhoeven:
On Wed, Apr 3, 2024 at 8:35 PM Arnd Bergmann <arnd@xxxxxxxxxx> wrote:
On Wed, Apr 3, 2024, at 20:11, Michael Schmitz wrote:
how do you propose we handle legacy drivers that do depend on
inb()/outb() functions (_not_ actual ISA I/O) on architectures that map
inb()/outb() to MMIO functions?
(In my case, that's at least ne.c - Geert ought to have a better
overview what else does use inb()/outb() on m68k)
If a machine provides an inb()/outb() set of operations that
is actually used, it should set HAS_IOPORT.
For the Q40, it may be better in the long run to change the
drivers to just use MMIO directly though.
Q40 uses ISA.
Michael is worried about non-ISA drivers using inb() and friends.
At some point in time (i.e. eons ago), we were told it was better to
use in[bwl]()/read[bwl]() instead of directly dereferencing volatile
pointers...
Anyway, I don't think we have many users of inb() and friends left, and
I assume the bots should have detected any/most remaining users in Niklas'
branch...
All the 8390 based ethernet drivers still use inb() and friends.
That is the main reason for the terrible hacks in
arch/m68k/include/asm/io_mm.h ...
The last time I tried to add support for a different PCMCIA ethernet
adapter to apne.c _without_ adding to the hacks in io_mm.h, I wasn't
getting anywhere with the netdev crowd. That was ages ago, and I doubt
their enthusiasm for a rewrite of the 8390 code base to avoid using
inb() on MMIO architectures will be any better now.
From what I can see, there is already an abstraction layer in
these drivers that is used by all m68k drivers except apne:
$ git grep -w 'define\sei_inb'
drivers/net/ethernet/8390/8390.h:#define ei_inb(_p) inb(_p)
drivers/net/ethernet/8390/8390p.c:#define ei_inb(_p) inb(_p)
drivers/net/ethernet/8390/ax88796.c:#define ei_inb(_a) readb(ax_convert_addr(_a))
drivers/net/ethernet/8390/etherh.c:#define ei_inb(_p) readb((void __iomem *)_p)
drivers/net/ethernet/8390/hydra.c:#define ei_inb(port) in_8(port)
drivers/net/ethernet/8390/mac8390.c:#define ei_inb(port) in_8(port)
drivers/net/ethernet/8390/mcf8390.c:#define ei_inb ei_inb
drivers/net/ethernet/8390/xsurf100.c:#define ei_inb(_a) z_readb(ax_convert_addr(_a))
drivers/net/ethernet/8390/zorro8390.c:#define ei_inb(port) in_8(port)
Can't apne.c just do the same here? The patch below didn't
take that long to come up with, but I may be missing something
here of course.
Arnd
8<---
From 5dd43e612a52adf499b1ea3d33e3b2b45894d275 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@xxxxxxxx>
Date: Fri, 5 Apr 2024 21:47:51 +0200
Subject: [PATCH] net: apne: convert to lib8390
The apne driver still uses the ISA-style inb()/outb() wappers through the
8390.c helper module, which won't work in the future.
Change it to include lib8390.c like all the other m68k variants of this
driver do, so it can have custom MMIO abstractions.
Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
diff --git a/drivers/net/ethernet/8390/Makefile b/drivers/net/ethernet/8390/Makefile
index 85c83c566ec6..ec1b325da4e4 100644
--- a/drivers/net/ethernet/8390/Makefile
+++ b/drivers/net/ethernet/8390/Makefile
@@ -4,7 +4,7 @@
#
obj-$(CONFIG_MAC8390) += mac8390.o
-obj-$(CONFIG_APNE) += apne.o 8390.o
+obj-$(CONFIG_APNE) += apne.o
obj-$(CONFIG_ARM_ETHERH) += etherh.o
obj-$(CONFIG_AX88796) += ax88796.o
obj-$(CONFIG_HYDRA) += hydra.o
diff --git a/drivers/net/ethernet/8390/apne.c b/drivers/net/ethernet/8390/apne.c
index 828edca8d30c..ea3747723b3c 100644
--- a/drivers/net/ethernet/8390/apne.c
+++ b/drivers/net/ethernet/8390/apne.c
@@ -41,7 +41,15 @@
#include <asm/amigayle.h>
#include <asm/amipcmcia.h>
-#include "8390.h"
+#define ei_inb(port) in_8(port)
+#define ei_outb(val, port) out_8(port, val)
+#define ei_inb_p(port) in_8(port)
+#define ei_outb_p(val, port) out_8(port, val)
+
+static const char version[] =
+ "apne.c:v1.1 7/10/98 Alain Malek (Alain.Malek@xxxxxxxxxx)\n";
+
+#include "lib8390.c"
/* ---- No user-serviceable parts below ---- */
@@ -105,14 +113,21 @@ static int init_pcmcia(void);
#define MANUAL_HWADDR5 0x9a
*/
-static const char version[] =
- "apne.c:v1.1 7/10/98 Alain Malek (Alain.Malek@xxxxxxxxxx)\n";
-
static int apne_owned; /* signal if card already owned */
-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 const struct net_device_ops apne_netdev_ops = {
+ .ndo_open = __ei_open,
+ .ndo_stop = __ei_close,
+ .ndo_start_xmit = __ei_start_xmit,
+ .ndo_tx_timeout = __ei_tx_timeout,
+ .ndo_get_stats = __ei_get_stats,
+ .ndo_set_rx_mode = __ei_set_multicast_list,
+ .ndo_validate_addr = eth_validate_addr,
+ .ndo_set_mac_address = eth_mac_addr,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+ .ndo_poll_controller = __ei_poll,
+#endif
+};
static struct net_device * __init apne_probe(void)
{
@@ -141,11 +156,11 @@ static struct net_device * __init apne_probe(void)
return ERR_PTR(-ENODEV);
}
- dev = alloc_ei_netdev();
+ dev = ____alloc_ei_netdev(0);
if (!dev)
return ERR_PTR(-ENOMEM);
ei_local = netdev_priv(dev);
- ei_local->msg_enable = apne_msg_enable;
+ ei_local->msg_enable = msg_enable;
/* disable pcmcia irq for readtuple */
pcmcia_disable_irq();
@@ -203,7 +218,7 @@ static int __init apne_probe1(struct net_device *dev, int ioaddr)
#endif
static unsigned version_printed;
- if ((apne_msg_enable & NETIF_MSG_DRV) && (version_printed++ == 0))
+ if ((msg_enable & NETIF_MSG_DRV) && (version_printed++ == 0))
netdev_info(dev, version);
netdev_info(dev, "PCMCIA NE*000 ethercard probe");
@@ -309,7 +324,7 @@ static int __init apne_probe1(struct net_device *dev, int ioaddr)
dev->base_addr = ioaddr;
dev->irq = IRQ_AMIGA_PORTS;
- dev->netdev_ops = &ei_netdev_ops;
+ dev->netdev_ops = &apne_netdev_ops;
/* Install the Interrupt handler */
i = request_irq(dev->irq, apne_interrupt, IRQF_SHARED, DRV_NAME, dev);
@@ -333,7 +348,7 @@ static int __init apne_probe1(struct net_device *dev, int ioaddr)
ei_status.block_output = &apne_block_output;
ei_status.get_8390_hdr = &apne_get_8390_hdr;
- NS8390_init(dev, 0);
+ __NS8390_init(dev, 0);
pcmcia_ack_int(pcmcia_get_intreq()); /* ack PCMCIA int req */
pcmcia_enable_irq();
@@ -513,7 +528,7 @@ apne_block_output(struct net_device *dev, int count,
if (time_after(jiffies, dma_start + 2*HZ/100)) { /* 20ms */
netdev_warn(dev, "timeout waiting for Tx RDC.\n");
apne_reset_8390(dev);
- NS8390_init(dev,1);
+ __NS8390_init(dev,1);
break;
}
@@ -534,10 +549,10 @@ static irqreturn_t apne_interrupt(int irq, void *dev_id)
pcmcia_ack_int(pcmcia_intreq);
return IRQ_NONE;
}
- if (apne_msg_enable & NETIF_MSG_INTR)
+ if (msg_enable & NETIF_MSG_INTR)
pr_debug("pcmcia intreq = %x\n", pcmcia_intreq);
pcmcia_disable_irq(); /* to get rid of the sti() within ei_interrupt */
- ei_interrupt(irq, dev_id);
+ __ei_interrupt(irq, dev_id);
pcmcia_ack_int(pcmcia_get_intreq());
pcmcia_enable_irq();
return IRQ_HANDLED;
