From: Richard Fitzgerald <rf@opensource.cirrus.com>
To: broonie@kernel.org
Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org,
patches@opensource.cirrus.com
Subject: [PATCH 4/4] ASoC: cs35l56: Add test that probe() doesn't write SDW mux registers
Date: Fri, 20 Nov 2026 11:04:41 +0000 [thread overview]
Message-ID: <20261120110441.2163567-5-rf@opensource.cirrus.com> (raw)
In-Reply-To: <20261120110441.2163567-1-rf@opensource.cirrus.com>
The driver cannot assume that it owns control of the
CS35L56_SWIRE_DP3_CH?_INPUT registers so it must not do anything
during probe() or component_probe() that could result in a write
to these registers. Add a test case for this.
Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
---
sound/soc/codecs/cs35l56-test.c | 84 +++++++++++++++++++++++++++++++++
1 file changed, 84 insertions(+)
diff --git a/sound/soc/codecs/cs35l56-test.c b/sound/soc/codecs/cs35l56-test.c
index b422d19ba0b2..362da30b949e 100644
--- a/sound/soc/codecs/cs35l56-test.c
+++ b/sound/soc/codecs/cs35l56-test.c
@@ -63,6 +63,7 @@ struct cs35l56_test_priv {
bool asp_config_regs_written;
bool asp_mixer_regs_written;
+ bool sdw_mux_regs_written;
};
struct cs35l56_test_param {
@@ -124,6 +125,11 @@ static const struct range cs35l56_test_asp_mixer_registers_range = {
.end = CS35L56_ASP1TX4_INPUT,
};
+static const struct range cs35l56_test_sdw_mux_registers_range = {
+ .start = CS35L56_SWIRE_DP3_CH1_INPUT,
+ .end = CS35L56_SWIRE_DP3_CH4_INPUT,
+};
+
static int cs35l56_test_mock_registers_read(void *context,
const void *reg_buf, size_t reg_size,
void *val_buf, size_t val_size)
@@ -200,6 +206,9 @@ static int cs35l56_test_mock_registers_write(void *context, const void *data, si
if (range_overlaps(&addr_range, &cs35l56_test_asp_mixer_registers_range))
priv->asp_mixer_regs_written = true;
+ if (range_overlaps(&addr_range, &cs35l56_test_sdw_mux_registers_range))
+ priv->sdw_mux_regs_written = true;
+
for (i = 0; i < count; i += sizeof(u32)) {
val = get_unaligned_be32(buf + i);
ret = regmap_write(priv->registers, reg + i, val);
@@ -929,6 +938,79 @@ static void cs35l56_test_component_probe_omits_asp(struct kunit *test)
KUNIT_EXPECT_FALSE(test, priv->asp_mixer_regs_written);
}
+/*
+ * Probing the component must not write the SoundWire TX mux registers,
+ * either directly or through a subsequent regcache_sync().
+ */
+static void cs35l56_test_component_probe_omits_sdw_mux(struct kunit *test)
+{
+ struct cs35l56_test_priv *priv = test->priv;
+ struct cs35l56_private *cs35l56 = priv->cs35l56_priv;
+ struct snd_soc_card *card = cs35l56->component->card;
+ struct snd_soc_aux_dev *aux;
+ struct faux_device *card_dev;
+
+ cs35l56_test_create_mock_supplies(test);
+ cs35l56_test_create_mock_device_registers(test);
+
+ KUNIT_ASSERT_NOT_NULL(test, priv->regmap_config);
+ cs35l56->base.regmap = devm_regmap_init(cs35l56->base.dev,
+ &cs35l56_test_mock_registers_client_regmap_bus,
+ test, priv->regmap_config);
+ KUNIT_ASSERT_NOT_ERR_OR_NULL(test, cs35l56->base.regmap);
+
+ KUNIT_ASSERT_EQ(test, 0, cs35l56_common_probe(cs35l56, 0));
+ KUNIT_ASSERT_EQ(test, 0,
+ kunit_add_action_or_reset(test, cs35l56_remove_wrapper, cs35l56));
+
+ /* Prevent real dsp_work */
+ INIT_WORK(&cs35l56->dsp_work, cs35l56_test_dummy_dsp_work);
+
+ /* Simulate first attachment and re-attachment after the soft reset. */
+ regcache_cache_only(cs35l56->base.regmap, false);
+ KUNIT_ASSERT_EQ(test, 0, cs35l56_init(cs35l56));
+ KUNIT_ASSERT_EQ(test, 0, cs35l56_init(cs35l56));
+ KUNIT_ASSERT_TRUE(test, cs35l56->base.init_done);
+ flush_work(&cs35l56->component_register_work);
+ KUNIT_ASSERT_TRUE(test, cs35l56->component_registered);
+
+ card_dev = faux_device_create("cs35l56_test_card", NULL, NULL);
+ KUNIT_ASSERT_NOT_NULL(test, card_dev);
+ KUNIT_ASSERT_EQ(test, 0,
+ kunit_add_action_or_reset(test, faux_device_destroy_wrapper, card_dev));
+
+ /* Bind as an auxiliary component so the ASP DAI is never probed. */
+ aux = kunit_kzalloc(test, sizeof(*aux), GFP_KERNEL);
+ KUNIT_ASSERT_NOT_NULL(test, aux);
+ aux->dlc.name = dev_name(cs35l56->base.dev);
+ card->name = "cs35l56-test";
+ card->dev = &card_dev->dev;
+ card->owner = THIS_MODULE;
+ card->aux_dev = aux;
+ card->num_aux_devs = 1;
+ KUNIT_ASSERT_EQ(test, 0, snd_soc_register_card(card));
+ KUNIT_ASSERT_EQ(test, 0,
+ kunit_add_action_or_reset(test, snd_soc_unregister_card_wrapper, card));
+ KUNIT_ASSERT_TRUE(test, card->instantiated);
+ KUNIT_EXPECT_FALSE(test, priv->sdw_mux_regs_written);
+
+ /*
+ * Flush cache to ensure there aren't cached values for the SoundWire muxes.
+ * The first case without regcache_mark_dirty() tests flushing when
+ * hardware registers have not reset, and requires a dummy write to
+ * the cache to make it dirty.
+ */
+ regcache_cache_only(cs35l56->base.regmap, true);
+ KUNIT_ASSERT_EQ(test, 0, regmap_write(cs35l56->base.regmap,
+ CS35L56_DSP_VIRTUAL1_MBOX_1, 0));
+ regcache_cache_only(cs35l56->base.regmap, false);
+ KUNIT_ASSERT_EQ(test, 0, regcache_sync(cs35l56->base.regmap));
+ regcache_mark_dirty(cs35l56->base.regmap);
+ KUNIT_ASSERT_EQ(test, 0, regcache_sync(cs35l56->base.regmap));
+
+ KUNIT_EXPECT_FALSE(test, priv->sdw_mux_regs_written);
+}
+
static int cs35l56_test_case_init_common(struct kunit *test)
{
struct cs35l56_test_priv *priv;
@@ -1233,6 +1315,8 @@ static struct kunit_case cs35l56_test_cases_soundwire[] = {
KUNIT_CASE(cs35l56_test_set_fw_name_preserves_spkid_without_onchip_gpios),
KUNIT_CASE_PARAM(cs35l56_test_component_probe_omits_asp,
cs35l56_test_type_rev_all_gen_params),
+ KUNIT_CASE_PARAM(cs35l56_test_component_probe_omits_sdw_mux,
+ cs35l56_test_type_rev_all_gen_params),
{ } /* terminator */
};
--
2.47.3
next prev parent reply other threads:[~2026-11-20 11:04 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-20 11:04 [PATCH 0/4] ASoC: cs35l56: Prepare for SDCA Companion Amp Richard Fitzgerald
2026-11-20 11:04 ` [PATCH 1/4] ASoC: cs35l56: Remove SDW1 TX source controls and widgets Richard Fitzgerald
2026-11-20 11:04 ` [PATCH 2/4] ASoC: cs35l56: Rename the DP3 DAI to cs35l56-ot127 Richard Fitzgerald
2026-11-20 11:04 ` [PATCH 3/4] ASoC: cs35l56: Eliminate trivial regmap patch Richard Fitzgerald
2026-11-20 11:04 ` Richard Fitzgerald [this message]
2026-11-20 12:48 ` [PATCH 0/4] ASoC: cs35l56: Prepare for SDCA Companion Amp Mark Brown
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=20261120110441.2163567-5-rf@opensource.cirrus.com \
--to=rf@opensource.cirrus.com \
--cc=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.