Merge remote-tracking branch 'regmap/topic/cache' into regmap-next

diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index c8756c030516ffd675da0c4da053775752131761..a941dcfe7590119f7f1cc1b4a69574ea3d47b9b6 100644 (file)
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -1018,6 +1018,8 @@ int _regmap_raw_write(struct regmap *map, unsigned int reg,
                if (!async)
                        return -ENOMEM;
 
+               trace_regmap_async_write_start(map->dev, reg, val_len);
+
                async->work_buf = kzalloc(map->format.buf_size,
                                          GFP_KERNEL | GFP_DMA);
                if (!async->work_buf) {
@@ -1670,6 +1672,8 @@ void regmap_async_complete_cb(struct regmap_async *async, int ret)
        struct regmap *map = async->map;
        bool wake;
 
+       trace_regmap_async_io_complete(map->dev);
+
        spin_lock(&map->async_lock);
 
        list_del(&async->list);
@@ -1716,6 +1720,8 @@ int regmap_async_complete(struct regmap *map)
        if (!map->bus->async_write)
                return 0;
 
+       trace_regmap_async_complete_start(map->dev);
+
        wait_event(map->async_waitq, regmap_async_is_done(map));
 
        spin_lock_irqsave(&map->async_lock, flags);
@@ -1723,6 +1729,8 @@ int regmap_async_complete(struct regmap *map)
        map->async_ret = 0;
        spin_unlock_irqrestore(&map->async_lock, flags);
 
+       trace_regmap_async_complete_done(map->dev);
+
        return ret;
 }
 EXPORT_SYMBOL_GPL(regmap_async_complete);

diff --git a/include/trace/events/regmap.h b/include/trace/events/regmap.h
index 41a7dbd570e2d066b9dbd8e2f604fbbe441bdd1b..a43a2f67bd8e080d844a780a2255dc77af898762 100644 (file)
--- a/include/trace/events/regmap.h
+++ b/include/trace/events/regmap.h
@@ -175,6 +175,54 @@ DEFINE_EVENT(regmap_bool, regmap_cache_bypass,
 
 );
 
+DECLARE_EVENT_CLASS(regmap_async,
+
+       TP_PROTO(struct device *dev),
+
+       TP_ARGS(dev),
+
+       TP_STRUCT__entry(
+               __string(       name,           dev_name(dev)   )
+       ),
+
+       TP_fast_assign(
+               __assign_str(name, dev_name(dev));
+       ),
+
+       TP_printk("%s", __get_str(name))
+);
+
+DEFINE_EVENT(regmap_block, regmap_async_write_start,
+
+       TP_PROTO(struct device *dev, unsigned int reg, int count),
+
+       TP_ARGS(dev, reg, count)
+);
+
+DEFINE_EVENT(regmap_async, regmap_async_io_complete,
+
+       TP_PROTO(struct device *dev),
+
+       TP_ARGS(dev)
+
+);
+
+DEFINE_EVENT(regmap_async, regmap_async_complete_start,
+
+       TP_PROTO(struct device *dev),
+
+       TP_ARGS(dev)
+
+);
+
+DEFINE_EVENT(regmap_async, regmap_async_complete_done,
+
+       TP_PROTO(struct device *dev),
+
+       TP_ARGS(dev)
+
+);
+
 #endif /* _TRACE_REGMAP_H */
 
 /* This part must be outside protection */