Merge tag 'configfs-for-4.10' of git://git.infradead.org/users/hch/configfs

[mirror_ubuntu-zesty-kernel.git] / drivers / hwtracing / coresight / coresight-etm.h

diff --git a/drivers/hwtracing/coresight/coresight-etm.h b/drivers/hwtracing/coresight/coresight-etm.h
index 4a18ee4999658eccbe16eb619d83efecc1c682cb..ad063d7444e1787a7c42c25f7efd798734f38bbd 100644 (file)
--- a/drivers/hwtracing/coresight/coresight-etm.h
+++ b/drivers/hwtracing/coresight/coresight-etm.h
@@ -89,11 +89,13 @@
 /* ETMCR - 0x00 */
 #define ETMCR_PWD_DWN          BIT(0)
 #define ETMCR_STALL_MODE       BIT(7)
+#define ETMCR_BRANCH_BROADCAST BIT(8)
 #define ETMCR_ETM_PRG          BIT(10)
 #define ETMCR_ETM_EN           BIT(11)
 #define ETMCR_CYC_ACC          BIT(12)
 #define ETMCR_CTXID_SIZE       (BIT(14)|BIT(15))
 #define ETMCR_TIMESTAMP_EN     BIT(28)
+#define ETMCR_RETURN_STACK     BIT(29)
 /* ETMCCR - 0x04 */
 #define ETMCCR_FIFOFULL                BIT(23)
 /* ETMPDCR - 0x310 */
@@ -110,8 +112,11 @@
 #define ETM_MODE_STALL         BIT(2)
 #define ETM_MODE_TIMESTAMP     BIT(3)
 #define ETM_MODE_CTXID         BIT(4)
+#define ETM_MODE_BBROAD                BIT(5)
+#define ETM_MODE_RET_STACK     BIT(6)
 #define ETM_MODE_ALL           (ETM_MODE_EXCLUDE | ETM_MODE_CYCACC | \
                                 ETM_MODE_STALL | ETM_MODE_TIMESTAMP | \
+                                ETM_MODE_BBROAD | ETM_MODE_RET_STACK | \
                                 ETM_MODE_CTXID | ETM_MODE_EXCL_KERN | \
                                 ETM_MODE_EXCL_USER)