@@ -53,6 +53,10 @@ 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_SM_REQ_SESSION_IN_PLAY) {
+ ret = pxp_sm_mark_protected_session_in_play(i915, params->session_type,
+ params->pxp_tag);
+
} else {
ret = -EINVAL;
goto end;
@@ -41,6 +41,18 @@ static int pxp_reg_write(struct drm_i915_private *i915, u32 offset, u32 regval)
return 0;
}
+static int pxp_get_session_index(struct drm_i915_private *i915, u32 pxp_tag,
+ int *session_index_out, int *session_type_out)
+{
+ if (!session_index_out || !session_type_out)
+ return -EINVAL;
+
+ *session_type_out = (pxp_tag & SESSION_TYPE_MASK) ? SESSION_TYPE_TYPE1 : SESSION_TYPE_TYPE0;
+ *session_index_out = pxp_tag & SESSION_ID_MASK;
+
+ return 0;
+}
+
static u8 pxp_get_session_id(int session_index, int session_type)
{
u8 session_id = session_index & SESSION_ID_MASK;
@@ -445,6 +457,63 @@ int intel_pxp_sm_reserve_session(struct drm_i915_private *i915, struct drm_file
return ret;
}
+/**
+ * pxp_sm_mark_protected_session_in_play - To put an reserved protected session to "in_play" state
+ * @i915: i915 device handle.
+ * @session_type: Type of the session to be updated. One of enum pxp_session_types.
+ * @session_id: Session id identifier of the protected session.
+ *
+ * Return: status. 0 means update is successful.
+ */
+int pxp_sm_mark_protected_session_in_play(struct drm_i915_private *i915, int session_type,
+ u32 session_id)
+{
+ int ret;
+ int session_index;
+ int session_type_in_id;
+ struct pxp_protected_session *current_session;
+
+ ret = pxp_get_session_index(i915, session_id, &session_index, &session_type_in_id);
+ if (ret) {
+ drm_err(&i915->drm, "Failed to pxp_get_session_index\n");
+ return ret;
+ }
+
+ if (session_type != session_type_in_id) {
+ drm_err(&i915->drm, "Failed to session_type and session_type_in_id don't match\n");
+ return -EINVAL;
+ }
+
+ lockdep_assert_held(&i915->pxp.ctx->ctx_mutex);
+
+ switch (session_type) {
+ case SESSION_TYPE_TYPE0:
+ list_for_each_entry(current_session, &i915->pxp.ctx->active_pxp_type0_sessions,
+ session_list) {
+ if (current_session->session_index == session_index) {
+ current_session->session_is_in_play = true;
+ return 0;
+ }
+ }
+ break;
+ case SESSION_TYPE_TYPE1:
+ list_for_each_entry(current_session, &i915->pxp.ctx->active_pxp_type1_sessions,
+ session_list) {
+ if (current_session->session_index == session_index) {
+ current_session->session_is_in_play = true;
+ return 0;
+ }
+ }
+ break;
+ default:
+ /* invalid session type */
+ return -EINVAL;
+ }
+
+ drm_err(&i915->drm, "Failed to %s couldn't find active session\n", __func__);
+ return -EINVAL;
+}
+
int pxp_sm_set_kcr_init_reg(struct drm_i915_private *i915)
{
int ret;
@@ -87,6 +87,8 @@ struct pxp_protected_session {
int intel_pxp_sm_reserve_session(struct drm_i915_private *i915, struct drm_file *drmfile,
int context_id, int session_type, int protection_mode,
u32 *pxp_tag);
+int pxp_sm_mark_protected_session_in_play(struct drm_i915_private *i915, int session_type,
+ u32 session_id);
int pxp_sm_set_kcr_init_reg(struct drm_i915_private *i915);
#endif /* __INTEL_PXP_SM_H__ */
With this ioctl action, user space driver can set the session in state "session in play", after dirver reserved the session slot/id from driver, 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 | 4 ++ drivers/gpu/drm/i915/pxp/intel_pxp_sm.c | 69 +++++++++++++++++++++++++ drivers/gpu/drm/i915/pxp/intel_pxp_sm.h | 2 + 3 files changed, 75 insertions(+)