| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <c5452c26-f947-4b0c-928d-13ba8d133a43@gmail.com>
Date: Tue, 6 May 2025 22:06:00 +0200
From: Heiner Kallweit <hkallweit1@...il.com>
To: Mark Brown <broonie@...nel.org>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
"Rafael J. Wysocki" <rafael@...nel.org>, Danilo Krummrich <dakr@...nel.org>,
Andrew Lunn <andrew@...n.ch>
Cc: "netdev@...r.kernel.org" <netdev@...r.kernel.org>,
Sander Vanheule <sander@...nheule.net>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: [PATCH] regmap: remove MDIO support
MDIO regmap support was added with 1f89d2fe1607 as only patch from a
series. The rest of the series wasn't applied. Therefore MDIO regmap
has never had a user.
Link: https://lore.kernel.org/all/cover.1621279162.git.sander@svanheule.net/
Signed-off-by: Heiner Kallweit <hkallweit1@...il.com>
---
drivers/base/regmap/Kconfig | 6 +-
drivers/base/regmap/Makefile | 1 -
drivers/base/regmap/regmap-mdio.c | 121 ------------------------------
include/linux/regmap.h | 44 -----------
4 files changed, 1 insertion(+), 171 deletions(-)
delete mode 100644 drivers/base/regmap/regmap-mdio.c
diff --git a/drivers/base/regmap/Kconfig b/drivers/base/regmap/Kconfig
index b1affac70..8ae3271cb 100644
--- a/drivers/base/regmap/Kconfig
+++ b/drivers/base/regmap/Kconfig
@@ -5,9 +5,8 @@
config REGMAP
bool
- default y if (REGMAP_I2C || REGMAP_SPI || REGMAP_SPMI || REGMAP_W1 || REGMAP_AC97 || REGMAP_MMIO || REGMAP_IRQ || REGMAP_SOUNDWIRE || REGMAP_SOUNDWIRE_MBQ || REGMAP_SCCB || REGMAP_I3C || REGMAP_SPI_AVMM || REGMAP_MDIO || REGMAP_FSI)
+ default y if (REGMAP_I2C || REGMAP_SPI || REGMAP_SPMI || REGMAP_W1 || REGMAP_AC97 || REGMAP_MMIO || REGMAP_IRQ || REGMAP_SOUNDWIRE || REGMAP_SOUNDWIRE_MBQ || REGMAP_SCCB || REGMAP_I3C || REGMAP_SPI_AVMM || REGMAP_FSI)
select IRQ_DOMAIN if REGMAP_IRQ
- select MDIO_BUS if REGMAP_MDIO
help
Enable support for the Register Map (regmap) access API.
@@ -56,9 +55,6 @@ config REGMAP_W1
tristate
depends on W1
-config REGMAP_MDIO
- tristate
-
config REGMAP_MMIO
tristate
diff --git a/drivers/base/regmap/Makefile b/drivers/base/regmap/Makefile
index 5fdd0845b..f47d5a2a7 100644
--- a/drivers/base/regmap/Makefile
+++ b/drivers/base/regmap/Makefile
@@ -20,5 +20,4 @@ obj-$(CONFIG_REGMAP_SOUNDWIRE_MBQ) += regmap-sdw-mbq.o
obj-$(CONFIG_REGMAP_SCCB) += regmap-sccb.o
obj-$(CONFIG_REGMAP_I3C) += regmap-i3c.o
obj-$(CONFIG_REGMAP_SPI_AVMM) += regmap-spi-avmm.o
-obj-$(CONFIG_REGMAP_MDIO) += regmap-mdio.o
obj-$(CONFIG_REGMAP_FSI) += regmap-fsi.o
diff --git a/drivers/base/regmap/regmap-mdio.c b/drivers/base/regmap/regmap-mdio.c
deleted file mode 100644
index 9573bf3b5..000000000
--- a/drivers/base/regmap/regmap-mdio.c
+++ /dev/null
@@ -1,121 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-
-#include <linux/errno.h>
-#include <linux/mdio.h>
-#include <linux/module.h>
-#include <linux/regmap.h>
-
-#define REGVAL_MASK GENMASK(15, 0)
-#define REGNUM_C22_MASK GENMASK(4, 0)
-/* Clause-45 mask includes the device type (5 bit) and actual register number (16 bit) */
-#define REGNUM_C45_MASK GENMASK(20, 0)
-
-static int regmap_mdio_c22_read(void *context, unsigned int reg, unsigned int *val)
-{
- struct mdio_device *mdio_dev = context;
- int ret;
-
- if (unlikely(reg & ~REGNUM_C22_MASK))
- return -ENXIO;
-
- ret = mdiodev_read(mdio_dev, reg);
- if (ret < 0)
- return ret;
-
- *val = ret & REGVAL_MASK;
-
- return 0;
-}
-
-static int regmap_mdio_c22_write(void *context, unsigned int reg, unsigned int val)
-{
- struct mdio_device *mdio_dev = context;
-
- if (unlikely(reg & ~REGNUM_C22_MASK))
- return -ENXIO;
-
- return mdiodev_write(mdio_dev, reg, val);
-}
-
-static const struct regmap_bus regmap_mdio_c22_bus = {
- .reg_write = regmap_mdio_c22_write,
- .reg_read = regmap_mdio_c22_read,
-};
-
-static int regmap_mdio_c45_read(void *context, unsigned int reg, unsigned int *val)
-{
- struct mdio_device *mdio_dev = context;
- unsigned int devad;
- int ret;
-
- if (unlikely(reg & ~REGNUM_C45_MASK))
- return -ENXIO;
-
- devad = reg >> REGMAP_MDIO_C45_DEVAD_SHIFT;
- reg = reg & REGMAP_MDIO_C45_REGNUM_MASK;
-
- ret = mdiodev_c45_read(mdio_dev, devad, reg);
- if (ret < 0)
- return ret;
-
- *val = ret & REGVAL_MASK;
-
- return 0;
-}
-
-static int regmap_mdio_c45_write(void *context, unsigned int reg, unsigned int val)
-{
- struct mdio_device *mdio_dev = context;
- unsigned int devad;
-
- if (unlikely(reg & ~REGNUM_C45_MASK))
- return -ENXIO;
-
- devad = reg >> REGMAP_MDIO_C45_DEVAD_SHIFT;
- reg = reg & REGMAP_MDIO_C45_REGNUM_MASK;
-
- return mdiodev_c45_write(mdio_dev, devad, reg, val);
-}
-
-static const struct regmap_bus regmap_mdio_c45_bus = {
- .reg_write = regmap_mdio_c45_write,
- .reg_read = regmap_mdio_c45_read,
-};
-
-struct regmap *__regmap_init_mdio(struct mdio_device *mdio_dev,
- const struct regmap_config *config, struct lock_class_key *lock_key,
- const char *lock_name)
-{
- const struct regmap_bus *bus;
-
- if (config->reg_bits == 5 && config->val_bits == 16)
- bus = ®map_mdio_c22_bus;
- else if (config->reg_bits == 21 && config->val_bits == 16)
- bus = ®map_mdio_c45_bus;
- else
- return ERR_PTR(-EOPNOTSUPP);
-
- return __regmap_init(&mdio_dev->dev, bus, mdio_dev, config, lock_key, lock_name);
-}
-EXPORT_SYMBOL_GPL(__regmap_init_mdio);
-
-struct regmap *__devm_regmap_init_mdio(struct mdio_device *mdio_dev,
- const struct regmap_config *config, struct lock_class_key *lock_key,
- const char *lock_name)
-{
- const struct regmap_bus *bus;
-
- if (config->reg_bits == 5 && config->val_bits == 16)
- bus = ®map_mdio_c22_bus;
- else if (config->reg_bits == 21 && config->val_bits == 16)
- bus = ®map_mdio_c45_bus;
- else
- return ERR_PTR(-EOPNOTSUPP);
-
- return __devm_regmap_init(&mdio_dev->dev, bus, mdio_dev, config, lock_key, lock_name);
-}
-EXPORT_SYMBOL_GPL(__devm_regmap_init_mdio);
-
-MODULE_AUTHOR("Sander Vanheule <sander@...nheule.net>");
-MODULE_DESCRIPTION("regmap MDIO Module");
-MODULE_LICENSE("GPL v2");
diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index d17c5ea3d..c1058499e 100644
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -28,7 +28,6 @@ struct fsi_device;
struct i2c_client;
struct i3c_device;
struct irq_domain;
-struct mdio_device;
struct slim_device;
struct spi_device;
struct spmi_device;
@@ -38,14 +37,6 @@ struct regmap_field;
struct snd_ac97;
struct sdw_slave;
-/*
- * regmap_mdio address encoding. IEEE 802.3ae clause 45 addresses consist of a
- * device address and a register address.
- */
-#define REGMAP_MDIO_C45_DEVAD_SHIFT 16
-#define REGMAP_MDIO_C45_DEVAD_MASK GENMASK(20, 16)
-#define REGMAP_MDIO_C45_REGNUM_MASK GENMASK(15, 0)
-
/*
* regmap.reg_shift indicates by how much we must shift registers prior to
* performing any operation. It's a signed value, positive numbers means
@@ -635,10 +626,6 @@ struct regmap *__regmap_init_i2c(struct i2c_client *i2c,
const struct regmap_config *config,
struct lock_class_key *lock_key,
const char *lock_name);
-struct regmap *__regmap_init_mdio(struct mdio_device *mdio_dev,
- const struct regmap_config *config,
- struct lock_class_key *lock_key,
- const char *lock_name);
struct regmap *__regmap_init_sccb(struct i2c_client *i2c,
const struct regmap_config *config,
struct lock_class_key *lock_key,
@@ -700,10 +687,6 @@ struct regmap *__devm_regmap_init_i2c(struct i2c_client *i2c,
const struct regmap_config *config,
struct lock_class_key *lock_key,
const char *lock_name);
-struct regmap *__devm_regmap_init_mdio(struct mdio_device *mdio_dev,
- const struct regmap_config *config,
- struct lock_class_key *lock_key,
- const char *lock_name);
struct regmap *__devm_regmap_init_sccb(struct i2c_client *i2c,
const struct regmap_config *config,
struct lock_class_key *lock_key,
@@ -813,19 +796,6 @@ int regmap_attach_dev(struct device *dev, struct regmap *map,
__regmap_lockdep_wrapper(__regmap_init_i2c, #config, \
i2c, config)
-/**
- * regmap_init_mdio() - Initialise register map
- *
- * @mdio_dev: Device that will be interacted with
- * @config: Configuration for register map
- *
- * The return value will be an ERR_PTR() on error or a valid pointer to
- * a struct regmap.
- */
-#define regmap_init_mdio(mdio_dev, config) \
- __regmap_lockdep_wrapper(__regmap_init_mdio, #config, \
- mdio_dev, config)
-
/**
* regmap_init_sccb() - Initialise register map
*
@@ -1045,20 +1015,6 @@ bool regmap_ac97_default_volatile(struct device *dev, unsigned int reg);
__regmap_lockdep_wrapper(__devm_regmap_init_i2c, #config, \
i2c, config)
-/**
- * devm_regmap_init_mdio() - Initialise managed register map
- *
- * @mdio_dev: Device that will be interacted with
- * @config: Configuration for register map
- *
- * The return value will be an ERR_PTR() on error or a valid pointer
- * to a struct regmap. The regmap will be automatically freed by the
- * device management code.
- */
-#define devm_regmap_init_mdio(mdio_dev, config) \
- __regmap_lockdep_wrapper(__devm_regmap_init_mdio, #config, \
- mdio_dev, config)
-
/**
* devm_regmap_init_sccb() - Initialise managed register map
*
--
2.49.0
Powered by blists - more mailing lists