Commit 9fc0d361 authored by Eric Blake's avatar Eric Blake Committed by Kevin Wolf
Browse files

nand: Switch to byte-based block access 



Sector-based blk_write() should die; switch to byte-based
blk_pwrite() instead.  Likewise for blk_read().

This file is doing some complex computations to map various
flash page sizes (256, 512, and 2048) atop generic uses of
512-byte sector operations.  Perhaps someone will want to tidy
up the file for fewer gymnastics in managing addresses and
offsets, and less wasteful visits of 256-byte pages, but it
was out of scope for this series, where I just went with the
mechanical conversion.

Signed-off-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent a7a5b7c0

hw/block/nand.c

+23 −13
Original line number Diff line number Diff line
@@ -663,7 +663,8 @@ static void glue(nand_blk_write_, PAGE_SIZE)(NANDFlashState *s) 
        sector = SECTOR(s->addr);

        off = (s->addr & PAGE_MASK) + s->offset;

        soff = SECTOR_OFFSET(s->addr);

        if (blk_read(s->blk, sector, iobuf, PAGE_SECTORS) < 0) {

        if (blk_pread(s->blk, sector << BDRV_SECTOR_BITS, iobuf,

                      PAGE_SECTORS << BDRV_SECTOR_BITS) < 0) {

            printf("%s: read error in sector %" PRIu64 "\n", __func__, sector);

            return;

        }
@@ -675,21 +676,24 @@ static void glue(nand_blk_write_, PAGE_SIZE)(NANDFlashState *s) 
                            MIN(OOB_SIZE, off + s->iolen - PAGE_SIZE));

        }



        if (blk_write(s->blk, sector, iobuf, PAGE_SECTORS) < 0) {

        if (blk_pwrite(s->blk, sector << BDRV_SECTOR_BITS, iobuf,

                       PAGE_SECTORS << BDRV_SECTOR_BITS, 0) < 0) {

            printf("%s: write error in sector %" PRIu64 "\n", __func__, sector);

        }

    } else {

        off = PAGE_START(s->addr) + (s->addr & PAGE_MASK) + s->offset;

        sector = off >> 9;

        soff = off & 0x1ff;

        if (blk_read(s->blk, sector, iobuf, PAGE_SECTORS + 2) < 0) {

        if (blk_pread(s->blk, sector << BDRV_SECTOR_BITS, iobuf,

                      (PAGE_SECTORS + 2) << BDRV_SECTOR_BITS) < 0) {

            printf("%s: read error in sector %" PRIu64 "\n", __func__, sector);

            return;

        }



        mem_and(iobuf + soff, s->io, s->iolen);



        if (blk_write(s->blk, sector, iobuf, PAGE_SECTORS + 2) < 0) {

        if (blk_pwrite(s->blk, sector << BDRV_SECTOR_BITS, iobuf,

                       (PAGE_SECTORS + 2) << BDRV_SECTOR_BITS, 0) < 0) {

            printf("%s: write error in sector %" PRIu64 "\n", __func__, sector);

        }

    }
@@ -716,17 +720,20 @@ static void glue(nand_blk_erase_, PAGE_SIZE)(NANDFlashState *s) 
        i = SECTOR(addr);

        page = SECTOR(addr + (1 << (ADDR_SHIFT + s->erase_shift)));

        for (; i < page; i ++)

            if (blk_write(s->blk, i, iobuf, 1) < 0) {

            if (blk_pwrite(s->blk, i << BDRV_SECTOR_BITS, iobuf,

                           BDRV_SECTOR_SIZE, 0) < 0) {

                printf("%s: write error in sector %" PRIu64 "\n", __func__, i);

            }

    } else {

        addr = PAGE_START(addr);

        page = addr >> 9;

        if (blk_read(s->blk, page, iobuf, 1) < 0) {

        if (blk_pread(s->blk, page << BDRV_SECTOR_BITS, iobuf,

                      BDRV_SECTOR_SIZE) < 0) {

            printf("%s: read error in sector %" PRIu64 "\n", __func__, page);

        }

        memset(iobuf + (addr & 0x1ff), 0xff, (~addr & 0x1ff) + 1);

        if (blk_write(s->blk, page, iobuf, 1) < 0) {

        if (blk_pwrite(s->blk, page << BDRV_SECTOR_BITS, iobuf,

                       BDRV_SECTOR_SIZE, 0) < 0) {

            printf("%s: write error in sector %" PRIu64 "\n", __func__, page);

        }
@@ -734,18 +741,20 @@ static void glue(nand_blk_erase_, PAGE_SIZE)(NANDFlashState *s) 
        i = (addr & ~0x1ff) + 0x200;

        for (addr += ((PAGE_SIZE + OOB_SIZE) << s->erase_shift) - 0x200;

                        i < addr; i += 0x200) {

            if (blk_write(s->blk, i >> 9, iobuf, 1) < 0) {

            if (blk_pwrite(s->blk, i, iobuf, BDRV_SECTOR_SIZE, 0) < 0) {

                printf("%s: write error in sector %" PRIu64 "\n",

                       __func__, i >> 9);

            }

        }



        page = i >> 9;

        if (blk_read(s->blk, page, iobuf, 1) < 0) {

        if (blk_pread(s->blk, page << BDRV_SECTOR_BITS, iobuf,

                      BDRV_SECTOR_SIZE) < 0) {

            printf("%s: read error in sector %" PRIu64 "\n", __func__, page);

        }

        memset(iobuf, 0xff, ((addr - 1) & 0x1ff) + 1);

        if (blk_write(s->blk, page, iobuf, 1) < 0) {

        if (blk_pwrite(s->blk, page << BDRV_SECTOR_BITS, iobuf,

                       BDRV_SECTOR_SIZE, 0) < 0) {

            printf("%s: write error in sector %" PRIu64 "\n", __func__, page);

        }

    }
@@ -760,7 +769,8 @@ static void glue(nand_blk_load_, PAGE_SIZE)(NANDFlashState *s, 


    if (s->blk) {

        if (s->mem_oob) {

            if (blk_read(s->blk, SECTOR(addr), s->io, PAGE_SECTORS) < 0) {

            if (blk_pread(s->blk, SECTOR(addr) << BDRV_SECTOR_BITS, s->io,

                          PAGE_SECTORS << BDRV_SECTOR_BITS) < 0) {

                printf("%s: read error in sector %" PRIu64 "\n",

                                __func__, SECTOR(addr));

            }
@@ -769,8 +779,8 @@ static void glue(nand_blk_load_, PAGE_SIZE)(NANDFlashState *s, 
                            OOB_SIZE);

            s->ioaddr = s->io + SECTOR_OFFSET(s->addr) + offset;

        } else {

            if (blk_read(s->blk, PAGE_START(addr) >> 9,

                         s->io, (PAGE_SECTORS + 2)) < 0) {

            if (blk_pread(s->blk, PAGE_START(addr), s->io,

                          (PAGE_SECTORS + 2) << BDRV_SECTOR_BITS) < 0) {

                printf("%s: read error in sector %" PRIu64 "\n",

                                __func__, PAGE_START(addr) >> 9);

            }