flashrom

flashrom@flashrom.org

9164 discussions

Re: [flashrom] [PATCH] Fix compilation with MinGW.
by Stefan Tauner 02 Sep '12

02 Sep '12

On Sat, 1 Sep 2012 23:40:57 +0200 Idwer Vollering <vidwer(a)gmail.com> wrote: > 2012/9/1 Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at>: > > This was broken since r1557 when we got rid of some exit calls, but returned > > -1 instead which is not a valid HANDLE value. > > > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> > > Acked-by: Idwer Vollering <vidwer(a)gmail.com> thanks, committed in r1591 -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

[commit] r1591 - trunk
by repository service 02 Sep '12

02 Sep '12

Author: stefanct Date: Sat Sep 1 23:47:19 2012 New Revision: 1591 URL: http://flashrom.org/trac/flashrom/changeset/1591 Log: Fix compilation with MinGW. This was broken since r1557 when we got rid of some exit calls, but returned -1 instead which is not a valid HANDLE value. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Idwer Vollering <vidwer(a)gmail.com> Modified: trunk/programmer.h trunk/serial.c Modified: trunk/programmer.h ============================================================================== --- trunk/programmer.h Sat Sep 1 23:32:04 2012 (r1590) +++ trunk/programmer.h Sat Sep 1 23:47:19 2012 (r1591) @@ -636,8 +636,10 @@ /* serial.c */ #ifdef _WIN32 typedef HANDLE fdtype; +#define SER_INV_FD INVALID_HANDLE_VALUE #else typedef int fdtype; +#define SER_INV_FD -1 #endif void sp_flush_incoming(void); Modified: trunk/serial.c ============================================================================== --- trunk/serial.c Sat Sep 1 23:32:04 2012 (r1590) +++ trunk/serial.c Sat Sep 1 23:47:19 2012 (r1591) @@ -115,7 +115,7 @@ dev2 = malloc(strlen(dev) + 5); if (!dev2) { msg_perr("Error: Out of memory: %s\n", strerror(errno)); - return -1; + return SER_INV_FD; } strcpy(dev2, "\\\\.\\"); strcpy(dev2 + 4, dev); @@ -126,12 +126,12 @@ free(dev2); if (fd == INVALID_HANDLE_VALUE) { msg_perr("Error: cannot open serial port: %s\n", strerror(errno)); - return -1; + return SER_INV_FD; } DCB dcb; if (!GetCommState(fd, &dcb)) { msg_perr("Error: Could not fetch serial port configuration: %s\n", strerror(errno)); - return -1; + return SER_INV_FD; } switch (baud) { case 9600: dcb.BaudRate = CBR_9600; break; @@ -140,14 +140,14 @@ case 57600: dcb.BaudRate = CBR_57600; break; case 115200: dcb.BaudRate = CBR_115200; break; default: msg_perr("Error: Could not set baud rate: %s\n", strerror(errno)); - return -1; + return SER_INV_FD; } dcb.ByteSize = 8; dcb.Parity = NOPARITY; dcb.StopBits = ONESTOPBIT; if (!SetCommState(fd, &dcb)) { msg_perr("Error: Could not change serial port configuration: %s\n", strerror(errno)); - return -1; + return SER_INV_FD; } return fd; #else @@ -156,7 +156,7 @@ fd = open(dev, O_RDWR | O_NOCTTY | O_NDELAY); if (fd < 0) { msg_perr("Error: cannot open serial port: %s\n", strerror(errno)); - return -1; + return SER_INV_FD; } fcntl(fd, F_SETFL, 0); tcgetattr(fd, &options); @@ -164,7 +164,7 @@ if (sp_baudtable[i].baud == 0) { close(fd); msg_perr("Error: cannot configure for baudrate %d\n", baud); - return -1; + return SER_INV_FD; } if (sp_baudtable[i].baud == baud) { cfsetispeed(&options, sp_baudtable[i].flag);

1 0

Re: [flashrom] [PATCH] Fix compilation with MinGW.
by Idwer Vollering 02 Sep '12

02 Sep '12

2012/9/1 Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at>: > This was broken since r1557 when we got rid of some exit calls, but returned > -1 instead which is not a valid HANDLE value. > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Idwer Vollering <vidwer(a)gmail.com>

1 0

Re: [flashrom] [PATCH] Add support for AJAWe to pony_spi.
by Stefan Tauner 02 Sep '12

02 Sep '12

On Sat, 1 Sep 2012 22:05:45 +0200 Virgil-Adrian Teaca <darkstarlinux(a)gmail.com> wrote: > Ouch, you just found a bug in the detection code. :) > > The right code (after my last thinking) is: > > /* The AJAWe serial programmer just have DSR on when > it is active. */ > data_in = sp_get_pin(PIN_DSR); > > if(!data_in) { > have_prog = 0; > } mhm :) > > since we can not test or verify it otherwise, i will disable the > > detection for now as posted. we can add it later if need be and we find > > out how it really is supposed to work. thanks for looking at the > > changes and your initial patch! > > I totally agree with the disabling of AJAWe auto-detection until we > figure out how it really works and IF really we need it. ok then, thanks. i have committed my version in r1590. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

[commit] r1590 - trunk
by repository service 02 Sep '12

02 Sep '12

Author: stefanct Date: Sat Sep 1 23:32:04 2012 New Revision: 1590 URL: http://flashrom.org/trac/flashrom/changeset/1590 Log: Add support for AJAWe to pony_spi. http://www.ajawe.pl/ajawe0208.htm http://www.ajawe.pl/files/0208_R_DOK.pdf First version was Signed-off-by: Virgil-Adrian Teaca <darkstarlinux(a)gmail.com> Refinements and general cleanup is Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Modified: trunk/pony_spi.c trunk/print.c Modified: trunk/pony_spi.c ============================================================================== --- trunk/pony_spi.c Thu Aug 30 23:41:00 2012 (r1589) +++ trunk/pony_spi.c Sat Sep 1 23:32:04 2012 (r1590) @@ -17,8 +17,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -/* Driver for the SI-Prog like hardware by Lancos.com. - * See http://www.lancos.com/siprogsch.html for schematics and instructions. +/* Driver for serial programmers compatible with SI-Prog or AJAWe. + * + * See http://www.lancos.com/siprogsch.html for SI-Prog schematics and instructions. + * See http://www.ajawe.pl/ajawe0208.htm for AJAWe serial programmer documentation. + * + * Pin layout for SI-Prog-like hardware: + * + * MOSI <-------< DTR + * MISO >-------> CTS + * SCK <---+---< RTS + * +---> DSR + * CS# <-------< TXD + * + * and for the AJAWe serial programmer: + * + * MOSI <-------< DTR + * MISO >-------> CTS + * SCK <-------< RTS + * CS# <-------< TXD + * + * DCE >-------> DSR */ #include <stdlib.h> @@ -28,55 +47,50 @@ #include "flash.h" #include "programmer.h" -/* We have: - - MOSI -----> DTR - MISO -----> CTS - SCK --+--> RTS - +--> DSR - CS# -----> TXD - -*/ - enum pony_type { TYPE_SI_PROG, TYPE_SERBANG, + TYPE_AJAWE }; -/* The hardware programmer used. */ -static enum pony_type pony_type = TYPE_SI_PROG; +/* Pins for master->slave direction */ +static int pony_negate_cs = 1; +static int pony_negate_sck = 0; +static int pony_negate_mosi = 0; +/* Pins for slave->master direction */ +static int pony_negate_miso = 0; static void pony_bitbang_set_cs(int val) { - if (pony_type == TYPE_SI_PROG) - { - /* CS# is negated by the SI-Prog programmer. */ + if (pony_negate_cs) val ^= 1; - } + sp_set_pin(PIN_TXD, val); } static void pony_bitbang_set_sck(int val) { + if (pony_negate_sck) + val ^= 1; + sp_set_pin(PIN_RTS, val); } static void pony_bitbang_set_mosi(int val) { + if (pony_negate_mosi) + val ^= 1; + sp_set_pin(PIN_DTR, val); } static int pony_bitbang_get_miso(void) { - int tmp; + int tmp = sp_get_pin(PIN_CTS); - tmp = sp_get_pin(PIN_CTS); - - if (pony_type == TYPE_SERBANG) - { - /* MISO is negated by the SERBANG programmer. */ + if (pony_negate_miso) tmp ^= 1; - } + return tmp; } @@ -91,15 +105,17 @@ int pony_spi_init(void) { + int i, data_out; char *arg = NULL; - int i, data_in, data_out, have_device = 0; - int have_prog = 1; + enum pony_type type = TYPE_SI_PROG; + char *name; + int have_device = 0; + int have_prog = 0; - /* The parameter is on format "dev=/dev/device,type=serbang" */ + /* The parameter is in format "dev=/dev/device,type=serbang" */ arg = extract_programmer_param("dev"); - if (arg && strlen(arg)) { - sp_fd = sp_openserport( arg, 9600 ); + sp_fd = sp_openserport(arg, 9600); if (sp_fd < 0) { free(arg); return 1; @@ -110,51 +126,88 @@ if (!have_device) { msg_perr("Error: No valid device specified.\n" - "Use flashrom -p pony_spi:dev=/dev/device\n"); - + "Use flashrom -p pony_spi:dev=/dev/device[,type=name]\n"); return 1; } - /* Register the shutdown callback. */ - if (register_shutdown(serialport_shutdown, NULL)) { + + arg = extract_programmer_param("type"); + if (arg && !strcasecmp(arg, "serbang")) { + type = TYPE_SERBANG; + } else if (arg && !strcasecmp(arg, "si_prog")) { + type = TYPE_SI_PROG; + } else if (arg && !strcasecmp( arg, "ajawe")) { + type = TYPE_AJAWE; + } else if (arg && !strlen(arg)) { + msg_perr("Error: Missing argument for programmer type.\n"); + free(arg); + } else if (arg){ + msg_perr("Error: Invalid programmer type specified.\n"); + free(arg); return 1; } - arg = extract_programmer_param("type"); + free(arg); - if (arg) { - if (!strcasecmp( arg, "serbang")) { - pony_type = TYPE_SERBANG; - } else if (!strcasecmp( arg, "si_prog") ) { - pony_type = TYPE_SI_PROG; - } else { - msg_perr("Error: Invalid programmer type specified.\n"); - free(arg); - return 1; - } + /* + * Configure the serial port pins, depending on the used programmer. + */ + switch (type) { + case TYPE_AJAWE: + pony_negate_cs = 1; + pony_negate_sck = 1; + pony_negate_mosi = 1; + pony_negate_miso = 1; + name = "AJAWe"; + break; + case TYPE_SERBANG: + pony_negate_cs = 0; + pony_negate_sck = 0; + pony_negate_mosi = 0; + pony_negate_miso = 1; + name = "serbang"; + break; + default: + case TYPE_SI_PROG: + pony_negate_cs = 1; + pony_negate_sck = 0; + pony_negate_mosi = 0; + pony_negate_miso = 0; + name = "SI-Prog"; + break; } - free(arg); + msg_pdbg("Using %s programmer pinout.\n", name); - msg_pdbg("Using the %s programmer.\n", ((pony_type == TYPE_SI_PROG ) ? "SI-Prog" : "SERBANG")); /* - * Detect if there is a SI-Prog compatible programmer connected. + * Detect if there is a compatible hardware programmer connected. */ pony_bitbang_set_cs(1); + pony_bitbang_set_sck(1); pony_bitbang_set_mosi(1); - /* We toggle SCK while we keep MOSI and CS# on. */ - for (i = 1; i <= 10; ++i) { - data_out = i & 1; - sp_set_pin(PIN_RTS, data_out); - programmer_delay( 1000 ); - data_in = sp_get_pin(PIN_DSR); - - if (data_out != data_in) { - have_prog = 0; - break; + switch (type) { + case TYPE_AJAWE: + have_prog = 1; + break; + case TYPE_SI_PROG: + case TYPE_SERBANG: + default: + have_prog = 1; + /* We toggle RTS/SCK a few times and see if DSR changes too. */ + for (i = 1; i <= 10; i++) { + data_out = i & 1; + sp_set_pin(PIN_RTS, data_out); + programmer_delay(1000); + + /* If DSR does not change, we are not connected to what we think */ + if (data_out != sp_get_pin(PIN_DSR)) { + have_prog = 0; + break; + } } + break; } if (!have_prog) { - msg_perr( "No SI-Prog compatible hardware detected.\n" ); + msg_perr("No programmer compatible with %s detected.\n", name); return 1; } Modified: trunk/print.c ============================================================================== --- trunk/print.c Thu Aug 30 23:41:00 2012 (r1589) +++ trunk/print.c Sat Sep 1 23:32:04 2012 (r1590) @@ -520,7 +520,7 @@ msg_ginfo("\nSupported devices for the %s programmer:\n", programmer_table[PROGRAMMER_PONY_SPI].name); /* FIXME */ - msg_ginfo("SI-Prog and SERBANG serial port programmer\n"); + msg_ginfo("SI-Prog, serbang and AJAWe serial port programmers\n"); #endif #if CONFIG_NICINTEL == 1 msg_ginfo("\nSupported devices for the %s programmer:\n",

1 0

Re: [flashrom] [PATCH] Add support for AJAWe to pony_spi.
by Stefan Tauner 01 Sep '12

01 Sep '12

On Sat, 1 Sep 2012 16:55:03 +0200 Virgil-Adrian Teaca <darkstarlinux(a)gmail.com> wrote: > Talking about the function DSR, in the AJAWe programmer, I think that > the Zenner diode D5 is labeled wrong. In fact, the circuit makes sense > only if we assume that DSR is high when the supply voltage VCC reaches > a level of 3V. i would agree, but i dont see it (it might make sense to look at the PCB instead of the schematic to understand it, but i am way too lazy :). > In other words, the DSR is used to signal that the circuit power, and > he can work properly. And it seems that the original programmer made > the same assumption. what do you mean with the original programmer? did you disassemble the original software? > > My patch check the DSR to emulate the original programmer operation. this is your code: … /* The AJAWe serial programmer just have DSR off when it is active. */ data_in = sp_get_pin(PIN_DSR); if(data_in) { have_prog = 0; } if (!have_prog) { msg_perr("No compatible %s programmer detected.\n", ((pony_type == TYPE_AJAWE) ? "AJAWe" : "SI-Prog")); return 1; } i read that as if (DSR == high) then no ajawe attached. correct me please if that is wrong. if it would be if (DSR == low)... then i would agree with you that it is the most plausible configuration, but your code does not make sense to me. since we can not test or verify it otherwise, i will disable the detection for now as posted. we can add it later if need be and we find out how it really is supposed to work. thanks for looking at the changes and your initial patch! -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

2 1

[PATCH] Fix compilation with MinGW.
by Stefan Tauner 01 Sep '12

01 Sep '12

This was broken since r1557 when we got rid of some exit calls, but returned -1 instead which is not a valid HANDLE value. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- programmer.h | 2 ++ serial.c | 14 +++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/programmer.h b/programmer.h index 303fbc4..51b9c40 100644 --- a/programmer.h +++ b/programmer.h @@ -636,8 +636,10 @@ void serprog_delay(int usecs); /* serial.c */ #ifdef _WIN32 typedef HANDLE fdtype; +#define SER_INV_FD INVALID_HANDLE_VALUE #else typedef int fdtype; +#define SER_INV_FD -1 #endif void sp_flush_incoming(void); diff --git a/serial.c b/serial.c index 7443a3c..05c7d04 100644 --- a/serial.c +++ b/serial.c @@ -115,7 +115,7 @@ fdtype sp_openserport(char *dev, unsigned int baud) dev2 = malloc(strlen(dev) + 5); if (!dev2) { msg_perr("Error: Out of memory: %s\n", strerror(errno)); - return -1; + return SER_INV_FD; } strcpy(dev2, "\\\\.\\"); strcpy(dev2 + 4, dev); @@ -126,12 +126,12 @@ fdtype sp_openserport(char *dev, unsigned int baud) free(dev2); if (fd == INVALID_HANDLE_VALUE) { msg_perr("Error: cannot open serial port: %s\n", strerror(errno)); - return -1; + return SER_INV_FD; } DCB dcb; if (!GetCommState(fd, &dcb)) { msg_perr("Error: Could not fetch serial port configuration: %s\n", strerror(errno)); - return -1; + return SER_INV_FD; } switch (baud) { case 9600: dcb.BaudRate = CBR_9600; break; @@ -140,14 +140,14 @@ fdtype sp_openserport(char *dev, unsigned int baud) case 57600: dcb.BaudRate = CBR_57600; break; case 115200: dcb.BaudRate = CBR_115200; break; default: msg_perr("Error: Could not set baud rate: %s\n", strerror(errno)); - return -1; + return SER_INV_FD; } dcb.ByteSize = 8; dcb.Parity = NOPARITY; dcb.StopBits = ONESTOPBIT; if (!SetCommState(fd, &dcb)) { msg_perr("Error: Could not change serial port configuration: %s\n", strerror(errno)); - return -1; + return SER_INV_FD; } return fd; #else @@ -156,7 +156,7 @@ fdtype sp_openserport(char *dev, unsigned int baud) fd = open(dev, O_RDWR | O_NOCTTY | O_NDELAY); if (fd < 0) { msg_perr("Error: cannot open serial port: %s\n", strerror(errno)); - return -1; + return SER_INV_FD; } fcntl(fd, F_SETFL, 0); tcgetattr(fd, &options); @@ -164,7 +164,7 @@ fdtype sp_openserport(char *dev, unsigned int baud) if (sp_baudtable[i].baud == 0) { close(fd); msg_perr("Error: cannot configure for baudrate %d\n", baud); - return -1; + return SER_INV_FD; } if (sp_baudtable[i].baud == baud) { cfsetispeed(&options, sp_baudtable[i].flag); -- Kind regards, Stefan Tauner

1 0

Re: [flashrom] [PATCH] Add support for AJAWe to pony_spi.
by Virgil-Adrian Teaca 01 Sep '12

01 Sep '12

Talking about the function DSR, in the AJAWe programmer, I think that the Zenner diode D5 is labeled wrong. In fact, the circuit makes sense only if we assume that DSR is high when the supply voltage VCC reaches a level of 3V. In other words, the DSR is used to signal that the circuit power, and he can work properly. And it seems that the original programmer made the same assumption. My patch check the DSR to emulate the original programmer operation. Of course, there is nothing wrong if we assume that the programmer AJAWe is permanently connected, because the DSR status check isn't, however, a very good method for identifying the used programmer. And, yes, I agree with your changes. All the best, Virgil-Adrian. On Fri, Aug 31, 2012 at 10:40 AM, Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> wrote: > http://www.ajawe.pl/ajawe0208.htm > http://www.ajawe.pl/files/0208_R_DOK.pdf > > First version was > Signed-off-by: Virgil-Adrian Teaca <darkstarlinux(a)gmail.com> > Refinements and general cleanup is > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> > --- > Virgil: could you please take a look at this and maybe even test it? > i have changed a few bits of your patch, most of it shouldnt change > behavior, with one major exception: > AJAWe is always assumed to be attached. this should not be a big issue > the worst thing that could happen is that we toggle a few bits of an > unknown device, but OTOH even if your detection would work it is not > really safe, but just a good guess (this also applies to some extent to > the SI-Prog detection). > > if i interpret the AJAWe schematic correctly, then it sets pin 6 (DSR) > high if there is too much voltage on VCC and low otherwise. it does > so by two times inverting the voltage level that remains after > subtracting 3.3V (with the zener diode D5) from VCC. the trigger > voltage of the schmitt triggers is about 2V, so this would result DSR > being high only if the voltage rises above abot 5.3V. this looks more > like an overvoltage signaling than a power inidicator to me. > OTOH i am bad at electronics... we need to check this with someone > who knows what he is doing :) > > pony_spi.c | 171 +++++++++++++++++++++++++++++++++++++++--------------------- > print.c | 2 +- > 2 files changed, 113 insertions(+), 60 deletions(-) > > diff --git a/pony_spi.c b/pony_spi.c > index fb90a33..7875200 100644 > --- a/pony_spi.c > +++ b/pony_spi.c > @@ -17,8 +17,27 @@ > * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA > */ > > -/* Driver for the SI-Prog like hardware by Lancos.com. > - * See http://www.lancos.com/siprogsch.html for schematics and instructions. > +/* Driver for serial programmers compatible with SI-Prog or AJAWe. > + * > + * See http://www.lancos.com/siprogsch.html for SI-Prog schematics and instructions. > + * See http://www.ajawe.pl/ajawe0208.htm for AJAWe serial programmer documentation. > + * > + * Pin layout for SI-Prog-like hardware: > + * > + * MOSI <-------< DTR > + * MISO >-------> CTS > + * SCK <---+---< RTS > + * +---> DSR > + * CS# <-------< TXD > + * > + * and for the AJAWe serial programmer: > + * > + * MOSI <-------< DTR > + * MISO >-------> CTS > + * SCK <-------< RTS > + * CS# <-------< TXD > + * > + * DCE >-------> DSR > */ > > #include <stdlib.h> > @@ -28,55 +47,50 @@ > #include "flash.h" > #include "programmer.h" > > -/* We have: > - > - MOSI -----> DTR > - MISO -----> CTS > - SCK --+--> RTS > - +--> DSR > - CS# -----> TXD > - > -*/ > - > enum pony_type { > TYPE_SI_PROG, > TYPE_SERBANG, > + TYPE_AJAWE > }; > > -/* The hardware programmer used. */ > -static enum pony_type pony_type = TYPE_SI_PROG; > +/* Pins for master->slave direction */ > +static int pony_negate_cs = 1; > +static int pony_negate_sck = 0; > +static int pony_negate_mosi = 0; > +/* Pins for slave->master direction */ > +static int pony_negate_miso = 0; > > static void pony_bitbang_set_cs(int val) > { > - if (pony_type == TYPE_SI_PROG) > - { > - /* CS# is negated by the SI-Prog programmer. */ > + if (pony_negate_cs) > val ^= 1; > - } > + > sp_set_pin(PIN_TXD, val); > } > > static void pony_bitbang_set_sck(int val) > { > + if (pony_negate_sck) > + val ^= 1; > + > sp_set_pin(PIN_RTS, val); > } > > static void pony_bitbang_set_mosi(int val) > { > + if (pony_negate_mosi) > + val ^= 1; > + > sp_set_pin(PIN_DTR, val); > } > > static int pony_bitbang_get_miso(void) > { > - int tmp; > - > - tmp = sp_get_pin(PIN_CTS); > + int tmp = sp_get_pin(PIN_CTS); > > - if (pony_type == TYPE_SERBANG) > - { > - /* MISO is negated by the SERBANG programmer. */ > + if (pony_negate_miso) > tmp ^= 1; > - } > + > return tmp; > } > > @@ -91,15 +105,17 @@ static const struct bitbang_spi_master bitbang_spi_master_pony = { > > int pony_spi_init(void) > { > + int i, data_out; > char *arg = NULL; > - int i, data_in, data_out, have_device = 0; > - int have_prog = 1; > + enum pony_type type = TYPE_SI_PROG; > + char *name; > + int have_device = 0; > + int have_prog = 0; > > - /* The parameter is on format "dev=/dev/device,type=serbang" */ > + /* The parameter is in format "dev=/dev/device,type=serbang" */ > arg = extract_programmer_param("dev"); > - > if (arg && strlen(arg)) { > - sp_fd = sp_openserport( arg, 9600 ); > + sp_fd = sp_openserport(arg, 9600); > if (sp_fd < 0) { > free(arg); > return 1; > @@ -110,51 +126,88 @@ int pony_spi_init(void) > > if (!have_device) { > msg_perr("Error: No valid device specified.\n" > - "Use flashrom -p pony_spi:dev=/dev/device\n"); > - > + "Use flashrom -p pony_spi:dev=/dev/device[,type=name]\n"); > return 1; > } > - /* Register the shutdown callback. */ > - if (register_shutdown(serialport_shutdown, NULL)) { > + > + arg = extract_programmer_param("type"); > + if (arg && !strcasecmp(arg, "serbang")) { > + type = TYPE_SERBANG; > + } else if (arg && !strcasecmp(arg, "si_prog")) { > + type = TYPE_SI_PROG; > + } else if (arg && !strcasecmp( arg, "ajawe")) { > + type = TYPE_AJAWE; > + } else if (arg && !strlen(arg)) { > + msg_perr("Error: Missing argument for programmer type.\n"); > + free(arg); > + } else if (arg){ > + msg_perr("Error: Invalid programmer type specified.\n"); > + free(arg); > return 1; > } > - arg = extract_programmer_param("type"); > + free(arg); > > - if (arg) { > - if (!strcasecmp( arg, "serbang")) { > - pony_type = TYPE_SERBANG; > - } else if (!strcasecmp( arg, "si_prog") ) { > - pony_type = TYPE_SI_PROG; > - } else { > - msg_perr("Error: Invalid programmer type specified.\n"); > - free(arg); > - return 1; > - } > + /* > + * Configure the serial port pins, depending on the used programmer. > + */ > + switch (type) { > + case TYPE_AJAWE: > + pony_negate_cs = 1; > + pony_negate_sck = 1; > + pony_negate_mosi = 1; > + pony_negate_miso = 1; > + name = "AJAWe"; > + break; > + case TYPE_SERBANG: > + pony_negate_cs = 0; > + pony_negate_sck = 0; > + pony_negate_mosi = 0; > + pony_negate_miso = 1; > + name = "serbang"; > + break; > + default: > + case TYPE_SI_PROG: > + pony_negate_cs = 1; > + pony_negate_sck = 0; > + pony_negate_mosi = 0; > + pony_negate_miso = 0; > + name = "SI-Prog"; > + break; > } > - free(arg); > + msg_pdbg("Using %s programmer pinout.\n", name); > > - msg_pdbg("Using the %s programmer.\n", ((pony_type == TYPE_SI_PROG ) ? "SI-Prog" : "SERBANG")); > /* > - * Detect if there is a SI-Prog compatible programmer connected. > + * Detect if there is a compatible hardware programmer connected. > */ > pony_bitbang_set_cs(1); > + pony_bitbang_set_sck(1); > pony_bitbang_set_mosi(1); > > - /* We toggle SCK while we keep MOSI and CS# on. */ > - for (i = 1; i <= 10; ++i) { > - data_out = i & 1; > - sp_set_pin(PIN_RTS, data_out); > - programmer_delay( 1000 ); > - data_in = sp_get_pin(PIN_DSR); > - > - if (data_out != data_in) { > - have_prog = 0; > - break; > + switch (type) { > + case TYPE_AJAWE: > + have_prog = 1; > + break; > + case TYPE_SI_PROG: > + case TYPE_SERBANG: > + default: > + have_prog = 1; > + /* We toggle RTS/SCK a few times and see if DSR changes too. */ > + for (i = 1; i <= 10; i++) { > + data_out = i & 1; > + sp_set_pin(PIN_RTS, data_out); > + programmer_delay(1000); > + > + /* If DSR does not change, we are not connected to what we think */ > + if (data_out != sp_get_pin(PIN_DSR)) { > + have_prog = 0; > + break; > + } > } > + break; > } > > if (!have_prog) { > - msg_perr( "No SI-Prog compatible hardware detected.\n" ); > + msg_perr("No programmer compatible with %s detected.\n", name); > return 1; > } > > diff --git a/print.c b/print.c > index f0cd753..ae067a6 100644 > --- a/print.c > +++ b/print.c > @@ -520,7 +520,7 @@ void print_supported(void) > msg_ginfo("\nSupported devices for the %s programmer:\n", > programmer_table[PROGRAMMER_PONY_SPI].name); > /* FIXME */ > - msg_ginfo("SI-Prog and SERBANG serial port programmer\n"); > + msg_ginfo("SI-Prog, serbang and AJAWe serial port programmers\n"); > #endif > #if CONFIG_NICINTEL == 1 > msg_ginfo("\nSupported devices for the %s programmer:\n", > -- > Kind regards, Stefan Tauner >

1 0

[PATCH] Add support for AJAWe to pony_spi.
by Stefan Tauner 31 Aug '12

31 Aug '12

http://www.ajawe.pl/ajawe0208.htm http://www.ajawe.pl/files/0208_R_DOK.pdf First version was Signed-off-by: Virgil-Adrian Teaca <darkstarlinux(a)gmail.com> Refinements and general cleanup is Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- Virgil: could you please take a look at this and maybe even test it? i have changed a few bits of your patch, most of it shouldnt change behavior, with one major exception: AJAWe is always assumed to be attached. this should not be a big issue the worst thing that could happen is that we toggle a few bits of an unknown device, but OTOH even if your detection would work it is not really safe, but just a good guess (this also applies to some extent to the SI-Prog detection). if i interpret the AJAWe schematic correctly, then it sets pin 6 (DSR) high if there is too much voltage on VCC and low otherwise. it does so by two times inverting the voltage level that remains after subtracting 3.3V (with the zener diode D5) from VCC. the trigger voltage of the schmitt triggers is about 2V, so this would result DSR being high only if the voltage rises above abot 5.3V. this looks more like an overvoltage signaling than a power inidicator to me. OTOH i am bad at electronics... we need to check this with someone who knows what he is doing :) pony_spi.c | 171 +++++++++++++++++++++++++++++++++++++++--------------------- print.c | 2 +- 2 files changed, 113 insertions(+), 60 deletions(-) diff --git a/pony_spi.c b/pony_spi.c index fb90a33..7875200 100644 --- a/pony_spi.c +++ b/pony_spi.c @@ -17,8 +17,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -/* Driver for the SI-Prog like hardware by Lancos.com. - * See http://www.lancos.com/siprogsch.html for schematics and instructions. +/* Driver for serial programmers compatible with SI-Prog or AJAWe. + * + * See http://www.lancos.com/siprogsch.html for SI-Prog schematics and instructions. + * See http://www.ajawe.pl/ajawe0208.htm for AJAWe serial programmer documentation. + * + * Pin layout for SI-Prog-like hardware: + * + * MOSI <-------< DTR + * MISO >-------> CTS + * SCK <---+---< RTS + * +---> DSR + * CS# <-------< TXD + * + * and for the AJAWe serial programmer: + * + * MOSI <-------< DTR + * MISO >-------> CTS + * SCK <-------< RTS + * CS# <-------< TXD + * + * DCE >-------> DSR */ #include <stdlib.h> @@ -28,55 +47,50 @@ #include "flash.h" #include "programmer.h" -/* We have: - - MOSI -----> DTR - MISO -----> CTS - SCK --+--> RTS - +--> DSR - CS# -----> TXD - -*/ - enum pony_type { TYPE_SI_PROG, TYPE_SERBANG, + TYPE_AJAWE }; -/* The hardware programmer used. */ -static enum pony_type pony_type = TYPE_SI_PROG; +/* Pins for master->slave direction */ +static int pony_negate_cs = 1; +static int pony_negate_sck = 0; +static int pony_negate_mosi = 0; +/* Pins for slave->master direction */ +static int pony_negate_miso = 0; static void pony_bitbang_set_cs(int val) { - if (pony_type == TYPE_SI_PROG) - { - /* CS# is negated by the SI-Prog programmer. */ + if (pony_negate_cs) val ^= 1; - } + sp_set_pin(PIN_TXD, val); } static void pony_bitbang_set_sck(int val) { + if (pony_negate_sck) + val ^= 1; + sp_set_pin(PIN_RTS, val); } static void pony_bitbang_set_mosi(int val) { + if (pony_negate_mosi) + val ^= 1; + sp_set_pin(PIN_DTR, val); } static int pony_bitbang_get_miso(void) { - int tmp; - - tmp = sp_get_pin(PIN_CTS); + int tmp = sp_get_pin(PIN_CTS); - if (pony_type == TYPE_SERBANG) - { - /* MISO is negated by the SERBANG programmer. */ + if (pony_negate_miso) tmp ^= 1; - } + return tmp; } @@ -91,15 +105,17 @@ static const struct bitbang_spi_master bitbang_spi_master_pony = { int pony_spi_init(void) { + int i, data_out; char *arg = NULL; - int i, data_in, data_out, have_device = 0; - int have_prog = 1; + enum pony_type type = TYPE_SI_PROG; + char *name; + int have_device = 0; + int have_prog = 0; - /* The parameter is on format "dev=/dev/device,type=serbang" */ + /* The parameter is in format "dev=/dev/device,type=serbang" */ arg = extract_programmer_param("dev"); - if (arg && strlen(arg)) { - sp_fd = sp_openserport( arg, 9600 ); + sp_fd = sp_openserport(arg, 9600); if (sp_fd < 0) { free(arg); return 1; @@ -110,51 +126,88 @@ int pony_spi_init(void) if (!have_device) { msg_perr("Error: No valid device specified.\n" - "Use flashrom -p pony_spi:dev=/dev/device\n"); - + "Use flashrom -p pony_spi:dev=/dev/device[,type=name]\n"); return 1; } - /* Register the shutdown callback. */ - if (register_shutdown(serialport_shutdown, NULL)) { + + arg = extract_programmer_param("type"); + if (arg && !strcasecmp(arg, "serbang")) { + type = TYPE_SERBANG; + } else if (arg && !strcasecmp(arg, "si_prog")) { + type = TYPE_SI_PROG; + } else if (arg && !strcasecmp( arg, "ajawe")) { + type = TYPE_AJAWE; + } else if (arg && !strlen(arg)) { + msg_perr("Error: Missing argument for programmer type.\n"); + free(arg); + } else if (arg){ + msg_perr("Error: Invalid programmer type specified.\n"); + free(arg); return 1; } - arg = extract_programmer_param("type"); + free(arg); - if (arg) { - if (!strcasecmp( arg, "serbang")) { - pony_type = TYPE_SERBANG; - } else if (!strcasecmp( arg, "si_prog") ) { - pony_type = TYPE_SI_PROG; - } else { - msg_perr("Error: Invalid programmer type specified.\n"); - free(arg); - return 1; - } + /* + * Configure the serial port pins, depending on the used programmer. + */ + switch (type) { + case TYPE_AJAWE: + pony_negate_cs = 1; + pony_negate_sck = 1; + pony_negate_mosi = 1; + pony_negate_miso = 1; + name = "AJAWe"; + break; + case TYPE_SERBANG: + pony_negate_cs = 0; + pony_negate_sck = 0; + pony_negate_mosi = 0; + pony_negate_miso = 1; + name = "serbang"; + break; + default: + case TYPE_SI_PROG: + pony_negate_cs = 1; + pony_negate_sck = 0; + pony_negate_mosi = 0; + pony_negate_miso = 0; + name = "SI-Prog"; + break; } - free(arg); + msg_pdbg("Using %s programmer pinout.\n", name); - msg_pdbg("Using the %s programmer.\n", ((pony_type == TYPE_SI_PROG ) ? "SI-Prog" : "SERBANG")); /* - * Detect if there is a SI-Prog compatible programmer connected. + * Detect if there is a compatible hardware programmer connected. */ pony_bitbang_set_cs(1); + pony_bitbang_set_sck(1); pony_bitbang_set_mosi(1); - /* We toggle SCK while we keep MOSI and CS# on. */ - for (i = 1; i <= 10; ++i) { - data_out = i & 1; - sp_set_pin(PIN_RTS, data_out); - programmer_delay( 1000 ); - data_in = sp_get_pin(PIN_DSR); - - if (data_out != data_in) { - have_prog = 0; - break; + switch (type) { + case TYPE_AJAWE: + have_prog = 1; + break; + case TYPE_SI_PROG: + case TYPE_SERBANG: + default: + have_prog = 1; + /* We toggle RTS/SCK a few times and see if DSR changes too. */ + for (i = 1; i <= 10; i++) { + data_out = i & 1; + sp_set_pin(PIN_RTS, data_out); + programmer_delay(1000); + + /* If DSR does not change, we are not connected to what we think */ + if (data_out != sp_get_pin(PIN_DSR)) { + have_prog = 0; + break; + } } + break; } if (!have_prog) { - msg_perr( "No SI-Prog compatible hardware detected.\n" ); + msg_perr("No programmer compatible with %s detected.\n", name); return 1; } diff --git a/print.c b/print.c index f0cd753..ae067a6 100644 --- a/print.c +++ b/print.c @@ -520,7 +520,7 @@ void print_supported(void) msg_ginfo("\nSupported devices for the %s programmer:\n", programmer_table[PROGRAMMER_PONY_SPI].name); /* FIXME */ - msg_ginfo("SI-Prog and SERBANG serial port programmer\n"); + msg_ginfo("SI-Prog, serbang and AJAWe serial port programmers\n"); #endif #if CONFIG_NICINTEL == 1 msg_ginfo("\nSupported devices for the %s programmer:\n", -- Kind regards, Stefan Tauner

1 0

Re: [flashrom] [PATCH] Add support for generic SPI RES matching.
by Carl-Daniel Hailfinger 31 Aug '12

31 Aug '12

Am 30.08.2012 23:55 schrieb Stefan Tauner: > Support generic 1-byte SPI RES matching (low match quality) and enable > read support by guessing the chip size from the ID. > Support generic 2-byte SPI RES matching (high match quality). > > Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> > --- > chipdrivers.h | 1 + > flashchips.c | 31 +++++++++++++++++++++++++++++ > flashrom.c | 4 +++- > spi25.c | 61 +++++++++++++++++++++++++++++++++++++++++++++------------ > 4 files changed, 84 insertions(+), 13 deletions(-) > > diff --git a/chipdrivers.h b/chipdrivers.h > index b43e16e..63c5d37 100644 > --- a/chipdrivers.h > +++ b/chipdrivers.h > @@ -33,6 +33,7 @@ int probe_spi_rdid4(struct flashctx *flash); > int probe_spi_rems(struct flashctx *flash); > int probe_spi_res1(struct flashctx *flash); > int probe_spi_res2(struct flashctx *flash); > +int probe_spi_automagic_res1(struct flashctx *flash); > int spi_write_enable(struct flashctx *flash); > int spi_write_disable(struct flashctx *flash); > int spi_block_erase_20(struct flashctx *flash, unsigned int addr, unsigned int blocklen); > diff --git a/flashchips.c b/flashchips.c > index 8fe50bd..c175108 100644 > --- a/flashchips.c > +++ b/flashchips.c > @@ -9662,6 +9662,24 @@ const struct flashchip flashchips[] = { > > { > .vendor = "Generic", > + .name = "unknown SPI chip (RES1)", > + .bustype = BUS_SPI, > + .manufacture_id = GENERIC_MANUF_ID, > + .model_id = GENERIC_DEVICE_ID, > + .total_size = 0, > + .page_size = 256, > + .tested = TEST_BAD_PREW, > + .probe = probe_spi_automagic_res1, > + .probe_timing = TIMING_ZERO, > + .block_erasers = {}, > + .unlock = spi_disable_blockprotect, Please kill the unlock here. AFAICS we have no way to determine how to unlock for a REMS1 chip. > + .write = NULL, > + .read = spi_chip_read, > + .voltage = {}, > + }, The RES1 chip should be below the RES2 chip to make sure the RES2 chip matches first (better match quality) and prevents RES1 matching if RES2 matches. > + > + { > + .vendor = "Generic", > .name = "unknown SPI chip (REMS)", > .bustype = BUS_SPI, > .manufacture_id = GENERIC_MANUF_ID, > @@ -9673,5 +9691,18 @@ const struct flashchip flashchips[] = { > .write = NULL, > }, > > + { > + .vendor = "Generic", > + .name = "unknown SPI chip (RES2)", > + .bustype = BUS_SPI, > + .manufacture_id = GENERIC_MANUF_ID, > + .model_id = GENERIC_DEVICE_ID, > + .total_size = 0, > + .page_size = 256, > + .tested = TEST_BAD_PREW, > + .probe = probe_spi_res2, > + .write = NULL, > + }, > + > { NULL } > }; > diff --git a/flashrom.c b/flashrom.c > index fdc5412..148f969 100644 > --- a/flashrom.c > +++ b/flashrom.c > @@ -1028,7 +1028,9 @@ int probe_flash(struct registered_programmer *pgm, int startchip, struct flashct > if (startchip == 0) > break; > /* Not the first flash chip detected on this bus, but not a generic match either. */ > - if ((flash->chip->model_id != GENERIC_DEVICE_ID) && (flash->chip->model_id != SFDP_DEVICE_ID)) > + if ((flash->chip->manufacture_id != GENERIC_MANUF_ID) && > + (flash->chip->model_id != GENERIC_DEVICE_ID) && > + (flash->chip->model_id != SFDP_DEVICE_ID)) > break; > /* Not the first flash chip detected on this bus, and it's just a generic match. Ignore it. */ > notfound: > diff --git a/spi25.c b/spi25.c > index 914b821..7d9e948 100644 > --- a/spi25.c > +++ b/spi25.c > @@ -232,6 +232,7 @@ int probe_spi_rems(struct flashctx *flash) > > int probe_spi_res1(struct flashctx *flash) > { > + const struct flashchip *chip = flash->chip; > static const unsigned char allff[] = {0xff, 0xff, 0xff}; > static const unsigned char all00[] = {0x00, 0x00, 0x00}; > unsigned char readarr[3]; > @@ -265,18 +266,23 @@ int probe_spi_res1(struct flashctx *flash) > > msg_cdbg("%s: id 0x%x\n", __func__, id2); > > - if (id2 != flash->chip->model_id) > - return 0; > + if (id2 == flash->chip->model_id) { my bad, this could have been simplified to use chip->model_id instead of flash->chip->model_id > + /* Print the status register to tell the user about possible write protection. */ > + spi_prettyprint_status_register(flash); > > - /* Print the status register to tell the > - * user about possible write protection. > - */ > - spi_prettyprint_status_register(flash); > - return 1; > + return 1; > + } > + > + /* Test if there is any device ID. */ > + if (GENERIC_MANUF_ID == chip->manufacture_id && id2 == chip->model_id) > + return 1; > + > + return 0; > } > > int probe_spi_res2(struct flashctx *flash) > { > + const struct flashchip *chip = flash->chip; > unsigned char readarr[2]; > uint32_t id1, id2; > > @@ -289,13 +295,44 @@ int probe_spi_res2(struct flashctx *flash) > > msg_cdbg("%s: id1 0x%x, id2 0x%x\n", __func__, id1, id2); > > - if (id1 != flash->chip->manufacture_id || id2 != flash->chip->model_id) > + if (id1 == chip->manufacture_id && id2 == chip->model_id) { > + /* Print the status register to tell the > + * user about possible write protection. > + */ > + spi_prettyprint_status_register(flash); > + > + return 1; > + } > + > + /* Test if this is a pure vendor match. */ > + if (id1 == chip->manufacture_id && GENERIC_DEVICE_ID == chip->model_id) > + return 1; > + > + /* Test if there is any vendor ID and if this is indeed a two-byte RES. */ > + if (GENERIC_MANUF_ID == chip->manufacture_id && id1 != 0xff && id1 != id2) > + return 1; > + > + return 0; > +} > + > +int probe_spi_automagic_res1(struct flashctx *flash) > +{ > + unsigned char readarr[1]; > + unsigned int total_size; > + uint32_t id1; IMHO we should check here that neither RDID nor REMS nor RES2 work before proceeding with RES1. > + > + if (spi_res(flash, readarr, 1)) > return 0; > > - /* Print the status register to tell the > - * user about possible write protection. > - */ > - spi_prettyprint_status_register(flash); > + id1 = readarr[0]; > + msg_cdbg("%s: id1 0x%02x\n", __func__, id1); > + if (id1 < 0x10 || id1 > 0x17) { > + msg_cdbg("RES ID out of bounds!\n"); > + return 0; > + } > + total_size = (2 << id1) / 1024; > + flash->chip->total_size = total_size; > + flash->chip->tested = TEST_OK_PR | TEST_BAD_ERASE | TEST_BAD_WRITE; > return 1; > } > I might have missed something, but right now I hope the review is complete. Regards, Carl-Daniel -- http://www.hailfinger.org/

2 1

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom