Skip to contentSkip to conversation

soc: qcom: rmtfs-mem: Add support for assigning memory to remote

PATCH In review Bjorn Andersson 2 participants 4 messages Feb 13, 2018 – Feb 21, 2018

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 soc: qcom: rmtfs-mem: Add support for assigning memory to remote

On some platform the remote processor's memory map is not statically configured in TrustZone, so each memory region that is to be accessed by the remote needs a call into TrustZone to set up the remote's permissions.

Implement this for the rmtfs memory driver, to give the modem on 8996 access to the shared file system buffers.

---
 drivers/soc/qcom/Kconfig     |  1 +
 drivers/soc/qcom/rmtfs_mem.c | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+)
drivers/soc/qcom/Kconfig +1 -0
index e050eb83341d..a993d19fa562 100644
@@ -47,6 +47,7 @@ config QCOM_QMI_HELPERS
 config QCOM_RMTFS_MEM
 	tristate "Qualcomm Remote Filesystem memory driver"
 	depends on ARCH_QCOM
+	select QCOM_SCM
 	help
 	  The Qualcomm remote filesystem memory driver is used for allocating
 	  and exposing regions of shared memory with remote processors for the
drivers/soc/qcom/rmtfs_mem.c +34 -0
index 0a43b2e8906f..c8999e38b005 100644
@@ -37,6 +37,8 @@ struct qcom_rmtfs_mem {
 	phys_addr_t size;
 
 	unsigned int client_id;
+
+	unsigned int perms;
 };
 
 static ssize_t qcom_rmtfs_mem_show(struct device *dev,
@@ -151,9 +153,11 @@ static void qcom_rmtfs_mem_release_device(struct device *dev)
 static int qcom_rmtfs_mem_probe(struct platform_device *pdev)
 {
 	struct device_node *node = pdev->dev.of_node;
+	struct qcom_scm_vmperm perms[2];
 	struct reserved_mem *rmem;
 	struct qcom_rmtfs_mem *rmtfs_mem;
 	u32 client_id;
+	u32 vmid;
 	int ret;
 
 	rmem = of_reserved_mem_lookup(node);
@@ -204,10 +208,31 @@ static int qcom_rmtfs_mem_probe(struct platform_device *pdev)
 
 	rmtfs_mem->dev.release = qcom_rmtfs_mem_release_device;
 
+	ret = of_property_read_u32(node, "qcom,vmid", &vmid);
+	if (ret < 0 && ret != -EINVAL) {
+		dev_err(&pdev->dev, "failed to parse qcom,vmid\n");
+		goto remove_cdev;
+	} else if (!ret) {
+		perms[0].vmid = QCOM_SCM_VMID_HLOS;
+		perms[0].perm = QCOM_SCM_PERM_RW;
+		perms[1].vmid = vmid;
+		perms[1].perm = QCOM_SCM_PERM_RW;
+
+		rmtfs_mem->perms = BIT(QCOM_SCM_VMID_HLOS);
+		ret = qcom_scm_assign_mem(rmtfs_mem->addr, rmtfs_mem->size,
+					  &rmtfs_mem->perms, perms, 2);
+		if (ret < 0) {
+			dev_err(&pdev->dev, "assign memory failed\n");
+			goto remove_cdev;
+		}
+	}
+
 	dev_set_drvdata(&pdev->dev, rmtfs_mem);
 
 	return 0;
 
+remove_cdev:
+	cdev_device_del(&rmtfs_mem->cdev, &rmtfs_mem->dev);
 put_device:
 	put_device(&rmtfs_mem->dev);
 
@@ -217,6 +242,15 @@ static int qcom_rmtfs_mem_probe(struct platform_device *pdev)
 static int qcom_rmtfs_mem_remove(struct platform_device *pdev)
 {
 	struct qcom_rmtfs_mem *rmtfs_mem = dev_get_drvdata(&pdev->dev);
+	struct qcom_scm_vmperm perm;
+
+	if (rmtfs_mem->perms) {
+		perm.vmid = QCOM_SCM_VMID_HLOS;
+		perm.perm = QCOM_SCM_PERM_RW;
+
+		qcom_scm_assign_mem(rmtfs_mem->addr, rmtfs_mem->size,
+				    &rmtfs_mem->perms, &perm, 1);
+	}
 
 	cdev_device_del(&rmtfs_mem->cdev, &rmtfs_mem->dev);
 	put_device(&rmtfs_mem->dev);
Signature · 1 line
2.15.0
#1 lore raw

PATCH 2/2 arm64: dts: msm8996: Add rmtfs sharedmem node

A 2MB shared memory region is used on MSM8996 for exchanging sector data in rmtfs. Add this chunk of reserved memory now that we have the rmtfs-mem compatible to describe it and its memory protection properties.

---
 arch/arm64/boot/dts/qcom/msm8996.dtsi | 11 +++++++++++
 1 file changed, 11 insertions(+)
arch/arm64/boot/dts/qcom/msm8996.dtsi +11 -0
index 4b2afcc4fdf4..d04babb5f526 100644
@@ -75,6 +75,17 @@
 			reg = <0x0 0x86200000 0x0 0x2600000>;
 			no-map;
 		};
+
+		rmtfs@86700000 {
+			compatible = "qcom,rmtfs-mem";
+
+			size = <0x0 0x200000>;
+			alloc-ranges = <0x0 0xa0000000 0x0 0x2000000>;
+			no-map;
+
+			qcom,client-id = <1>;
+			qcom,vmid = <15>;
+		};
 	};
 
 	cpus {
Signature · 1 line
2.15.0
#2 lore raw
In reply to Bjorn Andersson

Hi Bjorn,

Quoted 64 lines · Bjorn Andersson

On some platform the remote processor's memory map is not statically configured in TrustZone, so each memory region that is to be accessed by the remote needs a call into TrustZone to set up the remote's permissions.

Implement this for the rmtfs memory driver, to give the modem on 8996 access to the shared file system buffers.

---
  drivers/soc/qcom/Kconfig     |  1 +
  drivers/soc/qcom/rmtfs_mem.c | 34 ++++++++++++++++++++++++++++++++++
  2 files changed, 35 insertions(+)
drivers/soc/qcom/Kconfig +1 -0
index e050eb83341d..a993d19fa562 100644
@@ -47,6 +47,7 @@ config QCOM_QMI_HELPERS
  config QCOM_RMTFS_MEM
  	tristate "Qualcomm Remote Filesystem memory driver"
  	depends on ARCH_QCOM
+	select QCOM_SCM
  	help
  	  The Qualcomm remote filesystem memory driver is used for allocating
  	  and exposing regions of shared memory with remote processors for the
drivers/soc/qcom/rmtfs_mem.c +13 -0
index 0a43b2e8906f..c8999e38b005 100644
@@ -37,6 +37,8 @@ struct qcom_rmtfs_mem {
  	phys_addr_t size;
 
  	unsigned int client_id;
+
+	unsigned int perms;
  };
 
  static ssize_t qcom_rmtfs_mem_show(struct device *dev,
@@ -151,9 +153,11 @@ static void qcom_rmtfs_mem_release_device(struct device *dev)
  static int qcom_rmtfs_mem_probe(struct platform_device *pdev)
  {
  	struct device_node *node = pdev->dev.of_node;
+	struct qcom_scm_vmperm perms[2];
  	struct reserved_mem *rmem;
  	struct qcom_rmtfs_mem *rmtfs_mem;
  	u32 client_id;
+	u32 vmid;
  	int ret;
 
  	rmem = of_reserved_mem_lookup(node);
@@ -204,10 +208,31 @@ static int qcom_rmtfs_mem_probe(struct platform_device *pdev)
 
  	rmtfs_mem->dev.release = qcom_rmtfs_mem_release_device;
 
+	ret = of_property_read_u32(node, "qcom,vmid", &vmid);
+	if (ret < 0 && ret != -EINVAL) {
+		dev_err(&pdev->dev, "failed to parse qcom,vmid\n");
+		goto remove_cdev;
+	} else if (!ret) {
+		perms[0].vmid = QCOM_SCM_VMID_HLOS;
+		perms[0].perm = QCOM_SCM_PERM_RW;
+		perms[1].vmid = vmid;
+		perms[1].perm = QCOM_SCM_PERM_RW;

drivers/soc/qcom/rmtfs_mem.c static int qcom_rmtfs_mem_probe(struct platform_device *pdev) · line 229

Quoted 10 lines
drivers/soc/qcom/rmtfs_mem.c +10 -0
+
+		rmtfs_mem->perms = BIT(QCOM_SCM_VMID_HLOS);
+		ret = qcom_scm_assign_mem(rmtfs_mem->addr, rmtfs_mem->size,
+					  &rmtfs_mem->perms, perms, 2);
+		if (ret < 0) {
+			dev_err(&pdev->dev, "assign memory failed\n");
+			goto remove_cdev;
+		}
+	}
+

I have a query here,
We assigned memory ownership to modem at boot up. In case of errors in other parts of driver, where we are returning, have we assigned memory back to HLOS

Quoted 25 lines
drivers/soc/qcom/rmtfs_mem.c +11 -0
  	dev_set_drvdata(&pdev->dev, rmtfs_mem);
 
  	return 0;
 
+remove_cdev:
+	cdev_device_del(&rmtfs_mem->cdev, &rmtfs_mem->dev);
  put_device:
  	put_device(&rmtfs_mem->dev);
 
@@ -217,6 +242,15 @@ static int qcom_rmtfs_mem_probe(struct platform_device *pdev)
  static int qcom_rmtfs_mem_remove(struct platform_device *pdev)
  {
  	struct qcom_rmtfs_mem *rmtfs_mem = dev_get_drvdata(&pdev->dev);
+	struct qcom_scm_vmperm perm;
+
+	if (rmtfs_mem->perms) {
+		perm.vmid = QCOM_SCM_VMID_HLOS;
+		perm.perm = QCOM_SCM_PERM_RW;
+
+		qcom_scm_assign_mem(rmtfs_mem->addr, rmtfs_mem->size,
+				    &rmtfs_mem->perms, &perm, 1);
+	}
 
  	cdev_device_del(&rmtfs_mem->cdev, &rmtfs_mem->dev);
  	put_device(&rmtfs_mem->dev);
#3 lore raw
Quoted 69 lines · Jitendra Sharma

Hi Bjorn,

Quoted 65 lines · Bjorn Andersson

On some platform the remote processor's memory map is not statically configured in TrustZone, so each memory region that is to be accessed by the remote needs a call into TrustZone to set up the remote's permissions.

Implement this for the rmtfs memory driver, to give the modem on 8996 access to the shared file system buffers.

---
  drivers/soc/qcom/Kconfig     |  1 +
  drivers/soc/qcom/rmtfs_mem.c | 34 ++++++++++++++++++++++++++++++++++
  2 files changed, 35 insertions(+)
drivers/soc/qcom/Kconfig +1 -0
index e050eb83341d..a993d19fa562 100644
@@ -47,6 +47,7 @@ config QCOM_QMI_HELPERS
  config QCOM_RMTFS_MEM
  	tristate "Qualcomm Remote Filesystem memory driver"
  	depends on ARCH_QCOM
+	select QCOM_SCM
  	help
  	  The Qualcomm remote filesystem memory driver is used for allocating
  	  and exposing regions of shared memory with remote processors for the
drivers/soc/qcom/rmtfs_mem.c +19 -0
index 0a43b2e8906f..c8999e38b005 100644
@@ -37,6 +37,8 @@ struct qcom_rmtfs_mem {
  	phys_addr_t size;
  	unsigned int client_id;
+
+	unsigned int perms;
  };
  static ssize_t qcom_rmtfs_mem_show(struct device *dev,
@@ -151,9 +153,11 @@ static void qcom_rmtfs_mem_release_device(struct device *dev)
  static int qcom_rmtfs_mem_probe(struct platform_device *pdev)
  {
  	struct device_node *node = pdev->dev.of_node;
+	struct qcom_scm_vmperm perms[2];
  	struct reserved_mem *rmem;
  	struct qcom_rmtfs_mem *rmtfs_mem;
  	u32 client_id;
+	u32 vmid;
  	int ret;
  	rmem = of_reserved_mem_lookup(node);
@@ -204,10 +208,31 @@ static int qcom_rmtfs_mem_probe(struct platform_device *pdev)
  	rmtfs_mem->dev.release = qcom_rmtfs_mem_release_device;
+	ret = of_property_read_u32(node, "qcom,vmid", &vmid);
+	if (ret < 0 && ret != -EINVAL) {
+		dev_err(&pdev->dev, "failed to parse qcom,vmid\n");
+		goto remove_cdev;
+	} else if (!ret) {
+		perms[0].vmid = QCOM_SCM_VMID_HLOS;
+		perms[0].perm = QCOM_SCM_PERM_RW;
+		perms[1].vmid = vmid;
+		perms[1].perm = QCOM_SCM_PERM_RW;
+
+		rmtfs_mem->perms = BIT(QCOM_SCM_VMID_HLOS);
+		ret = qcom_scm_assign_mem(rmtfs_mem->addr, rmtfs_mem->size,
+					  &rmtfs_mem->perms, perms, 2);
+		if (ret < 0) {
+			dev_err(&pdev->dev, "assign memory failed\n");
Quoted 8 lines

drivers/soc/qcom/rmtfs_mem.c static int qcom_rmtfs_mem_probe(struct platform_device *pdev) · line 229

Quoted 4 lines
drivers/soc/qcom/rmtfs_mem.c +4 -0
+			goto remove_cdev;
+		}
+	}
+

I have a query here,
We assigned memory ownership to modem at boot up. In case of errors in other parts of driver, where we are returning, have we assigned memory back to HLOS

We're assigning the rmtfs memory to MPSS from the time this driver probes until it is removed. The PIL related memory regions shared with MPSS is handled by the remoteproc driver, for the duration of the MPSS being up.

The one issue worth mentioning here is that this extends the dependency the booting MPSS have on the remote-storage QMI service being functional, i.e. if this device isn't present, we can't serve remote-storage requests and MPSS will not function.

I haven't yet come up with a good idea of how to make the MPSS PIL explicitly depend on the remote-storage service being present.

Regards,
Bjorn