| Message ID | 20200902110606.15764-1-guille.rodriguez@gmail.com |
|---|---|
| State | Accepted |
| Commit | 1b3c4cb1e392bf9365ac633d305c6a1aac9b94e1 |
| Delegated to: | Lukasz Majewski |
| Headers | show |
| Series | dfu: Fix handling of UBI partitions in MTD backend | expand |
Hi, > From: U-Boot <u-boot-bounces@lists.denx.de> On Behalf Of Guillermo Rodriguez > Sent: mercredi 2 septembre 2020 13:06 > To: u-boot@lists.denx.de > Cc: Guillermo Rodriguez <guille.rodriguez@gmail.com>; Lukasz Majewski > <lukma@denx.de> > Subject: [PATCH] dfu: Fix handling of UBI partitions in MTD backend > > 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 <guille.rodriguez@gmail.com> > Cc: Lukasz Majewski <lukma@denx.de> > --- Fixes: 6015af28ee6d ("dfu: add backend for MTD device") Reviewed-by: Patrick Delaunay <patrick.delaunay@st.com> Thanks for the correction. Patrick > 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; > -- > 2.21.0
Hi Lukasz, > From: U-Boot <u-boot-bounces@lists.denx.de> On Behalf Of Patrick DELAUNAY > Sent: vendredi 4 septembre 2020 10:31 > > Hi, > > > From: U-Boot <u-boot-bounces@lists.denx.de> On Behalf Of Guillermo > > Rodriguez > > Sent: mercredi 2 septembre 2020 13:06 > > To: u-boot@lists.denx.de > > Cc: Guillermo Rodriguez <guille.rodriguez@gmail.com>; Lukasz Majewski > > <lukma@denx.de> > > Subject: [PATCH] dfu: Fix handling of UBI partitions in MTD backend > > > > 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 <guille.rodriguez@gmail.com> > > Cc: Lukasz Majewski <lukma@denx.de> > > --- > > Fixes: 6015af28ee6d ("dfu: add backend for MTD device") > Reviewed-by: Patrick Delaunay <patrick.delaunay@st.com> > > Thanks for the correction. > > Patrick > > > drivers/dfu/dfu_mtd.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > This correction will be integrated in the next u-boot-dfu v2021.01 pull request ? Or I can include it in stm32 custodians master branch ? Patrick
On Fri, 23 Oct 2020 15:48:24 +0000 Patrick DELAUNAY <patrick.delaunay@st.com> wrote: > Hi Lukasz, > > > From: U-Boot <u-boot-bounces@lists.denx.de> On Behalf Of Patrick > > DELAUNAY Sent: vendredi 4 septembre 2020 10:31 > > > > Hi, > > > > > From: U-Boot <u-boot-bounces@lists.denx.de> On Behalf Of Guillermo > > > Rodriguez > > > Sent: mercredi 2 septembre 2020 13:06 > > > To: u-boot@lists.denx.de > > > Cc: Guillermo Rodriguez <guille.rodriguez@gmail.com>; Lukasz > > > Majewski <lukma@denx.de> > > > Subject: [PATCH] dfu: Fix handling of UBI partitions in MTD > > > backend > > > > > > 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 <guille.rodriguez@gmail.com> > > > Cc: Lukasz Majewski <lukma@denx.de> > > > --- > > > > Fixes: 6015af28ee6d ("dfu: add backend for MTD device") > > Reviewed-by: Patrick Delaunay <patrick.delaunay@st.com> > > > > Thanks for the correction. > > > > Patrick > > > > > drivers/dfu/dfu_mtd.c | 4 ++-- > > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > > This correction will be integrated in the next u-boot-dfu v2021.01 > pull request ? Or I can include it in stm32 custodians master branch ? > Please pull it via stm32. > Patrick > Best regards, Lukasz Majewski -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma@denx.de
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;
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 <guille.rodriguez@gmail.com> Cc: Lukasz Majewski <lukma@denx.de> --- drivers/dfu/dfu_mtd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)