From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 91002C4332F for ; Thu, 22 Dec 2022 12:45:16 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BAFD285282; Thu, 22 Dec 2022 13:45:13 +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="p2uH7Anw"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 86B6885286; Thu, 22 Dec 2022 13:45:12 +0100 (CET) Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) (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 EB67680393 for ; Thu, 22 Dec 2022 13:45:09 +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=ilias.apalodimas@linaro.org Received: by mail-ej1-x62b.google.com with SMTP id fc4so4557411ejc.12 for ; Thu, 22 Dec 2022 04:45:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=UOxgBSlDm9H/RrcndnXf45MKAvYCahDyo7xS45R9p0w=; b=p2uH7Anw9pflwvSuDjQWP8TyWb+vNx6oabvWnbTrKiLTwg8/kwST6FcjWYivhhdGV5 b3VHpauaXwXseEQ9/nItSQwG/nSwxEbYgReTRcckIucMxHYTyU7AjGp8N4FCfWotWDts 5IjWHznGnWp48vqFUi37uBRP/qjJ2Lo028NONNmR/jaeyMtxlY6Sf9OWmKvTLY9CPNvE N+HxS00OybH/JYlnjLdfST6A+R3EDjAMzXHR0c/6CVZUkRu9kZvivRce48F1c/owetwS 5dNfhhD/ZoX5x1z8QQnu/EGP6X6UquvFIn0rAW7G4+gi57j9/JjRccR0Ma/B5zqh4e16 +KUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=UOxgBSlDm9H/RrcndnXf45MKAvYCahDyo7xS45R9p0w=; b=GM01ugfkArcpBDz9gAk33LpNCKfS8bwVI8SimHYaz6xsGKaUl43KDT7mdV4OwaX9Os s55mtWZc+5RE1GvFegwE4lprKIE9YU4m5p/2PpZdnkUHDWrpZTo29mbHGdBy/e2HshhI 4yFiq+QuNzyQRQFkybA82ywQgxvPHlEcnNPBtw4dLzF8ie/jva2ZJd2lrIFd9Lfr8EtH nryuxJKTRU9Cg/dLPcWH09B2ko8GLNUn2MDROvAZMs0JLIFjbrlqPBBJcOcZtimAmw+2 LnWT6YoDbqWnbdtKiJeHUIc4gtowwkcJwc3+pc85ik+MGCOy0GKy1YYSk/w6gST+GI20 EzYA== X-Gm-Message-State: AFqh2kp3a2tY51GJGABwHFnW4bCWWf7Cju7AcUOCMsMw9Ja3jdJjAxwf kLSEGqy5suGxnBkghwzL0U2kyw== X-Google-Smtp-Source: AMrXdXtmaTS8C5cUTuWzN8kMCEo8Gt2pAxfndyJzVjfiKwaYjM3B1PlA2fGaUXHsX+V7L7l0Wb6tKQ== X-Received: by 2002:a17:907:6d0b:b0:83f:1f64:c1e with SMTP id sa11-20020a1709076d0b00b0083f1f640c1emr4830555ejc.47.1671713109591; Thu, 22 Dec 2022 04:45:09 -0800 (PST) Received: from hera (ppp079167090036.access.hol.gr. [79.167.90.36]) by smtp.gmail.com with ESMTPSA id 23-20020a170906309700b00809e33ba33dsm227629ejv.19.2022.12.22.04.45.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Dec 2022 04:45:09 -0800 (PST) Date: Thu, 22 Dec 2022 14:45:06 +0200 From: Ilias Apalodimas To: jassisinghbrar@gmail.com Cc: u-boot@lists.denx.de, sughosh.ganu@linaro.org, etienne.carriere@linaro.org, trini@konsulko.com, sjg@chromium.org, xypron.glpk@gmx.de, patrick.delaunay@foss.st.com, patrice.chotard@foss.st.com, Jassi Brar Subject: Re: [PATCHv2 1/4] fwu: gpt: use cached meta-data partition numbers Message-ID: References: <20221203031557.579632-1-jassisinghbrar@gmail.com> <20221203031651.579771-1-jassisinghbrar@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20221203031651.579771-1-jassisinghbrar@gmail.com> 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 On Fri, Dec 02, 2022 at 09:16:51PM -0600, jassisinghbrar@gmail.com wrote: > From: Jassi Brar > > Use cached values and avoid parsing and scanning through partitions > everytime for meta-data partitions because they can't change after bootup. > > Acked-by: Etienne Carriere > Signed-off-by: Jassi Brar > --- > drivers/fwu-mdata/gpt_blk.c | 43 +++++++++++++++++++++---------------- > 1 file changed, 24 insertions(+), 19 deletions(-) > > diff --git a/drivers/fwu-mdata/gpt_blk.c b/drivers/fwu-mdata/gpt_blk.c > index d35ce49c5c..28f5d23e1e 100644 > --- a/drivers/fwu-mdata/gpt_blk.c > +++ b/drivers/fwu-mdata/gpt_blk.c > @@ -24,8 +24,9 @@ enum { > MDATA_WRITE, > }; > > -static int gpt_get_mdata_partitions(struct blk_desc *desc, > - uint mdata_parts[2]) > +static uint g_mdata_part[2]; /* = {0, 0} to check against uninit parts */ > + > +static int gpt_get_mdata_partitions(struct blk_desc *desc) > { > int i, ret; > u32 nparts; > @@ -33,18 +34,19 @@ static int gpt_get_mdata_partitions(struct blk_desc *desc, > struct disk_partition info; > const efi_guid_t fwu_mdata_guid = FWU_MDATA_GUID; > > + /* if primary and secondary partitions already found */ > + if (g_mdata_part[0] && g_mdata_part[1]) > + return 0; > + > nparts = 0; > - for (i = 1; i < MAX_SEARCH_PARTITIONS; i++) { > + for (i = 1; i < MAX_SEARCH_PARTITIONS && nparts < 2; i++) { > if (part_get_info(desc, i, &info)) > continue; > uuid_str_to_bin(info.type_guid, part_type_guid.b, > UUID_STR_FORMAT_GUID); > > - if (!guidcmp(&fwu_mdata_guid, &part_type_guid)) { > - if (nparts < 2) > - mdata_parts[nparts] = i; > - ++nparts; > - } > + if (!guidcmp(&fwu_mdata_guid, &part_type_guid)) > + g_mdata_part[nparts++] = i; The reason the 'if (nparts < 2)' was outside the main loop was to show errors in case the user defined more than two partitions. Can we keep it like that or am I the only being paranoid here? > } > > if (nparts != 2) { > @@ -127,26 +129,25 @@ static int fwu_gpt_update_mdata(struct udevice *dev, struct fwu_mdata *mdata) > { > int ret; > struct blk_desc *desc; > - uint mdata_parts[2]; > struct fwu_mdata_gpt_blk_priv *priv = dev_get_priv(dev); > > desc = dev_get_uclass_plat(priv->blk_dev); > > - ret = gpt_get_mdata_partitions(desc, mdata_parts); > + ret = gpt_get_mdata_partitions(desc); > if (ret < 0) { > log_debug("Error getting the FWU metadata partitions\n"); > return -ENOENT; > } > > /* First write the primary partition */ > - ret = gpt_read_write_mdata(desc, mdata, MDATA_WRITE, mdata_parts[0]); > + ret = gpt_read_write_mdata(desc, mdata, MDATA_WRITE, g_mdata_part[0]); > if (ret < 0) { > log_debug("Updating primary FWU metadata partition failed\n"); > return ret; > } > > /* And now the replica */ > - ret = gpt_read_write_mdata(desc, mdata, MDATA_WRITE, mdata_parts[1]); > + ret = gpt_read_write_mdata(desc, mdata, MDATA_WRITE, g_mdata_part[1]); > if (ret < 0) { > log_debug("Updating secondary FWU metadata partition failed\n"); > return ret; > @@ -158,16 +159,14 @@ static int fwu_gpt_update_mdata(struct udevice *dev, struct fwu_mdata *mdata) > static int gpt_get_mdata(struct blk_desc *desc, struct fwu_mdata *mdata) > { > int ret; > - uint mdata_parts[2]; > - > - ret = gpt_get_mdata_partitions(desc, mdata_parts); > > + ret = gpt_get_mdata_partitions(desc); > if (ret < 0) { > log_debug("Error getting the FWU metadata partitions\n"); > return -ENOENT; > } > > - ret = gpt_read_write_mdata(desc, mdata, MDATA_READ, mdata_parts[0]); > + ret = gpt_read_write_mdata(desc, mdata, MDATA_READ, g_mdata_part[0]); > if (ret < 0) { > log_debug("Failed to read the FWU metadata from the device\n"); > return -EIO; > @@ -182,7 +181,7 @@ static int gpt_get_mdata(struct blk_desc *desc, struct fwu_mdata *mdata) > * Try to read the replica. > */ > memset(mdata, '\0', sizeof(struct fwu_mdata)); > - ret = gpt_read_write_mdata(desc, mdata, MDATA_READ, mdata_parts[1]); > + ret = gpt_read_write_mdata(desc, mdata, MDATA_READ, g_mdata_part[1]); > if (ret < 0) { > log_debug("Failed to read the FWU metadata from the device\n"); > return -EIO; > @@ -206,9 +205,15 @@ static int fwu_gpt_get_mdata(struct udevice *dev, struct fwu_mdata *mdata) > static int fwu_gpt_get_mdata_partitions(struct udevice *dev, uint *mdata_parts) > { > struct fwu_mdata_gpt_blk_priv *priv = dev_get_priv(dev); > + int err; > + > + err = gpt_get_mdata_partitions(dev_get_uclass_plat(priv->blk_dev)); > + if (!err) { > + mdata_parts[0] = g_mdata_part[0]; > + mdata_parts[1] = g_mdata_part[1]; > + } > > - return gpt_get_mdata_partitions(dev_get_uclass_plat(priv->blk_dev), > - mdata_parts); > + return err; > } > > static int fwu_gpt_read_mdata_partition(struct udevice *dev, > -- > 2.34.1 > Thanks /Ilias