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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17B93EB64DD for ; Thu, 15 Jun 2023 11:43:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344475AbjFOLne (ORCPT ); Thu, 15 Jun 2023 07:43:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53508 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344251AbjFOLmm (ORCPT ); Thu, 15 Jun 2023 07:42:42 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 319D72D6B; Thu, 15 Jun 2023 04:39:52 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 134C56390B; Thu, 15 Jun 2023 11:39:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DCD77C433C0; Thu, 15 Jun 2023 11:39:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1686829191; bh=XwERnW4Pnic3eOpM/mKDTGDmoa4xHYVBZQbDvRPgLAs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QtpeeIvqYzXpYwNRvI0puSJeu9GhhRmfDkhp+JphWa0ejZ42BvqDwDMN6Le+VIJ/7 ifucBL3QYxnszX/w+5zESzHo/ntgvXnW6TJKSmd6ROCiVayxXDb3SZ8mQHalJ++kIY Knf4voP1BfcydZswRj42XYaBULj8CqXHMN6XOiolsoTvT7P5RHtVSfYABWLdA5Vx1b 4/iR4OEyZI6SWohXP+v/VPoPYTtA8+uDDn8MMU61b7oB4LRsCd2BmOUylDi/hCwbbs 2l7IlmltQGQ3fTlrj4zHL484GQF/Mf7AeRZvkj+4OC7DbJK2xIHwnwonJJVrPu47A6 bEMDEYdrCPWrg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin , linux-media@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 6/8] media: cec: core: don't set last_initiator if tx in progress Date: Thu, 15 Jun 2023 07:39:36 -0400 Message-Id: <20230615113938.649627-6-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230615113938.649627-1-sashal@kernel.org> References: <20230615113938.649627-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.4.247 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hans Verkuil [ Upstream commit 73af6c7511038249cad3d5f3b44bf8d78ac0f499 ] When a message was received the last_initiator is set to 0xff. This will force the signal free time for the next transmit to that for a new initiator. However, if a new transmit is already in progress, then don't set last_initiator, since that's the initiator of the current transmit. Overwriting this would cause the signal free time of a following transmit to be that of the new initiator instead of a next transmit. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/cec/cec-adap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/media/cec/cec-adap.c b/drivers/media/cec/cec-adap.c index c665f7d20c448..4c1770b8128cb 100644 --- a/drivers/media/cec/cec-adap.c +++ b/drivers/media/cec/cec-adap.c @@ -1077,7 +1077,8 @@ void cec_received_msg_ts(struct cec_adapter *adap, mutex_lock(&adap->lock); dprintk(2, "%s: %*ph\n", __func__, msg->len, msg->msg); - adap->last_initiator = 0xff; + if (!adap->transmit_in_progress) + adap->last_initiator = 0xff; /* Check if this message was for us (directed or broadcast). */ if (!cec_msg_is_broadcast(msg)) -- 2.39.2