Changeset 1409

Timestamp:

08/09/11 03:49:34 (10 months ago)

Author:

stefanct

Message:

ichspi.c: refactor filling and reading the fdata/spid registers

• add ich_fill_data to fill the chipset registers from an array
• add ich_read_data to copy the data from the chipset register into an array
• replace the existing code with calls to those functions
• minor cosmetic changes

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

File:

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

trunk/ichspi.c

@@ -7 +7 @@
  * Copyright (C) 2008 coresystems GmbH <info@coresystems.de>
  * Copyright (C) 2009, 2010 Carl-Daniel Hailfinger
+ * Copyright (C) 2011 Stefan Tauner
  *
  * This program is free software; you can redistribute it and/or modify
@@ -21 +22 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-/*
- * This module is designed for supporting the devices
- * ST M25P40
- * ST M25P80
- * ST M25P16
- * ST M25P32 already tested
- * ST M25P64
- * AT 25DF321 already tested
- * ... and many more SPI flash devices
- *
  */
 
@@ -294 +283 @@
 
 /* pretty printing functions */
-static void pretty_print_opcodes(OPCODES *ops)
+static void prettyprint_opcodes(OPCODES *ops)
 {
         if(ops == NULL)
@@ -593 +582 @@
 }
 
+/* Read len bytes from the fdata/spid register into the data array.
+ *
+ * Note that using len > spi_programmer->max_data_read will return garbage or
+ * may even crash.
+ */
+ static void ich_read_data(uint8_t *data, int len, int reg0_off)
+ {
+        int i;
+        uint32_t temp32 = 0;
+
+        for (i = 0; i < len; i++) {
+                if ((i % 4) == 0)
+                        temp32 = REGREAD32(reg0_off + i);
+
+                data[i] = (temp32 >> ((i % 4) * 8)) & 0xff;
+        }
+}
+
+/* Fill len bytes from the data array into the fdata/spid registers.
+ *
+ * Note that using len > spi_programmer->max_data_write will trash the registers
+ * following the data registers.
+ */
+static void ich_fill_data(const uint8_t *data, int len, int reg0_off)
+{
+        uint32_t temp32 = 0;
+        int i;
+
+        if (len <= 0)
+                return;
+
+        for (i = 0; i < len; i++) {
+                if ((i % 4) == 0)
+                        temp32 = 0;
+
+                temp32 |= ((uint32_t) data[i]) << ((i % 4) * 8);
+
+                if ((i % 4) == 3) /* 32 bits are full, write them to regs. */
+                        REGWRITE32(reg0_off + (i - (i % 4)), temp32);
+        }
+        i--;
+        if ((i % 4) != 3) /* Write remaining data to regs. */
+                REGWRITE32(reg0_off + (i - (i % 4)), temp32);
+}
+
 /* This function generates OPCODES from or programs OPCODES to ICH according to
  * the chipset's SPI configuration lock.
@@ -628 +662 @@
                 curopcodes = curopcodes_done;
                 msg_pdbg("done\n");
-                pretty_print_opcodes(curopcodes);
+                prettyprint_opcodes(curopcodes);
                 msg_pdbg("\n");
                 return 0;
@@ -639 +673 @@
         int write_cmd = 0;
         int timeout;
-        uint32_t temp32 = 0;
+        uint32_t temp32;
         uint16_t temp16;
-        uint32_t a;
         uint64_t opmenu;
         int opcode_index;
@@ -665 +698 @@
 
         /* Program data into SPID0 to N */
-        if (write_cmd && (datalength != 0)) {
-                temp32 = 0;
-                for (a = 0; a < datalength; a++) {
-                        if ((a % 4) == 0) {
-                                temp32 = 0;
-                        }
-
-                        temp32 |= ((uint32_t) data[a]) << ((a % 4) * 8);
-
-                        if ((a % 4) == 3) {
-                                REGWRITE32(ICH7_REG_SPID0 + (a - (a % 4)),
-                                           temp32);
-                        }
-                }
-                if (((a - 1) % 4) != 3) {
-                        REGWRITE32(ICH7_REG_SPID0 +
-                                   ((a - 1) - ((a - 1) % 4)), temp32);
-                }
-
-        }
+        if (write_cmd && (datalength != 0))
+                ich_fill_data(data, datalength, ICH7_REG_SPID0);
 
         /* Assemble SPIS */
@@ -765 +780 @@
         }
 
-        if ((!write_cmd) && (datalength != 0)) {
-                for (a = 0; a < datalength; a++) {
-                        if ((a % 4) == 0) {
-                                temp32 = REGREAD32(ICH7_REG_SPID0 + (a));
-                        }
-
-                        data[a] =
-                            (temp32 & (((uint32_t) 0xff) << ((a % 4) * 8)))
-                            >> ((a % 4) * 8);
-                }
-        }
+        if ((!write_cmd) && (datalength != 0))
+                ich_read_data(data, datalength, ICH7_REG_SPID0);
 
         return 0;
@@ -786 +792 @@
         int timeout;
         uint32_t temp32;
-        uint32_t a;
         uint64_t opmenu;
         int opcode_index;
@@ -811 +816 @@
 
         /* Program data into FDATA0 to N */
-        if (write_cmd && (datalength != 0)) {
-                temp32 = 0;
-                for (a = 0; a < datalength; a++) {
-                        if ((a % 4) == 0) {
-                                temp32 = 0;
-                        }
-
-                        temp32 |= ((uint32_t) data[a]) << ((a % 4) * 8);
-
-                        if ((a % 4) == 3) {
-                                REGWRITE32(ICH9_REG_FDATA0 + (a - (a % 4)),
-                                           temp32);
-                        }
-                }
-                if (((a - 1) % 4) != 3) {
-                        REGWRITE32(ICH9_REG_FDATA0 +
-                                   ((a - 1) - ((a - 1) % 4)), temp32);
-                }
-        }
+        if (write_cmd && (datalength != 0))
+                ich_fill_data(data, datalength, ICH9_REG_FDATA0);
 
         /* Assemble SSFS + SSFC */
@@ -917 +905 @@
         }
 
-        if ((!write_cmd) && (datalength != 0)) {
-                for (a = 0; a < datalength; a++) {
-                        if ((a % 4) == 0) {
-                                temp32 = REGREAD32(ICH9_REG_FDATA0 + (a));
-                        }
-
-                        data[a] =
-                            (temp32 & (((uint32_t) 0xff) << ((a % 4) * 8)))
-                            >> ((a % 4) * 8);
-                }
-        }
+        if ((!write_cmd) && (datalength != 0))
+                ich_read_data(data, datalength, ICH9_REG_FDATA0);
 
         return 0;