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

nicnatsemi: 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 specified below.

TOPIC=register_master_api
TEST=builds

Change-Id: I58ad1f0222338fc107e7ac2b9cdd361ae7033912
Signed-off-by: Alexander Goncharov <chat@joursoir.net>
Ticket: https://ticket.coreboot.org/issues/391
Reviewed-on: https://review.coreboot.org/c/flashrom/+/65970
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Thomas Heijligen <src@posteo.de>
Reviewed-by: Felix Singer <felixsinger@posteo.net>
Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
This commit is contained in:
Alexander Goncharov 2022-07-14 16:53:45 +03:00 committed by Anastasia Klimchuk
parent 474a8b8259
commit ce16a1059f
1 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
nicnatsemi.c
View File

@ -25,7 +25,10 @@
#define BOOT_ROM_ADDR 0x50 #define BOOT_ROM_ADDR 0x50
#define BOOT_ROM_DATA 0x54 #define BOOT_ROM_DATA 0x54
static uint32_t io_base_addr = 0; struct nicnatsemi_data {
uint32_t io_base_addr;
};
static const struct dev_entry nics_natsemi[] = { static const struct dev_entry nics_natsemi[] = {
{0x100b, 0x0020, NT, "National Semiconductor", "DP83815/DP83816"}, {0x100b, 0x0020, NT, "National Semiconductor", "DP83815/DP83816"},
{0x100b, 0x0022, NT, "National Semiconductor", "DP83820"}, {0x100b, 0x0022, NT, "National Semiconductor", "DP83820"},
@ -36,7 +39,9 @@ static const struct dev_entry nics_natsemi[] = {
static void nicnatsemi_chip_writeb(const struct flashctx *flash, uint8_t val, static void nicnatsemi_chip_writeb(const struct flashctx *flash, uint8_t val,
chipaddr addr) chipaddr addr)
{ {
OUTL((uint32_t)addr & 0x0001FFFF, io_base_addr + BOOT_ROM_ADDR); const struct nicnatsemi_data *data = flash->mst->par.data;
OUTL((uint32_t)addr & 0x0001FFFF, data->io_base_addr + BOOT_ROM_ADDR);
/* /*
* The datasheet requires 32 bit accesses to this register, but it seems * The datasheet requires 32 bit accesses to this register, but it seems
* that requirement might only apply if the register is memory mapped. * that requirement might only apply if the register is memory mapped.
@ -45,13 +50,15 @@ static void nicnatsemi_chip_writeb(const struct flashctx *flash, uint8_t val,
* register seem to work fine. Due to that, we ignore the advice in the * register seem to work fine. Due to that, we ignore the advice in the
* data sheet. * data sheet.
*/ */
OUTB(val, io_base_addr + BOOT_ROM_DATA); OUTB(val, data->io_base_addr + BOOT_ROM_DATA);
} }
static uint8_t nicnatsemi_chip_readb(const struct flashctx *flash, static uint8_t nicnatsemi_chip_readb(const struct flashctx *flash,
const chipaddr addr) const chipaddr addr)
{ {
OUTL(((uint32_t)addr & 0x0001FFFF), io_base_addr + BOOT_ROM_ADDR); const struct nicnatsemi_data *data = flash->mst->par.data;
OUTL(((uint32_t)addr & 0x0001FFFF), data->io_base_addr + BOOT_ROM_ADDR);
/* /*
* The datasheet requires 32 bit accesses to this register, but it seems * The datasheet requires 32 bit accesses to this register, but it seems
* that requirement might only apply if the register is memory mapped. * that requirement might only apply if the register is memory mapped.
@ -60,7 +67,13 @@ static uint8_t nicnatsemi_chip_readb(const struct flashctx *flash,
* register seem to work fine. Due to that, we ignore the advice in the * register seem to work fine. Due to that, we ignore the advice in the
* data sheet. * data sheet.
*/ */
return INB(io_base_addr + BOOT_ROM_DATA); return INB(data->io_base_addr + BOOT_ROM_DATA);
}
static int nicnatsemi_shutdown(void *par_data)
{
free(par_data);
return 0;
} }
static const struct par_master par_master_nicnatsemi = { static const struct par_master par_master_nicnatsemi = {
@ -72,11 +85,13 @@ static const struct par_master par_master_nicnatsemi = {
.chip_writew = fallback_chip_writew, .chip_writew = fallback_chip_writew,
.chip_writel = fallback_chip_writel, .chip_writel = fallback_chip_writel,
.chip_writen = fallback_chip_writen, .chip_writen = fallback_chip_writen,
.shutdown = nicnatsemi_shutdown,
}; };
static int nicnatsemi_init(void) static int nicnatsemi_init(void)
{ {
struct pci_dev *dev = NULL; struct pci_dev *dev = NULL;
uint32_t io_base_addr;
if (rget_io_perms()) if (rget_io_perms())
return 1; return 1;
@ -89,6 +104,13 @@ static int nicnatsemi_init(void)
if (!io_base_addr) if (!io_base_addr)
return 1; return 1;
struct nicnatsemi_data *data = calloc(1, sizeof(*data));
if (!data) {
msg_perr("Unable to allocate space for PAR master data\n");
return 1;
}
data->io_base_addr = io_base_addr;
/* The datasheet shows address lines MA0-MA16 in one place and MA0-MA15 /* The datasheet shows address lines MA0-MA16 in one place and MA0-MA15
* in another. My NIC has MA16 connected to A16 on the boot ROM socket * in another. My NIC has MA16 connected to A16 on the boot ROM socket
* so I'm assuming it is accessible. If not then next line wants to be * so I'm assuming it is accessible. If not then next line wants to be
@ -96,7 +118,7 @@ static int nicnatsemi_init(void)
* functions below wants to be 0x0000FFFF. * functions below wants to be 0x0000FFFF.
*/ */
max_rom_decode.parallel = 131072; max_rom_decode.parallel = 131072;
return register_par_master(&par_master_nicnatsemi, BUS_PARALLEL, NULL); return register_par_master(&par_master_nicnatsemi, BUS_PARALLEL, data);
} }