From patchwork Wed Sep 2 11:06:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guillermo Rodriguez X-Patchwork-Id: 1355661 X-Patchwork-Delegate: lukma@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=DF6RFRVC; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BhLjH3QmZz9sV7 for ; Wed, 2 Sep 2020 21:06:26 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6A21081B79; Wed, 2 Sep 2020 13:06:23 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com 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=gmail.com header.i=@gmail.com header.b="DF6RFRVC"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2514C81C31; Wed, 2 Sep 2020 13:06:21 +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,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) (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 AF08281281 for ; Wed, 2 Sep 2020 13:06:18 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=guille.rodriguez@gmail.com Received: by mail-wr1-x444.google.com with SMTP id z1so4782957wrt.3 for ; Wed, 02 Sep 2020 04:06:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=gxCNRzazg1BLSGS12wDIGIwVLTzzUmiNvbohWpqC/GA=; b=DF6RFRVCQwglel2Cy71D+gMzlVWjDCyh5SNAbATW/UdEYF5RBZrHZPC201it8syd1o ZGLn/kDGMiggMkKtG/d0MqlN/vwUvFCGydQZm5Ovbax1+wLqNTcMt9+NtoUT8eZ1BPNP smC/jGfwiDdXJTZgLBF1hIY2jxO+0YAQYyFK1KrK5dLwhH/W019QeBApOUvrbygmuJyi hy4b9Fn38nddqfkJYDEwvWDATZ5FNgMg5AUXBk+znDkhYa1SDiRXa7YYPUvk2BC8XYe3 E0QdO/E0l15uCik1TM8PVmhLAipiORRFieikexsU/SBkELHdLo7H6iDZR084GqJiGVhB 4eiQ== 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:mime-version :content-transfer-encoding; bh=gxCNRzazg1BLSGS12wDIGIwVLTzzUmiNvbohWpqC/GA=; b=Ja7CbLvh8fL377bocQEit6fOKzGYKxYpBbLenAl/Z4HQiQOElkgZJZ7rULQNrlF6LP 8UNqnjnHBdSx71o6O0FwEr30GO4bNCNoYayXL2+2uU8T+aA+COnyEhSnYlEjP3sweNKM EkpS1htMD/MdSID9K3iXzssTU4k9o0uQjp8JJtCBW24SuEVD+ECnAZpe8tJp8qIjEn5K THofp1L5BRTE97S6dkkXA00JUkpskMhw4wnnAVjbu3xrddMcstsbumrlF0tKFxAEG9IU JlJlVYkyWb0PpWCfi+xPWqepOnKRhXGLMeo/l5wrAjx5pJ4w+uIr628eb9xS3seSS5LP bVMA== X-Gm-Message-State: AOAM531dp/JN3rLvbw+8/MlvX8Kl9s+eaHgY84gYkTJIc4Chm3HlKibS 7F+fyomaC7eZDPp/L47FE16F/5Aw03M= X-Google-Smtp-Source: ABdhPJy8EdjPINjMxdqNB+kXGjPpSxv/9MTGT4lwYVSsF7FR8M/VO/mWtLadsbPMp+N1dQv2MCJA5Q== X-Received: by 2002:adf:f382:: with SMTP id m2mr6298885wro.327.1599044778165; Wed, 02 Sep 2020 04:06:18 -0700 (PDT) Received: from localhost.localdomain ([78.30.4.203]) by smtp.gmail.com with ESMTPSA id d190sm6587289wmd.23.2020.09.02.04.06.16 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Sep 2020 04:06:17 -0700 (PDT) From: Guillermo Rodriguez To: u-boot@lists.denx.de Cc: Guillermo Rodriguez , Lukasz Majewski Subject: [PATCH] dfu: Fix handling of UBI partitions in MTD backend Date: Wed, 2 Sep 2020 13:06:06 +0200 Message-Id: <20200902110606.15764-1-guille.rodriguez@gmail.com> X-Mailer: git-send-email 2.21.0 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.3 at phobos.denx.de X-Virus-Status: Clean For UBI partitions ("partubi" in dfu_alt_info), dfu_fill_entity_mtd sets the mtd.ubi flag; however other functions incorrectly check for nand.ubi instead. Fix this by checking for the correct flag. Signed-off-by: Guillermo Rodriguez Cc: Lukasz Majewski Reviewed-by: Patrick Delaunay --- drivers/dfu/dfu_mtd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/dfu/dfu_mtd.c b/drivers/dfu/dfu_mtd.c index 36cd4e945b..2811ae8463 100644 --- a/drivers/dfu/dfu_mtd.c +++ b/drivers/dfu/dfu_mtd.c @@ -190,7 +190,7 @@ static int dfu_flush_medium_mtd(struct dfu_entity *dfu) int ret; /* in case of ubi partition, erase rest of the partition */ - if (dfu->data.nand.ubi) { + if (dfu->data.mtd.ubi) { struct erase_info erase_op = {}; erase_op.mtd = dfu->data.mtd.info; @@ -228,7 +228,7 @@ static unsigned int dfu_polltimeout_mtd(struct dfu_entity *dfu) * ubi partition, as sectors which are not used need * to be erased */ - if (dfu->data.nand.ubi) + if (dfu->data.mtd.ubi) return DFU_MANIFEST_POLL_TIMEOUT; return DFU_DEFAULT_POLL_TIMEOUT;