From patchwork Sat Oct 22 15:23:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerry Snitselaar X-Patchwork-Id: 7898 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp1254039wrr; Sat, 22 Oct 2022 08:35:12 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4nYAuXeEEQK89WjVbojk80Lcwri+xw8fpK4d6t15RZGK2BIdEkCRHSQASQ9A8J5I3pgxAC X-Received: by 2002:a05:6402:350f:b0:45d:1d86:9ec9 with SMTP id b15-20020a056402350f00b0045d1d869ec9mr23140428edd.266.1666452912072; Sat, 22 Oct 2022 08:35:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666452912; cv=none; d=google.com; s=arc-20160816; b=rJFvcHStpJTnkfKRzEu4WAcEgoKiAFb/VSnL1Zbckg59bSK4wI9mGK0UGQY3qtp/wT 6aQanwp+DsbBIftFLwNKWOCub2Idzb8yl+iGulTsHJC6RQsgNgw6ZzUg50/sKZ+XSY24 0ISi9dVxuNNZ6ibSZJKKhfjYKv8yK+k1cjlPuWQx82l5s0YMhVEvpBEo9rEGHqgUyxry +vUaBwGmVZNy765O8LC7xOkwsf5lGtN53RWnwlT++x1KVcOvQron7YjAUMMdQL56sKNw HVjVr/ON6GRog4FxBcAfa0sa4z6QPcagKC2XGt78TdA7fw1S6FR+ifhyCfkK2Tt1yIVT x1AQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=UWUkuuCod8l5bJVZ5tTL+4nS+qttcoxn4McrP045ChQ=; b=GkRF0uFHplQAdeP2Drr9rDCg93xpZSBMhk2wVJhFm+K6+fcUMhw6ZCa4mCD6FGUyJZ OuOTPMX0z7rZOkD6M3zaPnsPXP3VrKaxaWB0n8f5pqHpHij1J4HlUVNniC2zq/9W7M5v PNcUoyQaNskzy6lwpigCt4IutoacB1YUS9MHjadvp9K0uMLpjEeDWUJRjpqNtLAfusPF 08wl8jT0Rtwt+VR443gSIGLlIf9GUxC+yMTE7Md7LgxrDlzhtFwGlFsyS50WzD6q5ulM X+t4QC8Rxd3VpWmxaD9TaE+qChLE6ssjKE1BlwTlWLrxOnjkoQjNZqodR4FSkrpVDr83 bZlg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=TJokguSn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id qk10-20020a1709077f8a00b0078d112eaf80si24188631ejc.86.2022.10.22.08.34.42; Sat, 22 Oct 2022 08:35:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=TJokguSn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229606AbiJVPYD (ORCPT + 99 others); Sat, 22 Oct 2022 11:24:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55864 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229568AbiJVPYC (ORCPT ); Sat, 22 Oct 2022 11:24:02 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 17B3ABE09 for ; Sat, 22 Oct 2022 08:24:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666452240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=UWUkuuCod8l5bJVZ5tTL+4nS+qttcoxn4McrP045ChQ=; b=TJokguSn0Db3cXEbhlwYxS2ygiK9/C6rZNGZUXpuGx6OIc0G/xyRnR4xrM4XyV2bR6LjC5 tJYmwQfb2TvLWXOAJjevCLk0sfRNV9oLfGRcPkI9jICPsyhOxU8FPbGJmghQvbtI7TWZf0 7QHewkQ8i/QITCSxsPOrvHtmG3J5BHQ= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-640-ffCSfy1EOGur2LgQwF961Q-1; Sat, 22 Oct 2022 11:23:56 -0400 X-MC-Unique: ffCSfy1EOGur2LgQwF961Q-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 62CE08027F5; Sat, 22 Oct 2022 15:23:56 +0000 (UTC) Received: from cantor.redhat.com (unknown [10.2.16.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id A3AE22024CBF; Sat, 22 Oct 2022 15:23:55 +0000 (UTC) From: Jerry Snitselaar To: linux-kernel@vger.kernel.org, linux-efi@vger.kernel.org Cc: Matthew Garrett , Jarkko Sakkinen , Bartosz Szczepanek , Ard Biesheuvel Subject: [PATCH] efi/tpm: Pass correct address to memblock_reserve Date: Sat, 22 Oct 2022 08:23:52 -0700 Message-Id: <20221022152352.1033750-1-jsnitsel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747402528418564238?= X-GMAIL-MSGID: =?utf-8?q?1747402528418564238?= 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 Cc: Jarkko Sakkinen Cc: Bartosz Szczepanek Cc: Ard Biesheuvel Signed-off-by: Jerry Snitselaar Acked-by: Jarkko Sakkinen --- drivers/firmware/efi/tpm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/firmware/efi/tpm.c b/drivers/firmware/efi/tpm.c index 8f665678e9e3..e8d69bd548f3 100644 --- a/drivers/firmware/efi/tpm.c +++ b/drivers/firmware/efi/tpm.c @@ -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;