Skip to contentSkip to conversation

dfu: Fix handling of UBI partitions in MTD backend

PATCH New Guillermo Rodriguez 3 participants 4 messages Sep 2, 2020 – Oct 26, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 drivers/dfu/dfu_mtd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/dfu/dfu_mtd.c +2 -2
index 36cd4e945b..2811ae8463 100644
@@ -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;
Signature · 1 line
2.21.0
#1 lore raw

PATCH 1/1 dfu: Fix handling of UBI partitions in MTD backend

Hi,

Quoted 7 lines

From: U-Boot <[email protected]> On Behalf Of Guillermo Rodriguez
Sent: mercredi 2 septembre 2020 13:06
To: u-boot at lists.denx.de
Cc: Guillermo Rodriguez <[email protected]>; Lukasz Majewski <[email protected]>
Subject: [PATCH] dfu: Fix handling of UBI partitions in MTD backend

Quoted 7 lines

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.

---

Fixes 6015af28ee6d ("dfu: add backend for MTD device")

Thanks for the correction.

Patrick

Quoted 28 lines
 drivers/dfu/dfu_mtd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/dfu/dfu_mtd.c index renamed from drivers/dfu/dfu_mtd.c +0 -0

36cd4e945b..2811ae8463 100644

drivers/dfu/dfu_mtd.c +2 -2
@@ -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

#2 lore raw

PATCH 1/1 dfu: Fix handling of UBI partitions in MTD backend

Hi Lukasz,

Quoted 21 lines

From: U-Boot <[email protected]> On Behalf Of Patrick DELAUNAY
Sent: vendredi 4 septembre 2020 10:31

Hi,

Quoted 8 lines

From: U-Boot <[email protected]> On Behalf Of Guillermo Rodriguez
Sent: mercredi 2 septembre 2020 13:06
To: u-boot at lists.denx.de
Cc: Guillermo Rodriguez <[email protected]>; Lukasz Majewski <[email protected]>
Subject: [PATCH] dfu: Fix handling of UBI partitions in MTD backend

Quoted 7 lines

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.

---

Quoted 10 lines
Fixes 6015af28ee6d ("dfu: add backend for MTD device")

Thanks for the correction.

Patrick

Quoted 3 lines
 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

#3 lore raw

PATCH 1/1 dfu: Fix handling of UBI partitions in MTD backend

Quoted 30 lines · On Fri, 23 Oct 2020 15:48:24 +0000 Patrick DELAUNAY <[email protected]>…

Hi Lukasz,

Quoted 28 lines

From: U-Boot <[email protected]> On Behalf Of Patrick DELAUNAY Sent: vendredi 4 septembre 2020 10:31

Hi,

Quoted 9 lines

From: U-Boot <[email protected]> On Behalf Of Guillermo Rodriguez
Sent: mercredi 2 septembre 2020 13:06
To: u-boot at lists.denx.de
Cc: Guillermo Rodriguez <[email protected]>; Lukasz Majewski <[email protected]>
Subject: [PATCH] dfu: Fix handling of UBI partitions in MTD backend

Quoted 8 lines

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.

---

Fixes 6015af28ee6d ("dfu: add backend for MTD device")

Thanks for the correction.

Quoted 9 lines
Quoted 5 lines

Patrick

Quoted 3 lines
 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.

Quoted 2 lines

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 at denx.de -------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201026/e30e3d00/attachment.sig>