From patchwork Fri Jan 20 11:58:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilias Apalodimas X-Patchwork-Id: 644641 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp735215pvb; Fri, 20 Jan 2023 03:59:11 -0800 (PST) X-Google-Smtp-Source: AMrXdXvEoe1BA70lQeAfHwuQMHCNc+eCqQxHa+utFr69o6NTlmp+9Fk1to+1/pq5AqkRKYarJJ48 X-Received: by 2002:a05:6870:450c:b0:144:1078:ed9 with SMTP id e12-20020a056870450c00b0014410780ed9mr8333411oao.25.1674215951358; Fri, 20 Jan 2023 03:59:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674215951; cv=none; d=google.com; s=arc-20160816; b=yS5AL/18FNzauRcS3hUPuzdXklHtUiGwp2Gu8cZ4MeiwDWD5rCSviR/zTpDWUtviP4 dnK88uBiJtp+bi2PlsZ/EgunzDDQkoDDjnMHmYwk8ZjNds9Dy5dAZugRS7EJJEj1L1LQ nsD1jRaRJGSNldAymgMJ0t/2zhyWsN4QZXASi9iIFyjAtdn6vScNAX3Y2QYqHNnDrwOw 3w86uUi5hCUKoVTQ3HlZYStN8yI7XLOUzE2Hs2ciHLoSdRRy4rFzmVrN1R/ghAUuhkyM kqKUPvXC8wiww1BXtAs9N84wGKQIZDbJc65eiPdXDHiCto91c/TDLj7PnRADZXdEpOSl 4pTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from:dkim-signature; bh=ZWrXS1688orVwnTCxhGl09rGC4Qx8YwWNAWIwiOIy/Y=; b=RAIcT+M8V7j3teIyS/+jZWOVPLMHQI/uBTC9lmiGbOLfRWSfPez4nFIipUyRjh7kbH 4Bm/r4RbOw22gKmHSgrn/bIS+z/kj6ybzdjNvNFoQ9/7ah+8PKYL1+xQdcJp7lg6EjDN G1dhUGyE2pkUhx4rtmZD0rkKX7L8d5OB7wPy1790sp9NzYco6MMYTC4oXrHl3yZV7aL5 T9NHUzTMHcOqnX/UrVN0YdTkvCTC4sktWgIdht7BsxJSKcdNtW8gLzbaxfsyS+qfWgO/ wIbWRKSG9t33vozJqKU/zp2ki2e/SvaIh2dUmIc77KyEC3mzGazfhsH2sXs/zj8DszSj wnww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UhNAuO16; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [85.214.62.61]) by mx.google.com with ESMTPS id d5-20020a056870d28500b0014ff15936e4si15075431oae.278.2023.01.20.03.59.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 03:59:11 -0800 (PST) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UhNAuO16; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3BC3E853D1; Fri, 20 Jan 2023 12:59:06 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="UhNAuO16"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A84B68546F; Fri, 20 Jan 2023 12:59:03 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 0DC908533F for ; Fri, 20 Jan 2023 12:59:01 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=ilias.apalodimas@linaro.org Received: by mail-ed1-x52e.google.com with SMTP id z11so6518440ede.1 for ; Fri, 20 Jan 2023 03:59:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ZWrXS1688orVwnTCxhGl09rGC4Qx8YwWNAWIwiOIy/Y=; b=UhNAuO163DBIvy5RE8OvO8fWhcv6RcR5H0K4KeuRKLhk3EWymbrpjlkqzDtAzjwFDu xjZC46OxdViwEimrAXpaUzraq4YPrX9AMt0qSzolYNnFyrPew8LoblsCynM0QRoji/wl ZQVOxgXdk9JCUGiXJvXI2OGIwd0XM0mGKllvPdMcJZnnVlH90YIsdF8ARrGlSndtE7GX fAgV8dX5V6yF5lTOeqNbdgkNSBoKecGRPi9pM5lpFgo7rClmJ+7NJR35R3adVKdDl2c2 wOSIfwXRpgEsi3AiUP3x6plpCZXeHtSwhlTtxE6vOitnO3q/uhVoqK1fhFidVUXlVle6 bTUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ZWrXS1688orVwnTCxhGl09rGC4Qx8YwWNAWIwiOIy/Y=; b=q0z0N7XXtXvVcuSPZkHWJHIgQssTPS6NBOhYtIsOb/ODZoY+Ew1ibQkKQjFHVKzr6j pPEJMewgFV4MOXGsZ2yvykH1Fa2Rar0ehFNLUXu+WArUTOhRFRsnfR9c4SK7BZF1NhPs vXYMBb7wIE+mXgRcr9TF4+widQFEK3HtUXRD0w2EdsKTORz7ilWNGoJVFn1CZrE8g5em kfm9e6Gc91jSjMVsMHA3RYtlNY3HUUMAVEFBH91awqkpQ+37fbHEIlIRbak5l/IT+6KV h9hyGD2NtkXOArsd2xGKTYgjbfBIdCRug6P5SG7hbTtyXhqIq3SC+J+C0T7qv8ug+GPv LX0Q== X-Gm-Message-State: AFqh2kp4TK7UInlFQcTfosVglc9YIiFws0B01bx+Y7XhcmxUlb+ThzK7 4Id5RuBtxfswm/SPbXQvZNyiCWjEwZJzuf9z X-Received: by 2002:aa7:cc81:0:b0:465:f6a9:cb7b with SMTP id p1-20020aa7cc81000000b00465f6a9cb7bmr14547260edt.12.1674215940605; Fri, 20 Jan 2023 03:59:00 -0800 (PST) Received: from localhost.localdomain ([2a02:85f:fc9d:e4b5:8225:9a2f:d09d:5e54]) by smtp.gmail.com with ESMTPSA id m20-20020aa7c2d4000000b00495f4535a33sm17322989edp.74.2023.01.20.03.58.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 03:59:00 -0800 (PST) From: Ilias Apalodimas To: u-boot@lists.denx.de Cc: Ilias Apalodimas , Heinrich Schuchardt Subject: [PATCH] efi_loader: fix CapsuleMax variable reporting Date: Fri, 20 Jan 2023 13:58:48 +0200 Message-Id: <20230120115848.898846-1-ilias.apalodimas@linaro.org> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean Currently the code that adds the CapsuleMax variable is under a Kconfig named 'EFI_HAVE_CAPSULE_UPDATE. Git history only shows a single occurrence of that. The IS_ENABLED should be checking for EFI_HAVE_CAPSULE_SUPPORT Reported-by: Heinrich Schuchardt Signed-off-by: Ilias Apalodimas --- lib/efi_loader/efi_setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.38.1 diff --git a/lib/efi_loader/efi_setup.c b/lib/efi_loader/efi_setup.c index e00005bc3830..0a7b608ba960 100644 --- a/lib/efi_loader/efi_setup.c +++ b/lib/efi_loader/efi_setup.c @@ -128,7 +128,7 @@ static efi_status_t efi_init_capsule(void) { efi_status_t ret = EFI_SUCCESS; - if (IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_UPDATE)) { + if (IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT)) { ret = efi_set_variable_int(u"CapsuleMax", &efi_guid_capsule_report, EFI_VARIABLE_READ_ONLY |