From: Charles Keepax <ckeepax@opensource.cirrus.com>
To: lee@kernel.org
Cc: linux-sound@vger.kernel.org, mfd@lists.linux.dev,
linux-kernel@vger.kernel.org, patches@opensource.cirrus.com
Subject: [PATCH] mfd: cs42l43: Stop using legacy SoundWire IRQ callback
Date: Fri, 20 Nov 2026 13:56:26 +0000 [thread overview]
Message-ID: <20261120135626.2004361-1-ckeepax@opensource.cirrus.com> (raw)
When removing the cs42l43 driver on SoundWire the core will warn of
too many retries on the SoundWire alert. This is caused by the use
of the legacy SoundWire IRQ callback to clear INT_STAT_GEN1. This
implementation defined SoundWire alert bit is used to tie the cs42l43
internal interrupts into the SoundWire alert mechanism. However,
the legacy SoundWire IRQ callback is gated by the probed flag inside
the core and that is cleared before the driver's remove callback
is called. This means that any IRQs triggered during the driver
remove process will not clear INT_STAT_GEN1 leading to the device
being stuck in the alert state until it is removed from the bus.
To fix this issue handling is moved to the regmap IRQ handle_post_irq
callback which ensures that INT_STAT_GEN1 will be cleared right up
until the IRQ itself is cleaned up.
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
---
drivers/mfd/cs42l43-sdw.c | 9 ++++++---
drivers/mfd/cs42l43.c | 22 ++++++++--------------
2 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/drivers/mfd/cs42l43-sdw.c b/drivers/mfd/cs42l43-sdw.c
index cd0132e3632be..72833333b73ca 100644
--- a/drivers/mfd/cs42l43-sdw.c
+++ b/drivers/mfd/cs42l43-sdw.c
@@ -112,9 +112,11 @@ static int cs42l43_sdw_update_status(struct sdw_slave *sdw, enum sdw_slave_statu
return 0;
}
-static int cs42l43_sdw_interrupt(struct sdw_slave *sdw,
- struct sdw_slave_intr_status *status)
+static int cs42l43_sdw_interrupt(void *data)
{
+ struct cs42l43 *cs42l43 = data;
+ struct sdw_slave *sdw = cs42l43->sdw;
+
/*
* The IRQ itself was handled through the regmap_irq handler, this is
* just clearing up the additional Cirrus SoundWire registers that are
@@ -155,7 +157,6 @@ static int cs42l43_sdw_bus_config(struct sdw_slave *sdw,
static const struct sdw_slave_ops cs42l43_sdw_ops = {
.read_prop = cs42l43_read_prop,
.update_status = cs42l43_sdw_update_status,
- .interrupt_callback = cs42l43_sdw_interrupt,
.bus_config = cs42l43_sdw_bus_config,
};
@@ -172,6 +173,8 @@ static int cs42l43_sdw_probe(struct sdw_slave *sdw, const struct sdw_device_id *
cs42l43->sdw = sdw;
cs42l43->variant_id = (long)id->driver_data;
+ cs42l43->irq_chip.handle_post_irq = cs42l43_sdw_interrupt;
+
cs42l43->regmap = devm_regmap_init_sdw(sdw, &cs42l43_sdw_regmap);
if (IS_ERR(cs42l43->regmap))
return dev_err_probe(cs42l43->dev, PTR_ERR(cs42l43->regmap),
diff --git a/drivers/mfd/cs42l43.c b/drivers/mfd/cs42l43.c
index a83b62064dae6..d36628e8dc279 100644
--- a/drivers/mfd/cs42l43.c
+++ b/drivers/mfd/cs42l43.c
@@ -515,19 +515,6 @@ static const struct regmap_irq cs42l43_regmap_irqs[] = {
CS42L43_IRQ_REG(HP_LOADDET_DONE, HPOUT),
};
-static const struct regmap_irq_chip cs42l43_irq_chip = {
- .name = "cs42l43",
-
- .status_base = CS42L43_DECIM_INT,
- .mask_base = CS42L43_DECIM_MASK,
- .num_regs = 16,
-
- .irqs = cs42l43_regmap_irqs,
- .num_irqs = ARRAY_SIZE(cs42l43_regmap_irqs),
-
- .runtime_pm = true,
-};
-
static const char * const cs42l43_core_supplies[] = {
"vdd-a", "vdd-io", "vdd-cp",
};
@@ -917,7 +904,14 @@ static int cs42l43_irq_config(struct cs42l43 *cs42l43)
if (cs42l43->sdw)
cs42l43->irq = cs42l43->sdw->irq;
- cs42l43->irq_chip = cs42l43_irq_chip;
+ /* Manually fill so extra settings from bus are preserved */
+ cs42l43->irq_chip.name = "cs42l43",
+ cs42l43->irq_chip.status_base = CS42L43_DECIM_INT,
+ cs42l43->irq_chip.mask_base = CS42L43_DECIM_MASK,
+ cs42l43->irq_chip.num_regs = 16,
+ cs42l43->irq_chip.irqs = cs42l43_regmap_irqs,
+ cs42l43->irq_chip.num_irqs = ARRAY_SIZE(cs42l43_regmap_irqs),
+ cs42l43->irq_chip.runtime_pm = true,
cs42l43->irq_chip.irq_drv_data = cs42l43;
irq_data = irq_get_irq_data(cs42l43->irq);
--
2.47.3
reply other threads:[~2026-11-20 13:56 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261120135626.2004361-1-ckeepax@opensource.cirrus.com \
--to=ckeepax@opensource.cirrus.com \
--cc=lee@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=mfd@lists.linux.dev \
--cc=patches@opensource.cirrus.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®