flashrom

flashrom@flashrom.org

6 participants
9100 discussions

Re: [flashrom] [commit] r772 - trunk
by Stefan Reinauer 24 Nov '09

24 Nov '09

svn(a)flashrom.org wrote: > +ifeq ($(CONFIG_BUSPIRATESPI), yes) > +FEATURE_CFLAGS += -D'BUSPIRATE_SPI_SUPPORT=1' > +OBJS += buspirate_spi.o > +endif > + > +# Ugly, but there's no elif/elseif. > ifeq ($(CONFIG_SERPROG), yes) > OBJS += serial.o > +else > +ifeq ($(CONFIG_BUSPIRATESPI), yes) > +OBJS += serial.o > endif > +endif how long before we see Kconfig? ;-)

2 1

[commit] r773 - trunk
by svn＠flashrom.org 24 Nov '09

24 Nov '09

Author: hailfinger Date: 2009-11-24 01:23:33 +0100 (Tue, 24 Nov 2009) New Revision: 773 Modified: trunk/Makefile Log: Revert debug compilation which was committed in r772 by accident. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2009-11-24 00:20:03 UTC (rev 772) +++ trunk/Makefile 2009-11-24 00:23:33 UTC (rev 773) @@ -25,7 +25,7 @@ DIFF = diff PREFIX ?= /usr/local MANDIR ?= $(PREFIX)/share/man -CFLAGS ?= -Os -Wall -Werror -g +CFLAGS ?= -Os -Wall -Werror EXPORTDIR ?= . OS_ARCH = $(shell uname)

1 0

Re: [flashrom] [PATCH] Bus Pirate SPI support in flashrom
by Sean Nelson 24 Nov '09

24 Nov '09

Patch with SPI mode init code. On Sat, Nov 21, 2009 at 2:50 AM, Sean Nelson <audiohacked(a)gmail.com> wrote: > Verbose log of flashrom-buspiratespi. > > On Fri, Nov 20, 2009 at 8:53 PM, Carl-Daniel Hailfinger > <c-d.hailfinger.devel.2006(a)gmx.net> wrote: >> Add Bus Pirate SPI support to flashrom. >> >> Untested, should work. >> >> Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> >> >> Index: flashrom-buspiratespi/flash.h >> =================================================================== >> --- flashrom-buspiratespi/flash.h (Revision 767) >> +++ flashrom-buspiratespi/flash.h (Arbeitskopie) >> @@ -104,6 +104,9 @@ >> #if SERPROG_SUPPORT == 1 >> PROGRAMMER_SERPROG, >> #endif >> +#if BUSPIRATE_SPI_SUPPORT == 1 >> + PROGRAMMER_BUSPIRATESPI, >> +#endif >> PROGRAMMER_INVALID /* This must always be the last entry. */ >> }; >> >> @@ -484,6 +487,12 @@ >> int bitbang_spi_read(struct flashchip *flash, uint8_t *buf, int start, int len); >> int bitbang_spi_write_256(struct flashchip *flash, uint8_t *buf); >> >> +/* buspirate_spi.c */ >> +int buspirate_spi_init(void); >> +int buspirate_spi_shutdown(void); >> +int buspirate_spi_send_command(unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); >> +int buspirate_spi_read(struct flashchip *flash, uint8_t *buf, int start, int len); >> + >> /* flashrom.c */ >> extern char *programmer_param; >> extern int verbose; >> @@ -527,6 +536,9 @@ >> #if DUMMY_SUPPORT == 1 >> SPI_CONTROLLER_DUMMY, >> #endif >> +#if BUSPIRATE_SPI_SUPPORT == 1 >> + SPI_CONTROLLER_BUSPIRATE, >> +#endif >> SPI_CONTROLLER_INVALID /* This must always be the last entry. */ >> }; >> extern const int spi_programmer_count; >> @@ -736,5 +748,8 @@ >> uint8_t serprog_chip_readb(const chipaddr addr); >> void serprog_chip_readn(uint8_t *buf, const chipaddr addr, size_t len); >> void serprog_delay(int delay); >> +void sp_flush_incoming(void); >> +int sp_openserport(char *dev, unsigned int baud); >> +extern int sp_fd; >> >> #endif /* !__FLASH_H__ */ >> Index: flashrom-buspiratespi/buspirate_spi.c >> =================================================================== >> --- flashrom-buspiratespi/buspirate_spi.c (Revision 0) >> +++ flashrom-buspiratespi/buspirate_spi.c (Revision 0) >> @@ -0,0 +1,317 @@ >> +/* >> + * This file is part of the flashrom project. >> + * >> + * Copyright (C) 2009 Carl-Daniel Hailfinger >> + * >> + * This program is free software; you can redistribute it and/or modify >> + * it under the terms of the GNU General Public License as published by >> + * the Free Software Foundation; version 2 of the License. >> + * >> + * This program is distributed in the hope that it will be useful, >> + * but WITHOUT ANY WARRANTY; without even the implied warranty of >> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >> + * GNU General Public License for more details. >> + * >> + * You should have received a copy of the GNU General Public License >> + * along with this program; if not, write to the Free Software >> + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA >> + */ >> + >> +#include <stdio.h> >> +#include <stdint.h> >> +#include <string.h> >> +#include <stdlib.h> >> +#include <ctype.h> >> +#include <fcntl.h> >> +#include "flash.h" >> +#include "spi.h" >> + >> +int buspirate_serialport_setup(char *dev) >> +{ >> + /* 115200bps, 8 databits, no parity, 1 stopbit */ >> + sp_fd = sp_openserport(dev, 115200); >> + return 0; >> +} >> + >> +int buspirate_serialport_shutdown(void) >> +{ >> + close(sp_fd); >> + return 0; >> +} >> + >> +int serialport_write(unsigned char *buf, unsigned int writecnt) >> +{ >> + int tmp = 0; >> + >> + while (tmp != writecnt) { >> + tmp = write(sp_fd, buf + tmp, writecnt - tmp); >> + if (tmp == -1) >> + return 1; >> + if (!tmp) >> + printf_debug("Empty write\n"); >> + } >> + >> + return 0; >> +} >> + >> +int serialport_read(unsigned char *buf, unsigned int readcnt) >> +{ >> + int tmp = 0; >> + >> + while (tmp != readcnt) { >> + tmp = read(sp_fd, buf + tmp, readcnt - tmp); >> + if (tmp == -1) >> + return 1; >> + if (!tmp) >> + printf_debug("Empty read\n"); >> + } >> + >> + return 0; >> +} >> + >> +int buspirate_discard_read(void) >> +{ >> + int flags; >> + >> + printf_debug("%s\n", __func__); >> + flags = fcntl(sp_fd, F_GETFL); >> + flags |= O_NONBLOCK; >> + fcntl(sp_fd, F_SETFL, flags); >> + sp_flush_incoming(); >> + flags &= ~O_NONBLOCK; >> + fcntl(sp_fd, F_SETFL, flags); >> + >> + return 0; >> +} >> + >> +#undef FAKE_COMMUNICATION >> +int buspirate_sendrecv(unsigned char *buf, unsigned int writecnt, unsigned int readcnt) >> +{ >> + int i, ret = 0; >> + >> + printf_debug("%s: write %i, read %i\n", __func__, writecnt, readcnt); >> + if (!writecnt && !readcnt) { >> + fprintf(stderr, "Zero length command!\n"); >> + return 1; >> + } >> + printf_debug("Sending"); >> + for (i = 0; i < writecnt; i++) >> + printf_debug(" 0x%02x", buf[i]); >> +#ifdef FAKE_COMMUNICATION >> + /* Placate the caller for now. */ >> + buf[0] = 0x01; >> + memset(buf + 1, 0xff, readcnt - 1); >> + ret = 0; >> +#else >> + if (writecnt) >> + ret = serialport_write(buf, writecnt); >> + if (ret) >> + return ret; >> + if (readcnt) >> + ret = serialport_read(buf, readcnt); >> + if (ret) >> + return ret; >> +#endif >> + printf_debug(", receiving"); >> + for (i = 0; i < readcnt; i++) >> + printf_debug(" 0x%02x", buf[i]); >> + printf_debug("\n"); >> + return 0; >> +} >> + >> +int buspirate_spi_init(void) >> +{ >> + unsigned char buf[512]; >> + int ret = 0; >> + int i; >> + char *devpos = NULL; >> + char *dev = NULL; >> + int devlen; >> + >> + if (programmer_param && !strlen(programmer_param)) { >> + free(programmer_param); >> + programmer_param = NULL; >> + } >> + if (programmer_param) { >> + devpos = strstr(programmer_param, "dev="); >> + if (devpos) { >> + devpos += 4; >> + devlen = strcspn(devpos, ",:"); >> + if (devlen) { >> + dev = malloc(devlen + 1); >> + if (!dev) { >> + fprintf(stderr, "Out of memory!\n"); >> + exit(1); >> + } >> + strncpy(dev, devpos, devlen); >> + dev[devlen] = '\0'; >> + } >> + } >> + free(programmer_param); >> + programmer_param = NULL; >> + } >> + if (!dev) { >> + fprintf(stderr, "No serial device given. Use flashrom -p " >> + "buspiratespi:dev=/dev/ttyUSB0\n"); >> + return 1; >> + } >> + >> + ret = buspirate_serialport_setup(dev); >> + if (ret) >> + return ret; >> + >> + /* This is the brute force version, but it should work. */ >> + for (i = 0; i < 19; i++) { >> + /* Enter raw bitbang mode */ >> + buf[0] = 0x00; >> + /* Send the command, don't read the response. */ >> + ret = buspirate_sendrecv(buf, 1, 0); >> + if (ret) >> + return ret; >> + /* Read any response and discard it. */ >> + ret = buspirate_discard_read(); >> + if (ret) >> + return ret; >> + } >> + /* Enter raw bitbang mode */ >> + buf[0] = 0x00; >> + ret = buspirate_sendrecv(buf, 1, 5); >> + if (ret) >> + return ret; >> + if (memcmp(buf, "BBIO", 4)) { >> + fprintf(stderr, "Entering raw bitbang mode failed!\n"); >> + return 1; >> + } >> + printf_debug("Raw bitbang mode version %c\n", buf[4]); >> + if (buf[4] != '1') { >> + fprintf(stderr, "Can't handle raw bitbang mode version %c!\n", >> + buf[4]); >> + return 1; >> + } >> + /* Enter raw SPI mode */ >> + buf[0] = 0x01; >> + ret = buspirate_sendrecv(buf, 1, 4); >> + if (memcmp(buf, "SPI", 3)) { >> + fprintf(stderr, "Entering raw SPI mode failed!\n"); >> + return 1; >> + } >> + printf_debug("Raw SPI mode version %c\n", buf[3]); >> + if (buf[3] != '1') { >> + fprintf(stderr, "Can't handle raw SPI mode version %c!\n", >> + buf[3]); >> + return 1; >> + } >> + >> + /* Initial setup: Enable power, */ >> + /* De-assert CS# */ >> + buf[0] = 0x03; >> + ret = buspirate_sendrecv(buf, 1, 1); >> + if (ret) >> + return 1; >> + if (buf[0] != 0x01) { >> + fprintf(stderr, "Protocol error!\n"); >> + return 1; >> + } >> + >> + buses_supported = CHIP_BUSTYPE_SPI; >> + spi_controller = SPI_CONTROLLER_BUSPIRATE; >> + >> + return 0; >> +} >> + >> +int buspirate_spi_shutdown(void) >> +{ >> + unsigned char buf[5]; >> + int ret = 0; >> + >> + /* Exit raw SPI mode (enter raw bitbang mode) */ >> + buf[0] = 0x00; >> + ret = buspirate_sendrecv(buf, 1, 5); >> + if (ret) >> + return ret; >> + if (memcmp(buf, "BBIO", 4)) { >> + fprintf(stderr, "Entering raw bitbang mode failed!\n"); >> + return 1; >> + } >> + printf_debug("Raw bitbang mode version %c\n", buf[4]); >> + if (buf[4] != '1') { >> + fprintf(stderr, "Can't handle raw bitbang mode version %c!\n", >> + buf[4]); >> + return 1; >> + } >> + /* Reset Bus Pirate (return to user terminal) */ >> + buf[0] = 0x0f; >> + ret = buspirate_sendrecv(buf, 1, 0); >> + if (ret) >> + return ret; >> + >> + /* Shut down serial port communication */ >> + ret = buspirate_serialport_shutdown(); >> + if (ret) >> + return ret; >> + printf_debug("Bus Pirate shutdown completed.\n"); >> + >> + return 0; >> +} >> + >> +int buspirate_spi_send_command(unsigned int writecnt, unsigned int readcnt, >> + const unsigned char *writearr, unsigned char *readarr) >> +{ >> + static unsigned char *buf = NULL; >> + int i = 0, ret = 0; >> + >> + if (writecnt > 16 || readcnt > 16 || (readcnt + writecnt) > 16) >> + return SPI_INVALID_LENGTH; >> + >> + /* +2 is pretty arbitrary. */ >> + buf = realloc(buf, writecnt + readcnt + 2); >> + if (!buf) { >> + fprintf(stderr, "Out of memory!\n"); >> + exit(1); // -1 >> + } >> + >> + /* Assert CS# */ >> + buf[i++] = 0x02; >> + ret = buspirate_sendrecv(buf, 1, 1); >> + if (ret) >> + return SPI_GENERIC_ERROR; >> + if (buf[0] != 0x01) { >> + fprintf(stderr, "Protocol error!\n"); >> + return SPI_GENERIC_ERROR; >> + } >> + >> + i = 0; >> + buf[i++] = 0x10 | (writecnt + readcnt - 1); >> + memcpy(buf + i, writearr, writecnt); >> + i += writecnt; >> + memset(buf + i, 0, readcnt); >> + ret = buspirate_sendrecv(buf, i + readcnt, i + readcnt); >> + if (ret) >> + return SPI_GENERIC_ERROR; >> + if (buf[0] != 0x01) { >> + fprintf(stderr, "Protocol error!\n"); >> + return SPI_GENERIC_ERROR; >> + } >> + memcpy(readarr, buf + i, readcnt); >> + >> + i = 0; >> + /* De-assert CS# */ >> + buf[i++] = 0x03; >> + ret = buspirate_sendrecv(buf, 1, 1); >> + if (ret) >> + return SPI_GENERIC_ERROR; >> + if (buf[0] != 0x01) { >> + fprintf(stderr, "Protocol error!\n"); >> + return SPI_GENERIC_ERROR; >> + } >> + >> + return ret; >> +} >> + >> +int buspirate_spi_read(struct flashchip *flash, uint8_t *buf, int start, int len) >> +{ >> + /* Maximum read length is 12 bytes, use 8 for now. */ >> + return spi_read_chunked(flash, buf, start, len, 8); >> +} >> + >> +/* We could do 12-byte writes, but for now we use the generic 1-byte code. */ >> Index: flashrom-buspiratespi/serprog.c >> =================================================================== >> --- flashrom-buspiratespi/serprog.c (Revision 767) >> +++ flashrom-buspiratespi/serprog.c (Arbeitskopie) >> @@ -61,7 +61,7 @@ >> #define S_CMD_Q_RDNMAXLEN 0x11 /* Query read-n maximum length */ >> #define S_CMD_S_BUSTYPE 0x12 /* Set used bustype(s). */ >> >> -static int sp_fd; >> +int sp_fd; >> >> static uint16_t sp_device_serbuf_size = 16; >> static uint16_t sp_device_opbuf_size = 300; >> @@ -185,7 +185,7 @@ >> {0, 0} /* Terminator */ >> }; >> >> -static int sp_openserport(char *dev, unsigned int baud) >> +int sp_openserport(char *dev, unsigned int baud) >> { >> struct termios options; >> int fd, i; >> @@ -208,20 +208,16 @@ >> break; >> } >> } >> - options.c_cflag &= ~PARENB; >> - options.c_cflag &= ~CSTOPB; >> - options.c_cflag &= ~CSIZE; >> - options.c_cflag |= CS8; >> - options.c_cflag &= ~CRTSCTS; >> + options.c_cflag &= ~(PARENB | CSTOPB | CSIZE | CRTSCTS); >> + options.c_cflag |= (CS8 | CLOCAL | CREAD); >> options.c_lflag &= ~(ICANON | ECHO | ECHOE | ISIG); >> options.c_iflag &= ~(IXON | IXOFF | IXANY | ICRNL | IGNCR | INLCR); >> options.c_oflag &= ~OPOST; >> - options.c_cflag |= (CLOCAL | CREAD); >> tcsetattr(fd, TCSANOW, &options); >> return fd; >> } >> >> -static void sp_flush_incoming(void) >> +void sp_flush_incoming(void) >> { >> int i; >> for (i=0;i<100;i++) { /* In case the device doesnt do EAGAIN, just read 0 */ >> Index: flashrom-buspiratespi/spi.c >> =================================================================== >> --- flashrom-buspiratespi/spi.c (Revision 767) >> +++ flashrom-buspiratespi/spi.c (Arbeitskopie) >> @@ -100,6 +100,15 @@ >> }, >> #endif >> >> +#if BUSPIRATE_SPI_SUPPORT == 1 >> + { /* SPI_CONTROLLER_BUSPIRATE */ >> + .command = buspirate_spi_send_command, >> + .multicommand = default_spi_send_multicommand, >> + .read = buspirate_spi_read, >> + .write_256 = spi_chip_write_1, >> + }, >> +#endif >> + >> {}, /* This entry corresponds to SPI_CONTROLLER_INVALID. */ >> }; >> >> Index: flashrom-buspiratespi/Makefile >> =================================================================== >> --- flashrom-buspiratespi/Makefile (Revision 767) >> +++ flashrom-buspiratespi/Makefile (Arbeitskopie) >> @@ -89,6 +89,9 @@ >> # Always enable Dr. Kaiser for now. >> CONFIG_DRKAISER ?= yes >> >> +# Always enable Bus Pirate SPI for now. >> +CONFIG_BUSPIRATESPI ?= yes >> + >> # Disable wiki printing by default. It is only useful if you have wiki access. >> CONFIG_PRINT_WIKI ?= no >> >> @@ -138,6 +141,11 @@ >> OBJS += drkaiser.o >> endif >> >> +ifeq ($(CONFIG_BUSPIRATESPI), yes) >> +FEATURE_CFLAGS += -D'BUSPIRATE_SPI_SUPPORT=1' >> +OBJS += buspirate_spi.o >> +endif >> + >> ifeq ($(CONFIG_PRINT_WIKI), yes) >> FEATURE_CFLAGS += -D'PRINT_WIKI_SUPPORT=1' >> OBJS += print_wiki.o >> Index: flashrom-buspiratespi/spi.h >> =================================================================== >> --- flashrom-buspiratespi/spi.h (Revision 767) >> +++ flashrom-buspiratespi/spi.h (Arbeitskopie) >> @@ -106,6 +106,7 @@ >> #define JEDEC_BYTE_PROGRAM_INSIZE 0x00 >> >> /* Error codes */ >> +#define SPI_GENERIC_ERROR -1 >> #define SPI_INVALID_OPCODE -2 >> #define SPI_INVALID_ADDRESS -3 >> #define SPI_INVALID_LENGTH -4 >> Index: flashrom-buspiratespi/flashrom.c >> =================================================================== >> --- flashrom-buspiratespi/flashrom.c (Revision 767) >> +++ flashrom-buspiratespi/flashrom.c (Arbeitskopie) >> @@ -204,6 +204,25 @@ >> }, >> #endif >> >> +#if BUSPIRATE_SPI_SUPPORT == 1 >> + { >> + .name = "buspiratespi", >> + .init = buspirate_spi_init, >> + .shutdown = buspirate_spi_shutdown, >> + .map_flash_region = fallback_map, >> + .unmap_flash_region = fallback_unmap, >> + .chip_readb = noop_chip_readb, >> + .chip_readw = fallback_chip_readw, >> + .chip_readl = fallback_chip_readl, >> + .chip_readn = fallback_chip_readn, >> + .chip_writeb = noop_chip_writeb, >> + .chip_writew = fallback_chip_writew, >> + .chip_writel = fallback_chip_writel, >> + .chip_writen = fallback_chip_writen, >> + .delay = internal_delay, >> + }, >> +#endif >> + >> {}, /* This entry corresponds to PROGRAMMER_INVALID. */ >> }; >> >> >> >> -- >> Developer quote of the month: >> "We are juggling too many chainsaws and flaming arrows and tigers." >> >> >

2 3

[commit] r772 - trunk
by svn＠flashrom.org 24 Nov '09

24 Nov '09

Author: hailfinger Date: 2009-11-24 01:20:03 +0100 (Tue, 24 Nov 2009) New Revision: 772 Added: trunk/buspirate_spi.c Modified: trunk/Makefile trunk/flash.h trunk/flashrom.c trunk/spi.c trunk/spi.h Log: Add Bus Pirate SPI support to flashrom. The code should work on Linux/*BSD/MacOSX and relies on the serial code implementation in serial.c. Support for additional platforms (Windows) will have to be added to serial.c for this to work. For tests without a Bus Pirate (or with non-functional serial code) it is possible to #define FAKE_COMMUNICATION in buspirate_spi.c. Thanks to Sean Nelson for the SPI mode settings code. I tweaked it a bit to make configuration from a commandline easier should anybody want that feature. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Sean Nelson <audiohacked(a)gmail.com> Tested-by: Sean Nelson <audiohacked(a)gmail.com> Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2009-11-23 19:20:11 UTC (rev 771) +++ trunk/Makefile 2009-11-24 00:20:03 UTC (rev 772) @@ -25,7 +25,7 @@ DIFF = diff PREFIX ?= /usr/local MANDIR ?= $(PREFIX)/share/man -CFLAGS ?= -Os -Wall -Werror +CFLAGS ?= -Os -Wall -Werror -g EXPORTDIR ?= . OS_ARCH = $(shell uname) @@ -89,6 +89,9 @@ # Always enable Dr. Kaiser for now. CONFIG_DRKAISER ?= yes +# Always enable Bus Pirate SPI for now. +CONFIG_BUSPIRATESPI ?= yes + # Disable wiki printing by default. It is only useful if you have wiki access. CONFIG_PRINT_WIKI ?= no @@ -138,9 +141,19 @@ OBJS += drkaiser.o endif +ifeq ($(CONFIG_BUSPIRATESPI), yes) +FEATURE_CFLAGS += -D'BUSPIRATE_SPI_SUPPORT=1' +OBJS += buspirate_spi.o +endif + +# Ugly, but there's no elif/elseif. ifeq ($(CONFIG_SERPROG), yes) OBJS += serial.o +else +ifeq ($(CONFIG_BUSPIRATESPI), yes) +OBJS += serial.o endif +endif ifeq ($(CONFIG_PRINT_WIKI), yes) FEATURE_CFLAGS += -D'PRINT_WIKI_SUPPORT=1' Added: trunk/buspirate_spi.c =================================================================== --- trunk/buspirate_spi.c (rev 0) +++ trunk/buspirate_spi.c 2009-11-24 00:20:03 UTC (rev 772) @@ -0,0 +1,358 @@ +/* + * This file is part of the flashrom project. + * + * Copyright (C) 2009 Carl-Daniel Hailfinger + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <stdio.h> +#include <stdint.h> +#include <string.h> +#include <stdlib.h> +#include <ctype.h> +#include <fcntl.h> +#include "flash.h" +#include "spi.h" + +/* Change this to #define if you want to test without a serial implementation */ +#undef FAKE_COMMUNICATION + +#ifndef FAKE_COMMUNICATION +int buspirate_serialport_setup(char *dev) +{ + /* 115200bps, 8 databits, no parity, 1 stopbit */ + sp_fd = sp_openserport(dev, 115200); + return 0; +} + +int buspirate_serialport_shutdown(void) +{ + close(sp_fd); + return 0; +} + +int serialport_write(unsigned char *buf, unsigned int writecnt) +{ + int tmp = 0; + + while (tmp != writecnt) { + tmp = write(sp_fd, buf + tmp, writecnt - tmp); + if (tmp == -1) + return 1; + if (!tmp) + printf_debug("Empty write\n"); + } + + return 0; +} + +int serialport_read(unsigned char *buf, unsigned int readcnt) +{ + int tmp = 0; + + while (tmp != readcnt) { + tmp = read(sp_fd, buf + tmp, readcnt - tmp); + if (tmp == -1) + return 1; + if (!tmp) + printf_debug("Empty read\n"); + } + + return 0; +} + +int buspirate_discard_read(void) +{ + int flags; + + printf_debug("%s\n", __func__); + flags = fcntl(sp_fd, F_GETFL); + flags |= O_NONBLOCK; + fcntl(sp_fd, F_SETFL, flags); + sp_flush_incoming(); + flags &= ~O_NONBLOCK; + fcntl(sp_fd, F_SETFL, flags); + + return 0; +} +#else +#define buspirate_serialport_setup(...) 0 +#define buspirate_serialport_shutdown(...) 0 +#define serialport_write(...) 0 +#define serialport_read(...) 0 +#define buspirate_discard_read(...) 0 +#endif + +int buspirate_sendrecv(unsigned char *buf, unsigned int writecnt, unsigned int readcnt) +{ + int i, ret = 0; + + printf_debug("%s: write %i, read %i\n", __func__, writecnt, readcnt); + if (!writecnt && !readcnt) { + fprintf(stderr, "Zero length command!\n"); + return 1; + } + printf_debug("Sending"); + for (i = 0; i < writecnt; i++) + printf_debug(" 0x%02x", buf[i]); +#ifdef FAKE_COMMUNICATION + /* Placate the caller for now. */ + if (readcnt) { + buf[0] = 0x01; + memset(buf + 1, 0xff, readcnt - 1); + } + ret = 0; +#else + if (writecnt) + ret = serialport_write(buf, writecnt); + if (ret) + return ret; + if (readcnt) + ret = serialport_read(buf, readcnt); + if (ret) + return ret; +#endif + printf_debug(", receiving"); + for (i = 0; i < readcnt; i++) + printf_debug(" 0x%02x", buf[i]); + printf_debug("\n"); + return 0; +} + +int buspirate_spi_init(void) +{ + unsigned char buf[512]; + int ret = 0; + int i; + char *devpos = NULL; + char *dev = NULL; + int devlen; + + if (programmer_param && !strlen(programmer_param)) { + free(programmer_param); + programmer_param = NULL; + } + if (programmer_param) { + devpos = strstr(programmer_param, "dev="); + if (devpos) { + devpos += 4; + devlen = strcspn(devpos, ",:"); + if (devlen) { + dev = malloc(devlen + 1); + if (!dev) { + fprintf(stderr, "Out of memory!\n"); + exit(1); + } + strncpy(dev, devpos, devlen); + dev[devlen] = '\0'; + } + } + free(programmer_param); + programmer_param = NULL; + } + if (!dev) { + fprintf(stderr, "No serial device given. Use flashrom -p " + "buspiratespi:dev=/dev/ttyUSB0\n"); + return 1; + } + + ret = buspirate_serialport_setup(dev); + if (ret) + return ret; + + /* This is the brute force version, but it should work. */ + for (i = 0; i < 19; i++) { + /* Enter raw bitbang mode */ + buf[0] = 0x00; + /* Send the command, don't read the response. */ + ret = buspirate_sendrecv(buf, 1, 0); + if (ret) + return ret; + /* Read any response and discard it. */ + ret = buspirate_discard_read(); + if (ret) + return ret; + } + /* Enter raw bitbang mode */ + buf[0] = 0x00; + ret = buspirate_sendrecv(buf, 1, 5); + if (ret) + return ret; + if (memcmp(buf, "BBIO", 4)) { + fprintf(stderr, "Entering raw bitbang mode failed!\n"); + return 1; + } + printf_debug("Raw bitbang mode version %c\n", buf[4]); + if (buf[4] != '1') { + fprintf(stderr, "Can't handle raw bitbang mode version %c!\n", + buf[4]); + return 1; + } + /* Enter raw SPI mode */ + buf[0] = 0x01; + ret = buspirate_sendrecv(buf, 1, 4); + if (memcmp(buf, "SPI", 3)) { + fprintf(stderr, "Entering raw SPI mode failed!\n"); + return 1; + } + printf_debug("Raw SPI mode version %c\n", buf[3]); + if (buf[3] != '1') { + fprintf(stderr, "Can't handle raw SPI mode version %c!\n", + buf[3]); + return 1; + } + + /* Initial setup (SPI peripherals config): Enable power, CS high, AUX */ + buf[0] = 0x40 | 0xb; + ret = buspirate_sendrecv(buf, 1, 1); + if (ret) + return 1; + if (buf[0] != 0x01) { + fprintf(stderr, "Protocol error while setting power/CS/AUX!\n"); + return 1; + } + + /* Set speed to 8 MHz */ + buf[0] = 0x60 | 0x7; + ret = buspirate_sendrecv(buf, 1, 1); + if (ret) + return 1; + if (buf[0] != 0x01) { + fprintf(stderr, "Protocol error while setting SPI speed!\n"); + return 1; + } + + /* Set SPI config: output type, idle, clock edge, sample */ + buf[0] = 0x80 | 0xa; + ret = buspirate_sendrecv(buf, 1, 1); + if (ret) + return 1; + if (buf[0] != 0x01) { + fprintf(stderr, "Protocol error while setting SPI config!\n"); + return 1; + } + + /* De-assert CS# */ + buf[0] = 0x03; + ret = buspirate_sendrecv(buf, 1, 1); + if (ret) + return 1; + if (buf[0] != 0x01) { + fprintf(stderr, "Protocol error while raising CS#!\n"); + return 1; + } + + buses_supported = CHIP_BUSTYPE_SPI; + spi_controller = SPI_CONTROLLER_BUSPIRATE; + + return 0; +} + +int buspirate_spi_shutdown(void) +{ + unsigned char buf[5]; + int ret = 0; + + /* Exit raw SPI mode (enter raw bitbang mode) */ + buf[0] = 0x00; + ret = buspirate_sendrecv(buf, 1, 5); + if (ret) + return ret; + if (memcmp(buf, "BBIO", 4)) { + fprintf(stderr, "Entering raw bitbang mode failed!\n"); + return 1; + } + printf_debug("Raw bitbang mode version %c\n", buf[4]); + if (buf[4] != '1') { + fprintf(stderr, "Can't handle raw bitbang mode version %c!\n", + buf[4]); + return 1; + } + /* Reset Bus Pirate (return to user terminal) */ + buf[0] = 0x0f; + ret = buspirate_sendrecv(buf, 1, 0); + if (ret) + return ret; + + /* Shut down serial port communication */ + ret = buspirate_serialport_shutdown(); + if (ret) + return ret; + printf_debug("Bus Pirate shutdown completed.\n"); + + return 0; +} + +int buspirate_spi_send_command(unsigned int writecnt, unsigned int readcnt, + const unsigned char *writearr, unsigned char *readarr) +{ + static unsigned char *buf = NULL; + int i = 0, ret = 0; + + if (writecnt > 16 || readcnt > 16 || (readcnt + writecnt) > 16) + return SPI_INVALID_LENGTH; + + /* +2 is pretty arbitrary. */ + buf = realloc(buf, writecnt + readcnt + 2); + if (!buf) { + fprintf(stderr, "Out of memory!\n"); + exit(1); // -1 + } + + /* Assert CS# */ + buf[i++] = 0x02; + ret = buspirate_sendrecv(buf, 1, 1); + if (ret) + return SPI_GENERIC_ERROR; + if (buf[0] != 0x01) { + fprintf(stderr, "Protocol error while lowering CS#!\n"); + return SPI_GENERIC_ERROR; + } + + i = 0; + buf[i++] = 0x10 | (writecnt + readcnt - 1); + memcpy(buf + i, writearr, writecnt); + i += writecnt; + memset(buf + i, 0, readcnt); + ret = buspirate_sendrecv(buf, i + readcnt, i + readcnt); + if (ret) + return SPI_GENERIC_ERROR; + if (buf[0] != 0x01) { + fprintf(stderr, "Protocol error while reading/writing SPI!\n"); + return SPI_GENERIC_ERROR; + } + memcpy(readarr, buf + i, readcnt); + + i = 0; + /* De-assert CS# */ + buf[i++] = 0x03; + ret = buspirate_sendrecv(buf, 1, 1); + if (ret) + return SPI_GENERIC_ERROR; + if (buf[0] != 0x01) { + fprintf(stderr, "Protocol error while raising CS#!\n"); + return SPI_GENERIC_ERROR; + } + + return ret; +} + +int buspirate_spi_read(struct flashchip *flash, uint8_t *buf, int start, int len) +{ + /* Maximum read length is 12 bytes, use 8 for now. */ + return spi_read_chunked(flash, buf, start, len, 8); +} + +/* We could do 12-byte writes, but for now we use the generic 1-byte code. */ Modified: trunk/flash.h =================================================================== --- trunk/flash.h 2009-11-23 19:20:11 UTC (rev 771) +++ trunk/flash.h 2009-11-24 00:20:03 UTC (rev 772) @@ -104,6 +104,9 @@ #if SERPROG_SUPPORT == 1 PROGRAMMER_SERPROG, #endif +#if BUSPIRATE_SPI_SUPPORT == 1 + PROGRAMMER_BUSPIRATESPI, +#endif PROGRAMMER_INVALID /* This must always be the last entry. */ }; @@ -484,6 +487,12 @@ int bitbang_spi_read(struct flashchip *flash, uint8_t *buf, int start, int len); int bitbang_spi_write_256(struct flashchip *flash, uint8_t *buf); +/* buspirate_spi.c */ +int buspirate_spi_init(void); +int buspirate_spi_shutdown(void); +int buspirate_spi_send_command(unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); +int buspirate_spi_read(struct flashchip *flash, uint8_t *buf, int start, int len); + /* flashrom.c */ extern char *programmer_param; extern int verbose; @@ -527,6 +536,9 @@ #if DUMMY_SUPPORT == 1 SPI_CONTROLLER_DUMMY, #endif +#if BUSPIRATE_SPI_SUPPORT == 1 + SPI_CONTROLLER_BUSPIRATE, +#endif SPI_CONTROLLER_INVALID /* This must always be the last entry. */ }; extern const int spi_programmer_count; Modified: trunk/flashrom.c =================================================================== --- trunk/flashrom.c 2009-11-23 19:20:11 UTC (rev 771) +++ trunk/flashrom.c 2009-11-24 00:20:03 UTC (rev 772) @@ -204,6 +204,25 @@ }, #endif +#if BUSPIRATE_SPI_SUPPORT == 1 + { + .name = "buspiratespi", + .init = buspirate_spi_init, + .shutdown = buspirate_spi_shutdown, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .chip_readb = noop_chip_readb, + .chip_readw = fallback_chip_readw, + .chip_readl = fallback_chip_readl, + .chip_readn = fallback_chip_readn, + .chip_writeb = noop_chip_writeb, + .chip_writew = fallback_chip_writew, + .chip_writel = fallback_chip_writel, + .chip_writen = fallback_chip_writen, + .delay = internal_delay, + }, +#endif + {}, /* This entry corresponds to PROGRAMMER_INVALID. */ }; Modified: trunk/spi.c =================================================================== --- trunk/spi.c 2009-11-23 19:20:11 UTC (rev 771) +++ trunk/spi.c 2009-11-24 00:20:03 UTC (rev 772) @@ -100,6 +100,15 @@ }, #endif +#if BUSPIRATE_SPI_SUPPORT == 1 + { /* SPI_CONTROLLER_BUSPIRATE */ + .command = buspirate_spi_send_command, + .multicommand = default_spi_send_multicommand, + .read = buspirate_spi_read, + .write_256 = spi_chip_write_1, + }, +#endif + {}, /* This entry corresponds to SPI_CONTROLLER_INVALID. */ }; Modified: trunk/spi.h =================================================================== --- trunk/spi.h 2009-11-23 19:20:11 UTC (rev 771) +++ trunk/spi.h 2009-11-24 00:20:03 UTC (rev 772) @@ -106,6 +106,7 @@ #define JEDEC_BYTE_PROGRAM_INSIZE 0x00 /* Error codes */ +#define SPI_GENERIC_ERROR -1 #define SPI_INVALID_OPCODE -2 #define SPI_INVALID_ADDRESS -3 #define SPI_INVALID_LENGTH -4

1 0

Re: [flashrom] flash erase failure
by Adrian Glaubitz 23 Nov '09

23 Nov '09

Hi, On Mon, Nov 23, 2009 at 10:52 PM, Thao Hoang <thao_hoang(a)yahoo.com> wrote: > > Thanks Adrian! I appreciate the advice and insight. You're welcome, again. > I was not able to run superiotool because it wasn't install on my system, however I did run the other two. > See attachment. If you really need me to run superiotool, I can download it and run it. > Yes, please install it. It would be nice to have a full output of: lspci -nnvvvxx superiotool -dV flashrom -V By the way, I don't see your attachments, did you forget them (thats what I usually do :)). Please post the put of all three tools like I suggested to the mailing list (flashrom(a)flashrom.org), that will help us with your board. > Don't laugh... but I haven't used IRC chat before. Never had a reason to until now I guess. Is there a way to post the chats somewhere so that anyone with a similar problem can go there without taking up your time? hum... > Well, really, IRC is nothing magical or mystical. Just use any IRC-capable software to connect (like irssi, pidgin, xchat or mIRC). Set the server to irc.freenode.org and the channel to #flashrom. Then just start asking questions and many people will be happy to help you and answer all your questions. > Also, did I get the syntax correct to force a write <./flashrom -f -w (filename) -c (chipname)>. Yes, think so. Check the manpage. > I have a laptop also that doesn't seem to work off the bat. I was able to force the read and > find some chips that successfullly read the bios. (i.e.... forced read and compared the result > using the original binary which I extracted using a dos bios utility.) Mhh, okey. Don't hesitate to post all your results to the mailing list. Please post every laptop and mainboard and whatever your try to flash in a single mail to the mailing list. And seriously, join the IRC-channel. You'll learn alot of stuff there. Adrian

1 0

Re: [flashrom] flash erase failure
by Adrian Glaubitz 23 Nov '09

23 Nov '09

Hi, On Mon, Nov 23, 2009 at 10:13 PM, Thao Hoang <thao_hoang(a)yahoo.com> wrote: > > Adrian- > > Sorry to bother you. Don't worry, you don't bother me at all. If you did, I wouldn't be here to answer ;). > If you can force a read to a similiar chip, can you force a write to using a similar chip. Something like ./flashrom -f -w (filename) -c (chipname) ?? If not, what does forcing a read tell me? I used my board to force a read and several chipname worked. > Well, you can give it a try. But the problem anyway is that your chip still remains write-protected. We need to find out how to disable write-protection for your specific board. If you check the recent mailing list archives (<http://www.flashrom.org/pipermail/flashrom/2009-November/thread.html>), you will see that there alot of other reports with exactly the same problem. I think Carl-Daniel said, he would be working on that soon. > Also, not sure if this makes a difference but do I really need this library libftdi ? I'm not using any external FT2232SPI flasher. Don't know either, sorry. Why don't you join the IRC-channel #flashrom on FreeNode, it's really worth to come by, alot of experts are on there. > Thanks again for your time. You're welcome. Could you provide the output of lspci, superiotool and flashrom as I suggested and post it to the mailing list? Adrian

1 0

Re: [flashrom] flash erase failure
by Adrian Glaubitz 23 Nov '09

23 Nov '09

Hi Thao, On Mon, Nov 23, 2009 at 9:12 PM, Thao Hoang <thao_hoang(a)yahoo.com> wrote: > > Thanks Adrian for getting back to me. Here is my motherboard information: > http://www.ibase.com.tw/2009/MB899.html#features > Good, now we know what mainboard you are using ;). > I tried to flash the board with the original backup just to make sure it works. I also did a verify and a read to make sure there wasn't a problem with the bios image so I know nothing got erase. Ok, that means you didn't brick your mainboard. > > I also went to into the bios menu to see if there I needed to enable bios updating but that didn't work. Also check if there's a jumper, refer to the manual. > > If this takes too much time for you to answer, don't worry about it. Or maybe you can lead me to the solution. I couldn't find enough info on the my ibase board to know if there is a jumper I need to toggle. Well, the point is that one probably needs to disable write protection of the flash chip with some magic byte sequence (in case you don't find a jumper nor a setting in the BIOS setup). And this is something that needs to be implemented for flashrom. So the best thing you can do is to provide as much information as possible regarding your mainboard. Please provide the output of: flashrom -V superiotool -dV lspci -nnvvvxxx Adrian

1 0

[PATCH] Move serial handling from serprog.c to serial.c
by Carl-Daniel Hailfinger 23 Nov '09

23 Nov '09

Move serial handling from serprog.c to serial.c. This is the first step in enabling platform independent serprog and it also allows other drivers to use serial port functionality without requiring serprog. Pure code move, no code changed. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-serprog_serial_factorout/flash.h =================================================================== --- flashrom-serprog_serial_factorout/flash.h (Revision 768) +++ flashrom-serprog_serial_factorout/flash.h (Arbeitskopie) @@ -736,8 +736,11 @@ uint8_t serprog_chip_readb(const chipaddr addr); void serprog_chip_readn(uint8_t *buf, const chipaddr addr, size_t len); void serprog_delay(int delay); + +/* serial.c */ void sp_flush_incoming(void); int sp_openserport(char *dev, unsigned int baud); +void __attribute__((noreturn)) sp_die(char *msg); extern int sp_fd; #endif /* !__FLASH_H__ */ Index: flashrom-serprog_serial_factorout/serial.c =================================================================== --- flashrom-serprog_serial_factorout/serial.c (Revision 0) +++ flashrom-serprog_serial_factorout/serial.c (Revision 0) @@ -0,0 +1,142 @@ +/* + * This file is part of the flashrom project. + * + * Copyright (C) 2009 Urja Rannikko <urjaman(a)gmail.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> +#include "flash.h" +#include <string.h> +#include <ctype.h> +#include <fcntl.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <errno.h> +#include <inttypes.h> +#include <termios.h> + +int sp_fd; + +void __attribute__((noreturn)) sp_die(char *msg) +{ + perror(msg); + exit(1); +} + +struct baudentry { + int flag; + unsigned int baud; +}; + +/* I'd like if the C preprocessor could have directives in macros */ +#define BAUDENTRY(baud) { B##baud, baud }, +static const struct baudentry sp_baudtable[] = { + BAUDENTRY(9600) + BAUDENTRY(19200) + BAUDENTRY(38400) + BAUDENTRY(57600) + BAUDENTRY(115200) +#ifdef B230400 + BAUDENTRY(230400) +#endif +#ifdef B460800 + BAUDENTRY(460800) +#endif +#ifdef B500000 + BAUDENTRY(500000) +#endif +#ifdef B576000 + BAUDENTRY(576000) +#endif +#ifdef B921600 + BAUDENTRY(921600) +#endif +#ifdef B1000000 + BAUDENTRY(1000000) +#endif +#ifdef B1152000 + BAUDENTRY(1152000) +#endif +#ifdef B1500000 + BAUDENTRY(1500000) +#endif +#ifdef B2000000 + BAUDENTRY(2000000) +#endif +#ifdef B2500000 + BAUDENTRY(2500000) +#endif +#ifdef B3000000 + BAUDENTRY(3000000) +#endif +#ifdef B3500000 + BAUDENTRY(3500000) +#endif +#ifdef B4000000 + BAUDENTRY(4000000) +#endif + {0, 0} /* Terminator */ +}; + +int sp_openserport(char *dev, unsigned int baud) +{ + struct termios options; + int fd, i; + fd = open(dev, O_RDWR | O_NOCTTY | O_NDELAY); + if (fd < 0) + sp_die("Error: cannot open serial port"); + fcntl(fd, F_SETFL, 0); + tcgetattr(fd, &options); + for (i = 0;; i++) { + if (sp_baudtable[i].baud == 0) { + close(fd); + fprintf(stderr, + "Error: cannot configure for baudrate %d\n", + baud); + exit(1); + } + if (sp_baudtable[i].baud == baud) { + cfsetispeed(&options, sp_baudtable[i].flag); + cfsetospeed(&options, sp_baudtable[i].flag); + break; + } + } + options.c_cflag &= ~(PARENB | CSTOPB | CSIZE | CRTSCTS); + options.c_cflag |= (CS8 | CLOCAL | CREAD); + options.c_lflag &= ~(ICANON | ECHO | ECHOE | ISIG); + options.c_iflag &= ~(IXON | IXOFF | IXANY | ICRNL | IGNCR | INLCR); + options.c_oflag &= ~OPOST; + tcsetattr(fd, TCSANOW, &options); + return fd; +} + +void sp_flush_incoming(void) +{ + int i; + for (i=0;i<100;i++) { /* In case the device doesnt do EAGAIN, just read 0 */ + unsigned char flush[16]; + ssize_t rv; + rv = read(sp_fd, flush, sizeof(flush)); + if ((rv == -1) && (errno == EAGAIN)) + break; + if (rv == -1) + sp_die("flush read"); + } + return; +} Index: flashrom-serprog_serial_factorout/serprog.c =================================================================== --- flashrom-serprog_serial_factorout/serprog.c (Revision 768) +++ flashrom-serprog_serial_factorout/serprog.c (Arbeitskopie) @@ -61,8 +61,6 @@ #define S_CMD_Q_RDNMAXLEN 0x11 /* Query read-n maximum length */ #define S_CMD_S_BUSTYPE 0x12 /* Set used bustype(s). */ -int sp_fd; - static uint16_t sp_device_serbuf_size = 16; static uint16_t sp_device_opbuf_size = 300; /* Bitmap of supported commands */ @@ -95,12 +93,6 @@ whether the command is supported before doing it */ static int sp_check_avail_automatic = 0; -static void __attribute__((noreturn)) sp_die(char *msg) -{ - perror(msg); - exit(1); -} - static int sp_opensocket(char *ip, unsigned int port) { int flag = 1; @@ -130,108 +122,6 @@ return sock; } -struct baudentry { - int flag; - unsigned int baud; -}; - -/* I'd like if the C preprocessor could have directives in macros */ -#define BAUDENTRY(baud) { B##baud, baud }, -static const struct baudentry sp_baudtable[] = { - BAUDENTRY(9600) - BAUDENTRY(19200) - BAUDENTRY(38400) - BAUDENTRY(57600) - BAUDENTRY(115200) -#ifdef B230400 - BAUDENTRY(230400) -#endif -#ifdef B460800 - BAUDENTRY(460800) -#endif -#ifdef B500000 - BAUDENTRY(500000) -#endif -#ifdef B576000 - BAUDENTRY(576000) -#endif -#ifdef B921600 - BAUDENTRY(921600) -#endif -#ifdef B1000000 - BAUDENTRY(1000000) -#endif -#ifdef B1152000 - BAUDENTRY(1152000) -#endif -#ifdef B1500000 - BAUDENTRY(1500000) -#endif -#ifdef B2000000 - BAUDENTRY(2000000) -#endif -#ifdef B2500000 - BAUDENTRY(2500000) -#endif -#ifdef B3000000 - BAUDENTRY(3000000) -#endif -#ifdef B3500000 - BAUDENTRY(3500000) -#endif -#ifdef B4000000 - BAUDENTRY(4000000) -#endif - {0, 0} /* Terminator */ -}; - -int sp_openserport(char *dev, unsigned int baud) -{ - struct termios options; - int fd, i; - fd = open(dev, O_RDWR | O_NOCTTY | O_NDELAY); - if (fd < 0) - sp_die("Error: cannot open serial port"); - fcntl(fd, F_SETFL, 0); - tcgetattr(fd, &options); - for (i = 0;; i++) { - if (sp_baudtable[i].baud == 0) { - close(fd); - fprintf(stderr, - "Error: cannot configure for baudrate %d\n", - baud); - exit(1); - } - if (sp_baudtable[i].baud == baud) { - cfsetispeed(&options, sp_baudtable[i].flag); - cfsetospeed(&options, sp_baudtable[i].flag); - break; - } - } - options.c_cflag &= ~(PARENB | CSTOPB | CSIZE | CRTSCTS); - options.c_cflag |= (CS8 | CLOCAL | CREAD); - options.c_lflag &= ~(ICANON | ECHO | ECHOE | ISIG); - options.c_iflag &= ~(IXON | IXOFF | IXANY | ICRNL | IGNCR | INLCR); - options.c_oflag &= ~OPOST; - tcsetattr(fd, TCSANOW, &options); - return fd; -} - -void sp_flush_incoming(void) -{ - int i; - for (i=0;i<100;i++) { /* In case the device doesnt do EAGAIN, just read 0 */ - unsigned char flush[16]; - ssize_t rv; - rv = read(sp_fd, flush, sizeof(flush)); - if ((rv == -1) && (errno == EAGAIN)) - break; - if (rv == -1) - sp_die("flush read"); - } - return; -} - static int sp_sync_read_timeout(int loops) { int i; Index: flashrom-serprog_serial_factorout/Makefile =================================================================== --- flashrom-serprog_serial_factorout/Makefile (Revision 768) +++ flashrom-serprog_serial_factorout/Makefile (Arbeitskopie) @@ -138,6 +138,10 @@ OBJS += drkaiser.o endif +ifeq ($(CONFIG_SERPROG), yes) +OBJS += serial.o +endif + ifeq ($(CONFIG_PRINT_WIKI), yes) FEATURE_CFLAGS += -D'PRINT_WIKI_SUPPORT=1' OBJS += print_wiki.o -- Developer quote of the month: "We are juggling too many chainsaws and flaming arrows and tigers."

2 2

[commit] r771 - trunk
by svn＠flashrom.org 23 Nov '09

23 Nov '09

Author: hailfinger Date: 2009-11-23 20:20:11 +0100 (Mon, 23 Nov 2009) New Revision: 771 Added: trunk/serial.c Modified: trunk/Makefile trunk/flash.h trunk/serprog.c Log: Move serial handling from serprog.c to serial.c. This is the first step in enabling platform independent serprog and it also allows other drivers to use serial port functionality without requiring serprog. Pure code move, no code changed. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2009-11-23 12:55:31 UTC (rev 770) +++ trunk/Makefile 2009-11-23 19:20:11 UTC (rev 771) @@ -138,6 +138,10 @@ OBJS += drkaiser.o endif +ifeq ($(CONFIG_SERPROG), yes) +OBJS += serial.o +endif + ifeq ($(CONFIG_PRINT_WIKI), yes) FEATURE_CFLAGS += -D'PRINT_WIKI_SUPPORT=1' OBJS += print_wiki.o Modified: trunk/flash.h =================================================================== --- trunk/flash.h 2009-11-23 12:55:31 UTC (rev 770) +++ trunk/flash.h 2009-11-23 19:20:11 UTC (rev 771) @@ -736,8 +736,11 @@ uint8_t serprog_chip_readb(const chipaddr addr); void serprog_chip_readn(uint8_t *buf, const chipaddr addr, size_t len); void serprog_delay(int delay); + +/* serial.c */ void sp_flush_incoming(void); int sp_openserport(char *dev, unsigned int baud); +void __attribute__((noreturn)) sp_die(char *msg); extern int sp_fd; #endif /* !__FLASH_H__ */ Added: trunk/serial.c =================================================================== --- trunk/serial.c (rev 0) +++ trunk/serial.c 2009-11-23 19:20:11 UTC (rev 771) @@ -0,0 +1,142 @@ +/* + * This file is part of the flashrom project. + * + * Copyright (C) 2009 Urja Rannikko <urjaman(a)gmail.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> +#include "flash.h" +#include <string.h> +#include <ctype.h> +#include <fcntl.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <errno.h> +#include <inttypes.h> +#include <termios.h> + +int sp_fd; + +void __attribute__((noreturn)) sp_die(char *msg) +{ + perror(msg); + exit(1); +} + +struct baudentry { + int flag; + unsigned int baud; +}; + +/* I'd like if the C preprocessor could have directives in macros */ +#define BAUDENTRY(baud) { B##baud, baud }, +static const struct baudentry sp_baudtable[] = { + BAUDENTRY(9600) + BAUDENTRY(19200) + BAUDENTRY(38400) + BAUDENTRY(57600) + BAUDENTRY(115200) +#ifdef B230400 + BAUDENTRY(230400) +#endif +#ifdef B460800 + BAUDENTRY(460800) +#endif +#ifdef B500000 + BAUDENTRY(500000) +#endif +#ifdef B576000 + BAUDENTRY(576000) +#endif +#ifdef B921600 + BAUDENTRY(921600) +#endif +#ifdef B1000000 + BAUDENTRY(1000000) +#endif +#ifdef B1152000 + BAUDENTRY(1152000) +#endif +#ifdef B1500000 + BAUDENTRY(1500000) +#endif +#ifdef B2000000 + BAUDENTRY(2000000) +#endif +#ifdef B2500000 + BAUDENTRY(2500000) +#endif +#ifdef B3000000 + BAUDENTRY(3000000) +#endif +#ifdef B3500000 + BAUDENTRY(3500000) +#endif +#ifdef B4000000 + BAUDENTRY(4000000) +#endif + {0, 0} /* Terminator */ +}; + +int sp_openserport(char *dev, unsigned int baud) +{ + struct termios options; + int fd, i; + fd = open(dev, O_RDWR | O_NOCTTY | O_NDELAY); + if (fd < 0) + sp_die("Error: cannot open serial port"); + fcntl(fd, F_SETFL, 0); + tcgetattr(fd, &options); + for (i = 0;; i++) { + if (sp_baudtable[i].baud == 0) { + close(fd); + fprintf(stderr, + "Error: cannot configure for baudrate %d\n", + baud); + exit(1); + } + if (sp_baudtable[i].baud == baud) { + cfsetispeed(&options, sp_baudtable[i].flag); + cfsetospeed(&options, sp_baudtable[i].flag); + break; + } + } + options.c_cflag &= ~(PARENB | CSTOPB | CSIZE | CRTSCTS); + options.c_cflag |= (CS8 | CLOCAL | CREAD); + options.c_lflag &= ~(ICANON | ECHO | ECHOE | ISIG); + options.c_iflag &= ~(IXON | IXOFF | IXANY | ICRNL | IGNCR | INLCR); + options.c_oflag &= ~OPOST; + tcsetattr(fd, TCSANOW, &options); + return fd; +} + +void sp_flush_incoming(void) +{ + int i; + for (i=0;i<100;i++) { /* In case the device doesnt do EAGAIN, just read 0 */ + unsigned char flush[16]; + ssize_t rv; + rv = read(sp_fd, flush, sizeof(flush)); + if ((rv == -1) && (errno == EAGAIN)) + break; + if (rv == -1) + sp_die("flush read"); + } + return; +} Modified: trunk/serprog.c =================================================================== --- trunk/serprog.c 2009-11-23 12:55:31 UTC (rev 770) +++ trunk/serprog.c 2009-11-23 19:20:11 UTC (rev 771) @@ -61,8 +61,6 @@ #define S_CMD_Q_RDNMAXLEN 0x11 /* Query read-n maximum length */ #define S_CMD_S_BUSTYPE 0x12 /* Set used bustype(s). */ -int sp_fd; - static uint16_t sp_device_serbuf_size = 16; static uint16_t sp_device_opbuf_size = 300; /* Bitmap of supported commands */ @@ -95,12 +93,6 @@ whether the command is supported before doing it */ static int sp_check_avail_automatic = 0; -static void __attribute__((noreturn)) sp_die(char *msg) -{ - perror(msg); - exit(1); -} - static int sp_opensocket(char *ip, unsigned int port) { int flag = 1; @@ -130,108 +122,6 @@ return sock; } -struct baudentry { - int flag; - unsigned int baud; -}; - -/* I'd like if the C preprocessor could have directives in macros */ -#define BAUDENTRY(baud) { B##baud, baud }, -static const struct baudentry sp_baudtable[] = { - BAUDENTRY(9600) - BAUDENTRY(19200) - BAUDENTRY(38400) - BAUDENTRY(57600) - BAUDENTRY(115200) -#ifdef B230400 - BAUDENTRY(230400) -#endif -#ifdef B460800 - BAUDENTRY(460800) -#endif -#ifdef B500000 - BAUDENTRY(500000) -#endif -#ifdef B576000 - BAUDENTRY(576000) -#endif -#ifdef B921600 - BAUDENTRY(921600) -#endif -#ifdef B1000000 - BAUDENTRY(1000000) -#endif -#ifdef B1152000 - BAUDENTRY(1152000) -#endif -#ifdef B1500000 - BAUDENTRY(1500000) -#endif -#ifdef B2000000 - BAUDENTRY(2000000) -#endif -#ifdef B2500000 - BAUDENTRY(2500000) -#endif -#ifdef B3000000 - BAUDENTRY(3000000) -#endif -#ifdef B3500000 - BAUDENTRY(3500000) -#endif -#ifdef B4000000 - BAUDENTRY(4000000) -#endif - {0, 0} /* Terminator */ -}; - -int sp_openserport(char *dev, unsigned int baud) -{ - struct termios options; - int fd, i; - fd = open(dev, O_RDWR | O_NOCTTY | O_NDELAY); - if (fd < 0) - sp_die("Error: cannot open serial port"); - fcntl(fd, F_SETFL, 0); - tcgetattr(fd, &options); - for (i = 0;; i++) { - if (sp_baudtable[i].baud == 0) { - close(fd); - fprintf(stderr, - "Error: cannot configure for baudrate %d\n", - baud); - exit(1); - } - if (sp_baudtable[i].baud == baud) { - cfsetispeed(&options, sp_baudtable[i].flag); - cfsetospeed(&options, sp_baudtable[i].flag); - break; - } - } - options.c_cflag &= ~(PARENB | CSTOPB | CSIZE | CRTSCTS); - options.c_cflag |= (CS8 | CLOCAL | CREAD); - options.c_lflag &= ~(ICANON | ECHO | ECHOE | ISIG); - options.c_iflag &= ~(IXON | IXOFF | IXANY | ICRNL | IGNCR | INLCR); - options.c_oflag &= ~OPOST; - tcsetattr(fd, TCSANOW, &options); - return fd; -} - -void sp_flush_incoming(void) -{ - int i; - for (i=0;i<100;i++) { /* In case the device doesnt do EAGAIN, just read 0 */ - unsigned char flush[16]; - ssize_t rv; - rv = read(sp_fd, flush, sizeof(flush)); - if ((rv == -1) && (errno == EAGAIN)) - break; - if (rv == -1) - sp_die("flush read"); - } - return; -} - static int sp_sync_read_timeout(int loops) { int i;

1 0

[PATCH] Factor out lock functions (print, unlock, lock)
by Carl-Daniel Hailfinger 23 Nov '09

23 Nov '09

Chip locking has three actions you can do with it: - Print/read the current locking status - Lock the chip - Unlock the chip. Currently, the code usually does lock printing inside the probe function, and unlocking somewhere in the erase or write function. Only very few chips reactivate the lock after write/erase. Since many chips have identical probe/write/erase functions, but totally different locking, many such functions have been duplicated needlessly. With this patch, it is possible to call the chip-specific locking functions from probe/write/erase functions and unify lots of code. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-lock_refactor/flash.h =================================================================== --- flashrom-lock_refactor/flash.h (Revision 750) +++ flashrom-lock_refactor/flash.h (Arbeitskopie) @@ -175,6 +175,12 @@ CHIP_BUSTYPE_UNKNOWN = CHIP_BUSTYPE_PARALLEL | CHIP_BUSTYPE_LPC | CHIP_BUSTYPE_FWH | CHIP_BUSTYPE_SPI, }; +enum lockaction { + lock_print, + lock_disable, + lock_enable, +}; + /* * How many different contiguous runs of erase blocks with one size each do * we have for a given erase function? @@ -229,6 +235,7 @@ int (*write) (struct flashchip *flash, uint8_t *buf); int (*read) (struct flashchip *flash, uint8_t *buf, int start, int len); + int (*lock) (struct flashchip *flash, enum lockaction action); /* Some flash devices have an additional register space. */ chipaddr virtual_memory; @@ -551,6 +558,7 @@ int spi_send_multicommand(struct spi_command *cmds); int spi_write_enable(void); int spi_write_disable(void); +int spi_lock(struct flashchip *flash, enum lockaction action); int spi_chip_erase_60(struct flashchip *flash); int spi_chip_erase_c7(struct flashchip *flash); int spi_chip_erase_60_c7(struct flashchip *flash); Index: flashrom-lock_refactor/flashchips.c =================================================================== --- flashrom-lock_refactor/flashchips.c (Revision 750) +++ flashrom-lock_refactor/flashchips.c (Arbeitskopie) @@ -211,6 +211,7 @@ .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -227,6 +228,7 @@ .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -243,6 +245,7 @@ .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -259,6 +262,7 @@ .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -275,6 +279,7 @@ .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -291,6 +296,7 @@ .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -307,6 +313,7 @@ .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -323,6 +330,7 @@ .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -339,6 +347,7 @@ .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -355,6 +364,7 @@ .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -371,6 +381,7 @@ .erase = NULL, .write = NULL /* Incompatible Page write */, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -387,6 +398,7 @@ .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -403,6 +415,7 @@ .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -419,6 +432,7 @@ .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, /*The AT26DF321 has the same ID as the AT25DF321. */ @@ -436,6 +450,7 @@ .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, },*/ { @@ -452,6 +467,7 @@ .erase = spi_chip_erase_60_c7, .write = NULL /* Incompatible Page write */, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -468,7 +484,6 @@ .erase = erase_chip_jedec, .write = write_jedec, .read = read_memmapped, - }, { @@ -533,6 +548,7 @@ .erase = NULL, .write = NULL /* Incompatible Page write */, .read = NULL /* Incompatible read */, + .lock = spi_lock, }, { @@ -549,6 +565,7 @@ .erase = NULL, .write = NULL, .read = NULL, + .lock = spi_lock, }, { @@ -565,6 +582,7 @@ .erase = NULL, .write = NULL, .read = NULL, + .lock = spi_lock, }, { @@ -581,6 +599,7 @@ .erase = NULL, .write = NULL, .read = NULL, + .lock = spi_lock, }, { @@ -597,6 +616,7 @@ .erase = NULL, .write = NULL, .read = NULL, + .lock = spi_lock, }, { @@ -613,6 +633,7 @@ .erase = NULL, .write = NULL, .read = NULL, + .lock = spi_lock, }, { @@ -629,6 +650,7 @@ .erase = NULL, .write = NULL, .read = NULL /* Incompatible read */, + .lock = spi_lock, }, { @@ -645,6 +667,7 @@ .erase = NULL, .write = NULL, .read = NULL, + .lock = spi_lock, }, { @@ -661,6 +684,7 @@ .erase = NULL, .write = NULL, .read = NULL, + .lock = spi_lock, }, { @@ -725,6 +749,7 @@ .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -821,6 +846,7 @@ .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -837,6 +863,7 @@ .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -853,6 +880,7 @@ .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -869,6 +897,7 @@ .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -885,6 +914,7 @@ .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -901,6 +931,7 @@ .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -917,6 +948,7 @@ .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -933,6 +965,7 @@ .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -949,6 +982,7 @@ .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -965,6 +999,7 @@ .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -981,6 +1016,7 @@ .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -997,6 +1033,7 @@ .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -1013,6 +1050,7 @@ .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -1029,6 +1067,7 @@ .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -1045,6 +1084,7 @@ .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -1061,6 +1101,7 @@ .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -1256,6 +1297,7 @@ }, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -1288,6 +1330,7 @@ }, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -1323,6 +1366,7 @@ }, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -1358,6 +1402,7 @@ }, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -1393,6 +1438,7 @@ }, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -1428,6 +1474,7 @@ }, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -1444,6 +1491,7 @@ .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -1460,6 +1508,7 @@ .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -1476,6 +1525,7 @@ .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -1492,6 +1542,7 @@ .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -1508,6 +1559,7 @@ .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -1604,6 +1656,7 @@ .erase = spi_chip_erase_d8, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -1620,6 +1673,7 @@ .erase = spi_chip_erase_d8, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -1636,6 +1690,7 @@ .erase = spi_chip_erase_d8, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -1652,6 +1707,7 @@ .erase = spi_chip_erase_d8, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -1668,6 +1724,7 @@ .erase = spi_chip_erase_d8, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -1684,6 +1741,7 @@ .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -1700,6 +1758,7 @@ .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -1716,6 +1775,7 @@ .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -1732,6 +1792,7 @@ .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -1748,6 +1809,7 @@ .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -1764,6 +1826,7 @@ .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -1876,6 +1939,7 @@ .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -1892,6 +1956,7 @@ .erase = spi_chip_erase_c7, .write = spi_chip_write_1, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -1908,6 +1973,7 @@ .erase = spi_chip_erase_c7, .write = spi_chip_write_1, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -1924,6 +1990,7 @@ .erase = spi_chip_erase_c7, .write = spi_chip_write_1, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -1940,6 +2007,7 @@ .erase = spi_chip_erase_60, .write = spi_chip_write_1, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -1956,6 +2024,7 @@ .erase = spi_chip_erase_c7, .write = spi_chip_write_1, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -1972,6 +2041,7 @@ .erase = spi_chip_erase_60_c7, .write = spi_chip_write_1, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -2420,6 +2490,7 @@ .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, /* The ST M25P05 is a bit of a problem. It has the same ID as the @@ -2441,6 +2512,7 @@ .erase = spi_chip_erase_c7, .write = spi_chip_write_1, /* 128 */ .read = spi_chip_read, + .lock = spi_lock, }, { @@ -2457,6 +2529,7 @@ .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, /* The ST M25P10 has the same problem as the M25P05. */ @@ -2474,6 +2547,7 @@ .erase = spi_chip_erase_c7, .write = spi_chip_write_1, /* 128 */ .read = spi_chip_read, + .lock = spi_lock, }, { @@ -2490,6 +2564,7 @@ .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -2506,6 +2581,7 @@ .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -2522,6 +2598,7 @@ .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -2538,6 +2615,7 @@ .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -2554,6 +2632,7 @@ .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -2570,6 +2649,7 @@ .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -2586,6 +2666,7 @@ .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -2602,6 +2683,7 @@ .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -2954,6 +3036,7 @@ .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -2970,6 +3053,7 @@ .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -2986,6 +3070,7 @@ .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -3002,6 +3087,7 @@ .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -3018,6 +3104,7 @@ .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, + .lock = spi_lock, }, { @@ -3258,6 +3345,7 @@ .erase = NULL, .write = NULL, .read = NULL, + .lock = NULL, }, { @@ -3274,6 +3362,7 @@ .erase = NULL, .write = NULL, .read = NULL, + .lock = NULL, }, { @@ -3290,6 +3379,7 @@ .erase = NULL, .write = NULL, .read = NULL, + .lock = NULL, }, { @@ -3306,6 +3396,7 @@ .erase = NULL, .write = NULL, .read = NULL, + .lock = NULL, }, { @@ -3322,6 +3413,7 @@ .erase = NULL, .write = NULL, .read = NULL, + .lock = NULL, }, { @@ -3338,6 +3430,7 @@ .erase = NULL, .write = NULL, .read = NULL, + .lock = NULL, }, { NULL } Index: flashrom-lock_refactor/spi.c =================================================================== --- flashrom-lock_refactor/spi.c (Revision 750) +++ flashrom-lock_refactor/spi.c (Arbeitskopie) @@ -30,8 +30,6 @@ enum spi_controller spi_controller = SPI_CONTROLLER_NONE; void *spibar = NULL; -void spi_prettyprint_status_register(struct flashchip *flash); - const struct spi_programmer spi_programmer[] = { { /* SPI_CONTROLLER_NONE */ .command = NULL, @@ -268,11 +266,6 @@ printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __func__, id1, id2); if (id1 == flash->manufacture_id && id2 == flash->model_id) { - /* Print the status register to tell the - * user about possible write protection. - */ - spi_prettyprint_status_register(flash); - return 1; } @@ -327,11 +320,6 @@ printf_debug("%s: id1 0x%x, id2 0x%x\n", __func__, id1, id2); if (id1 == flash->manufacture_id && id2 == flash->model_id) { - /* Print the status register to tell the - * user about possible write protection. - */ - spi_prettyprint_status_register(flash); - return 1; } @@ -363,10 +351,6 @@ if (id2 != flash->model_id) return 0; - /* Print the status register to tell the - * user about possible write protection. - */ - spi_prettyprint_status_register(flash); return 1; } @@ -490,6 +474,25 @@ } } +int spi_lock(struct flashchip *flash, enum lockaction action) +{ + switch (action) { + case lock_print: + spi_prettyprint_status_register(flash); + return 0; + break; + case lock_disable: + return spi_disable_blockprotect(); + break; + case lock_enable: + fprintf(stderr, "lock enable not supported.\n"); + return 1; + break; + default: /* Work around gcc. It can't see we enumerated all values. */ + return 1; + } +} + int spi_chip_erase_60(struct flashchip *flash) { int result; Index: flashrom-lock_refactor/flashrom.c =================================================================== --- flashrom-lock_refactor/flashrom.c (Revision 750) +++ flashrom-lock_refactor/flashrom.c (Arbeitskopie) @@ -448,6 +448,9 @@ printf("Found chip \"%s %s\" (%d KB, %s) at physical address 0x%lx.\n", flash->vendor, flash->name, flash->total_size, flashbuses_to_text(flash->bustype), base); + /* Print the locking status. */ + if (flash->lock) + flash->lock(flash, lock_print); return flash; } -- Developer quote of the week: "We are juggling too many chainsaws and flaming arrows and tigers."

3 7

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom