Skip to contentSkip to conversation

media: camss: vfe: Don't call hw_version() before its dependencies are met

PATCH In review Robert Foss 2 participants 3 messages Aug 12, 2021 – Aug 23, 2021

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

PATCH v2 1/1 media: camss: vfe: Don't call hw_version() before its dependencies are met

vfe->ops->hw_version(vfe) is being called before vfe->base has been assigned, and before the hardware has been powered up.

Fixes b10b5334528a9 ("media: camss: vfe: Don't read hardware version needlessly")
---
 drivers/media/platform/qcom/camss/camss-vfe.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/media/platform/qcom/camss/camss-vfe.c +2 -1
index 6b2f33fc9be2..71f78b40e7f5 100644
@@ -604,6 +604,8 @@ static int vfe_get(struct vfe_device *vfe)
 		vfe_reset_output_maps(vfe);
 
 		vfe_init_outputs(vfe);
+
+		vfe->ops->hw_version(vfe);
 	} else {
 		ret = vfe_check_clock_rates(vfe);
 		if (ret < 0)
@@ -1299,7 +1301,6 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe,
 		return -EINVAL;
 	}
 	vfe->ops->subdev_init(dev, vfe);
-	vfe->ops->hw_version(vfe);
 
 	/* Memory */
 
Signature · 1 line
2.30.2
Tested-by on v2 1/1
#1 lore raw
Quoted 8 lines · Robert Foss

vfe->ops->hw_version(vfe) is being called before vfe->base has been assigned, and before the hardware has been powered up.

Fixes b10b5334528a9 ("media: camss: vfe: Don't read hardware version needlessly")
Quoted 18 lines
---
  drivers/media/platform/qcom/camss/camss-vfe.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
drivers/media/platform/qcom/camss/camss-vfe.c +2 -0
index 6b2f33fc9be2..71f78b40e7f5 100644
@@ -604,6 +604,8 @@ static int vfe_get(struct vfe_device *vfe)
  		vfe_reset_output_maps(vfe);
 
  		vfe_init_outputs(vfe);
+
+		vfe->ops->hw_version(vfe);
  	} else {
  		ret = vfe_check_clock_rates(vfe);
  		if (ret < 0)

drivers/media/platform/qcom/camss/camss-vfe.c int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe, · line 1306

Quoted 7 lines
drivers/media/platform/qcom/camss/camss-vfe.c +0 -1
@@ -1299,7 +1301,6 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe,
  		return -EINVAL;
  	}
  	vfe->ops->subdev_init(dev, vfe);
-	vfe->ops->hw_version(vfe);
 
  	/* Memory */
 

Best regards

Signature · 2 lines
Marek Szyprowski, PhD
Samsung R&D Institute Poland
Reviewed-by
#2 lore raw
Quoted 11 lines · Marek Szyprowski
Quoted 9 lines · Robert Foss

vfe->ops->hw_version(vfe) is being called before vfe->base has been assigned, and before the hardware has been powered up.

Fixes b10b5334528a9 ("media: camss: vfe: Don't read hardware version

needlessly")

This restores old, well tested code path.

Quoted 18 lines
Quoted 18 lines

---
  drivers/media/platform/qcom/camss/camss-vfe.c | 3 ++-

  1 file changed, 2 insertions(+), 1 deletion(-)
drivers/media/platform/qcom/camss/camss-vfe.c +2 -0
index 6b2f33fc9be2..71f78b40e7f5 100644
@@ -604,6 +604,8 @@ static int vfe_get(struct vfe_device *vfe)
           vfe_reset_output_maps(vfe);
             vfe_init_outputs(vfe);
+
+        vfe->ops->hw_version(vfe);
       } else {
           ret = vfe_check_clock_rates(vfe);
           if (ret < 0)
@@ -1299,7 +1301,6 @@ int msm_vfe_subdev_init(struct camss *camss, 
Quoted 8 lines

drivers/media/platform/qcom/camss/camss-vfe.c int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe, · line 1305

Quoted 6 lines
drivers/media/platform/qcom/camss/camss-vfe.c +0 -1
 struct vfe_device *vfe,
           return -EINVAL;
       }
       vfe->ops->subdev_init(dev, vfe);
-    vfe->ops->hw_version(vfe);
         /* Memory */

Best regards

Best regards

Signature · 2 lines
Marek Szyprowski, PhD
Samsung R&D Institute Poland