Message ID | 20200327052800.11022-7-xypron.glpk@gmx.de |
---|---|
State | Superseded, archived |
Delegated to: | Heinrich Schuchardt |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=Z8jHMBV0; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48pVkv4MTXz9sR4 for <incoming@patchwork.ozlabs.org>; Fri, 27 Mar 2020 16:28:39 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 64EEE818AB; Fri, 27 Mar 2020 06:28:30 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="Z8jHMBV0"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 845E1818AB; Fri, 27 Mar 2020 06:28:27 +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=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 4B2F981836 for <u-boot@lists.denx.de>; Fri, 27 Mar 2020 06:28:24 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=xypron.glpk@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1585286894; bh=xOv2HgJrrPtdjGRpv1SQ66M3t2XupBYVkmENKlPLnEY=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=Z8jHMBV0KNOnx7sAo1H9gWPIlyzf2hU1rbhoNH0bScn4eIDLeL4/e+twPfaY6n4DK 4M3QpdfdRGqtQPLzwhEgnzjWhU0ZfJp2jrH0aNsdZ5j4D+qMmnnlCeGdlv62nREaSi NZoK0TE03msupT44yRocz6cRvdNH6G+2r3H+1mXQ= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from LT02.fritz.box ([84.119.33.226]) by mail.gmx.com (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MC30P-1j5Liy36oH-00CQ9i; Fri, 27 Mar 2020 06:28:13 +0100 From: Heinrich Schuchardt <xypron.glpk@gmx.de> To: Alexander Graf <agraf@csgraf.de>, AKASHI Takahiro <takahiro.akashi@linaro.org> Cc: Ilias Apalodimas <ilias.apalodimas@linaro.org>, Sughosh Ganu <sughosh.ganu@linaro.org>, Alexey Brodkin <abrodkin@synopsys.com>, Paul Emge <paulemge@forallsecure.com>, Faiz Abbas <faiz_abbas@ti.com>, Eugeniu Rosca <erosca@de.adit-jv.com>, Urja Rannikko <urjaman@gmail.com>, Kever Yang <kever.yang@rock-chips.com>, Simon Glass <sjg@chromium.org>, Alistair Strachan <astrachan@google.com>, Ruslan Trofymenko <ruslan.trofymenko@linaro.org>, Igor Opaniuk <igor.opaniuk@gmail.com>, u-boot@lists.denx.de, Heinrich Schuchardt <xypron.glpk@gmx.de> Subject: [PATCH 06/16] efi_loader: keep attributes in efi_set_variable_int() Date: Fri, 27 Mar 2020 06:27:50 +0100 Message-Id: <20200327052800.11022-7-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200327052800.11022-1-xypron.glpk@gmx.de> References: <20200327052800.11022-1-xypron.glpk@gmx.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:TjWUmFtj2mEcg0fPTwuJGA0OOGHYjkjI1VGyWBQdy5efSV4rOla RQbT9JocxEtr4n4bO6I5IBuxlYus5Uq/Doky8uI9+zmeRxpYYvpt8w+Xp4FNXP0ZuuznDJD tnBo0hmXeOT3MUPBA4+iv6kBPSwWXzA/P0xQmweEfNz5qporAjf1pDMjI9JPXOKjjDszwgC vItIgE7QT2d4vbkhdIATw== X-UI-Out-Filterresults: notjunk:1; V03:K0:mKaJyqsYoUk=:+zDa1pvcHyHcz6CJgk6laf RzuHo9zVjRUbPWHFRYJo+AYj57IDQYsy1M6QmhIWQWe3tAov9g0uKWcxFt9vTX3WrqJ3PqzKM z/r/U9VSi9Dnue2TuZO4X1ktT8fAb/jG6vBUfcmzCgN1x1N8VNDjYW9rU/wwjgAVwKo/PRJ3Q JTtTKz7jvJmxOLfAvdoV3GFqwQeRZz+vGl+QVNeo1PTD8P9H6BNSLNmqaHOsLaQdBmnrt7ky/ vONn53H2OKjtzLdrD3PUMiqqDMZhRxUlPzHGy7zhbZnmYDoPYnX+Awz3uZZuHIPIBsWZjxpQq nJXl89P8yKddhMM0sr/7Okua6ETWIT0JNg4fEsXhn0PHTJykTkFXkvFSIWQ5JBFvOeaTNNYKY oQRMuaBlhZvgcvUaxs2NNxsTQpJk2c1821JRUZ5QDYv32CLItLrMrDueWjtxnRKaGiUvwAa8T unPJGQiYYRzwMQGyknOQRu0uX5pb+MJOI6t+TxNtgwWkKEA33H/iPfbzNZ1BdeVCEv0iO8J6v RGS3ywtV4wUyGPUNlsDFfP68XatU0wDSmfSReSXssvMP3+YHoRsVTT1zkcj2zu7Yruap2xHyJ V1UYyIayIXHL/y/olgYylzFTi8gZosgu94bZiWsm9/Bl10xmwL48QNXNv2ZIEj7JiV7z8rpiv /eGxE5SyIXGjEtwgxYxJnLPRUqBsvTxz4TX6O+sLcb29yqt3RvZlYR1HmJsdn0etCa7p5AOEr ussgLXzCWb3pq5ljoFGXcZ+9uiYMZHvIqhYFbJqime4JEsmrSRecuGN6m4r2Q4nbYguEXvSUm uOUfotkKhS8TTZm0Ow+3qKAUwPxMwIYPzipB1TY+BBpNM6AboiIMgVSXNZr7rIXV6L9IJv0AD QuqTd57ebfaMUTdk4plRLeMiS9JNEuT0DhFEXMdrLWhfV5acx5hFbGsq06f/EA6sQzQ3ge9pm VEX5UeORttw7mTDS9ohSw2Tli1jUCZk/wY6H+P/rWk+s4KwBT521bZRl7KsR1dWCgx+cn7ffe qYNuC3/amXO+R6mHum4SI+9TFs27ahCTWvmQU4e4uMgyWfssNDOep6yvS3l8ZeImhC2ETFhNe OgUc/QgUyCS6NOw5rWnGODwa/dB3JScokuTHKjsQne93L68d6ubfenL6GFYpkqAogtGa+/bB3 l6Cdq44E+nUC5QqkpEN4H6/C/tmzcFFZeTe3/PMSNeSPuqCGoXwQInaiYQmooDEIDpGdGavvx SFgWrmCFfOL40MA3D X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean |
Series |
efi_loader: non-volatile and runtime variables
|
expand
|
diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c index 4fae1fa4c7..d99ad6ddae 100644 --- a/lib/efi_loader/efi_variable.c +++ b/lib/efi_loader/efi_variable.c @@ -573,8 +573,8 @@ efi_status_t efi_set_variable_int(u16 *variable_name, EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS); s += sprintf(s, "{"); - while (attributes) { - u32 attr = 1 << (ffs(attributes) - 1); + for (u32 attr_rem = attributes; attr_rem;) { + u32 attr = 1 << (ffs(attr_rem) - 1); if (attr == EFI_VARIABLE_NON_VOLATILE) s += sprintf(s, "nv"); @@ -583,8 +583,8 @@ efi_status_t efi_set_variable_int(u16 *variable_name, else if (attr == EFI_VARIABLE_RUNTIME_ACCESS) s += sprintf(s, "run"); - attributes &= ~attr; - if (attributes) + attr_rem &= ~attr; + if (attr_rem) s += sprintf(s, ","); } s += sprintf(s, "}");
Do not change the value of parameter attributes in function efi_set_variable_int(). This allows to use it later. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> --- lib/efi_loader/efi_variable.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.25.1