From patchwork Fri Sep 8 08:10:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Glauber X-Patchwork-Id: 811376 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xpVQf2813z9s7p for ; Fri, 8 Sep 2017 18:11:38 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755545AbdIHILG (ORCPT ); Fri, 8 Sep 2017 04:11:06 -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 Received: by mail-wr0-f195.google.com with SMTP id u48so882619wrf.4; Fri, 08 Sep 2017 01:10:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=5OTDzmflPp/CT2VkRWR63Gn1g2nSBvk6jKRetKEFMEk=; b=sCJuiP6MpS/NbdGJ/bbfEaPc7dtWKMSWC45lbdLo2tNin/6ZFCHXRKLGa/xytSnlrE AZ+DzJkBDh54IAsdZ7YzVI1t/PdwvsKGgE85ABeRqqWmxeeS8f1Pz4wmSIGEqlsDZDCt P6WlTHTrwZV+3gSLbkUXdRiRsT0ZxIgJrK3IoFfaOu5BanoXprsx3Xt/SyC5x8a3dy8F QyIenrL+cTK0Ap4PY+BNW+A+xrT5Eg0vUEmr8LIMBEWBrMZ/7aoD31YovTl3K16d3t/s 7vjx82lSw/QdqjpMnoy9C2qUlGeVO482zGPuz4m83WQTxj5q1YQGcGG+3ZtWarYY6xe5 VVVw== X-Gm-Message-State: AHPjjUi1xPqYeYZ1AwbABeYsbF8ATVfXk8KlPy4oYHAOnjsPyQPXu98g JLyGJLIcB1ePig== X-Google-Smtp-Source: ADKCNb4fibfE2e+smADfbTGmDs5flxwuLfrydbez7375NSOgW+Svw5N/aEd9NLMdk9aVS/tIbtAELw== X-Received: by 10.223.164.13 with SMTP id d13mr1361346wra.48.1504858255146; Fri, 08 Sep 2017 01:10:55 -0700 (PDT) Received: from hc.fritz.box (HSI-KBW-46-223-156-13.hsi.kabel-badenwuerttemberg.de. [46.223.156.13]) by smtp.gmail.com with ESMTPSA id r14sm1600805wra.97.2017.09.08.01.10.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 08 Sep 2017 01:10:54 -0700 (PDT) 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-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org 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;