Rename the xxx_dbg_irq() macros to xxx_dbg_verbose(), as they can be
used to verbose debugs outside irq context too.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
#define CFE_MODULE_NAME "rp1-cfe"
#define CFE_VERSION "1.0"
#define CFE_MODULE_NAME "rp1-cfe"
#define CFE_VERSION "1.0"
-#define cfe_dbg_irq(fmt, arg...) \
+#define cfe_dbg_verbose(fmt, arg...) \
+ if (cfe_debug_verbose) \
dev_dbg(&cfe->pdev->dev, fmt, ##arg); \
} while (0)
#define cfe_dbg(fmt, arg...) dev_dbg(&cfe->pdev->dev, fmt, ##arg)
dev_dbg(&cfe->pdev->dev, fmt, ##arg); \
} while (0)
#define cfe_dbg(fmt, arg...) dev_dbg(&cfe->pdev->dev, fmt, ##arg)
node->next_frm = buf;
list_del(&buf->list);
node->next_frm = buf;
list_del(&buf->list);
- cfe_dbg_irq("%s: [%s] buffer:%p\n", __func__,
- node_desc[node->id].name, &buf->vb.vb2_buf);
+ cfe_dbg_verbose("%s: [%s] buffer:%p\n", __func__,
+ node_desc[node->id].name, &buf->vb.vb2_buf);
if (is_meta_node(node)) {
size = node->fmt.fmt.meta.buffersize;
if (is_meta_node(node)) {
size = node->fmt.fmt.meta.buffersize;
buf = list_first_entry(&node->dma_queue, struct cfe_buffer,
list);
buf = list_first_entry(&node->dma_queue, struct cfe_buffer,
list);
- cfe_dbg_irq("%s: [%s] buffer:%p\n", __func__,
- node_desc[node->id].name, &buf->vb.vb2_buf);
+ cfe_dbg_verbose("%s: [%s] buffer:%p\n", __func__,
+ node_desc[node->id].name, &buf->vb.vb2_buf);
node->next_frm = buf;
vb2_bufs[node_desc[i].link_pad] = &buf->vb.vb2_buf;
node->next_frm = buf;
vb2_bufs[node_desc[i].link_pad] = &buf->vb.vb2_buf;
continue;
if (list_empty(&node->dma_queue)) {
continue;
if (list_empty(&node->dma_queue)) {
- cfe_dbg_irq("%s: [%s] has no buffer, unable to schedule job\n",
- __func__, node_desc[i].name);
+ cfe_dbg_verbose("%s: [%s] has no buffer, unable to schedule job\n",
+ __func__, node_desc[i].name);
/* Flag if another job is ready after this. */
cfe->job_ready = cfe_check_job_ready(cfe);
/* Flag if another job is ready after this. */
cfe->job_ready = cfe_check_job_ready(cfe);
- cfe_dbg_irq("%s: end with scheduled job\n", __func__);
+ cfe_dbg_verbose("%s: end with scheduled job\n", __func__);
}
static void cfe_process_buffer_complete(struct cfe_node *node,
}
static void cfe_process_buffer_complete(struct cfe_node *node,
{
struct cfe_device *cfe = node->cfe;
{
struct cfe_device *cfe = node->cfe;
- cfe_dbg_irq("%s: [%s] buffer:%p\n", __func__, node_desc[node->id].name,
- &node->cur_frm->vb.vb2_buf);
+ cfe_dbg_verbose("%s: [%s] buffer:%p\n", __func__,
+ node_desc[node->id].name, &node->cur_frm->vb.vb2_buf);
node->cur_frm->vb.sequence = sequence;
vb2_buffer_done(&node->cur_frm->vb.vb2_buf, VB2_BUF_STATE_DONE);
node->cur_frm->vb.sequence = sequence;
vb2_buffer_done(&node->cur_frm->vb.vb2_buf, VB2_BUF_STATE_DONE);
{
struct cfe_device *cfe = node->cfe;
{
struct cfe_device *cfe = node->cfe;
- cfe_dbg_irq("%s: [%s] seq %u\n", __func__, node_desc[node->id].name,
- cfe->sequence);
+ cfe_dbg_verbose("%s: [%s] seq %u\n", __func__, node_desc[node->id].name,
+ cfe->sequence);
node->cur_frm = node->next_frm;
node->next_frm = NULL;
node->cur_frm = node->next_frm;
node->next_frm = NULL;
{
struct cfe_device *cfe = node->cfe;
{
struct cfe_device *cfe = node->cfe;
- cfe_dbg_irq("%s: [%s] seq %u\n", __func__, node_desc[node->id].name,
- cfe->sequence);
+ cfe_dbg_verbose("%s: [%s] seq %u\n", __func__, node_desc[node->id].name,
+ cfe->sequence);
if (node->cur_frm)
cfe_process_buffer_complete(node, cfe->sequence);
if (node->cur_frm)
cfe_process_buffer_complete(node, cfe->sequence);
struct cfe_buffer *buf = to_cfe_buffer(vb);
unsigned long size;
struct cfe_buffer *buf = to_cfe_buffer(vb);
unsigned long size;
- cfe_dbg_irq("%s: [%s] buffer:%p\n", __func__, node_desc[node->id].name,
- vb);
+ cfe_dbg_verbose("%s: [%s] buffer:%p\n", __func__,
+ node_desc[node->id].name, vb);
size = is_image_output_node(node) ? node->fmt.fmt.pix.sizeimage :
node->fmt.fmt.meta.buffersize;
size = is_image_output_node(node) ? node->fmt.fmt.pix.sizeimage :
node->fmt.fmt.meta.buffersize;
struct cfe_buffer *buf = to_cfe_buffer(vb);
unsigned long flags;
struct cfe_buffer *buf = to_cfe_buffer(vb);
unsigned long flags;
- cfe_dbg_irq("%s: [%s] buffer:%p\n", __func__, node_desc[node->id].name,
- vb);
+ cfe_dbg_verbose("%s: [%s] buffer:%p\n", __func__,
+ node_desc[node->id].name, vb);
spin_lock_irqsave(&cfe->state_lock, flags);
spin_lock_irqsave(&cfe->state_lock, flags);
#include <linux/media-bus-format.h>
#include <linux/videodev2.h>
#include <linux/media-bus-format.h>
#include <linux/videodev2.h>
-extern bool cfe_debug_irq;
+extern bool cfe_debug_verbose;
enum cfe_remap_types {
CFE_REMAP_16BIT,
enum cfe_remap_types {
CFE_REMAP_16BIT,
#include "csi2.h"
#include "cfe.h"
#include "csi2.h"
#include "cfe.h"
-#define csi2_dbg_irq(fmt, arg...) \
+#define csi2_dbg_verbose(fmt, arg...) \
+ if (cfe_debug_verbose) \
dev_dbg(csi2->v4l2_dev->dev, fmt, ##arg); \
} while (0)
#define csi2_dbg(fmt, arg...) dev_dbg(csi2->v4l2_dev->dev, fmt, ##arg)
dev_dbg(csi2->v4l2_dev->dev, fmt, ##arg); \
} while (0)
#define csi2_dbg(fmt, arg...) dev_dbg(csi2->v4l2_dev->dev, fmt, ##arg)
u32 status;
status = csi2_reg_read(csi2, CSI2_STATUS);
u32 status;
status = csi2_reg_read(csi2, CSI2_STATUS);
- csi2_dbg_irq("ISR: STA: 0x%x\n", status);
+ csi2_dbg_verbose("ISR: STA: 0x%x\n", status);
/* Write value back to clear the interrupts */
csi2_reg_write(csi2, CSI2_STATUS, status);
/* Write value back to clear the interrupts */
csi2_reg_write(csi2, CSI2_STATUS, status);
dbg = csi2_reg_read(csi2, CSI2_CH_DEBUG(i));
dbg = csi2_reg_read(csi2, CSI2_CH_DEBUG(i));
- csi2_dbg_irq("ISR: [%u], %s%s%s%s%s frame: %u line: %u\n", i,
- (status & IRQ_FS(i)) ? "FS " : "",
- (status & IRQ_FE(i)) ? "FE " : "",
- (status & IRQ_FE_ACK(i)) ? "FE_ACK " : "",
- (status & IRQ_LE(i)) ? "LE " : "",
- (status & IRQ_LE_ACK(i)) ? "LE_ACK " : "",
- dbg >> 16,
- csi2->num_lines[i] ?
- ((dbg & 0xffff) % csi2->num_lines[i]) :
- 0);
+ csi2_dbg_verbose("ISR: [%u], %s%s%s%s%s frame: %u line: %u\n",
+ i, (status & IRQ_FS(i)) ? "FS " : "",
+ (status & IRQ_FE(i)) ? "FE " : "",
+ (status & IRQ_FE_ACK(i)) ? "FE_ACK " : "",
+ (status & IRQ_LE(i)) ? "LE " : "",
+ (status & IRQ_LE_ACK(i)) ? "LE_ACK " : "",
+ dbg >> 16,
+ csi2->num_lines[i] ?
+ ((dbg & 0xffff) % csi2->num_lines[i]) :
+ 0);
sof[i] = !!(status & IRQ_FS(i));
eof[i] = !!(status & IRQ_FE_ACK(i));
sof[i] = !!(status & IRQ_FS(i));
eof[i] = !!(status & IRQ_FE_ACK(i));
sizeof(struct pisp_fe_output_config) },
};
sizeof(struct pisp_fe_output_config) },
};
-#define pisp_fe_dbg_irq(fmt, arg...) \
+#define pisp_fe_dbg_verbose(fmt, arg...) \
+ if (cfe_debug_verbose) \
dev_dbg(fe->v4l2_dev->dev, fmt, ##arg); \
} while (0)
#define pisp_fe_dbg(fmt, arg...) dev_dbg(fe->v4l2_dev->dev, fmt, ##arg)
dev_dbg(fe->v4l2_dev->dev, fmt, ##arg); \
} while (0)
#define pisp_fe_dbg(fmt, arg...) dev_dbg(fe->v4l2_dev->dev, fmt, ##arg)
int_status = pisp_fe_reg_read(fe, FE_INT_STATUS);
pisp_fe_reg_write(fe, FE_INT_STATUS, int_status);
int_status = pisp_fe_reg_read(fe, FE_INT_STATUS);
pisp_fe_reg_write(fe, FE_INT_STATUS, int_status);
- pisp_fe_dbg_irq("%s: status 0x%x out 0x%x frame 0x%x error 0x%x int 0x%x\n",
- __func__, status, out_status, frame_status, error_status,
- int_status);
+ pisp_fe_dbg_verbose("%s: status 0x%x out 0x%x frame 0x%x error 0x%x int 0x%x\n",
+ __func__, status, out_status, frame_status, error_status,
+ int_status);
/* We do not report interrupts for the input/stream pad. */
for (i = 0; i < FE_NUM_PADS - 1; i++) {
/* We do not report interrupts for the input/stream pad. */
for (i = 0; i < FE_NUM_PADS - 1; i++) {
* sequence of relaxed writes which follow.
*/
status = pisp_fe_reg_read(fe, FE_STATUS);
* sequence of relaxed writes which follow.
*/
status = pisp_fe_reg_read(fe, FE_STATUS);
- pisp_fe_dbg_irq("%s: status = 0x%x\n", __func__, status);
+ pisp_fe_dbg_verbose("%s: status = 0x%x\n", __func__, status);
if (WARN_ON(status & FE_STATUS_QUEUED))
return;
if (WARN_ON(status & FE_STATUS_QUEUED))
return;