* [PATCH] efi: Fix TPM code build failure on ARM
@ 2019-06-05 18:11 Matthew Garrett
2019-06-06 11:39 ` Ard Biesheuvel
2019-06-09 19:53 ` Jarkko Sakkinen
0 siblings, 2 replies; 5+ messages in thread
From: Matthew Garrett @ 2019-06-05 18:11 UTC (permalink / raw)
To: linux-integrity
Cc: peterhuewe, jarkko.sakkinen, jgg, linux-efi, ard.biesheuvel,
Matthew Garrett, Matthew Garrett
asm/early_ioremap.h needs to be #included before tpm_eventlog.h in order
to ensure that early_memremap is available.
Signed-off-by: Matthew Garrett <mjg59@google.com>
---
drivers/firmware/efi/tpm.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/firmware/efi/tpm.c b/drivers/firmware/efi/tpm.c
index 0bdceb5913aa..1d3f5ca3eaaf 100644
--- a/drivers/firmware/efi/tpm.c
+++ b/drivers/firmware/efi/tpm.c
@@ -7,13 +7,12 @@
#define TPM_MEMREMAP(start, size) early_memremap(start, size)
#define TPM_MEMUNMAP(start, size) early_memunmap(start, size)
+#include <asm/early_ioremap.h>
#include <linux/efi.h>
#include <linux/init.h>
#include <linux/memblock.h>
#include <linux/tpm_eventlog.h>
-#include <asm/early_ioremap.h>
-
int efi_tpm_final_log_size;
EXPORT_SYMBOL(efi_tpm_final_log_size);
--
2.22.0.rc1.311.g5d7573a151-goog
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] efi: Fix TPM code build failure on ARM
2019-06-05 18:11 [PATCH] efi: Fix TPM code build failure on ARM Matthew Garrett
@ 2019-06-06 11:39 ` Ard Biesheuvel
2019-06-06 16:03 ` Matthew Garrett
2019-06-09 19:53 ` Jarkko Sakkinen
1 sibling, 1 reply; 5+ messages in thread
From: Ard Biesheuvel @ 2019-06-06 11:39 UTC (permalink / raw)
To: Matthew Garrett
Cc: linux-integrity, Peter Hüwe, Jarkko Sakkinen,
Jason Gunthorpe, linux-efi, Matthew Garrett
On Wed, 5 Jun 2019 at 20:11, Matthew Garrett <matthewgarrett@google.com> wrote:
>
> asm/early_ioremap.h needs to be #included before tpm_eventlog.h in order
> to ensure that early_memremap is available.
>
Doesn't that make it tpm_eventlog.h's job to #include it?
> Signed-off-by: Matthew Garrett <mjg59@google.com>
> ---
> drivers/firmware/efi/tpm.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/firmware/efi/tpm.c b/drivers/firmware/efi/tpm.c
> index 0bdceb5913aa..1d3f5ca3eaaf 100644
> --- a/drivers/firmware/efi/tpm.c
> +++ b/drivers/firmware/efi/tpm.c
> @@ -7,13 +7,12 @@
> #define TPM_MEMREMAP(start, size) early_memremap(start, size)
> #define TPM_MEMUNMAP(start, size) early_memunmap(start, size)
>
> +#include <asm/early_ioremap.h>
> #include <linux/efi.h>
> #include <linux/init.h>
> #include <linux/memblock.h>
> #include <linux/tpm_eventlog.h>
>
> -#include <asm/early_ioremap.h>
> -
> int efi_tpm_final_log_size;
> EXPORT_SYMBOL(efi_tpm_final_log_size);
>
> --
> 2.22.0.rc1.311.g5d7573a151-goog
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] efi: Fix TPM code build failure on ARM
2019-06-06 11:39 ` Ard Biesheuvel
@ 2019-06-06 16:03 ` Matthew Garrett
2019-06-07 10:03 ` Ard Biesheuvel
0 siblings, 1 reply; 5+ messages in thread
From: Matthew Garrett @ 2019-06-06 16:03 UTC (permalink / raw)
To: Ard Biesheuvel
Cc: linux-integrity, Peter Hüwe, Jarkko Sakkinen,
Jason Gunthorpe, linux-efi
On Thu, Jun 6, 2019 at 4:39 AM Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote:
>
> On Wed, 5 Jun 2019 at 20:11, Matthew Garrett <matthewgarrett@google.com> wrote:
> >
> > asm/early_ioremap.h needs to be #included before tpm_eventlog.h in order
> > to ensure that early_memremap is available.
> >
>
> Doesn't that make it tpm_eventlog.h's job to #include it?
tpm_eventlog.h doesn't use early_memremap directly, it's expanded from
the macros declared in tpm.c .
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] efi: Fix TPM code build failure on ARM
2019-06-06 16:03 ` Matthew Garrett
@ 2019-06-07 10:03 ` Ard Biesheuvel
0 siblings, 0 replies; 5+ messages in thread
From: Ard Biesheuvel @ 2019-06-07 10:03 UTC (permalink / raw)
To: Matthew Garrett
Cc: linux-integrity, Peter Hüwe, Jarkko Sakkinen,
Jason Gunthorpe, linux-efi
On Thu, 6 Jun 2019 at 18:04, Matthew Garrett <mjg59@google.com> wrote:
>
> On Thu, Jun 6, 2019 at 4:39 AM Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote:
> >
> > On Wed, 5 Jun 2019 at 20:11, Matthew Garrett <matthewgarrett@google.com> wrote:
> > >
> > > asm/early_ioremap.h needs to be #included before tpm_eventlog.h in order
> > > to ensure that early_memremap is available.
> > >
> >
> > Doesn't that make it tpm_eventlog.h's job to #include it?
>
> tpm_eventlog.h doesn't use early_memremap directly, it's expanded from
> the macros declared in tpm.c .
Fair enough
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] efi: Fix TPM code build failure on ARM
2019-06-05 18:11 [PATCH] efi: Fix TPM code build failure on ARM Matthew Garrett
2019-06-06 11:39 ` Ard Biesheuvel
@ 2019-06-09 19:53 ` Jarkko Sakkinen
1 sibling, 0 replies; 5+ messages in thread
From: Jarkko Sakkinen @ 2019-06-09 19:53 UTC (permalink / raw)
To: Matthew Garrett
Cc: linux-integrity, peterhuewe, jgg, linux-efi, ard.biesheuvel,
Matthew Garrett
On Wed, Jun 05, 2019 at 11:11:40AM -0700, Matthew Garrett wrote:
> asm/early_ioremap.h needs to be #included before tpm_eventlog.h in order
> to ensure that early_memremap is available.
>
> Signed-off-by: Matthew Garrett <mjg59@google.com>
Thanks, squashed to "tpm: Reserve the TPM final events table".
/Jarkko
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-06-09 19:53 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-06-05 18:11 [PATCH] efi: Fix TPM code build failure on ARM Matthew Garrett
2019-06-06 11:39 ` Ard Biesheuvel
2019-06-06 16:03 ` Matthew Garrett
2019-06-07 10:03 ` Ard Biesheuvel
2019-06-09 19:53 ` Jarkko Sakkinen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).