Skip to contentSkip to conversation

iommu: Use of_property_present()

PATCH Applied Rob Herring (Arm) 3 participants 4 messages Jul 31, 2024 – Sep 4, 2024 IOMMU

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 iommu: Use of_property_present()

Use of_property_present() to test for property presence rather than of_(find|get)_property(). This is part of a larger effort to remove callers of of_find_property() and similar functions. of_find_property() leaks the DT struct property and data pointers which is a problem for dynamically allocated nodes which may be freed.

---
 drivers/iommu/fsl_pamu_domain.c | 4 +---
 drivers/iommu/of_iommu.c        | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)
drivers/iommu/fsl_pamu_domain.c +1 -3
index e9d2bff4659b..30be786bff11 100644
@@ -416,14 +416,12 @@ static struct iommu_group *fsl_pamu_device_group(struct device *dev)
 
 static struct iommu_device *fsl_pamu_probe_device(struct device *dev)
 {
-	int len;
-
 	/*
 	 * uboot must fill the fsl,liodn for platform devices to be supported by
 	 * the iommu.
 	 */
 	if (!dev_is_pci(dev) &&
-	    !of_get_property(dev->of_node, "fsl,liodn", &len))
+	    !of_property_present(dev->of_node, "fsl,liodn"))
 		return ERR_PTR(-ENODEV);
 
 	return &pamu_iommu;
drivers/iommu/of_iommu.c +1 -1
index 78d61da75257..e7a6a1611d19 100644
@@ -214,7 +214,7 @@ void of_iommu_get_resv_regions(struct device *dev, struct list_head *list)
 		 * that represent reservations in the IOVA space, which are regions that should
 		 * not be mapped.
 		 */
-		if (of_find_property(it.node, "reg", NULL)) {
+		if (of_property_present(it.node, "reg")) {
 			err = of_address_to_resource(it.node, 0, &phys);
 			if (err < 0) {
 				dev_err(dev, "failed to parse memory region %pOF: %d\n",
Signature · 1 line
2.43.0
reviewer Reviewed-by on v1 1/1
#1 lore raw
Quoted 5 lines · Rob Herring (Arm)

Use of_property_present() to test for property presence rather than of_(find|get)_property(). This is part of a larger effort to remove callers of of_find_property() and similar functions. of_find_property() leaks the DT struct property and data pointers which is a problem for dynamically allocated nodes which may be freed.

Quoted 39 lines
---
  drivers/iommu/fsl_pamu_domain.c | 4 +---
  drivers/iommu/of_iommu.c        | 2 +-
  2 files changed, 2 insertions(+), 4 deletions(-)
drivers/iommu/fsl_pamu_domain.c +1 -3
index e9d2bff4659b..30be786bff11 100644
@@ -416,14 +416,12 @@ static struct iommu_group *fsl_pamu_device_group(struct device *dev)
 
  static struct iommu_device *fsl_pamu_probe_device(struct device *dev)
  {
-	int len;
-
  	/*
  	 * uboot must fill the fsl,liodn for platform devices to be supported by
  	 * the iommu.
  	 */
  	if (!dev_is_pci(dev) &&
-	    !of_get_property(dev->of_node, "fsl,liodn", &len))
+	    !of_property_present(dev->of_node, "fsl,liodn"))
  		return ERR_PTR(-ENODEV);
 
  	return &pamu_iommu;
drivers/iommu/of_iommu.c +1 -1
index 78d61da75257..e7a6a1611d19 100644
@@ -214,7 +214,7 @@ void of_iommu_get_resv_regions(struct device *dev, struct list_head *list)
  		 * that represent reservations in the IOVA space, which are regions that should
  		 * not be mapped.
  		 */
-		if (of_find_property(it.node, "reg", NULL)) {
+		if (of_property_present(it.node, "reg")) {
  			err = of_address_to_resource(it.node, 0, &phys);
  			if (err < 0) {
  				dev_err(dev, "failed to parse memory region %pOF: %d\n",
#2 lore raw
In reply to Rob Herring (Arm)
Quoted 7 lines · Rob Herring (Arm)

Use of_property_present() to test for property presence rather than of_(find|get)_property(). This is part of a larger effort to remove callers of of_find_property() and similar functions. of_find_property() leaks the DT struct property and data pointers which is a problem for dynamically allocated nodes which may be freed.

Quoted 5 lines
---
 drivers/iommu/fsl_pamu_domain.c | 4 +---
 drivers/iommu/of_iommu.c        | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

Ping!

Quoted 37 lines
drivers/iommu/fsl_pamu_domain.c +1 -3
index e9d2bff4659b..30be786bff11 100644
@@ -416,14 +416,12 @@ static struct iommu_group *fsl_pamu_device_group(struct device *dev)
 
 static struct iommu_device *fsl_pamu_probe_device(struct device *dev)
 {
-       int len;
-
        /*
         * uboot must fill the fsl,liodn for platform devices to be supported by
         * the iommu.
         */
        if (!dev_is_pci(dev) &&
-           !of_get_property(dev->of_node, "fsl,liodn", &len))
+           !of_property_present(dev->of_node, "fsl,liodn"))
                return ERR_PTR(-ENODEV);
 
        return &pamu_iommu;
drivers/iommu/of_iommu.c +1 -2
index 78d61da75257..e7a6a1611d19 100644
@@ -214,7 +214,7 @@ void of_iommu_get_resv_regions(struct device *dev, struct list_head *list)
                 * that represent reservations in the IOVA space, which are regions that should
                 * not be mapped.
                 */
-               if (of_find_property(it.node, "reg", NULL)) {
+               if (of_property_present(it.node, "reg")) {
                        err = of_address_to_resource(it.node, 0, &phys);
                        if (err < 0) {
                                dev_err(dev, "failed to parse memory region %pOF: %d\n",
--

2.43.0

maintainer Applied
#3 lore raw
In reply to Rob Herring (Arm)
Quoted 11 lines · Rob Herring (Arm)

Use of_property_present() to test for property presence rather than of_(find|get)_property(). This is part of a larger effort to remove callers of of_find_property() and similar functions. of_find_property() leaks the DT struct property and data pointers which is a problem for dynamically allocated nodes which may be freed.

---
 drivers/iommu/fsl_pamu_domain.c | 4 +---
 drivers/iommu/of_iommu.c        | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

Applied, thanks.