openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-07-01 14:11:15 +02:00
Code Issues Releases Wiki Activity

parallel: Drop explicit fallback_chip_X boilerplate

Browse Source 
A NULL func pointer is necessary and sufficient for the
condition `NULL func pointer => fallback_chip_X' as to not
need this explicit specification.

Therefore drop the explicit need to specify these fallback
callback function pointer in the par_master struct.
This is a reasonable default for every driver in the tree.

Furthermore, move the 'fallback_chip_X()' func from the
generic programmer.c register logic into its relevant
home of parallel.c and make static local to clean up
link-time symbol space.

This simplifies the code and driver development.

Change-Id: If25c0048a07057aa72be6ffa8d8ad7f0a568dcf7
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/71745
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Edward O'Callaghan
2023-01-09 10:43:47 +11:00
committed by Edward O'Callaghan
parent 4ae3ac3062
commit a031c81f51
17 changed files with 70 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
parallel.c
View File

@ -27,19 +27,49 @@ void chip_writeb(const struct flashctx *flash, uint8_t val, chipaddr addr)
flash->mst->par.chip_writeb(flash, val, addr);
}
/* Little-endian fallback for drivers not supporting 16 bit accesses */
static void fallback_chip_writew(const struct flashctx *flash, uint16_t val,
chipaddr addr)
{
chip_writeb(flash, val & 0xff, addr);
chip_writeb(flash, (val >> 8) & 0xff, addr + 1);
}
void chip_writew(const struct flashctx *flash, uint16_t val, chipaddr addr)
{
flash->mst->par.chip_writew(flash, val, addr);
if (flash->mst->par.chip_writew)
flash->mst->par.chip_writew(flash, val, addr);
fallback_chip_writew(flash, val, addr);
}
/* Little-endian fallback for drivers not supporting 32 bit accesses */
static void fallback_chip_writel(const struct flashctx *flash, uint32_t val,
chipaddr addr)
{
chip_writew(flash, val & 0xffff, addr);
chip_writew(flash, (val >> 16) & 0xffff, addr + 2);
}
void chip_writel(const struct flashctx *flash, uint32_t val, chipaddr addr)
{
flash->mst->par.chip_writel(flash, val, addr);
if (flash->mst->par.chip_writel)
flash->mst->par.chip_writel(flash, val, addr);
fallback_chip_writel(flash, val, addr);
}
static void fallback_chip_writen(const struct flashctx *flash, const uint8_t *buf, chipaddr addr, size_t len)
{
size_t i;
for (i = 0; i < len; i++)
chip_writeb(flash, buf[i], addr + i);
return;
}
void chip_writen(const struct flashctx *flash, const uint8_t *buf, chipaddr addr, size_t len)
{
flash->mst->par.chip_writen(flash, buf, addr, len);
if (flash->mst->par.chip_writen)
flash->mst->par.chip_writen(flash, buf, addr, len);
fallback_chip_writen(flash, buf, addr, len);
}
uint8_t chip_readb(const struct flashctx *flash, const chipaddr addr)
@ -47,20 +77,53 @@ uint8_t chip_readb(const struct flashctx *flash, const chipaddr addr)
return flash->mst->par.chip_readb(flash, addr);
}
/* Little-endian fallback for drivers not supporting 16 bit accesses */
static uint16_t fallback_chip_readw(const struct flashctx *flash, const chipaddr addr)
{
uint16_t val;
val = chip_readb(flash, addr);
val |= chip_readb(flash, addr + 1) << 8;
return val;
}
uint16_t chip_readw(const struct flashctx *flash, const chipaddr addr)
{
return flash->mst->par.chip_readw(flash, addr);
if (flash->mst->par.chip_readw)
return flash->mst->par.chip_readw(flash, addr);
return fallback_chip_readw(flash, addr);
}
/* Little-endian fallback for drivers not supporting 32 bit accesses */
static uint32_t fallback_chip_readl(const struct flashctx *flash, const chipaddr addr)
{
uint32_t val;
val = chip_readw(flash, addr);
val |= chip_readw(flash, addr + 2) << 16;
return val;
}
uint32_t chip_readl(const struct flashctx *flash, const chipaddr addr)
{
return flash->mst->par.chip_readl(flash, addr);
if (flash->mst->par.chip_readl)
return flash->mst->par.chip_readl(flash, addr);
return fallback_chip_readl(flash, addr);
}
static void fallback_chip_readn(const struct flashctx *flash, uint8_t *buf,
chipaddr addr, size_t len)
{
size_t i;
for (i = 0; i < len; i++)
buf[i] = chip_readb(flash, addr + i);
return;
}
void chip_readn(const struct flashctx *flash, uint8_t *buf, chipaddr addr,
size_t len)
{
flash->mst->par.chip_readn(flash, buf, addr, len);
if (flash->mst->par.chip_readn)
flash->mst->par.chip_readn(flash, buf, addr, len);
fallback_chip_readn(flash, buf, addr, len);
}
int register_par_master(const struct par_master *mst,
@ -87,9 +150,7 @@ int register_par_master(const struct par_master *mst,
return ERROR_FLASHROM_BUG;
}
if (!mst->chip_writeb || !mst->chip_writew || !mst->chip_writel ||
!mst->chip_writen || !mst->chip_readb || !mst->chip_readw ||
!mst->chip_readl || !mst->chip_readn) {
if (!mst->chip_writeb || !mst->chip_readb) {
msg_perr("%s called with incomplete master definition. "
"Please report a bug at flashrom@flashrom.org\n",
__func__);