summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Tauner <stefan.tauner@alumni.tuwien.ac.at>2014-07-15 13:50:17 +0000
committerStefan Tauner <stefan.tauner@alumni.tuwien.ac.at>2014-07-15 13:50:17 +0000
commit0e0a0dc05d8647ec5800ec439b7a8cb0586caa50 (patch)
tree959356c3027e3008ee0d0b5d5b940bf4a267234c
parent9d8f53d8704685af654d41d789692820f0278010 (diff)
downloadast2050-flashrom-0e0a0dc05d8647ec5800ec439b7a8cb0586caa50.zip
ast2050-flashrom-0e0a0dc05d8647ec5800ec439b7a8cb0586caa50.tar.gz
Refine messages regarding AMD FCH flash protections
Corresponding to flashrom svn r1829. Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
-rw-r--r--chipset_enable.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/chipset_enable.c b/chipset_enable.c
index 6ead846..37a718f 100644
--- a/chipset_enable.c
+++ b/chipset_enable.c
@@ -999,20 +999,23 @@ static int enable_flash_sb600(struct pci_dev *dev, const char *name)
/* 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;
OpenPOWER on IntegriCloud