summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2008-11-03 00:20:22 +0000
committerCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2008-11-03 00:20:22 +0000
commit6f31f110319418cb7c63132090f7970e3425862a (patch)
tree2ba7360948b29da6f69314a1cb8a8d3abed167df
parent6287e2e7aa2c0459a9fcb0af8a5fb1f4d5bca4f8 (diff)
Dump ICH8/ICH9/ICH10 SPI registers in flashrom.
This helps a lot if we have to track down configuration weirdnesses. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3723 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
-rw-r--r--util/flashrom/chipset_enable.c50
1 files changed, 45 insertions, 5 deletions
diff --git a/util/flashrom/chipset_enable.c b/util/flashrom/chipset_enable.c
index d7a5b024c1..658313d548 100644
--- a/util/flashrom/chipset_enable.c
+++ b/util/flashrom/chipset_enable.c
@@ -232,9 +232,11 @@ static int enable_flash_ich_dc_spi(struct pci_dev *dev, const char *name,
{
int ret, i;
uint8_t old, new, bbs, buc;
- uint16_t spibar_offset;
+ uint16_t spibar_offset, tmp2;
uint32_t tmp, gcs;
void *rcrb;
+ //TODO: These names are incorrect for EP80579. For that, the solution would look like the commented line
+ //static const char *straps_names[] = {"SPI", "reserved", "reserved", "LPC" };
static const char *straps_names[] = { "reserved", "SPI", "PCI", "LPC" };
/* Enable Flash Writes */
@@ -334,10 +336,48 @@ static int enable_flash_ich_dc_spi(struct pci_dev *dev, const char *name,
}
break;
case BUS_TYPE_ICH9_SPI:
- /* TODO: Add dumping function for ICH8/ICH9, or drop the
- * whole SPIBAR dumping from chipset_enable.c - There's
- * inteltool for this task already.
- */
+ tmp2 = *(uint16_t *) (spibar + 0);
+ printf_debug("0x00: 0x%04x (HSFS)\n", tmp2);
+ printf_debug("FLOCKDN %i, ", (tmp >> 15 & 1));
+ printf_debug("FDV %i, ", (tmp >> 14) & 1);
+ printf_debug("FDOPSS %i, ", (tmp >> 13) & 1);
+ printf_debug("SCIP %i, ", (tmp >> 5) & 1);
+ printf_debug("BERASE %i, ", (tmp >> 3) & 3);
+ printf_debug("AEL %i, ", (tmp >> 2) & 1);
+ printf_debug("FCERR %i, ", (tmp >> 1) & 1);
+ printf_debug("FDONE %i\n", (tmp >> 0) & 1);
+
+ tmp = *(uint32_t *) (spibar + 0x50);
+ printf_debug("0x50: 0x%08x (FRAP)\n", tmp);
+ printf_debug("BMWAG %i, ", (tmp >> 24) & 0xff);
+ printf_debug("BMRAG %i, ", (tmp >> 16) & 0xff);
+ printf_debug("BRWA %i, ", (tmp >> 8) & 0xff);
+ printf_debug("BRRA %i\n", (tmp >> 0) & 0xff);
+
+ printf_debug("0x54: 0x%08x (FREG0)\n",
+ *(uint32_t *) (spibar + 0x54));
+ printf_debug("0x58: 0x%08x (FREG1)\n",
+ *(uint32_t *) (spibar + 0x58));
+ printf_debug("0x5C: 0x%08x (FREG2)\n",
+ *(uint32_t *) (spibar + 0x5C));
+ printf_debug("0x60: 0x%08x (FREG3)\n",
+ *(uint32_t *) (spibar + 0x60));
+ printf_debug("0x64: 0x%08x (FREG4)\n",
+ *(uint32_t *) (spibar + 0x64));
+ printf_debug("0x74: 0x%08x (PR0)\n",
+ *(uint32_t *) (spibar + 0x74));
+ printf_debug("0x78: 0x%08x (PR1)\n",
+ *(uint32_t *) (spibar + 0x78));
+ printf_debug("0x7C: 0x%08x (PR2)\n",
+ *(uint32_t *) (spibar + 0x7C));
+ printf_debug("0x80: 0x%08x (PR3)\n",
+ *(uint32_t *) (spibar + 0x80));
+ printf_debug("0x84: 0x%08x (PR4)\n",
+ *(uint32_t *) (spibar + 0x84));
+ /* printf_debug("0xA0: 0x%08x (BBAR)\n",
+ *(uint32_t *) (spibar + 0xA0)); ICH10 only? */
+ printf_debug("0xB0: 0x%08x (FDOC)\n",
+ *(uint32_t *) (spibar + 0xB0));
break;
default:
/* Nothing */