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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS 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 62718C433E0 for ; Tue, 7 Jul 2020 22:36:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 40D8F20675 for ; Tue, 7 Jul 2020 22:36:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594161402; bh=XNyL4Knjloue7Zmtlah/X6qQu06hR830oaTwsSUXTHg=; h=Date:From:To:Cc:Subject:In-Reply-To:List-ID:From; b=k//qTzBnQHbDiBZVJ1ed/yZ9Yqn5kX9W3+8poCG7NwtfBkgNqywIhh66Nf3oM4ykW R7y9G6SUuk2MY/sGFTenKAY+oP3joNWFQSv0rIBYq0hmDT8zBAEiXsSrbGaYE6zrKm VjXRnD5Z3rpqCb91bJmpVG1WprdUJuLzUtdjYEO0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728612AbgGGWgi (ORCPT ); Tue, 7 Jul 2020 18:36:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:54210 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728299AbgGGWgi (ORCPT ); Tue, 7 Jul 2020 18:36:38 -0400 Received: from localhost (mobile-166-175-191-139.mycingular.net [166.175.191.139]) (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 D3EB320675; Tue, 7 Jul 2020 22:36:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594161397; bh=XNyL4Knjloue7Zmtlah/X6qQu06hR830oaTwsSUXTHg=; h=Date:From:To:Cc:Subject:In-Reply-To:From; b=xetdEKJ5aWdBTllQu7iCldcr2gL0pHQD1391STAhb/ZytwPjQ3LkU7pnMm4aRcFwP E8Ui4PxHIhfM839vwO2yKQkjGPz5EfvczV0Vo07a1qGBZlagfuWVisiGO8Fna15qob nc7qm4xvca7SwrnNClgxex/yUGc1KWYI8CZyXaJc= Date: Tue, 7 Jul 2020 17:36:34 -0500 From: Bjorn Helgaas 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 , Greg Kroah-Hartman , oohall@gmail.com, Saravana Kannan , Suzuki K Poulose , Arnd Bergmann , Heikki Krogerus , stable@vger.kernel.org Subject: Re: [PATCH RESEND v2] PCI: Add device even if driver attach failed Message-ID: <20200707223634.GA392692@bjorn-Precision-5520> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200706233240.3245512-1-rajatja@google.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org On Mon, Jul 06, 2020 at 04:32: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 > --- > Resending to stable, independent from other patches per Greg's suggestion > v2: Add Greg's reviewed by, fix commit log Applied to pci/enumeration for v5.8 with stable tag, thanks! > 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); > } > -- > 2.27.0.212.ge8ba1cc988-goog >