flashrom

flashrom@flashrom.org

3 participants
9189 discussions

Start a nNew thread

chip support
by Василий Вылегжанин 10 Nov '10

10 Nov '10

Successfully flashed my boards and here are logs attached. Gigabyte EP35-DS3L and ECS 945GCT-M5.

1 0

[commit] r1232 - trunk
by repository service 10 Nov '10

10 Nov '10

Author: hailfinger Date: Wed Nov 10 16:25:18 2010 New Revision: 1232 URL: http://flashrom.org/trac/flashrom/changeset/1232 Log: Revert PCI config space writes on shutdown. This means all chipset enables etc. will be undone on shutdown. Reversible PCI config space writes now use rpci_write_*(). PCI config space writes which are one-shot (e.g. communication via config space) should continue to use the permanent pci_write_* variants. Extend the number of available register_shutdown slots to 32. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> Modified: trunk/atahpt.c trunk/chipset_enable.c trunk/drkaiser.c trunk/flashrom.c trunk/gfxnvidia.c trunk/pcidev.c trunk/programmer.h Modified: trunk/atahpt.c ============================================================================== --- trunk/atahpt.c Wed Nov 10 04:26:57 2010 (r1231) +++ trunk/atahpt.c Wed Nov 10 16:25:18 2010 (r1232) @@ -50,7 +50,7 @@ /* Enable flash access. */ reg32 = pci_read_long(pcidev_dev, REG_FLASH_ACCESS); reg32 |= (1 << 24); - pci_write_long(pcidev_dev, REG_FLASH_ACCESS, reg32); + rpci_write_long(pcidev_dev, REG_FLASH_ACCESS, reg32); buses_supported = CHIP_BUSTYPE_PARALLEL; @@ -59,13 +59,7 @@ int atahpt_shutdown(void) { - uint32_t reg32; - - /* Disable flash access again. */ - reg32 = pci_read_long(pcidev_dev, REG_FLASH_ACCESS); - reg32 &= ~(1 << 24); - pci_write_long(pcidev_dev, REG_FLASH_ACCESS, reg32); - + /* Flash access is disabled automatically by PCI restore. */ pci_cleanup(pacc); release_io_perms(); return 0; Modified: trunk/chipset_enable.c ============================================================================== --- trunk/chipset_enable.c Wed Nov 10 04:26:57 2010 (r1231) +++ trunk/chipset_enable.c Wed Nov 10 16:25:18 2010 (r1232) @@ -47,7 +47,7 @@ */ tmp = pci_read_byte(dev, 0x47); tmp |= 0x46; - pci_write_byte(dev, 0x47, tmp); + rpci_write_byte(dev, 0x47, tmp); return 0; } @@ -58,7 +58,7 @@ tmp = pci_read_byte(dev, 0xd0); tmp |= 0xf8; - pci_write_byte(dev, 0xd0, tmp); + rpci_write_byte(dev, 0xd0, tmp); return 0; } @@ -72,7 +72,7 @@ new = pci_read_byte(dev, 0x40); new &= (~0x04); /* No idea why we clear bit 2. */ new |= 0xb; /* 0x3 for some chipsets, bit 7 seems to be don't care. */ - pci_write_byte(dev, 0x40, new); + rpci_write_byte(dev, 0x40, new); newer = pci_read_byte(dev, 0x40); if (newer != new) { msg_pinfo("tried to set register 0x%x to 0x%x on %s failed (WARNING ONLY)\n", 0x40, new, name); @@ -160,7 +160,7 @@ new = pci_read_byte(sbdev, 0x45); new &= (~0x20); new |= 0x4; - pci_write_byte(sbdev, 0x45, new); + rpci_write_byte(sbdev, 0x45, new); newer = pci_read_byte(sbdev, 0x45); if (newer != new) { msg_pinfo("tried to set register 0x%x to 0x%x on %s failed (WARNING ONLY)\n", 0x45, new, name); @@ -186,7 +186,7 @@ new = pci_read_byte(sbdev, 0x45); new &= (~0x80); new |= 0x40; - pci_write_byte(sbdev, 0x45, new); + rpci_write_byte(sbdev, 0x45, new); newer = pci_read_byte(sbdev, 0x45); if (newer != new) { msg_pinfo("tried to set register 0x%x to 0x%x on %s failed (WARNING ONLY)\n", 0x45, new, name); @@ -233,7 +233,7 @@ if (new == old) return 0; - pci_write_word(dev, xbcs, new); + rpci_write_word(dev, xbcs, new); if (pci_read_word(dev, xbcs) != new) { msg_pinfo("tried to set 0x%x to 0x%x on %s failed (WARNING ONLY)\n", xbcs, new, name); @@ -269,7 +269,7 @@ if (new == old) return 0; - pci_write_byte(dev, bios_cntl, new); + rpci_write_byte(dev, bios_cntl, new); if (pci_read_byte(dev, bios_cntl) != new) { msg_pinfo("tried to set 0x%x to 0x%x on %s failed (WARNING ONLY)\n", bios_cntl, new, name); @@ -306,8 +306,8 @@ /* FIXME: Need to undo this on shutdown. */ msg_pinfo("\nSetting IDSEL=0x%x for top 16 MB", fwh_conf); - pci_write_long(dev, 0xd0, fwh_conf); - pci_write_word(dev, 0xd4, fwh_conf); + rpci_write_long(dev, 0xd0, fwh_conf); + rpci_write_word(dev, 0xd4, fwh_conf); /* FIXME: Decode settings are not changed. */ } else if (idsel) { msg_perr("Error: idsel= specified, but no number given.\n"); @@ -403,7 +403,7 @@ new = old & ~1; if (new != old) - pci_write_byte(dev, 0xd9, new); + rpci_write_byte(dev, 0xd9, new); buses_supported = CHIP_BUSTYPE_FWH; return 0; @@ -498,17 +498,6 @@ return enable_flash_ich_dc_spi(dev, name, 10); } -static void via_do_byte_merge(void * arg) -{ - struct pci_dev * dev = arg; - uint8_t val; - - msg_pdbg("Re-enabling byte merging\n"); - val = pci_read_byte(dev, 0x71); - val |= 0x40; - pci_write_byte(dev, 0x71, val); -} - static int via_no_byte_merge(struct pci_dev *dev, const char *name) { uint8_t val; @@ -518,8 +507,7 @@ { msg_pdbg("Disabling byte merging\n"); val &= ~0x40; - pci_write_byte(dev, 0x71, val); - register_shutdown(via_do_byte_merge, dev); + rpci_write_byte(dev, 0x71, val); } return NOT_DONE_YET; /* need to find south bridge, too */ } @@ -529,12 +517,12 @@ uint8_t val; /* enable ROM decode range (1MB) FFC00000 - FFFFFFFF */ - pci_write_byte(dev, 0x41, 0x7f); + rpci_write_byte(dev, 0x41, 0x7f); /* ROM write enable */ val = pci_read_byte(dev, 0x40); val |= 0x10; - pci_write_byte(dev, 0x40, val); + rpci_write_byte(dev, 0x40, val); if (pci_read_byte(dev, 0x40) != val) { msg_pinfo("\nWARNING: Failed to enable flash write on \"%s\"\n", @@ -546,7 +534,7 @@ /* All memory cycles, not just ROM ones, go to LPC. */ val = pci_read_byte(dev, 0x59); val &= ~0x80; - pci_write_byte(dev, 0x59, val); + rpci_write_byte(dev, 0x59, val); } return 0; @@ -580,12 +568,12 @@ reg8 |= LOWER_ROM_ADDRESS_RANGE; reg8 |= UPPER_ROM_ADDRESS_RANGE; reg8 |= ROM_WRITE_ENABLE; - pci_write_byte(dev, ROM_AT_LOGIC_CONTROL_REG, reg8); + rpci_write_byte(dev, ROM_AT_LOGIC_CONTROL_REG, reg8); /* Set positive decode on ROM. */ reg8 = pci_read_byte(dev, DECODE_CONTROL_REG2); reg8 |= BIOS_ROM_POSITIVE_DECODE; - pci_write_byte(dev, DECODE_CONTROL_REG2, reg8); + rpci_write_byte(dev, DECODE_CONTROL_REG2, reg8); reg8 = pci_read_byte(dev, CS5530_RESET_CONTROL_REG); if (reg8 & CS5530_ISA_MASTER) { @@ -649,7 +637,7 @@ { uint8_t new; - pci_write_byte(dev, 0x52, 0xee); + rpci_write_byte(dev, 0x52, 0xee); new = pci_read_byte(dev, 0x52); @@ -670,7 +658,7 @@ old = pci_read_byte(dev, 0x43); new = old | 0xC0; if (new != old) { - pci_write_byte(dev, 0x43, new); + rpci_write_byte(dev, 0x43, new); if (pci_read_byte(dev, 0x43) != new) { msg_pinfo("tried to set 0x%x to 0x%x on %s failed (WARNING ONLY)\n", 0x43, new, name); } @@ -681,7 +669,7 @@ new = old | 0x01; if (new == old) return 0; - pci_write_byte(dev, 0x40, new); + rpci_write_byte(dev, 0x40, new); if (pci_read_byte(dev, 0x40) != new) { msg_pinfo("tried to set 0x%x to 0x%x on %s failed (WARNING ONLY)\n", 0x40, new, name); @@ -709,7 +697,7 @@ (prot & 0xfffffc00), (prot & 0xfffffc00) + ((prot & 0x3ff) << 8)); prot &= 0xfffffffc; - pci_write_byte(dev, reg, prot); + rpci_write_byte(dev, reg, prot); prot = pci_read_long(dev, reg); if (prot & 0x3) msg_perr("SB600 %s%sunprotect failed from %u to %u\n", @@ -765,11 +753,11 @@ { uint8_t tmp; - pci_write_byte(dev, 0x92, 0); + rpci_write_byte(dev, 0x92, 0); tmp = pci_read_byte(dev, 0x6d); tmp |= 0x01; - pci_write_byte(dev, 0x6d, tmp); + rpci_write_byte(dev, 0x6d, tmp); return 0; } @@ -781,7 +769,7 @@ old = pci_read_byte(dev, 0x88); new = old | 0xc0; if (new != old) { - pci_write_byte(dev, 0x88, new); + rpci_write_byte(dev, 0x88, new); if (pci_read_byte(dev, 0x88) != new) { msg_pinfo("tried to set 0x%x to 0x%x on %s failed (WARNING ONLY)\n", 0x88, new, name); } @@ -791,7 +779,7 @@ new = old | 0x01; if (new == old) return 0; - pci_write_byte(dev, 0x6d, new); + rpci_write_byte(dev, 0x6d, new); if (pci_read_byte(dev, 0x6d) != new) { msg_pinfo("tried to set 0x%x to 0x%x on %s failed (WARNING ONLY)\n", 0x6d, new, name); @@ -835,12 +823,12 @@ /* Enable some SMBus stuff. */ tmp = pci_read_byte(smbusdev, 0x79); tmp |= 0x01; - pci_write_byte(smbusdev, 0x79, tmp); + rpci_write_byte(smbusdev, 0x79, tmp); /* Change southbridge. */ tmp = pci_read_byte(dev, 0x48); tmp |= 0x21; - pci_write_byte(dev, 0x48, tmp); + rpci_write_byte(dev, 0x48, tmp); /* Now become a bit silly. */ tmp = INB(0xc6f); @@ -862,19 +850,19 @@ /* Set the 0-16 MB enable bits. */ val = pci_read_byte(dev, 0x88); val |= 0xff; /* 256K */ - pci_write_byte(dev, 0x88, val); + rpci_write_byte(dev, 0x88, val); val = pci_read_byte(dev, 0x8c); val |= 0xff; /* 1M */ - pci_write_byte(dev, 0x8c, val); + rpci_write_byte(dev, 0x8c, val); wordval = pci_read_word(dev, 0x90); wordval |= 0x7fff; /* 16M */ - pci_write_word(dev, 0x90, wordval); + rpci_write_word(dev, 0x90, wordval); old = pci_read_byte(dev, 0x6d); new = old | 0x01; if (new == old) return 0; - pci_write_byte(dev, 0x6d, new); + rpci_write_byte(dev, 0x6d, new); if (pci_read_byte(dev, 0x6d) != new) { msg_pinfo("tried to set 0x%x to 0x%x on %s failed (WARNING ONLY)\n", 0x6d, new, name); @@ -931,7 +919,7 @@ #if 0 val |= (1 << 6); val &= ~(1 << 5); - pci_write_byte(dev, 0x8a, val); + rpci_write_byte(dev, 0x8a, val); #endif if (mcp6x_spi_init(want_spi)) { @@ -954,11 +942,11 @@ /* Set the 4MB enable bit. */ val = pci_read_byte(dev, 0x41); val |= 0x0e; - pci_write_byte(dev, 0x41, val); + rpci_write_byte(dev, 0x41, val); val = pci_read_byte(dev, 0x43); val |= (1 << 4); - pci_write_byte(dev, 0x43, val); + rpci_write_byte(dev, 0x43, val); return 0; } Modified: trunk/drkaiser.c ============================================================================== --- trunk/drkaiser.c Wed Nov 10 04:26:57 2010 (r1231) +++ trunk/drkaiser.c Wed Nov 10 16:25:18 2010 (r1232) @@ -47,7 +47,7 @@ drkaiser_pcidev); /* Write magic register to enable flash write. */ - pci_write_word(pcidev_dev, PCI_MAGIC_DRKAISER_ADDR, + rpci_write_word(pcidev_dev, PCI_MAGIC_DRKAISER_ADDR, PCI_MAGIC_DRKAISER_VALUE); /* Map 128KB flash memory window. */ @@ -61,8 +61,7 @@ int drkaiser_shutdown(void) { - /* Write protect the flash again. */ - pci_write_word(pcidev_dev, PCI_MAGIC_DRKAISER_ADDR, 0); + /* Flash write is disabled automatically by PCI restore. */ pci_cleanup(pacc); release_io_perms(); return 0; Modified: trunk/flashrom.c ============================================================================== --- trunk/flashrom.c Wed Nov 10 04:26:57 2010 (r1231) +++ trunk/flashrom.c Wed Nov 10 16:25:18 2010 (r1232) @@ -442,7 +442,7 @@ {}, /* This entry corresponds to PROGRAMMER_INVALID. */ }; -#define SHUTDOWN_MAXFN 4 +#define SHUTDOWN_MAXFN 32 static int shutdown_fn_count = 0; struct shutdown_func_data { void (*func) (void *data); Modified: trunk/gfxnvidia.c ============================================================================== --- trunk/gfxnvidia.c Wed Nov 10 04:26:57 2010 (r1231) +++ trunk/gfxnvidia.c Wed Nov 10 16:25:18 2010 (r1232) @@ -75,7 +75,7 @@ /* Allow access to flash interface (will disable screen). */ reg32 = pci_read_long(pcidev_dev, 0x50); reg32 &= ~(1 << 0); - pci_write_long(pcidev_dev, 0x50, reg32); + rpci_write_long(pcidev_dev, 0x50, reg32); nvidia_bar = physmap("NVIDIA", io_base_addr, 16 * 1024 * 1024); @@ -89,13 +89,9 @@ int gfxnvidia_shutdown(void) { - uint32_t reg32; - - /* Disallow access to flash interface (and re-enable screen). */ - reg32 = pci_read_long(pcidev_dev, 0x50); - reg32 |= (1 << 0); - pci_write_long(pcidev_dev, 0x50, reg32); - + /* Flash interface access is disabled (and screen enabled) automatically + * by PCI restore. + */ pci_cleanup(pacc); release_io_perms(); return 0; Modified: trunk/pcidev.c ============================================================================== --- trunk/pcidev.c Wed Nov 10 04:26:57 2010 (r1231) +++ trunk/pcidev.c Wed Nov 10 16:25:18 2010 (r1232) @@ -142,3 +142,73 @@ (devs[i].status == NT) ? " (untested)" : ""); } } + +enum pci_write_type { + pci_write_type_byte, + pci_write_type_word, + pci_write_type_long, +}; + +struct undo_pci_write_data { + struct pci_dev dev; + int reg; + enum pci_write_type type; + union { + uint8_t bytedata; + uint16_t worddata; + uint32_t longdata; + }; +}; + +void undo_pci_write(void *p) +{ + struct undo_pci_write_data *data = p; + msg_pdbg("Restoring PCI config space for %02x:%02x:%01x reg 0x%02x\n", + data->dev.bus, data->dev.dev, data->dev.func, data->reg); + switch (data->type) { + case pci_write_type_byte: + pci_write_byte(&data->dev, data->reg, data->bytedata); + break; + case pci_write_type_word: + pci_write_word(&data->dev, data->reg, data->worddata); + break; + case pci_write_type_long: + pci_write_long(&data->dev, data->reg, data->longdata); + break; + } + /* p was allocated in register_undo_pci_write. */ + free(p); +} + +#define register_undo_pci_write(a, b, c) \ +{ \ + struct undo_pci_write_data *undo_pci_write_data; \ + undo_pci_write_data = malloc(sizeof(struct undo_pci_write_data)); \ + undo_pci_write_data->dev = *a; \ + undo_pci_write_data->reg = b; \ + undo_pci_write_data->type = pci_write_type_##c; \ + undo_pci_write_data->c##data = pci_read_##c(dev, reg); \ + register_shutdown(undo_pci_write, undo_pci_write_data); \ +} + +#define register_undo_pci_write_byte(a, b) register_undo_pci_write(a, b, byte) +#define register_undo_pci_write_word(a, b) register_undo_pci_write(a, b, word) +#define register_undo_pci_write_long(a, b) register_undo_pci_write(a, b, long) + +int rpci_write_byte(struct pci_dev *dev, int reg, uint8_t data) +{ + register_undo_pci_write_byte(dev, reg); + return pci_write_byte(dev, reg, data); +} + +int rpci_write_word(struct pci_dev *dev, int reg, uint16_t data) +{ + register_undo_pci_write_word(dev, reg); + return pci_write_word(dev, reg, data); +} + +int rpci_write_long(struct pci_dev *dev, int reg, uint32_t data) +{ + register_undo_pci_write_long(dev, reg); + return pci_write_long(dev, reg, data); +} Modified: trunk/programmer.h ============================================================================== --- trunk/programmer.h Wed Nov 10 04:26:57 2010 (r1231) +++ trunk/programmer.h Wed Nov 10 16:25:18 2010 (r1232) @@ -212,6 +212,12 @@ }; uint32_t pcidev_validate(struct pci_dev *dev, uint32_t bar, const struct pcidev_status *devs); uint32_t pcidev_init(uint16_t vendor_id, uint32_t bar, const struct pcidev_status *devs); +/* rpci_write_* are reversible writes. The original PCI config space register + * contents will be restored on shutdown. + */ +int rpci_write_byte(struct pci_dev *dev, int reg, u8 data); +int rpci_write_word(struct pci_dev *dev, int reg, u16 data); +int rpci_write_long(struct pci_dev *dev, int reg, u32 data); #endif /* print.c */

1 0

[PATCH] Undo all PCI writes on shutdown
by Carl-Daniel Hailfinger 10 Nov '10

10 Nov '10

Undo all PCI config space writes on shutdown. This means all chipset enables etc. will be undone on shutdown. Any writes which are one-shot should use the permanent ppci_write_* variants. Extend the number of available register_shutdown slots to 32. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-pci_configspace_shutdown_restore/drkaiser.c =================================================================== --- flashrom-pci_configspace_shutdown_restore/drkaiser.c (Revision 1225) +++ flashrom-pci_configspace_shutdown_restore/drkaiser.c (Arbeitskopie) @@ -61,8 +61,7 @@ int drkaiser_shutdown(void) { - /* Write protect the flash again. */ - pci_write_word(pcidev_dev, PCI_MAGIC_DRKAISER_ADDR, 0); + /* Flash write is disabled automatically by PCI restore. */ pci_cleanup(pacc); release_io_perms(); return 0; Index: flashrom-pci_configspace_shutdown_restore/pcidev.c =================================================================== --- flashrom-pci_configspace_shutdown_restore/pcidev.c (Revision 1225) +++ flashrom-pci_configspace_shutdown_restore/pcidev.c (Arbeitskopie) @@ -21,6 +21,7 @@ #include <stdlib.h> #include <string.h> #include "flash.h" +#define NO_PCI_REDIRECT 1 #include "programmer.h" uint32_t io_base_addr; @@ -90,7 +91,7 @@ uint32_t addr = 0, curaddr = 0; pacc = pci_alloc(); /* Get the pci_access structure */ - pci_init(pacc); /* Initialize the PCI library */ + pci_init(pacc); /* Initialize the PCI library */ pci_scan_bus(pacc); /* We want to get the list of devices */ pci_filter_init(pacc, &filter); @@ -142,3 +143,85 @@ (devs[i].status == NT) ? " (untested)" : ""); } } + +enum pci_write_type { + pci_write_type_byte, + pci_write_type_word, + pci_write_type_long, +}; + +struct undo_pci_write_data { + struct pci_dev dev; + int pos; + enum pci_write_type type; + union { + uint8_t bytedata; + uint16_t worddata; + uint32_t longdata; + }; +}; + +void undo_pci_write(void *p) +{ + struct undo_pci_write_data *data = p; + msg_pdbg("Restoring PCI config space for %02x:%02x:%01x pos 0x%02x\n", + data->dev.bus, data->dev.dev, data->dev.func, data->pos); + switch (data->type) { + case pci_write_type_byte: + pci_write_byte(&data->dev, data->pos, data->bytedata); + break; + case pci_write_type_word: + pci_write_word(&data->dev, data->pos, data->worddata); + break; + case pci_write_type_long: + pci_write_long(&data->dev, data->pos, data->longdata); + break; + } + /* p was allocated in register_undo_pci_write. */ + free(p); +} + +#define register_undo_pci_write(a, b, c) \ +{ \ + struct undo_pci_write_data *undo_pci_write_data; \ + undo_pci_write_data = malloc(sizeof(struct undo_pci_write_data)); \ + undo_pci_write_data->dev = *a; \ + undo_pci_write_data->pos = b; \ + undo_pci_write_data->type = pci_write_type_##c; \ + undo_pci_write_data->c##data = pci_read_##c(dev, pos); \ + register_shutdown(undo_pci_write, undo_pci_write_data); \ +} + +int rpci_write_byte(struct pci_dev *dev, int pos, uint8_t data) +{ + register_undo_pci_write(dev, pos, byte); + return pci_write_byte(dev, pos, data); +} + +int rpci_write_word(struct pci_dev *dev, int pos, uint16_t data) +{ + register_undo_pci_write(dev, pos, word); + return pci_write_word(dev, pos, data); +} + +int rpci_write_long(struct pci_dev *dev, int pos, uint32_t data) +{ + register_undo_pci_write(dev, pos, long); + return pci_write_long(dev, pos, data); +} + +int ppci_write_byte(struct pci_dev *dev, int pos, u8 data) +{ + return pci_write_byte(dev, pos, data); +} + +int ppci_write_word(struct pci_dev *dev, int pos, u16 data) +{ + return pci_write_word(dev, pos, data); +} + +int ppci_write_long(struct pci_dev *dev, int pos, u32 data) +{ + return pci_write_long(dev, pos, data); +} + Index: flashrom-pci_configspace_shutdown_restore/gfxnvidia.c =================================================================== --- flashrom-pci_configspace_shutdown_restore/gfxnvidia.c (Revision 1225) +++ flashrom-pci_configspace_shutdown_restore/gfxnvidia.c (Arbeitskopie) @@ -89,13 +89,9 @@ int gfxnvidia_shutdown(void) { - uint32_t reg32; - - /* Disallow access to flash interface (and re-enable screen). */ - reg32 = pci_read_long(pcidev_dev, 0x50); - reg32 |= (1 << 0); - pci_write_long(pcidev_dev, 0x50, reg32); - + /* Flash interface access is disabled (and screen enabled) automatically + * by PCI restore. + */ pci_cleanup(pacc); release_io_perms(); return 0; Index: flashrom-pci_configspace_shutdown_restore/atahpt.c =================================================================== --- flashrom-pci_configspace_shutdown_restore/atahpt.c (Revision 1225) +++ flashrom-pci_configspace_shutdown_restore/atahpt.c (Arbeitskopie) @@ -59,13 +59,7 @@ int atahpt_shutdown(void) { - uint32_t reg32; - - /* Disable flash access again. */ - reg32 = pci_read_long(pcidev_dev, REG_FLASH_ACCESS); - reg32 &= ~(1 << 24); - pci_write_long(pcidev_dev, REG_FLASH_ACCESS, reg32); - + /* Flash access is disabled automatically by PCI restore. */ pci_cleanup(pacc); release_io_perms(); return 0; Index: flashrom-pci_configspace_shutdown_restore/chipset_enable.c =================================================================== --- flashrom-pci_configspace_shutdown_restore/chipset_enable.c (Revision 1225) +++ flashrom-pci_configspace_shutdown_restore/chipset_enable.c (Arbeitskopie) @@ -498,17 +498,6 @@ return enable_flash_ich_dc_spi(dev, name, 10); } -static void via_do_byte_merge(void * arg) -{ - struct pci_dev * dev = arg; - uint8_t val; - - msg_pdbg("Re-enabling byte merging\n"); - val = pci_read_byte(dev, 0x71); - val |= 0x40; - pci_write_byte(dev, 0x71, val); -} - static int via_no_byte_merge(struct pci_dev *dev, const char *name) { uint8_t val; @@ -519,7 +508,6 @@ msg_pdbg("Disabling byte merging\n"); val &= ~0x40; pci_write_byte(dev, 0x71, val); - register_shutdown(via_do_byte_merge, dev); } return NOT_DONE_YET; /* need to find south bridge, too */ } Index: flashrom-pci_configspace_shutdown_restore/flashrom.c =================================================================== --- flashrom-pci_configspace_shutdown_restore/flashrom.c (Revision 1225) +++ flashrom-pci_configspace_shutdown_restore/flashrom.c (Arbeitskopie) @@ -441,7 +441,7 @@ {}, /* This entry corresponds to PROGRAMMER_INVALID. */ }; -#define SHUTDOWN_MAXFN 4 +#define SHUTDOWN_MAXFN 32 static int shutdown_fn_count = 0; struct shutdown_func_data { void (*func) (void *data); Index: flashrom-pci_configspace_shutdown_restore/programmer.h =================================================================== --- flashrom-pci_configspace_shutdown_restore/programmer.h (Revision 1225) +++ flashrom-pci_configspace_shutdown_restore/programmer.h (Arbeitskopie) @@ -212,7 +212,25 @@ }; uint32_t pcidev_validate(struct pci_dev *dev, uint32_t bar, const struct pcidev_status *devs); uint32_t pcidev_init(uint16_t vendor_id, uint32_t bar, const struct pcidev_status *devs); +/* rpci_write_* are reversible writes. The original PCI config space register + * contents will be restored on shutdown. + */ +int rpci_write_byte(struct pci_dev *dev, int pos, u8 data); +int rpci_write_word(struct pci_dev *dev, int pos, u16 data); +int rpci_write_long(struct pci_dev *dev, int pos, u32 data); +/* ppci_write_* are permanent writes, an alias for pci_write_*. */ +int ppci_write_byte(struct pci_dev *dev, int pos, u8 data); +int ppci_write_word(struct pci_dev *dev, int pos, u16 data); +int ppci_write_long(struct pci_dev *dev, int pos, u32 data); + +#if NO_PCI_REDIRECT +/* Don't touch pci_write_* definitions. */ +#else +#define pci_write_byte rpci_write_byte +#define pci_write_word rpci_write_word +#define pci_write_long rpci_write_long #endif +#endif /* print.c */ #if CONFIG_NIC3COM+CONFIG_NICREALTEK+CONFIG_NICNATSEMI+CONFIG_GFXNVIDIA+CONFIG_DRKAISER+CONFIG_SATASII+CONFIG_ATAHPT+CONFIG_NICINTEL_SPI >= 1 -- http://www.hailfinger.org/

4 6

[commit] r1231 - trunk
by repository service 10 Nov '10

10 Nov '10

Author: hailfinger Date: Wed Nov 10 04:26:57 2010 New Revision: 1231 URL: http://flashrom.org/trac/flashrom/changeset/1231 Log: Add support for the OpenMoko Neo1973/Neo FreeRunner debug board version 2 or 3 (vid:pid 1457:5118). The new type is called "openmoko". Information about the debug board can be found at http://wiki.openmoko.org/wiki/Debug_Board_v3 Signed-off-by: Alex Badea <vamposdecampos(a)gmail.com> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/ft2232_spi.c Modified: trunk/ft2232_spi.c ============================================================================== --- trunk/ft2232_spi.c Wed Nov 10 04:22:39 2010 (r1230) +++ trunk/ft2232_spi.c Wed Nov 10 04:26:57 2010 (r1231) @@ -35,10 +35,16 @@ #define FTDI_FT4232H_PID 0x6011 #define AMONTEC_JTAGKEY_PID 0xCFF8 +#define FIC_VID 0x1457 +#define OPENMOKO_DBGBOARD_PID 0x5118 + const struct usbdev_status devs_ft2232spi[] = { {FTDI_VID, FTDI_FT2232H_PID, OK, "FTDI", "FT2232H"}, {FTDI_VID, FTDI_FT4232H_PID, OK, "FTDI", "FT4232H"}, {FTDI_VID, AMONTEC_JTAGKEY_PID, OK, "Amontec", "JTAGkey"}, + {FIC_VID, OPENMOKO_DBGBOARD_PID, OK, + "First International Computer, Inc.", + "OpenMoko Neo1973 Debug board (V2+)"}, {}, }; @@ -144,8 +150,11 @@ ft2232_interface = INTERFACE_A; cs_bits = 0x18; pindir = 0x1b; - } - else { + } else if (!strcasecmp(arg, "openmoko")) { + ft2232_vid = FIC_VID; + ft2232_type = OPENMOKO_DBGBOARD_PID; + ft2232_interface = INTERFACE_A; + } else { msg_perr("Error: Invalid device type specified.\n"); free(arg); return 1;

1 0

[commit] r1230 - trunk
by repository service 10 Nov '10

10 Nov '10

Author: hailfinger Date: Wed Nov 10 04:22:39 2010 New Revision: 1230 URL: http://flashrom.org/trac/flashrom/changeset/1230 Log: ft2232_spi ftdi_usb_open() is called with the constant FTDI_VID vendor ID. Fix it by using the programmer-type-dependent ft2232_vid variable, to allow programmers with other vendor IDs. Signed-off-by: Alex Badea <vamposdecampos(a)gmail.com> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/ft2232_spi.c Modified: trunk/ft2232_spi.c ============================================================================== --- trunk/ft2232_spi.c Wed Nov 10 04:18:41 2010 (r1229) +++ trunk/ft2232_spi.c Wed Nov 10 04:22:39 2010 (r1230) @@ -179,7 +179,7 @@ return EXIT_FAILURE; // TODO } - f = ftdi_usb_open(ftdic, FTDI_VID, ft2232_type); + 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,

1 0

[commit] r1229 - trunk
by repository service 10 Nov '10

10 Nov '10

Author: hailfinger Date: Wed Nov 10 04:18:41 2010 New Revision: 1229 URL: http://flashrom.org/trac/flashrom/changeset/1229 Log: ft2232_spi: allow 5x clock divisor to be set at runtime. Check at init time whether the chip is a type 'H' (FT2232H or FT4232H). If not, omit the disable-divide-by-5 (0x8a) command which can confuse older chips. Signed-off-by: Alex Badea <vamposdecampos(a)gmail.com> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/ft2232_spi.c Modified: trunk/ft2232_spi.c ============================================================================== --- trunk/ft2232_spi.c Wed Nov 10 04:10:41 2010 (r1228) +++ trunk/ft2232_spi.c Wed Nov 10 04:18:41 2010 (r1229) @@ -46,11 +46,11 @@ * The 'H' chips can run internally at either 12MHz or 60MHz. * The non-H chips can only run at 12MHz. */ -#define CLOCK_5X 1 +static uint8_t clock_5x = 1; /* * In either case, the divisor is a simple integer clock divider. - * If CLOCK_5X is set, this divisor divides 30MHz, else it divides 6MHz. + * If clock_5x is set, this divisor divides 30MHz, else it divides 6MHz. */ #define DIVIDE_BY 3 /* e.g. '3' will give either 10MHz or 2MHz SPI clock. */ @@ -131,6 +131,7 @@ int ft2232_type = FTDI_FT4232H_PID; enum ftdi_interface ft2232_interface = INTERFACE_B; char *arg; + double mpsse_clk; arg = extract_programmer_param("type"); if (arg) { @@ -186,6 +187,12 @@ exit(-1); // TODO } + if (ftdic->type != TYPE_2232H && ftdic->type != TYPE_4232H) { + msg_pdbg("FTDI chip type %d is not high-speed\n", + ftdic->type); + clock_5x = 0; + } + if (ftdi_set_interface(ftdic, ft2232_interface) < 0) { msg_perr("Unable to select interface: %s\n", ftdic->error_str); @@ -207,18 +214,16 @@ msg_perr("Unable to set bitmode to SPI\n"); } -#if CLOCK_5X - msg_pdbg("Disable divide-by-5 front stage\n"); - buf[0] = 0x8a; /* Disable divide-by-5. */ - if (send_buf(ftdic, buf, 1)) - return -1; -#define MPSSE_CLK 60.0 - -#else - -#define MPSSE_CLK 12.0 + if (clock_5x) { + msg_pdbg("Disable divide-by-5 front stage\n"); + buf[0] = 0x8a; /* Disable divide-by-5. */ + if (send_buf(ftdic, buf, 1)) + return -1; + mpsse_clk = 60.0; + } else { + mpsse_clk = 12.0; + } -#endif msg_pdbg("Set clock divisor\n"); buf[0] = 0x86; /* command "set divisor" */ /* valueL/valueH are (desired_divisor - 1) */ @@ -227,8 +232,10 @@ if (send_buf(ftdic, buf, 3)) return -1; - msg_pdbg("SPI clock is %fMHz\n", - (double)(MPSSE_CLK / (((DIVIDE_BY - 1) + 1) * 2))); + msg_pdbg("MPSSE clock: %f MHz divisor: %d " + "SPI clock: %f MHz\n", + mpsse_clk, DIVIDE_BY, + (double)(mpsse_clk / (((DIVIDE_BY - 1) + 1) * 2))); /* Disconnect TDI/DO to TDO/DI for loopback. */ msg_pdbg("No loopback of TDI/DO TDO/DI\n");

1 0

[commit] r1228 - trunk
by repository service 10 Nov '10

10 Nov '10

Author: hailfinger Date: Wed Nov 10 04:10:41 2010 New Revision: 1228 URL: http://flashrom.org/trac/flashrom/changeset/1228 Log: Retry short reads in ft2232_spi. It is possible that ftdi_read_data() returns less data than requested. Catch this case and retry reading the rest of the buffer. Signed-off-by: Alex Badea <vamposdecampos(a)gmail.com> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/ft2232_spi.c Modified: trunk/ft2232_spi.c ============================================================================== --- trunk/ft2232_spi.c Wed Nov 10 00:30:43 2010 (r1227) +++ trunk/ft2232_spi.c Wed Nov 10 04:10:41 2010 (r1228) @@ -108,11 +108,16 @@ int size) { int r; - r = ftdi_read_data(ftdic, (unsigned char *) buf, size); - if (r < 0) { - msg_perr("ftdi_read_data: %d, %s\n", r, - ftdi_get_error_string(ftdic)); - return 1; + + while (size > 0) { + r = ftdi_read_data(ftdic, (unsigned char *) buf, size); + if (r < 0) { + msg_perr("ftdi_read_data: %d, %s\n", r, + ftdi_get_error_string(ftdic)); + return 1; + } + buf += r; + size -= r; } return 0; }

1 0

[PATCH v2] DediProg: support for firmware version 5.1.5
by Mathias Krause 10 Nov '10

10 Nov '10

Hi, the DediProg firmware version 5.1.5 of the SF-100 works just fine. Also I've added error handling for the initial USB command to catch -EPERM errors. This version allows any firmware version from 2.x.y to 5.x.y, as suggested by Carl Daniel. Signed-off-by: Mathias Krause <mathias.krause(a)secunet.com> Regards, Mathias

2 1

[commit] r1227 - trunk
by repository service 10 Nov '10

10 Nov '10

Author: hailfinger Date: Wed Nov 10 00:30:43 2010 New Revision: 1227 URL: http://flashrom.org/trac/flashrom/changeset/1227 Log: DediProg firmware version 5.1.5 of the SF-100 works just fine. Allow any firmware version from 2.x.y to 5.x.y. Handle errors for the initial USB command to catch -EPERM. Signed-off-by: Mathias Krause <mathias.krause(a)secunet.com> Acked-by: Patrick Georgi <patrick(a)georgi-clan.de> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/dediprog.c Modified: trunk/dediprog.c ============================================================================== --- trunk/dediprog.c Tue Nov 9 23:00:31 2010 (r1226) +++ trunk/dediprog.c Wed Nov 10 00:30:43 2010 (r1227) @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdio.h> #include <string.h> #include <usb.h> #include "flash.h" @@ -192,6 +193,7 @@ static int dediprog_check_devicestring(void) { int ret; + int fw[3]; char buf[0x11]; /* Command Prepare Receive Device String. */ @@ -216,10 +218,14 @@ msg_perr("Device not a SF100!\n"); return 1; } + if (sscanf(buf, "SF100 V:%d.%d.%d ", &fw[0], &fw[1], &fw[2]) != 3) { + msg_perr("Unexpected firmware version string!\n"); + return 1; + } /* Only these versions were tested. */ - if (memcmp(buf, "SF100 V:2.1.1 ", 0x10) && - memcmp(buf, "SF100 V:3.1.8 ", 0x10)) { - msg_perr("Unexpected firmware version!\n"); + if (fw[0] < 2 || fw[0] > 5) { + msg_perr("Unexpected firmware version %d.%d.%d!\n", fw[0], + fw[1], fw[2]); return 1; } return 0; @@ -236,6 +242,10 @@ memset(buf, 0, sizeof(buf)); ret = usb_control_msg(dediprog_handle, 0xc3, 0xb, 0x0, 0x0, buf, 0x1, DEFAULT_TIMEOUT); + if (ret < 0) { + msg_perr("Command A failed (%s)!\n", usb_strerror()); + return 1; + } if ((ret != 0x1) || (buf[0] != 0x6f)) { msg_perr("Unexpected response to Command A!\n"); return 1;

1 0

[commit] r1226 - trunk
by repository service 09 Nov '10

09 Nov '10

Author: hailfinger Date: Tue Nov 9 23:00:31 2010 New Revision: 1226 URL: http://flashrom.org/trac/flashrom/changeset/1226 Log: Support setting the Dediprog SF100 SPI voltage. Add a generic voltage parameter parser. Move tolower_string() from dummyflasher.c to flashrom.c to make it available everywhere. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Stefan Reinauer <stepan(a)coreboot.org> Modified: trunk/dediprog.c trunk/dummyflasher.c trunk/flash.h trunk/flashrom.8 trunk/flashrom.c Modified: trunk/dediprog.c ============================================================================== --- trunk/dediprog.c Fri Nov 5 15:51:59 2010 (r1225) +++ trunk/dediprog.c Tue Nov 9 23:00:31 2010 (r1226) @@ -55,34 +55,35 @@ //int usb_control_msg(usb_dev_handle *dev, int requesttype, int request, int value, int index, char *bytes, int size, int timeout); -static int dediprog_set_spi_voltage(uint16_t voltage) +static int dediprog_set_spi_voltage(int millivolt) { int ret; - unsigned int mv; + uint16_t voltage_selector; - switch (voltage) { - case 0x0: + switch (millivolt) { + case 0: /* Admittedly this one is an assumption. */ - mv = 0; + voltage_selector = 0x0; break; - case 0x12: - mv = 1800; + case 1800: + voltage_selector = 0x12; break; - case 0x11: - mv = 2500; + case 2500: + voltage_selector = 0x11; break; - case 0x10: - mv = 3500; + case 3500: + voltage_selector = 0x10; break; default: - msg_perr("Unknown voltage selector 0x%x! Aborting.\n", voltage); + msg_perr("Unknown voltage %i mV! Aborting.\n", millivolt); return 1; } - msg_pdbg("Setting SPI voltage to %u.%03u V\n", mv / 1000, mv % 1000); + msg_pdbg("Setting SPI voltage to %u.%03u V\n", millivolt / 1000, + millivolt % 1000); - ret = usb_control_msg(dediprog_handle, 0x42, 0x9, voltage, 0xff, NULL, 0x0, DEFAULT_TIMEOUT); + ret = usb_control_msg(dediprog_handle, 0x42, 0x9, voltage_selector, 0xff, NULL, 0x0, DEFAULT_TIMEOUT); if (ret != 0x0) { - msg_perr("Command Set SPI Voltage 0x%x failed!\n", voltage); + msg_perr("Command Set SPI Voltage 0x%x failed!\n", voltage_selector); return 1; } return 0; @@ -279,13 +280,74 @@ } #endif +static int parse_voltage(char *voltage) +{ + char *tmp = NULL; + int i; + int millivolt; + int fraction = 0; + + if (!voltage || !strlen(voltage)) { + msg_perr("Empty voltage= specified.\n"); + return -1; + } + millivolt = (int)strtol(voltage, &tmp, 0); + voltage = tmp; + /* Handle "," and "." as decimal point. Everything after it is assumed + * to be in decimal notation. + */ + if ((*voltage == '.') || (*voltage == ',')) { + voltage++; + for (i = 0; i < 3; i++) { + fraction *= 10; + /* Don't advance if the current character is invalid, + * but continue multiplying. + */ + if ((*voltage < '0') || (*voltage > '9')) + continue; + fraction += *voltage - '0'; + voltage++; + } + /* Throw away remaining digits. */ + voltage += strspn(voltage, "0123456789"); + } + /* The remaining string must be empty or "mV" or "V". */ + tolower_string(voltage); + + /* No unit or "V". */ + if ((*voltage == '\0') || !strncmp(voltage, "v", 1)) { + millivolt *= 1000; + millivolt += fraction; + } else if (!strncmp(voltage, "mv", 2) || + !strncmp(voltage, "milliv", 6)) { + /* No adjustment. fraction is discarded. */ + } else { + /* Garbage at the end of the string. */ + msg_perr("Garbage voltage= specified.\n"); + return -1; + } + return millivolt; +} + /* URB numbers refer to the first log ever captured. */ int dediprog_init(void) { struct usb_device *dev; + char *voltage; + int millivolt = 3500; msg_pspew("%s\n", __func__); + voltage = extract_programmer_param("voltage"); + if (voltage) { + millivolt = parse_voltage(voltage); + free(voltage); + if (millivolt < 0) { + return 1; + } + msg_pinfo("Setting voltage to %i mV\n", millivolt); + } + /* Here comes the USB stuff. */ usb_init(); usb_find_busses(); @@ -315,7 +377,7 @@ if (dediprog_command_c()) return 1; /* URB 11. Command Set SPI Voltage. */ - if (dediprog_set_spi_voltage(0x10)) + if (dediprog_set_spi_voltage(millivolt)) return 1; buses_supported = CHIP_BUSTYPE_SPI; Modified: trunk/dummyflasher.c ============================================================================== --- trunk/dummyflasher.c Fri Nov 5 15:51:59 2010 (r1225) +++ trunk/dummyflasher.c Tue Nov 9 23:00:31 2010 (r1226) @@ -19,7 +19,6 @@ #include <string.h> #include <stdlib.h> -#include <ctype.h> #include "flash.h" #include "chipdrivers.h" #include "programmer.h" @@ -61,12 +60,6 @@ static int spi_write_256_chunksize = 256; -static void tolower_string(char *str) -{ - for (; *str != '\0'; str++) - *str = (char)tolower((unsigned char)*str); -} - int dummy_init(void) { char *bustext = NULL; Modified: trunk/flash.h ============================================================================== --- trunk/flash.h Fri Nov 5 15:51:59 2010 (r1225) +++ trunk/flash.h Tue Nov 9 23:00:31 2010 (r1226) @@ -197,6 +197,7 @@ int read_flash_to_file(struct flashchip *flash, char *filename); int min(int a, int b); int max(int a, int b); +void tolower_string(char *str); char *extract_param(char **haystack, char *needle, char *delim); int check_erased_range(struct flashchip *flash, int start, int len); int verify_range(struct flashchip *flash, uint8_t *cmpbuf, int start, int len, char *message); Modified: trunk/flashrom.8 ============================================================================== --- trunk/flashrom.8 Fri Nov 5 15:51:59 2010 (r1225) +++ trunk/flashrom.8 Tue Nov 9 23:00:31 2010 (r1226) @@ -402,7 +402,20 @@ (in Hz). The default is the maximum frequency of 8 MHz. .TP .BR "dediprog " programmer -No parameters defined yet. +An optional +.B voltage +parameter specifies the voltage the Dediprog should use. The default unit is +Volt if no unit is specified. You can use +.BR mV ", " milliVolt ", " V " or " Volt +as unit specifier. Syntax is +.sp +.B "flashrom \-p dediprog:voltage=value" +.sp +where +.B value +can be any of +.BR 0V ", " 1.8V ", " 2.5V ", " 3.5V +or the equivalent in mV. .TP .BR "rayer_spi " programmer The default I/O base address used for the parallel port is 0x378 and you can use Modified: trunk/flashrom.c ============================================================================== --- trunk/flashrom.c Fri Nov 5 15:51:59 2010 (r1225) +++ trunk/flashrom.c Tue Nov 9 23:00:31 2010 (r1226) @@ -29,6 +29,7 @@ #endif #include <string.h> #include <stdlib.h> +#include <ctype.h> #include <getopt.h> #if HAVE_UTSNAME == 1 #include <sys/utsname.h> @@ -615,6 +616,12 @@ return i; } +void tolower_string(char *str) +{ + for (; *str != '\0'; str++) + *str = (char)tolower((unsigned char)*str); +} + char *strcat_realloc(char *dest, const char *src) { dest = realloc(dest, strlen(dest) + strlen(src) + 1);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom