Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 (c08e611b) · Commits · 戴 / test

drivers/crypto/caam/caampkc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -506,7 +506,7 @@ static int caam_rsa_init_tfm(struct crypto_akcipher *tfm)
		ctx->dev = caam_jr_alloc();

		if (IS_ERR(ctx->dev)) {
		dev_err(ctx->dev, "Job Ring Device allocation for transform failed\n");
		pr_err("Job Ring Device allocation for transform failed\n");
		return PTR_ERR(ctx->dev);
		}

drivers/crypto/caam/ctrl.c

+21 −45

Original line number	Diff line number	Diff line
		@@ -281,7 +281,8 @@ static int deinstantiate_rng(struct device *ctrldev, int state_handle_mask)
		/* Try to run it through DECO0 */
		ret = run_descriptor_deco0(ctrldev, desc, &status);

		if (ret \|\| status) {
		if (ret \|\|
		(status && status != JRSTA_SSRC_JUMP_HALT_CC)) {
		dev_err(ctrldev,
		"Failed to deinstantiate RNG4 SH%d\n",
		sh_idx);
		@@ -301,15 +302,13 @@ static int caam_remove(struct platform_device *pdev)
		struct device *ctrldev;
		struct caam_drv_private *ctrlpriv;
		struct caam_ctrl __iomem *ctrl;
		int ring;

		ctrldev = &pdev->dev;
		ctrlpriv = dev_get_drvdata(ctrldev);
		ctrl = (struct caam_ctrl __iomem *)ctrlpriv->ctrl;

		/* Remove platform devices for JobRs */
		for (ring = 0; ring < ctrlpriv->total_jobrs; ring++)
		of_device_unregister(ctrlpriv->jrpdev[ring]);
		/* Remove platform devices under the crypto node */
		of_platform_depopulate(ctrldev);

		/* De-initialize RNG state handles initialized by this driver. */
		if (ctrlpriv->rng4_sh_init)
		@@ -418,10 +417,21 @@ DEFINE_SIMPLE_ATTRIBUTE(caam_fops_u32_ro, caam_debugfs_u32_get, NULL, "%llu\n");
		DEFINE_SIMPLE_ATTRIBUTE(caam_fops_u64_ro, caam_debugfs_u64_get, NULL, "%llu\n");
		#endif

		static const struct of_device_id caam_match[] = {
		{
		.compatible = "fsl,sec-v4.0",
		},
		{
		.compatible = "fsl,sec4.0",
		},
		{},
		};
		MODULE_DEVICE_TABLE(of, caam_match);

		/* Probe routine for CAAM top (controller) level */
		static int caam_probe(struct platform_device *pdev)
		{
		int ret, ring, ridx, rspec, gen_sk, ent_delay = RTSDCTL_ENT_DLY_MIN;
		int ret, ring, gen_sk, ent_delay = RTSDCTL_ENT_DLY_MIN;
		u64 caam_id;
		struct device *dev;
		struct device_node nprop, np;
		@@ -597,46 +607,23 @@ static int caam_probe(struct platform_device *pdev)
		goto iounmap_ctrl;
		}

		/*
		* Detect and enable JobRs
		* First, find out how many ring spec'ed, allocate references
		* for all, then go probe each one.
		*/
		rspec = 0;
		for_each_available_child_of_node(nprop, np)
		if (of_device_is_compatible(np, "fsl,sec-v4.0-job-ring") \|\|
		of_device_is_compatible(np, "fsl,sec4.0-job-ring"))
		rspec++;

		ctrlpriv->jrpdev = devm_kcalloc(&pdev->dev, rspec,
		sizeof(*ctrlpriv->jrpdev), GFP_KERNEL);
		if (ctrlpriv->jrpdev == NULL) {
		ret = -ENOMEM;
		ret = of_platform_populate(nprop, caam_match, NULL, dev);
		if (ret) {
		dev_err(dev, "JR platform devices creation error\n");
		goto iounmap_ctrl;
		}

		ring = 0;
		ridx = 0;
		ctrlpriv->total_jobrs = 0;
		for_each_available_child_of_node(nprop, np)
		if (of_device_is_compatible(np, "fsl,sec-v4.0-job-ring") \|\|
		of_device_is_compatible(np, "fsl,sec4.0-job-ring")) {
		ctrlpriv->jrpdev[ring] =
		of_platform_device_create(np, NULL, dev);
		if (!ctrlpriv->jrpdev[ring]) {
		pr_warn("JR physical index %d: Platform device creation error\n",
		ridx);
		ridx++;
		continue;
		}
		ctrlpriv->jr[ring] = (struct caam_job_ring __iomem __force *)
		((__force uint8_t *)ctrl +
		(ridx + JR_BLOCK_NUMBER) *
		(ring + JR_BLOCK_NUMBER) *
		BLOCK_OFFSET
		);
		ctrlpriv->total_jobrs++;
		ring++;
		ridx++;
		}

		/* Check to see if QI present. If so, enable */
		@@ -847,17 +834,6 @@ disable_caam_ipg:
		return ret;
		}

		static struct of_device_id caam_match[] = {
		{
		.compatible = "fsl,sec-v4.0",
		},
		{
		.compatible = "fsl,sec4.0",
		},
		{},
		};
		MODULE_DEVICE_TABLE(of, caam_match);

		static struct platform_driver caam_driver = {
		.driver = {
		.name = "caam",

drivers/crypto/caam/intern.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -66,7 +66,6 @@ struct caam_drv_private_jr {
		struct caam_drv_private {

		struct device *dev;
		struct platform_device *jrpdev; / Alloc'ed array per sub-device */
		struct platform_device *pdev;

		/* Physical-presence section */

Admin message