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

Commit 7ae1ae19 authored by Dinesh K Garg's avatar Dinesh K Garg
Browse files

crypto: ice: Remove initialization of secure config of ICE 



ICE provides secure and non-secure interrupts. Earlier, non-secure side
used to register for both kind of interrupts. It is no longer required
as secure side handles secure interrupts itself. Also, fixed another
issue where virtual address was used instead of physical address.

Change-Id: I28b2da22cf4c9a79bc52ee46e9dbcdab8b37d0ff
Signed-off-by: default avatarDinesh K Garg <dineshg@codeaurora.org>
parent 377d2dff

drivers/crypto/msm/ice.c

+9 −9
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ struct ice_device { 
	dev_t			device_no;

	struct class		*driver_class;

	void __iomem		*mmio;

	struct resource		*res;

	int			irq;

	bool			is_irq_enabled;

	bool			is_ice_enabled;
@@ -522,17 +523,16 @@ out: 
static int qcom_ice_get_device_tree_data(struct platform_device *pdev,

		struct ice_device *ice_dev)

{

	struct resource *res;

	struct device *dev = &pdev->dev;

	int irq, rc = -1;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res) {

	ice_dev->res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!ice_dev->res) {

		pr_err("%s: No memory available for IORESOURCE\n", __func__);

		return -ENOMEM;

	}



	ice_dev->mmio = devm_ioremap_resource(dev, res);

	ice_dev->mmio = devm_ioremap_resource(dev, ice_dev->res);

	if (IS_ERR(ice_dev->mmio)) {

		rc = PTR_ERR(ice_dev->mmio);

		pr_err("%s: Error = %d mapping ICE io memory\n", __func__, rc);
@@ -851,13 +851,11 @@ static int qcom_ice_secure_ice_init(struct ice_device *ice_dev) 
	int ret = 0;

	u32 regval;



	regval = scm_call_atomic1(SCM_SVC_TZ, SCM_IO_READ,

			(unsigned long)ice_dev->mmio +

	regval = scm_io_read((unsigned long)ice_dev->res +

			QCOM_ICE_LUT_KEYS_ICE_SEC_IRQ_MASK);



	regval &= ~QCOM_ICE_SEC_IRQ_MASK;

	ret = scm_call_atomic2(SCM_SVC_TZ, SCM_IO_WRITE,

			(unsigned long)ice_dev->mmio +

	ret = scm_io_write((unsigned long)ice_dev->res +

			QCOM_ICE_LUT_KEYS_ICE_SEC_IRQ_MASK, regval);



	/*
@@ -962,7 +960,9 @@ static void qcom_ice_finish_init(void *data, async_cookie_t cookie) 
		return;

	}



	if (!qcom_ice_secure_ice_init(ice_dev)) {

	/* TZ side of ICE driver would handle secure init of ICE HW from v2 */

	if (ICE_REV(ice_dev->ice_hw_version, MAJOR) == 1 &&

		!qcom_ice_secure_ice_init(ice_dev)) {

		pr_err("%s: Error: ICE_ERROR_ICE_TZ_INIT_FAILED\n", __func__);

		ice_dev->error_cb(ice_dev->host_controller_data,

					ICE_ERROR_ICE_TZ_INIT_FAILED);