From patchwork Tue Apr 18 20:31:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?RGF2aWQgSMODwqRyZGVtYW4=?= X-Patchwork-Id: 9686281 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 26D7C602C2 for ; Tue, 18 Apr 2017 20:31:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1601E283A6 for ; Tue, 18 Apr 2017 20:31:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 08156283F1; Tue, 18 Apr 2017 20:31:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 59763283A6 for ; Tue, 18 Apr 2017 20:31:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754108AbdDRUbH (ORCPT ); Tue, 18 Apr 2017 16:31:07 -0400 Received: from vader.hardeman.nu ([95.142.160.32]:53608 "EHLO hardeman.nu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753811AbdDRUbG (ORCPT ); Tue, 18 Apr 2017 16:31:06 -0400 Received: from hardeman.nu (81-230-232-203-no270.tbcn.telia.com [81.230.232.203]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by vader.hardeman.nu (Postfix) with ESMTPSA id DE5A032DE; Tue, 18 Apr 2017 22:31:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=hardeman.nu; s=hardeman-201703; t=1492547465; bh=7dc3arGlHLAKnBNHtMheXjFvuG61vIAO1OzYh+AXzu0=; h=Subject:From:To:Cc:Date:From; b=h74K0ARmcJql0YQjPao3qryZxB16b+r+ymBbePiAcGxmKC8lX0gMO9UqkjrSOmywB nhBjMrpwED+I4TsBN+Wu+KADfawYqp/WZ1KCw3etA2yliFrsgqcimpeYMOUxPNYDIy KYofOBTDN+lFvzp4LQ7PTwtORjMX+QJXyAjAguZ54cVtWkpQrEpYTnxwKdb0cAzGZ7 rnW+FosVgOAUMJn050N5DjIJI7L/OyEreOZAq8v0Ic9w4ZbKHKfnIZ2f0iMS/DK+nZ pvW7UMAR/L6Znrq1ZR52qg69YL9QNxClDUO3V1sLi47dYwi0VyiBLT4H90xmUMSZX4 8iAdxrg7XP5Fg== Received: (nullmailer pid 9618 invoked by uid 1000); Tue, 18 Apr 2017 20:31:04 -0000 Subject: [PATCH] rc-core: use the full 32 bits for NEC scancodes in wakefilters From: David =?utf-8?b?SMOkcmRlbWFu?= To: linux-media@vger.kernel.org Cc: mchehab@s-opensource.com, sean@mess.org Date: Tue, 18 Apr 2017 22:31:04 +0200 Message-ID: <149254746451.9595.15629164506779251309.stgit@zeus.hardeman.nu> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The new sysfs wakefilter API will expose the difference between the NEC protocols to userspace for no good reason and once exposed, it will be much more difficult to change the logic. By only allowing full NEC32 scancodes to be set, any heuristics in the kernel can be avoided. This is the minimalistic version of the full NEC32 patch posted here: http://www.spinics.net/lists/linux-media/msg114603.html Signed-off-by: David Härdeman --- drivers/media/rc/rc-main.c | 17 ++++------------- drivers/media/rc/winbond-cir.c | 32 ++------------------------------ 2 files changed, 6 insertions(+), 43 deletions(-) diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c index 6ec73357fa47..8a2a2973e718 100644 --- a/drivers/media/rc/rc-main.c +++ b/drivers/media/rc/rc-main.c @@ -742,8 +742,6 @@ static int rc_validate_filter(struct rc_dev *dev, [RC_TYPE_SONY15] = 0xff007f, [RC_TYPE_SONY20] = 0x1fff7f, [RC_TYPE_JVC] = 0xffff, - [RC_TYPE_NEC] = 0xffff, - [RC_TYPE_NECX] = 0xffffff, [RC_TYPE_NEC32] = 0xffffffff, [RC_TYPE_SANYO] = 0x1fffff, [RC_TYPE_MCIR2_KBD] = 0xffff, @@ -759,14 +757,9 @@ static int rc_validate_filter(struct rc_dev *dev, enum rc_type protocol = dev->wakeup_protocol; switch (protocol) { + case RC_TYPE_NEC: case RC_TYPE_NECX: - if ((((s >> 16) ^ ~(s >> 8)) & 0xff) == 0) - return -EINVAL; - break; - case RC_TYPE_NEC32: - if ((((s >> 24) ^ ~(s >> 16)) & 0xff) == 0) - return -EINVAL; - break; + return -EINVAL; case RC_TYPE_RC6_MCE: if ((s & 0xffff0000) != 0x800f0000) return -EINVAL; @@ -1330,7 +1323,7 @@ static ssize_t store_filter(struct device *device, /* * This is the list of all variants of all protocols, which is used by * the wakeup_protocols sysfs entry. In the protocols sysfs entry some - * some protocols are grouped together (e.g. nec = nec + necx + nec32). + * some protocols are grouped together. * * For wakeup we need to know the exact protocol variant so the hardware * can be programmed exactly what to expect. @@ -1345,9 +1338,7 @@ static const char * const proto_variant_names[] = { [RC_TYPE_SONY12] = "sony-12", [RC_TYPE_SONY15] = "sony-15", [RC_TYPE_SONY20] = "sony-20", - [RC_TYPE_NEC] = "nec", - [RC_TYPE_NECX] = "nec-x", - [RC_TYPE_NEC32] = "nec-32", + [RC_TYPE_NEC32] = "nec", [RC_TYPE_SANYO] = "sanyo", [RC_TYPE_MCIR2_KBD] = "mcir2-kbd", [RC_TYPE_MCIR2_MSE] = "mcir2-mse", diff --git a/drivers/media/rc/winbond-cir.c b/drivers/media/rc/winbond-cir.c index 5a4d4a611197..6ef0e7232356 100644 --- a/drivers/media/rc/winbond-cir.c +++ b/drivers/media/rc/winbond-cir.c @@ -714,34 +714,6 @@ wbcir_shutdown(struct pnp_dev *device) proto = IR_PROTOCOL_RC5; break; - case RC_TYPE_NEC: - mask[1] = bitrev8(mask_sc); - mask[0] = mask[1]; - mask[3] = bitrev8(mask_sc >> 8); - mask[2] = mask[3]; - - match[1] = bitrev8(wake_sc); - match[0] = ~match[1]; - match[3] = bitrev8(wake_sc >> 8); - match[2] = ~match[3]; - - proto = IR_PROTOCOL_NEC; - break; - - case RC_TYPE_NECX: - mask[1] = bitrev8(mask_sc); - mask[0] = mask[1]; - mask[2] = bitrev8(mask_sc >> 8); - mask[3] = bitrev8(mask_sc >> 16); - - match[1] = bitrev8(wake_sc); - match[0] = ~match[1]; - match[2] = bitrev8(wake_sc >> 8); - match[3] = bitrev8(wake_sc >> 16); - - proto = IR_PROTOCOL_NEC; - break; - case RC_TYPE_NEC32: mask[0] = bitrev8(mask_sc); mask[1] = bitrev8(mask_sc >> 8); @@ -1087,8 +1059,8 @@ wbcir_probe(struct pnp_dev *device, const struct pnp_device_id *dev_id) data->dev->max_timeout = 10 * IR_DEFAULT_TIMEOUT; data->dev->rx_resolution = US_TO_NS(2); data->dev->allowed_protocols = RC_BIT_ALL_IR_DECODER; - data->dev->allowed_wakeup_protocols = RC_BIT_NEC | RC_BIT_NECX | - RC_BIT_NEC32 | RC_BIT_RC5 | RC_BIT_RC6_0 | + data->dev->allowed_wakeup_protocols = + RC_BIT_NEC | RC_BIT_RC5 | RC_BIT_RC6_0 | RC_BIT_RC6_6A_20 | RC_BIT_RC6_6A_24 | RC_BIT_RC6_6A_32 | RC_BIT_RC6_MCE; data->dev->wakeup_protocol = RC_TYPE_RC6_MCE;