Nick: carldani
E-mail: none
Board: patch: flashrom internal no chip mapping larger than 16 mbyt
Contents: 
Index: flashrom-internal_no_chip_mapping_larger_16mbyte/flash.h
===================================================================
--- flashrom-internal_no_chip_mapping_larger_16mbyte/flash.h	(Revision 1701)
+++ flashrom-internal_no_chip_mapping_larger_16mbyte/flash.h	(Arbeitskopie)
@@ -176,6 +176,7 @@
 
 struct flashctx {
 	struct flashchip *chip;
+	bool virtual_memory_is_usable;
 	chipaddr virtual_memory;
 	/* Some flash devices have an additional register space. */
 	chipaddr virtual_registers;
Index: flashrom-internal_no_chip_mapping_larger_16mbyte/it87spi.c
===================================================================
--- flashrom-internal_no_chip_mapping_larger_16mbyte/it87spi.c	(Revision 1701)
+++ flashrom-internal_no_chip_mapping_larger_16mbyte/it87spi.c	(Arbeitskopie)
@@ -352,7 +352,7 @@
 	 * the mainboard does not use IT87 SPI translation. This should be done
 	 * via a programmer parameter for the internal programmer.
 	 */
-	if ((flash->chip->total_size * 1024 > 512 * 1024)) {
+	if (!flash->virtual_memory_is_usable || (flash->chip->total_size * 1024 > 512 * 1024)) {
 		spi_read_chunked(flash, buf, start, len, 3);
 	} else {
 		mmio_readn((void *)(flash->virtual_memory + start), buf, len);
Index: flashrom-internal_no_chip_mapping_larger_16mbyte/internal.c
===================================================================
--- flashrom-internal_no_chip_mapping_larger_16mbyte/internal.c	(Revision 1701)
+++ flashrom-internal_no_chip_mapping_larger_16mbyte/internal.c	(Arbeitskopie)
@@ -366,45 +366,69 @@
 }
 #endif
 
+void *internal_map(const char *descr, uintptr_t phys_addr, size_t len)
+{
+	return physmap(descr, phys_addr, len);
+}
+
+void internal_unmap(void *virt_addr, size_t len)
+{
+	physunmap(virt_addr, len);
+}
+
 static void internal_chip_writeb(const struct flashctx *flash, uint8_t val,
 				 chipaddr addr)
 {
+	if (!flash->virtual_memory_is_usable)
+		exit(1);
 	mmio_writeb(val, (void *) addr);
 }
 
 static void internal_chip_writew(const struct flashctx *flash, uint16_t val,
 				 chipaddr addr)
 {
+	if (!flash->virtual_memory_is_usable)
+		exit(1);
 	mmio_writew(val, (void *) addr);
 }
 
 static void internal_chip_writel(const struct flashctx *flash, uint32_t val,
 				 chipaddr addr)
 {
+	if (!flash->virtual_memory_is_usable)
+		exit(1);
 	mmio_writel(val, (void *) addr);
 }
 
 static uint8_t internal_chip_readb(const struct flashctx *flash,
 				   const chipaddr addr)
 {
+	if (!flash->virtual_memory_is_usable)
+		exit(1);
 	return mmio_readb((void *) addr);
 }
 
 static uint16_t internal_chip_readw(const struct flashctx *flash,
 				    const chipaddr addr)
 {
+	if (!flash->virtual_memory_is_usable)
+		exit(1);
 	return mmio_readw((void *) addr);
 }
 
 static uint32_t internal_chip_readl(const struct flashctx *flash,
 				    const chipaddr addr)
 {
+	if (!flash->virtual_memory_is_usable)
+		exit(1);
 	return mmio_readl((void *) addr);
 }
 
 static void internal_chip_readn(const struct flashctx *flash, uint8_t *buf,
 				const chipaddr addr, size_t len)
 {
+	if (!flash->virtual_memory_is_usable)
+		exit(1);
 	mmio_readn((void *)addr, buf, len);
 	return;
 }
Index: flashrom-internal_no_chip_mapping_larger_16mbyte/wbsio_spi.c
===================================================================
--- flashrom-internal_no_chip_mapping_larger_16mbyte/wbsio_spi.c	(Revision 1701)
+++ flashrom-internal_no_chip_mapping_larger_16mbyte/wbsio_spi.c	(Arbeitskopie)
@@ -20,6 +20,7 @@
 
 #if defined(__i386__) || defined(__x86_64__)
 
+#include <stdlib.h>
 #include "flash.h"
 #include "chipdrivers.h"
 #include "programmer.h"
@@ -204,6 +205,8 @@
 static int wbsio_spi_read(struct flashctx *flash, uint8_t *buf,
 			  unsigned int start, unsigned int len)
 {
+	if (!flash->virtual_memory_is_usable)
+		exit(1);
 	mmio_readn((void *)(flash->virtual_memory + start), buf, len);
 	return 0;
 }
Index: flashrom-internal_no_chip_mapping_larger_16mbyte/flashrom.c
===================================================================
--- flashrom-internal_no_chip_mapping_larger_16mbyte/flashrom.c	(Revision 1701)
+++ flashrom-internal_no_chip_mapping_larger_16mbyte/flashrom.c	(Arbeitskopie)
@@ -68,8 +68,8 @@
 		.type			= OTHER,
 		.devs.note		= NULL,
 		.init			= internal_init,
-		.map_flash_region	= physmap,
-		.unmap_flash_region	= physunmap,
+		.map_flash_region	= internal_map,
+		.unmap_flash_region	= internal_unmap,
 		.delay			= internal_delay,
 	},
 #endif
@@ -1070,6 +1070,10 @@
 
 		base = flashbase ? flashbase : (0xffffffff - size + 1);
 		flash->virtual_memory = (chipaddr)programmer_map_flash_region("flash chip", base, size);
+		if (flash->virtual_memory == (chipaddr)ERROR_PTR)
+			flash->virtual_memory_is_usable = false;
+		else
+			flash->virtual_memory_is_usable = true;
 
 		/* We handle a forced match like a real match, we just avoid probing. Note that probe_flash()
 		 * is only called with force=1 after normal probing failed.
Index: flashrom-internal_no_chip_mapping_larger_16mbyte/programmer.h
===================================================================
--- flashrom-internal_no_chip_mapping_larger_16mbyte/programmer.h	(Revision 1701)
+++ flashrom-internal_no_chip_mapping_larger_16mbyte/programmer.h	(Arbeitskopie)
@@ -321,6 +321,8 @@
 int register_superio(struct superio s);
 extern enum chipbustype internal_buses_supported;
 int internal_init(void);
+void *internal_map(const char *descr, uintptr_t phys_addr, size_t len);
+void internal_unmap(void *virt_addr, size_t len);
 #endif
 
 /* hwaccess.c */