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

pony_spi.c: Refactor singleton states into reentrant pattern

Browse Source 
Move global singleton states into a struct and store within
the bitbang_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".

BUG=b:185191942
TEST=builds

Change-Id: Icf1125dadcdaa287ebe3c07ca95adb770bb19412
Signed-off-by: Anastasia Klimchuk <aklm@chromium.org>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/54997
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
This commit is contained in:
Anastasia Klimchuk 2021-05-27 09:46:23 +10:00 committed by Edward O'Callaghan
parent ab93e70387
commit f7b0674266
1 changed files with 49 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
pony_spi.c
View File

@ -49,16 +49,20 @@ enum pony_type {
TYPE_AJAWE TYPE_AJAWE
}; };
/* Pins for master->slave direction */ struct pony_spi_data {
static int pony_negate_cs = 1; /* Pins for master->slave direction */
static int pony_negate_sck = 0; int negate_cs;
static int pony_negate_mosi = 0; int negate_sck;
/* Pins for slave->master direction */ int negate_mosi;
static int pony_negate_miso = 0; /* Pins for slave->master direction */
int negate_miso;
};
static void pony_bitbang_set_cs(int val, void *spi_data) static void pony_bitbang_set_cs(int val, void *spi_data)
{ {
if (pony_negate_cs) struct pony_spi_data *data = spi_data;
if (data->negate_cs)
val ^= 1; val ^= 1;
sp_set_pin(PIN_TXD, val); sp_set_pin(PIN_TXD, val);
@ -66,7 +70,9 @@ static void pony_bitbang_set_cs(int val, void *spi_data)
static void pony_bitbang_set_sck(int val, void *spi_data) static void pony_bitbang_set_sck(int val, void *spi_data)
{ {
if (pony_negate_sck) struct pony_spi_data *data = spi_data;
if (data->negate_sck)
val ^= 1; val ^= 1;
sp_set_pin(PIN_RTS, val); sp_set_pin(PIN_RTS, val);
@ -74,7 +80,9 @@ static void pony_bitbang_set_sck(int val, void *spi_data)
static void pony_bitbang_set_mosi(int val, void *spi_data) static void pony_bitbang_set_mosi(int val, void *spi_data)
{ {
if (pony_negate_mosi) struct pony_spi_data *data = spi_data;
if (data->negate_mosi)
val ^= 1; val ^= 1;
sp_set_pin(PIN_DTR, val); sp_set_pin(PIN_DTR, val);
@ -82,9 +90,10 @@ static void pony_bitbang_set_mosi(int val, void *spi_data)
static int pony_bitbang_get_miso(void *spi_data) static int pony_bitbang_get_miso(void *spi_data)
{ {
struct pony_spi_data *data = spi_data;
int tmp = sp_get_pin(PIN_CTS); int tmp = sp_get_pin(PIN_CTS);
if (pony_negate_miso) if (data->negate_miso)
tmp ^= 1; tmp ^= 1;
return tmp; return tmp;
@ -107,6 +116,7 @@ static int pony_spi_shutdown(void *data)
else else
msg_pdbg("Pony SPI shutdown completed.\n"); msg_pdbg("Pony SPI shutdown completed.\n");
free(data);
return ret; return ret;
} }
@ -119,6 +129,16 @@ int pony_spi_init(void)
int have_device = 0; int have_device = 0;
int have_prog = 0; int have_prog = 0;
struct pony_spi_data *data = calloc(1, sizeof(*data));
if (!data) {
msg_perr("Unable to allocate space for SPI master data\n");
return 1;
}
data->negate_cs = 1;
data->negate_sck = 0;
data->negate_mosi = 0;
data->negate_miso = 0;
/* The parameter is in format "dev=/dev/device,type=serbang" */ /* The parameter is in format "dev=/dev/device,type=serbang" */
arg = extract_programmer_param("dev"); arg = extract_programmer_param("dev");
if (arg && strlen(arg)) { if (arg && strlen(arg)) {
@ -127,8 +147,9 @@ int pony_spi_init(void)
free(arg); free(arg);
return 1; return 1;
} }
if (register_shutdown(pony_spi_shutdown, NULL) != 0) { if (register_shutdown(pony_spi_shutdown, data) != 0) {
free(arg); free(arg);
free(data);
serialport_shutdown(NULL); serialport_shutdown(NULL);
return 1; return 1;
} }
@ -165,25 +186,25 @@ int pony_spi_init(void)
*/ */
switch (type) { switch (type) {
case TYPE_AJAWE: case TYPE_AJAWE:
pony_negate_cs = 1; data->negate_cs = 1;
pony_negate_sck = 1; data->negate_sck = 1;
pony_negate_mosi = 1; data->negate_mosi = 1;
pony_negate_miso = 1; data->negate_miso = 1;
name = "AJAWe"; name = "AJAWe";
break; break;
case TYPE_SERBANG: case TYPE_SERBANG:
pony_negate_cs = 0; data->negate_cs = 0;
pony_negate_sck = 0; data->negate_sck = 0;
pony_negate_mosi = 0; data->negate_mosi = 0;
pony_negate_miso = 1; data->negate_miso = 1;
name = "serbang"; name = "serbang";
break; break;
default: default:
case TYPE_SI_PROG: case TYPE_SI_PROG:
pony_negate_cs = 1; data->negate_cs = 1;
pony_negate_sck = 0; data->negate_sck = 0;
pony_negate_mosi = 0; data->negate_mosi = 0;
pony_negate_miso = 0; data->negate_miso = 0;
name = "SI-Prog"; name = "SI-Prog";
break; break;
} }
@ -192,9 +213,9 @@ int pony_spi_init(void)
/* /*
* Detect if there is a compatible hardware programmer connected. * Detect if there is a compatible hardware programmer connected.
*/ */
pony_bitbang_set_cs(1, NULL); pony_bitbang_set_cs(1, data);
pony_bitbang_set_sck(1, NULL); pony_bitbang_set_sck(1, data);
pony_bitbang_set_mosi(1, NULL); pony_bitbang_set_mosi(1, data);
switch (type) { switch (type) {
case TYPE_AJAWE: case TYPE_AJAWE:
@ -224,8 +245,8 @@ int pony_spi_init(void)
return 1; return 1;
} }
if (register_spi_bitbang_master(&bitbang_spi_master_pony, NULL)) { if (register_spi_bitbang_master(&bitbang_spi_master_pony, data))
return 1; return 1;
}
return 0; return 0;
} }