haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

m25p80: Switch to byte-based block access

Browse source 
Sector-based blk_read() should die; switch to byte-based
blk_pread() instead.

Likewise for blk_aio_readv() and blk_aio_writev().

Signed-off-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Eric Blake 2016-05-06 10:26:40 -06:00 committed by Kevin Wolf
parent 12c125cba9
commit 243e6f69c1
1 changed files with 7 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
hw/block/m25p80.c
View file

@ -358,25 +358,21 @@ static void blk_sync_complete(void *opaque, int ret)
static void flash_sync_page(Flash *s, int page) static void flash_sync_page(Flash *s, int page)
{ {
int blk_sector, nb_sectors;
QEMUIOVector iov; QEMUIOVector iov;
if (!s->blk || blk_is_read_only(s->blk)) { if (!s->blk || blk_is_read_only(s->blk)) {
return; return;
} }
blk_sector = (page * s->pi->page_size) / BDRV_SECTOR_SIZE;
nb_sectors = DIV_ROUND_UP(s->pi->page_size, BDRV_SECTOR_SIZE);
qemu_iovec_init(&iov, 1); qemu_iovec_init(&iov, 1);
qemu_iovec_add(&iov, s->storage + blk_sector * BDRV_SECTOR_SIZE, qemu_iovec_add(&iov, s->storage + page * s->pi->page_size,
nb_sectors * BDRV_SECTOR_SIZE); s->pi->page_size);
blk_aio_writev(s->blk, blk_sector, &iov, nb_sectors, blk_sync_complete, blk_aio_pwritev(s->blk, page * s->pi->page_size, &iov, 0,
NULL); blk_sync_complete, NULL);
} }
static inline void flash_sync_area(Flash *s, int64_t off, int64_t len) static inline void flash_sync_area(Flash *s, int64_t off, int64_t len)
{ {
int64_t start, end, nb_sectors;
QEMUIOVector iov; QEMUIOVector iov;
if (!s->blk || blk_is_read_only(s->blk)) { if (!s->blk || blk_is_read_only(s->blk)) {
@ -384,13 +380,9 @@ static inline void flash_sync_area(Flash *s, int64_t off, int64_t len)
} }
assert(!(len % BDRV_SECTOR_SIZE)); assert(!(len % BDRV_SECTOR_SIZE));
start = off / BDRV_SECTOR_SIZE;
end = (off + len) / BDRV_SECTOR_SIZE;
nb_sectors = end - start;
qemu_iovec_init(&iov, 1); qemu_iovec_init(&iov, 1);
qemu_iovec_add(&iov, s->storage + (start * BDRV_SECTOR_SIZE), qemu_iovec_add(&iov, s->storage + off, len);
nb_sectors * BDRV_SECTOR_SIZE); blk_aio_pwritev(s->blk, off, &iov, 0, blk_sync_complete, NULL);
blk_aio_writev(s->blk, start, &iov, nb_sectors, blk_sync_complete, NULL);
} }
static void flash_erase(Flash *s, int offset, FlashCMD cmd) static void flash_erase(Flash *s, int offset, FlashCMD cmd)
@ -907,8 +899,7 @@ static int m25p80_init(SSISlave *ss)
s->storage = blk_blockalign(s->blk, s->size); s->storage = blk_blockalign(s->blk, s->size);
/* FIXME: Move to late init */ /* FIXME: Move to late init */
if (blk_read(s->blk, 0, s->storage, if (blk_pread(s->blk, 0, s->storage, s->size)) {
DIV_ROUND_UP(s->size, BDRV_SECTOR_SIZE))) {
fprintf(stderr, "Failed to initialize SPI flash!\n"); fprintf(stderr, "Failed to initialize SPI flash!\n");
return 1; return 1;
} }