diff --git a/core/SConscript.firmware b/core/SConscript.firmware
index 7e16ae457..8ab7b49ae 100644
--- a/core/SConscript.firmware
+++ b/core/SConscript.firmware
@@ -358,6 +358,7 @@ if SYSTEM_VIEW:
         'embed/segger/SEGGER/SEGGER_SYSVIEW.c',
         'embed/segger/SEGGER/SEGGER_RTT.c',
         'embed/segger/SEGGER/SEGGER_RTT_ASM_ARMv7M.S',
+        'embed/firmware/systemview.c',
     ]
     CPPPATH_MOD += [
         'embed/segger/SEGGER/',
diff --git a/core/embed/firmware/main.c b/core/embed/firmware/main.c
index d29e155f0..691a9f177 100644
--- a/core/embed/firmware/main.c
+++ b/core/embed/firmware/main.c
@@ -43,6 +43,9 @@
 #ifdef RDI
 #include "rdi.h"
 #endif
+#ifdef SYSTEM_VIEW
+#include "systemview.h"
+#endif
 #include "rng.h"
 #include "sdcard.h"
 #include "supervise.h"
@@ -62,6 +65,10 @@ int main(void) {
 
   collect_hw_entropy();
 
+#ifdef SYSTEM_VIEW
+  enable_systemview();
+#endif
+
 #if TREZOR_MODEL == T
 #if PRODUCTION
   check_and_replace_bootloader();
diff --git a/core/embed/firmware/systemview.c b/core/embed/firmware/systemview.c
new file mode 100644
index 000000000..275adf1e7
--- /dev/null
+++ b/core/embed/firmware/systemview.c
@@ -0,0 +1,85 @@
+#ifdef SYSTEM_VIEW
+
+#include <stdint.h>
+
+#include "SEGGER_SYSVIEW_Conf.h"
+#include "SEGGER_SYSVIEW.h"
+
+#define SYSTICK ((SYSTICK_REGS*)0xE000E010)
+#define SCS     ((SCS_REGS*)0xE000ED00)
+
+typedef struct {
+    volatile unsigned int CSR;
+    volatile unsigned int RVR;
+    volatile unsigned int CVR;
+    volatile unsigned int CALIB;
+} SYSTICK_REGS;
+
+typedef struct {
+    volatile unsigned int CPUID;       // CPUID Base Register
+    volatile unsigned int ICSR;        // Interrupt Control and State Register
+    volatile unsigned int VTOR;        // Vector Table Offset Register
+    volatile unsigned int AIRCR;       // Application Interrupt and Reset Control Register
+    volatile unsigned int SCR;         // System Control Register
+    volatile unsigned int CCR;         // Configuration and Control Register
+    volatile unsigned int SHPR1;       // System Handler Priority Register 1
+    volatile unsigned int SHPR2;       // System Handler Priority Register 2
+    volatile unsigned int SHPR3;       // System Handler Priority Register 3
+    volatile unsigned int SHCSR;       // System Handler Control and State Register
+    volatile unsigned int CFSR;        // Configurable Fault Status Register
+    volatile unsigned int HFSR;        // HardFault Status Register
+    volatile unsigned int DFSR;        // Debug Fault Status Register
+    volatile unsigned int MMFAR;       // MemManage Fault Address Register
+    volatile unsigned int BFAR;        // BusFault Address Register
+    volatile unsigned int AFSR;        // Auxiliary Fault Status Register
+    volatile unsigned int aDummy0[4];  // 0x40-0x4C Reserved
+    volatile unsigned int aDummy1[4];  // 0x50-0x5C Reserved
+    volatile unsigned int aDummy2[4];  // 0x60-0x6C Reserved
+    volatile unsigned int aDummy3[4];  // 0x70-0x7C Reserved
+    volatile unsigned int aDummy4[2];  // 0x80-0x87 - - - Reserved.
+    volatile unsigned int CPACR;       // Coprocessor Access Control Register
+} SCS_REGS;
+
+extern uint32_t SystemCoreClock;
+
+U32 SEGGER_SYSVIEW_X_GetTimestamp ()
+{
+//    static U32 i = 0;
+//    return i++;
+    return (*(U32 *)(0xE0001004));
+}
+
+U32 SEGGER_SYSVIEW_X_GetInterruptId()
+{
+//    static U32 i = 0;
+//    return (i++) % 200;
+    return ((*(U32*)(0xE000ED04)) & 0x1FF);
+}
+
+void enable_systemview() {
+    SEGGER_SYSVIEW_Conf();
+    SEGGER_SYSVIEW_Start();
+
+    U32 v;
+    //
+    // Configure SysTick and debug monitor interrupt priorities
+    // Low value means high priority
+    // A maximum of 8 priority bits and a minimum of 3 bits is implemented per interrupt.
+    // How many bits are implemented depends on the actual CPU being used
+    // If less than 8 bits are supported, the lower bits of the priority byte are RAZ.
+    // In order to make sure that priority of monitor and SysTick always differ, please make sure that the difference is visible in the highest 3 bits
+    v = SCS->SHPR3;
+    v |= (0xFFuL << 24);   // Lowest prio for SysTick so SystemView does not get interrupted by Systick
+    SCS->SHPR3 = v;
+    //
+    // Configure SysTick interrupt
+    // SysTick is running at CPU speed
+    // Configure SysTick to fire every ms
+    //
+    SYSTICK->RVR = (SystemCoreClock / 1000) - 1;     // set reload
+    SYSTICK->CVR = 0x00;      // set counter
+    SYSTICK->CSR = 0x07;      // enable systick
+
+}
+
+#endif
diff --git a/core/embed/firmware/systemview.h b/core/embed/firmware/systemview.h
new file mode 100644
index 000000000..a260d3b82
--- /dev/null
+++ b/core/embed/firmware/systemview.h
@@ -0,0 +1,11 @@
+
+#ifndef CORE_SYSTEMVIEW_H
+#define CORE_SYSTEMVIEW_H
+
+#ifdef SYSTEM_VIEW
+
+void enable_systemview();
+
+#endif
+
+#endif //CORE_SYSTEMVIEW_H