From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753235AbdKIQN7 (ORCPT ); Thu, 9 Nov 2017 11:13:59 -0500 Received: from esa5.dell-outbound.iphmx.com ([68.232.153.95]:53029 "EHLO esa5.dell-outbound.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752529AbdKIQN5 (ORCPT ); Thu, 9 Nov 2017 11:13:57 -0500 IronPort-PHdr: =?us-ascii?q?9a23=3A2z/MNh3oa21gL6cksmDT+DRfVm0co7zxezQtwd8Z?= =?us-ascii?q?seIfK/ad9pjvdHbS+e9qxAeQG96Ku7Qc06L/iOPJYSQ4+5GPsXQPItRndiQuro?= =?us-ascii?q?EopTEmG9OPEkbhLfTnPGQQFcVGU0J5rTngaRAGUMnxaEfPrXKs8DUcBgvwNRZv?= =?us-ascii?q?JuTyB4Xek9m72/q89pDXYAhEniaxba9vJxiqsAvdsdUbj5F/Iagr0BvJpXVIe+?= =?us-ascii?q?VSxWx2IF+Yggjx6MSt8pN96ipco/0u+dJOXqX8ZKQ4UKdXDC86PGAv5c3krgfM?= =?us-ascii?q?QA2S7XYBSGoWkx5IAw/Y7BHmW5r6ryX3uvZh1CScIMb7S60/Vza/4KdxUBLmiD?= =?us-ascii?q?kJOSMl8G/ZicJwgqBUoBO9qBJwzIHZe52VO+F8fq/BYd8WWWhMU8BMXCJBGIO8?= =?us-ascii?q?aI4PAvIGMOhftYb9vVoOrRykCQeqBePvzzhIhnnq0q07zeshFQXG3As7Et0Trn?= =?us-ascii?q?vUqNH1OL0OXuCyyanF1DPOZO5V1zfl8IXFcxMsreuSUb9+b8bd01QjGgPLg1mK?= =?us-ascii?q?t4DpIy6Z2vwQv2SH9eZsSO2ihmA9pw1soTWj3MQhh4jRio4IxV3J+z91zJs0KN?= =?us-ascii?q?C5UkJ3fNGpHZhKuy2EKod6X8UvSHxytikg0L0Jo5u7cTAPyJQg2hHQdeSKc5ON?= =?us-ascii?q?4hL/TOaRJip4hG59dLK/mRmy9U+gx/XiWcmvyllGszBJncTSuXAJ0xzf88+HSu?= =?us-ascii?q?Zh/ki63jaPygbT5fxaLUwulKrbM54hwrs/l5YJrUvDGSr2lF33jK+QaEok5vCl?= =?us-ascii?q?5uXkb7n8uJOROZF4hhvjPqkulMGzG/o0PhQTU2SD/OSzzrzj/Un3QLVQif02l7?= =?us-ascii?q?HUvpfAKsQBp665BBVZ3IAi6xa6CDem1sgXnXgZI1JBfBKHiJPkNEzQL/D8Cfez?= =?us-ascii?q?mUijkDBux/zeJL3uHo3NLmTfkLfmZbt9709cyAwuzdFQ/p5UCa8OIOj1WkDvsN?= =?us-ascii?q?zVFQE5MwOqzOb9Etl91Z0RWXiJAqCHNKPeq1iI5vggI+OUfo8apC79K+Q55/7p?= =?us-ascii?q?lXI5gVsdcrO13ZsZb3C4BPFmL1yEbnr2g9cBD3kFvhAnQO3li1CPUCVeZ2i9X6?= =?us-ascii?q?0i/DE3EoGmApnZRoCrnrOB2D23HppMZmBJWRiwFiK8b4yAWrEWbyKbOOdulzUF?= =?us-ascii?q?Uf6qTIp3hj+0swqvn59uNOvTvAkZsJXl39l44+nUvR0/8TgyBMOYhTLeB1pol3?= =?us-ascii?q?8FEmdllJt0plZwnw+O?= X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A2E0AQBJfgRah8mZ6ERcGQEBAQEBAQEBA?= =?us-ascii?q?QEBAQcBAQEBAYQIficHg3aZRoF8gX+GV414ghEKhTsCGoQdQRYBAQEBAQEBAQE?= =?us-ascii?q?BAhABAQEKCwkIKC+COCKCRAEBAQQjBA1FDAQCAQgRBAEBAQICIwMCAgIfJQEIC?= =?us-ascii?q?AIEDgUIE4lwAxWpSoFtOoc/DYNIAQEBAQEBAQECAQEBAQEBAQEBAQEdgQ+CIYI?= =?us-ascii?q?Hgz2DKoJrgjMQIQKCW4JjBYoiiS2ODz2QBYRwk0SNIokAgTkmBIIfeoNCglwQD?= =?us-ascii?q?BmBTneJSCyBBYERAQEB?= X-IPAS-Result: =?us-ascii?q?A2E0AQBJfgRah8mZ6ERcGQEBAQEBAQEBAQEBAQcBAQEBAYQ?= =?us-ascii?q?IficHg3aZRoF8gX+GV414ghEKhTsCGoQdQRYBAQEBAQEBAQEBAhABAQEKCwkIK?= =?us-ascii?q?C+COCKCRAEBAQQjBA1FDAQCAQgRBAEBAQICIwMCAgIfJQEICAIEDgUIE4lwAxW?= =?us-ascii?q?pSoFtOoc/DYNIAQEBAQEBAQECAQEBAQEBAQEBAQEdgQ+CIYIHgz2DKoJrgjMQI?= =?us-ascii?q?QKCW4JjBYoiiS2ODz2QBYRwk0SNIokAgTkmBIIfeoNCglwQDBmBTneJSCyBBYE?= =?us-ascii?q?RAQEB?= From: X-LoopCount0: from 10.166.132.169 X-IronPort-AV: E=Sophos;i="5.44,370,1505797200"; d="scan'208";a="85383755" X-DLP: DLP_GlobalPCIDSS To: CC: , , , Subject: RE: [PATCH 2/2] platform/x86: dell-*wmi*: Relay failed initial probe to dependent drivers Thread-Topic: [PATCH 2/2] platform/x86: dell-*wmi*: Relay failed initial probe to dependent drivers Thread-Index: AQHTWXRzZxN2cgUwok2mrgpP5WsL66MMN2gw Date: Thu, 9 Nov 2017 16:13:52 +0000 Message-ID: <8746e7178fb84a1b9309a6b228af604f@ausx13mpc120.AMER.DELL.COM> References: <6312b76d08d3b6b5562c773fce8e13d85036ddd5.1509725778.git.mario.limonciello@dell.com> <20171109160249.jjiros7c4z6f76wr@pali> In-Reply-To: <20171109160249.jjiros7c4z6f76wr@pali> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [10.143.18.86] Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by nfs id vA9GE3xh015816 > -----Original Message----- > From: Pali Rohár [mailto:pali.rohar@gmail.com] > Sent: Thursday, November 9, 2017 10:03 AM > To: Limonciello, Mario > Cc: dvhart@infradead.org; Andy Shevchenko ; > LKML ; platform-driver-x86@vger.kernel.org > Subject: Re: [PATCH 2/2] platform/x86: dell-*wmi*: Relay failed initial probe to > dependent drivers > > On Friday 03 November 2017 11:27:22 Mario Limonciello wrote: > > dell-wmi and dell-smbios-wmi are dependent upon dell-wmi-descriptor > > finishing probe successfully to probe themselves. > > > > Currently if dell-wmi-descriptor fails probing in a non-recoverable way > > (such as invalid header) dell-wmi and dell-smbios-wmi will continue to > > try to redo probing due to deferred probing. > > > > To solve this have the dependent drivers query the dell-wmi-descriptor > > driver whether the descriptor has been determined valid. The possible > > results are: > > -EPROBE_DEFER: Descriptor not yet probed, dependent driver should wait > > and use deferred probing > > < 0: Descriptor probed, invalid. Dependent driver should return an > > error. > > 0: Successful descriptor probe, dependent driver can continue > > > > Successful descriptor probe still doesn't mean that the descriptor driver > > is necessarily bound at the time of initialization of dependent driver. > > Userspace can unbind the driver, so all methods used from driver > > should still be verified to return success values otherwise deferred > > probing be used. > > Darren, Andy, any comments on this patch? > > I think now it should work also those corner, but legit cases. > > > Signed-off-by: Mario Limonciello > > --- > > drivers/platform/x86/dell-smbios-wmi.c | 4 ++++ > > drivers/platform/x86/dell-wmi-descriptor.c | 11 +++++++++++ > > drivers/platform/x86/dell-wmi-descriptor.h | 7 +++++++ > > drivers/platform/x86/dell-wmi.c | 5 +++++ > > 4 files changed, 27 insertions(+) > > > > diff --git a/drivers/platform/x86/dell-smbios-wmi.c b/drivers/platform/x86/dell- > smbios-wmi.c > > index 35c13815b24c..3fa53fa174b2 100644 > > --- a/drivers/platform/x86/dell-smbios-wmi.c > > +++ b/drivers/platform/x86/dell-smbios-wmi.c > > @@ -151,6 +151,10 @@ static int dell_smbios_wmi_probe(struct wmi_device > *wdev) > > if (!wmi_has_guid(DELL_WMI_DESCRIPTOR_GUID)) > > return -ENODEV; > > > > + ret = dell_wmi_get_descriptor_valid(); > > + if (ret) > > + return ret; > > + > > priv = devm_kzalloc(&wdev->dev, sizeof(struct wmi_smbios_priv), > > GFP_KERNEL); > > if (!priv) > > diff --git a/drivers/platform/x86/dell-wmi-descriptor.c > b/drivers/platform/x86/dell-wmi-descriptor.c > > index 28ef5f37cfbf..e7f4c3a7bfc4 100644 > > --- a/drivers/platform/x86/dell-wmi-descriptor.c > > +++ b/drivers/platform/x86/dell-wmi-descriptor.c > > @@ -26,9 +26,16 @@ struct descriptor_priv { > > u32 interface_version; > > u32 size; > > }; > > +static int descriptor_valid = -EPROBE_DEFER; > > static LIST_HEAD(wmi_list); > > static DEFINE_MUTEX(list_mutex); > > > > +int dell_wmi_get_descriptor_valid(void) > > +{ > > + return descriptor_valid; > > +} > > +EXPORT_SYMBOL_GPL(dell_wmi_get_descriptor_valid); > > + > > bool dell_wmi_get_interface_version(u32 *version) > > { > > struct descriptor_priv *priv; > > @@ -91,6 +98,7 @@ static int dell_wmi_descriptor_probe(struct wmi_device > *wdev) > > if (obj->type != ACPI_TYPE_BUFFER) { > > dev_err(&wdev->dev, "Dell descriptor has wrong type\n"); > > ret = -EINVAL; > > + descriptor_valid = ret; > > goto out; > > } > > > > @@ -102,6 +110,7 @@ static int dell_wmi_descriptor_probe(struct wmi_device > *wdev) > > "Dell descriptor buffer has unexpected length (%d)\n", > > obj->buffer.length); > > ret = -EINVAL; > > + descriptor_valid = ret; > > goto out; > > } > > > > @@ -111,8 +120,10 @@ static int dell_wmi_descriptor_probe(struct wmi_device > *wdev) > > dev_err(&wdev->dev, "Dell descriptor buffer has invalid signature > (%8ph)\n", > > buffer); > > ret = -EINVAL; > > + descriptor_valid = ret; > > goto out; > > } > > + descriptor_valid = 0; > > > > if (buffer[2] != 0 && buffer[2] != 1) > > dev_warn(&wdev->dev, "Dell descriptor buffer has unknown > version (%lu)\n", > > diff --git a/drivers/platform/x86/dell-wmi-descriptor.h > b/drivers/platform/x86/dell-wmi-descriptor.h > > index 5f7b69c2c83a..776cddd5e135 100644 > > --- a/drivers/platform/x86/dell-wmi-descriptor.h > > +++ b/drivers/platform/x86/dell-wmi-descriptor.h > > @@ -15,6 +15,13 @@ > > > > #define DELL_WMI_DESCRIPTOR_GUID "8D9DDCBC-A997-11DA-B012- > B622A1EF5492" > > > > +/* possible return values: > > + * -EPROBE_DEFER: probing for dell-wmi-descriptor not yet run > > + * 0: valid descriptor, successfully probed > > + * < 0: invalid descriptor, don't probe dependent devices > > + */ > > +int dell_wmi_get_descriptor_valid(void); > > + > > bool dell_wmi_get_interface_version(u32 *version); > > bool dell_wmi_get_size(u32 *size); > > > > diff --git a/drivers/platform/x86/dell-wmi.c b/drivers/platform/x86/dell-wmi.c > > index 54321080a30d..bb7c1e681792 100644 > > --- a/drivers/platform/x86/dell-wmi.c > > +++ b/drivers/platform/x86/dell-wmi.c > > @@ -655,10 +655,15 @@ static int dell_wmi_events_set_enabled(bool enable) > > static int dell_wmi_probe(struct wmi_device *wdev) > > { > > struct dell_wmi_priv *priv; > > + int ret; > > > > if (!wmi_has_guid(DELL_WMI_DESCRIPTOR_GUID)) > > return -ENODEV; > > Just one suggestion, is above check still needed in dell-wmi.c code? > I think that now it should be job of dell_wmi_get_descriptor_valid() > function to fully validate if dell wmi descriptor driver is able to > provide all needed information for dell-wmi driver. > Yes, I believe it's still needed because if the GUID isn't on the bus the probe routine for dell-wmi-descriptor won't run and dell_wmi_get_descriptor_valid() will continually return -EPROBE_DEFER. That's the exact problem this patch exists for (preventing infinite deferred probing). Perhaps a "cleaner" solution is to have the init routine of dell-wmi-descriptor do this wmi_has_guid check and set the descriptor_valid variable to -ENODEV so that "dependent" drivers don't need to. > > + ret = dell_wmi_get_descriptor_valid(); > > + if (ret) > > + return ret; > > + > > priv = devm_kzalloc( > > &wdev->dev, sizeof(struct dell_wmi_priv), GFP_KERNEL); > > if (!priv) > > -- > Pali Rohár > pali.rohar@gmail.com