diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-08-28 16:58:19 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-08-28 16:58:19 +0200 |
commit | 981b4677364dee053763a4c542ed9eb6d94c246c (patch) | |
tree | 444ec28b6ad6df436d16e85c535f9152cbced85a /drivers/hwtracing/intel_th/gth.h | |
parent | 234b7f8d3bf2738024b155b87303ed1218e620fa (diff) | |
parent | a0e7df335afd2a8a8a688251ffee375b58b6517c (diff) | |
download | op-kernel-dev-981b4677364dee053763a4c542ed9eb6d94c246c.zip op-kernel-dev-981b4677364dee053763a4c542ed9eb6d94c246c.tar.gz |
Merge tag 'stm-for-greg-20170825' of git://git.kernel.org/pub/scm/linux/kernel/git/ash/stm into char-misc-next
Alexander writes:
stm class / intel_th: Updates for 4.14
Intel TH:
* Updated subdevice management code to better fit host mode
* Added support for Low Power Path (LPP) output type
* Fixed memory allocation with IOMMU enabled (DMAR tables)
* Added Cannon Lake PCH PCI IDs
* Added a quirk to force time sync on devices that need it
STM:
* Fixed potential read overflow in ioctl()
* Documented stm_ftrace source.
Diffstat (limited to 'drivers/hwtracing/intel_th/gth.h')
-rw-r--r-- | drivers/hwtracing/intel_th/gth.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/hwtracing/intel_th/gth.h b/drivers/hwtracing/intel_th/gth.h index 56f0d26..f3d2342 100644 --- a/drivers/hwtracing/intel_th/gth.h +++ b/drivers/hwtracing/intel_th/gth.h @@ -55,9 +55,14 @@ enum { REG_GTH_SCRPD1 = 0xe4, /* ScratchPad[1] */ REG_GTH_SCRPD2 = 0xe8, /* ScratchPad[2] */ REG_GTH_SCRPD3 = 0xec, /* ScratchPad[3] */ + REG_TSCU_TSUCTRL = 0x2000, /* TSCU control register */ + REG_TSCU_TSCUSTAT = 0x2004, /* TSCU status register */ }; /* waiting for Pipeline Empty bit(s) to assert for GTH */ #define GTH_PLE_WAITLOOP_DEPTH 10000 +#define TSUCTRL_CTCRESYNC BIT(0) +#define TSCUSTAT_CTCSYNCING BIT(1) + #endif /* __INTEL_TH_GTH_H__ */ |