From patchwork Sat Oct 14 05:32:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Limonciello, Mario" X-Patchwork-Id: 10006259 X-Patchwork-Delegate: dvhart@infradead.org 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 D92AE6037E for ; Sat, 14 Oct 2017 05:36:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CF18129194 for ; Sat, 14 Oct 2017 05:36:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C3E7C291BE; Sat, 14 Oct 2017 05:36:19 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable 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 7CB9729194 for ; Sat, 14 Oct 2017 05:36:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753696AbdJNFfm (ORCPT ); Sat, 14 Oct 2017 01:35:42 -0400 Received: from esa4.dell-outbound.iphmx.com ([68.232.149.214]:4072 "EHLO esa4.dell-outbound.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753455AbdJNFdB (ORCPT ); Sat, 14 Oct 2017 01:33:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=dell.com; i=@dell.com; q=dns/txt; s=smtpout; t=1507959181; x=1539495181; h=from:to:cc:subject:date:message-id; bh=ZvWcB6Wc4OaW264XGSSQ4Vx3d5gS3tj03y1BK2rocrQ=; b=Ae7ltwWwIBWuCuGAtC46yYnzM/569AdjMPeKChjlAIPHmVQRRoGnfmGb q2u1wcsbg8OB6Opt2iWeGYR7fDMdTuluwO24JUPmTWxBqTmG+A+RiR9py cdPcvZo2dmbNGbS72bFL8E+bdtBFzAQV4SVEgPBOuQHlgNp46KAysiz2s g=; Received: from esa6.dell-outbound2.iphmx.com ([68.232.154.99]) by esa4.dell-outbound.iphmx.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Oct 2017 00:32:59 -0500 Received: from ausxippc110.us.dell.com ([143.166.85.200]) by esa6.dell-outbound2.iphmx.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Oct 2017 11:32:59 +0600 X-LoopCount0: from 10.208.86.39 X-IronPort-AV: E=Sophos;i="5.43,374,1503378000"; d="scan'208";a="562232184" X-DLP: DLP_GlobalPCIDSS From: Mario Limonciello To: dvhart@infradead.org, Andy Shevchenko Cc: LKML , platform-driver-x86@vger.kernel.org, Andy Lutomirski , quasisec@google.com, pali.rohar@gmail.com, rjw@rjwysocki.net, mjg59@google.com, hch@lst.de, Greg KH , Alan Cox , Mario Limonciello Subject: [PATCH v8 04/15] platform/x86: dell-wmi: allow 32k return size in the descriptor Date: Sat, 14 Oct 2017 00:32:42 -0500 Message-Id: <5064c5e052e624dba7ac50921d9fc7d767bb6cbe.1507958847.git.mario.limonciello@dell.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: In-Reply-To: References: Sender: platform-driver-x86-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Some platforms this year will be adopting 32k WMI buffer, so don't complain when encountering those. Signed-off-by: Mario Limonciello --- drivers/platform/x86/dell-wmi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/platform/x86/dell-wmi.c b/drivers/platform/x86/dell-wmi.c index ece2fe341f01..2578dff90a14 100644 --- a/drivers/platform/x86/dell-wmi.c +++ b/drivers/platform/x86/dell-wmi.c @@ -624,7 +624,7 @@ static void dell_wmi_input_destroy(struct wmi_device *wdev) * Vendor Signature 0 4 "DELL" * Object Signature 4 4 " WMI" * WMI Interface Version 8 4 - * WMI buffer length 12 4 4096 + * WMI buffer length 12 4 4096 or 32768 */ static int dell_wmi_check_descriptor_buffer(struct wmi_device *wdev) { @@ -674,7 +674,7 @@ static int dell_wmi_check_descriptor_buffer(struct wmi_device *wdev) dev_warn(&wdev->dev, "Dell descriptor buffer has unknown version (%u)\n", buffer[2]); - if (buffer[3] != 4096) + if (buffer[3] != 4096 && buffer[3] != 32768) dev_warn(&wdev->dev, "Dell descriptor buffer has invalid buffer length (%u)\n", buffer[3]);