Skip to content

dai: uaol: add support for Intel UAOL (includes west.yml Zephyr update) #10567

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
serhiy-katsyuba-intel wants to merge 4 commits into
base: main
Choose a base branch
from
+147 −7
Open

dai: uaol: add support for Intel UAOL (includes west.yml Zephyr update) #10567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7cf3d8a
west.yml: update Zephyr to c8b9adaec98
serhiy-katsyuba-intel Feb 2, 2026
c5148bf
copier_dai: fix typo
serhiy-katsyuba-intel Mar 13, 2026
6572036
dai: uaol: add support for Intel UAOL
tlissows Jun 13, 2024
77afefe
boards: intel: enable UAOL on ACE platforms
serhiy-katsyuba-intel Mar 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/boards/intel_adsp/Kconfig.defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,9 @@ config INTEL_ADSP_TIMER
config MM_DRV
default y

config UAOL
default y if ACE


# # Zephyr / power settings
# ----------------------------------------
Expand Down
94 changes: 92 additions & 2 deletions src/audio/base_fw_intel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@
#include <sof/lib/memory.h>
#include <sof/lib_manager.h>

#if CONFIG_UAOL_INTEL_ADSP
#include <zephyr/drivers/uaol.h>
#endif

#include <ipc4/base_fw.h>
#include <ipc4/alh.h>
#include <rimage/sof/user/manifest.h>
Expand All @@ -41,6 +45,23 @@ struct ipc4_modules_info {
/* Sanity check because a subtraction of those sizes is performed later on */
STATIC_ASSERT(sizeof(struct ipc4_modules_info) < SOF_IPC_MSG_MAX_SIZE,
invalid_modules_info_struct_size);

#if CONFIG_UAOL_INTEL_ADSP
struct ipc4_uaol_link_capabilities {
uint32_t input_streams_supported : 4;
uint32_t output_streams_supported : 4;
uint32_t bidirectional_streams_supported : 5;
uint32_t rsvd : 19;
uint32_t max_tx_fifo_size;
uint32_t max_rx_fifo_size;
} __packed __aligned(4);

struct ipc4_uaol_capabilities {
uint32_t link_count;
struct ipc4_uaol_link_capabilities link_caps[];
} __packed __aligned(4);
#endif /* CONFIG_UAOL_INTEL_ADSP */

/*
* TODO: default to value of ACE1.x platforms. This is defined
* in multiple places in Zephyr, mm_drv_intel_adsp.h and
Expand Down Expand Up @@ -71,7 +92,7 @@ __cold int basefw_vendor_fw_config(uint32_t *data_offset, char *data)
tlv_value_uint32_set(tuple, IPC4_SLOW_CLOCK_FREQ_HZ_FW_CFG, IPC4_ALH_CAVS_1_8);

tuple = tlv_next(tuple);
tlv_value_uint32_set(tuple, IPC4_UAOL_SUPPORT, 0);
tlv_value_uint32_set(tuple, IPC4_UAOL_SUPPORT, IS_ENABLED(CONFIG_UAOL_INTEL_ADSP));

tuple = tlv_next(tuple);
tlv_value_uint32_set(tuple, IPC4_ALH_SUPPORT_LEVEL_FW_CFG, IPC4_ALH_CAVS_1_8);
Expand All @@ -82,6 +103,55 @@ __cold int basefw_vendor_fw_config(uint32_t *data_offset, char *data)
return 0;
}

#if CONFIG_UAOL_INTEL_ADSP
#define DEV_AND_COMMA(node) DEVICE_DT_GET(node),
static const struct device *uaol_devs[] = {
DT_FOREACH_STATUS_OKAY(intel_adsp_uaol, DEV_AND_COMMA)
};

static void tlv_value_set_uaol_caps(struct sof_tlv *tuple, uint32_t type)
{
const size_t dev_count = ARRAY_SIZE(uaol_devs);
struct uaol_capabilities dev_cap;
struct ipc4_uaol_capabilities *caps = (struct ipc4_uaol_capabilities *)tuple->value;
size_t caps_size = offsetof(struct ipc4_uaol_capabilities, link_caps[dev_count]);
Copy link

Copilot AI Mar 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

offsetof(struct ..., link_caps[dev_count]) uses a non-constant array index; this is not valid with standard offsetof/__builtin_offsetof and can fail to compile. Compute the size as sizeof(*caps) + dev_count * sizeof(caps->link_caps[0]) (or the equivalent using the element type) instead.

Suggested change
size_t caps_size = offsetof(struct ipc4_uaol_capabilities, link_caps[dev_count]);
size_t caps_size = sizeof(*caps) + dev_count * sizeof(caps->link_caps[0]);

Copilot uses AI. Check for mistakes.
size_t i;
int ret;

memset(caps, 0, caps_size);

caps->link_count = dev_count;
for (i = 0; i < dev_count; i++) {
ret = uaol_get_capabilities(uaol_devs[i], &dev_cap);
if (ret)
continue;

caps->link_caps[i].input_streams_supported = dev_cap.input_streams;
caps->link_caps[i].output_streams_supported = dev_cap.output_streams;
caps->link_caps[i].bidirectional_streams_supported = dev_cap.bidirectional_streams;
caps->link_caps[i].max_tx_fifo_size = dev_cap.max_tx_fifo_size;
caps->link_caps[i].max_rx_fifo_size = dev_cap.max_rx_fifo_size;
}

tlv_value_set(tuple, type, caps_size, caps);
Copy link
Collaborator

@kv2019i kv2019i Mar 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not related to this PR, but reminds me we'd to add better protections against overrunning the IPC mailbox size. The overall length of the TLV is not known in these functions now, and it will be difficult to debug if we excedeed the space. Most of these are by definition ok as the structure is fixed and defined in FW.

}

static int uaol_stream_id_to_hda_link_stream_id(int uaol_stream_id)
{
size_t dev_count = ARRAY_SIZE(uaol_devs);
size_t i;

for (i = 0; i < dev_count; i++) {
int hda_link_stream_id = uaol_get_mapped_hda_link_stream_id(uaol_devs[i],
uaol_stream_id);
if (hda_link_stream_id >= 0)
return hda_link_stream_id;
}

return -1;
}
#endif /* CONFIG_UAOL_INTEL_ADSP */

__cold int basefw_vendor_hw_config(uint32_t *data_offset, char *data)
{
struct sof_tlv *tuple = (struct sof_tlv *)data;
Expand Down Expand Up @@ -124,6 +194,11 @@ __cold int basefw_vendor_hw_config(uint32_t *data_offset, char *data)
tlv_value_set(tuple, IPC4_INTEL_MIC_PRIVACY_CAPS_HW_CFG, sizeof(priv_caps), &priv_caps);
#endif

#if CONFIG_UAOL_INTEL_ADSP
tuple = tlv_next(tuple);
tlv_value_set_uaol_caps(tuple, IPC4_UAOL_CAPS_HW_CFG);
#endif

tuple = tlv_next(tuple);
*data_offset = (int)((char *)tuple - data);

Expand Down Expand Up @@ -454,6 +529,7 @@ __cold int basefw_vendor_set_large_config(struct comp_dev *dev, uint32_t param_i
__cold int basefw_vendor_dma_control(uint32_t node_id, const char *config_data, size_t data_size)
{
union ipc4_connector_node_id node = (union ipc4_connector_node_id)node_id;
int dai_index = node.f.v_index;
int ret, result;
enum sof_ipc_dai_type type;

Expand All @@ -477,11 +553,25 @@ __cold int basefw_vendor_dma_control(uint32_t node_id, const char *config_data,
case ipc4_i2s_link_input_class:
type = SOF_DAI_INTEL_SSP;
break;

#if CONFIG_UAOL_INTEL_ADSP
case ipc4_alh_uaol_stream_link_output_class:
case ipc4_alh_uaol_stream_link_input_class:
type = SOF_DAI_INTEL_UAOL;
dai_index = uaol_stream_id_to_hda_link_stream_id(node.f.v_index);
if (dai_index < 0) {
tr_err(&basefw_comp_tr,
"HDA link stream not found! UAOL node ID: 0x%x", node_id);
return IPC4_INVALID_RESOURCE_ID;
}
break;
#endif

default:
return IPC4_INVALID_RESOURCE_ID;
}

const struct device *dev = dai_get_device(type, node.f.v_index);
const struct device *dev = dai_get_device(type, dai_index);

if (!dev) {
tr_err(&basefw_comp_tr,
Expand Down
2 changes: 2 additions & 0 deletions src/audio/copier/copier.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,8 @@ __cold static int copier_init(struct processing_module *mod)
case ipc4_i2s_link_input_class:
case ipc4_alh_link_output_class:
case ipc4_alh_link_input_class:
case ipc4_alh_uaol_stream_link_output_class:
case ipc4_alh_uaol_stream_link_input_class:
ret = copier_dai_create(dev, cd, copier, dev->pipeline);
if (ret < 0) {
comp_err(dev, "unable to create dai");
Expand Down
17 changes: 14 additions & 3 deletions src/audio/copier/copier_dai.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ __cold int copier_dai_create(struct comp_dev *dev, struct copier_data *cd,
int dai_count;
int i, ret;
uint8_t *gtw_cfg_data = (uint8_t *)cd->config.gtw_cfg.config_data;
size_t gtw_cfg_szie = cd->config.gtw_cfg.config_length * 4;
size_t gtw_cfg_size = cd->config.gtw_cfg.config_length * 4;

assert_can_be_cold();

Expand Down Expand Up @@ -300,7 +300,7 @@ __cold int copier_dai_create(struct comp_dev *dev, struct copier_data *cd,
dai.type = SOF_DAI_INTEL_SSP;
dai.is_config_blob = true;
cd->gtw_type = ipc4_gtw_ssp;
ret = ipc4_find_dma_config(&dai, gtw_cfg_data, gtw_cfg_szie);
ret = ipc4_find_dma_config(&dai, gtw_cfg_data, gtw_cfg_size);
if (ret != 0) {
comp_err(dev, "No ssp dma_config found in blob!");
return -EINVAL;
Expand All @@ -322,11 +322,22 @@ __cold int copier_dai_create(struct comp_dev *dev, struct copier_data *cd,
if (ret)
return ret;
break;
case ipc4_alh_uaol_stream_link_output_class:
case ipc4_alh_uaol_stream_link_input_class:
dai.type = SOF_DAI_INTEL_UAOL;
dai.is_config_blob = true;
cd->gtw_type = ipc4_gtw_alh;
ret = ipc4_find_dma_config(&dai, gtw_cfg_data, gtw_cfg_size);
if (ret != IPC4_SUCCESS) {
comp_err(dev, "No uaol dma_config found in blob!");
return -EINVAL;
}
break;
case ipc4_dmic_link_input_class:
dai.type = SOF_DAI_INTEL_DMIC;
dai.is_config_blob = true;
cd->gtw_type = ipc4_gtw_dmic;
ret = ipc4_find_dma_config(&dai, gtw_cfg_data, gtw_cfg_szie);
ret = ipc4_find_dma_config(&dai, gtw_cfg_data, gtw_cfg_size);
if (ret != 0) {
comp_err(dev, "No dmic dma_config found in blob!");
return -EINVAL;
Expand Down
12 changes: 12 additions & 0 deletions src/audio/dai-zephyr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,18 @@ __cold int dai_set_config(struct dai *dai, struct ipc_config_dai *common_config,
cfg.type = DAI_IMX_MICFIL;
cfg_params = &sof_cfg->micfil;
break;
case SOF_DAI_INTEL_UAOL:
cfg.type = DAI_INTEL_UAOL;
cfg.channels = common_config->gtw_fmt->channels_count;
/*
* FIXME: The spec says HW expects container size here, not valid_bit_depth.
* However, tests fail if container size is used and work fine with
* valid_bit_depth. Needs investigation. Perhaps tests have a bug?
*/
cfg.word_size = common_config->gtw_fmt->valid_bit_depth;
cfg_params = spec_config;
dai_set_link_hda_config(&cfg.link_config, common_config, spec_config);
break;
default:
return -EINVAL;
}
Expand Down
3 changes: 2 additions & 1 deletion src/include/ipc/dai.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@ enum sof_ipc_dai_type {
SOF_DAI_AMD_SP_VIRTUAL, /**<Amd SP VIRTUAL */
SOF_DAI_AMD_HS_VIRTUAL, /**<Amd HS VIRTUAL */
SOF_DAI_IMX_MICFIL, /**< i.MX MICFIL */
SOF_DAI_AMD_SW_AUDIO /**<Amd SW AUDIO */
SOF_DAI_AMD_SW_AUDIO, /**<Amd SW AUDIO */
SOF_DAI_INTEL_UAOL, /**< Intel UAOL */
};

/* general purpose DAI configuration */
Expand Down
15 changes: 15 additions & 0 deletions src/ipc/ipc4/dai.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,12 @@ void dai_set_link_hda_config(uint16_t *link_config,
}
link_cfg.part.stream = common_config->host_dma_config[0]->stream_id;
break;
case SOF_DAI_INTEL_UAOL:
link_cfg.full = 0;
link_cfg.part.hchan = gtw_fmt->channels_count - 1;
link_cfg.part.dir = common_config->direction;
link_cfg.part.stream = common_config->host_dma_config[0]->stream_id;
break;
Comment on lines +63 to +68
Copy link

Copilot AI Mar 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hchan is derived as channels_count - 1. If channels_count is 0, this underflows and encodes an invalid hchan value. Clamp or validate the channel count before subtracting (e.g., ensure the minimum encoded value is 0 and only subtract when channels_count > 0).

Copilot uses AI. Check for mistakes.
default:
/* other types of DAIs not need link_config */
return;
Expand Down Expand Up @@ -112,6 +118,13 @@ int dai_config_dma_channel(struct dai_data *dd, struct comp_dev *dev, const void
*/
channel = 0;
break;
#if ACE_VERSION > ACE_VERSION_1_5
case SOF_DAI_INTEL_UAOL:
channel = 0;
if (dai->host_dma_config[0]->pre_allocated_by_host)
channel = dai->host_dma_config[0]->dma_channel_id;
break;
#endif
default:
/* other types of DAIs not handled for now */
comp_err(dev, "Unknown dai type %d", dai->type);
Expand Down Expand Up @@ -173,6 +186,8 @@ int ipc_dai_data_config(struct dai_data *dd, struct comp_dev *dev)
comp_dbg(dev, "dai_data_config() SOF_DAI_INTEL_ALH dev->ipc_config.frame_fmt: %d, stream_id: %d",
dev->ipc_config.frame_fmt, dd->stream_id);

break;
case SOF_DAI_INTEL_UAOL:
break;
default:
/* other types of DAIs not handled for now */
Expand Down
6 changes: 6 additions & 0 deletions src/lib/dai.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,9 @@ const struct device *zephyr_dev[] = {
#if CONFIG_DAI_NXP_MICFIL
DT_FOREACH_STATUS_OKAY(nxp_dai_micfil, GET_DEVICE_LIST)
#endif
#if CONFIG_DAI_INTEL_UAOL
DT_FOREACH_STATUS_OKAY(intel_uaol_dai, GET_DEVICE_LIST)
#endif
};

const struct device **dai_get_device_list(size_t *count)
Expand All @@ -207,6 +210,8 @@ static int sof_dai_type_to_zephyr(uint32_t type)
return DAI_INTEL_HDA;
case SOF_DAI_INTEL_ALH:
return DAI_INTEL_ALH;
case SOF_DAI_INTEL_UAOL:
return DAI_INTEL_UAOL;
case SOF_DAI_IMX_SAI:
return DAI_IMX_SAI;
case SOF_DAI_IMX_ESAI:
Expand Down Expand Up @@ -285,6 +290,7 @@ static void dai_set_device_params(struct dai *d)
#endif
break;
case SOF_DAI_INTEL_HDA:
case SOF_DAI_INTEL_UAOL:
d->dma_dev = SOF_DMA_DEV_HDA;
d->dma_caps = SOF_DMA_CAP_HDA;
break;
Expand Down
2 changes: 1 addition & 1 deletion west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ manifest:

- name: zephyr
repo-path: zephyr
revision: 653ebccc49ad1f79cae2729f4c6fabd5ff54d397
revision: c8b9adaec98778767d00a41bbb395eabe9f4985e
Copy link

@majunkier majunkier Mar 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could you please update to latest Zephyr version?

remote: zephyrproject

# Import some projects listed in zephyr/west.yml@revision
Expand Down
Loading