Skip to contentSkip to conversation

firmware: qcom: scm: add 32 bit iommu page table support

PATCH In review Brian Masney 5 participants 7 messages Jan 1, 2020 – Jan 5, 2020 Arm Qualcomm mailing list

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 firmware: qcom: scm: add 32 bit iommu page table support

Add 32 bit implmentations of the functions __qcom_scm_iommu_secure_ptbl_size() and __qcom_scm_iommu_secure_ptbl_init() that are required by the qcom_iommu driver.

---
 drivers/firmware/qcom_scm-32.c | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)
drivers/firmware/qcom_scm-32.c +30 -2
index 48e2ef794ea3..f149a85d36b0 100644
@@ -638,13 +638,41 @@ int __qcom_scm_restore_sec_cfg(struct device *dev, u32 device_id,
 int __qcom_scm_iommu_secure_ptbl_size(struct device *dev, u32 spare,
 				      size_t *size)
 {
-	return -ENODEV;
+	int psize[2] = { 0, 0 };
+	int ret;
+
+	ret = qcom_scm_call(dev, QCOM_SCM_SVC_MP,
+			    QCOM_SCM_IOMMU_SECURE_PTBL_SIZE,
+			    &spare, sizeof(spare), &psize, sizeof(psize));
+	if (ret || psize[1])
+		return ret ? ret : -EINVAL;
+
+	*size = psize[0];
+
+	return 0;
 }
 
 int __qcom_scm_iommu_secure_ptbl_init(struct device *dev, u64 addr, u32 size,
 				      u32 spare)
 {
-	return -ENODEV;
+	struct msm_scm_ptbl_init {
+		__le32 paddr;
+		__le32 size;
+		__le32 spare;
+	} req;
+	int ret, scm_ret = 0;
+
+	req.paddr = addr;
+	req.size = size;
+	req.spare = spare;
+
+	ret = qcom_scm_call(dev, QCOM_SCM_SVC_MP,
+			    QCOM_SCM_IOMMU_SECURE_PTBL_INIT,
+			    &req, sizeof(req), &scm_ret, sizeof(scm_ret));
+	if (ret || scm_ret)
+		return ret ? ret : -EINVAL;
+
+	return 0;
 }
 
 int __qcom_scm_io_readl(struct device *dev, phys_addr_t addr,
Signature · 1 line
2.21.0
#1 lore raw
Quoted 15 lines · Brian Masney

Add 32 bit implmentations of the functions __qcom_scm_iommu_secure_ptbl_size() and __qcom_scm_iommu_secure_ptbl_init() that are required by the qcom_iommu driver.

---
 drivers/firmware/qcom_scm-32.c | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)
drivers/firmware/qcom_scm-32.c +0 -0
index 48e2ef794ea3..f149a85d36b0 100644

drivers/firmware/qcom_scm-32.c int __qcom_scm_restore_sec_cfg(struct device *dev, u32 device_id, · line 641

Quoted 5 lines
drivers/firmware/qcom_scm-32.c +1 -1
@@ -638,13 +638,41 @@ int __qcom_scm_restore_sec_cfg(struct device *dev, u32 device_id,
 int __qcom_scm_iommu_secure_ptbl_size(struct device *dev, u32 spare,
 				      size_t *size)
 {
-	return -ENODEV;
+	int psize[2] = { 0, 0 };

I would use an explicit size (i.e. __le32) here.

Quoted 17 lines
drivers/firmware/qcom_scm-32.c +11 -1
+	int ret;
+
+	ret = qcom_scm_call(dev, QCOM_SCM_SVC_MP,
+			    QCOM_SCM_IOMMU_SECURE_PTBL_SIZE,
+			    &spare, sizeof(spare), &psize, sizeof(psize));
+	if (ret || psize[1])
+		return ret ? ret : -EINVAL;
+
+	*size = psize[0];
+
+	return 0;
 }
 
 int __qcom_scm_iommu_secure_ptbl_init(struct device *dev, u64 addr, u32 size,
 				      u32 spare)
 {
-	return -ENODEV;

drivers/firmware/qcom_scm-32.c int __qcom_scm_restore_sec_cfg(struct device *dev, u32 device_id, · line 667

Quoted 10 lines
drivers/firmware/qcom_scm-32.c +10 -0
+	struct msm_scm_ptbl_init {
+		__le32 paddr;
+		__le32 size;
+		__le32 spare;
+	} req;
+	int ret, scm_ret = 0;
+
+	req.paddr = addr;
+	req.size = size;
+	req.spare = spare;

I'm not sure if there is actually anyone using qcom in BE mode (does that even work?), but all the other methods in this file explicitly convert using cpu_to_le32(), so this method should do the same :)

Quoted 14 lines
drivers/firmware/qcom_scm-32.c +8 -0
+
+	ret = qcom_scm_call(dev, QCOM_SCM_SVC_MP,
+			    QCOM_SCM_IOMMU_SECURE_PTBL_INIT,
+			    &req, sizeof(req), &scm_ret, sizeof(scm_ret));
+	if (ret || scm_ret)
+		return ret ? ret : -EINVAL;
+
+	return 0;
 }
 
 int __qcom_scm_io_readl(struct device *dev, phys_addr_t addr,
Signature · 1 line
2.21.0
#2 lore raw
Quoted 48 lines · Stephan Gerhold
Quoted 15 lines · Brian Masney

Add 32 bit implmentations of the functions __qcom_scm_iommu_secure_ptbl_size() and __qcom_scm_iommu_secure_ptbl_init() that are required by the qcom_iommu driver.

---
 drivers/firmware/qcom_scm-32.c | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)
drivers/firmware/qcom_scm-32.c +0 -0
index 48e2ef794ea3..f149a85d36b0 100644

drivers/firmware/qcom_scm-32.c int __qcom_scm_restore_sec_cfg(struct device *dev, u32 device_id, · line 641

Quoted 5 lines
drivers/firmware/qcom_scm-32.c +1 -1
@@ -638,13 +638,41 @@ int __qcom_scm_restore_sec_cfg(struct device *dev, u32 device_id,
 int __qcom_scm_iommu_secure_ptbl_size(struct device *dev, u32 spare,
                                    size_t *size)
 {
-     return -ENODEV;
+     int psize[2] = { 0, 0 };

I would use an explicit size (i.e. __le32) here.

Quoted 23 lines
drivers/firmware/qcom_scm-32.c +17 -1
+     int ret;
+
+     ret = qcom_scm_call(dev, QCOM_SCM_SVC_MP,
+                         QCOM_SCM_IOMMU_SECURE_PTBL_SIZE,
+                         &spare, sizeof(spare), &psize, sizeof(psize));
+     if (ret || psize[1])
+             return ret ? ret : -EINVAL;
+
+     *size = psize[0];
+
+     return 0;
 }
 
 int __qcom_scm_iommu_secure_ptbl_init(struct device *dev, u64 addr, u32 size,
                                    u32 spare)
 {
-     return -ENODEV;
+     struct msm_scm_ptbl_init {
+             __le32 paddr;
+             __le32 size;
+             __le32 spare;
+     } req;
+     int ret, scm_ret = 0;
Quoted 8 lines

drivers/firmware/qcom_scm-32.c int __qcom_scm_restore_sec_cfg(struct device *dev, u32 device_id, · line 667

Quoted 4 lines
drivers/firmware/qcom_scm-32.c +4 -0
+
+     req.paddr = addr;
+     req.size = size;
+     req.spare = spare;

I'm not sure if there is actually anyone using qcom in BE mode (does that even work?), but all the other methods in this file explicitly convert using cpu_to_le32(), so this method should do the same :)

sboyd used to occasionally fix things related to qcom in BE back in the day.. not sure if modern snapdragons still support BE.

(I'm willing to just pretend that they don't.. that lessens the chance that someday someone gets far enough to try the GPU in BE mode, and realizes they've wasted their time getting that far ;-))

BR,
-R

Quoted 14 lines
Quoted 14 lines
drivers/firmware/qcom_scm-32.c +8 -1
+
+     ret = qcom_scm_call(dev, QCOM_SCM_SVC_MP,
+                         QCOM_SCM_IOMMU_SECURE_PTBL_INIT,
+                         &req, sizeof(req), &scm_ret, sizeof(scm_ret));
+     if (ret || scm_ret)
+             return ret ? ret : -EINVAL;
+
+     return 0;
 }
 
 int __qcom_scm_io_readl(struct device *dev, phys_addr_t addr,
--

2.21.0

#3 lore raw

Quoting Rob Clark (2020-01-01 12:14:35)

Quoted 58 lines · Stephan Gerhold
Quoted 48 lines · Brian Masney
Quoted 15 lines

Add 32 bit implmentations of the functions __qcom_scm_iommu_secure_ptbl_size() and __qcom_scm_iommu_secure_ptbl_init() that are required by the qcom_iommu driver.

---
 drivers/firmware/qcom_scm-32.c | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)
drivers/firmware/qcom_scm-32.c +0 -0
index 48e2ef794ea3..f149a85d36b0 100644

drivers/firmware/qcom_scm-32.c int __qcom_scm_restore_sec_cfg(struct device *dev, u32 device_id, · line 641

Quoted 5 lines
drivers/firmware/qcom_scm-32.c +1 -1
@@ -638,13 +638,41 @@ int __qcom_scm_restore_sec_cfg(struct device *dev, u32 device_id,
 int __qcom_scm_iommu_secure_ptbl_size(struct device *dev, u32 spare,
                                    size_t *size)
 {
-     return -ENODEV;
+     int psize[2] = { 0, 0 };

I would use an explicit size (i.e. __le32) here.

Quoted 23 lines
drivers/firmware/qcom_scm-32.c +17 -1
+     int ret;
+
+     ret = qcom_scm_call(dev, QCOM_SCM_SVC_MP,
+                         QCOM_SCM_IOMMU_SECURE_PTBL_SIZE,
+                         &spare, sizeof(spare), &psize, sizeof(psize));
+     if (ret || psize[1])
+             return ret ? ret : -EINVAL;
+
+     *size = psize[0];
+
+     return 0;
 }
 
 int __qcom_scm_iommu_secure_ptbl_init(struct device *dev, u64 addr, u32 size,
                                    u32 spare)
 {
-     return -ENODEV;
+     struct msm_scm_ptbl_init {
+             __le32 paddr;
+             __le32 size;
+             __le32 spare;
+     } req;
+     int ret, scm_ret = 0;
Quoted 8 lines

drivers/firmware/qcom_scm-32.c int __qcom_scm_restore_sec_cfg(struct device *dev, u32 device_id, · line 667

Quoted 4 lines
drivers/firmware/qcom_scm-32.c +4 -0
+
+     req.paddr = addr;
+     req.size = size;
+     req.spare = spare;

I'm not sure if there is actually anyone using qcom in BE mode (does that even work?), but all the other methods in this file explicitly convert using cpu_to_le32(), so this method should do the same :)

Quoted 7 lines

sboyd used to occasionally fix things related to qcom in BE back in the day.. not sure if modern snapdragons still support BE.

(I'm willing to just pretend that they don't.. that lessens the chance that someday someone gets far enough to try the GPU in BE mode, and realizes they've wasted their time getting that far ;-))

Yeah it used to work many ages ago, but I don't think anyone besides me tested it, except maybe for the folks working in QCA back then.

#4 lore raw
In reply to Brian Masney
Quoted 5 lines · Brian Masney

Add 32 bit implmentations of the functions __qcom_scm_iommu_secure_ptbl_size() and __qcom_scm_iommu_secure_ptbl_init() that are required by the qcom_iommu driver.

Hi Brian,

This looks good, but I was hoping to hoping to reach a conclusion and merge [1] - which in patch 16 squashes the argument filling boiler plate code of the 32 and 64-bit version of scm and hence implements the same.

If you have time to take a peek at this series I would greatly appreciate it (not a lot of people testing 32-bit these days...)

[1] https://patchwork.kernel.org/project/linux-arm-msm/list/?series=215943

Regards,
Bjorn

Quoted 56 lines
---
 drivers/firmware/qcom_scm-32.c | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)
drivers/firmware/qcom_scm-32.c +30 -2
index 48e2ef794ea3..f149a85d36b0 100644
@@ -638,13 +638,41 @@ int __qcom_scm_restore_sec_cfg(struct device *dev, u32 device_id,
 int __qcom_scm_iommu_secure_ptbl_size(struct device *dev, u32 spare,
 				      size_t *size)
 {
-	return -ENODEV;
+	int psize[2] = { 0, 0 };
+	int ret;
+
+	ret = qcom_scm_call(dev, QCOM_SCM_SVC_MP,
+			    QCOM_SCM_IOMMU_SECURE_PTBL_SIZE,
+			    &spare, sizeof(spare), &psize, sizeof(psize));
+	if (ret || psize[1])
+		return ret ? ret : -EINVAL;
+
+	*size = psize[0];
+
+	return 0;
 }
 
 int __qcom_scm_iommu_secure_ptbl_init(struct device *dev, u64 addr, u32 size,
 				      u32 spare)
 {
-	return -ENODEV;
+	struct msm_scm_ptbl_init {
+		__le32 paddr;
+		__le32 size;
+		__le32 spare;
+	} req;
+	int ret, scm_ret = 0;
+
+	req.paddr = addr;
+	req.size = size;
+	req.spare = spare;
+
+	ret = qcom_scm_call(dev, QCOM_SCM_SVC_MP,
+			    QCOM_SCM_IOMMU_SECURE_PTBL_INIT,
+			    &req, sizeof(req), &scm_ret, sizeof(scm_ret));
+	if (ret || scm_ret)
+		return ret ? ret : -EINVAL;
+
+	return 0;
 }
 
 int __qcom_scm_io_readl(struct device *dev, phys_addr_t addr,
Signature · 1 line
2.21.0
#5 lore raw

Hi Bjorn,

Quoted 10 lines · Bjorn Andersson
Quoted 5 lines · Brian Masney

Add 32 bit implmentations of the functions __qcom_scm_iommu_secure_ptbl_size() and __qcom_scm_iommu_secure_ptbl_init() that are required by the qcom_iommu driver.

Hi Brian,

Quoted 8 lines

This looks good, but I was hoping to hoping to reach a conclusion and merge [1] - which in patch 16 squashes the argument filling boiler plate code of the 32 and 64-bit version of scm and hence implements the same.

If you have time to take a peek at this series I would greatly appreciate it (not a lot of people testing 32-bit these days...)

[1] https://patchwork.kernel.org/project/linux-arm-msm/list/?series=215943

I'll look at that series this weekend and test it on arm32.

Brian

#6 lore raw
In reply to Bjorn Andersson
Quoted 10 lines · Bjorn Andersson
Quoted 5 lines · Brian Masney

Add 32 bit implmentations of the functions __qcom_scm_iommu_secure_ptbl_size() and __qcom_scm_iommu_secure_ptbl_init() that are required by the qcom_iommu driver.

Hi Brian,

Quoted 8 lines

This looks good, but I was hoping to hoping to reach a conclusion and merge [1] - which in patch 16 squashes the argument filling boiler plate code of the 32 and 64-bit version of scm and hence implements the same.

If you have time to take a peek at this series I would greatly appreciate it (not a lot of people testing 32-bit these days...)

[1] https://patchwork.kernel.org/project/linux-arm-msm/list/?series=215943

I agree to drop what I proposed here and go with that series instead. It's a big improvement over what's upstream now. I left a Tested-by on that cover letter.

Brian