Skip to contentSkip to conversation

ASoC: SDCA: Add PDE state transition helper

PATCH In review Niranjan H Y 3 participants 11 messages Apr 21 – Apr 23

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH v10 1/4 ASoC: SDCA: Add PDE state transition helper

Per SDCA specification, after writing REQUESTED_PS, drivers must poll ACTUAL_PS until the target power state is reached. Implement sdca_asoc_set_pde_state_sync() helper function for changing the power state of the PDE widget and wait for the power transition to happen or timeout.

Changes include:
- Add sdca_asoc_set_pde_poll_sync() to handle write REQUESTED_PS register and poll ACTUAL_PS register until the target state is reached or timed out.
- Export function via sdca_asoc.h for use by SDCA-compliant drivers
- Refactor entity_pde_event() in sdca_asoc.c to use the helper

---
v10:
- write REQUESTED_PS before checking the target state.
- change the API name sdca_asoc_pde_ensure_ps to sdca_asoc_set_pde_poll_sync

v9:
- newly added interface

---
 include/sound/sdca_asoc.h       |   4 ++
 include/sound/sdca_function.h   |   2 +
 sound/soc/sdca/sdca_asoc.c      | 111 ++++++++++++++++++++++----------
 sound/soc/sdca/sdca_functions.c |   4 +-
 4 files changed, 86 insertions(+), 35 deletions(-)
include/sound/sdca_asoc.h +4 -0
index 46a61a52decc5..125a3d4e18c09 100644
@@ -12,6 +12,7 @@
 
 struct device;
 struct regmap;
+struct sdca_pde_delay;
 struct sdca_function_data;
 struct snd_ctl_elem_value;
 struct snd_kcontrol;
@@ -99,4 +100,7 @@ int sdca_asoc_q78_put_volsw(struct snd_kcontrol *kcontrol,
 			    struct snd_ctl_elem_value *ucontrol);
 int sdca_asoc_q78_get_volsw(struct snd_kcontrol *kcontrol,
 			    struct snd_ctl_elem_value *ucontrol);
+int sdca_asoc_set_pde_poll_sync(struct device *dev, struct regmap *regmap,
+				int function_id, int entity_id, int from_ps, int to_ps,
+				const struct sdca_pde_delay *pde_delays, int num_delays);
 #endif // __SDCA_ASOC_H__
include/sound/sdca_function.h +2 -0
index 0e871c786513f..18cee74fb1f9b 100644
@@ -1173,6 +1173,7 @@ struct sdca_entity_xu {
  * @sources: Dynamically allocated array pointing to each input Entity
  * connected to this Entity.
  * @controls: Dynamically allocated array of Controls.
+ * @parent_func: Pointer to sdca_function_data to which this entity belongs to.
  * @num_sources: Number of sources for the Entity.
  * @num_controls: Number of Controls for the Entity.
  * @iot: Input/Output Terminal specific Entity properties.
@@ -1190,6 +1191,7 @@ struct sdca_entity {
 	struct sdca_entity *group;
 	struct sdca_entity **sources;
 	struct sdca_control *controls;
+	struct sdca_function_data *parent_func;
 	int num_sources;
 	int num_controls;
 	union {
sound/soc/sdca/sdca_asoc.c +77 -34

135 lines not on this page · raw message

sound/soc/sdca/sdca_functions.c +3 -1
index fd6a254c95305..2396487213819 100644
@@ -1556,8 +1556,10 @@ static int find_sdca_entities(struct device *dev, struct sdw_slave *sdw,
 	fwnode_property_read_u32_array(function_node, "mipi-sdca-entity-id-list",
 				       entity_list, num_entities);
 
-	for (i = 0; i < num_entities; i++)
+	for (i = 0; i < num_entities; i++) {
 		entities[i].id = entity_list[i];
+		entities[i].parent_func = function;
+	}
 
 	/* now read subproperties */
 	for (i = 0; i < num_entities; i++) {
Signature · 1 line
2.34.1
#1 lore raw

PATCH v10 2/4 ASoC: tac5xx2-sdw: add soundwire based codec driver

Add codec driver for tac5xx2 family of devices. This includes the support for
1. tac5572 - DAC, PDM, UAJ and HID
2. tas2883 - Amplifier with DSP
3. tac5672 - Similar to tac5572 with feedback
4. tac5682 - Similar to tac5672 with Amplifier DSP.

---
v10:
- use sdca helper sdca_asoc_set_pde_poll_sync for
changing the power states.
- register .set_jack callback only for if uaj is
available.

v9:
- Update tac5xx2-sdw.c hw_params() and hw_free() to use new SDCA helper sdca_asoc_pde_ensure_ps
- Remove redundant PPU11 initialization as it is there as part of the initialisation table.
- remove unnecessary default value writes for latch clear as the register.
- Improve jack detection and PDE power state transition comments

v8:
- disable interrupts in .set_jack if jack is set to NULL
- hold uaj_lock in .set_jack
- remove unwanted interrupt enable in initialisation

v7:
- refactor remove the cx11, cs18 and cs11 they are not required to be configured for mic
- fix error handling and interrupt cleanup in .set_jack
- fix typo in Kconfig

v6:
- move firmware caching trigger from soundwire bus callback to soundwire probe and make it asynchronous
- validate the firmware fully before starting firmware.
- drop mixer control for cx11 configuration
- check the actual power state in .hw_free after requesting power state transition to power off
- use dev_is_pci() and remove CONFIG_PCI

v5:
- add missing pde_lock while accessing the current power state.
- add uaj_lock to serialize uaj detection update
- return error, if any, returned by sdw_stream_add_slave in hw_parms
- drop snd_soc_unregister_component as we are using devm_snd_soc_register_component
- fix issue in error handling for invalid firmware
- remove unsupported line in/out detection in jack detection
- refactor the jack and button detection logic to be based on their respective interrupt

v4:
- make volume controls as stereo controls for amp gain, playback, dmic and uaj playback.
- better error handling for "CX11 CS Select" mixer control.
- use switch statement for scalability in hw_params and hw_free
- remove unnecessary else in tac_io_init
- change error log for unsupported sample rates to debug logs
- make firmware binary parsing robust by checking the fw size during caching and parsing

v3:
- use macro SDCA_SINGLE_Q78_TLV for the volume mixer controls
- replace magic number with macro for current owner
- fix debug log message about the current owner for hid event

v2:
- Define and use consistent macros for register access to improve code readability and maintainability
- Replace complex event handlers with simpler DAPM widget implementations using direct register control for muting/unmuting and enabling/disabling components
- Replace custom volume controls with standard Q7.8 controls from the SDCA framework
- Fix PDE power state transitions with proper verification of actual power state
- Combine separate locks into a single ops\_lock to protect both firmware operations and power state transitions
- Clean up interrupt handling by removing unnecessary register accesses
- Fix headset microphone control by using the correct mono channel value
- Add comments to clarify firmware handling and critical sections

---
 sound/soc/codecs/Kconfig       |   11 +
 sound/soc/codecs/Makefile      |    2 +
 sound/soc/codecs/tac5xx2-sdw.c | 2019 ++++++++++++++++++++++++++++++++
 sound/soc/codecs/tac5xx2.h     |  259 ++++
 4 files changed, 2291 insertions(+)
 create mode 100644 sound/soc/codecs/tac5xx2-sdw.c
 create mode 100644 sound/soc/codecs/tac5xx2.h
sound/soc/codecs/Kconfig +11 -0
index cf94a1c756e09..176f1b061f66d 100644
@@ -264,6 +264,7 @@ config SND_SOC_ALL_CODECS
 	imply SND_SOC_STA529
 	imply SND_SOC_STAC9766
 	imply SND_SOC_STI_SAS
+	imply SND_SOC_TAC5XX2_SDW
 	imply SND_SOC_TAS2552
 	imply SND_SOC_TAS2562
 	imply SND_SOC_TAS2764
@@ -2139,6 +2140,16 @@ config SND_SOC_STAC9766
 config SND_SOC_STI_SAS
 	tristate "codec Audio support for STI SAS codec"
 
+config SND_SOC_TAC5XX2_SDW
+	tristate "Texas Instruments TAC5XX2 SoundWire Smart Amplifier"
+	depends on SOUNDWIRE
+	depends on SND_SOC_SDCA
+	help
+	  This option enables support for Texas Instruments TAC5XX2 family
+	  of SoundWire Smart Amplifiers. This includes TAC5572, TAC5672,
+	  TAC5682 and TAS2883. To compile this driver as a module, choose
+	  M here: the module will be called snd-soc-tac5xx2.
+
 config SND_SOC_TAS2552
 	tristate "Texas Instruments TAS2552 Mono Audio amplifier"
 	depends on I2C
sound/soc/codecs/Makefile +2 -0
index 172861d17cfd0..f64e75dd2f35d 100644
@@ -313,6 +313,7 @@ snd-soc-sta350-y := sta350.o
 snd-soc-sta529-y := sta529.o
 snd-soc-stac9766-y := stac9766.o
 snd-soc-sti-sas-y := sti-sas.o
+snd-soc-tac5xx2-sdw-y := tac5xx2-sdw.o
 snd-soc-tas5086-y := tas5086.o
 snd-soc-tas571x-y := tas571x.o
 snd-soc-tas5720-y := tas5720.o
@@ -746,6 +747,7 @@ obj-$(CONFIG_SND_SOC_STA350)   += snd-soc-sta350.o
 obj-$(CONFIG_SND_SOC_STA529)   += snd-soc-sta529.o
 obj-$(CONFIG_SND_SOC_STAC9766)	+= snd-soc-stac9766.o
 obj-$(CONFIG_SND_SOC_STI_SAS)	+= snd-soc-sti-sas.o
+obj-$(CONFIG_SND_SOC_TAC5XX2_SDW)	+= snd-soc-tac5xx2-sdw.o
 obj-$(CONFIG_SND_SOC_TAS2552)	+= snd-soc-tas2552.o
 obj-$(CONFIG_SND_SOC_TAS2562)	+= snd-soc-tas2562.o
 obj-$(CONFIG_SND_SOC_TAS2764)	+= snd-soc-tas2764.o
sound/soc/codecs/tac5xx2-sdw.c new file +2019 -0

2,019 lines not on this page · raw message

sound/soc/codecs/tac5xx2.h new file +259 -0

259 lines not on this page · raw message

Signature · 1 line
2.34.1
#2 lore raw

PATCH v10 3/4 ASoC: sdw_utils: TI amp utility for tac5xx2 family

In reply to Niranjan H Y

Add TI amp utility for supporting the tac5xx2 family
of devices to support tac5572, tac5672, tac5682 and tas2883

---
v10:
- no change

v9:
- no change

---
 include/sound/soc_sdw_utils.h        |   4 +
 sound/soc/sdw_utils/soc_sdw_ti_amp.c | 144 ++++++++++++++++++++++++-
 sound/soc/sdw_utils/soc_sdw_utils.c  | 151 +++++++++++++++++++++++++++
 3 files changed, 298 insertions(+), 1 deletion(-)
include/sound/soc_sdw_utils.h +4 -0
index 4890831836734..d713ab2f66203 100644
@@ -272,7 +272,11 @@ int asoc_sdw_ti_amp_init(struct snd_soc_card *card,
 			 struct asoc_sdw_codec_info *info,
 			 bool playback);
 int asoc_sdw_ti_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
+int asoc_sdw_ti_tac5xx2_spk_rtd_init(struct snd_soc_pcm_runtime *rtd,
+				     struct snd_soc_dai *dai);
 int asoc_sdw_ti_amp_initial_settings(struct snd_soc_card *card,
 				     const char *name_prefix);
+int asoc_sdw_ti_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
+int asoc_sdw_ti_sdca_jack_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
 
 #endif
sound/soc/sdw_utils/soc_sdw_ti_amp.c +143 -1

158 lines not on this page · raw message

sound/soc/sdw_utils/soc_sdw_utils.c +151 -0

157 lines not on this page · raw message

Signature · 1 line
2.34.1
#3 lore raw

PATCH v10 4/4 ASoC: tac5xx2-sdw: ACPI match for intel mtl platform

In reply to Niranjan H Y

Add acpi match entries to support TI's tac5572,
tas2883, tac5672 and tac5682 on link 0 on MTL machine.

---
v10:
- no change

v9:
- no change

---
 .../intel/common/soc-acpi-intel-mtl-match.c   | 132 ++++++++++++++++++
 1 file changed, 132 insertions(+)
sound/soc/intel/common/soc-acpi-intel-mtl-match.c +132 -0
index 72c35e73078e3..2e4222456f27f 100644
@@ -122,6 +122,42 @@ static const struct snd_soc_acpi_endpoint spk_r_endpoint = {
 	.group_id = 1,
 };
 
+static const struct snd_soc_acpi_endpoint tac5xx2_endpoints[] = {
+	{ /* Playback Endpoint */
+		.num = 0,
+		.aggregated = 0,
+		.group_position = 0,
+		.group_id = 0,
+	},
+	{ /* Mic Capture Endpoint */
+		.num = 1,
+		.aggregated = 0,
+		.group_position = 0,
+		.group_id = 0,
+	},
+	{ /* UAJ-HP with Mic Endpoint */
+		.num = 2,
+		.aggregated = 0,
+		.group_position = 0,
+		.group_id = 0,
+	},
+};
+
+static const struct snd_soc_acpi_endpoint tas2883_endpoints[] = {
+	{ /* Playback Endpoint */
+		.num = 0,
+		.aggregated = 0,
+		.group_position = 0,
+		.group_id = 0,
+	},
+	{ /* Mic Capture Endpoint */
+		.num = 1,
+		.aggregated = 0,
+		.group_position = 0,
+		.group_id = 0,
+	},
+};
+
 static const struct snd_soc_acpi_endpoint rt712_endpoints[] = {
 	{
 		.num = 0,
@@ -1011,6 +1047,33 @@ static const struct snd_soc_acpi_adr_device cs42l42_0_adr[] = {
 	}
 };
 
+static const struct snd_soc_acpi_adr_device tac5572_0_adr[] = {
+	{
+		.adr = 0x0000300102557201ull,
+		.num_endpoints = ARRAY_SIZE(tac5xx2_endpoints),
+		.endpoints = tac5xx2_endpoints,
+		.name_prefix = "tac5572"
+	}
+};
+
+static const struct snd_soc_acpi_adr_device tac5672_0_adr[] = {
+	{
+		.adr = 0x0000300102567201ull,
+		.num_endpoints = ARRAY_SIZE(tac5xx2_endpoints),
+		.endpoints = tac5xx2_endpoints,
+		.name_prefix = "tac5672"
+	}
+};
+
+static const struct snd_soc_acpi_adr_device tac5682_0_adr[] = {
+	{
+		.adr = 0x0000300102568201ull,
+		.num_endpoints = ARRAY_SIZE(tac5xx2_endpoints),
+		.endpoints = tac5xx2_endpoints,
+		.name_prefix = "tac5682"
+	}
+};
+
 static const struct snd_soc_acpi_adr_device tas2783_0_adr[] = {
 	{
 		.adr = 0x00003c0102000001ull,
@@ -1035,9 +1098,45 @@ static const struct snd_soc_acpi_adr_device tas2783_0_adr[] = {
 		.num_endpoints = 1,
 		.endpoints = &spk_r_endpoint,
 		.name_prefix = "tas2783-4"
+	},
+};
+
+static const struct snd_soc_acpi_adr_device tas2883_0_adr[] = {
+	{
+		.adr = 0x0000300102288301ull,
+		.num_endpoints = ARRAY_SIZE(tas2883_endpoints),
+		.endpoints = tas2883_endpoints,
+		.name_prefix = "tas2883"
 	}
 };
 
+static const struct snd_soc_acpi_link_adr tac5572_l0[] = {
+	{
+		.mask = BIT(0),
+		.num_adr = ARRAY_SIZE(tac5572_0_adr),
+		.adr_d = tac5572_0_adr,
+	},
+	{}
+};
+
+static const struct snd_soc_acpi_link_adr tac5672_l0[] = {
+	{
+		.mask = BIT(0),
+		.num_adr = ARRAY_SIZE(tac5672_0_adr),
+		.adr_d = tac5672_0_adr,
+	},
+	{}
+};
+
+static const struct snd_soc_acpi_link_adr tac5682_l0[] = {
+	{
+		.mask = BIT(0),
+		.num_adr = ARRAY_SIZE(tac5682_0_adr),
+		.adr_d = tac5682_0_adr,
+	},
+	{}
+};
+
 static const struct snd_soc_acpi_link_adr tas2783_link0[] = {
 	{
 		.mask = BIT(0),
@@ -1047,6 +1146,15 @@ static const struct snd_soc_acpi_link_adr tas2783_link0[] = {
 	{}
 };
 
+static const struct snd_soc_acpi_link_adr tas2883_l0[] = {
+	{
+		.mask = BIT(0),
+		.num_adr = ARRAY_SIZE(tas2883_0_adr),
+		.adr_d = tas2883_0_adr,
+	},
+	{}
+};
+
 static const struct snd_soc_acpi_link_adr cs42l42_link0_max98363_link2[] = {
 	/* Expected order: jack -> amp */
 	{
@@ -1208,12 +1316,36 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = {
 		.drv_name = "sof_sdw",
 		.sof_tplg_filename = "sof-mtl-rt715-rt711-rt1308-mono.tplg",
 	},
+	{
+		.link_mask = BIT(0),
+		.links = tac5572_l0,
+		.drv_name = "sof_sdw",
+		.sof_tplg_filename = "sof-mtl-tac5572.tplg",
+	},
+	{
+		.link_mask = BIT(0),
+		.links = tac5672_l0,
+		.drv_name = "sof_sdw",
+		.sof_tplg_filename = "sof-mtl-tac5672.tplg",
+	},
+	{
+		.link_mask = BIT(0),
+		.links = tac5682_l0,
+		.drv_name = "sof_sdw",
+		.sof_tplg_filename = "sof-mtl-tac5682.tplg",
+	},
 	{
 		.link_mask = BIT(0),
 		.links = tas2783_link0,
 		.drv_name = "sof_sdw",
 		.sof_tplg_filename = "sof-mtl-tas2783.tplg",
 	},
+	{
+		.link_mask = BIT(0),
+		.links = tas2883_l0,
+		.drv_name = "sof_sdw",
+		.sof_tplg_filename = "sof-mtl-tas2883.tplg",
+	},
 	{
 		.link_mask = GENMASK(3, 0),
 		.links = mtl_rt713_l0_rt1316_l12_rt1713_l3,
Signature · 1 line
2.34.1
maintainer
#4 lore raw
In reply to Niranjan H Y
Quoted 17 lines · Niranjan H Y

Per SDCA specification, after writing REQUESTED_PS, drivers must poll ACTUAL_PS until the target power state is reached. Implement sdca_asoc_set_pde_state_sync() helper function for changing the power state of the PDE widget and wait for the power transition to happen or timeout.

Changes include:
- Add sdca_asoc_set_pde_poll_sync() to handle write REQUESTED_PS register and poll ACTUAL_PS register until the target state is reached or timed out.
- Export function via sdca_asoc.h for use by SDCA-compliant drivers
- Refactor entity_pde_event() in sdca_asoc.c to use the helper

---
static int entity_parse_pde(struct device *dev,

sound/soc/sdca/sdca_asoc.c static int entity_parse_pde(struct device *dev, · line 496

Quoted 7 lines
sound/soc/sdca/sdca_asoc.c +2 -2
@@ -449,8 +492,8 @@ static int entity_parse_pde(struct device *dev,
 	}
 
 	(*widget)->id = snd_soc_dapm_supply;
-	(*widget)->reg = SDW_SDCA_CTL(function->desc->adr, entity->id, control->sel, 0);
-	(*widget)->mask = GENMASK(control->nbits - 1, 0);
+	(*widget)->reg = SND_SOC_NOPM;
+	(*widget)->mask = 0;

Hmm... yeah I am really sorry I totally overlooked this. Yeah we should leave the write outside the helper it is much nicer to have DAPM do it.

Thanks,
Charles

#5 lore raw
Quoted 20 lines · Charles Keepax
Quoted 19 lines · Niranjan H Y

Per SDCA specification, after writing REQUESTED_PS, drivers must poll ACTUAL_PS until the target power state is reached. Implement sdca_asoc_set_pde_state_sync() helper function for changing the power state of the PDE widget and wait for the power transition to happen or timeout.

Changes include:
- Add sdca_asoc_set_pde_poll_sync() to handle write REQUESTED_PS register and poll ACTUAL_PS register until the target state is reached or timed out.
- Export function via sdca_asoc.h for use by SDCA-compliant drivers
- Refactor entity_pde_event() in sdca_asoc.c to use the helper

---
static int entity_parse_pde(struct device *dev,

(quoted diff) +0 -0
@@ -449,8 +492,8 @@ static int entity_parse_pde(struct device *dev,
 	}
 
Quoted 9 lines

sound/soc/sdca/sdca_asoc.c static int entity_parse_pde(struct device *dev, · line 496

Quoted 5 lines
sound/soc/sdca/sdca_asoc.c +2 -2
 	(*widget)->id = snd_soc_dapm_supply;
-	(*widget)->reg = SDW_SDCA_CTL(function->desc->adr, entity->id, control->sel, 0);
-	(*widget)->mask = GENMASK(control->nbits - 1, 0);
+	(*widget)->reg = SND_SOC_NOPM;
+	(*widget)->mask = 0;

Hmm... yeah I am really sorry I totally overlooked this. Yeah we should leave the write outside the helper it is much nicer to have DAPM do it.

Not following that comment, there are quite a few codecs that trap a DAPM event, do a regmap_write then wait with a loop, see e.g. rt722_sdca_pde47_event

I haven't seen DAPM deal directly with the write?
what am I missing?

maintainer
#6 lore raw
Quoted 31 lines · Pierre-Louis Bossart
Quoted 20 lines · Charles Keepax
Quoted 19 lines · Niranjan H Y

Per SDCA specification, after writing REQUESTED_PS, drivers must poll ACTUAL_PS until the target power state is reached. Implement sdca_asoc_set_pde_state_sync() helper function for changing the power state of the PDE widget and wait for the power transition to happen or timeout.

Changes include:
- Add sdca_asoc_set_pde_poll_sync() to handle write REQUESTED_PS register and poll ACTUAL_PS register until the target state is reached or timed out.
- Export function via sdca_asoc.h for use by SDCA-compliant drivers
- Refactor entity_pde_event() in sdca_asoc.c to use the helper

---
static int entity_parse_pde(struct device *dev,

(quoted diff) +0 -0
@@ -449,8 +492,8 @@ static int entity_parse_pde(struct device *dev,
 	}
 
Quoted 9 lines

sound/soc/sdca/sdca_asoc.c static int entity_parse_pde(struct device *dev, · line 496

Quoted 5 lines
sound/soc/sdca/sdca_asoc.c +2 -2
 	(*widget)->id = snd_soc_dapm_supply;
-	(*widget)->reg = SDW_SDCA_CTL(function->desc->adr, entity->id, control->sel, 0);
-	(*widget)->mask = GENMASK(control->nbits - 1, 0);
+	(*widget)->reg = SND_SOC_NOPM;
+	(*widget)->mask = 0;

Hmm... yeah I am really sorry I totally overlooked this. Yeah we should leave the write outside the helper it is much nicer to have DAPM do it.

Quoted 3 lines

Not following that comment, there are quite a few codecs that trap a DAPM event, do a regmap_write then wait with a loop, see e.g. rt722_sdca_pde47_event

If you have a good reason to do the write manually you can (typically because it needs sequencing with other writes), but generally if the DAPM widget can do the write its better to do it that way. Just cleaner.

Apologies totally my bad on this I should have realised the implications of this change the first time.

Quoted 2 lines

I haven't seen DAPM deal directly with the write?
what am I missing?

That is what is happening in the above code setting the reg/mask/on_val/off_val, DAPM uses that information to do the register write.

Thanks,
Charles

#7 lore raw
Quoted 29 lines · Charles Keepax
Quoted 6 lines · Pierre-Louis Bossart
Quoted 5 lines · Charles Keepax

Review

Quoted 4 lines · Niranjan H Y

Per SDCA specification, after writing REQUESTED_PS, drivers must

(quoted diff) +0 -1
 	(*widget)->id = snd_soc_dapm_supply;
-	(*widget)->reg = SDW_SDCA_CTL(function->desc->adr, entity->id,

control->sel, 0);

Quoted 11 lines
Quoted 7 lines

sound/soc/sdca/sdca_asoc.c static int entity_parse_pde(struct device *dev, · line 496

Quoted 3 lines
sound/soc/sdca/sdca_asoc.c +2 -1
-	(*widget)->mask = GENMASK(control->nbits - 1, 0);
+	(*widget)->reg = SND_SOC_NOPM;
+	(*widget)->mask = 0;

Hmm... yeah I am really sorry I totally overlooked this. Yeah we should leave the write outside the helper it is much nicer to have DAPM do it.

Not following that comment, there are quite a few codecs that trap a DAPM event, do a regmap_write then wait with a loop, see e.g. rt722_sdca_pde47_event

If you have a good reason to do the write manually you can (typically because it needs sequencing with other writes), but generally if the DAPM widget can do the write its better to do it that way. Just cleaner.

Apologies totally my bad on this I should have realised the implications of this change the first time.

Quoted 6 lines
Quoted 2 lines

I haven't seen DAPM deal directly with the write?
what am I missing?

That is what is happening in the above code setting the reg/mask/on_val/off_val, DAPM uses that information to do the register write.

No problem at all. I will revert back changes as in the previous patch to check for ACTUAL_PS alone.

Regards
Niranjan

#8 lore raw
In reply to Charles Keepax
Quoted 32 lines · Charles Keepax
Quoted 31 lines · Pierre-Louis Bossart
Quoted 29 lines · Charles Keepax
Quoted 17 lines · Niranjan H Y

Per SDCA specification, after writing REQUESTED_PS, drivers must poll ACTUAL_PS until the target power state is reached. Implement sdca_asoc_set_pde_state_sync() helper function for changing the power state of the PDE widget and wait for the power transition to happen or timeout.

Changes include:
- Add sdca_asoc_set_pde_poll_sync() to handle write REQUESTED_PS register and poll ACTUAL_PS register until the target state is reached or timed out.
- Export function via sdca_asoc.h for use by SDCA-compliant drivers
- Refactor entity_pde_event() in sdca_asoc.c to use the helper

---
static int entity_parse_pde(struct device *dev,

sound/soc/sdca/sdca_asoc.c static int entity_parse_pde(struct device *dev, · line 496

Quoted 7 lines
sound/soc/sdca/sdca_asoc.c +2 -2
@@ -449,8 +492,8 @@ static int entity_parse_pde(struct device *dev,
 	}
 
 	(*widget)->id = snd_soc_dapm_supply;
-	(*widget)->reg = SDW_SDCA_CTL(function->desc->adr, entity->id, control->sel, 0);
-	(*widget)->mask = GENMASK(control->nbits - 1, 0);
+	(*widget)->reg = SND_SOC_NOPM;
+	(*widget)->mask = 0;

Hmm... yeah I am really sorry I totally overlooked this. Yeah we should leave the write outside the helper it is much nicer to have DAPM do it.

Quoted 8 lines
Quoted 3 lines

Not following that comment, there are quite a few codecs that trap a DAPM event, do a regmap_write then wait with a loop, see e.g. rt722_sdca_pde47_event

If you have a good reason to do the write manually you can (typically because it needs sequencing with other writes), but generally if the DAPM widget can do the write its better to do it that way. Just cleaner.

The existing code I was referring to pre-dates the introduction of sdca_parse_pde()...

It doesn't really need sequencing with other writes, DAPM is used to deal with PRE_PMU and POST_PMD events, it does not deal with register writes in all cases.

Quoted 9 lines

Apologies totally my bad on this I should have realised the implications of this change the first time.

Quoted 2 lines

I haven't seen DAPM deal directly with the write?
what am I missing?

That is what is happening in the above code setting the reg/mask/on_val/off_val, DAPM uses that information to do the register write.

Since we have two different ways of doing this PDE management, do we need two helpers, one with the write and one without?

maintainer
#9 lore raw
Quoted 10 lines · Pierre-Louis Bossart
Quoted 6 lines · Charles Keepax
Quoted 2 lines · Pierre-Louis Bossart
Quoted 1 line · Charles Keepax

On Tue, Apr 21, 2026 at 09:18:01PM +0530, Niranjan H Y wrote:

That is what is happening in the above code setting the reg/mask/on_val/off_val, DAPM uses that information to do the register write.

Since we have two different ways of doing this PDE management, do we need two helpers, one with the write and one without?

I would really vote for just the polling helper, most of the time the register should be written by DAPM and for drivers that don't those drivers will likely be writing a bunch of other registers in the event handler anyway so what is one more.

Thanks,
Charles

#10 lore raw
Quoted 9 lines · Charles Keepax
Quoted 8 lines · Pierre-Louis Bossart
Quoted 6 lines · Charles Keepax
Quoted 2 lines · Pierre-Louis Bossart
Quoted 1 line · Charles Keepax

On Tue, Apr 21, 2026 at 09:18:01PM +0530, Niranjan H Y wrote:

That is what is happening in the above code setting the reg/mask/on_val/off_val, DAPM uses that information to do the register write.

Quoted 7 lines
Quoted 2 lines

Since we have two different ways of doing this PDE management, do we need two helpers, one with the write and one without?

I would really vote for just the polling helper, most of the time the register should be written by DAPM and for drivers that don't those drivers will likely be writing a bunch of other registers in the event handler anyway so what is one more.

I don't really see what drivers could possibly do between writing REQUESTED_PS and waiting on ACTUAL_PS...

They may have other registers to tweak *before* or *after* the sequence, this two-step power sequence doesn't really offer much room for interleaving other commands. FWIW, this sort of sequence is exactly the same for HDaudio, you set the desired power and wait for it to be reached. We never did anything else in the mean time..

At any rate, not going to lay on the tracks for a helper. Fine if you want to keep the write to REQUESTED_PS out...