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

nicintel_eeprom: Reduce usage of is_i210()

Browse Source 
Don't entagle the code paths for the two NIC classes if it's not necessary.

Only compile tested.

Change-Id: I59164ccf54afbbd64a0598282d13e80ff7fd6fa4
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/33637
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Nico Huber 2017-10-10 18:05:55 +02:00
parent 5d068ddca4
commit 89622674b2
1 changed files with 52 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
nicintel_eeprom.c
View File

@ -145,14 +145,6 @@ static int nicintel_ee_probe_82580(struct flashctx *flash)
return 1;
}
static int nicintel_ee_probe(struct flashctx *flash)
{
if (is_i210(nicintel_pci->device_id))
return nicintel_ee_probe_i210(flash);
return nicintel_ee_probe_82580(flash);
}
#define MAX_ATTEMPTS 10000000
static int nicintel_ee_read_word(unsigned int addr, uint16_t *data)
{
@ -281,6 +273,11 @@ static int nicintel_ee_write_i210(struct flashctx *flash, const uint8_t *buf,
return 0;
}
static int nicintel_ee_erase_i210(struct flashctx *flash, unsigned int addr, unsigned int len)
{
return nicintel_ee_write_i210(flash, NULL, addr, len);
}
static int nicintel_ee_bitset(int reg, int bit, bool val)
{
uint32_t tmp;
@ -392,24 +389,24 @@ out:
nicintel_ee_bitset(EEC, EE_REQ, 0); /* Give up direct access. */
return ret;
}
static int nicintel_ee_write(struct flashctx *flash, const uint8_t *buf, unsigned int addr, unsigned int len)
{
if (is_i210(nicintel_pci->device_id))
return nicintel_ee_write_i210(flash, buf, addr, len);
return nicintel_ee_write_82580(flash, buf, addr, len);
static int nicintel_ee_erase_82580(struct flashctx *flash, unsigned int addr, unsigned int len)
{
return nicintel_ee_write_82580(flash, NULL, addr, len);
}
static int nicintel_ee_erase(struct flashctx *flash, unsigned int addr, unsigned int len)
{
return nicintel_ee_write(flash, NULL, addr, len);
}
static const struct opaque_master opaque_master_nicintel_ee = {
.probe = nicintel_ee_probe,
static const struct opaque_master opaque_master_nicintel_ee_82580 = {
.probe = nicintel_ee_probe_82580,
.read = nicintel_ee_read,
.write = nicintel_ee_write,
.erase = nicintel_ee_erase,
.write = nicintel_ee_write_82580,
.erase = nicintel_ee_erase_82580,
};
static const struct opaque_master opaque_master_nicintel_ee_i210 = {
.probe = nicintel_ee_probe_i210,
.read = nicintel_ee_read,
.write = nicintel_ee_write_i210,
.erase = nicintel_ee_erase_i210,
};
static int nicintel_ee_shutdown_i210(void *arg)
@ -432,7 +429,7 @@ static int nicintel_ee_shutdown_i210(void *arg)
return -1;
}
static int nicintel_ee_shutdown(void *eecp)
static int nicintel_ee_shutdown_82580(void *eecp)
{
uint32_t old_eec = *(uint32_t *)eecp;
/* Request bitbanging and unselect the chip first to be safe. */
@ -463,18 +460,18 @@ int nicintel_ee_init(void)
if (!io_base_addr)
return 1;
nicintel_eebar = rphysmap("Intel Gigabit NIC w/ SPI EEPROM",
io_base_addr + (is_i210(dev->device_id) ? 0x12000 : 0), MEMMAP_SIZE);
if (!is_i210(dev->device_id)) {
nicintel_eebar = rphysmap("Intel Gigabit NIC w/ SPI EEPROM", io_base_addr, MEMMAP_SIZE);
if (!nicintel_eebar)
return 1;
nicintel_pci = dev;
if ((dev->device_id != UNPROG_DEVICE) && ! is_i210(dev->device_id))
{
if ((dev->device_id != UNPROG_DEVICE)) {
uint32_t eec = pci_mmio_readl(nicintel_eebar + EEC);
/* C.f. 3.3.1.5 for the detection mechanism (maybe? contradicting the EE_PRES definition),
* and 3.3.1.7 for possible recovery. */
/* C.f. 3.3.1.5 for the detection mechanism (maybe? contradicting
the EE_PRES definition),
and 3.3.1.7 for possible recovery. */
if (!(eec & BIT(EE_PRES))) {
msg_perr("Controller reports no EEPROM is present.\n");
return 1;
@ -485,13 +482,22 @@ int nicintel_ee_init(void)
return 1;
*eecp = eec;
if (register_shutdown(nicintel_ee_shutdown, eecp))
if (register_shutdown(nicintel_ee_shutdown_82580, eecp))
return 1;
}
if (is_i210(dev->device_id))
return register_opaque_master(&opaque_master_nicintel_ee_82580);
} else {
nicintel_eebar = rphysmap("Intel i210 NIC w/ emulated EEPROM",
io_base_addr + 0x12000, MEMMAP_SIZE);
if (!nicintel_eebar)
return 1;
if (register_shutdown(nicintel_ee_shutdown_i210, NULL))
return 1;
return register_opaque_master(&opaque_master_nicintel_ee);
return register_opaque_master(&opaque_master_nicintel_ee_i210);
}
return 1;
}