target/linux/bcm27xx/patches-6.1/950-1002-media-rp1-cfe-Rename-xxx_dbg_irq-to-xxx_dbg_verbose.patch

   1 From a1ea528e187ee045aeff929ff0f4b2e53fdd970f Mon Sep 17 00:00:00 2001
   2 From: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
   3 Date: Wed, 4 Oct 2023 10:12:37 +0300
   4 Subject: [PATCH] media: rp1: cfe: Rename xxx_dbg_irq() to xxx_dbg_verbose()
   5
   6 Rename the xxx_dbg_irq() macros to xxx_dbg_verbose(), as they can be
   7 used to verbose debugs outside irq context too.
   8
   9 Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
  10 ---
  11  .../media/platform/raspberrypi/rp1_cfe/cfe.c  | 40 +++++++++----------
  12  .../media/platform/raspberrypi/rp1_cfe/cfe.h  |  2 +-
  13  .../media/platform/raspberrypi/rp1_cfe/csi2.c | 26 ++++++------
  14  .../platform/raspberrypi/rp1_cfe/pisp_fe.c    | 12 +++---
  15  4 files changed, 40 insertions(+), 40 deletions(-)
  16
  17 --- a/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
  18 +++ b/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
  19 @@ -49,11 +49,11 @@
  20  #define CFE_MODULE_NAME        "rp1-cfe"
  21  #define CFE_VERSION    "1.0"
  22
  23 -bool cfe_debug_irq;
  24 +bool cfe_debug_verbose;
  25
  26 -#define cfe_dbg_irq(fmt, arg...)                              \
  27 +#define cfe_dbg_verbose(fmt, arg...)                          \
  28         do {                                                  \
  29 -               if (cfe_debug_irq)                            \
  30 +               if (cfe_debug_verbose)                        \
  31                         dev_dbg(&cfe->pdev->dev, fmt, ##arg); \
  32         } while (0)
  33  #define cfe_dbg(fmt, arg...) dev_dbg(&cfe->pdev->dev, fmt, ##arg)
  34 @@ -518,8 +518,8 @@ static void cfe_schedule_next_csi2_job(s
  35                 node->next_frm = buf;
  36                 list_del(&buf->list);
  37
  38 -               cfe_dbg_irq("%s: [%s] buffer:%p\n", __func__,
  39 -                           node_desc[node->id].name, &buf->vb.vb2_buf);
  40 +               cfe_dbg_verbose("%s: [%s] buffer:%p\n", __func__,
  41 +                               node_desc[node->id].name, &buf->vb.vb2_buf);
  42
  43                 if (is_meta_node(node)) {
  44                         size = node->fmt.fmt.meta.buffersize;
  45 @@ -550,8 +550,8 @@ static void cfe_schedule_next_pisp_job(s
  46                 buf = list_first_entry(&node->dma_queue, struct cfe_buffer,
  47                                        list);
  48
  49 -               cfe_dbg_irq("%s: [%s] buffer:%p\n", __func__,
  50 -                           node_desc[node->id].name, &buf->vb.vb2_buf);
  51 +               cfe_dbg_verbose("%s: [%s] buffer:%p\n", __func__,
  52 +                               node_desc[node->id].name, &buf->vb.vb2_buf);
  53
  54                 node->next_frm = buf;
  55                 vb2_bufs[node_desc[i].link_pad] = &buf->vb.vb2_buf;
  56 @@ -573,8 +573,8 @@ static bool cfe_check_job_ready(struct c
  57                         continue;
  58
  59                 if (list_empty(&node->dma_queue)) {
  60 -                       cfe_dbg_irq("%s: [%s] has no buffer, unable to schedule job\n",
  61 -                                   __func__, node_desc[i].name);
  62 +                       cfe_dbg_verbose("%s: [%s] has no buffer, unable to schedule job\n",
  63 +                               __func__, node_desc[i].name);
  64                         return false;
  65                 }
  66         }
  67 @@ -592,7 +592,7 @@ static void cfe_prepare_next_job(struct
  68         /* Flag if another job is ready after this. */
  69         cfe->job_ready = cfe_check_job_ready(cfe);
  70
  71 -       cfe_dbg_irq("%s: end with scheduled job\n", __func__);
  72 +       cfe_dbg_verbose("%s: end with scheduled job\n", __func__);
  73  }
  74
  75  static void cfe_process_buffer_complete(struct cfe_node *node,
  76 @@ -600,8 +600,8 @@ static void cfe_process_buffer_complete(
  77  {
  78         struct cfe_device *cfe = node->cfe;
  79
  80 -       cfe_dbg_irq("%s: [%s] buffer:%p\n", __func__, node_desc[node->id].name,
  81 -                   &node->cur_frm->vb.vb2_buf);
  82 +       cfe_dbg_verbose("%s: [%s] buffer:%p\n", __func__,
  83 +                       node_desc[node->id].name, &node->cur_frm->vb.vb2_buf);
  84
  85         node->cur_frm->vb.sequence = sequence;
  86         vb2_buffer_done(&node->cur_frm->vb.vb2_buf, VB2_BUF_STATE_DONE);
  87 @@ -621,8 +621,8 @@ static void cfe_sof_isr_handler(struct c
  88  {
  89         struct cfe_device *cfe = node->cfe;
  90
  91 -       cfe_dbg_irq("%s: [%s] seq %u\n", __func__, node_desc[node->id].name,
  92 -                   cfe->sequence);
  93 +       cfe_dbg_verbose("%s: [%s] seq %u\n", __func__, node_desc[node->id].name,
  94 +                       cfe->sequence);
  95
  96         node->cur_frm = node->next_frm;
  97         node->next_frm = NULL;
  98 @@ -651,8 +651,8 @@ static void cfe_eof_isr_handler(struct c
  99  {
 100         struct cfe_device *cfe = node->cfe;
 101
 102 -       cfe_dbg_irq("%s: [%s] seq %u\n", __func__, node_desc[node->id].name,
 103 -                   cfe->sequence);
 104 +       cfe_dbg_verbose("%s: [%s] seq %u\n", __func__, node_desc[node->id].name,
 105 +                       cfe->sequence);
 106
 107         if (node->cur_frm)
 108                 cfe_process_buffer_complete(node, cfe->sequence);
 109 @@ -921,8 +921,8 @@ static int cfe_buffer_prepare(struct vb2
 110         struct cfe_buffer *buf = to_cfe_buffer(vb);
 111         unsigned long size;
 112
 113 -       cfe_dbg_irq("%s: [%s] buffer:%p\n", __func__, node_desc[node->id].name,
 114 -                   vb);
 115 +       cfe_dbg_verbose("%s: [%s] buffer:%p\n", __func__,
 116 +                       node_desc[node->id].name, vb);
 117
 118         size = is_image_output_node(node) ? node->fmt.fmt.pix.sizeimage :
 119                                             node->fmt.fmt.meta.buffersize;
 120 @@ -954,8 +954,8 @@ static void cfe_buffer_queue(struct vb2_
 121         struct cfe_buffer *buf = to_cfe_buffer(vb);
 122         unsigned long flags;
 123
 124 -       cfe_dbg_irq("%s: [%s] buffer:%p\n", __func__, node_desc[node->id].name,
 125 -                   vb);
 126 +       cfe_dbg_verbose("%s: [%s] buffer:%p\n", __func__,
 127 +                       node_desc[node->id].name, vb);
 128
 129         spin_lock_irqsave(&cfe->state_lock, flags);
 130
 131 --- a/drivers/media/platform/raspberrypi/rp1_cfe/cfe.h
 132 +++ b/drivers/media/platform/raspberrypi/rp1_cfe/cfe.h
 133 @@ -11,7 +11,7 @@
 134  #include <linux/media-bus-format.h>
 135  #include <linux/videodev2.h>
 136
 137 -extern bool cfe_debug_irq;
 138 +extern bool cfe_debug_verbose;
 139
 140  enum cfe_remap_types {
 141         CFE_REMAP_16BIT,
 142 --- a/drivers/media/platform/raspberrypi/rp1_cfe/csi2.c
 143 +++ b/drivers/media/platform/raspberrypi/rp1_cfe/csi2.c
 144 @@ -16,9 +16,9 @@
 145  #include "csi2.h"
 146  #include "cfe.h"
 147
 148 -#define csi2_dbg_irq(fmt, arg...)                                 \
 149 +#define csi2_dbg_verbose(fmt, arg...)                             \
 150         do {                                                      \
 151 -               if (cfe_debug_irq)                                \
 152 +               if (cfe_debug_verbose)                            \
 153                         dev_dbg(csi2->v4l2_dev->dev, fmt, ##arg); \
 154         } while (0)
 155  #define csi2_dbg(fmt, arg...) dev_dbg(csi2->v4l2_dev->dev, fmt, ##arg)
 156 @@ -154,7 +154,7 @@ void csi2_isr(struct csi2_device *csi2,
 157         u32 status;
 158
 159         status = csi2_reg_read(csi2, CSI2_STATUS);
 160 -       csi2_dbg_irq("ISR: STA: 0x%x\n", status);
 161 +       csi2_dbg_verbose("ISR: STA: 0x%x\n", status);
 162
 163         /* Write value back to clear the interrupts */
 164         csi2_reg_write(csi2, CSI2_STATUS, status);
 165 @@ -167,16 +167,16 @@ void csi2_isr(struct csi2_device *csi2,
 166
 167                 dbg = csi2_reg_read(csi2, CSI2_CH_DEBUG(i));
 168
 169 -               csi2_dbg_irq("ISR: [%u], %s%s%s%s%s frame: %u line: %u\n", i,
 170 -                            (status & IRQ_FS(i)) ? "FS " : "",
 171 -                            (status & IRQ_FE(i)) ? "FE " : "",
 172 -                            (status & IRQ_FE_ACK(i)) ? "FE_ACK " : "",
 173 -                            (status & IRQ_LE(i)) ? "LE " : "",
 174 -                            (status & IRQ_LE_ACK(i)) ? "LE_ACK " : "",
 175 -                            dbg >> 16,
 176 -                            csi2->num_lines[i] ?
 177 -                                    ((dbg & 0xffff) % csi2->num_lines[i]) :
 178 -                                    0);
 179 +               csi2_dbg_verbose("ISR: [%u], %s%s%s%s%s frame: %u line: %u\n",
 180 +                                i, (status & IRQ_FS(i)) ? "FS " : "",
 181 +                                (status & IRQ_FE(i)) ? "FE " : "",
 182 +                                (status & IRQ_FE_ACK(i)) ? "FE_ACK " : "",
 183 +                                (status & IRQ_LE(i)) ? "LE " : "",
 184 +                                (status & IRQ_LE_ACK(i)) ? "LE_ACK " : "",
 185 +                                dbg >> 16,
 186 +                                csi2->num_lines[i] ?
 187 +                                        ((dbg & 0xffff) % csi2->num_lines[i]) :
 188 +                                        0);
 189
 190                 sof[i] = !!(status & IRQ_FS(i));
 191                 eof[i] = !!(status & IRQ_FE_ACK(i));
 192 --- a/drivers/media/platform/raspberrypi/rp1_cfe/pisp_fe.c
 193 +++ b/drivers/media/platform/raspberrypi/rp1_cfe/pisp_fe.c
 194 @@ -114,9 +114,9 @@ static const struct pisp_fe_config_param
 195                                         sizeof(struct pisp_fe_output_config)         },
 196  };
 197
 198 -#define pisp_fe_dbg_irq(fmt, arg...)                            \
 199 +#define pisp_fe_dbg_verbose(fmt, arg...)                        \
 200         do {                                                    \
 201 -               if (cfe_debug_irq)                              \
 202 +               if (cfe_debug_verbose)                          \
 203                         dev_dbg(fe->v4l2_dev->dev, fmt, ##arg); \
 204         } while (0)
 205  #define pisp_fe_dbg(fmt, arg...) dev_dbg(fe->v4l2_dev->dev, fmt, ##arg)
 206 @@ -202,9 +202,9 @@ void pisp_fe_isr(struct pisp_fe_device *
 207         int_status = pisp_fe_reg_read(fe, FE_INT_STATUS);
 208         pisp_fe_reg_write(fe, FE_INT_STATUS, int_status);
 209
 210 -       pisp_fe_dbg_irq("%s: status 0x%x out 0x%x frame 0x%x error 0x%x int 0x%x\n",
 211 -                       __func__, status, out_status, frame_status, error_status,
 212 -                       int_status);
 213 +       pisp_fe_dbg_verbose("%s: status 0x%x out 0x%x frame 0x%x error 0x%x int 0x%x\n",
 214 +               __func__, status, out_status, frame_status, error_status,
 215 +               int_status);
 216
 217         /* We do not report interrupts for the input/stream pad. */
 218         for (i = 0; i < FE_NUM_PADS - 1; i++) {
 219 @@ -339,7 +339,7 @@ void pisp_fe_submit_job(struct pisp_fe_d
 220          * sequence of relaxed writes which follow.
 221          */
 222         status = pisp_fe_reg_read(fe, FE_STATUS);
 223 -       pisp_fe_dbg_irq("%s: status = 0x%x\n", __func__, status);
 224 +       pisp_fe_dbg_verbose("%s: status = 0x%x\n", __func__, status);
 225         if (WARN_ON(status & FE_STATUS_QUEUED))
 226                 return;
 227