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

jlink_spi.c: Refactor singleton states into reentrant pattern

Browse Source 
Move global singleton states into a struct and store within
the spi_master data field for the life-time of the driver.

This is one of the steps on the way to move spi_master data
memory management behind the initialisation API, for more
context see other patches under the same topic "register_master_api".

TEST=builds
BUG=b:185191942

Change-Id: If13ad0c979ccf62ca4ccbd479d471c657895ef59
Signed-off-by: Anastasia Klimchuk <aklm@chromium.org>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/52560
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Miklós Márton <martonmiklosqdev@gmail.com>
This commit is contained in:
Anastasia Klimchuk 2021-04-21 12:21:49 +10:00 committed by Angel Pons
parent 87718aadb4
commit 3c97998aea
1 changed files with 47 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
jlink_spi.c
View File

@ -51,23 +51,25 @@
/* Minimum target voltage required for operation in mV. */ /* Minimum target voltage required for operation in mV. */
#define MIN_TARGET_VOLTAGE 1200 #define MIN_TARGET_VOLTAGE 1200
static struct jaylink_context *jaylink_ctx; struct jlink_spi_data {
static struct jaylink_device_handle *jaylink_devh; struct jaylink_context *jaylink_ctx;
static bool reset_cs; struct jaylink_device_handle *jaylink_devh;
bool reset_cs;
};
static bool assert_cs(void) static bool assert_cs(struct jlink_spi_data *spi_data)
{ {
int ret; int ret;
if (reset_cs) { if (spi_data->reset_cs) {
ret = jaylink_clear_reset(jaylink_devh); ret = jaylink_clear_reset(spi_data->jaylink_devh);
if (ret != JAYLINK_OK) { if (ret != JAYLINK_OK) {
msg_perr("jaylink_clear_reset() failed: %s.\n", jaylink_strerror(ret)); msg_perr("jaylink_clear_reset() failed: %s.\n", jaylink_strerror(ret));
return false; return false;
} }
} else { } else {
ret = jaylink_jtag_clear_trst(jaylink_devh); ret = jaylink_jtag_clear_trst(spi_data->jaylink_devh);
if (ret != JAYLINK_OK) { if (ret != JAYLINK_OK) {
msg_perr("jaylink_jtag_clear_trst() failed: %s.\n", jaylink_strerror(ret)); msg_perr("jaylink_jtag_clear_trst() failed: %s.\n", jaylink_strerror(ret));
@ -78,19 +80,19 @@ static bool assert_cs(void)
return true; return true;
} }
static bool deassert_cs(void) static bool deassert_cs(struct jlink_spi_data *spi_data)
{ {
int ret; int ret;
if (reset_cs) { if (spi_data->reset_cs) {
ret = jaylink_set_reset(jaylink_devh); ret = jaylink_set_reset(spi_data->jaylink_devh);
if (ret != JAYLINK_OK) { if (ret != JAYLINK_OK) {
msg_perr("jaylink_set_reset() failed: %s.\n", jaylink_strerror(ret)); msg_perr("jaylink_set_reset() failed: %s.\n", jaylink_strerror(ret));
return false; return false;
} }
} else { } else {
ret = jaylink_jtag_set_trst(jaylink_devh); ret = jaylink_jtag_set_trst(spi_data->jaylink_devh);
if (ret != JAYLINK_OK) { if (ret != JAYLINK_OK) {
msg_perr("jaylink_jtag_set_trst() failed: %s.\n", jaylink_strerror(ret)); msg_perr("jaylink_jtag_set_trst() failed: %s.\n", jaylink_strerror(ret));
@ -106,6 +108,7 @@ static int jlink_spi_send_command(const struct flashctx *flash, unsigned int wri
{ {
uint32_t length; uint32_t length;
uint8_t *buffer; uint8_t *buffer;
struct jlink_spi_data *spi_data = flash->mst->spi.data;
length = writecnt + readcnt; length = writecnt + readcnt;
@ -124,14 +127,15 @@ static int jlink_spi_send_command(const struct flashctx *flash, unsigned int wri
memset(buffer + writecnt, 0x00, readcnt); memset(buffer + writecnt, 0x00, readcnt);
if (!assert_cs()) { if (!assert_cs(spi_data)) {
free(buffer); free(buffer);
return SPI_PROGRAMMER_ERROR; return SPI_PROGRAMMER_ERROR;
} }
int ret; int ret;
ret = jaylink_jtag_io(jaylink_devh, buffer, buffer, buffer, length * 8, JAYLINK_JTAG_VERSION_2); ret = jaylink_jtag_io(spi_data->jaylink_devh,
buffer, buffer, buffer, length * 8, JAYLINK_JTAG_VERSION_2);
if (ret != JAYLINK_OK) { if (ret != JAYLINK_OK) {
msg_perr("jaylink_jtag_io() failed: %s.\n", jaylink_strerror(ret)); msg_perr("jaylink_jtag_io() failed: %s.\n", jaylink_strerror(ret));
@ -139,7 +143,7 @@ static int jlink_spi_send_command(const struct flashctx *flash, unsigned int wri
return SPI_PROGRAMMER_ERROR; return SPI_PROGRAMMER_ERROR;
} }
if (!deassert_cs()) { if (!deassert_cs(spi_data)) {
free(buffer); free(buffer);
return SPI_PROGRAMMER_ERROR; return SPI_PROGRAMMER_ERROR;
} }
@ -151,7 +155,7 @@ static int jlink_spi_send_command(const struct flashctx *flash, unsigned int wri
return 0; return 0;
} }
static const struct spi_master spi_master_jlink_spi = { static struct spi_master spi_master_jlink_spi = {
/* Maximum data read size in one go (excluding opcode+address). */ /* Maximum data read size in one go (excluding opcode+address). */
.max_data_read = JTAG_MAX_TRANSFER_SIZE - 5, .max_data_read = JTAG_MAX_TRANSFER_SIZE - 5,
/* Maximum data write size in one go (excluding opcode+address). */ /* Maximum data write size in one go (excluding opcode+address). */
@ -166,11 +170,14 @@ static const struct spi_master spi_master_jlink_spi = {
static int jlink_spi_shutdown(void *data) static int jlink_spi_shutdown(void *data)
{ {
if (jaylink_devh) struct jlink_spi_data *spi_data = data;
jaylink_close(jaylink_devh); if (spi_data->jaylink_devh)
jaylink_close(spi_data->jaylink_devh);
jaylink_exit(jaylink_ctx); jaylink_exit(spi_data->jaylink_ctx);
/* jaylink_ctx, jaylink_devh are freed by jaylink_close and jaylink_exit */
free(spi_data);
return 0; return 0;
} }
@ -178,6 +185,10 @@ int jlink_spi_init(void)
{ {
char *arg; char *arg;
unsigned long speed = 0; unsigned long speed = 0;
struct jaylink_context *jaylink_ctx = NULL;
struct jaylink_device_handle *jaylink_devh = NULL;
bool reset_cs;
struct jlink_spi_data *spi_data = NULL;
arg = extract_programmer_param("spispeed"); arg = extract_programmer_param("spispeed");
@ -443,11 +454,23 @@ int jlink_spi_init(void)
msg_pdbg("SPI speed: %lu kHz\n", speed); msg_pdbg("SPI speed: %lu kHz\n", speed);
spi_data = calloc(1, sizeof(*spi_data));
if (!spi_data) {
msg_perr("Unable to allocate space for SPI master data\n");
goto init_err;
}
/* jaylink_ctx, jaylink_devh are allocated by jaylink_init and jaylink_open */
spi_data->jaylink_ctx = jaylink_ctx;
spi_data->jaylink_devh = jaylink_devh;
spi_data->reset_cs = reset_cs;
spi_master_jlink_spi.data = spi_data;
/* Ensure that the CS signal is not active initially. */ /* Ensure that the CS signal is not active initially. */
if (!deassert_cs()) if (!deassert_cs(spi_data))
goto init_err; goto init_err;
if (register_shutdown(jlink_spi_shutdown, NULL)) if (register_shutdown(jlink_spi_shutdown, spi_data))
goto init_err; goto init_err;
register_spi_master(&spi_master_jlink_spi); register_spi_master(&spi_master_jlink_spi);
@ -459,5 +482,9 @@ init_err:
jaylink_exit(jaylink_ctx); jaylink_exit(jaylink_ctx);
/* jaylink_ctx, jaylink_devh are freed by jaylink_close and jaylink_exit */
if (spi_data)
free(spi_data);
return 1; return 1;
} }