AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

regmap-irq: Fix a bug in regmap_irq_enable() for type_in_mask chips

Browse Source 
[ Upstream commit 485037ae9a095491beb7f893c909a76cc4f9d1e7 ]

When enabling a type_in_mask irq, the type_buf contents must be
AND'd with the mask of the IRQ we're enabling to avoid enabling
other IRQs by accident, which can happen if several type_in_mask
irqs share a mask register.

Fixes: bc998a7303 ("regmap: irq: handle HW using separate rising/falling edge interrupts")
Signed-off-by: Aidan MacDonald <aidanmacdonald.0x0@gmail.com>
Link: https://lore.kernel.org/r/20220620200644.1961936-2-aidanmacdonald.0x0@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Aidan MacDonald 2022-06-20 21:05:56 +01:00 committed by Greg Kroah-Hartman
parent 40b3815b2c
commit 7d7450363f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/base/regmap/regmap-irq.c
View File

@ -220,6 +220,7 @@ static void regmap_irq_enable(struct irq_data *data)
struct regmap_irq_chip_data *d = irq_data_get_irq_chip_data(data); struct regmap_irq_chip_data *d = irq_data_get_irq_chip_data(data);
struct regmap *map = d->map; struct regmap *map = d->map;
const struct regmap_irq *irq_data = irq_to_regmap_irq(d, data->hwirq); const struct regmap_irq *irq_data = irq_to_regmap_irq(d, data->hwirq);
unsigned int reg = irq_data->reg_offset / map->reg_stride;
unsigned int mask, type; unsigned int mask, type;
type = irq_data->type.type_falling_val | irq_data->type.type_rising_val; type = irq_data->type.type_falling_val | irq_data->type.type_rising_val;
@ -236,14 +237,14 @@ static void regmap_irq_enable(struct irq_data *data)
* at the corresponding offset in regmap_irq_set_type(). * at the corresponding offset in regmap_irq_set_type().
*/ */
if (d->chip->type_in_mask && type) if (d->chip->type_in_mask && type)
mask = d->type_buf[irq_data->reg_offset / map->reg_stride]; mask = d->type_buf[reg] & irq_data->mask;
else else
mask = irq_data->mask; mask = irq_data->mask;
if (d->chip->clear_on_unmask) if (d->chip->clear_on_unmask)
d->clear_status = true; d->clear_status = true;
d->mask_buf[irq_data->reg_offset / map->reg_stride] &= ~mask; d->mask_buf[reg] &= ~mask;
} }
static void regmap_irq_disable(struct irq_data *data) static void regmap_irq_disable(struct irq_data *data)