openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 23:22:37 +02:00
Code Issues Releases Wiki Activity

writeprotect: add {get,set}_wp_mode()

Browse Source 
BUG=b:195381327,b:153800563
BRANCH=none
TEST=flashrom --wp-{enable,disable,status}

Change-Id: I7b68e940f0e1359281806c98e1da119b4caf8405
Signed-off-by: Nikolai Artemiev <nartemiev@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/58483
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
This commit is contained in:
Nikolai Artemiev 2021-10-21 02:29:22 +11:00 committed by Anastasia Klimchuk
parent 4cb8464e90
commit 12dbc4e045
2 changed files with 47 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libflashrom.h
View File

@ -128,7 +128,9 @@ enum flashrom_wp_result {
FLASHROM_WP_ERR_READ_FAILED = 3, FLASHROM_WP_ERR_READ_FAILED = 3,
FLASHROM_WP_ERR_WRITE_FAILED = 4, FLASHROM_WP_ERR_WRITE_FAILED = 4,
FLASHROM_WP_ERR_VERIFY_FAILED = 5, FLASHROM_WP_ERR_VERIFY_FAILED = 5,
FLASHROM_WP_ERR_RANGE_UNSUPPORTED = 6 FLASHROM_WP_ERR_RANGE_UNSUPPORTED = 6,
FLASHROM_WP_ERR_MODE_UNSUPPORTED = 7,
FLASHROM_WP_ERR_RANGE_LIST_UNAVAILABLE = 8
}; };
enum flashrom_wp_mode { enum flashrom_wp_mode {

50
writeprotect.c
View File

@ -348,6 +348,50 @@ static int set_wp_range(struct wp_bits *bits, struct flashctx *flash, const stru
return ret; return ret;
} }
/** Get the mode selected by a WP configuration. */
static int get_wp_mode(enum flashrom_wp_mode *mode, const struct wp_bits *bits)
{
if (!bits->srp_bit_present)
return FLASHROM_WP_ERR_CHIP_UNSUPPORTED;
if (bits->srl_bit_present && bits->srl == 1) {
*mode = bits->srp ? FLASHROM_WP_MODE_PERMANENT :
FLASHROM_WP_MODE_POWER_CYCLE;
} else {
*mode = bits->srp ? FLASHROM_WP_MODE_HARDWARE :
FLASHROM_WP_MODE_DISABLED;
}
return FLASHROM_WP_OK;
}
/** Modify a wp_bits structure such that it will select a specified protection mode. */
static int set_wp_mode(struct wp_bits *bits, const enum flashrom_wp_mode mode)
{
switch (mode) {
case FLASHROM_WP_MODE_DISABLED:
bits->srl = 0;
bits->srp = 0;
return FLASHROM_WP_OK;
case FLASHROM_WP_MODE_HARDWARE:
bits->srl = 0;
bits->srp = 1;
return FLASHROM_WP_OK;
case FLASHROM_WP_MODE_POWER_CYCLE:
case FLASHROM_WP_MODE_PERMANENT:
default:
/*
* Don't try to enable power cycle or permanent protection for
* now. Those modes may be possible to activate on some chips,
* but they are usually unavailable by default or require special
* commands to activate.
*/
return FLASHROM_WP_ERR_MODE_UNSUPPORTED;
}
}
static bool chip_supported(struct flashctx *flash) static bool chip_supported(struct flashctx *flash)
{ {
return (flash->chip != NULL) && (flash->chip->decode_range != NULL); return (flash->chip != NULL) && (flash->chip->decode_range != NULL);
@ -367,11 +411,8 @@ enum flashrom_wp_result wp_read_cfg(struct flashrom_wp_cfg *cfg, struct flashctx
if (ret == FLASHROM_WP_OK) if (ret == FLASHROM_WP_OK)
ret = get_wp_range(&cfg->range, flash, &bits); ret = get_wp_range(&cfg->range, flash, &bits);
/* TODO: implement and get_wp_mode() and call it */
/*
if (ret == FLASHROM_WP_OK) if (ret == FLASHROM_WP_OK)
ret = get_wp_mode(&cfg->mode, &bits); ret = get_wp_mode(&cfg->mode, &bits);
*/
return ret; return ret;
} }
@ -394,11 +435,8 @@ enum flashrom_wp_result wp_write_cfg(struct flashctx *flash, const struct flashr
ret = write_wp_bits(flash, bits); ret = write_wp_bits(flash, bits);
/* Set protection mode */ /* Set protection mode */
/* TODO: implement set_wp_mode() and use it */
/*
if (ret == FLASHROM_WP_OK) if (ret == FLASHROM_WP_OK)
ret = set_wp_mode(&bits, cfg->mode); ret = set_wp_mode(&bits, cfg->mode);
*/
if (ret == FLASHROM_WP_OK) if (ret == FLASHROM_WP_OK)
ret = write_wp_bits(flash, bits); ret = write_wp_bits(flash, bits);