Repository navigation
Conversation
To identify the endpoint is for companion amp. Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Add asoc_sdw_companion_amp_endpoint struct to help machine driver to create codec to codec dai links for SoundWire companion amps. Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
The companion stream is from peripheral to peripheral and all peripherals need to use the same SoundWire frame area to transfer the stream data. Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
The companion amp dai links should not be created by the default machine driver. We will create a mach table for the config that companion amp is used. Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Add the componion amp dai info for rt712 and rt1320. This commit is only for testing which is not a correct information. Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
There was a problem hiding this comment.
🟡 Changes recommended
Critical defects can block card registration, permanently defer probing, overlap companion-stream payload slots, and omit codec prefixes required to avoid control-name collisions and resolve routes.
5 open issues
What changed in this PR
This PR adds shared ASoC and SoundWire support for companion amplifiers that receive audio from another peripheral rather than the host.
Changes:
- Adds companion endpoint metadata, grouping, and RT712/RT1320 DAI entries.
- Creates Intel codec-to-codec links and adapts AMD drivers to the updated endpoint helpers.
- Introduces a companion stream type and adjusts peripheral port offsets.
| File | Description |
|---|---|
sound/soc/sof/intel/hda.c |
Excludes companion endpoints from automatic discovery. |
sound/soc/sdw_utils/soc_sdw_utils.c |
Adds companion DAI entries and endpoint grouping. |
sound/soc/intel/boards/sof_sdw.c |
Creates companion codec-to-codec links. |
sound/soc/amd/acp/acp-sdw-sof-mach.c |
Adapts SOF endpoint parsing for companion groups. |
sound/soc/amd/acp/acp-sdw-legacy-mach.c |
Adapts legacy endpoint parsing for companion groups. |
include/sound/soc-acpi.h |
Adds the companion endpoint flag. |
include/sound/soc_sdw_utils.h |
Defines companion grouping structures and helper interfaces. |
include/linux/soundwire/sdw.h |
Adds the companion stream type. |
drivers/soundwire/generic_bandwidth_allocation.c |
Resets port offsets for companion streams. |
Review effort: Balanced
| if (m_rt->stream->type == SDW_STREAM_COMPANION) | ||
| port_bo = t_data->block_offset; |
|
|
||
| if (m_rt->stream->type == SDW_STREAM_COMPANION) | ||
| port_bo = t_data->block_offset; | ||
| } |
| codecs[num_codecs].name = end->codec_name; | ||
| codecs[num_codecs].dai_name = end->dai_info->dai_name; | ||
| num_codecs++; |
| (*dai_links)->platforms = platform; | ||
| (*dai_links)->num_platforms = 1; |
| codec_name = asoc_sdw_get_codec_name(dev, dai_info, | ||
| adr_link, i); | ||
| if (IS_ERR(codec_name)) | ||
| return PTR_ERR(codec_name); |
plbossart
left a comment
plbossart
left a comment
There was a problem hiding this comment.
Man you seem to start really big SoundWire changes. You should hire me haha...
Overall I didn't quite get how the new dailink is supposed to be handled, specifically how it's allocated, prepared and triggered. It's quite dependent on the host-peripheral dailink.
| */ | ||
| #define SOC_SDW_SIDECAR_AMPS BIT(16) | ||
| #define SOC_SDW_CODEC_MIC BIT(17) | ||
| #define SOC_SDW_COMPANION_AMPS BIT(18) |
There was a problem hiding this comment.
it'd be useful to describe the difference between sidecar and companion amps
| num_links = sdw_be_num + ssp_num + dmic_num + hdmi_num + bt_num + 1; | ||
| dai_links = devm_kcalloc(dev, num_links, sizeof(*dai_links), GFP_KERNEL); | ||
| num_links = sdw_be_num + ssp_num + dmic_num + hdmi_num + bt_num + num_comp_amps + 1; | ||
| dai_links = devm_kcalloc(dev, num_links + 1, sizeof(*dai_links), GFP_KERNEL); |
There was a problem hiding this comment.
you should explain why there's an additional dailink.
What's not clear specifically is how this dailink is handled, i.e. how it's allocated, prepared, triggered.
so far the device-to-device connections are not handled by the SoundWire core, so it's not clear how this might work?
| SDW_STREAM_PCM = 0, | ||
| SDW_STREAM_PDM = 1, | ||
| SDW_STREAM_BPT = 2, | ||
| SDW_STREAM_COMPANION = 3, |
There was a problem hiding this comment.
yeah but it could be PDM or PCM.
It think you'd need to add a new transport type, such as MANAGER_PERIPHERAL or PERIPHERAL_PERIPHERAL.
There are other uses cases where device-to-device communication is needed, e.g. to share the amp feedback. Don't make this just for the companion case.
| slave_total_ch += ch; | ||
|
|
||
| if (m_rt->stream->type == SDW_STREAM_COMPANION) | ||
| port_bo = t_data->block_offset; |
| * the mach table if it is present. | ||
| */ | ||
| if (!is_endpoint_present(sdw_device, codec_info_list[i].dais[j].dai_type) || | ||
| (codec_info_list[i].dais[j].quirk & SOC_SDW_COMPANION_AMPS)) |
There was a problem hiding this comment.
the commit message says the opposite of what's done in other patches where you create a new dailink.
Some platforms use a SoundWire companion amp, which gets its audio data
from another SoundWire peripheral (the main amp) instead of from the
host. The current machine drivers and SoundWire core assume that every
stream is exchanged with the host, so these amps cannot be described or
configured.
This series adds the common support needed for such configurations:
a way to mark companion amp endpoints in the mach table, machine driver
support for the peripheral to peripheral path, a SoundWire stream type
that fits it.