Skip to content

Commit da43ff0

Browse files
committed
drm/vc4: tests: Fail the current test if we access a register
Accessing a register when running under kunit is a bad idea since our device is completely mocked. Fail the current test if we ever access any of our hardware registers. Reviewed-by: Javier Martinez Canillas <javierm@redhat.com> Reviewed-by: Maíra Canal <mcanal@igalia.com> Link: https://lore.kernel.org/r/20221123-rpi-kunit-tests-v3-18-4615a663a84a@cerno.tech Signed-off-by: Maxime Ripard <maxime@cerno.tech>
1 parent f759f5b commit da43ff0

File tree

7 files changed

+81
-13
lines changed

7 files changed

+81
-13
lines changed

drivers/gpu/drm/vc4/vc4_crtc.c

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,17 @@
5050

5151
#define HVS_FIFO_LATENCY_PIX 6
5252

53-
#define CRTC_WRITE(offset, val) writel(val, vc4_crtc->regs + (offset))
54-
#define CRTC_READ(offset) readl(vc4_crtc->regs + (offset))
53+
#define CRTC_WRITE(offset, val) \
54+
do { \
55+
kunit_fail_current_test("Accessing a register in a unit test!\n"); \
56+
writel(val, vc4_crtc->regs + (offset)); \
57+
} while (0)
58+
59+
#define CRTC_READ(offset) \
60+
({ \
61+
kunit_fail_current_test("Accessing a register in a unit test!\n"); \
62+
readl(vc4_crtc->regs + (offset)); \
63+
})
5564

5665
static const struct debugfs_reg32 crtc_regs[] = {
5766
VC4_REG32(PV_CONTROL),

drivers/gpu/drm/vc4/vc4_dpi.c

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,17 @@ to_vc4_dpi(struct drm_encoder *encoder)
103103
return container_of(encoder, struct vc4_dpi, encoder.base);
104104
}
105105

106-
#define DPI_READ(offset) readl(dpi->regs + (offset))
107-
#define DPI_WRITE(offset, val) writel(val, dpi->regs + (offset))
106+
#define DPI_READ(offset) \
107+
({ \
108+
kunit_fail_current_test("Accessing a register in a unit test!\n"); \
109+
readl(dpi->regs + (offset)); \
110+
})
111+
112+
#define DPI_WRITE(offset, val) \
113+
do { \
114+
kunit_fail_current_test("Accessing a register in a unit test!\n"); \
115+
writel(val, dpi->regs + (offset)); \
116+
} while (0)
108117

109118
static const struct debugfs_reg32 dpi_regs[] = {
110119
VC4_REG32(DPI_C),

drivers/gpu/drm/vc4/vc4_drv.h

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
#include <drm/drm_mm.h>
2020
#include <drm/drm_modeset_lock.h>
2121

22+
#include <kunit/test-bug.h>
23+
2224
#include "uapi/drm/vc4_drm.h"
2325

2426
struct drm_device;
@@ -645,10 +647,29 @@ to_vc4_crtc_state(const struct drm_crtc_state *crtc_state)
645647
return container_of(crtc_state, struct vc4_crtc_state, base);
646648
}
647649

648-
#define V3D_READ(offset) readl(vc4->v3d->regs + offset)
649-
#define V3D_WRITE(offset, val) writel(val, vc4->v3d->regs + offset)
650-
#define HVS_READ(offset) readl(hvs->regs + offset)
651-
#define HVS_WRITE(offset, val) writel(val, hvs->regs + offset)
650+
#define V3D_READ(offset) \
651+
({ \
652+
kunit_fail_current_test("Accessing a register in a unit test!\n"); \
653+
readl(vc4->v3d->regs + (offset)); \
654+
})
655+
656+
#define V3D_WRITE(offset, val) \
657+
do { \
658+
kunit_fail_current_test("Accessing a register in a unit test!\n"); \
659+
writel(val, vc4->v3d->regs + (offset)); \
660+
} while (0)
661+
662+
#define HVS_READ(offset) \
663+
({ \
664+
kunit_fail_current_test("Accessing a register in a unit test!\n"); \
665+
readl(hvs->regs + (offset)); \
666+
})
667+
668+
#define HVS_WRITE(offset, val) \
669+
do { \
670+
kunit_fail_current_test("Accessing a register in a unit test!\n"); \
671+
writel(val, hvs->regs + (offset)); \
672+
} while (0)
652673

653674
#define VC4_REG32(reg) { .name = #reg, .offset = reg }
654675

drivers/gpu/drm/vc4/vc4_dsi.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -617,6 +617,8 @@ dsi_dma_workaround_write(struct vc4_dsi *dsi, u32 offset, u32 val)
617617
dma_cookie_t cookie;
618618
int ret;
619619

620+
kunit_fail_current_test("Accessing a register in a unit test!\n");
621+
620622
/* DSI0 should be able to write normally. */
621623
if (!chan) {
622624
writel(val, dsi->regs + offset);
@@ -645,7 +647,12 @@ dsi_dma_workaround_write(struct vc4_dsi *dsi, u32 offset, u32 val)
645647
DRM_ERROR("Failed to wait for DMA: %d\n", ret);
646648
}
647649

648-
#define DSI_READ(offset) readl(dsi->regs + (offset))
650+
#define DSI_READ(offset) \
651+
({ \
652+
kunit_fail_current_test("Accessing a register in a unit test!\n"); \
653+
readl(dsi->regs + (offset)); \
654+
})
655+
649656
#define DSI_WRITE(offset, val) dsi_dma_workaround_write(dsi, offset, val)
650657
#define DSI_PORT_READ(offset) \
651658
DSI_READ(dsi->variant->port ? DSI1_##offset : DSI0_##offset)

drivers/gpu/drm/vc4/vc4_hdmi_regs.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -456,6 +456,8 @@ static inline u32 vc4_hdmi_read(struct vc4_hdmi *hdmi,
456456

457457
WARN_ON(pm_runtime_status_suspended(&hdmi->pdev->dev));
458458

459+
kunit_fail_current_test("Accessing an HDMI register in a unit test!\n");
460+
459461
if (reg >= variant->num_registers) {
460462
dev_warn(&hdmi->pdev->dev,
461463
"Invalid register ID %u\n", reg);
@@ -486,6 +488,8 @@ static inline void vc4_hdmi_write(struct vc4_hdmi *hdmi,
486488

487489
WARN_ON(pm_runtime_status_suspended(&hdmi->pdev->dev));
488490

491+
kunit_fail_current_test("Accessing an HDMI register in a unit test!\n");
492+
489493
if (reg >= variant->num_registers) {
490494
dev_warn(&hdmi->pdev->dev,
491495
"Invalid register ID %u\n", reg);

drivers/gpu/drm/vc4/vc4_txp.c

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,17 @@
145145
/* Number of lines received and committed to memory. */
146146
#define TXP_PROGRESS 0x10
147147

148-
#define TXP_READ(offset) readl(txp->regs + (offset))
149-
#define TXP_WRITE(offset, val) writel(val, txp->regs + (offset))
148+
#define TXP_READ(offset) \
149+
({ \
150+
kunit_fail_current_test("Accessing a register in a unit test!\n"); \
151+
readl(txp->regs + (offset)); \
152+
})
153+
154+
#define TXP_WRITE(offset, val) \
155+
do { \
156+
kunit_fail_current_test("Accessing a register in a unit test!\n"); \
157+
writel(val, txp->regs + (offset)); \
158+
} while (0)
150159

151160
struct vc4_txp {
152161
struct vc4_crtc base;

drivers/gpu/drm/vc4/vc4_vec.c

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,17 @@ struct vc4_vec {
207207
struct debugfs_regset32 regset;
208208
};
209209

210-
#define VEC_READ(offset) readl(vec->regs + (offset))
211-
#define VEC_WRITE(offset, val) writel(val, vec->regs + (offset))
210+
#define VEC_READ(offset) \
211+
({ \
212+
kunit_fail_current_test("Accessing a register in a unit test!\n"); \
213+
readl(vec->regs + (offset)); \
214+
})
215+
216+
#define VEC_WRITE(offset, val) \
217+
do { \
218+
kunit_fail_current_test("Accessing a register in a unit test!\n"); \
219+
writel(val, vec->regs + (offset)); \
220+
} while (0)
212221

213222
static inline struct vc4_vec *
214223
encoder_to_vc4_vec(struct drm_encoder *encoder)

0 commit comments

Comments
 (0)