crypto: caam - fix typos (24c7bf08) · Commits · 戴 / test

drivers/crypto/caam/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -147,7 +147,7 @@ config CRYPTO_DEV_FSL_CAAM_RNG_API
		select HW_RANDOM
		help
		Selecting this will register the SEC4 hardware rng to
		the hw_random API for suppying the kernel entropy pool.
		the hw_random API for supplying the kernel entropy pool.

		endif # CRYPTO_DEV_FSL_CAAM_JR

drivers/crypto/caam/ctrl.c

+9 −9

Original line number	Diff line number	Diff line
		@@ -54,7 +54,7 @@ static void build_instantiation_desc(u32 *desc, int handle, int do_sk)

		/*
		* load 1 to clear written reg:
		* resets the done interrrupt and returns the RNG to idle.
		* resets the done interrupt and returns the RNG to idle.
		*/
		append_load_imm_u32(desc, 1, LDST_SRCDST_WORD_CLRW);

		@@ -156,7 +156,7 @@ static inline int run_descriptor_deco0(struct device ctrldev, u32 desc,
		DESC_DER_DECO_STAT_SHIFT;

		/*
		* If an error occured in the descriptor, then
		* If an error occurred in the descriptor, then
		* the DECO status field will be set to 0x0D
		*/
		if (deco_state == DECO_STAT_HOST_ERR)
		@@ -264,7 +264,7 @@ static void devm_deinstantiate_rng(void *data)
		* - -ENODEV if DECO0 couldn't be acquired
		* - -EAGAIN if an error occurred when executing the descriptor
		* f.i. there was a RNG hardware error due to not "good enough"
		* entropy being aquired.
		* entropy being acquired.
		*/
		static int instantiate_rng(struct device *ctrldev, int state_handle_mask,
		int gen_sk)
		@@ -733,8 +733,8 @@ static int caam_probe(struct platform_device *pdev)
		handle_imx6_err005766(&ctrl->mcr);

		/*
		* Read the Compile Time paramters and SCFGR to determine
		* if Virtualization is enabled for this platform
		* Read the Compile Time parameters and SCFGR to determine
		* if virtualization is enabled for this platform
		*/
		scfgr = rd_reg32(&ctrl->scfgr);

		@@ -863,9 +863,9 @@ static int caam_probe(struct platform_device *pdev)
		}
		/*
		* if instantiate_rng(...) fails, the loop will rerun
		* and the kick_trng(...) function will modfiy the
		* and the kick_trng(...) function will modify the
		* upper and lower limits of the entropy sampling
		* interval, leading to a sucessful initialization of
		* interval, leading to a successful initialization of
		* the RNG.
		*/
		ret = instantiate_rng(dev, inst_handles,
		@@ -882,8 +882,8 @@ static int caam_probe(struct platform_device *pdev)
		return ret;
		}
		/*
		* Set handles init'ed by this module as the complement of the
		* already initialized ones
		* Set handles initialized by this module as the complement of
		* the already initialized ones
		*/
		ctrlpriv->rng4_sh_init = ~ctrlpriv->rng4_sh_init & RDSTA_MASK;

drivers/crypto/caam/desc.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@
		*/

		#define SEC4_SG_LEN_EXT 0x80000000 /* Entry points to table */
		#define SEC4_SG_LEN_FIN 0x40000000 /* Last ent in table */
		#define SEC4_SG_LEN_FIN 0x40000000 /* Last entry in table */
		#define SEC4_SG_BPID_MASK 0x000000ff
		#define SEC4_SG_BPID_SHIFT 16
		#define SEC4_SG_LEN_MASK 0x3fffffff /* Excludes EXT and FINAL */
		@@ -113,7 +113,7 @@
		*/
		#define HDR_REVERSE 0x00000800

		/* Propogate DNR property to SharedDesc */
		/* Propagate DNR property to SharedDesc */
		#define HDR_PROP_DNR 0x00000800

		/* JobDesc/SharedDesc share property */

drivers/crypto/caam/pdb.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -453,7 +453,7 @@ struct srtp_decap_pdb {
		#define DSA_PDB_N_MASK 0x7f

		struct dsa_sign_pdb {
		u32 sgf_ln; /* Use DSA_PDB_ defintions per above */
		u32 sgf_ln; /* Use DSA_PDB_ definitions per above */
		u8 *q;
		u8 *r;
		u8 g; / or Gx,y */

Admin message