flashrom July 2013

flashrom@flashrom.org

31 participants
142 discussions

Re: [flashrom] New development guidelines after 0.9.7
by Carl-Daniel Hailfinger 19 Jul '13

19 Jul '13

Am 18.07.2013 19:15 schrieb Marc Jones: > On Wed, Jul 17, 2013 at 7:21 PM, Stefan Tauner < > stefan.tauner(a)student.tuwien.ac.at> wrote: > >> Our current development model with elaborate reviews has not been >> working for a while now. Therefore, beginning with the release of >> flashrom 0.9.7 our strategy on merging patches will change radically. >> >> The current rules regarding committing to subversion can be found here: >> http://flashrom.org/Development_Guidelines#Committing >> Essentially they prohibit merging non-trivial patches without explicit >> consent from another community member and is not too specific on the >> requirements for an ack. >> > Not to add undue overhead to the project, but why not go to git and gerrit? > Automates a lot of this stuff and is already setup on coreboot.org. <rant> Because I think git sucks? I might be open for a switch to mercurial because it has usable revision numbers and a user-friendly interface. But git... without a command line and the right tree, I'll never know if commit hash deadbeef is before or after badc0ffe. Besides that, I managed to learn mercurial in a few hours and gave up on git after a few days. And gerrit needs known insecure OpenID for authentication. I'm not going to get any OpenID capable account just to satisfy a defective login mechanism. Apart from that, it seems gerrit pretty much killed all patch discussion on the coreboot mailing list. It also was pretty much unsuitable for offline use (no idea if that changed). While those properties may work for coreboot development (with very infrequent contributions/reviews by outsiders), I fear it will introduce an additional barrier for flashrom. </rant> Regards, Carl-Daniel

3 2

Re: [flashrom] Flashrom fails on write. P4 motherboard
by Stefan Tauner 19 Jul '13

19 Jul '13

On Thu, 18 Jul 2013 11:31:12 +0200 san <san(a)plusnet.pl> wrote: > Ok, i found my compiled version does not work. Will check this out later. > > Flashrom.log and other possibly useful informations can be found here > http://e-san.info/Flashrom-P4/ I am quite sure that you will need a board enable that changes the state of the WP and TBL pins. You can verify that by measuring the voltage of said pins against ground. You can read more about board enables here: http://flashrom.org/Board_Enable -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

2 1

Re: [flashrom] [PATCH 04/10] sbxxx: Handle active IMCs in AMD chipsets.
by Carl-Daniel Hailfinger 18 Jul '13

18 Jul '13

Am 10.07.2013 21:17 schrieb Stefan Tauner: > Detect and temporarily disable the IMC while accessing the flash. > Disable writes on default, but allow the user to enforce it. > > Signed-off-by: Rudolf Marek <r.marek(a)assembler.cz> > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> > --- > imc.c | 171 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ I already mentioned the suboptimal file name and public function names on IRC. You said: "[...] best would be to name it amd_imc.c and name the one external visible function amd_imc_shutdown [...]" That change would be appreciated. > diff --git a/chipset_enable.c b/chipset_enable.c > index 3979347..c884c80 100644 > --- a/chipset_enable.c > +++ b/chipset_enable.c > @@ -922,6 +922,10 @@ static int enable_flash_sb600(struct pci_dev *dev, const char *name) > uint8_t reg; > int ret; > > + if (imc_shutdown(dev) != 0) { Hm. Can we avoid calling this on SB600 (if SB600 doesn't support IMC at all)? > + return ERROR_FATAL; > + } > + > /* Clear ROM protect 0-3. */ > for (reg = 0x50; reg < 0x60; reg += 4) { > prot = pci_read_long(dev, reg); > diff --git a/sb600spi.c b/sb600spi.c > index a5c00d8..7043aec 100644 > --- a/sb600spi.c > +++ b/sb600spi.c > @@ -210,10 +211,26 @@ int sb600_probe_spi(struct pci_dev *dev) > struct pci_dev *smbus_dev; > uint32_t tmp; > uint8_t reg; > + bool amd_imc_force = false; Ah yes, the joy of having a bool type in C99. It makes sense here. >From a quick glance the code looks sane otherwise. I'll try to evaluate it in light of the recent discussions about AMD IMC and associated problems. Regards, Carl-Daniel -- http://www.hailfinger.org/

2 2

Re: [flashrom] Flashrom fails on write. P4 motherboard
by san 18 Jul '13

18 Jul '13

Ok, i found my compiled version does not work. Will check this out later. Flashrom.log and other possibly useful informations can be found here http://e-san.info/Flashrom-P4/ Thanks for quick response. > Unicorn wishes! ;) Cherry lollipops! 2013/7/18 san <san(a)plusnet.pl> > Ok, i found my compiled version does not work. Will check this out later. > > Flashrom.log and other possibly useful informations can be found here > http://e-san.info/Flashrom-P4/ > > Thanks for quick response. > > > Unicorn wishes! ;) > Cherry lollipops! > > > 2013/7/18 Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> > >> On Thu, 18 Jul 2013 02:14:22 +0200 >> san <san(a)plusnet.pl> wrote: >> >> > Hi! >> > >> > First of all, thank You for providing such a great software. >> > >> > I have problems with flashing bios on my no-name motherboard. >> > >> > It is propably Saphire or PCPartner (a bit different: >> > http://www.compass.ua/products/view1.asp?code=28915 ) >> > But almost sure it is PP: >> > http://support.pcpartner.com/products/old-intel/DM-262E.htm >> > >> > Flashrom does recognise chipset, flash chip and read rom but does not >> write. >> > >> > I use TinyCore Linux LiveCD (http://distro.ibiblio.org/tinycorelinux/), >> > Flashrom from ubuntu (binary) and current version (compiled). >> > >> > I hot swap chips but they are same model. >> > >> > Manual for motherboard found here: >> > http://support.pcpartner.com/support/man/intel/p262.pdf ( >> > http://support.pcpartner.com/support/bios/i845.htm#845e => 845EAS4-262E >> > [DDR]) doeas not provide any information about bios flash protection. >> > >> > Please help! >> >> Please provide flashrom's verbose output when it is trying to write. >> With newer versions you can create a log file easily by using the -o >> parameter. Without the detailed output we can only guess what happens. >> >> > Beast regards! >> >> Unicorn wishes! ;) >> >> -- >> Kind regards/Mit freundlichen Grüßen, Stefan Tauner >> > > > > -- > [ e-San.info | San(a)plusnet.pl ] > -- [ e-San.info | San(a)plusnet.pl ]

1 0

Re: [flashrom] New development guidelines after 0.9.7
by David Hendricks 18 Jul '13

18 Jul '13

On Thu, Jul 18, 2013 at 10:15 AM, Marc Jones <marcj303(a)gmail.com> wrote: > On Wed, Jul 17, 2013 at 7:21 PM, Stefan Tauner < > stefan.tauner(a)student.tuwien.ac.at> wrote: > >> Our current development model with elaborate reviews has not been >> working for a while now. Therefore, beginning with the release of >> flashrom 0.9.7 our strategy on merging patches will change radically. >> >> The current rules regarding committing to subversion can be found here: >> http://flashrom.org/Development_Guidelines#Committing >> Essentially they prohibit merging non-trivial patches without explicit >> consent from another community member and is not too specific on the >> requirements for an ack. >> > > Not to add undue overhead to the project, but why not go to git and > gerrit? Automates a lot of this stuff and is already setup on coreboot.org > . > +1. -- David Hendricks (dhendrix) Systems Software Engineer, Google Inc.

1 0

Re: [flashrom] Flashrom fails on write. P4 motherboard
by Stefan Tauner 18 Jul '13

18 Jul '13

On Thu, 18 Jul 2013 02:14:22 +0200 san <san(a)plusnet.pl> wrote: > Hi! > > First of all, thank You for providing such a great software. > > I have problems with flashing bios on my no-name motherboard. > > It is propably Saphire or PCPartner (a bit different: > http://www.compass.ua/products/view1.asp?code=28915 ) > But almost sure it is PP: > http://support.pcpartner.com/products/old-intel/DM-262E.htm > > Flashrom does recognise chipset, flash chip and read rom but does not write. > > I use TinyCore Linux LiveCD (http://distro.ibiblio.org/tinycorelinux/), > Flashrom from ubuntu (binary) and current version (compiled). > > I hot swap chips but they are same model. > > Manual for motherboard found here: > http://support.pcpartner.com/support/man/intel/p262.pdf ( > http://support.pcpartner.com/support/bios/i845.htm#845e => 845EAS4-262E > [DDR]) doeas not provide any information about bios flash protection. > > Please help! Please provide flashrom's verbose output when it is trying to write. With newer versions you can create a log file easily by using the -o parameter. Without the detailed output we can only guess what happens. > Beast regards! Unicorn wishes! ;) -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

2 1

Flashrom fails on write. P4 motherboard
by san 18 Jul '13

18 Jul '13

Hi! First of all, thank You for providing such a great software. I have problems with flashing bios on my no-name motherboard. It is propably Saphire or PCPartner (a bit different: http://www.compass.ua/products/view1.asp?code=28915 ) But almost sure it is PP: http://support.pcpartner.com/products/old-intel/DM-262E.htm Flashrom does recognise chipset, flash chip and read rom but does not write. I use TinyCore Linux LiveCD (http://distro.ibiblio.org/tinycorelinux/), Flashrom from ubuntu (binary) and current version (compiled). I hot swap chips but they are same model. Manual for motherboard found here: http://support.pcpartner.com/support/man/intel/p262.pdf ( http://support.pcpartner.com/support/bios/i845.htm#845e => 845EAS4-262E [DDR]) doeas not provide any information about bios flash protection. Please help! Beast regards! -- [ e-San.info | San(a)plusnet.pl ]

1 0

Re: [flashrom] [PATCH] uintptr_t-ify map_flash_region functions.
by Carl-Daniel Hailfinger 18 Jul '13

18 Jul '13

Am 17.07.2013 15:58 schrieb Stefan Tauner: > unsigned long is not the right type for manipulating pointer values. > Since C99 there are suitable unsigned and signed types available, namely > uintptr_t and intptr_t respectively. > > Use them in functions assigned to programmers' map_flash_region fields and > their callers where applicable. > > This patch also changes the display width of all associated address values in > physmap.c to 16/8 hex characters depending on the actual size by > introducing a macro PRIxPTR_WIDTH and exploiting printf's * field width > specifier. > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> > Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> > --- > > Can you please verify that this is what you want? Yes. Exactly. > I put the _WIDTH macro in flash.h now for obvious reasons. Thanks! Regards, Carl-Daniel -- http://www.hailfinger.org/

2 1

[commit] r1701 - trunk
by repository service 18 Jul '13

18 Jul '13

Author: stefanct Date: Thu Jul 18 01:46:44 2013 New Revision: 1701 URL: http://flashrom.org/trac/flashrom/changeset/1701 Log: uintptr_t-ify map_flash_region functions. unsigned long is not the right type for manipulating pointer values. Since C99 there are suitable unsigned and signed types available, namely uintptr_t and intptr_t respectively. Use them in functions assigned to programmers' map_flash_region fields and their callers where applicable. This patch also changes the display width of all associated address values in physmap.c to 16/8 hex characters depending on the actual size by introducing a macro PRIxPTR_WIDTH and exploiting printf's * field width specifier. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/dummyflasher.c trunk/flash.h trunk/flashrom.c trunk/physmap.c trunk/programmer.c trunk/programmer.h Modified: trunk/dummyflasher.c ============================================================================== --- trunk/dummyflasher.c Wed Jul 17 11:28:00 2013 (r1700) +++ trunk/dummyflasher.c Thu Jul 18 01:46:44 2013 (r1701) @@ -412,10 +412,10 @@ return 0; } -void *dummy_map(const char *descr, unsigned long phys_addr, size_t len) +void *dummy_map(const char *descr, uintptr_t phys_addr, size_t len) { - msg_pspew("%s: Mapping %s, 0x%lx bytes at 0x%08lx\n", - __func__, descr, (unsigned long)len, phys_addr); + msg_pspew("%s: Mapping %s, 0x%lx bytes at 0x%*" PRIxPTR "\n", + __func__, descr, (unsigned long)len, PRIxPTR_WIDTH, phys_addr); return (void *)phys_addr; } Modified: trunk/flash.h ============================================================================== --- trunk/flash.h Wed Jul 17 11:28:00 2013 (r1700) +++ trunk/flash.h Thu Jul 18 01:46:44 2013 (r1701) @@ -43,10 +43,10 @@ /* TODO: check using code for correct usage of types */ typedef uintptr_t chipaddr; +#define PRIxPTR_WIDTH ((int)(sizeof(uintptr_t)*2)) int register_shutdown(int (*function) (void *data), void *data); -void *programmer_map_flash_region(const char *descr, unsigned long phys_addr, - size_t len); +void *programmer_map_flash_region(const char *descr, uintptr_t phys_addr, size_t len); void programmer_unmap_flash_region(void *virt_addr, size_t len); void programmer_delay(int usecs); Modified: trunk/flashrom.c ============================================================================== --- trunk/flashrom.c Wed Jul 17 11:28:00 2013 (r1700) +++ trunk/flashrom.c Thu Jul 18 01:46:44 2013 (r1701) @@ -417,8 +417,7 @@ return ret; } -void *programmer_map_flash_region(const char *descr, unsigned long phys_addr, - size_t len) +void *programmer_map_flash_region(const char *descr, uintptr_t phys_addr, size_t len) { return programmer_table[programmer].map_flash_region(descr, phys_addr, len); Modified: trunk/physmap.c ============================================================================== --- trunk/physmap.c Wed Jul 17 11:28:00 2013 (r1700) +++ trunk/physmap.c Thu Jul 18 01:46:44 2013 (r1701) @@ -42,7 +42,7 @@ static void *realmem_map; -static void *map_first_meg(unsigned long phys_addr, size_t len) +static void *map_first_meg(uintptr_t phys_addr, size_t len) { if (realmem_map) return realmem_map + phys_addr; @@ -61,7 +61,7 @@ return realmem_map + phys_addr; } -static void *sys_physmap(unsigned long phys_addr, size_t len) +static void *sys_physmap(uintptr_t phys_addr, size_t len) { int ret; __dpmi_meminfo mi; @@ -109,7 +109,7 @@ #define MEM_DEV "" -void *sys_physmap(unsigned long phys_addr, size_t len) +void *sys_physmap(uintptr_t phys_addr, size_t len) { return (void *)phys_to_virt(phys_addr); } @@ -124,7 +124,7 @@ #define MEM_DEV "DirectHW" -static void *sys_physmap(unsigned long phys_addr, size_t len) +static void *sys_physmap(uintptr_t phys_addr, size_t len) { /* The short form of ?: is a GNU extension. * FIXME: map_physical returns NULL both for errors and for success @@ -156,7 +156,7 @@ static int fd_mem_cached = -1; /* For MMIO access. Must be uncached, doesn't make sense to restrict to ro. */ -static void *sys_physmap_rw_uncached(unsigned long phys_addr, size_t len) +static void *sys_physmap_rw_uncached(uintptr_t phys_addr, size_t len) { void *virt_addr; @@ -176,7 +176,7 @@ /* For reading DMI/coreboot/whatever tables. We should never write, and we * do not care about caching. */ -static void *sys_physmap_ro_cached(unsigned long phys_addr, size_t len) +static void *sys_physmap_ro_cached(uintptr_t phys_addr, size_t len) { void *virt_addr; @@ -209,25 +209,24 @@ #define PHYSMAP_RW 0 #define PHYSMAP_RO 1 -static void *physmap_common(const char *descr, unsigned long phys_addr, +static void *physmap_common(const char *descr, uintptr_t phys_addr, size_t len, int mayfail, int readonly) { void *virt_addr; if (len == 0) { - msg_pspew("Not mapping %s, zero size at 0x%08lx.\n", - descr, phys_addr); + msg_pspew("Not mapping %s, zero size at 0x%0*" PRIxPTR ".\n", descr, PRIxPTR_WIDTH, phys_addr); return ERROR_PTR; } if ((getpagesize() - 1) & len) { - msg_perr("Mapping %s at 0x%08lx, unaligned size 0x%lx.\n", - descr, phys_addr, (unsigned long)len); + msg_perr("Mapping %s at 0x%0*" PRIxPTR ", unaligned size 0x%lx.\n", + descr, PRIxPTR_WIDTH, phys_addr, (unsigned long)len); } if ((getpagesize() - 1) & phys_addr) { - msg_perr("Mapping %s, 0x%lx bytes at unaligned 0x%08lx.\n", - descr, (unsigned long)len, phys_addr); + msg_perr("Mapping %s, 0x%lx bytes at unaligned 0x%0*" PRIxPTR ".\n", + descr, (unsigned long)len, PRIxPTR_WIDTH, phys_addr); } if (readonly) @@ -238,8 +237,8 @@ if (ERROR_PTR == virt_addr) { if (NULL == descr) descr = "memory"; - msg_perr("Error accessing %s, 0x%lx bytes at 0x%08lx\n", descr, - (unsigned long)len, phys_addr); + msg_perr("Error accessing %s, 0x%lx bytes at 0x%0*" PRIxPTR "\n", + descr, (unsigned long)len, PRIxPTR_WIDTH, phys_addr); msg_perr(MEM_DEV " mmap failed: %s\n", strerror(errno)); #ifdef __linux__ if (EINVAL == errno) { @@ -261,13 +260,13 @@ return virt_addr; } -void *physmap(const char *descr, unsigned long phys_addr, size_t len) +void *physmap(const char *descr, uintptr_t phys_addr, size_t len) { return physmap_common(descr, phys_addr, len, PHYSMAP_NOFAIL, PHYSMAP_RW); } -void *physmap_try_ro(const char *descr, unsigned long phys_addr, size_t len) +void *physmap_try_ro(const char *descr, uintptr_t phys_addr, size_t len) { return physmap_common(descr, phys_addr, len, PHYSMAP_MAYFAIL, PHYSMAP_RO); Modified: trunk/programmer.c ============================================================================== --- trunk/programmer.c Wed Jul 17 11:28:00 2013 (r1700) +++ trunk/programmer.c Thu Jul 18 01:46:44 2013 (r1701) @@ -28,7 +28,7 @@ } /* Fallback map() for programmers which don't need special handling */ -void *fallback_map(const char *descr, unsigned long phys_addr, size_t len) +void *fallback_map(const char *descr, uintptr_t phys_addr, size_t len) { /* FIXME: Should return phys_addr. */ return NULL; Modified: trunk/programmer.h ============================================================================== --- trunk/programmer.h Wed Jul 17 11:28:00 2013 (r1700) +++ trunk/programmer.h Thu Jul 18 01:46:44 2013 (r1701) @@ -117,7 +117,7 @@ int (*init) (void); - void *(*map_flash_region) (const char *descr, unsigned long phys_addr, size_t len); + void *(*map_flash_region) (const char *descr, uintptr_t phys_addr, size_t len); void (*unmap_flash_region) (void *virt_addr, size_t len); void (*delay) (int usecs); @@ -275,8 +275,8 @@ #endif /* physmap.c */ -void *physmap(const char *descr, unsigned long phys_addr, size_t len); -void *physmap_try_ro(const char *descr, unsigned long phys_addr, size_t len); +void *physmap(const char *descr, uintptr_t phys_addr, size_t len); +void *physmap_try_ro(const char *descr, uintptr_t phys_addr, size_t len); void physunmap(void *virt_addr, size_t len); #if CONFIG_INTERNAL == 1 int setup_cpu_msr(int cpu); @@ -359,7 +359,7 @@ /* dummyflasher.c */ #if CONFIG_DUMMY == 1 int dummy_init(void); -void *dummy_map(const char *descr, unsigned long phys_addr, size_t len); +void *dummy_map(const char *descr, uintptr_t phys_addr, size_t len); void dummy_unmap(void *virt_addr, size_t len); #endif @@ -606,7 +606,7 @@ /* programmer.c */ int noop_shutdown(void); -void *fallback_map(const char *descr, unsigned long phys_addr, size_t len); +void *fallback_map(const char *descr, uintptr_t phys_addr, size_t len); void fallback_unmap(void *virt_addr, size_t len); void noop_chip_writeb(const struct flashctx *flash, uint8_t val, chipaddr addr); void fallback_chip_writew(const struct flashctx *flash, uint16_t val, chipaddr addr);

1 0

Re: [flashrom] [PATCH 06/10] uintptr_t-ify physmap functions.
by Carl-Daniel Hailfinger 17 Jul '13

17 Jul '13

Am 10.07.2013 21:17 schrieb Stefan Tauner: > unsigned long is not the right type for manipulating pointer values. > Since C99 there are suitable unsigned and signed types available, namely > uintptr_t and intptr_t respectively. > > Use them in physmap.c and its callers where applicable. > > This patch also changes the display width of all address values in > physmap.c to 16/8 hex characters depending on the actual size. > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Why don't you use PRIxPTR_WIDTH everywhere including dummyflasher.c? Put another way, is there a reason to use PRIxPTR_WIDTH at all? Do we care that C99 doesn't guarantee a 0x prefix for printed addresses with PRIxPTR? Will that cause confusion? I think PRIxPTR is a good idea, but I'm not so sure about the side effects. There's also the problem of programmer_map_flash_region. It should not take an uintptr_t. The address parameter is a horrible mess: A physical address from the CPU point of view for the internal programmer, a top-of-4-GB aligned fake address for some other programmers, and a bottom-aligned address for the rest of our programmers. If we want to do this the right way, we need to have a wrapper for physmap in the "internal" programmer case instead of setting map_flash_region = physmap. And then I need to update my patch which abstracts the flash bus address vs programmer address conflict into something that won't cause madness. > --- > dummyflasher.c | 4 ++-- > flash.h | 3 +-- > flashrom.c | 3 +-- > physmap.c | 36 +++++++++++++++++++----------------- > programmer.c | 2 +- > programmer.h | 10 +++++----- > 6 files changed, 29 insertions(+), 29 deletions(-) > > diff --git a/dummyflasher.c b/dummyflasher.c > index e2ec036..8e861ee 100644 > --- a/dummyflasher.c > +++ b/dummyflasher.c > @@ -412,9 +412,9 @@ dummy_init_out: > return 0; > } > > -void *dummy_map(const char *descr, unsigned long phys_addr, size_t len) > +void *dummy_map(const char *descr, uintptr_t phys_addr, size_t len) > { > - msg_pspew("%s: Mapping %s, 0x%lx bytes at 0x%08lx\n", > + msg_pspew("%s: Mapping %s, 0x%lx bytes at 0x%08" PRIxPTR "\n", > __func__, descr, (unsigned long)len, phys_addr); > return (void *)phys_addr; > } > diff --git a/flash.h b/flash.h > index 9e787c0..a752d6b 100644 > --- a/flash.h > +++ b/flash.h > @@ -45,8 +45,7 @@ > typedef uintptr_t chipaddr; > > int register_shutdown(int (*function) (void *data), void *data); > -void *programmer_map_flash_region(const char *descr, unsigned long phys_addr, > - size_t len); > +void *programmer_map_flash_region(const char *descr, uintptr_t phys_addr, size_t len); > void programmer_unmap_flash_region(void *virt_addr, size_t len); > void programmer_delay(int usecs); > > diff --git a/flashrom.c b/flashrom.c > index c298748..43b7b11 100644 > --- a/flashrom.c > +++ b/flashrom.c > @@ -417,8 +417,7 @@ int programmer_shutdown(void) > return ret; > } > > -void *programmer_map_flash_region(const char *descr, unsigned long phys_addr, > - size_t len) > +void *programmer_map_flash_region(const char *descr, uintptr_t phys_addr, size_t len) > { > return programmer_table[programmer].map_flash_region(descr, > phys_addr, len); > diff --git a/physmap.c b/physmap.c > index 644ee35..8be4f06 100644 > --- a/physmap.c > +++ b/physmap.c > @@ -20,6 +20,7 @@ > * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA > */ > > +#include <inttypes.h> > #include <unistd.h> > #include <stdio.h> > #include <stdlib.h> > @@ -34,6 +35,8 @@ > #include <fcntl.h> > #endif > > +#define PRIxPTR_WIDTH ((int)(sizeof(uintptr_t)*2)) > + > #ifdef __DJGPP__ > #include <dpmi.h> > #include <sys/nearptr.h> > @@ -42,7 +45,7 @@ > > static void *realmem_map; > > -static void *map_first_meg(unsigned long phys_addr, size_t len) > +static void *map_first_meg(uintptr_t phys_addr, size_t len) > { > if (realmem_map) > return realmem_map + phys_addr; > @@ -61,7 +64,7 @@ static void *map_first_meg(unsigned long phys_addr, size_t len) > return realmem_map + phys_addr; > } > > -static void *sys_physmap(unsigned long phys_addr, size_t len) > +static void *sys_physmap(uintptr_t phys_addr, size_t len) > { > int ret; > __dpmi_meminfo mi; > @@ -109,7 +112,7 @@ void physunmap(void *virt_addr, size_t len) > > #define MEM_DEV "" > > -void *sys_physmap(unsigned long phys_addr, size_t len) > +void *sys_physmap(uintptr_t phys_addr, size_t len) > { > return (void *)phys_to_virt(phys_addr); > } > @@ -124,7 +127,7 @@ void physunmap(void *virt_addr, size_t len) > > #define MEM_DEV "DirectHW" > > -static void *sys_physmap(unsigned long phys_addr, size_t len) > +static void *sys_physmap(uintptr_t phys_addr, size_t len) > { > /* The short form of ?: is a GNU extension. > * FIXME: map_physical returns NULL both for errors and for success > @@ -156,7 +159,7 @@ static int fd_mem = -1; > static int fd_mem_cached = -1; > > /* For MMIO access. Must be uncached, doesn't make sense to restrict to ro. */ > -static void *sys_physmap_rw_uncached(unsigned long phys_addr, size_t len) > +static void *sys_physmap_rw_uncached(uintptr_t phys_addr, size_t len) > { > void *virt_addr; > > @@ -176,7 +179,7 @@ static void *sys_physmap_rw_uncached(unsigned long phys_addr, size_t len) > /* For reading DMI/coreboot/whatever tables. We should never write, and we > * do not care about caching. > */ > -static void *sys_physmap_ro_cached(unsigned long phys_addr, size_t len) > +static void *sys_physmap_ro_cached(uintptr_t phys_addr, size_t len) > { > void *virt_addr; > > @@ -209,25 +212,24 @@ void physunmap(void *virt_addr, size_t len) > #define PHYSMAP_RW 0 > #define PHYSMAP_RO 1 > > -static void *physmap_common(const char *descr, unsigned long phys_addr, > +static void *physmap_common(const char *descr, uintptr_t phys_addr, > size_t len, int mayfail, int readonly) > { > void *virt_addr; > > if (len == 0) { > - msg_pspew("Not mapping %s, zero size at 0x%08lx.\n", > - descr, phys_addr); > + msg_pspew("Not mapping %s, zero size at 0x%0*" PRIxPTR ".\n", descr, PRIxPTR_WIDTH, phys_addr); > return ERROR_PTR; > } > > if ((getpagesize() - 1) & len) { > - msg_perr("Mapping %s at 0x%08lx, unaligned size 0x%lx.\n", > - descr, phys_addr, (unsigned long)len); > + msg_perr("Mapping %s at 0x%0*" PRIxPTR ", unaligned size 0x%lx.\n", > + descr, PRIxPTR_WIDTH, phys_addr, (unsigned long)len); > } > > if ((getpagesize() - 1) & phys_addr) { > - msg_perr("Mapping %s, 0x%lx bytes at unaligned 0x%08lx.\n", > - descr, (unsigned long)len, phys_addr); > + msg_perr("Mapping %s, 0x%lx bytes at unaligned 0x%0*" PRIxPTR ".\n", > + descr, (unsigned long)len, PRIxPTR_WIDTH, phys_addr); > } > > if (readonly) > @@ -238,8 +240,8 @@ static void *physmap_common(const char *descr, unsigned long phys_addr, > if (ERROR_PTR == virt_addr) { > if (NULL == descr) > descr = "memory"; > - msg_perr("Error accessing %s, 0x%lx bytes at 0x%08lx\n", descr, > - (unsigned long)len, phys_addr); > + msg_perr("Error accessing %s, 0x%0zx bytes at 0x%0*" PRIxPTR "\n", > + descr, len, PRIxPTR_WIDTH, phys_addr); > msg_perr(MEM_DEV " mmap failed: %s\n", strerror(errno)); > #ifdef __linux__ > if (EINVAL == errno) { > @@ -261,13 +263,13 @@ static void *physmap_common(const char *descr, unsigned long phys_addr, > return virt_addr; > } > > -void *physmap(const char *descr, unsigned long phys_addr, size_t len) > +void *physmap(const char *descr, uintptr_t phys_addr, size_t len) > { > return physmap_common(descr, phys_addr, len, PHYSMAP_NOFAIL, > PHYSMAP_RW); > } > > -void *physmap_try_ro(const char *descr, unsigned long phys_addr, size_t len) > +void *physmap_try_ro(const char *descr, uintptr_t phys_addr, size_t len) > { > return physmap_common(descr, phys_addr, len, PHYSMAP_MAYFAIL, > PHYSMAP_RO); > diff --git a/programmer.c b/programmer.c > index 3b4def0..bf7dca1 100644 > --- a/programmer.c > +++ b/programmer.c > @@ -28,7 +28,7 @@ int noop_shutdown(void) > } > > /* Fallback map() for programmers which don't need special handling */ > -void *fallback_map(const char *descr, unsigned long phys_addr, size_t len) > +void *fallback_map(const char *descr, uintptr_t phys_addr, size_t len) > { > /* FIXME: Should return phys_addr. */ > return NULL; > diff --git a/programmer.h b/programmer.h > index 7de8f2c..4ed7c90 100644 > --- a/programmer.h > +++ b/programmer.h > @@ -117,7 +117,7 @@ struct programmer_entry { > > int (*init) (void); > > - void *(*map_flash_region) (const char *descr, unsigned long phys_addr, size_t len); > + void *(*map_flash_region) (const char *descr, uintptr_t phys_addr, size_t len); > void (*unmap_flash_region) (void *virt_addr, size_t len); > > void (*delay) (int usecs); > @@ -275,8 +275,8 @@ int processor_flash_enable(void); > #endif > > /* physmap.c */ > -void *physmap(const char *descr, unsigned long phys_addr, size_t len); > -void *physmap_try_ro(const char *descr, unsigned long phys_addr, size_t len); > +void *physmap(const char *descr, uintptr_t phys_addr, size_t len); > +void *physmap_try_ro(const char *descr, uintptr_t phys_addr, size_t len); > void physunmap(void *virt_addr, size_t len); > #if CONFIG_INTERNAL == 1 > int setup_cpu_msr(int cpu); > @@ -359,7 +359,7 @@ void rmmio_vall(void *addr); > /* dummyflasher.c */ > #if CONFIG_DUMMY == 1 > int dummy_init(void); > -void *dummy_map(const char *descr, unsigned long phys_addr, size_t len); > +void *dummy_map(const char *descr, uintptr_t phys_addr, size_t len); > void dummy_unmap(void *virt_addr, size_t len); > #endif > > @@ -609,7 +609,7 @@ int register_opaque_programmer(const struct opaque_programmer *pgm); > > /* programmer.c */ > int noop_shutdown(void); > -void *fallback_map(const char *descr, unsigned long phys_addr, size_t len); > +void *fallback_map(const char *descr, uintptr_t phys_addr, size_t len); > void fallback_unmap(void *virt_addr, size_t len); > void noop_chip_writeb(const struct flashctx *flash, uint8_t val, chipaddr addr); > void fallback_chip_writew(const struct flashctx *flash, uint16_t val, chipaddr addr); Overall, while I'd like to have this patch in, it conceptually breaks as much stuff as it fixes. I don't see this getting fixed within the release timeframe, so I'd like to postpone. Regards, Carl-Daniel -- http://www.hailfinger.org/

2 4

← Newer
1
...
5
6
7
8
9
10
11
...
15
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom July 2013