Skip to content

ALSA: intel-nhlt: Fix ssp v1.5 blob size and add support for SSP blob V3.0 #5585

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

Closed
ujfalusi wants to merge 2 commits into from
Closed

ALSA: intel-nhlt: Fix ssp v1.5 blob size and add support for SSP blob V3.0 #5585

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ca33c8
ALSA: intel-nhlt: Adjust the SSP blob size for v1.5 by one uint32_t
ujfalusi Nov 10, 2025
27067d3
ALSA: intel-nhlt: Add SSP blob V3.0 definition
ujfalusi Nov 10, 2025
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
12 changes: 10 additions & 2 deletions sound/hda/core/intel-nhlt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,10 @@ EXPORT_SYMBOL(intel_nhlt_ssp_endpoint_mask);
#define SSP_BLOB_V2_0_MDIVC_OFFSET 20 /* offset in u32 */
#define SSP_BLOB_VER_2_0 0xEE000200

#define SSP_BLOB_V3_0_SIZE 200
#define SSP_BLOB_V3_0_MDIVC_OFFSET 50 /* offset in u32 */
#define SSP_BLOB_VER_3_0 0xEE000300

int intel_nhlt_ssp_mclk_mask(struct nhlt_acpi_table *nhlt, int ssp_num)
{
struct nhlt_endpoint *epnt;
Expand Down Expand Up @@ -205,12 +209,16 @@ int intel_nhlt_ssp_mclk_mask(struct nhlt_acpi_table *nhlt, int ssp_num)

blob = (u32 *)cfg->config.caps;

if (blob[1] == SSP_BLOB_VER_2_0) {
if (blob[1] == SSP_BLOB_VER_3_0) {
mdivc_offset = SSP_BLOB_V3_0_MDIVC_OFFSET;
size = SSP_BLOB_V3_0_SIZE + sizeof(uint32_t);
} else if (blob[1] == SSP_BLOB_VER_2_0) {
mdivc_offset = SSP_BLOB_V2_0_MDIVC_OFFSET;
size = SSP_BLOB_V2_0_SIZE;
} else if (blob[1] == SSP_BLOB_VER_1_5) {
mdivc_offset = SSP_BLOB_V1_5_MDIVC_OFFSET;
size = SSP_BLOB_V1_5_SIZE;
/* mdivc is a flexible array with at least one value */
size = SSP_BLOB_V1_5_SIZE + sizeof(uint32_t);
} else {
mdivc_offset = SSP_BLOB_V1_0_MDIVC_OFFSET;
size = SSP_BLOB_V1_0_SIZE;
Expand Down
Loading