Commit 2bc1f2b5 authored by Masahiro Yamada's avatar Masahiro Yamada

mtd: denali_spl: do not allocate page_buffer in .bss section

Since commit 2580a2a7 ("mtd: nand: Increase max sizes of OOB and
Page size"), three boards (ph1_ld4, ph1_pro4, ph1_sld8) fail to build
with the following error message:
  arm-linux-gnueabi-ld.bfd: SPL image plus BSS too big

They compile drivers/mtd/nand/denali_spl.c and it has a page_buffer
as static data:

    static uint8_t page_buffer[NAND_MAX_PAGESIZE];

This buffer required 8KB in .bss section before that commit and now
it has been increased to 16KB.  Given limited code/memory size for SPL,
it is not a good idea to allocate a page buffer statically.  In the
first place, the load address 'dst' can be used as a page buffer.
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent a679cc01
/* /*
* Copyright (C) 2014 Panasonic Corporation * Copyright (C) 2014 Panasonic Corporation
* Copyright (C) 2014-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
* *
* SPDX-License-Identifier: GPL-2.0+ * SPDX-License-Identifier: GPL-2.0+
*/ */
...@@ -22,7 +23,6 @@ static void __iomem *denali_flash_reg = ...@@ -22,7 +23,6 @@ static void __iomem *denali_flash_reg =
(void __iomem *)CONFIG_SYS_NAND_REGS_BASE; (void __iomem *)CONFIG_SYS_NAND_REGS_BASE;
static const int flash_bank; static const int flash_bank;
static uint8_t page_buffer[NAND_MAX_PAGESIZE];
static int page_size, oob_size, pages_per_block; static int page_size, oob_size, pages_per_block;
static void index_addr(uint32_t address, uint32_t data) static void index_addr(uint32_t address, uint32_t data)
...@@ -144,15 +144,15 @@ static int nand_read_page(void *buf, int page) ...@@ -144,15 +144,15 @@ static int nand_read_page(void *buf, int page)
return 0; return 0;
} }
static int nand_block_isbad(int block) static int nand_block_isbad(void *buf, int block)
{ {
int ret; int ret;
ret = nand_read_oob(page_buffer, block * pages_per_block); ret = nand_read_oob(buf, block * pages_per_block);
if (ret < 0) if (ret < 0)
return ret; return ret;
return page_buffer[CONFIG_SYS_NAND_BAD_BLOCK_POS] != 0xff; return *((uint8_t *)buf + CONFIG_SYS_NAND_BAD_BLOCK_POS) != 0xff;
} }
/* nand_init() - initialize data to make nand usable by SPL */ /* nand_init() - initialize data to make nand usable by SPL */
...@@ -184,7 +184,7 @@ int nand_spl_load_image(uint32_t offs, unsigned int size, void *dst) ...@@ -184,7 +184,7 @@ int nand_spl_load_image(uint32_t offs, unsigned int size, void *dst)
while (size) { while (size) {
if (force_bad_block_check || page == 0) { if (force_bad_block_check || page == 0) {
ret = nand_block_isbad(block); ret = nand_block_isbad(dst, block);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -196,24 +196,16 @@ int nand_spl_load_image(uint32_t offs, unsigned int size, void *dst) ...@@ -196,24 +196,16 @@ int nand_spl_load_image(uint32_t offs, unsigned int size, void *dst)
force_bad_block_check = 0; force_bad_block_check = 0;
if (unlikely(column || size < page_size)) { ret = nand_read_page(dst, block * pages_per_block + page);
/* Partial page read */ if (ret < 0)
ret = nand_read_page(page_buffer, return ret;
block * pages_per_block + page);
if (ret < 0)
return ret;
readlen = min(page_size - column, (int)size); readlen = min(page_size - column, (int)size);
memcpy(dst, page_buffer, readlen);
if (unlikely(column)) {
/* Partial page read */
memmove(dst, dst + column, readlen);
column = 0; column = 0;
} else {
ret = nand_read_page(dst,
block * pages_per_block + page);
if (ret < 0)
return ret;
readlen = page_size;
} }
size -= readlen; size -= readlen;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment