efi/tpm: Pass correct address to memblock_reserve
PATCH 1/1 efi/tpm: Pass correct address to memblock_reserve
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.
--- drivers/firmware/efi/tpm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/firmware/efi/tpm.c +1 -1
@@ -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;
Signature · 1 line
2.37.2
Quoted 34 lines · Jerry Snitselaar
memblock_reserve()expects a physical address, but the address being passed for the TPM final events log is what was returned fromearly_memremap(). This results in something like the following:[ 0.000000] memblock_reserve: [0xffffffffff2c0000-0xffffffffff2c00e4] efi_tpm_eventlog_init+0x324/0x370Pass 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 <[email protected]>Cc Jarkko Sakkinen <[email protected]>Cc Bartosz Szczepanek <[email protected]>Cc Ard Biesheuvel <[email protected]>Signed-off-by Jerry Snitselaar <[email protected]>--- drivers/firmware/efi/tpm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/firmware/efi/tpm.c +1
-1@@ -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;Signature · 1 line
2.37.2
BR, Jarkko
Ard Biesheuvel
maintainerQuoted 33 lines · Jarkko Sakkinen
Quoted 31 lines · Jerry Snitselaar
memblock_reserve()expects a physical address, but the address being passed for the TPM final events log is what was returned fromearly_memremap(). This results in something like the following:[ 0.000000] memblock_reserve: [0xffffffffff2c0000-0xffffffffff2c00e4] efi_tpm_eventlog_init+0x324/0x370Pass 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 <[email protected]>Cc Jarkko Sakkinen <[email protected]>Cc Bartosz Szczepanek <[email protected]>Cc Ard Biesheuvel <[email protected]>Signed-off-by Jerry Snitselaar <[email protected]>--- drivers/firmware/efi/tpm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/firmware/efi/tpm.c +1
-1@@ -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;
Quoted 7 lines
Quoted 3 lines
--
2.37.2Acked-by Jarkko Sakkinen <[email protected]>
Queued as a fix,
Thanks all,