regmap: irq: Add support to clear ack registers
Subsystems (2)
PATCH v2 1/1 regmap: irq: Add support to clear ack registers
In reply to a message not in the archive<diff in v1 to v2 , addressed formatting and simplified logic >
For particular codec HWs have requirement to
toggle interrupt clear register twice 0->1->0.
To accommodate it, need to add one more field
(clear_ack) in the regmap_irq struct and update
regmap-irq driver to support it.
--- drivers/base/regmap/regmap-irq.c | 33 ++++++++++++++++++++++++++++++++- include/linux/regmap.h | 2 ++ 2 files changed, 34 insertions(+), 1 deletion(-)
drivers/base/regmap/regmap-irq.c +32 -1
@@ -168,6 +168,14 @@ static void regmap_irq_sync_unlock(struct irq_data *data) ret =regmap_write (map, reg, ~d->mask_buf[i]); else ret =regmap_write (map, reg, d->mask_buf[i]); +if (d->chip->clear_ack) { +if (d->chip->ack_invert && !ret) + ret =regmap_write (map, reg, + d->mask_buf[i]); +else if (!ret) + ret =regmap_write (map, reg, + ~d->mask_buf[i]); + }if (ret !=0 )dev_err (d->map->dev,"Failed to ack 0x%x: %d\n" , reg, ret);
@@ -493,7 +501,20 @@ static irqreturn_t regmap_irq_thread(int irq, void *d)if (data->status_buf[i] && (chip->ack_base || chip->use_ack)) { reg = chip->ack_base + (i * map->reg_stride * data->irq_reg_stride); - ret =regmap_write (map, reg, data->status_buf[i]); +if (chip->ack_invert) + ret =regmap_write (map, reg, + ~data->status_buf[i]); +else + ret =regmap_write (map, reg, + data->status_buf[i]); +if (chip->clear_ack) { +if (chip->ack_invert && !ret) + ret =regmap_write (map, reg, + data->status_buf[i]); +else if (!ret) + ret =regmap_write (map, reg, + ~data->status_buf[i]); + }if (ret !=0 )dev_err (map->dev,"Failed to ack 0x%x: %d\n" , reg, ret);
@@ -722,6 +743,16 @@ int regmap_add_irq_chip_fwnode(struct fwnode_handle *fwnode,else ret =regmap_write (map, reg, d->status_buf[i] & d->mask_buf[i]); +if (chip->clear_ack) { +if (chip->ack_invert && !ret) + ret =regmap_write (map, reg, + (d->status_buf[i] & + d->mask_buf[i])); +else if (!ret) + ret =regmap_write (map, reg, + ~(d->status_buf[i] & + d->mask_buf[i])); + }if (ret !=0 ) {dev_err (map->dev,"Failed to ack 0x%x: %d\n" , reg, ret);
include/linux/regmap.h +2 -0
@@ -1305,6 +1305,7 @@ struct regmap_irq_sub_irq_map {* @mask_invert: Inverted mask register: cleared bits are masked out. * @use_ack: Use @ack register even if it is zero. * @ack_invert: Inverted ack register: cleared bits for ack. +* @clear_ack: Use this to set 1 and 0 or vice-versa to clear interrupts. * @wake_invert: Inverted wake register: cleared bits are wake enabled. * @type_invert: Invert the type flags. * @type_in_mask: Use the mask registers for controlling irq type. For
@@ -1353,6 +1354,7 @@ struct regmap_irq_chip { bool mask_invert:1; bool use_ack:1; bool ack_invert:1; + bool clear_ack:1; bool wake_invert:1; bool runtime_pm:1; bool type_invert:1;
--
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc., is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
From 822d819c8d538b0323709eefc41e88d062b349ee Mon Sep 17 00:00:00 2001
From: Laxminath Kasam <[email protected]>
Date: Wed, 23 Sep 2020 18:42:36 +0530
Subject: [PATCH v2] regmap: irq: Add support to clear ack registers
For particular codec HWs have requirement to
toggle interrupt clear register twice 0->1->0.
To accommodate it, need to add one more field
(clear_ack) in the regmap_irq struct and update
regmap-irq driver to support it.
--- drivers/base/regmap/regmap-irq.c | 33 ++++++++++++++++++++++++++++++++- include/linux/regmap.h | 2 ++ 2 files changed, 34 insertions(+), 1 deletion(-)
drivers/base/regmap/regmap-irq.c +32 -1
@@ -168,6 +168,14 @@ static void regmap_irq_sync_unlock(struct irq_data *data) ret =regmap_write (map, reg, ~d->mask_buf[i]); else ret =regmap_write (map, reg, d->mask_buf[i]); +if (d->chip->clear_ack) { +if (d->chip->ack_invert && !ret) + ret =regmap_write (map, reg, + d->mask_buf[i]); +else if (!ret) + ret =regmap_write (map, reg, + ~d->mask_buf[i]); + }if (ret !=0 )dev_err (d->map->dev,"Failed to ack 0x%x: %d\n" , reg, ret);
@@ -493,7 +501,20 @@ static irqreturn_t regmap_irq_thread(int irq, void *d)if (data->status_buf[i] && (chip->ack_base || chip->use_ack)) { reg = chip->ack_base + (i * map->reg_stride * data->irq_reg_stride); - ret =regmap_write (map, reg, data->status_buf[i]); +if (chip->ack_invert) + ret =regmap_write (map, reg, + ~data->status_buf[i]); +else + ret =regmap_write (map, reg, + data->status_buf[i]); +if (chip->clear_ack) { +if (chip->ack_invert && !ret) + ret =regmap_write (map, reg, + data->status_buf[i]); +else if (!ret) + ret =regmap_write (map, reg, + ~data->status_buf[i]); + }if (ret !=0 )dev_err (map->dev,"Failed to ack 0x%x: %d\n" , reg, ret);
@@ -722,6 +743,16 @@ int regmap_add_irq_chip_fwnode(struct fwnode_handle *fwnode,else ret =regmap_write (map, reg, d->status_buf[i] & d->mask_buf[i]); +if (chip->clear_ack) { +if (chip->ack_invert && !ret) + ret =regmap_write (map, reg, + (d->status_buf[i] & + d->mask_buf[i])); +else if (!ret) + ret =regmap_write (map, reg, + ~(d->status_buf[i] & + d->mask_buf[i])); + }if (ret !=0 ) {dev_err (map->dev,"Failed to ack 0x%x: %d\n" , reg, ret);
include/linux/regmap.h +2 -0
@@ -1305,6 +1305,7 @@ struct regmap_irq_sub_irq_map {* @mask_invert: Inverted mask register: cleared bits are masked out. * @use_ack: Use @ack register even if it is zero. * @ack_invert: Inverted ack register: cleared bits for ack. +* @clear_ack: Use this to set 1 and 0 or vice-versa to clear interrupts. * @wake_invert: Inverted wake register: cleared bits are wake enabled. * @type_invert: Invert the type flags. * @type_in_mask: Use the mask registers for controlling irq type. For
@@ -1353,6 +1354,7 @@ struct regmap_irq_chip { bool mask_invert:1; bool use_ack:1; bool ack_invert:1; + bool clear_ack:1; bool wake_invert:1; bool runtime_pm:1; bool type_invert:1;
Signature · 2 lines
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc., is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
Greg KH
maintainerQuoted 1 line · On Mon, Oct 05, 2020 at 05:55:27PM +0530, [email protected] wrote:
<diff in v1 to v2 , addressed formatting and simplified logic >
That goes below the --- line, as the documentation says, right?
And this whole thing was attached, twice, why? Can't you use 'git send-email'?
Quoted 5 lines
For particular codec HWs have requirement to toggle interrupt clear register twice 0->1->0. To accommodate it, need to add one more field (
clear_ack) in theregmap_irqstruct and update regmap-irq driver to support it.
Nit, we have 72 columns to fill, might as well use it :)
thanks,
greg k-h
Quoted 7 lines · Greg KH
Quoted 1 line · On Mon, Oct 05, 2020 at 05:55:27PM +0530, [email protected] wrote:
<diff in v1 to v2 , addressed formatting and simplified logic >
That goes below the --- line, as the documentation says, right?
And this whole thing was attached, twice, why? Can't you use 'git send-email'?
Sure, will fix it and send via git mail option, also will update below commit text to use upto 72 columns.
Quoted 11 lines
Quoted 5 lines
For particular codec HWs have requirement to toggle interrupt clear register twice 0->1->0. To accommodate it, need to add one more field (
clear_ack) in theregmap_irqstruct and update regmap-irq driver to support it.Nit, we have 72 columns to fill, might as well use it :)
thanks,
greg k-h