From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 11AF0C2BA83 for ; Thu, 13 Feb 2020 09:00:34 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DFE9220848 for ; Thu, 13 Feb 2020 09:00:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DFE9220848 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EAA346F56E; Thu, 13 Feb 2020 09:00:27 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 01A576F56A; Thu, 13 Feb 2020 09:00:26 +0000 (UTC) X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Feb 2020 01:00:26 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,436,1574150400"; d="scan'208";a="222581907" Received: from unknown (HELO intel.com) ([10.223.74.178]) by orsmga007.jf.intel.com with ESMTP; 13 Feb 2020 01:00:24 -0800 Date: Thu, 13 Feb 2020 14:21:51 +0530 From: Anshuman Gupta To: Ramalingam C Message-ID: <20200213085151.GA11041@intel.com> References: <20200212102942.26568-1-ramalingam.c@intel.com> <20200212102942.26568-4-ramalingam.c@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200212102942.26568-4-ramalingam.c@intel.com> User-Agent: Mutt/1.5.24 (2015-08-30) Subject: Re: [Intel-gfx] [PATCH v2 3/5] drm/i915: terminate reauth at stream management failure X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: intel-gfx , dri-devel Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On 2020-02-12 at 15:59:40 +0530, Ramalingam C wrote: > As per the HDCP2.2 compliance test 1B-10 expectation, when stream > management for a repeater fails, we retry thrice and when it fails > in all retries, HDCP2.2 reauthentication aborted at kernel. > > v2: > seq_num_m++ is extended for steam management failures too.[Anshuman] > v3: > use drm_dbg_kms instead of DRM_DEBUG_KMS [Anshuman] > v4: > dev_priv is used as i915 [JaniN] > > Signed-off-by: Ramalingam C > --- > drivers/gpu/drm/i915/display/intel_hdcp.c | 75 ++++++++++++++--------- > 1 file changed, 46 insertions(+), 29 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c > index 30e0a3aa9d57..b24d12efae0a 100644 > --- a/drivers/gpu/drm/i915/display/intel_hdcp.c > +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c > @@ -1380,7 +1380,7 @@ static int hdcp2_session_key_exchange(struct intel_connector *connector) > } > > static > -int hdcp2_propagate_stream_management_info(struct intel_connector *connector) > +int _hdcp2_propagate_stream_management_info(struct intel_connector *connector) > { > struct intel_digital_port *intel_dig_port = intel_attached_dig_port(connector); > struct intel_hdcp *hdcp = &connector->hdcp; > @@ -1406,28 +1406,25 @@ int hdcp2_propagate_stream_management_info(struct intel_connector *connector) > ret = shim->write_2_2_msg(intel_dig_port, &msgs.stream_manage, > sizeof(msgs.stream_manage)); > if (ret < 0) > - return ret; > + goto err_exit; > > ret = shim->read_2_2_msg(intel_dig_port, HDCP_2_2_REP_STREAM_READY, > &msgs.stream_ready, sizeof(msgs.stream_ready)); > if (ret < 0) > - return ret; > + goto err_exit; > > hdcp->port_data.seq_num_m = hdcp->seq_num_m; > hdcp->port_data.streams[0].stream_type = hdcp->content_type; > - > ret = hdcp2_verify_mprime(connector, &msgs.stream_ready); > - if (ret < 0) > - return ret; > > +err_exit: > hdcp->seq_num_m++; > - > if (hdcp->seq_num_m > HDCP_2_2_SEQ_NUM_MAX) { > DRM_DEBUG_KMS("seq_num_m roll over.\n"); > - return -1; > + ret = -1; > } > > - return 0; > + return ret; > } > > static > @@ -1492,17 +1489,6 @@ int hdcp2_authenticate_repeater_topology(struct intel_connector *connector) > return 0; > } > > -static int hdcp2_authenticate_repeater(struct intel_connector *connector) > -{ > - int ret; > - > - ret = hdcp2_authenticate_repeater_topology(connector); > - if (ret < 0) > - return ret; > - > - return hdcp2_propagate_stream_management_info(connector); > -} > - > static int hdcp2_authenticate_sink(struct intel_connector *connector) > { > struct intel_digital_port *intel_dig_port = intel_attached_dig_port(connector); > @@ -1537,18 +1523,13 @@ static int hdcp2_authenticate_sink(struct intel_connector *connector) > } > > if (hdcp->is_repeater) { > - ret = hdcp2_authenticate_repeater(connector); > + ret = hdcp2_authenticate_repeater_topology(connector); > if (ret < 0) { > DRM_DEBUG_KMS("Repeater Auth Failed. Err: %d\n", ret); > return ret; > } > } > > - hdcp->port_data.streams[0].stream_type = hdcp->content_type; > - ret = hdcp2_authenticate_port(connector); > - if (ret < 0) > - return ret; > - > return ret; > } > > @@ -1626,14 +1607,50 @@ static int hdcp2_disable_encryption(struct intel_connector *connector) > return ret; > } > > +static int > +hdcp2_propagate_stream_management_info(struct intel_connector *connector) > +{ > + struct drm_i915_private *i915 = to_i915(connector->base.dev); > + int i, tries = 3, ret; > + > + if (!connector->hdcp.is_repeater) > + return 0; > + > + for (i = 0; i < tries; i++) { > + ret = _hdcp2_propagate_stream_management_info(connector); > + if (!ret) > + break; > + > + drm_dbg_kms(&i915->drm, > + "HDCP2 stream management %d of %d Failed.(%d)\n", > + i + 1, tries, ret); > + } > + > + return ret; > +} > + > static int hdcp2_authenticate_and_encrypt(struct intel_connector *connector) > { > + struct drm_i915_private *i915 = to_i915(connector->base.dev); > + struct intel_hdcp *hdcp = &connector->hdcp; > int ret, i, tries = 3; > > for (i = 0; i < tries; i++) { > ret = hdcp2_authenticate_sink(connector); > - if (!ret) > - break; > + if (!ret) { > + ret = hdcp2_propagate_stream_management_info(connector); IMHO hdcp2_propagate_stream_management_info should be called only for repeater rather then early return in funciton itself (theoretically it may avoid a stack operation). but this is also ok. Tested this patch on HDCP compliance. Tested-by: Anshuman Gupta Reviewed-by: Anshuman Gupta Thanks, Anshuman Gupta. > + if (!ret) { > + hdcp->port_data.streams[0].stream_type = > + hdcp->content_type; > + ret = hdcp2_authenticate_port(connector); > + if (!ret) > + break; > + } else { > + drm_dbg_kms(&i915->drm, > + "HDCP2 stream management failed\n"); > + break; > + } > + } > > /* Clearing the mei hdcp session */ > DRM_DEBUG_KMS("HDCP2.2 Auth %d of %d Failed.(%d)\n", > @@ -1642,7 +1659,7 @@ static int hdcp2_authenticate_and_encrypt(struct intel_connector *connector) > DRM_DEBUG_KMS("Port deauth failed.\n"); > } > > - if (i != tries) { > + if (!ret) { > /* > * Ensuring the required 200mSec min time interval between > * Session Key Exchange and encryption. > -- > 2.20.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx