Changeset 1435 for trunk

Timestamp:

09/09/11 14:46:32 (8 months ago)

Author:

stefanct

Message:

Revamp the warning of failing to set BIOS write enable in enable_flash_ich

• introduce a new variable 'wanted' that is used instead of 'new'
• use 'new' for the actual value contained in BIOS_CNTL after we tried to write it
• rephrase the warning which now also includes the old and new values besides the wanted one

Signed-off-by: Stefan Tauner <stefan.tauner@…>
Acked-by: Uwe Hermann <uwe@…>

File:

• trunk/chipset_enable.c (modified) (2 diffs)

trunk/chipset_enable.c

@@ -257 +257 @@
                             int bios_cntl)
 {
-        uint8_t old, new;
+        uint8_t old, new, wanted;
 
         /*
@@ -281 +281 @@
                 msg_pinfo("WARNING: BIOS region SMM protection is enabled!\n");
 
-        new = old | 1;
-        if (new == old)
+        wanted = old | 1;
+        if (wanted == old)
                 return 0;
 
-        rpci_write_byte(dev, bios_cntl, new);
-
-        if (pci_read_byte(dev, bios_cntl) != new) {
-                msg_pinfo("Setting register 0x%x to 0x%x on %s failed "
-                          "(WARNING ONLY).\n", bios_cntl, new, name);
+        rpci_write_byte(dev, bios_cntl, wanted);
+
+        if ((new = pci_read_byte(dev, bios_cntl)) != wanted) {
+                msg_pinfo("WARNING: Setting 0x%x from 0x%x to 0x%x on %s "
+                          "failed. New value is 0x%x.\n",
+                          bios_cntl, old, wanted, name, new);
                 return -1;
         }