linux-next: build failure after merge of the tpmdd tree

linux-next: build failure after merge of the tpmdd tree

[Stephen Rothwell]

Hi Jarkko,

After merging the tpmdd tree, today's linux-next build (powerpc
allyesconfig) failed like this:

drivers/char/tpm/tpm_tis.c: In function 'tpm_tis_init':
drivers/char/tpm/tpm_tis.c:193:23: error: passing argument 1 of 'check_acpi_tpm2' from incompatible pointer type [-Werror=incompatible-pointer-types]
  rc = check_acpi_tpm2(dev);
                       ^
drivers/char/tpm/tpm_tis.c:129:12: note: expected 'struct acpi_device *' but argument is of type 'struct device *'
 static int check_acpi_tpm2(struct acpi_device *dev)
            ^

Caused by commit

  e3b975d27b46 ("tpm_tis: Consolidate the platform and acpi probe flow")

CONFIG_ACPI is not set for this build.

I have added the following patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 10 May 2017 13:15:35 +1000
Subject: [PATCH] tpm_tis: fixup for CONFIG_ACPI not set

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 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 54d90e31a7b6..b14d4aa97af8 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -126,7 +126,7 @@ static int check_acpi_tpm2(struct device *dev)
 	return 0;
 }
 #else
-static int check_acpi_tpm2(struct acpi_device *dev)
+static int check_acpi_tpm2(struct device *dev)
 {
 	return 0;
 }
-- 
2.11.0

-- 
Cheers,
Stephen Rothwell

Re: linux-next: build failure after merge of the tpmdd tree

[Jarkko Sakkinen]

Hi

On Wed, May 10, 2017 at 01:23:27PM +1000, Stephen Rothwell wrote:
> Hi Jarkko,
> 
> After merging the tpmdd tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> drivers/char/tpm/tpm_tis.c: In function 'tpm_tis_init':
> drivers/char/tpm/tpm_tis.c:193:23: error: passing argument 1 of 'check_acpi_tpm2' from incompatible pointer type [-Werror=incompatible-pointer-types]
>   rc = check_acpi_tpm2(dev);
>                        ^
> drivers/char/tpm/tpm_tis.c:129:12: note: expected 'struct acpi_device *' but argument is of type 'struct device *'
>  static int check_acpi_tpm2(struct acpi_device *dev)
>             ^
> 
> Caused by commit
> 
>   e3b975d27b46 ("tpm_tis: Consolidate the platform and acpi probe flow")
> 
> CONFIG_ACPI is not set for this build.
> 
> I have added the following patch for today.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 10 May 2017 13:15:35 +1000
> Subject: [PATCH] tpm_tis: fixup for CONFIG_ACPI not set
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  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 54d90e31a7b6..b14d4aa97af8 100644
> --- a/drivers/char/tpm/tpm_tis.c
> +++ b/drivers/char/tpm/tpm_tis.c
> @@ -126,7 +126,7 @@ static int check_acpi_tpm2(struct device *dev)
>  	return 0;
>  }
>  #else
> -static int check_acpi_tpm2(struct acpi_device *dev)
> +static int check_acpi_tpm2(struct device *dev)
>  {
>  	return 0;
>  }
> -- 
> 2.11.0
> 
> -- 
> Cheers,
> Stephen Rothwell

Thank you! I'll squash this.

/Jarkko

Re: linux-next: build failure after merge of the tpmdd tree

[Jarkko Sakkinen]

On Thu Apr 27, 2023 at 3:55 PM EEST,  wrote:
> Hi all,
>
> After merging the tpmdd tree, today's linux-next build (arm64 defconfig
> and others) failed like this:
>
> In file included from /tmp/next/build/include/linux/tpm_eventlog.h:6,
>                  from /tmp/next/build/drivers/char/tpm/tpm-chip.c:24:
> /tmp/next/build/include/linux/tpm.h:285:9: error: redeclaration of enumerator 'TPM_CHIP_FLAG_FIRMWARE_UPGRADE'
>   285 |         TPM_CHIP_FLAG_FIRMWARE_UPGRADE          = BIT(7),
>       |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> /tmp/next/build/include/linux/tpm.h:284:9: note: previous definition of 'TPM_CHIP_FLAG_FIRMWARE_UPGRADE' with type 'int'
>   284 |         TPM_CHIP_FLAG_FIRMWARE_UPGRADE          = BIT(7),
>       |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> /tmp/next/build/include/linux/tpm.h:286:9: error: redeclaration of enumerator 'TPM_CHIP_FLAG_FIRMWARE_UPGRADE'
>   286 |         TPM_CHIP_FLAG_FIRMWARE_UPGRADE          = BIT(7),
>       |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> /tmp/next/build/include/linux/tpm.h:285:9: note: previous definition of 'TPM_CHIP_FLAG_FIRMWARE_UPGRADE' with type 'int'
>   285 |         TPM_CHIP_FLAG_FIRMWARE_UPGRADE          = BIT(7),
>       |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> make[5]: *** [/tmp/next/build/scripts/Makefile.build:252: drivers/char/tpm/tpm-chip.o] Error 1
> make[4]: *** [/tmp/next/build/scripts/Makefile.build:494: drivers/char/tpm] Error 2
> make[3]: *** [/tmp/next/build/scripts/Makefile.build:494: drivers/char] Error 2
> make[3]: *** Waiting for unfinished jobs....
> In file included from /tmp/next/build/include/keys/trusted-type.h:12,
>                  from /tmp/next/build/crypto/af_alg.c:26:
> /tmp/next/build/include/linux/tpm.h:285:9: error: redeclaration of enumerator 'TPM_CHIP_FLAG_FIRMWARE_UPGRADE'
>   285 |         TPM_CHIP_FLAG_FIRMWARE_UPGRADE          = BIT(7),
>       |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> /tmp/next/build/include/linux/tpm.h:284:9: note: previous definition of 'TPM_CHIP_FLAG_FIRMWARE_UPGRADE' with type 'int'
>   284 |         TPM_CHIP_FLAG_FIRMWARE_UPGRADE          = BIT(7),
>       |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> /tmp/next/build/include/linux/tpm.h:286:9: error: redeclaration of enumerator 'TPM_CHIP_FLAG_FIRMWARE_UPGRADE'
>   286 |         TPM_CHIP_FLAG_FIRMWARE_UPGRADE          = BIT(7),
>       |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> /tmp/next/build/include/linux/tpm.h:285:9: note: previous definition of 'TPM_CHIP_FLAG_FIRMWARE_UPGRADE' with type 'int'
>   285 |         TPM_CHIP_FLAG_FIRMWARE_UPGRADE          = BIT(7),
>       |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> make[3]: *** [/tmp/next/build/scripts/Makefile.build:252: crypto/af_alg.o] Error 1
>
> Caused by commit
>
>   e2f14081c6839 ("tpm: Re-enable TPM chip boostrapping non-tpm_tis TPM drivers")
>
> I will use the tree from yesterday instead.

Hi sorry about this, I've dropped the commit.

BR, Jarkko

linux-next: build failure after merge of the tpmdd tree

[broonie]

Hi all,

After merging the tpmdd tree, today's linux-next build (arm64 defconfig
and others) failed like this:

In file included from /tmp/next/build/include/linux/tpm_eventlog.h:6,
                 from /tmp/next/build/drivers/char/tpm/tpm-chip.c:24:
/tmp/next/build/include/linux/tpm.h:285:9: error: redeclaration of enumerator 'TPM_CHIP_FLAG_FIRMWARE_UPGRADE'
  285 |         TPM_CHIP_FLAG_FIRMWARE_UPGRADE          = BIT(7),
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/tmp/next/build/include/linux/tpm.h:284:9: note: previous definition of 'TPM_CHIP_FLAG_FIRMWARE_UPGRADE' with type 'int'
  284 |         TPM_CHIP_FLAG_FIRMWARE_UPGRADE          = BIT(7),
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/tmp/next/build/include/linux/tpm.h:286:9: error: redeclaration of enumerator 'TPM_CHIP_FLAG_FIRMWARE_UPGRADE'
  286 |         TPM_CHIP_FLAG_FIRMWARE_UPGRADE          = BIT(7),
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/tmp/next/build/include/linux/tpm.h:285:9: note: previous definition of 'TPM_CHIP_FLAG_FIRMWARE_UPGRADE' with type 'int'
  285 |         TPM_CHIP_FLAG_FIRMWARE_UPGRADE          = BIT(7),
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
make[5]: *** [/tmp/next/build/scripts/Makefile.build:252: drivers/char/tpm/tpm-chip.o] Error 1
make[4]: *** [/tmp/next/build/scripts/Makefile.build:494: drivers/char/tpm] Error 2
make[3]: *** [/tmp/next/build/scripts/Makefile.build:494: drivers/char] Error 2
make[3]: *** Waiting for unfinished jobs....
In file included from /tmp/next/build/include/keys/trusted-type.h:12,
                 from /tmp/next/build/crypto/af_alg.c:26:
/tmp/next/build/include/linux/tpm.h:285:9: error: redeclaration of enumerator 'TPM_CHIP_FLAG_FIRMWARE_UPGRADE'
  285 |         TPM_CHIP_FLAG_FIRMWARE_UPGRADE          = BIT(7),
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/tmp/next/build/include/linux/tpm.h:284:9: note: previous definition of 'TPM_CHIP_FLAG_FIRMWARE_UPGRADE' with type 'int'
  284 |         TPM_CHIP_FLAG_FIRMWARE_UPGRADE          = BIT(7),
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/tmp/next/build/include/linux/tpm.h:286:9: error: redeclaration of enumerator 'TPM_CHIP_FLAG_FIRMWARE_UPGRADE'
  286 |         TPM_CHIP_FLAG_FIRMWARE_UPGRADE          = BIT(7),
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/tmp/next/build/include/linux/tpm.h:285:9: note: previous definition of 'TPM_CHIP_FLAG_FIRMWARE_UPGRADE' with type 'int'
  285 |         TPM_CHIP_FLAG_FIRMWARE_UPGRADE          = BIT(7),
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
make[3]: *** [/tmp/next/build/scripts/Makefile.build:252: crypto/af_alg.o] Error 1

Caused by commit

  e2f14081c6839 ("tpm: Re-enable TPM chip boostrapping non-tpm_tis TPM drivers")

I will use the tree from yesterday instead.

Re: linux-next: build failure after merge of the tpmdd tree

[Jarkko Sakkinen]

On Fri, Mar 24, 2023 at 01:20:50PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> On Tue, 21 Mar 2023 11:54:13 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the tpmdd tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> > 
> > drivers/char/tpm/tpm-chip.c: In function 'tpm_amd_is_rng_defective':
> > drivers/char/tpm/tpm-chip.c:531:15: error: too many arguments to function 'tpm_request_locality'
> >   531 |         ret = tpm_request_locality(chip, 0);
> >       |               ^~~~~~~~~~~~~~~~~~~~
> > drivers/char/tpm/tpm-chip.c:35:12: note: declared here
> >    35 | static int tpm_request_locality(struct tpm_chip *chip)
> >       |            ^~~~~~~~~~~~~~~~~~~~
> > 
> > Caused by commit
> > 
> >   923c8dfa9a36 ("tpm: fix build break in tpm-chip.c caused by AMD fTPM quirk")
> > 
> > I have used the tmpdd tree from next-20230320 for today.
> 
> I am still getting this build failure.
> 
> The commit above is trying to fix a build failure that does not exist
> in the tmpdd tree!
> 

Hi sorry for the latency, I got sick on Friday and was sick leave
up until Tuesday.

The offending commit has been removed.

BR, Jarkko

Re: linux-next: build failure after merge of the tpmdd tree

[Jarkko Sakkinen]

On Tue, Mar 21, 2023 at 11:54:13AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the tpmdd tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> drivers/char/tpm/tpm-chip.c: In function 'tpm_amd_is_rng_defective':
> drivers/char/tpm/tpm-chip.c:531:15: error: too many arguments to function 'tpm_request_locality'
>   531 |         ret = tpm_request_locality(chip, 0);
>       |               ^~~~~~~~~~~~~~~~~~~~
> drivers/char/tpm/tpm-chip.c:35:12: note: declared here
>    35 | static int tpm_request_locality(struct tpm_chip *chip)
>       |            ^~~~~~~~~~~~~~~~~~~~
> 
> Caused by commit
> 
>   923c8dfa9a36 ("tpm: fix build break in tpm-chip.c caused by AMD fTPM quirk")
> 
> I have used the tmpdd tree from next-20230320 for today.
> 
> -- 
> Cheers,
> Stephen Rothwell

My mistake. I've removed the commit from my tree. Apologies.

BR, Jarkko

Re: linux-next: build failure after merge of the tpmdd tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 989 bytes --]

Hi all,

On Tue, 21 Mar 2023 11:54:13 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the tpmdd tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> drivers/char/tpm/tpm-chip.c: In function 'tpm_amd_is_rng_defective':
> drivers/char/tpm/tpm-chip.c:531:15: error: too many arguments to function 'tpm_request_locality'
>   531 |         ret = tpm_request_locality(chip, 0);
>       |               ^~~~~~~~~~~~~~~~~~~~
> drivers/char/tpm/tpm-chip.c:35:12: note: declared here
>    35 | static int tpm_request_locality(struct tpm_chip *chip)
>       |            ^~~~~~~~~~~~~~~~~~~~
> 
> Caused by commit
> 
>   923c8dfa9a36 ("tpm: fix build break in tpm-chip.c caused by AMD fTPM quirk")
> 
> I have used the tmpdd tree from next-20230320 for today.

I am still getting this build failure.

The commit above is trying to fix a build failure that does not exist
in the tmpdd tree!

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the tpmdd tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 736 bytes --]

Hi all,

After merging the tpmdd tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

drivers/char/tpm/tpm-chip.c: In function 'tpm_amd_is_rng_defective':
drivers/char/tpm/tpm-chip.c:531:15: error: too many arguments to function 'tpm_request_locality'
  531 |         ret = tpm_request_locality(chip, 0);
      |               ^~~~~~~~~~~~~~~~~~~~
drivers/char/tpm/tpm-chip.c:35:12: note: declared here
   35 | static int tpm_request_locality(struct tpm_chip *chip)
      |            ^~~~~~~~~~~~~~~~~~~~

Caused by commit

  923c8dfa9a36 ("tpm: fix build break in tpm-chip.c caused by AMD fTPM quirk")

I have used the tmpdd tree from next-20230320 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the tpmdd tree

[Jarkko Sakkinen]

On Wed, Jun 05, 2019 at 12:09:46PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the tpmdd tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:

I'm sorry about the incident and thank you for reporting this.

/Jarkko

linux-next: build failure after merge of the tpmdd tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 4125 bytes --]

Hi all,

After merging the tpmdd tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

include/linux/tpm_eventlog.h: In function '__calc_tpm2_event_size':
drivers/firmware/efi/tpm.c:7:35: error: implicit declaration of function 'early_memremap'; did you mean 'early_memtest'? [-Werror=implicit-function-declaration]
 #define TPM_MEMREMAP(start, size) early_memremap(start, size)
                                   ^~~~~~~~~~~~~~
include/linux/tpm_eventlog.h:182:13: note: in expansion of macro 'TPM_MEMREMAP'
   mapping = TPM_MEMREMAP((unsigned long)marker_start,
             ^~~~~~~~~~~~
In file included from drivers/firmware/efi/tpm.c:13:
include/linux/tpm_eventlog.h:182:11: warning: assignment to 'void *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
   mapping = TPM_MEMREMAP((unsigned long)marker_start,
           ^
drivers/firmware/efi/tpm.c:8:35: error: implicit declaration of function 'early_memunmap'; did you mean 'early_memtest'? [-Werror=implicit-function-declaration]
 #define TPM_MEMUNMAP(start, size) early_memunmap(start, size)
                                   ^~~~~~~~~~~~~~
include/linux/tpm_eventlog.h:207:4: note: in expansion of macro 'TPM_MEMUNMAP'
    TPM_MEMUNMAP(mapping, mapping_size);
    ^~~~~~~~~~~~
In file included from drivers/firmware/efi/tpm.c:13:
include/linux/tpm_eventlog.h:209:12: warning: assignment to 'void *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
    mapping = TPM_MEMREMAP((unsigned long)marker,
            ^
include/linux/tpm_eventlog.h:243:11: warning: assignment to 'void *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
   mapping = TPM_MEMREMAP((unsigned long)marker,
           ^
In file included from ./arch/arm/include/generated/asm/early_ioremap.h:1,
                 from drivers/firmware/efi/tpm.c:15:
include/asm-generic/early_ioremap.h: At top level:
include/asm-generic/early_ioremap.h:13:14: error: conflicting types for 'early_memremap'
 extern void *early_memremap(resource_size_t phys_addr,
              ^~~~~~~~~~~~~~
drivers/firmware/efi/tpm.c:7:35: note: previous implicit declaration of 'early_memremap' was here
 #define TPM_MEMREMAP(start, size) early_memremap(start, size)
                                   ^~~~~~~~~~~~~~
include/linux/tpm_eventlog.h:182:13: note: in expansion of macro 'TPM_MEMREMAP'
   mapping = TPM_MEMREMAP((unsigned long)marker_start,
             ^~~~~~~~~~~~
In file included from ./arch/arm/include/generated/asm/early_ioremap.h:1,
                 from drivers/firmware/efi/tpm.c:15:
include/asm-generic/early_ioremap.h:20:13: warning: conflicting types for 'early_memunmap'
 extern void early_memunmap(void *addr, unsigned long size);
             ^~~~~~~~~~~~~~
drivers/firmware/efi/tpm.c:8:35: note: previous implicit declaration of 'early_memunmap' was here
 #define TPM_MEMUNMAP(start, size) early_memunmap(start, size)
                                   ^~~~~~~~~~~~~~
include/linux/tpm_eventlog.h:207:4: note: in expansion of macro 'TPM_MEMUNMAP'
    TPM_MEMUNMAP(mapping, mapping_size);
    ^~~~~~~~~~~~
drivers/firmware/efi/tpm.c: In function 'efi_tpm_eventlog_init':
drivers/firmware/efi/tpm.c:81:10: warning: passing argument 1 of 'tpm2_calc_event_log_size' makes pointer from integer without a cast [-Wint-conversion]
  tbl_size = tpm2_calc_event_log_size(efi.tpm_final_log
                                      ~~~~~~~~~~~~~~~~~
          + sizeof(final_tbl->version)
          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
          + sizeof(final_tbl->nr_events),
          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/firmware/efi/tpm.c:20:43: note: expected 'void *' but argument is of type 'long unsigned int'
 static int tpm2_calc_event_log_size(void *data, int count, void *size_info)
                                     ~~~~~~^~~~
cc1: some warnings being treated as errors

Caused by commit

  b25b956d13d5 ("tpm: Reserve the TPM final events table")

I have used the tpmdd tree from next-20190604 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the tpmdd tree

[Jarkko Sakkinen]

On Thu, Apr 18, 2019 at 12:40:48PM -0700, Matthew Garrett wrote:
> On Tue, Apr 16, 2019 at 8:36 AM Jarkko Sakkinen
> <jarkko.sakkinen@linux.intel.com> wrote:
> > Matthew, looking at the code I guess the includes are in wrong order
> > i.e. early_ioremap.h should be included before tpm_eventlog.h. Do you
> > agree that this is the correct conclusion? I can do the update.
> 
> Yes, I believe that that's the correct fix.

I'll hold  up until the previous flush of patches is in
security/next-general (bug fixes for v5.1 changes).

/Jarkko

Re: linux-next: build failure after merge of the tpmdd tree

[Matthew Garrett]

On Tue, Apr 16, 2019 at 8:36 AM Jarkko Sakkinen
<jarkko.sakkinen@linux.intel.com> wrote:
> Matthew, looking at the code I guess the includes are in wrong order
> i.e. early_ioremap.h should be included before tpm_eventlog.h. Do you
> agree that this is the correct conclusion? I can do the update.

Yes, I believe that that's the correct fix.

Re: linux-next: build failure after merge of the tpmdd tree

[Jarkko Sakkinen]

On Tue, Apr 16, 2019 at 01:07:40PM +1000, Stephen Rothwell wrote:
> Hi Jarkko,
> 
> After merging the tpmdd tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:

Matthew, looking at the code I guess the includes are in wrong order
i.e. early_ioremap.h should be included before tpm_eventlog.h. Do you
agree that this is the correct conclusion? I can do the update.

Just as a temporary measure I removed the commits from my next branch.

/Jarkko

linux-next: build failure after merge of the tpmdd tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 3671 bytes --]

Hi Jarkko,

After merging the tpmdd tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

include/linux/tpm_eventlog.h: In function '__calc_tpm2_event_size':
drivers/firmware/efi/tpm.c:7:35: error: implicit declaration of function 'early_memremap'; did you mean 'early_memtest'? [-Werror=implicit-function-declaration]
 #define TPM_MEMREMAP(start, size) early_memremap(start, size)
                                   ^~~~~~~~~~~~~~
include/linux/tpm_eventlog.h:182:13: note: in expansion of macro 'TPM_MEMREMAP'
   mapping = TPM_MEMREMAP((unsigned long)marker_start,
             ^~~~~~~~~~~~
In file included from drivers/firmware/efi/tpm.c:13:
include/linux/tpm_eventlog.h:182:11: warning: assignment to 'void *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
   mapping = TPM_MEMREMAP((unsigned long)marker_start,
           ^
drivers/firmware/efi/tpm.c:8:35: error: implicit declaration of function 'early_memunmap'; did you mean 'early_memtest'? [-Werror=implicit-function-declaration]
 #define TPM_MEMUNMAP(start, size) early_memunmap(start, size)
                                   ^~~~~~~~~~~~~~
include/linux/tpm_eventlog.h:203:4: note: in expansion of macro 'TPM_MEMUNMAP'
    TPM_MEMUNMAP(mapping, mapping_size);
    ^~~~~~~~~~~~
In file included from drivers/firmware/efi/tpm.c:13:
include/linux/tpm_eventlog.h:205:12: warning: assignment to 'void *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
    mapping = TPM_MEMREMAP((unsigned long)marker_start,
            ^
include/linux/tpm_eventlog.h:225:14: warning: assignment to 'void *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
      mapping = TPM_MEMREMAP((unsigned long)marker_start,
              ^
include/linux/tpm_eventlog.h:251:11: warning: assignment to 'void *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
   mapping = TPM_MEMREMAP((unsigned long)marker_start,
           ^
In file included from ./arch/arm/include/generated/asm/early_ioremap.h:1,
                 from drivers/firmware/efi/tpm.c:15:
include/asm-generic/early_ioremap.h: At top level:
include/asm-generic/early_ioremap.h:13:14: error: conflicting types for 'early_memremap'
 extern void *early_memremap(resource_size_t phys_addr,
              ^~~~~~~~~~~~~~
drivers/firmware/efi/tpm.c:7:35: note: previous implicit declaration of 'early_memremap' was here
 #define TPM_MEMREMAP(start, size) early_memremap(start, size)
                                   ^~~~~~~~~~~~~~
include/linux/tpm_eventlog.h:182:13: note: in expansion of macro 'TPM_MEMREMAP'
   mapping = TPM_MEMREMAP((unsigned long)marker_start,
             ^~~~~~~~~~~~
In file included from ./arch/arm/include/generated/asm/early_ioremap.h:1,
                 from drivers/firmware/efi/tpm.c:15:
include/asm-generic/early_ioremap.h:20:13: warning: conflicting types for 'early_memunmap'
 extern void early_memunmap(void *addr, unsigned long size);
             ^~~~~~~~~~~~~~
drivers/firmware/efi/tpm.c:8:35: note: previous implicit declaration of 'early_memunmap' was here
 #define TPM_MEMUNMAP(start, size) early_memunmap(start, size)
                                   ^~~~~~~~~~~~~~
include/linux/tpm_eventlog.h:203:4: note: in expansion of macro 'TPM_MEMUNMAP'
    TPM_MEMUNMAP(mapping, mapping_size);
    ^~~~~~~~~~~~

Caused by commit

  05165bf3d231 ("tpm: Abstract crypto agile event size calculations")

and maybe

  cdb75b359079 ("tpm: Reserve the TPM final events table")

I have used the tmpdd tree from next-20190415 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the tpmdd tree

[Jarkko Sakkinen]

On Mon, May 02, 2016 at 10:19:27PM +1000, Stephen Rothwell wrote:
> Hi Jarkko,
> 
> On Mon, 2 May 2016 14:10:36 +0300 Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> wrote:
> >
> > I applied the fix and merged it.
> 
> Unfortunately, you seem to have turned the leading whitespace from a
> TAB to spaces :-(

Fixed. Sorry. I also did cross-compilation for PPC to make sure that
this works. I'll take PPC compilation as part of my testing procedure
from now on in order to prevent this problem from happening again
in the first place.

> -- 
> Cheers,
> Stephen Rothwell

/Jarkko

Re: linux-next: build failure after merge of the tpmdd tree

[Stephen Rothwell]

Hi Jarkko,

On Mon, 2 May 2016 14:10:36 +0300 Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> wrote:
>
> I applied the fix and merged it.

Unfortunately, you seem to have turned the leading whitespace from a
TAB to spaces :-(

-- 
Cheers,
Stephen Rothwell

Re: linux-next: build failure after merge of the tpmdd tree

[Jarkko Sakkinen]

On Sun, May 01, 2016 at 11:12:22PM +1000, Stephen Rothwell wrote:
> Hi Jarkko,
> 
> On Thu, 28 Apr 2016 12:02:24 +0300 Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> wrote:
> >
> > On Thu, 2016-04-28 at 15:32 +1000, Stephen Rothwell wrote:
> > > Hi Jarkko,
> > > 
> > > After merging the tpmdd tree, today's linux-next build (powerpc
> > > allyesconfig) failed like this:
> > > 
> > > In file included from /home/sfr/next/next/include/linux/rcupdate.h:38:0,
> > >                  from /home/sfr/next/next/include/linux/idr.h:18,
> > >                  from /home/sfr/next/next/include/linux/kernfs.h:14,
> > >                  from /home/sfr/next/next/include/linux/sysfs.h:15,
> > >                  from /home/sfr/next/next/include/linux/kobject.h:21,
> > >                  from /home/sfr/next/next/include/linux/device.h:17,
> > >                  from /home/sfr/next/next/include/linux/dma-mapping.h:6,
> > >                  from /home/sfr/next/next/drivers/char/tpm/tpm_ibmvtpm.c:18:
> > > /home/sfr/next/next/drivers/char/tpm/tpm_ibmvtpm.c: In function 'tpm_ibmvtpm_probe':
> > > /home/sfr/next/next/include/linux/spinlock.h:295:1: error: expected ';' before 'do'
> > >  do {       \
> > >  ^
> > > /home/sfr/next/next/drivers/char/tpm/tpm_ibmvtpm.c:632:2: note: in expansion of macro
> > > 'spin_lock_init'
> > >   spin_lock_init(&ibmvtpm->rtce_lock);
> > >   ^
> > > 
> > > Caused by commit
> > > 
> > >   28157164b056 ("tpm: Remove useless priv field in struct tpm_vendor_specific")
> > > 
> > > A ';' was missed.
> > > 
> > > I added the following patch for today.  
> > 
> > Sorry about this and thank you.
> > 
> > /Jarkko
> > 
> > > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > > Date: Thu, 28 Apr 2016 15:27:17 +1000
> > > Subject: [PATCH] tpm: fix for typo in tpm/tpm_ibmvtpm.c
> > > 
> > > Fixes: 28157164b056 ("tpm: Remove useless priv field in struct tpm_vendor_specific")
> > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > > ---
> > >  drivers/char/tpm/tpm_ibmvtpm.c | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > 
> > > diff --git a/drivers/char/tpm/tpm_ibmvtpm.c b/drivers/char/tpm/tpm_ibmvtpm.c
> > > index 6b22826f0e11..946025a7413b 100644
> > > --- a/drivers/char/tpm/tpm_ibmvtpm.c
> > > +++ b/drivers/char/tpm/tpm_ibmvtpm.c
> > > @@ -627,7 +627,7 @@ static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev,
> > >  
> > >  	crq_q->index = 0;
> > >  
> > > -	dev_set_drvdata(&chip->dev, ibmvtpm)
> > > +	dev_set_drvdata(&chip->dev, ibmvtpm);
> > >  
> > >  	spin_lock_init(&ibmvtpm->rtce_lock);
> > >  
> > > -- 
> > > 2.7.0
> > >   
> 
> Ping?

Acked-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>

I applied the fix and merged it.

> -- 
> Cheers,
> Stephen Rothwell

/Jarkko

Re: linux-next: build failure after merge of the tpmdd tree

[Stephen Rothwell]

Hi Jarkko,

On Thu, 28 Apr 2016 12:02:24 +0300 Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> wrote:
>
> On Thu, 2016-04-28 at 15:32 +1000, Stephen Rothwell wrote:
> > Hi Jarkko,
> > 
> > After merging the tpmdd tree, today's linux-next build (powerpc
> > allyesconfig) failed like this:
> > 
> > In file included from /home/sfr/next/next/include/linux/rcupdate.h:38:0,
> >                  from /home/sfr/next/next/include/linux/idr.h:18,
> >                  from /home/sfr/next/next/include/linux/kernfs.h:14,
> >                  from /home/sfr/next/next/include/linux/sysfs.h:15,
> >                  from /home/sfr/next/next/include/linux/kobject.h:21,
> >                  from /home/sfr/next/next/include/linux/device.h:17,
> >                  from /home/sfr/next/next/include/linux/dma-mapping.h:6,
> >                  from /home/sfr/next/next/drivers/char/tpm/tpm_ibmvtpm.c:18:
> > /home/sfr/next/next/drivers/char/tpm/tpm_ibmvtpm.c: In function 'tpm_ibmvtpm_probe':
> > /home/sfr/next/next/include/linux/spinlock.h:295:1: error: expected ';' before 'do'
> >  do {       \
> >  ^
> > /home/sfr/next/next/drivers/char/tpm/tpm_ibmvtpm.c:632:2: note: in expansion of macro
> > 'spin_lock_init'
> >   spin_lock_init(&ibmvtpm->rtce_lock);
> >   ^
> > 
> > Caused by commit
> > 
> >   28157164b056 ("tpm: Remove useless priv field in struct tpm_vendor_specific")
> > 
> > A ';' was missed.
> > 
> > I added the following patch for today.  
> 
> Sorry about this and thank you.
> 
> /Jarkko
> 
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Thu, 28 Apr 2016 15:27:17 +1000
> > Subject: [PATCH] tpm: fix for typo in tpm/tpm_ibmvtpm.c
> > 
> > Fixes: 28157164b056 ("tpm: Remove useless priv field in struct tpm_vendor_specific")
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > ---
> >  drivers/char/tpm/tpm_ibmvtpm.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/drivers/char/tpm/tpm_ibmvtpm.c b/drivers/char/tpm/tpm_ibmvtpm.c
> > index 6b22826f0e11..946025a7413b 100644
> > --- a/drivers/char/tpm/tpm_ibmvtpm.c
> > +++ b/drivers/char/tpm/tpm_ibmvtpm.c
> > @@ -627,7 +627,7 @@ static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev,
> >  
> >  	crq_q->index = 0;
> >  
> > -	dev_set_drvdata(&chip->dev, ibmvtpm)
> > +	dev_set_drvdata(&chip->dev, ibmvtpm);
> >  
> >  	spin_lock_init(&ibmvtpm->rtce_lock);
> >  
> > -- 
> > 2.7.0
> >   

Ping?

-- 
Cheers,
Stephen Rothwell

Re: linux-next: build failure after merge of the tpmdd tree

[Jarkko Sakkinen]

On Thu, 2016-04-28 at 15:32 +1000, Stephen Rothwell wrote:
> Hi Jarkko,
> 
> After merging the tpmdd tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> In file included from /home/sfr/next/next/include/linux/rcupdate.h:38:0,
>                  from /home/sfr/next/next/include/linux/idr.h:18,
>                  from /home/sfr/next/next/include/linux/kernfs.h:14,
>                  from /home/sfr/next/next/include/linux/sysfs.h:15,
>                  from /home/sfr/next/next/include/linux/kobject.h:21,
>                  from /home/sfr/next/next/include/linux/device.h:17,
>                  from /home/sfr/next/next/include/linux/dma-mapping.h:6,
>                  from /home/sfr/next/next/drivers/char/tpm/tpm_ibmvtpm.c:18:
> /home/sfr/next/next/drivers/char/tpm/tpm_ibmvtpm.c: In function 'tpm_ibmvtpm_probe':
> /home/sfr/next/next/include/linux/spinlock.h:295:1: error: expected ';' before 'do'
>  do {       \
>  ^
> /home/sfr/next/next/drivers/char/tpm/tpm_ibmvtpm.c:632:2: note: in expansion of macro
> 'spin_lock_init'
>   spin_lock_init(&ibmvtpm->rtce_lock);
>   ^
> 
> Caused by commit
> 
>   28157164b056 ("tpm: Remove useless priv field in struct tpm_vendor_specific")
> 
> A ';' was missed.
> 
> I added the following patch for today.

Sorry about this and thank you.

/Jarkko

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 28 Apr 2016 15:27:17 +1000
> Subject: [PATCH] tpm: fix for typo in tpm/tpm_ibmvtpm.c
> 
> Fixes: 28157164b056 ("tpm: Remove useless priv field in struct tpm_vendor_specific")
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/char/tpm/tpm_ibmvtpm.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/char/tpm/tpm_ibmvtpm.c b/drivers/char/tpm/tpm_ibmvtpm.c
> index 6b22826f0e11..946025a7413b 100644
> --- a/drivers/char/tpm/tpm_ibmvtpm.c
> +++ b/drivers/char/tpm/tpm_ibmvtpm.c
> @@ -627,7 +627,7 @@ static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev,
>  
>  	crq_q->index = 0;
>  
> -	dev_set_drvdata(&chip->dev, ibmvtpm)
> +	dev_set_drvdata(&chip->dev, ibmvtpm);
>  
>  	spin_lock_init(&ibmvtpm->rtce_lock);
>  
> -- 
> 2.7.0
> 

linux-next: build failure after merge of the tpmdd tree

[Stephen Rothwell]

Hi Jarkko,

After merging the tpmdd tree, today's linux-next build (powerpc
allyesconfig) failed like this:

In file included from /home/sfr/next/next/include/linux/rcupdate.h:38:0,
                 from /home/sfr/next/next/include/linux/idr.h:18,
                 from /home/sfr/next/next/include/linux/kernfs.h:14,
                 from /home/sfr/next/next/include/linux/sysfs.h:15,
                 from /home/sfr/next/next/include/linux/kobject.h:21,
                 from /home/sfr/next/next/include/linux/device.h:17,
                 from /home/sfr/next/next/include/linux/dma-mapping.h:6,
                 from /home/sfr/next/next/drivers/char/tpm/tpm_ibmvtpm.c:18:
/home/sfr/next/next/drivers/char/tpm/tpm_ibmvtpm.c: In function 'tpm_ibmvtpm_probe':
/home/sfr/next/next/include/linux/spinlock.h:295:1: error: expected ';' before 'do'
 do {       \
 ^
/home/sfr/next/next/drivers/char/tpm/tpm_ibmvtpm.c:632:2: note: in expansion of macro 'spin_lock_init'
  spin_lock_init(&ibmvtpm->rtce_lock);
  ^

Caused by commit

  28157164b056 ("tpm: Remove useless priv field in struct tpm_vendor_specific")

A ';' was missed.

I added the following patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 28 Apr 2016 15:27:17 +1000
Subject: [PATCH] tpm: fix for typo in tpm/tpm_ibmvtpm.c

Fixes: 28157164b056 ("tpm: Remove useless priv field in struct tpm_vendor_specific")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/char/tpm/tpm_ibmvtpm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/char/tpm/tpm_ibmvtpm.c b/drivers/char/tpm/tpm_ibmvtpm.c
index 6b22826f0e11..946025a7413b 100644
--- a/drivers/char/tpm/tpm_ibmvtpm.c
+++ b/drivers/char/tpm/tpm_ibmvtpm.c
@@ -627,7 +627,7 @@ static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev,
 
 	crq_q->index = 0;
 
-	dev_set_drvdata(&chip->dev, ibmvtpm)
+	dev_set_drvdata(&chip->dev, ibmvtpm);
 
 	spin_lock_init(&ibmvtpm->rtce_lock);
 
-- 
2.7.0

-- 
Cheers,
Stephen Rothwell