@@ -16,7 +16,13 @@
#define KCR_INIT_ALLOW_DISPLAY_ME_WRITES (BIT(14) | (BIT(14) << KCR_INIT_MASK_SHIFT))
#define PXP_ACTION_SET_SESSION_STATUS 1
-#define PXP_REQ_SESSION_ID_INIT 0
+
+enum pxp_session_req {
+ /* Request KMD to allocate session id and move it to IN INIT */
+ PXP_REQ_SESSION_ID_INIT = 0x0,
+ /* Inform KMD that UMD has completed the initialization */
+ PXP_REQ_SESSION_IN_PLAY,
+};
/*
* struct pxp_set_session_status_params - Params to reserved, set or destroy
@@ -228,6 +234,9 @@ int i915_pxp_ops_ioctl(struct drm_device *dev, void *data, struct drm_file *drmf
pxp_info.sm_status = ret;
ret = 0;
}
+ } else if (params->req_session_state == PXP_REQ_SESSION_IN_PLAY) {
+ ret = intel_pxp_sm_ioctl_mark_session_in_play(pxp, params->session_type,
+ params->pxp_tag);
} else {
ret = -EINVAL;
}
@@ -12,6 +12,9 @@
#define GEN12_KCR_TSIP _MMIO(0x32264) /* KCR type1 session in play 0-63 */
+#define SESSION_TYPE_MASK BIT(7)
+#define SESSION_ID_MASK (BIT(7) - 1)
+
static inline int session_max(int session_type)
{
return (session_type == SESSION_TYPE_TYPE0) ?
@@ -148,6 +151,17 @@ static int create_session_entry(struct intel_pxp *pxp, struct drm_file *drmfile,
return 0;
}
+static int pxp_get_session_index(u32 session_id, int *index_out, int *type_out)
+{
+ if (!index_out || !type_out)
+ return -EINVAL;
+
+ *type_out = (session_id & SESSION_TYPE_MASK) ? SESSION_TYPE_TYPE1 : SESSION_TYPE_TYPE0;
+ *index_out = session_id & SESSION_ID_MASK;
+
+ return 0;
+}
+
/**
* intel_pxp_sm_ioctl_reserve_session - To reserve an available protected session.
* @pxp: pointer to pxp struct
@@ -192,3 +206,40 @@ int intel_pxp_sm_ioctl_reserve_session(struct intel_pxp *pxp, struct drm_file *d
return PXP_SM_STATUS_SESSION_NOT_AVAILABLE;
}
+
+/**
+ * intel_pxp_sm_ioctl_mark_session_in_play - Put an reserved session to "in_play" state
+ * @pxp: pointer to pxp struct
+ * @session_type: Type of the session to be updated. One of enum pxp_session_types.
+ * @session_id: Session identifier of the session, containing type and index info
+ *
+ * Return: status. 0 means update is successful.
+ */
+int intel_pxp_sm_ioctl_mark_session_in_play(struct intel_pxp *pxp, int session_type,
+ u32 session_id)
+{
+ int ret;
+ int session_index;
+ int session_type_in_id;
+ struct intel_pxp_sm_session *curr;
+ struct intel_gt *gt = container_of(pxp, struct intel_gt, pxp);
+
+ ret = pxp_get_session_index(session_id, &session_index, &session_type_in_id);
+ if (ret)
+ return ret;
+
+ if (session_type != session_type_in_id)
+ return -EINVAL;
+
+ lockdep_assert_held(&pxp->ctx.mutex);
+
+ list_for_each_entry(curr, session_list(pxp, session_type), list) {
+ if (curr->index == session_index) {
+ curr->is_in_play = true;
+ return 0;
+ }
+ }
+
+ drm_err(>->i915->drm, "Failed to %s couldn't find active session\n", __func__);
+ return -EINVAL;
+}
@@ -40,4 +40,6 @@ struct intel_pxp_sm_session {
int intel_pxp_sm_ioctl_reserve_session(struct intel_pxp *pxp, struct drm_file *drmfile,
int session_type, int protection_mode,
u32 *pxp_tag);
+int intel_pxp_sm_ioctl_mark_session_in_play(struct intel_pxp *pxp, int session_type,
+ u32 session_id);
#endif /* __INTEL_PXP_SM_H__ */
With this ioctl action, userspace driver can set the session in state "session in play", after dirver reserved the session slot/id from kernel PXP, and sent the TEE commands to activate the corresponding hardware session. Session state "session in play" means this session is ready for secure playback. Signed-off-by: Huang, Sean Z <sean.z.huang@intel.com> --- drivers/gpu/drm/i915/pxp/intel_pxp.c | 11 +++++- drivers/gpu/drm/i915/pxp/intel_pxp_sm.c | 51 +++++++++++++++++++++++++ drivers/gpu/drm/i915/pxp/intel_pxp_sm.h | 2 + 3 files changed, 63 insertions(+), 1 deletion(-)