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

it87spi.c: Remove 'it8716f_' prefix from local state tracker

Browse Source 
The local state inhabited within the state tracker has now obvious scope
and therefore we can drop the redundant prefix for readability.

BUG=b:173477683
TEST=builds

Change-Id: Ic1c9647ef640152417a66dbb411554b83e30ad75
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/47663
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
Reviewed-by: Sam McNally <sammc@google.com>
This commit is contained in:
Edward O'Callaghan 2020-11-17 18:38:15 +11:00 committed by Edward O'Callaghan
parent f65b9dee23
commit b2b4507657
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
it87spi.c
View File

@ -38,7 +38,7 @@
#define CHIP_VER_REG 0x22 #define CHIP_VER_REG 0x22
struct it8716f_spi_data { struct it8716f_spi_data {
uint16_t it8716f_flashport; uint16_t flashport;
/* use fast 33MHz SPI (<>0) or slow 16MHz (0) */ /* use fast 33MHz SPI (<>0) or slow 16MHz (0) */
int fast_spi; int fast_spi;
}; };
@ -127,11 +127,11 @@ static int it8716f_spi_page_program(struct flashctx *flash, const uint8_t *buf,
if (result) if (result)
return result; return result;
/* FIXME: The command below seems to be redundant or wrong. */ /* FIXME: The command below seems to be redundant or wrong. */
OUTB(0x06, data->it8716f_flashport + 1); OUTB(0x06, data->flashport + 1);
OUTB(((2 + (data->fast_spi ? 1 : 0)) << 4), data->it8716f_flashport); OUTB(((2 + (data->fast_spi ? 1 : 0)) << 4), data->flashport);
for (i = 0; i < flash->chip->page_size; i++) for (i = 0; i < flash->chip->page_size; i++)
mmio_writeb(buf[i], (void *)(bios + start + i)); mmio_writeb(buf[i], (void *)(bios + start + i));
OUTB(0, data->it8716f_flashport); OUTB(0, data->flashport);
/* Wait until the Write-In-Progress bit is cleared. /* Wait until the Write-In-Progress bit is cleared.
* This usually takes 1-10 ms, so wait in 1 ms steps. * This usually takes 1-10 ms, so wait in 1 ms steps.
*/ */
@ -161,7 +161,7 @@ static int it8716f_spi_send_command(const struct flashctx *flash,
return SPI_GENERIC_ERROR; return SPI_GENERIC_ERROR;
do { do {
busy = INB(data->it8716f_flashport) & 0x80; busy = INB(data->flashport) & 0x80;
} while (busy); } while (busy);
if (readcnt > 3) { if (readcnt > 3) {
msg_pinfo("%s called with unsupported readcnt %i.\n", msg_pinfo("%s called with unsupported readcnt %i.\n",
@ -170,27 +170,27 @@ static int it8716f_spi_send_command(const struct flashctx *flash,
} }
switch (writecnt) { switch (writecnt) {
case 1: case 1:
OUTB(writearr[0], data->it8716f_flashport + 1); OUTB(writearr[0], data->flashport + 1);
writeenc = 0x0; writeenc = 0x0;
break; break;
case 2: case 2:
OUTB(writearr[0], data->it8716f_flashport + 1); OUTB(writearr[0], data->flashport + 1);
OUTB(writearr[1], data->it8716f_flashport + 7); OUTB(writearr[1], data->flashport + 7);
writeenc = 0x1; writeenc = 0x1;
break; break;
case 4: case 4:
OUTB(writearr[0], data->it8716f_flashport + 1); OUTB(writearr[0], data->flashport + 1);
OUTB(writearr[1], data->it8716f_flashport + 4); OUTB(writearr[1], data->flashport + 4);
OUTB(writearr[2], data->it8716f_flashport + 3); OUTB(writearr[2], data->flashport + 3);
OUTB(writearr[3], data->it8716f_flashport + 2); OUTB(writearr[3], data->flashport + 2);
writeenc = 0x2; writeenc = 0x2;
break; break;
case 5: case 5:
OUTB(writearr[0], data->it8716f_flashport + 1); OUTB(writearr[0], data->flashport + 1);
OUTB(writearr[1], data->it8716f_flashport + 4); OUTB(writearr[1], data->flashport + 4);
OUTB(writearr[2], data->it8716f_flashport + 3); OUTB(writearr[2], data->flashport + 3);
OUTB(writearr[3], data->it8716f_flashport + 2); OUTB(writearr[3], data->flashport + 2);
OUTB(writearr[4], data->it8716f_flashport + 7); OUTB(writearr[4], data->flashport + 7);
writeenc = 0x3; writeenc = 0x3;
break; break;
default: default:
@ -204,17 +204,17 @@ static int it8716f_spi_send_command(const struct flashctx *flash,
* We can't use writecnt directly, but have to use a strange encoding. * We can't use writecnt directly, but have to use a strange encoding.
*/ */
OUTB(((0x4 + (data->fast_spi ? 1 : 0)) << 4) OUTB(((0x4 + (data->fast_spi ? 1 : 0)) << 4)
| ((readcnt & 0x3) << 2) | (writeenc), data->it8716f_flashport); | ((readcnt & 0x3) << 2) | (writeenc), data->flashport);
if (readcnt > 0) { if (readcnt > 0) {
unsigned int i; unsigned int i;
do { do {
busy = INB(data->it8716f_flashport) & 0x80; busy = INB(data->flashport) & 0x80;
} while (busy); } while (busy);
for (i = 0; i < readcnt; i++) for (i = 0; i < readcnt; i++)
readarr[i] = INB(data->it8716f_flashport + 5 + i); readarr[i] = INB(data->flashport + 5 + i);
} }
return 0; return 0;
@ -417,7 +417,7 @@ static uint16_t it87spi_probe(uint16_t port)
return SPI_GENERIC_ERROR; return SPI_GENERIC_ERROR;
} }
data->it8716f_flashport = flashport; data->flashport = flashport;
data->fast_spi = 1; data->fast_spi = 1;
spi_master_it87xx.data = data; spi_master_it87xx.data = data;