LinuxLists.cc - [PATCH v3 0/2] Drop map from handle_mask

2023-03-20 14:52:37

Subject: [PATCH v3 0/2] Drop map from handle_mask_sync() parameters

Changes in v3:
- Inline dio48gpio->map usage in dio48e_handle_mask_sync() to avoid
redefining map parameter

Remove the map parameter from the struct regmap_irq_chip callback
handle_mask_sync() because it can be passed via the irq_drv_data
parameter instead. The gpio-104-dio-48e driver is the only consumer of
this callback and is thus updated accordingly.

A couple pending patchsets also utilize handle_mask_sync() [0][1], so
it'll be useful to merge the changes in this series first to avoid
subsequent noise adjusting the dependent drivers.

[0] https://lore.kernel.org/r/[email protected]/
[1] https://lore.kernel.org/r/[email protected]/

William Breathitt Gray (2):
gpio: 104-dio-48e: Implement struct dio48e_gpio
regmap-irq: Drop map from handle_mask_sync() parameters

drivers/base/regmap/regmap-irq.c | 5 ++---
drivers/gpio/gpio-104-dio-48e.c | 37 +++++++++++++++++++++-----------
include/linux/regmap.h | 3 +--
3 files changed, 28 insertions(+), 17 deletions(-)

base-commit: 03810031c91dfe448cd116ee987d5dc4139006f4
--
2.39.2

2023-03-20 14:52:40

by William Breathitt Gray

[permalink] [raw]

Subject: [PATCH v3 1/2] gpio: 104-dio-48e: Implement struct dio48e_gpio

A private data structure struct dio48e_gpio is introduced to facilitate
passage of the regmap and IRQ mask state for the device to the callback
dio48e_handle_mask_sync(). This is in preparation for the removal of the
handle_mask_sync() map parameter in a subsequent patch.

Signed-off-by: William Breathitt Gray <[email protected]>
---
Changes in v3:
- Inline dio48gpio->map usage in dio48e_handle_mask_sync() to avoid
redefining map parameter

drivers/gpio/gpio-104-dio-48e.c | 35 ++++++++++++++++++++++-----------
1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/drivers/gpio/gpio-104-dio-48e.c b/drivers/gpio/gpio-104-dio-48e.c
index 74e2721f2613..3516321c92b0 100644
--- a/drivers/gpio/gpio-104-dio-48e.c
+++ b/drivers/gpio/gpio-104-dio-48e.c
@@ -99,13 +99,23 @@ static const struct regmap_irq dio48e_regmap_irqs[] = {
DIO48E_REGMAP_IRQ(0), DIO48E_REGMAP_IRQ(1),
};

+/**
+ * struct dio48e_gpio - GPIO device private data structure
+ * @map: Regmap for the device
+ * @irq_mask: Current IRQ mask state on the device
+ */
+struct dio48e_gpio {
+ struct regmap *map;
+ unsigned int irq_mask;
+};
+
static int dio48e_handle_mask_sync(struct regmap *const map, const int index,
const unsigned int mask_buf_def,
const unsigned int mask_buf,
void *const irq_drv_data)
{
- unsigned int *const irq_mask = irq_drv_data;
- const unsigned int prev_mask = *irq_mask;
+ struct dio48e_gpio *const dio48egpio = irq_drv_data;
+ const unsigned int prev_mask = dio48egpio->irq_mask;
int err;
unsigned int val;

@@ -114,19 +124,19 @@ static int dio48e_handle_mask_sync(struct regmap *const map, const int index,
return 0;

/* remember the current mask for the next mask sync */
- *irq_mask = mask_buf;
+ dio48egpio->irq_mask = mask_buf;

/* if all previously masked, enable interrupts when unmasking */
if (prev_mask == mask_buf_def) {
- err = regmap_write(map, DIO48E_CLEAR_INTERRUPT, 0x00);
+ err = regmap_write(dio48egpio->map, DIO48E_CLEAR_INTERRUPT, 0x00);
if (err)
return err;
- return regmap_write(map, DIO48E_ENABLE_INTERRUPT, 0x00);
+ return regmap_write(dio48egpio->map, DIO48E_ENABLE_INTERRUPT, 0x00);
}

/* if all are currently masked, disable interrupts */
if (mask_buf == mask_buf_def)
- return regmap_read(map, DIO48E_DISABLE_INTERRUPT, &val);
+ return regmap_read(dio48egpio->map, DIO48E_DISABLE_INTERRUPT, &val);

return 0;
}
@@ -167,7 +177,7 @@ static int dio48e_probe(struct device *dev, unsigned int id)
struct regmap *map;
int err;
struct regmap_irq_chip *chip;
- unsigned int irq_mask;
+ struct dio48e_gpio *dio48egpio;
struct regmap_irq_chip_data *chip_data;

if (!devm_request_region(dev, base[id], DIO48E_EXTENT, name)) {
@@ -185,12 +195,14 @@ static int dio48e_probe(struct device *dev, unsigned int id)
return dev_err_probe(dev, PTR_ERR(map),
"Unable to initialize register map\n");

- chip = devm_kzalloc(dev, sizeof(*chip), GFP_KERNEL);
- if (!chip)
+ dio48egpio = devm_kzalloc(dev, sizeof(*dio48egpio), GFP_KERNEL);
+ if (!dio48egpio)
return -ENOMEM;

- chip->irq_drv_data = devm_kzalloc(dev, sizeof(irq_mask), GFP_KERNEL);
- if (!chip->irq_drv_data)
+ dio48egpio->map = map;
+
+ chip = devm_kzalloc(dev, sizeof(*chip), GFP_KERNEL);
+ if (!chip)
return -ENOMEM;

chip->name = name;
@@ -205,6 +217,7 @@ static int dio48e_probe(struct device *dev, unsigned int id)
chip->irqs = dio48e_regmap_irqs;
chip->num_irqs = ARRAY_SIZE(dio48e_regmap_irqs);
chip->handle_mask_sync = dio48e_handle_mask_sync;
+ chip->irq_drv_data = dio48egpio;

/* Initialize to prevent spurious interrupts before we're ready */
err = dio48e_irq_init_hw(map);
--
2.39.2

2023-03-20 14:52:43

by William Breathitt Gray

[permalink] [raw]

Subject: [PATCH v3 2/2] regmap-irq: Drop map from handle_mask_sync() parameters

Remove the map parameter from the struct regmap_irq_chip callback
handle_mask_sync() because it can be passed via the irq_drv_data
parameter instead. The gpio-104-dio-48e driver is the only consumer of
this callback and is thus updated accordingly.

Reviewed-by: Linus Walleij <[email protected]>
Signed-off-by: William Breathitt Gray <[email protected]>
---
drivers/base/regmap/regmap-irq.c | 5 ++---
drivers/gpio/gpio-104-dio-48e.c | 2 +-
include/linux/regmap.h | 3 +--
3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/base/regmap/regmap-irq.c b/drivers/base/regmap/regmap-irq.c
index 8c903b8c9714..a9337192ddd3 100644
--- a/drivers/base/regmap/regmap-irq.c
+++ b/drivers/base/regmap/regmap-irq.c
@@ -116,8 +116,7 @@ static void regmap_irq_sync_unlock(struct irq_data *data)
for (i = 0; i < d->chip->num_regs; i++) {
if (d->mask_base) {
if (d->chip->handle_mask_sync)
- d->chip->handle_mask_sync(d->map, i,
- d->mask_buf_def[i],
+ d->chip->handle_mask_sync(i, d->mask_buf_def[i],
d->mask_buf[i],
d->chip->irq_drv_data);
else {
@@ -915,7 +914,7 @@ int regmap_add_irq_chip_fwnode(struct fwnode_handle *fwnode,

if (d->mask_base) {
if (chip->handle_mask_sync) {
- ret = chip->handle_mask_sync(d->map, i,
+ ret = chip->handle_mask_sync(i,
d->mask_buf_def[i],
d->mask_buf[i],
chip->irq_drv_data);
diff --git a/drivers/gpio/gpio-104-dio-48e.c b/drivers/gpio/gpio-104-dio-48e.c
index 3516321c92b0..509864d36940 100644
--- a/drivers/gpio/gpio-104-dio-48e.c
+++ b/drivers/gpio/gpio-104-dio-48e.c
@@ -109,7 +109,7 @@ struct dio48e_gpio {
unsigned int irq_mask;
};

-static int dio48e_handle_mask_sync(struct regmap *const map, const int index,
+static int dio48e_handle_mask_sync(const int index,
const unsigned int mask_buf_def,
const unsigned int mask_buf,
void *const irq_drv_data)
diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index 4d10790adeb0..6e18d8b405b1 100644
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -1644,8 +1644,7 @@ struct regmap_irq_chip {

int (*handle_pre_irq)(void *irq_drv_data);
int (*handle_post_irq)(void *irq_drv_data);
- int (*handle_mask_sync)(struct regmap *map, int index,
- unsigned int mask_buf_def,
+ int (*handle_mask_sync)(int index, unsigned int mask_buf_def,
unsigned int mask_buf, void *irq_drv_data);
int (*set_type_virt)(unsigned int **buf, unsigned int type,
unsigned long hwirq, int reg);
--
2.39.2

2023-03-20 15:41:45

by Andy Shevchenko

[permalink] [raw]

Subject: Re: [PATCH v3 0/2] Drop map from handle_mask_sync() parameters

On Mon, Mar 20, 2023 at 10:50:14AM -0400, William Breathitt Gray wrote:
> Changes in v3:
> - Inline dio48gpio->map usage in dio48e_handle_mask_sync() to avoid
> redefining map parameter
>
> Remove the map parameter from the struct regmap_irq_chip callback
> handle_mask_sync() because it can be passed via the irq_drv_data
> parameter instead. The gpio-104-dio-48e driver is the only consumer of
> this callback and is thus updated accordingly.
>
> A couple pending patchsets also utilize handle_mask_sync() [0][1], so
> it'll be useful to merge the changes in this series first to avoid
> subsequent noise adjusting the dependent drivers.

Reviewed-by: Andy Shevchenko <[email protected]>

I believe this should go to the immutable branch somewhere, so GPIO and regmap
subsystems can pull from.

> [0] https://lore.kernel.org/r/[email protected]/
> [1] https://lore.kernel.org/r/[email protected]/
>
> William Breathitt Gray (2):
> gpio: 104-dio-48e: Implement struct dio48e_gpio
> regmap-irq: Drop map from handle_mask_sync() parameters
>
> drivers/base/regmap/regmap-irq.c | 5 ++---
> drivers/gpio/gpio-104-dio-48e.c | 37 +++++++++++++++++++++-----------
> include/linux/regmap.h | 3 +--
> 3 files changed, 28 insertions(+), 17 deletions(-)
>
>
> base-commit: 03810031c91dfe448cd116ee987d5dc4139006f4
> --
> 2.39.2
>

--
With Best Regards,
Andy Shevchenko

2023-03-22 17:04:14

by Bartosz Golaszewski

On Tue, Apr 11, 2023 at 11:35 PM William Breathitt Gray
<[email protected]> wrote:
> On Tue, Apr 11, 2023 at 10:15:54PM +0100, Mark Brown wrote:
> > On Tue, Apr 11, 2023 at 02:36:23PM -0400, William Breathitt Gray wrote:
> > > On Tue, Apr 11, 2023 at 09:23:55PM +0100, Mark Brown wrote:
> > > > On Mon, Mar 20, 2023 at 10:50:15AM -0400, William Breathitt Gray wrote:
> > > > > A private data structure struct dio48e_gpio is introduced to facilitate
> > > > > passage of the regmap and IRQ mask state for the device to the callback
> > > > > dio48e_handle_mask_sync(). This is in preparation for the removal of the
> > > > > handle_mask_sync() map parameter in a subsequent patch.
> >
> > > > What's the story with this patch?
> >
> > > Currently dio48e_handle_mask_sync() uses the map argument in its
> > > implementation. Once the map parameter is removed, the current
> > > implementation of dio48e_handle_mask_sync() will no longer build, so we
> > > must adjust the implementation to no longer depend on map.
> >
> > I mean what's the story with getting this patch applied? It doesn't
> > seem to have been reviewed...
>
> I'm sorry, I forgot to add Linus' tag from v2 [0]. Linus, would you
> confirm you're still okay with this patch?

Oh of course.
Reviewed-by: Linus Walleij <[email protected]>

Yours,
Linus Walleij