tpm: tpm_tis: Fix UPX-i11 DMI_PRODUCT_VERSION string

[PATCH] tpm: tpm_tis: Fix UPX-i11 DMI_PRODUCT_VERSION string

Posted by Peter Ujfalusi 2 years, 6 months ago

The patch which made it to the kernel somehow lost the "01" from the
string, making the match to not work anymore.

Link: https://lore.kernel.org/lkml/20230524085844.11580-1-peter.ujfalusi@linux.intel.com/
Fixes: edb13d7bb034 ("tpm: tpm_tis: Disable interrupts *only* for AEON UPX-i11")
---
Hi Jarkko,

Can you send this patch for the 6.5 cycle?
edb13d7bb034 was applied in 6.5-rc3 and I just updated my work tree to notice
the regression.

Thank you,
Peter

 drivers/char/tpm/tpm_tis.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index ac4daaf294a3..2bb9901a329a 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -183,7 +183,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_VERSION, "UPX-TGL01"),
 		},
 	},
 	{}
-- 
2.41.0

Re: [PATCH] tpm: tpm_tis: Fix UPX-i11 DMI_PRODUCT_VERSION string

Posted by Jarkko Sakkinen 2 years, 6 months ago

On Tue Aug 8, 2023 at 9:18 AM EEST, Peter Ujfalusi wrote:
> The patch which made it to the kernel somehow lost the "01" from the
> string, making the match to not work anymore.
>
> Link: https://lore.kernel.org/lkml/20230524085844.11580-1-peter.ujfalusi@linux.intel.com/
> Fixes: edb13d7bb034 ("tpm: tpm_tis: Disable interrupts *only* for AEON UPX-i11")
> ---
> Hi Jarkko,
>
> Can you send this patch for the 6.5 cycle?
> edb13d7bb034 was applied in 6.5-rc3 and I just updated my work tree to notice
> the regression.
>
> Thank you,
> Peter
>
>  drivers/char/tpm/tpm_tis.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
> index ac4daaf294a3..2bb9901a329a 100644
> --- a/drivers/char/tpm/tpm_tis.c
> +++ b/drivers/char/tpm/tpm_tis.c
> @@ -183,7 +183,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_VERSION, "UPX-TGL01"),
>  		},
>  	},
>  	{}

Yes. I'm sending a PR for v6.5-rc6 tomorrow anyhow.

BR, Jarkko

Re: [PATCH] tpm: tpm_tis: Fix UPX-i11 DMI_PRODUCT_VERSION string

Posted by Péter Ujfalusi 2 years, 6 months ago


On 08/08/2023 09:18, Peter Ujfalusi wrote:
> The patch which made it to the kernel somehow lost the "01" from the
> string, making the match to not work anymore.
> 
> Link: https://lore.kernel.org/lkml/20230524085844.11580-1-peter.ujfalusi@linux.intel.com/
> Fixes: edb13d7bb034 ("tpm: tpm_tis: Disable interrupts *only* for AEON UPX-i11")
> ---
> Hi Jarkko,
> 
> Can you send this patch for the 6.5 cycle?
> edb13d7bb034 was applied in 6.5-rc3 and I just updated my work tree to notice
> the regression.
> 
> Thank you,
> Peter
> 
>  drivers/char/tpm/tpm_tis.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
> index ac4daaf294a3..2bb9901a329a 100644
> --- a/drivers/char/tpm/tpm_tis.c
> +++ b/drivers/char/tpm/tpm_tis.c
> @@ -183,7 +183,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_VERSION, "UPX-TGL01"),

The DMI property also got changed in the applied patch, it should have
been DMI_PRODUCT_NAME, I will send v2 shortly, please ignore this version

>  		},
>  	},
>  	{}

-- 
Péter

Re: [PATCH] tpm: tpm_tis: Fix UPX-i11 DMI_PRODUCT_VERSION string

Posted by Jarkko Sakkinen 2 years, 6 months ago

On Tue Aug 8, 2023 at 12:37 PM EEST, Péter Ujfalusi wrote:
>
>
> On 08/08/2023 09:18, Peter Ujfalusi wrote:
> > The patch which made it to the kernel somehow lost the "01" from the
> > string, making the match to not work anymore.
> > 
> > Link: https://lore.kernel.org/lkml/20230524085844.11580-1-peter.ujfalusi@linux.intel.com/
> > Fixes: edb13d7bb034 ("tpm: tpm_tis: Disable interrupts *only* for AEON UPX-i11")
> > ---
> > Hi Jarkko,
> > 
> > Can you send this patch for the 6.5 cycle?
> > edb13d7bb034 was applied in 6.5-rc3 and I just updated my work tree to notice
> > the regression.
> > 
> > Thank you,
> > Peter
> > 
> >  drivers/char/tpm/tpm_tis.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
> > index ac4daaf294a3..2bb9901a329a 100644
> > --- a/drivers/char/tpm/tpm_tis.c
> > +++ b/drivers/char/tpm/tpm_tis.c
> > @@ -183,7 +183,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_VERSION, "UPX-TGL01"),
>
> The DMI property also got changed in the applied patch, it should have
> been DMI_PRODUCT_NAME, I will send v2 shortly, please ignore this version

sure

BR, Jarkko