From patchwork Thu Feb 10 08:11:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 541410 Delivered-To: patch@linaro.org Received: by 2002:ad5:420f:0:0:0:0:0 with SMTP id e15csp2039978imo; Thu, 10 Feb 2022 00:15:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJyF+1B1Mg3FF2xaSoLoyqp8nRWCeZ8LwRVA2bXx10ViBbeViVuFcUFBasSK1l93ixCJpJsf X-Received: by 2002:a05:6402:42cd:: with SMTP id i13mr7110029edc.121.1644480920147; Thu, 10 Feb 2022 00:15:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644480920; cv=none; d=google.com; s=arc-20160816; b=hVy4uNcXfoAO4IS2cL9RdOZRPU2GD4OdcDWQLdcCzEOPJ5HGBQek3Unpe00doA5B40 rKouMzzf+1tiZwmIoEku+yhkG9oUAlhYPV5PRlamrbeqWmV5zyh3UcS17U8X93zFGtxo VBUEUakK8do3xTGt8Qe8H0MbNKg2YCjUQERtNodw257eGBI2rSDxwtpMEl2bhYiQT8BP aDs9SisjiMYB43at2hlFyU6liH+1+WyOm70lKYsrTgjMiHf2d0zjDNWx376wV25WnJwx opoGE92RYY4svPOsRLZ+6R02LcgD/WUbubw3L+RB7NHYhni63Rkhl8/kmMYkSlKtWDUt cuWA== 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=KDkB6jeJfQUa2ED0ziGxkJDYCnCmWevQG5aoPTJeaVE=; b=MrcfqwtSxbIbF2qHcjm1Gf7YZOQxFKdDSBzf0c1KIISrqfgeUXQffqWNYFIzG+QuZx uSYjB2RibX1+UENPcuuqb4VbQFu0E+7e8UHp5jl4+15FZBlzfZFRptZQdOeDnYoT9OEs Bs8ynvR6LM/RRlJEvC3MyMMPrIw/VKESVcLHUrhGIFLJD19VQD9tnbicbNB1fjkfRzap dQ9NNSQnvB3khZLHEiyk3v61eMr3HCjkCh2dDhLLucYPIo96rLMhllU58g43KJI/dRJf BpDa2d5GnE6FP77o3pNTZC5jSOXn91pdG4P3NJd0yOEIjkjUTTonig6QX31Sc2BTT29z u17w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Fv1ydTg5; 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 gt37si3085188ejc.97.2022.02.10.00.15.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Feb 2022 00:15:20 -0800 (PST) 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=Fv1ydTg5; 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 08F7F83A27; Thu, 10 Feb 2022 09:13:56 +0100 (CET) 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="Fv1ydTg5"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 80ABA83A2B; Thu, 10 Feb 2022 09:13:52 +0100 (CET) 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-pl1-x630.google.com (mail-pl1-x630.google.com [IPv6:2607:f8b0:4864:20::630]) (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 A3418836A3 for ; Thu, 10 Feb 2022 09:13:11 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=takahiro.akashi@linaro.org Received: by mail-pl1-x630.google.com with SMTP id x3so1197851pll.3 for ; Thu, 10 Feb 2022 00:13:11 -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=KDkB6jeJfQUa2ED0ziGxkJDYCnCmWevQG5aoPTJeaVE=; b=Fv1ydTg5c8t9NK1daN3EQzAkkfiFmNgcDdeJABlF1e9+nk9DBrmv1ht40qPWL+kc7M do7x1IE36UxhLdfBsVuRt/vA/mUK3WiCsrp3ebpyIMxHoxeTW2414sVsRWTbNy47pr3a sTb9XkHkrVpIzsAe6YVshtvo2s0FB3yQWWc+/JnrNN+hSlOrGg6YHfnHn1qMgdp3ZHZO vGStsl/1Da5pX22B7kosrceN7tIq+i59hvVraBXxOzZx34Q3+R7BjPN5757GcJGaiDOx vrO+moAx3r5Mt7hdT3ewaj80t3NmZYW1/HvJxgZaRHKlYZuWPZJ8phYGyFC8ayFkrFqj 9UYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KDkB6jeJfQUa2ED0ziGxkJDYCnCmWevQG5aoPTJeaVE=; b=Omemxjg23w/ZA+GYkL14KZ4y2FvxqMsYyMsCN/EkG3NdccYUlPp6QuIawPVZkntpal RduWDGELQyAgLnkSWxI75ACACTdW3IZxfPIcmKS1Pjgh8CONb2cpegNxxPJrL86eZcpN xsHLOinHPO5Hsyj0CLB/kbMgcfW5oj5O52l2sNXQp3E3NGYIv3NBRl0QtGvPAQI0iUbo 8FExKnNafWUgimJ+X2R2xIA1aGoxBO25nQrvBpw/wW8Y+XVXdoGHw2FZA0PENlVVc1Uz Vr3C+g5aGPBLVrE1eLg4frJI+Qb0C+uxu18AtnQHfwlWkfliup8OciMce4xO2+kwZ9XP Bbgw== X-Gm-Message-State: AOAM532+ewHFq5qQA18cSR763GeiE5gXeKJxLg7FSN7CLNplo+N3X/WK eGdqtRl7fGuQ6IY/nI7rWWDmtQ== X-Received: by 2002:a17:902:ecc3:: with SMTP id a3mr4236493plh.84.1644480789881; Thu, 10 Feb 2022 00:13:09 -0800 (PST) Received: from localhost.localdomain ([2400:4050:c3e1:100:412e:384:fab9:f24]) by smtp.gmail.com with ESMTPSA id lk8sm1529208pjb.40.2022.02.10.00.13.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Feb 2022 00:13:09 -0800 (PST) From: AKASHI Takahiro To: lukma@denx.de, peng.fan@nxp.com, jh80.chung@samsung.com, bmeng.cn@gmail.com, peng.ma@nxp.com, sr@denx.de, xypron.glpk@gmx.de, sjg@chromium.org, ilias.apalodimas@linaro.org Cc: masami.hiramatsu@linaro.org, u-boot@lists.denx.de, AKASHI Takahiro Subject: [PATCH v2 16/20] efi_loader: disk: a helper function to delete efi_disk objects Date: Thu, 10 Feb 2022 17:11:20 +0900 Message-Id: <20220210081124.86612-17-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220210081124.86612-1-takahiro.akashi@linaro.org> References: <20220210081124.86612-1-takahiro.akashi@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.5 at phobos.denx.de X-Virus-Status: Clean This function is expected to be called, in particular from dm's pre_remove hook, when associated block devices no longer exist. Add efi_disk_remove() function. This function removes an efi_disk object for a raw disk device (UCLASS_BLK) and related objects for its partitions (UCLASS_PARTITION). So this function is expected to be called through driver model's "remove" interface every time a raw disk device is to be disconnected. Signed-off-by: AKASHI Takahiro Reviewed-by: Simon Glass --- lib/efi_loader/efi_disk.c | 88 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c index 243cd0e215d4..7abe5d3a6bd2 100644 --- a/lib/efi_loader/efi_disk.c +++ b/lib/efi_loader/efi_disk.c @@ -630,6 +630,87 @@ static int efi_disk_probe(void *ctx, struct event *event) return 0; } +/* + * Delete an efi_disk object for a whole raw disk + * + * @dev uclass device (UCLASS_BLK) + * + * Delete an efi_disk object which is associated with @dev. + * The type of @dev must be UCLASS_BLK. + * + * @return 0 on success, -1 otherwise + */ +static int efi_disk_delete_raw(struct udevice *dev) +{ + efi_handle_t handle; + struct efi_disk_obj *diskobj; + + if (dev_tag_get_ptr(dev, DM_TAG_EFI, (void **)&handle)) + return -1; + + diskobj = container_of(handle, struct efi_disk_obj, header); + efi_free_pool(diskobj->dp); + + efi_delete_handle(handle); + dev_tag_del(dev, DM_TAG_EFI); + + return 0; +} + +/* + * Delete an efi_disk object for a disk partition + * + * @dev uclass device (UCLASS_PARTITION) + * + * Delete an efi_disk object which is associated with @dev. + * The type of @dev must be UCLASS_PARTITION. + * + * @return 0 on success, -1 otherwise + */ +static int efi_disk_delete_part(struct udevice *dev) +{ + efi_handle_t handle; + struct efi_disk_obj *diskobj; + + if (dev_tag_get_ptr(dev, DM_TAG_EFI, (void **)&handle)) + return -1; + + diskobj = container_of(handle, struct efi_disk_obj, header); + + efi_free_pool(diskobj->dp); + efi_delete_handle(handle); + dev_tag_del(dev, DM_TAG_EFI); + + return 0; +} + +/* + * Delete an efi_disk object for a block device + * + * @dev uclass device (UCLASS_BLK or UCLASS_PARTITION) + * + * Delete an efi_disk object which is associated with @dev. + * The type of @dev must be either UCLASS_BLK or UCLASS_PARTITION. + * This function is expected to be called at EV_PM_PRE_REMOVE. + * + * @return 0 on success, -1 otherwise + */ +static int efi_disk_remove(void *ctx, struct event *event) +{ + enum uclass_id id; + struct udevice *dev; + + dev = event->data.dm.dev; + id = device_get_uclass_id(dev); + + if (id == UCLASS_BLK) + return efi_disk_delete_raw(dev); + else if (id == UCLASS_PARTITION) + return efi_disk_delete_part(dev); + else + return 0; +} + efi_status_t efi_disk_init(void) { int ret; @@ -641,6 +722,13 @@ efi_status_t efi_disk_init(void) return EFI_OUT_OF_RESOURCES; } + ret = event_register("efi_disk del", EVT_DM_PRE_REMOVE, + efi_disk_remove, NULL); + if (ret) { + log_err("Event registration for efi_disk del failed\n"); + return EFI_OUT_OF_RESOURCES; + } + return EFI_SUCCESS; }