From patchwork Fri Apr 16 23:37:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masami Hiramatsu X-Patchwork-Id: 422676 Delivered-To: patch@linaro.org Received: by 2002:a17:906:6d12:0:0:0:0 with SMTP id m18csp845103ejr; Fri, 16 Apr 2021 16:38:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxfntQ5tbqK8RMB95sk/zwXb8GNGOTcrPujZRmyjIQ8Opc2fYcO877gakaV2yoh2Zu80ILV X-Received: by 2002:a17:906:e97:: with SMTP id p23mr9405369ejf.5.1618616282605; Fri, 16 Apr 2021 16:38:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618616282; cv=none; d=google.com; s=arc-20160816; b=CgrpxmvuNoAqoSZD8xR0V2k5daWv2MM3kbopFnU8KpNwMvg2HQ74xajcZBs6cT0j5l coP4A2/yPam11aEUBxGWvfzmmyhi1OzkGtAfY5gp6mwAA+fqLhMbk1G5ZAsFxsYRHxEH d0VOI6gfuNIr+bUfifWpRc8ovIe/75wLgg9Iwv51hOmuSew3vbbkseOh6GIj5fwB9sGE pyDObogQxGPz0N4uUp94v7ApSzCyHYH1OkpoqOS5VId9gZ89dIEJ2LWtT1JPmySPbDwr eppWV9ineNMdNqDKvrgAymWsQppj1nZ/DxqDpx1Nj0eLJrIkbKevXb87KrWRm/GDJ+y6 Su2g== 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=ki+4Y3LpLozi1pt7JSYQwTjpIMizi5ByfFaU8Bl7ydI=; b=WvicszNmTFTWMxuVBrLuEakSyT6roQu7teDJBqDVlYHiXIlwDOnwr2X6uEF0Ya4yaR yAbU74pRJpOwl/wiPXbiAuvSHgF1SY4Dc4Huvucl8zfgH05ZC30HYfEe7Hf8JLYnRch0 SB0eclh6mGqUjyShwsXrl3Nl8zwM05soCQZ9/L0Q/nE/pMnxou5IvLGQ7o5fdgA0n9Cm zSw1YGcS40ffJudUOId4GDoijfNgbelmM2I+LA1dWcyRvN/yiwQI4UIPa1/jm6IDiwC8 MLMwN8TI4gBf9BXVTciMFEmJXNsTNZ3dk3cO8BtPq+cxZ7Z8gqPoxaCznJI2bjqKJ4mf j//A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Jj8tPE33; 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 dd3si5880135edb.391.2021.04.16.16.38.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Apr 2021 16:38:02 -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=Jj8tPE33; 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 501B581734; Sat, 17 Apr 2021 01:38:00 +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="Jj8tPE33"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 24A0B81734; Sat, 17 Apr 2021 01:37:55 +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-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) (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 38E0F80EC0 for ; Sat, 17 Apr 2021 01:37: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=masami.hiramatsu@linaro.org Received: by mail-pf1-x433.google.com with SMTP id c17so19343011pfn.6 for ; Fri, 16 Apr 2021 16:37:50 -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=ki+4Y3LpLozi1pt7JSYQwTjpIMizi5ByfFaU8Bl7ydI=; b=Jj8tPE33+pf8U5e/EqjhGvo7xRsLzU+v6aRWCvqavAmFlo+ipriNbHG739QVrT5lSP Yp7GJAv/4BDsvRJo2hIOFJjAmRwMCKWoZQ810Ri0c3JxrZi2Crzq6RAHYCl7KqIa0fsc PsZ3wAxxm3VeQKldH5Qkk7OwoVTNWJADqbnpirLxbkOr+aIfS2qAqqnvEdPe3+f5scfA auyuEXdBCrox2RiisI0fM1xtcVsMfCHf+7zSX4keEOd8O0sSLZ5FoTac06Sv2ntQnMRC Qtk19cynOU5F7GIsKYpyvBIERMQJ4qVcx0T7Y2dETMOwsQLQMlE+lF0DVADDRLAX3IuG gQLg== 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=ki+4Y3LpLozi1pt7JSYQwTjpIMizi5ByfFaU8Bl7ydI=; b=BEZ9lI5wELuE/erJ2+ZQPeOX3Y1fu3iMwQxzldaPcvZvuoGMnlfnsC7SuBGgbM7lJH +HXU/9Ju6e1R/GshHjECN9UDMuWcKR54X5d/p43sdbHqI+GWbMK/mixyCJWiluU0Zlw3 Dcx4P8kCEBxCfX0fNJXmbnHjXKmWnC8BL0ZRBGGHu1RcIcHJ0JCJfRPvPdPbrORh1kvR JMS6q69rTCKp0XeYDVuVKcFGPisHpXhXgZia3eA8SX4lwVmjWDIR+P1Ht6kdQusKbgUY NgkrJsqvduaK0kac6jPa3wyAAUKFQzOrYZj6KvkrpTCFkV7lZ3TPFGbQx06Zfc+POpnt sRhw== X-Gm-Message-State: AOAM532/vMT4KBKdiywUSoHDYCiqLMV/UpP5A9iQ6ZwrC8X2EKgmpwNV NjYSyO4rihcZEmYy0wbqDwcevw== X-Received: by 2002:a62:3642:0:b029:225:a79b:da18 with SMTP id d63-20020a6236420000b0290225a79bda18mr9623357pfa.75.1618616268732; Fri, 16 Apr 2021 16:37:48 -0700 (PDT) Received: from localhost.localdomain (NE2965lan1.rev.em-net.ne.jp. [210.141.244.193]) by smtp.gmail.com with ESMTPSA id mj13sm6411625pjb.9.2021.04.16.16.37.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Apr 2021 16:37:48 -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 Subject: [PATCH v2 03/13] efi: Fix to use null handle to create new handle for efi_fmp_raw Date: Sat, 17 Apr 2021 08:37:42 +0900 Message-Id: <161861626186.298230.5059797938554688857.stgit@localhost> X-Mailer: git-send-email 2.25.1 In-Reply-To: <161861622792.298230.15803163505976731363.stgit@localhost> References: <161861622792.298230.15803163505976731363.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 7ba1ced0a0..ebb0725484 100644 --- a/lib/efi_loader/efi_capsule.c +++ b/lib/efi_loader/efi_capsule.c @@ -938,7 +938,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)); }