]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/i915/pxp: limit drm-errors or warning on firmware API failures
authorAlan Previn <alan.previn.teres.alexis@intel.com>
Thu, 23 Mar 2023 18:41:56 +0000 (11:41 -0700)
committerDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Wed, 5 Apr 2023 16:19:32 +0000 (09:19 -0700)
MESA driver is creating protected context on every driver handle
creation to query caps bits for app. So when running CI tests,
they are observing hundreds of drm_errors when enabling PXP
in .config but using SOC fusing or BIOS configuration that cannot
support PXP sessions.

The fixes tag referenced below was to resolve a related issue
where we wanted to silence error messages, but that case was due
to outdated IFWI (firmware) that definitely needed an upgrade and
was, at that point, considered a one-off case as opposed to today's
realization that default CI was enabling PXP in kernel config for
all testing.

So with this patch, let's strike a balance between issues that is
critical but are root-caused from HW/platform gaps (louder drm-warn
but just ONCE) vs other cases where it could also come from session
state machine (which cannot be a WARN_ONCE since it can be triggered
due to runtime operation events).

Let's use helpers for these so as more functions are added in future
features / HW (or as FW designers continue to bless upstreaming of
the error codes and meanings), we only need to update the helpers.

NOTE: Don't completely remove FW errors (via drm_debug) or else cusomer
apps that really needs to know that content protection failed won't
be aware of it.

v2: - Add fixes tag (Trvtko)
v3: - Break multi-line drm_dbg strings into separate drm_dbg (Daniele)
    - Fix couple of typecasting nits (Daniele)
v4: - Unsuccessful PXP FW cmd due to platform configuration shouldn't
      use drm_WARN_once (Tvrtko), Switched to use drm_info_once.
v5: - Added "reported-and-tested" by Eero.

Reported-and-tested-by: Eero Tamminen <eero.t.tamminen@intel.com>
Fixes: b762787bf767 ("drm/i915/pxp: Use drm_dbg if arb session failed due to fw version")
Signed-off-by: Alan Previn <alan.previn.teres.alexis@intel.com>
Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230323184156.4140659-1-alan.previn.teres.alexis@intel.com
drivers/gpu/drm/i915/pxp/intel_pxp_cmd_interface_cmn.h
drivers/gpu/drm/i915/pxp/intel_pxp_session.c
drivers/gpu/drm/i915/pxp/intel_pxp_tee.c

index ae9b151b7cb77bbe0e8d1f0b4d0be048a2f8d984..6f6541d5e49a6f36b188fb0a2bfb07acc25b880d 100644 (file)
@@ -18,6 +18,9 @@
 enum pxp_status {
        PXP_STATUS_SUCCESS = 0x0,
        PXP_STATUS_ERROR_API_VERSION = 0x1002,
+       PXP_STATUS_NOT_READY = 0x100e,
+       PXP_STATUS_PLATFCONFIG_KF1_NOVERIF = 0x101a,
+       PXP_STATUS_PLATFCONFIG_KF1_BAD = 0x101f,
        PXP_STATUS_OP_NOT_PERMITTED = 0x4013
 };
 
index 448cacb0465d9a0dd439b909cf0afbd3454ddc8a..7de849cb6c47b4053c9d86b179b8fef0fec0aa79 100644 (file)
@@ -74,7 +74,7 @@ static int pxp_create_arb_session(struct intel_pxp *pxp)
 
        ret = pxp_wait_for_session_state(pxp, ARB_SESSION, true);
        if (ret) {
-               drm_err(&gt->i915->drm, "arb session failed to go in play\n");
+               drm_dbg(&gt->i915->drm, "arb session failed to go in play\n");
                return ret;
        }
        drm_dbg(&gt->i915->drm, "PXP ARB session is alive\n");
index d9d248b48093421d34789206af253925c0ccede9..a2846b1dbbee45b378f47623b1f4558625ce77ec 100644 (file)
 #include "intel_pxp_tee.h"
 #include "intel_pxp_types.h"
 
+static bool
+is_fw_err_platform_config(u32 type)
+{
+       switch (type) {
+       case PXP_STATUS_ERROR_API_VERSION:
+       case PXP_STATUS_PLATFCONFIG_KF1_NOVERIF:
+       case PXP_STATUS_PLATFCONFIG_KF1_BAD:
+               return true;
+       default:
+               break;
+       }
+       return false;
+}
+
+static const char *
+fw_err_to_string(u32 type)
+{
+       switch (type) {
+       case PXP_STATUS_ERROR_API_VERSION:
+               return "ERR_API_VERSION";
+       case PXP_STATUS_NOT_READY:
+               return "ERR_NOT_READY";
+       case PXP_STATUS_PLATFCONFIG_KF1_NOVERIF:
+       case PXP_STATUS_PLATFCONFIG_KF1_BAD:
+               return "ERR_PLATFORM_CONFIG";
+       default:
+               break;
+       }
+       return NULL;
+}
+
 static int intel_pxp_tee_io_message(struct intel_pxp *pxp,
                                    void *msg_in, u32 msg_in_size,
                                    void *msg_out, u32 msg_out_max_size,
@@ -307,15 +338,22 @@ int intel_pxp_tee_cmd_create_arb_session(struct intel_pxp *pxp,
                                       &msg_out, sizeof(msg_out),
                                       NULL);
 
-       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);
+       if (ret) {
+               drm_err(&i915->drm, "Failed to send tee msg init arb session, ret=[%d]\n", ret);
+       } else if (msg_out.header.status != 0) {
+               if (is_fw_err_platform_config(msg_out.header.status)) {
+                       drm_info_once(&i915->drm,
+                                     "PXP init-arb-session-%d failed due to BIOS/SOC:0x%08x:%s\n",
+                                     arb_session_id, msg_out.header.status,
+                                     fw_err_to_string(msg_out.header.status));
+               } else {
+                       drm_dbg(&i915->drm, "PXP init-arb-session--%d failed 0x%08x:%st:\n",
+                               arb_session_id, msg_out.header.status,
+                               fw_err_to_string(msg_out.header.status));
+                       drm_dbg(&i915->drm, "     cmd-detail: ID=[0x%08x],API-Ver-[0x%08x]\n",
+                               msg_in.header.command_id, msg_in.header.api_version);
+               }
+       }
 
        return ret;
 }
@@ -347,10 +385,21 @@ try_again:
        if ((ret || msg_out.header.status != 0x0) && ++trials < 3)
                goto try_again;
 
-       if (ret)
-               drm_err(&i915->drm, "Failed to send tee msg for inv-stream-key-%d, ret=[%d]\n",
+       if (ret) {
+               drm_err(&i915->drm, "Failed to send tee msg for inv-stream-key-%u, ret=[%d]\n",
                        session_id, ret);
-       else if (msg_out.header.status != 0x0)
-               drm_warn(&i915->drm, "PXP firmware failed inv-stream-key-%d with status 0x%08x\n",
-                        session_id, msg_out.header.status);
+       } else if (msg_out.header.status != 0) {
+               if (is_fw_err_platform_config(msg_out.header.status)) {
+                       drm_info_once(&i915->drm,
+                                     "PXP inv-stream-key-%u failed due to BIOS/SOC :0x%08x:%s\n",
+                                     session_id, msg_out.header.status,
+                                     fw_err_to_string(msg_out.header.status));
+               } else {
+                       drm_dbg(&i915->drm, "PXP inv-stream-key-%u failed 0x%08x:%s:\n",
+                               session_id, msg_out.header.status,
+                               fw_err_to_string(msg_out.header.status));
+                       drm_dbg(&i915->drm, "     cmd-detail: ID=[0x%08x],API-Ver-[0x%08x]\n",
+                               msg_in.header.command_id, msg_in.header.api_version);
+               }
+       }
 }