Changeset 1464 for trunk/ichspi.c

Timestamp:

Nov 13, 2011 4:17:10 PM (19 months ago)

Author:

stefanct

Message:

ichspi: fix ich_init_opcodes() calls in ich_init_spi()

By calling it early ichspi_lock was not set up correctly in accordance
with the corresponding register, hence ich_init_opcodes() was always
trying to programming the opcodes instead of reading them in from the
opmenu in case of a locked down configuration.

Thanks to Jonathan A. Kollasch for reporting this bug.

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

File:

• trunk/ichspi.c (modified) (3 diffs)

trunk/ichspi.c

@@ -1563 +1563 @@
         ich_spibar = rcrb + spibar_offset;
 
-        ich_init_opcodes();
-
         switch (ich_generation) {
         case CHIPSET_ICH7:
@@ -1602 +1600 @@
                         ichspi_lock = 1;
                 }
+                ich_init_opcodes();
                 ich_set_bbar(0);
                 register_spi_programmer(&spi_programmer_ich7);
@@ -1644 +1643 @@
                                   "effect. Please note that Protected\n"
                                   "Range (PR) restrictions still apply.\n");
+                ich_init_opcodes();
 
                 if (desc_valid) {