diff options
author | Bob Pearson <rpearson@systemfabricworks.com> | 2012-03-23 18:02:24 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-23 19:58:37 -0400 |
commit | 324eb0f17d9dcead3c60c133aa244f6b3631fec9 (patch) | |
tree | 657c564269a0fc1921f4252dbf0184725f5c85fa /lib/crc32defs.h | |
parent | 9a1dbf6a29694c9d81b498019f103aee0f8b5b6c (diff) |
crc32: add slice-by-8 algorithm to existing code
Add slicing-by-8 algorithm to the existing slicing-by-4 algorithm. This
consists of:
- extend largest BITS size from 32 to 64
- extend tables from tab[4][256] to up to tab[8][256]
- Add code for inner loop.
[djwong@us.ibm.com: Minor changelog tweaks]
Signed-off-by: Bob Pearson <rpearson@systemfabricworks.com>
Signed-off-by: Darrick J. Wong <djwong@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'lib/crc32defs.h')
-rw-r--r-- | lib/crc32defs.h | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/lib/crc32defs.h b/lib/crc32defs.h index daa3a5e85f60..818159288489 100644 --- a/lib/crc32defs.h +++ b/lib/crc32defs.h | |||
@@ -6,29 +6,42 @@ | |||
6 | #define CRCPOLY_LE 0xedb88320 | 6 | #define CRCPOLY_LE 0xedb88320 |
7 | #define CRCPOLY_BE 0x04c11db7 | 7 | #define CRCPOLY_BE 0x04c11db7 |
8 | 8 | ||
9 | /* How many bits at a time to use. Valid values are 1, 2, 4, 8, and 32. */ | 9 | /* |
10 | /* For less performance-sensitive, use 4 or 8 */ | 10 | * How many bits at a time to use. Valid values are 1, 2, 4, 8, 32 and 64. |
11 | * For less performance-sensitive, use 4 or 8 to save table size. | ||
12 | * For larger systems choose same as CPU architecture as default. | ||
13 | * This works well on X86_64, SPARC64 systems. This may require some | ||
14 | * elaboration after experiments with other architectures. | ||
15 | */ | ||
11 | #ifndef CRC_LE_BITS | 16 | #ifndef CRC_LE_BITS |
12 | # define CRC_LE_BITS 32 | 17 | # ifdef CONFIG_64BIT |
18 | # define CRC_LE_BITS 64 | ||
19 | # else | ||
20 | # define CRC_LE_BITS 32 | ||
21 | # endif | ||
13 | #endif | 22 | #endif |
14 | #ifndef CRC_BE_BITS | 23 | #ifndef CRC_BE_BITS |
15 | # define CRC_BE_BITS 32 | 24 | # ifdef CONFIG_64BIT |
25 | # define CRC_BE_BITS 64 | ||
26 | # else | ||
27 | # define CRC_BE_BITS 32 | ||
28 | # endif | ||
16 | #endif | 29 | #endif |
17 | 30 | ||
18 | /* | 31 | /* |
19 | * Little-endian CRC computation. Used with serial bit streams sent | 32 | * Little-endian CRC computation. Used with serial bit streams sent |
20 | * lsbit-first. Be sure to use cpu_to_le32() to append the computed CRC. | 33 | * lsbit-first. Be sure to use cpu_to_le32() to append the computed CRC. |
21 | */ | 34 | */ |
22 | #if CRC_LE_BITS > 32 || CRC_LE_BITS < 1 || CRC_LE_BITS == 16 || \ | 35 | #if CRC_LE_BITS > 64 || CRC_LE_BITS < 1 || CRC_LE_BITS == 16 || \ |
23 | CRC_LE_BITS & CRC_LE_BITS-1 | 36 | CRC_LE_BITS & CRC_LE_BITS-1 |
24 | # error "CRC_LE_BITS must be one of {1, 2, 4, 8, 32}" | 37 | # error "CRC_LE_BITS must be one of {1, 2, 4, 8, 32, 64}" |
25 | #endif | 38 | #endif |
26 | 39 | ||
27 | /* | 40 | /* |
28 | * Big-endian CRC computation. Used with serial bit streams sent | 41 | * Big-endian CRC computation. Used with serial bit streams sent |
29 | * msbit-first. Be sure to use cpu_to_be32() to append the computed CRC. | 42 | * msbit-first. Be sure to use cpu_to_be32() to append the computed CRC. |
30 | */ | 43 | */ |
31 | #if CRC_BE_BITS > 32 || CRC_BE_BITS < 1 || CRC_BE_BITS == 16 || \ | 44 | #if CRC_BE_BITS > 64 || CRC_BE_BITS < 1 || CRC_BE_BITS == 16 || \ |
32 | CRC_BE_BITS & CRC_BE_BITS-1 | 45 | CRC_BE_BITS & CRC_BE_BITS-1 |
33 | # error "CRC_BE_BITS must be one of {1, 2, 4, 8, 32}" | 46 | # error "CRC_BE_BITS must be one of {1, 2, 4, 8, 32, 64}" |
34 | #endif | 47 | #endif |