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

Commit f28de3bc authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: ADSPRPC: Remove IOMMU domain adsp_shared_domain"

parents 5df53019 ccd8600c

Documentation/devicetree/bindings/qdsp/msm-fastrpc.txt

+5 −27
Original line number Diff line number Diff line
@@ -44,39 +44,17 @@ Required subnode: 
                                banks



Required subnode properties:

- qcom,adsp-shared-domain-phandle: Specifies the phandle of iommu domain

                                   associated with context bank

- qcom,adsp-shared-phandle: phandle that describe the context bank handle

- qcom,adsp-shared-sids : A list of SID associated with the context bank

- qcom,virtual-addr-pool : Virtual address range that the context bank

                           will be using



Example:

        qcom,adsprpc_domains {

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

                qcom,msm_fastrpc_compute_cb {

                       qcom,adsp-shared-domain-phandle = <&adsp_shared_domain>;

                       qcom,adsp-shared-phandle = <&adsp_shared>;

                       qcom,adsp-shared-sids = <0x8 0x9>;

                };

        };



IOMMU Domain:



Required properties:

- compatible : Must be "qcom,iommu-domains"



Required subnode:

- adsp_shared_domain : IOMMU domain specifies the context bank and its VA range



Required subnode properties:

- label : Label describing the context bank

- qcom,iommu-contexts : phandle that describe the context bank handle

- qcom,virtual-addr-pool : Virtual address range that the context bank

                           will be using



Example:

	qcom,iommu-domains {

		compatible = "qcom,iommu-domains";

		adsp_shared_domain: qcom,iommu-domain6 {

			label = "adsp_shared";

			qcom,iommu-contexts = <&adsp_shared>;

                       qcom,virtual-addr-pool = <0x80000000 0x7FFFFFFF>;

                };

        };

arch/arm/boot/dts/qcom/msm8937-iommu-domains.dtsi

+0 −8
Original line number Diff line number Diff line
@@ -19,14 +19,6 @@ 
			qcom,virtual-addr-pool = <0x10000000 0x0fffffff>;

			#iommu-cells = <1>;

		};

		/*

		 * non-secure addr pool from 2048MB to 4096MB

		*/

		adsp_shared_domain: qcom,iommu-domain6 {

			label = "adsp_shared";

			qcom,iommu-contexts = <&adsp_shared>;

			qcom,virtual-addr-pool = <0x80000000 0x7FFFFFFF>;

		};



		/*

		 * non-secure addr pool from 1500 MB to 3532 MB

arch/arm/boot/dts/qcom/msm8937.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -1499,9 +1499,10 @@ 
	qcom,adsprpc_domains {

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

		qcom,msm_fastrpc_compute_cb {

			qcom,adsp-shared-domain-phandle = <&adsp_shared_domain>;

			qcom,adsp-shared-phandle = <&adsp_shared>;

			qcom,adsp-shared-sids =

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

			qcom,virtual-addr-pool = <0x80000000 0x7FFFFFFF>;

		};

	};

drivers/char/adsprpc.c

+3 −3
Original line number Diff line number Diff line
@@ -1917,7 +1917,7 @@ static int fastrpc_cb_legacy_probe(struct device *dev) 
		goto bail;

	VERIFY(err, 0 != (ctx_node = of_parse_phandle(

			domains_child_node,

			"qcom,adsp-shared-domain-phandle", 0)));

			"qcom,adsp-shared-phandle", 0)));

	if (err)

		goto bail;

	VERIFY(err, 0 != of_get_property(domains_child_node,
@@ -1936,14 +1936,14 @@ static int fastrpc_cb_legacy_probe(struct device *dev) 
	VERIFY(err, 0 != (name = of_get_property(ctx_node, "label", NULL)));

	if (err)

		goto bail;

	VERIFY(err, 0 != of_get_property(ctx_node,

	VERIFY(err, 0 != of_get_property(domains_child_node,

					"qcom,virtual-addr-pool", &range_size));

	if (err)

		goto bail;

	VERIFY(err, range = kzalloc(range_size, GFP_KERNEL));

	if (err)

		goto bail;

	ret = of_property_read_u32_array(ctx_node,

	ret = of_property_read_u32_array(domains_child_node,

					"qcom,virtual-addr-pool",

					range,

					range_size/sizeof(unsigned int));