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=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 5FDF2C433E1 for ; Thu, 20 Aug 2020 09:52:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2E3AF20885 for ; Thu, 20 Aug 2020 09:52:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597917146; bh=jHopqwvpfTLIe/E0Lw1lj/3ANsQyejgd1n9hrdtErjE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ADEZbEjZHG/wsUiAnprEIop99rMHLtfjMSbVjTlYVcXijrp7if9dg7S1US6LIxJxR vrcADPyOteQopVC1ViEHkBHA3yzoO+AxA9olZ8MvsSUC30fjJlQgc3tXYCncdxj37c RY7nh0dqGyCMo5Z31m+eAIlBd8IkHnF5C6bGm1f4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729908AbgHTJwY (ORCPT ); Thu, 20 Aug 2020 05:52:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:33302 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729321AbgHTJwI (ORCPT ); Thu, 20 Aug 2020 05:52:08 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 4B01B207FB; Thu, 20 Aug 2020 09:52:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597917127; bh=jHopqwvpfTLIe/E0Lw1lj/3ANsQyejgd1n9hrdtErjE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YD51dkEKWdk5ejlb0Y8kQBpl+n6O0oWhXReGzijmbBbvC8ml4gOPJuGtjEW9W4lqR L4I/kgOEzA4GtRJNRnM958G85bRkQ+IuhsCj6JQQ+tnWUcu/+0UCY3aj7P7GguiaTt g7MX7Ni3K5H9A8rFPfmJLsOSsRSFroASEB8Ty5tY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Rajat Jain , Bjorn Helgaas Subject: [PATCH 4.19 05/92] PCI: Add device even if driver attach failed Date: Thu, 20 Aug 2020 11:20:50 +0200 Message-Id: <20200820091537.769509157@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200820091537.490965042@linuxfoundation.org> References: <20200820091537.490965042@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rajat Jain commit 2194bc7c39610be7cabe7456c5f63a570604f015 upstream. 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. When device_attach() fails, merely warn about it and keep the PCI device in the system. This partially reverts ab1a187bba5c ("PCI: Check device_attach() return value always"). Link: https://lore.kernel.org/r/20200706233240.3245512-1-rajatja@google.com Signed-off-by: Rajat Jain Signed-off-by: Bjorn Helgaas Reviewed-by: Greg Kroah-Hartman Cc: stable@vger.kernel.org # v4.6+ Signed-off-by: Greg Kroah-Hartman --- drivers/pci/bus.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) --- a/drivers/pci/bus.c +++ b/drivers/pci/bus.c @@ -323,12 +323,8 @@ void pci_bus_add_device(struct pci_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); }