Chrome DUT based on tgl_max98373_rt5682: override tplg and quirk data by sathya-nujella · Pull Request #2345 · thesofproject/linux

sathya-nujella · 2020-08-05T22:35:41Z

Chrome DUT based on tgl_max98373_rt5682: override tplg and quirk data

Below changes are done here:

1)Machine driver's platform data has a copy of acpi mach data.
So, override tplg info on this platform data and use this tplg info
while loading tplg binary. Updated sof pcm.c accordingly.

A Chrome System based on tgl_max98373_rt5682 has different SSP and tplg
configurations. Using DMI data of this variant DUT, overiride
quirk and tplg information.

ranj063 · 2020-08-06T03:31:59Z

@dbaluta how would this change affect you?

ghost

The change looks ok, but the topology names doesn't seem so good. I'd really like us to follow the previous convention with rt5682 first followed by the amplifier name.

ghost

LGTM, but can you also send a PR to change the topology names for rt5682-max98373 in sound/soc/intel/common and also in SOF tools/topology/CMakefile

Thanks @sathya-nujella

ghost · 2020-08-10T15:54:23Z

SOFCI TEST

ghost · 2020-08-10T16:03:23Z

@sathya-nujella I was talking about a simple change like this:

diff --git a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
index 6816847bee40..355a6d8ac175 100644
--- a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
@@ -261,19 +261,19 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_machines[] = {
        },
        {
                .id = "10EC5682",
-               .drv_name = "tgl_max98357a_rt5682",
+               .drv_name = "tgl_rt5682_max98357a",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &tgl_codecs,
                .sof_fw_filename = "sof-tgl.ri",
-               .sof_tplg_filename = "sof-tgl-max98357a-rt5682.tplg",
+               .sof_tplg_filename = "sof-tgl-rt5682-max98357a.tplg",
        },
        {
                .id = "10EC5682",
-               .drv_name = "tgl_max98373_rt5682",
+               .drv_name = "tgl_rt5682_max98373",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &tgl_max98373_amp,
                .sof_fw_filename = "sof-tgl.ri",
-               .sof_tplg_filename = "sof-tgl-max98373-rt5682.tplg",
+               .sof_tplg_filename = "sof-tgl-rt5682-max98373.tplg",
        },
        {},
 };
@@ -319,7 +319,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_sdw_machines[] = {
                .links = tgl_chromebook_base,
                .drv_name = "sof_sdw",
                .sof_fw_filename = "sof-tgl.ri",
-               .sof_tplg_filename = "sof-tgl-sdw-max98373-rt5682.tplg",
+               .sof_tplg_filename = "sof-tgl-sdw-rt5682-max98373.tplg",
        },
        {
                .link_mask = 0x1, /* this will only enable rt5682 for now */

ghost · 2020-08-10T16:05:45Z

LGTM, but can you also send a PR to change the topology names for rt5682-max98373 in sound/soc/intel/common and also in SOF tools/topology/CMakefile

Thanks @sathya-nujella

sure @plbossart , I will do.

ghost · 2020-08-10T16:07:15Z

@sathya-nujella I was talking about a simple change like this:

diff --git a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
index 6816847bee40..355a6d8ac175 100644
--- a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
@@ -261,19 +261,19 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_machines[] = {
        },
        {
                .id = "10EC5682",
-               .drv_name = "tgl_max98357a_rt5682",
+               .drv_name = "tgl_rt5682_max98357a",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &tgl_codecs,
                .sof_fw_filename = "sof-tgl.ri",
-               .sof_tplg_filename = "sof-tgl-max98357a-rt5682.tplg",
+               .sof_tplg_filename = "sof-tgl-rt5682-max98357a.tplg",
        },
        {
                .id = "10EC5682",
-               .drv_name = "tgl_max98373_rt5682",
+               .drv_name = "tgl_rt5682_max98373",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &tgl_max98373_amp,
                .sof_fw_filename = "sof-tgl.ri",
-               .sof_tplg_filename = "sof-tgl-max98373-rt5682.tplg",
+               .sof_tplg_filename = "sof-tgl-rt5682-max98373.tplg",
        },
        {},
 };
@@ -319,7 +319,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_sdw_machines[] = {
                .links = tgl_chromebook_base,
                .drv_name = "sof_sdw",
                .sof_fw_filename = "sof-tgl.ri",
-               .sof_tplg_filename = "sof-tgl-sdw-max98373-rt5682.tplg",
+               .sof_tplg_filename = "sof-tgl-sdw-rt5682-max98373.tplg",
        },
        {
                .link_mask = 0x1, /* this will only enable rt5682 for now */

Sure @plbossart , understood. I will do in a separate PR. Thanks!

ghost · 2020-08-12T02:44:01Z

rebased on top of latest sof-dev

ghost

sorry, I should have noticed these before :-(

ghost · 2020-08-12T17:11:55Z

sorry, I should have noticed these before :-(

np thank you for inputs.

A Chrome System based on tgl_max98373_rt5682 has different SSP interface configurations. Using DMI data of this variant DUT, override quirk data. Signed-off-by: Sathyanarayana Nujella <sathyanarayana.nujella@intel.com> Signed-off-by: Mac Chiang <mac.chiang@intel.com>

Add tplg file override based on system DMI data matching. Based on DMI match, update tplg_filename in sof_pdata. In ACPI based systems: tplg_file name is assigned in acpi mach table. Do not update sof_pdata->tplg_filename from mach->sof_tplg_filename. This way, tplg_filename provided via dmi table will be loaded in system. Signed-off-by: Sathyanarayana Nujella <sathyanarayana.nujella@intel.com>

ghost

Thanks for addressing the comments!

sathya-nujella requested review from bardliao, dbaluta, juimonen, keyonjie, kv2019i, lgirdwood, lyakh, plbossart and ranj063 as code owners August 5, 2020 22:35

sathya-nujella force-pushed the amp_ssp2_tplg_override_chrome branch from 6e90d8f to 7064584 Compare August 6, 2020 01:37

lyakh requested changes Aug 6, 2020

View reviewed changes

Comment thread sound/soc/sof/pcm.c Outdated

Comment thread sound/soc/intel/boards/sof_rt5682.c

Comment thread sound/soc/intel/boards/sof_rt5682.c Outdated

Comment thread sound/soc/intel/boards/sof_rt5682.c Outdated

sathya-nujella force-pushed the amp_ssp2_tplg_override_chrome branch from 7064584 to cc98e78 Compare August 10, 2020 01:32

sathya-nujella requested a review from libinyang as a code owner August 10, 2020 01:32

sathya-nujella force-pushed the amp_ssp2_tplg_override_chrome branch from cc98e78 to 78ecc07 Compare August 10, 2020 06:40

plbossart requested changes Aug 10, 2020

View reviewed changes

Comment thread sound/soc/sof/sof-pci-dev.c Outdated

sathya-nujella force-pushed the amp_ssp2_tplg_override_chrome branch from 78ecc07 to 4dde2e5 Compare August 10, 2020 15:44

plbossart previously approved these changes Aug 10, 2020

View reviewed changes

ranj063 previously approved these changes Aug 10, 2020

View reviewed changes

lyakh requested changes Aug 11, 2020

View reviewed changes

Comment thread sound/soc/sof/sof-pci-dev.c Outdated

sathya-nujella dismissed stale reviews from ranj063 and plbossart via 0a7d96d August 11, 2020 06:07

sathya-nujella force-pushed the amp_ssp2_tplg_override_chrome branch 2 times, most recently from 0a7d96d to 9251b90 Compare August 12, 2020 02:42

lyakh requested changes Aug 12, 2020

View reviewed changes

Comment thread sound/soc/sof/sof-pci-dev.c Outdated

Comment thread sound/soc/sof/sof-pci-dev.c Outdated

sathya-nujella force-pushed the amp_ssp2_tplg_override_chrome branch from 9251b90 to 86a9705 Compare August 12, 2020 17:08

plbossart previously approved these changes Aug 12, 2020

View reviewed changes

ranj063 reviewed Aug 12, 2020

View reviewed changes

Comment thread sound/soc/intel/boards/sof_rt5682.c

Sathyanarayana Nujella added 2 commits August 12, 2020 15:27

sathya-nujella dismissed plbossart’s stale review via b675928 August 12, 2020 22:32

sathya-nujella force-pushed the amp_ssp2_tplg_override_chrome branch from 86a9705 to b675928 Compare August 12, 2020 22:32

lyakh approved these changes Aug 13, 2020

View reviewed changes

plbossart approved these changes Aug 13, 2020

View reviewed changes

plbossart merged commit 20d59b1 into thesofproject:topic/sof-dev Aug 13, 2020

sathya-nujella mentioned this pull request Sep 3, 2020

[NOT TO MERGE] TO Discuss: Override quirk/SSP and tplg name #2286

Closed

sathya-nujella mentioned this pull request Sep 14, 2020

topology: Update tplg file name for tgl system with max98373-rt5682 thesofproject/sof#3407

Merged

Conversation

sathya-nujella commented Aug 5, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ranj063 commented Aug 6, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ghost left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

ghost left a comment

Choose a reason for hiding this comment

Uh oh!

ghost commented Aug 10, 2020

Uh oh!

ghost commented Aug 10, 2020

Uh oh!

ghost commented Aug 10, 2020

Uh oh!

ghost commented Aug 10, 2020

Uh oh!

Uh oh!

ghost commented Aug 12, 2020

Uh oh!

ghost left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

ghost commented Aug 12, 2020

Uh oh!

Uh oh!

ghost left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

sathya-nujella commented Aug 5, 2020 •

edited

Loading