diff options
| author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2014-12-21 22:54:00 +0200 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2014-12-24 08:14:22 +1100 |
| commit | 011f3c6cbb97859860e451f2a75767cd4c1ffc03 (patch) | |
| tree | 6662ed497e584d9de3caec1447c13115c9bdc2b6 /arch/mips/cavium-octeon | |
| parent | 1e585ef51c3fdcf296d2ce5cb8c9e74b1a36cfb4 (diff) | |
| download | op-kernel-dev-011f3c6cbb97859860e451f2a75767cd4c1ffc03.zip op-kernel-dev-011f3c6cbb97859860e451f2a75767cd4c1ffc03.tar.gz | |
MIPS: OCTEON: reintroduce crypto features check
Reintroduce run-time check for crypto features. The old one was deleted
because it was unreliable, now decide the crypto availability on early
boot when the model string is constructed.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'arch/mips/cavium-octeon')
| -rw-r--r-- | arch/mips/cavium-octeon/executive/octeon-model.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/mips/cavium-octeon/executive/octeon-model.c b/arch/mips/cavium-octeon/executive/octeon-model.c index e15b049..b2104bd 100644 --- a/arch/mips/cavium-octeon/executive/octeon-model.c +++ b/arch/mips/cavium-octeon/executive/octeon-model.c @@ -27,6 +27,9 @@ #include <asm/octeon/octeon.h> +enum octeon_feature_bits __octeon_feature_bits __read_mostly; +EXPORT_SYMBOL_GPL(__octeon_feature_bits); + /** * Read a byte of fuse data * @byte_addr: address to read @@ -103,6 +106,9 @@ static const char *__init octeon_model_get_string_buffer(uint32_t chip_id, else suffix = "NSP"; + if (!fus_dat2.s.nocrypto) + __octeon_feature_bits |= OCTEON_HAS_CRYPTO; + /* * Assume pass number is encoded using <5:3><2:0>. Exceptions * will be fixed later. |
