Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759298AbbLCJfO (ORCPT ); Thu, 3 Dec 2015 04:35:14 -0500 Received: from mga03.intel.com ([134.134.136.65]:33405 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751225AbbLCJfK (ORCPT ); Thu, 3 Dec 2015 04:35:10 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,377,1444719600"; d="scan'208";a="699371840" Date: Thu, 3 Dec 2015 11:34:58 +0200 From: Jarkko Sakkinen To: martin.wilck@ts.fujitsu.com Cc: gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, u.kleine-koenig@pengutronix.de, tpmdd-devel@lists.sourceforge.net Subject: Re: [tpmdd-devel] [PATCH v3] base/platform: fix binding for drivers without probe callback Message-ID: <20151203093458.GA21051@intel.com> References: <20151202165338.GA18274@kroah.com> <1449132704-9952-1-git-send-email-martin.wilck@ts.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1449132704-9952-1-git-send-email-martin.wilck@ts.fujitsu.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2671 Lines: 67 On Thu, Dec 03, 2015 at 09:51:44AM +0100, martin.wilck@ts.fujitsu.com wrote: > From: Martin Wilck > > Since b8b2c7d845d5, platform_drv_probe() is called for all platform > devices. If drv->probe is NULL, and dev_pm_domain_attach() fails, > platform_drv_probe() will return the error code from dev_pm_domain_attach(). > > This causes real_probe() to enter the "probe_failed" path and set > dev->driver to NULL. Before b8b2c7d845d5, real_probe() would assume > success if both dev->bus->probe and drv->probe were missing. As a result, > a device and driver could be "bound" together just by matching their names; > this doesn't work any more after b8b2c7d845d5. > > This change broke the assumptions of certain drivers; for example, the TPM > code has long assumed that platform driver and device with matching name > could be bound in this way. That assumption may cause such drivers to > fail with Oops during initialization after applying this change. Failure > in suspend/resume tests under qemu has also been reported. > > This patch restores the previous (4.3.0 and earlier) behavior of > platform_drv_probe() in the case when the associated platform driver has > no "probe" function. > > Fixes: b8b2c7d845d5 ("base/platform: assert that dev_pm_domain callbacks are called unconditionally") > Signed-off-by: Martin Wilck > --- > v2: fixed style issues, rephrased commit message. > v3: rephrased commit message and subject again. > > drivers/base/platform.c | 13 +++++++++---- > 1 file changed, 9 insertions(+), 4 deletions(-) > > diff --git a/drivers/base/platform.c b/drivers/base/platform.c > index 1dd6d3b..176b59f 100644 > --- a/drivers/base/platform.c > +++ b/drivers/base/platform.c > @@ -513,10 +513,15 @@ static int platform_drv_probe(struct device *_dev) > return ret; > > ret = dev_pm_domain_attach(_dev, true); > - if (ret != -EPROBE_DEFER && drv->probe) { > - ret = drv->probe(dev); > - if (ret) > - dev_pm_domain_detach(_dev, true); > + if (ret != -EPROBE_DEFER) { > + if (drv->probe) { > + ret = drv->probe(dev); > + if (ret) > + dev_pm_domain_detach(_dev, true); > + } else { > + /* don't fail if just dev_pm_domain_attach failed */ > + ret = 0; > + } > } > > if (drv->prevent_deferred_probe && ret == -EPROBE_DEFER) { > -- > 1.8.3.1 Acked-by: Jarkko Sakkinen /Jarkko -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/