Re: [PATCH] RFC: platform/x86: wmi: Fix check for method instance number

[Pali RohÃr]

On Wednesday 05 July 2017 22:24:20 Pali RohÃr wrote:
> On Wednesday 05 July 2017 21:30:35 David Airlie wrote:
> > ----- Original Message -----
> > 
> > > From: "Pali RohÃr" <pali.rohar@xxxxxxxxx>
> > > To: "Chun-Yi Lee" <jlee@xxxxxxxx>, "Corentin Chary"
> > > <corentin.chary@xxxxxxxxx>, acpi4asus-user@xxxxxxxxxxxxxxxxxxxxx,
> > > "Dave Airlie" <airlied@xxxxxxxxxx>, "Oleksij Rempel"
> > > <linux@xxxxxxxxxxxxxxxx>, "JoÃo Paulo Rechi Vita"
> > > <jprvita@xxxxxxxxx>
> > > Cc: "Darren Hart" <dvhart@xxxxxxxxxxxxx>, "Andy Shevchenko"
> > > <andy@xxxxxxxxxxxxx>, "Andy Lutomirski" <luto@xxxxxxxxxx>,
> > > platform-driver-x86@xxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx
> > > Sent: Wednesday, 5 July, 2017 7:51:13 PM
> > > Subject: Re: [PATCH] RFC: platform/x86: wmi: Fix check for method
> > > instance number
> > > 
> > > On Saturday 17 June 2017 18:47:54 Pali RohÃr wrote:
> > > > > So problematic drivers which use instance=1 without any
> > > > > comments
> > > > > 
> > > > > are:
> > > > >   acer-wmi
> > > > >   asus-wmi
> > > > >   mxm-wmi
> > > > 
> > > > Adding authors & maintainers of those drivers in loop.
> > > 
> > > Hi!
> > > 
> > > Dell drivers and acer-wmi are fixed now. So only asus-wmi and
> > > mxm-wmi needs to be investigated.
> > > 
> > > Adding more people who developed those drivers recently in loop.
> > > Can you check if instance number is used correctly or not?
> > 
> > I've no memory of why I picked 1 or 0, I probably cut-n-paste it
> > from somewhere else.
> > 
> > Dave.
> 
> And do you have at least ACPI DSDT dumps from that machine? Or are
> you able to find some?

Hi! For mxm-wmi I found this document:
https://lekensteyn.nl/files/docs/mxm-2.1-software-spec.pdf

On page numbered 26 (resp. in PDF page 31) is information about WMI
GUID {F6CB5C3C-9CAE-4EBD-B577-931EA32A2CC0} interface and there is
written that instance count = 1.

// Methods GUID {F6CB5C3C-9CAE-4ebd-B577-931EA32A2CC0}
0x3C, 0x5C, 0xCB, 0xF6, 0xAE, 0x9C, 0xbd, 0x4e, 0xB5, 0x77, 0x93,
0x1E, 0xA3, 0x2A, 0x2C, 0xC0,
0x4D, 0x58,    // Object ID âMXâ = method âWMMXâ
1,             // Instance Count
0x02,          // Flags (WMIACPI_REGFLAG_METHOD)

And ACPI method for handling this WMI call does not check Arg0 and Arg1
at all.

So... Andy, Darren, any objections for following patch which changes
instance number from one to zero?

diff --git a/drivers/platform/x86/mxm-wmi.c b/drivers/platform/x86/mxm-wmi.c
index f4bad83..35d8b9a 100644
--- a/drivers/platform/x86/mxm-wmi.c
+++ b/drivers/platform/x86/mxm-wmi.c
@@ -53,7 +53,7 @@ int mxm_wmi_call_mxds(int adapter)
 
 	printk("calling mux switch %d\n", adapter);
 
-	status = wmi_evaluate_method(MXM_WMMX_GUID, 0x1, adapter, &input,
+	status = wmi_evaluate_method(MXM_WMMX_GUID, 0x0, adapter, &input,
 				     &output);
 
 	if (ACPI_FAILURE(status))
@@ -78,7 +78,7 @@ int mxm_wmi_call_mxmx(int adapter)
 
 	printk("calling mux switch %d\n", adapter);
 
-	status = wmi_evaluate_method(MXM_WMMX_GUID, 0x1, adapter, &input,
+	status = wmi_evaluate_method(MXM_WMMX_GUID, 0x0, adapter, &input,
 				     &output);
 
 	if (ACPI_FAILURE(status))

-- 
Pali RohÃr
pali.rohar@xxxxxxxxx

Attachment: signature.asc
Description: This is a digitally signed message part.