diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-03-13 14:20:46 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-03-13 14:21:04 +0100 |
| commit | 56544d29c3a0e383c0d819fefc9570b2803db193 (patch) | |
| tree | 4366fc0ba3f5115b8c1c9d171fa245d86e5415d0 /arch/mips/include/asm/octeon/octeon-feature.h | |
| parent | 9261dc1de11e158a5f6b4b92c8bf1ef4a02dbf0d (diff) | |
| parent | 9eccca0843205f87c00404b663188b88eb248051 (diff) | |
| download | talos-op-linux-56544d29c3a0e383c0d819fefc9570b2803db193.tar.gz talos-op-linux-56544d29c3a0e383c0d819fefc9570b2803db193.zip | |
Merge tag 'v4.0-rc3' into x86/build, to refresh an older tree before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/mips/include/asm/octeon/octeon-feature.h')
| -rw-r--r-- | arch/mips/include/asm/octeon/octeon-feature.h | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/arch/mips/include/asm/octeon/octeon-feature.h b/arch/mips/include/asm/octeon/octeon-feature.h index c4fe81f47f53..8ebd3f579b84 100644 --- a/arch/mips/include/asm/octeon/octeon-feature.h +++ b/arch/mips/include/asm/octeon/octeon-feature.h @@ -46,8 +46,6 @@ enum octeon_feature { OCTEON_FEATURE_SAAD, /* Does this Octeon support the ZIP offload engine? */ OCTEON_FEATURE_ZIP, - /* Does this Octeon support crypto acceleration using COP2? */ - OCTEON_FEATURE_CRYPTO, OCTEON_FEATURE_DORM_CRYPTO, /* Does this Octeon support PCI express? */ OCTEON_FEATURE_PCIE, @@ -86,6 +84,21 @@ enum octeon_feature { OCTEON_MAX_FEATURE }; +enum octeon_feature_bits { + OCTEON_HAS_CRYPTO = 0x0001, /* Crypto acceleration using COP2 */ +}; +extern enum octeon_feature_bits __octeon_feature_bits; + +/** + * octeon_has_crypto() - Check if this OCTEON has crypto acceleration support. + * + * Returns: Non-zero if the feature exists. Zero if the feature does not exist. + */ +static inline int octeon_has_crypto(void) +{ + return __octeon_feature_bits & OCTEON_HAS_CRYPTO; +} + /** * Determine if the current Octeon supports a specific feature. These * checks have been optimized to be fairly quick, but they should still |
