From patchwork Wed Nov 28 06:00:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 152196 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp700398ljp; Tue, 27 Nov 2018 22:00:16 -0800 (PST) X-Google-Smtp-Source: AFSGD/W+ga9qS3+n+OW2MOrTPENIHfkhy1wSN8IKKgqpNjR51bGnO0yk/yyq3EqcLf5lT2B1z8Bk X-Received: by 2002:a50:9ee3:: with SMTP id a90mr29193601edf.283.1543384816845; Tue, 27 Nov 2018 22:00:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543384816; cv=none; d=google.com; s=arc-20160816; b=cEVBJ9skYXhBuTsiHuL5UO6KPF6h5QC3mRN2kbuxbI5H0+anixtwiXwyySa5FJJCBm KilGowuTc5zsfp1aW26+dlFLT4ZNWUw8QkMqdxzmziuYlVlcHqQrtiD5kNHfLt+8EMyg mU8D5y7/fWJfM3bAoqLcUTxOpeHoiP86mcq6OufMg3DxZ+W77p+2Gj7B7zmgYpzB+1pD Xr5D8YFufKrNQFV9VeIV4zy4lrFtLXkB8nZAGXnz2ypW/q6OXSxaLbpAdj6Ys+sMVVdw BVcFie6id5ZwM8lAxcs5zBwUn6nJfy33IS1y/YJJYEyIIFduujIw4udYaJ0Sn+kQHF5h b7Wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :cc:mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature; bh=4uQXBvYD0afUoYtjYwmB88s98zkedhz9W/godjCxqDc=; b=ExpQAQnsbFWqVSxdXVhqFwZzq6eMWe7KAB/zSF/UFB+b2UTwgb8i8GL6+VZNrZ+tMR rV+hdNJAyTBV5kQcaY+5YVjztSKs2BEaY1gKTN1cG5UlOYLRTeo/2VFh+2DqiXwmhH5w govRsN+RyD009ZPjAnPRncXP7h1SAFExA4Yd4RpyiFaV0cOfV7ZLEhr0zcsROfKKoUB+ yAgVPGV9STnRkO6Iuyu51BDTztNRoJZqmwGceeK3J5OJ2jQ3DWRwd3fO53Jjhdx/vLVq 5PIiT/4AexvxR1mqEyhTuZSnl+K3I2SakAA9DKICdPSgkUgPsIVdE06a4YT62YvOEwAG grGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=dHDFKbZi; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id z49si1003300edb.342.2018.11.27.22.00.16; Tue, 27 Nov 2018 22:00:16 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=dHDFKbZi; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.denx.de (Postfix, from userid 105) id 6BE35C2218E; Wed, 28 Nov 2018 05:59:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 8FF8AC221AB; Wed, 28 Nov 2018 05:58:56 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B527BC22167; Wed, 28 Nov 2018 05:58:52 +0000 (UTC) Received: from mail-yb1-f193.google.com (mail-yb1-f193.google.com [209.85.219.193]) by lists.denx.de (Postfix) with ESMTPS id 8415FC221BC for ; Wed, 28 Nov 2018 05:58:48 +0000 (UTC) Received: by mail-yb1-f193.google.com with SMTP id t13-v6so10149803ybb.8 for ; Tue, 27 Nov 2018 21:58:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=V6qwGHSpURnUDRCWFLWp10PXCsXIA/7PAHrzM9YMy7Y=; b=dHDFKbZivxqYkZxe8Oz42hjdlOrQYNdae/PRKy7xr8RYlR426ap33eFDqESiFScF84 SV0n+qu2ck523Ov4vhzmkBU1GEYW3t5sYL8ZvsIhVJ91457vYCF3OtIF2VOJYTz34Y11 T1oGgcBWSFDTw7oRsonUYGIQYn05GLO9m9e4o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=V6qwGHSpURnUDRCWFLWp10PXCsXIA/7PAHrzM9YMy7Y=; b=AOawLfUntyu8v+R6/Q0+1tFCRMf55JcFckrkqNaoTZpLaBk0XNgPUe2GmUpLCHO5Ok SMe4q98+afvF2B0iwzPkx0N3YY3uS6NunOGIEdvfRrb2S+ILKuky15MLaXWQjnMcc1ok 7P1BgDFd0PPvxd0uZf1DZajBmixYad6hMqsRjf2qIrs0epZqE8Vtka98M/EYzCtIMbRP Zx91AodtUT8fWQ0BKONlfAmStX42oA0E+ArYa0wXs9/QZvjEsbt0+0gNMQ5i1JbSE5d8 9SDSRtRD5CgHvEeZePfcFvrfBjOGv1qY6JaGfyaMsLkQQuJgvASik3sE2sQJcpI+EL6x oQYA== X-Gm-Message-State: AA+aEWb2x9tdLK5zrpxcPuE5gQ9BTOoEtir7+nEaXKVzuMX95Df2vN5p ExbOmxQz+N+lDdLbWUhmu+lS/A== X-Received: by 2002:a25:764d:: with SMTP id r74-v6mr35922658ybc.461.1543384727275; Tue, 27 Nov 2018 21:58:47 -0800 (PST) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id j134sm4657152ywb.91.2018.11.27.21.58.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Nov 2018 21:58:46 -0800 (PST) From: AKASHI Takahiro To: trini@konsulko.com, agraf@suse.de, xypron.glpk@gmx.de Date: Wed, 28 Nov 2018 15:00:56 +0900 Message-Id: <20181128060059.5508-2-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181128060059.5508-1-takahiro.akashi@linaro.org> References: <20181128060059.5508-1-takahiro.akashi@linaro.org> MIME-Version: 1.0 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH 1/4] efi_loader: support non-volatile variable behavior X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" An EFI variable is nothing but a wrapper of a corresponding u-boot environment variable (See efi_variable.c), but under the current implementation, NON_VOLATILE attribute is not honored while u-boot environment variables can be saved/restored in storage. With this patch, the expected semantics will be mimicked by deleting all the EFI variables *without* NON_VOLATILE attribute when loading them from storage at boot time. Signed-off-by: AKASHI Takahiro --- env/env.c | 4 +++ include/efi_loader.h | 1 + lib/efi_loader/efi_variable.c | 64 +++++++++++++++++++++++++++++++++-- 3 files changed, 66 insertions(+), 3 deletions(-) diff --git a/env/env.c b/env/env.c index afed0f3c95c3..c507a4ac5f78 100644 --- a/env/env.c +++ b/env/env.c @@ -5,6 +5,7 @@ */ #include +#include #include DECLARE_GLOBAL_DATA_PTR; @@ -195,6 +196,9 @@ int env_load(void) if (ret) { debug("Failed (%d)\n", ret); } else { +#ifdef CONFIG_EFI_LOADER + efi_purge_volatile_variables(); +#endif printf("OK\n"); return 0; } diff --git a/include/efi_loader.h b/include/efi_loader.h index 9f7a4068efa6..9cad1dcd62bb 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -533,6 +533,7 @@ efi_status_t EFIAPI efi_get_next_variable_name(efi_uintn_t *variable_name_size, efi_status_t EFIAPI efi_set_variable(u16 *variable_name, efi_guid_t *vendor, u32 attributes, efi_uintn_t data_size, void *data); +int efi_purge_volatile_variables(void); /* * See section 3.1.3 in the v2.7 UEFI spec for more details on diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c index 19d9cb865f25..ad8cd36fa1e1 100644 --- a/lib/efi_loader/efi_variable.c +++ b/lib/efi_loader/efi_variable.c @@ -8,6 +8,8 @@ #include #include #include +#include +#include #define READ_ONLY BIT(31) @@ -142,6 +144,8 @@ static const char *parse_attr(const char *str, u32 *attrp) if ((s = prefix(str, "ro"))) { attr |= READ_ONLY; + } else if ((s = prefix(str, "nv"))) { + attr |= EFI_VARIABLE_NON_VOLATILE; } else if ((s = prefix(str, "boot"))) { attr |= EFI_VARIABLE_BOOTSERVICE_ACCESS; } else if ((s = prefix(str, "run"))) { @@ -293,7 +297,7 @@ efi_status_t EFIAPI efi_set_variable(u16 *variable_name, efi_guid_t *vendor, } } - val = malloc(2 * data_size + strlen("{ro,run,boot}(blob)") + 1); + val = malloc(2 * data_size + strlen("{ro,run,boot,nv}(blob)") + 1); if (!val) { ret = EFI_OUT_OF_RESOURCES; goto out; @@ -302,12 +306,16 @@ efi_status_t EFIAPI efi_set_variable(u16 *variable_name, efi_guid_t *vendor, s = val; /* store attributes: */ - attributes &= (EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS); + attributes &= (EFI_VARIABLE_NON_VOLATILE | + EFI_VARIABLE_BOOTSERVICE_ACCESS | + EFI_VARIABLE_RUNTIME_ACCESS); s += sprintf(s, "{"); while (attributes) { u32 attr = 1 << (ffs(attributes) - 1); - if (attr == EFI_VARIABLE_BOOTSERVICE_ACCESS) + if (attr == EFI_VARIABLE_NON_VOLATILE) + s += sprintf(s, "nv"); + else if (attr == EFI_VARIABLE_BOOTSERVICE_ACCESS) s += sprintf(s, "boot"); else if (attr == EFI_VARIABLE_RUNTIME_ACCESS) s += sprintf(s, "run"); @@ -334,3 +342,53 @@ out: return EFI_EXIT(ret); } + +/* + * Purge all the variables which are not marked non volatile. + * This function is assumed to be called only once at boot time. + */ +int efi_purge_volatile_variables(void) +{ + char regex[256]; + char * const regexlist[] = {regex}; + char *list = NULL, *name, *value; + int len, ret = 0; + u32 attr; + + snprintf(regex, 256, "efi_.*-.*-.*-.*-.*_.*"); + + len = hexport_r(&env_htab, '\n', H_MATCH_REGEX | H_MATCH_KEY, + &list, 0, 1, regexlist); + + if (len < 0) + return -1; + else if (!len) + return 0; + + name = list; + while (*name) { + /* variable name */ + value = strchr(name, '='); + if (!value) + break; + *value = '\0'; + value++; + + parse_attr(value, &attr); + if (!(attr & EFI_VARIABLE_NON_VOLATILE)) { + if (env_set(name, NULL)) { + printf("cannot purge efi variable: %s\n", name); + ret = -1; + } + } + + name = strchr(value, '\n'); + if (!name) + break; + name++; + } + + free(list); + + return ret; +} From patchwork Wed Nov 28 06:00:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 152195 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp700013ljp; Tue, 27 Nov 2018 21:59:44 -0800 (PST) X-Google-Smtp-Source: AFSGD/XwpZ0LaPDhv6De0Djx4mzLeigsCnC9M/yVmiPdRXGvbi4BQQwINy3UVMkE/tR+RWfc2L3Z X-Received: by 2002:a50:9e43:: with SMTP id z61mr29395508ede.90.1543384784327; Tue, 27 Nov 2018 21:59:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543384784; cv=none; d=google.com; s=arc-20160816; b=Y9xB80He13Hj2FgcVI6XmQ+ED/v6r2K9H12nEPFkC6jcC7dlDSwSdYLxvNLqRCbcBS 9uT9rR7SqR+aYZu5KToflYklwtLks5y4fmAdpcypTeaqenGwErzNVofkUvp86ykytWa3 7Nmtx1sdAB7BnCKzeipI5IRhCp0tRjpzECimlTwWLoZjXW7lkH9Sd4KYV6wnwblfnMd5 OR0WQLuOBmFOUm3t/H2onolOlVbfNc8namD4DuaPgovDA+38A3lYA89O8w5L5deP5i7D O9/8QKjvHIWJ5BX/HZnC4Bt71JLaK0ninqy/rRE5iNS1Va2xQgNREX4pYjOC4KuAw8ij lOew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :cc:mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature; bh=jKVgLLMcy0T6m864CUG3pPQEhW9ZwUjfUikbk6xQxmI=; b=FjmC10ZY6rE7HNrgYog3szWEbLEYekJNs1UM+as5hu9rZqm5/aF38GZCZ3wum180VK 3SzdlbHZjKFH+yUHa7kv7B3NXpvr9MY/yXkRSY5ABp6o6jsBl0lAUmF1Fjwib3rdBUym kdYjQ0sEwDG5LDNmMkUg3UJUQzYl43yZM4SVM8hX4z+gf+36GiANPQGbAHnpb9a2mIS8 wGRsQAd7Kbq6m3tfrB2Jm4uf/gT2d69lX9FstPdyR8smNYOOeTeMgoH7p1fK2Yh7sH4z RtAc7ZDMqj5THm6IK7A14Z2t8OmJxgKgFUFhXw8jYyrVVbSQ2eBZkkRjCI3rnJ0+Grt8 d4Bg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=ZFfmgXfd; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id v27si2535734edb.444.2018.11.27.21.59.44; Tue, 27 Nov 2018 21:59:44 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=ZFfmgXfd; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.denx.de (Postfix, from userid 105) id DF1EAC22171; Wed, 28 Nov 2018 05:59:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 92DD2C2218B; Wed, 28 Nov 2018 05:59:15 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 7EC6BC2212E; Wed, 28 Nov 2018 05:58:55 +0000 (UTC) Received: from mail-yw1-f65.google.com (mail-yw1-f65.google.com [209.85.161.65]) by lists.denx.de (Postfix) with ESMTPS id 5C3C7C221BA for ; Wed, 28 Nov 2018 05:58:52 +0000 (UTC) Received: by mail-yw1-f65.google.com with SMTP id h32so10250274ywk.2 for ; Tue, 27 Nov 2018 21:58:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=h1iqcyR857W+HIPftMlJWYkQKCC3Iw5j6ZMjLpKqJbA=; b=ZFfmgXfdzg3gVSsaBvWuvs5Z3ZFfzXWkrU9aQ6H5UskCvKsTIlcO9tJbr9ZRS8g2JX UrrFLrS8UX/1TfUgbcpLxFRhVTYTHRcE3Bk34PZNBhoLSWJlXNKLStWf7ReJS4a7j/gX 4Jc7RFI0hc6UwewIGvhNcbMw36jTCFKG0QdmE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=h1iqcyR857W+HIPftMlJWYkQKCC3Iw5j6ZMjLpKqJbA=; b=X38PQy9N7VVgzxkbV3PNSLtI0/CG0d5DO6YfE5fBJsz22HvhBmoyP/k/93Dg1Zjpag ugam6OBX/NpBWv7u1v/Z08ckftDFbfsaSfx016cnssQzqKjXcoL2Ea2G17U5i3CFPtz7 ttsvrCexQsIY/SVLYrJtj2S1zAGptzS/srSLOjEY1Xs143kwpqhV5DEw49wIhjmb35zb ERiMCvOHRM12Ief06SdijcPh3r98sVc/qGCDrLDC+EYdVAs6JUwy3u/Tp0j+/qiNWyqg aZx8cjZZez4+HBRn8X1cbeymAH43jIFnmk6C6EvHHqP5jENDSn43Rb8NC36SuzHsDXZB aqCg== X-Gm-Message-State: AA+aEWaJ/iYUiUyI07rlvC3VGB5dFpSC/y4naZ3bq9mNE1kEVCiYenEL SpHcqd0JArTRKbGkPyPiK/lBsQ== X-Received: by 2002:a81:51c7:: with SMTP id f190mr33772970ywb.162.1543384731178; Tue, 27 Nov 2018 21:58:51 -0800 (PST) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id u84sm1549893ywb.12.2018.11.27.21.58.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Nov 2018 21:58:50 -0800 (PST) From: AKASHI Takahiro To: trini@konsulko.com, agraf@suse.de, xypron.glpk@gmx.de Date: Wed, 28 Nov 2018 15:00:57 +0900 Message-Id: <20181128060059.5508-3-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181128060059.5508-1-takahiro.akashi@linaro.org> References: <20181128060059.5508-1-takahiro.akashi@linaro.org> MIME-Version: 1.0 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH 2/4] cmd: efishell: support -nv option to setvar sub-command X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" With -nv specified, a variable to be created will have NON_VOLATILE attribute. Signed-off-by: AKASHI Takahiro --- cmd/efishell.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/cmd/efishell.c b/cmd/efishell.c index 7cd3ca489559..7cdff757b06c 100644 --- a/cmd/efishell.c +++ b/cmd/efishell.c @@ -249,11 +249,22 @@ static int _do_efi_set_var(int argc, char * const argv[]) unsigned long size = 0; u16 *var_name16, *p; efi_guid_t guid; + u32 attributes; efi_status_t ret; if (argc == 1) return CMD_RET_SUCCESS; + attributes = EFI_VARIABLE_BOOTSERVICE_ACCESS | + EFI_VARIABLE_RUNTIME_ACCESS; + if (!strcmp(argv[1], "-nv")) { + attributes |= EFI_VARIABLE_NON_VOLATILE; + argc--; + argv++; + if (argc == 1) + return CMD_RET_SUCCESS; + } + var_name = argv[1]; if (argc == 2) { /* remove */ @@ -275,9 +286,7 @@ static int _do_efi_set_var(int argc, char * const argv[]) utf8_utf16_strncpy(&p, var_name, strlen(var_name) + 1); guid = efi_global_variable_guid; - ret = efi_set_variable(var_name16, &guid, - EFI_VARIABLE_BOOTSERVICE_ACCESS | - EFI_VARIABLE_RUNTIME_ACCESS, size, value); + ret = efi_set_variable(var_name16, &guid, attributes, size, value); ret = (ret == EFI_SUCCESS ? CMD_RET_SUCCESS : CMD_RET_FAILURE); out: return ret; @@ -978,7 +987,7 @@ static char efishell_help_text[] = "\n" "efishell dumpvar []\n" " - get uefi variable's value\n" - "efishell setvar []\n" + "efishell setvar [-nv] []\n" " - set/delete uefi variable's value\n" " may be \"=\"...\"\", \"=0x...\" (set) or \"=\" (delete)\n" "efishell devices\n" From patchwork Wed Nov 28 06:00:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 152198 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp701038ljp; Tue, 27 Nov 2018 22:01:02 -0800 (PST) X-Google-Smtp-Source: AFSGD/XZH/DjB52HldINLOCghpnFFiqOQ7eNCJPksnK0K/wIH19I8DLM0bab84NAIV5s2ApYMCVO X-Received: by 2002:a05:6402:3d1:: with SMTP id t17mr30206847edw.21.1543384862830; Tue, 27 Nov 2018 22:01:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543384862; cv=none; d=google.com; s=arc-20160816; b=tBMaV+X/2hvuK65L0y0jv7o+b+/Vcw/or9IhUX/79qQAfa+B+79fh9R3k/Xfclg16o sHun3IlKlkYpXM+NJ0VdL6l76PXSvexfGtcWKB4cHI48HBR4zJJbXxn60LWi7w4NSG+L R6rAKW9EA5W0Rcs9e5143wGHAAFvURepnQItKE2AvOR8gNKZaCblFdsRiIUXN9W8hW5q vbhn/UzFI6H1FJIQs1mnzA6tfCUtANDXJrbbHIrWtviAVN2xXXGOofaCJjuxNhTuAVlx DdrH60mL8ClautNwu/5yACf1mm3cn1+uLxSBB042k3vOgLW9/nyQtiU4FNg21dXbSmHJ QU3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :cc:mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature; bh=+AQqQw8ob/vUiUvsy+kxDSPBRBYOtvzykJi4a6QYSBo=; b=f81dK5qPvrGT0cAJxX2IpM4MAk2rudfwroYHyONfO4o3ZWCmJuwnjLuTz8G3Up2cR7 i6wK0mPv2m47FvkjPIhLI6NA1TMcSxNL5i47sb7IkCzQuB56ILk08yGw/3td32mn7FUJ nWAXFxWn5nkntitVc0ZV5BTWq2sjUovmoF20JjWXjgAf3oQoJcUMmCQOzPWF82FZDP5O 2bTY88njOV9G7GgXPV8hyuaaeyJb0zcu59GpgU8MEHgdLsO+suXv6yBKnbW2WRJaQS7r uPisnH8U8cT3FTYLuvu/i7yrgq8oDROvwZtcmIAMCDRbTshOZbTgShQEk9Zk+zretnb5 gWBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=HF0O5R3y; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id s19-v6si801585ejm.289.2018.11.27.22.01.02; Tue, 27 Nov 2018 22:01:02 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=HF0O5R3y; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.denx.de (Postfix, from userid 105) id 6764DC22194; Wed, 28 Nov 2018 05:59:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 3DB64C221A6; Wed, 28 Nov 2018 05:59:19 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4F8DBC2217E; Wed, 28 Nov 2018 05:59:00 +0000 (UTC) Received: from mail-yw1-f68.google.com (mail-yw1-f68.google.com [209.85.161.68]) by lists.denx.de (Postfix) with ESMTPS id E1AC8C221BC for ; Wed, 28 Nov 2018 05:58:56 +0000 (UTC) Received: by mail-yw1-f68.google.com with SMTP id q11so10263211ywa.0 for ; Tue, 27 Nov 2018 21:58:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RLvNHTPnFFDVJEheugyEpRElFWkDI6UsO41o/fk3j0I=; b=HF0O5R3ytDDo1HLwT50xO+R+sNkcAaNYvY98zNx3caw5s16lWtufvOLtNLFqQE7S/Q CKlXR3VBYxKAZIr9/OtVTOtW/l43lYaSbltncgGAwDgHn13z/yf7r9gCphZljxSpPZwZ TN6fvvmxiyyORPmIjUkCeL6zVJsPcMphh5acg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RLvNHTPnFFDVJEheugyEpRElFWkDI6UsO41o/fk3j0I=; b=QibpxDuRQsG7gOOQRh8Fx5lJU4d1wiGVAsrgNpPb+aoX+sgBefpCWxCG0+FBm0r7jZ iT/SyDi6UjND0UVu5MPXTeKpLIRuAxw12gWkPWNL5Ch5Sg5jobtu0c16x1u80HvAkOek +tYF7I12dqqFOJnGdloCsdgoNWrFGOB3O3HO0yXLmkbmw6UMYnXxkvUMvDqtXoYAaUTp TV1MKr/HSipuE8j3B/l09W7JHu46aDfmWSqZ7XZjapZ7n+s6wY0L/5NreTZTsG7veMRZ KeAOxlfAoj7GqSW3MKxFlznEVUwyedaKVoASJxeorJ0wGUGqK477TiNBbOmjzKmR1zgw IUOQ== X-Gm-Message-State: AA+aEWZd66TU0isfJ1i4hWqmfDXxGoPE1vOzNiP2H5IebMcqijv7YIpk L7goRzKCFhWnkI2crLHp/L7MNg== X-Received: by 2002:a81:417:: with SMTP id 23mr17317042ywe.471.1543384735845; Tue, 27 Nov 2018 21:58:55 -0800 (PST) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id 141sm1605422yws.47.2018.11.27.21.58.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Nov 2018 21:58:55 -0800 (PST) From: AKASHI Takahiro To: trini@konsulko.com, agraf@suse.de, xypron.glpk@gmx.de Date: Wed, 28 Nov 2018 15:00:58 +0900 Message-Id: <20181128060059.5508-4-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181128060059.5508-1-takahiro.akashi@linaro.org> References: <20181128060059.5508-1-takahiro.akashi@linaro.org> MIME-Version: 1.0 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH 3/4] cmd: efishell: make Boot####/BootOrder variable non-volatile X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" See UEFI specification v2.7a, section 3.3 for details attributes. Signed-off-by: AKASHI Takahiro --- cmd/efishell.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmd/efishell.c b/cmd/efishell.c index 7cdff757b06c..a594278a04fe 100644 --- a/cmd/efishell.c +++ b/cmd/efishell.c @@ -641,6 +641,7 @@ static int do_efi_boot_add(int argc, char * const argv[]) } ret = efi_set_variable(var_name16, &guid, + EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS, size, data); ret = (ret == EFI_SUCCESS ? CMD_RET_SUCCESS : CMD_RET_FAILURE); @@ -676,6 +677,7 @@ static int do_efi_boot_rm(int argc, char * const argv[]) utf8_utf16_strncpy((u16 **)&var_name16, var_name, 9); ret = efi_set_variable(var_name16, &guid, + EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS, 0, NULL); if (ret) { @@ -898,6 +900,7 @@ static int do_efi_boot_order(int argc, char * const argv[]) guid = efi_global_variable_guid; ret = efi_set_variable(L"BootOrder", &guid, + EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS, size, bootorder); ret = (ret == EFI_SUCCESS ? CMD_RET_SUCCESS : CMD_RET_FAILURE); From patchwork Wed Nov 28 06:00:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 152197 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp700725ljp; Tue, 27 Nov 2018 22:00:39 -0800 (PST) X-Google-Smtp-Source: AFSGD/UEqqUDXy1lXwnk3/JUAcDGfZwyRlZfJlBQRePv0Z6PCYtXjm9xpSiiVrB2ltduKPsNSGtD X-Received: by 2002:aa7:c55a:: with SMTP id s26mr28769153edr.132.1543384839195; Tue, 27 Nov 2018 22:00:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543384839; cv=none; d=google.com; s=arc-20160816; b=xov5eXCdg0R3s56u/HJz70Yk1Ssoa35l8tqQPmQSxIaj02aip1CKjlOX+1v8siIfWU wsUF6S0fdBdA99wpu7g4EwRHAMFsSOPowCJ4idw+m1b6XGWSuTlLTqQ5yh50/VaTlgzm 2yUYJaKPw31L+OVMcKSxYejJLzZebvZB/Me69fPugF9KdwcC1tU55id65kyTRimCHvHT sWu+nHuI3mbV8TanqXrfoSu1gvB0Npn+PBsqAVvbF+qi7IDlcxFX5cIj1Fv2wiD4ixLF vh01tl1PYNVZnHBZkhNFUL/Thw5HM5tlLU3pQZGVO/GFJHqqpscX9taPn4ZnG+fQ1m8O G3Rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :cc:mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature; bh=FT51urVIbT/Oar5mlAPUzIPT3+80Z4gZDNEut5Gaj1Y=; b=oY/6t/x2xxSQ0Jv4n0pk/DhvnRzjG7SYpQf59Tx2c5iqOpD817LdsZk1kDr7KbXJlr wPsZx5diCjcsJBcQTU9qXFQ7OlJJA2m3wt9lRyyzbCbMWiKxBytWlBtYfPEJA+0pRsYy JdufCJbzdrXD3QrxX7otAm3B3g13WPvTt/xRbVN4ggFKW7djPALtAwWs9feZGUkdBxFU mOPZ5CEZGMv3JYFIfs2JHBU0WAfal3xe19fgclICoCIaakuEY1WvAjDNUji6S3cmKRiu 4tYhbzMOd18RTs48yV0fHsWydVSYcfMXo6qplB47B+xyFMJegSCCRC72AIx/Gnevfan2 yQuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=GndXOaGM; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id i48si3511067ede.239.2018.11.27.22.00.38; Tue, 27 Nov 2018 22:00:39 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=GndXOaGM; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.denx.de (Postfix, from userid 105) id 90D21C22167; Wed, 28 Nov 2018 06:00:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 75925C22187; Wed, 28 Nov 2018 06:00:04 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 543AFC220CF; Wed, 28 Nov 2018 05:59:04 +0000 (UTC) Received: from mail-yw1-f68.google.com (mail-yw1-f68.google.com [209.85.161.68]) by lists.denx.de (Postfix) with ESMTPS id 98FF3C22198 for ; Wed, 28 Nov 2018 05:59:00 +0000 (UTC) Received: by mail-yw1-f68.google.com with SMTP id l200so10238428ywe.10 for ; Tue, 27 Nov 2018 21:59:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=W2vLMV0wm/qktDI0Ug4BM8Tu1VihZA+iOGKku2NHzf8=; b=GndXOaGM1bS91OWoxkKOT4g9dc0Q7rXatvA42F0naoRqMVjej2q79CLZ6m83VjaEyT D9KO39JCEAdpt23t7goVkvSEq9abIxwINz41J7fUZROK/8GPRinFlt/QHJCS1b5E5ixo zNTi5Z/gdEA1K57k0RO7Z+Xaeq1paNkzTYrgU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=W2vLMV0wm/qktDI0Ug4BM8Tu1VihZA+iOGKku2NHzf8=; b=UMnVQiTTcy2w18Zb5xtSM6XnxYtwx7b+mduksZmaQnNnaksXRimMk7JJLTMslvUUa3 /QWLXwLgPZ6dx7rXzRaBck9sxBlcf6hd0v01h3vKjy3PB3fXfbOowTvVsz/HW6hBJ6xX 7As64xhUgErrsg35MQ0yfFGTWuu2z1VFvJ25x7F8Fy88j/050anDtiTXx0x9LW04g/pb W68RQyBlpWUS7y8vosIFyryfBFeo+Tf/MqYTgGJUir0fuFOdCpkQCo9W5i+2JR2CySU4 ECBngu+bwLbscc9osfA/7Iy2alpIXUM5aPgEvEBNxdKmb7ZnMau0M+1Pe8RL6v5TRNzL ASHg== X-Gm-Message-State: AGRZ1gLhoqh4gZWP6+z9yVb1Ve+P+lurpeoudetsLTEuUVWt97Q9ObfC 6hwzW/H9OgpiJR7gqIFT24tcgz1VjpU= X-Received: by 2002:a81:4514:: with SMTP id s20mr37170639ywa.76.1543384739559; Tue, 27 Nov 2018 21:58:59 -0800 (PST) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id d85sm1843664ywd.22.2018.11.27.21.58.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Nov 2018 21:58:59 -0800 (PST) From: AKASHI Takahiro To: trini@konsulko.com, agraf@suse.de, xypron.glpk@gmx.de Date: Wed, 28 Nov 2018 15:00:59 +0900 Message-Id: <20181128060059.5508-5-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181128060059.5508-1-takahiro.akashi@linaro.org> References: <20181128060059.5508-1-takahiro.akashi@linaro.org> MIME-Version: 1.0 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH 4/4] efi_loader: bootmgr: make BootNext non-volatile X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" See UEFI specification v2.7a, section 3.3 for details attributes. Signed-off-by: AKASHI Takahiro --- lib/efi_loader/efi_bootmgr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/efi_loader/efi_bootmgr.c b/lib/efi_loader/efi_bootmgr.c index db391147fb2d..128d1e887cb4 100644 --- a/lib/efi_loader/efi_bootmgr.c +++ b/lib/efi_loader/efi_bootmgr.c @@ -210,7 +210,8 @@ void *efi_bootmgr_load(int boot_id, if (!bootnext) goto run_list; - attributes = EFI_VARIABLE_BOOTSERVICE_ACCESS | + attributes = EFI_VARIABLE_NON_VOLATILE | + EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS; size = 0; ret = rs->set_variable(L"BootNext",