Merge "ARM: dts: msm: Add the mem-protect-id to the modem PIL node on msm8996" (bc6da394) · Commits · e / devices / android_kernel_xiaomi_markw

Documentation/devicetree/bindings/pil/pil-q6v5-mss.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,8 @@ Optional properties:
		- qcom,is-not-loadable: Boolean- Present if the image does not need to
		be loaded.
		- qcom,pil-self-auth: Boolean- True if authentication is required.
		- qcom,mem-protect-id: Virtual ID used by PIL to call into TZ/HYP to protect/unprotect
		subsystem related memory.
		- qcom,gpio-err-fatal: GPIO used by the modem to indicate error fatal to the apps.
		- qcom,gpio-err-ready: GPIO used by the modem to indicate error ready to the apps.
		- qcom,gpio-proxy-unvote: GPIO used by the modem to trigger proxy unvoting in

Documentation/devicetree/bindings/pil/subsys-pil-tz.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -43,6 +43,8 @@ Optional properties:
		need to be loaded.
		- qcom,pil-no-auth: Boolean. Present if the subsystem is not authenticated and brought
		out of reset by using the PIL ops.
		- qcom,mem-protect-id: Virtual ID used by PIL to call into TZ/HYP to protect/unprotect
		subsystem related memory.
		- qcom,gpio-err-fatal: GPIO used by the subsystem to indicate error fatal to the apps.
		- qcom,gpio-err-ready: GPIO used by the subsystem to indicate error ready to the apps.
		- qcom,gpio-proxy-unvote: GPIO used by the subsystem to trigger proxy unvoting in

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -2482,6 +2482,7 @@
		qcom,pnoc-clk-vote;
		qcom,qdsp6v56-1-5;
		memory-region = <&modem_mem>;
		qcom,mem-protect-id = <0xF>;

		/* GPIO inputs from mss */
		qcom,gpio-err-fatal = <&smp2pgpio_ssr_smp2p_1_in 0 0>;

drivers/soc/qcom/peripheral-loader.c

+119 −6

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@
		#include <linux/dma-mapping.h>
		#include <soc/qcom/ramdump.h>
		#include <soc/qcom/subsystem_restart.h>
		#include <soc/qcom/secure_buffer.h>

		#include <asm/uaccess.h>
		#include <asm/setup.h>
		@@ -169,6 +170,73 @@ int pil_do_ramdump(struct pil_desc desc, void ramdump_dev)
		}
		EXPORT_SYMBOL(pil_do_ramdump);

		int pil_assign_mem_to_subsys(struct pil_desc *desc, phys_addr_t addr,
		size_t size)
		{
		int ret;
		int srcVM[1] = {VMID_HLOS};
		int destVM[1] = {desc->subsys_vmid};
		int destVMperm[1] = {PERM_READ \| PERM_WRITE};

		ret = hyp_assign_phys(addr, size, srcVM, 1, destVM, destVMperm, 1);
		if (ret)
		pil_err(desc, "%s: failed for %pa address of size %zx - subsys VMid %d\n",
		__func__, &addr, size, desc->subsys_vmid);
		return ret;
		}
		EXPORT_SYMBOL(pil_assign_mem_to_subsys);

		int pil_assign_mem_to_linux(struct pil_desc *desc, phys_addr_t addr,
		size_t size)
		{
		int ret;
		int srcVM[1] = {desc->subsys_vmid};
		int destVM[1] = {VMID_HLOS};
		int destVMperm[1] = {PERM_READ \| PERM_WRITE};

		ret = hyp_assign_phys(addr, size, srcVM, 1, destVM, destVMperm, 1);
		if (ret)
		panic("%s: failed for %pa address of size %zx - subsys VMid %d. Fatal error.\n",
		__func__, &addr, size, desc->subsys_vmid);

		return ret;
		}
		EXPORT_SYMBOL(pil_assign_mem_to_linux);

		int pil_assign_mem_to_subsys_and_linux(struct pil_desc *desc,
		phys_addr_t addr, size_t size)
		{
		int ret;
		int srcVM[1] = {VMID_HLOS};
		int destVM[2] = {VMID_HLOS, desc->subsys_vmid};
		int destVMperm[2] = {PERM_READ \| PERM_WRITE, PERM_READ \| PERM_WRITE};

		ret = hyp_assign_phys(addr, size, srcVM, 1, destVM, destVMperm, 2);
		if (ret)
		pil_err(desc, "%s: failed for %pa address of size %zx - subsys VMid %d\n",
		__func__, &addr, size, desc->subsys_vmid);

		return ret;
		}
		EXPORT_SYMBOL(pil_assign_mem_to_subsys_and_linux);

		int pil_reclaim_mem(struct pil_desc *desc, phys_addr_t addr, size_t size,
		int VMid)
		{
		int ret;
		int srcVM[2] = {VMID_HLOS, desc->subsys_vmid};
		int destVM[1] = {VMid};
		int destVMperm[1] = {PERM_READ \| PERM_WRITE};

		ret = hyp_assign_phys(addr, size, srcVM, 2, destVM, destVMperm, 1);
		if (ret)
		panic("%s: failed for %pa address of size %zx - subsys VMid %d. Fatal error.\n",
		__func__, &addr, size, desc->subsys_vmid);

		return ret;
		}
		EXPORT_SYMBOL(pil_reclaim_mem);

		/**
		* pil_get_entry_addr() - Retrieve the entry address of a peripheral image
		* @desc: descriptor from pil_desc_init()
		@@ -478,6 +546,16 @@ static int pil_init_mmap(struct pil_desc desc, const struct pil_mdt mdt)
		if (ret)
		return ret;

		if (desc->subsys_vmid > 0) {
		ret = pil_assign_mem_to_subsys_and_linux(desc,
		priv->region_start,
		(priv->region_end - priv->region_start));
		if (ret) {
		pil_err(desc, "Failed to assign memory, ret - %d\n",
		ret);
		return ret;
		}
		}
		pil_info(desc, "loading from %pa to %pa\n", &priv->region_start,
		&priv->region_end);

		@@ -605,13 +683,21 @@ static int pil_load_seg(struct pil_desc desc, struct pil_seg seg)

		static int pil_parse_devicetree(struct pil_desc *desc)
		{
		struct device_node *ofnode = desc->dev->of_node;
		int clk_ready = 0;

		if (desc->ops->proxy_unvote &&
		of_find_property(desc->dev->of_node,
		if (!ofnode)
		return -EINVAL;

		if (of_property_read_u32(ofnode, "qcom,mem-protect-id",
		&desc->subsys_vmid))
		pr_debug("Unable to read the addr-protect-id for %s\n",
		desc->name);

		if (desc->ops->proxy_unvote && of_find_property(ofnode,
		"qcom,gpio-proxy-unvote",
		NULL)) {
		clk_ready = of_get_named_gpio(desc->dev->of_node,
		clk_ready = of_get_named_gpio(ofnode,
		"qcom,gpio-proxy-unvote", 0);

		if (clk_ready < 0) {
		@@ -651,6 +737,7 @@ int pil_boot(struct pil_desc *desc)
		struct pil_seg *seg;
		const struct firmware *fw;
		struct pil_priv *priv = desc->priv;
		bool mem_protect = false;

		if (desc->shutdown_fail)
		pil_err(desc, "Subsystem shutdown failed previously!\n");
		@@ -727,12 +814,29 @@ int pil_boot(struct pil_desc *desc)
		goto err_deinit_image;
		}

		if (desc->subsys_vmid > 0) {
		ret = pil_reclaim_mem(desc, priv->region_start,
		(priv->region_end - priv->region_start),
		desc->subsys_vmid);
		if (ret) {
		pil_err(desc, "Failed to assign %s memory, ret - %d\n",
		desc->name, ret);
		goto err_deinit_image;
		}
		}

		ret = desc->ops->auth_and_reset(desc);
		if (ret) {
		pil_err(desc, "Failed to bring out of reset\n");
		goto err_deinit_image;
		goto err_auth_and_reset;
		}
		pil_info(desc, "Brought out of reset\n");
		err_auth_and_reset:
		if (ret && desc->subsys_vmid > 0) {
		pil_assign_mem_to_linux(desc, priv->region_start,
		(priv->region_end - priv->region_start));
		mem_protect = true;
		}
		err_deinit_image:
		if (ret && desc->ops->deinit_image)
		desc->ops->deinit_image(desc);
		@@ -746,6 +850,12 @@ out:
		up_read(&pil_pm_rwsem);
		if (ret) {
		if (priv->region) {
		if (desc->subsys_vmid > 0 && !mem_protect) {
		pil_reclaim_mem(desc, priv->region_start,
		(priv->region_end -
		priv->region_start),
		VMID_HLOS);
		}
		dma_free_attrs(desc->dev, priv->region_size,
		priv->region, priv->region_start,
		&desc->attrs);
		@@ -792,6 +902,9 @@ void pil_free_memory(struct pil_desc *desc)
		struct pil_priv *priv = desc->priv;

		if (priv->region) {
		if (desc->subsys_vmid > 0)
		pil_assign_mem_to_linux(desc, priv->region_start,
		(priv->region_end - priv->region_start));
		dma_free_attrs(desc->dev, priv->region_size,
		priv->region, priv->region_start, &desc->attrs);
		priv->region = NULL;

drivers/soc/qcom/peripheral-loader.h

+30 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ struct pil_priv;
		* @unmap_fw_mem: Custom function used to undo mapping by map_fw_mem.
		* This defaults to iounmap if not specified.
		* @shutdown_fail: Set if PIL op for shutting down subsystem fails.
		* @subsys_vmid: memprot id for the subsystem.
		*/
		struct pil_desc {
		const char *name;
		@@ -53,6 +54,7 @@ struct pil_desc {
		void (unmap_fw_mem)(void virt, size_t size, void *data);
		void *map_data;
		bool shutdown_fail;
		u32 subsys_vmid;
		};

		/**
		@@ -100,6 +102,14 @@ extern void pil_free_memory(struct pil_desc *desc);
		extern void pil_desc_release(struct pil_desc *desc);
		extern phys_addr_t pil_get_entry_addr(struct pil_desc *desc);
		extern int pil_do_ramdump(struct pil_desc desc, void ramdump_dev);
		extern int pil_assign_mem_to_subsys(struct pil_desc *desc, phys_addr_t addr,
		size_t size);
		extern int pil_assign_mem_to_linux(struct pil_desc *desc, phys_addr_t addr,
		size_t size);
		extern int pil_assign_mem_to_subsys_and_linux(struct pil_desc *desc,
		phys_addr_t addr, size_t size);
		extern int pil_reclaim_mem(struct pil_desc *desc, phys_addr_t addr, size_t size,
		int VMid);
		#else
		static inline int pil_desc_init(struct pil_desc *desc) { return 0; }
		static inline int pil_boot(struct pil_desc *desc) { return 0; }
		@@ -114,6 +124,26 @@ static inline int pil_do_ramdump(struct pil_desc desc, void ramdump_dev)
		{
		return 0;
		}
		static inline int pil_assign_mem_to_subsys(struct pil_desc *desc,
		phys_addr_t addr, size_t size)
		{
		return 0;
		}
		static inline int pil_assign_mem_to_linux(struct pil_desc *desc,
		phys_addr_t addr, size_t size)
		{
		return 0;
		}
		static inline int pil_assign_mem_to_subsys_and_linux(struct pil_desc *desc,
		phys_addr_t addr, size_t size)
		{
		return 0;
		}
		static inline int pil_reclaim_mem(struct pil_desc *desc, phys_addr_t addr,
		size_t size, int VMid)
		{
		return 0;
		}
		#endif

		#endif