From patchwork Fri Sep 9 06:57:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1675889 X-Patchwork-Delegate: xypron.glpk@gmx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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=) Authentication-Results: legolas.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=ZxfvujM6; 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 ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MP6Jk00Cyz1yhP for ; Fri, 9 Sep 2022 16:58:13 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 22D7984B2A; Fri, 9 Sep 2022 08:58:09 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (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="ZxfvujM6"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 924CE84B2B; Fri, 9 Sep 2022 08:58:07 +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=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 519DC84B23 for ; Fri, 9 Sep 2022 08:58:05 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (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=1662706684; bh=uXSig/zqI7VeOGCoF7AyafvxyE7FHT0wZgZL4Y1MMJk=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=ZxfvujM6Ntnlg3Q+SHMtvMuIfrusXOorvhJa3rS+ocMSY+7knrW8rfPmDq5febidb MpKlmI9+9tCFgtvTlIiL17loUOyzBiVTDaIuxEaMJp7pC1j+n7WHEYLEDx4r9I+HY+ PhFxqd172K4NaYUi7h6f8IsEpbFB4vyRWOueyfd0= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from rpi3.fritz.box ([84.118.157.2]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MatVb-1p38YZ1RTX-00cOvc; Fri, 09 Sep 2022 08:58:04 +0200 From: Heinrich Schuchardt To: Ilias Apalodimas Cc: Simon Glass , Etienne Carriere , AKASHI Takahiro , u-boot@lists.denx.de, Heinrich Schuchardt Subject: [PATCH 1/1] efi_driver: don't bind internal block devices Date: Fri, 9 Sep 2022 06:57:58 +0000 Message-Id: <20220909065758.64817-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Provags-ID: V03:K1:jEosK9o68efjzqlyc8O/AbOiP1B44FeSB20GYfWu/ixO1pMo00d qviGKXXbxxCPYmtLhBLHYeb8qk8kfvfXt6J4yVFtt956SyHgKhbFR5sRONQ8dUnpR6EKP8g vKW2GULx/i9+JOqe3RmzlNH9YHFlkyTC45iUCvC3bW0z3P2wgKthyWKGpFfz1dUM9/ttytb eZZtEHooMvkmz0EyaZmMA== X-UI-Out-Filterresults: notjunk:1;V03:K0:S4jP3Q7CbrA=:CHkA5mowwrCtcGI93/rWIW UWBbDwGbt6KMaavIi3PRAr96enJyiU+k9VvQcpwFwN3l0MoOZUE5sfFpUNfBd2gDlrWqnGFHm dSYtmskj6fUmwYnbsESRTE9QGhx/Kvr5O/iPV6EGZUNMihm2mKY7s+sl07Sb5wITwcaDdddCC 0Bywdm+cmUWd6nY9o75qOwTbdor1CQ5qcA1XNXPJ5JWYNEPteKhRJ69UBrMIzARxt3Yok3Wyn WnZp3FMHgjISglkWdqne7ujy1yAe6umXFsPeHEdoZQU4MZNoewOYxkj17E3fUffGGR7NzBfSk hSS0ilc3yOYZke+zcj7ptwcEo5zrpblbVv0mLxYzJph9MoOIWKjsHodgpSW+8HF3g7jm6LzJL 6Yx17wk2B2Hs/92B33iH9FiDPfR4O6jCsVI+pUJxfEN3or20QPEHTMNeyl2n0+q1WCaCl0C5I o86LHz+3ILw2NUTfniQP1UJqw6+FMHQbR7GPpJNLRceHCbISoF6oilvpbxGCWLpvSxbrie7fl pjAof136XaiEPZ9hHwCdisEzXEDR3HWLdZaszBbE7VVd4QnsduXx0DHnfbK2nWIiA/voUUAj5 5vAqyJyftYumJID63/r1OmU7oQLgrCB8lO4vpIMUOfZd0+jKCpS/syV8NTWoTal7bw2U1jsGZ ywTome+h39DuVLRvz2ugUxWvBOAadlRRG0wejTBEDLOvxVNxXwv6taaP43ymuxaxq6E07Y+hB NC/SaRIbPuz1FAPvbIwWTPWhnl1s1D8wJzLUl/XUB/pY0TMcAKj67Ukk9HJTNV4sK6xqteK1a 1Lp3Ly834vhkIc5GSQGGC1OELC7zZTuWOAicJS3ckcBv5gMLpPpu/IDy3rJ1rzUtg+Voy9ZK9 0zHkoePgS8pVJP/BWZwFRSSPs2iNHEWtJXXGX5j25ixUfjdRh3dJl0hGk6OpzqMpi+z4JIUsi KNAoG7EzcujmPIGvJOUnuxRYAFO6yU3xjCRbbpsRiORMYgG7Ths8GMf2Tqt9cyn1DTK0Qs+KP YY63sP4p5FOlcmI0ZDhkREjs5Vi6qZGPEgqnhrTCXGBYISSgu+ByVYhF0/WRA54W8WExLDC9/ Mtos7MpzP+ySe0MmKxhj2MvoPt465o4BzjcZ14kYk/TItdj0NGtnbGywoo/rrIWjALB1wL0G0 XWklz9hAxXk+o/jgR2cmYvoH8x 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.6 at phobos.denx.de X-Virus-Status: Clean UEFI block devices can either mirror U-Boot's internal devices or be provided by an EFI application like iPXE. When ConnectController() is invoked for the EFI_BLOCK_IO_PROTOCOL interface for such an application provided device we create a virtual U-Boot block device of type "efi_blk". Currently we do not call ConnectController() when handles for U-Boot's internal block devices are created. If an EFI application calls ConnectController() for a handle relating to an internal block device, we erroneously create an extra "efi_blk" block device. E.g. the UEFI shell has a command 'connect -r' which calls ConnectController() for all handles. In the Supported() method of our EFI_DRIVER_BINDING_PROTOCOL return EFI_ALREADY_STARTED when dealing with an U-Boot internal device. Reported-by: Etienne Carriere Fixes: b406eb04c360 ("efi_loader: disk: a helper function to delete efi_disk objects") Signed-off-by: Heinrich Schuchardt Reviewed-by: Etienne Carriere Tested-by: Etienne Carriere Reviewed-by: Ilias Apalodimas --- lib/efi_driver/efi_uclass.c | 5 +++++ 1 file changed, 5 insertions(+) -- 2.30.2 diff --git a/lib/efi_driver/efi_uclass.c b/lib/efi_driver/efi_uclass.c index b01ce89c84..d348960fc9 100644 --- a/lib/efi_driver/efi_uclass.c +++ b/lib/efi_driver/efi_uclass.c @@ -71,6 +71,11 @@ static efi_status_t EFIAPI efi_uc_supported( EFI_ENTRY("%p, %p, %ls", this, controller_handle, efi_dp_str(remaining_device_path)); + if (controller_handle->dev) { + ret = EFI_ALREADY_STARTED; + goto out; + } + ret = EFI_CALL(systab.boottime->open_protocol( controller_handle, bp->ops->protocol, &interface, this->driver_binding_handle,