drm/i915: trace down all the register write and read
Subsystems (2)
PATCH 1/2 drm/i915: trace down all the register write and read
Add two tracepoints at I915_WRITE/READ for tracing down all the register write and read.
Signed-off-by Yuanhan Liu <[email protected]>
--- drivers/gpu/drm/i915/i915_drv.h | 61 ++++++++++++++++++++++++++++++++----- drivers/gpu/drm/i915/i915_trace.h | 23 ++++++++++++++ 2 files changed, 76 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +53 -8
@@ -32,6 +32,7 @@#include "i915_reg.h" #include "intel_bios.h" +#include "i915_trace.h" #include "intel_ringbuffer.h" #include <linux/io-mapping.h> #include <linux/i2c.h>
@@ -1173,14 +1174,58 @@ extern void intel_overlay_print_error_state(struct seq_file *m, struct intel_oveLOCK_TEST_WITH_RETURN (dev, file_priv); \ }while (0 ) -#define I915_READ (reg) readl(dev_priv->regs + (reg)) -#define I915_WRITE (reg, val) writel(val, dev_priv->regs + (reg)) -#define I915_READ16 (reg) readw(dev_priv->regs + (reg)) -#define I915_WRITE16 (reg, val) writel(val, dev_priv->regs + (reg)) -#define I915_READ8 (reg) readb(dev_priv->regs + (reg)) -#define I915_WRITE8 (reg, val) writeb(val, dev_priv->regs + (reg)) -#define I915_WRITE64 (reg, val) writeq(val, dev_priv->regs + (reg)) -#define I915_READ64 (reg) readq(dev_priv->regs + (reg)) +static inline u32 i915_read(struct drm_i915_private *dev_priv, u32 reg, int len) +{ +u64 val =0 ; + +switch (len) { +case 8 : + val =readq (dev_priv->regs + reg); +break ; +case 4 : + val =readl (dev_priv->regs + reg); +break ; +case 2 : + val =readw (dev_priv->regs + reg); +break ; +case 1 : + val =readb (dev_priv->regs + reg); +break ; + } +trace_i915_reg_rw ('R' , reg, val, len); + +return val; +} + +static inline void +i915_write (struct drm_i915_private *dev_priv,u32 reg,u64 val,int len) +{ +/* Trace down the write operation before the real write */ +trace_i915_reg_rw ('W' , reg, val, len); +switch (len) { +case 8 : +writeq (val, dev_priv->regs + reg); +break ; +case 4 : +writel (val, dev_priv->regs + reg); +break ; +case 2 : +writew (val, dev_priv->regs + reg); +break ; +case 1 : +writeb (val, dev_priv->regs + reg); +break ; + } +} + +#define I915_READ (reg) i915_read(dev_priv, (reg), 4) +#define I915_WRITE (reg, val) i915_write(dev_priv, (reg), (val), 4) +#define I915_READ16 (reg) i915_read(dev_priv, (reg), 2) +#define I915_WRITE16 (reg, val) i915_write(dev_priv, (reg), (val), 2) +#define I915_READ8 (reg) i915_read(dev_priv, (reg), 1) +#define I915_WRITE8 (reg, val) i915_write(dev_priv, (reg), (val), 1) +#define I915_WRITE64 (reg, val) i915_write(dev_priv, (reg), (val), 8) +#define I915_READ64 (reg) i915_read(dev_priv, (reg), 8)#define POSTING_READ (reg) (void)I915_READ(reg)#define POSTING_READ16 (reg) (void)I915_READ16(reg)
drivers/gpu/drm/i915/i915_trace.h +23 -0
@@ -301,6 +301,29 @@ TRACE_EVENT(i915_flip_complete,TP_printk ("plane=%d, obj=%p" , __entry->plane, __entry->obj) ); +TRACE_EVENT (i915_reg_rw, + TP_PROTO(int cmd, uint32_t reg, uint64_t val, int len), + +TP_ARGS (cmd, reg, val, len), + +TP_STRUCT__entry ( + __field(int, cmd) + __field(uint32_t, reg) + __field(uint64_t, val) +__field (int, len) + ), + +TP_fast_assign ( + __entry->cmd = cmd; + __entry->reg = reg; + __entry->val = (uint64_t)val; + __entry->len = len; + ), + +TP_printk ("cmd=%c, reg=0x%x, val=0x%llx, len=%d" , + __entry->cmd, __entry->reg, __entry->val, __entry->len) +); +#endif /* _I915_TRACE_H_ */ /* This part must be outside protection */
Signature · 1 line
1.7.0.1
PATCH 2/2 drm/i915: filter out the read/write of GPIO registers
Filter out the read/write of GPIO registers.
Signed-off-by Yuanhan Liu <[email protected]>
--- drivers/gpu/drm/i915/i915_drv.h | 5 +++++ drivers/gpu/drm/i915/intel_i2c.c | 25 +++++++++++++------------ 2 files changed, 18 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +5 -0
@@ -1229,6 +1229,11 @@ i915_write(struct drm_i915_private *dev_priv, u32 reg, u64 val, int len)#define POSTING_READ (reg) (void)I915_READ(reg)#define POSTING_READ16 (reg) (void)I915_READ16(reg) +#define I915_READ_NOTRACE (reg) readl(dev_priv->regs + (reg)) +#define I915_WRITE_NOTRACE (reg, val) writel(val, dev_priv->regs + (reg)) +#define POSTING_READ_NOTRACE (reg) (void)I915_READ_NOTRACE(reg) + +#define BEGIN_LP_RING (n) \ intel_ring_begin(&dev_priv->render_ring, (n))
drivers/gpu/drm/i915/intel_i2c.c +13 -12
@@ -85,8 +85,9 @@ static u32 get_reserved(struct intel_gpio *gpio)/* On most chips, these bits must be preserved in software. */ if (!IS_I830 (dev) && !IS_845G (dev)) - reserved =I915_READ (gpio->reg) & (GPIO_DATA_PULLUP_DISABLE | -GPIO_CLOCK_PULLUP_DISABLE ); + reserved =I915_READ_NOTRACE (gpio->reg) & + (GPIO_DATA_PULLUP_DISABLE | +GPIO_CLOCK_PULLUP_DISABLE );return reserved; }
@@ -96,9 +97,9 @@ static int get_clock(void *data)struct intel_gpio *gpio = data;struct drm_i915_private *dev_priv = gpio->dev_priv;u32 reserved =get_reserved (gpio); -I915_WRITE (gpio->reg, reserved |GPIO_CLOCK_DIR_MASK ); -I915_WRITE (gpio->reg, reserved); -return (I915_READ (gpio->reg) &GPIO_CLOCK_VAL_IN ) !=0 ; +I915_WRITE_NOTRACE (gpio->reg, reserved |GPIO_CLOCK_DIR_MASK ); +I915_WRITE_NOTRACE (gpio->reg, reserved); +return (I915_READ_NOTRACE (gpio->reg) &GPIO_CLOCK_VAL_IN ) !=0 ; }static int get_data (void *data)
@@ -106,9 +107,9 @@ static int get_data(void *data)struct intel_gpio *gpio = data;struct drm_i915_private *dev_priv = gpio->dev_priv;u32 reserved =get_reserved (gpio); -I915_WRITE (gpio->reg, reserved |GPIO_DATA_DIR_MASK ); -I915_WRITE (gpio->reg, reserved); -return (I915_READ (gpio->reg) &GPIO_DATA_VAL_IN ) !=0 ; +I915_WRITE_NOTRACE (gpio->reg, reserved |GPIO_DATA_DIR_MASK ); +I915_WRITE_NOTRACE (gpio->reg, reserved); +return (I915_READ_NOTRACE (gpio->reg) &GPIO_DATA_VAL_IN ) !=0 ; }static void set_clock (void *data,int state_high)
@@ -124,8 +125,8 @@ static void set_clock(void *data, int state_high) clock_bits =GPIO_CLOCK_DIR_OUT |GPIO_CLOCK_DIR_MASK |GPIO_CLOCK_VAL_MASK ; -I915_WRITE (gpio->reg, reserved | clock_bits); -POSTING_READ (gpio->reg); +I915_WRITE_NOTRACE (gpio->reg, reserved | clock_bits); +POSTING_READ_NOTRACE (gpio->reg); }static void set_data (void *data,int state_high)
@@ -141,8 +142,8 @@ static void set_data(void *data, int state_high) data_bits =GPIO_DATA_DIR_OUT |GPIO_DATA_DIR_MASK |GPIO_DATA_VAL_MASK ; -I915_WRITE (gpio->reg, reserved | data_bits); -POSTING_READ (gpio->reg); +I915_WRITE_NOTRACE (gpio->reg, reserved | data_bits); +POSTING_READ_NOTRACE (gpio->reg); } static struct i2c_adapter *
Signature · 1 line
1.7.0.1
Chris Wilson
AppliedRe: [PATCH 2/2] drm/i915: filter out the read/write of GPIO registers
Quoted 1 line · Yuanhan Liu
Filter out the read/write of GPIO registers.
I split this into two patches, in case we ever add a second user of the notrace interface and want to re-enable tracing of the GPIO registers for any reason.
Applied these to -next, thanks. You'll make Jesse happy again since he was starting to worry about his loss of debug printks. ;-)
-Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre