From patchwork Mon Aug 12 20:56:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilias Apalodimas X-Patchwork-Id: 818571 Delivered-To: patch@linaro.org Received: by 2002:adf:cd01:0:b0:367:895a:4699 with SMTP id w1csp3197wrm; Mon, 12 Aug 2024 13:56:48 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU4b7FyHE4MHWGXO3MJtW/nR/mWVB1CVK/aW3C98uB0O1sNhz3H7O5PK7qTwmzdYU8HN6x3+d7VclyFPuBeHXFH X-Google-Smtp-Source: AGHT+IG+XzcH93NqnqjuJoAieHyRvr7lJ+ovfyVCq/wcIwRGA+iDB+CwX6jDOMpocnFe0QrBSCf4 X-Received: by 2002:a05:6402:430b:b0:5af:6f52:c11e with SMTP id 4fb4d7f45d1cf-5bd44c0cd7emr1622644a12.8.1723496208359; Mon, 12 Aug 2024 13:56:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1723496208; cv=none; d=google.com; s=arc-20160816; b=izq7TOlVIwYlC5Nd/CouU0xeiQgM2wNzF/Mxh2vrXtYEnVknZqe6ThFF1w5VxD7GVU CQ+AD291ELYEHN+pN8swN7CWSjIUdlcaebg1W3S9PdGdUAvyyZeWKlbi8Yobf8aV7VKO B8SylhdVTsBuMxaa2yVMTHC1iSfVgb9oVYIu7zfX+XoGzUKCvvDz9n3nkg7pQaA5CZtp /qm18gY85Z25JPASwg68C61Oa9XrDN1tA9SLR6D02Gb0QKZXwZ3S5SDid9n2HXsoCyc9 PvAOEKPX0MLlcBbcsw16i2CDT4jIm19K5x3DEYLF2iEySIVwe25oghAHjYHw7d1/0C3y Xf5g== 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=rhn0BE9ahqyPm2j1mQYO9hlkMjX8QPEfn+w8vdq9OR4=; fh=/7LjPiKhohDX4MIjVG5IUTORXUIMR0pRgBK2qFpEeGI=; b=pGas0FpJZfkcgFNoEnsp1/4bCWh/R/P05r4MF6etWTFSiwBWOq0u+LO5P1fxVrF4Lp /qATNJ3QZr5o88egU0U8tOeJrTX7BhNcgPYGc0Wluy4dzEuGFmwdlh+ee/Y0Jx72/8Ge JjIUNwUyJPE8YIDwLHi+5i3aOzWRjn51VkaTdy1I8z4MdYT1cmQu3Q1HPYmJQIIy2x22 mB380ksEVr/yhpYGzhStyEqK9xTaOvJB3Qn5QjtT2CRMUZgUGp4+J468nyJ37soa3jPK AGZABYVzogO5W61WwBz2etYBp2RXFBf6DMy9tOVEKMILCT/QgngBPXWrdtQnBo3r2pY/ 6EHA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Km9Dj44A; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [85.214.62.61]) by mx.google.com with ESMTPS id 4fb4d7f45d1cf-5bd1a5f9000si3410848a12.398.2024.08.12.13.56.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Aug 2024 13:56:48 -0700 (PDT) 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=Km9Dj44A; 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; dara=neutral header.i=@linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1DABD87DB6; Mon, 12 Aug 2024 22:56:47 +0200 (CEST) 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="Km9Dj44A"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B2CB287C38; Mon, 12 Aug 2024 22:56:46 +0200 (CEST) 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, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) (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 0114087E9D for ; Mon, 12 Aug 2024 22:56:43 +0200 (CEST) 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-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-4281d812d3eso47386175e9.3 for ; Mon, 12 Aug 2024 13:56:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1723496203; x=1724101003; darn=lists.denx.de; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=rhn0BE9ahqyPm2j1mQYO9hlkMjX8QPEfn+w8vdq9OR4=; b=Km9Dj44ABPJjt4aT8yMGSO3lb5anyowebMOQBgVkwn6EjVKG6U6uo2PW+sntjHHraI tGaLNSxCVHI7VoIprDsO3VyTSBbinDCYc7S0vcPV/v4O+dtgQFcHUfPGG99+zhftsfg1 8sfZFFuqsgmCyrFH6NCfeWyeOYpCvCFlwzFIncF0B8OTMmMeuzLV/M8F/nJzZTUwbdpE +T+XEutOiCEjrJGrLLFFl3W7ryUIsQHdSVr3HIswg8ZZjwjuvGQu6GB9zo9NSx2gZ7K4 dz7/qae+NHn2S7QA6eFqJwDxmHzO6C7RxRlL9uDG/pRW43LbT0ROLugLd2kWb8JaQjtm puvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723496203; x=1724101003; 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=rhn0BE9ahqyPm2j1mQYO9hlkMjX8QPEfn+w8vdq9OR4=; b=FgVyir09ighjPu9AahuJ7wD5BERCIYTbikDVyF7O1WhGINTrkuuQ+8OMcfKuzIXiJP zQeJtKbTLq4+m/sgTkJyXJ6WnvwxqFEQdRUXcjSCIDFfkdpZ6wLK3oeZYd3GTsKd5Wzd vm7lMr8eLLtSErHFyFS9mgCJXquRobIM2G6xmj+XiCpP4Z44mvRhbw2PPPSmwt3dCdK4 qITzWlXn7Dtu9lACwACua9tRZfxk3+D1hY0+jbutyz7Zh5swtVJ37U9dgU/0kLyymyNk 5ZLasSz/HcktGzwZYoyQ4Ndy7Nf7/IgYpjRoU6u/LUXg/IHOQPibAKSZk0BCQwhsOVB4 6Puw== X-Forwarded-Encrypted: i=1; AJvYcCXGzgW6EbqKrtRrvdL402VDXTd0vjiI7giYM+dnNsILSdcw5R5tNwk297cR0UmZyaJcRRHpv2A5esrkG0Y8m93FLEqF2Q== X-Gm-Message-State: AOJu0YxJXVGfAb7CpsM+CYNEhWKuXsTOuMU/KEbZ8uYhU1kLfxFBMSet AiTuJhPbmZN1/7xCwH8o3tVRHgqb6mOxMDMVsZGHWSi8x+7k+ks+axZ2HOseuNo= X-Received: by 2002:a05:6000:2c1:b0:368:3782:c2b3 with SMTP id ffacd0b85a97d-3716ccfa0e2mr1347250f8f.29.1723496202764; Mon, 12 Aug 2024 13:56:42 -0700 (PDT) Received: from localhost.localdomain (ppp046103060252.access.hol.gr. [46.103.60.252]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a80f411b51esm9491966b.134.2024.08.12.13.56.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Aug 2024 13:56:42 -0700 (PDT) From: Ilias Apalodimas To: xypron.glpk@gmx.de Cc: kojima.masahisa@socionext.com, u-boot@lists.denx.de, akashi.tkhro@gmail.com, Ilias Apalodimas Subject: [PATCH 1/3] efi_loader: shorten efi_bootmgr_release_uridp_resource() Date: Mon, 12 Aug 2024 23:56:36 +0300 Message-ID: <20240812205638.1732159-1-ilias.apalodimas@linaro.org> X-Mailer: git-send-email 2.45.2 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.8 at phobos.denx.de X-Virus-Status: Clean We use this function to clean up leftover resources when booting an EFI HTTP boot image, but the name is unnecessary long. Shorten it to efi_bootmgr_release_uridp() Signed-off-by: Ilias Apalodimas Reviewed-by: Simon Glass --- lib/efi_loader/efi_bootmgr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/efi_loader/efi_bootmgr.c b/lib/efi_loader/efi_bootmgr.c index 589d3996b680..181fc8775b96 100644 --- a/lib/efi_loader/efi_bootmgr.c +++ b/lib/efi_loader/efi_bootmgr.c @@ -380,12 +380,12 @@ err: } /** - * efi_bootmgr_release_uridp_resource() - cleanup uri device path resource + * efi_bootmgr_release_uridp() - cleanup uri device path resource * * @ctx: event context * Return: status code */ -efi_status_t efi_bootmgr_release_uridp_resource(struct uridp_context *ctx) +efi_status_t efi_bootmgr_release_uridp(struct uridp_context *ctx) { efi_status_t ret = EFI_SUCCESS; @@ -432,7 +432,7 @@ static void EFIAPI efi_bootmgr_image_return_notify(struct efi_event *event, efi_status_t ret; EFI_ENTRY("%p, %p", event, context); - ret = efi_bootmgr_release_uridp_resource(context); + ret = efi_bootmgr_release_uridp(context); EFI_EXIT(ret); } @@ -544,7 +544,7 @@ static efi_status_t try_load_from_uri_path(struct efi_device_path_uri *uridp, return ret; err: - efi_bootmgr_release_uridp_resource(ctx); + efi_bootmgr_release_uridp(ctx); return ret; } From patchwork Mon Aug 12 20:56:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilias Apalodimas X-Patchwork-Id: 818572 Delivered-To: patch@linaro.org Received: by 2002:adf:cd01:0:b0:367:895a:4699 with SMTP id w1csp3263wrm; Mon, 12 Aug 2024 13:57:00 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXvdQHoTl7F3TZ00zWwt6GPHuHmgM6vjPB/mtsjMpBCYoYff0uH5tZ/FJmInRpmrlwndq39sBHMMwpYt5XJMGXA X-Google-Smtp-Source: AGHT+IGj1KjUv1zq4AowxRx5RO6iVwzWUZ9g3VqYsrZWrzueGFkt5iGtvESlNpfEFYFZTc29p0fg X-Received: by 2002:a17:906:bc0e:b0:a7a:8cb9:7491 with SMTP id a640c23a62f3a-a80ed2c8150mr106054866b.54.1723496220376; Mon, 12 Aug 2024 13:57:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1723496220; cv=none; d=google.com; s=arc-20160816; b=mqFlhXe9YChxFZEakUmJp24cGf+/RnMytqE8eK7K0pHwWXAGv4EevDg/KYIY/vjjM6 58GKRE5wDCPbAZuBywexVjc3OJuGPCn51AKPP+LcWavgIMJIi3QiQJpRyDeDDicc1+xC cm9fKdn+DLxRJR2v24fouxcFpc3GmrwtPHSgG9Z37usTZJNVnvJfV4cZSZq6c3wo3pDe QORzqR0EWyI2uo3xlzN7NsVqM9XMJ6gAe0XkxszN9Yutm5YxcZodigPV6ndSpp3Dka3J Wwv/kqYVcSrNAGcUn4kzGvg/1PrFn6yejGIQ9w/KiUi09rn5kQPLO6/yXK9DEwVuBDtH 1a4w== 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:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=dSPhPLrkOupbWWvPT5Cpp0+hW/YWwfV0IjHdf2GnvOk=; fh=ZZ7uhUNHtxDJ7+Os7cexURg5d6/Dwl6zXXrkcHtlEXk=; b=P1gqZNaJMIsoHp6jOMnxjeoW/KJ8oTBDpxw4MffK8n9jdYcLVm3ZJqxGaEwfIAwD6V yMt359lTx6l92fqgdk+2IuDxkCI1xYJGWNwJw3IeyWXhnz1ZgMymMSjW1IesfkhJBI7l MxifyYxCQ/BS7mbgonSq32tCYCNERd6Il8hVfg72zjz3QBGvdnGVduSU/ago3XAurZaT CL+B1dTLxIf+z+/806Nx7hNnTkI6SY2miyphJTuQEgWZ5yhY6Q5In4KVsYkniZbhFD4K l1Zq2Av3F0Cs/DFxhASp8TJ0YlnWOfbOTxF2BUYaPaoMgxaVlcwHYPyQygtYS6fTrmuL +tUA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YTkGHCjd; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [85.214.62.61]) by mx.google.com with ESMTPS id a640c23a62f3a-a80f411bab7si11364366b.364.2024.08.12.13.56.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Aug 2024 13:57:00 -0700 (PDT) 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=YTkGHCjd; 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; dara=neutral header.i=@linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7551386BF1; Mon, 12 Aug 2024 22:56:50 +0200 (CEST) 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="YTkGHCjd"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 997C1888C1; Mon, 12 Aug 2024 22:56:47 +0200 (CEST) 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, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) (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 E6EAE88703 for ; Mon, 12 Aug 2024 22:56:44 +0200 (CEST) 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-ej1-x62a.google.com with SMTP id a640c23a62f3a-a7a9cf7d3f3so557249666b.1 for ; Mon, 12 Aug 2024 13:56:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1723496204; x=1724101004; darn=lists.denx.de; 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=dSPhPLrkOupbWWvPT5Cpp0+hW/YWwfV0IjHdf2GnvOk=; b=YTkGHCjdM9aFFVpmTXWBRB15dy8iTOVTKDXSBWXiOd0Qj2z2RHh2+DPHyj5k2yQT5z hpHfGjoNoLWlHPXKZYIPGPji4UdMuT4H65YA4PisnSu/BzLdk2GVx73m+eHwbSIizl7Q gKHfUEUSDY/epiaOUeN2Q/XQ2HA45gc3ZB5whXpxBsXdb8mdT6X5pKeHvlJljSu4vVPT asmcj5y1eNQoo7H62K06pMhe+BLjJc4t07WWVHfqOOap2iHEZ1Lxr25suzmoG17tgLNi kHyHSTefW2j9u5wsFDspSnscWqSTpxIOPW0Z0VVQltLo0MTkafyzLSOyFGrYC6vFGjuX /5uQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723496204; x=1724101004; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dSPhPLrkOupbWWvPT5Cpp0+hW/YWwfV0IjHdf2GnvOk=; b=rj9D5po8ER5RgdL+/XkSsR/ugCe5pOwM/AaHmVkLC48dXDQacfXrmeOupkyEuEgbh0 q/bayL3Oe0SAp2EJQyAHFzqy8okZm0j2Fqp+z4NtxL+1U9SLODsH2XLGs2iq0dmxOs61 N61xRcr3KblBbd1uLhkFCNLZDe3uN2Xx8wQ2LNHIZ853FYly8zPVMLhpKtxdjXId+gVW jnX4691p8QfuVix0nfCBmadbYo4z9bhTKAnYkxul5oD84zFu/lKHj+kuB6K9abXGDfdE wiceTYI4fKFuLJzxG/ictZ8Uqny9PL8k8nAA2mOprb04QBDT7DoFotEqnt09PuHsQKZ+ y2ZA== X-Forwarded-Encrypted: i=1; AJvYcCVlmGdIGaFvsTBbCIuXszLB7PJfiuJTDjdu5aTtrJD8KQApIRG9psH/eCBbt9l8OsW9VcnR5ki7iQvwaTW55Wzx1o4ypw== X-Gm-Message-State: AOJu0YxMkj0Sn2wfObStkTkKIBNzV30JjDGNZWo6u1A11Es7NKux6/AY MQQGZI2XEIcMWGZ0MOXxoxLjZMlq67KJzhykJUfP1HVqFX1/6I9hvneiXMrpMUY= X-Received: by 2002:a17:906:f599:b0:a77:db36:1ccf with SMTP id a640c23a62f3a-a80ed2c87c5mr97191066b.42.1723496204041; Mon, 12 Aug 2024 13:56:44 -0700 (PDT) Received: from localhost.localdomain (ppp046103060252.access.hol.gr. [46.103.60.252]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a80f411b51esm9491966b.134.2024.08.12.13.56.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Aug 2024 13:56:43 -0700 (PDT) From: Ilias Apalodimas To: xypron.glpk@gmx.de Cc: kojima.masahisa@socionext.com, u-boot@lists.denx.de, akashi.tkhro@gmail.com, Ilias Apalodimas Subject: [PATCH 2/3] efi_loader: rename efi_bootmgr_image_return_notify Date: Mon, 12 Aug 2024 23:56:37 +0300 Message-ID: <20240812205638.1732159-2-ilias.apalodimas@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240812205638.1732159-1-ilias.apalodimas@linaro.org> References: <20240812205638.1732159-1-ilias.apalodimas@linaro.org> 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.8 at phobos.denx.de X-Virus-Status: Clean We use this event when returning from an EFI HTTP booted image. The name is a bit confusing since it suggests we always run it, rename it to make it clearer Signed-off-by: Ilias Apalodimas Reviewed-by: Simon Glass --- lib/efi_loader/efi_bootmgr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/efi_loader/efi_bootmgr.c b/lib/efi_loader/efi_bootmgr.c index 181fc8775b96..03cdee15017d 100644 --- a/lib/efi_loader/efi_bootmgr.c +++ b/lib/efi_loader/efi_bootmgr.c @@ -421,13 +421,13 @@ efi_status_t efi_bootmgr_release_uridp(struct uridp_context *ctx) } /** - * efi_bootmgr_image_return_notify() - return to efibootmgr callback + * efi_bootmgr_http_return() - return to efibootmgr callback * * @event: the event for which this notification function is registered * @context: event context */ -static void EFIAPI efi_bootmgr_image_return_notify(struct efi_event *event, - void *context) +static void EFIAPI efi_bootmgr_http_return(struct efi_event *event, + void *context) { efi_status_t ret; @@ -533,7 +533,7 @@ static efi_status_t try_load_from_uri_path(struct efi_device_path_uri *uridp, /* create event for cleanup when the image returns or error occurs */ ret = efi_create_event(EVT_NOTIFY_SIGNAL, TPL_CALLBACK, - efi_bootmgr_image_return_notify, ctx, + efi_bootmgr_http_return, ctx, &efi_guid_event_group_return_to_efibootmgr, &event); if (ret != EFI_SUCCESS) { From patchwork Mon Aug 12 20:56:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilias Apalodimas X-Patchwork-Id: 818573 Delivered-To: patch@linaro.org Received: by 2002:adf:cd01:0:b0:367:895a:4699 with SMTP id w1csp3337wrm; Mon, 12 Aug 2024 13:57:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUi3eXwetXrHqzNHFI5cLPCXxWIlQ87aGFMnusNT4PLniTbXlLdDKVMnk372XAiRyy1EsyGpqME3q6LqCAseQnd X-Google-Smtp-Source: AGHT+IEXGBkoz3RDWVgkL/c8hJNijb176ayMbON5maXJVtcbpg7DrmxYNHt8e8M+8O7HhCyiw096 X-Received: by 2002:a17:907:efd5:b0:a7a:929f:c0cf with SMTP id a640c23a62f3a-a80ed1efeedmr112892066b.21.1723496232439; Mon, 12 Aug 2024 13:57:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1723496232; cv=none; d=google.com; s=arc-20160816; b=y2og+9Qzr3NgUa4jsGF0thKHZhpDUBP/x5f5kDjfAoOq8SGzwWCzh8O6E7faLl6V0+ /wuYiFd73QNF/XBMGu58eFLisICcFo9JrbF7vHB9DL9I7vuy2chZwrXqHMSZ2bPxAu36 5+Ur2YLA3DbbukcfqWXBrt/vhNywZCdQo2CV2X/6l0QnlYrdOv/RZERfIr+DTAV8aiFU 44RArCaI5YhHatyQN4AqGNj5BygYY4i7Lmk01oF12726PF0ZJLuSVWUqbn6mATK/yZrt 6d5/Tn9R6s5JpTU8rzZBZpG0opYSh0nxeIMDziDm+fX1VZrLIkQNYr/p8FPZw2Vui7Ne 6v+w== 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:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=1PxyyKOhIhLJM2KgJkvqItP92NBeMNvKC4AN5PkDxq8=; fh=lrmtqYFDsOI3S+I8ZACfLVds8AhopcQ75saoSqWRD08=; b=ZotyQDvbGBLbl4uyYw1wcfSMun+b+CKmV+kkQNBGiKM1Wz+WYDYWRlPFnQyQPFIcZd MWU9pjF8ePYEVzjKHL5VN2RumfnVsypNZt9eP2VVi7bOdF8dtlePvKZxqiP/a9sVj3Xw jndxDJSgtA0XZPbJ30TcRNlB5TH0LRaMFsJA4qY6LJapx1Oz26lFbzxRmMG2CqImJ+yO UoHXLYDzsoQ0RhGcN7/FLOtEvxR2k1F/GkwTCVf/MWaxQsLLj7G0CSC4RMCKzltcD8y2 +6wZ1hQQtq7920jW6XrJiMcRMU6sdbDonqMmBtC8OdGSmWm4ePrq7O2WLFByLdqb4MI8 mf9g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="xCzo3/fy"; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [2a01:238:438b:c500:173d:9f52:ddab:ee01]) by mx.google.com with ESMTPS id a640c23a62f3a-a80f411d3a1si12268766b.461.2024.08.12.13.57.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Aug 2024 13:57:12 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="xCzo3/fy"; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D0579888C6; Mon, 12 Aug 2024 22:56:50 +0200 (CEST) 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="xCzo3/fy"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4B54888703; Mon, 12 Aug 2024 22:56:49 +0200 (CEST) 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, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) (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 60960866EE for ; Mon, 12 Aug 2024 22:56:46 +0200 (CEST) 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-x52d.google.com with SMTP id 4fb4d7f45d1cf-5a1c49632deso5317732a12.2 for ; Mon, 12 Aug 2024 13:56:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1723496206; x=1724101006; darn=lists.denx.de; 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=1PxyyKOhIhLJM2KgJkvqItP92NBeMNvKC4AN5PkDxq8=; b=xCzo3/fyc4kANwIOVZik9JjffUQmMlkCYmj7pVfgxC5hqeNe3TZYJLeqPLDNKvtZHL Csyt+wzP+c1eRqTzgAU8yFBIQhzuSX2hE08t6MHapZhW35J8QrYDSyD0C3kOBjR0OvWd o8cbf0MjL/ZflcQOW8MaZdyhio6W8nWNANwJnb755Saw1HhQ3QHMPC1NcohlBBbqkP7i co/TreQ0VbuEQxFmtTocSCMxDhPgK1BhdzZ9EBYThHeCkUNUFoY2epa/VpKuxoMvwMoi f7x3RouTAHJkAscuAtB4GnVTnZwE7yl6PtiQZOox8it6+Hpz8rZL3O5CILeHv8jXAolY kogw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723496206; x=1724101006; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1PxyyKOhIhLJM2KgJkvqItP92NBeMNvKC4AN5PkDxq8=; b=b+b31BdDTz6gHDCEOW+aNBsYyk0DFnQ9nySwHmEdsvZxWsfItR5C5HA3F9mHZqpcU8 CLxQUxUo8gq9QapwXY1/QgDxAcRYRtHVSaungYME1nWpnUygcLk+j4b2GtRGvFI6aOxt 9NDwgirvA/1kakqXpvRpd4rwViSabOJByDE/YEWX99N3T7LNnD4Zwg2uw2x5Kc3q2/s7 u4J/U1rh2UEjtTWMeUFHlpMujJfExZjF1GT/d4SwklA0kr0U55i497ODaqE4576mrVX1 qfIUFMYy+dC383GVHJsjaoWhp915XOsp0n3NE2FSmMDwCzmOo+/GeqokNzaN/HqKqLhB QltA== X-Forwarded-Encrypted: i=1; AJvYcCUTQ18dGJOQATbiOHdYALxnzqxR8KSJEumTQz2HShcj6cfG/WnypyyiFuvw9rdXyL9+w9KsZs4WesmLCJ59+Vp74Lq6bA== X-Gm-Message-State: AOJu0YzaaM6bNcpRONkb86t/xBOum76EWn6ElWn0bJ2eN7W0VA1vMe79 xkHethObQNvGDq9G9X8O0V1Pv91CIoGkC3iH8hmoDvMCHDSpqDPNBd9MxsH4uz4= X-Received: by 2002:a17:907:3fa3:b0:a7d:c9fa:e3b3 with SMTP id a640c23a62f3a-a80ed2ca647mr96190166b.54.1723496205337; Mon, 12 Aug 2024 13:56:45 -0700 (PDT) Received: from localhost.localdomain (ppp046103060252.access.hol.gr. [46.103.60.252]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a80f411b51esm9491966b.134.2024.08.12.13.56.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Aug 2024 13:56:44 -0700 (PDT) From: Ilias Apalodimas To: xypron.glpk@gmx.de Cc: kojima.masahisa@socionext.com, u-boot@lists.denx.de, akashi.tkhro@gmail.com, Ilias Apalodimas Subject: [PATCH 3/3] efi_loader: return the correct error in efi_bootmgr_release_uridp() Date: Mon, 12 Aug 2024 23:56:38 +0300 Message-ID: <20240812205638.1732159-3-ilias.apalodimas@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240812205638.1732159-1-ilias.apalodimas@linaro.org> References: <20240812205638.1732159-1-ilias.apalodimas@linaro.org> 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.8 at phobos.denx.de X-Virus-Status: Clean There's currently a chance for this function to overwrite an error if one occurred and the subsequent call to efi_uninstall_multiple_protocol_interfaces() succedded. Although this is an EFI event and we can't do much let's at least set and return the correct error Signed-off-by: Ilias Apalodimas Reviewed-by: Simon Glass --- lib/efi_loader/efi_bootmgr.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/efi_loader/efi_bootmgr.c b/lib/efi_loader/efi_bootmgr.c index 03cdee15017d..a3aa2b8d1b92 100644 --- a/lib/efi_loader/efi_bootmgr.c +++ b/lib/efi_loader/efi_bootmgr.c @@ -388,6 +388,7 @@ err: efi_status_t efi_bootmgr_release_uridp(struct uridp_context *ctx) { efi_status_t ret = EFI_SUCCESS; + efi_status_t ret2 = EFI_SUCCESS; if (!ctx) return ret; @@ -407,17 +408,18 @@ efi_status_t efi_bootmgr_release_uridp(struct uridp_context *ctx) /* cleanup for PE-COFF image */ if (ctx->mem_handle) { - ret = efi_uninstall_multiple_protocol_interfaces( - ctx->mem_handle, &efi_guid_device_path, ctx->loaded_dp, - NULL); - if (ret != EFI_SUCCESS) + ret2 = efi_uninstall_multiple_protocol_interfaces(ctx->mem_handle, + &efi_guid_device_path, + ctx->loaded_dp, + NULL); + if (ret2 != EFI_SUCCESS) log_err("Uninstall device_path protocol failed\n"); } efi_free_pool(ctx->loaded_dp); free(ctx); - return ret; + return ret == EFI_SUCCESS ? ret2 : ret; } /**