staging: slicoss: fix eeprom checksum code

Rewrite slic_eeprom_cksum() to fix bugs and make readable. This patch
technically has no effect on the user as failed eeprom checksums are
ignored anyway.

The original implementation had the following issues:

  1. 2 of the 3 unrolled loops had the following bug:

       while ((len -= 32) >= 0) {
               [...]
               sum += w[15];
               w = (u16 *)((ulong) w + 16);    /* verify */
       }

     This processes 32-bytes of data but only increments the word
     pointer by 16 bytes. Fixing both of these bugs seems to fix
     slic_eeprom_cksum().

  2. Non-descriptive variable names, use of unions, and macros that
     change local state make the code difficult to read.

  3. The checksum loop is unrolled which makes the code harder to
     reason about while providing small performance improvement:
      - max eeprom length is 0x80 bytes (MAX_EECODE_SIZE), that's
        only 0x40 iterations
      - checksum is only computed during pci probe(), so not very
        often

Tested on Mojave card

Signed-off-by: David Matlack <matlackdavid@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c
index 3010501120d24db3e2cda7b93dab4ba61611849e..6ad180b6ec85f990d470b2f71815cad717fb17d5 100644 (file)
--- a/drivers/staging/slicoss/slicoss.c
+++ b/drivers/staging/slicoss/slicoss.c
@@ -1144,105 +1144,26 @@ static void slic_config_get(struct adapter *adapter, u32 config,
 }
 
 /*
- *  this is here to checksum the eeprom, there is some ucode bug
- *  which prevens us from using the ucode result.
- *  remove this once ucode is fixed.
+ * Compute a checksum of the EEPROM according to RFC 1071.
  */
-static ushort slic_eeprom_cksum(char *m, int len)
+static u16 slic_eeprom_cksum(void *eeprom, unsigned len)
 {
-#define ADDCARRY(x)  (x > 65535 ? x -= 65535 : x)
-#define REDUCE {l_util.l = sum; sum = l_util.s[0] + l_util.s[1]; ADDCARRY(sum);\
-               }
-
-       u16 *w;
-       u32 sum = 0;
-       u32 byte_swapped = 0;
-       u32 w_int;
-
-       union {
-               char c[2];
-               ushort s;
-       } s_util;
+       u16 *wp = eeprom;
+       u32 checksum = 0;
 
-       union {
-               ushort s[2];
-               int l;
-       } l_util;
+       while (len > 1) {
+               checksum += *(wp++);
+               len -= 2;
+       }
 
-       l_util.l = 0;
-       s_util.s = 0;
+       if (len > 0)
+               checksum += *(u8 *) wp;
 
-       w = (u16 *)m;
-#if BITS_PER_LONG == 64
-       w_int = (u32) ((ulong) w & 0x00000000FFFFFFFF);
-#else
-       w_int = (u32) (w);
-#endif
-       if ((1 & w_int) && (len > 0)) {
-               REDUCE;
-               sum <<= 8;
-               s_util.c[0] = *(unsigned char *)w;
-               w = (u16 *)((char *)w + 1);
-               len--;
-               byte_swapped = 1;
-       }
-
-       /* Unroll the loop to make overhead from branches &c small. */
-       while ((len -= 32) >= 0) {
-               sum += w[0];
-               sum += w[1];
-               sum += w[2];
-               sum += w[3];
-               sum += w[4];
-               sum += w[5];
-               sum += w[6];
-               sum += w[7];
-               sum += w[8];
-               sum += w[9];
-               sum += w[10];
-               sum += w[11];
-               sum += w[12];
-               sum += w[13];
-               sum += w[14];
-               sum += w[15];
-               w = (u16 *)((ulong) w + 16);    /* verify */
-       }
-       len += 32;
-       while ((len -= 8) >= 0) {
-               sum += w[0];
-               sum += w[1];
-               sum += w[2];
-               sum += w[3];
-               w = (u16 *)((ulong) w + 4);     /* verify */
-       }
-       len += 8;
-       if (len != 0 || byte_swapped != 0) {
-               REDUCE;
-               while ((len -= 2) >= 0)
-                       sum += *w++;    /* verify */
-               if (byte_swapped) {
-                       REDUCE;
-                       sum <<= 8;
-                       byte_swapped = 0;
-                       if (len == -1) {
-                               s_util.c[1] = *(char *) w;
-                               sum += s_util.s;
-                               len = 0;
-                       } else {
-                               len = -1;
-                       }
 
-               } else if (len == -1) {
-                       s_util.c[0] = *(char *) w;
-               }
+       while (checksum >> 16)
+               checksum = (checksum & 0xFFFF) + ((checksum >> 16) & 0xFFFF);
 
-               if (len == -1) {
-                       s_util.c[1] = 0;
-                       sum += s_util.s;
-               }
-       }
-       REDUCE;
-       return (ushort) sum;
+       return ~checksum;
 }
 
 static void slic_rspqueue_free(struct adapter *adapter)
@@ -2902,9 +2823,8 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter)
                        /*
                            calculate the EEPROM checksum
                        */
-                       calc_chksum =
-                           ~slic_eeprom_cksum((char *) peeprom,
-                                              (eecodesize - 2));
+                       calc_chksum = slic_eeprom_cksum(peeprom,
+                                                       eecodesize - 2);
                        /*
                            if the ucdoe chksum flag bit worked,
                            we wouldn't need this