diff options
| author | Sander Vanheule <sander@svanheule.net> | 2021-06-03 21:25:09 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-06-08 15:37:42 +0300 |
| commit | dff404deb8493e6154ad75a62ce7c4e37ff8fccd (patch) | |
| tree | fea5ed0f2acaec8ff44603a8fc8d165ad3bb3fbe /drivers/base | |
| parent | bcd23f93d3984a94d64ce0b6bbfa3789c0e8ebaf (diff) | |
| download | linux-dff404deb8493e6154ad75a62ce7c4e37ff8fccd.tar.xz | |
regmap: mdio: Clean up invalid clause-22 addresses
Currently a regmap configuration for regmap-mdio must have a register
address width of 5 bits (cf. clause-22 register access). This is not
enforced on the provided register addresses, which would enable
clause-45 MDIO bus access, if the right bit packing is used.
Prevent clause-45 access, and other invalid addresses, by masking the
provided register address.
Signed-off-by: Sander Vanheule <sander@svanheule.net>
Link: https://lore.kernel.org/r/f7013f67e6d6ff56ec98660f18320f6ffcc1a777.1622743333.git.sander@svanheule.net
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/regmap/regmap-mdio.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/base/regmap/regmap-mdio.c b/drivers/base/regmap/regmap-mdio.c index 5ec208279913..aee34bf2400e 100644 --- a/drivers/base/regmap/regmap-mdio.c +++ b/drivers/base/regmap/regmap-mdio.c @@ -5,16 +5,19 @@ #include <linux/module.h> #include <linux/regmap.h> +#define REGVAL_MASK GENMASK(15, 0) +#define REGNUM_C22_MASK GENMASK(4, 0) + static int regmap_mdio_read(void *context, unsigned int reg, unsigned int *val) { struct mdio_device *mdio_dev = context; int ret; - ret = mdiobus_read(mdio_dev->bus, mdio_dev->addr, reg); + ret = mdiobus_read(mdio_dev->bus, mdio_dev->addr, reg & REGNUM_C22_MASK); if (ret < 0) return ret; - *val = ret & 0xffff; + *val = ret & REGVAL_MASK; return 0; } @@ -22,7 +25,7 @@ static int regmap_mdio_write(void *context, unsigned int reg, unsigned int val) { struct mdio_device *mdio_dev = context; - return mdiobus_write(mdio_dev->bus, mdio_dev->addr, reg, val); + return mdiobus_write(mdio_dev->bus, mdio_dev->addr, reg & REGNUM_C22_MASK, val); } static const struct regmap_bus regmap_mdio_bus = { |