Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932406AbdIHILI (ORCPT ); Fri, 8 Sep 2017 04:11:08 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:37475 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754751AbdIHIK4 (ORCPT ); Fri, 8 Sep 2017 04:10:56 -0400 X-Google-Smtp-Source: ADKCNb4fibfE2e+smADfbTGmDs5flxwuLfrydbez7375NSOgW+Svw5N/aEd9NLMdk9aVS/tIbtAELw== From: Jan Glauber To: Bjorn Helgaas Cc: linux-pci@vger.kernel.org, Alex Williamson , linux-kernel@vger.kernel.org, david.daney@cavium.com, Jon Masters , Robert Richter , linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org, Jan Glauber Subject: [PATCH v4 3/3] PCI: Avoid slot reset if bus reset is not possible Date: Fri, 8 Sep 2017 10:10:33 +0200 Message-Id: <20170908081033.3025-4-jglauber@cavium.com> X-Mailer: git-send-email 2.9.0.rc0.21.g7777322 In-Reply-To: <20170908081033.3025-1-jglauber@cavium.com> References: <20170908081033.3025-1-jglauber@cavium.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 999 Lines: 32 When checking to see if a PCI slot can safely be reset, we check to see if any of the children have their PCI_DEV_FLAGS_NO_BUS_RESET flag set. Some PCIe root port bridges do not behave well after a slot reset, and may cause the device in the slot to become unusable. Add a check for the PCI_DEV_FLAGS_NO_BUS_RESET flag being set in the bridge device to prevent the slot from being reset. Signed-off-by: Jan Glauber --- drivers/pci/pci.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index b2a46ca7f133..45a086fc3592 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -4393,6 +4393,10 @@ static bool pci_slot_resetable(struct pci_slot *slot) { struct pci_dev *dev; + if (slot->bus->self && + (slot->bus->self->dev_flags & PCI_DEV_FLAGS_NO_BUS_RESET)) + return false; + list_for_each_entry(dev, &slot->bus->devices, bus_list) { if (!dev->slot || dev->slot != slot) continue; -- 2.9.0.rc0.21.g7777322