mlx4: avoid init errors when kernel modules are not loaded

[dpdk.git] / lib / librte_hash / rte_hash_crc.h

diff --git a/lib/librte_hash/rte_hash_crc.h b/lib/librte_hash/rte_hash_crc.h
index 03ab748..3dcd362 100644 (file)
--- a/lib/librte_hash/rte_hash_crc.h
+++ b/lib/librte_hash/rte_hash_crc.h
@@ -47,6 +47,7 @@ extern "C" {
 #include <stdint.h>
 #include <rte_cpuflags.h>
 #include <rte_branch_prediction.h>
+#include <rte_common.h>
 
 /* Lookup tables for software implementation of CRC32C */
 static const uint32_t crc32c_tables[8][256] = {{
@@ -364,6 +365,8 @@ crc32c_2words(uint64_t data, uint32_t init_val)
        return crc;
 }
 
+#if defined(RTE_ARCH_I686) || defined(RTE_ARCH_X86_64)
+
 static inline uint32_t
 crc32c_sse42_u32(uint32_t data, uint32_t init_val)
 {
@@ -374,16 +377,6 @@ crc32c_sse42_u32(uint32_t data, uint32_t init_val)
        return init_val;
 }
 
-static inline uint32_t
-crc32c_sse42_u64(uint64_t data, uint64_t init_val)
-{
-       __asm__ volatile(
-                       "crc32q %[data], %[init_val];"
-                       : [init_val] "+r" (init_val)
-                       : [data] "rm" (data));
-       return init_val;
-}
-
 static inline uint32_t
 crc32c_sse42_u64_mimic(uint64_t data, uint64_t init_val)
 {
@@ -398,6 +391,47 @@ crc32c_sse42_u64_mimic(uint64_t data, uint64_t init_val)
        return init_val;
 }
 
+#else
+
+static inline uint32_t
+crc32c_sse42_u32(__rte_unused uint32_t data,
+                 __rte_unused uint32_t init_val)
+{
+       return 0;
+}
+
+static inline uint32_t
+crc32c_sse42_u64_mimic(__rte_unused uint32_t data,
+                       __rte_unused uint32_t init_val)
+{
+       return 0;
+}
+
+#endif
+
+#ifdef RTE_ARCH_X86_64
+
+static inline uint32_t
+crc32c_sse42_u64(uint64_t data, uint64_t init_val)
+{
+       __asm__ volatile(
+                       "crc32q %[data], %[init_val];"
+                       : [init_val] "+r" (init_val)
+                       : [data] "rm" (data));
+       return init_val;
+}
+
+#else
+
+static inline uint32_t
+crc32c_sse42_u64(__rte_unused uint64_t data,
+                 __rte_unused uint64_t init_val)
+{
+       return 0;
+}
+
+#endif
+
 #define CRC32_SW            (1U << 0)
 #define CRC32_SSE42         (1U << 1)
 #define CRC32_x64           (1U << 2)
@@ -486,7 +520,7 @@ rte_hash_crc_8byte(uint64_t data, uint32_t init_val)
 }
 
 /**
- * Use crc32 instruction to perform a hash.
+ * Calculate CRC32 hash on user-supplied byte array.
  *
  * @param data
  *   Data to perform hash on.
@@ -501,23 +535,38 @@ static inline uint32_t
 rte_hash_crc(const void *data, uint32_t data_len, uint32_t init_val)
 {
        unsigned i;
-       uint32_t temp = 0;
-       const uint32_t *p32 = (const uint32_t *)data;
+       uint64_t temp = 0;
+       const uint64_t *p64 = (const uint64_t *)data;
 
-       for (i = 0; i < data_len / 4; i++) {
-               init_val = rte_hash_crc_4byte(*p32++, init_val);
+       for (i = 0; i < data_len / 8; i++) {
+               init_val = rte_hash_crc_8byte(*p64++, init_val);
        }
 
-       switch (3 - (data_len & 0x03)) {
+       switch (7 - (data_len & 0x07)) {
        case 0:
-               temp |= *((const uint8_t *)p32 + 2) << 16;
+               temp |= (uint64_t) *((const uint8_t *)p64 + 6) << 48;
                /* Fallthrough */
        case 1:
-               temp |= *((const uint8_t *)p32 + 1) << 8;
+               temp |= (uint64_t) *((const uint8_t *)p64 + 5) << 40;
                /* Fallthrough */
        case 2:
-               temp |= *((const uint8_t *)p32);
+               temp |= (uint64_t) *((const uint8_t *)p64 + 4) << 32;
+               temp |= *((const uint32_t *)p64);
+               init_val = rte_hash_crc_8byte(temp, init_val);
+               break;
+       case 3:
+               init_val = rte_hash_crc_4byte(*(const uint32_t *)p64, init_val);
+               break;
+       case 4:
+               temp |= *((const uint8_t *)p64 + 2) << 16;
+               /* Fallthrough */
+       case 5:
+               temp |= *((const uint8_t *)p64 + 1) << 8;
+               /* Fallthrough */
+       case 6:
+               temp |= *((const uint8_t *)p64);
                init_val = rte_hash_crc_4byte(temp, init_val);
+               /* Fallthrough */
        default:
                break;
        }