Skip to content

src: base_fw: adjust ssp copier init flow for ptl (with Zephyr update)#9220

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

Merged
kv2019i merged 2 commits into from
Jun 19, 2024
Merged

src: base_fw: adjust ssp copier init flow for ptl (with Zephyr update) #9220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed4d000
src: base_fw: add I2S IPC4 blob version for PTL
dnikodem Jun 11, 2024
7ea4f27
src: copier: update virtual index value for ssp
dnikodem Jun 11, 2024
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
5 changes: 5 additions & 0 deletions src/audio/base_fw_intel.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,6 +63,11 @@ int basefw_vendor_hw_config(uint32_t *data_offset, char *data)
tuple = tlv_next(tuple);
tlv_value_uint32_set(tuple, IPC4_LP_EBB_COUNT_HW_CFG, PLATFORM_LPSRAM_EBB_COUNT);

#ifdef CONFIG_SOC_INTEL_ACE30_PTL
tuple = tlv_next(tuple);
tlv_value_uint32_set(tuple, IPC4_I2S_CAPS_HW_CFG, I2S_VER_30_PTL);
#endif

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

Expand Down
2 changes: 2 additions & 0 deletions src/audio/dai-zephyr.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,8 @@ int dai_set_config(struct dai *dai, struct ipc_config_dai *common_config,
cfg_params = is_blob ? spec_config : &sof_cfg->ssp;
dai_set_link_hda_config(&cfg.link_config,
common_config, cfg_params);
/* Store tdm slot group index*/
cfg.tdm_slot_group = common_config->dai_index & 0xF;
break;
case SOF_DAI_INTEL_ALH:
cfg.type = is_blob ? DAI_INTEL_ALH_NHLT : DAI_INTEL_ALH;
Expand Down
3 changes: 3 additions & 0 deletions src/include/ipc4/base_fw.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -728,4 +728,7 @@ struct schedulers_info {

struct ipc4_system_time_info *basefw_get_system_time_info(void);

/* Specifies I2S IPC4 version for PTL platform */
static const uint32_t I2S_VER_30_PTL = 0x40000;

@kv2019ikv2019iJun 19, 2024

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

This would ideally be put in some Intel-specific file, but as we have no such file now, base_fw.h is probably the best fit. But if we get more of these, we need to add base_fw_intel.h and have these there (and also if there are any build-time dependencies).

#endif /* __SOF_IPC4_BASE_FW_H__ */
2 changes: 1 addition & 1 deletion west.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ manifest:

- name: zephyr
repo-path: zephyr
revision: 0a3f2f0397a86425cc7d12fa3a0c0ab8020d80e1
revision: a2386efbce1866613f7c714b958a159364dc5f37

@kv2019ikv2019iJun 19, 2024

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

This west update could be done as a separate PR and then do this PR. Recommendation is to update west.yml and code only and only if Zephyr has a interface changes (i.e. something SOF uses is changed). In this case, it seems this is a new capabiltiy, so Zephyr could be update dfirst, and then this PR could be done on top once Zephyr baseline has "tdm_slot_group".

remote: zephyrproject

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