Allow connector to detect a EEPROM map type

Connectors that interact with real card via PnP bus (e.g. PCI) are able
to determine a chip model and via it determine a EEPROM map type. Add a
new connector capabilities flag (CON_CAP_PNP) that indicates connector
ability to determine EEPROM map type. Assign the new flag to PCI
connector and assign map type in the PCI connector if chip was detected.

Old utility behaviour is preserved too. User specified EEPROM type
overrides autodetected type, but now all these are done in more explicit
way. If autodetection failed or autodetected type differs from user
input than utility will print coresponding message in the verbose output
mode. Also if EEPROM type was not provided by a user or autodetected by
a connector, then as earlier the utility will fallback to SREV register
based autodetection.

All this gives us a reliable source of chip type information before any
access to the chip registers.

Author: rsa9000

atheepmgr.c

@@ -859,6 +859,7 @@ int main(int argc, char *argv[])
 {
 	struct atheepmgr *aem = &__aem;
 	const struct action *act = NULL;
+	const struct eepmap *user_eepmap = NULL;
 	char *con_arg = NULL;
 	int print_usage = 0;
 	int i, opt;
@@ -891,10 +892,10 @@ int main(int argc, char *argv[])
 			break;
 #endif
 		case 't':
-			aem->eepmap = eepmap_find_by_name(optarg);
-			if (!aem->eepmap)
-				aem->eepmap = eepmap_find_by_chip(optarg);
-			if (!aem->eepmap) {
+			user_eepmap = eepmap_find_by_name(optarg);
+			if (!user_eepmap)
+				user_eepmap = eepmap_find_by_chip(optarg);
+			if (!user_eepmap) {
 				fprintf(stderr, "Unknown EEPROM map type or chip name: %s\n",
 					optarg);
 				goto exit;
@@ -948,7 +949,7 @@ int main(int argc, char *argv[])
 		goto exit;
 	}
 
-	if ((act->flags & ACT_F_DATA) && !aem->eepmap &&
+	if ((act->flags & ACT_F_DATA) && !user_eepmap &&
 	    !(aem->con->caps & CON_CAP_HW)) {
 		fprintf(stderr, "EEPROM map type option is mandatory for connectors without direct HW access\n");
 		goto exit;
@@ -965,6 +966,25 @@ int main(int argc, char *argv[])
 	if (ret)
 		goto exit;
 
+	if (!aem->eepmap && !user_eepmap) {
+		if ((aem->con->caps & CON_CAP_PNP) && aem->verbose)
+			printf("Connector failed to autodetect EEPROM type, fallback to SREV register based autodetection\n");
+	} else if (!aem->eepmap && user_eepmap) {
+		if ((aem->con->caps & CON_CAP_PNP) && aem->verbose)
+			printf("Connector failed to autodetect EEPROM type, use manually configured %s type\n",
+			       user_eepmap->name);
+		aem->eepmap = user_eepmap;
+	} else if (aem->eepmap && !user_eepmap) {
+		if (aem->verbose)
+			printf("Autodetected EEPROM map type is %s\n",
+			       aem->eepmap->name);
+	} else if (aem->eepmap != user_eepmap) {
+		if (aem->verbose)
+			printf("Override autodetected %s EEPROM type with manually configured %s type\n",
+			       aem->eepmap->name, user_eepmap->name);
+		aem->eepmap = user_eepmap;
+	}
+
 	if (aem->con->caps & CON_CAP_HW) {
 		ret = hw_init(aem);
 		if (ret)

atheepmgr.h

@@ -138,6 +138,7 @@ typedef int bool;
 #define AH_TIME_QUANTUM		10
 
 #define CON_CAP_HW		1	/* Con. is able to interact with HW */
+#define CON_CAP_PNP		2	/* Con. is able to detect EEP layout */
 
 #define EEP_WP_GPIO_AUTO	-1	/* Use autodetection */
 #define EEP_WP_GPIO_NONE	-2	/* Do not use GPIO for unlocking */

con_pci.c

@@ -54,6 +54,8 @@ static int is_supported_chipset(struct atheepmgr *aem, struct pci_device *pdev)
 		printf(")\n");
 	}
 
+	aem->eepmap = chips[0]->eepmap;
+
 	return 1;
 
 not_supported:
@@ -249,7 +251,7 @@ static void pci_clean(struct atheepmgr *aem)
 const struct connector con_pci = {
 	.name = "PCI",
 	.priv_data_sz = sizeof(struct pci_priv),
-	.caps = CON_CAP_HW,
+	.caps = CON_CAP_HW | CON_CAP_PNP,
 	.init = pci_init,
 	.clean = pci_clean,
 	.reg_read = pci_reg_read,