diff options
| author | Sascha Silbe <t-uboot@infra-silbe.de> | 2013-06-14 13:07:25 +0200 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-06-26 10:26:06 -0400 |
| commit | ff8fef566601ba27767e885386cb2074c4f09886 (patch) | |
| tree | 73a5ae4d090fdb0df6749d954daa2fdc0f937fd9 /include | |
| parent | eeaef5e4305497537bd47308724de39c7d6cbf19 (diff) | |
| download | u-boot-imx-ff8fef566601ba27767e885386cb2074c4f09886.zip u-boot-imx-ff8fef566601ba27767e885386cb2074c4f09886.tar.gz u-boot-imx-ff8fef566601ba27767e885386cb2074c4f09886.tar.bz2 | |
Fix block device accesses beyond 2TiB
With CONFIG_SYS_64BIT_LBA, lbaint_t gets defined as a 64-bit type,
which is required to represent block numbers for storage devices that
exceed 2TiB (the block size usually is 512B), e.g. recent hard drives.
For some obscure reason, the current U-Boot code uses lbaint_t for the
number of blocks to read (a rather optimistic estimation of how RAM
sizes will evolve), but not for the starting address. Trying to access
blocks beyond the 2TiB boundary will simply wrap around and read a
block within the 0..2TiB range.
We now use lbaint_t for block start addresses, too. This required
changes to all block drivers as the signature of block_read(),
block_write() and block_erase() in block_dev_desc_t changed.
Signed-off-by: Sascha Silbe <t-uboot@infra-silbe.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/ide.h | 5 | ||||
| -rw-r--r-- | include/part.h | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/include/ide.h b/include/ide.h index afea85c..f691a74 100644 --- a/include/ide.h +++ b/include/ide.h @@ -54,8 +54,9 @@ typedef ulong lbaint_t; */ void ide_init(void); -ulong ide_read(int device, ulong blknr, lbaint_t blkcnt, void *buffer); -ulong ide_write(int device, ulong blknr, lbaint_t blkcnt, const void *buffer); +ulong ide_read(int device, lbaint_t blknr, lbaint_t blkcnt, void *buffer); +ulong ide_write(int device, lbaint_t blknr, lbaint_t blkcnt, + const void *buffer); #ifdef CONFIG_IDE_PREINIT int ide_preinit(void); diff --git a/include/part.h b/include/part.h index f7c7cc5..35c1c5b 100644 --- a/include/part.h +++ b/include/part.h @@ -43,15 +43,15 @@ typedef struct block_dev_desc { char product[20+1]; /* IDE Serial no, SCSI product */ char revision[8+1]; /* firmware revision */ unsigned long (*block_read)(int dev, - unsigned long start, + lbaint_t start, lbaint_t blkcnt, void *buffer); unsigned long (*block_write)(int dev, - unsigned long start, + lbaint_t start, lbaint_t blkcnt, const void *buffer); unsigned long (*block_erase)(int dev, - unsigned long start, + lbaint_t start, lbaint_t blkcnt); void *priv; /* driver private struct pointer */ }block_dev_desc_t; |