mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-30 06:10:56 +00:00
Code Issues Releases Wiki Activity

regmap: mdio: Clean up invalid clause-22 addresses

Browse source 
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>
This commit is contained in:
Sander Vanheule 2021-06-03 20:25:09 +02:00 committed by Mark Brown
parent bcd23f93d3
commit dff404deb8
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/base/regmap/regmap-mdio.c
View file

@ -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 = {