summaryrefslogtreecommitdiff
path: root/board/samsung
diff options
context:
space:
mode:
authorPrzemyslaw Marczak <p.marczak@samsung.com>2013-10-23 14:30:44 +0200
committerMarek Vasut <marex@denx.de>2013-11-08 20:46:19 +0100
commit0697f206dfbbb5821fbf03283dce0b96515167cf (patch)
tree44d1700294f8d9f53243fbf60786f541020adfaa /board/samsung
parentf4dacf7b95e9f7d4246db00facdbe366b5c30a5a (diff)
downloadu-boot-imx-0697f206dfbbb5821fbf03283dce0b96515167cf.zip
u-boot-imx-0697f206dfbbb5821fbf03283dce0b96515167cf.tar.gz
u-boot-imx-0697f206dfbbb5821fbf03283dce0b96515167cf.tar.bz2
usb: ums: fix disk capacity miscalculation and code cleanup
This patch prevents: - ums disk capacity miscalculation because of integer overflow Changes v2: - Prevents passing zero size disk capacity to ums gadget driver - Change function ums_get_capacity() to ums_disk_init() and do ums disk initialization before gadget init - Remove unnecessary code from mass storage driver Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com> Cc: Marek Vasut <marex@denx.de>
Diffstat (limited to 'board/samsung')
-rw-r--r--board/samsung/trats/trats.c49
1 files changed, 32 insertions, 17 deletions
diff --git a/board/samsung/trats/trats.c b/board/samsung/trats/trats.c
index 7d91d88..dab790f 100644
--- a/board/samsung/trats/trats.c
+++ b/board/samsung/trats/trats.c
@@ -778,7 +778,7 @@ static int ums_read_sector(struct ums *ums_dev,
ulong start, lbaint_t blkcnt, void *buf)
{
block_dev_desc_t *block_dev = &ums_dev->mmc->block_dev;
- lbaint_t blkstart = start + ums_dev->offset;
+ lbaint_t blkstart = start + ums_dev->start_sector;
int dev_num = block_dev->dev;
return block_dev->block_read(dev_num, blkstart, blkcnt, buf);
@@ -788,30 +788,47 @@ static int ums_write_sector(struct ums *ums_dev,
ulong start, lbaint_t blkcnt, const void *buf)
{
block_dev_desc_t *block_dev = &ums_dev->mmc->block_dev;
- lbaint_t blkstart = start + ums_dev->offset;
+ lbaint_t blkstart = start + ums_dev->start_sector;
int dev_num = block_dev->dev;
return block_dev->block_write(dev_num, blkstart, blkcnt, buf);
}
-static void ums_get_capacity(struct ums *ums_dev, long long int *capacity)
-{
- long long int tmp_capacity;
-
- tmp_capacity = (long long int)((ums_dev->offset + ums_dev->part_size)
- * SECTOR_SIZE);
- *capacity = ums_dev->mmc->capacity - tmp_capacity;
-}
-
static struct ums ums_dev = {
.read_sector = ums_read_sector,
.write_sector = ums_write_sector,
- .get_capacity = ums_get_capacity,
.name = "UMS disk",
- .offset = UMS_START_SECTOR,
- .part_size = UMS_NUM_SECTORS,
};
+static struct ums *ums_disk_init(struct mmc *mmc)
+{
+ uint64_t mmc_end_sector = mmc->capacity / SECTOR_SIZE;
+ uint64_t ums_end_sector = UMS_NUM_SECTORS + UMS_START_SECTOR;
+
+ if (!mmc_end_sector) {
+ error("MMC capacity is not valid");
+ return NULL;
+ }
+
+ ums_dev.mmc = mmc;
+
+ if (ums_end_sector <= mmc_end_sector) {
+ ums_dev.start_sector = UMS_START_SECTOR;
+ if (UMS_NUM_SECTORS)
+ ums_dev.num_sectors = UMS_NUM_SECTORS;
+ else
+ ums_dev.num_sectors = mmc_end_sector - UMS_START_SECTOR;
+ } else {
+ ums_dev.num_sectors = mmc_end_sector;
+ puts("UMS: defined bad disk parameters. Using default.\n");
+ }
+
+ printf("UMS: disk start sector: %#x, count: %#x\n",
+ ums_dev.start_sector, ums_dev.num_sectors);
+
+ return &ums_dev;
+}
+
struct ums *ums_init(unsigned int dev_num)
{
struct mmc *mmc = NULL;
@@ -820,8 +837,6 @@ struct ums *ums_init(unsigned int dev_num)
if (!mmc)
return NULL;
- ums_dev.mmc = mmc;
-
- return &ums_dev;
+ return ums_disk_init(mmc);
}
#endif