From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753620AbdHQVN3 (ORCPT ); Thu, 17 Aug 2017 17:13:29 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:33631 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752609AbdHQVN2 (ORCPT ); Thu, 17 Aug 2017 17:13:28 -0400 Date: Thu, 17 Aug 2017 23:13:19 +0200 From: Pali =?utf-8?B?Um9ow6Fy?= To: Darren Hart Cc: Corentin Chary , Andy Shevchenko , acpi4asus-user@lists.sourceforge.net, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 4/4] platform/x86: wmi: Fix check for method instance number Message-ID: <20170817211319.GA20526@pali> References: <1502523858-25716-1-git-send-email-pali.rohar@gmail.com> <1502523858-25716-5-git-send-email-pali.rohar@gmail.com> <20170817152431.GA19276@fury> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20170817152431.GA19276@fury> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thursday 17 August 2017 08:24:31 Darren Hart wrote: > On Sat, Aug 12, 2017 at 09:44:18AM +0200, Pali Rohár wrote: > > instance_count defines number of instances of data block and instance > > itself is indexed from zero, which means first instance has number 0. > > Therefore check for invalid instance should be non-strict inequality. > > > > Signed-off-by: Pali Rohár > > This is correct per the WMI specification. Pali, now that Andy has > applied 1-3 of this series, is that all the required driver updates? Hmmm... I have not understood your question. I checked that all drivers which uses instance id 1 have comment explaining why is id 1 used. Problematic drivers without comment have either patch to use instance id 0 in this series or somebody else already supplied patch which is part of linus tree. > Reviewed-by: Darren Hart (VMware) > > > > --- > > drivers/platform/x86/wmi.c | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c > > index e32ba57..0765b17 100644 > > --- a/drivers/platform/x86/wmi.c > > +++ b/drivers/platform/x86/wmi.c > > @@ -218,7 +218,7 @@ acpi_status wmi_evaluate_method(const char *guid_string, u8 instance, > > if (!(block->flags & ACPI_WMI_METHOD)) > > return AE_BAD_DATA; > > > > - if (block->instance_count < instance) > > + if (block->instance_count <= instance) > > return AE_BAD_PARAMETER; > > > > input.count = 2; > > @@ -265,7 +265,7 @@ static acpi_status __query_block(struct wmi_block *wblock, u8 instance, > > block = &wblock->gblock; > > handle = wblock->acpi_device->handle; > > > > - if (block->instance_count < instance) > > + if (block->instance_count <= instance) > > return AE_BAD_PARAMETER; > > > > /* Check GUID is a data block */ > > @@ -392,7 +392,7 @@ acpi_status wmi_set_block(const char *guid_string, u8 instance, > > block = &wblock->gblock; > > handle = wblock->acpi_device->handle; > > > > - if (block->instance_count < instance) > > + if (block->instance_count <= instance) > > return AE_BAD_PARAMETER; > > > > /* Check GUID is a data block */ > > -- > > 1.7.9.5 > > > > > -- Pali Rohár pali.rohar@gmail.com