coreboot May 2009

coreboot@coreboot.org

92 participants
571 discussions

question on erasing flash
by ron minnich 17 May '09

17 May '09

I notice that flashrom erases many pages even if they are already erased. I've gotten curious: does erasing erased pages count as a 'write cycle' against that page? ron

3 2

[PATCH] flashrom: Kill all 'inline's
by Uwe Hermann 17 May '09

17 May '09

See patch. Uwe. -- http://www.hermann-uwe.de | http://www.holsham-traders.de http://www.crazy-hacks.org | http://www.unmaintained-free-software.org

2 2

[flashrom] r522 - trunk
by svn＠coreboot.org 17 May '09

17 May '09

Author: uwe Date: 2009-05-17 00:36:00 +0200 (Sun, 17 May 2009) New Revision: 522 Modified: trunk/am29f040b.c trunk/flash.h trunk/flashrom.c trunk/ichspi.c trunk/sst28sf040.c trunk/sst49lfxxxc.c Log: Eliminate all 'inline's from the flashrom code. They serve pretty much no purpose, compilers can optimize pretty much all of what we might mark as inline anyway, _and_ inlines are not enforced in any way by the compiler either. They're totally unneeded. Kill them. Signed-off-by: Uwe Hermann <uwe(a)hermann-uwe.de> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/am29f040b.c =================================================================== --- trunk/am29f040b.c 2009-05-16 22:05:42 UTC (rev 521) +++ trunk/am29f040b.c 2009-05-16 22:36:00 UTC (rev 522) @@ -20,8 +20,7 @@ #include "flash.h" -static __inline__ int erase_sector_29f040b(chipaddr bios, - unsigned long address) +static int erase_sector_29f040b(chipaddr bios, unsigned long address) { chip_writeb(0xAA, bios + 0x555); chip_writeb(0x55, bios + 0x2AA); @@ -38,10 +37,8 @@ return 0; } -static __inline__ int write_sector_29f040b(chipaddr bios, - uint8_t *src, - chipaddr dst, - unsigned int page_size) +static int write_sector_29f040b(chipaddr bios, uint8_t *src, chipaddr dst, + unsigned int page_size) { int i; Modified: trunk/flash.h =================================================================== --- trunk/flash.h 2009-05-16 22:05:42 UTC (rev 521) +++ trunk/flash.h 2009-05-16 22:36:00 UTC (rev 522) @@ -104,56 +104,18 @@ extern const struct programmer_entry programmer_table[]; -static inline int programmer_init(void) -{ - return programmer_table[programmer].init(); -} +int programmer_init(void); +int programmer_shutdown(void); +void *programmer_map_flash_region(const char *descr, unsigned long phys_addr, + size_t len); +void programmer_unmap_flash_region(void *virt_addr, size_t len); +void chip_writeb(uint8_t val, chipaddr addr); +void chip_writew(uint16_t val, chipaddr addr); +void chip_writel(uint32_t val, chipaddr addr); +uint8_t chip_readb(const chipaddr addr); +uint16_t chip_readw(const chipaddr addr); +uint32_t chip_readl(const chipaddr addr); -static inline int programmer_shutdown(void) -{ - return programmer_table[programmer].shutdown(); -} - -static inline void *programmer_map_flash_region(const char *descr, unsigned long phys_addr, size_t len) -{ - return programmer_table[programmer].map_flash_region(descr, phys_addr, len); -} - -static inline void programmer_unmap_flash_region(void *virt_addr, size_t len) -{ - programmer_table[programmer].unmap_flash_region(virt_addr, len); -} - -static inline void chip_writeb(uint8_t val, chipaddr addr) -{ - programmer_table[programmer].chip_writeb(val, addr); -} - -static inline void chip_writew(uint16_t val, chipaddr addr) -{ - programmer_table[programmer].chip_writew(val, addr); -} - -static inline void chip_writel(uint32_t val, chipaddr addr) -{ - programmer_table[programmer].chip_writel(val, addr); -} - -static inline uint8_t chip_readb(const chipaddr addr) -{ - return programmer_table[programmer].chip_readb(addr); -} - -static inline uint16_t chip_readw(const chipaddr addr) -{ - return programmer_table[programmer].chip_readw(addr); -} - -static inline uint32_t chip_readl(const chipaddr addr) -{ - return programmer_table[programmer].chip_readl(addr); -} - #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) struct flashchip { Modified: trunk/flashrom.c =================================================================== --- trunk/flashrom.c 2009-05-16 22:05:42 UTC (rev 521) +++ trunk/flashrom.c 2009-05-16 22:36:00 UTC (rev 522) @@ -77,6 +77,58 @@ {}, }; +int programmer_init(void) +{ + return programmer_table[programmer].init(); +} + +int programmer_shutdown(void) +{ + return programmer_table[programmer].shutdown(); +} + +void *programmer_map_flash_region(const char *descr, unsigned long phys_addr, + size_t len) +{ + return programmer_table[programmer].map_flash_region(descr, + phys_addr, len); +} + +void programmer_unmap_flash_region(void *virt_addr, size_t len) +{ + programmer_table[programmer].unmap_flash_region(virt_addr, len); +} + +void chip_writeb(uint8_t val, chipaddr addr) +{ + programmer_table[programmer].chip_writeb(val, addr); +} + +void chip_writew(uint16_t val, chipaddr addr) +{ + programmer_table[programmer].chip_writew(val, addr); +} + +void chip_writel(uint32_t val, chipaddr addr) +{ + programmer_table[programmer].chip_writel(val, addr); +} + +uint8_t chip_readb(const chipaddr addr) +{ + return programmer_table[programmer].chip_readb(addr); +} + +uint16_t chip_readw(const chipaddr addr) +{ + return programmer_table[programmer].chip_readw(addr); +} + +uint32_t chip_readl(const chipaddr addr) +{ + return programmer_table[programmer].chip_readl(addr); +} + void map_flash_registers(struct flashchip *flash) { size_t size = flash->total_size * 1024; Modified: trunk/ichspi.c =================================================================== --- trunk/ichspi.c 2009-05-16 22:05:42 UTC (rev 521) +++ trunk/ichspi.c 2009-05-16 22:36:00 UTC (rev 522) @@ -127,14 +127,14 @@ static OPCODES *curopcodes = NULL; /* HW access functions */ -static inline uint32_t REGREAD32(int X) +static uint32_t REGREAD32(int X) { volatile uint32_t regval; regval = *(volatile uint32_t *)((uint8_t *) spibar + X); return regval; } -static inline uint16_t REGREAD16(int X) +static uint16_t REGREAD16(int X) { volatile uint16_t regval; regval = *(volatile uint16_t *)((uint8_t *) spibar + X); @@ -146,8 +146,8 @@ #define REGWRITE8(X,Y) (*(uint8_t *)((uint8_t *)spibar+X)=Y) /* Common SPI functions */ -static inline int find_opcode(OPCODES *op, uint8_t opcode); -static inline int find_preop(OPCODES *op, uint8_t preop); +static int find_opcode(OPCODES *op, uint8_t opcode); +static int find_preop(OPCODES *op, uint8_t preop); static int generate_opcodes(OPCODES * op); static int program_opcodes(OPCODES * op); static int run_opcode(OPCODE op, uint32_t offset, @@ -192,7 +192,7 @@ OPCODES O_EXISTING = {}; -static inline int find_opcode(OPCODES *op, uint8_t opcode) +static int find_opcode(OPCODES *op, uint8_t opcode) { int a; @@ -204,7 +204,7 @@ return -1; } -static inline int find_preop(OPCODES *op, uint8_t preop) +static int find_preop(OPCODES *op, uint8_t preop) { int a; Modified: trunk/sst28sf040.c =================================================================== --- trunk/sst28sf040.c 2009-05-16 22:05:42 UTC (rev 521) +++ trunk/sst28sf040.c 2009-05-16 22:36:00 UTC (rev 522) @@ -28,7 +28,7 @@ #define RESET 0xFF #define READ_ID 0x90 -static __inline__ void protect_28sf040(chipaddr bios) +static void protect_28sf040(chipaddr bios) { uint8_t tmp; @@ -41,7 +41,7 @@ tmp = chip_readb(bios + 0x040A); } -static __inline__ void unprotect_28sf040(chipaddr bios) +static void unprotect_28sf040(chipaddr bios) { uint8_t tmp; @@ -54,8 +54,7 @@ tmp = chip_readb(bios + 0x041A); } -static __inline__ int erase_sector_28sf040(chipaddr bios, - unsigned long address) +static int erase_sector_28sf040(chipaddr bios, unsigned long address) { chip_writeb(AUTO_PG_ERASE1, bios); chip_writeb(AUTO_PG_ERASE2, bios + address); @@ -66,10 +65,8 @@ return 0; } -static __inline__ int write_sector_28sf040(chipaddr bios, - uint8_t *src, - chipaddr dst, - unsigned int page_size) +static int write_sector_28sf040(chipaddr bios, uint8_t *src, chipaddr dst, + unsigned int page_size) { int i; Modified: trunk/sst49lfxxxc.c =================================================================== --- trunk/sst49lfxxxc.c 2009-05-16 22:05:42 UTC (rev 521) +++ trunk/sst49lfxxxc.c 2009-05-16 22:36:00 UTC (rev 522) @@ -38,8 +38,8 @@ #define STATUS_ESS (1 << 6) #define STATUS_WSMS (1 << 7) -static __inline__ int write_lockbits_49lfxxxc(chipaddr bios, int size, - unsigned char bits) +static int write_lockbits_49lfxxxc(chipaddr bios, int size, + unsigned char bits) { int i, left = size; unsigned long address; @@ -65,8 +65,7 @@ return 0; } -static __inline__ int erase_sector_49lfxxxc(chipaddr bios, - unsigned long address) +static int erase_sector_49lfxxxc(chipaddr bios, unsigned long address) { unsigned char status; @@ -85,10 +84,8 @@ return 0; } -static __inline__ int write_sector_49lfxxxc(chipaddr bios, - uint8_t *src, - chipaddr dst, - unsigned int page_size) +static int write_sector_49lfxxxc(chipaddr bios, uint8_t *src, chipaddr dst, + unsigned int page_size) { int i; unsigned char status;

1 0

[flashrom] r521 - trunk
by svn＠coreboot.org 17 May '09

17 May '09

Author: uwe Date: 2009-05-17 00:05:42 +0200 (Sun, 17 May 2009) New Revision: 521 Modified: trunk/82802ab.c trunk/am29f040b.c trunk/board_enable.c trunk/cbtable.c trunk/chipset_enable.c trunk/coreboot_tables.h trunk/dummyflasher.c trunk/en29f002a.c trunk/flash.h trunk/flashrom.c trunk/ichspi.c trunk/internal.c trunk/it87spi.c trunk/jedec.c trunk/layout.c trunk/mx29f002.c trunk/pm49fl00x.c trunk/sb600spi.c trunk/sharplhf00l04.c trunk/spi.c trunk/sst28sf040.c trunk/sst49lf040.c trunk/sst49lfxxxc.c trunk/sst_fwhub.c trunk/stm50flw0x0x.c trunk/udelay.c trunk/w39v040c.c trunk/w39v080fa.c trunk/w49f002u.c trunk/wbsio_spi.c Log: Drop unused/duplicated #includes and some dead code (trivial). Build-tested on 32bit x86. Signed-off-by: Uwe Hermann <uwe(a)hermann-uwe.de> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Modified: trunk/82802ab.c =================================================================== --- trunk/82802ab.c 2009-05-16 21:39:19 UTC (rev 520) +++ trunk/82802ab.c 2009-05-16 22:05:42 UTC (rev 521) @@ -26,9 +26,7 @@ * - Order number: 290658-004 */ -#include <stdio.h> #include <string.h> -#include <stdint.h> #include "flash.h" // I need that Berkeley bit-map printer Modified: trunk/am29f040b.c =================================================================== --- trunk/am29f040b.c 2009-05-16 21:39:19 UTC (rev 520) +++ trunk/am29f040b.c 2009-05-16 22:05:42 UTC (rev 521) @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <stdio.h> -#include <stdint.h> #include "flash.h" static __inline__ int erase_sector_29f040b(chipaddr bios, Modified: trunk/board_enable.c =================================================================== --- trunk/board_enable.c 2009-05-16 21:39:19 UTC (rev 520) +++ trunk/board_enable.c 2009-05-16 22:05:42 UTC (rev 521) @@ -24,9 +24,6 @@ * Contains the board specific flash enables. */ -#include <stdio.h> -#include <pci/pci.h> -#include <stdint.h> #include <string.h> #include <fcntl.h> #include "flash.h" Modified: trunk/cbtable.c =================================================================== --- trunk/cbtable.c 2009-05-16 21:39:19 UTC (rev 520) +++ trunk/cbtable.c 2009-05-16 22:05:42 UTC (rev 521) @@ -21,11 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <stdio.h> -#include <stdint.h> #include <stdlib.h> #include <fcntl.h> -#include <unistd.h> #include <sys/types.h> #include <string.h> #include <errno.h> Modified: trunk/chipset_enable.c =================================================================== --- trunk/chipset_enable.c 2009-05-16 21:39:19 UTC (rev 520) +++ trunk/chipset_enable.c 2009-05-16 22:05:42 UTC (rev 521) @@ -25,14 +25,11 @@ #define _LARGEFILE64_SOURCE -#include <stdio.h> -#include <pci/pci.h> #include <stdlib.h> #include <sys/types.h> #include <sys/stat.h> #include <sys/mman.h> #include <fcntl.h> -#include <unistd.h> #include "flash.h" unsigned long flashbase = 0; Modified: trunk/coreboot_tables.h =================================================================== --- trunk/coreboot_tables.h 2009-05-16 21:39:19 UTC (rev 520) +++ trunk/coreboot_tables.h 2009-05-16 22:05:42 UTC (rev 521) @@ -48,22 +48,6 @@ uint32_t hi; }; -static inline uint64_t unpack_lb64(struct lb_uint64 value) -{ - uint64_t result; - result = value.hi; - result = (result << 32) + value.lo; - return result; -} - -static inline struct lb_uint64 pack_lb64(uint64_t value) -{ - struct lb_uint64 result; - result.lo = (value >> 0) & 0xffffffff; - result.hi = (value >> 32) & 0xffffffff; - return result; -} - struct lb_header { uint8_t signature[4]; /* LBIO */ uint32_t header_bytes; @@ -142,76 +126,4 @@ uint64_t forward; }; -/* The following structures are for the cmos definitions table */ -#define LB_TAG_CMOS_OPTION_TABLE 200 -/* cmos header record */ -struct cmos_option_table { - uint32_t tag; /* CMOS definitions table type */ - uint32_t size; /* size of the entire table */ - uint32_t header_length; /* length of header */ -}; - -/* cmos entry record - This record is variable length. The name field may be - shorter than CMOS_MAX_NAME_LENGTH. The entry may start - anywhere in the byte, but can not span bytes unless it - starts at the beginning of the byte and the length is - fills complete bytes. -*/ -#define LB_TAG_OPTION 201 -struct cmos_entries { - uint32_t tag; /* entry type */ - uint32_t size; /* length of this record */ - uint32_t bit; /* starting bit from start of image */ - uint32_t length; /* length of field in bits */ - uint32_t config; /* e=enumeration, h=hex, r=reserved */ - uint32_t config_id; /* a number linking to an enumeration record */ -#define CMOS_MAX_NAME_LENGTH 32 - uint8_t name[CMOS_MAX_NAME_LENGTH]; /* name of entry in ascii, - variable length int aligned */ -}; - -/* cmos enumerations record - This record is variable length. The text field may be - shorter than CMOS_MAX_TEXT_LENGTH. -*/ -#define LB_TAG_OPTION_ENUM 202 -struct cmos_enums { - uint32_t tag; /* enumeration type */ - uint32_t size; /* length of this record */ - uint32_t config_id; /* a number identifying the config id */ - uint32_t value; /* the value associated with the text */ -#define CMOS_MAX_TEXT_LENGTH 32 - uint8_t text[CMOS_MAX_TEXT_LENGTH]; /* enum description in ascii, - variable length int aligned */ -}; - -/* cmos defaults record - This record contains default settings for the cmos ram. -*/ -#define LB_TAG_OPTION_DEFAULTS 203 -struct cmos_defaults { - uint32_t tag; /* default type */ - uint32_t size; /* length of this record */ - uint32_t name_length; /* length of the following name field */ - uint8_t name[CMOS_MAX_NAME_LENGTH]; /* name identifying the default */ -#define CMOS_IMAGE_BUFFER_SIZE 128 - uint8_t default_set[CMOS_IMAGE_BUFFER_SIZE]; /* default settings */ -}; - -#define LB_TAG_OPTION_CHECKSUM 204 -struct cmos_checksum { - uint32_t tag; - uint32_t size; - /* In practice everything is byte aligned, but things are measured - * in bits to be consistent. - */ - uint32_t range_start; /* First bit that is checksummed (byte aligned) */ - uint32_t range_end; /* Last bit that is checksummed (byte aligned) */ - uint32_t location; /* First bit of the checksum (byte aligned) */ - uint32_t type; /* Checksum algorithm that is used */ -#define CHECKSUM_NONE 0 -#define CHECKSUM_PCBIOS 1 -}; - #endif /* COREBOOT_TABLES_H */ Modified: trunk/dummyflasher.c =================================================================== --- trunk/dummyflasher.c 2009-05-16 21:39:19 UTC (rev 520) +++ trunk/dummyflasher.c 2009-05-16 22:05:42 UTC (rev 521) @@ -18,14 +18,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <stdint.h> #include <string.h> #include <stdlib.h> #include <fcntl.h> #include <sys/types.h> #include <sys/stat.h> #include <errno.h> -#include <pci/pci.h> #include "flash.h" int dummy_init(void) Modified: trunk/en29f002a.c =================================================================== --- trunk/en29f002a.c 2009-05-16 21:39:19 UTC (rev 520) +++ trunk/en29f002a.c 2009-05-16 22:05:42 UTC (rev 521) @@ -26,8 +26,6 @@ * EN29LV040(A) has 1C,4F and uses short F0 reset sequence */ -#include <stdio.h> -#include <stdint.h> #include "flash.h" int probe_en29f512(struct flashchip *flash) Modified: trunk/flash.h =================================================================== --- trunk/flash.h 2009-05-16 21:39:19 UTC (rev 520) +++ trunk/flash.h 2009-05-16 22:05:42 UTC (rev 521) @@ -548,13 +548,6 @@ void myusec_delay(int time); void myusec_calibrate_delay(void); -/* PCI handling for board/chipset_enable */ -struct pci_access *pacc; -struct pci_dev *pci_dev_find_filter(struct pci_filter filter); -struct pci_dev *pci_dev_find(uint16_t vendor, uint16_t device); -struct pci_dev *pci_card_find(uint16_t vendor, uint16_t device, - uint16_t card_vendor, uint16_t card_device); - /* pcidev.c */ #define PCI_OK 0 #define PCI_NT 1 /* Not tested */ @@ -607,6 +600,10 @@ void physunmap(void *virt_addr, size_t len); /* internal.c */ +struct pci_dev *pci_dev_find_filter(struct pci_filter filter); +struct pci_dev *pci_dev_find(uint16_t vendor, uint16_t device); +struct pci_dev *pci_card_find(uint16_t vendor, uint16_t device, + uint16_t card_vendor, uint16_t card_device); void get_io_perms(void); int internal_init(void); int internal_shutdown(void); Modified: trunk/flashrom.c =================================================================== --- trunk/flashrom.c 2009-05-16 21:39:19 UTC (rev 520) +++ trunk/flashrom.c 2009-05-16 22:05:42 UTC (rev 521) @@ -24,8 +24,6 @@ #include <fcntl.h> #include <sys/types.h> #include <sys/stat.h> -#include <unistd.h> -#include <stdio.h> #include <string.h> #include <stdlib.h> #include <getopt.h> Modified: trunk/ichspi.c =================================================================== --- trunk/ichspi.c 2009-05-16 21:39:19 UTC (rev 520) +++ trunk/ichspi.c 2009-05-16 22:05:42 UTC (rev 521) @@ -32,11 +32,8 @@ * */ -#include <stdio.h> #include <string.h> -#include <stdint.h> #include <sys/mman.h> -#include <pci/pci.h> #include "flash.h" #include "spi.h" Modified: trunk/internal.c =================================================================== --- trunk/internal.c 2009-05-16 21:39:19 UTC (rev 520) +++ trunk/internal.c 2009-05-16 22:05:42 UTC (rev 521) @@ -25,15 +25,12 @@ #include <sys/types.h> #include <sys/stat.h> #include <errno.h> -#include <pci/pci.h> #include "flash.h" #if defined(__FreeBSD__) || defined(__DragonFly__) int io_fd; #endif -struct pci_access *pacc; /* For board and chipset_enable */ - struct pci_dev *pci_dev_find_filter(struct pci_filter filter) { struct pci_dev *temp; Modified: trunk/it87spi.c =================================================================== --- trunk/it87spi.c 2009-05-16 21:39:19 UTC (rev 520) +++ trunk/it87spi.c 2009-05-16 22:05:42 UTC (rev 521) @@ -23,9 +23,6 @@ * Contains the ITE IT87* SPI specific routines */ -#include <stdio.h> -#include <pci/pci.h> -#include <stdint.h> #include <string.h> #include "flash.h" #include "spi.h" Modified: trunk/jedec.c =================================================================== --- trunk/jedec.c 2009-05-16 21:39:19 UTC (rev 520) +++ trunk/jedec.c 2009-05-16 22:05:42 UTC (rev 521) @@ -21,8 +21,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <stdio.h> -#include <stdint.h> #include "flash.h" #define MAX_REFLASH_TRIES 0x10 Modified: trunk/layout.c =================================================================== --- trunk/layout.c 2009-05-16 21:39:19 UTC (rev 520) +++ trunk/layout.c 2009-05-16 22:05:42 UTC (rev 521) @@ -18,11 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <stdio.h> #include <stdlib.h> #include <string.h> #include <ctype.h> -#include <stdint.h> #include "flash.h" char *mainboard_vendor = NULL; Modified: trunk/mx29f002.c =================================================================== --- trunk/mx29f002.c 2009-05-16 21:39:19 UTC (rev 520) +++ trunk/mx29f002.c 2009-05-16 22:05:42 UTC (rev 521) @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <stdio.h> -#include <stdint.h> #include "flash.h" int probe_29f002(struct flashchip *flash) Modified: trunk/pm49fl00x.c =================================================================== --- trunk/pm49fl00x.c 2009-05-16 21:39:19 UTC (rev 520) +++ trunk/pm49fl00x.c 2009-05-16 22:05:42 UTC (rev 521) @@ -20,7 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <stdio.h> #include "flash.h" extern int exclude_start_page, exclude_end_page; Modified: trunk/sb600spi.c =================================================================== --- trunk/sb600spi.c 2009-05-16 21:39:19 UTC (rev 520) +++ trunk/sb600spi.c 2009-05-16 22:05:42 UTC (rev 521) @@ -20,11 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <stdio.h> #include <string.h> -#include <stdint.h> #include <sys/mman.h> -#include <pci/pci.h> #include "flash.h" #include "spi.h" Modified: trunk/sharplhf00l04.c =================================================================== --- trunk/sharplhf00l04.c 2009-05-16 21:39:19 UTC (rev 520) +++ trunk/sharplhf00l04.c 2009-05-16 22:05:42 UTC (rev 521) @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <stdio.h> #include <stdlib.h> #include "flash.h" Modified: trunk/spi.c =================================================================== --- trunk/spi.c 2009-05-16 21:39:19 UTC (rev 520) +++ trunk/spi.c 2009-05-16 22:05:42 UTC (rev 521) @@ -22,9 +22,6 @@ * Contains the generic SPI framework */ -#include <stdio.h> -#include <pci/pci.h> -#include <stdint.h> #include <string.h> #include "flash.h" #include "spi.h" Modified: trunk/sst28sf040.c =================================================================== --- trunk/sst28sf040.c 2009-05-16 21:39:19 UTC (rev 520) +++ trunk/sst28sf040.c 2009-05-16 22:05:42 UTC (rev 521) @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <stdio.h> -#include <stdint.h> #include "flash.h" #define AUTO_PG_ERASE1 0x20 Modified: trunk/sst49lf040.c =================================================================== --- trunk/sst49lf040.c 2009-05-16 21:39:19 UTC (rev 520) +++ trunk/sst49lf040.c 2009-05-16 22:05:42 UTC (rev 521) @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <stdio.h> #include "flash.h" int erase_49lf040(struct flashchip *flash) Modified: trunk/sst49lfxxxc.c =================================================================== --- trunk/sst49lfxxxc.c 2009-05-16 21:39:19 UTC (rev 520) +++ trunk/sst49lfxxxc.c 2009-05-16 22:05:42 UTC (rev 521) @@ -22,10 +22,7 @@ #include <errno.h> #include <fcntl.h> #include <sys/mman.h> -#include <unistd.h> -#include <stdio.h> #include <stdlib.h> -#include <stdint.h> #include "flash.h" #define SECTOR_ERASE 0x30 Modified: trunk/sst_fwhub.c =================================================================== --- trunk/sst_fwhub.c 2009-05-16 21:39:19 UTC (rev 520) +++ trunk/sst_fwhub.c 2009-05-16 22:05:42 UTC (rev 521) @@ -20,7 +20,6 @@ /* Adapted from the Intel FW hub stuff for 82802ax parts. */ -#include <stdio.h> #include "flash.h" // I need that Berkeley bit-map printer Modified: trunk/stm50flw0x0x.c =================================================================== --- trunk/stm50flw0x0x.c 2009-05-16 21:39:19 UTC (rev 520) +++ trunk/stm50flw0x0x.c 2009-05-16 22:05:42 UTC (rev 521) @@ -26,9 +26,7 @@ * ST M50FLW080B (not yet tested) */ -#include <stdio.h> #include <string.h> -#include <stdint.h> #include "flash.h" void protect_stm50flw0x0x(chipaddr bios) Modified: trunk/udelay.c =================================================================== --- trunk/udelay.c 2009-05-16 21:39:19 UTC (rev 520) +++ trunk/udelay.c 2009-05-16 22:05:42 UTC (rev 521) @@ -19,7 +19,6 @@ */ #include <sys/time.h> -#include <stdio.h> #include "flash.h" // count to a billion. Time it. If it's < 1 sec, count to 10B, etc. Modified: trunk/w39v040c.c =================================================================== --- trunk/w39v040c.c 2009-05-16 21:39:19 UTC (rev 520) +++ trunk/w39v040c.c 2009-05-16 22:05:42 UTC (rev 521) @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <stdio.h> #include "flash.h" int probe_w39v040c(struct flashchip *flash) Modified: trunk/w39v080fa.c =================================================================== --- trunk/w39v080fa.c 2009-05-16 21:39:19 UTC (rev 520) +++ trunk/w39v080fa.c 2009-05-16 22:05:42 UTC (rev 521) @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <stdio.h> #include "flash.h" int probe_winbond_fwhub(struct flashchip *flash) Modified: trunk/w49f002u.c =================================================================== --- trunk/w49f002u.c 2009-05-16 21:39:19 UTC (rev 520) +++ trunk/w49f002u.c 2009-05-16 22:05:42 UTC (rev 521) @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <stdio.h> #include "flash.h" int write_49f002(struct flashchip *flash, uint8_t *buf) Modified: trunk/wbsio_spi.c =================================================================== --- trunk/wbsio_spi.c 2009-05-16 21:39:19 UTC (rev 520) +++ trunk/wbsio_spi.c 2009-05-16 22:05:42 UTC (rev 521) @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <stdio.h> -#include <pci/pci.h> -#include <stdint.h> #include <string.h> #include "flash.h" #include "spi.h"

1 0

[PATCH] flashrom: 3COM 3C90xB fixups, partial AT29C010A support
by Uwe Hermann 16 May '09

16 May '09

See patch. Uwe. -- http://www.hermann-uwe.de | http://www.holsham-traders.de http://www.crazy-hacks.org | http://www.unmaintained-free-software.org

2 2

[flashrom] r520 - trunk
by svn＠coreboot.org 16 May '09

16 May '09

Author: uwe Date: 2009-05-16 23:39:19 +0200 (Sat, 16 May 2009) New Revision: 520 Modified: trunk/flash.h trunk/flashchips.c trunk/nic3com.c trunk/pcidev.c Log: Add proper workaround for 3COM 3C90xB cards, which need special fixups (the 3C90xC ones don't). This is tested on hardware. Also, add initial support for the Atmel AT29C010A chip (which I inserted in a 3COM 3C90xB card for testing). It can be detected, read works, erase works, but write will need some additional code (will post in another patch later). Signed-off-by: Uwe Hermann <uwe(a)hermann-uwe.de> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/flash.h =================================================================== --- trunk/flash.h 2009-05-16 21:22:56 UTC (rev 519) +++ trunk/flash.h 2009-05-16 21:39:19 UTC (rev 520) @@ -193,6 +193,7 @@ #define TEST_OK_ERASE (1<<2) #define TEST_OK_WRITE (1<<3) #define TEST_OK_PR (TEST_OK_PROBE|TEST_OK_READ) +#define TEST_OK_PRE (TEST_OK_PROBE|TEST_OK_READ|TEST_OK_ERASE) #define TEST_OK_PREW (TEST_OK_PROBE|TEST_OK_READ|TEST_OK_ERASE|TEST_OK_WRITE) #define TEST_OK_MASK 0x0f @@ -258,6 +259,7 @@ #define AT_26DF321 0x4700 /* also 25DF321 */ #define AT_26F004 0x0400 #define AT_29C040A 0xA4 +#define AT_29C010A 0xD5 #define AT_29C020 0xDA #define AT_45BR3214B /* No ID available */ #define AT_45CS1282 0x2920 @@ -559,6 +561,7 @@ extern uint32_t io_base_addr; extern struct pci_access *pacc; extern struct pci_filter filter; +extern struct pci_dev *pcidev_dev; struct pcidev_status { uint16_t vendor_id; uint16_t device_id; Modified: trunk/flashchips.c =================================================================== --- trunk/flashchips.c 2009-05-16 21:22:56 UTC (rev 519) +++ trunk/flashchips.c 2009-05-16 21:39:19 UTC (rev 520) @@ -376,6 +376,20 @@ { .vendor = "Atmel", + .name = "AT29C010A", + .manufacture_id = ATMEL_ID, + .model_id = AT_29C010A, + .total_size = 128, + .page_size = 128, + .tested = TEST_OK_PRE, + .probe = probe_jedec, + .erase = erase_chip_jedec, + .write = write_jedec, /* FIXME */ + .read = read_memmapped, + }, + + { + .vendor = "Atmel", .name = "AT29C020", .manufacture_id = ATMEL_ID, .model_id = AT_29C020, Modified: trunk/nic3com.c =================================================================== --- trunk/nic3com.c 2009-05-16 21:22:56 UTC (rev 519) +++ trunk/nic3com.c 2009-05-16 21:39:19 UTC (rev 520) @@ -29,13 +29,17 @@ #define BIOS_ROM_ADDR 0x04 #define BIOS_ROM_DATA 0x08 #define INT_STATUS 0x0e +#define INTERNAL_CONFIG 0x00 #define SELECT_REG_WINDOW 0x800 #define PCI_VENDOR_ID_3COM 0x10b7 +uint32_t internal_conf; +uint16_t id; + struct pcidev_status nics_3com[] = { /* 3C90xB */ - {0x10b7, 0x9055, PCI_NT, "3COM", "3C90xB: PCI 10/100 Mbps; shared 10BASE-T/100BASE-TX"}, + {0x10b7, 0x9055, PCI_OK, "3COM", "3C90xB: PCI 10/100 Mbps; shared 10BASE-T/100BASE-TX"}, {0x10b7, 0x9001, PCI_NT, "3COM", "3C90xB: PCI 10/100 Mbps; shared 10BASE-T/100BASE-T4" }, {0x10b7, 0x9004, PCI_NT, "3COM", "3C90xB: PCI 10BASE-T (TPO)" }, {0x10b7, 0x9005, PCI_NT, "3COM", "3C90xB: PCI 10BASE-T/10BASE2/AUI (COMBO)" }, @@ -57,7 +61,19 @@ get_io_perms(); io_base_addr = pcidev_init(PCI_VENDOR_ID_3COM, nics_3com); + id = pcidev_dev->device_id; + /* 3COM 3C90xB cards need a special fixup. */ + if (id == 0x9055 || id == 0x9001 || id == 0x9004 || id == 0x9005 + || id == 0x9006 || id == 0x900a || id == 0x905a) { + /* Select register window 3 and save the receiver status. */ + OUTW(SELECT_REG_WINDOW + 3, io_base_addr + INT_STATUS); + internal_conf = INL(io_base_addr + INTERNAL_CONFIG); + + /* Set receiver type to MII for full BIOS ROM access. */ + OUTL((internal_conf & 0xf00fffff) | 0x00600000, io_base_addr); + } + /* * The lowest 16 bytes of the I/O mapped register space of (most) 3COM * cards form a 'register window' into one of multiple (usually 8) @@ -70,6 +86,14 @@ int nic3com_shutdown(void) { + /* 3COM 3C90xB cards need a special fixup. */ + if (id == 0x9055 || id == 0x9001 || id == 0x9004 || id == 0x9005 + || id == 0x9006 || id == 0x900a || id == 0x905a) { + /* Select register window 3 and restore the receiver status. */ + OUTW(SELECT_REG_WINDOW + 3, io_base_addr + INT_STATUS); + OUTL(internal_conf, io_base_addr + INTERNAL_CONFIG); + } + free(pcidev_bdf); pci_cleanup(pacc); #if defined(__FreeBSD__) || defined(__DragonFly__) Modified: trunk/pcidev.c =================================================================== --- trunk/pcidev.c 2009-05-16 21:22:56 UTC (rev 519) +++ trunk/pcidev.c 2009-05-16 21:39:19 UTC (rev 520) @@ -32,6 +32,7 @@ struct pci_access *pacc; struct pci_filter filter; char *pcidev_bdf = NULL; +struct pci_dev *pcidev_dev = NULL; uint32_t pcidev_validate(struct pci_dev *dev, struct pcidev_status *devs) { @@ -67,7 +68,7 @@ struct pci_dev *dev; char *msg = NULL; int found = 0; - uint32_t addr = 0; + uint32_t addr = 0, curaddr = 0; pacc = pci_alloc(); /* Get the pci_access structure */ pci_init(pacc); /* Initialize the PCI library */ @@ -85,8 +86,11 @@ for (dev = pacc->devices; dev; dev = dev->next) { if (pci_filter_match(&filter, dev)) { - if ((addr = pcidev_validate(dev, devs)) != 0) + if ((addr = pcidev_validate(dev, devs)) != 0) { + curaddr = addr; + pcidev_dev = dev; found++; + } } } @@ -102,7 +106,7 @@ exit(1); } - return addr; + return curaddr; } void print_supported_pcidevs(struct pcidev_status *devs)

1 0

[PATCH] flashrom: Use chipaddr_t instead of volatile uint8_t *
by Carl-Daniel Hailfinger 16 May '09

16 May '09

Use chipaddr_t instead of volatile uint8_t * because when we access chips in external flashers, they are not accessed via pointers at all. Benefits: This allows us to differentiate between volatile machine memory accesses and flash chip accesses. It also enforces usage of chip_{read,write}[bwl] to access flash chips, so nobody will unintentionally use pointers to access chips anymore. Some unneeded casts are removed as well. Grepping for chip operations and machine memory operations doesn't yield any false positives anymore. Compile tested on 32 bit and 64 bit Linux. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flash.h =================================================================== --- flash.h (Revision 514) +++ flash.h (Arbeitskopie) @@ -77,6 +77,9 @@ #endif #endif +typedef unsigned long chipaddr_t; +//typedef volatile uint8_t * chipaddr_t; + extern int programmer; #define PROGRAMMER_INTERNAL 0x00 #define PROGRAMMER_DUMMY 0x01 @@ -92,12 +95,12 @@ void * (*map_flash_region) (const char *descr, unsigned long phys_addr, size_t len); void (*unmap_flash_region) (void *virt_addr, size_t len); - void (*chip_writeb) (uint8_t val, volatile void *addr); - void (*chip_writew) (uint16_t val, volatile void *addr); - void (*chip_writel) (uint32_t val, volatile void *addr); - uint8_t (*chip_readb) (const volatile void *addr); - uint16_t (*chip_readw) (const volatile void *addr); - uint32_t (*chip_readl) (const volatile void *addr); + void (*chip_writeb) (uint8_t val, chipaddr_t addr); + void (*chip_writew) (uint16_t val, chipaddr_t addr); + void (*chip_writel) (uint32_t val, chipaddr_t addr); + uint8_t (*chip_readb) (const chipaddr_t addr); + uint16_t (*chip_readw) (const chipaddr_t addr); + uint32_t (*chip_readl) (const chipaddr_t addr); }; extern const struct programmer_entry programmer_table[]; @@ -122,32 +125,32 @@ programmer_table[programmer].unmap_flash_region(virt_addr, len); } -static inline void chip_writeb(uint8_t val, volatile void *addr) +static inline void chip_writeb(uint8_t val, chipaddr_t addr) { programmer_table[programmer].chip_writeb(val, addr); } -static inline void chip_writew(uint16_t val, volatile void *addr) +static inline void chip_writew(uint16_t val, chipaddr_t addr) { programmer_table[programmer].chip_writew(val, addr); } -static inline void chip_writel(uint32_t val, volatile void *addr) +static inline void chip_writel(uint32_t val, chipaddr_t addr) { programmer_table[programmer].chip_writel(val, addr); } -static inline uint8_t chip_readb(const volatile void *addr) +static inline uint8_t chip_readb(const chipaddr_t addr) { return programmer_table[programmer].chip_readb(addr); } -static inline uint16_t chip_readw(const volatile void *addr) +static inline uint16_t chip_readw(const chipaddr_t addr) { return programmer_table[programmer].chip_readw(addr); } -static inline uint32_t chip_readl(const volatile void *addr) +static inline uint32_t chip_readl(const chipaddr_t addr) { return programmer_table[programmer].chip_readl(addr); } @@ -180,8 +183,8 @@ int (*read) (struct flashchip *flash, uint8_t *buf); /* Some flash devices have an additional register space. */ - volatile uint8_t *virtual_memory; - volatile uint8_t *virtual_registers; + chipaddr_t virtual_memory; + chipaddr_t virtual_registers; }; #define TEST_UNTESTED 0 @@ -588,12 +591,12 @@ void get_io_perms(void); int internal_init(void); int internal_shutdown(void); -void internal_chip_writeb(uint8_t val, volatile void *addr); -void internal_chip_writew(uint16_t val, volatile void *addr); -void internal_chip_writel(uint32_t val, volatile void *addr); -uint8_t internal_chip_readb(const volatile void *addr); -uint16_t internal_chip_readw(const volatile void *addr); -uint32_t internal_chip_readl(const volatile void *addr); +void internal_chip_writeb(uint8_t val, chipaddr_t addr); +void internal_chip_writew(uint16_t val, chipaddr_t addr); +void internal_chip_writel(uint32_t val, chipaddr_t addr); +uint8_t internal_chip_readb(const chipaddr_t addr); +uint16_t internal_chip_readw(const chipaddr_t addr); +uint32_t internal_chip_readl(const chipaddr_t addr); #if defined(__FreeBSD__) || defined(__DragonFly__) extern int io_fd; #endif @@ -603,12 +606,12 @@ int dummy_shutdown(void); void *dummy_map(const char *descr, unsigned long phys_addr, size_t len); void dummy_unmap(void *virt_addr, size_t len); -void dummy_chip_writeb(uint8_t val, volatile void *addr); -void dummy_chip_writew(uint16_t val, volatile void *addr); -void dummy_chip_writel(uint32_t val, volatile void *addr); -uint8_t dummy_chip_readb(const volatile void *addr); -uint16_t dummy_chip_readw(const volatile void *addr); -uint32_t dummy_chip_readl(const volatile void *addr); +void dummy_chip_writeb(uint8_t val, chipaddr_t addr); +void dummy_chip_writew(uint16_t val, chipaddr_t addr); +void dummy_chip_writel(uint32_t val, chipaddr_t addr); +uint8_t dummy_chip_readb(const chipaddr_t addr); +uint16_t dummy_chip_readw(const chipaddr_t addr); +uint32_t dummy_chip_readl(const chipaddr_t addr); int dummy_spi_command(unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); @@ -617,12 +620,12 @@ int nic3com_shutdown(void); void *nic3com_map(const char *descr, unsigned long phys_addr, size_t len); void nic3com_unmap(void *virt_addr, size_t len); -void nic3com_chip_writeb(uint8_t val, volatile void *addr); -void nic3com_chip_writew(uint16_t val, volatile void *addr); -void nic3com_chip_writel(uint32_t val, volatile void *addr); -uint8_t nic3com_chip_readb(const volatile void *addr); -uint16_t nic3com_chip_readw(const volatile void *addr); -uint32_t nic3com_chip_readl(const volatile void *addr); +void nic3com_chip_writeb(uint8_t val, chipaddr_t addr); +void nic3com_chip_writew(uint16_t val, chipaddr_t addr); +void nic3com_chip_writel(uint32_t val, chipaddr_t addr); +uint8_t nic3com_chip_readb(const chipaddr_t addr); +uint16_t nic3com_chip_readw(const chipaddr_t addr); +uint32_t nic3com_chip_readl(const chipaddr_t addr); /* flashrom.c */ extern int verbose; @@ -707,19 +710,19 @@ /* jedec.c */ uint8_t oddparity(uint8_t val); -void toggle_ready_jedec(volatile uint8_t *dst); -void data_polling_jedec(volatile uint8_t *dst, uint8_t data); -void unprotect_jedec(volatile uint8_t *bios); -void protect_jedec(volatile uint8_t *bios); -int write_byte_program_jedec(volatile uint8_t *bios, uint8_t *src, - volatile uint8_t *dst); +void toggle_ready_jedec(chipaddr_t dst); +void data_polling_jedec(chipaddr_t dst, uint8_t data); +void unprotect_jedec(chipaddr_t bios); +void protect_jedec(chipaddr_t bios); +int write_byte_program_jedec(chipaddr_t bios, uint8_t *src, + chipaddr_t dst); int probe_jedec(struct flashchip *flash); int erase_chip_jedec(struct flashchip *flash); int write_jedec(struct flashchip *flash, uint8_t *buf); -int erase_sector_jedec(volatile uint8_t *bios, unsigned int page); -int erase_block_jedec(volatile uint8_t *bios, unsigned int page); -int write_sector_jedec(volatile uint8_t *bios, uint8_t *src, - volatile uint8_t *dst, unsigned int page_size); +int erase_sector_jedec(chipaddr_t bios, unsigned int page); +int erase_block_jedec(chipaddr_t bios, unsigned int page); +int write_sector_jedec(chipaddr_t bios, uint8_t *src, + chipaddr_t dst, unsigned int page_size); /* m29f002.c */ int erase_m29f002(struct flashchip *flash); @@ -729,15 +732,15 @@ /* m29f400bt.c */ int probe_m29f400bt(struct flashchip *flash); int erase_m29f400bt(struct flashchip *flash); -int block_erase_m29f400bt(volatile uint8_t *bios, - volatile uint8_t *dst); +int block_erase_m29f400bt(chipaddr_t bios, + chipaddr_t dst); int write_m29f400bt(struct flashchip *flash, uint8_t *buf); int write_coreboot_m29f400bt(struct flashchip *flash, uint8_t *buf); -void toggle_ready_m29f400bt(volatile uint8_t *dst); -void data_polling_m29f400bt(volatile uint8_t *dst, uint8_t data); -void protect_m29f400bt(volatile uint8_t *bios); -void write_page_m29f400bt(volatile uint8_t *bios, uint8_t *src, - volatile uint8_t *dst, int page_size); +void toggle_ready_m29f400bt(chipaddr_t dst); +void data_polling_m29f400bt(chipaddr_t dst, uint8_t data); +void protect_m29f400bt(chipaddr_t bios); +void write_page_m29f400bt(chipaddr_t bios, uint8_t *src, + chipaddr_t dst, int page_size); /* mx29f002.c */ int probe_29f002(struct flashchip *flash); @@ -753,9 +756,9 @@ int probe_lhf00l04(struct flashchip *flash); int erase_lhf00l04(struct flashchip *flash); int write_lhf00l04(struct flashchip *flash, uint8_t *buf); -void toggle_ready_lhf00l04(volatile uint8_t *dst); -void data_polling_lhf00l04(volatile uint8_t *dst, uint8_t data); -void protect_lhf00l04(volatile uint8_t *bios); +void toggle_ready_lhf00l04(chipaddr_t dst); +void data_polling_lhf00l04(chipaddr_t dst, uint8_t data); +void protect_lhf00l04(chipaddr_t bios); /* sst28sf040.c */ int probe_28sf040(struct flashchip *flash); Index: pm49fl00x.c =================================================================== --- pm49fl00x.c (Revision 514) +++ pm49fl00x.c (Arbeitskopie) @@ -25,7 +25,7 @@ extern int exclude_start_page, exclude_end_page; -void write_lockbits_49fl00x(volatile uint8_t *bios, int size, +void write_lockbits_49fl00x(chipaddr_t bios, int size, unsigned char bits, int block_size) { int i, left = size; @@ -54,7 +54,7 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; /* unprotected */ write_lockbits_49fl00x(flash->virtual_registers, @@ -89,7 +89,7 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; /* unprotected */ write_lockbits_49fl00x(flash->virtual_registers, total_size, 0, Index: en29f002a.c =================================================================== --- en29f002a.c (Revision 514) +++ en29f002a.c (Arbeitskopie) @@ -32,7 +32,7 @@ int probe_en29f512(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; uint8_t id1, id2; chip_writeb(0xAA, bios + 0x555); @@ -65,7 +65,7 @@ /* This does not seem to function properly for EN29F002NT. */ int probe_en29f002a(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; uint8_t id1, id2; chip_writeb(0xAA, bios + 0x555); @@ -95,8 +95,8 @@ { int i; int total_size = flash->total_size * 1024; - volatile uint8_t *bios = flash->virtual_memory; - volatile uint8_t *dst = bios; + chipaddr_t bios = flash->virtual_memory; + chipaddr_t dst = bios; // *bios = 0xF0; myusec_delay(10); Index: jedec.c =================================================================== --- jedec.c (Revision 514) +++ jedec.c (Arbeitskopie) @@ -35,7 +35,7 @@ return (val ^ (val >> 1)) & 0x1; } -void toggle_ready_jedec(volatile uint8_t *dst) +void toggle_ready_jedec(chipaddr_t dst) { unsigned int i = 0; uint8_t tmp1, tmp2; @@ -51,7 +51,7 @@ } } -void data_polling_jedec(volatile uint8_t *dst, uint8_t data) +void data_polling_jedec(chipaddr_t dst, uint8_t data) { unsigned int i = 0; uint8_t tmp; @@ -66,7 +66,7 @@ } } -void unprotect_jedec(volatile uint8_t *bios) +void unprotect_jedec(chipaddr_t bios) { chip_writeb(0xAA, bios + 0x5555); chip_writeb(0x55, bios + 0x2AAA); @@ -78,7 +78,7 @@ usleep(200); } -void protect_jedec(volatile uint8_t *bios) +void protect_jedec(chipaddr_t bios) { chip_writeb(0xAA, bios + 0x5555); chip_writeb(0x55, bios + 0x2AAA); @@ -89,7 +89,7 @@ int probe_jedec(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; uint8_t id1, id2; uint32_t largeid1, largeid2; uint32_t flashcontent1, flashcontent2; @@ -161,7 +161,7 @@ return 0; } -int erase_sector_jedec(volatile uint8_t *bios, unsigned int page) +int erase_sector_jedec(chipaddr_t bios, unsigned int page) { /* Issue the Sector Erase command */ chip_writeb(0xAA, bios + 0x5555); @@ -184,7 +184,7 @@ return 0; } -int erase_block_jedec(volatile uint8_t *bios, unsigned int block) +int erase_block_jedec(chipaddr_t bios, unsigned int block) { /* Issue the Sector Erase command */ chip_writeb(0xAA, bios + 0x5555); @@ -209,7 +209,7 @@ int erase_chip_jedec(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; /* Issue the JEDEC Chip Erase command */ chip_writeb(0xAA, bios + 0x5555); @@ -231,11 +231,11 @@ return 0; } -int write_page_write_jedec(volatile uint8_t *bios, uint8_t *src, - volatile uint8_t *dst, int page_size) +int write_page_write_jedec(chipaddr_t bios, uint8_t *src, + chipaddr_t dst, int page_size) { int i, tried = 0, start_index = 0, ok; - volatile uint8_t *d = dst; + chipaddr_t d = dst; uint8_t *s = src; retry: @@ -272,14 +272,14 @@ goto retry; } if (!ok) { - fprintf(stderr, " page %d failed!\n", - (unsigned int)(d - bios) / page_size); + fprintf(stderr, " page 0x%lx failed!\n", + (d - bios) / page_size); } return !ok; } -int write_byte_program_jedec(volatile uint8_t *bios, uint8_t *src, - volatile uint8_t *dst) +int write_byte_program_jedec(chipaddr_t bios, uint8_t *src, + chipaddr_t dst) { int tried = 0, ok = 1; @@ -308,8 +308,8 @@ return !ok; } -int write_sector_jedec(volatile uint8_t *bios, uint8_t *src, - volatile uint8_t *dst, unsigned int page_size) +int write_sector_jedec(chipaddr_t bios, uint8_t *src, + chipaddr_t dst, unsigned int page_size) { int i; @@ -326,12 +326,12 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; erase_chip_jedec(flash); // dumb check if erase was successful. for (i = 0; i < total_size; i++) { - if (chip_readb(bios + i) != (uint8_t) 0xff) { + if (chip_readb(bios + i) != 0xff) { printf("ERASE FAILED @%d, val %02x!\n", i, chip_readb(bios + i)); return -1; } Index: w29ee011.c =================================================================== --- w29ee011.c (Revision 514) +++ w29ee011.c (Arbeitskopie) @@ -23,7 +23,7 @@ int probe_w29ee011(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; uint8_t id1, id2; extern char *chip_to_probe; Index: sst49lfxxxc.c =================================================================== --- sst49lfxxxc.c (Revision 514) +++ sst49lfxxxc.c (Arbeitskopie) @@ -41,7 +41,7 @@ #define STATUS_ESS (1 << 6) #define STATUS_WSMS (1 << 7) -static __inline__ int write_lockbits_49lfxxxc(volatile uint8_t *bios, int size, +static __inline__ int write_lockbits_49lfxxxc(chipaddr_t bios, int size, unsigned char bits) { int i, left = size; @@ -68,7 +68,7 @@ return 0; } -static __inline__ int erase_sector_49lfxxxc(volatile uint8_t *bios, +static __inline__ int erase_sector_49lfxxxc(chipaddr_t bios, unsigned long address) { unsigned char status; @@ -79,7 +79,7 @@ do { status = chip_readb(bios); if (status & (STATUS_ESS | STATUS_BPS)) { - printf("sector erase FAILED at address=0x%08lx status=0x%01x\n", (unsigned long)bios + address, status); + printf("sector erase FAILED at address=0x%08lx status=0x%01x\n", bios + address, status); chip_writeb(CLEAR_STATUS, bios); return (-1); } @@ -88,9 +88,9 @@ return 0; } -static __inline__ int write_sector_49lfxxxc(volatile uint8_t *bios, +static __inline__ int write_sector_49lfxxxc(chipaddr_t bios, uint8_t *src, - volatile uint8_t *dst, + chipaddr_t dst, unsigned int page_size) { int i; @@ -111,7 +111,7 @@ do { status = chip_readb(bios); if (status & (STATUS_ESS | STATUS_BPS)) { - printf("sector write FAILED at address=0x%08lx status=0x%01x\n", (unsigned long)dst, status); + printf("sector write FAILED at address=0x%08lx status=0x%01x\n", dst, status); chip_writeb(CLEAR_STATUS, bios); return (-1); } @@ -123,7 +123,7 @@ int probe_49lfxxxc(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; uint8_t id1, id2; @@ -147,8 +147,8 @@ int erase_49lfxxxc(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; - volatile uint8_t *registers = flash->virtual_registers; + chipaddr_t bios = flash->virtual_memory; + chipaddr_t registers = flash->virtual_registers; int i; unsigned int total_size = flash->total_size * 1024; @@ -167,7 +167,7 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; write_lockbits_49lfxxxc(flash->virtual_registers, total_size, 0); printf("Programming page: "); Index: sharplhf00l04.c =================================================================== --- sharplhf00l04.c (Revision 514) +++ sharplhf00l04.c (Arbeitskopie) @@ -36,7 +36,7 @@ int probe_lhf00l04(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; uint8_t id1, id2; #if 0 @@ -71,7 +71,7 @@ return 1; } -uint8_t wait_lhf00l04(volatile uint8_t *bios) +uint8_t wait_lhf00l04(chipaddr_t bios) { uint8_t status; uint8_t id1, id2; @@ -101,17 +101,17 @@ int erase_lhf00l04_block(struct flashchip *flash, int offset) { - volatile uint8_t *bios = flash->virtual_memory + offset; - volatile uint8_t *wrprotect = flash->virtual_registers + offset + 2; + chipaddr_t bios = flash->virtual_memory + offset; + chipaddr_t wrprotect = flash->virtual_registers + offset + 2; uint8_t status; // clear status register chip_writeb(0x50, bios); - printf("Erase at %p\n", bios); + printf("Erase at 0x%lx\n", bios); status = wait_lhf00l04(flash->virtual_memory); print_lhf00l04_status(status); // clear write protect - printf("write protect is at %p\n", (wrprotect)); + printf("write protect is at 0x%lx\n", (wrprotect)); printf("write protect is 0x%x\n", chip_readb(wrprotect)); chip_writeb(0, wrprotect); printf("write protect is 0x%x\n", chip_readb(wrprotect)); @@ -142,8 +142,8 @@ return 0; } -void write_page_lhf00l04(volatile uint8_t *bios, uint8_t *src, - volatile uint8_t *dst, int page_size) +void write_page_lhf00l04(chipaddr_t bios, uint8_t *src, + chipaddr_t dst, int page_size) { int i; @@ -160,7 +160,7 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; erase_lhf00l04(flash); if (chip_readb(bios) != 0xff) { Index: nic3com.c =================================================================== --- nic3com.c (Revision 514) +++ nic3com.c (Arbeitskopie) @@ -163,36 +163,36 @@ { } -void nic3com_chip_writeb(uint8_t val, volatile void *addr) +void nic3com_chip_writeb(uint8_t val, chipaddr_t addr) { - OUTL((uint32_t)(intptr_t)addr, io_base_addr + BIOS_ROM_ADDR); + OUTL((uint32_t)addr, io_base_addr + BIOS_ROM_ADDR); OUTB(val, io_base_addr + BIOS_ROM_DATA); } -void nic3com_chip_writew(uint16_t val, volatile void *addr) +void nic3com_chip_writew(uint16_t val, chipaddr_t addr) { } -void nic3com_chip_writel(uint32_t val, volatile void *addr) +void nic3com_chip_writel(uint32_t val, chipaddr_t addr) { } -uint8_t nic3com_chip_readb(const volatile void *addr) +uint8_t nic3com_chip_readb(const chipaddr_t addr) { uint8_t val; - OUTL((uint32_t)(intptr_t)addr, io_base_addr + BIOS_ROM_ADDR); + OUTL((uint32_t)addr, io_base_addr + BIOS_ROM_ADDR); val = INB(io_base_addr + BIOS_ROM_DATA); return val; } -uint16_t nic3com_chip_readw(const volatile void *addr) +uint16_t nic3com_chip_readw(const chipaddr_t addr) { return 0xffff; } -uint32_t nic3com_chip_readl(const volatile void *addr) +uint32_t nic3com_chip_readl(const chipaddr_t addr) { return 0xffffffff; } Index: w39v040c.c =================================================================== --- w39v040c.c (Revision 514) +++ w39v040c.c (Arbeitskopie) @@ -23,7 +23,7 @@ int probe_w39v040c(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; uint8_t id1, id2, lock; chip_writeb(0xAA, bios + 0x5555); @@ -61,7 +61,7 @@ { int i; unsigned int total_size = flash->total_size * 1024; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; for (i = 0; i < total_size; i += flash->page_size) erase_sector_jedec(flash->virtual_memory, i); @@ -80,7 +80,7 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; if (flash->erase(flash)) return -1; Index: m29f002.c =================================================================== --- m29f002.c (Revision 514) +++ m29f002.c (Arbeitskopie) @@ -22,7 +22,7 @@ int erase_m29f002(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; chip_writeb(0xaa, bios + 0x555); chip_writeb(0x55, bios + 0xaaa); chip_writeb(0x80, bios + 0x555); @@ -34,8 +34,8 @@ return 0; } -static void rewrite_block(volatile uint8_t *bios, uint8_t *src, - volatile uint8_t *dst, int size) +static void rewrite_block(chipaddr_t bios, uint8_t *src, + chipaddr_t dst, int size) { /* erase */ chip_writeb(0xaa, bios + 0x555); @@ -59,7 +59,7 @@ } } -static void do_block(volatile uint8_t *bios, uint8_t *src, int i, +static void do_block(chipaddr_t bios, uint8_t *src, int i, unsigned long start, int size) { printf("%d at address: 0x%08lx", i, start); @@ -70,7 +70,7 @@ int write_m29f002t(struct flashchip *flash, uint8_t *buf) { int i, page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; /* M29F002(N)T has 7 blocks. From bottom to top their sizes are: * 64k 64k 64k 32k 8k 8k 16k @@ -92,7 +92,7 @@ int write_m29f002b(struct flashchip *flash, uint8_t *buf) { int i = 0, page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; /* M29F002B has 7 blocks. From bottom to top their sizes are: * 16k 8k 8k 32k 64k 64k 64k Index: dummyflasher.c =================================================================== --- dummyflasher.c (Revision 514) +++ dummyflasher.c (Arbeitskopie) @@ -54,36 +54,36 @@ __func__, (unsigned long)len, virt_addr); } -void dummy_chip_writeb(uint8_t val, volatile void *addr) +void dummy_chip_writeb(uint8_t val, chipaddr_t addr) { - printf_debug("%s: addr=%p, val=0x%02x\n", __func__, addr, val); + printf_debug("%s: addr=0x%lx, val=0x%02x\n", __func__, addr, val); } -void dummy_chip_writew(uint16_t val, volatile void *addr) +void dummy_chip_writew(uint16_t val, chipaddr_t addr) { - printf_debug("%s: addr=%p, val=0x%04x\n", __func__, addr, val); + printf_debug("%s: addr=0x%lx, val=0x%04x\n", __func__, addr, val); } -void dummy_chip_writel(uint32_t val, volatile void *addr) +void dummy_chip_writel(uint32_t val, chipaddr_t addr) { - printf_debug("%s: addr=%p, val=0x%08x\n", __func__, addr, val); + printf_debug("%s: addr=0x%lx, val=0x%08x\n", __func__, addr, val); } -uint8_t dummy_chip_readb(const volatile void *addr) +uint8_t dummy_chip_readb(const chipaddr_t addr) { - printf_debug("%s: addr=%p, returning 0xff\n", __func__, addr); + printf_debug("%s: addr=0x%lx, returning 0xff\n", __func__, addr); return 0xff; } -uint16_t dummy_chip_readw(const volatile void *addr) +uint16_t dummy_chip_readw(const chipaddr_t addr) { - printf_debug("%s: addr=%p, returning 0xffff\n", __func__, addr); + printf_debug("%s: addr=0x%lx, returning 0xffff\n", __func__, addr); return 0xffff; } -uint32_t dummy_chip_readl(const volatile void *addr) +uint32_t dummy_chip_readl(const chipaddr_t addr) { - printf_debug("%s: addr=%p, returning 0xffffffff\n", __func__, addr); + printf_debug("%s: addr=0x%lx, returning 0xffffffff\n", __func__, addr); return 0xffffffff; } Index: w49f002u.c =================================================================== --- w49f002u.c (Revision 514) +++ w49f002u.c (Arbeitskopie) @@ -26,7 +26,7 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; erase_chip_jedec(flash); Index: sst28sf040.c =================================================================== --- sst28sf040.c (Revision 514) +++ sst28sf040.c (Arbeitskopie) @@ -30,7 +30,7 @@ #define RESET 0xFF #define READ_ID 0x90 -static __inline__ void protect_28sf040(volatile uint8_t *bios) +static __inline__ void protect_28sf040(chipaddr_t bios) { uint8_t tmp; @@ -43,7 +43,7 @@ tmp = chip_readb(bios + 0x040A); } -static __inline__ void unprotect_28sf040(volatile uint8_t *bios) +static __inline__ void unprotect_28sf040(chipaddr_t bios) { uint8_t tmp; @@ -56,7 +56,7 @@ tmp = chip_readb(bios + 0x041A); } -static __inline__ int erase_sector_28sf040(volatile uint8_t *bios, +static __inline__ int erase_sector_28sf040(chipaddr_t bios, unsigned long address) { chip_writeb(AUTO_PG_ERASE1, bios); @@ -68,9 +68,9 @@ return 0; } -static __inline__ int write_sector_28sf040(volatile uint8_t *bios, +static __inline__ int write_sector_28sf040(chipaddr_t bios, uint8_t *src, - volatile uint8_t *dst, + chipaddr_t dst, unsigned int page_size) { int i; @@ -95,7 +95,7 @@ int probe_28sf040(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; uint8_t id1, id2; chip_writeb(RESET, bios); @@ -119,7 +119,7 @@ int erase_28sf040(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; unprotect_28sf040(bios); chip_writeb(CHIP_ERASE, bios); @@ -137,7 +137,7 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; unprotect_28sf040(bios); Index: stm50flw0x0x.c =================================================================== --- stm50flw0x0x.c (Revision 514) +++ stm50flw0x0x.c (Arbeitskopie) @@ -31,7 +31,7 @@ #include <stdint.h> #include "flash.h" -void protect_stm50flw0x0x(volatile uint8_t *bios) +void protect_stm50flw0x0x(chipaddr_t bios) { chip_writeb(0xAA, bios + 0x5555); chip_writeb(0x55, bios + 0x2AAA); @@ -42,7 +42,7 @@ int probe_stm50flw0x0x(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; uint8_t id1, id2; uint32_t largeid1, largeid2; @@ -91,7 +91,7 @@ return 1; } -static void wait_stm50flw0x0x(volatile uint8_t *bios) +static void wait_stm50flw0x0x(chipaddr_t bios) { uint8_t id1; // id2; @@ -120,7 +120,7 @@ */ int unlock_block_stm50flw0x0x(struct flashchip *flash, int offset) { - volatile uint8_t *wrprotect = flash->virtual_registers + 2; + chipaddr_t wrprotect = flash->virtual_registers + 2; const uint8_t unlock_sector = 0x00; int j; @@ -163,12 +163,12 @@ int erase_block_stm50flw0x0x(struct flashchip *flash, int offset) { - volatile uint8_t *bios = flash->virtual_memory + offset; + chipaddr_t bios = flash->virtual_memory + offset; int j; // clear status register chip_writeb(0x50, bios); - printf_debug("Erase at %p\n", bios); + printf_debug("Erase at 0x%lx\n", bios); // now start it chip_writeb(0x20, bios); chip_writeb(0xd0, bios); @@ -188,11 +188,11 @@ return 0; } -int write_page_stm50flw0x0x(volatile uint8_t *bios, uint8_t *src, - volatile uint8_t *dst, int page_size) +int write_page_stm50flw0x0x(chipaddr_t bios, uint8_t *src, + chipaddr_t dst, int page_size) { int i, rc = 0; - volatile uint8_t *d = dst; + chipaddr_t d = dst; uint8_t *s = src; /* transfer data from source to destination */ @@ -219,8 +219,8 @@ } if (rc) { - fprintf(stderr, " page %d failed!\n", - (unsigned int)(d - bios) / page_size); + fprintf(stderr, " page 0x%lx failed!\n", + (d - bios) / page_size); } return rc; @@ -234,7 +234,7 @@ int i, rc = 0; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; printf("Erasing page:\n"); for (i = 0; (i < total_size / page_size) && (rc == 0); i++) { @@ -256,7 +256,7 @@ int i, rc = 0; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; printf("Programming page: \n"); for (i = 0; (i < total_size / page_size) && (rc == 0); i++) { Index: am29f040b.c =================================================================== --- am29f040b.c (Revision 514) +++ am29f040b.c (Arbeitskopie) @@ -22,7 +22,7 @@ #include <stdint.h> #include "flash.h" -static __inline__ int erase_sector_29f040b(volatile uint8_t *bios, +static __inline__ int erase_sector_29f040b(chipaddr_t bios, unsigned long address) { chip_writeb(0xAA, bios + 0x555); @@ -40,17 +40,16 @@ return 0; } -static __inline__ int write_sector_29f040b(volatile uint8_t *bios, +static __inline__ int write_sector_29f040b(chipaddr_t bios, uint8_t *src, - volatile uint8_t *dst, + chipaddr_t dst, unsigned int page_size) { int i; for (i = 0; i < page_size; i++) { if ((i & 0xfff) == 0xfff) - printf("0x%08lx", (unsigned long)dst - - (unsigned long)bios); + printf("0x%08lx", dst - bios); chip_writeb(0xAA, bios + 0x555); chip_writeb(0x55, bios + 0x2AA); @@ -69,7 +68,7 @@ int probe_29f040b(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; uint8_t id1, id2; chip_writeb(0xAA, bios + 0x555); @@ -92,7 +91,7 @@ int erase_29f040b(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; chip_writeb(0xAA, bios + 0x555); chip_writeb(0x55, bios + 0x2AA); @@ -112,7 +111,7 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; printf("Programming page "); for (i = 0; i < total_size / page_size; i++) { Index: sst_fwhub.c =================================================================== --- sst_fwhub.c (Revision 514) +++ sst_fwhub.c (Arbeitskopie) @@ -37,7 +37,7 @@ int check_sst_fwhub_block_lock(struct flashchip *flash, int offset) { - volatile uint8_t *registers = flash->virtual_registers; + chipaddr_t registers = flash->virtual_registers; uint8_t blockstatus; blockstatus = chip_readb(registers + offset + 2); @@ -63,7 +63,7 @@ int clear_sst_fwhub_block_lock(struct flashchip *flash, int offset) { - volatile uint8_t *registers = flash->virtual_registers; + chipaddr_t registers = flash->virtual_registers; uint8_t blockstatus; blockstatus = check_sst_fwhub_block_lock(flash, offset); @@ -115,7 +115,7 @@ { int i; unsigned int total_size = flash->total_size * 1024; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; for (i = 0; i < total_size; i += flash->page_size) erase_sst_fwhub_block(flash, i); @@ -136,7 +136,7 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; uint8_t blockstatus; // FIXME: We want block wide erase instead of ironing the whole chip Index: w39v080fa.c =================================================================== --- w39v080fa.c (Revision 514) +++ w39v080fa.c (Arbeitskopie) @@ -23,7 +23,7 @@ int probe_winbond_fwhub(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; uint8_t vid, did; /* Product Identification Entry */ @@ -54,7 +54,7 @@ static int unlock_block_winbond_fwhub(struct flashchip *flash, int offset) { - volatile uint8_t *wrprotect = flash->virtual_registers + offset + 2; + chipaddr_t wrprotect = flash->virtual_registers + offset + 2; uint8_t locking; printf_debug("Trying to unlock block @0x%08x = 0x%02x\n", offset, @@ -98,7 +98,7 @@ int unlock_winbond_fwhub(struct flashchip *flash) { int i, total_size = flash->total_size * 1024; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; uint8_t locking; /* Are there any hardware restrictions that we can't overcome? @@ -143,7 +143,7 @@ return 0; } -static int erase_sector_winbond_fwhub(volatile uint8_t *bios, +static int erase_sector_winbond_fwhub(chipaddr_t bios, unsigned int sector) { /* Remember: too much sleep can waste your day. */ @@ -168,7 +168,7 @@ int erase_winbond_fwhub(struct flashchip *flash) { int i, total_size = flash->total_size * 1024; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; unlock_winbond_fwhub(flash); @@ -193,7 +193,7 @@ { int i; int total_size = flash->total_size * 1024; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; if (erase_winbond_fwhub(flash)) return -1; Index: flashrom.c =================================================================== --- flashrom.c (Revision 514) +++ flashrom.c (Arbeitskopie) @@ -84,7 +84,7 @@ { size_t size = flash->total_size * 1024; /* Flash registers live 4 MByte below the flash. */ - flash->virtual_registers = programmer_map_flash_region("flash chip registers", (0xFFFFFFFF - 0x400000 - size + 1), size); + flash->virtual_registers = (chipaddr_t)programmer_map_flash_region("flash chip registers", (0xFFFFFFFF - 0x400000 - size + 1), size); } int read_memmapped(struct flashchip *flash, uint8_t *buf) @@ -117,7 +117,7 @@ size = flash->total_size * 1024; base = flashbase ? flashbase : (0xffffffff - size + 1); - flash->virtual_memory = programmer_map_flash_region("flash chip", base, size); + flash->virtual_memory = (chipaddr_t)programmer_map_flash_region("flash chip", base, size); if (force) break; @@ -130,8 +130,7 @@ break; notfound: - /* The intermediate cast to unsigned long works around a gcc warning bug. */ - programmer_unmap_flash_region((void *)(unsigned long)flash->virtual_memory, size); + programmer_unmap_flash_region((void *)flash->virtual_memory, size); } if (!flash || !flash->name) Index: internal.c =================================================================== --- internal.c (Revision 514) +++ internal.c (Arbeitskopie) @@ -138,32 +138,32 @@ return 0; } -void internal_chip_writeb(uint8_t val, volatile void *addr) +void internal_chip_writeb(uint8_t val, chipaddr_t addr) { *(volatile uint8_t *) addr = val; } -void internal_chip_writew(uint16_t val, volatile void *addr) +void internal_chip_writew(uint16_t val, chipaddr_t addr) { *(volatile uint16_t *) addr = val; } -void internal_chip_writel(uint32_t val, volatile void *addr) +void internal_chip_writel(uint32_t val, chipaddr_t addr) { *(volatile uint32_t *) addr = val; } -uint8_t internal_chip_readb(const volatile void *addr) +uint8_t internal_chip_readb(const chipaddr_t addr) { return *(volatile uint8_t *) addr; } -uint16_t internal_chip_readw(const volatile void *addr) +uint16_t internal_chip_readw(const chipaddr_t addr) { return *(volatile uint16_t *) addr; } -uint32_t internal_chip_readl(const volatile void *addr) +uint32_t internal_chip_readl(const chipaddr_t addr) { return *(volatile uint32_t *) addr; } Index: 82802ab.c =================================================================== --- 82802ab.c (Revision 514) +++ 82802ab.c (Arbeitskopie) @@ -45,7 +45,7 @@ int probe_82802ab(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; uint8_t id1, id2; #if 0 @@ -79,7 +79,7 @@ return 1; } -uint8_t wait_82802ab(volatile uint8_t *bios) +uint8_t wait_82802ab(chipaddr_t bios) { uint8_t status; uint8_t id1, id2; @@ -109,8 +109,8 @@ int erase_82802ab_block(struct flashchip *flash, int offset) { - volatile uint8_t *bios = flash->virtual_memory + offset; - volatile uint8_t *wrprotect = flash->virtual_registers + offset + 2; + chipaddr_t bios = flash->virtual_memory + offset; + chipaddr_t wrprotect = flash->virtual_registers + offset + 2; int j; uint8_t status; @@ -155,8 +155,8 @@ return 0; } -void write_page_82802ab(volatile uint8_t *bios, uint8_t *src, - volatile uint8_t *dst, int page_size) +void write_page_82802ab(chipaddr_t bios, uint8_t *src, + chipaddr_t dst, int page_size) { int i; @@ -173,7 +173,7 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; printf("Programming page: \n"); for (i = 0; i < total_size / page_size; i++) { Index: mx29f002.c =================================================================== --- mx29f002.c (Revision 514) +++ mx29f002.c (Arbeitskopie) @@ -24,7 +24,7 @@ int probe_29f002(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; uint8_t id1, id2; chip_writeb(0xAA, bios + 0x5555); @@ -47,7 +47,7 @@ int erase_29f002(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; chip_writeb(0xF0, bios + 0x555); chip_writeb(0xAA, bios + 0x555); @@ -80,8 +80,8 @@ { int i; int total_size = flash->total_size * 1024; - volatile uint8_t *bios = flash->virtual_memory; - volatile uint8_t *dst = bios; + chipaddr_t bios = flash->virtual_memory; + chipaddr_t dst = bios; chip_writeb(0xF0, bios); myusec_delay(10); Index: m29f400bt.c =================================================================== --- m29f400bt.c (Revision 514) +++ m29f400bt.c (Arbeitskopie) @@ -20,7 +20,7 @@ #include "flash.h" -void protect_m29f400bt(volatile uint8_t *bios) +void protect_m29f400bt(chipaddr_t bios) { chip_writeb(0xAA, bios + 0xAAA); chip_writeb(0x55, bios + 0x555); @@ -29,8 +29,8 @@ usleep(200); } -void write_page_m29f400bt(volatile uint8_t *bios, uint8_t *src, - volatile uint8_t *dst, int page_size) +void write_page_m29f400bt(chipaddr_t bios, uint8_t *src, + chipaddr_t dst, int page_size) { int i; @@ -41,12 +41,12 @@ /* transfer data from source to destination */ chip_writeb(*src, dst); - //*(volatile char *) (bios) = 0xF0; + //chip_writeb(0xF0, bios); //usleep(5); toggle_ready_jedec(dst); printf - ("Value in the flash at address %p = %#x, want %#x\n", - (uint8_t *) (dst - bios), chip_readb(dst), *src); + ("Value in the flash at address 0x%lx = %#x, want %#x\n", + (dst - bios), chip_readb(dst), *src); dst++; src++; } @@ -54,7 +54,7 @@ int probe_m29f400bt(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; uint8_t id1, id2; chip_writeb(0xAA, bios + 0xAAA); @@ -85,7 +85,7 @@ int erase_m29f400bt(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; chip_writeb(0xAA, bios + 0xAAA); chip_writeb(0x55, bios + 0x555); @@ -101,7 +101,7 @@ return 0; } -int block_erase_m29f400bt(volatile uint8_t *bios, volatile uint8_t *dst) +int block_erase_m29f400bt(chipaddr_t bios, chipaddr_t dst) { chip_writeb(0xAA, bios + 0xAAA); @@ -110,7 +110,7 @@ chip_writeb(0xAA, bios + 0xAAA); chip_writeb(0x55, bios + 0x555); - //*(volatile uint8_t *) (bios + 0xAAA) = 0x10; + //*(chipaddr_t ) (bios + 0xAAA) = 0x10; chip_writeb(0x30, dst); myusec_delay(10); @@ -124,7 +124,7 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; //erase_m29f400bt (flash); printf("Programming page:\n "); @@ -176,7 +176,7 @@ int write_coreboot_m29f400bt(struct flashchip *flash, uint8_t *buf) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; printf("Programming page:\n "); /********************************* Index: sst49lf040.c =================================================================== --- sst49lf040.c (Revision 514) +++ sst49lf040.c (Arbeitskopie) @@ -26,7 +26,7 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; for (i = 0; i < total_size / page_size; i++) { /* Chip erase only works in parallel programming mode @@ -42,7 +42,7 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; printf("Programming page: "); for (i = 0; i < total_size / page_size; i++) { -- http://www.hailfinger.org/ Index: flashrom-chipaddr_t/flash.h =================================================================== --- flashrom-chipaddr_t/flash.h (Revision 514) +++ flashrom-chipaddr_t/flash.h (Arbeitskopie) @@ -77,6 +77,9 @@ #endif #endif +typedef unsigned long chipaddr_t; +//typedef volatile uint8_t * chipaddr_t; + extern int programmer; #define PROGRAMMER_INTERNAL 0x00 #define PROGRAMMER_DUMMY 0x01 @@ -92,12 +95,12 @@ void * (*map_flash_region) (const char *descr, unsigned long phys_addr, size_t len); void (*unmap_flash_region) (void *virt_addr, size_t len); - void (*chip_writeb) (uint8_t val, volatile void *addr); - void (*chip_writew) (uint16_t val, volatile void *addr); - void (*chip_writel) (uint32_t val, volatile void *addr); - uint8_t (*chip_readb) (const volatile void *addr); - uint16_t (*chip_readw) (const volatile void *addr); - uint32_t (*chip_readl) (const volatile void *addr); + void (*chip_writeb) (uint8_t val, chipaddr_t addr); + void (*chip_writew) (uint16_t val, chipaddr_t addr); + void (*chip_writel) (uint32_t val, chipaddr_t addr); + uint8_t (*chip_readb) (const chipaddr_t addr); + uint16_t (*chip_readw) (const chipaddr_t addr); + uint32_t (*chip_readl) (const chipaddr_t addr); }; extern const struct programmer_entry programmer_table[]; @@ -122,32 +125,32 @@ programmer_table[programmer].unmap_flash_region(virt_addr, len); } -static inline void chip_writeb(uint8_t val, volatile void *addr) +static inline void chip_writeb(uint8_t val, chipaddr_t addr) { programmer_table[programmer].chip_writeb(val, addr); } -static inline void chip_writew(uint16_t val, volatile void *addr) +static inline void chip_writew(uint16_t val, chipaddr_t addr) { programmer_table[programmer].chip_writew(val, addr); } -static inline void chip_writel(uint32_t val, volatile void *addr) +static inline void chip_writel(uint32_t val, chipaddr_t addr) { programmer_table[programmer].chip_writel(val, addr); } -static inline uint8_t chip_readb(const volatile void *addr) +static inline uint8_t chip_readb(const chipaddr_t addr) { return programmer_table[programmer].chip_readb(addr); } -static inline uint16_t chip_readw(const volatile void *addr) +static inline uint16_t chip_readw(const chipaddr_t addr) { return programmer_table[programmer].chip_readw(addr); } -static inline uint32_t chip_readl(const volatile void *addr) +static inline uint32_t chip_readl(const chipaddr_t addr) { return programmer_table[programmer].chip_readl(addr); } @@ -180,8 +183,8 @@ int (*read) (struct flashchip *flash, uint8_t *buf); /* Some flash devices have an additional register space. */ - volatile uint8_t *virtual_memory; - volatile uint8_t *virtual_registers; + chipaddr_t virtual_memory; + chipaddr_t virtual_registers; }; #define TEST_UNTESTED 0 @@ -588,12 +591,12 @@ void get_io_perms(void); int internal_init(void); int internal_shutdown(void); -void internal_chip_writeb(uint8_t val, volatile void *addr); -void internal_chip_writew(uint16_t val, volatile void *addr); -void internal_chip_writel(uint32_t val, volatile void *addr); -uint8_t internal_chip_readb(const volatile void *addr); -uint16_t internal_chip_readw(const volatile void *addr); -uint32_t internal_chip_readl(const volatile void *addr); +void internal_chip_writeb(uint8_t val, chipaddr_t addr); +void internal_chip_writew(uint16_t val, chipaddr_t addr); +void internal_chip_writel(uint32_t val, chipaddr_t addr); +uint8_t internal_chip_readb(const chipaddr_t addr); +uint16_t internal_chip_readw(const chipaddr_t addr); +uint32_t internal_chip_readl(const chipaddr_t addr); #if defined(__FreeBSD__) || defined(__DragonFly__) extern int io_fd; #endif @@ -603,12 +606,12 @@ int dummy_shutdown(void); void *dummy_map(const char *descr, unsigned long phys_addr, size_t len); void dummy_unmap(void *virt_addr, size_t len); -void dummy_chip_writeb(uint8_t val, volatile void *addr); -void dummy_chip_writew(uint16_t val, volatile void *addr); -void dummy_chip_writel(uint32_t val, volatile void *addr); -uint8_t dummy_chip_readb(const volatile void *addr); -uint16_t dummy_chip_readw(const volatile void *addr); -uint32_t dummy_chip_readl(const volatile void *addr); +void dummy_chip_writeb(uint8_t val, chipaddr_t addr); +void dummy_chip_writew(uint16_t val, chipaddr_t addr); +void dummy_chip_writel(uint32_t val, chipaddr_t addr); +uint8_t dummy_chip_readb(const chipaddr_t addr); +uint16_t dummy_chip_readw(const chipaddr_t addr); +uint32_t dummy_chip_readl(const chipaddr_t addr); int dummy_spi_command(unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); @@ -617,12 +620,12 @@ int nic3com_shutdown(void); void *nic3com_map(const char *descr, unsigned long phys_addr, size_t len); void nic3com_unmap(void *virt_addr, size_t len); -void nic3com_chip_writeb(uint8_t val, volatile void *addr); -void nic3com_chip_writew(uint16_t val, volatile void *addr); -void nic3com_chip_writel(uint32_t val, volatile void *addr); -uint8_t nic3com_chip_readb(const volatile void *addr); -uint16_t nic3com_chip_readw(const volatile void *addr); -uint32_t nic3com_chip_readl(const volatile void *addr); +void nic3com_chip_writeb(uint8_t val, chipaddr_t addr); +void nic3com_chip_writew(uint16_t val, chipaddr_t addr); +void nic3com_chip_writel(uint32_t val, chipaddr_t addr); +uint8_t nic3com_chip_readb(const chipaddr_t addr); +uint16_t nic3com_chip_readw(const chipaddr_t addr); +uint32_t nic3com_chip_readl(const chipaddr_t addr); /* flashrom.c */ extern int verbose; @@ -707,19 +710,19 @@ /* jedec.c */ uint8_t oddparity(uint8_t val); -void toggle_ready_jedec(volatile uint8_t *dst); -void data_polling_jedec(volatile uint8_t *dst, uint8_t data); -void unprotect_jedec(volatile uint8_t *bios); -void protect_jedec(volatile uint8_t *bios); -int write_byte_program_jedec(volatile uint8_t *bios, uint8_t *src, - volatile uint8_t *dst); +void toggle_ready_jedec(chipaddr_t dst); +void data_polling_jedec(chipaddr_t dst, uint8_t data); +void unprotect_jedec(chipaddr_t bios); +void protect_jedec(chipaddr_t bios); +int write_byte_program_jedec(chipaddr_t bios, uint8_t *src, + chipaddr_t dst); int probe_jedec(struct flashchip *flash); int erase_chip_jedec(struct flashchip *flash); int write_jedec(struct flashchip *flash, uint8_t *buf); -int erase_sector_jedec(volatile uint8_t *bios, unsigned int page); -int erase_block_jedec(volatile uint8_t *bios, unsigned int page); -int write_sector_jedec(volatile uint8_t *bios, uint8_t *src, - volatile uint8_t *dst, unsigned int page_size); +int erase_sector_jedec(chipaddr_t bios, unsigned int page); +int erase_block_jedec(chipaddr_t bios, unsigned int page); +int write_sector_jedec(chipaddr_t bios, uint8_t *src, + chipaddr_t dst, unsigned int page_size); /* m29f002.c */ int erase_m29f002(struct flashchip *flash); @@ -729,15 +732,15 @@ /* m29f400bt.c */ int probe_m29f400bt(struct flashchip *flash); int erase_m29f400bt(struct flashchip *flash); -int block_erase_m29f400bt(volatile uint8_t *bios, - volatile uint8_t *dst); +int block_erase_m29f400bt(chipaddr_t bios, + chipaddr_t dst); int write_m29f400bt(struct flashchip *flash, uint8_t *buf); int write_coreboot_m29f400bt(struct flashchip *flash, uint8_t *buf); -void toggle_ready_m29f400bt(volatile uint8_t *dst); -void data_polling_m29f400bt(volatile uint8_t *dst, uint8_t data); -void protect_m29f400bt(volatile uint8_t *bios); -void write_page_m29f400bt(volatile uint8_t *bios, uint8_t *src, - volatile uint8_t *dst, int page_size); +void toggle_ready_m29f400bt(chipaddr_t dst); +void data_polling_m29f400bt(chipaddr_t dst, uint8_t data); +void protect_m29f400bt(chipaddr_t bios); +void write_page_m29f400bt(chipaddr_t bios, uint8_t *src, + chipaddr_t dst, int page_size); /* mx29f002.c */ int probe_29f002(struct flashchip *flash); @@ -753,9 +756,9 @@ int probe_lhf00l04(struct flashchip *flash); int erase_lhf00l04(struct flashchip *flash); int write_lhf00l04(struct flashchip *flash, uint8_t *buf); -void toggle_ready_lhf00l04(volatile uint8_t *dst); -void data_polling_lhf00l04(volatile uint8_t *dst, uint8_t data); -void protect_lhf00l04(volatile uint8_t *bios); +void toggle_ready_lhf00l04(chipaddr_t dst); +void data_polling_lhf00l04(chipaddr_t dst, uint8_t data); +void protect_lhf00l04(chipaddr_t bios); /* sst28sf040.c */ int probe_28sf040(struct flashchip *flash); Index: flashrom-chipaddr_t/pm49fl00x.c =================================================================== --- flashrom-chipaddr_t/pm49fl00x.c (Revision 514) +++ flashrom-chipaddr_t/pm49fl00x.c (Arbeitskopie) @@ -25,7 +25,7 @@ extern int exclude_start_page, exclude_end_page; -void write_lockbits_49fl00x(volatile uint8_t *bios, int size, +void write_lockbits_49fl00x(chipaddr_t bios, int size, unsigned char bits, int block_size) { int i, left = size; @@ -54,7 +54,7 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; /* unprotected */ write_lockbits_49fl00x(flash->virtual_registers, @@ -89,7 +89,7 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; /* unprotected */ write_lockbits_49fl00x(flash->virtual_registers, total_size, 0, Index: flashrom-chipaddr_t/en29f002a.c =================================================================== --- flashrom-chipaddr_t/en29f002a.c (Revision 514) +++ flashrom-chipaddr_t/en29f002a.c (Arbeitskopie) @@ -32,7 +32,7 @@ int probe_en29f512(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; uint8_t id1, id2; chip_writeb(0xAA, bios + 0x555); @@ -65,7 +65,7 @@ /* This does not seem to function properly for EN29F002NT. */ int probe_en29f002a(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; uint8_t id1, id2; chip_writeb(0xAA, bios + 0x555); @@ -95,8 +95,8 @@ { int i; int total_size = flash->total_size * 1024; - volatile uint8_t *bios = flash->virtual_memory; - volatile uint8_t *dst = bios; + chipaddr_t bios = flash->virtual_memory; + chipaddr_t dst = bios; // *bios = 0xF0; myusec_delay(10); Index: flashrom-chipaddr_t/jedec.c =================================================================== --- flashrom-chipaddr_t/jedec.c (Revision 514) +++ flashrom-chipaddr_t/jedec.c (Arbeitskopie) @@ -35,7 +35,7 @@ return (val ^ (val >> 1)) & 0x1; } -void toggle_ready_jedec(volatile uint8_t *dst) +void toggle_ready_jedec(chipaddr_t dst) { unsigned int i = 0; uint8_t tmp1, tmp2; @@ -51,7 +51,7 @@ } } -void data_polling_jedec(volatile uint8_t *dst, uint8_t data) +void data_polling_jedec(chipaddr_t dst, uint8_t data) { unsigned int i = 0; uint8_t tmp; @@ -66,7 +66,7 @@ } } -void unprotect_jedec(volatile uint8_t *bios) +void unprotect_jedec(chipaddr_t bios) { chip_writeb(0xAA, bios + 0x5555); chip_writeb(0x55, bios + 0x2AAA); @@ -78,7 +78,7 @@ usleep(200); } -void protect_jedec(volatile uint8_t *bios) +void protect_jedec(chipaddr_t bios) { chip_writeb(0xAA, bios + 0x5555); chip_writeb(0x55, bios + 0x2AAA); @@ -89,7 +89,7 @@ int probe_jedec(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; uint8_t id1, id2; uint32_t largeid1, largeid2; uint32_t flashcontent1, flashcontent2; @@ -161,7 +161,7 @@ return 0; } -int erase_sector_jedec(volatile uint8_t *bios, unsigned int page) +int erase_sector_jedec(chipaddr_t bios, unsigned int page) { /* Issue the Sector Erase command */ chip_writeb(0xAA, bios + 0x5555); @@ -184,7 +184,7 @@ return 0; } -int erase_block_jedec(volatile uint8_t *bios, unsigned int block) +int erase_block_jedec(chipaddr_t bios, unsigned int block) { /* Issue the Sector Erase command */ chip_writeb(0xAA, bios + 0x5555); @@ -209,7 +209,7 @@ int erase_chip_jedec(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; /* Issue the JEDEC Chip Erase command */ chip_writeb(0xAA, bios + 0x5555); @@ -231,11 +231,11 @@ return 0; } -int write_page_write_jedec(volatile uint8_t *bios, uint8_t *src, - volatile uint8_t *dst, int page_size) +int write_page_write_jedec(chipaddr_t bios, uint8_t *src, + chipaddr_t dst, int page_size) { int i, tried = 0, start_index = 0, ok; - volatile uint8_t *d = dst; + chipaddr_t d = dst; uint8_t *s = src; retry: @@ -272,14 +272,14 @@ goto retry; } if (!ok) { - fprintf(stderr, " page %d failed!\n", - (unsigned int)(d - bios) / page_size); + fprintf(stderr, " page 0x%lx failed!\n", + (d - bios) / page_size); } return !ok; } -int write_byte_program_jedec(volatile uint8_t *bios, uint8_t *src, - volatile uint8_t *dst) +int write_byte_program_jedec(chipaddr_t bios, uint8_t *src, + chipaddr_t dst) { int tried = 0, ok = 1; @@ -308,8 +308,8 @@ return !ok; } -int write_sector_jedec(volatile uint8_t *bios, uint8_t *src, - volatile uint8_t *dst, unsigned int page_size) +int write_sector_jedec(chipaddr_t bios, uint8_t *src, + chipaddr_t dst, unsigned int page_size) { int i; @@ -326,12 +326,12 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; erase_chip_jedec(flash); // dumb check if erase was successful. for (i = 0; i < total_size; i++) { - if (chip_readb(bios + i) != (uint8_t) 0xff) { + if (chip_readb(bios + i) != 0xff) { printf("ERASE FAILED @%d, val %02x!\n", i, chip_readb(bios + i)); return -1; } Index: flashrom-chipaddr_t/w29ee011.c =================================================================== --- flashrom-chipaddr_t/w29ee011.c (Revision 514) +++ flashrom-chipaddr_t/w29ee011.c (Arbeitskopie) @@ -23,7 +23,7 @@ int probe_w29ee011(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; uint8_t id1, id2; extern char *chip_to_probe; Index: flashrom-chipaddr_t/sst49lfxxxc.c =================================================================== --- flashrom-chipaddr_t/sst49lfxxxc.c (Revision 514) +++ flashrom-chipaddr_t/sst49lfxxxc.c (Arbeitskopie) @@ -41,7 +41,7 @@ #define STATUS_ESS (1 << 6) #define STATUS_WSMS (1 << 7) -static __inline__ int write_lockbits_49lfxxxc(volatile uint8_t *bios, int size, +static __inline__ int write_lockbits_49lfxxxc(chipaddr_t bios, int size, unsigned char bits) { int i, left = size; @@ -68,7 +68,7 @@ return 0; } -static __inline__ int erase_sector_49lfxxxc(volatile uint8_t *bios, +static __inline__ int erase_sector_49lfxxxc(chipaddr_t bios, unsigned long address) { unsigned char status; @@ -79,7 +79,7 @@ do { status = chip_readb(bios); if (status & (STATUS_ESS | STATUS_BPS)) { - printf("sector erase FAILED at address=0x%08lx status=0x%01x\n", (unsigned long)bios + address, status); + printf("sector erase FAILED at address=0x%08lx status=0x%01x\n", bios + address, status); chip_writeb(CLEAR_STATUS, bios); return (-1); } @@ -88,9 +88,9 @@ return 0; } -static __inline__ int write_sector_49lfxxxc(volatile uint8_t *bios, +static __inline__ int write_sector_49lfxxxc(chipaddr_t bios, uint8_t *src, - volatile uint8_t *dst, + chipaddr_t dst, unsigned int page_size) { int i; @@ -111,7 +111,7 @@ do { status = chip_readb(bios); if (status & (STATUS_ESS | STATUS_BPS)) { - printf("sector write FAILED at address=0x%08lx status=0x%01x\n", (unsigned long)dst, status); + printf("sector write FAILED at address=0x%08lx status=0x%01x\n", dst, status); chip_writeb(CLEAR_STATUS, bios); return (-1); } @@ -123,7 +123,7 @@ int probe_49lfxxxc(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; uint8_t id1, id2; @@ -147,8 +147,8 @@ int erase_49lfxxxc(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; - volatile uint8_t *registers = flash->virtual_registers; + chipaddr_t bios = flash->virtual_memory; + chipaddr_t registers = flash->virtual_registers; int i; unsigned int total_size = flash->total_size * 1024; @@ -167,7 +167,7 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; write_lockbits_49lfxxxc(flash->virtual_registers, total_size, 0); printf("Programming page: "); Index: flashrom-chipaddr_t/sharplhf00l04.c =================================================================== --- flashrom-chipaddr_t/sharplhf00l04.c (Revision 514) +++ flashrom-chipaddr_t/sharplhf00l04.c (Arbeitskopie) @@ -36,7 +36,7 @@ int probe_lhf00l04(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; uint8_t id1, id2; #if 0 @@ -71,7 +71,7 @@ return 1; } -uint8_t wait_lhf00l04(volatile uint8_t *bios) +uint8_t wait_lhf00l04(chipaddr_t bios) { uint8_t status; uint8_t id1, id2; @@ -101,17 +101,17 @@ int erase_lhf00l04_block(struct flashchip *flash, int offset) { - volatile uint8_t *bios = flash->virtual_memory + offset; - volatile uint8_t *wrprotect = flash->virtual_registers + offset + 2; + chipaddr_t bios = flash->virtual_memory + offset; + chipaddr_t wrprotect = flash->virtual_registers + offset + 2; uint8_t status; // clear status register chip_writeb(0x50, bios); - printf("Erase at %p\n", bios); + printf("Erase at 0x%lx\n", bios); status = wait_lhf00l04(flash->virtual_memory); print_lhf00l04_status(status); // clear write protect - printf("write protect is at %p\n", (wrprotect)); + printf("write protect is at 0x%lx\n", (wrprotect)); printf("write protect is 0x%x\n", chip_readb(wrprotect)); chip_writeb(0, wrprotect); printf("write protect is 0x%x\n", chip_readb(wrprotect)); @@ -142,8 +142,8 @@ return 0; } -void write_page_lhf00l04(volatile uint8_t *bios, uint8_t *src, - volatile uint8_t *dst, int page_size) +void write_page_lhf00l04(chipaddr_t bios, uint8_t *src, + chipaddr_t dst, int page_size) { int i; @@ -160,7 +160,7 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; erase_lhf00l04(flash); if (chip_readb(bios) != 0xff) { Index: flashrom-chipaddr_t/nic3com.c =================================================================== --- flashrom-chipaddr_t/nic3com.c (Revision 514) +++ flashrom-chipaddr_t/nic3com.c (Arbeitskopie) @@ -163,36 +163,36 @@ { } -void nic3com_chip_writeb(uint8_t val, volatile void *addr) +void nic3com_chip_writeb(uint8_t val, chipaddr_t addr) { - OUTL((uint32_t)(intptr_t)addr, io_base_addr + BIOS_ROM_ADDR); + OUTL((uint32_t)addr, io_base_addr + BIOS_ROM_ADDR); OUTB(val, io_base_addr + BIOS_ROM_DATA); } -void nic3com_chip_writew(uint16_t val, volatile void *addr) +void nic3com_chip_writew(uint16_t val, chipaddr_t addr) { } -void nic3com_chip_writel(uint32_t val, volatile void *addr) +void nic3com_chip_writel(uint32_t val, chipaddr_t addr) { } -uint8_t nic3com_chip_readb(const volatile void *addr) +uint8_t nic3com_chip_readb(const chipaddr_t addr) { uint8_t val; - OUTL((uint32_t)(intptr_t)addr, io_base_addr + BIOS_ROM_ADDR); + OUTL((uint32_t)addr, io_base_addr + BIOS_ROM_ADDR); val = INB(io_base_addr + BIOS_ROM_DATA); return val; } -uint16_t nic3com_chip_readw(const volatile void *addr) +uint16_t nic3com_chip_readw(const chipaddr_t addr) { return 0xffff; } -uint32_t nic3com_chip_readl(const volatile void *addr) +uint32_t nic3com_chip_readl(const chipaddr_t addr) { return 0xffffffff; } Index: flashrom-chipaddr_t/w39v040c.c =================================================================== --- flashrom-chipaddr_t/w39v040c.c (Revision 514) +++ flashrom-chipaddr_t/w39v040c.c (Arbeitskopie) @@ -23,7 +23,7 @@ int probe_w39v040c(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; uint8_t id1, id2, lock; chip_writeb(0xAA, bios + 0x5555); @@ -61,7 +61,7 @@ { int i; unsigned int total_size = flash->total_size * 1024; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; for (i = 0; i < total_size; i += flash->page_size) erase_sector_jedec(flash->virtual_memory, i); @@ -80,7 +80,7 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; if (flash->erase(flash)) return -1; Index: flashrom-chipaddr_t/m29f002.c =================================================================== --- flashrom-chipaddr_t/m29f002.c (Revision 514) +++ flashrom-chipaddr_t/m29f002.c (Arbeitskopie) @@ -22,7 +22,7 @@ int erase_m29f002(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; chip_writeb(0xaa, bios + 0x555); chip_writeb(0x55, bios + 0xaaa); chip_writeb(0x80, bios + 0x555); @@ -34,8 +34,8 @@ return 0; } -static void rewrite_block(volatile uint8_t *bios, uint8_t *src, - volatile uint8_t *dst, int size) +static void rewrite_block(chipaddr_t bios, uint8_t *src, + chipaddr_t dst, int size) { /* erase */ chip_writeb(0xaa, bios + 0x555); @@ -59,7 +59,7 @@ } } -static void do_block(volatile uint8_t *bios, uint8_t *src, int i, +static void do_block(chipaddr_t bios, uint8_t *src, int i, unsigned long start, int size) { printf("%d at address: 0x%08lx", i, start); @@ -70,7 +70,7 @@ int write_m29f002t(struct flashchip *flash, uint8_t *buf) { int i, page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; /* M29F002(N)T has 7 blocks. From bottom to top their sizes are: * 64k 64k 64k 32k 8k 8k 16k @@ -92,7 +92,7 @@ int write_m29f002b(struct flashchip *flash, uint8_t *buf) { int i = 0, page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; /* M29F002B has 7 blocks. From bottom to top their sizes are: * 16k 8k 8k 32k 64k 64k 64k Index: flashrom-chipaddr_t/dummyflasher.c =================================================================== --- flashrom-chipaddr_t/dummyflasher.c (Revision 514) +++ flashrom-chipaddr_t/dummyflasher.c (Arbeitskopie) @@ -54,36 +54,36 @@ __func__, (unsigned long)len, virt_addr); } -void dummy_chip_writeb(uint8_t val, volatile void *addr) +void dummy_chip_writeb(uint8_t val, chipaddr_t addr) { - printf_debug("%s: addr=%p, val=0x%02x\n", __func__, addr, val); + printf_debug("%s: addr=0x%lx, val=0x%02x\n", __func__, addr, val); } -void dummy_chip_writew(uint16_t val, volatile void *addr) +void dummy_chip_writew(uint16_t val, chipaddr_t addr) { - printf_debug("%s: addr=%p, val=0x%04x\n", __func__, addr, val); + printf_debug("%s: addr=0x%lx, val=0x%04x\n", __func__, addr, val); } -void dummy_chip_writel(uint32_t val, volatile void *addr) +void dummy_chip_writel(uint32_t val, chipaddr_t addr) { - printf_debug("%s: addr=%p, val=0x%08x\n", __func__, addr, val); + printf_debug("%s: addr=0x%lx, val=0x%08x\n", __func__, addr, val); } -uint8_t dummy_chip_readb(const volatile void *addr) +uint8_t dummy_chip_readb(const chipaddr_t addr) { - printf_debug("%s: addr=%p, returning 0xff\n", __func__, addr); + printf_debug("%s: addr=0x%lx, returning 0xff\n", __func__, addr); return 0xff; } -uint16_t dummy_chip_readw(const volatile void *addr) +uint16_t dummy_chip_readw(const chipaddr_t addr) { - printf_debug("%s: addr=%p, returning 0xffff\n", __func__, addr); + printf_debug("%s: addr=0x%lx, returning 0xffff\n", __func__, addr); return 0xffff; } -uint32_t dummy_chip_readl(const volatile void *addr) +uint32_t dummy_chip_readl(const chipaddr_t addr) { - printf_debug("%s: addr=%p, returning 0xffffffff\n", __func__, addr); + printf_debug("%s: addr=0x%lx, returning 0xffffffff\n", __func__, addr); return 0xffffffff; } Index: flashrom-chipaddr_t/w49f002u.c =================================================================== --- flashrom-chipaddr_t/w49f002u.c (Revision 514) +++ flashrom-chipaddr_t/w49f002u.c (Arbeitskopie) @@ -26,7 +26,7 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; erase_chip_jedec(flash); Index: flashrom-chipaddr_t/sst28sf040.c =================================================================== --- flashrom-chipaddr_t/sst28sf040.c (Revision 514) +++ flashrom-chipaddr_t/sst28sf040.c (Arbeitskopie) @@ -30,7 +30,7 @@ #define RESET 0xFF #define READ_ID 0x90 -static __inline__ void protect_28sf040(volatile uint8_t *bios) +static __inline__ void protect_28sf040(chipaddr_t bios) { uint8_t tmp; @@ -43,7 +43,7 @@ tmp = chip_readb(bios + 0x040A); } -static __inline__ void unprotect_28sf040(volatile uint8_t *bios) +static __inline__ void unprotect_28sf040(chipaddr_t bios) { uint8_t tmp; @@ -56,7 +56,7 @@ tmp = chip_readb(bios + 0x041A); } -static __inline__ int erase_sector_28sf040(volatile uint8_t *bios, +static __inline__ int erase_sector_28sf040(chipaddr_t bios, unsigned long address) { chip_writeb(AUTO_PG_ERASE1, bios); @@ -68,9 +68,9 @@ return 0; } -static __inline__ int write_sector_28sf040(volatile uint8_t *bios, +static __inline__ int write_sector_28sf040(chipaddr_t bios, uint8_t *src, - volatile uint8_t *dst, + chipaddr_t dst, unsigned int page_size) { int i; @@ -95,7 +95,7 @@ int probe_28sf040(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; uint8_t id1, id2; chip_writeb(RESET, bios); @@ -119,7 +119,7 @@ int erase_28sf040(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; unprotect_28sf040(bios); chip_writeb(CHIP_ERASE, bios); @@ -137,7 +137,7 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; unprotect_28sf040(bios); Index: flashrom-chipaddr_t/stm50flw0x0x.c =================================================================== --- flashrom-chipaddr_t/stm50flw0x0x.c (Revision 514) +++ flashrom-chipaddr_t/stm50flw0x0x.c (Arbeitskopie) @@ -31,7 +31,7 @@ #include <stdint.h> #include "flash.h" -void protect_stm50flw0x0x(volatile uint8_t *bios) +void protect_stm50flw0x0x(chipaddr_t bios) { chip_writeb(0xAA, bios + 0x5555); chip_writeb(0x55, bios + 0x2AAA); @@ -42,7 +42,7 @@ int probe_stm50flw0x0x(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; uint8_t id1, id2; uint32_t largeid1, largeid2; @@ -91,7 +91,7 @@ return 1; } -static void wait_stm50flw0x0x(volatile uint8_t *bios) +static void wait_stm50flw0x0x(chipaddr_t bios) { uint8_t id1; // id2; @@ -120,7 +120,7 @@ */ int unlock_block_stm50flw0x0x(struct flashchip *flash, int offset) { - volatile uint8_t *wrprotect = flash->virtual_registers + 2; + chipaddr_t wrprotect = flash->virtual_registers + 2; const uint8_t unlock_sector = 0x00; int j; @@ -163,12 +163,12 @@ int erase_block_stm50flw0x0x(struct flashchip *flash, int offset) { - volatile uint8_t *bios = flash->virtual_memory + offset; + chipaddr_t bios = flash->virtual_memory + offset; int j; // clear status register chip_writeb(0x50, bios); - printf_debug("Erase at %p\n", bios); + printf_debug("Erase at 0x%lx\n", bios); // now start it chip_writeb(0x20, bios); chip_writeb(0xd0, bios); @@ -188,11 +188,11 @@ return 0; } -int write_page_stm50flw0x0x(volatile uint8_t *bios, uint8_t *src, - volatile uint8_t *dst, int page_size) +int write_page_stm50flw0x0x(chipaddr_t bios, uint8_t *src, + chipaddr_t dst, int page_size) { int i, rc = 0; - volatile uint8_t *d = dst; + chipaddr_t d = dst; uint8_t *s = src; /* transfer data from source to destination */ @@ -219,8 +219,8 @@ } if (rc) { - fprintf(stderr, " page %d failed!\n", - (unsigned int)(d - bios) / page_size); + fprintf(stderr, " page 0x%lx failed!\n", + (d - bios) / page_size); } return rc; @@ -234,7 +234,7 @@ int i, rc = 0; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; printf("Erasing page:\n"); for (i = 0; (i < total_size / page_size) && (rc == 0); i++) { @@ -256,7 +256,7 @@ int i, rc = 0; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; printf("Programming page: \n"); for (i = 0; (i < total_size / page_size) && (rc == 0); i++) { Index: flashrom-chipaddr_t/am29f040b.c =================================================================== --- flashrom-chipaddr_t/am29f040b.c (Revision 514) +++ flashrom-chipaddr_t/am29f040b.c (Arbeitskopie) @@ -22,7 +22,7 @@ #include <stdint.h> #include "flash.h" -static __inline__ int erase_sector_29f040b(volatile uint8_t *bios, +static __inline__ int erase_sector_29f040b(chipaddr_t bios, unsigned long address) { chip_writeb(0xAA, bios + 0x555); @@ -40,17 +40,16 @@ return 0; } -static __inline__ int write_sector_29f040b(volatile uint8_t *bios, +static __inline__ int write_sector_29f040b(chipaddr_t bios, uint8_t *src, - volatile uint8_t *dst, + chipaddr_t dst, unsigned int page_size) { int i; for (i = 0; i < page_size; i++) { if ((i & 0xfff) == 0xfff) - printf("0x%08lx", (unsigned long)dst - - (unsigned long)bios); + printf("0x%08lx", dst - bios); chip_writeb(0xAA, bios + 0x555); chip_writeb(0x55, bios + 0x2AA); @@ -69,7 +68,7 @@ int probe_29f040b(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; uint8_t id1, id2; chip_writeb(0xAA, bios + 0x555); @@ -92,7 +91,7 @@ int erase_29f040b(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; chip_writeb(0xAA, bios + 0x555); chip_writeb(0x55, bios + 0x2AA); @@ -112,7 +111,7 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; printf("Programming page "); for (i = 0; i < total_size / page_size; i++) { Index: flashrom-chipaddr_t/sst_fwhub.c =================================================================== --- flashrom-chipaddr_t/sst_fwhub.c (Revision 514) +++ flashrom-chipaddr_t/sst_fwhub.c (Arbeitskopie) @@ -37,7 +37,7 @@ int check_sst_fwhub_block_lock(struct flashchip *flash, int offset) { - volatile uint8_t *registers = flash->virtual_registers; + chipaddr_t registers = flash->virtual_registers; uint8_t blockstatus; blockstatus = chip_readb(registers + offset + 2); @@ -63,7 +63,7 @@ int clear_sst_fwhub_block_lock(struct flashchip *flash, int offset) { - volatile uint8_t *registers = flash->virtual_registers; + chipaddr_t registers = flash->virtual_registers; uint8_t blockstatus; blockstatus = check_sst_fwhub_block_lock(flash, offset); @@ -115,7 +115,7 @@ { int i; unsigned int total_size = flash->total_size * 1024; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; for (i = 0; i < total_size; i += flash->page_size) erase_sst_fwhub_block(flash, i); @@ -136,7 +136,7 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; uint8_t blockstatus; // FIXME: We want block wide erase instead of ironing the whole chip Index: flashrom-chipaddr_t/w39v080fa.c =================================================================== --- flashrom-chipaddr_t/w39v080fa.c (Revision 514) +++ flashrom-chipaddr_t/w39v080fa.c (Arbeitskopie) @@ -23,7 +23,7 @@ int probe_winbond_fwhub(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; uint8_t vid, did; /* Product Identification Entry */ @@ -54,7 +54,7 @@ static int unlock_block_winbond_fwhub(struct flashchip *flash, int offset) { - volatile uint8_t *wrprotect = flash->virtual_registers + offset + 2; + chipaddr_t wrprotect = flash->virtual_registers + offset + 2; uint8_t locking; printf_debug("Trying to unlock block @0x%08x = 0x%02x\n", offset, @@ -98,7 +98,7 @@ int unlock_winbond_fwhub(struct flashchip *flash) { int i, total_size = flash->total_size * 1024; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; uint8_t locking; /* Are there any hardware restrictions that we can't overcome? @@ -143,7 +143,7 @@ return 0; } -static int erase_sector_winbond_fwhub(volatile uint8_t *bios, +static int erase_sector_winbond_fwhub(chipaddr_t bios, unsigned int sector) { /* Remember: too much sleep can waste your day. */ @@ -168,7 +168,7 @@ int erase_winbond_fwhub(struct flashchip *flash) { int i, total_size = flash->total_size * 1024; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; unlock_winbond_fwhub(flash); @@ -193,7 +193,7 @@ { int i; int total_size = flash->total_size * 1024; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; if (erase_winbond_fwhub(flash)) return -1; Index: flashrom-chipaddr_t/flashrom.c =================================================================== --- flashrom-chipaddr_t/flashrom.c (Revision 514) +++ flashrom-chipaddr_t/flashrom.c (Arbeitskopie) @@ -84,7 +84,7 @@ { size_t size = flash->total_size * 1024; /* Flash registers live 4 MByte below the flash. */ - flash->virtual_registers = programmer_map_flash_region("flash chip registers", (0xFFFFFFFF - 0x400000 - size + 1), size); + flash->virtual_registers = (chipaddr_t)programmer_map_flash_region("flash chip registers", (0xFFFFFFFF - 0x400000 - size + 1), size); } int read_memmapped(struct flashchip *flash, uint8_t *buf) @@ -117,7 +117,7 @@ size = flash->total_size * 1024; base = flashbase ? flashbase : (0xffffffff - size + 1); - flash->virtual_memory = programmer_map_flash_region("flash chip", base, size); + flash->virtual_memory = (chipaddr_t)programmer_map_flash_region("flash chip", base, size); if (force) break; @@ -130,8 +130,7 @@ break; notfound: - /* The intermediate cast to unsigned long works around a gcc warning bug. */ - programmer_unmap_flash_region((void *)(unsigned long)flash->virtual_memory, size); + programmer_unmap_flash_region((void *)flash->virtual_memory, size); } if (!flash || !flash->name) Index: flashrom-chipaddr_t/internal.c =================================================================== --- flashrom-chipaddr_t/internal.c (Revision 514) +++ flashrom-chipaddr_t/internal.c (Arbeitskopie) @@ -138,32 +138,32 @@ return 0; } -void internal_chip_writeb(uint8_t val, volatile void *addr) +void internal_chip_writeb(uint8_t val, chipaddr_t addr) { *(volatile uint8_t *) addr = val; } -void internal_chip_writew(uint16_t val, volatile void *addr) +void internal_chip_writew(uint16_t val, chipaddr_t addr) { *(volatile uint16_t *) addr = val; } -void internal_chip_writel(uint32_t val, volatile void *addr) +void internal_chip_writel(uint32_t val, chipaddr_t addr) { *(volatile uint32_t *) addr = val; } -uint8_t internal_chip_readb(const volatile void *addr) +uint8_t internal_chip_readb(const chipaddr_t addr) { return *(volatile uint8_t *) addr; } -uint16_t internal_chip_readw(const volatile void *addr) +uint16_t internal_chip_readw(const chipaddr_t addr) { return *(volatile uint16_t *) addr; } -uint32_t internal_chip_readl(const volatile void *addr) +uint32_t internal_chip_readl(const chipaddr_t addr) { return *(volatile uint32_t *) addr; } Index: flashrom-chipaddr_t/82802ab.c =================================================================== --- flashrom-chipaddr_t/82802ab.c (Revision 514) +++ flashrom-chipaddr_t/82802ab.c (Arbeitskopie) @@ -45,7 +45,7 @@ int probe_82802ab(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; uint8_t id1, id2; #if 0 @@ -79,7 +79,7 @@ return 1; } -uint8_t wait_82802ab(volatile uint8_t *bios) +uint8_t wait_82802ab(chipaddr_t bios) { uint8_t status; uint8_t id1, id2; @@ -109,8 +109,8 @@ int erase_82802ab_block(struct flashchip *flash, int offset) { - volatile uint8_t *bios = flash->virtual_memory + offset; - volatile uint8_t *wrprotect = flash->virtual_registers + offset + 2; + chipaddr_t bios = flash->virtual_memory + offset; + chipaddr_t wrprotect = flash->virtual_registers + offset + 2; int j; uint8_t status; @@ -155,8 +155,8 @@ return 0; } -void write_page_82802ab(volatile uint8_t *bios, uint8_t *src, - volatile uint8_t *dst, int page_size) +void write_page_82802ab(chipaddr_t bios, uint8_t *src, + chipaddr_t dst, int page_size) { int i; @@ -173,7 +173,7 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; printf("Programming page: \n"); for (i = 0; i < total_size / page_size; i++) { Index: flashrom-chipaddr_t/mx29f002.c =================================================================== --- flashrom-chipaddr_t/mx29f002.c (Revision 514) +++ flashrom-chipaddr_t/mx29f002.c (Arbeitskopie) @@ -24,7 +24,7 @@ int probe_29f002(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; uint8_t id1, id2; chip_writeb(0xAA, bios + 0x5555); @@ -47,7 +47,7 @@ int erase_29f002(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; chip_writeb(0xF0, bios + 0x555); chip_writeb(0xAA, bios + 0x555); @@ -80,8 +80,8 @@ { int i; int total_size = flash->total_size * 1024; - volatile uint8_t *bios = flash->virtual_memory; - volatile uint8_t *dst = bios; + chipaddr_t bios = flash->virtual_memory; + chipaddr_t dst = bios; chip_writeb(0xF0, bios); myusec_delay(10); Index: flashrom-chipaddr_t/m29f400bt.c =================================================================== --- flashrom-chipaddr_t/m29f400bt.c (Revision 514) +++ flashrom-chipaddr_t/m29f400bt.c (Arbeitskopie) @@ -20,7 +20,7 @@ #include "flash.h" -void protect_m29f400bt(volatile uint8_t *bios) +void protect_m29f400bt(chipaddr_t bios) { chip_writeb(0xAA, bios + 0xAAA); chip_writeb(0x55, bios + 0x555); @@ -29,8 +29,8 @@ usleep(200); } -void write_page_m29f400bt(volatile uint8_t *bios, uint8_t *src, - volatile uint8_t *dst, int page_size) +void write_page_m29f400bt(chipaddr_t bios, uint8_t *src, + chipaddr_t dst, int page_size) { int i; @@ -41,12 +41,12 @@ /* transfer data from source to destination */ chip_writeb(*src, dst); - //*(volatile char *) (bios) = 0xF0; + //chip_writeb(0xF0, bios); //usleep(5); toggle_ready_jedec(dst); printf - ("Value in the flash at address %p = %#x, want %#x\n", - (uint8_t *) (dst - bios), chip_readb(dst), *src); + ("Value in the flash at address 0x%lx = %#x, want %#x\n", + (dst - bios), chip_readb(dst), *src); dst++; src++; } @@ -54,7 +54,7 @@ int probe_m29f400bt(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; uint8_t id1, id2; chip_writeb(0xAA, bios + 0xAAA); @@ -85,7 +85,7 @@ int erase_m29f400bt(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; chip_writeb(0xAA, bios + 0xAAA); chip_writeb(0x55, bios + 0x555); @@ -101,7 +101,7 @@ return 0; } -int block_erase_m29f400bt(volatile uint8_t *bios, volatile uint8_t *dst) +int block_erase_m29f400bt(chipaddr_t bios, chipaddr_t dst) { chip_writeb(0xAA, bios + 0xAAA); @@ -110,7 +110,7 @@ chip_writeb(0xAA, bios + 0xAAA); chip_writeb(0x55, bios + 0x555); - //*(volatile uint8_t *) (bios + 0xAAA) = 0x10; + //*(chipaddr_t ) (bios + 0xAAA) = 0x10; chip_writeb(0x30, dst); myusec_delay(10); @@ -124,7 +124,7 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; //erase_m29f400bt (flash); printf("Programming page:\n "); @@ -176,7 +176,7 @@ int write_coreboot_m29f400bt(struct flashchip *flash, uint8_t *buf) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; printf("Programming page:\n "); /********************************* Index: flashrom-chipaddr_t/sst49lf040.c =================================================================== --- flashrom-chipaddr_t/sst49lf040.c (Revision 514) +++ flashrom-chipaddr_t/sst49lf040.c (Arbeitskopie) @@ -26,7 +26,7 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; for (i = 0; i < total_size / page_size; i++) { /* Chip erase only works in parallel programming mode @@ -42,7 +42,7 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr_t bios = flash->virtual_memory; printf("Programming page: "); for (i = 0; i < total_size / page_size; i++) {

4 8

[flashrom] r519 - trunk
by svn＠coreboot.org 16 May '09

16 May '09

Author: hailfinger Date: 2009-05-16 23:22:56 +0200 (Sat, 16 May 2009) New Revision: 519 Modified: trunk/82802ab.c trunk/am29f040b.c trunk/dummyflasher.c trunk/en29f002a.c trunk/flash.h trunk/flashrom.c trunk/internal.c trunk/jedec.c trunk/m29f002.c trunk/m29f400bt.c trunk/mx29f002.c trunk/nic3com.c trunk/pm49fl00x.c trunk/sharplhf00l04.c trunk/sst28sf040.c trunk/sst49lf040.c trunk/sst49lfxxxc.c trunk/sst_fwhub.c trunk/stm50flw0x0x.c trunk/w29ee011.c trunk/w39v040c.c trunk/w39v080fa.c trunk/w49f002u.c Log: Use chipaddr instead of volatile uint8_t * because when we access chips in external flashers, they are not accessed via pointers at all. Benefits: This allows us to differentiate between volatile machine memory accesses and flash chip accesses. It also enforces usage of chip_{read,write}[bwl] to access flash chips, so nobody will unintentionally use pointers to access chips anymore. Some unneeded casts are removed as well. Grepping for chip operations and machine memory operations doesn't yield any false positives anymore. Compile tested on 32 bit and 64 bit Linux. 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/82802ab.c =================================================================== --- trunk/82802ab.c 2009-05-16 01:30:48 UTC (rev 518) +++ trunk/82802ab.c 2009-05-16 21:22:56 UTC (rev 519) @@ -45,7 +45,7 @@ int probe_82802ab(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; uint8_t id1, id2; #if 0 @@ -79,7 +79,7 @@ return 1; } -uint8_t wait_82802ab(volatile uint8_t *bios) +uint8_t wait_82802ab(chipaddr bios) { uint8_t status; uint8_t id1, id2; @@ -109,8 +109,8 @@ int erase_82802ab_block(struct flashchip *flash, int offset) { - volatile uint8_t *bios = flash->virtual_memory + offset; - volatile uint8_t *wrprotect = flash->virtual_registers + offset + 2; + chipaddr bios = flash->virtual_memory + offset; + chipaddr wrprotect = flash->virtual_registers + offset + 2; int j; uint8_t status; @@ -155,8 +155,8 @@ return 0; } -void write_page_82802ab(volatile uint8_t *bios, uint8_t *src, - volatile uint8_t *dst, int page_size) +void write_page_82802ab(chipaddr bios, uint8_t *src, + chipaddr dst, int page_size) { int i; @@ -173,7 +173,7 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; printf("Programming page: \n"); for (i = 0; i < total_size / page_size; i++) { Modified: trunk/am29f040b.c =================================================================== --- trunk/am29f040b.c 2009-05-16 01:30:48 UTC (rev 518) +++ trunk/am29f040b.c 2009-05-16 21:22:56 UTC (rev 519) @@ -22,7 +22,7 @@ #include <stdint.h> #include "flash.h" -static __inline__ int erase_sector_29f040b(volatile uint8_t *bios, +static __inline__ int erase_sector_29f040b(chipaddr bios, unsigned long address) { chip_writeb(0xAA, bios + 0x555); @@ -40,17 +40,16 @@ return 0; } -static __inline__ int write_sector_29f040b(volatile uint8_t *bios, +static __inline__ int write_sector_29f040b(chipaddr bios, uint8_t *src, - volatile uint8_t *dst, + chipaddr dst, unsigned int page_size) { int i; for (i = 0; i < page_size; i++) { if ((i & 0xfff) == 0xfff) - printf("0x%08lx", (unsigned long)dst - - (unsigned long)bios); + printf("0x%08lx", dst - bios); chip_writeb(0xAA, bios + 0x555); chip_writeb(0x55, bios + 0x2AA); @@ -69,7 +68,7 @@ int probe_29f040b(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; uint8_t id1, id2; chip_writeb(0xAA, bios + 0x555); @@ -92,7 +91,7 @@ int erase_29f040b(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; chip_writeb(0xAA, bios + 0x555); chip_writeb(0x55, bios + 0x2AA); @@ -112,7 +111,7 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; printf("Programming page "); for (i = 0; i < total_size / page_size; i++) { Modified: trunk/dummyflasher.c =================================================================== --- trunk/dummyflasher.c 2009-05-16 01:30:48 UTC (rev 518) +++ trunk/dummyflasher.c 2009-05-16 21:22:56 UTC (rev 519) @@ -54,36 +54,36 @@ __func__, (unsigned long)len, virt_addr); } -void dummy_chip_writeb(uint8_t val, volatile void *addr) +void dummy_chip_writeb(uint8_t val, chipaddr addr) { - printf_debug("%s: addr=%p, val=0x%02x\n", __func__, addr, val); + printf_debug("%s: addr=0x%lx, val=0x%02x\n", __func__, addr, val); } -void dummy_chip_writew(uint16_t val, volatile void *addr) +void dummy_chip_writew(uint16_t val, chipaddr addr) { - printf_debug("%s: addr=%p, val=0x%04x\n", __func__, addr, val); + printf_debug("%s: addr=0x%lx, val=0x%04x\n", __func__, addr, val); } -void dummy_chip_writel(uint32_t val, volatile void *addr) +void dummy_chip_writel(uint32_t val, chipaddr addr) { - printf_debug("%s: addr=%p, val=0x%08x\n", __func__, addr, val); + printf_debug("%s: addr=0x%lx, val=0x%08x\n", __func__, addr, val); } -uint8_t dummy_chip_readb(const volatile void *addr) +uint8_t dummy_chip_readb(const chipaddr addr) { - printf_debug("%s: addr=%p, returning 0xff\n", __func__, addr); + printf_debug("%s: addr=0x%lx, returning 0xff\n", __func__, addr); return 0xff; } -uint16_t dummy_chip_readw(const volatile void *addr) +uint16_t dummy_chip_readw(const chipaddr addr) { - printf_debug("%s: addr=%p, returning 0xffff\n", __func__, addr); + printf_debug("%s: addr=0x%lx, returning 0xffff\n", __func__, addr); return 0xffff; } -uint32_t dummy_chip_readl(const volatile void *addr) +uint32_t dummy_chip_readl(const chipaddr addr) { - printf_debug("%s: addr=%p, returning 0xffffffff\n", __func__, addr); + printf_debug("%s: addr=0x%lx, returning 0xffffffff\n", __func__, addr); return 0xffffffff; } Modified: trunk/en29f002a.c =================================================================== --- trunk/en29f002a.c 2009-05-16 01:30:48 UTC (rev 518) +++ trunk/en29f002a.c 2009-05-16 21:22:56 UTC (rev 519) @@ -32,7 +32,7 @@ int probe_en29f512(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; uint8_t id1, id2; chip_writeb(0xAA, bios + 0x555); @@ -65,7 +65,7 @@ /* This does not seem to function properly for EN29F002NT. */ int probe_en29f002a(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; uint8_t id1, id2; chip_writeb(0xAA, bios + 0x555); @@ -95,10 +95,10 @@ { int i; int total_size = flash->total_size * 1024; - volatile uint8_t *bios = flash->virtual_memory; - volatile uint8_t *dst = bios; + chipaddr bios = flash->virtual_memory; + chipaddr dst = bios; - // *bios = 0xF0; + //chip_writeb(0xF0, bios); myusec_delay(10); erase_chip_jedec(flash); Modified: trunk/flash.h =================================================================== --- trunk/flash.h 2009-05-16 01:30:48 UTC (rev 518) +++ trunk/flash.h 2009-05-16 21:22:56 UTC (rev 519) @@ -77,6 +77,8 @@ #endif #endif +typedef unsigned long chipaddr; + extern int programmer; #define PROGRAMMER_INTERNAL 0x00 #define PROGRAMMER_DUMMY 0x01 @@ -92,12 +94,12 @@ void * (*map_flash_region) (const char *descr, unsigned long phys_addr, size_t len); void (*unmap_flash_region) (void *virt_addr, size_t len); - void (*chip_writeb) (uint8_t val, volatile void *addr); - void (*chip_writew) (uint16_t val, volatile void *addr); - void (*chip_writel) (uint32_t val, volatile void *addr); - uint8_t (*chip_readb) (const volatile void *addr); - uint16_t (*chip_readw) (const volatile void *addr); - uint32_t (*chip_readl) (const volatile void *addr); + void (*chip_writeb) (uint8_t val, chipaddr addr); + void (*chip_writew) (uint16_t val, chipaddr addr); + void (*chip_writel) (uint32_t val, chipaddr addr); + uint8_t (*chip_readb) (const chipaddr addr); + uint16_t (*chip_readw) (const chipaddr addr); + uint32_t (*chip_readl) (const chipaddr addr); }; extern const struct programmer_entry programmer_table[]; @@ -122,32 +124,32 @@ programmer_table[programmer].unmap_flash_region(virt_addr, len); } -static inline void chip_writeb(uint8_t val, volatile void *addr) +static inline void chip_writeb(uint8_t val, chipaddr addr) { programmer_table[programmer].chip_writeb(val, addr); } -static inline void chip_writew(uint16_t val, volatile void *addr) +static inline void chip_writew(uint16_t val, chipaddr addr) { programmer_table[programmer].chip_writew(val, addr); } -static inline void chip_writel(uint32_t val, volatile void *addr) +static inline void chip_writel(uint32_t val, chipaddr addr) { programmer_table[programmer].chip_writel(val, addr); } -static inline uint8_t chip_readb(const volatile void *addr) +static inline uint8_t chip_readb(const chipaddr addr) { return programmer_table[programmer].chip_readb(addr); } -static inline uint16_t chip_readw(const volatile void *addr) +static inline uint16_t chip_readw(const chipaddr addr) { return programmer_table[programmer].chip_readw(addr); } -static inline uint32_t chip_readl(const volatile void *addr) +static inline uint32_t chip_readl(const chipaddr addr) { return programmer_table[programmer].chip_readl(addr); } @@ -180,8 +182,8 @@ int (*read) (struct flashchip *flash, uint8_t *buf); /* Some flash devices have an additional register space. */ - volatile uint8_t *virtual_memory; - volatile uint8_t *virtual_registers; + chipaddr virtual_memory; + chipaddr virtual_registers; }; #define TEST_UNTESTED 0 @@ -605,16 +607,16 @@ void get_io_perms(void); int internal_init(void); int internal_shutdown(void); -void internal_chip_writeb(uint8_t val, volatile void *addr); -void internal_chip_writew(uint16_t val, volatile void *addr); -void internal_chip_writel(uint32_t val, volatile void *addr); -uint8_t internal_chip_readb(const volatile void *addr); -uint16_t internal_chip_readw(const volatile void *addr); -uint32_t internal_chip_readl(const volatile void *addr); -void fallback_chip_writew(uint16_t val, volatile void *addr); -void fallback_chip_writel(uint32_t val, volatile void *addr); -uint16_t fallback_chip_readw(const volatile void *addr); -uint32_t fallback_chip_readl(const volatile void *addr); +void internal_chip_writeb(uint8_t val, chipaddr addr); +void internal_chip_writew(uint16_t val, chipaddr addr); +void internal_chip_writel(uint32_t val, chipaddr addr); +uint8_t internal_chip_readb(const chipaddr addr); +uint16_t internal_chip_readw(const chipaddr addr); +uint32_t internal_chip_readl(const chipaddr addr); +void fallback_chip_writew(uint16_t val, chipaddr addr); +void fallback_chip_writel(uint32_t val, chipaddr addr); +uint16_t fallback_chip_readw(const chipaddr addr); +uint32_t fallback_chip_readl(const chipaddr addr); #if defined(__FreeBSD__) || defined(__DragonFly__) extern int io_fd; #endif @@ -624,12 +626,12 @@ int dummy_shutdown(void); void *dummy_map(const char *descr, unsigned long phys_addr, size_t len); void dummy_unmap(void *virt_addr, size_t len); -void dummy_chip_writeb(uint8_t val, volatile void *addr); -void dummy_chip_writew(uint16_t val, volatile void *addr); -void dummy_chip_writel(uint32_t val, volatile void *addr); -uint8_t dummy_chip_readb(const volatile void *addr); -uint16_t dummy_chip_readw(const volatile void *addr); -uint32_t dummy_chip_readl(const volatile void *addr); +void dummy_chip_writeb(uint8_t val, chipaddr addr); +void dummy_chip_writew(uint16_t val, chipaddr addr); +void dummy_chip_writel(uint32_t val, chipaddr addr); +uint8_t dummy_chip_readb(const chipaddr addr); +uint16_t dummy_chip_readw(const chipaddr addr); +uint32_t dummy_chip_readl(const chipaddr addr); int dummy_spi_command(unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); @@ -638,8 +640,8 @@ int nic3com_shutdown(void); void *nic3com_map(const char *descr, unsigned long phys_addr, size_t len); void nic3com_unmap(void *virt_addr, size_t len); -void nic3com_chip_writeb(uint8_t val, volatile void *addr); -uint8_t nic3com_chip_readb(const volatile void *addr); +void nic3com_chip_writeb(uint8_t val, chipaddr addr); +uint8_t nic3com_chip_readb(const chipaddr addr); extern struct pcidev_status nics_3com[]; /* flashrom.c */ @@ -725,19 +727,19 @@ /* jedec.c */ uint8_t oddparity(uint8_t val); -void toggle_ready_jedec(volatile uint8_t *dst); -void data_polling_jedec(volatile uint8_t *dst, uint8_t data); -void unprotect_jedec(volatile uint8_t *bios); -void protect_jedec(volatile uint8_t *bios); -int write_byte_program_jedec(volatile uint8_t *bios, uint8_t *src, - volatile uint8_t *dst); +void toggle_ready_jedec(chipaddr dst); +void data_polling_jedec(chipaddr dst, uint8_t data); +void unprotect_jedec(chipaddr bios); +void protect_jedec(chipaddr bios); +int write_byte_program_jedec(chipaddr bios, uint8_t *src, + chipaddr dst); int probe_jedec(struct flashchip *flash); int erase_chip_jedec(struct flashchip *flash); int write_jedec(struct flashchip *flash, uint8_t *buf); -int erase_sector_jedec(volatile uint8_t *bios, unsigned int page); -int erase_block_jedec(volatile uint8_t *bios, unsigned int page); -int write_sector_jedec(volatile uint8_t *bios, uint8_t *src, - volatile uint8_t *dst, unsigned int page_size); +int erase_sector_jedec(chipaddr bios, unsigned int page); +int erase_block_jedec(chipaddr bios, unsigned int page); +int write_sector_jedec(chipaddr bios, uint8_t *src, + chipaddr dst, unsigned int page_size); /* m29f002.c */ int erase_m29f002(struct flashchip *flash); @@ -747,15 +749,15 @@ /* m29f400bt.c */ int probe_m29f400bt(struct flashchip *flash); int erase_m29f400bt(struct flashchip *flash); -int block_erase_m29f400bt(volatile uint8_t *bios, - volatile uint8_t *dst); +int block_erase_m29f400bt(chipaddr bios, + chipaddr dst); int write_m29f400bt(struct flashchip *flash, uint8_t *buf); int write_coreboot_m29f400bt(struct flashchip *flash, uint8_t *buf); -void toggle_ready_m29f400bt(volatile uint8_t *dst); -void data_polling_m29f400bt(volatile uint8_t *dst, uint8_t data); -void protect_m29f400bt(volatile uint8_t *bios); -void write_page_m29f400bt(volatile uint8_t *bios, uint8_t *src, - volatile uint8_t *dst, int page_size); +void toggle_ready_m29f400bt(chipaddr dst); +void data_polling_m29f400bt(chipaddr dst, uint8_t data); +void protect_m29f400bt(chipaddr bios); +void write_page_m29f400bt(chipaddr bios, uint8_t *src, + chipaddr dst, int page_size); /* mx29f002.c */ int probe_29f002(struct flashchip *flash); @@ -771,9 +773,9 @@ int probe_lhf00l04(struct flashchip *flash); int erase_lhf00l04(struct flashchip *flash); int write_lhf00l04(struct flashchip *flash, uint8_t *buf); -void toggle_ready_lhf00l04(volatile uint8_t *dst); -void data_polling_lhf00l04(volatile uint8_t *dst, uint8_t data); -void protect_lhf00l04(volatile uint8_t *bios); +void toggle_ready_lhf00l04(chipaddr dst); +void data_polling_lhf00l04(chipaddr dst, uint8_t data); +void protect_lhf00l04(chipaddr bios); /* sst28sf040.c */ int probe_28sf040(struct flashchip *flash); Modified: trunk/flashrom.c =================================================================== --- trunk/flashrom.c 2009-05-16 01:30:48 UTC (rev 518) +++ trunk/flashrom.c 2009-05-16 21:22:56 UTC (rev 519) @@ -83,7 +83,7 @@ { size_t size = flash->total_size * 1024; /* Flash registers live 4 MByte below the flash. */ - flash->virtual_registers = programmer_map_flash_region("flash chip registers", (0xFFFFFFFF - 0x400000 - size + 1), size); + flash->virtual_registers = (chipaddr)programmer_map_flash_region("flash chip registers", (0xFFFFFFFF - 0x400000 - size + 1), size); } int read_memmapped(struct flashchip *flash, uint8_t *buf) @@ -116,7 +116,7 @@ size = flash->total_size * 1024; base = flashbase ? flashbase : (0xffffffff - size + 1); - flash->virtual_memory = programmer_map_flash_region("flash chip", base, size); + flash->virtual_memory = (chipaddr)programmer_map_flash_region("flash chip", base, size); if (force) break; @@ -129,8 +129,7 @@ break; notfound: - /* The intermediate cast to unsigned long works around a gcc warning bug. */ - programmer_unmap_flash_region((void *)(unsigned long)flash->virtual_memory, size); + programmer_unmap_flash_region((void *)flash->virtual_memory, size); } if (!flash || !flash->name) Modified: trunk/internal.c =================================================================== --- trunk/internal.c 2009-05-16 01:30:48 UTC (rev 518) +++ trunk/internal.c 2009-05-16 21:22:56 UTC (rev 519) @@ -138,45 +138,45 @@ return 0; } -void internal_chip_writeb(uint8_t val, volatile void *addr) +void internal_chip_writeb(uint8_t val, chipaddr addr) { *(volatile uint8_t *) addr = val; } -void internal_chip_writew(uint16_t val, volatile void *addr) +void internal_chip_writew(uint16_t val, chipaddr addr) { *(volatile uint16_t *) addr = val; } -void internal_chip_writel(uint32_t val, volatile void *addr) +void internal_chip_writel(uint32_t val, chipaddr addr) { *(volatile uint32_t *) addr = val; } -uint8_t internal_chip_readb(const volatile void *addr) +uint8_t internal_chip_readb(const chipaddr addr) { return *(volatile uint8_t *) addr; } -uint16_t internal_chip_readw(const volatile void *addr) +uint16_t internal_chip_readw(const chipaddr addr) { return *(volatile uint16_t *) addr; } -uint32_t internal_chip_readl(const volatile void *addr) +uint32_t internal_chip_readl(const chipaddr addr) { return *(volatile uint32_t *) addr; } /* Little-endian fallback for drivers not supporting 16 bit accesses */ -void fallback_chip_writew(uint16_t val, volatile void *addr) +void fallback_chip_writew(uint16_t val, chipaddr addr) { chip_writeb(val & 0xff, addr); chip_writeb((val >> 8) & 0xff, addr + 1); } /* Little-endian fallback for drivers not supporting 16 bit accesses */ -uint16_t fallback_chip_readw(const volatile void *addr) +uint16_t fallback_chip_readw(const chipaddr addr) { uint16_t val; val = chip_readb(addr); @@ -185,14 +185,14 @@ } /* Little-endian fallback for drivers not supporting 32 bit accesses */ -void fallback_chip_writel(uint32_t val, volatile void *addr) +void fallback_chip_writel(uint32_t val, chipaddr addr) { chip_writew(val & 0xffff, addr); chip_writew((val >> 16) & 0xffff, addr + 2); } /* Little-endian fallback for drivers not supporting 32 bit accesses */ -uint32_t fallback_chip_readl(const volatile void *addr) +uint32_t fallback_chip_readl(const chipaddr addr) { uint32_t val; val = chip_readw(addr); Modified: trunk/jedec.c =================================================================== --- trunk/jedec.c 2009-05-16 01:30:48 UTC (rev 518) +++ trunk/jedec.c 2009-05-16 21:22:56 UTC (rev 519) @@ -35,7 +35,7 @@ return (val ^ (val >> 1)) & 0x1; } -void toggle_ready_jedec(volatile uint8_t *dst) +void toggle_ready_jedec(chipaddr dst) { unsigned int i = 0; uint8_t tmp1, tmp2; @@ -51,7 +51,7 @@ } } -void data_polling_jedec(volatile uint8_t *dst, uint8_t data) +void data_polling_jedec(chipaddr dst, uint8_t data) { unsigned int i = 0; uint8_t tmp; @@ -66,7 +66,7 @@ } } -void unprotect_jedec(volatile uint8_t *bios) +void unprotect_jedec(chipaddr bios) { chip_writeb(0xAA, bios + 0x5555); chip_writeb(0x55, bios + 0x2AAA); @@ -78,7 +78,7 @@ usleep(200); } -void protect_jedec(volatile uint8_t *bios) +void protect_jedec(chipaddr bios) { chip_writeb(0xAA, bios + 0x5555); chip_writeb(0x55, bios + 0x2AAA); @@ -89,7 +89,7 @@ int probe_jedec(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; uint8_t id1, id2; uint32_t largeid1, largeid2; uint32_t flashcontent1, flashcontent2; @@ -161,7 +161,7 @@ return 0; } -int erase_sector_jedec(volatile uint8_t *bios, unsigned int page) +int erase_sector_jedec(chipaddr bios, unsigned int page) { /* Issue the Sector Erase command */ chip_writeb(0xAA, bios + 0x5555); @@ -184,7 +184,7 @@ return 0; } -int erase_block_jedec(volatile uint8_t *bios, unsigned int block) +int erase_block_jedec(chipaddr bios, unsigned int block) { /* Issue the Sector Erase command */ chip_writeb(0xAA, bios + 0x5555); @@ -209,7 +209,7 @@ int erase_chip_jedec(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; /* Issue the JEDEC Chip Erase command */ chip_writeb(0xAA, bios + 0x5555); @@ -231,11 +231,11 @@ return 0; } -int write_page_write_jedec(volatile uint8_t *bios, uint8_t *src, - volatile uint8_t *dst, int page_size) +int write_page_write_jedec(chipaddr bios, uint8_t *src, + chipaddr dst, int page_size) { int i, tried = 0, start_index = 0, ok; - volatile uint8_t *d = dst; + chipaddr d = dst; uint8_t *s = src; retry: @@ -272,14 +272,14 @@ goto retry; } if (!ok) { - fprintf(stderr, " page %d failed!\n", - (unsigned int)(d - bios) / page_size); + fprintf(stderr, " page 0x%lx failed!\n", + (d - bios) / page_size); } return !ok; } -int write_byte_program_jedec(volatile uint8_t *bios, uint8_t *src, - volatile uint8_t *dst) +int write_byte_program_jedec(chipaddr bios, uint8_t *src, + chipaddr dst) { int tried = 0, ok = 1; @@ -308,8 +308,8 @@ return !ok; } -int write_sector_jedec(volatile uint8_t *bios, uint8_t *src, - volatile uint8_t *dst, unsigned int page_size) +int write_sector_jedec(chipaddr bios, uint8_t *src, + chipaddr dst, unsigned int page_size) { int i; @@ -326,12 +326,12 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; erase_chip_jedec(flash); // dumb check if erase was successful. for (i = 0; i < total_size; i++) { - if (chip_readb(bios + i) != (uint8_t) 0xff) { + if (chip_readb(bios + i) != 0xff) { printf("ERASE FAILED @%d, val %02x!\n", i, chip_readb(bios + i)); return -1; } Modified: trunk/m29f002.c =================================================================== --- trunk/m29f002.c 2009-05-16 01:30:48 UTC (rev 518) +++ trunk/m29f002.c 2009-05-16 21:22:56 UTC (rev 519) @@ -22,7 +22,7 @@ int erase_m29f002(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; chip_writeb(0xaa, bios + 0x555); chip_writeb(0x55, bios + 0xaaa); chip_writeb(0x80, bios + 0x555); @@ -34,8 +34,8 @@ return 0; } -static void rewrite_block(volatile uint8_t *bios, uint8_t *src, - volatile uint8_t *dst, int size) +static void rewrite_block(chipaddr bios, uint8_t *src, + chipaddr dst, int size) { /* erase */ chip_writeb(0xaa, bios + 0x555); @@ -59,7 +59,7 @@ } } -static void do_block(volatile uint8_t *bios, uint8_t *src, int i, +static void do_block(chipaddr bios, uint8_t *src, int i, unsigned long start, int size) { printf("%d at address: 0x%08lx", i, start); @@ -70,7 +70,7 @@ int write_m29f002t(struct flashchip *flash, uint8_t *buf) { int i, page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; /* M29F002(N)T has 7 blocks. From bottom to top their sizes are: * 64k 64k 64k 32k 8k 8k 16k @@ -92,7 +92,7 @@ int write_m29f002b(struct flashchip *flash, uint8_t *buf) { int i = 0, page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; /* M29F002B has 7 blocks. From bottom to top their sizes are: * 16k 8k 8k 32k 64k 64k 64k Modified: trunk/m29f400bt.c =================================================================== --- trunk/m29f400bt.c 2009-05-16 01:30:48 UTC (rev 518) +++ trunk/m29f400bt.c 2009-05-16 21:22:56 UTC (rev 519) @@ -20,7 +20,7 @@ #include "flash.h" -void protect_m29f400bt(volatile uint8_t *bios) +void protect_m29f400bt(chipaddr bios) { chip_writeb(0xAA, bios + 0xAAA); chip_writeb(0x55, bios + 0x555); @@ -29,8 +29,8 @@ usleep(200); } -void write_page_m29f400bt(volatile uint8_t *bios, uint8_t *src, - volatile uint8_t *dst, int page_size) +void write_page_m29f400bt(chipaddr bios, uint8_t *src, + chipaddr dst, int page_size) { int i; @@ -41,12 +41,12 @@ /* transfer data from source to destination */ chip_writeb(*src, dst); - //*(volatile char *) (bios) = 0xF0; + //chip_writeb(0xF0, bios); //usleep(5); toggle_ready_jedec(dst); printf - ("Value in the flash at address %p = %#x, want %#x\n", - (uint8_t *) (dst - bios), chip_readb(dst), *src); + ("Value in the flash at address 0x%lx = %#x, want %#x\n", + (dst - bios), chip_readb(dst), *src); dst++; src++; } @@ -54,7 +54,7 @@ int probe_m29f400bt(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; uint8_t id1, id2; chip_writeb(0xAA, bios + 0xAAA); @@ -85,7 +85,7 @@ int erase_m29f400bt(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; chip_writeb(0xAA, bios + 0xAAA); chip_writeb(0x55, bios + 0x555); @@ -101,7 +101,7 @@ return 0; } -int block_erase_m29f400bt(volatile uint8_t *bios, volatile uint8_t *dst) +int block_erase_m29f400bt(chipaddr bios, chipaddr dst) { chip_writeb(0xAA, bios + 0xAAA); @@ -110,7 +110,7 @@ chip_writeb(0xAA, bios + 0xAAA); chip_writeb(0x55, bios + 0x555); - //*(volatile uint8_t *) (bios + 0xAAA) = 0x10; + //chip_writeb(0x10, bios + 0xAAA); chip_writeb(0x30, dst); myusec_delay(10); @@ -124,7 +124,7 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; //erase_m29f400bt (flash); printf("Programming page:\n "); @@ -176,7 +176,7 @@ int write_coreboot_m29f400bt(struct flashchip *flash, uint8_t *buf) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; printf("Programming page:\n "); /********************************* Modified: trunk/mx29f002.c =================================================================== --- trunk/mx29f002.c 2009-05-16 01:30:48 UTC (rev 518) +++ trunk/mx29f002.c 2009-05-16 21:22:56 UTC (rev 519) @@ -24,7 +24,7 @@ int probe_29f002(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; uint8_t id1, id2; chip_writeb(0xAA, bios + 0x5555); @@ -47,7 +47,7 @@ int erase_29f002(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; chip_writeb(0xF0, bios + 0x555); chip_writeb(0xAA, bios + 0x555); @@ -80,8 +80,8 @@ { int i; int total_size = flash->total_size * 1024; - volatile uint8_t *bios = flash->virtual_memory; - volatile uint8_t *dst = bios; + chipaddr bios = flash->virtual_memory; + chipaddr dst = bios; chip_writeb(0xF0, bios); myusec_delay(10); Modified: trunk/nic3com.c =================================================================== --- trunk/nic3com.c 2009-05-16 01:30:48 UTC (rev 518) +++ trunk/nic3com.c 2009-05-16 21:22:56 UTC (rev 519) @@ -87,17 +87,17 @@ { } -void nic3com_chip_writeb(uint8_t val, volatile void *addr) +void nic3com_chip_writeb(uint8_t val, chipaddr addr) { - OUTL((uint32_t)(intptr_t)addr, io_base_addr + BIOS_ROM_ADDR); + OUTL((uint32_t)addr, io_base_addr + BIOS_ROM_ADDR); OUTB(val, io_base_addr + BIOS_ROM_DATA); } -uint8_t nic3com_chip_readb(const volatile void *addr) +uint8_t nic3com_chip_readb(const chipaddr addr) { uint8_t val; - OUTL((uint32_t)(intptr_t)addr, io_base_addr + BIOS_ROM_ADDR); + OUTL((uint32_t)addr, io_base_addr + BIOS_ROM_ADDR); val = INB(io_base_addr + BIOS_ROM_DATA); return val; Modified: trunk/pm49fl00x.c =================================================================== --- trunk/pm49fl00x.c 2009-05-16 01:30:48 UTC (rev 518) +++ trunk/pm49fl00x.c 2009-05-16 21:22:56 UTC (rev 519) @@ -25,7 +25,7 @@ extern int exclude_start_page, exclude_end_page; -void write_lockbits_49fl00x(volatile uint8_t *bios, int size, +void write_lockbits_49fl00x(chipaddr bios, int size, unsigned char bits, int block_size) { int i, left = size; @@ -54,7 +54,7 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; /* unprotected */ write_lockbits_49fl00x(flash->virtual_registers, @@ -89,7 +89,7 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; /* unprotected */ write_lockbits_49fl00x(flash->virtual_registers, total_size, 0, Modified: trunk/sharplhf00l04.c =================================================================== --- trunk/sharplhf00l04.c 2009-05-16 01:30:48 UTC (rev 518) +++ trunk/sharplhf00l04.c 2009-05-16 21:22:56 UTC (rev 519) @@ -36,7 +36,7 @@ int probe_lhf00l04(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; uint8_t id1, id2; #if 0 @@ -71,7 +71,7 @@ return 1; } -uint8_t wait_lhf00l04(volatile uint8_t *bios) +uint8_t wait_lhf00l04(chipaddr bios) { uint8_t status; uint8_t id1, id2; @@ -101,17 +101,17 @@ int erase_lhf00l04_block(struct flashchip *flash, int offset) { - volatile uint8_t *bios = flash->virtual_memory + offset; - volatile uint8_t *wrprotect = flash->virtual_registers + offset + 2; + chipaddr bios = flash->virtual_memory + offset; + chipaddr wrprotect = flash->virtual_registers + offset + 2; uint8_t status; // clear status register chip_writeb(0x50, bios); - printf("Erase at %p\n", bios); + printf("Erase at 0x%lx\n", bios); status = wait_lhf00l04(flash->virtual_memory); print_lhf00l04_status(status); // clear write protect - printf("write protect is at %p\n", (wrprotect)); + printf("write protect is at 0x%lx\n", (wrprotect)); printf("write protect is 0x%x\n", chip_readb(wrprotect)); chip_writeb(0, wrprotect); printf("write protect is 0x%x\n", chip_readb(wrprotect)); @@ -142,8 +142,8 @@ return 0; } -void write_page_lhf00l04(volatile uint8_t *bios, uint8_t *src, - volatile uint8_t *dst, int page_size) +void write_page_lhf00l04(chipaddr bios, uint8_t *src, + chipaddr dst, int page_size) { int i; @@ -160,7 +160,7 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; erase_lhf00l04(flash); if (chip_readb(bios) != 0xff) { Modified: trunk/sst28sf040.c =================================================================== --- trunk/sst28sf040.c 2009-05-16 01:30:48 UTC (rev 518) +++ trunk/sst28sf040.c 2009-05-16 21:22:56 UTC (rev 519) @@ -30,7 +30,7 @@ #define RESET 0xFF #define READ_ID 0x90 -static __inline__ void protect_28sf040(volatile uint8_t *bios) +static __inline__ void protect_28sf040(chipaddr bios) { uint8_t tmp; @@ -43,7 +43,7 @@ tmp = chip_readb(bios + 0x040A); } -static __inline__ void unprotect_28sf040(volatile uint8_t *bios) +static __inline__ void unprotect_28sf040(chipaddr bios) { uint8_t tmp; @@ -56,7 +56,7 @@ tmp = chip_readb(bios + 0x041A); } -static __inline__ int erase_sector_28sf040(volatile uint8_t *bios, +static __inline__ int erase_sector_28sf040(chipaddr bios, unsigned long address) { chip_writeb(AUTO_PG_ERASE1, bios); @@ -68,9 +68,9 @@ return 0; } -static __inline__ int write_sector_28sf040(volatile uint8_t *bios, +static __inline__ int write_sector_28sf040(chipaddr bios, uint8_t *src, - volatile uint8_t *dst, + chipaddr dst, unsigned int page_size) { int i; @@ -95,7 +95,7 @@ int probe_28sf040(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; uint8_t id1, id2; chip_writeb(RESET, bios); @@ -119,7 +119,7 @@ int erase_28sf040(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; unprotect_28sf040(bios); chip_writeb(CHIP_ERASE, bios); @@ -137,7 +137,7 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; unprotect_28sf040(bios); Modified: trunk/sst49lf040.c =================================================================== --- trunk/sst49lf040.c 2009-05-16 01:30:48 UTC (rev 518) +++ trunk/sst49lf040.c 2009-05-16 21:22:56 UTC (rev 519) @@ -26,7 +26,7 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; for (i = 0; i < total_size / page_size; i++) { /* Chip erase only works in parallel programming mode @@ -42,7 +42,7 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; printf("Programming page: "); for (i = 0; i < total_size / page_size; i++) { Modified: trunk/sst49lfxxxc.c =================================================================== --- trunk/sst49lfxxxc.c 2009-05-16 01:30:48 UTC (rev 518) +++ trunk/sst49lfxxxc.c 2009-05-16 21:22:56 UTC (rev 519) @@ -41,7 +41,7 @@ #define STATUS_ESS (1 << 6) #define STATUS_WSMS (1 << 7) -static __inline__ int write_lockbits_49lfxxxc(volatile uint8_t *bios, int size, +static __inline__ int write_lockbits_49lfxxxc(chipaddr bios, int size, unsigned char bits) { int i, left = size; @@ -68,7 +68,7 @@ return 0; } -static __inline__ int erase_sector_49lfxxxc(volatile uint8_t *bios, +static __inline__ int erase_sector_49lfxxxc(chipaddr bios, unsigned long address) { unsigned char status; @@ -79,7 +79,7 @@ do { status = chip_readb(bios); if (status & (STATUS_ESS | STATUS_BPS)) { - printf("sector erase FAILED at address=0x%08lx status=0x%01x\n", (unsigned long)bios + address, status); + printf("sector erase FAILED at address=0x%08lx status=0x%01x\n", bios + address, status); chip_writeb(CLEAR_STATUS, bios); return (-1); } @@ -88,9 +88,9 @@ return 0; } -static __inline__ int write_sector_49lfxxxc(volatile uint8_t *bios, +static __inline__ int write_sector_49lfxxxc(chipaddr bios, uint8_t *src, - volatile uint8_t *dst, + chipaddr dst, unsigned int page_size) { int i; @@ -111,7 +111,7 @@ do { status = chip_readb(bios); if (status & (STATUS_ESS | STATUS_BPS)) { - printf("sector write FAILED at address=0x%08lx status=0x%01x\n", (unsigned long)dst, status); + printf("sector write FAILED at address=0x%08lx status=0x%01x\n", dst, status); chip_writeb(CLEAR_STATUS, bios); return (-1); } @@ -123,7 +123,7 @@ int probe_49lfxxxc(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; uint8_t id1, id2; @@ -147,8 +147,8 @@ int erase_49lfxxxc(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; - volatile uint8_t *registers = flash->virtual_registers; + chipaddr bios = flash->virtual_memory; + chipaddr registers = flash->virtual_registers; int i; unsigned int total_size = flash->total_size * 1024; @@ -167,7 +167,7 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; write_lockbits_49lfxxxc(flash->virtual_registers, total_size, 0); printf("Programming page: "); Modified: trunk/sst_fwhub.c =================================================================== --- trunk/sst_fwhub.c 2009-05-16 01:30:48 UTC (rev 518) +++ trunk/sst_fwhub.c 2009-05-16 21:22:56 UTC (rev 519) @@ -37,7 +37,7 @@ int check_sst_fwhub_block_lock(struct flashchip *flash, int offset) { - volatile uint8_t *registers = flash->virtual_registers; + chipaddr registers = flash->virtual_registers; uint8_t blockstatus; blockstatus = chip_readb(registers + offset + 2); @@ -63,7 +63,7 @@ int clear_sst_fwhub_block_lock(struct flashchip *flash, int offset) { - volatile uint8_t *registers = flash->virtual_registers; + chipaddr registers = flash->virtual_registers; uint8_t blockstatus; blockstatus = check_sst_fwhub_block_lock(flash, offset); @@ -115,7 +115,7 @@ { int i; unsigned int total_size = flash->total_size * 1024; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; for (i = 0; i < total_size; i += flash->page_size) erase_sst_fwhub_block(flash, i); @@ -136,7 +136,7 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; uint8_t blockstatus; // FIXME: We want block wide erase instead of ironing the whole chip Modified: trunk/stm50flw0x0x.c =================================================================== --- trunk/stm50flw0x0x.c 2009-05-16 01:30:48 UTC (rev 518) +++ trunk/stm50flw0x0x.c 2009-05-16 21:22:56 UTC (rev 519) @@ -31,7 +31,7 @@ #include <stdint.h> #include "flash.h" -void protect_stm50flw0x0x(volatile uint8_t *bios) +void protect_stm50flw0x0x(chipaddr bios) { chip_writeb(0xAA, bios + 0x5555); chip_writeb(0x55, bios + 0x2AAA); @@ -42,7 +42,7 @@ int probe_stm50flw0x0x(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; uint8_t id1, id2; uint32_t largeid1, largeid2; @@ -91,7 +91,7 @@ return 1; } -static void wait_stm50flw0x0x(volatile uint8_t *bios) +static void wait_stm50flw0x0x(chipaddr bios) { uint8_t id1; // id2; @@ -120,7 +120,7 @@ */ int unlock_block_stm50flw0x0x(struct flashchip *flash, int offset) { - volatile uint8_t *wrprotect = flash->virtual_registers + 2; + chipaddr wrprotect = flash->virtual_registers + 2; const uint8_t unlock_sector = 0x00; int j; @@ -163,12 +163,12 @@ int erase_block_stm50flw0x0x(struct flashchip *flash, int offset) { - volatile uint8_t *bios = flash->virtual_memory + offset; + chipaddr bios = flash->virtual_memory + offset; int j; // clear status register chip_writeb(0x50, bios); - printf_debug("Erase at %p\n", bios); + printf_debug("Erase at 0x%lx\n", bios); // now start it chip_writeb(0x20, bios); chip_writeb(0xd0, bios); @@ -188,11 +188,11 @@ return 0; } -int write_page_stm50flw0x0x(volatile uint8_t *bios, uint8_t *src, - volatile uint8_t *dst, int page_size) +int write_page_stm50flw0x0x(chipaddr bios, uint8_t *src, + chipaddr dst, int page_size) { int i, rc = 0; - volatile uint8_t *d = dst; + chipaddr d = dst; uint8_t *s = src; /* transfer data from source to destination */ @@ -219,8 +219,8 @@ } if (rc) { - fprintf(stderr, " page %d failed!\n", - (unsigned int)(d - bios) / page_size); + fprintf(stderr, " page 0x%lx failed!\n", + (d - bios) / page_size); } return rc; @@ -234,7 +234,7 @@ int i, rc = 0; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; printf("Erasing page:\n"); for (i = 0; (i < total_size / page_size) && (rc == 0); i++) { @@ -256,7 +256,7 @@ int i, rc = 0; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; printf("Programming page: \n"); for (i = 0; (i < total_size / page_size) && (rc == 0); i++) { Modified: trunk/w29ee011.c =================================================================== --- trunk/w29ee011.c 2009-05-16 01:30:48 UTC (rev 518) +++ trunk/w29ee011.c 2009-05-16 21:22:56 UTC (rev 519) @@ -23,7 +23,7 @@ int probe_w29ee011(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; uint8_t id1, id2; extern char *chip_to_probe; Modified: trunk/w39v040c.c =================================================================== --- trunk/w39v040c.c 2009-05-16 01:30:48 UTC (rev 518) +++ trunk/w39v040c.c 2009-05-16 21:22:56 UTC (rev 519) @@ -23,7 +23,7 @@ int probe_w39v040c(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; uint8_t id1, id2, lock; chip_writeb(0xAA, bios + 0x5555); @@ -61,7 +61,7 @@ { int i; unsigned int total_size = flash->total_size * 1024; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; for (i = 0; i < total_size; i += flash->page_size) erase_sector_jedec(flash->virtual_memory, i); @@ -80,7 +80,7 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; if (flash->erase(flash)) return -1; Modified: trunk/w39v080fa.c =================================================================== --- trunk/w39v080fa.c 2009-05-16 01:30:48 UTC (rev 518) +++ trunk/w39v080fa.c 2009-05-16 21:22:56 UTC (rev 519) @@ -23,7 +23,7 @@ int probe_winbond_fwhub(struct flashchip *flash) { - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; uint8_t vid, did; /* Product Identification Entry */ @@ -54,7 +54,7 @@ static int unlock_block_winbond_fwhub(struct flashchip *flash, int offset) { - volatile uint8_t *wrprotect = flash->virtual_registers + offset + 2; + chipaddr wrprotect = flash->virtual_registers + offset + 2; uint8_t locking; printf_debug("Trying to unlock block @0x%08x = 0x%02x\n", offset, @@ -98,7 +98,7 @@ int unlock_winbond_fwhub(struct flashchip *flash) { int i, total_size = flash->total_size * 1024; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; uint8_t locking; /* Are there any hardware restrictions that we can't overcome? @@ -143,7 +143,7 @@ return 0; } -static int erase_sector_winbond_fwhub(volatile uint8_t *bios, +static int erase_sector_winbond_fwhub(chipaddr bios, unsigned int sector) { /* Remember: too much sleep can waste your day. */ @@ -168,7 +168,7 @@ int erase_winbond_fwhub(struct flashchip *flash) { int i, total_size = flash->total_size * 1024; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; unlock_winbond_fwhub(flash); @@ -193,7 +193,7 @@ { int i; int total_size = flash->total_size * 1024; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; if (erase_winbond_fwhub(flash)) return -1; Modified: trunk/w49f002u.c =================================================================== --- trunk/w49f002u.c 2009-05-16 01:30:48 UTC (rev 518) +++ trunk/w49f002u.c 2009-05-16 21:22:56 UTC (rev 519) @@ -26,7 +26,7 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - volatile uint8_t *bios = flash->virtual_memory; + chipaddr bios = flash->virtual_memory; erase_chip_jedec(flash);

1 0

Flashrom problems on SB600
by Tiago Marques 16 May '09

16 May '09

Hi all, I tried to run flashrom on an ECS AMD690GM-M2 motherboard and it detects the SB600 southbridge and enables flash writing but hangs before trying to find the flash/EEPROM chip. The system itself doesn't hang, just flashrom that stays stalled apparently waiting for something. Any ideas? Best regards, Tiago Marques

5 12

[PATCH] flashrom: nic3com: add 16bit and 32bit chip reads/writes
by Carl-Daniel Hailfinger 16 May '09

16 May '09

Add 16 bit and 32 bit chip reads/writes to the nic3com driver. It emulates those accesses by splitting them to 8 bit accesses. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-nic3com_16bit_32bit_read_write/nic3com.c =================================================================== --- flashrom-nic3com_16bit_32bit_read_write/nic3com.c (Revision 516) +++ flashrom-nic3com_16bit_32bit_read_write/nic3com.c (Arbeitskopie) @@ -93,12 +93,18 @@ OUTB(val, io_base_addr + BIOS_ROM_DATA); } +/* Little-endian */ void nic3com_chip_writew(uint16_t val, volatile void *addr) { + chip_writeb(val & 0xff, addr); + chip_writeb((val >> 8) & 0xff, addr + 1); } +/* Little-endian */ void nic3com_chip_writel(uint32_t val, volatile void *addr) { + chip_writew(val & 0xffff, addr); + chip_writew((val >> 16) & 0xffff, addr + 2); } uint8_t nic3com_chip_readb(const volatile void *addr) @@ -111,12 +117,20 @@ return val; } +/* Little-endian */ uint16_t nic3com_chip_readw(const volatile void *addr) { - return 0xffff; + uint16_t val; + val = chip_readb(addr); + val |= chip_readb(addr + 1) << 8; + return val; } +/* Little-endian */ uint32_t nic3com_chip_readl(const volatile void *addr) { - return 0xffffffff; + uint32_t val; + val = chip_readw(addr); + val |= chip_readw(addr + 2) << 16; + return val; } -- http://www.hailfinger.org/ Index: flashrom-nic3com_16bit_32bit_read_write/nic3com.c =================================================================== --- flashrom-nic3com_16bit_32bit_read_write/nic3com.c (Revision 516) +++ flashrom-nic3com_16bit_32bit_read_write/nic3com.c (Arbeitskopie) @@ -93,12 +93,18 @@ OUTB(val, io_base_addr + BIOS_ROM_DATA); } +/* Little-endian */ void nic3com_chip_writew(uint16_t val, volatile void *addr) { + chip_writeb(val & 0xff, addr); + chip_writeb((val >> 8) & 0xff, addr + 1); } +/* Little-endian */ void nic3com_chip_writel(uint32_t val, volatile void *addr) { + chip_writew(val & 0xffff, addr); + chip_writew((val >> 16) & 0xffff, addr + 2); } uint8_t nic3com_chip_readb(const volatile void *addr) @@ -111,12 +117,20 @@ return val; } +/* Little-endian */ uint16_t nic3com_chip_readw(const volatile void *addr) { - return 0xffff; + uint16_t val; + val = chip_readb(addr); + val |= chip_readb(addr + 1) << 8; + return val; } +/* Little-endian */ uint32_t nic3com_chip_readl(const volatile void *addr) { - return 0xffffffff; + uint32_t val; + val = chip_readw(addr); + val |= chip_readw(addr + 2) << 16; + return val; }

2 3

← Newer
1
...
26
27
28
29
30
31
32
...
58
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

coreboot May 2009