From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8D95E433BC8 for ; Mon, 6 Jul 2026 16:39:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783355959; cv=none; b=KUw5U393/nuqnCxL3X2Li1Qo85XK58pIdYfpA2bHrtFKaYdxG4FVXbVCGUPZvpKIZQBcdMiCrvKX8WKZR5Csad2BjshFBpnQnjj+hCij+rxEhSI5/PiljUfOtD4TmLfNHRdEAkK9SsaV7ILv8Di0p/DEk4L4l+o+w+WL3/MC328= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783355959; c=relaxed/simple; bh=BTI/aAntiQ9xcx69tlVTSh2gnfDkXs2rdrTFgedaEpQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jxkf/8wULyLHRt5xPDPCb6tTvSYUUWDgH+EiqHM5aedIoRbDQkbXYQAHepev2Ru57x1Ufjmsl3B7w6hkQSaszPTWRPHbWx/CPlZE9b5qwdrzeakkNGpga2l8X00YjbHZ3fO0q2mzJ6l4YkCLnMvB5brO2v2g51YYT9I9BByNUME= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ne7bMMZB; arc=none smtp.client-ip=209.85.214.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ne7bMMZB" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-2cc8e87f29bso10970505ad.2 for ; Mon, 06 Jul 2026 09:39:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783355957; x=1783960757; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ln2AHNDCstBaUrT3DCw2JhDQU5MIDiC1ybsTRxhjJ6s=; b=ne7bMMZBz7DuDx/UcyHgEcjNO9sg9oXkkSJcy4Ro1v9/HNWoW5no/7MLPpBjx5gMdh /6VtiTEp0WHcGnRln5BbWkhQz0gQR4ATVMo8qfjH5qUbJQniwrzjYCPzBx5xu1Cr+6w8 rUFGa/XlXhQE7oNvbR36Z03B+pK9zBhEKYj8iDJYHpDG4vxDYsIPHAXiU74dz1N6cuVm YaC9WUqz6yUADZBhBDtphmsRUweZJEUaEvt46JOGhAAMgVPMwFZ0c0W4XBezDIBzMPxO y77uTAzrkcZa4EFiC/LXWwUBz3rszeCoY2z2cLfR8zktbOfQbVQ5fNd/xGa5GP2KAS/L GkvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783355957; x=1783960757; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ln2AHNDCstBaUrT3DCw2JhDQU5MIDiC1ybsTRxhjJ6s=; b=V2BW8+pvxRg1Lgjz7KajLE3ilwVqtXKrs1BZpYu8ChG1/sUUn4+FC/Zi2dvV8ElRep xOKVWhArQXmUAPnAAKibjIpdfaFp2WfSdD3cqGmg5NoY2XIkZH3aM2gHFWzaZoypUHLZ zilnXCH4OR0UWzoRLTQiTQ69FUgXv6NcSGsoHbybINIFyZzSW9RMRZfXCAth2B5lnbZZ /yWDCu5K26f1NxXnmCZIhYiKvYwkAY3i9jzr5xCYNyAZ+IXpMral1ZlHwP/OMRHNGwf3 zgdeiE4M9RFNpiFpL2Bo+5Z63j034012Mb0TPAIQAyoMpQYBWVrIXS+SvT69tH6M/miS 7XGQ== X-Forwarded-Encrypted: i=1; AHgh+Rrs7x1iddjLRhJI+8z8wmpdLzeQPFvy6N847nJP+xlXGgL/Ytw56upibD6BdlTUS6I9wd3J1oP8NKOvYXg=@vger.kernel.org X-Gm-Message-State: AOJu0Yyk+JKjlBOqAO+vZSXqRbZuil4kOD7XX24p3yGpmdZMCES4MIuT srFLFm3mQP8swpqUpUd6KQ3oVY4S0FCET+UkjshEz966WEkPcdhas4Hv X-Gm-Gg: AfdE7cl/qzhTLg3nPj1GCFa6xAItYbCOX129TCarA3TgJooDdP21XN1HKTWMnLhuFxK OVbL2dMP982/Ag3HcYn6hExp4bJq4eGMNUE+EojSbK28jZjxO80Y5dM/ZjCetdmbBfBdE9vvapR D6T9LA92rb48RwymqItPfG5Oj0/DQXYH4JpEP8nXCkOYJm3tuOKvNg03QtrAoQXfy+xBKIbmriY qSeoWoPDQqR5SPeZr6tX9wUrbOWurzixExCsOv6S+sbUXBIE3aStz4oA/ofy9WVeNjTOeG+oi73 tW16yGSzaayzzGogmatwOmaaMHL74bIzhKmoNteP6e7LIbX2+6Ogoal3+OICRrKJmtw8JCRr/wR 0h5Vl5LhzwHAX3ZQ6YyT8Qmvtjv1G3co0x/4r1NDLrglenz+/mGi50rBPiyPx/0OWtN+pj4l1jE 0Aypr8quo= X-Received: by 2002:a17:902:ec88:b0:2ca:c84b:c4a4 with SMTP id d9443c01a7336-2ccbee245d5mr14321395ad.28.1783355956959; Mon, 06 Jul 2026 09:39:16 -0700 (PDT) Received: from ubuntu.. ([110.9.142.4]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cad7893a8dsm53103305ad.73.2026.07.06.09.39.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jul 2026 09:39:16 -0700 (PDT) From: Sang-Heon Jeon To: rppt@kernel.org, Ard Biesheuvel Cc: linux-mm@kvack.org, Sang-Heon Jeon , Borislav Petkov , Chris Zankel , Dave Hansen , Ilias Apalodimas , Ingo Molnar , John Paul Adrian Glaubitz , linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, Madhavan Srinivasan , Max Filippov , Michael Ellerman , Rich Felker , Thomas Gleixner , Yoshinori Sato Subject: [PATCH v2 5/5] Revert "tpm: do not ignore memblock_reserve return value" Date: Tue, 7 Jul 2026 01:37:53 +0900 Message-ID: <20260706163753.193875-6-ekffu200098@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260706163753.193875-1-ekffu200098@gmail.com> References: <20260706163753.193875-1-ekffu200098@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit This reverts commit c33c28f9f6e017702374e1ab907dfa5a63db5301. efi_tpm_eventlog_init() runs from efi_config_parse_tables() during early EFI initialization, before memblock_allow_resize(). At that point memblock_reserve() either succeeds or panics, never returning an error. Therefore the return value check is unreachable, so restore the original unconditional memblock_reserve(). No functional change. Signed-off-by: Sang-Heon Jeon --- drivers/firmware/efi/tpm.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/firmware/efi/tpm.c b/drivers/firmware/efi/tpm.c index cdd431027065..288bcf7a5b99 100644 --- a/drivers/firmware/efi/tpm.c +++ b/drivers/firmware/efi/tpm.c @@ -61,12 +61,7 @@ int __init efi_tpm_eventlog_init(void) } tbl_size = sizeof(*log_tbl) + log_tbl->size; - if (memblock_reserve(efi.tpm_log, tbl_size)) { - pr_err("TPM Event Log memblock reserve fails (0x%lx, 0x%x)\n", - efi.tpm_log, tbl_size); - ret = -ENOMEM; - goto out; - } + memblock_reserve(efi.tpm_log, tbl_size); if (efi.tpm_final_log == EFI_INVALID_TABLE_ADDR) { pr_info("TPM Final Events table not present\n"); -- 2.43.0