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.3 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 06EFDC432C0 for ; Tue, 3 Dec 2019 17:23:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 892012073F for ; Tue, 3 Dec 2019 17:23:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=xs4all.nl header.i=@xs4all.nl header.b="Fmw7FlnM" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726822AbfLCRXY (ORCPT ); Tue, 3 Dec 2019 12:23:24 -0500 Received: from lb1-smtp-cloud7.xs4all.net ([194.109.24.24]:33985 "EHLO lb1-smtp-cloud7.xs4all.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726422AbfLCRXX (ORCPT ); Tue, 3 Dec 2019 12:23:23 -0500 Received: from [IPv6:2001:420:44c1:2577:39bf:ca7e:6fc8:fad2] ([IPv6:2001:420:44c1:2577:39bf:ca7e:6fc8:fad2]) by smtp-cloud7.xs4all.net with ESMTPA id cBtOi81fLjpCOcBtRiW1vC; Tue, 03 Dec 2019 18:23:22 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xs4all.nl; s=s1; t=1575393802; bh=nBhHNww5w3r6P7laB68iEm3ISZrEZ9SPBQdNQMVWadA=; h=To:From:Subject:Message-ID:Date:MIME-Version:Content-Type:From: Subject; b=Fmw7FlnMtgukHkOSIo3NrR7EFeu1lPLiG3MfEDltbSzm5bNI4ZrGnOWKVxsIiB+q8 xLAxXmIR2QcNTnUPBnnFhWM5eyst40EssF1NsNYlcZqem4QVtlobnQd10R6CA6avL1 hxkzeMJ5zKYvPS9mnWdWqMFflOjYASCwKEBhcAqC1Ger02m+wT8D3sBOldeiqps4EW Fv74o7hPUZpVBJIYmc4P9QW7QOsWhF0BZ0jgY83izD1Fwl6RXqnIpr1kJyCZ5SkM3C 06Xjeb7VnwtBWU/yVywxxIF+EkSlzE+VxQiUnOOWFCI5z69TBGYYP4aiqmsDXXf2qo EV2Sg0e8X4NTw== To: Linux Media Mailing List From: Hans Verkuil Subject: [PATCH for v5.5] cec: CEC 2.0-only bcast messages were ignored Message-ID: Date: Tue, 3 Dec 2019 18:23:18 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-CMAE-Envelope: MS4wfDcSzWsaNBJFMJ+3Bo4JdHbqzFO6Ti1XpiyRBTMd4HRMmc/iUXcdfS9R0p5aXy6j5nqIvglHxm4X1q+/qmB2lNDkW3V6+HX+e+YR6sjtDR1nWgS/mtfi 5pAwAmf3GYhASP5HiOCSIjE/T1WsPngFku06gKeqYbxRl5VjkDQk6NcDxMEp0bhPmE1+iju7I+uHYKB4aFjjXMFUImId8YRadgnBe/7CvItUkMXLMSve3sy2 zKzAil6nEqxXERVpmtatYd8NuGtbEbZ7VtVkQCd1QiWMauHSViVOQErc+fZRcpyV Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Some messages are allowed to be a broadcast message in CEC 2.0 only, and should be ignored by CEC 1.4 devices. Unfortunately, the check was wrong, causing such messages to be marked as invalid under CEC 2.0. Signed-off-by: Hans Verkuil Cc: # for v4.10 and up --- diff --git a/drivers/media/cec/cec-adap.c b/drivers/media/cec/cec-adap.c index 9340435a94a0..ce64d0bbcc00 100644 --- a/drivers/media/cec/cec-adap.c +++ b/drivers/media/cec/cec-adap.c @@ -1085,7 +1085,7 @@ void cec_received_msg_ts(struct cec_adapter *adap, valid_la = false; else if (!cec_msg_is_broadcast(msg) && !(dir_fl & DIRECTED)) valid_la = false; - else if (cec_msg_is_broadcast(msg) && !(dir_fl & BCAST1_4)) + else if (cec_msg_is_broadcast(msg) && !(dir_fl & BCAST)) valid_la = false; else if (cec_msg_is_broadcast(msg) && adap->log_addrs.cec_version >= CEC_OP_CEC_VERSION_2_0 &&