| Message ID | 20200205203818.4679-1-jarkko.sakkinen@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | tpm: Revert tpm_tis_spi_mod.ko to tpm_tis_spi.ko. | expand |
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
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
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>
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
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
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
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%)