Skip to content
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.

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

tpm: tpm_tis: Fix UPX-i11 DMI_MATCH condition #4510

Conversation

ujfalusi
Copy link
Collaborator

@ujfalusi ujfalusi commented Aug 8, 2023

The patch which made it to the kernel somehow changed the
match condition from
DMI_MATCH(DMI_PRODUCT_NAME, "UPX-TGL01")
to
DMI_MATCH(DMI_PRODUCT_VERSION, "UPX-TGL")

Revert back to the correct match condition to disable the
interrupt mode on the board.

Link: https://lore.kernel.org/lkml/[email protected]/
Fixes: edb13d7 ("tpm: tpm_tis: Disable interrupts only for AEON UPX-i11")

aiChaoSONG
aiChaoSONG previously approved these changes Aug 8, 2023
@ujfalusi
Copy link
Collaborator Author

ujfalusi commented Aug 8, 2023

I cannot provide the link to lore as for some reason it is not picking it up

@ujfalusi
Copy link
Collaborator Author

ujfalusi commented Aug 8, 2023

Changes since v1:

  • the DMI match condition also changed, use the correct one: DMI_MATCH(DMI_PRODUCT_NAME, "UPX-TGL01")

The patch which made it to the kernel somehow changed the
match condition from
DMI_MATCH(DMI_PRODUCT_NAME, "UPX-TGL01")
to
DMI_MATCH(DMI_PRODUCT_VERSION, "UPX-TGL")

Revert back to the correct match condition to disable the
interrupt mode on the board.

Link: https://lore.kernel.org/lkml/[email protected]/
Fixes: edb13d7 ("tpm: tpm_tis: Disable interrupts *only* for AEON UPX-i11")
@ujfalusi ujfalusi changed the title tpm: tpm_tis: Fix UPX-i11 DMI_PRODUCT_VERSION string tpm: tpm_tis: Fix UPX-i11 DMI_MATCH condition Aug 8, 2023
@@ -167,7 +167,7 @@ static const struct dmi_system_id tpm_tis_dmi_table[] = {
.ident = "UPX-TGL",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "AAEON"),
DMI_MATCH(DMI_PRODUCT_VERSION, "UPX-TGL"),
DMI_MATCH(DMI_PRODUCT_NAME, "UPX-TGL01"),
Copy link
Member

Choose a reason for hiding this comment

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

well d'uh, I assumed that the upstream version was the correct one...

@plbossart plbossart merged commit 10b82ff into thesofproject:topic/sof-dev Aug 8, 2023
@ujfalusi
Copy link
Collaborator Author

ujfalusi commented Aug 9, 2023

@ujfalusi ujfalusi deleted the peter/sof/pr/tpm_fix_upx_i11_again branch November 30, 2023 06:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants