Linux-Integrity Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH] tpm: Revert tpm_tis_spi_mod.ko to tpm_tis_spi.ko.
@ 2020-02-05 20:38 Jarkko Sakkinen
  2020-02-06 12:54 ` Alexander Steffen
  2020-02-06 19:22 ` Stephen Boyd
  0 siblings, 2 replies; 6+ messages in thread
From: Jarkko Sakkinen @ 2020-02-05 20:38 UTC (permalink / raw)
  To: linux-integrity
  Cc: Jarkko Sakkinen, Andrey Pronin, Stephen Boyd, stable,
	Alexander Steffen, Peter Huewe, Jason Gunthorpe, Arnd Bergmann,
	Greg Kroah-Hartman, Heiko Stuebner, open list

Revert tpm_tis_spi_mod.ko back to tpm_tis_spi.ko as the rename could break
the build script. This can be achieved by renaming tpm_tis_spi.c as
tpm_tis_spi_main.c. Then tpm_tis_spi-y can be used inside the makefile.

Cc: Andrey Pronin <apronin@chromium.org>
Cc: Stephen Boyd <swboyd@chromium.org>
Cc: stable@vger.kernel.org
Fixes: 797c0113c9a4 ("tpm: tpm_tis_spi: Support cr50 devices")
Reported-by: Alexander Steffen <Alexander.Steffen@infineon.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
---
 drivers/char/tpm/Makefile                              | 8 +++++---
 drivers/char/tpm/{tpm_tis_spi.c => tpm_tis_spi_main.c} | 0
 2 files changed, 5 insertions(+), 3 deletions(-)
 rename drivers/char/tpm/{tpm_tis_spi.c => tpm_tis_spi_main.c} (100%)

diff --git a/drivers/char/tpm/Makefile b/drivers/char/tpm/Makefile
index 5a0d99d4fec0..9567e5197f74 100644
--- a/drivers/char/tpm/Makefile
+++ b/drivers/char/tpm/Makefile
@@ -21,9 +21,11 @@ tpm-$(CONFIG_EFI) += eventlog/efi.o
 tpm-$(CONFIG_OF) += eventlog/of.o
 obj-$(CONFIG_TCG_TIS_CORE) += tpm_tis_core.o
 obj-$(CONFIG_TCG_TIS) += tpm_tis.o
-obj-$(CONFIG_TCG_TIS_SPI) += tpm_tis_spi_mod.o
-tpm_tis_spi_mod-y := tpm_tis_spi.o
-tpm_tis_spi_mod-$(CONFIG_TCG_TIS_SPI_CR50) += tpm_tis_spi_cr50.o
+
+obj-$(CONFIG_TCG_TIS_SPI) += tpm_tis_spi.o
+tpm_tis_spi-y := tpm_tis_spi_main.o
+tpm_tis_spi-$(CONFIG_TCG_TIS_SPI_CR50) += tpm_tis_spi_cr50.o
+
 obj-$(CONFIG_TCG_TIS_I2C_ATMEL) += tpm_i2c_atmel.o
 obj-$(CONFIG_TCG_TIS_I2C_INFINEON) += tpm_i2c_infineon.o
 obj-$(CONFIG_TCG_TIS_I2C_NUVOTON) += tpm_i2c_nuvoton.o
diff --git a/drivers/char/tpm/tpm_tis_spi.c b/drivers/char/tpm/tpm_tis_spi_main.c
similarity index 100%
rename from drivers/char/tpm/tpm_tis_spi.c
rename to drivers/char/tpm/tpm_tis_spi_main.c
-- 
2.20.1


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] tpm: Revert tpm_tis_spi_mod.ko to tpm_tis_spi.ko.
  2020-02-05 20:38 [PATCH] tpm: Revert tpm_tis_spi_mod.ko to tpm_tis_spi.ko Jarkko Sakkinen
@ 2020-02-06 12:54 ` Alexander Steffen
  2020-02-06 14:53   ` Jarkko Sakkinen
  2020-02-06 19:22 ` Stephen Boyd
  1 sibling, 1 reply; 6+ messages in thread
From: Alexander Steffen @ 2020-02-06 12:54 UTC (permalink / raw)
  To: Jarkko Sakkinen, linux-integrity
  Cc: Andrey Pronin, Stephen Boyd, stable, Peter Huewe,
	Jason Gunthorpe, Arnd Bergmann, Greg Kroah-Hartman,
	Heiko Stuebner, open list

On 05.02.2020 21:38, Jarkko Sakkinen wrote:
> Revert tpm_tis_spi_mod.ko back to tpm_tis_spi.ko as the rename could break
> the build script. This can be achieved by renaming tpm_tis_spi.c as
> tpm_tis_spi_main.c. Then tpm_tis_spi-y can be used inside the makefile.
> 
> Cc: Andrey Pronin <apronin@chromium.org>
> Cc: Stephen Boyd <swboyd@chromium.org>
> Cc: stable@vger.kernel.org
> Fixes: 797c0113c9a4 ("tpm: tpm_tis_spi: Support cr50 devices")
> Reported-by: Alexander Steffen <Alexander.Steffen@infineon.com>
> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
> ---
>   drivers/char/tpm/Makefile                              | 8 +++++---
>   drivers/char/tpm/{tpm_tis_spi.c => tpm_tis_spi_main.c} | 0
>   2 files changed, 5 insertions(+), 3 deletions(-)
>   rename drivers/char/tpm/{tpm_tis_spi.c => tpm_tis_spi_main.c} (100%)
> 
> diff --git a/drivers/char/tpm/Makefile b/drivers/char/tpm/Makefile
> index 5a0d99d4fec0..9567e5197f74 100644
> --- a/drivers/char/tpm/Makefile
> +++ b/drivers/char/tpm/Makefile
> @@ -21,9 +21,11 @@ tpm-$(CONFIG_EFI) += eventlog/efi.o
>   tpm-$(CONFIG_OF) += eventlog/of.o
>   obj-$(CONFIG_TCG_TIS_CORE) += tpm_tis_core.o
>   obj-$(CONFIG_TCG_TIS) += tpm_tis.o
> -obj-$(CONFIG_TCG_TIS_SPI) += tpm_tis_spi_mod.o
> -tpm_tis_spi_mod-y := tpm_tis_spi.o
> -tpm_tis_spi_mod-$(CONFIG_TCG_TIS_SPI_CR50) += tpm_tis_spi_cr50.o
> +
> +obj-$(CONFIG_TCG_TIS_SPI) += tpm_tis_spi.o
> +tpm_tis_spi-y := tpm_tis_spi_main.o
> +tpm_tis_spi-$(CONFIG_TCG_TIS_SPI_CR50) += tpm_tis_spi_cr50.o
> +
>   obj-$(CONFIG_TCG_TIS_I2C_ATMEL) += tpm_i2c_atmel.o
>   obj-$(CONFIG_TCG_TIS_I2C_INFINEON) += tpm_i2c_infineon.o
>   obj-$(CONFIG_TCG_TIS_I2C_NUVOTON) += tpm_i2c_nuvoton.o
> diff --git a/drivers/char/tpm/tpm_tis_spi.c b/drivers/char/tpm/tpm_tis_spi_main.c
> similarity index 100%
> rename from drivers/char/tpm/tpm_tis_spi.c
> rename to drivers/char/tpm/tpm_tis_spi_main.c

Works for me, thank you very much :)

Alexander

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] tpm: Revert tpm_tis_spi_mod.ko to tpm_tis_spi.ko.
  2020-02-06 12:54 ` Alexander Steffen
@ 2020-02-06 14:53   ` Jarkko Sakkinen
  0 siblings, 0 replies; 6+ messages in thread
From: Jarkko Sakkinen @ 2020-02-06 14:53 UTC (permalink / raw)
  To: Alexander Steffen
  Cc: linux-integrity, Andrey Pronin, Stephen Boyd, stable,
	Peter Huewe, Jason Gunthorpe, Arnd Bergmann, Greg Kroah-Hartman,
	Heiko Stuebner, open list

On Thu, Feb 06, 2020 at 01:54:11PM +0100, Alexander Steffen wrote:
> Works for me, thank you very much :)

Apologies for having bad judgement with this in the first place :-)

I'll send another PR for the next kernel release as soon as v5.6-rc1 is
out.

/Jarkko

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] tpm: Revert tpm_tis_spi_mod.ko to tpm_tis_spi.ko.
  2020-02-05 20:38 [PATCH] tpm: Revert tpm_tis_spi_mod.ko to tpm_tis_spi.ko Jarkko Sakkinen
  2020-02-06 12:54 ` Alexander Steffen
@ 2020-02-06 19:22 ` Stephen Boyd
  2020-02-09 21:01   ` Jarkko Sakkinen
  1 sibling, 1 reply; 6+ messages in thread
From: Stephen Boyd @ 2020-02-06 19:22 UTC (permalink / raw)
  To: Jarkko Sakkinen, linux-integrity
  Cc: Jarkko Sakkinen, Andrey Pronin, stable, Alexander Steffen,
	Peter Huewe, Jason Gunthorpe, Arnd Bergmann, Greg Kroah-Hartman,
	Heiko Stuebner, linux-kernel

Quoting Jarkko Sakkinen (2020-02-05 12:38:18)
> Revert tpm_tis_spi_mod.ko back to tpm_tis_spi.ko as the rename could break
> the build script. This can be achieved by renaming tpm_tis_spi.c as

Do you mean userspace scripts?

> tpm_tis_spi_main.c. Then tpm_tis_spi-y can be used inside the makefile.
> 
> Cc: Andrey Pronin <apronin@chromium.org>
> Cc: Stephen Boyd <swboyd@chromium.org>
> Cc: stable@vger.kernel.org
> Fixes: 797c0113c9a4 ("tpm: tpm_tis_spi: Support cr50 devices")
> Reported-by: Alexander Steffen <Alexander.Steffen@infineon.com>
> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
> ---

Reviewed-by: Stephen Boyd <swboyd@chromium.org>


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] tpm: Revert tpm_tis_spi_mod.ko to tpm_tis_spi.ko.
  2020-02-06 19:22 ` Stephen Boyd
@ 2020-02-09 21:01   ` Jarkko Sakkinen
  2020-02-09 21:09     ` Jarkko Sakkinen
  0 siblings, 1 reply; 6+ messages in thread
From: Jarkko Sakkinen @ 2020-02-09 21:01 UTC (permalink / raw)
  To: Stephen Boyd
  Cc: linux-integrity, Andrey Pronin, stable, Alexander Steffen,
	Peter Huewe, Jason Gunthorpe, Arnd Bergmann, Greg Kroah-Hartman,
	Heiko Stuebner, linux-kernel

On Thu, Feb 06, 2020 at 11:22:44AM -0800, Stephen Boyd wrote:
> Quoting Jarkko Sakkinen (2020-02-05 12:38:18)
> > Revert tpm_tis_spi_mod.ko back to tpm_tis_spi.ko as the rename could break
> > the build script. This can be achieved by renaming tpm_tis_spi.c as
> 
> Do you mean userspace scripts?

Yes. I'll fix the commit message before merging.

Thanks for the review.

/Jarkko

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] tpm: Revert tpm_tis_spi_mod.ko to tpm_tis_spi.ko.
  2020-02-09 21:01   ` Jarkko Sakkinen
@ 2020-02-09 21:09     ` Jarkko Sakkinen
  0 siblings, 0 replies; 6+ messages in thread
From: Jarkko Sakkinen @ 2020-02-09 21:09 UTC (permalink / raw)
  To: Stephen Boyd
  Cc: linux-integrity, Andrey Pronin, stable, Alexander Steffen,
	Peter Huewe, Jason Gunthorpe, Arnd Bergmann, Greg Kroah-Hartman,
	Heiko Stuebner, linux-kernel

On Sun, Feb 09, 2020 at 11:01:33PM +0200, Jarkko Sakkinen wrote:
> On Thu, Feb 06, 2020 at 11:22:44AM -0800, Stephen Boyd wrote:
> > Quoting Jarkko Sakkinen (2020-02-05 12:38:18)
> > > Revert tpm_tis_spi_mod.ko back to tpm_tis_spi.ko as the rename could break
> > > the build script. This can be achieved by renaming tpm_tis_spi.c as
> > 
> > Do you mean userspace scripts?
> 
> Yes. I'll fix the commit message before merging.
> 
> Thanks for the review.

The commit message is now fixed in my master:

git://git.infradead.org/users/jjs/linux-tpmdd.git

I also added your and Alexander's tags.

I'll send a PR after rc1 is out. Thank you.

/Jarkko

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, back to index

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-05 20:38 [PATCH] tpm: Revert tpm_tis_spi_mod.ko to tpm_tis_spi.ko Jarkko Sakkinen
2020-02-06 12:54 ` Alexander Steffen
2020-02-06 14:53   ` Jarkko Sakkinen
2020-02-06 19:22 ` Stephen Boyd
2020-02-09 21:01   ` Jarkko Sakkinen
2020-02-09 21:09     ` Jarkko Sakkinen

Linux-Integrity Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-integrity/0 linux-integrity/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-integrity linux-integrity/ https://lore.kernel.org/linux-integrity \
		linux-integrity@vger.kernel.org
	public-inbox-index linux-integrity

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-integrity


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git