[PATCH 1/3] [net-next] w5100: remove MMIO support

[PATCH 1/3] [net-next] w5100: remove MMIO support

[Arnd Bergmann]

From: Arnd Bergmann <arnd@arndb.de>

This driver supports both SPI and MMIO based register access, but only
the former has devicetree support. While MMIO mode would have worked
with old-style board files, those have never defined such a device
upstream.

Remove the MMIO mode, leaving SPI as the only way to use this driver,
but leave it in two loadable modules. More cleanups can be done by
combining the two into one file.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/net/ethernet/wiznet/Kconfig  |  19 +-
 drivers/net/ethernet/wiznet/Makefile |   3 +-
 drivers/net/ethernet/wiznet/w5100.c  | 350 ---------------------------
 include/linux/platform_data/wiznet.h |  23 --
 4 files changed, 3 insertions(+), 392 deletions(-)
 delete mode 100644 include/linux/platform_data/wiznet.h

diff --git a/drivers/net/ethernet/wiznet/Kconfig b/drivers/net/ethernet/wiznet/Kconfig
index 4bac2ad2d6a1..67b3376b39c7 100644
--- a/drivers/net/ethernet/wiznet/Kconfig
+++ b/drivers/net/ethernet/wiznet/Kconfig
@@ -5,7 +5,6 @@
 
 config NET_VENDOR_WIZNET
 	bool "WIZnet devices"
-	depends on HAS_IOMEM
 	default y
 	help
 	  If you have a network (Ethernet) card belonging to this class, say Y.
@@ -18,8 +17,8 @@ config NET_VENDOR_WIZNET
 if NET_VENDOR_WIZNET
 
 config WIZNET_W5100
-	tristate "WIZnet W5100 Ethernet support"
-	depends on HAS_IOMEM
+	tristate "WIZnet W5100/W5200/W5500 Ethernet support for SPI mode"
+	depends on SPI
 	help
 	  Support for WIZnet W5100 chips.
 
@@ -70,18 +69,4 @@ config WIZNET_BUS_ANY
 	  Performance may decrease compared to explicitly selected bus mode.
 endchoice
 
-config WIZNET_W5100_SPI
-	tristate "WIZnet W5100/W5200/W5500 Ethernet support for SPI mode"
-	depends on WIZNET_BUS_ANY && WIZNET_W5100
-	depends on SPI
-	help
-	  In SPI mode host system accesses registers using SPI protocol
-	  (mode 0) on the SPI bus.
-
-	  Performance decreases compared to other bus interface mode.
-	  In W5100 SPI mode, burst READ/WRITE processing are not provided.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called w5100-spi.
-
 endif # NET_VENDOR_WIZNET
diff --git a/drivers/net/ethernet/wiznet/Makefile b/drivers/net/ethernet/wiznet/Makefile
index 78104f0bf415..a97fdcdf4632 100644
--- a/drivers/net/ethernet/wiznet/Makefile
+++ b/drivers/net/ethernet/wiznet/Makefile
@@ -1,4 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0-only
-obj-$(CONFIG_WIZNET_W5100) += w5100.o
-obj-$(CONFIG_WIZNET_W5100_SPI) += w5100-spi.o
+obj-$(CONFIG_WIZNET_W5100) += w5100.o w5100-spi.o
 obj-$(CONFIG_WIZNET_W5300) += w5300.o
diff --git a/drivers/net/ethernet/wiznet/w5100.c b/drivers/net/ethernet/wiznet/w5100.c
index c5424d882135..cfe6813ce805 100644
--- a/drivers/net/ethernet/wiznet/w5100.c
+++ b/drivers/net/ethernet/wiznet/w5100.c
@@ -11,7 +11,6 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/platform_device.h>
-#include <linux/platform_data/wiznet.h>
 #include <linux/ethtool.h>
 #include <linux/skbuff.h>
 #include <linux/types.h>
@@ -172,311 +171,6 @@ struct w5100_priv {
 	struct work_struct restart_work;
 };
 
-/************************************************************************
- *
- *  Lowlevel I/O functions
- *
- ***********************************************************************/
-
-struct w5100_mmio_priv {
-	void __iomem *base;
-	/* Serialize access in indirect address mode */
-	spinlock_t reg_lock;
-};
-
-static inline struct w5100_mmio_priv *w5100_mmio_priv(struct net_device *dev)
-{
-	return w5100_ops_priv(dev);
-}
-
-static inline void __iomem *w5100_mmio(struct net_device *ndev)
-{
-	struct w5100_mmio_priv *mmio_priv = w5100_mmio_priv(ndev);
-
-	return mmio_priv->base;
-}
-
-/*
- * In direct address mode host system can directly access W5100 registers
- * after mapping to Memory-Mapped I/O space.
- *
- * 0x8000 bytes are required for memory space.
- */
-static inline int w5100_read_direct(struct net_device *ndev, u32 addr)
-{
-	return ioread8(w5100_mmio(ndev) + (addr << CONFIG_WIZNET_BUS_SHIFT));
-}
-
-static inline int __w5100_write_direct(struct net_device *ndev, u32 addr,
-				       u8 data)
-{
-	iowrite8(data, w5100_mmio(ndev) + (addr << CONFIG_WIZNET_BUS_SHIFT));
-
-	return 0;
-}
-
-static inline int w5100_write_direct(struct net_device *ndev, u32 addr, u8 data)
-{
-	__w5100_write_direct(ndev, addr, data);
-
-	return 0;
-}
-
-static int w5100_read16_direct(struct net_device *ndev, u32 addr)
-{
-	u16 data;
-	data  = w5100_read_direct(ndev, addr) << 8;
-	data |= w5100_read_direct(ndev, addr + 1);
-	return data;
-}
-
-static int w5100_write16_direct(struct net_device *ndev, u32 addr, u16 data)
-{
-	__w5100_write_direct(ndev, addr, data >> 8);
-	__w5100_write_direct(ndev, addr + 1, data);
-
-	return 0;
-}
-
-static int w5100_readbulk_direct(struct net_device *ndev, u32 addr, u8 *buf,
-				 int len)
-{
-	int i;
-
-	for (i = 0; i < len; i++, addr++)
-		*buf++ = w5100_read_direct(ndev, addr);
-
-	return 0;
-}
-
-static int w5100_writebulk_direct(struct net_device *ndev, u32 addr,
-				  const u8 *buf, int len)
-{
-	int i;
-
-	for (i = 0; i < len; i++, addr++)
-		__w5100_write_direct(ndev, addr, *buf++);
-
-	return 0;
-}
-
-static int w5100_mmio_init(struct net_device *ndev)
-{
-	struct platform_device *pdev = to_platform_device(ndev->dev.parent);
-	struct w5100_mmio_priv *mmio_priv = w5100_mmio_priv(ndev);
-
-	spin_lock_init(&mmio_priv->reg_lock);
-
-	mmio_priv->base = devm_platform_get_and_ioremap_resource(pdev, 0, NULL);
-	if (IS_ERR(mmio_priv->base))
-		return PTR_ERR(mmio_priv->base);
-
-	return 0;
-}
-
-static const struct w5100_ops w5100_mmio_direct_ops = {
-	.chip_id = W5100,
-	.read = w5100_read_direct,
-	.write = w5100_write_direct,
-	.read16 = w5100_read16_direct,
-	.write16 = w5100_write16_direct,
-	.readbulk = w5100_readbulk_direct,
-	.writebulk = w5100_writebulk_direct,
-	.init = w5100_mmio_init,
-};
-
-/*
- * In indirect address mode host system indirectly accesses registers by
- * using Indirect Mode Address Register (IDM_AR) and Indirect Mode Data
- * Register (IDM_DR), which are directly mapped to Memory-Mapped I/O space.
- * Mode Register (MR) is directly accessible.
- *
- * Only 0x04 bytes are required for memory space.
- */
-#define W5100_IDM_AR		0x01   /* Indirect Mode Address Register */
-#define W5100_IDM_DR		0x03   /* Indirect Mode Data Register */
-
-static int w5100_read_indirect(struct net_device *ndev, u32 addr)
-{
-	struct w5100_mmio_priv *mmio_priv = w5100_mmio_priv(ndev);
-	unsigned long flags;
-	u8 data;
-
-	spin_lock_irqsave(&mmio_priv->reg_lock, flags);
-	w5100_write16_direct(ndev, W5100_IDM_AR, addr);
-	data = w5100_read_direct(ndev, W5100_IDM_DR);
-	spin_unlock_irqrestore(&mmio_priv->reg_lock, flags);
-
-	return data;
-}
-
-static int w5100_write_indirect(struct net_device *ndev, u32 addr, u8 data)
-{
-	struct w5100_mmio_priv *mmio_priv = w5100_mmio_priv(ndev);
-	unsigned long flags;
-
-	spin_lock_irqsave(&mmio_priv->reg_lock, flags);
-	w5100_write16_direct(ndev, W5100_IDM_AR, addr);
-	w5100_write_direct(ndev, W5100_IDM_DR, data);
-	spin_unlock_irqrestore(&mmio_priv->reg_lock, flags);
-
-	return 0;
-}
-
-static int w5100_read16_indirect(struct net_device *ndev, u32 addr)
-{
-	struct w5100_mmio_priv *mmio_priv = w5100_mmio_priv(ndev);
-	unsigned long flags;
-	u16 data;
-
-	spin_lock_irqsave(&mmio_priv->reg_lock, flags);
-	w5100_write16_direct(ndev, W5100_IDM_AR, addr);
-	data  = w5100_read_direct(ndev, W5100_IDM_DR) << 8;
-	data |= w5100_read_direct(ndev, W5100_IDM_DR);
-	spin_unlock_irqrestore(&mmio_priv->reg_lock, flags);
-
-	return data;
-}
-
-static int w5100_write16_indirect(struct net_device *ndev, u32 addr, u16 data)
-{
-	struct w5100_mmio_priv *mmio_priv = w5100_mmio_priv(ndev);
-	unsigned long flags;
-
-	spin_lock_irqsave(&mmio_priv->reg_lock, flags);
-	w5100_write16_direct(ndev, W5100_IDM_AR, addr);
-	__w5100_write_direct(ndev, W5100_IDM_DR, data >> 8);
-	w5100_write_direct(ndev, W5100_IDM_DR, data);
-	spin_unlock_irqrestore(&mmio_priv->reg_lock, flags);
-
-	return 0;
-}
-
-static int w5100_readbulk_indirect(struct net_device *ndev, u32 addr, u8 *buf,
-				   int len)
-{
-	struct w5100_mmio_priv *mmio_priv = w5100_mmio_priv(ndev);
-	unsigned long flags;
-	int i;
-
-	spin_lock_irqsave(&mmio_priv->reg_lock, flags);
-	w5100_write16_direct(ndev, W5100_IDM_AR, addr);
-
-	for (i = 0; i < len; i++)
-		*buf++ = w5100_read_direct(ndev, W5100_IDM_DR);
-
-	spin_unlock_irqrestore(&mmio_priv->reg_lock, flags);
-
-	return 0;
-}
-
-static int w5100_writebulk_indirect(struct net_device *ndev, u32 addr,
-				    const u8 *buf, int len)
-{
-	struct w5100_mmio_priv *mmio_priv = w5100_mmio_priv(ndev);
-	unsigned long flags;
-	int i;
-
-	spin_lock_irqsave(&mmio_priv->reg_lock, flags);
-	w5100_write16_direct(ndev, W5100_IDM_AR, addr);
-
-	for (i = 0; i < len; i++)
-		__w5100_write_direct(ndev, W5100_IDM_DR, *buf++);
-
-	spin_unlock_irqrestore(&mmio_priv->reg_lock, flags);
-
-	return 0;
-}
-
-static int w5100_reset_indirect(struct net_device *ndev)
-{
-	w5100_write_direct(ndev, W5100_MR, MR_RST);
-	mdelay(5);
-	w5100_write_direct(ndev, W5100_MR, MR_PB | MR_AI | MR_IND);
-
-	return 0;
-}
-
-static const struct w5100_ops w5100_mmio_indirect_ops = {
-	.chip_id = W5100,
-	.read = w5100_read_indirect,
-	.write = w5100_write_indirect,
-	.read16 = w5100_read16_indirect,
-	.write16 = w5100_write16_indirect,
-	.readbulk = w5100_readbulk_indirect,
-	.writebulk = w5100_writebulk_indirect,
-	.init = w5100_mmio_init,
-	.reset = w5100_reset_indirect,
-};
-
-#if defined(CONFIG_WIZNET_BUS_DIRECT)
-
-static int w5100_read(struct w5100_priv *priv, u32 addr)
-{
-	return w5100_read_direct(priv->ndev, addr);
-}
-
-static int w5100_write(struct w5100_priv *priv, u32 addr, u8 data)
-{
-	return w5100_write_direct(priv->ndev, addr, data);
-}
-
-static int w5100_read16(struct w5100_priv *priv, u32 addr)
-{
-	return w5100_read16_direct(priv->ndev, addr);
-}
-
-static int w5100_write16(struct w5100_priv *priv, u32 addr, u16 data)
-{
-	return w5100_write16_direct(priv->ndev, addr, data);
-}
-
-static int w5100_readbulk(struct w5100_priv *priv, u32 addr, u8 *buf, int len)
-{
-	return w5100_readbulk_direct(priv->ndev, addr, buf, len);
-}
-
-static int w5100_writebulk(struct w5100_priv *priv, u32 addr, const u8 *buf,
-			   int len)
-{
-	return w5100_writebulk_direct(priv->ndev, addr, buf, len);
-}
-
-#elif defined(CONFIG_WIZNET_BUS_INDIRECT)
-
-static int w5100_read(struct w5100_priv *priv, u32 addr)
-{
-	return w5100_read_indirect(priv->ndev, addr);
-}
-
-static int w5100_write(struct w5100_priv *priv, u32 addr, u8 data)
-{
-	return w5100_write_indirect(priv->ndev, addr, data);
-}
-
-static int w5100_read16(struct w5100_priv *priv, u32 addr)
-{
-	return w5100_read16_indirect(priv->ndev, addr);
-}
-
-static int w5100_write16(struct w5100_priv *priv, u32 addr, u16 data)
-{
-	return w5100_write16_indirect(priv->ndev, addr, data);
-}
-
-static int w5100_readbulk(struct w5100_priv *priv, u32 addr, u8 *buf, int len)
-{
-	return w5100_readbulk_indirect(priv->ndev, addr, buf, len);
-}
-
-static int w5100_writebulk(struct w5100_priv *priv, u32 addr, const u8 *buf,
-			   int len)
-{
-	return w5100_writebulk_indirect(priv->ndev, addr, buf, len);
-}
-
-#else /* CONFIG_WIZNET_BUS_ANY */
-
 static int w5100_read(struct w5100_priv *priv, u32 addr)
 {
 	return priv->ops->read(priv->ndev, addr);
@@ -508,8 +202,6 @@ static int w5100_writebulk(struct w5100_priv *priv, u32 addr, const u8 *buf,
 	return priv->ops->writebulk(priv->ndev, addr, buf, len);
 }
 
-#endif
-
 static int w5100_readbuf(struct w5100_priv *priv, u16 offset, u8 *buf, int len)
 {
 	u32 addr;
@@ -1035,38 +727,6 @@ static const struct net_device_ops w5100_netdev_ops = {
 	.ndo_validate_addr	= eth_validate_addr,
 };
 
-static int w5100_mmio_probe(struct platform_device *pdev)
-{
-	struct wiznet_platform_data *data = dev_get_platdata(&pdev->dev);
-	const void *mac_addr = NULL;
-	struct resource *mem;
-	const struct w5100_ops *ops;
-	int irq;
-
-	if (data && is_valid_ether_addr(data->mac_addr))
-		mac_addr = data->mac_addr;
-
-	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	if (!mem)
-		return -EINVAL;
-	if (resource_size(mem) < W5100_BUS_DIRECT_SIZE)
-		ops = &w5100_mmio_indirect_ops;
-	else
-		ops = &w5100_mmio_direct_ops;
-
-	irq = platform_get_irq(pdev, 0);
-	if (irq < 0)
-		return irq;
-
-	return w5100_probe(&pdev->dev, ops, sizeof(struct w5100_mmio_priv),
-			   mac_addr, irq, data ? data->link_gpio : -EINVAL);
-}
-
-static void w5100_mmio_remove(struct platform_device *pdev)
-{
-	w5100_remove(&pdev->dev);
-}
-
 void *w5100_ops_priv(const struct net_device *ndev)
 {
 	return netdev_priv(ndev) +
@@ -1264,13 +924,3 @@ static int w5100_resume(struct device *dev)
 
 SIMPLE_DEV_PM_OPS(w5100_pm_ops, w5100_suspend, w5100_resume);
 EXPORT_SYMBOL_GPL(w5100_pm_ops);
-
-static struct platform_driver w5100_mmio_driver = {
-	.driver		= {
-		.name	= DRV_NAME,
-		.pm	= &w5100_pm_ops,
-	},
-	.probe		= w5100_mmio_probe,
-	.remove		= w5100_mmio_remove,
-};
-module_platform_driver(w5100_mmio_driver);
diff --git a/include/linux/platform_data/wiznet.h b/include/linux/platform_data/wiznet.h
deleted file mode 100644
index 1154c4db8a13..000000000000
--- a/include/linux/platform_data/wiznet.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- * Ethernet driver for the WIZnet W5x00 chip.
- */
-
-#ifndef PLATFORM_DATA_WIZNET_H
-#define PLATFORM_DATA_WIZNET_H
-
-#include <linux/if_ether.h>
-
-struct wiznet_platform_data {
-	int	link_gpio;
-	u8	mac_addr[ETH_ALEN];
-};
-
-#ifndef CONFIG_WIZNET_BUS_SHIFT
-#define CONFIG_WIZNET_BUS_SHIFT 0
-#endif
-
-#define W5100_BUS_DIRECT_SIZE	(0x8000 << CONFIG_WIZNET_BUS_SHIFT)
-#define W5300_BUS_DIRECT_SIZE	(0x0400 << CONFIG_WIZNET_BUS_SHIFT)
-
-#endif /* PLATFORM_DATA_WIZNET_H */
-- 
2.39.5

[PATCH 2/3] [net-next]: w5300: remove unused driver

[Arnd Bergmann]

From: Arnd Bergmann <arnd@arndb.de>

Unlike w5100, this driver does not support SPI mode or devicetree
bindings, and is hence entirely unusable without third-party board
support patches that likely haven't existed for any recent kernel
version.

Remove the entire driver.

If anyone is in fact using it with their custom board files, they
can bring it back and include an earlier patch I sent to add
DT based probing for the GPIO lines.

Link: https://lore.kernel.org/all/20260427142924.2702598-1-arnd@kernel.org/
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/net/ethernet/wiznet/Kconfig  |  40 --
 drivers/net/ethernet/wiznet/Makefile |   1 -
 drivers/net/ethernet/wiznet/w5300.c  | 687 ---------------------------
 3 files changed, 728 deletions(-)
 delete mode 100644 drivers/net/ethernet/wiznet/w5300.c

diff --git a/drivers/net/ethernet/wiznet/Kconfig b/drivers/net/ethernet/wiznet/Kconfig
index 67b3376b39c7..bc83f6d389b1 100644
--- a/drivers/net/ethernet/wiznet/Kconfig
+++ b/drivers/net/ethernet/wiznet/Kconfig
@@ -29,44 +29,4 @@ config WIZNET_W5100
 	  To compile this driver as a module, choose M here: the module
 	  will be called w5100.
 
-config WIZNET_W5300
-	tristate "WIZnet W5300 Ethernet support"
-	depends on HAS_IOMEM
-	help
-	  Support for WIZnet W5300 chips.
-
-	  W5300 is a single chip with integrated 10/100 Ethernet MAC,
-	  PHY and hardware TCP/IP stack, but this driver is limited to
-	  the MAC and PHY functions only, onchip TCP/IP is unused.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called w5300.
-
-choice
-	prompt "WIZnet interface mode"
-	depends on WIZNET_W5100 || WIZNET_W5300
-	default WIZNET_BUS_ANY
-
-config WIZNET_BUS_DIRECT
-	bool "Direct address bus mode"
-	help
-	  In direct address mode host system can directly access all registers
-	  after mapping to Memory-Mapped I/O space.
-
-config WIZNET_BUS_INDIRECT
-	bool "Indirect address bus mode"
-	help
-	  In indirect address mode host system indirectly accesses registers
-	  using Indirect Mode Address Register and Indirect Mode Data Register,
-	  which are directly mapped to Memory-Mapped I/O space.
-
-config WIZNET_BUS_ANY
-	bool "Select interface mode in runtime"
-	help
-	  If interface mode is unknown in compile time, it can be selected
-	  in runtime from board/platform resources configuration.
-
-	  Performance may decrease compared to explicitly selected bus mode.
-endchoice
-
 endif # NET_VENDOR_WIZNET
diff --git a/drivers/net/ethernet/wiznet/Makefile b/drivers/net/ethernet/wiznet/Makefile
index a97fdcdf4632..502150d6ead2 100644
--- a/drivers/net/ethernet/wiznet/Makefile
+++ b/drivers/net/ethernet/wiznet/Makefile
@@ -1,3 +1,2 @@
 # SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_WIZNET_W5100) += w5100.o w5100-spi.o
-obj-$(CONFIG_WIZNET_W5300) += w5300.o
diff --git a/drivers/net/ethernet/wiznet/w5300.c b/drivers/net/ethernet/wiznet/w5300.c
deleted file mode 100644
index 3e711dea3b2c..000000000000
--- a/drivers/net/ethernet/wiznet/w5300.c
+++ /dev/null
@@ -1,687 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Ethernet driver for the WIZnet W5300 chip.
- *
- * Copyright (C) 2008-2009 WIZnet Co.,Ltd.
- * Copyright (C) 2011 Taehun Kim <kth3321 <at> gmail.com>
- * Copyright (C) 2012 Mike Sinkovsky <msink@permonline.ru>
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/platform_device.h>
-#include <linux/platform_data/wiznet.h>
-#include <linux/ethtool.h>
-#include <linux/skbuff.h>
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <linux/delay.h>
-#include <linux/slab.h>
-#include <linux/spinlock.h>
-#include <linux/io.h>
-#include <linux/ioport.h>
-#include <linux/interrupt.h>
-#include <linux/irq.h>
-#include <linux/gpio.h>
-
-#define DRV_NAME	"w5300"
-#define DRV_VERSION	"2012-04-04"
-
-MODULE_DESCRIPTION("WIZnet W5300 Ethernet driver v"DRV_VERSION);
-MODULE_AUTHOR("Mike Sinkovsky <msink@permonline.ru>");
-MODULE_ALIAS("platform:"DRV_NAME);
-MODULE_LICENSE("GPL");
-
-/*
- * Registers
- */
-#define W5300_MR		0x0000	/* Mode Register */
-#define   MR_DBW		  (1 << 15) /* Data bus width */
-#define   MR_MPF		  (1 << 14) /* Mac layer pause frame */
-#define   MR_WDF(n)		  (((n)&7)<<11) /* Write data fetch time */
-#define   MR_RDH		  (1 << 10) /* Read data hold time */
-#define   MR_FS			  (1 << 8)  /* FIFO swap */
-#define   MR_RST		  (1 << 7)  /* S/W reset */
-#define   MR_PB			  (1 << 4)  /* Ping block */
-#define   MR_DBS		  (1 << 2)  /* Data bus swap */
-#define   MR_IND		  (1 << 0)  /* Indirect mode */
-#define W5300_IR		0x0002	/* Interrupt Register */
-#define W5300_IMR		0x0004	/* Interrupt Mask Register */
-#define   IR_S0			  0x0001  /* S0 interrupt */
-#define W5300_SHARL		0x0008	/* Source MAC address (0123) */
-#define W5300_SHARH		0x000c	/* Source MAC address (45) */
-#define W5300_TMSRL		0x0020	/* Transmit Memory Size (0123) */
-#define W5300_TMSRH		0x0024	/* Transmit Memory Size (4567) */
-#define W5300_RMSRL		0x0028	/* Receive Memory Size (0123) */
-#define W5300_RMSRH		0x002c	/* Receive Memory Size (4567) */
-#define W5300_MTYPE		0x0030	/* Memory Type */
-#define W5300_IDR		0x00fe	/* Chip ID register */
-#define   IDR_W5300		  0x5300  /* =0x5300 for WIZnet W5300 */
-#define W5300_S0_MR		0x0200	/* S0 Mode Register */
-#define   S0_MR_CLOSED		  0x0000  /* Close mode */
-#define   S0_MR_MACRAW		  0x0004  /* MAC RAW mode (promiscuous) */
-#define   S0_MR_MACRAW_MF	  0x0044  /* MAC RAW mode (filtered) */
-#define W5300_S0_CR		0x0202	/* S0 Command Register */
-#define   S0_CR_OPEN		  0x0001  /* OPEN command */
-#define   S0_CR_CLOSE		  0x0010  /* CLOSE command */
-#define   S0_CR_SEND		  0x0020  /* SEND command */
-#define   S0_CR_RECV		  0x0040  /* RECV command */
-#define W5300_S0_IMR		0x0204	/* S0 Interrupt Mask Register */
-#define W5300_S0_IR		0x0206	/* S0 Interrupt Register */
-#define   S0_IR_RECV		  0x0004  /* Receive interrupt */
-#define   S0_IR_SENDOK		  0x0010  /* Send OK interrupt */
-#define W5300_S0_SSR		0x0208	/* S0 Socket Status Register */
-#define W5300_S0_TX_WRSR	0x0220	/* S0 TX Write Size Register */
-#define W5300_S0_TX_FSR		0x0224	/* S0 TX Free Size Register */
-#define W5300_S0_RX_RSR		0x0228	/* S0 Received data Size */
-#define W5300_S0_TX_FIFO	0x022e	/* S0 Transmit FIFO */
-#define W5300_S0_RX_FIFO	0x0230	/* S0 Receive FIFO */
-#define W5300_REGS_LEN		0x0400
-
-/*
- * Device driver private data structure
- */
-struct w5300_priv {
-	void __iomem *base;
-	spinlock_t reg_lock;
-	bool indirect;
-	u16  (*read) (struct w5300_priv *priv, u16 addr);
-	void (*write)(struct w5300_priv *priv, u16 addr, u16 data);
-	int irq;
-	int link_irq;
-	int link_gpio;
-
-	struct napi_struct napi;
-	struct net_device *ndev;
-	bool promisc;
-	u32 msg_enable;
-};
-
-/************************************************************************
- *
- *  Lowlevel I/O functions
- *
- ***********************************************************************/
-
-/*
- * In direct address mode host system can directly access W5300 registers
- * after mapping to Memory-Mapped I/O space.
- *
- * 0x400 bytes are required for memory space.
- */
-static inline u16 w5300_read_direct(struct w5300_priv *priv, u16 addr)
-{
-	return ioread16(priv->base + (addr << CONFIG_WIZNET_BUS_SHIFT));
-}
-
-static inline void w5300_write_direct(struct w5300_priv *priv,
-				      u16 addr, u16 data)
-{
-	iowrite16(data, priv->base + (addr << CONFIG_WIZNET_BUS_SHIFT));
-}
-
-/*
- * In indirect address mode host system indirectly accesses registers by
- * using Indirect Mode Address Register (IDM_AR) and Indirect Mode Data
- * Register (IDM_DR), which are directly mapped to Memory-Mapped I/O space.
- * Mode Register (MR) is directly accessible.
- *
- * Only 0x06 bytes are required for memory space.
- */
-#define W5300_IDM_AR		0x0002	 /* Indirect Mode Address */
-#define W5300_IDM_DR		0x0004	 /* Indirect Mode Data */
-
-static u16 w5300_read_indirect(struct w5300_priv *priv, u16 addr)
-{
-	unsigned long flags;
-	u16 data;
-
-	spin_lock_irqsave(&priv->reg_lock, flags);
-	w5300_write_direct(priv, W5300_IDM_AR, addr);
-	data = w5300_read_direct(priv, W5300_IDM_DR);
-	spin_unlock_irqrestore(&priv->reg_lock, flags);
-
-	return data;
-}
-
-static void w5300_write_indirect(struct w5300_priv *priv, u16 addr, u16 data)
-{
-	unsigned long flags;
-
-	spin_lock_irqsave(&priv->reg_lock, flags);
-	w5300_write_direct(priv, W5300_IDM_AR, addr);
-	w5300_write_direct(priv, W5300_IDM_DR, data);
-	spin_unlock_irqrestore(&priv->reg_lock, flags);
-}
-
-#if defined(CONFIG_WIZNET_BUS_DIRECT)
-#define w5300_read	w5300_read_direct
-#define w5300_write	w5300_write_direct
-
-#elif defined(CONFIG_WIZNET_BUS_INDIRECT)
-#define w5300_read	w5300_read_indirect
-#define w5300_write	w5300_write_indirect
-
-#else /* CONFIG_WIZNET_BUS_ANY */
-#define w5300_read	priv->read
-#define w5300_write	priv->write
-#endif
-
-static u32 w5300_read32(struct w5300_priv *priv, u16 addr)
-{
-	u32 data;
-	data  = w5300_read(priv, addr) << 16;
-	data |= w5300_read(priv, addr + 2);
-	return data;
-}
-
-static void w5300_write32(struct w5300_priv *priv, u16 addr, u32 data)
-{
-	w5300_write(priv, addr, data >> 16);
-	w5300_write(priv, addr + 2, data);
-}
-
-static int w5300_command(struct w5300_priv *priv, u16 cmd)
-{
-	unsigned long timeout = jiffies + msecs_to_jiffies(100);
-
-	w5300_write(priv, W5300_S0_CR, cmd);
-
-	while (w5300_read(priv, W5300_S0_CR) != 0) {
-		if (time_after(jiffies, timeout))
-			return -EIO;
-		cpu_relax();
-	}
-
-	return 0;
-}
-
-static void w5300_read_frame(struct w5300_priv *priv, u8 *buf, int len)
-{
-	u16 fifo;
-	int i;
-
-	for (i = 0; i < len; i += 2) {
-		fifo = w5300_read(priv, W5300_S0_RX_FIFO);
-		*buf++ = fifo >> 8;
-		*buf++ = fifo;
-	}
-	fifo = w5300_read(priv, W5300_S0_RX_FIFO);
-	fifo = w5300_read(priv, W5300_S0_RX_FIFO);
-}
-
-static void w5300_write_frame(struct w5300_priv *priv, u8 *buf, int len)
-{
-	u16 fifo;
-	int i;
-
-	for (i = 0; i < len; i += 2) {
-		fifo  = *buf++ << 8;
-		fifo |= *buf++;
-		w5300_write(priv, W5300_S0_TX_FIFO, fifo);
-	}
-	w5300_write32(priv, W5300_S0_TX_WRSR, len);
-}
-
-static void w5300_write_macaddr(struct w5300_priv *priv)
-{
-	struct net_device *ndev = priv->ndev;
-	w5300_write32(priv, W5300_SHARL,
-		      ndev->dev_addr[0] << 24 |
-		      ndev->dev_addr[1] << 16 |
-		      ndev->dev_addr[2] << 8 |
-		      ndev->dev_addr[3]);
-	w5300_write(priv, W5300_SHARH,
-		      ndev->dev_addr[4] << 8 |
-		      ndev->dev_addr[5]);
-}
-
-static void w5300_hw_reset(struct w5300_priv *priv)
-{
-	w5300_write_direct(priv, W5300_MR, MR_RST);
-	mdelay(5);
-	w5300_write_direct(priv, W5300_MR, priv->indirect ?
-				 MR_WDF(7) | MR_PB | MR_IND :
-				 MR_WDF(7) | MR_PB);
-	w5300_write(priv, W5300_IMR, 0);
-	w5300_write_macaddr(priv);
-
-	/* Configure 128K of internal memory
-	 * as 64K RX fifo and 64K TX fifo
-	 */
-	w5300_write32(priv, W5300_RMSRL, 64 << 24);
-	w5300_write32(priv, W5300_RMSRH, 0);
-	w5300_write32(priv, W5300_TMSRL, 64 << 24);
-	w5300_write32(priv, W5300_TMSRH, 0);
-	w5300_write(priv, W5300_MTYPE, 0x00ff);
-}
-
-static void w5300_hw_start(struct w5300_priv *priv)
-{
-	w5300_write(priv, W5300_S0_MR, priv->promisc ?
-			  S0_MR_MACRAW : S0_MR_MACRAW_MF);
-	w5300_command(priv, S0_CR_OPEN);
-	w5300_write(priv, W5300_S0_IMR, S0_IR_RECV | S0_IR_SENDOK);
-	w5300_write(priv, W5300_IMR, IR_S0);
-}
-
-static void w5300_hw_close(struct w5300_priv *priv)
-{
-	w5300_write(priv, W5300_IMR, 0);
-	w5300_command(priv, S0_CR_CLOSE);
-}
-
-/***********************************************************************
- *
- *   Device driver functions / callbacks
- *
- ***********************************************************************/
-
-static void w5300_get_drvinfo(struct net_device *ndev,
-			      struct ethtool_drvinfo *info)
-{
-	strscpy(info->driver, DRV_NAME, sizeof(info->driver));
-	strscpy(info->version, DRV_VERSION, sizeof(info->version));
-	strscpy(info->bus_info, dev_name(ndev->dev.parent),
-		sizeof(info->bus_info));
-}
-
-static u32 w5300_get_link(struct net_device *ndev)
-{
-	struct w5300_priv *priv = netdev_priv(ndev);
-
-	if (gpio_is_valid(priv->link_gpio))
-		return !!gpio_get_value(priv->link_gpio);
-
-	return 1;
-}
-
-static u32 w5300_get_msglevel(struct net_device *ndev)
-{
-	struct w5300_priv *priv = netdev_priv(ndev);
-
-	return priv->msg_enable;
-}
-
-static void w5300_set_msglevel(struct net_device *ndev, u32 value)
-{
-	struct w5300_priv *priv = netdev_priv(ndev);
-
-	priv->msg_enable = value;
-}
-
-static int w5300_get_regs_len(struct net_device *ndev)
-{
-	return W5300_REGS_LEN;
-}
-
-static void w5300_get_regs(struct net_device *ndev,
-			   struct ethtool_regs *regs, void *_buf)
-{
-	struct w5300_priv *priv = netdev_priv(ndev);
-	u8 *buf = _buf;
-	u16 addr;
-	u16 data;
-
-	regs->version = 1;
-	for (addr = 0; addr < W5300_REGS_LEN; addr += 2) {
-		switch (addr & 0x23f) {
-		case W5300_S0_TX_FIFO: /* cannot read TX_FIFO */
-		case W5300_S0_RX_FIFO: /* cannot read RX_FIFO */
-			data = 0xffff;
-			break;
-		default:
-			data = w5300_read(priv, addr);
-			break;
-		}
-		*buf++ = data >> 8;
-		*buf++ = data;
-	}
-}
-
-static void w5300_tx_timeout(struct net_device *ndev, unsigned int txqueue)
-{
-	struct w5300_priv *priv = netdev_priv(ndev);
-
-	netif_stop_queue(ndev);
-	w5300_hw_reset(priv);
-	w5300_hw_start(priv);
-	ndev->stats.tx_errors++;
-	netif_trans_update(ndev);
-	netif_wake_queue(ndev);
-}
-
-static netdev_tx_t w5300_start_tx(struct sk_buff *skb, struct net_device *ndev)
-{
-	struct w5300_priv *priv = netdev_priv(ndev);
-
-	netif_stop_queue(ndev);
-
-	w5300_write_frame(priv, skb->data, skb->len);
-	ndev->stats.tx_packets++;
-	ndev->stats.tx_bytes += skb->len;
-	dev_kfree_skb(skb);
-	netif_dbg(priv, tx_queued, ndev, "tx queued\n");
-
-	w5300_command(priv, S0_CR_SEND);
-
-	return NETDEV_TX_OK;
-}
-
-static int w5300_napi_poll(struct napi_struct *napi, int budget)
-{
-	struct w5300_priv *priv = container_of(napi, struct w5300_priv, napi);
-	struct net_device *ndev = priv->ndev;
-	struct sk_buff *skb;
-	int rx_count;
-	u16 rx_len;
-
-	for (rx_count = 0; rx_count < budget; rx_count++) {
-		u32 rx_fifo_len = w5300_read32(priv, W5300_S0_RX_RSR);
-		if (rx_fifo_len == 0)
-			break;
-
-		rx_len = w5300_read(priv, W5300_S0_RX_FIFO);
-
-		skb = netdev_alloc_skb_ip_align(ndev, roundup(rx_len, 2));
-		if (unlikely(!skb)) {
-			u32 i;
-			for (i = 0; i < rx_fifo_len; i += 2)
-				w5300_read(priv, W5300_S0_RX_FIFO);
-			ndev->stats.rx_dropped++;
-			return -ENOMEM;
-		}
-
-		skb_put(skb, rx_len);
-		w5300_read_frame(priv, skb->data, rx_len);
-		skb->protocol = eth_type_trans(skb, ndev);
-
-		netif_receive_skb(skb);
-		ndev->stats.rx_packets++;
-		ndev->stats.rx_bytes += rx_len;
-	}
-
-	if (rx_count < budget) {
-		napi_complete_done(napi, rx_count);
-		w5300_write(priv, W5300_IMR, IR_S0);
-	}
-
-	return rx_count;
-}
-
-static irqreturn_t w5300_interrupt(int irq, void *ndev_instance)
-{
-	struct net_device *ndev = ndev_instance;
-	struct w5300_priv *priv = netdev_priv(ndev);
-
-	int ir = w5300_read(priv, W5300_S0_IR);
-	if (!ir)
-		return IRQ_NONE;
-	w5300_write(priv, W5300_S0_IR, ir);
-
-	if (ir & S0_IR_SENDOK) {
-		netif_dbg(priv, tx_done, ndev, "tx done\n");
-		netif_wake_queue(ndev);
-	}
-
-	if (ir & S0_IR_RECV) {
-		if (napi_schedule_prep(&priv->napi)) {
-			w5300_write(priv, W5300_IMR, 0);
-			__napi_schedule(&priv->napi);
-		}
-	}
-
-	return IRQ_HANDLED;
-}
-
-static irqreturn_t w5300_detect_link(int irq, void *ndev_instance)
-{
-	struct net_device *ndev = ndev_instance;
-	struct w5300_priv *priv = netdev_priv(ndev);
-
-	if (netif_running(ndev)) {
-		if (gpio_get_value(priv->link_gpio) != 0) {
-			netif_info(priv, link, ndev, "link is up\n");
-			netif_carrier_on(ndev);
-		} else {
-			netif_info(priv, link, ndev, "link is down\n");
-			netif_carrier_off(ndev);
-		}
-	}
-
-	return IRQ_HANDLED;
-}
-
-static void w5300_set_rx_mode(struct net_device *ndev)
-{
-	struct w5300_priv *priv = netdev_priv(ndev);
-	bool set_promisc = (ndev->flags & IFF_PROMISC) != 0;
-
-	if (priv->promisc != set_promisc) {
-		priv->promisc = set_promisc;
-		w5300_hw_start(priv);
-	}
-}
-
-static int w5300_set_macaddr(struct net_device *ndev, void *addr)
-{
-	struct w5300_priv *priv = netdev_priv(ndev);
-	struct sockaddr *sock_addr = addr;
-
-	if (!is_valid_ether_addr(sock_addr->sa_data))
-		return -EADDRNOTAVAIL;
-	eth_hw_addr_set(ndev, sock_addr->sa_data);
-	w5300_write_macaddr(priv);
-	return 0;
-}
-
-static int w5300_open(struct net_device *ndev)
-{
-	struct w5300_priv *priv = netdev_priv(ndev);
-
-	netif_info(priv, ifup, ndev, "enabling\n");
-	w5300_hw_start(priv);
-	napi_enable(&priv->napi);
-	netif_start_queue(ndev);
-	if (!gpio_is_valid(priv->link_gpio) ||
-	    gpio_get_value(priv->link_gpio) != 0)
-		netif_carrier_on(ndev);
-	return 0;
-}
-
-static int w5300_stop(struct net_device *ndev)
-{
-	struct w5300_priv *priv = netdev_priv(ndev);
-
-	netif_info(priv, ifdown, ndev, "shutting down\n");
-	w5300_hw_close(priv);
-	netif_carrier_off(ndev);
-	netif_stop_queue(ndev);
-	napi_disable(&priv->napi);
-	return 0;
-}
-
-static const struct ethtool_ops w5300_ethtool_ops = {
-	.get_drvinfo		= w5300_get_drvinfo,
-	.get_msglevel		= w5300_get_msglevel,
-	.set_msglevel		= w5300_set_msglevel,
-	.get_link		= w5300_get_link,
-	.get_regs_len		= w5300_get_regs_len,
-	.get_regs		= w5300_get_regs,
-};
-
-static const struct net_device_ops w5300_netdev_ops = {
-	.ndo_open		= w5300_open,
-	.ndo_stop		= w5300_stop,
-	.ndo_start_xmit		= w5300_start_tx,
-	.ndo_tx_timeout		= w5300_tx_timeout,
-	.ndo_set_rx_mode	= w5300_set_rx_mode,
-	.ndo_set_mac_address	= w5300_set_macaddr,
-	.ndo_validate_addr	= eth_validate_addr,
-};
-
-static int w5300_hw_probe(struct platform_device *pdev)
-{
-	struct wiznet_platform_data *data = dev_get_platdata(&pdev->dev);
-	struct net_device *ndev = platform_get_drvdata(pdev);
-	struct w5300_priv *priv = netdev_priv(ndev);
-	const char *name = netdev_name(ndev);
-	struct resource *mem;
-	int mem_size;
-	int irq;
-	int ret;
-
-	if (data && is_valid_ether_addr(data->mac_addr)) {
-		eth_hw_addr_set(ndev, data->mac_addr);
-	} else {
-		eth_hw_addr_random(ndev);
-	}
-
-	priv->base = devm_platform_get_and_ioremap_resource(pdev, 0, &mem);
-	if (IS_ERR(priv->base))
-		return PTR_ERR(priv->base);
-
-	mem_size = resource_size(mem);
-
-	spin_lock_init(&priv->reg_lock);
-	priv->indirect = mem_size < W5300_BUS_DIRECT_SIZE;
-	if (priv->indirect) {
-		priv->read  = w5300_read_indirect;
-		priv->write = w5300_write_indirect;
-	} else {
-		priv->read  = w5300_read_direct;
-		priv->write = w5300_write_direct;
-	}
-
-	w5300_hw_reset(priv);
-	if (w5300_read(priv, W5300_IDR) != IDR_W5300)
-		return -ENODEV;
-
-	irq = platform_get_irq(pdev, 0);
-	if (irq < 0)
-		return irq;
-	ret = request_irq(irq, w5300_interrupt,
-			  IRQ_TYPE_LEVEL_LOW, name, ndev);
-	if (ret < 0)
-		return ret;
-	priv->irq = irq;
-
-	priv->link_gpio = data ? data->link_gpio : -EINVAL;
-	if (gpio_is_valid(priv->link_gpio)) {
-		char *link_name = devm_kzalloc(&pdev->dev, 16, GFP_KERNEL);
-		if (!link_name)
-			return -ENOMEM;
-		snprintf(link_name, 16, "%s-link", name);
-		priv->link_irq = gpio_to_irq(priv->link_gpio);
-		if (request_any_context_irq(priv->link_irq, w5300_detect_link,
-				IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
-				link_name, priv->ndev) < 0)
-			priv->link_gpio = -EINVAL;
-	}
-
-	netdev_info(ndev, "at 0x%llx irq %d\n", (u64)mem->start, irq);
-	return 0;
-}
-
-static int w5300_probe(struct platform_device *pdev)
-{
-	struct w5300_priv *priv;
-	struct net_device *ndev;
-	int err;
-
-	ndev = alloc_etherdev(sizeof(*priv));
-	if (!ndev)
-		return -ENOMEM;
-	SET_NETDEV_DEV(ndev, &pdev->dev);
-	platform_set_drvdata(pdev, ndev);
-	priv = netdev_priv(ndev);
-	priv->ndev = ndev;
-
-	ndev->netdev_ops = &w5300_netdev_ops;
-	ndev->ethtool_ops = &w5300_ethtool_ops;
-	ndev->watchdog_timeo = HZ;
-	netif_napi_add_weight(ndev, &priv->napi, w5300_napi_poll, 16);
-
-	/* This chip doesn't support VLAN packets with normal MTU,
-	 * so disable VLAN for this device.
-	 */
-	ndev->features |= NETIF_F_VLAN_CHALLENGED;
-
-	err = register_netdev(ndev);
-	if (err < 0)
-		goto err_register;
-
-	err = w5300_hw_probe(pdev);
-	if (err < 0)
-		goto err_hw_probe;
-
-	return 0;
-
-err_hw_probe:
-	unregister_netdev(ndev);
-err_register:
-	free_netdev(ndev);
-	return err;
-}
-
-static void w5300_remove(struct platform_device *pdev)
-{
-	struct net_device *ndev = platform_get_drvdata(pdev);
-	struct w5300_priv *priv = netdev_priv(ndev);
-
-	w5300_hw_reset(priv);
-	free_irq(priv->irq, ndev);
-	if (gpio_is_valid(priv->link_gpio))
-		free_irq(priv->link_irq, ndev);
-
-	unregister_netdev(ndev);
-	free_netdev(ndev);
-}
-
-#ifdef CONFIG_PM_SLEEP
-static int w5300_suspend(struct device *dev)
-{
-	struct net_device *ndev = dev_get_drvdata(dev);
-	struct w5300_priv *priv = netdev_priv(ndev);
-
-	if (netif_running(ndev)) {
-		netif_carrier_off(ndev);
-		netif_device_detach(ndev);
-
-		w5300_hw_close(priv);
-	}
-	return 0;
-}
-
-static int w5300_resume(struct device *dev)
-{
-	struct net_device *ndev = dev_get_drvdata(dev);
-	struct w5300_priv *priv = netdev_priv(ndev);
-
-	if (!netif_running(ndev)) {
-		w5300_hw_reset(priv);
-		w5300_hw_start(priv);
-
-		netif_device_attach(ndev);
-		if (!gpio_is_valid(priv->link_gpio) ||
-		    gpio_get_value(priv->link_gpio) != 0)
-			netif_carrier_on(ndev);
-	}
-	return 0;
-}
-#endif /* CONFIG_PM_SLEEP */
-
-static SIMPLE_DEV_PM_OPS(w5300_pm_ops, w5300_suspend, w5300_resume);
-
-static struct platform_driver w5300_driver = {
-	.driver		= {
-		.name	= DRV_NAME,
-		.pm	= &w5300_pm_ops,
-	},
-	.probe		= w5300_probe,
-	.remove		= w5300_remove,
-};
-
-module_platform_driver(w5300_driver);
-- 
2.39.5

[PATCH 3/3] [net-next v5] w5100: remove unused gpio link detection

[Arnd Bergmann]

From: Arnd Bergmann <arnd@arndb.de>

Since the platform_device support is now gone, nothing ever passes a
valid gpio number, and all the link state handling can go away.

An earlier version of my patch changed this to look up the GPIO descriptor
from devicetree and convert it all to the modern interface, but there
are no users of that binding at the moment.

Remove the gpio handling, which is now one of the last users of the
legacy gpio interface in platform-independent code.

Cc: Rob Herring <robh@kernel.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/all/20230127095839.3266452-1-arnd@kernel.org/
---
v5: rewrite to just remove gpio support
v4: rebase to 7.1
v3: include linux/gpio/consumer.h to avoid build failure without GPIOLIB
v2: replace CONFIG_WIZNET_BUS_SHIFT with a constant
---
 drivers/net/ethernet/wiznet/w5100-spi.c |  2 +-
 drivers/net/ethernet/wiznet/w5100.c     | 62 +------------------------
 drivers/net/ethernet/wiznet/w5100.h     |  3 +-
 3 files changed, 3 insertions(+), 64 deletions(-)

diff --git a/drivers/net/ethernet/wiznet/w5100-spi.c b/drivers/net/ethernet/wiznet/w5100-spi.c
index 990a3cce8c0f..d2c5e99ab9c7 100644
--- a/drivers/net/ethernet/wiznet/w5100-spi.c
+++ b/drivers/net/ethernet/wiznet/w5100-spi.c
@@ -450,7 +450,7 @@ static int w5100_spi_probe(struct spi_device *spi)
 		return -EINVAL;
 	}
 
-	return w5100_probe(&spi->dev, ops, priv_size, mac, spi->irq, -EINVAL);
+	return w5100_probe(&spi->dev, ops, priv_size, mac, spi->irq);
 }
 
 static void w5100_spi_remove(struct spi_device *spi)
diff --git a/drivers/net/ethernet/wiznet/w5100.c b/drivers/net/ethernet/wiznet/w5100.c
index cfe6813ce805..53d8dc642fbd 100644
--- a/drivers/net/ethernet/wiznet/w5100.c
+++ b/drivers/net/ethernet/wiznet/w5100.c
@@ -22,7 +22,6 @@
 #include <linux/ioport.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
-#include <linux/gpio.h>
 
 #include "w5100.h"
 
@@ -155,8 +154,6 @@ struct w5100_priv {
 	u16 s0_rx_buf_size;
 
 	int irq;
-	int link_irq;
-	int link_gpio;
 
 	struct napi_struct napi;
 	struct net_device *ndev;
@@ -417,16 +414,6 @@ static void w5100_get_drvinfo(struct net_device *ndev,
 		sizeof(info->bus_info));
 }
 
-static u32 w5100_get_link(struct net_device *ndev)
-{
-	struct w5100_priv *priv = netdev_priv(ndev);
-
-	if (gpio_is_valid(priv->link_gpio))
-		return !!gpio_get_value(priv->link_gpio);
-
-	return 1;
-}
-
 static u32 w5100_get_msglevel(struct net_device *ndev)
 {
 	struct w5100_priv *priv = netdev_priv(ndev);
@@ -629,24 +616,6 @@ static irqreturn_t w5100_interrupt(int irq, void *ndev_instance)
 	return IRQ_HANDLED;
 }
 
-static irqreturn_t w5100_detect_link(int irq, void *ndev_instance)
-{
-	struct net_device *ndev = ndev_instance;
-	struct w5100_priv *priv = netdev_priv(ndev);
-
-	if (netif_running(ndev)) {
-		if (gpio_get_value(priv->link_gpio) != 0) {
-			netif_info(priv, link, ndev, "link is up\n");
-			netif_carrier_on(ndev);
-		} else {
-			netif_info(priv, link, ndev, "link is down\n");
-			netif_carrier_off(ndev);
-		}
-	}
-
-	return IRQ_HANDLED;
-}
-
 static void w5100_setrx_work(struct work_struct *work)
 {
 	struct w5100_priv *priv = container_of(work, struct w5100_priv,
@@ -690,9 +659,6 @@ static int w5100_open(struct net_device *ndev)
 	w5100_hw_start(priv);
 	napi_enable(&priv->napi);
 	netif_start_queue(ndev);
-	if (!gpio_is_valid(priv->link_gpio) ||
-	    gpio_get_value(priv->link_gpio) != 0)
-		netif_carrier_on(ndev);
 	return 0;
 }
 
@@ -712,7 +678,6 @@ static const struct ethtool_ops w5100_ethtool_ops = {
 	.get_drvinfo		= w5100_get_drvinfo,
 	.get_msglevel		= w5100_get_msglevel,
 	.set_msglevel		= w5100_set_msglevel,
-	.get_link		= w5100_get_link,
 	.get_regs_len		= w5100_get_regs_len,
 	.get_regs		= w5100_get_regs,
 };
@@ -735,8 +700,7 @@ void *w5100_ops_priv(const struct net_device *ndev)
 EXPORT_SYMBOL_GPL(w5100_ops_priv);
 
 int w5100_probe(struct device *dev, const struct w5100_ops *ops,
-		int sizeof_ops_priv, const void *mac_addr, int irq,
-		int link_gpio)
+		int sizeof_ops_priv, const void *mac_addr, int irq)
 {
 	struct w5100_priv *priv;
 	struct net_device *ndev;
@@ -787,7 +751,6 @@ int w5100_probe(struct device *dev, const struct w5100_ops *ops,
 	priv->ndev = ndev;
 	priv->ops = ops;
 	priv->irq = irq;
-	priv->link_gpio = link_gpio;
 
 	ndev->netdev_ops = &w5100_netdev_ops;
 	ndev->ethtool_ops = &w5100_ethtool_ops;
@@ -840,26 +803,8 @@ int w5100_probe(struct device *dev, const struct w5100_ops *ops,
 	if (err)
 		goto err_hw;
 
-	if (gpio_is_valid(priv->link_gpio)) {
-		char *link_name = devm_kzalloc(dev, 16, GFP_KERNEL);
-
-		if (!link_name) {
-			err = -ENOMEM;
-			goto err_gpio;
-		}
-		snprintf(link_name, 16, "%s-link", netdev_name(ndev));
-		priv->link_irq = gpio_to_irq(priv->link_gpio);
-		if (request_any_context_irq(priv->link_irq, w5100_detect_link,
-					    IRQF_TRIGGER_RISING |
-					    IRQF_TRIGGER_FALLING,
-					    link_name, priv->ndev) < 0)
-			priv->link_gpio = -EINVAL;
-	}
-
 	return 0;
 
-err_gpio:
-	free_irq(priv->irq, ndev);
 err_hw:
 	destroy_workqueue(priv->xfer_wq);
 err_wq:
@@ -877,8 +822,6 @@ void w5100_remove(struct device *dev)
 
 	w5100_hw_reset(priv);
 	free_irq(priv->irq, ndev);
-	if (gpio_is_valid(priv->link_gpio))
-		free_irq(priv->link_irq, ndev);
 
 	flush_work(&priv->setrx_work);
 	flush_work(&priv->restart_work);
@@ -914,9 +857,6 @@ static int w5100_resume(struct device *dev)
 		w5100_hw_start(priv);
 
 		netif_device_attach(ndev);
-		if (!gpio_is_valid(priv->link_gpio) ||
-		    gpio_get_value(priv->link_gpio) != 0)
-			netif_carrier_on(ndev);
 	}
 	return 0;
 }
diff --git a/drivers/net/ethernet/wiznet/w5100.h b/drivers/net/ethernet/wiznet/w5100.h
index 481af3b6d9e8..76e1b8149041 100644
--- a/drivers/net/ethernet/wiznet/w5100.h
+++ b/drivers/net/ethernet/wiznet/w5100.h
@@ -29,8 +29,7 @@ struct w5100_ops {
 void *w5100_ops_priv(const struct net_device *ndev);
 
 int w5100_probe(struct device *dev, const struct w5100_ops *ops,
-		int sizeof_ops_priv, const void *mac_addr, int irq,
-		int link_gpio);
+		int sizeof_ops_priv, const void *mac_addr, int irq);
 void w5100_remove(struct device *dev);
 
 extern const struct dev_pm_ops w5100_pm_ops;
-- 
2.39.5

Re: [PATCH 1/3] [net-next] w5100: remove MMIO support

[patchwork-bot+netdevbpf]

Hello:

This series was applied to netdev/net-next.git (main)
by Jakub Kicinski <kuba@kernel.org>:

On Tue,  5 May 2026 20:04:57 +0200 you wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> This driver supports both SPI and MMIO based register access, but only
> the former has devicetree support. While MMIO mode would have worked
> with old-style board files, those have never defined such a device
> upstream.
> 
> [...]

Here is the summary with links:
  - [1/3,net-next] w5100: remove MMIO support
    https://git.kernel.org/netdev/net-next/c/5e138e0ec32b
  - [2/3,net-next] : w5300: remove unused driver
    https://git.kernel.org/netdev/net-next/c/68edebbd0e7d
  - [3/3,net-next,v5] w5100: remove unused gpio link detection
    https://git.kernel.org/netdev/net-next/c/dacf281771a9

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html