Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

crypto: ccree - add HW engine config check

Add check to verify the stated device tree HW configuration
matches the HW.

Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

authored by

Gilad Ben-Yossef and committed by
Herbert Xu
303f99ac 3db617e7

+38
+18
drivers/crypto/ccree/cc_driver.c
··· 408 408 } 409 409 sig_cidr = val; 410 410 411 + /* Check HW engine configuration */ 412 + val = cc_ioread(new_drvdata, CC_REG(HOST_REMOVE_INPUT_PINS)); 413 + switch (val) { 414 + case CC_PINS_FULL: 415 + /* This is fine */ 416 + break; 417 + case CC_PINS_SLIM: 418 + if (new_drvdata->std_bodies & CC_STD_NIST) { 419 + dev_warn(dev, "703 mode forced due to HW configuration.\n"); 420 + new_drvdata->std_bodies = CC_STD_OSCCA; 421 + } 422 + break; 423 + default: 424 + dev_err(dev, "Unsupported engines configration.\n"); 425 + rc = -EINVAL; 426 + goto post_clk_err; 427 + } 428 + 411 429 /* Check security disable state */ 412 430 val = cc_ioread(new_drvdata, CC_REG(SECURITY_DISABLED)); 413 431 val &= CC_SECURITY_DISABLED_MASK;
+3
drivers/crypto/ccree/cc_driver.h
··· 53 53 54 54 #define CC_COHERENT_CACHE_PARAMS 0xEEE 55 55 56 + #define CC_PINS_FULL 0x0 57 + #define CC_PINS_SLIM 0x9F 58 + 56 59 /* Maximum DMA mask supported by IP */ 57 60 #define DMA_BIT_MASK_LEN 48 58 61
+17
drivers/crypto/ccree/cc_host_regs.h
··· 206 206 #define CC_HOST_POWER_DOWN_EN_REG_OFFSET 0xA78UL 207 207 #define CC_HOST_POWER_DOWN_EN_VALUE_BIT_SHIFT 0x0UL 208 208 #define CC_HOST_POWER_DOWN_EN_VALUE_BIT_SIZE 0x1UL 209 + #define CC_HOST_REMOVE_INPUT_PINS_REG_OFFSET 0x0A7CUL 210 + #define CC_HOST_REMOVE_INPUT_PINS_REMOVE_AES_ENGINE_BIT_SHIFT 0x0UL 211 + #define CC_HOST_REMOVE_INPUT_PINS_REMOVE_AES_ENGINE_BIT_SIZE 0x1UL 212 + #define CC_HOST_REMOVE_INPUT_PINS_REMOVE_AES_MAC_ENGINE_BIT_SHIFT 0x1UL 213 + #define CC_HOST_REMOVE_INPUT_PINS_REMOVE_AES_MAC_ENGINE_BIT_SIZE 0x1UL 214 + #define CC_HOST_REMOVE_INPUT_PINS_REMOVE_GHASH_ENGINE_BIT_SHIFT 0x2UL 215 + #define CC_HOST_REMOVE_INPUT_PINS_REMOVE_GHASH_ENGINE_BIT_SIZE 0x1UL 216 + #define CC_HOST_REMOVE_INPUT_PINS_REMOVE_DES_ENGINE_BIT_SHIFT 0x3UL 217 + #define CC_HOST_REMOVE_INPUT_PINS_REMOVE_DES_ENGINE_BIT_SIZE 0x1UL 218 + #define CC_HOST_REMOVE_INPUT_PINS_REMOVE_HASH_ENGINE_BIT_SHIFT 0x4UL 219 + #define CC_HOST_REMOVE_INPUT_PINS_REMOVE_HASH_ENGINE_BIT_SIZE 0x1UL 220 + #define CC_HOST_REMOVE_INPUT_PINS_REMOVE_SM3_ENGINE_BIT_SHIFT 0x5UL 221 + #define CC_HOST_REMOVE_INPUT_PINS_REMOVE_SM3_ENGINE_BIT_SIZE 0x1UL 222 + #define CC_HOST_REMOVE_INPUT_PINS_REMOVE_SM4_ENGINE_BIT_SHIFT 0x6UL 223 + #define CC_HOST_REMOVE_INPUT_PINS_REMOVE_SM4_ENGINE_BIT_SIZE 0x1UL 224 + #define CC_HOST_REMOVE_INPUT_PINS_OTP_DISCONNECTED_BIT_SHIFT 0x7UL 225 + #define CC_HOST_REMOVE_INPUT_PINS_OTP_DISCONNECTED_BIT_SIZE 0x1UL 209 226 // -------------------------------------- 210 227 // BLOCK: ID_REGISTERS 211 228 // --------------------------------------