flashrom

flashrom@flashrom.org

3 participants
9188 discussions

flashing 0806 bios for P5WD2 PREMIUM
by Mark Starikov 04 Sep '12

04 Sep '12

Dear Flashrom team, I was wondering if you could point me to the right direction: I'm trying to update BIOS on ASUS P5WD2 PREMIUM board(2 NICs). As usual, floppy is not available and your program always did wonders for me so I though I'll send you a quick note before resorting to other measures. the current ROM on the board is Version: 0601 and i'm trying to flash 0806 This fails with output from the attempt, flashrom -V and dmidecode attached as txt files. BIOS download location: http://www.asus.com/Motherboards/Intel_Socket_775/P5WD2_Premium/#download Please let me know if there is a quick fix that can get this board flashed or(as this is very old hardware now) i would understand that support for such would be limited. Thanks in advance. *Big fan of flashrom BTW. Mark.

1 0

asus p5n-mx: flashrom -V
by widhaya trisarnwadhana 04 Sep '12

04 Sep '12

ASUS P5N-MX Motherboard

1 0

[PATCH] Add VIA VT6421A LPC programmer driver.
by Stefan Tauner 04 Sep '12

04 Sep '12

Thanks to Idwer Vollering for his iterative testing of this code. Signed-off-by: Jonathan Kollasch <jakllsch(a)kollasch.net> Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- the LPC registration was well-meant, but was useless. i am not sure yet why the weird offset in the mapping function is needed by idwer's card, but imho it should be useless and the problem is somewhere else. let's find out where. Makefile | 9 +++ atavia.c | 178 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ flashrom.c | 10 ++++ print.c | 5 ++ programmer.h | 13 ++++- 5 files changed, 214 insertions(+), 1 deletion(-) create mode 100644 atavia.c diff --git a/Makefile b/Makefile index 9309ce5..e4b364d 100644 --- a/Makefile +++ b/Makefile @@ -334,6 +334,9 @@ CONFIG_SATASII ?= yes # IMPORTANT: This code is not yet working! CONFIG_ATAHPT ?= no +# VIA VT6421A LPC memory support +CONFIG_ATAVIA ?= yes + # Always enable FT2232 SPI dongles for now. CONFIG_FT2232_SPI ?= yes @@ -459,6 +462,12 @@ PROGRAMMER_OBJS += atahpt.o NEED_PCI := yes endif +ifeq ($(CONFIG_ATAVIA), yes) +FEATURE_CFLAGS += -D'CONFIG_ATAVIA=1' +PROGRAMMER_OBJS += atavia.o +NEED_PCI := yes +endif + ifeq ($(CONFIG_FT2232_SPI), yes) FTDILIBS := $(shell pkg-config --libs libftdi 2>/dev/null || printf "%s" "-lftdi -lusb") # This is a totally ugly hack. diff --git a/atavia.c b/atavia.c new file mode 100644 index 0000000..dfb8d3b --- /dev/null +++ b/atavia.c @@ -0,0 +1,178 @@ +/* + * This file is part of the flashrom project. + * + * Copyright (C) 2010 Uwe Hermann <uwe(a)hermann-uwe.de> + * Copyright (C) 2011 Jonathan Kollasch <jakllsch(a)kollasch.net> + * Copyright (C) 2012 Stefan Tauner + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <stdbool.h> +#include "flash.h" +#include "programmer.h" +#include "hwaccess.h" + +#define PCI_VENDOR_ID_VIA 0x1106 + +#define VIA_BASE_MASK 0xFFFFF000 +#define VIA_MAX_RETRIES 300 + +#define BROM_ADDR 0x60 + +#define BROM_DATA 0x64 + +#define BROM_ACCESS 0x68 +#define BROM_TRIGGER 0x80 +#define BROM_WRITE 0x40 +#define BROM_SIZE_MASK 0x30 +#define BROM_SIZE_64K 0x00 +#define BROM_SIZE_32K 0x10 +#define BROM_SIZE_16K 0x20 +#define BROM_SIZE_0K 0x30 +#define BROM_BYTE_ENABLE_MASK 0x0f + +#define BROM_STATUS 0x69 +#define BROM_ERROR_STATUS 0x80 + +/* + * Select the byte we want to access. This is done by clearing the bit + * corresponding to the byte we want to access, leaving the others set. + * (Yes, really.) + */ +#define ENABLE_BYTE(address) ((~(1 << ((address) & 3))) & BROM_BYTE_ENABLE_MASK) +#define BYTE_OFFSET(address) (((addr) & 3) * 8) + +const struct pcidev_status ata_via[] = { + {PCI_VENDOR_ID_VIA, 0x3249, NT, "VIA", "VT6421A"}, + + {}, +}; + +static const struct par_programmer lpc_programmer_atavia = { + .chip_readb = atavia_chip_readb, + .chip_readw = fallback_chip_readw, + .chip_readl = fallback_chip_readl, + .chip_readn = fallback_chip_readn, + .chip_writeb = atavia_chip_writeb, + .chip_writew = fallback_chip_writew, + .chip_writel = fallback_chip_writel, + .chip_writen = fallback_chip_writen, +}; + +static bool atavia_ready(void) +{ + int try; + uint8_t access, status; + bool ready = false; + + for (try = 0; try < VIA_MAX_RETRIES; try++) { + access = pci_read_byte(pcidev_dev, BROM_ACCESS); + status = pci_read_byte(pcidev_dev, BROM_STATUS); + if (((access & BROM_TRIGGER) == 0) && (status & BROM_ERROR_STATUS) == 0) { + ready = true; + break; + } else { + programmer_delay(1); + continue; + } + } + + msg_pdbg2("%s: %s after %d tries (access=0x%02x, status=0x%02x)\n", + __FUNCTION__, ready ? "suceeded" : "failed", try, access, status); + + return ready; +} + +static int atavia_shutdown(void *data) +{ + pci_cleanup(pacc); + return 0; +} + +int atavia_init(void) +{ + uint32_t tmp; + if (rget_io_perms()) + return 1; + + pcidev_init(PCI_BASE_ADDRESS_0, ata_via); + + /* must be done before rpci calls */ + if (register_shutdown(atavia_shutdown, NULL)) + return 1; + + /* Enable expansion ROM. */ + uint32_t exp_base = pci_read_long(pcidev_dev, PCI_ROM_ADDRESS) | 0x01; + rpci_write_long(pcidev_dev, PCI_ROM_ADDRESS, exp_base); + + /* Test if a flash chip is attached. */ + pci_write_long(pcidev_dev, PCI_ROM_ADDRESS, exp_base | VIA_BASE_MASK); + programmer_delay(90); + tmp = pci_read_long(pcidev_dev, PCI_ROM_ADDRESS); + if ((tmp & VIA_BASE_MASK) == 0) { + msg_perr("Controller thinks there is no ROM attached.\n"); + msg_pdbg("BROM base=0x%08x\n", tmp); + //return 1; + } + + pci_write_long(pcidev_dev, PCI_ROM_ADDRESS, exp_base); + programmer_delay(10); + if (!atavia_ready()) { + msg_perr("Controller not ready.\n"); + //return 1; + } + + uint8_t access = pci_read_byte(pcidev_dev, BROM_ACCESS) & BROM_SIZE_MASK; + if (access & BROM_SIZE_0K) { + msg_pinfo("No ROM device found although the Expansion ROM Base test succeeded!?\n"); + msg_pdbg("access=0x%02x\n", access); + //return 1; + } + msg_pinfo("Controller thinks there is a ROM device with %s kB attached.\n", + (access & BROM_SIZE_64K) ? "64" : + (access & BROM_SIZE_32K) ? "32" : "16"); + + register_par_programmer(&lpc_programmer_atavia, BUS_LPC); + + return 0; +} + +void atavia_chip_writeb(const struct flashctx *flash, uint8_t val, chipaddr addr) +{ + pci_write_long(pcidev_dev, BROM_ADDR, (addr & ~3)); + pci_write_long(pcidev_dev, BROM_DATA, val << BYTE_OFFSET(addr)); + pci_write_byte(pcidev_dev, BROM_ACCESS, BROM_TRIGGER | BROM_WRITE | ENABLE_BYTE(addr)); + + if (atavia_ready() == false) { + msg_perr("not ready after write\n"); + } +} + +uint8_t atavia_chip_readb(const struct flashctx *flash, const chipaddr addr) +{ + uint8_t val; + + pci_write_long(pcidev_dev, BROM_ADDR, (addr & ~3)); + pci_write_byte(pcidev_dev, BROM_ACCESS, BROM_TRIGGER | ENABLE_BYTE(addr)); + + if (atavia_ready() == false) { + msg_perr("not ready after read\n"); + } + + val = (pci_read_long(pcidev_dev, BROM_DATA) >> BYTE_OFFSET(addr)) & 0xff; + + return val; +} diff --git a/flashrom.c b/flashrom.c index fdc5412..f5bf45f 100644 --- a/flashrom.c +++ b/flashrom.c @@ -152,6 +152,16 @@ const struct programmer_entry programmer_table[] = { }, #endif +#if CONFIG_ATAVIA == 1 + { + .name = "atavia", + .init = atavia_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, + }, +#endif + #if CONFIG_FT2232_SPI == 1 { .name = "ft2232_spi", diff --git a/print.c b/print.c index 582a49e..724f91c 100644 --- a/print.c +++ b/print.c @@ -487,6 +487,11 @@ void print_supported(void) programmer_table[PROGRAMMER_ATAHPT].name); print_supported_pcidevs(ata_hpt); #endif +#if CONFIG_ATAVIA == 1 + printf("\nSupported devices for the %s programmer:\n", + programmer_table[PROGRAMMER_ATAVIA].name); + print_supported_pcidevs(ata_via); +#endif #if CONFIG_FT2232_SPI == 1 msg_ginfo("\nSupported devices for the %s programmer:\n", programmer_table[PROGRAMMER_FT2232_SPI].name); diff --git a/programmer.h b/programmer.h index 51b9c40..105613c 100644 --- a/programmer.h +++ b/programmer.h @@ -54,6 +54,9 @@ enum programmer { #if CONFIG_ATAHPT == 1 PROGRAMMER_ATAHPT, #endif +#if CONFIG_ATAVIA == 1 + PROGRAMMER_ATAVIA, +#endif #if CONFIG_FT2232_SPI == 1 PROGRAMMER_FT2232_SPI, #endif @@ -239,7 +242,7 @@ int rpci_write_long(struct pci_dev *dev, int reg, uint32_t data); #endif /* print.c */ -#if CONFIG_NIC3COM+CONFIG_NICREALTEK+CONFIG_NICNATSEMI+CONFIG_GFXNVIDIA+CONFIG_DRKAISER+CONFIG_SATASII+CONFIG_ATAHPT+CONFIG_NICINTEL+CONFIG_NICINTEL_SPI+CONFIG_OGP_SPI+CONFIG_SATAMV >= 1 +#if CONFIG_NIC3COM+CONFIG_NICREALTEK+CONFIG_NICNATSEMI+CONFIG_GFXNVIDIA+CONFIG_DRKAISER+CONFIG_SATASII+CONFIG_ATAHPT+CONFIG_ATAVIA+CONFIG_NICINTEL+CONFIG_NICINTEL_SPI+CONFIG_OGP_SPI+CONFIG_SATAMV >= 1 /* Not needed for CONFIG_INTERNAL, but for all other PCI-based programmers. */ void print_supported_pcidevs(const struct pcidev_status *devs); #endif @@ -420,6 +423,14 @@ int atahpt_init(void); extern const struct pcidev_status ata_hpt[]; #endif +/* atavia.c */ +#if CONFIG_ATAVIA == 1 +int atavia_init(void); +void atavia_chip_writeb(const struct flashctx *flash, uint8_t val, chipaddr addr); +uint8_t atavia_chip_readb(const struct flashctx *flash, const chipaddr addr); +extern const struct pcidev_status ata_via[]; +#endif + /* ft2232_spi.c */ #if CONFIG_FT2232_SPI == 1 struct usbdev_status { -- Kind regards, Stefan Tauner

1 0

Re: [flashrom] [PATCH 1/2] Nvidia CK804 enable improvement
by Stefan Tauner 03 Sep '12

03 Sep '12

On Sun, 7 Aug 2011 06:35:59 +0200 Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> wrote: > Ensure all read and write locks are disabled on ck804 (and MCP51). > > Currently the same chipset enable is used for MCP51 (nForce 430) too. > There have been reports of successful writes with its variations > (e.g. A8N-LA (Nagami-GL8E)), but the chipset enables were not tagged as OK. > Due to the new "unsupported chipset"-message we will get success reports in > the case this patch does not break anything on the MCP51-based boards. > > Tested on CK804 and > Signed-off-by: Jonathan Kollasch <jakllsch(a)kollasch.net> > which was previously > Acked-by: Stefan Reinauer <stepan(a)coreboot.org> > > Rebasing, rephrasing and making errors non-fatal is > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> A refined (yes, again) version of this was Acked-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> and committed in r1593. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

[commit] r1593 - trunk
by repository service 03 Sep '12

03 Sep '12

Author: stefanct Date: Tue Sep 4 05:55:04 2012 New Revision: 1593 URL: http://flashrom.org/trac/flashrom/changeset/1593 Log: Try to remove all read and write locks on CK804 (and MCP51). We made a first step into this direction in r1405, but failed to notice that there was already an extended patch by Jonathan which was refined to become this one. Allows the removal of board_shuttle_fn25 (which was also intended to be used on the ASUS A8N-SLI Deluxe, but this was never tested). A previous iteration was tested on CK804 and Signed-off-by: Jonathan Kollasch <jakllsch(a)kollasch.net> which was then Acked-by: Stefan Reinauer <stepan(a)coreboot.org> Rebasing, refining and making errors non-fatal is Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Modified: trunk/board_enable.c trunk/chipset_enable.c trunk/print.c Modified: trunk/board_enable.c ============================================================================== --- trunk/board_enable.c Tue Sep 4 03:49:49 2012 (r1592) +++ trunk/board_enable.c Tue Sep 4 05:55:04 2012 (r1593) @@ -993,26 +993,6 @@ /* * Suited for: - * - Shuttle FN25 (SN25P): AMD S939 + NVIDIA CK804 (nForce4) - */ -static int board_shuttle_fn25(void) -{ - struct pci_dev *dev; - - dev = pci_dev_find(0x10DE, 0x0050); /* NVIDIA CK804 ISA bridge. */ - if (!dev) { - msg_perr("\nERROR: NVIDIA nForce4 ISA bridge not found.\n"); - return -1; - } - - /* One of those bits seems to be connected to TBL#, but -ENOINFO. */ - pci_write_byte(dev, 0x92, 0); - - return 0; -} - -/* - * Suited for: * - Elitegroup GeForce6100SM-M: NVIDIA MCP61 + ITE IT8726F */ static int board_ecs_geforce6100sm_m(void) @@ -2339,7 +2319,6 @@ {0x8086, 0x27A0, 0x1043, 0x1287, 0x8086, 0x27DF, 0x1043, 0x1287, "^A8J", NULL, NULL, P3, "ASUS", "A8Jm", 0, NT, intel_ich_gpio34_raise}, {0x10DE, 0x0260, 0x103C, 0x2A34, 0x10DE, 0x0264, 0x103C, 0x2A34, "NODUSM3", NULL, NULL, P3, "ASUS", "A8M2N-LA (NodusM3-GL8E)", 0, OK, nvidia_mcp_gpio0_raise}, {0x10DE, 0x0260, 0x103c, 0x2a3e, 0x10DE, 0x0264, 0x103c, 0x2a3e, "NAGAMI2L", NULL, NULL, P3, "ASUS", "A8N-LA (Nagami-GL8E)", 0, OK, nvidia_mcp_gpio0_raise}, - {0x10DE, 0x005E, 0x1043, 0x815A, 0x10DE, 0x0054, 0x1043, 0x815A, "^A8N-SLI DELUXE", NULL, NULL, P3, "ASUS", "A8N-SLI Deluxe", 0, NT, board_shuttle_fn25}, {0x10de, 0x0264, 0x1043, 0x81bc, 0x10de, 0x02f0, 0x1043, 0x81cd, NULL, NULL, NULL, P3, "ASUS", "A8N-VM CSM", 0, OK, w83627ehf_gpio22_raise_2e}, {0x10DE, 0x0264, 0x1043, 0x81C0, 0x10DE, 0x0260, 0x1043, 0x81C0, NULL, NULL, NULL, P3, "ASUS", "M2NBP-VM CSM", 0, OK, nvidia_mcp_gpio0_raise}, {0x1106, 0x1336, 0x1043, 0x80ed, 0x1106, 0x3288, 0x1043, 0x8249, NULL, NULL, NULL, P3, "ASUS", "M2V-MX", 0, OK, via_vt823x_gpio5_raise}, @@ -2433,7 +2412,6 @@ {0x8086, 0x24d3, 0x144d, 0xb025, 0x8086, 0x1050, 0x144d, 0xb025, NULL, NULL, NULL, P3, "Samsung", "Polaris 32", 0, OK, intel_ich_gpio21_raise}, {0x1106, 0x3099, 0, 0, 0x1106, 0x3074, 0, 0, NULL, "shuttle", "ak31", P3, "Shuttle", "AK31", 0, OK, w836xx_memw_enable_2e}, {0x1106, 0x3104, 0x1297, 0xa238, 0x1106, 0x3059, 0x1297, 0xc063, NULL, NULL, NULL, P3, "Shuttle", "AK38N", 256, OK, NULL}, - {0x10DE, 0x0050, 0x1297, 0x5036, 0x1412, 0x1724, 0x1297, 0x5036, NULL, NULL, NULL, P3, "Shuttle", "FN25", 0, OK, board_shuttle_fn25}, {0x1106, 0x3038, 0x0925, 0x1234, 0x1106, 0x3058, 0x15DD, 0x7609, NULL, NULL, NULL, P3, "Soyo", "SY-7VCA", 0, OK, via_apollo_gpo0_lower}, {0x10de, 0x0364, 0x108e, 0x6676, 0x10de, 0x0369, 0x108e, 0x6676, "^Sun Ultra 40 M2", NULL, NULL, P3, "Sun", "Ultra 40 M2", 0, OK, board_sun_ultra_40_m2}, {0x1106, 0x3038, 0x0925, 0x1234, 0x1106, 0x0596, 0x1106, 0, NULL, NULL, NULL, P3, "Tekram", "P6Pro-A5", 256, OK, NULL}, Modified: trunk/chipset_enable.c ============================================================================== --- trunk/chipset_enable.c Tue Sep 4 03:49:49 2012 (r1592) +++ trunk/chipset_enable.c Tue Sep 4 05:55:04 2012 (r1593) @@ -997,25 +997,74 @@ static int enable_flash_ck804(struct pci_dev *dev, const char *name) { - uint8_t old, new; + uint32_t segctrl; + uint8_t reg, old, new; + unsigned int err = 0; - pci_write_byte(dev, 0x92, 0x00); - if (pci_read_byte(dev, 0x92) != 0x00) { - msg_pinfo("Setting register 0x%x to 0x%x on %s failed " - "(WARNING ONLY).\n", 0x92, 0x00, name); + /* 0x8A is special: it is a single byte and only one nibble is touched. */ + reg = 0x8A; + segctrl = pci_read_byte(dev, reg); + if ((segctrl & 0x3) != 0x0) { + if ((segctrl & 0xC) != 0x0) { + msg_pinfo("Can not unlock existing protection in register 0x%02x.\n", reg); + err++; + } else { + msg_pdbg("Unlocking protection in register 0x%02x... ", reg); + rpci_write_byte(dev, reg, segctrl & 0xF0); + + segctrl = pci_read_byte(dev, reg); + if ((segctrl & 0x3) != 0x0) { + msg_pinfo("Could not unlock protection in register 0x%02x (new value: 0x%x).\n", + reg, segctrl); + err++; + } else + msg_pdbg("OK\n"); + } + } + + for (reg = 0x8C; reg <= 0x94; reg += 4) { + segctrl = pci_read_long(dev, reg); + if ((segctrl & 0x33333333) == 0x00000000) { + /* reads and writes are unlocked */ + continue; + } + if ((segctrl & 0xCCCCCCCC) != 0x00000000) { + msg_pinfo("Can not unlock existing protection in register 0x%02x.\n", reg); + err++; + continue; + } + msg_pdbg("Unlocking protection in register 0x%02x... ", reg); + rpci_write_long(dev, reg, 0x00000000); + + segctrl = pci_read_long(dev, reg); + if ((segctrl & 0x33333333) != 0x00000000) { + msg_pinfo("Could not unlock protection in register 0x%02x (new value: 0x%08x).\n", + reg, segctrl); + err++; + } else + msg_pdbg("OK\n"); } - old = pci_read_byte(dev, 0x88); - new = old | 0xc0; + if (err > 0) { + msg_pinfo("%d locks could not be disabled, disabling writes (reads may also fail).\n", err); + programmer_may_write = 0; + } + + reg = 0x88; + old = pci_read_byte(dev, reg); + new = old | 0xC0; if (new != old) { - rpci_write_byte(dev, 0x88, new); - if (pci_read_byte(dev, 0x88) != new) { - msg_pinfo("Setting register 0x%x to 0x%x on %s failed " - "(WARNING ONLY).\n", 0x88, new, name); + rpci_write_byte(dev, reg, new); + if (pci_read_byte(dev, reg) != new) { + msg_pinfo("Setting register 0x%02x to 0x%x on %s failed.\n", reg, new, name); + err++; } } if (enable_flash_nvidia_common(dev, name)) + err++; + + if (err > 0) return ERROR_NONFATAL; else return 0; Modified: trunk/print.c ============================================================================== --- trunk/print.c Tue Sep 4 03:49:49 2012 (r1592) +++ trunk/print.c Tue Sep 4 05:55:04 2012 (r1593) @@ -620,7 +620,7 @@ B("ASUS", "A8N-E", OK, "http://www.asus.com/Motherboards/AMD_Socket_939/A8NE/", NULL), B("ASUS", "A8N-LA (Nagami-GL8E)", OK, "http://h10025.www1.hp.com/ewfrf/wc/document?lc=en&cc=us&docname=c00647121&d…", "This is an OEM board from HP, the HP name is Nagami-GL8E."), B("ASUS", "A8N-SLI", OK, "http://www.asus.com/Motherboards/AMD_Socket_939/A8NSLI/", NULL), - B("ASUS", "A8N-SLI Deluxe", NT, NULL, "Untested board enable."), + B("ASUS", "A8N-SLI Deluxe", NT, NULL, "Should work out of the box since r1593."), B("ASUS", "A8N-SLI Premium", OK, "http://www.asus.com/Motherboards/AMD_Socket_939/A8NSLI_Premium/", NULL), B("ASUS", "A8N-VM", OK, "http://www.asus.com/Motherboards/AMD_Socket_939/A8NVM/", NULL), B("ASUS", "A8N-VM CSM", OK, "http://www.asus.com/Motherboards/AMD_Socket_939/A8NVM_CSM/", NULL),

1 0

Re: [flashrom] [PATCH 2/2] Nvidia chipset enables: refactor setting bit 0 in 0x6d
by Stefan Tauner 03 Sep '12

03 Sep '12

On Sun, 7 Aug 2011 06:36:00 +0200 stefan.tauner at student.tuwien.ac.at (Stefan Tauner) wrote: > Signed-off-by: Stefan Tauner <stefan.tauner at student.tuwien.ac.at> Refined, Acked-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> and committed in r1592. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

[commit] r1592 - trunk
by repository service 03 Sep '12

03 Sep '12

Author: stefanct Date: Tue Sep 4 03:49:49 2012 New Revision: 1592 URL: http://flashrom.org/trac/flashrom/changeset/1592 Log: Nvidia chipset enables: refactor setting bit 0 in 0x6d. This patch also changes semantics: previously failing to set this was interpreted as a fatal error by enable_flash_ck804 and enable_flash_mcp55 although the output indicated otherwise. Also, in enable_flash_nvidia_nforce2 there was no check if settings the bit succeeds. Now all methods check for success and return ERROR_NONFATAL on failure. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Modified: trunk/chipset_enable.c Modified: trunk/chipset_enable.c ============================================================================== --- trunk/chipset_enable.c Sat Sep 1 23:47:19 2012 (r1591) +++ trunk/chipset_enable.c Tue Sep 4 03:49:49 2012 (r1592) @@ -968,19 +968,33 @@ return ret; } -static int enable_flash_nvidia_nforce2(struct pci_dev *dev, const char *name) +/* sets bit 0 in 0x6d */ +static int enable_flash_nvidia_common(struct pci_dev *dev, const char *name) { - uint8_t tmp; - - rpci_write_byte(dev, 0x92, 0); + uint8_t old, new; - tmp = pci_read_byte(dev, 0x6d); - tmp |= 0x01; - rpci_write_byte(dev, 0x6d, tmp); + old = pci_read_byte(dev, 0x6d); + new = old | 0x01; + if (new == old) + return 0; + rpci_write_byte(dev, 0x6d, new); + if (pci_read_byte(dev, 0x6d) != new) { + msg_pinfo("Setting register 0x6d to 0x%02x on %s failed.\n", new, name); + return 1; + } return 0; } +static int enable_flash_nvidia_nforce2(struct pci_dev *dev, const char *name) +{ + rpci_write_byte(dev, 0x92, 0); + if (enable_flash_nvidia_common(dev, name)) + return ERROR_NONFATAL; + else + return 0; +} + static int enable_flash_ck804(struct pci_dev *dev, const char *name) { uint8_t old, new; @@ -1001,19 +1015,10 @@ } } - old = pci_read_byte(dev, 0x6d); - new = old | 0x01; - if (new == old) + if (enable_flash_nvidia_common(dev, name)) + return ERROR_NONFATAL; + else return 0; - rpci_write_byte(dev, 0x6d, new); - - if (pci_read_byte(dev, 0x6d) != new) { - msg_pinfo("Setting register 0x%x to 0x%x on %s failed " - "(WARNING ONLY).\n", 0x6d, new, name); - return -1; - } - - return 0; } static int enable_flash_osb4(struct pci_dev *dev, const char *name) @@ -1071,7 +1076,7 @@ static int enable_flash_mcp55(struct pci_dev *dev, const char *name) { - uint8_t old, new, val; + uint8_t val; uint16_t wordval; /* Set the 0-16 MB enable bits. */ @@ -1085,19 +1090,10 @@ wordval |= 0x7fff; /* 16M */ rpci_write_word(dev, 0x90, wordval); - old = pci_read_byte(dev, 0x6d); - new = old | 0x01; - if (new == old) + if (enable_flash_nvidia_common(dev, name)) + return ERROR_NONFATAL; + else return 0; - rpci_write_byte(dev, 0x6d, new); - - if (pci_read_byte(dev, 0x6d) != new) { - msg_pinfo("Setting register 0x%x to 0x%x on %s failed " - "(WARNING ONLY).\n", 0x6d, new, name); - return -1; - } - - return 0; } /*

1 0

[PATCH 3/3] Cleanup ft2322.c
by Stefan Tauner 03 Sep '12

03 Sep '12

Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- ft2232_spi.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/ft2232_spi.c b/ft2232_spi.c index 43a95e9..625dd06 100644 --- a/ft2232_spi.c +++ b/ft2232_spi.c @@ -64,8 +64,7 @@ const struct usbdev_status devs_ft2232spi[] = { {FTDI_VID, TIAO_TUMPA_PID, OK, "TIAO", "USB Multi-Protocol Adapter"}, {FTDI_VID, AMONTEC_JTAGKEY_PID, OK, "Amontec", "JTAGkey"}, {GOEPEL_VID, GOEPEL_PICOTAP_PID, OK, "GOEPEL", "PicoTAP"}, - {FIC_VID, OPENMOKO_DBGBOARD_PID, OK, "FIC", - "OpenMoko Neo1973 Debug board (V2+)"}, + {FIC_VID, OPENMOKO_DBGBOARD_PID, OK, "FIC", "OpenMoko Neo1973 Debug board (V2+)"}, {OLIMEX_VID, OLIMEX_ARM_OCD_PID, NT, "Olimex", "ARM-USB-OCD"}, {OLIMEX_VID, OLIMEX_ARM_TINY_PID, OK, "Olimex", "ARM-USB-TINY"}, {OLIMEX_VID, OLIMEX_ARM_OCD_H_PID, NT, "Olimex", "ARM-USB-OCD-H"}, @@ -74,7 +73,6 @@ const struct usbdev_status devs_ft2232spi[] = { {0}, }; - #define DEFAULT_DIVISOR 2 #define BITMODE_BITBANG_NORMAL 1 @@ -251,6 +249,7 @@ int ft2232_spi_init(void) } } free(arg); + arg = extract_programmer_param("port"); if (arg) { switch (toupper((unsigned char)*arg)) { @@ -298,6 +297,7 @@ int ft2232_spi_init(void) } } free(arg); + msg_pdbg("Using device type %s %s ", get_ft2232_vendorname(ft2232_vid, ft2232_type), get_ft2232_devicename(ft2232_vid, ft2232_type)); @@ -318,14 +318,12 @@ int ft2232_spi_init(void) f = ftdi_usb_open(ftdic, ft2232_vid, ft2232_type); if (f < 0 && f != -5) { - msg_perr("Unable to open FTDI device: %d (%s)\n", f, - ftdi_get_error_string(ftdic)); + msg_perr("Unable to open FTDI device: %d (%s)\n", f, ftdi_get_error_string(ftdic)); return -4; } if (ftdic->type != TYPE_2232H && ftdic->type != TYPE_4232H && ftdic->type != TYPE_232H) { - msg_pdbg("FTDI chip type %d is not high-speed\n", - ftdic->type); + msg_pdbg("FTDI chip type %d is not high-speed\n", ftdic->type); clock_5x = 0; } @@ -386,8 +384,6 @@ int ft2232_spi_init(void) goto ftdi_err; } - // msg_pdbg("\nft2232 chosen\n"); - register_spi_programmer(&spi_programmer_ft2232); return 0; -- Kind regards, Stefan Tauner

1 0

[PATCH 2/3] Add support for FT232H.
by Stefan Tauner 03 Sep '12

03 Sep '12

For older versions of libftdi we define TYPE_232H ourselves and this seems to be enough to get at least basic support. Signed-off-by: Ilya A. Volynets-Evenbakh <ilya(a)total-knowledge.com> Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- Makefile | 12 ++++++++++++ flashrom.8 | 6 +++--- ft2232_spi.c | 13 ++++++++++++- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 9309ce5..b992c5e 100644 --- a/Makefile +++ b/Makefile @@ -463,6 +463,7 @@ ifeq ($(CONFIG_FT2232_SPI), yes) FTDILIBS := $(shell pkg-config --libs libftdi 2>/dev/null || printf "%s" "-lftdi -lusb") # This is a totally ugly hack. FEATURE_CFLAGS += $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "-D'CONFIG_FT2232_SPI=1'") +FEATURE_CFLAGS += $(shell LC_ALL=C grep -q "FT232H := yes" .features && printf "%s" "-D'HAVE_FT232H=1'") FEATURE_LIBS += $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "$(FTDILIBS)") PROGRAMMER_OBJS += ft2232_spi.o endif @@ -717,6 +718,12 @@ int main(int argc, char **argv) endef export FTDI_TEST +define FTDI_232H_TEST +#include <ftdi.h> +enum ftdi_chip_type type = TYPE_232H; +endef +export FTDI_232H_TEST + define UTSNAME_TEST #include <sys/utsname.h> struct utsname osinfo; @@ -751,6 +758,11 @@ ifeq ($(CONFIG_FT2232_SPI), yes) @$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) .featuretest.c -o .featuretest$(EXEC_SUFFIX) $(FTDILIBS) $(LIBS) >/dev/null 2>&1 && \ ( echo "found."; echo "FTDISUPPORT := yes" >> .features.tmp ) || \ ( echo "not found."; echo "FTDISUPPORT := no" >> .features.tmp ) + @printf "Checking for FT232H support in libftdi... " + @echo "$$FTDI_232H_TEST" >> .featuretest.c + @$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) .featuretest.c -o .featuretest$(EXEC_SUFFIX) $(FTDILIBS) $(LIBS) >/dev/null 2>&1 && \ + ( echo "found."; echo "FT232H := yes" >> .features.tmp ) || \ + ( echo "not found."; echo "FT232H := no" >> .features.tmp ) endif ifeq ($(CONFIG_LINUX_SPI), yes) @printf "Checking if Linux SPI headers are present... " diff --git a/flashrom.8 b/flashrom.8 index 1699f2a..19506a3 100644 --- a/flashrom.8 +++ b/flashrom.8 @@ -15,7 +15,7 @@ chips. It's often used to flash BIOS/EFI/coreboot/firmware images in-system using a supported mainboard. However, it also supports various external PCI/USB/parallel-port/serial-port based devices which can program flash chips, including some network cards (NICs), SATA/IDE controller cards, graphics cards, -the Bus Pirate device, various FTDI FT2232/FT4232H based USB devices, and more. +the Bus Pirate device, various FTDI FT2232/FT4232H/FT232H based USB devices, and more. .PP It supports a wide range of DIP32, PLCC32, DIP8, SO8/SOIC8, TSOP32, TSOP40, TSOP48, and BGA chips, which use various protocols such as LPC, FWH, @@ -189,7 +189,7 @@ cards)" .sp .BR "* atahpt" " (for flash ROMs on Highpoint ATA/RAID controllers)" .sp -.BR "* ft2232_spi" " (for SPI flash ROMs attached to an FT2232/FT4232H family \ +.BR "* ft2232_spi" " (for SPI flash ROMs attached to an FT2232/FT4232H/FT232H family \ based USB SPI programmer), including the DLP Design DLP-USB1232H, \ FTDI FT2232H Mini-Module, FTDI FT4232H Mini-Module, openbiosprog-spi, Amontec \ JTAGkey/JTAGkey-tiny/JTAGkey-2, Dangerous Prototypes Bus Blaster, \ @@ -561,7 +561,7 @@ type and channel/interface/port it should support. For that you have to use the syntax where .B model can be -.BR 2232H ", " 4232H ", " jtagkey ", " busblaster ", " openmoko ", " \ +.BR 2232H ", " 4232H ", " 232H ", " jtagkey ", " busblaster ", " openmoko ", " \ arm-usb-tiny ", " arm-usb-tiny-h ", " arm-usb-ocd ", " arm-usb-ocd-h \ ", " tumpa ", or " picotap and diff --git a/ft2232_spi.c b/ft2232_spi.c index 0e18a0c..43a95e9 100644 --- a/ft2232_spi.c +++ b/ft2232_spi.c @@ -30,11 +30,18 @@ #include "spi.h" #include <ftdi.h> +/* This is not defined in libftdi.h <0.20 (c7e4c09e68cfa6f5e112334aa1b3bb23401c8dc7 to be exact). + * Some tests indicate that his is the only change that it is needed to support the FT232H in flashrom. */ +#if !defined(HAVE_FT232H) +#define TYPE_232H 6 +#endif + /* Please keep sorted by vendor ID, then device ID. */ #define FTDI_VID 0x0403 #define FTDI_FT2232H_PID 0x6010 #define FTDI_FT4232H_PID 0x6011 +#define FTDI_FT232H_PID 0x6014 #define TIAO_TUMPA_PID 0x8a98 #define AMONTEC_JTAGKEY_PID 0xCFF8 @@ -53,6 +60,7 @@ const struct usbdev_status devs_ft2232spi[] = { {FTDI_VID, FTDI_FT2232H_PID, OK, "FTDI", "FT2232H"}, {FTDI_VID, FTDI_FT4232H_PID, OK, "FTDI", "FT4232H"}, + {FTDI_VID, FTDI_FT232H_PID, OK, "FTDI", "FT232H"}, {FTDI_VID, TIAO_TUMPA_PID, OK, "TIAO", "USB Multi-Protocol Adapter"}, {FTDI_VID, AMONTEC_JTAGKEY_PID, OK, "Amontec", "JTAGkey"}, {GOEPEL_VID, GOEPEL_PICOTAP_PID, OK, "GOEPEL", "PicoTAP"}, @@ -190,6 +198,9 @@ int ft2232_spi_init(void) } else if (!strcasecmp(arg, "4232H")) { ft2232_type = FTDI_FT4232H_PID; channel_count = 4; + } else if (!strcasecmp(arg, "232H")) { + ft2232_type = FTDI_FT232H_PID; + channel_count = 1; } else if (!strcasecmp(arg, "jtagkey")) { ft2232_type = AMONTEC_JTAGKEY_PID; channel_count = 2; @@ -312,7 +323,7 @@ int ft2232_spi_init(void) return -4; } - if (ftdic->type != TYPE_2232H && ftdic->type != TYPE_4232H) { + if (ftdic->type != TYPE_2232H && ftdic->type != TYPE_4232H && ftdic->type != TYPE_232H) { msg_pdbg("FTDI chip type %d is not high-speed\n", ftdic->type); clock_5x = 0; -- Kind regards, Stefan Tauner

1 0

[PATCH 1/3] Add support for all 4 possible channels to the ft2232_spi programmer.
by Stefan Tauner 03 Sep '12

03 Sep '12

Add a check to validate the selected channel/interface, which not even libftdi seems to do yet. This patch changes default behavior: the new default channel/interface is A. Also, this patch uses the word 'channel' in addition or in place of 'interface' where possible without too much hassle because it is the term FTDI uses. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- flashrom.8 | 6 +++--- ft2232_spi.c | 59 +++++++++++++++++++++++++++++++++++++++------------------- 2 files changed, 43 insertions(+), 22 deletions(-) diff --git a/flashrom.8 b/flashrom.8 index bf671c2..1699f2a 100644 --- a/flashrom.8 +++ b/flashrom.8 @@ -554,7 +554,7 @@ Example: .SS .BR "ft2232_spi " programmer An optional parameter specifies the controller -type and interface/port it should support. For that you have to use the +type and channel/interface/port it should support. For that you have to use the .sp .B " flashrom \-p ft2232_spi:type=model,port=interface" .sp @@ -567,11 +567,11 @@ arm-usb-tiny ", " arm-usb-tiny-h ", " arm-usb-ocd ", " arm-usb-ocd-h \ and .B interface can be -.BR A ", or " B . +.BR A ", " B ", " C ", or " D . The default model is .B 4232H and the default interface is -.BR B . +.BR A . .sp All models supported by the ft2232_spi driver can configure the SPI clock rate by setting a divisor. The expressible divisors are all even numbers between 2 and 2^17 (=131072) resulting in SPI clock frequencies of diff --git a/ft2232_spi.c b/ft2232_spi.c index edea1e6..0e18a0c 100644 --- a/ft2232_spi.c +++ b/ft2232_spi.c @@ -161,7 +161,8 @@ int ft2232_spi_init(void) unsigned char buf[512]; int ft2232_vid = FTDI_VID; int ft2232_type = FTDI_FT4232H_PID; - enum ftdi_interface ft2232_interface = INTERFACE_B; + int channel_count = 4; /* Stores the number of channels of the device. */ + enum ftdi_interface ft2232_interface = INTERFACE_A; /* * The 'H' chips can run with an internal clock of either 12 MHz or 60 MHz, * but the non-H chips can only run at 12 MHz. We enable the divide-by-5 @@ -183,53 +184,55 @@ int ft2232_spi_init(void) arg = extract_programmer_param("type"); if (arg) { - if (!strcasecmp(arg, "2232H")) + if (!strcasecmp(arg, "2232H")) { ft2232_type = FTDI_FT2232H_PID; - else if (!strcasecmp(arg, "4232H")) + channel_count = 2; + } else if (!strcasecmp(arg, "4232H")) { ft2232_type = FTDI_FT4232H_PID; - else if (!strcasecmp(arg, "jtagkey")) { + channel_count = 4; + } else if (!strcasecmp(arg, "jtagkey")) { ft2232_type = AMONTEC_JTAGKEY_PID; - ft2232_interface = INTERFACE_A; + channel_count = 2; cs_bits = 0x18; pindir = 0x1b; } else if (!strcasecmp(arg, "picotap")) { ft2232_vid = GOEPEL_VID; ft2232_type = GOEPEL_PICOTAP_PID; - ft2232_interface = INTERFACE_A; + channel_count = 2; } else if (!strcasecmp(arg, "tumpa")) { /* Interface A is SPI1, B is SPI2. */ ft2232_type = TIAO_TUMPA_PID; - ft2232_interface = INTERFACE_A; + channel_count = 2; } else if (!strcasecmp(arg, "busblaster")) { /* In its default configuration it is a jtagkey clone */ ft2232_type = FTDI_FT2232H_PID; - ft2232_interface = INTERFACE_A; + channel_count = 2; cs_bits = 0x18; pindir = 0x1b; } else if (!strcasecmp(arg, "openmoko")) { ft2232_vid = FIC_VID; ft2232_type = OPENMOKO_DBGBOARD_PID; - ft2232_interface = INTERFACE_A; + channel_count = 2; } else if (!strcasecmp(arg, "arm-usb-ocd")) { ft2232_vid = OLIMEX_VID; ft2232_type = OLIMEX_ARM_OCD_PID; - ft2232_interface = INTERFACE_A; + channel_count = 2; cs_bits = 0x08; pindir = 0x1b; } else if (!strcasecmp(arg, "arm-usb-tiny")) { ft2232_vid = OLIMEX_VID; ft2232_type = OLIMEX_ARM_TINY_PID; - ft2232_interface = INTERFACE_A; + channel_count = 2; } else if (!strcasecmp(arg, "arm-usb-ocd-h")) { ft2232_vid = OLIMEX_VID; ft2232_type = OLIMEX_ARM_OCD_H_PID; - ft2232_interface = INTERFACE_A; + channel_count = 2; cs_bits = 0x08; pindir = 0x1b; } else if (!strcasecmp(arg, "arm-usb-tiny-h")) { ft2232_vid = OLIMEX_VID; ft2232_type = OLIMEX_ARM_TINY_H_PID; - ft2232_interface = INTERFACE_A; + channel_count = 2; } else { msg_perr("Error: Invalid device type specified.\n"); free(arg); @@ -245,14 +248,30 @@ int ft2232_spi_init(void) break; case 'B': ft2232_interface = INTERFACE_B; + if (channel_count < 2) + channel_count = -1; + break; + case 'C': + ft2232_interface = INTERFACE_C; + if (channel_count < 3) + channel_count = -1; + break; + case 'D': + ft2232_interface = INTERFACE_D; + if (channel_count < 4) + channel_count = -1; break; default: - msg_perr("Error: Invalid port/interface specified.\n"); - free(arg); - return -2; + channel_count = -1; + break; } } free(arg); + if (channel_count < 0) { + msg_perr("Error: Invalid channel/port/interface specified.\n"); + return -2; + } + arg = extract_programmer_param("divisor"); if (arg && strlen(arg)) { unsigned int temp = 0; @@ -271,8 +290,10 @@ int ft2232_spi_init(void) msg_pdbg("Using device type %s %s ", get_ft2232_vendorname(ft2232_vid, ft2232_type), get_ft2232_devicename(ft2232_vid, ft2232_type)); - msg_pdbg("interface %s\n", - (ft2232_interface == INTERFACE_A) ? "A" : "B"); + msg_pdbg("channel %s\n", + (ft2232_interface == INTERFACE_A) ? "A" : + (ft2232_interface == INTERFACE_B) ? "B" : + (ft2232_interface == INTERFACE_C) ? "C" : "D"); if (ftdi_init(ftdic) < 0) { msg_perr("ftdi_init failed\n"); @@ -280,7 +301,7 @@ int ft2232_spi_init(void) } if (ftdi_set_interface(ftdic, ft2232_interface) < 0) { - msg_perr("Unable to select interface: %s\n", ftdic->error_str); + msg_perr("Unable to select channel: %s\n", ftdic->error_str); } f = ftdi_usb_open(ftdic, ft2232_vid, ft2232_type); -- Kind regards, Stefan Tauner

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom