<br><br><div class="gmail_quote">2010/6/2 Carl-Daniel Hailfinger <span dir="ltr"><<a href="mailto:c-d.hailfinger.devel.2006@gmx.net">c-d.hailfinger.devel.2006@gmx.net</a>></span><br><blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
Hi,<br>
<div class="im"><br>
On 01.06.2010 11:54, rayer wrote:<br>
> it still hangs while autodetecting flash chip at AE49F2008 (is<br>
> displayed as last probed),<br>
> only with -c option it works.<br>
<br>
</div>Does it really work with -c CHIPNAME or do you need -f as well?<br>
<br>
I found a bug in the bitbanging SPI core (buffer confusion) and fixed it.<br>
This version also reduces reach chunk size to 256 bytes instead of 65536<br>
bytes. That makes buffer management more efficient (only one round of<br>
memory allocations).<br>
<br>
Idwer will build a new .exe</blockquote><div><br> <a href="http://khepri.coresystems.de/~idwer/flashrom/r1025-patchwork-1441/flashrom.exe">http://khepri.coresystems.de/~idwer/flashrom/r1025-patchwork-1441/flashrom.exe</a><br>
<br></div><blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">, and it would be great if you could test it with<br>
<div class="im">flashrom -p rayer_bitbang_spi -V<br>
</div>and make a photo or screenshot of the run. I will add more debugging if<br>
it still hangs.<br>
<br>
-snip-<br>
<div class="im"><br>
Add support for RayeR SPIPGM hardware as described in<br>
<a href="http://rayer.ic.cz/elektro/spipgm.htm" target="_blank">http://rayer.ic.cz/elektro/spipgm.htm</a><br>
<br>
</div><div class="im">To use the RayeR driver, run<br>
flashrom -p rayer_bitbang_spi -V<br>
<br>
</div><div class="im">Known bugs/limitations:<br>
- Won't compile/work on non-x86 architectures.<br>
</div><div class="im">- Will always use direct port I/O access.<br>
<br>
<br>
</div><div class="im">Signed-off-by: Carl-Daniel Hailfinger <<a href="mailto:c-d.hailfinger.devel.2006@gmx.net">c-d.hailfinger.devel.2006@gmx.net</a>><br>
<br>
</div><div class="im">Index: flashrom-bitbang_spi_rayer/flash.h<br>
===================================================================<br>
</div>--- flashrom-bitbang_spi_rayer/flash.h (Revision 1025)<br>
<div class="im">+++ flashrom-bitbang_spi_rayer/flash.h (Arbeitskopie)<br>
</div>@@ -81,6 +81,9 @@<br>
#if CONFIG_DEDIPROG == 1<br>
PROGRAMMER_DEDIPROG,<br>
#endif<br>
+#if CONFIG_RAYER_BITBANG_SPI == 1<br>
<div class="im">+ PROGRAMMER_RAYER_BITBANG_SPI,<br>
+#endif<br>
PROGRAMMER_INVALID /* This must always be the last entry. */<br>
};<br>
<br>
</div>@@ -128,13 +131,14 @@<br>
<div class="im"> void programmer_delay(int usecs);<br>
<br>
enum bitbang_spi_master {<br>
</div>+#if CONFIG_RAYER_BITBANG_SPI == 1<br>
<div class="im">+ BITBANG_SPI_MASTER_RAYER,<br>
+#endif<br>
BITBANG_SPI_INVALID /* This must always be the last entry. */<br>
};<br>
<br>
</div> extern const int bitbang_spi_master_count;<br>
<br>
-extern enum bitbang_spi_master bitbang_spi_master;<br>
-<br>
struct bitbang_spi_master_entry {<br>
void (*set_cs) (int val);<br>
void (*set_sck) (int val);<br>
@@ -524,10 +528,19 @@<br>
<div class="im"> int ft2232_spi_read(struct flashchip *flash, uint8_t *buf, int start, int len);<br>
int ft2232_spi_write_256(struct flashchip *flash, uint8_t *buf);<br>
<br>
+/* rayer_bitbang_spi.c */<br>
</div>+#if CONFIG_RAYER_BITBANG_SPI == 1<br>
<div class="im">+int rayer_bitbang_spi_init(void);<br>
+void rayer_bitbang_set_cs(int val);<br>
+void rayer_bitbang_set_sck(int val);<br>
+void rayer_bitbang_set_mosi(int val);<br>
+int rayer_bitbang_get_miso(void);<br>
+#endif<br>
+<br>
/* bitbang_spi.c */<br>
extern int bitbang_spi_half_period;<br>
extern const struct bitbang_spi_master_entry bitbang_spi_master_table[];<br>
</div><div class="im">-int bitbang_spi_init(void);<br>
+int bitbang_spi_init(enum bitbang_spi_master master);<br>
int bitbang_spi_send_command(unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr);<br>
</div> int bitbang_spi_read(struct flashchip *flash, uint8_t *buf, int start, int len);<br>
int bitbang_spi_write_256(struct flashchip *flash, uint8_t *buf);<br>
@@ -643,6 +656,9 @@<br>
#if CONFIG_DEDIPROG == 1<br>
SPI_CONTROLLER_DEDIPROG,<br>
#endif<br>
+#if CONFIG_RAYER_BITBANG_SPI == 1<br>
<div class="im">+ SPI_CONTROLLER_RAYER_BITBANG,<br>
+#endif<br>
SPI_CONTROLLER_INVALID /* This must always be the last entry. */<br>
};<br>
extern const int spi_programmer_count;<br>
Index: flashrom-bitbang_spi_rayer/spi25.c<br>
===================================================================<br>
</div>--- flashrom-bitbang_spi_rayer/spi25.c (Revision 1025)<br>
<div class="im">+++ flashrom-bitbang_spi_rayer/spi25.c (Arbeitskopie)<br>
@@ -192,6 +192,9 @@<br>
</div> #if CONFIG_DEDIPROG == 1<br>
<div class="im"> case SPI_CONTROLLER_DEDIPROG:<br>
#endif<br>
</div>+#if CONFIG_RAYER_BITBANG_SPI == 1<br>
<div class="im">+ case SPI_CONTROLLER_RAYER_BITBANG:<br>
+#endif<br>
return probe_spi_rdid_generic(flash, 4);<br>
default:<br>
msg_cinfo("4b ID not supported on this SPI controller\n");<br>
Index: flashrom-bitbang_spi_rayer/hwaccess.h<br>
===================================================================<br>
</div>--- flashrom-bitbang_spi_rayer/hwaccess.h (Revision 1025)<br>
<div class="im">+++ flashrom-bitbang_spi_rayer/hwaccess.h (Arbeitskopie)<br>
@@ -169,6 +169,10 @@<br>
#define __DARWIN__<br>
#endif<br>
<br>
+/* Clarification about OUTB/OUTW/OUTL argument order:<br>
+ * OUT[BWL](val, port)<br>
+ */<br>
+<br>
#if defined(__FreeBSD__) || defined(__DragonFly__)<br>
#include <machine/cpufunc.h><br>
#define off64_t off_t<br>
Index: flashrom-bitbang_spi_rayer/bitbang_spi.c<br>
===================================================================<br>
</div>--- flashrom-bitbang_spi_rayer/bitbang_spi.c (Revision 1025)<br>
<div class="im">+++ flashrom-bitbang_spi_rayer/bitbang_spi.c (Arbeitskopie)<br>
@@ -32,11 +32,20 @@<br>
enum bitbang_spi_master bitbang_spi_master = BITBANG_SPI_INVALID;<br>
<br>
const struct bitbang_spi_master_entry bitbang_spi_master_table[] = {<br>
- {}, /* This entry corresponds to BITBANG_SPI_INVALID. */<br>
</div>+#if CONFIG_RAYER_BITBANG_SPI == 1<br>
<div class="im">+ {<br>
+ .set_cs = rayer_bitbang_set_cs,<br>
+ .set_sck = rayer_bitbang_set_sck,<br>
+ .set_mosi = rayer_bitbang_set_mosi,<br>
+ .get_miso = rayer_bitbang_get_miso,<br>
+ },<br>
+#endif<br>
+ {}, /* This entry corresponds to SPI_BITBANG_INVALID. */<br>
};<br>
<br>
const int bitbang_spi_master_count = ARRAY_SIZE(bitbang_spi_master_table);<br>
<br>
+/* Note that CS# is active low, so val=0 means the chip is active. */<br>
void bitbang_spi_set_cs(int val)<br>
{<br>
bitbang_spi_master_table[bitbang_spi_master].set_cs(val);<br>
</div>@@ -57,10 +66,19 @@<br>
<div class="im"> return bitbang_spi_master_table[bitbang_spi_master].get_miso();<br>
}<br>
<br>
-int bitbang_spi_init(void)<br>
+int bitbang_spi_init(enum bitbang_spi_master master)<br>
{<br>
+ bitbang_spi_master = master;<br>
+<br>
</div><div class="im">+ if (bitbang_spi_master == BITBANG_SPI_INVALID) {<br>
</div><div class="im">+ msg_perr("Invalid bitbang SPI master. \n"<br>
</div>+ "Please report a bug at <a href="mailto:flashrom@flashrom.org">flashrom@flashrom.org</a>\n",<br>
<div class="im">+ __func__);<br>
+ return 1;<br>
+ }<br>
bitbang_spi_set_cs(1);<br>
bitbang_spi_set_sck(0);<br>
</div>+ bitbang_spi_set_mosi(0);<br>
<div class="im"> buses_supported = CHIP_BUSTYPE_SPI;<br>
</div> return 0;<br>
}<br>
@@ -87,6 +105,7 @@<br>
{<br>
static unsigned char *bufout = NULL;<br>
static unsigned char *bufin = NULL;<br>
+ unsigned char *tmp;<br>
static int oldbufsize = 0;<br>
int bufsize;<br>
int i;<br>
@@ -98,20 +117,34 @@<br>
bufsize = max(writecnt + readcnt, 260);<br>
/* Never shrink. realloc() calls are expensive. */<br>
if (bufsize > oldbufsize) {<br>
- bufout = realloc(bufout, bufsize);<br>
- if (!bufout) {<br>
+ tmp = realloc(bufout, bufsize);<br>
+ if (!tmp) {<br>
msg_perr("Out of memory!\n");<br>
+ if (bufout)<br>
+ free(bufout);<br>
+ bufout = NULL;<br>
if (bufin)<br>
free(bufin);<br>
+ bufin = NULL;<br>
+ oldbufsize = 0;<br>
exit(1);<br>
- }<br>
- bufin = realloc(bufout, bufsize);<br>
- if (!bufin) {<br>
+ } else<br>
+ bufout = tmp;<br>
+<br>
+ tmp = realloc(bufin, bufsize);<br>
+ if (!tmp) {<br>
msg_perr("Out of memory!\n");<br>
+ if (bufin)<br>
+ free(bufin);<br>
+ bufin = NULL;<br>
if (bufout)<br>
free(bufout);<br>
+ bufout = NULL;<br>
+ oldbufsize = 0;<br>
exit(1);<br>
- }<br>
+ } else<br>
+ bufin = tmp;<br>
+<br>
oldbufsize = bufsize;<br>
}<br>
<br>
@@ -135,8 +168,13 @@<br>
<br>
int bitbang_spi_read(struct flashchip *flash, uint8_t *buf, int start, int len)<br>
{<br>
- /* Maximum read length is unlimited, use 64k bytes. */<br>
- return spi_read_chunked(flash, buf, start, len, 64 * 1024);<br>
+ /* Maximum read length is unlimited in theory.<br>
+ * The current implementation can handle reads of up to 65536 bytes.<br>
+ * Please note that you need two buffers of 2n+4 bytes each for a read<br>
+ * of n bytes, resulting in a total memory requirement of 4n+8 bytes.<br>
+ * To conserve memory, read in chunks of 256 bytes.<br>
+ */<br>
+ return spi_read_chunked(flash, buf, start, len, 256);<br>
}<br>
<br>
int bitbang_spi_write_256(struct flashchip *flash, uint8_t *buf)<br>
<div class="im">Index: flashrom-bitbang_spi_rayer/spi.c<br>
===================================================================<br>
</div>--- flashrom-bitbang_spi_rayer/spi.c (Revision 1025)<br>
<div class="im">+++ flashrom-bitbang_spi_rayer/spi.c (Arbeitskopie)<br>
</div><div class="im">@@ -122,6 +122,15 @@<br>
},<br>
#endif<br>
<br>
</div>+#if CONFIG_RAYER_BITBANG_SPI == 1<br>
<div class="im">+ { /* SPI_CONTROLLER_RAYER_BITBANG */<br>
+ .command = bitbang_spi_send_command,<br>
+ .multicommand = default_spi_send_multicommand,<br>
+ .read = bitbang_spi_read,<br>
+ .write_256 = bitbang_spi_write_256,<br>
+ },<br>
+#endif<br>
+<br>
{}, /* This entry corresponds to SPI_CONTROLLER_INVALID. */<br>
};<br>
<br>
Index: flashrom-bitbang_spi_rayer/Makefile<br>
===================================================================<br>
</div>--- flashrom-bitbang_spi_rayer/Makefile (Revision 1025)<br>
<div class="im">+++ flashrom-bitbang_spi_rayer/Makefile (Arbeitskopie)<br>
@@ -85,8 +85,15 @@<br>
# Always enable serprog for now. Needs to be disabled on Windows.<br>
CONFIG_SERPROG ?= yes<br>
<br>
-# Bitbanging SPI infrastructure is not used yet.<br>
+# RayeR SPIPGM hardware support<br>
+CONFIG_RAYER_BITBANG_SPI ?= yes<br>
+<br>
+# Bitbanging SPI infrastructure, default off unless needed.<br>
+ifeq ($(CONFIG_RAYER_BITBANG_SPI), yes)<br>
+CONFIG_BITBANG_SPI = yes<br>
+else<br>
CONFIG_BITBANG_SPI ?= no<br>
+endif<br>
<br>
# Always enable 3Com NICs for now.<br>
CONFIG_NIC3COM ?= yes<br>
@@ -138,6 +145,13 @@<br>
endif<br>
endif<br>
<br>
+ifeq ($(CONFIG_RAYER_BITBANG_SPI), yes)<br>
</div>+FEATURE_CFLAGS += -D'CONFIG_RAYER_BITBANG_SPI=1'<br>
<div class="im">+PROGRAMMER_OBJS += rayer_bitbang_spi.o<br>
+# Actually, NEED_PCI is wrong. NEED_IOPORT_ACCESS would be more correct.<br>
+NEED_PCI := yes<br>
+endif<br>
+<br>
ifeq ($(CONFIG_BITBANG_SPI), yes)<br>
</div> FEATURE_CFLAGS += -D'CONFIG_BITBANG_SPI=1'<br>
<div class="im"> PROGRAMMER_OBJS += bitbang_spi.o<br>
Index: flashrom-bitbang_spi_rayer/flashrom.c<br>
===================================================================<br>
</div>--- flashrom-bitbang_spi_rayer/flashrom.c (Revision 1025)<br>
<div class="im">+++ flashrom-bitbang_spi_rayer/flashrom.c (Arbeitskopie)<br>
</div>@@ -48,7 +48,7 @@<br>
<div class="im"> * if more than one of them is selected. If only one is selected, it is clear<br>
* that the user wants that one to become the default.<br>
*/<br>
</div>-#if CONFIG_NIC3COM+CONFIG_NICREALTEK+CONFIG_GFXNVIDIA+CONFIG_DRKAISER+CONFIG_SATASII+CONFIG_ATAHPT+CONFIG_FT2232_SPI+CONFIG_SERPROG+CONFIG_BUSPIRATE_SPI+CONFIG_DEDIPROG > 1<br>
+#if CONFIG_NIC3COM+CONFIG_NICREALTEK+CONFIG_GFXNVIDIA+CONFIG_DRKAISER+CONFIG_SATASII+CONFIG_ATAHPT+CONFIG_FT2232_SPI+CONFIG_SERPROG+CONFIG_BUSPIRATE_SPI+CONFIG_DEDIPROG+CONFIG_RAYER_BITBANG_SPI > 1<br>
#error Please enable either CONFIG_DUMMY or CONFIG_INTERNAL or disable support for all programmers except one.<br>
#endif<br>
enum programmer programmer =<br>
@@ -83,6 +83,9 @@<br>
#if CONFIG_DEDIPROG == 1<br>
PROGRAMMER_DEDIPROG<br>
#endif<br>
+#if CONFIG_RAYER_BITBANG_SPI == 1<br>
<div class="im">+ PROGRAMMER_RAYER_BITBANG_SPI<br>
+#endif<br>
;<br>
#endif<br>
<br>
</div><div class="im">@@ -373,6 +376,25 @@<br>
},<br>
#endif<br>
<br>
</div>+#if CONFIG_RAYER_BITBANG_SPI == 1<br>
+ {<br>
+ .name = "rayer_bitbang_spi",<br>
<div class="im">+ .init = rayer_bitbang_spi_init,<br>
+ .shutdown = noop_shutdown,<br>
+ .map_flash_region = fallback_map,<br>
+ .unmap_flash_region = fallback_unmap,<br>
+ .chip_readb = noop_chip_readb,<br>
+ .chip_readw = fallback_chip_readw,<br>
+ .chip_readl = fallback_chip_readl,<br>
+ .chip_readn = fallback_chip_readn,<br>
+ .chip_writeb = noop_chip_writeb,<br>
+ .chip_writew = fallback_chip_writew,<br>
+ .chip_writel = fallback_chip_writel,<br>
+ .chip_writen = fallback_chip_writen,<br>
+ .delay = internal_delay,<br>
+ },<br>
+#endif<br>
+<br>
{}, /* This entry corresponds to PROGRAMMER_INVALID. */<br>
};<br>
<br>
Index: flashrom-bitbang_spi_rayer/rayer_bitbang_spi.c<br>
===================================================================<br>
--- flashrom-bitbang_spi_rayer/rayer_bitbang_spi.c (Revision 0)<br>
+++ flashrom-bitbang_spi_rayer/rayer_bitbang_spi.c (Revision 0)<br>
</div>@@ -0,0 +1,112 @@<br>
<div class="im">+/*<br>
+ * This file is part of the flashrom project.<br>
+ *<br>
+ * Copyright (C) 2009,2010 Carl-Daniel Hailfinger<br>
+ *<br>
+ * This program is free software; you can redistribute it and/or modify<br>
+ * it under the terms of the GNU General Public License as published by<br>
+ * the Free Software Foundation; version 2 of the License.<br>
+ *<br>
+ * This program is distributed in the hope that it will be useful,<br>
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of<br>
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the<br>
+ * GNU General Public License for more details.<br>
+ *<br>
+ * You should have received a copy of the GNU General Public License<br>
+ * along with this program; if not, write to the Free Software<br>
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA<br>
+ */<br>
+<br>
+/* Driver for the SPIPGM hardware by "RayeR" Martin Rehak.<br>
</div><div class="im">+ * See <a href="http://rayer.ic.cz/elektro/spipgm.htm" target="_blank">http://rayer.ic.cz/elektro/spipgm.htm</a> for schematics and instructions.<br>
+ */<br>
+<br>
+/* This driver uses non-portable direct I/O port accesses which won't work on<br>
+ * any non-x86 platform, and even on x86 there is a high chance there will be<br>
+ * collisions with any loaded parallel port drivers.<br>
+ * The big advantage of direct port I/O is OS independence and speed because<br>
+ * most OS parport drivers will perform many unnecessary accesses although<br>
+ * this driver just treats the parallel port as a GPIO set.<br>
+ */<br>
+#if defined(__i386__) || defined(__x86_64__)<br>
+<br>
</div><div class="im">+#include "flash.h"<br>
+<br>
+/* We have two sets of pins, out and in. The numbers for both sets are<br>
+ * independent and are bitshift values, not real pin numbers.<br>
+ */<br>
+/* Pins for master->slave direction */<br>
+#define SPI_CS_PIN 5<br>
+#define SPI_SCK_PIN 6<br>
+#define SPI_MOSI_PIN 7<br>
+/* Pins for slave->master direction */<br>
+#define SPI_MISO_PIN 6<br>
+<br>
+static int lpt_iobase;<br>
+<br>
+/* FIXME: All rayer_bitbang_set_* functions could use caching of the value<br>
+ * stored at port lpt_iobase to avoid unnecessary INB. In theory, only one<br>
+ * INB(lpt_iobase) would be needed on programmer init to get the initial<br>
+ * value.<br>
+ */<br>
+<br>
+void rayer_bitbang_set_cs(int val)<br>
+{<br>
</div><div class="im">+ uint8_t tmp;<br>
+<br>
+ tmp = INB(lpt_iobase);<br>
+ tmp &= ~(1 << SPI_CS_PIN);<br>
</div>+ tmp |= (val << SPI_CS_PIN);<br>
+ OUTB(tmp, lpt_iobase);<br>
<div class="im">+}<br>
+<br>
+void rayer_bitbang_set_sck(int val)<br>
+{<br>
</div><div class="im">+ uint8_t tmp;<br>
+<br>
+ tmp = INB(lpt_iobase);<br>
+ tmp &= ~(1 << SPI_SCK_PIN);<br>
</div>+ tmp |= (val << SPI_SCK_PIN);<br>
+ OUTB(tmp, lpt_iobase);<br>
<div class="im">+}<br>
+<br>
+void rayer_bitbang_set_mosi(int val)<br>
+{<br>
</div><div class="im">+ uint8_t tmp;<br>
+<br>
+ tmp = INB(lpt_iobase);<br>
+ tmp &= ~(1 << SPI_MOSI_PIN);<br>
</div>+ tmp |= (val << SPI_MOSI_PIN);<br>
+ OUTB(tmp, lpt_iobase);<br>
<div class="im">+}<br>
+<br>
+int rayer_bitbang_get_miso(void)<br>
+{<br>
</div><div class="im">+ uint8_t tmp;<br>
+<br>
+ tmp = INB(lpt_iobase + 1);<br>
</div>+ tmp = (tmp >> SPI_MISO_PIN) & 0x1;<br>
+ return tmp;<br>
<div class="im">+}<br>
+<br>
+int rayer_bitbang_spi_init(void)<br>
+{<br>
+ /* Pick a default value for now. */<br>
+ lpt_iobase = 0x378;<br>
+<br>
</div><div class="im">+ msg_pdbg("Using port 0x%x as I/O base for parallel port access.\n",<br>
+ lpt_iobase);<br>
+<br>
</div>+ get_io_perms();<br>
+<br>
+ if (bitbang_spi_init(BITBANG_SPI_MASTER_RAYER))<br>
<div class="im">+ return 1;<br>
+<br>
+ spi_controller = SPI_CONTROLLER_RAYER_BITBANG;<br>
+<br>
+ return 0;<br>
+}<br>
</div><div class="im">+<br>
+#else<br>
+#error PCI port I/O access is not supported on this architecture yet.<br>
+#endif<br>
<br>
<br>
--<br>
<a href="http://www.hailfinger.org/" target="_blank">http://www.hailfinger.org/</a><br>
<br>
<br>
</div><div><div></div><div class="h5">_______________________________________________<br>
flashrom mailing list<br>
<a href="mailto:flashrom@flashrom.org">flashrom@flashrom.org</a><br>
<a href="http://www.flashrom.org/mailman/listinfo/flashrom" target="_blank">http://www.flashrom.org/mailman/listinfo/flashrom</a><br>
</div></div></blockquote></div><br>