flashrom

flashrom@flashrom.org

5 participants
9161 discussions

[PATCH v2] nicintel_eeprom: New programmer for Intel Nics eeproms
by Ricardo Ribalda Delgado 12 May '14

12 May '14

This patch let you read and write the eeprom on your gigagit nic card. So far it has been tested on the 82580 NIC, but there should be other boards also compatibles. It is a nice substitution for the eeupdate tool. Speed is quite decent root@qt5022:~# time ./flashrom -p nicintel_eeprom:pci=03:00.0 -E flashrom v0.9.7-r1622 on Linux 3.11.0-qtec-standard (x86_64) flashrom is free software, get the source code at http://www.flashrom.org Calibrating delay loop... OK. Found Programmer flash chip "Opaque flash chip" (32 kB, Programmer-specific) on nicintel_eeprom. Erasing and writing flash chip... Erase/write done. real 0m4.699s user 0m4.676s sys 0m0.024s root@qt5022:~# time ./flashrom -p nicintel_eeprom:pci=03:00.0 -w original.kk flashrom v0.9.7-r1622 on Linux 3.11.0-qtec-standard (x86_64) flashrom is free software, get the source code at http://www.flashrom.org Calibrating delay loop... OK. Found Programmer flash chip "Opaque flash chip" (32 kB, Programmer-specific) on nicintel_eeprom. Reading old flash chip contents... done. Erasing and writing flash chip... Erase/write done. Verifying flash... VERIFIED. real 0m3.533s user 0m3.516s sys 0m0.018s Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda(a)gmail.com> --- v2: -Changes by Stefan Tauner -Manpage Makefile | 9 ++ flashrom.8.tmpl | 6 +- flashrom.c | 12 ++ nicintel_eeprom.c | 336 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ programmer.h | 9 ++ 5 files changed, 370 insertions(+), 2 deletions(-) create mode 100644 nicintel_eeprom.c diff --git a/Makefile b/Makefile index 346d46a..c412bdc 100644 --- a/Makefile +++ b/Makefile @@ -408,6 +408,9 @@ CONFIG_NICINTEL ?= yes # Always enable SPI on Intel NICs for now. CONFIG_NICINTEL_SPI ?= yes +# Always enable EEPROM on Intel NICs for now. +CONFIG_NICINTEL_EEPROM ?= yes + # Always enable SPI on OGP cards for now. CONFIG_OGP_SPI ?= yes @@ -592,6 +595,12 @@ PROGRAMMER_OBJS += nicintel_spi.o NEED_PCI := yes endif +ifeq ($(CONFIG_NICINTEL_EEPROM), yes) +FEATURE_CFLAGS += -D'CONFIG_NICINTEL_EEPROM=1' +PROGRAMMER_OBJS += nicintel_eeprom.o +NEED_PCI := yes +endif + ifeq ($(CONFIG_OGP_SPI), yes) FEATURE_CFLAGS += -D'CONFIG_OGP_SPI=1' PROGRAMMER_OBJS += ogp_spi.o diff --git a/flashrom.8.tmpl b/flashrom.8.tmpl index 8d46ffe..6d400b4 100644 --- a/flashrom.8.tmpl +++ b/flashrom.8.tmpl @@ -221,6 +221,8 @@ bitbanging adapter) .sp .BR "* usbblaster_spi" " (for SPI flash ROMs attached to an Altera USB-Blaster compatible cable)" .sp +.BR "* nicintel_eeprom" " (for SPI EEPROMs on Intel Gigabit network cards)" +.sp Some programmers have optional or mandatory parameters which are described in detail in the .B PROGRAMMER SPECIFIC INFO @@ -566,9 +568,9 @@ syntax where .B content is an 8-bit hexadecimal value. .SS -.BR "nic3com" , " nicrealtek" , " nicnatsemi" , " nicintel\ +.BR "nic3com" , " nicrealtek" , " nicnatsemi" , " nicintel", " nicintel_eeprom\ " , " nicintel_spi" , " gfxnvidia" , " ogp_spi" , " drkaiser" , " satasii\ -" , " satamv" ", and " atahpt " programmers +" , " satamv", ", and " atahpt " programmers These programmers have an option to specify the PCI address of the card your want to use, which must be specified if more than one card supported by the selected programmer is installed in your system. The syntax is diff --git a/flashrom.c b/flashrom.c index b3661c1..1b0a687 100644 --- a/flashrom.c +++ b/flashrom.c @@ -273,6 +273,18 @@ const struct programmer_entry programmer_table[] = { }, #endif +#if CONFIG_NICINTEL_EEPROM == 1 + { + .name = "nicintel_eeprom", + .type = PCI, + .devs.dev = nics_intel_ee, + .init = nicintel_ee_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, + }, +#endif + #if CONFIG_OGP_SPI == 1 { .name = "ogp_spi", diff --git a/nicintel_eeprom.c b/nicintel_eeprom.c new file mode 100644 index 0000000..c80be37 --- /dev/null +++ b/nicintel_eeprom.c @@ -0,0 +1,336 @@ +/* + * This file is part of the flashrom project. + * + * Copyright (C) 2013 Ricardo Ribalda - Qtechnology A/S + * Copyright (C) 2011, 2014 Stefan Tauner + * + * Based on nicinctel_spi.c and ichspi.c + * + * 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. + * + */ + +/* + * Datasheet: Intel 82580 Quad/Dual Gigabit Ethernet LAN Controller Datasheet + * Section 7.4: Register Descriptions + */ + +#include <stdlib.h> +#include <unistd.h> +#include "flash.h" +#include "spi.h" +#include "programmer.h" +#include "hwaccess.h" + +#define PCI_VENDOR_ID_INTEL 0x8086 +#define MEMMAP_SIZE (0x14 + 3) /* Only EEC and EERD are needed. */ + +#define EEC 0x10 /* EEPROM/Flash Control Register */ +#define EERD 0x14 /* EEPROM Read Register */ + +/* EPROM/Flash Control Register bits */ +#define EE_SCK 0 +#define EE_CS 1 +#define EE_SI 2 +#define EE_SO 3 +#define EE_REQ 6 +#define EE_GNT 7 +#define EE_PRES 8 +#define EE_SIZE 11 +#define EE_SIZE_MASK 0xf + +/* EEPROM Read Register bits */ +#define EERD_START 0 +#define EERD_DONE 1 +#define EERD_ADDR 2 +#define EERD_DATA 16 + +#define BIT(x) (1<<x) +#define PAGE_MASK 0x3f + +static uint8_t *nicintel_eebar; +static struct pci_dev *nicintel_pci; + +#define UNPROG_DEVICE 0x1509 + +const struct dev_entry nics_intel_ee[] = { + {PCI_VENDOR_ID_INTEL, 0x150e, OK, "Intel", + "82580 Quad/Dual Gigabit Ethernet LAN Controller"}, + {PCI_VENDOR_ID_INTEL, UNPROG_DEVICE, OK, "Intel", + "Unprogrammed 82580 Quad/Dual " + "Gigabit Ethernet LAN Controller"}, + {0}, +}; + +static int nicintel_ee_probe(struct flashctx *flash) +{ + if (nicintel_pci->device_id == UNPROG_DEVICE) + flash->chip->total_size = 16; + else{ + uint32_t tmp = pci_mmio_readl(nicintel_eebar + EEC); + tmp = ((tmp >> EE_SIZE) & EE_SIZE_MASK); + switch (tmp) { + case 7: + flash->chip->total_size = 16; + break; + case 8: + flash->chip->total_size = 32; + break; + default: + msg_cerr("Unsupported chip size 0x%x\n", tmp); + return 0; + } + } + + flash->chip->page_size = PAGE_MASK + 1; + flash->chip->tested = TEST_OK_PREW; + /* FIXME: Due to the write_granularity set below we do 0xFF dummy + * writes to fake erases on every write which is completely pointless + * and potentially even harmful for the hardware. Programmers/devices + * should be able to indicate that erases are not needed for writes. */ + flash->chip->gran = write_gran_1byte; + flash->chip->block_erasers->eraseblocks[0].size = (PAGE_MASK + 1); + flash->chip->block_erasers->eraseblocks[0].count = + (flash->chip->total_size * 1024) / (PAGE_MASK + 1); + + return 1; +} + +static int nicintel_ee_read_word(unsigned int addr, uint16_t *word) +{ + uint32_t tmp = BIT(EERD_START) | (addr << EERD_ADDR); + uint32_t i; + + pci_mmio_writel(tmp, nicintel_eebar + EERD); + + /* Poll done flag */ + for (i = 0; i < 10000000; i++) { + tmp = pci_mmio_readl(nicintel_eebar + EERD); + if (tmp & BIT(EERD_DONE)) { + *word = (tmp >> EERD_DATA) & 0xffff; + return 0; + } + } + + return -1; +} + +static int nicintel_ee_read(struct flashctx *flash, uint8_t *buf, + unsigned int addr, unsigned int len) +{ + uint16_t word; + + /* The NIC interface always reads 16 b words so we need to convert the + * address and handle odd address explicitly at the start (and also + * at the end in the loop below). */ + if (addr & 1) { + if (nicintel_ee_read_word(addr / 2, &word)) + return -1; + *buf++ = word & 0xff; + addr++; + len--; + } + + while (len > 0) { + if (nicintel_ee_read_word(addr / 2, &word)) + return -1; + *buf++ = word & 0xff; + addr++; + len--; + if (len > 0) { + *buf++ = (word >> 8) & 0xff; + addr++; + len--; + } + } + + return 0; +} + +static int nicintel_ee_bitset(int reg, int bit, bool val) +{ + uint32_t tmp; + + tmp = pci_mmio_readl(nicintel_eebar + reg); + if (val) + tmp |= BIT(bit); + else + tmp &= ~BIT(bit); + pci_mmio_writel(tmp, nicintel_eebar + reg); + + return -1; +} + +static int nicintel_ee_byte(uint8_t mosi, uint8_t *miso) +{ + int i; + uint8_t out = 0x0; + + for (i = 7; i >= 0; i--) { + nicintel_ee_bitset(EEC, EE_SI, mosi & BIT(i)); + nicintel_ee_bitset(EEC, EE_SCK, 1); + if (miso != NULL) { + uint32_t tmp = pci_mmio_readl(nicintel_eebar + EEC); + if (tmp & BIT(EE_SO)) + out |= BIT(i); + } + nicintel_ee_bitset(EEC, EE_SCK, 0); + } + + if (miso != NULL) + *miso = out; + + return 0; +} + +static int nicintel_ee_ready(void) +{ + unsigned int i; + + for (i = 0; i < 1000; i++) { + uint8_t rdsr; + + nicintel_ee_bitset(EEC, EE_CS, 0); + nicintel_ee_byte(JEDEC_RDSR, NULL); + nicintel_ee_byte(0x00, &rdsr); + nicintel_ee_bitset(EEC, EE_CS, 1); + programmer_delay(1); + if (!(rdsr & SPI_SR_WIP)) + return 0; + } + + return -1; +} + +static int nicintel_ee_req(void) +{ + uint32_t tmp; + nicintel_ee_bitset(EEC, EE_REQ, 1); + + tmp = pci_mmio_readl(nicintel_eebar + EEC); + if (!(tmp & BIT(EE_GNT))) { + msg_perr("Enabling eeprom access failed.\n"); + return 1; + } + + nicintel_ee_bitset(EEC, EE_SCK, 0); + return 0; +} + +static int nicintel_ee_write(struct flashctx *flash, const uint8_t *buf, + unsigned int addr, unsigned int len) +{ + if (nicintel_ee_req()) + return -1; + + int ret = -1; + if (nicintel_ee_ready()) + goto out; + + while (len > 0) { + /*wren*/ + nicintel_ee_bitset(EEC, EE_CS, 0); + nicintel_ee_byte(JEDEC_WREN, NULL); + nicintel_ee_bitset(EEC, EE_CS, 1); + programmer_delay(1); + + /*data*/ + nicintel_ee_bitset(EEC, EE_CS, 0); + nicintel_ee_byte(JEDEC_BYTE_PROGRAM, NULL); + nicintel_ee_byte((addr >> 8) & 0xff, NULL); + nicintel_ee_byte(addr & 0xff, NULL); + while (len > 0) { + nicintel_ee_byte((buf) ? *buf++ : 0xff, NULL); + len--; + addr++; + if (!(addr & PAGE_MASK)) + break; + } + nicintel_ee_bitset(EEC, EE_CS, 1); + programmer_delay(1); + if (nicintel_ee_ready()) + goto out; + } + ret = 0; +out: + nicintel_ee_bitset(EEC, EE_REQ, 0); + return ret; +} + +static int nicintel_ee_erase(struct flashctx *flash, unsigned int addr, + unsigned int len) +{ + return nicintel_ee_write(flash, NULL, addr, len); +} + +static const struct opaque_programmer opaque_programmer_nicintel_ee = { + .probe = nicintel_ee_probe, + .read = nicintel_ee_read, + .write = nicintel_ee_write, + .erase = nicintel_ee_erase, +}; + +static int nicintel_spi_shutdown(void *eecp) +{ + int ret; + uint32_t old_eec = *(uint32_t *)eecp; + + /* Request bitbanging and unselect the chip first to be safe. */ + if (nicintel_ee_req() || nicintel_ee_bitset(EEC, EE_CS, 1)) + return -1; + + /* Try to restore individual bits we care about. */ + ret = nicintel_ee_bitset(EEC, EE_SCK, old_eec & BIT(EE_SCK)); + ret |= nicintel_ee_bitset(EEC, EE_SI, old_eec & BIT(EE_SI)); + ret |= nicintel_ee_bitset(EEC, EE_CS, old_eec & BIT(EE_CS)); + ret |= nicintel_ee_bitset(EEC, EE_REQ, old_eec & BIT(EE_REQ)); + + free(eecp); + return ret; +} + +int nicintel_ee_init(void) +{ + struct pci_dev *dev; + + if (rget_io_perms()) + return 1; + + dev = pcidev_init(nics_intel_ee, PCI_BASE_ADDRESS_0); + if (!dev) + return 1; + + io_base_addr = pcidev_readbar(dev, PCI_BASE_ADDRESS_0); + if (!io_base_addr) + return 1; + + nicintel_eebar = rphysmap("Intel Gigabit NIC w/ SPI EEPROM", + io_base_addr, MEMMAP_SIZE); + nicintel_pci = dev; + if (dev->device_id != UNPROG_DEVICE) { + uint32_t eec = pci_mmio_readl(nicintel_eebar + EEC); + uint32_t *eecp; + + if (!(eec & BIT(EE_PRES))) { + msg_perr("EEPROM not present.\n"); + return 1; + } + + eecp = malloc(sizeof(uint32_t)); + if (eecp == NULL) + return 1; + *eecp = eec; + + if (register_shutdown(nicintel_spi_shutdown, eecp)) + return 1; + } + + return register_opaque_programmer(&opaque_programmer_nicintel_ee); +} diff --git a/programmer.h b/programmer.h index 7670784..84a4c68 100644 --- a/programmer.h +++ b/programmer.h @@ -78,6 +78,9 @@ enum programmer { #if CONFIG_NICINTEL_SPI == 1 PROGRAMMER_NICINTEL_SPI, #endif +#if CONFIG_NICINTEL_EEPROM == 1 + PROGRAMMER_NICINTEL_EEPROM, +#endif #if CONFIG_OGP_SPI == 1 PROGRAMMER_OGP_SPI, #endif @@ -410,6 +413,12 @@ int nicintel_spi_init(void); extern const struct dev_entry nics_intel_spi[]; #endif +/* nicintel_eeprom.c */ +#if CONFIG_NICINTEL_EEPROM == 1 +int nicintel_ee_init(void); +extern const struct dev_entry nics_intel_ee[]; +#endif + /* ogp_spi.c */ #if CONFIG_OGP_SPI == 1 int ogp_spi_init(void); -- 2.0.0.rc0

1 0

Re: [flashrom] Flashrom verbose log
by Stefan Tauner 12 May '14

12 May '14

Hello Rajiv, can you please send us the log file created by flashrom -p internal -VV -o probe.log This redirects more output directly into the file "probe.log" and allows us to investigate the problem better. Thank you. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

2 1

at45db buffer overflow
by degener_trash＠mail.ru 10 May '14

10 May '14

I found buffer overflow at at45db module. Error was in chunk length calculation. Patch is attached. Chip AT45DB041D: reading, writing and erasing operations works correctly. Best regards, Alexander Irenkov

3 4

Re: [flashrom] [PATCH] Refine messages related to erase/write recovery.
by Stefan Tauner 10 May '14

10 May '14

On Wed, 7 Aug 2013 17:07:47 +0200 Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> wrote: > We are more verbose inside erase_and_write_flash() although it does not > matter as much as here - at the end of the process. > > New output for the non-fatal (i.e. read-protected + successful read) case: > > Reading old flash chip contents... done. > Erasing and writing flash chip... spi_block_erase_d8 failed during command execution at address 0x8000 > Reading current flash chip contents... done. spi_chip_erase_c7 failed during command execution > FAILED! > Uh oh. Erase/write failed. Checking if anything has changed. > Reading current flash chip contents... done. > Good. Writing to the flash chip apparently didn't do anything. > Please check the connections (especially those to write protection pins) between > the programmer and the flash chip. If you think the error is caused by flashrom > please report this on IRC at chat.freenode.net (channel #flashrom) or > mail flashrom(a)flashrom.org, thanks! > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Slightly refined, Acked-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> and committed in r1790. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

[commit] r1790 - trunk
by repository service 10 May '14

10 May '14

Author: stefanct Date: Sat May 10 11:25:44 2014 New Revision: 1790 URL: http://flashrom.org/trac/flashrom/changeset/1790 Log: Refine messages related to erase/write recovery. We are more verbose inside erase_and_write_flash() although it does not matter as much as at the end of the whole process in doit(). New output for the non-fatal (i.e. read-protected + successful recovery read) case: Reading old flash chip contents... done. Erasing and writing flash chip... spi_block_erase_d8 failed during command execution at address 0x8000 Reading current flash chip contents... done. spi_chip_erase_c7 failed during command execution FAILED! Uh oh. Erase/write failed. Checking if anything has changed. Reading current flash chip contents... done. Good, writing to the flash chip apparently didn't do anything. Please check the connections (especially those to write protection pins) between the programmer and the flash chip. If you think the error is caused by flashrom please report this on IRC at chat.freenode.net (channel #flashrom) or mail flashrom(a)flashrom.org, thanks! Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Modified: trunk/flashrom.c Modified: trunk/flashrom.c ============================================================================== --- trunk/flashrom.c Fri May 9 23:16:21 2014 (r1789) +++ trunk/flashrom.c Sat May 10 11:25:44 2014 (r1790) @@ -1521,7 +1521,7 @@ static void nonfatal_help_message(void) { - msg_gerr("Writing to the flash chip apparently didn't do anything.\n"); + msg_gerr("Good, writing to the flash chip apparently didn't do anything.\n"); #if CONFIG_INTERNAL == 1 if (programmer == PROGRAMMER_INTERNAL) msg_gerr("This means we have to add special support for your board, programmer or flash\n" @@ -2008,16 +2008,18 @@ if (write_it) { if (erase_and_write_flash(flash, oldcontents, newcontents)) { - msg_cerr("Uh oh. Erase/write failed. Checking if " - "anything changed.\n"); + msg_cerr("Uh oh. Erase/write failed. Checking if anything has changed.\n"); + msg_cinfo("Reading current flash chip contents... "); if (!flash->chip->read(flash, newcontents, 0, size)) { + msg_cinfo("done.\n"); if (!memcmp(oldcontents, newcontents, size)) { - msg_cinfo("Good. It seems nothing was changed.\n"); nonfatal_help_message(); ret = 1; goto out; } - } + msg_cerr("Apparently at least some data has changed.\n"); + } else + msg_cerr("Can't even read anymore!\n"); emergency_help_message(); ret = 1; goto out;

1 0

Re: [flashrom] flashrom support for Intel Rangeley/Avoton/C2000
by Stefan Tauner 10 May '14

10 May '14

On Sat, 10 May 2014 11:43:30 +0530 Rajasekhar Pulluru <pullururajasekhar(a)gmail.com> wrote: > Hi Stefan, > > In the system, only below regions were mapped and only these regions can be > erased/programmed. > > 0x54: 0x000f0000 FREG0: Flash Descriptor region (0x00000000-0x0000ffff) is > read-write. > 0x58: 0x07ff0200 FREG1: BIOS region (0x00200000-0x007fffff) is read-write. > > The other regions were not used on this platform. > > Creating a romlayout file and programming only the specified regions solves > the issue. The patch works fine. Hello Rajasekhar, great to hear that it works for you. Your patch as sent previously does have a few issues (flash chip patch included, redundancies that might be worthwhile to refactor) that need to be resolved before integrating it. I would probably want to take it and merge it manually when integrating chromiumos' baytrail patch. To be able to do this we need your confirmation by signing off the patch as explained here: http://www.coreboot.org/Development_Guidelines#Sign-off_Procedure -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

Re: [flashrom] flashrom support for Intel Rangeley/Avoton/C2000
by Stefan Tauner 10 May '14

10 May '14

On Wed, 23 Apr 2014 20:40:26 +0530 Rajasekhar Pulluru <pullururajasekhar(a)gmail.com> wrote: > Hi Stefan, > > Attached the full logs (excluding dmi). My observation is that: > 1) reading spi flash seems to be good. > 2) erasing spi flash : only first 64kb erases successfully, after that > erase reports failure. > 3) programming spi flash: only first 64kb programs fine, after that erase > reports failure. Hi, your output is missing the lines that are printed to stderr instead of stdout and you should probably use the -o option of flashrom to create logfiles ;) ... but anyway, it seems to me as if the ME region starts exactly where you have problems. And I assume that it is at least not writable. You can make that r/w by changing the flash descriptor (i.e. the first 4kB which are apparently writable). -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

2 1

Re: [flashrom] [PATCH] Add const to many function prototypes
by Stefan Tauner 10 May '14

10 May '14

On Thu, 28 Mar 2013 13:16:10 +0100 Mark Marshall <markmarshall14(a)gmail.com> wrote: > Add 'const' to the data block passed to 'write' functions. > This is as much for documentation as anything else, but should > allow the compiler to make a few basic checks for us. > > Signed-off-by: Mark Marshall <mark.marshall(a)omicron.at> I don't know what's more embarrassing: that we have not merged this earlier or that we have not even noticed that the patch was mangled by your MUA. Anyway, as a fan of strict typing I like the patch and so I have fixed it, rebased it and eventually committed it in r1789. Thank you! To everyone trying to rebase patches that now fail to merge: my sincere apologies, but you probably have earned it though. :P -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

[commit] r1789 - trunk
by repository service 10 May '14

10 May '14

Author: stefanct Date: Fri May 9 23:16:21 2014 New Revision: 1789 URL: http://flashrom.org/trac/flashrom/changeset/1789 Log: Add 'const' keyword to chip write and other function prototypes. Inspired by and mostly based on a patch Signed-off-by: Mark Marshall <mark.marshall(a)omicron.at> Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Modified: trunk/82802ab.c trunk/at45db.c trunk/chipdrivers.h trunk/dummyflasher.c trunk/en29lv640b.c trunk/flash.h trunk/flashrom.c trunk/ichspi.c trunk/it87spi.c trunk/layout.c trunk/linux_spi.c trunk/m29f400bt.c trunk/opaque.c trunk/programmer.c trunk/programmer.h trunk/serial.c trunk/spi.c trunk/spi25.c trunk/sst28sf040.c Modified: trunk/82802ab.c ============================================================================== --- trunk/82802ab.c Thu May 8 00:07:23 2014 (r1788) +++ trunk/82802ab.c Fri May 9 23:16:21 2014 (r1789) @@ -142,8 +142,7 @@ } /* chunksize is 1 */ -int write_82802ab(struct flashctx *flash, uint8_t *src, unsigned int start, - unsigned int len) +int write_82802ab(struct flashctx *flash, const uint8_t *src, unsigned int start, unsigned int len) { int i; chipaddr dst = flash->virtual_memory + start; Modified: trunk/at45db.c ============================================================================== --- trunk/at45db.c Thu May 8 00:07:23 2014 (r1788) +++ trunk/at45db.c Fri May 9 23:16:21 2014 (r1789) @@ -460,7 +460,7 @@ return at45db_erase(flash, opcode, at45db_convert_addr(addr, page_size), 200000, 100); } -static int at45db_fill_buffer1(struct flashctx *flash, uint8_t *bytes, unsigned int off, unsigned int len) +static int at45db_fill_buffer1(struct flashctx *flash, const uint8_t *bytes, unsigned int off, unsigned int len) { const unsigned int page_size = flash->chip->page_size; if ((off + len) > page_size) { @@ -518,7 +518,7 @@ return 0; } -static int at45db_program_page(struct flashctx *flash, uint8_t *buf, unsigned int at45db_addr) +static int at45db_program_page(struct flashctx *flash, const uint8_t *buf, unsigned int at45db_addr) { int ret = at45db_fill_buffer1(flash, buf, 0, flash->chip->page_size); if (ret != 0) { @@ -535,7 +535,7 @@ return 0; } -int spi_write_at45db(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len) +int spi_write_at45db(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len) { const unsigned int page_size = flash->chip->page_size; const unsigned int total_size = flash->chip->total_size; Modified: trunk/chipdrivers.h ============================================================================== --- trunk/chipdrivers.h Thu May 8 00:07:23 2014 (r1788) +++ trunk/chipdrivers.h Fri May 9 23:16:21 2014 (r1789) @@ -28,8 +28,8 @@ #include "flash.h" /* for chipaddr and flashctx */ /* spi.c */ -int spi_aai_write(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); -int spi_chip_write_256(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); +int spi_aai_write(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); +int spi_chip_write_256(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); int spi_chip_read(struct flashctx *flash, uint8_t *buf, unsigned int start, int unsigned len); /* spi25.c */ @@ -54,12 +54,12 @@ int spi_block_erase_d8(struct flashctx *flash, unsigned int addr, unsigned int blocklen); int spi_block_erase_db(struct flashctx *flash, unsigned int addr, unsigned int blocklen); erasefunc_t *spi_get_erasefn_from_opcode(uint8_t opcode); -int spi_chip_write_1(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); +int spi_chip_write_1(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); int spi_byte_program(struct flashctx *flash, unsigned int addr, uint8_t databyte); -int spi_nbyte_program(struct flashctx *flash, unsigned int addr, uint8_t *bytes, unsigned int len); +int spi_nbyte_program(struct flashctx *flash, unsigned int addr, const uint8_t *bytes, unsigned int len); int spi_nbyte_read(struct flashctx *flash, unsigned int addr, uint8_t *bytes, unsigned int len); int spi_read_chunked(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len, unsigned int chunksize); -int spi_write_chunked(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len, unsigned int chunksize); +int spi_write_chunked(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len, unsigned int chunksize); /* spi25_statusreg.c */ uint8_t spi_read_status_register(struct flashctx *flash); @@ -107,7 +107,7 @@ /* opaque.c */ int probe_opaque(struct flashctx *flash); int read_opaque(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); -int write_opaque(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); +int write_opaque(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); int erase_opaque(struct flashctx *flash, unsigned int blockaddr, unsigned int blocklen); /* at45db.c */ @@ -116,7 +116,7 @@ int spi_disable_blockprotect_at45db(struct flashctx *flash); int spi_read_at45db(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); int spi_read_at45db_e8(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); -int spi_write_at45db(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); +int spi_write_at45db(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); int spi_erase_at45db_page(struct flashctx *flash, unsigned int addr, unsigned int blocklen); int spi_erase_at45db_block(struct flashctx *flash, unsigned int addr, unsigned int blocklen); int spi_erase_at45db_sector(struct flashctx *flash, unsigned int addr, unsigned int blocklen); @@ -127,7 +127,7 @@ uint8_t wait_82802ab(struct flashctx *flash); int probe_82802ab(struct flashctx *flash); int erase_block_82802ab(struct flashctx *flash, unsigned int page, unsigned int pagesize); -int write_82802ab(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); +int write_82802ab(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); void print_status_82802ab(uint8_t status); int unlock_82802ab(struct flashctx *flash); int unlock_28f004s5(struct flashctx *flash); @@ -140,8 +140,8 @@ int write_byte_program_jedec(struct flashctx *flash, chipaddr bios, uint8_t *src, chipaddr dst); int probe_jedec(struct flashctx *flash); -int write_jedec(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); -int write_jedec_1(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); +int write_jedec(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); +int write_jedec_1(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); int erase_sector_jedec(struct flashctx *flash, unsigned int page, unsigned int pagesize); int erase_block_jedec(struct flashctx *flash, unsigned int page, unsigned int blocksize); int erase_chip_block_jedec(struct flashctx *flash, unsigned int page, unsigned int blocksize); @@ -150,7 +150,7 @@ int probe_m29f400bt(struct flashctx *flash); int block_erase_m29f400bt(struct flashctx *flash, unsigned int start, unsigned int len); int block_erase_chip_m29f400bt(struct flashctx *flash, unsigned int start, unsigned int len); -int write_m29f400bt(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); +int write_m29f400bt(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); void protect_m29f400bt(struct flashctx *flash, chipaddr bios); /* pm49fl00x.c */ @@ -160,7 +160,7 @@ /* sst28sf040.c */ int erase_chip_28sf040(struct flashctx *flash, unsigned int addr, unsigned int blocklen); int erase_sector_28sf040(struct flashctx *flash, unsigned int address, unsigned int sector_size); -int write_28sf040(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); +int write_28sf040(struct flashctx *flash, const uint8_t *buf,unsigned int start, unsigned int len); int unprotect_28sf040(struct flashctx *flash); int protect_28sf040(struct flashctx *flash); @@ -202,6 +202,6 @@ int probe_en29lv640b(struct flashctx *flash); int block_erase_en29lv640b(struct flashctx *flash, unsigned int start, unsigned int len); int block_erase_chip_en29lv640b(struct flashctx *flash, unsigned int start, unsigned int len); -int write_en29lv640b(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); +int write_en29lv640b(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); #endif /* !__CHIPDRIVERS_H__ */ Modified: trunk/dummyflasher.c ============================================================================== --- trunk/dummyflasher.c Thu May 8 00:07:23 2014 (r1788) +++ trunk/dummyflasher.c Fri May 9 23:16:21 2014 (r1789) @@ -96,28 +96,18 @@ static unsigned int spi_write_256_chunksize = 256; -static int dummy_spi_send_command(struct flashctx *flash, unsigned int writecnt, - unsigned int readcnt, - const unsigned char *writearr, - unsigned char *readarr); -static int dummy_spi_write_256(struct flashctx *flash, uint8_t *buf, +static int dummy_spi_send_command(struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, + const unsigned char *writearr, unsigned char *readarr); +static int dummy_spi_write_256(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); -static void dummy_chip_writeb(const struct flashctx *flash, uint8_t val, - chipaddr addr); -static void dummy_chip_writew(const struct flashctx *flash, uint16_t val, - chipaddr addr); -static void dummy_chip_writel(const struct flashctx *flash, uint32_t val, - chipaddr addr); -static void dummy_chip_writen(const struct flashctx *flash, uint8_t *buf, - chipaddr addr, size_t len); -static uint8_t dummy_chip_readb(const struct flashctx *flash, - const chipaddr addr); -static uint16_t dummy_chip_readw(const struct flashctx *flash, - const chipaddr addr); -static uint32_t dummy_chip_readl(const struct flashctx *flash, - const chipaddr addr); -static void dummy_chip_readn(const struct flashctx *flash, uint8_t *buf, - const chipaddr addr, size_t len); +static void dummy_chip_writeb(const struct flashctx *flash, uint8_t val, chipaddr addr); +static void dummy_chip_writew(const struct flashctx *flash, uint16_t val, chipaddr addr); +static void dummy_chip_writel(const struct flashctx *flash, uint32_t val, chipaddr addr); +static void dummy_chip_writen(const struct flashctx *flash, const uint8_t *buf, chipaddr addr, size_t len); +static uint8_t dummy_chip_readb(const struct flashctx *flash, const chipaddr addr); +static uint16_t dummy_chip_readw(const struct flashctx *flash, const chipaddr addr); +static uint32_t dummy_chip_readl(const struct flashctx *flash, const chipaddr addr); +static void dummy_chip_readn(const struct flashctx *flash, uint8_t *buf, const chipaddr addr, size_t len); static const struct spi_programmer spi_programmer_dummyflasher = { .type = SPI_CONTROLLER_DUMMY, @@ -427,26 +417,22 @@ msg_pspew("%s: Unmapping 0x%zx bytes at %p\n", __func__, len, virt_addr); } -static void dummy_chip_writeb(const struct flashctx *flash, uint8_t val, - chipaddr addr) +static void dummy_chip_writeb(const struct flashctx *flash, uint8_t val, chipaddr addr) { msg_pspew("%s: addr=0x%" PRIxPTR ", val=0x%02x\n", __func__, addr, val); } -static void dummy_chip_writew(const struct flashctx *flash, uint16_t val, - chipaddr addr) +static void dummy_chip_writew(const struct flashctx *flash, uint16_t val, chipaddr addr) { msg_pspew("%s: addr=0x%" PRIxPTR ", val=0x%04x\n", __func__, addr, val); } -static void dummy_chip_writel(const struct flashctx *flash, uint32_t val, - chipaddr addr) +static void dummy_chip_writel(const struct flashctx *flash, uint32_t val, chipaddr addr) { msg_pspew("%s: addr=0x%" PRIxPTR ", val=0x%08x\n", __func__, addr, val); } -static void dummy_chip_writen(const struct flashctx *flash, uint8_t *buf, - chipaddr addr, size_t len) +static void dummy_chip_writen(const struct flashctx *flash, const uint8_t *buf, chipaddr addr, size_t len) { size_t i; msg_pspew("%s: addr=0x%" PRIxPTR ", len=0x%zx, writing data (hex):", __func__, addr, len); @@ -457,29 +443,25 @@ } } -static uint8_t dummy_chip_readb(const struct flashctx *flash, - const chipaddr addr) +static uint8_t dummy_chip_readb(const struct flashctx *flash, const chipaddr addr) { msg_pspew("%s: addr=0x%" PRIxPTR ", returning 0xff\n", __func__, addr); return 0xff; } -static uint16_t dummy_chip_readw(const struct flashctx *flash, - const chipaddr addr) +static uint16_t dummy_chip_readw(const struct flashctx *flash, const chipaddr addr) { msg_pspew("%s: addr=0x%" PRIxPTR ", returning 0xffff\n", __func__, addr); return 0xffff; } -static uint32_t dummy_chip_readl(const struct flashctx *flash, - const chipaddr addr) +static uint32_t dummy_chip_readl(const struct flashctx *flash, const chipaddr addr) { msg_pspew("%s: addr=0x%" PRIxPTR ", returning 0xffffffff\n", __func__, addr); return 0xffffffff; } -static void dummy_chip_readn(const struct flashctx *flash, uint8_t *buf, - const chipaddr addr, size_t len) +static void dummy_chip_readn(const struct flashctx *flash, uint8_t *buf, const chipaddr addr, size_t len) { msg_pspew("%s: addr=0x%" PRIxPTR ", len=0x%zx, returning array of 0xff\n", __func__, addr, len); memset(buf, 0xff, len); @@ -846,8 +828,7 @@ return 0; } -static int dummy_spi_write_256(struct flashctx *flash, uint8_t *buf, - unsigned int start, unsigned int len) +static int dummy_spi_write_256(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len) { return spi_write_chunked(flash, buf, start, len, spi_write_256_chunksize); Modified: trunk/en29lv640b.c ============================================================================== --- trunk/en29lv640b.c Thu May 8 00:07:23 2014 (r1788) +++ trunk/en29lv640b.c Fri May 9 23:16:21 2014 (r1789) @@ -31,8 +31,7 @@ */ /* chunksize is 1 */ -int write_en29lv640b(struct flashctx *flash, uint8_t *src, unsigned int start, - unsigned int len) +int write_en29lv640b(struct flashctx *flash, const uint8_t *src, unsigned int start, unsigned int len) { int i; chipaddr bios = flash->virtual_memory; Modified: trunk/flash.h ============================================================================== --- trunk/flash.h Thu May 8 00:07:23 2014 (r1788) +++ trunk/flash.h Fri May 9 23:16:21 2014 (r1789) @@ -175,7 +175,7 @@ int (*printlock) (struct flashctx *flash); int (*unlock) (struct flashctx *flash); - int (*write) (struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); + int (*write) (struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); int (*read) (struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); struct voltage { uint16_t min; @@ -228,7 +228,7 @@ void chip_writeb(const struct flashctx *flash, uint8_t val, chipaddr addr); void chip_writew(const struct flashctx *flash, uint16_t val, chipaddr addr); void chip_writel(const struct flashctx *flash, uint32_t val, chipaddr addr); -void chip_writen(const struct flashctx *flash, uint8_t *buf, chipaddr addr, size_t len); +void chip_writen(const struct flashctx *flash, const uint8_t *buf, chipaddr addr, size_t len); uint8_t chip_readb(const struct flashctx *flash, const chipaddr addr); uint16_t chip_readw(const struct flashctx *flash, const chipaddr addr); uint32_t chip_readl(const struct flashctx *flash, const chipaddr addr); @@ -253,8 +253,8 @@ int max(int a, int b); void tolower_string(char *str); char *extract_param(const char *const *haystack, const char *needle, const char *delim); -int verify_range(struct flashctx *flash, uint8_t *cmpbuf, unsigned int start, unsigned int len); -int need_erase(uint8_t *have, uint8_t *want, unsigned int len, enum write_granularity gran); +int verify_range(struct flashctx *flash, const uint8_t *cmpbuf, unsigned int start, unsigned int len); +int need_erase(const uint8_t *have, const uint8_t *want, unsigned int len, enum write_granularity gran); char *strcat_realloc(char *dest, const char *src); void print_version(void); void print_buildinfo(void); @@ -263,7 +263,7 @@ int selfcheck(void); int doit(struct flashctx *flash, int force, const char *filename, int read_it, int write_it, int erase_it, int verify_it); int read_buf_from_file(unsigned char *buf, unsigned long size, const char *filename); -int write_buf_to_file(unsigned char *buf, unsigned long size, const char *filename); +int write_buf_to_file(const unsigned char *buf, unsigned long size, const char *filename); enum test_state { OK = 0, @@ -327,7 +327,7 @@ /* layout.c */ int register_include_arg(char *name); int process_include_args(void); -int read_romlayout(char *name); +int read_romlayout(const char *name); int normalize_romentries(const struct flashctx *flash); int build_new_image(const struct flashctx *flash, uint8_t *oldcontents, uint8_t *newcontents); void layout_cleanup(void); Modified: trunk/flashrom.c ============================================================================== --- trunk/flashrom.c Thu May 8 00:07:23 2014 (r1788) +++ trunk/flashrom.c Fri May 9 23:16:21 2014 (r1789) @@ -463,8 +463,7 @@ flash->pgm->par.chip_writel(flash, val, addr); } -void chip_writen(const struct flashctx *flash, uint8_t *buf, chipaddr addr, - size_t len) +void chip_writen(const struct flashctx *flash, const uint8_t *buf, chipaddr addr, size_t len) { flash->pgm->par.chip_writen(flash, buf, addr, len); } @@ -627,7 +626,7 @@ return usable_erasefunctions; } -int compare_range(uint8_t *wantbuf, uint8_t *havebuf, unsigned int start, unsigned int len) +static int compare_range(const uint8_t *wantbuf, const uint8_t *havebuf, unsigned int start, unsigned int len) { int ret = 0, failcount = 0; unsigned int i; @@ -671,7 +670,7 @@ * @len length of the verified area * @return 0 for success, -1 for failure */ -int verify_range(struct flashctx *flash, uint8_t *cmpbuf, unsigned int start, unsigned int len) +int verify_range(struct flashctx *flash, const uint8_t *cmpbuf, unsigned int start, unsigned int len) { uint8_t *readbuf = malloc(len); int ret = 0; @@ -710,7 +709,7 @@ } /* Helper function for need_erase() that focuses on granularities of gran bytes. */ -static int need_erase_gran_bytes(uint8_t *have, uint8_t *want, unsigned int len, unsigned int gran) +static int need_erase_gran_bytes(const uint8_t *have, const uint8_t *want, unsigned int len, unsigned int gran) { unsigned int i, j, limit; for (j = 0; j < len / gran; j++) { @@ -740,7 +739,7 @@ * @gran write granularity (enum, not count) * @return 0 if no erase is needed, 1 otherwise */ -int need_erase(uint8_t *have, uint8_t *want, unsigned int len, enum write_granularity gran) +int need_erase(const uint8_t *have, const uint8_t *want, unsigned int len, enum write_granularity gran) { int result = 0; unsigned int i; @@ -808,7 +807,7 @@ * in relation to the max write length of the programmer and the max write * length of the chip. */ -static unsigned int get_next_write(uint8_t *have, uint8_t *want, unsigned int len, +static unsigned int get_next_write(const uint8_t *have, const uint8_t *want, unsigned int len, unsigned int *first_start, enum write_granularity gran) { @@ -1211,8 +1210,7 @@ #endif } -int write_buf_to_file(unsigned char *buf, unsigned long size, - const char *filename) +int write_buf_to_file(const unsigned char *buf, unsigned long size, const char *filename) { #ifdef __LIBPAYLOAD__ msg_gerr("Error: No file I/O support in libpayload\n"); @@ -1456,8 +1454,7 @@ return 0; } -int erase_and_write_flash(struct flashctx *flash, uint8_t *oldcontents, - uint8_t *newcontents) +int erase_and_write_flash(struct flashctx *flash, uint8_t *oldcontents, uint8_t *newcontents) { int k, ret = 1; uint8_t *curcontents; Modified: trunk/ichspi.c ============================================================================== --- trunk/ichspi.c Thu May 8 00:07:23 2014 (r1788) +++ trunk/ichspi.c Fri May 9 23:16:21 2014 (r1789) @@ -1327,8 +1327,7 @@ return 0; } -static int ich_hwseq_write(struct flashctx *flash, uint8_t *buf, - unsigned int addr, unsigned int len) +static int ich_hwseq_write(struct flashctx *flash, const uint8_t *buf, unsigned int addr, unsigned int len) { uint16_t hsfc; uint16_t timeout = 100 * 60; Modified: trunk/it87spi.c ============================================================================== --- trunk/it87spi.c Thu May 8 00:07:23 2014 (r1788) +++ trunk/it87spi.c Fri May 9 23:16:21 2014 (r1789) @@ -108,7 +108,7 @@ unsigned char *readarr); static int it8716f_spi_chip_read(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); -static int it8716f_spi_chip_write_256(struct flashctx *flash, uint8_t *buf, +static int it8716f_spi_chip_write_256(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); static const struct spi_programmer spi_programmer_it87xx = { @@ -347,8 +347,7 @@ } /* Page size is usually 256 bytes */ -static int it8716f_spi_page_program(struct flashctx *flash, uint8_t *buf, - unsigned int start) +static int it8716f_spi_page_program(struct flashctx *flash, const uint8_t *buf, unsigned int start) { unsigned int i; int result; @@ -393,7 +392,7 @@ return 0; } -static int it8716f_spi_chip_write_256(struct flashctx *flash, uint8_t *buf, +static int it8716f_spi_chip_write_256(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len) { const struct flashchip *chip = flash->chip; Modified: trunk/layout.c ============================================================================== --- trunk/layout.c Thu May 8 00:07:23 2014 (r1788) +++ trunk/layout.c Fri May 9 23:16:21 2014 (r1789) @@ -45,7 +45,7 @@ static int num_include_args = 0; /* the number of valid include_args. */ #ifndef __LIBPAYLOAD__ -int read_romlayout(char *name) +int read_romlayout(const char *name) { FILE *romlayout; char tempstr[256]; @@ -102,7 +102,7 @@ #endif /* returns the index of the entry (or a negative value if it is not found) */ -int find_include_arg(const char *const name) +static int find_include_arg(const char *const name) { unsigned int i; for (i = 0; i < num_include_args; i++) { Modified: trunk/linux_spi.c ============================================================================== --- trunk/linux_spi.c Thu May 8 00:07:23 2014 (r1788) +++ trunk/linux_spi.c Fri May 9 23:16:21 2014 (r1789) @@ -43,7 +43,7 @@ unsigned char *rxbuf); static int linux_spi_read(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); -static int linux_spi_write_256(struct flashctx *flash, uint8_t *buf, +static int linux_spi_write_256(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); static const struct spi_programmer spi_programmer_linux = { @@ -179,8 +179,7 @@ (unsigned int)getpagesize()); } -static int linux_spi_write_256(struct flashctx *flash, uint8_t *buf, - unsigned int start, unsigned int len) +static int linux_spi_write_256(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len) { return spi_write_chunked(flash, buf, start, len, ((unsigned int)getpagesize()) - 4); Modified: trunk/m29f400bt.c ============================================================================== --- trunk/m29f400bt.c Thu May 8 00:07:23 2014 (r1788) +++ trunk/m29f400bt.c Fri May 9 23:16:21 2014 (r1789) @@ -28,8 +28,7 @@ functions. */ /* chunksize is 1 */ -int write_m29f400bt(struct flashctx *flash, uint8_t *src, unsigned int start, - unsigned int len) +int write_m29f400bt(struct flashctx *flash, const uint8_t *src, unsigned int start, unsigned int len) { int i; chipaddr bios = flash->virtual_memory; Modified: trunk/opaque.c ============================================================================== --- trunk/opaque.c Thu May 8 00:07:23 2014 (r1788) +++ trunk/opaque.c Fri May 9 23:16:21 2014 (r1789) @@ -40,7 +40,7 @@ return flash->pgm->opaque.read(flash, buf, start, len); } -int write_opaque(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len) +int write_opaque(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len) { return flash->pgm->opaque.write(flash, buf, start, len); } Modified: trunk/programmer.c ============================================================================== --- trunk/programmer.c Thu May 8 00:07:23 2014 (r1788) +++ trunk/programmer.c Fri May 9 23:16:21 2014 (r1789) @@ -78,8 +78,7 @@ return val; } -void fallback_chip_writen(const struct flashctx *flash, uint8_t *buf, - chipaddr addr, size_t len) +void fallback_chip_writen(const struct flashctx *flash, const uint8_t *buf, chipaddr addr, size_t len) { size_t i; for (i = 0; i < len; i++) Modified: trunk/programmer.h ============================================================================== --- trunk/programmer.h Thu May 8 00:07:23 2014 (r1788) +++ trunk/programmer.h Fri May 9 23:16:21 2014 (r1789) @@ -542,8 +542,8 @@ /* Optimized functions for this programmer */ int (*read)(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); - int (*write_256)(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); - int (*write_aai)(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); + int (*write_256)(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); + int (*write_aai)(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); const void *data; }; @@ -551,8 +551,8 @@ const unsigned char *writearr, unsigned char *readarr); int default_spi_send_multicommand(struct flashctx *flash, struct spi_command *cmds); int default_spi_read(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); -int default_spi_write_256(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); -int default_spi_write_aai(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); +int default_spi_write_256(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); +int default_spi_write_aai(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); int register_spi_programmer(const struct spi_programmer *programmer); /* The following enum is needed by ich_descriptor_tool and ich* code as well as in chipset_enable.c. */ @@ -611,7 +611,7 @@ /* Specific functions for this programmer */ int (*probe) (struct flashctx *flash); int (*read) (struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); - int (*write) (struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); + int (*write) (struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); int (*erase) (struct flashctx *flash, unsigned int blockaddr, unsigned int blocklen); const void *data; }; @@ -624,7 +624,7 @@ void noop_chip_writeb(const struct flashctx *flash, uint8_t val, chipaddr addr); void fallback_chip_writew(const struct flashctx *flash, uint16_t val, chipaddr addr); void fallback_chip_writel(const struct flashctx *flash, uint32_t val, chipaddr addr); -void fallback_chip_writen(const struct flashctx *flash, uint8_t *buf, chipaddr addr, size_t len); +void fallback_chip_writen(const struct flashctx *flash, const uint8_t *buf, chipaddr addr, size_t len); uint16_t fallback_chip_readw(const struct flashctx *flash, const chipaddr addr); uint32_t fallback_chip_readl(const struct flashctx *flash, const chipaddr addr); void fallback_chip_readn(const struct flashctx *flash, uint8_t *buf, const chipaddr addr, size_t len); @@ -632,7 +632,7 @@ void (*chip_writeb) (const struct flashctx *flash, uint8_t val, chipaddr addr); void (*chip_writew) (const struct flashctx *flash, uint16_t val, chipaddr addr); void (*chip_writel) (const struct flashctx *flash, uint32_t val, chipaddr addr); - void (*chip_writen) (const struct flashctx *flash, uint8_t *buf, chipaddr addr, size_t len); + void (*chip_writen) (const struct flashctx *flash, const uint8_t *buf, chipaddr addr, size_t len); uint8_t (*chip_readb) (const struct flashctx *flash, const chipaddr addr); uint16_t (*chip_readw) (const struct flashctx *flash, const chipaddr addr); uint32_t (*chip_readl) (const struct flashctx *flash, const chipaddr addr); @@ -673,8 +673,8 @@ extern fdtype sp_fd; /* expose serialport_shutdown as it's currently used by buspirate */ int serialport_shutdown(void *data); -int serialport_write(unsigned char *buf, unsigned int writecnt); -int serialport_write_nonblock(unsigned char *buf, unsigned int writecnt, unsigned int timeout, unsigned int *really_wrote); +int serialport_write(const unsigned char *buf, unsigned int writecnt); +int serialport_write_nonblock(const unsigned char *buf, unsigned int writecnt, unsigned int timeout, unsigned int *really_wrote); int serialport_read(unsigned char *buf, unsigned int readcnt); int serialport_read_nonblock(unsigned char *c, unsigned int readcnt, unsigned int timeout, unsigned int *really_read); Modified: trunk/serial.c ============================================================================== --- trunk/serial.c Thu May 8 00:07:23 2014 (r1788) +++ trunk/serial.c Fri May 9 23:16:21 2014 (r1789) @@ -335,7 +335,7 @@ return 0; } -int serialport_write(unsigned char *buf, unsigned int writecnt) +int serialport_write(const unsigned char *buf, unsigned int writecnt) { #ifdef _WIN32 DWORD tmp = 0; @@ -470,7 +470,7 @@ /* Tries up to timeout ms to write writecnt characters from the array starting at buf. Returns * 0 on success, positive values on temporary errors (e.g. timeouts) and negative ones on permanent errors. * If really_wrote is not NULL, this function sets its contents to the number of bytes written successfully. */ -int serialport_write_nonblock(unsigned char *buf, unsigned int writecnt, unsigned int timeout, unsigned int *really_wrote) +int serialport_write_nonblock(const unsigned char *buf, unsigned int writecnt, unsigned int timeout, unsigned int *really_wrote) { int ret = 1; /* disable blocked i/o and declare platform-specific variables */ Modified: trunk/spi.c ============================================================================== --- trunk/spi.c Thu May 8 00:07:23 2014 (r1788) +++ trunk/spi.c Fri May 9 23:16:21 2014 (r1789) @@ -88,8 +88,7 @@ return spi_read_chunked(flash, buf, start, len, max_data); } -int default_spi_write_256(struct flashctx *flash, uint8_t *buf, - unsigned int start, unsigned int len) +int default_spi_write_256(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len) { unsigned int max_data = flash->pgm->spi.max_data_write; if (max_data == MAX_DATA_UNSPECIFIED) { @@ -135,8 +134,7 @@ * .write_256 = spi_chip_write_1 */ /* real chunksize is up to 256, logical chunksize is 256 */ -int spi_chip_write_256(struct flashctx *flash, uint8_t *buf, unsigned int start, - unsigned int len) +int spi_chip_write_256(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len) { return flash->pgm->spi.write_256(flash, buf, start, len); } @@ -162,8 +160,7 @@ } } -int spi_aai_write(struct flashctx *flash, uint8_t *buf, - unsigned int start, unsigned int len) +int spi_aai_write(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len) { return flash->pgm->spi.write_aai(flash, buf, start, len); } Modified: trunk/spi25.c ============================================================================== --- trunk/spi25.c Thu May 8 00:07:23 2014 (r1788) +++ trunk/spi25.c Fri May 9 23:16:21 2014 (r1789) @@ -876,8 +876,7 @@ return result; } -int spi_nbyte_program(struct flashctx *flash, unsigned int addr, uint8_t *bytes, - unsigned int len) +int spi_nbyte_program(struct flashctx *flash, unsigned int addr, const uint8_t *bytes, unsigned int len) { int result; /* FIXME: Switch to malloc based on len unless that kills speed. */ @@ -983,7 +982,7 @@ * FIXME: Use the chunk code from Michael Karcher instead. * Each page is written separately in chunks with a maximum size of chunksize. */ -int spi_write_chunked(struct flashctx *flash, uint8_t *buf, unsigned int start, +int spi_write_chunked(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len, unsigned int chunksize) { int rc = 0; @@ -1032,8 +1031,7 @@ * (e.g. due to size constraints in IT87* for over 512 kB) */ /* real chunksize is 1, logical chunksize is 1 */ -int spi_chip_write_1(struct flashctx *flash, uint8_t *buf, unsigned int start, - unsigned int len) +int spi_chip_write_1(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len) { unsigned int i; int result = 0; @@ -1049,7 +1047,7 @@ return 0; } -int default_spi_write_aai(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len) +int default_spi_write_aai(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len) { uint32_t pos = start; int result; Modified: trunk/sst28sf040.c ============================================================================== --- trunk/sst28sf040.c Thu May 8 00:07:23 2014 (r1788) +++ trunk/sst28sf040.c Fri May 9 23:16:21 2014 (r1789) @@ -77,8 +77,7 @@ } /* chunksize is 1 */ -int write_28sf040(struct flashctx *flash, uint8_t *src, unsigned int start, - unsigned int len) +int write_28sf040(struct flashctx *flash, const uint8_t *src, unsigned int start, unsigned int len) { int i; chipaddr bios = flash->virtual_memory;

1 0

Flashrom verbose log
by RGIAS MUG 09 May '14

09 May '14

Hi All, When i run flashrom utility in my linux kernel, i am getting No EEPROM/flash device found.... I attached the output of flashrom -V -p internal in samp.txt file... Could u help me in figuring out this issue....? Regards, Rajiv

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom