coreboot-mirror
/
chrome-ec
mirror of https://review.coreboot.org/chrome-ec.git
1
0
Fork 0
Code Issues Releases Wiki Activity

flash: allow programming larger EC images 

For some ECs, the EC image size is limited by the amount of code RAM
instead of 1/2 the total flash size. In this instance, there is unused
flash that can be used for single use data objects.

To support linking data objects into the unused flash area, increase the
region size that can be programmed for RW images.

Analysis of chips that are impacted by this change:
    Chip          EC image limit    New RW size limit
    mec1701h      188 KiB           256 KiB
    mec17xx_2E00  188 KiB           256 KiB
    npcx5m5g      96 KiB            128 KiB
    npcx5m6g      224 KiB           256 KiB
    npcx7m6f      192 KiB           256 KiB
    npcx7m6fb     192 KiB           256 KiB
    npcx7m6fc     192 KiB           256 KiB
    npcx7m6g      192 KiB           256 KiB
    npcx7m7wb     256 KiB           512 KiB
    npcx7m7wc     252 KiB           256 KiB

Boards using other chips verified that CONFIG_RW_SIZE is the same as
CONFIG_EC_WRITABLE_STORAGE_SIZE.

EC_FLASH_REGION_RO isn't used by depthcharge, only EC_FLASH_REGION_WP_RO
which is already set to the correct size.

BUG=b:160330682
BRANCH=none
TEST=make buildall

Signed-off-by: Keith Short <keithshort@chromium.org>
Change-Id: I84b9dc84568273e1ab1473e301d27ffd2b07ba7f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2325764
Reviewed-by: Abe Levkoy <alevkoy@chromium.org>
Reviewed-by: caveh jalali <caveh@chromium.org>
Commit-Queue: caveh jalali <caveh@chromium.org>
This commit is contained in:
Keith Short 2020-07-27 17:00:04 -06:00 committed by Commit Bot
parent 53c77e42bc
commit 8ce0c16cc2
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/flash.c
View File

@ -1373,6 +1373,9 @@ DECLARE_HOST_COMMAND(EC_CMD_FLASH_WRITE,
*/
BUILD_ASSERT(CONFIG_RO_SIZE % CONFIG_FLASH_ERASE_SIZE == 0);
BUILD_ASSERT(CONFIG_RW_SIZE % CONFIG_FLASH_ERASE_SIZE == 0);
BUILD_ASSERT(EC_FLASH_REGION_RO_SIZE % CONFIG_FLASH_ERASE_SIZE == 0);
BUILD_ASSERT(CONFIG_EC_WRITABLE_STORAGE_SIZE % CONFIG_FLASH_ERASE_SIZE == 0);
#endif
static enum ec_status flash_command_erase(struct host_cmd_handler_args *args)
@ -1499,12 +1502,12 @@ flash_command_region_info(struct host_cmd_handler_args *args)
r->offset = CONFIG_EC_PROTECTED_STORAGE_OFF +
CONFIG_RO_STORAGE_OFF -
EC_FLASH_REGION_START;
r->size = CONFIG_RO_SIZE;
r->size = EC_FLASH_REGION_RO_SIZE;
break;
case EC_FLASH_REGION_ACTIVE:
r->offset = flash_get_rw_offset(system_get_active_copy()) -
EC_FLASH_REGION_START;
r->size = CONFIG_RW_SIZE;
r->size = CONFIG_EC_WRITABLE_STORAGE_SIZE;
break;
case EC_FLASH_REGION_WP_RO:
r->offset = CONFIG_WP_STORAGE_OFF -
@ -1514,7 +1517,7 @@ flash_command_region_info(struct host_cmd_handler_args *args)
case EC_FLASH_REGION_UPDATE:
r->offset = flash_get_rw_offset(system_get_update_copy()) -
EC_FLASH_REGION_START;
r->size = CONFIG_RW_SIZE;
r->size = CONFIG_EC_WRITABLE_STORAGE_SIZE;
break;
default:
return EC_RES_INVALID_PARAM;

10
include/flash.h
View File

@ -78,6 +78,12 @@ int flash_bank_erase_size(int bank);
#error "Not supported."
#endif
/*
* When there is a dedicated flash bank used to store persistent state,
* ensure the RO flash region excludes the PSTATE bank.
*/
#define EC_FLASH_REGION_RO_SIZE CONFIG_RO_SIZE
#ifndef PSTATE_BANK
#define PSTATE_BANK (CONFIG_FW_PSTATE_OFF / CONFIG_FLASH_BANK_SIZE)
#endif
@ -85,7 +91,9 @@ int flash_bank_erase_size(int bank);
#define PSTATE_BANK_COUNT (CONFIG_FW_PSTATE_SIZE / CONFIG_FLASH_BANK_SIZE)
#endif
#else /* CONFIG_FLASH_PSTATE && CONFIG_FLASH_PSTATE_BANK */
#define PSTATE_BANK_COUNT 0
/* Allow flashrom to program the entire write protected area */
#define EC_FLASH_REGION_RO_SIZE CONFIG_WP_STORAGE_SIZE
#define PSTATE_BANK_COUNT 0
#endif /* CONFIG_FLASH_PSTATE && CONFIG_FLASH_PSTATE_BANK */
#ifdef CONFIG_ROLLBACK

8
test/flash.c
View File

@ -363,15 +363,17 @@ static int test_region_info(void)
{
VERIFY_REGION_INFO(EC_FLASH_REGION_RO,
CONFIG_EC_PROTECTED_STORAGE_OFF +
CONFIG_RO_STORAGE_OFF, CONFIG_RO_SIZE);
CONFIG_RO_STORAGE_OFF, EC_FLASH_REGION_RO_SIZE);
VERIFY_REGION_INFO(EC_FLASH_REGION_ACTIVE,
CONFIG_EC_WRITABLE_STORAGE_OFF +
CONFIG_RW_STORAGE_OFF, CONFIG_RW_SIZE);
CONFIG_RW_STORAGE_OFF,
CONFIG_EC_WRITABLE_STORAGE_SIZE);
VERIFY_REGION_INFO(EC_FLASH_REGION_WP_RO,
CONFIG_WP_STORAGE_OFF, CONFIG_WP_STORAGE_SIZE);
VERIFY_REGION_INFO(EC_FLASH_REGION_UPDATE,
CONFIG_EC_WRITABLE_STORAGE_OFF +
CONFIG_RW_STORAGE_OFF, CONFIG_RW_SIZE);
CONFIG_RW_STORAGE_OFF,
CONFIG_EC_WRITABLE_STORAGE_SIZE);
return EC_SUCCESS;
}