[flashrom] [commit] r1137 - trunk

[repository service]

Author: mkarcher
Date: Wed Aug 11 23:06:10 2010
New Revision: 1137
URL: http://flashrom.org/trac/coreboot/changeset/1137

Log:
Add support for Intel 5 Series / 3400 Series chipsets

(At least) for the QM57 which i have tested an additional patch was
needed as some reserved bits in the "Software Sequencing Flash Control
Register" (SSFC) needs to be programmed to 1 in the QM57.

Signed-off-by: Helge Wagner <helge.wagner at ge.com>
Acked-by: Michael Karcher <flashrom at mkarcher.dialup.fu-berlin.de>

Modified:
   trunk/chipset_enable.c
   trunk/ichspi.c

Modified: trunk/chipset_enable.c
==============================================================================
--- trunk/chipset_enable.c	Sun Aug  8 23:56:52 2010	(r1136)
+++ trunk/chipset_enable.c	Wed Aug 11 23:06:10 2010	(r1137)
@@ -1011,7 +1011,21 @@
 	{0x1166, 0x0205, OK, "Broadcom", "HT-1000",	enable_flash_ht1000},
 	{0x8086, 0x3b00, NT, "Intel", "3400 Desktop",	enable_flash_ich10},
 	{0x8086, 0x3b01, NT, "Intel", "3400 Mobile",	enable_flash_ich10},
+	{0x8086, 0x3b02, NT, "Intel", "P55",		enable_flash_ich10},
+	{0x8086, 0x3b03, NT, "Intel", "PM55",		enable_flash_ich10},
+	{0x8086, 0x3b06, NT, "Intel", "H55",		enable_flash_ich10},
+	{0x8086, 0x3b07, OK, "Intel", "QM57",		enable_flash_ich10},
+	{0x8086, 0x3b08, NT, "Intel", "H57",		enable_flash_ich10},
+	{0x8086, 0x3b09, NT, "Intel", "HM55",		enable_flash_ich10},
+	{0x8086, 0x3b0a, NT, "Intel", "Q57",		enable_flash_ich10},
+	{0x8086, 0x3b0b, NT, "Intel", "HM57",		enable_flash_ich10},
 	{0x8086, 0x3b0d, NT, "Intel", "3400 Mobile SFF", enable_flash_ich10},
+	{0x8086, 0x3b0e, NT, "Intel", "B55",		enable_flash_ich10},
+	{0x8086, 0x3b0f, NT, "Intel", "QS57",		enable_flash_ich10},
+	{0x8086, 0x3b12, NT, "Intel", "3400",		enable_flash_ich10},
+	{0x8086, 0x3b14, NT, "Intel", "3420",		enable_flash_ich10},
+	{0x8086, 0x3b16, NT, "Intel", "3450",		enable_flash_ich10},
+	{0x8086, 0x3b1e, NT, "Intel", "B55",		enable_flash_ich10},
 	{0x8086, 0x7198, OK, "Intel", "440MX",		enable_flash_piix4},
 	{0x8086, 0x25a1, OK, "Intel", "6300ESB",	enable_flash_ich_4e},
 	{0x8086, 0x2670, OK, "Intel", "631xESB/632xESB/3100", enable_flash_ich_dc},

Modified: trunk/ichspi.c
==============================================================================
--- trunk/ichspi.c	Sun Aug  8 23:56:52 2010	(r1136)
+++ trunk/ichspi.c	Wed Aug 11 23:06:10 2010	(r1137)
@@ -560,7 +560,9 @@
 	}
 
 	/* Assemble SSFS + SSFC */
-	temp32 = 0;
+	/* keep reserved bits (23-19,7,0) */
+	temp32 = REGREAD32(ICH9_REG_SSFS);
+	temp32 &= 0xF8008100;
 
 	/* clear error status registers */
 	temp32 |= (SSFS_CDS + SSFS_FCERR);