Changeset 1443

Timestamp:

09/16/11 01:52:55 (8 months ago)

Author:

stefanct

Message:

ichspi: add ICH/PCH flash descriptor decoding via FDOC/FDOD

based on the work of Matthias 'mazzoo' Wenzel this patch adds pretty
printing of those ICH/PCH flash descriptor sections that are
cached/mapped by the chipset (and which are therefore reachable via
FDOC/FDOD registers).

this includes the following:

• content section:

describes the image and some generic properties (number of
sections, offset of sections, PCH/ICH and MCH/PROC strap
offsets and lengths)

• component section:

identify the different SPI flash chips and their capabilities.

• region section

similarly to a partition table this describes the different regions.
the content of FLREG* is derived from this section.

• master section

defines SPI master (host, ME, GbE) access rights of the
individual regions. the content of PR* is derived from this section.

this is only a part of the data included in the descriptor. other
information can be retrieved from a complete binary dump of the
descriptor region only.

this patch also adds macros and pretty printing for "Vendor Specific
Component Capabilities" registers: there are two of them: lower and
upper. they describe the properties of the address space divided by
FPBA (which allows to use multiple flash chips or partitions with
different properties). the properties of all supported flash chips
(together with their RDIDs) are stored in the same format in table
in a descriptor section (which is used by the ME apparently). a
later patch will use the macros outside of ichspi.c which is the
reason why the prettyprinting function and the register bit macros
are not defined in ichspi.c but ich_descriptors.h (else they would
be moved in the follow-up patch).

because this patch relies on (compiler) implementation-specific
layouting of bit-fields, it checks for correct layout before taking
any action on runtime.

Signed-off-by: Stefan Tauner <stefan.tauner@…>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@…>

Location:

trunk

Files:

• Makefile (modified) (1 diff)
• ich_descriptors.c (added)
• ich_descriptors.h (added)
• ichspi.c (modified) (7 diffs)

trunk/Makefile

@@ -350 +350 @@
 PROGRAMMER_OBJS += processor_enable.o chipset_enable.o board_enable.o cbtable.o dmi.o internal.o
 ifeq ($(ARCH),"x86")
-PROGRAMMER_OBJS += it87spi.o it85spi.o ichspi.o sb600spi.o wbsio_spi.o mcp6x_spi.o
+PROGRAMMER_OBJS += it87spi.o it85spi.o sb600spi.o wbsio_spi.o mcp6x_spi.o
+PROGRAMMER_OBJS += ichspi.o ich_descriptors.o
 else
 endif

trunk/ichspi.c

@@ -30 +30 @@
 #include "programmer.h"
 #include "spi.h"
+#include "ich_descriptors.h"
 
 /* ICH9 controller register definition */
@@ -119 +120 @@
 #define ICH9_REG_BBAR           0xA0    /* 32 Bits BIOS Base Address Configuration */
 #define BBAR_MASK       0x00ffff00              /* 8-23: Bottom of System Flash */
+
+#define ICH8_REG_VSCC           0xC1    /* 32 Bits Vendor Specific Component Capabilities */
+#define ICH9_REG_LVSCC          0xC4    /* 32 Bits Host Lower Vendor Specific Component Capabilities */
+#define ICH9_REG_UVSCC          0xC8    /* 32 Bits Host Upper Vendor Specific Component Capabilities */
+/* The individual fields of the VSCC registers are defined in the file
+ * ich_descriptors.h. The reason is that the same layout is also used in the
+ * flash descriptor to define the properties of the different flash chips
+ * supported. The BIOS (or the ME?) is responsible to populate the ICH registers
+ * with the information from the descriptor on startup depending on the actual
+ * chip(s) detected. */
 
 #define ICH9_REG_FPB            0xD0    /* 32 Bits Flash Partition Boundary */
@@ -1130 +1141 @@
 #define ICH_BRRA(x)  ((x >>  0) & 0xff)
 
-#define ICH_FREG_BASE(x)  ((x >>  0) & 0x1fff)
-#define ICH_FREG_LIMIT(x) ((x >> 16) & 0x1fff)
-
 static void do_ich9_spi_frap(uint32_t frap, int i)
 {
@@ -1159 +1167 @@
         }
 
-        msg_pdbg("0x%08x-0x%08x is %s\n",
-                    (base << 12), (limit << 12) | 0x0fff,
-                    access_names[rwperms]);
+        msg_pdbg("0x%08x-0x%08x is %s\n", base, (limit | 0x0fff),
+                 access_names[rwperms]);
 }
 
@@ -1191 +1198 @@
         uint16_t spibar_offset, tmp2;
         uint32_t tmp;
+        int ichspi_desc = 0;
 
         switch (ich_generation) {
@@ -1262 +1270 @@
                         ichspi_lock = 1;
                 }
+                if (tmp2 & HSFS_FDV)
+                        ichspi_desc = 1;
 
                 tmp2 = mmio_readw(ich_spibar + ICH9_REG_HSFC);
@@ -1309 +1319 @@
                 msg_pdbg("0x9C: 0x%08x (OPMENU+4)\n",
                              mmio_readl(ich_spibar + ICH9_REG_OPMENU + 4));
-                ichspi_bbar = mmio_readl(ich_spibar + ICH9_REG_BBAR);
-                msg_pdbg("0xA0: 0x%08x (BBAR)\n",
-                             ichspi_bbar);
-                tmp = mmio_readl(ich_spibar + ICH9_REG_FPB);
-                msg_pdbg("0xD0: 0x%08x (FPB)\n", tmp);
-
+                if (ich_generation == 8) {
+                        tmp = mmio_readl(ich_spibar + ICH8_REG_VSCC);
+                        msg_pdbg("0xC1: 0x%08x (VSCC)\n", tmp);
+                        msg_pdbg("VSCC: ");
+                        prettyprint_ich_reg_vscc(tmp, MSG_DEBUG);
+                } else {
+                        ichspi_bbar = mmio_readl(ich_spibar + ICH9_REG_BBAR);
+                        msg_pdbg("0xA0: 0x%08x (BBAR)\n",
+                                     ichspi_bbar);
+
+                        tmp = mmio_readl(ich_spibar + ICH9_REG_LVSCC);
+                        msg_pdbg("0xC4: 0x%08x (LVSCC)\n", tmp);
+                        msg_pdbg("LVSCC: ");
+                        prettyprint_ich_reg_vscc(tmp, MSG_DEBUG);
+
+                        tmp = mmio_readl(ich_spibar + ICH9_REG_UVSCC);
+                        msg_pdbg("0xC8: 0x%08x (UVSCC)\n", tmp);
+                        msg_pdbg("UVSCC: ");
+                        prettyprint_ich_reg_vscc(tmp, MSG_DEBUG);
+
+                        tmp = mmio_readl(ich_spibar + ICH9_REG_FPB);
+                        msg_pdbg("0xD0: 0x%08x (FPB)\n", tmp);
+                }
+
+                msg_pdbg("\n");
+                if (ichspi_desc) {
+                        struct ich_descriptors desc = {{ 0 }};
+                        if (read_ich_descriptors_via_fdo(ich_spibar, &desc) ==
+                            ICH_RET_OK)
+                                prettyprint_ich_descriptors(CHIPSET_ICH_UNKNOWN,
+                                                            &desc);
+                }
                 ich_init_opcodes();
                 break;