+1 -1

drivers/crypto/caam/Kconfig

reviewed

··· 147 147 select HW_RANDOM 148 148 help 149 149 Selecting this will register the SEC4 hardware rng to 150 150 - the hw_random API for suppying the kernel entropy pool. 150 150 + the hw_random API for supplying the kernel entropy pool. 151 151 152 152 endif # CRYPTO_DEV_FSL_CAAM_JR 153 153

+9 -9

drivers/crypto/caam/ctrl.c

reviewed

··· 54 54 55 55 /* 56 56 * load 1 to clear written reg: 57 57 - * resets the done interrrupt and returns the RNG to idle. 57 57 + * resets the done interrupt and returns the RNG to idle. 58 58 */ 59 59 append_load_imm_u32(desc, 1, LDST_SRCDST_WORD_CLRW); 60 60 ··· 156 156 DESC_DER_DECO_STAT_SHIFT; 157 157 158 158 /* 159 159 - * If an error occured in the descriptor, then 159 159 + * If an error occurred in the descriptor, then 160 160 * the DECO status field will be set to 0x0D 161 161 */ 162 162 if (deco_state == DECO_STAT_HOST_ERR) ··· 264 264 * - -ENODEV if DECO0 couldn't be acquired 265 265 * - -EAGAIN if an error occurred when executing the descriptor 266 266 * f.i. there was a RNG hardware error due to not "good enough" 267 267 - * entropy being aquired. 267 267 + * entropy being acquired. 268 268 */ 269 269 static int instantiate_rng(struct device *ctrldev, int state_handle_mask, 270 270 int gen_sk) ··· 733 733 handle_imx6_err005766(&ctrl->mcr); 734 734 735 735 /* 736 736 - * Read the Compile Time paramters and SCFGR to determine 737 737 - * if Virtualization is enabled for this platform 736 736 + * Read the Compile Time parameters and SCFGR to determine 737 737 + * if virtualization is enabled for this platform 738 738 */ 739 739 scfgr = rd_reg32(&ctrl->scfgr); 740 740 ··· 863 863 } 864 864 /* 865 865 * if instantiate_rng(...) fails, the loop will rerun 866 866 - * and the kick_trng(...) function will modfiy the 866 866 + * and the kick_trng(...) function will modify the 867 867 * upper and lower limits of the entropy sampling 868 868 - * interval, leading to a sucessful initialization of 868 868 + * interval, leading to a successful initialization of 869 869 * the RNG. 870 870 */ 871 871 ret = instantiate_rng(dev, inst_handles, ··· 882 882 return ret; 883 883 } 884 884 /* 885 885 - * Set handles init'ed by this module as the complement of the 886 886 - * already initialized ones 885 885 + * Set handles initialized by this module as the complement of 886 886 + * the already initialized ones 887 887 */ 888 888 ctrlpriv->rng4_sh_init = ~ctrlpriv->rng4_sh_init & RDSTA_MASK; 889 889

+2 -2

drivers/crypto/caam/desc.h

reviewed

··· 18 18 */ 19 19 20 20 #define SEC4_SG_LEN_EXT 0x80000000 /* Entry points to table */ 21 21 - #define SEC4_SG_LEN_FIN 0x40000000 /* Last ent in table */ 21 21 + #define SEC4_SG_LEN_FIN 0x40000000 /* Last entry in table */ 22 22 #define SEC4_SG_BPID_MASK 0x000000ff 23 23 #define SEC4_SG_BPID_SHIFT 16 24 24 #define SEC4_SG_LEN_MASK 0x3fffffff /* Excludes EXT and FINAL */ ··· 113 113 */ 114 114 #define HDR_REVERSE 0x00000800 115 115 116 116 - /* Propogate DNR property to SharedDesc */ 116 116 + /* Propagate DNR property to SharedDesc */ 117 117 #define HDR_PROP_DNR 0x00000800 118 118 119 119 /* JobDesc/SharedDesc share property */

+1 -1

drivers/crypto/caam/pdb.h

reviewed

··· 453 453 #define DSA_PDB_N_MASK 0x7f 454 454 455 455 struct dsa_sign_pdb { 456 456 - u32 sgf_ln; /* Use DSA_PDB_ defintions per above */ 456 456 + u32 sgf_ln; /* Use DSA_PDB_ definitions per above */ 457 457 u8 *q; 458 458 u8 *r; 459 459 u8 *g; /* or Gx,y */