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, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham 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 412E6C33CAC for ; Thu, 6 Feb 2020 17:13: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 084F8214AF for ; Thu, 6 Feb 2020 17:13:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 084F8214AF 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 8D6666FAC1; Thu, 6 Feb 2020 17:13:33 +0000 (UTC) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id ADAD26FAC1 for ; Thu, 6 Feb 2020 17:13:32 +0000 (UTC) X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Feb 2020 09:13:31 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,410,1574150400"; d="scan'208";a="379126898" Received: from ramaling-i9x.iind.intel.com (HELO intel.com) ([10.99.66.154]) by orsmga004.jf.intel.com with ESMTP; 06 Feb 2020 09:13:30 -0800 Date: Thu, 6 Feb 2020 22:43:40 +0530 From: Ramalingam C To: Anshuman Gupta Message-ID: <20200206171340.GB26821@intel.com> References: <20200206150442.32353-1-anshuman.gupta@intel.com> <20200206150442.32353-3-anshuman.gupta@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200206150442.32353-3-anshuman.gupta@intel.com> User-Agent: Mutt/1.10.1 (2018-07-13) Subject: Re: [Intel-gfx] [PATCH 2/2] drm/i915/hdcp: Fix 1B-10 HDCP 2.2 Comp test 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@lists.freedesktop.org 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-06 at 20:34:42 +0530, Anshuman Gupta wrote: > 1B-10 HDCP Comp test verifies that source DUT reattempts > Content Stream Management following a failure of Content > Stream Management, 1B-10 test fail if source DUT tries > reauthentication following a Content Stream Management > failure. > Fixing this broken test. We could explain what we do in brief? > > Cc: Ramalingam C > Signed-off-by: Anshuman Gupta > --- > .../drm/i915/display/intel_display_types.h | 3 ++ > drivers/gpu/drm/i915/display/intel_hdcp.c | 32 ++++++++++++++++--- > 2 files changed, 31 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h > index 2ae540e986ba..9232c4e0e42e 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_types.h > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h > @@ -363,6 +363,9 @@ struct intel_hdcp { > /* Flag indicate if it is a first ReceiverID_List msg after AKE_Init */ > bool first_recvid_msg; > > + /* Flag indicate whether reauth retries req */ > + bool reauth_req; Personally I would try to avoid extra flags here. See if you could. > + > /* > * Content Stream Type defined by content owner. TYPE0(0x0) content can > * flow in the link protected by HDCP2.2 or HDCP1.4, where as TYPE1(0x1) > diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c > index 3e24a6df503a..ed523de20eac 100644 > --- a/drivers/gpu/drm/i915/display/intel_hdcp.c > +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c > @@ -1507,13 +1507,35 @@ int hdcp2_authenticate_repeater_topology(struct intel_connector *connector) > > static int hdcp2_authenticate_repeater(struct intel_connector *connector) > { > - int ret; > + int ret, i, tries = 3; > + struct intel_hdcp *hdcp = &connector->hdcp; > + struct drm_i915_private *dev_priv = to_i915(connector->base.dev); Preferred to sort the lengthiest line first. > > ret = hdcp2_authenticate_repeater_topology(connector); > if (ret < 0) > return ret; > > - return hdcp2_propagate_stream_management_info(connector); > + /* > + * HDCP 2.2 HDCP Spec Stream Managemnt pass/fail transition > + * to HDCP authticate state i.e. A9->A5. > + * if it fails, retry for stream managemnt again and skip the reauth. > + */ > + for (i = 0; i < tries; i++) { > + ret = hdcp2_propagate_stream_management_info(connector); > + if (!ret) { > + hdcp->reauth_req = true; this is not required. hence {}. > + break; > + } > + > + hdcp->seq_num_m++; > + drm_dbg_kms(&dev_priv->drm, "HDCP2.2 stream management %d of %d Failed.(%d)\n", This can be wrapped to 80char without any loss of readability. -Ram > + i + 1, tries, ret); > + } > + > + if (ret) > + hdcp->reauth_req = false; > + > + return ret; > } > > static int hdcp2_authenticate_sink(struct intel_connector *connector) > @@ -1642,10 +1664,11 @@ static int hdcp2_disable_encryption(struct intel_connector *connector) > static int hdcp2_authenticate_and_encrypt(struct intel_connector *connector) > { > int ret, i, tries = 3; > + struct intel_hdcp *hdcp = &connector->hdcp; > > for (i = 0; i < tries; i++) { > ret = hdcp2_authenticate_sink(connector); > - if (!ret) > + if (!ret || !hdcp->reauth_req) > break; > > /* Clearing the mei hdcp session */ > @@ -1655,7 +1678,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. > @@ -1681,6 +1704,7 @@ static int _intel_hdcp2_enable(struct intel_connector *connector) > connector->base.name, connector->base.base.id, > hdcp->content_type); > > + hdcp->reauth_req = true; > ret = hdcp2_authenticate_and_encrypt(connector); > if (ret) { > DRM_DEBUG_KMS("HDCP2 Type%d Enabling Failed. (%d)\n", > -- > 2.24.0 > _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx