flashrom February 2010

flashrom@flashrom.org

55 participants
173 discussions

[commit] r912 - trunk
by repository service 24 Feb '10

24 Feb '10

Author: mkarcher Date: Wed Feb 24 23:43:44 2010 New Revision: 912 URL: http://flashrom.org/trac/coreboot/changeset/912 Log: Remove unused short IDs This also replaces the meaningless numbers in the DMI debug printout with the parameter names. Signed-off-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/dmi.c Modified: trunk/dmi.c ============================================================================== --- trunk/dmi.c Wed Feb 24 01:04:40 2010 (r911) +++ trunk/dmi.c Wed Feb 24 23:43:44 2010 (r912) @@ -36,16 +36,13 @@ /* The short_id for baseboard starts with "m" as in mainboard to leave "b" available for BIOS */ -struct { - const char *dmidecode_name; - char short_id[3]; -} dmi_properties[DMI_ID_INVALID] = { - {"system-manufacturer", "sm"}, - {"system-product-name", "sp"}, - {"system-version", "sv"}, - {"baseboard-manufacturer", "mm"}, - {"baseboard-product-name", "mp"}, - {"baseboard-version", "mv"} +const char *dmidecode_names[DMI_ID_INVALID] = { + "system-manufacturer", + "system-product-name", + "system-version", + "baseboard-manufacturer", + "baseboard-product-name", + "baseboard-version" }; #define DMI_COMMAND_LEN_MAX 260 @@ -71,8 +68,7 @@ { char commandline[DMI_COMMAND_LEN_MAX+40]; snprintf(commandline, sizeof(commandline), - "%s -s %s", dmidecode_command, - dmi_properties[i].dmidecode_name); + "%s -s %s", dmidecode_command, dmidecode_names[i]); dmidecode_pipe = popen(commandline, "r"); if (!dmidecode_pipe) { @@ -100,7 +96,8 @@ if (answerbuf[0] != 0 && answerbuf[strlen(answerbuf) - 1] == '\n') answerbuf[strlen(answerbuf) - 1] = 0; - printf_debug("DMI string %d: \"%s\"\n", i, answerbuf); + printf_debug("DMI string %s: \"%s\"\n", dmidecode_names[i], + answerbuf); dmistrings[i] = strdup(answerbuf); } has_dmi_support = 1;

1 0

Re: [flashrom] [PATCH 2/3] Factor out DMI string reading into subfunction
by Carl-Daniel Hailfinger 24 Feb '10

24 Feb '10

On 24.02.2010 14:28, Michael Karcher wrote: > Signed-off-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> > Looks OK, but I'm in a hurry and couldn't check too thorougly. I need to regenerate the diff with ignored whitespace to see the real changes. Will do so later. Right now, only a small coding style comment: You have if (condition) { block } in a few places. AFAIK flashrom coding style has the opening brace on the same line as the if/do/switch statement. The only "standalone" opening braces are those of functions. Regards, Carl-Daniel -- "I do consider assignment statements and pointer variables to be among computer science's most valuable treasures." -- Donald E. Knuth

1 0

Working: Tyan Tempest i5000PW S5382
by Rob Lazzurs 24 Feb '10

24 Feb '10

Hello, I have just used flashrom to update the above motherboard and this worked as expected with a little help from twice11 on the IRC channel. Thanks again for the excellent software, if any further information is required please just let me know. Kind regards. -- Rob Lazzurs | Senior Systems Administrator | TomTom Dynamic Content & Publishing | robert.lazzurs(a)tomtom.com | +44 (0) 131 445 6065 office

1 0

[PATCH 3/3] Warn if running on laptops
by Michael Karcher 24 Feb '10

24 Feb '10

--- dmi.c | 9 +++++++++ flash.h | 1 + internal.c | 12 ++++++++++++ 3 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dmi.c b/dmi.c index 100767f..ad023e0 100644 --- a/dmi.c +++ b/dmi.c @@ -96,6 +96,7 @@ static char *get_dmi_string(const char * string_name) void dmi_init(void) { int i; + char * chassis_type; has_dmi_support = 1; for (i = 0; i < DMI_ID_INVALID; i++) { dmistrings[i] = get_dmi_string(dmidecode_names[i]); @@ -104,6 +105,14 @@ void dmi_init(void) break; } } + + chassis_type = get_dmi_string("chassis-type"); + if (chassis_type && !strcmp(chassis_type, "Notebook")) + { + printf_debug("Laptop detected via DMI"); + is_laptop = 1; + } + free (chassis_type); } /** diff --git a/flash.h b/flash.h index ff2004c..0ad6212 100644 --- a/flash.h +++ b/flash.h @@ -382,6 +382,7 @@ struct pci_dev *pci_card_find(uint16_t vendor, uint16_t device, void get_io_perms(void); void release_io_perms(void); #if INTERNAL_SUPPORT == 1 +extern int is_laptop; void probe_superio(void); int internal_init(void); int internal_shutdown(void); diff --git a/internal.c b/internal.c index 12dae39..d557738 100644 --- a/internal.c +++ b/internal.c @@ -110,6 +110,8 @@ void probe_superio(void) #endif } +int is_laptop; + int internal_init(void) { int ret = 0; @@ -131,6 +133,16 @@ int internal_init(void) /* Probe for the SuperI/O chip and fill global struct superio. */ probe_superio(); + /* Warn if a laptop is detected */ + if (is_laptop) + printf("========================================================================\n" + "WARNING! You seem to be running flashrom on a laptop.\n" + "Laptops, notebooks and netbooks are difficult to support and we recommend\n" + "to use the vendor flashing utility. The embedded controller (EC) in these\n" + "machines often interacts badly with flashing\n" + "See http://www.flashrom.org/Supported_hardware#Unsupported_Laptops.2FNotebooks.…" + "========================================================================\n"); + /* try to enable it. Failure IS an option, since not all motherboards * really need this to be done, etc., etc. */ -- 1.6.5

1 0

[PATCH 2/3] Factor out DMI string reading into subfunction
by Michael Karcher 24 Feb '10

24 Feb '10

Signed-off-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> --- dmi.c | 85 +++++++++++++++++++++++++++++++++-------------------------------- 1 files changed, 43 insertions(+), 42 deletions(-) diff --git a/dmi.c b/dmi.c index c80a568..100767f 100644 --- a/dmi.c +++ b/dmi.c @@ -54,55 +54,56 @@ char *dmistrings[DMI_ID_INVALID]; /* strings longer than 4096 in DMI are just insane */ #define DMI_MAX_ANSWER_LEN 4096 -void dmi_init(void) +static char *get_dmi_string(const char * string_name) { FILE *dmidecode_pipe; - int i; - char *answerbuf = malloc(DMI_MAX_ANSWER_LEN); - if(!answerbuf) + char answerbuf[DMI_MAX_ANSWER_LEN]; + char commandline[DMI_COMMAND_LEN_MAX+40]; + snprintf(commandline, sizeof(commandline), + "%s -s %s", dmidecode_command, string_name); + dmidecode_pipe = popen(commandline, "r"); + if (!dmidecode_pipe) { - fprintf(stderr, "DMI: couldn't alloc answer buffer\n"); - return; + printf_debug("DMI pipe open error\n"); + return NULL; } - for (i = 0; i < DMI_ID_INVALID; i++) + if (!fgets(answerbuf, DMI_MAX_ANSWER_LEN, dmidecode_pipe) && + ferror(dmidecode_pipe)) { - char commandline[DMI_COMMAND_LEN_MAX+40]; - snprintf(commandline, sizeof(commandline), - "%s -s %s", dmidecode_command, dmidecode_names[i]); - dmidecode_pipe = popen(commandline, "r"); - if (!dmidecode_pipe) - { - printf_debug("DMI pipe open error\n"); - goto out_free; - } - if (!fgets(answerbuf, DMI_MAX_ANSWER_LEN, dmidecode_pipe) && - ferror(dmidecode_pipe)) - { - printf_debug("DMI pipe read error\n"); - pclose(dmidecode_pipe); - goto out_free; - } - /* Toss all output above DMI_MAX_ANSWER_LEN away to prevent - deadlock on pclose. */ - while (!feof(dmidecode_pipe)) - getc(dmidecode_pipe); - if (pclose(dmidecode_pipe) != 0) - { - printf_debug("DMI pipe close error\n"); - goto out_free; - } - - /* chomp trailing newline */ - if (answerbuf[0] != 0 && - answerbuf[strlen(answerbuf) - 1] == '\n') - answerbuf[strlen(answerbuf) - 1] = 0; - printf_debug("DMI string %s: \"%s\"\n", dmidecode_names[i], - answerbuf); - dmistrings[i] = strdup(answerbuf); + printf_debug("DMI pipe read error\n"); + pclose(dmidecode_pipe); + return NULL; + } + /* Toss all output above DMI_MAX_ANSWER_LEN away to prevent + deadlock on pclose. */ + while (!feof(dmidecode_pipe)) + getc(dmidecode_pipe); + if (pclose(dmidecode_pipe) != 0) + { + printf_debug("DMI pipe close error\n"); + return NULL; } + + /* chomp trailing newline */ + if (answerbuf[0] != 0 && + answerbuf[strlen(answerbuf) - 1] == '\n') + answerbuf[strlen(answerbuf) - 1] = 0; + printf_debug("DMI string %s: \"%s\"\n", string_name, answerbuf); + + return strdup(answerbuf); +} + +void dmi_init(void) +{ + int i; has_dmi_support = 1; -out_free: - free(answerbuf); + for (i = 0; i < DMI_ID_INVALID; i++) { + dmistrings[i] = get_dmi_string(dmidecode_names[i]); + if (!dmistrings[i]) { + has_dmi_support = 0; + break; + } + } } /** -- 1.6.5

1 0

[PATCH 1/3] Remove unused short IDs
by Michael Karcher 24 Feb '10

24 Feb '10

This also replaces the meaningless numbers in the DMI debug printout with the parameter names. Signed-off-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> --- dmi.c | 23 ++++++++++------------- 1 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dmi.c b/dmi.c index f97aff7..c80a568 100644 --- a/dmi.c +++ b/dmi.c @@ -36,16 +36,13 @@ enum dmi_strings { /* The short_id for baseboard starts with "m" as in mainboard to leave "b" available for BIOS */ -struct { - const char *dmidecode_name; - char short_id[3]; -} dmi_properties[DMI_ID_INVALID] = { - {"system-manufacturer", "sm"}, - {"system-product-name", "sp"}, - {"system-version", "sv"}, - {"baseboard-manufacturer", "mm"}, - {"baseboard-product-name", "mp"}, - {"baseboard-version", "mv"} +const char *dmidecode_names[DMI_ID_INVALID] = { + "system-manufacturer", + "system-product-name", + "system-version", + "baseboard-manufacturer", + "baseboard-product-name", + "baseboard-version" }; #define DMI_COMMAND_LEN_MAX 260 @@ -71,8 +68,7 @@ void dmi_init(void) { char commandline[DMI_COMMAND_LEN_MAX+40]; snprintf(commandline, sizeof(commandline), - "%s -s %s", dmidecode_command, - dmi_properties[i].dmidecode_name); + "%s -s %s", dmidecode_command, dmidecode_names[i]); dmidecode_pipe = popen(commandline, "r"); if (!dmidecode_pipe) { @@ -100,7 +96,8 @@ void dmi_init(void) if (answerbuf[0] != 0 && answerbuf[strlen(answerbuf) - 1] == '\n') answerbuf[strlen(answerbuf) - 1] = 0; - printf_debug("DMI string %d: \"%s\"\n", i, answerbuf); + printf_debug("DMI string %s: \"%s\"\n", dmidecode_names[i], + answerbuf); dmistrings[i] = strdup(answerbuf); } has_dmi_support = 1; -- 1.6.5

1 0

Epox EP-8RDA3+ rev. 3.2 - flash fail
by Michał Wazgird 24 Feb '10

24 Feb '10

This looks like latest oficial BIOS (and BIOS i currently have): http://epox.com/article.asp?ID=1494&showsupportlinks=YES But i don't support 1TB sized SATA drives. I tried to flash this: http://www.elektroda.pl/rtvforum/topic849507.html#5022832 Sorry don't have superiotool/coreboot, so can't put now output of this...

2 1

Re: [flashrom] [PATCH] Replace PCI_OK/PCI_NT by OK/NT
by Uwe Hermann 24 Feb '10

24 Feb '10

On Wed, Jan 20, 2010 at 03:48:38PM +0100, Michael Karcher wrote: > We don't need to duplicate OK and NT as PCI_OK and PCI_NT if the symbols > are already there (defined for the chipset enable table). > > Signed-off-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> There are some left-overs: $ grep PCI_NT * pcidev.c: if (devs[i].status == PCI_NT) { pcidev.c: (devs[i].status == PCI_NT) ? " (untested)" : ""); print_wiki.c: (devs[i].status == PCI_NT) ? (c) ? "?2" : "?" : "OK"); With those fixed, this is: Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Uwe. -- http://www.hermann-uwe.de | http://www.randomprojects.org http://www.crazy-hacks.org | http://www.unmaintained-free-software.org

2 2

[commit] r911 - trunk
by repository service 24 Feb '10

24 Feb '10

Author: mkarcher Date: Wed Feb 24 01:04:40 2010 New Revision: 911 URL: http://flashrom.org/trac/coreboot/changeset/911 Log: Replace PCI_OK/PCI_NT by OK/NT We don't need to duplicate OK and NT as PCI_OK and PCI_NT if the symbols are already there (defined for the chipset enable table). Signed-off-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Modified: trunk/atahpt.c trunk/drkaiser.c trunk/flash.h trunk/gfxnvidia.c trunk/nic3com.c trunk/pcidev.c trunk/print_wiki.c trunk/satasii.c Modified: trunk/atahpt.c ============================================================================== --- trunk/atahpt.c Wed Feb 24 01:00:21 2010 (r910) +++ trunk/atahpt.c Wed Feb 24 01:04:40 2010 (r911) @@ -31,9 +31,9 @@ #define PCI_VENDOR_ID_HPT 0x1103 struct pcidev_status ata_hpt[] = { - {0x1103, 0x0004, PCI_NT, "Highpoint", "HPT366/368/370/370A/372/372N"}, - {0x1103, 0x0005, PCI_NT, "Highpoint", "HPT372A/372N"}, - {0x1103, 0x0006, PCI_NT, "Highpoint", "HPT302/302N"}, + {0x1103, 0x0004, NT, "Highpoint", "HPT366/368/370/370A/372/372N"}, + {0x1103, 0x0005, NT, "Highpoint", "HPT372A/372N"}, + {0x1103, 0x0006, NT, "Highpoint", "HPT302/302N"}, {}, }; Modified: trunk/drkaiser.c ============================================================================== --- trunk/drkaiser.c Wed Feb 24 01:00:21 2010 (r910) +++ trunk/drkaiser.c Wed Feb 24 01:04:40 2010 (r911) @@ -29,7 +29,7 @@ #define PCI_MAGIC_DRKAISER_VALUE 0xa971 struct pcidev_status drkaiser_pcidev[] = { - {0x1803, 0x5057, PCI_OK, "Dr. Kaiser", "PC-Waechter (Actel FPGA)"}, + {0x1803, 0x5057, OK, "Dr. Kaiser", "PC-Waechter (Actel FPGA)"}, {}, }; Modified: trunk/flash.h ============================================================================== --- trunk/flash.h Wed Feb 24 01:00:21 2010 (r910) +++ trunk/flash.h Wed Feb 24 01:04:40 2010 (r911) @@ -311,8 +311,6 @@ #if NEED_PCI == 1 /* pcidev.c */ -#define PCI_OK 0 -#define PCI_NT 1 /* Not tested */ extern uint32_t io_base_addr; extern struct pci_access *pacc; Modified: trunk/gfxnvidia.c ============================================================================== --- trunk/gfxnvidia.c Wed Feb 24 01:00:21 2010 (r910) +++ trunk/gfxnvidia.c Wed Feb 24 01:04:40 2010 (r911) @@ -28,29 +28,29 @@ uint8_t *nvidia_bar; struct pcidev_status gfx_nvidia[] = { - {0x10de, 0x0010, PCI_NT, "NVIDIA", "Mutara V08 [NV2]" }, - {0x10de, 0x0018, PCI_NT, "NVIDIA", "RIVA 128" }, - {0x10de, 0x0020, PCI_NT, "NVIDIA", "RIVA TNT" }, - {0x10de, 0x0028, PCI_NT, "NVIDIA", "RIVA TNT2/TNT2 Pro" }, - {0x10de, 0x0029, PCI_NT, "NVIDIA", "RIVA TNT2 Ultra" }, - {0x10de, 0x002c, PCI_NT, "NVIDIA", "Vanta/Vanta LT" }, - {0x10de, 0x002d, PCI_OK, "NVIDIA", "RIVA TNT2 Model 64/Model 64 Pro" }, - {0x10de, 0x00a0, PCI_NT, "NVIDIA", "Aladdin TNT2" }, - {0x10de, 0x0100, PCI_NT, "NVIDIA", "GeForce 256" }, - {0x10de, 0x0101, PCI_NT, "NVIDIA", "GeForce DDR" }, - {0x10de, 0x0103, PCI_NT, "NVIDIA", "Quadro" }, - {0x10de, 0x0110, PCI_NT, "NVIDIA", "GeForce2 MX" }, - {0x10de, 0x0111, PCI_NT, "NVIDIA", "GeForce2 MX" }, - {0x10de, 0x0112, PCI_NT, "NVIDIA", "GeForce2 GO" }, - {0x10de, 0x0113, PCI_NT, "NVIDIA", "Quadro2 MXR" }, - {0x10de, 0x0150, PCI_NT, "NVIDIA", "GeForce2 GTS/Pro" }, - {0x10de, 0x0151, PCI_NT, "NVIDIA", "GeForce2 GTS" }, - {0x10de, 0x0152, PCI_NT, "NVIDIA", "GeForce2 Ultra" }, - {0x10de, 0x0153, PCI_NT, "NVIDIA", "Quadro2 Pro" }, - {0x10de, 0x0200, PCI_NT, "NVIDIA", "GeForce 3 nFX" }, - {0x10de, 0x0201, PCI_NT, "NVIDIA", "GeForce 3 nFX" }, - {0x10de, 0x0202, PCI_NT, "NVIDIA", "GeForce 3 nFX Ultra" }, - {0x10de, 0x0203, PCI_NT, "NVIDIA", "Quadro 3 DDC" }, + {0x10de, 0x0010, NT, "NVIDIA", "Mutara V08 [NV2]" }, + {0x10de, 0x0018, NT, "NVIDIA", "RIVA 128" }, + {0x10de, 0x0020, NT, "NVIDIA", "RIVA TNT" }, + {0x10de, 0x0028, NT, "NVIDIA", "RIVA TNT2/TNT2 Pro" }, + {0x10de, 0x0029, NT, "NVIDIA", "RIVA TNT2 Ultra" }, + {0x10de, 0x002c, NT, "NVIDIA", "Vanta/Vanta LT" }, + {0x10de, 0x002d, OK, "NVIDIA", "RIVA TNT2 Model 64/Model 64 Pro" }, + {0x10de, 0x00a0, NT, "NVIDIA", "Aladdin TNT2" }, + {0x10de, 0x0100, NT, "NVIDIA", "GeForce 256" }, + {0x10de, 0x0101, NT, "NVIDIA", "GeForce DDR" }, + {0x10de, 0x0103, NT, "NVIDIA", "Quadro" }, + {0x10de, 0x0110, NT, "NVIDIA", "GeForce2 MX" }, + {0x10de, 0x0111, NT, "NVIDIA", "GeForce2 MX" }, + {0x10de, 0x0112, NT, "NVIDIA", "GeForce2 GO" }, + {0x10de, 0x0113, NT, "NVIDIA", "Quadro2 MXR" }, + {0x10de, 0x0150, NT, "NVIDIA", "GeForce2 GTS/Pro" }, + {0x10de, 0x0151, NT, "NVIDIA", "GeForce2 GTS" }, + {0x10de, 0x0152, NT, "NVIDIA", "GeForce2 Ultra" }, + {0x10de, 0x0153, NT, "NVIDIA", "Quadro2 Pro" }, + {0x10de, 0x0200, NT, "NVIDIA", "GeForce 3 nFX" }, + {0x10de, 0x0201, NT, "NVIDIA", "GeForce 3 nFX" }, + {0x10de, 0x0202, NT, "NVIDIA", "GeForce 3 nFX Ultra" }, + {0x10de, 0x0203, NT, "NVIDIA", "Quadro 3 DDC" }, {}, }; Modified: trunk/nic3com.c ============================================================================== --- trunk/nic3com.c Wed Feb 24 01:00:21 2010 (r910) +++ trunk/nic3com.c Wed Feb 24 01:04:40 2010 (r911) @@ -36,20 +36,20 @@ struct pcidev_status nics_3com[] = { /* 3C90xB */ - {0x10b7, 0x9055, PCI_OK, "3COM", "3C90xB: PCI 10/100 Mbps; shared 10BASE-T/100BASE-TX"}, - {0x10b7, 0x9001, PCI_NT, "3COM", "3C90xB: PCI 10/100 Mbps; shared 10BASE-T/100BASE-T4" }, - {0x10b7, 0x9004, PCI_OK, "3COM", "3C90xB: PCI 10BASE-T (TPO)" }, - {0x10b7, 0x9005, PCI_NT, "3COM", "3C90xB: PCI 10BASE-T/10BASE2/AUI (COMBO)" }, - {0x10b7, 0x9006, PCI_NT, "3COM", "3C90xB: PCI 10BASE-T/10BASE2 (TPC)" }, - {0x10b7, 0x900a, PCI_NT, "3COM", "3C90xB: PCI 10BASE-FL" }, - {0x10b7, 0x905a, PCI_NT, "3COM", "3C90xB: PCI 10BASE-FX" }, - {0x10b7, 0x9058, PCI_OK, "3COM", "3C905B: Cyclone 10/100/BNC" }, + {0x10b7, 0x9055, OK, "3COM", "3C90xB: PCI 10/100 Mbps; shared 10BASE-T/100BASE-TX"}, + {0x10b7, 0x9001, NT, "3COM", "3C90xB: PCI 10/100 Mbps; shared 10BASE-T/100BASE-T4" }, + {0x10b7, 0x9004, OK, "3COM", "3C90xB: PCI 10BASE-T (TPO)" }, + {0x10b7, 0x9005, NT, "3COM", "3C90xB: PCI 10BASE-T/10BASE2/AUI (COMBO)" }, + {0x10b7, 0x9006, NT, "3COM", "3C90xB: PCI 10BASE-T/10BASE2 (TPC)" }, + {0x10b7, 0x900a, NT, "3COM", "3C90xB: PCI 10BASE-FL" }, + {0x10b7, 0x905a, NT, "3COM", "3C90xB: PCI 10BASE-FX" }, + {0x10b7, 0x9058, OK, "3COM", "3C905B: Cyclone 10/100/BNC" }, /* 3C905C */ - {0x10b7, 0x9200, PCI_OK, "3COM", "3C905C: EtherLink 10/100 PCI (TX)" }, + {0x10b7, 0x9200, OK, "3COM", "3C905C: EtherLink 10/100 PCI (TX)" }, /* 3C980C */ - {0x10b7, 0x9805, PCI_NT, "3COM", "3C980C: EtherLink Server 10/100 PCI (TX)" }, + {0x10b7, 0x9805, NT, "3COM", "3C980C: EtherLink Server 10/100 PCI (TX)" }, {}, }; Modified: trunk/pcidev.c ============================================================================== --- trunk/pcidev.c Wed Feb 24 01:00:21 2010 (r910) +++ trunk/pcidev.c Wed Feb 24 01:04:40 2010 (r911) @@ -49,7 +49,7 @@ dev->vendor_id, dev->device_id, dev->bus, dev->dev, dev->func); - if (devs[i].status == PCI_NT) { + if (devs[i].status == NT) { printf("===\nThis PCI device is UNTESTED. Please " "report the 'flashrom -p xxxx' output \n" "to flashrom(a)flashrom.org if it works " @@ -117,6 +117,6 @@ printf("%s %s [%02x:%02x]%s\n", devs[i].vendor_name, devs[i].device_name, devs[i].vendor_id, devs[i].device_id, - (devs[i].status == PCI_NT) ? " (untested)" : ""); + (devs[i].status == NT) ? " (untested)" : ""); } } Modified: trunk/print_wiki.c ============================================================================== --- trunk/print_wiki.c Wed Feb 24 01:00:21 2010 (r910) +++ trunk/print_wiki.c Wed Feb 24 01:04:40 2010 (r911) @@ -541,7 +541,7 @@ "%04x:%04x || {{%s}}\n", (c) ? "eeeeee" : "dddddd", devs[i].vendor_name, devs[i].device_name, devs[i].vendor_id, devs[i].device_id, - (devs[i].status == PCI_NT) ? (c) ? "?2" : "?" : "OK"); + (devs[i].status == NT) ? (c) ? "?2" : "?" : "OK"); } } Modified: trunk/satasii.c ============================================================================== --- trunk/satasii.c Wed Feb 24 01:00:21 2010 (r910) +++ trunk/satasii.c Wed Feb 24 01:04:40 2010 (r911) @@ -30,12 +30,12 @@ uint16_t id; struct pcidev_status satas_sii[] = { - {0x1095, 0x0680, PCI_OK, "Silicon Image", "PCI0680 Ultra ATA-133 Host Ctrl"}, - {0x1095, 0x3112, PCI_OK, "Silicon Image", "SiI 3112 [SATALink/SATARaid] SATA Ctrl"}, - {0x1095, 0x3114, PCI_OK, "Silicon Image", "SiI 3114 [SATALink/SATARaid] SATA Ctrl"}, - {0x1095, 0x3124, PCI_NT, "Silicon Image", "SiI 3124 PCI-X SATA Ctrl"}, - {0x1095, 0x3132, PCI_OK, "Silicon Image", "SiI 3132 SATA Raid II Ctrl"}, - {0x1095, 0x3512, PCI_NT, "Silicon Image", "SiI 3512 [SATALink/SATARaid] SATA Ctrl"}, + {0x1095, 0x0680, OK, "Silicon Image", "PCI0680 Ultra ATA-133 Host Ctrl"}, + {0x1095, 0x3112, OK, "Silicon Image", "SiI 3112 [SATALink/SATARaid] SATA Ctrl"}, + {0x1095, 0x3114, OK, "Silicon Image", "SiI 3114 [SATALink/SATARaid] SATA Ctrl"}, + {0x1095, 0x3124, NT, "Silicon Image", "SiI 3124 PCI-X SATA Ctrl"}, + {0x1095, 0x3132, OK, "Silicon Image", "SiI 3132 SATA Raid II Ctrl"}, + {0x1095, 0x3512, NT, "Silicon Image", "SiI 3512 [SATALink/SATARaid] SATA Ctrl"}, {}, };

1 0

Re: [flashrom] [PATCH] Fix PIIX4 GPO set
by Luc Verhaegen 24 Feb '10

24 Feb '10

On Thu, Feb 11, 2010 at 07:48:15PM +0100, Michael Karcher wrote: > Intel datasheet says "byte accesses only". Looks like they mean it. > > Signed-off-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> > --- > board_enable.c | 11 +++++++---- > 1 files changed, 7 insertions(+), 4 deletions(-) > > diff --git a/board_enable.c b/board_enable.c > index 5d89929..76b5a6a 100644 > --- a/board_enable.c > +++ b/board_enable.c > @@ -578,6 +578,7 @@ static int board_artecgroup_dbe6x(const char *name) > */ > static int intel_piix4_gpo_set(unsigned int gpo, int raise) > { > + unsigned int gpo_byte, gpo_bit; > struct pci_dev *dev; > uint32_t tmp, base; > > @@ -632,12 +633,14 @@ static int intel_piix4_gpo_set(unsigned int gpo, int raise) > /* PM IO base */ > base = pci_read_long(dev, 0x40) & 0x0000FFC0; > > - tmp = INL(base + 0x34); /* GPO register */ > + gpo_byte = gpo >> 3; > + gpo_bit = gpo & 7; > + tmp = INB(base + 0x34 + gpo_byte); /* GPO register */ > if (raise) > - tmp |= 0x01 << gpo; > + tmp |= 0x01 << gpo_bit; > else > - tmp |= ~(0x01 << gpo); > - OUTL(tmp, base + 0x34); > + tmp |= ~(0x01 << gpo_bit); > + OUTB(tmp, base + 0x34 + gpo_byte); > > return 0; > } > -- > 1.6.5 Acked-by: Luc Verhaegen <libv(a)skynet.be> Luc Verhaegen.

2 1

← Newer
1
2
3
4
5
6
7
8
9
...
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom February 2010