Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 453686ce authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "crypto: msm: Rename qcrypto module"

parents e8c9c4f0 feba5ac0

drivers/crypto/msm/Makefile

+6 −3
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

obj-$(CONFIG_CRYPTO_DEV_QCOM_MSM_QCE) += qce50.o

obj-$(CONFIG_CRYPTO_DEV_QCEDEV) += qcedev.o

obj-$(CONFIG_CRYPTO_DEV_QCEDEV) += qcedev_smmu.o

obj-$(CONFIG_CRYPTO_DEV_QCRYPTO) += qcrypto.o
 


obj-$(CONFIG_CRYPTO_DEV_QCEDEV) += qcedev-mod.o

qcedev-mod-y = qcedev.o qcedev_smmu.o



obj-$(CONFIG_CRYPTO_DEV_QCRYPTO) += qcrypto-msm.o

qcrypto-msm-y = qcrypto.o

drivers/crypto/msm/qce50.c

+1 −1
Original line number Diff line number Diff line
@@ -4665,7 +4665,7 @@ static int select_mode(struct qce_device *pce_dev, 
			pce_dev->intr_cadence = 0;

			atomic_set(&pce_dev->bunch_cmd_seq, 0);

			atomic_set(&pce_dev->last_intr_seq, 0);

			pce_dev->cadence_flag = ~pce_dev->cadence_flag;

			pce_dev->cadence_flag = !pce_dev->cadence_flag;

		}

	}

drivers/crypto/msm/qcedev.c

+7 −4
Original line number Diff line number Diff line
@@ -57,14 +57,14 @@ static dev_t qcedev_device_no; 
static struct class *driver_class;

static struct device *class_dev;



MODULE_DEVICE_TABLE(of, qcedev_match);



static const struct of_device_id qcedev_match[] = {

	{	.compatible = "qcom,qcedev"},

	{	.compatible = "qcom,qcedev,context-bank"},

	{}

};



MODULE_DEVICE_TABLE(of, qcedev_match);



static int qcedev_control_clocks(struct qcedev_control *podev, bool enable)

{

	unsigned int control_flag;
@@ -1760,6 +1760,7 @@ static inline long qcedev_ioctl(struct file *file, 
			err = -ENOTTY;

			goto exit_free_qcedev_areq;

		}

		/* Fall-through */

	case QCEDEV_IOCTL_SHA_UPDATE_REQ:

		{

		struct scatterlist sg_src;
@@ -1810,10 +1811,11 @@ static inline long qcedev_ioctl(struct file *file, 
				handle->sha_ctxt.diglen);

		mutex_unlock(&hash_access_lock);

		if (copy_to_user((void __user *)arg, &qcedev_areq->sha_op_req,

					sizeof(struct qcedev_sha_op_req)))

					sizeof(struct qcedev_sha_op_req))) {

			err = -EFAULT;

			goto exit_free_qcedev_areq;

		}

		}

		break;



	case QCEDEV_IOCTL_SHA_FINAL_REQ:
@@ -1902,10 +1904,11 @@ static inline long qcedev_ioctl(struct file *file, 
				handle->sha_ctxt.diglen);

		mutex_unlock(&hash_access_lock);

		if (copy_to_user((void __user *)arg, &qcedev_areq->sha_op_req,

					sizeof(struct qcedev_sha_op_req)))

					sizeof(struct qcedev_sha_op_req))) {

			err = -EFAULT;

			goto exit_free_qcedev_areq;

		}

		}

		break;



	case QCEDEV_IOCTL_MAP_BUF_REQ: