Received: by 10.192.165.148 with SMTP id m20csp56990imm; Thu, 19 Apr 2018 12:57:55 -0700 (PDT) X-Google-Smtp-Source: AIpwx49OCNRA9bTaWu9B24NnfERqWD5/eKalXyw/WkixHftOyGQk+NGs9Gip4+Y3QPhD4dVO2JXM X-Received: by 10.99.126.88 with SMTP id o24mr6352207pgn.325.1524167875756; Thu, 19 Apr 2018 12:57:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524167875; cv=none; d=google.com; s=arc-20160816; b=Sdmlu8n0jMRH/yLtDCloEY4iv+CL8xHt6+y8R18sBphjkcykmq0SPu2crfF6wth2Iv uUZkyd3pKMnEi3LTytJWRAmDLnDU/LnZu0cFFdh2AytJasA9RwK8XPSQoVIkSRMWEIFS NfQtJn7/G7HDD+i4B5DHkK0YEG3tcJID7Dbd8zwSegYZOsVcI6IxVuzqwKZubzhuZbAk xUQlpSuj2tu1l2FGd6csLCSyOgGUYu3aHUcEX2Y6UqYQlYOfyJvl0iEU/dUiMjMp5pZj OCpZVBm7BIL3k+dBQTTZeoCADRsPQuFWVF1L9POFoF9u4gM1LSDEiMKeqoiJln4As8dl Va9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dmarc-filter:dkim-signature :dkim-signature:arc-authentication-results; bh=BubtlPdk29SMtUxT4Nw6aOdw2KlxzNIlIDbku2mBGjg=; b=O6FJIMwTudljoz7QeQTPVyRm9UzSLxqGxG3CtaH79R57/AObmseTKKSU9L9Iru8crp GOg3qSfnsgiN0ZwzVi8V9NFdVAByJzExG2wngw8q8Dr2wOQhDfmwAtTTQtBjaiGETE1F as9rxp6FAjN1HD8SPL2iinRj1oiyr/pZjONF6J0bfS3ITNuRXwVDFvrpmZbLeuv1Q0Fw 6vbVKifbBEC6ub/BmwdWeigTXZW9smPfzR4pPqAqB+77TGeshkogOaApyuLgML1Gcg5M 72dVFT0Lhy2FsnujTE3XMkQdUbBoK41Q9WuU4NFUZ6Z+x/RZMV4L7ebn/NDjb3TdgcWF XA8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=ckfMkZnL; dkim=pass header.i=@codeaurora.org header.s=default header.b=W/gASxxp; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 9-v6si4051901plf.283.2018.04.19.12.57.41; Thu, 19 Apr 2018 12:57:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=ckfMkZnL; dkim=pass header.i=@codeaurora.org header.s=default header.b=W/gASxxp; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753503AbeDST4d (ORCPT + 99 others); Thu, 19 Apr 2018 15:56:33 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:40090 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751876AbeDST4b (ORCPT ); Thu, 19 Apr 2018 15:56:31 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 5B1946081C; Thu, 19 Apr 2018 19:56:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1524167790; bh=1P06fz6XDNPyH4G0A9VcIKYaUHPC5dyeN5/Et+6nQbs=; h=From:To:Cc:Subject:Date:From; b=ckfMkZnL/YT63yg199AHPp3Pg61kCcvpA5HXCIsdVb3FXU/amP3cDXYx0y8Z2HlGm DEYj7SJQdr3GwwI8ZMwnkp50yVaKp5hXNyPEo7MDVO0H29bvET/UXi7dPY4yZsLI22 E9u+4B+YaaqeVGS7/bdJDbn9N8pu3o/0QjB+GMVE= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 Received: from drakthul.qualcomm.com (global_nat1_iad_fw.qualcomm.com [129.46.232.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: okaya@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 69C186081C; Thu, 19 Apr 2018 19:56:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1524167789; bh=1P06fz6XDNPyH4G0A9VcIKYaUHPC5dyeN5/Et+6nQbs=; h=From:To:Cc:Subject:Date:From; b=W/gASxxpXxr3vkxr6OqORHzkzMELutDKHZ+cVPctx1FPpaJpCPiKUyhidnOMMEFYB 25SHOD5QzKdK0WjbZ+tsjhA6CpILsC4QLWtdiHNwqX5EksWG/0yR5j/VlYn0r05CzA CIgiItWzu0ThMWG+5FVxQduvQ1+z9duxECZ0Z7Bg= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 69C186081C Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=okaya@codeaurora.org From: Sinan Kaya To: linux-pci@vger.kernel.org, sulrich@codeaurora.org, timur@codeaurora.org Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sinan Kaya , Mike Marciniszyn , Dennis Dalessandro , Doug Ledford , Jason Gunthorpe , linux-rdma@vger.kernel.org (open list:HFI1 DRIVER), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 1/2] IB/hfi1: Try slot reset before secondary bus reset Date: Thu, 19 Apr 2018 15:56:23 -0400 Message-Id: <1524167784-5911-1-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The infiniband adapter might be connected to a PCI hotplug slot. Performing secondary bus reset on a hotplug slot causes PCI link up/down interrupts. Hotplug driver removes the device from system when a link down interrupt is observed and performs re-enumeration when link up interrupt is observed. This conflicts with what this code is trying to do. Try secondary bus reset only if pci_reset_slot() fails/unsupported. Signed-off-by: Sinan Kaya --- drivers/infiniband/hw/hfi1/pcie.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/infiniband/hw/hfi1/pcie.c b/drivers/infiniband/hw/hfi1/pcie.c index 83d66e8..75f49e3 100644 --- a/drivers/infiniband/hw/hfi1/pcie.c +++ b/drivers/infiniband/hw/hfi1/pcie.c @@ -908,7 +908,8 @@ static int trigger_sbr(struct hfi1_devdata *dd) * delay after a reset is required. Per spec requirements, * the link is either working or not after that point. */ - pci_reset_bridge_secondary_bus(dev->bus->self); + if (pci_reset_slot(dev->slot)) + pci_reset_bridge_secondary_bus(dev->bus->self); return 0; } -- 2.7.4