diff --git a/include/services/drtm_svc.h b/include/services/drtm_svc.h
index 890cdbb..69b314f 100644
--- a/include/services/drtm_svc.h
+++ b/include/services/drtm_svc.h
@@ -44,6 +44,12 @@
 #define ARM_DRTM_SVC_SET_TCB_HASH	DRTM_FID(DRTM_FNUM_SVC_SET_TCB_HASH)
 #define ARM_DRTM_SVC_LOCK_TCB_HASH	DRTM_FID(DRTM_FNUM_SVC_LOCK_TCB_HASH)
 
+#define ARM_DRTM_FEATURES_TPM		U(0x1)
+#define ARM_DRTM_FEATURES_MEM_REQ	U(0x2)
+#define ARM_DRTM_FEATURES_DMA_PROT	U(0x3)
+#define ARM_DRTM_FEATURES_BOOT_PE_ID	U(0x4)
+#define ARM_DRTM_FEATURES_TCB_HASHES	U(0x5)
+
 #define is_drtm_fid(_fid) \
 	(((_fid) >= ARM_DRTM_SVC_VERSION) && ((_fid) <= ARM_DRTM_SVC_LOCK_TCB_HASH))
 
@@ -62,9 +68,10 @@
 	ARM_DRTM_VERSION_MINOR_SHIFT))
 
 #define ARM_DRTM_FUNC_SHIFT	U(63)
-#define ARM_DRTM_FUNC_MASK	U(0x1)
+#define ARM_DRTM_FUNC_MASK	ULL(0x1)
 #define ARM_DRTM_FUNC_ID	U(0x0)
 #define ARM_DRTM_FEAT_ID	U(0x1)
+#define ARM_DRTM_FEAT_ID_MASK	ULL(0xff)
 
 /*
  * Definitions for DRTM features as per DRTM beta0 section 3.3,