Skip to content

Commit

Permalink
drm/i915/pxp: Use drm_dbg if arb session failed due to fw version
Browse files Browse the repository at this point in the history
If PXP arb-session is being attempted on older hardware SKUs or
on hardware with older, unsupported, firmware versions, then don't
report the failure with a drm_error. Instead, look specifically for
the API-version error reply and drm_dbg that reply. In this case, the
user-space will eventually get a -ENODEV for the protected context
creation which is the correct behavior and we don't create unnecessary
drm_error's in our dmesg (for what is unsupported platforms).

Changes from prio revs:
   v2 : - remove unnecessary newline. (Jani)
   v1 : - print incorrect version from input packet, not output.

Signed-off-by: Alan Previn <alan.previn.teres.alexis@intel.com>
Reviewed-by: Vinay Belgaumkar <vinay.belgaumkar@intel.com>
Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221221174901.2703954-1-alan.previn.teres.alexis@intel.com
  • Loading branch information
Alan Previn authored and John Harrison committed Jan 13, 2023
1 parent f7a79bd commit b762787
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
1 change: 1 addition & 0 deletions drivers/gpu/drm/i915/pxp/intel_pxp_cmd_interface_cmn.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
*/
enum pxp_status {
PXP_STATUS_SUCCESS = 0x0,
PXP_STATUS_ERROR_API_VERSION = 0x1002,
PXP_STATUS_OP_NOT_PERMITTED = 0x4013
};

Expand Down
4 changes: 4 additions & 0 deletions drivers/gpu/drm/i915/pxp/intel_pxp_tee.c
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,10 @@ int intel_pxp_tee_cmd_create_arb_session(struct intel_pxp *pxp,

if (ret)
drm_err(&i915->drm, "Failed to send tee msg ret=[%d]\n", ret);
else if (msg_out.header.status == PXP_STATUS_ERROR_API_VERSION)
drm_dbg(&i915->drm, "PXP firmware version unsupported, requested: "
"CMD-ID-[0x%08x] on API-Ver-[0x%08x]\n",
msg_in.header.command_id, msg_in.header.api_version);
else if (msg_out.header.status != 0x0)
drm_warn(&i915->drm, "PXP firmware failed arb session init request ret=[0x%08x]\n",
msg_out.header.status);
Expand Down

0 comments on commit b762787

Please sign in to comment.