iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

regmap: Rework regmap_mdio_c45_{read|write} for new C45 API.

Browse Source 
This reworks the regmap MDIO handling of C45 addresses in
 preparation for some forthcoming updates to the networking code.
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmPFY1EACgkQJNaLcl1U
 h9C1dQf9EbmqvfNnirOuRHFgdK0zXwvgmof6L2azbxvKbHi/mJ3BhG2fsAsBGFUA
 vdByizg2QxDzIOJh1D1eDYcON6pRthLZ/WC8W31EhXCrf5EyHYJyB1dY5qKJ6o6k
 Bj3h02dd2oDopc6xbAct4mN79wJ+uaJg/lpyalIQhCRM+csCmC3/hSQYQCXSwMY9
 2OGZH4s3NdX4LAMhVfk1CeaObDfdWOsyWWAiGkvcVq5Ht902Zt4+ZYd1SY6iO+tY
 jsK04gxcczsHdPpnZcn+H0MO+KZPHTtWESVEzH65eQqBAx+roHrCcN4kBuVAaWM9
 3YduZyiZQ82wtGbu6rbkc6CtmyVRfg==
 =JXdH
 -----END PGP SIGNATURE-----

Merge tag 'regmap-mdio-c45-rework' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap

Mark Brown says:

====================
regmap: Rework regmap_mdio_c45_{read|write} for new C45 API.

This reworks the regmap MDIO handling of C45 addresses in
preparation for some forthcoming updates to the networking code.

* tag 'regmap-mdio-c45-rework' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regmap: Rework regmap_mdio_c45_{read|write} for new C45 API.
====================

Link: https://lore.kernel.org/r/Y8VjkgcWHjR9TzNw@sirena.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski 2023-01-17 19:09:42 -08:00
commit 87a26f2bd6
2 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
drivers/base/regmap/regmap-mdio.c
View File

@ -10,33 +10,23 @@
/* 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_read(struct mdio_device *mdio_dev, u32 reg, unsigned int *val)
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_write(struct mdio_device *mdio_dev, u32 reg, unsigned int val)
{
return mdiodev_write(mdio_dev, reg, val);
}
static int regmap_mdio_c22_read(void *context, unsigned int reg, unsigned int *val)
{
struct mdio_device *mdio_dev = context;
if (unlikely(reg & ~REGNUM_C22_MASK))
return -ENXIO;
return regmap_mdio_read(mdio_dev, reg, val);
}
static int regmap_mdio_c22_write(void *context, unsigned int reg, unsigned int val)
{
struct mdio_device *mdio_dev = context;
@ -55,21 +45,36 @@ static const struct regmap_bus regmap_mdio_c22_bus = {
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;
return regmap_mdio_read(mdio_dev, MII_ADDR_C45 | reg, val);
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;
return regmap_mdio_write(mdio_dev, MII_ADDR_C45 | reg, val);
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 = {

8
include/linux/regmap.h
View File

@ -38,6 +38,14 @@ 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)
/* An enum of all the supported cache types */
enum regcache_type {
REGCACHE_NONE,