drm/msm: Don't use %pK through printk

In the past %pK was preferable to %p as it would not leak raw pointer
values into the kernel log.
Since commit ad67b74d2469 ("printk: hash addresses printed with %p")
the regular %p has been improved to avoid this issue.
Furthermore, restricted pointers ("%pK") were never meant to be used
through printk(). They can still unintentionally leak raw pointers or
acquire sleeping locks in atomic contexts.

Switch to the regular pointer formatting which is safer and
easier to reason about.

Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Patchwork: https://patchwork.freedesktop.org/patch/667895/
Signed-off-by: Rob Clark <robin.clark@oss.qualcomm.com>

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
index d4b545448d74657aafc96e9042c7756654b4f0e7..94912b4708fb5be937f1b3898a5676f7b481bd42 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
@@ -596,7 +596,7 @@ static void _dpu_crtc_complete_flip(struct drm_crtc *crtc)
 
        spin_lock_irqsave(&dev->event_lock, flags);
        if (dpu_crtc->event) {
-               DRM_DEBUG_VBL("%s: send event: %pK\n", dpu_crtc->name,
+               DRM_DEBUG_VBL("%s: send event: %p\n", dpu_crtc->name,
                              dpu_crtc->event);
                trace_dpu_crtc_complete_flip(DRMID(crtc));
                drm_crtc_send_vblank_event(crtc, dpu_crtc->event);

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c
index 11fb1bc54fa92a5d9926addb437bc4b8f283723b..54b20faa0b697e3bf8ad81bd806adb49de98f2b5 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c
@@ -31,14 +31,14 @@ static void dpu_setup_dspp_pcc(struct dpu_hw_dspp *ctx,
        u32 base;
 
        if (!ctx) {
-               DRM_ERROR("invalid ctx %pK\n", ctx);
+               DRM_ERROR("invalid ctx %p\n", ctx);
                return;
        }
 
        base = ctx->cap->sblk->pcc.base;
 
        if (!base) {
-               DRM_ERROR("invalid ctx %pK pcc base 0x%x\n", ctx, base);
+               DRM_ERROR("invalid ctx %p pcc base 0x%x\n", ctx, base);
                return;
        }
 

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
index 12dcb32b472497f9e59619db4e810abfbf610c7c..a306077647c317af9345eeff13082230906b5767 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
@@ -1345,7 +1345,7 @@ static int dpu_kms_mmap_mdp5(struct dpu_kms *dpu_kms)
                dpu_kms->mmio = NULL;
                return ret;
        }
-       DRM_DEBUG("mapped dpu address space @%pK\n", dpu_kms->mmio);
+       DRM_DEBUG("mapped dpu address space @%p\n", dpu_kms->mmio);
 
        dpu_kms->vbif[VBIF_RT] = msm_ioremap_mdss(mdss_dev,
                                                  dpu_kms->pdev,
@@ -1380,7 +1380,7 @@ static int dpu_kms_mmap_dpu(struct dpu_kms *dpu_kms)
                dpu_kms->mmio = NULL;
                return ret;
        }
-       DRM_DEBUG("mapped dpu address space @%pK\n", dpu_kms->mmio);
+       DRM_DEBUG("mapped dpu address space @%p\n", dpu_kms->mmio);
 
        dpu_kms->vbif[VBIF_RT] = msm_ioremap(pdev, "vbif");
        if (IS_ERR(dpu_kms->vbif[VBIF_RT])) {

diff --git a/drivers/gpu/drm/msm/msm_mdss.c b/drivers/gpu/drm/msm/msm_mdss.c
index 1f5fe7811e016909282087176a42a2349b21c9c4..39885b333910bb7aab7f72b9846f49ab16cfe5cc 100644 (file)
--- a/drivers/gpu/drm/msm/msm_mdss.c
+++ b/drivers/gpu/drm/msm/msm_mdss.c
@@ -423,7 +423,7 @@ static struct msm_mdss *msm_mdss_init(struct platform_device *pdev, bool is_mdp5
        if (IS_ERR(msm_mdss->mmio))
                return ERR_CAST(msm_mdss->mmio);
 
-       dev_dbg(&pdev->dev, "mapped mdss address space @%pK\n", msm_mdss->mmio);
+       dev_dbg(&pdev->dev, "mapped mdss address space @%p\n", msm_mdss->mmio);
 
        ret = msm_mdss_parse_data_bus_icc_path(&pdev->dev, msm_mdss);
        if (ret)