[flashrom] [commit] r1829 - trunk

[repository service]

Author: stefanct
Date: Tue Jul 15 15:50:17 2014
New Revision: 1829
URL: http://flashrom.org/trac/flashrom/changeset/1829

Log:
Refine messages regarding AMD FCH flash protections.

Signed-off-by: Stefan Tauner <stefan.tauner at alumni.tuwien.ac.at>
Acked-by: Stefan Tauner <stefan.tauner at alumni.tuwien.ac.at>

Modified:
   trunk/chipset_enable.c

Modified: trunk/chipset_enable.c
==============================================================================
--- trunk/chipset_enable.c	Mon Jul 14 20:04:15 2014	(r1828)
+++ trunk/chipset_enable.c	Tue Jul 15 15:50:17 2014	(r1829)
@@ -999,20 +999,23 @@
 		/* No protection flags for this region?*/
 		if ((prot & 0x3) == 0)
 			continue;
-		msg_pinfo("SB600 %s%sprotected from 0x%08x to 0x%08x\n",
-			  (prot & 0x1) ? "write " : "",
+		msg_pdbg("Chipset %s%sprotected flash from 0x%08x to 0x%08x, unlocking...",
 			  (prot & 0x2) ? "read " : "",
+			  (prot & 0x1) ? "write " : "",
 			  (prot & 0xfffff800),
 			  (prot & 0xfffff800) + (((prot & 0x7fc) << 8) | 0x3ff));
 		prot &= 0xfffffffc;
 		rpci_write_byte(dev, reg, prot);
 		prot = pci_read_long(dev, reg);
-		if (prot & 0x3)
-			msg_perr("SB600 %s%sunprotect failed from 0x%08x to 0x%08x\n",
-				 (prot & 0x1) ? "write " : "",
+		if ((prot & 0x3) != 0) {
+			msg_perr("Disabling %s%sprotection of flash addresses from 0x%08x to 0x%08x failed.\n",
 				 (prot & 0x2) ? "read " : "",
+				 (prot & 0x1) ? "write " : "",
 				 (prot & 0xfffff800),
 				 (prot & 0xfffff800) + (((prot & 0x7fc) << 8) | 0x3ff));
+			continue;
+		}
+		msg_pdbg("done.\n");
 	}
 
 	internal_buses_supported = BUS_LPC | BUS_FWH;