SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/block/nand: Rename PAGE_SIZE to NAND_PAGE_SIZE

Browse Source 
As per POSIX specification of limits.h [1], OS libc may define
PAGE_SIZE in limits.h.

To prevent collosion of definition, we rename PAGE_SIZE here.

[1]: https://pubs.opengroup.org/onlinepubs/7908799/xsh/limits.h.html

Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20210118063808.12471-5-jiaxun.yang@flygoat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Jiaxun Yang 2021-01-18 14:38:03 +08:00 committed by Thomas Huth
parent 29ce0d35e1
commit 9c57272507
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
hw/block/nand.c
View File

@ -115,24 +115,24 @@ static void mem_and(uint8_t *dest, const uint8_t *src, size_t n)
# define NAND_IO # define NAND_IO
# define PAGE(addr) ((addr) >> ADDR_SHIFT) # define PAGE(addr) ((addr) >> ADDR_SHIFT)
# define PAGE_START(page) (PAGE(page) * (PAGE_SIZE + OOB_SIZE)) # define PAGE_START(page) (PAGE(page) * (NAND_PAGE_SIZE + OOB_SIZE))
# define PAGE_MASK ((1 << ADDR_SHIFT) - 1) # define PAGE_MASK ((1 << ADDR_SHIFT) - 1)
# define OOB_SHIFT (PAGE_SHIFT - 5) # define OOB_SHIFT (PAGE_SHIFT - 5)
# define OOB_SIZE (1 << OOB_SHIFT) # define OOB_SIZE (1 << OOB_SHIFT)
# define SECTOR(addr) ((addr) >> (9 + ADDR_SHIFT - PAGE_SHIFT)) # define SECTOR(addr) ((addr) >> (9 + ADDR_SHIFT - PAGE_SHIFT))
# define SECTOR_OFFSET(addr) ((addr) & ((511 >> PAGE_SHIFT) << 8)) # define SECTOR_OFFSET(addr) ((addr) & ((511 >> PAGE_SHIFT) << 8))
# define PAGE_SIZE 256 # define NAND_PAGE_SIZE 256
# define PAGE_SHIFT 8 # define PAGE_SHIFT 8
# define PAGE_SECTORS 1 # define PAGE_SECTORS 1
# define ADDR_SHIFT 8 # define ADDR_SHIFT 8
# include "nand.c" # include "nand.c"
# define PAGE_SIZE 512 # define NAND_PAGE_SIZE 512
# define PAGE_SHIFT 9 # define PAGE_SHIFT 9
# define PAGE_SECTORS 1 # define PAGE_SECTORS 1
# define ADDR_SHIFT 8 # define ADDR_SHIFT 8
# include "nand.c" # include "nand.c"
# define PAGE_SIZE 2048 # define NAND_PAGE_SIZE 2048
# define PAGE_SHIFT 11 # define PAGE_SHIFT 11
# define PAGE_SECTORS 4 # define PAGE_SECTORS 4
# define ADDR_SHIFT 16 # define ADDR_SHIFT 16
@ -652,7 +652,7 @@ type_init(nand_register_types)
#else #else
/* Program a single page */ /* Program a single page */
static void glue(nand_blk_write_, PAGE_SIZE)(NANDFlashState *s) static void glue(nand_blk_write_, NAND_PAGE_SIZE)(NANDFlashState *s)
{ {
uint64_t off, page, sector, soff; uint64_t off, page, sector, soff;
uint8_t iobuf[(PAGE_SECTORS + 2) * 0x200]; uint8_t iobuf[(PAGE_SECTORS + 2) * 0x200];
@ -672,11 +672,11 @@ static void glue(nand_blk_write_, PAGE_SIZE)(NANDFlashState *s)
return; return;
} }
mem_and(iobuf + (soff | off), s->io, MIN(s->iolen, PAGE_SIZE - off)); mem_and(iobuf + (soff | off), s->io, MIN(s->iolen, NAND_PAGE_SIZE - off));
if (off + s->iolen > PAGE_SIZE) { if (off + s->iolen > NAND_PAGE_SIZE) {
page = PAGE(s->addr); page = PAGE(s->addr);
mem_and(s->storage + (page << OOB_SHIFT), s->io + PAGE_SIZE - off, mem_and(s->storage + (page << OOB_SHIFT), s->io + NAND_PAGE_SIZE - off,
MIN(OOB_SIZE, off + s->iolen - PAGE_SIZE)); MIN(OOB_SIZE, off + s->iolen - NAND_PAGE_SIZE));
} }
if (blk_pwrite(s->blk, sector << BDRV_SECTOR_BITS, iobuf, if (blk_pwrite(s->blk, sector << BDRV_SECTOR_BITS, iobuf,
@ -704,7 +704,7 @@ static void glue(nand_blk_write_, PAGE_SIZE)(NANDFlashState *s)
} }
/* Erase a single block */ /* Erase a single block */
static void glue(nand_blk_erase_, PAGE_SIZE)(NANDFlashState *s) static void glue(nand_blk_erase_, NAND_PAGE_SIZE)(NANDFlashState *s)
{ {
uint64_t i, page, addr; uint64_t i, page, addr;
uint8_t iobuf[0x200] = { [0 ... 0x1ff] = 0xff, }; uint8_t iobuf[0x200] = { [0 ... 0x1ff] = 0xff, };
@ -716,7 +716,7 @@ static void glue(nand_blk_erase_, PAGE_SIZE)(NANDFlashState *s)
if (!s->blk) { if (!s->blk) {
memset(s->storage + PAGE_START(addr), memset(s->storage + PAGE_START(addr),
0xff, (PAGE_SIZE + OOB_SIZE) << s->erase_shift); 0xff, (NAND_PAGE_SIZE + OOB_SIZE) << s->erase_shift);
} else if (s->mem_oob) { } else if (s->mem_oob) {
memset(s->storage + (PAGE(addr) << OOB_SHIFT), memset(s->storage + (PAGE(addr) << OOB_SHIFT),
0xff, OOB_SIZE << s->erase_shift); 0xff, OOB_SIZE << s->erase_shift);
@ -742,7 +742,7 @@ static void glue(nand_blk_erase_, PAGE_SIZE)(NANDFlashState *s)
memset(iobuf, 0xff, 0x200); memset(iobuf, 0xff, 0x200);
i = (addr & ~0x1ff) + 0x200; i = (addr & ~0x1ff) + 0x200;
for (addr += ((PAGE_SIZE + OOB_SIZE) << s->erase_shift) - 0x200; for (addr += ((NAND_PAGE_SIZE + OOB_SIZE) << s->erase_shift) - 0x200;
i < addr; i += 0x200) { i < addr; i += 0x200) {
if (blk_pwrite(s->blk, i, iobuf, BDRV_SECTOR_SIZE, 0) < 0) { if (blk_pwrite(s->blk, i, iobuf, BDRV_SECTOR_SIZE, 0) < 0) {
printf("%s: write error in sector %" PRIu64 "\n", printf("%s: write error in sector %" PRIu64 "\n",
@ -763,7 +763,7 @@ static void glue(nand_blk_erase_, PAGE_SIZE)(NANDFlashState *s)
} }
} }
static void glue(nand_blk_load_, PAGE_SIZE)(NANDFlashState *s, static void glue(nand_blk_load_, NAND_PAGE_SIZE)(NANDFlashState *s,
uint64_t addr, int offset) uint64_t addr, int offset)
{ {
if (PAGE(addr) >= s->pages) { if (PAGE(addr) >= s->pages) {
@ -777,7 +777,7 @@ static void glue(nand_blk_load_, PAGE_SIZE)(NANDFlashState *s,
printf("%s: read error in sector %" PRIu64 "\n", printf("%s: read error in sector %" PRIu64 "\n",
__func__, SECTOR(addr)); __func__, SECTOR(addr));
} }
memcpy(s->io + SECTOR_OFFSET(s->addr) + PAGE_SIZE, memcpy(s->io + SECTOR_OFFSET(s->addr) + NAND_PAGE_SIZE,
s->storage + (PAGE(s->addr) << OOB_SHIFT), s->storage + (PAGE(s->addr) << OOB_SHIFT),
OOB_SIZE); OOB_SIZE);
s->ioaddr = s->io + SECTOR_OFFSET(s->addr) + offset; s->ioaddr = s->io + SECTOR_OFFSET(s->addr) + offset;
@ -791,23 +791,23 @@ static void glue(nand_blk_load_, PAGE_SIZE)(NANDFlashState *s,
} }
} else { } else {
memcpy(s->io, s->storage + PAGE_START(s->addr) + memcpy(s->io, s->storage + PAGE_START(s->addr) +
offset, PAGE_SIZE + OOB_SIZE - offset); offset, NAND_PAGE_SIZE + OOB_SIZE - offset);
s->ioaddr = s->io; s->ioaddr = s->io;
} }
} }
static void glue(nand_init_, PAGE_SIZE)(NANDFlashState *s) static void glue(nand_init_, NAND_PAGE_SIZE)(NANDFlashState *s)
{ {
s->oob_shift = PAGE_SHIFT - 5; s->oob_shift = PAGE_SHIFT - 5;
s->pages = s->size >> PAGE_SHIFT; s->pages = s->size >> PAGE_SHIFT;
s->addr_shift = ADDR_SHIFT; s->addr_shift = ADDR_SHIFT;
s->blk_erase = glue(nand_blk_erase_, PAGE_SIZE); s->blk_erase = glue(nand_blk_erase_, NAND_PAGE_SIZE);
s->blk_write = glue(nand_blk_write_, PAGE_SIZE); s->blk_write = glue(nand_blk_write_, NAND_PAGE_SIZE);
s->blk_load = glue(nand_blk_load_, PAGE_SIZE); s->blk_load = glue(nand_blk_load_, NAND_PAGE_SIZE);
} }
# undef PAGE_SIZE # undef NAND_PAGE_SIZE
# undef PAGE_SHIFT # undef PAGE_SHIFT
# undef PAGE_SECTORS # undef PAGE_SECTORS
# undef ADDR_SHIFT # undef ADDR_SHIFT