efi/tpm: Pass correct address to memblock_reserve
authorJerry Snitselaar <jsnitsel@redhat.com>
Sat, 22 Oct 2022 15:23:52 +0000 (08:23 -0700)
committerArd Biesheuvel <ardb@kernel.org>
Mon, 24 Oct 2022 06:04:25 +0000 (08:04 +0200)
memblock_reserve() expects a physical address, but the address being
passed for the TPM final events log is what was returned from
early_memremap(). This results in something like the following:

[    0.000000] memblock_reserve: [0xffffffffff2c0000-0xffffffffff2c00e4] efi_tpm_eventlog_init+0x324/0x370

Pass the address from efi like what is done for the TPM events log.

Fixes: c46f3405692d ("tpm: Reserve the TPM final events table")
Cc: Matthew Garrett <mjg59@google.com>
Cc: Jarkko Sakkinen <jarkko@kernel.org>
Cc: Bartosz Szczepanek <bsz@semihalf.com>
Cc: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Jerry Snitselaar <jsnitsel@redhat.com>
Acked-by: Jarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
drivers/firmware/efi/tpm.c

index 8f66567..e8d69bd 100644 (file)
@@ -97,7 +97,7 @@ int __init efi_tpm_eventlog_init(void)
                goto out_calc;
        }
 
-       memblock_reserve((unsigned long)final_tbl,
+       memblock_reserve(efi.tpm_final_log,
                         tbl_size + sizeof(*final_tbl));
        efi_tpm_final_log_size = tbl_size;