Skip to content

Commit

Permalink
cmd: mvebu/bubt: a38x: Do not hardcode SATA block size to 512
Browse files Browse the repository at this point in the history
Find SATA block device by blk_get_devnum_by_uclass_id() function and read
from it the real block size of the SATA disk. In case of error, fallback
back to 512 bytes.

Signed-off-by: Pali Rohár <pali@kernel.org>
  • Loading branch information
pali authored and stroese committed Apr 13, 2023
1 parent fa06a6d commit 4548b37
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions cmd/mvebu/bubt.c
Original file line number Diff line number Diff line change
Expand Up @@ -924,8 +924,11 @@ static int check_image_header(void)
offset = le32_to_cpu(hdr->srcaddr);
size = le32_to_cpu(hdr->blocksize);

if (hdr->blockid == 0x78) /* SATA id */
offset *= 512;
if (hdr->blockid == 0x78) { /* SATA id */
struct blk_desc *blk_dev = IS_ENABLED(BLK) ? blk_get_devnum_by_uclass_id(UCLASS_SCSI, 0) : NULL;
unsigned long blksz = blk_dev ? blk_dev->blksz : 512;
offset *= blksz;
}

if (offset % 4 != 0 || size < 4 || size % 4 != 0) {
printf("Error: Bad A38x image blocksize.\n");
Expand Down

0 comments on commit 4548b37

Please sign in to comment.