Change in flashrom[master]: nicintel_eeprom: Check UNPROG_DEVICE in 82580 shutdown

[Anastasia Klimchuk (Code Review)]

Anastasia Klimchuk has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/56821 )

Change subject: nicintel_eeprom: Check UNPROG_DEVICE in 82580 shutdown
......................................................................

nicintel_eeprom: Check UNPROG_DEVICE in 82580 shutdown

Previously shutdown function was registered conditionally for 82580,
only if the device was not UNPROG_DEVICE. This patch moves the check
for UNPROG_DEVICE into shutdown function itself, so that shutdown
function can be always registered for 82580.

This also fixes a memory leak in nicintel_ee_shutdown_82580.

No changes for i210 device init/shutdown, only for 82580.

And very importantly this unlocks API change which plans to move
register_shutdown inside register_opaque_master, similar to what's
done in CB:56103

BUG=b:185191942
TEST=builds

Change-Id: I5c729a3a63d0106e65525a6a77b2f9104c96847f
Signed-off-by: Anastasia Klimchuk 
---
M nicintel_eeprom.c
1 file changed, 24 insertions(+), 14 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/21/56821/1

diff --git a/nicintel_eeprom.c b/nicintel_eeprom.c
index 430a980..ec0f04e 100644
--- a/nicintel_eeprom.c
+++ b/nicintel_eeprom.c
@@ -431,18 +431,26 @@

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. */
-	if (nicintel_ee_req() || nicintel_ee_bitset(EEC, EE_CS, 1))
-		return -1;
+	int ret = 0;

-	/* Try to restore individual bits we care about. */
-	int ret = nicintel_ee_bitset(EEC, EE_SCK, old_eec & BIT(EE_SCK));
-	ret |= nicintel_ee_bitset(EEC, EE_SI, old_eec & BIT(EE_SI));
-	ret |= nicintel_ee_bitset(EEC, EE_CS, old_eec & BIT(EE_CS));
-	/* REQ will be cleared by hardware anyway after 2 seconds of inactivity on the SPI pins (3.3.2.1). */
-	ret |= nicintel_ee_bitset(EEC, EE_REQ, old_eec & BIT(EE_REQ));
+	if (nicintel_pci->device_id != UNPROG_DEVICE) {
+		uint32_t old_eec = *(uint32_t *)eecp;
+		/* Request bitbanging and unselect the chip first to be safe. */
+		if (nicintel_ee_req() || nicintel_ee_bitset(EEC, EE_CS, 1)) {
+			ret = -1;
+			goto out;
+		}

+		/* Try to restore individual bits we care about. */
+		ret = nicintel_ee_bitset(EEC, EE_SCK, old_eec & BIT(EE_SCK));
+		ret |= nicintel_ee_bitset(EEC, EE_SI, old_eec & BIT(EE_SI));
+		ret |= nicintel_ee_bitset(EEC, EE_CS, old_eec & BIT(EE_CS));
+		/* REQ will be cleared by hardware anyway after 2 seconds of inactivity
+		 * on the SPI pins (3.3.2.1). */
+		ret |= nicintel_ee_bitset(EEC, EE_REQ, old_eec & BIT(EE_REQ));
+	}
+
+out:
    free(eecp);
    return ret;
 }
@@ -465,6 +473,8 @@
    	if (!nicintel_eebar)
    		return 1;

+		uint32_t *eecp = NULL;
+
    	nicintel_pci = dev;
    	if (dev->device_id != UNPROG_DEVICE) {
    		uint32_t eec = pci_mmio_readl(nicintel_eebar + EEC);
@@ -477,15 +487,15 @@
    			return 1;
    		}

-			uint32_t *eecp = malloc(sizeof(uint32_t));
+			eecp = malloc(sizeof(uint32_t));
    		if (eecp == NULL)
    			return 1;
    		*eecp = eec;
-
-			if (register_shutdown(nicintel_ee_shutdown_82580, eecp))
-				return 1;
    	}

+		if (register_shutdown(nicintel_ee_shutdown_82580, eecp))
+			return 1;
+
    	return register_opaque_master(&opaque_master_nicintel_ee_82580, NULL);
    } else {
    	nicintel_eebar = rphysmap("Intel i210 NIC w/ emulated EEPROM",