coreboot May 2009

coreboot@coreboot.org

92 participants
571 discussions

[PATCH] flashrom: Fix SST25 status register routines
by Carl-Daniel Hailfinger 06 May '09

06 May '09

Improve SST25 status register routines: - Using a 4-bit index into an array with 8 elements leads to out-of-bounds accesses. That bug was introduced by a self-acked patch from someone. Use proper bit masking to fix this. - Factor out common SST25 status register printing. - Use the common SST25 status register printing for SST25VF080B. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-SST25VF080B/spi.c =================================================================== --- flashrom-SST25VF080B/spi.c (Revision 464) +++ flashrom-SST25VF080B/spi.c (Arbeitskopie) @@ -275,6 +275,15 @@ spi_prettyprint_status_register_common(status); } +void spi_prettyprint_status_register_sst25(uint8_t status) +{ + printf_debug("Chip status register: Block Protect Write Disable " + "(BPL) is %sset\n", (status & (1 << 7)) ? "" : "not "); + printf_debug("Chip status register: Auto Address Increment Programming " + "(AAI) is %sset\n", (status & (1 << 6)) ? "" : "not "); + spi_prettyprint_status_register_common(status); +} + /* Prettyprint the status register. Works for * SST 25VF016 */ @@ -289,11 +298,7 @@ "100000H-1FFFFFH", "all", "all" }; - printf_debug("Chip status register: Block Protect Write Disable " - "(BPL) is %sset\n", (status & (1 << 7)) ? "" : "not "); - printf_debug("Chip status register: Auto Address Increment Programming " - "(AAI) is %sset\n", (status & (1 << 6)) ? "" : "not "); - spi_prettyprint_status_register_common(status); + spi_prettyprint_status_register_sst25(status); printf_debug("Resulting block protection : %s\n", bpt[(status & 0x1c) >> 2]); } @@ -307,13 +312,9 @@ "0x40000-0x7ffff", "all blocks", "all blocks", "all blocks", "all blocks" }; - printf_debug("Chip status register: Block Protect Write Disable " - "(BPL) is %sset\n", (status & (1 << 7)) ? "" : "not "); - printf_debug("Chip status register: Auto Address Increment Programming " - "(AAI) is %sset\n", (status & (1 << 6)) ? "" : "not "); - spi_prettyprint_status_register_common(status); + spi_prettyprint_status_register_sst25(status); printf_debug("Resulting block protection : %s\n", - bpt[(status & 0x3c) >> 2]); + bpt[(status & 0x1c) >> 2]); } void spi_prettyprint_status_register(struct flashchip *flash) @@ -341,6 +342,9 @@ case 0x258d: spi_prettyprint_status_register_sst25vf040b(status); break; + case 0x258e: + spi_prettyprint_status_register_sst25(status); + break; } break; } -- http://www.hailfinger.org/ Index: flashrom-SST25VF080B/spi.c =================================================================== --- flashrom-SST25VF080B/spi.c (Revision 464) +++ flashrom-SST25VF080B/spi.c (Arbeitskopie) @@ -275,6 +275,15 @@ spi_prettyprint_status_register_common(status); } +void spi_prettyprint_status_register_sst25(uint8_t status) +{ + printf_debug("Chip status register: Block Protect Write Disable " + "(BPL) is %sset\n", (status & (1 << 7)) ? "" : "not "); + printf_debug("Chip status register: Auto Address Increment Programming " + "(AAI) is %sset\n", (status & (1 << 6)) ? "" : "not "); + spi_prettyprint_status_register_common(status); +} + /* Prettyprint the status register. Works for * SST 25VF016 */ @@ -289,11 +298,7 @@ "100000H-1FFFFFH", "all", "all" }; - printf_debug("Chip status register: Block Protect Write Disable " - "(BPL) is %sset\n", (status & (1 << 7)) ? "" : "not "); - printf_debug("Chip status register: Auto Address Increment Programming " - "(AAI) is %sset\n", (status & (1 << 6)) ? "" : "not "); - spi_prettyprint_status_register_common(status); + spi_prettyprint_status_register_sst25(status); printf_debug("Resulting block protection : %s\n", bpt[(status & 0x1c) >> 2]); } @@ -307,13 +312,9 @@ "0x40000-0x7ffff", "all blocks", "all blocks", "all blocks", "all blocks" }; - printf_debug("Chip status register: Block Protect Write Disable " - "(BPL) is %sset\n", (status & (1 << 7)) ? "" : "not "); - printf_debug("Chip status register: Auto Address Increment Programming " - "(AAI) is %sset\n", (status & (1 << 6)) ? "" : "not "); - spi_prettyprint_status_register_common(status); + spi_prettyprint_status_register_sst25(status); printf_debug("Resulting block protection : %s\n", - bpt[(status & 0x3c) >> 2]); + bpt[(status & 0x1c) >> 2]); } void spi_prettyprint_status_register(struct flashchip *flash) @@ -341,6 +342,9 @@ case 0x258d: spi_prettyprint_status_register_sst25vf040b(status); break; + case 0x258e: + spi_prettyprint_status_register_sst25(status); + break; } break; }

2 3

Re: [coreboot] [flashrom] r467 - trunk
by Carl-Daniel Hailfinger 06 May '09

06 May '09

Just in case someone wants a more detailed explanation: prot is read again after the first if (prot & 0x3) and may have changed, so the second if (prot & 0x3) is not redundant. Regards, Carl-Daniel On 06.05.2009 15:51, svn(a)coreboot.org wrote: > Author: hailfinger > Date: 2009-05-06 15:51:44 +0200 (Wed, 06 May 2009) > New Revision: 467 > > Modified: > trunk/chipset_enable.c > Log: > Revert r466 because it introduced a bug: > If unprotect succeeded, it will print "SB600 unprotect failed". > > Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> > Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> > > > Modified: trunk/chipset_enable.c > =================================================================== > --- trunk/chipset_enable.c 2009-05-06 13:43:26 UTC (rev 466) > +++ trunk/chipset_enable.c 2009-05-06 13:51:44 UTC (rev 467) > @@ -675,11 +675,12 @@ > prot &= 0xfffffffc; > pci_write_byte(dev, reg, prot); > prot = pci_read_long(dev, reg); > - printf("SB600 %s%sunprotect failed from %u to %u\n", > - (prot & 0x1) ? "write " : "", > - (prot & 0x2) ? "read " : "", > - (prot & 0xfffffc00), > - (prot & 0xfffffc00) + ((prot & 0x3ff) << 8)); > + if (prot & 0x3) > + printf("SB600 still %s%sprotected from %u to %u\n", > + (prot & 0x1) ? "write " : "", > + (prot & 0x2) ? "read " : "", > + (prot & 0xfffffc00), > + (prot & 0xfffffc00) + ((prot & 0x3ff) << 8)); > } > > /* Read SPI_BaseAddr */ > > > -- http://www.hailfinger.org/

1 0

[flashrom] r468 - trunk
by svn＠coreboot.org 06 May '09

06 May '09

Author: hailfinger Date: 2009-05-06 15:59:44 +0200 (Wed, 06 May 2009) New Revision: 468 Modified: trunk/spi.c Log: Improve SST25 status register routines: - Using a 4-bit index into an array with 8 elements leads to out-of-bounds accesses. Use proper bit masking to fix this. - Factor out common SST25 status register printing. - Use the common SST25 status register printing for SST25VF080B. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Peter Stuge <peter(a)stuge.se> Modified: trunk/spi.c =================================================================== --- trunk/spi.c 2009-05-06 13:51:44 UTC (rev 467) +++ trunk/spi.c 2009-05-06 13:59:44 UTC (rev 468) @@ -275,6 +275,15 @@ spi_prettyprint_status_register_common(status); } +void spi_prettyprint_status_register_sst25(uint8_t status) +{ + printf_debug("Chip status register: Block Protect Write Disable " + "(BPL) is %sset\n", (status & (1 << 7)) ? "" : "not "); + printf_debug("Chip status register: Auto Address Increment Programming " + "(AAI) is %sset\n", (status & (1 << 6)) ? "" : "not "); + spi_prettyprint_status_register_common(status); +} + /* Prettyprint the status register. Works for * SST 25VF016 */ @@ -289,11 +298,7 @@ "100000H-1FFFFFH", "all", "all" }; - printf_debug("Chip status register: Block Protect Write Disable " - "(BPL) is %sset\n", (status & (1 << 7)) ? "" : "not "); - printf_debug("Chip status register: Auto Address Increment Programming " - "(AAI) is %sset\n", (status & (1 << 6)) ? "" : "not "); - spi_prettyprint_status_register_common(status); + spi_prettyprint_status_register_sst25(status); printf_debug("Resulting block protection : %s\n", bpt[(status & 0x1c) >> 2]); } @@ -307,13 +312,9 @@ "0x40000-0x7ffff", "all blocks", "all blocks", "all blocks", "all blocks" }; - printf_debug("Chip status register: Block Protect Write Disable " - "(BPL) is %sset\n", (status & (1 << 7)) ? "" : "not "); - printf_debug("Chip status register: Auto Address Increment Programming " - "(AAI) is %sset\n", (status & (1 << 6)) ? "" : "not "); - spi_prettyprint_status_register_common(status); + spi_prettyprint_status_register_sst25(status); printf_debug("Resulting block protection : %s\n", - bpt[(status & 0x3c) >> 2]); + bpt[(status & 0x1c) >> 2]); } void spi_prettyprint_status_register(struct flashchip *flash) @@ -341,6 +342,9 @@ case 0x258d: spi_prettyprint_status_register_sst25vf040b(status); break; + case 0x258e: + spi_prettyprint_status_register_sst25(status); + break; } break; }

1 0

[flashrom] r467 - trunk
by svn＠coreboot.org 06 May '09

06 May '09

Author: hailfinger Date: 2009-05-06 15:51:44 +0200 (Wed, 06 May 2009) New Revision: 467 Modified: trunk/chipset_enable.c Log: Revert r466 because it introduced a bug: If unprotect succeeded, it will print "SB600 unprotect failed". Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/chipset_enable.c =================================================================== --- trunk/chipset_enable.c 2009-05-06 13:43:26 UTC (rev 466) +++ trunk/chipset_enable.c 2009-05-06 13:51:44 UTC (rev 467) @@ -675,11 +675,12 @@ prot &= 0xfffffffc; pci_write_byte(dev, reg, prot); prot = pci_read_long(dev, reg); - printf("SB600 %s%sunprotect failed from %u to %u\n", - (prot & 0x1) ? "write " : "", - (prot & 0x2) ? "read " : "", - (prot & 0xfffffc00), - (prot & 0xfffffc00) + ((prot & 0x3ff) << 8)); + if (prot & 0x3) + printf("SB600 still %s%sprotected from %u to %u\n", + (prot & 0x1) ? "write " : "", + (prot & 0x2) ? "read " : "", + (prot & 0xfffffc00), + (prot & 0xfffffc00) + ((prot & 0x3ff) << 8)); } /* Read SPI_BaseAddr */

1 0

[flashrom] r466 - trunk
by svn＠coreboot.org 06 May '09

06 May '09

Author: stuge Date: 2009-05-06 15:43:26 +0200 (Wed, 06 May 2009) New Revision: 466 Modified: trunk/chipset_enable.c Log: Cleanup redundant condition and clarify message a little. Signed-off-by: Peter Stuge <peter(a)stuge.se> Acked-by: Peter Stuge <peter(a)stuge.se> Modified: trunk/chipset_enable.c =================================================================== --- trunk/chipset_enable.c 2009-05-06 13:38:55 UTC (rev 465) +++ trunk/chipset_enable.c 2009-05-06 13:43:26 UTC (rev 466) @@ -675,12 +675,11 @@ prot &= 0xfffffffc; pci_write_byte(dev, reg, prot); prot = pci_read_long(dev, reg); - if (prot & 0x3) - printf("SB600 still %s%sprotected from %u to %u\n", - (prot & 0x1) ? "write " : "", - (prot & 0x2) ? "read " : "", - (prot & 0xfffffc00), - (prot & 0xfffffc00) + ((prot & 0x3ff) << 8)); + printf("SB600 %s%sunprotect failed from %u to %u\n", + (prot & 0x1) ? "write " : "", + (prot & 0x2) ? "read " : "", + (prot & 0xfffffc00), + (prot & 0xfffffc00) + ((prot & 0x3ff) << 8)); } /* Read SPI_BaseAddr */

1 0

[PATCH] chipset_enable: Fix open /dev/cpu
by Beber 06 May '09

06 May '09

Hi, Here is a fix for chipset_enable.c when there is not /dev/cpu. Open fail no there is not reason to lseek in. Actually this is a trivial fix for not well handled return from open. Signed-off-by: Bertrand Jacquin <beber(a)meleeweb.net> Patch is attached -- Beber

5 6

[flashrom] r465 - trunk
by svn＠coreboot.org 06 May '09

06 May '09

Author: stuge Date: 2009-05-06 15:38:55 +0200 (Wed, 06 May 2009) New Revision: 465 Modified: trunk/chipset_enable.c Log: Touch up some error messages in enable_flash_cs5536(). Signed-off-by: Peter Stuge <peter(a)stuge.se> Acked-by: Peter Stuge <peter(a)stuge.se> Modified: trunk/chipset_enable.c =================================================================== --- trunk/chipset_enable.c 2009-05-06 00:35:31 UTC (rev 464) +++ trunk/chipset_enable.c 2009-05-06 13:38:55 UTC (rev 465) @@ -512,13 +512,13 @@ fd_msr = open("/dev/cpu/0/msr", O_RDWR); if (fd_msr == -1) { - perror("open msr"); + perror("open(/dev/cpu/0/msr)"); + printf("Cannot operate on MSR. Did you run 'modprobe msr'?\n"); return -1; } if (lseek64(fd_msr, (off64_t) MSR_RCONF_DEFAULT, SEEK_SET) == -1) { perror("lseek64"); - printf("Cannot operate on MSR. Did you run 'modprobe msr'?\n"); close(fd_msr); return -1; }

1 0

CBFS transition plan
by Myles Watson 06 May '09

06 May '09

I like CBFS and hope all boards can use it soon. I'm afraid that if we're not careful we'll bring the instability of v3 to v2 as we try to bring back what we've learned. I'd like to see an orderly transition to CBFS, from simplest to most complex. I think fixed areas, romstraps, etc. should be last. Simple things that don't work yet in CBFS: 1. Normal/Fallback/Failover - a. There are comments in the code that failover should disappear. Either failover should disappear or the comments should. b. Normal should be stored in CBFS, not concatenated into the bootblock. 2. Delete - Delete works on the assumption that you want contiguous files a. I'm not convinced that fixed CBFS areas will be simpler than ldscripts. I consider them both ugly. 3. PCI ROM optimization. There should be some optimization for ROMs. a. Possibilities: 1. Traverse ROM once and set a flag in devices which have ROMs 2. Traverse ROM and keep a list of ROMs 3. .... 4. Geode ROM handling in CBFS. a. It would be nice to change the code so that it doesn't have to be in a fixed location (maybe via a copy to RAM?) I guess the short version is that I'd like to keep all the ugly details in the bootblock and peel them out one at a time. I think we'll break fewer boards that way. I feel like we've been lucky to catch some of the little glitches lately, and we've had help from people being willing to bisect. Thanks, Myles

6 15

[PATCH] flashrom: Clean up SB400 chipset enable
by Carl-Daniel Hailfinger 06 May '09

06 May '09

Clean up the SB400 chipset enable code. Use pci_dev_find() instead of setting up a filter and iterating over PCI devices. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-sb400/chipset_enable.c =================================================================== --- flashrom-sb400/chipset_enable.c (Revision 463) +++ flashrom-sb400/chipset_enable.c (Arbeitskopie) @@ -741,19 +741,11 @@ static int enable_flash_sb400(struct pci_dev *dev, const char *name) { uint8_t tmp; - struct pci_filter f; struct pci_dev *smbusdev; /* Look for the SMBus device. */ - pci_filter_init((struct pci_access *)0, &f); - f.vendor = 0x1002; - f.device = 0x4372; + smbusdev = pci_dev_find(0x1002, 0x4372); - for (smbusdev = pacc->devices; smbusdev; smbusdev = smbusdev->next) { - if (pci_filter_match(&f, smbusdev)) - break; - } - if (!smbusdev) { fprintf(stderr, "ERROR: SMBus device not found. Aborting.\n"); exit(1); -- http://www.hailfinger.org/ Index: flashrom-sb400/chipset_enable.c =================================================================== --- flashrom-sb400/chipset_enable.c (Revision 463) +++ flashrom-sb400/chipset_enable.c (Arbeitskopie) @@ -741,19 +741,11 @@ static int enable_flash_sb400(struct pci_dev *dev, const char *name) { uint8_t tmp; - struct pci_filter f; struct pci_dev *smbusdev; /* Look for the SMBus device. */ - pci_filter_init((struct pci_access *)0, &f); - f.vendor = 0x1002; - f.device = 0x4372; + smbusdev = pci_dev_find(0x1002, 0x4372); - for (smbusdev = pacc->devices; smbusdev; smbusdev = smbusdev->next) { - if (pci_filter_match(&f, smbusdev)) - break; - } - if (!smbusdev) { fprintf(stderr, "ERROR: SMBus device not found. Aborting.\n"); exit(1);

2 2

[flashrom] r464 - trunk
by svn＠coreboot.org 06 May '09

06 May '09

Author: hailfinger Date: 2009-05-06 02:35:31 +0200 (Wed, 06 May 2009) New Revision: 464 Modified: trunk/chipset_enable.c Log: Clean up the SB400 chipset enable code. Use pci_dev_find() instead of setting up a filter and iterating over PCI devices. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/chipset_enable.c =================================================================== --- trunk/chipset_enable.c 2009-05-05 22:50:07 UTC (rev 463) +++ trunk/chipset_enable.c 2009-05-06 00:35:31 UTC (rev 464) @@ -741,19 +741,11 @@ static int enable_flash_sb400(struct pci_dev *dev, const char *name) { uint8_t tmp; - struct pci_filter f; struct pci_dev *smbusdev; /* Look for the SMBus device. */ - pci_filter_init((struct pci_access *)0, &f); - f.vendor = 0x1002; - f.device = 0x4372; + smbusdev = pci_dev_find(0x1002, 0x4372); - for (smbusdev = pacc->devices; smbusdev; smbusdev = smbusdev->next) { - if (pci_filter_match(&f, smbusdev)) - break; - } - if (!smbusdev) { fprintf(stderr, "ERROR: SMBus device not found. Aborting.\n"); exit(1);

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
58
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

coreboot May 2009