From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A2274C433DF for ; Tue, 30 Jun 2020 08:02:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 811662067D for ; Tue, 30 Jun 2020 08:02:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593504155; bh=l9em1xuyarZs6WU6lGVQVTbwQfuLz7IEaQ69vwvjbR0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=VaYUCQ/VkD2WJRArJvXD2Mo9Hc7VWyILyeJ0S/zs3nqGkKn5u+norEWzssEGQj4IJ gdc9dTKnGmMMRtKC1FUate4PrPyFKyHK8l5qRpXZyRG6C8Wf2/GFadKWx/9cHSUQL8 AwuPZdnJ/Kl0T13QGf/8gt92nmemyGRncCt858Gg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729193AbgF3IC2 (ORCPT ); Tue, 30 Jun 2020 04:02:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:42410 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726994AbgF3ICY (ORCPT ); Tue, 30 Jun 2020 04:02:24 -0400 Received: from localhost (unknown [84.241.197.94]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D604B2067D; Tue, 30 Jun 2020 08:02:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593504143; bh=l9em1xuyarZs6WU6lGVQVTbwQfuLz7IEaQ69vwvjbR0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=oKxVuVQjOlEV89XeGjZL+EsE+ssdpkUV5c1dxojW7lqFvXHdE3E11ratNJHAnBnMQ zeCuWnHl/2+If7Tp5g3qPlSHj8wOwKEjZeaSuNw82UTwMiTXYQ7SO8ce8ixj5l/2yI i/Qn7sOpT0LMWB/KPsX/pjQEeVZYwm82uqwScFWY= Date: Tue, 30 Jun 2020 10:02:20 +0200 From: Greg Kroah-Hartman To: Rajat Jain Cc: David Woodhouse , Lu Baolu , Joerg Roedel , Bjorn Helgaas , "Rafael J. Wysocki" , Len Brown , iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, linux-acpi@vger.kernel.org, Raj Ashok , lalithambika.krishnakumar@intel.com, Mika Westerberg , Jean-Philippe Brucker , Prashant Malani , Benson Leung , Todd Broch , Alex Levin , Mattias Nissler , Rajat Jain , Bernie Keany , Aaron Durbin , Diego Rivas , Duncan Laurie , Furquan Shaikh , Jesse Barnes , Christian Kellner , Alex Williamson , oohall@gmail.com, Saravana Kannan , Suzuki K Poulose , Arnd Bergmann , Heikki Krogerus Subject: Re: [PATCH v2 4/7] PCI: Add device even if driver attach failed Message-ID: <20200630080220.GC619174@kroah.com> References: <20200630044943.3425049-1-rajatja@google.com> <20200630044943.3425049-5-rajatja@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200630044943.3425049-5-rajatja@google.com> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org On Mon, Jun 29, 2020 at 09:49:40PM -0700, Rajat Jain wrote: > device_attach() returning failure indicates a driver error while trying to > probe the device. In such a scenario, the PCI device should still be added > in the system and be visible to the user. > > This patch partially reverts: > commit ab1a187bba5c ("PCI: Check device_attach() return value always") > > Signed-off-by: Rajat Jain > Reviewed-by: Greg Kroah-Hartman > --- > v2: Cosmetic change in commit log. > Add Greg's "reviewed-by" > > drivers/pci/bus.c | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c > index 8e40b3e6da77d..3cef835b375fd 100644 > --- a/drivers/pci/bus.c > +++ b/drivers/pci/bus.c > @@ -322,12 +322,8 @@ void pci_bus_add_device(struct pci_dev *dev) > > dev->match_driver = true; > retval = device_attach(&dev->dev); > - if (retval < 0 && retval != -EPROBE_DEFER) { > + if (retval < 0 && retval != -EPROBE_DEFER) > pci_warn(dev, "device attach failed (%d)\n", retval); > - pci_proc_detach_device(dev); > - pci_remove_sysfs_dev_files(dev); > - return; > - } > > pci_dev_assign_added(dev, true); > } This should go first in the series, and cc: stable and get merged now. No need to tie it to this series at all. Or just an independant patch, it doesn't have much to do with this series, it's a bugfix. thanks, greg k-h