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

Commit 11e60104 authored by Jeya R's avatar Jeya R Committed by Gerrit - the friendly Code Review server
Browse files

msm: set config for ADSPRPC and add dtsi node 



Set config for ADSPRPC and add dtsi node related to fastrpc.
Add backward compatibility in adsprpc driver code to probe
legacy dtsi entries.

Change-Id: Ibadfb3031ea491c8782c78d351d93f7dd45ad755
Signed-off-by: default avatarJeya R <jeyr@codeaurora.org>
parent ecbb3684

arch/arm/configs/vendor/sdm429-bg-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -331,6 +331,7 @@ CONFIG_HW_RANDOM=y 
CONFIG_HW_RANDOM_MSM_LEGACY=y

CONFIG_MSM_SMD_PKT=y

CONFIG_DIAG_CHAR=y

CONFIG_MSM_ADSPRPC=y

CONFIG_MSM_RDBG=m

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_MSM_V2=y

arch/arm/configs/vendor/sdm429-bg_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -342,6 +342,7 @@ CONFIG_HW_RANDOM=y 
CONFIG_HW_RANDOM_MSM_LEGACY=y

CONFIG_MSM_SMD_PKT=y

CONFIG_DIAG_CHAR=y

CONFIG_MSM_ADSPRPC=y

CONFIG_MSM_RDBG=m

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_MSM_V2=y

arch/arm64/boot/dts/qcom/sdm429.dtsi

+16 −0
Original line number Diff line number Diff line
@@ -783,6 +783,22 @@ 
		};

	};



	qcom,adsprpc-mem {

	compatible = "qcom,msm-adsprpc-mem-region";

	memory-region = <&adsp_mem>;

	restrict-access;

	};



	qcom,msm_fastrpc {

		compatible ="qcom,msm-fastrpc-legacy-compute";

		qcom,msm_fastrpc_compute_cb1 {

			compatible = "qcom,msm-fastrpc-legacy-compute-cb";

			label = "adsprpc-smd";

			iommus = <&apps_iommu 0x2008 0x7>;

			sids = <0x8 0x9 0xa 0xb 0xc 0xd 0xe 0xf>;

		};

	};



	wcnss-smp2p {

		compatible = "qcom,smp2p";

		qcom,smem = <451>, <431>;

drivers/char/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -609,7 +609,7 @@ config MSM_FASTCVPD 


config MSM_ADSPRPC

        tristate "QTI ADSP RPC driver"

        depends on QCOM_GLINK

        depends on QCOM_GLINK || RPMSG_QCOM_SMD

        help

          Provides a communication mechanism that allows for clients to

          make remote method invocations across processor boundary to

drivers/char/adsprpc.c

+91 −1
Original line number Diff line number Diff line
@@ -4002,6 +4002,92 @@ static int fastrpc_cb_probe(struct device *dev) 
	return err;

}





static int fastrpc_cb_legacy_probe(struct device *dev)

{

	struct fastrpc_channel_ctx *chan;

	struct fastrpc_session_ctx *first_sess = NULL, *sess = NULL;

	const char *name;

	unsigned int *sids = NULL, sids_size = 0;

	int err = 0, ret = 0, i;



	unsigned int start = 0x80000000;



	VERIFY(err, NULL != (name = of_get_property(dev->of_node,

					 "label", NULL)));

	if (err)

		goto bail;



	for (i = 0; i < NUM_CHANNELS; i++) {

		if (!gcinfo[i].name)

			continue;

		if (!strcmp(name, gcinfo[i].name))

			break;

	}

	VERIFY(err, i < NUM_CHANNELS);

	if (err)

		goto bail;



	chan = &gcinfo[i];

	VERIFY(err, chan->sesscount < NUM_SESSIONS);

	if (err)

		goto bail;



	first_sess  = &chan->session[chan->sesscount];



	VERIFY(err, NULL != of_get_property(dev->of_node,

				"sids", &sids_size));

	if (err)

		goto bail;



	VERIFY(err, NULL != (sids = kzalloc(sids_size, GFP_KERNEL)));

	if (err)

		goto bail;

	ret = of_property_read_u32_array(dev->of_node, "sids", sids,

					sids_size/sizeof(unsigned int));

	if (ret)

		goto bail;



	VERIFY(err, !IS_ERR_OR_NULL(first_sess->smmu.mapping =

				arm_iommu_create_mapping(&platform_bus_type,

						start, 0x78000000)));

	if (err)

		goto bail;



	VERIFY(err, !arm_iommu_attach_device(dev, first_sess->smmu.mapping));

	if (err) {

		pr_err("adsprpc: %s: attaching iommu device failed for %s with err %d",

			__func__, dev_name(dev), err);

		goto bail;

	}





	for (i = 0; i < sids_size/sizeof(unsigned int); i++) {

		VERIFY(err, chan->sesscount < NUM_SESSIONS);

		if (err)

			goto bail;

		sess = &chan->session[chan->sesscount];

		sess->smmu.cb = sids[i];

		sess->smmu.dev = dev;

		sess->smmu.dev_name = dev_name(dev);

		sess->smmu.mapping = first_sess->smmu.mapping;

		sess->smmu.enabled = 1;

		sess->used = 0;

		sess->smmu.coherent = false;

		sess->smmu.secure = false;

		chan->sesscount++;

		if (!sess->smmu.dev->dma_parms)

			sess->smmu.dev->dma_parms = devm_kzalloc(sess->smmu.dev,

				sizeof(*sess->smmu.dev->dma_parms), GFP_KERNEL);

		dma_set_max_seg_size(sess->smmu.dev, DMA_BIT_MASK(32));

		dma_set_seg_boundary(sess->smmu.dev,

					(unsigned long)DMA_BIT_MASK(64));

	}

bail:

	kfree(sids);

	return err;

}



static void init_secure_vmid_list(struct device *dev, char *prop_name,

						struct secure_vm *destvm)

{
@@ -4097,6 +4183,10 @@ static int fastrpc_probe(struct platform_device *pdev) 
					"qcom,msm-fastrpc-compute-cb"))

		return fastrpc_cb_probe(dev);



	if (of_device_is_compatible(dev->of_node,

					"qcom,msm-fastrpc-legacy-compute-cb"))

		return fastrpc_cb_legacy_probe(dev);



	if (of_device_is_compatible(dev->of_node,

					"qcom,msm-adsprpc-mem-region")) {

		me->dev = dev;
@@ -4291,7 +4381,7 @@ static struct platform_driver fastrpc_driver = { 


static const struct rpmsg_device_id fastrpc_rpmsg_match[] = {

	{ FASTRPC_GLINK_GUID },

	{ },

	{ FASTRPC_SMD_GUID },

};



static const struct of_device_id fastrpc_rpmsg_of_match[] = {