[commit] r755 - trunk

Author: hailfinger
Date: 2009-10-31 02:53:09 +0100 (Sat, 31 Oct 2009)
New Revision: 755

Modified:
   trunk/chipset_enable.c
   trunk/flash.h
   trunk/flashrom.c
Log:
Add infrastructure to check and report to the user the maximum supported
decode size for chipsets and tested mainboards.

The rationale is to warn users when they, for example, try to flash
a 512KB parallel flash chip but their chipset only supports 256KB,
or they try to flash 512KB and the chipset _does_ theoretically
support 512KB but their special board doesn't wire all address lines
and thus supports only 256 KB ROM chips at maximum.

This has cost Uwe hours of debugging on some board already, until he
figured out what was going on. We should try warn our users where
possible about this.

The chipset and the chip may have more than one bus in common (e.g.
SB600 and Pm49* can both speak LPC+FWH) and on SB600/SB7x0/SB8x0 there
are different limits for LPC and FWH. The only way to tell the user
about the exact circumstances is to spew error messages per bus.

The code will issue a warning during probe (which does fail for some
chips if the size is too big) and abort before the first real
read/write/erase action. If no action is specified, the warning is
printed anyway.
That way, a user can find out why probe might not have worked, and will
be stopped before he/she gets incorrect results.

Add a bitcount function to the infrastructure.

Signed-off-by: Carl-Daniel Hailfinger 
Acked-by: Uwe Hermann

Modified: trunk/chipset_enable.c
===================================================================
--- trunk/chipset_enable.c	2009-10-30 21:12:39 UTC (rev 754)
+++ trunk/chipset_enable.c	2009-10-31 01:53:09 UTC (rev 755)
@@ -42,6 +42,17 @@

enum chipbustype buses_supported = CHIP_BUSTYPE_NONSPI;

+/**
+ * Programmers supporting multiple buses can have differing size limits on
+ * each bus. Store the limits for each bus in a common struct.
+ */
+struct decode_sizes max_rom_decode = {
+	.parallel	= 0xffffffff,
+	.lpc		= 0xffffffff,
+	.fwh		= 0xffffffff,
+	.spi		= 0xffffffff
+};
+
 extern int ichspi_lock;

static int enable_flash_ali_m1533(struct pci_dev *dev, const char *name)

Modified: trunk/flash.h
===================================================================
--- trunk/flash.h	2009-10-30 21:12:39 UTC (rev 754)
+++ trunk/flash.h	2009-10-31 01:53:09 UTC (rev 755)
@@ -352,9 +352,17 @@
 void sio_mask(uint16_t port, uint8_t reg, uint8_t data, uint8_t mask);
 int board_flash_enable(const char *vendor, const char *part);

+struct decode_sizes {
+	uint32_t parallel;
+	uint32_t lpc;
+	uint32_t fwh;
+	uint32_t spi;
+};
+
 /* chipset_enable.c */
 extern enum chipbustype buses_supported;
 int chipset_flash_enable(void);
+extern struct decode_sizes max_rom_decode;

extern unsigned long flashbase;

Modified: trunk/flashrom.c
===================================================================
--- trunk/flashrom.c	2009-10-30 21:12:39 UTC (rev 754)
+++ trunk/flashrom.c	2009-10-31 01:53:09 UTC (rev 755)
@@ -299,6 +299,15 @@
    return (a > b) ? a : b;
 }

+int bitcount(unsigned long a)
+{
+	int i = 0;
+	for (; a != 0; a >>= 1)
+		if (a & 1)
+			i++;
+	return i;
+}
+
 char *strcat_realloc(char *dest, const char *src)
 {
    dest = realloc(dest, strlen(dest) + strlen(src) + 1);
@@ -398,10 +407,60 @@
    return ret;
 }

+int check_max_decode(enum chipbustype buses, uint32_t size)
+{
+	int limitexceeded = 0;
+	if ((buses & CHIP_BUSTYPE_PARALLEL) &&
+	    (max_rom_decode.parallel < size)) {
+		limitexceeded++;
+		printf_debug("Chip size %u kB is bigger than supported "
+			     "size %u kB of chipset/board/programmer "
+			     "for %s interface, "
+			     "probe/read/erase/write may fail. ", size / 1024,
+			     max_rom_decode.parallel / 1024, "Parallel");
+	}
+	if ((buses & CHIP_BUSTYPE_LPC) && (max_rom_decode.lpc < size)) {
+		limitexceeded++;
+		printf_debug("Chip size %u kB is bigger than supported "
+			     "size %u kB of chipset/board/programmer "
+			     "for %s interface, "
+			     "probe/read/erase/write may fail. ", size / 1024,
+			     max_rom_decode.lpc / 1024, "LPC");
+	}
+	if ((buses & CHIP_BUSTYPE_FWH) && (max_rom_decode.fwh < size)) {
+		limitexceeded++;
+		printf_debug("Chip size %u kB is bigger than supported "
+			     "size %u kB of chipset/board/programmer "
+			     "for %s interface, "
+			     "probe/read/erase/write may fail. ", size / 1024,
+			     max_rom_decode.fwh / 1024, "FWH");
+	}
+	if ((buses & CHIP_BUSTYPE_SPI) && (max_rom_decode.spi < size)) {
+		limitexceeded++;
+		printf_debug("Chip size %u kB is bigger than supported "
+			     "size %u kB of chipset/board/programmer "
+			     "for %s interface, "
+			     "probe/read/erase/write may fail. ", size / 1024,
+			     max_rom_decode.spi / 1024, "SPI");
+	}
+	if (!limitexceeded)
+		return 0;
+	/* Sometimes chip and programmer have more than one bus in common,
+	 * and the limit is not exceeded on all buses. Tell the user.
+	 */
+	if (bitcount(buses) > limitexceeded)
+		printf_debug("There is at least one common chip/programmer "
+			     "interface which can support a chip of this size. "
+			     "You can try --force at your own risk.\n");
+	return 1;
+}
+
 struct flashchip *probe_flash(struct flashchip *first_flash, int force)
 {
    struct flashchip *flash;
-	unsigned long base = 0, size;
+	unsigned long base = 0;
+	uint32_t size;
+	enum chipbustype buses_common;
    char *tmp;

for (flash = first_flash; flash && flash->name; flash++) {
@@ -413,7 +472,8 @@
    		printf_debug("failed! flashrom has no probe function for this flash chip.\n");
    		continue;
    	}
-		if (!(buses_supported & flash->bustype)) {
+		buses_common = buses_supported & flash->bustype;
+		if (!buses_common) {
    		tmp = flashbuses_to_text(buses_supported);
    		printf_debug("skipped. Host bus type %s ", tmp);
    		free(tmp);
@@ -424,6 +484,7 @@
    	}

size = flash->total_size * 1024;
+		check_max_decode(buses_common, size);

base = flashbase ? flashbase : (0xffffffff - size + 1);
    	flash->virtual_memory = (chipaddr)programmer_map_flash_region("flash chip", base, size);
@@ -956,6 +1017,15 @@
    	       "mainboard you tested. Thanks for your help!\n===\n");
    }

+	size = flash->total_size * 1024;
+	if (check_max_decode((buses_supported & flash->bustype), size) &&
+	    (!force)) {
+		fprintf(stderr, "Chip is too big for this programmer "
+			"(-V gives details). Use --force to override.\n");
+		programmer_shutdown();
+		return 1;
+	}
+
    if (!(read_it | write_it | verify_it | erase_it)) {
    	printf("No operations were specified.\n");
    	// FIXME: flash writes stay enabled!
@@ -974,7 +1044,6 @@
    if (write_it && !dont_verify_it)
    	verify_it = 1;

-	size = flash->total_size * 1024;
    buf = (uint8_t *) calloc(size, sizeof(char));

if (erase_it) {