From patchwork Wed May 19 05:44:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masami Hiramatsu X-Patchwork-Id: 442360 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp984688jac; Tue, 18 May 2021 22:45:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwf7N3tKvg+YnjbcQTfTSNTRd+K7MQiL7s7HO/ewRrsDrkHQZkwY7fPbWUAjmwKeu754CB5 X-Received: by 2002:aa7:cb84:: with SMTP id r4mr11925325edt.187.1621403116040; Tue, 18 May 2021 22:45:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621403116; cv=none; d=google.com; s=arc-20160816; b=bBoXspzD5D/7FTppmmd1ts1OCbDxI4LPHVwmdae2RbrP6SRTcnht0vWfBYb8YyiiAj VXyjogjL3U/FMvqDQK8TADhxLFjyTt9rTMYz8Esw97EMVAlqvd2A+7ti9Fn/MKGBLMeR GZ/HeqCf1XG5h0GUTiFFHl60WT8Yu7uYfHnfvQlYK89/lzwEil3tLADWkl0U8BfPkwFj 9z/Yb/9WZH2/nMea25NS3/kSV7J7sRoeQi7O05ANtYu/FwI65IYKKR/QUJ2eZOaZ9087 y6wawP1gSoepnnpcG3AM6Rlv9pdubSVQuyH91gJpcsYDn8is07gb4Oi3kifXEmPVbTbN cJaw== 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:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=PMLjaHX0yNu4Vt2+2+BRUy44Cz7XPGdIquySHnGbOJY=; b=oURjl/HOa0hvBSdOwgW9MUGjdjA7BJFTtAdNKUvIwi9Nk23Q+MSQdcxhISMlnQW7tq t1ysTIKo1xO4KM1Nv6OQBiDp+k+4cVJmJ0PJgD8LwaMYVUkumGEMgjrcCoKbVK0p5Qyp efin0cxGte2Y3P2clY7FVZ8/HVPW2yT7yjXnqrCxXKtvoYmLPwkdIn/hAqknxQ4g9WQm ykbDRg4Wd6FM2sy5WZDM3m0lvFRf6BbHn8yJTA/hz4QTNQyH/Ns+qpIhcNrrbyE6+TSp d0eEvpWTpFRUmHXV4j0812wpYw7YJSHqp/YkEQbfHwhFIwLD5+ASi/3+bKp1wdMCLKrf MQEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hvgEjt68; 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 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 m9si23662973ejj.281.2021.05.18.22.45.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 May 2021 22:45:16 -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=hvgEjt68; 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 Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 660E282CB8; Wed, 19 May 2021 07:45:10 +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="hvgEjt68"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3A68382CB8; Wed, 19 May 2021 07:45:08 +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.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pj1-x1036.google.com (mail-pj1-x1036.google.com [IPv6:2607:f8b0:4864:20::1036]) (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 B47FF82A81 for ; Wed, 19 May 2021 07:45:01 +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=masami.hiramatsu@linaro.org Received: by mail-pj1-x1036.google.com with SMTP id ep16-20020a17090ae650b029015d00f578a8so2835949pjb.2 for ; Tue, 18 May 2021 22:45:01 -0700 (PDT) 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 :user-agent:mime-version:content-transfer-encoding; bh=PMLjaHX0yNu4Vt2+2+BRUy44Cz7XPGdIquySHnGbOJY=; b=hvgEjt68z9fy44/WwrkIYGnBjIpuSprG6IRjVwq9GY+mHIHP4d6x2OhCCNjIKjF1go r8/zJLZd1aLC6iLwe6lpPjk526foTmv6OkUXkT/KYMtvVlottskJzAWIM89OhqQbctjB pJLTkbPOWDWCNqV3s/LbMpgPiLmvlDClM1JdOWi6A4S81Q3DhKSjTQPHbiOHSxjj4jJi hoHwmtEa8dm4Pm9EEXcGFppvEpphO4V1RVhcsOuAA6nsncgksxrpQ3CdLkjFFFm5EcmF Uv9Ciz0UyHoBOfZJLLIx/QQlJdHkWy8QCbHLQvpP1zFKwMnY5AA8VBxdSURxbRUWXAR0 fDKw== 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:user-agent:mime-version:content-transfer-encoding; bh=PMLjaHX0yNu4Vt2+2+BRUy44Cz7XPGdIquySHnGbOJY=; b=EBPUw4WKFBtQLEMmvGFFKQDdDuCvADgZqosb1gJzeynj3ch7jBELsMpOox+oZftvQ5 /cHbnIVxBaub48dU2OdOpz0SexpBRv/QPLFHSA4xHZMf0RazBRmMrgozfurIrgFI13lb koO9iikmRG59eyePPzzYGmhG+ZXI3PuCw+lBfiZifFPvuXMx3VGm9Ktrgzxl9Lz3pNat pKJxJjdrb5IXPvOp1EOvKbcgaPRZwrX2+sfiZzYOrmE16KiQZpQaZOnA8hjn55lhTwpV cvSd7s21hNM0VbXtpBl/lWyKh1PLDck2I+mx+yq8tA3g9JCgqW3pWd1do1goiuEi6KAo qlxw== X-Gm-Message-State: AOAM531XeaFcl16u46HVOSV0MyaQu8yc4CYwa2dmU/QFlgSA0/OWuirl GDShoM6H2DX2dGe41tVM1s59Iw== X-Received: by 2002:a17:90b:3b92:: with SMTP id pc18mr9660544pjb.218.1621403100220; Tue, 18 May 2021 22:45:00 -0700 (PDT) Received: from localhost.localdomain (NE2965lan1.rev.em-net.ne.jp. [210.141.244.193]) by smtp.gmail.com with ESMTPSA id lj13sm3296263pjb.3.2021.05.18.22.44.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 May 2021 22:44:59 -0700 (PDT) From: Masami Hiramatsu To: Peng Fan , Simon Glass , Tom Rini , Heinrich Schuchardt , Alexander Graf , Jagan Teki , Vignesh R , Joe Hershberger , Ramon Fried , Sughosh Ganu Cc: Masami Hiramatsu , Jassi Brar , Ilias Apalodimas , Masahisa Kojima , Takahiro Akashi , Tim Harvey , Bin Meng , u-boot@lists.denx.de, Jaehoon Chung Subject: [PATCH v4 03/14] efi: Fix to use null handle to create new handle for efi_fmp_raw Date: Wed, 19 May 2021 14:44:54 +0900 Message-Id: <162140309457.47256.11132864507511171368.stgit@localhost> X-Mailer: git-send-email 2.25.1 In-Reply-To: <162140306116.47256.6799058439792039400.stgit@localhost> References: <162140306116.47256.6799058439792039400.stgit@localhost> User-Agent: StGit/0.19 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.102.4 at phobos.denx.de X-Virus-Status: Clean When running the efidebug capsule disk-update command, the efi_fmp_raw protocol installation is failed with 2 (EFI_INVALID_PARAMETER) as below. This is because the code passes efi_root instaed of handle. => efidebug capsule disk-update EFI: Call: efi_install_multiple_protocol_interfaces( &handle, &efi_guid_firmware_management_protocol, &efi_fmp_fit, NULL) EFI: Entry efi_install_multiple_protocol_interfaces(00000000fbaf5988) EFI: Call: efi_install_protocol_interface( handle, protocol, EFI_NATIVE_INTERFACE, protocol_interface) EFI: Entry efi_install_protocol_interface(00000000fbaf5988, 86c77a67-0b97-4633-a187-49104d0685c7, 0, 00000000fbfa6ee8) EFI: new handle 00000000fbb37520 EFI: Exit: efi_install_protocol_interface: 0 EFI: 0 returned by efi_install_protocol_interface( handle, protocol, EFI_NATIVE_INTERFACE, protocol_interface) EFI: Exit: efi_install_multiple_protocol_interfaces: 0 EFI: 0 returned by efi_install_multiple_protocol_interfaces( &handle, &efi_guid_firmware_management_protocol, &efi_fmp_fit, NULL) EFI: Call: efi_install_multiple_protocol_interfaces( &efi_root, &efi_guid_firmware_management_protocol, &efi_fmp_raw, NULL) EFI: Entry efi_install_multiple_protocol_interfaces(00000000fbfec648) EFI: Call: efi_install_protocol_interface( handle, protocol, EFI_NATIVE_INTERFACE, protocol_interface) EFI: Entry efi_install_protocol_interface(00000000fbfec648, 86c77a67-0b97-4633-a187-49104d0685c7, 0, 00000000fbfa6f18) EFI: handle 00000000fbaf8520 EFI: Exit: efi_install_protocol_interface: 2 EFI: 2 returned by efi_install_protocol_interface( handle, protocol, EFI_NATIVE_INTERFACE, protocol_interface) EFI: Exit: efi_install_multiple_protocol_interfaces: 2 EFI: 2 returned by efi_install_multiple_protocol_interfaces( &efi_root, &efi_guid_firmware_management_protocol, &efi_fmp_raw, NULL) Command failed, result=1 To fix this issue, pass the handle variable as same as the efi_fmp_fit installation. Signed-off-by: Masami Hiramatsu --- lib/efi_loader/efi_capsule.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/efi_loader/efi_capsule.c b/lib/efi_loader/efi_capsule.c index 6ee883d5b1..f038245c93 100644 --- a/lib/efi_loader/efi_capsule.c +++ b/lib/efi_loader/efi_capsule.c @@ -949,7 +949,7 @@ efi_status_t __weak arch_efi_load_capsule_drivers(void) if (IS_ENABLED(CONFIG_EFI_CAPSULE_FIRMWARE_RAW)) { handle = NULL; ret = EFI_CALL(efi_install_multiple_protocol_interfaces( - &efi_root, + &handle, &efi_guid_firmware_management_protocol, &efi_fmp_raw, NULL)); }