Now that we use regmap for the KSZ9477 driver, we can make the register map available for introspection as a device file. As the KSZ driver has a separate regmap for each of the three access sizes, we add a new regmap_multi_register_cdev abstraction that multiplexes device file access to the regmap with the best matching alignment. Signed-off-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx> --- drivers/base/regmap/Makefile | 1 + drivers/base/regmap/regmap-multi.c | 81 ++++++++++++++++++++++++++++++ drivers/net/ksz9477.c | 6 ++- include/regmap.h | 2 + 4 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 drivers/base/regmap/regmap-multi.c diff --git a/drivers/base/regmap/Makefile b/drivers/base/regmap/Makefile index d99db4277149..fe5beaaaa382 100644 --- a/drivers/base/regmap/Makefile +++ b/drivers/base/regmap/Makefile @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only obj-y += regmap.o +obj-y += regmap-multi.o obj-y += regmap-mmio.o obj-$(CONFIG_REGMAP_FORMATTED) += regmap-fmt.o obj-$(CONFIG_I2C) += regmap-i2c.o diff --git a/drivers/base/regmap/regmap-multi.c b/drivers/base/regmap/regmap-multi.c new file mode 100644 index 000000000000..79dd1ba9bd95 --- /dev/null +++ b/drivers/base/regmap/regmap-multi.c @@ -0,0 +1,81 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright 2022 Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx> + */ + +#include <common.h> +#include <regmap.h> +#include <linux/export.h> + +#include "internal.h" + +enum { MULTI_MAP_8, MULTI_MAP_16, MULTI_MAP_32, MULTI_MAP_COUNT }; +struct regmap_multi { + struct cdev cdev; + struct regmap *map[MULTI_MAP_COUNT]; +}; + +static struct regmap *regmap_multi_cdev_get_map(struct cdev *cdev, size_t count) +{ + struct regmap_multi *multi = container_of(cdev, struct regmap_multi, cdev); + struct regmap *map = NULL; + + if (count % 4 == 0) + map = multi->map[MULTI_MAP_32]; + if (!map && count % 2 == 0) + map = multi->map[MULTI_MAP_16]; + return map ?: multi->map[MULTI_MAP_8]; +} + +static ssize_t regmap_multi_cdev_read(struct cdev *cdev, void *buf, size_t count, + loff_t offset, unsigned long flags) +{ + struct regmap *map = regmap_multi_cdev_get_map(cdev, count); + + return regmap_bulk_read(map, offset, buf, count) ?: count; +} + +static ssize_t regmap_multi_cdev_write(struct cdev *cdev, const void *buf, size_t count, + loff_t offset, unsigned long flags) +{ + struct regmap *map = regmap_multi_cdev_get_map(cdev, count); + + return regmap_bulk_write(map, offset, buf, count) ?: count; +} + +static struct cdev_operations regmap_multi_fops = { + .read = regmap_multi_cdev_read, + .write = regmap_multi_cdev_write, +}; + +int regmap_multi_register_cdev(struct regmap *maps[3]) +{ + struct regmap_multi *multi; + struct cdev *cdev; + int i; + + multi = xzalloc(sizeof(*multi)); + cdev = &multi->cdev; + + cdev->ops = ®map_multi_fops; + cdev->size = LLONG_MAX; + + for (i = 0; i < MULTI_MAP_COUNT; i++) { + struct regmap *map = maps[i]; + if (!map) + continue; + + multi->map[i] = map; + cdev->size = min_t(loff_t, regmap_size_bytes(map), cdev->size); + cdev->dev = cdev->dev ?: map->dev; + } + + if (!cdev->dev) { + free(multi); + return -EINVAL; + } + + cdev->name = xstrdup(dev_name(cdev->dev)); + + return devfs_create(cdev); +} diff --git a/drivers/net/ksz9477.c b/drivers/net/ksz9477.c index a980735e8e3a..93ce0dab813b 100644 --- a/drivers/net/ksz9477.c +++ b/drivers/net/ksz9477.c @@ -450,7 +450,11 @@ static int microchip_switch_probe(struct device *dev) ksz_default_setup(priv); - return dsa_register_switch(ds); + ret = dsa_register_switch(ds); + if (ret) + return ret; + + return regmap_multi_register_cdev(priv->regmap); } static const struct of_device_id microchip_switch_dt_ids[] = { diff --git a/include/regmap.h b/include/regmap.h index 986ed391ab28..76e648a5d73f 100644 --- a/include/regmap.h +++ b/include/regmap.h @@ -175,6 +175,8 @@ struct device *regmap_get_device(struct regmap *map); int regmap_register_cdev(struct regmap *map, const char *name); +int regmap_multi_register_cdev(struct regmap *map[3]); + int regmap_write(struct regmap *map, unsigned int reg, unsigned int val); int regmap_read(struct regmap *map, unsigned int reg, unsigned int *val); -- 2.30.2