[v1] ALSA: SOF: sof-pci-dev: Fix community key quirk detection

Message ID 20231020145953.v1.1.Iaf5702dc3f8af0fd2f81a22ba2da1a5e15b3604c@changeid
State New
Headers
Series [v1] ALSA: SOF: sof-pci-dev: Fix community key quirk detection |

Commit Message

Mark Hasemeyer Oct. 20, 2023, 8:59 p.m. UTC
  Some Chromebooks do not populate the product family DMI value resulting
in firmware load failures.

Add another quirk detection entry that looks for "Google" in the BIOS
version. Theoretically, PRODUCT_FAMILY could be replaced with
BIOS_VERSION, but it is left as a quirk to be conservative.

Cc: stable@vger.kernel.org
Signed-off-by: Mark Hasemeyer <markhas@chromium.org>
---

 sound/soc/sof/sof-pci-dev.c | 7 +++++++
 1 file changed, 7 insertions(+)
  

Comments

Curtis Malainey Oct. 20, 2023, 9:19 p.m. UTC | #1
Curtis Malainey | Chrome OS Audio Senior Software Engineer |
cujomalainey@google.com | Sound Open Firmware Lead


On Fri, Oct 20, 2023 at 2:00 PM Mark Hasemeyer <markhas@chromium.org> wrote:
>
> Some Chromebooks do not populate the product family DMI value resulting
> in firmware load failures.
>
> Add another quirk detection entry that looks for "Google" in the BIOS
> version. Theoretically, PRODUCT_FAMILY could be replaced with
> BIOS_VERSION, but it is left as a quirk to be conservative.
>
> Cc: stable@vger.kernel.org
> Signed-off-by: Mark Hasemeyer <markhas@chromium.org>

Acked-by: Curtis Malainey <cujomalainey@chromium.org>

> ---
>
>  sound/soc/sof/sof-pci-dev.c | 7 +++++++
>  1 file changed, 7 insertions(+)
>
> diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c
> index 1d706490588e..64b326e3ef85 100644
> --- a/sound/soc/sof/sof-pci-dev.c
> +++ b/sound/soc/sof/sof-pci-dev.c
> @@ -145,6 +145,13 @@ static const struct dmi_system_id community_key_platforms[] = {
>                         DMI_MATCH(DMI_PRODUCT_FAMILY, "Google"),
>                 }
>         },
> +       {
> +               .ident = "Google firmware",
> +               .callback = chromebook_use_community_key,
> +               .matches = {
> +                       DMI_MATCH(DMI_BIOS_VERSION, "Google"),
> +               }
> +       },
>         {},
>  };
>
> --
> 2.42.0.655.g421f12c284-goog
>
  
Pierre-Louis Bossart Oct. 20, 2023, 9:21 p.m. UTC | #2
> On Fri, Oct 20, 2023 at 2:00 PM Mark Hasemeyer <markhas@chromium.org> wrote:
>>
>> Some Chromebooks do not populate the product family DMI value resulting
>> in firmware load failures.
>>
>> Add another quirk detection entry that looks for "Google" in the BIOS
>> version. Theoretically, PRODUCT_FAMILY could be replaced with
>> BIOS_VERSION, but it is left as a quirk to be conservative.
>>
>> Cc: stable@vger.kernel.org
>> Signed-off-by: Mark Hasemeyer <markhas@chromium.org>
> 
> Acked-by: Curtis Malainey <cujomalainey@chromium.org>

Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

Now let's see how the machine drivers need to be updated...
  
Mark Brown Oct. 20, 2023, 9:21 p.m. UTC | #3
On Fri, Oct 20, 2023 at 02:59:53PM -0600, Mark Hasemeyer wrote:
> Some Chromebooks do not populate the product family DMI value resulting
> in firmware load failures.
> 
> Add another quirk detection entry that looks for "Google" in the BIOS
> version. Theoretically, PRODUCT_FAMILY could be replaced with
> BIOS_VERSION, but it is left as a quirk to be conservative.

Please submit patches using subject lines reflecting the style for the
subsystem, this makes it easier for people to identify relevant patches.
Look at what existing commits in the area you're changing are doing and
make sure your subject lines visually resemble what they're doing.
There's no need to resubmit to fix this alone.
  
Mark Brown Oct. 24, 2023, 1:55 p.m. UTC | #4
On Fri, 20 Oct 2023 14:59:53 -0600, Mark Hasemeyer wrote:
> Some Chromebooks do not populate the product family DMI value resulting
> in firmware load failures.
> 
> Add another quirk detection entry that looks for "Google" in the BIOS
> version. Theoretically, PRODUCT_FAMILY could be replaced with
> BIOS_VERSION, but it is left as a quirk to be conservative.
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ALSA: SOF: sof-pci-dev: Fix community key quirk detection
      commit: 7dd692217b861a8292ff8ac2c9d4458538fd6b96

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark
  

Patch

diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c
index 1d706490588e..64b326e3ef85 100644
--- a/sound/soc/sof/sof-pci-dev.c
+++ b/sound/soc/sof/sof-pci-dev.c
@@ -145,6 +145,13 @@  static const struct dmi_system_id community_key_platforms[] = {
 			DMI_MATCH(DMI_PRODUCT_FAMILY, "Google"),
 		}
 	},
+	{
+		.ident = "Google firmware",
+		.callback = chromebook_use_community_key,
+		.matches = {
+			DMI_MATCH(DMI_BIOS_VERSION, "Google"),
+		}
+	},
 	{},
 };