openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-29 07:53:44 +02:00
Code Issues Releases Wiki Activity

Uwe tested the recent SB600 SPI commit and notified me of one unexpected problem

Browse Source 
It seems some boards do not use SPI_HOLD at all. Take that into account
when trying to figure out if SPI is available.

Print the SB600 ROM strap override register status for better debugging.

Corresponding to flashrom svn r516.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
This commit is contained in:
Carl-Daniel Hailfinger 2009-05-15 23:36:23 +00:00
parent 515ab3de05
commit 9862251f89
1 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
chipset_enable.c
View File

@ -719,7 +719,8 @@ static int enable_flash_sb600(struct pci_dev *dev, const char *name)
reg &= 0xC0; reg &= 0xC0;
printf_debug("GPIO31 used for %s\n", (reg & (1 << 6)) ? "GPIO" : "SPI_HOLD"); printf_debug("GPIO31 used for %s\n", (reg & (1 << 6)) ? "GPIO" : "SPI_HOLD");
printf_debug("GPIO32 used for %s\n", (reg & (1 << 7)) ? "GPIO" : "SPI_CS"); printf_debug("GPIO32 used for %s\n", (reg & (1 << 7)) ? "GPIO" : "SPI_CS");
if (reg != 0x00) /* SPI_HOLD is not used on all boards, filter it out. */
if ((reg & 0x80) != 0x00)
has_spi = 0; has_spi = 0;
/* GPIO47/SPI_CLK status */ /* GPIO47/SPI_CLK status */
reg = pci_read_byte(smbus_dev, 0xA7); reg = pci_read_byte(smbus_dev, 0xA7);
@ -732,6 +733,29 @@ static int enable_flash_sb600(struct pci_dev *dev, const char *name)
if (has_spi) if (has_spi)
flashbus = BUS_TYPE_SB600_SPI; flashbus = BUS_TYPE_SB600_SPI;
/* Read ROM strap override register. */
OUTB(0x8f, 0xcd6);
reg = INB(0xcd7);
reg &= 0x0e;
printf_debug("ROM strap override is %sactive", (reg & 0x02) ? "" : "not ");
if (reg & 0x02) {
switch ((reg & 0x0c) >> 2) {
case 0x00:
printf_debug(": LPC");
break;
case 0x01:
printf_debug(": PCI");
break;
case 0x02:
printf_debug(": FWH");
break;
case 0x03:
printf_debug(": SPI");
break;
}
}
printf_debug("\n");
/* Force enable SPI ROM in SB600 PM register. /* Force enable SPI ROM in SB600 PM register.
* If we enable SPI ROM here, we have to disable it after we leave. * If we enable SPI ROM here, we have to disable it after we leave.
* But how can we know which ROM we are going to handle? So we have * But how can we know which ROM we are going to handle? So we have