Skip to content

Commit c736e45

Browse files
tlissowsserhiy-katsyuba-intel
tlissows
authored and
serhiy-katsyuba-intel
committed
dai: uaol: add support for Intel UAOL
Adds support for Intel USB Audio Offload Link (UAOL) DAI. Signed-off-by: Tomasz Lissowski <tomasz.lissowski@intel.com> Signed-off-by: Serhiy Katsyuba <serhiy.katsyuba@intel.com>
1 parent 78bbc45 commit c736e45

File tree

7 files changed

+134
-3
lines changed

7 files changed

+134
-3
lines changed

‎src/audio/base_fw_intel.c‎

Lines changed: 91 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@
2323

2424
#include <sof/lib/memory.h>
2525

26+
#if CONFIG_UAOL_INTEL_ADSP
27+
#include <zephyr/drivers/uaol.h>
28+
#endif
29+
2630
#include <ipc4/base_fw.h>
2731
#include <ipc4/alh.h>
2832
#include <rimage/sof/user/manifest.h>
@@ -37,6 +41,22 @@ struct ipc4_modules_info {
3741
struct sof_man_module modules[0];
3842
} __packed __aligned(4);
3943

44+
#if CONFIG_UAOL_INTEL_ADSP
45+
struct ipc4_uaol_link_capabilities {
46+
uint32_t input_streams_supported : 4;
47+
uint32_t output_streams_supported : 4;
48+
uint32_t bidirectional_streams_supported : 5;
49+
uint32_t rsvd : 19;
50+
uint32_t max_tx_fifo_size;
51+
uint32_t max_rx_fifo_size;
52+
} __packed __aligned(4);
53+
54+
struct ipc4_uaol_capabilities {
55+
uint32_t link_count;
56+
struct ipc4_uaol_link_capabilities link_caps[];
57+
} __packed __aligned(4);
58+
#endif /* CONFIG_UAOL_INTEL_ADSP */
59+
4060
/*
4161
* TODO: default to value of ACE1.x platforms. This is defined
4262
* in multiple places in Zephyr, mm_drv_intel_adsp.h and
@@ -67,7 +87,7 @@ __cold int basefw_vendor_fw_config(uint32_t *data_offset, char *data)
6787
tlv_value_uint32_set(tuple, IPC4_SLOW_CLOCK_FREQ_HZ_FW_CFG, IPC4_ALH_CAVS_1_8);
6888

6989
tuple = tlv_next(tuple);
70-
tlv_value_uint32_set(tuple, IPC4_UAOL_SUPPORT, 0);
90+
tlv_value_uint32_set(tuple, IPC4_UAOL_SUPPORT, IS_ENABLED(CONFIG_UAOL_INTEL_ADSP));
7191

7292
tuple = tlv_next(tuple);
7393
tlv_value_uint32_set(tuple, IPC4_ALH_SUPPORT_LEVEL_FW_CFG, IPC4_ALH_CAVS_1_8);
@@ -78,6 +98,55 @@ __cold int basefw_vendor_fw_config(uint32_t *data_offset, char *data)
7898
return 0;
7999
}
80100

101+
#if CONFIG_UAOL_INTEL_ADSP
102+
#define DEV_AND_COMMA(node) DEVICE_DT_GET(node),
103+
static const struct device *uaol_devs[] = {
104+
DT_FOREACH_STATUS_OKAY(intel_adsp_uaol, DEV_AND_COMMA)
105+
};
106+
107+
static void tlv_value_set_uaol_caps(struct sof_tlv *tuple, uint32_t type)
108+
{
109+
const size_t dev_count = ARRAY_SIZE(uaol_devs);
110+
struct uaol_capabilities dev_cap;
111+
struct ipc4_uaol_capabilities *caps = (struct ipc4_uaol_capabilities *)tuple->value;
112+
size_t caps_size = offsetof(struct ipc4_uaol_capabilities, link_caps[dev_count]);
113+
size_t i;
114+
int ret;
115+
116+
memset(caps, 0, caps_size);
117+
118+
caps->link_count = dev_count;
119+
for (i = 0; i < dev_count; i++) {
120+
ret = uaol_get_capabilities(uaol_devs[i], &dev_cap);
121+
if (ret)
122+
continue;
123+
124+
caps->link_caps[i].input_streams_supported = dev_cap.input_streams;
125+
caps->link_caps[i].output_streams_supported = dev_cap.output_streams;
126+
caps->link_caps[i].bidirectional_streams_supported = dev_cap.bidirectional_streams;
127+
caps->link_caps[i].max_tx_fifo_size = dev_cap.max_tx_fifo_size;
128+
caps->link_caps[i].max_rx_fifo_size = dev_cap.max_rx_fifo_size;
129+
}
130+
131+
tlv_value_set(tuple, type, caps_size, caps);
132+
}
133+
134+
static int uaol_stream_id_to_hda_link_stream_id(int uaol_stream_id)
135+
{
136+
size_t dev_count = ARRAY_SIZE(uaol_devs);
137+
size_t i;
138+
139+
for (i = 0; i < dev_count; i++) {
140+
int hda_link_stream_id = uaol_get_mapped_hda_link_stream_id(uaol_devs[i],
141+
uaol_stream_id);
142+
if (hda_link_stream_id >= 0)
143+
return hda_link_stream_id;
144+
}
145+
146+
return -1;
147+
}
148+
#endif /* CONFIG_UAOL_INTEL_ADSP */
149+
81150
__cold int basefw_vendor_hw_config(uint32_t *data_offset, char *data)
82151
{
83152
struct sof_tlv *tuple = (struct sof_tlv *)data;
@@ -120,6 +189,11 @@ __cold int basefw_vendor_hw_config(uint32_t *data_offset, char *data)
120189
tlv_value_set(tuple, IPC4_INTEL_MIC_PRIVACY_CAPS_HW_CFG, sizeof(priv_caps), &priv_caps);
121190
#endif
122191

192+
#if CONFIG_UAOL_INTEL_ADSP
193+
tuple = tlv_next(tuple);
194+
tlv_value_set_uaol_caps(tuple, IPC4_UAOL_CAPS_HW_CFG);
195+
#endif
196+
123197
tuple = tlv_next(tuple);
124198
*data_offset = (int)((char *)tuple - data);
125199

@@ -421,6 +495,7 @@ __cold int basefw_vendor_set_large_config(struct comp_dev *dev, uint32_t param_i
421495
__cold int basefw_vendor_dma_control(uint32_t node_id, const char *config_data, size_t data_size)
422496
{
423497
union ipc4_connector_node_id node = (union ipc4_connector_node_id)node_id;
498+
int dai_index = node.f.v_index;
424499
int ret, result;
425500
enum sof_ipc_dai_type type;
426501

@@ -444,11 +519,25 @@ __cold int basefw_vendor_dma_control(uint32_t node_id, const char *config_data,
444519
case ipc4_i2s_link_input_class:
445520
type = SOF_DAI_INTEL_SSP;
446521
break;
522+
523+
#if CONFIG_UAOL_INTEL_ADSP
524+
case ipc4_alh_uaol_stream_link_output_class:
525+
case ipc4_alh_uaol_stream_link_input_class:
526+
type = SOF_DAI_INTEL_UAOL;
527+
dai_index = uaol_stream_id_to_hda_link_stream_id(node.f.v_index);
528+
if (dai_index < 0) {
529+
tr_err(&basefw_comp_tr,
530+
"HDA link stream not found! UAOL node ID: 0x%x", node_id);
531+
return IPC4_INVALID_RESOURCE_ID;
532+
}
533+
break;
534+
#endif
535+
447536
default:
448537
return IPC4_INVALID_RESOURCE_ID;
449538
}
450539

451-
const struct device *dev = dai_get_device(type, node.f.v_index);
540+
const struct device *dev = dai_get_device(type, dai_index);
452541

453542
if (!dev) {
454543
tr_err(&basefw_comp_tr,

‎src/audio/copier/copier.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,8 @@ __cold static int copier_init(struct processing_module *mod)
191191
case ipc4_i2s_link_input_class:
192192
case ipc4_alh_link_output_class:
193193
case ipc4_alh_link_input_class:
194+
case ipc4_alh_uaol_stream_link_output_class:
195+
case ipc4_alh_uaol_stream_link_input_class:
194196
ret = copier_dai_create(dev, cd, copier, dev->pipeline);
195197
if (ret < 0) {
196198
comp_err(dev, "unable to create dai");

‎src/audio/copier/copier_dai.c‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,17 @@ __cold int copier_dai_create(struct comp_dev *dev, struct copier_data *cd,
322322
if (ret)
323323
return ret;
324324
break;
325+
case ipc4_alh_uaol_stream_link_output_class:
326+
case ipc4_alh_uaol_stream_link_input_class:
327+
dai.type = SOF_DAI_INTEL_UAOL;
328+
dai.is_config_blob = true;
329+
cd->gtw_type = ipc4_gtw_alh;
330+
ret = ipc4_find_dma_config(&dai, gtw_cfg_data, gtw_cfg_szie);
331+
if (ret != IPC4_SUCCESS) {
332+
comp_err(dev, "No uaol dma_config found in blob!");
333+
return -EINVAL;
334+
}
335+
break;
325336
case ipc4_dmic_link_input_class:
326337
dai.type = SOF_DAI_INTEL_DMIC;
327338
dai.is_config_blob = true;

‎src/audio/dai-zephyr.c‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,13 @@ __cold int dai_set_config(struct dai *dai, struct ipc_config_dai *common_config,
192192
cfg.type = DAI_IMX_MICFIL;
193193
cfg_params = &sof_cfg->micfil;
194194
break;
195+
case SOF_DAI_INTEL_UAOL:
196+
cfg.type = DAI_INTEL_UAOL;
197+
cfg.channels = common_config->gtw_fmt->channels_count;
198+
cfg.word_size = common_config->gtw_fmt->depth;
199+
cfg_params = spec_config;
200+
dai_set_link_hda_config(&cfg.link_config, common_config, spec_config);
201+
break;
195202
default:
196203
return -EINVAL;
197204
}

‎src/include/ipc/dai.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,8 @@ enum sof_ipc_dai_type {
9494
SOF_DAI_AMD_SP_VIRTUAL, /**<Amd SP VIRTUAL */
9595
SOF_DAI_AMD_HS_VIRTUAL, /**<Amd HS VIRTUAL */
9696
SOF_DAI_IMX_MICFIL, /**< i.MX MICFIL */
97-
SOF_DAI_AMD_SW_AUDIO /**<Amd SW AUDIO */
97+
SOF_DAI_AMD_SW_AUDIO, /**<Amd SW AUDIO */
98+
SOF_DAI_INTEL_UAOL, /**< Intel UAOL */
9899
};
99100

100101
/* general purpose DAI configuration */

‎src/ipc/ipc4/dai.c‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@ void dai_set_link_hda_config(uint16_t *link_config,
6060
}
6161
link_cfg.part.stream = common_config->host_dma_config[0]->stream_id;
6262
break;
63+
case SOF_DAI_INTEL_UAOL:
64+
link_cfg.full = 0;
65+
link_cfg.part.hchan = gtw_fmt->channels_count - 1;
66+
link_cfg.part.dir = common_config->direction;
67+
link_cfg.part.stream = common_config->host_dma_config[0]->stream_id;
68+
break;
6369
default:
6470
/* other types of DAIs not need link_config */
6571
return;
@@ -112,6 +118,13 @@ int dai_config_dma_channel(struct dai_data *dd, struct comp_dev *dev, const void
112118
*/
113119
channel = 0;
114120
break;
121+
#if ACE_VERSION > ACE_VERSION_1_5
122+
case SOF_DAI_INTEL_UAOL:
123+
channel = 0;
124+
if (dai->host_dma_config[0]->pre_allocated_by_host)
125+
channel = dai->host_dma_config[0]->dma_channel_id;
126+
break;
127+
#endif
115128
default:
116129
/* other types of DAIs not handled for now */
117130
comp_err(dev, "Unknown dai type %d", dai->type);
@@ -173,6 +186,8 @@ int ipc_dai_data_config(struct dai_data *dd, struct comp_dev *dev)
173186
comp_dbg(dev, "dai_data_config() SOF_DAI_INTEL_ALH dev->ipc_config.frame_fmt: %d, stream_id: %d",
174187
dev->ipc_config.frame_fmt, dd->stream_id);
175188

189+
break;
190+
case SOF_DAI_INTEL_UAOL:
176191
break;
177192
default:
178193
/* other types of DAIs not handled for now */

‎src/lib/dai.c‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,9 @@ const struct device *zephyr_dev[] = {
185185
#if CONFIG_DAI_NXP_MICFIL
186186
DT_FOREACH_STATUS_OKAY(nxp_dai_micfil, GET_DEVICE_LIST)
187187
#endif
188+
#if CONFIG_DAI_INTEL_UAOL
189+
DT_FOREACH_STATUS_OKAY(intel_uaol_dai, GET_DEVICE_LIST)
190+
#endif
188191
};
189192

190193
const struct device **dai_get_device_list(size_t *count)
@@ -207,6 +210,8 @@ static int sof_dai_type_to_zephyr(uint32_t type)
207210
return DAI_INTEL_HDA;
208211
case SOF_DAI_INTEL_ALH:
209212
return DAI_INTEL_ALH;
213+
case SOF_DAI_INTEL_UAOL:
214+
return DAI_INTEL_UAOL;
210215
case SOF_DAI_IMX_SAI:
211216
return DAI_IMX_SAI;
212217
case SOF_DAI_IMX_ESAI:
@@ -285,6 +290,7 @@ static void dai_set_device_params(struct dai *d)
285290
#endif
286291
break;
287292
case SOF_DAI_INTEL_HDA:
293+
case SOF_DAI_INTEL_UAOL:
288294
d->dma_dev = SOF_DMA_DEV_HDA;
289295
d->dma_caps = SOF_DMA_CAP_HDA;
290296
break;

0 commit comments

Comments
 (0)