From: Lukasz Majewski <l.majewski@samsung.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH] FIX: fat: Provide correct return code from disk_{read|write} to upper layers
Date: Thu, 03 Sep 2015 14:21:39 +0200 [thread overview]
Message-ID: <1441282899-13569-1-git-send-email-l.majewski@samsung.com> (raw)
In-Reply-To: <1440769821-24005-2-git-send-email-l.majewski@samsung.com>
It is very common that FAT code is using following pattern:
if (disk_{read|write}() < 0)
return -1;
Up till now the above code was dead, since disk_{read|write) could only
return value >= 0.
As a result some errors from medium layer (i.e. eMMC/SD) were not caught.
The above behavior was caused by block_{read|write|erase} declared at
struct block_dev_desc (@part.h). It returns unsigned long, where 0
indicates error and > 0 indicates that medium operation was correct.
This patch as error regards 0 returned from block_{read|write|erase}
when nr_blocks is grater than zero. Read/Write operation with nr_blocks=0
should return 0 and hence is not considered as an error.
Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Test HW: Odroid XU3 - Exynos 5433
---
fs/fat/fat.c | 11 +++++++++--
fs/fat/fat_write.c | 11 +++++++++--
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/fs/fat/fat.c b/fs/fat/fat.c
index bccc3e3..d743014 100644
--- a/fs/fat/fat.c
+++ b/fs/fat/fat.c
@@ -45,11 +45,18 @@ static disk_partition_t cur_part_info;
static int disk_read(__u32 block, __u32 nr_blocks, void *buf)
{
+ ulong ret;
+
if (!cur_dev || !cur_dev->block_read)
return -1;
- return cur_dev->block_read(cur_dev->dev,
- cur_part_info.start + block, nr_blocks, buf);
+ ret = cur_dev->block_read(cur_dev->dev,
+ cur_part_info.start + block, nr_blocks, buf);
+
+ if (nr_blocks && ret == 0)
+ return -1;
+
+ return ret;
}
int fat_set_blk_dev(block_dev_desc_t *dev_desc, disk_partition_t *info)
diff --git a/fs/fat/fat_write.c b/fs/fat/fat_write.c
index 98b88ad..adb6940 100644
--- a/fs/fat/fat_write.c
+++ b/fs/fat/fat_write.c
@@ -30,6 +30,8 @@ static void uppercase(char *str, int len)
static int total_sector;
static int disk_write(__u32 block, __u32 nr_blocks, void *buf)
{
+ ulong ret;
+
if (!cur_dev || !cur_dev->block_write)
return -1;
@@ -39,8 +41,13 @@ static int disk_write(__u32 block, __u32 nr_blocks, void *buf)
return -1;
}
- return cur_dev->block_write(cur_dev->dev,
- cur_part_info.start + block, nr_blocks, buf);
+ ret = cur_dev->block_write(cur_dev->dev,
+ cur_part_info.start + block,
+ nr_blocks, buf);
+ if (nr_blocks && ret == 0)
+ return -1;
+
+ return ret;
}
/*
--
2.0.0.rc2
next prev parent reply other threads:[~2015-09-03 12:21 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-28 13:50 [U-Boot] [PATCH 1/2] mmc: dw_mmc: Increase timeout to 20 seconds Lukasz Majewski
2015-08-28 13:50 ` [U-Boot] [PATCH 2/2] mmc: dw_mmc: Make timeout error visible to u-boot console Lukasz Majewski
2015-08-28 23:21 ` Simon Glass
2015-08-29 12:09 ` Lukasz Majewski
2015-08-29 15:07 ` Simon Glass
2015-09-03 12:33 ` Lukasz Majewski
2015-09-03 12:21 ` Lukasz Majewski [this message]
2015-09-03 12:44 ` [U-Boot] [PATCH] FIX: fat: Provide correct return code from disk_{read|write} to upper layers Tom Rini
2015-09-03 13:40 ` Lukasz Majewski
2015-09-03 14:18 ` Lukasz Majewski
2015-09-23 3:17 ` Stephen Warren
2015-09-23 8:40 ` Lukasz Majewski
2015-09-25 5:47 ` Stephen Warren
2015-09-09 7:02 ` Lukasz Majewski
2015-09-17 14:44 ` Lukasz Majewski
2015-09-12 12:51 ` [U-Boot] " Tom Rini
2015-08-28 21:55 ` [U-Boot] [PATCH 1/2] mmc: dw_mmc: Increase timeout to 20 seconds Marek Vasut
2015-08-29 11:55 ` Lukasz Majewski
2015-08-29 13:52 ` Marek Vasut
2015-08-29 16:38 ` Lukasz Majewski
2015-08-29 19:19 ` Marek Vasut
2015-09-01 11:19 ` Lukasz Majewski
2015-09-01 11:33 ` Marek Vasut
2015-09-01 15:25 ` Lukasz Majewski
2015-09-01 15:35 ` Marek Vasut
2015-09-01 16:22 ` Pantelis Antoniou
2015-09-02 8:06 ` Marek Vasut
2015-09-09 7:01 ` Lukasz Majewski
2015-09-09 11:34 ` Marek Vasut
2015-09-11 17:20 ` Alexey Brodkin
2015-09-11 21:45 ` Lukasz Majewski
2015-09-12 16:13 ` Marek Vasut
2015-09-13 10:03 ` Lukasz Majewski
2015-09-13 14:00 ` Marek Vasut
2015-09-14 10:15 ` Alexey Brodkin
2015-09-14 11:22 ` Lukasz Majewski
2015-09-14 13:36 ` Marek Vasut
2015-09-17 14:43 ` Lukasz Majewski
2015-09-18 0:31 ` Tom Rini
2015-09-18 7:32 ` Lukasz Majewski
2015-09-18 8:07 ` Przemyslaw Marczak
2015-09-18 19:27 ` Tom Rini
2015-09-21 15:32 ` Pantelis Antoniou
2015-09-14 10:30 ` Alexey Brodkin
2015-09-14 11:15 ` Przemyslaw Marczak
2015-09-14 10:33 ` Przemyslaw Marczak
2015-09-25 16:25 ` [U-Boot] [PATCH] mmc: dw_mmc: Increase timeout to 4 minutes (as in Linux kernel) Lukasz Majewski
2015-09-28 13:43 ` Przemyslaw Marczak
2015-09-28 21:08 ` Tom Rini
2015-09-28 21:08 ` [U-Boot] " Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1441282899-13569-1-git-send-email-l.majewski@samsung.com \
--to=l.majewski@samsung.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.