Changeset 560 for trunk/flashrom.c

Timestamp:

Jun 1, 2009 4:08:58 AM (4 years ago)

Author:

hailfinger

Message:

Only probe for chips with compatible bus protocols.
It doesn't make sense to probe for SPI chips on a LPC host, nor does it
make sense to probe for LPC chips on a Parallel host.

This change is backwards compatible, but adding host protocol info to
chipset init functions will speed up probing.

Once all chipset init functions are updated and the Winbond W29EE011 and
AMIC A49LF040A chip definitions are updated, the W29EE011 workaround can
be deleted as the W29/A49 conflict magically disappears.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@…>
Tested on real hardware and
Acked-by: Uwe Hermann <uwe@…>

File:

• trunk/flashrom.c (modified) (2 diffs)

trunk/flashrom.c

@@ -175 +175 @@
 }
 
+char *strcat_realloc(char *dest, const char *src)
+{
+        dest = realloc(dest, strlen(dest) + strlen(src) + 1);
+        if (!dest)
+                return NULL;
+        strcat(dest, src);
+        return dest;
+}
+
+/* Return a string corresponding to the bustype parameter.
+ * Memory is obtained with malloc() and can be freed with free().
+ */
+char *flashbuses_to_text(enum chipbustype bustype)
+{
+        char *ret = calloc(1, 1);
+        if (bustype == CHIP_BUSTYPE_UNKNOWN) {
+                ret = strcat_realloc(ret, "Unknown,");
+        /* FIXME: Once all chipsets and flash chips have been updated, NONSPI
+         * will cease to exist and should be eliminated here as well.
+         */
+        } else if (bustype == CHIP_BUSTYPE_NONSPI) {
+                ret = strcat_realloc(ret, "Non-SPI,");
+        } else {
+                if (bustype & CHIP_BUSTYPE_PARALLEL)
+                        ret = strcat_realloc(ret, "Parallel,");
+                if (bustype & CHIP_BUSTYPE_LPC)
+                        ret = strcat_realloc(ret, "LPC,");
+                if (bustype & CHIP_BUSTYPE_FWH)
+                        ret = strcat_realloc(ret, "FWH,");
+                if (bustype & CHIP_BUSTYPE_SPI)
+                        ret = strcat_realloc(ret, "SPI,");
+                if (bustype == CHIP_BUSTYPE_NONE)
+                        ret = strcat_realloc(ret, "None,");
+        }
+        /* Kill last comma. */
+        ret[strlen(ret) - 1] = '\0';
+        ret = realloc(ret, strlen(ret) + 1);
+        return ret;
+}
+
 struct flashchip *probe_flash(struct flashchip *first_flash, int force)
 {
         struct flashchip *flash;
         unsigned long base = 0, size;
+        char *tmp;
 
         for (flash = first_flash; flash && flash->name; flash++) {
@@ -187 +228 @@
                 if (!flash->probe && !force) {
                         printf_debug("failed! flashrom has no probe function for this flash chip.\n");
+                        continue;
+                }
+                if (!(buses_supported & flash->bustype)) {
+                        tmp = flashbuses_to_text(buses_supported);
+                        printf_debug("skipped. Host bus type %s ", tmp);
+                        free(tmp);
+                        tmp = flashbuses_to_text(flash->bustype);
+                        printf_debug("and chip bus type %s are incompatible.\n", tmp);
+                        free(tmp);
                         continue;
                 }