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

nic3com.c: Refactor singleton states into reentrant pattern

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

This is one of the steps on the way to move par_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: I9834b82650cd070556cf82207796bc6bd6b31b28
Signed-off-by: Anastasia Klimchuk <aklm@chromium.org>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/55107
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
This commit is contained in:
Anastasia Klimchuk 2021-06-01 11:17:17 +10:00 committed by Nico Huber
parent dee884ebc5
commit cedf7bd385
1 changed files with 47 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
nic3com.c
View File

@ -29,9 +29,11 @@
#define PCI_VENDOR_ID_3COM 0x10b7 #define PCI_VENDOR_ID_3COM 0x10b7
static uint32_t io_base_addr = 0; struct nic3com_data {
static uint32_t internal_conf; uint32_t io_base_addr;
static uint16_t id; uint32_t internal_conf;
uint16_t id;
};
const struct dev_entry nics_3com[] = { const struct dev_entry nics_3com[] = {
/* 3C90xB */ /* 3C90xB */
@ -56,15 +58,19 @@ const struct dev_entry nics_3com[] = {
static void nic3com_chip_writeb(const struct flashctx *flash, uint8_t val, static void nic3com_chip_writeb(const struct flashctx *flash, uint8_t val,
chipaddr addr) chipaddr addr)
{ {
OUTL((uint32_t)addr, io_base_addr + BIOS_ROM_ADDR); struct nic3com_data *data = flash->mst->par.data;
OUTB(val, io_base_addr + BIOS_ROM_DATA);
OUTL((uint32_t)addr, data->io_base_addr + BIOS_ROM_ADDR);
OUTB(val, data->io_base_addr + BIOS_ROM_DATA);
} }
static uint8_t nic3com_chip_readb(const struct flashctx *flash, static uint8_t nic3com_chip_readb(const struct flashctx *flash,
const chipaddr addr) const chipaddr addr)
{ {
OUTL((uint32_t)addr, io_base_addr + BIOS_ROM_ADDR); struct nic3com_data *data = flash->mst->par.data;
return INB(io_base_addr + BIOS_ROM_DATA);
OUTL((uint32_t)addr, data->io_base_addr + BIOS_ROM_ADDR);
return INB(data->io_base_addr + BIOS_ROM_DATA);
} }
static const struct par_master par_master_nic3com = { static const struct par_master par_master_nic3com = {
@ -78,22 +84,29 @@ static const struct par_master par_master_nic3com = {
.chip_writen = fallback_chip_writen, .chip_writen = fallback_chip_writen,
}; };
static int nic3com_shutdown(void *data) static int nic3com_shutdown(void *par_data)
{ {
struct nic3com_data *data = par_data;
const uint16_t id = data->id;
/* 3COM 3C90xB cards need a special fixup. */ /* 3COM 3C90xB cards need a special fixup. */
if (id == 0x9055 || id == 0x9001 || id == 0x9004 || id == 0x9005 if (id == 0x9055 || id == 0x9001 || id == 0x9004 || id == 0x9005
|| id == 0x9006 || id == 0x900a || id == 0x905a || id == 0x9058) { || id == 0x9006 || id == 0x900a || id == 0x905a || id == 0x9058) {
/* Select register window 3 and restore the receiver status. */ /* Select register window 3 and restore the receiver status. */
OUTW(SELECT_REG_WINDOW + 3, io_base_addr + INT_STATUS); OUTW(SELECT_REG_WINDOW + 3, data->io_base_addr + INT_STATUS);
OUTL(internal_conf, io_base_addr + INTERNAL_CONFIG); OUTL(data->internal_conf, data->io_base_addr + INTERNAL_CONFIG);
} }
free(data);
return 0; return 0;
} }
int nic3com_init(void) int nic3com_init(void)
{ {
struct pci_dev *dev = NULL; struct pci_dev *dev = NULL;
uint32_t io_base_addr = 0;
uint32_t internal_conf = 0;
uint16_t id;
if (rget_io_perms()) if (rget_io_perms())
return 1; return 1;
@ -126,13 +139,34 @@ int nic3com_init(void)
*/ */
OUTW(SELECT_REG_WINDOW + 0, io_base_addr + INT_STATUS); OUTW(SELECT_REG_WINDOW + 0, io_base_addr + INT_STATUS);
if (register_shutdown(nic3com_shutdown, NULL)) struct nic3com_data *data = calloc(1, sizeof(*data));
return 1; if (!data) {
msg_perr("Unable to allocate space for PAR master data\n");
goto init_err_cleanup_exit;
}
data->io_base_addr = io_base_addr;
data->internal_conf = internal_conf;
data->id = id;
max_rom_decode.parallel = 128 * 1024; max_rom_decode.parallel = 128 * 1024;
register_par_master(&par_master_nic3com, BUS_PARALLEL, NULL);
if (register_shutdown(nic3com_shutdown, data)) {
free(data);
goto init_err_cleanup_exit;
}
register_par_master(&par_master_nic3com, BUS_PARALLEL, data);
return 0; return 0;
init_err_cleanup_exit:
/* 3COM 3C90xB cards need a special fixup. */
if (id == 0x9055 || id == 0x9001 || id == 0x9004 || id == 0x9005
|| id == 0x9006 || id == 0x900a || id == 0x905a || id == 0x9058) {
/* Select register window 3 and restore the receiver status. */
OUTW(SELECT_REG_WINDOW + 3, io_base_addr + INT_STATUS);
OUTL(internal_conf, io_base_addr + INTERNAL_CONFIG);
}
return 1;
} }
#else #else