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=-15.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 63B8FC4338F for ; Wed, 11 Aug 2021 02:29:00 +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 24FA260ED8 for ; Wed, 11 Aug 2021 02:29:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 24FA260ED8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4C2AE6E095; Wed, 11 Aug 2021 02:28:53 +0000 (UTC) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id E2FB86E091; Wed, 11 Aug 2021 02:28:51 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10072"; a="194625931" X-IronPort-AV: E=Sophos;i="5.84,311,1620716400"; d="scan'208";a="194625931" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Aug 2021 19:28:50 -0700 X-IronPort-AV: E=Sophos;i="5.84,311,1620716400"; d="scan'208";a="484643927" Received: from ramaling-i9x.iind.intel.com (HELO intel.com) ([10.99.66.205]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Aug 2021 19:28:48 -0700 Date: Wed, 11 Aug 2021 08:00:49 +0530 From: Ramalingam C To: Juston Li Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, seanpaul@chromium.org, anshuman.gupta@intel.com, rodrigo.vivi@intel.com Message-ID: <20210811023047.GA16096@intel.com> References: <20210810235212.138721-1-juston.li@intel.com> <20210810235212.138721-2-juston.li@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20210810235212.138721-2-juston.li@intel.com> User-Agent: Mutt/1.10.1 (2018-07-13) Subject: Re: [Intel-gfx] [PATCH v3 1/3] drm/i915/hdcp: update cp_irq_count_cached in intel_dp_hdcp2_read_msg() 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On 2021-08-10 at 16:52:10 -0700, Juston Li wrote: > Update cp_irq_count_cached when reading messages rather than when > writing a message to make sure the value is up to date and not > stale from a previously handled CP_IRQ. > > AKE flow doesn't always respond to a read with a ACK write msg. > E.g. AKE_Send_Pairing_Info will "timeout" because we received > a CP_IRQ for reading AKE_Send_H_Prime but no write occurred between that > and reading AKE_Send_Pairing_Info so cp_irq_count_cached is stale > causing the wait to return right away rather than waiting for a new > CP_IRQ. LGTM. Reviewed-by: Ramalingam C > > Signed-off-by: Juston Li > Acked-by: Anshuman Gupta > --- > drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c > index d697d169e8c1..1d0096654776 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c > @@ -446,8 +446,6 @@ static > int intel_dp_hdcp2_write_msg(struct intel_digital_port *dig_port, > void *buf, size_t size) > { > - struct intel_dp *dp = &dig_port->dp; > - struct intel_hdcp *hdcp = &dp->attached_connector->hdcp; > unsigned int offset; > u8 *byte = buf; > ssize_t ret, bytes_to_write, len; > @@ -463,8 +461,6 @@ int intel_dp_hdcp2_write_msg(struct intel_digital_port *dig_port, > bytes_to_write = size - 1; > byte++; > > - hdcp->cp_irq_count_cached = atomic_read(&hdcp->cp_irq_count); > - > while (bytes_to_write) { > len = bytes_to_write > DP_AUX_MAX_PAYLOAD_BYTES ? > DP_AUX_MAX_PAYLOAD_BYTES : bytes_to_write; > @@ -530,6 +526,8 @@ int intel_dp_hdcp2_read_msg(struct intel_digital_port *dig_port, > u8 msg_id, void *buf, size_t size) > { > struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev); > + struct intel_dp *dp = &dig_port->dp; > + struct intel_hdcp *hdcp = &dp->attached_connector->hdcp; > unsigned int offset; > u8 *byte = buf; > ssize_t ret, bytes_to_recv, len; > @@ -546,6 +544,8 @@ int intel_dp_hdcp2_read_msg(struct intel_digital_port *dig_port, > if (ret < 0) > return ret; > > + hdcp->cp_irq_count_cached = atomic_read(&hdcp->cp_irq_count); > + > if (msg_id == HDCP_2_2_REP_SEND_RECVID_LIST) { > ret = get_receiver_id_list_size(dig_port); > if (ret < 0) > -- > 2.31.1 >