mbox series

[v2,0/4] Add missing TPM compatible strings

Message ID cover.1705140898.git.lukas@wunner.de
Headers show
Series Add missing TPM compatible strings | expand

Message

Lukas Wunner Jan. 13, 2024, 5:10 p.m. UTC 
Dear Jarkko,

you've requested me to resend two patches which add "atmel,attpm20p"
as a compatible string to the dt-bindings and to the driver:

https://lore.kernel.org/all/CY65RSEA4VMD.MXHPX898TSW4@suppilovahvero/

The patches depend on a commit which landed in Linus' tree yesterday,
it consolidates the TPM dt-bindings:

https://git.kernel.org/linus/26c9d152ebf3

So after pulling from Linus, you should be able to apply the enclosed
patches cleanly.

I am also including two patches to add other missing compatible strings
to the driver.  I already submitted them in November and December but
they haven't been picked up yet:

https://lore.kernel.org/all/096e5d9d22eaed0a256d2d9b315a77245bd423c6.1701095446.git.lukas@wunner.de/
https://lore.kernel.org/all/5c92620082189dc4e6be277952d0b46df26a6478.1702811113.git.lukas@wunner.de/

Because all these patches merely add device IDs, I believe they can be
picked up and forwarded to Linus at any time, even outside the merge
window.  (According to Documentation/process/stable-kernel-rules.rst,
patches which "just add a device ID" are eligible for stable and
should thus be fair game for fixes pulls.)

Thank you!

Lukas Wunner (4):
  dt-bindings: tpm: Add compatible string atmel,attpm20p
  tpm_tis_spi: Add compatible string atmel,attpm20p
  tpm_tis: Add compatible string atmel,at97sc3204
  tpm: tis_i2c: Add compatible string nuvoton,npct75x

 Documentation/devicetree/bindings/tpm/tcg,tpm_tis-spi.yaml | 1 +
 drivers/char/tpm/tpm_tis.c                                 | 1 +
 drivers/char/tpm/tpm_tis_i2c.c                             | 2 ++
 drivers/char/tpm/tpm_tis_spi_main.c                        | 1 +
 4 files changed, 5 insertions(+)

Comments

Jarkko Sakkinen Jan. 13, 2024, 9:54 p.m. UTC | #1 
On Sat Jan 13, 2024 at 7:10 PM EET, Lukas Wunner wrote:
> Commit 420d439849ca ("tpm_tis: Allow tpm_tis to be bound using DT")
> added the fallback compatible "tcg,tpm-tis-mmio" to the TPM TIS driver,
> but not the chip-specific "atmel,at97sc3204".  However it did document
> it as a valid compatible string.
>
> Add it to tis_of_platform_match[] for consistency.
>
> Signed-off-by: Lukas Wunner <lukas@wunner.de>
> Cc: Jason Gunthorpe <jgg@ziepe.ca>
> ---
>  drivers/char/tpm/tpm_tis.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
> index 2c52b79..14652aa 100644
> --- a/drivers/char/tpm/tpm_tis.c
> +++ b/drivers/char/tpm/tpm_tis.c
> @@ -347,6 +347,7 @@ static void tpm_tis_plat_remove(struct platform_device *pdev)
>  
>  #ifdef CONFIG_OF
>  static const struct of_device_id tis_of_platform_match[] = {
> +	{.compatible = "atmel,at97sc3204"},
>  	{.compatible = "tcg,tpm-tis-mmio"},
>  	{},
>  };

Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>

BR, Jarkko
Jarkko Sakkinen Jan. 13, 2024, 9:55 p.m. UTC | #2 
On Sat Jan 13, 2024 at 7:10 PM EET, Lukas Wunner wrote:
> Add "nuvoton,npct75x" as well as the fallback compatible string
> "tcg,tpm-tis-i2c" to the TPM TIS I²C driver.  They're used by:
>
>   arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-bonnell.dts
>   arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts
>
> And by all accounts, NPCT75x is supported by the driver:
>
>   https://lore.kernel.org/all/60e23fd0f0ff4d1f8954034237ae8865@NTILML02.nuvoton.com/
>   https://lore.kernel.org/all/20220808220839.1006341-8-peter@pjd.dev/
>
> Signed-off-by: Lukas Wunner <lukas@wunner.de>
> ---
>  drivers/char/tpm/tpm_tis_i2c.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/drivers/char/tpm/tpm_tis_i2c.c b/drivers/char/tpm/tpm_tis_i2c.c
> index a897402..9511c0d 100644
> --- a/drivers/char/tpm/tpm_tis_i2c.c
> +++ b/drivers/char/tpm/tpm_tis_i2c.c
> @@ -383,6 +383,8 @@ static void tpm_tis_i2c_remove(struct i2c_client *client)
>  #ifdef CONFIG_OF
>  static const struct of_device_id of_tis_i2c_match[] = {
>  	{ .compatible = "infineon,slb9673", },
> +	{ .compatible = "nuvoton,npct75x", },
> +	{ .compatible = "tcg,tpm-tis-i2c", },
>  	{}
>  };
>  MODULE_DEVICE_TABLE(of, of_tis_i2c_match);

Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>

BR, Jarkko
Lukas Wunner Feb. 20, 2024, 10:55 a.m. UTC | #3 
Dear Jarkko,

since v6.8-rc6 is approaching and the end of this cycle is thus in sight,
please do not forget to merge this series:

https://lore.kernel.org/all/cover.1705140898.git.lukas@wunner.de/

All 4 patches have a Reviewed-by from you and patch 1 has an Acked-by
from Rob.

Thanks,

Lukas
Jarkko Sakkinen Feb. 20, 2024, 6:06 p.m. UTC | #4 
On Tue Feb 20, 2024 at 10:55 AM UTC, Lukas Wunner wrote:
> Dear Jarkko,
>
> since v6.8-rc6 is approaching and the end of this cycle is thus in sight,
> please do not forget to merge this series:
>
> https://lore.kernel.org/all/cover.1705140898.git.lukas@wunner.de/
>
> All 4 patches have a Reviewed-by from you and patch 1 has an Acked-by
> from Rob.
>
> Thanks,
>
> Lukas

Thanks for reminding!

Since this patch set only has DT changes and zero actual TPM driver
changes, I think it would be better if Rob picked this.

Rob, what you think?

I'm good either way but need to check.

BR, Jarkko
Jarkko Sakkinen Feb. 20, 2024, 6:09 p.m. UTC | #5 
On Tue Feb 20, 2024 at 6:06 PM UTC, Jarkko Sakkinen wrote:
> On Tue Feb 20, 2024 at 10:55 AM UTC, Lukas Wunner wrote:
> > Dear Jarkko,
> >
> > since v6.8-rc6 is approaching and the end of this cycle is thus in sight,
> > please do not forget to merge this series:
> >
> > https://lore.kernel.org/all/cover.1705140898.git.lukas@wunner.de/
> >
> > All 4 patches have a Reviewed-by from you and patch 1 has an Acked-by
> > from Rob.
> >
> > Thanks,
> >
> > Lukas
>
> Thanks for reminding!
>
> Since this patch set only has DT changes and zero actual TPM driver
> changes, I think it would be better if Rob picked this.
>
> Rob, what you think?
>
> I'm good either way but need to check.

Ah, sorry I was looking at wrong lore link (had multiple tabs open).

I will definitely pick this despite one DT patch. Rob, please ignore.

Sorry for causing confusion.

BR, Jarkko
Jarkko Sakkinen Feb. 20, 2024, 6:12 p.m. UTC | #6 
On Tue Feb 20, 2024 at 6:09 PM UTC, Jarkko Sakkinen wrote:
> On Tue Feb 20, 2024 at 6:06 PM UTC, Jarkko Sakkinen wrote:
> > On Tue Feb 20, 2024 at 10:55 AM UTC, Lukas Wunner wrote:
> > > Dear Jarkko,
> > >
> > > since v6.8-rc6 is approaching and the end of this cycle is thus in sight,
> > > please do not forget to merge this series:
> > >
> > > https://lore.kernel.org/all/cover.1705140898.git.lukas@wunner.de/
> > >
> > > All 4 patches have a Reviewed-by from you and patch 1 has an Acked-by
> > > from Rob.
> > >
> > > Thanks,
> > >
> > > Lukas
> >
> > Thanks for reminding!
> >
> > Since this patch set only has DT changes and zero actual TPM driver
> > changes, I think it would be better if Rob picked this.
> >
> > Rob, what you think?
> >
> > I'm good either way but need to check.
>
> Ah, sorry I was looking at wrong lore link (had multiple tabs open).
>
> I will definitely pick this despite one DT patch. Rob, please ignore.
>
> Sorry for causing confusion.

OK, should be good now:

https://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git/log/?h=next

BR, Jarkko