From patchwork Tue Jan 2 17:00:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 854647 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=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=codeaurora.org header.i=@codeaurora.org header.b="Z14T2xBi"; dkim=pass (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="PwZKe0pf"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zB0hy5jQcz9t3M for ; Wed, 3 Jan 2018 04:01:54 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751241AbeABRBn (ORCPT ); Tue, 2 Jan 2018 12:01:43 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:52730 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751169AbeABRAh (ORCPT ); Tue, 2 Jan 2018 12:00:37 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 0E5B16024C; Tue, 2 Jan 2018 17:00:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1514912437; bh=PhK5rJYAeXtirJ/ksfjXWigBydVFxbPAsktLTxwlQuw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Z14T2xBi7uPAlo2o/7c2efk7ozmRoBMYWbW3cEoJ62/wOJmgWb2ayRqtnIVrsyb3L TCBlcmlueXSXUKFLJtErPSQuEzOXUNqAPMTPnUUuH9nX1y0NC2JKnNl0CbpOTViamv b6h17UtLOt8ywZrnssOF9O1z7Ogh6FIH3irUdB7M= 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 B0C186024C; Tue, 2 Jan 2018 17:00:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1514912436; bh=PhK5rJYAeXtirJ/ksfjXWigBydVFxbPAsktLTxwlQuw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PwZKe0pfmR2zeK4uv8NiLGo3Jvdx3Iq6BbXgB4WIQ49J6DRL+pmQcshYTiqNdi17f Ry3ww/BLWRMBhk+F2WltlX/BkbGPso4XOx2j6DUxOXGF7IJE23O9h49coK9Iwn70Mb Qk08tl1wjUzx6Vk26kiKH+qzTyWlX/P60TQnEEKY= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org B0C186024C 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, timur@codeaurora.org Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sinan Kaya , Bjorn Helgaas , linux-kernel@vger.kernel.org (open list) Subject: [PATCH V3 5/6] PCI: Add a return type for pci_reset_bridge_secondary_bus() Date: Tue, 2 Jan 2018 12:00:22 -0500 Message-Id: <1514912423-13341-6-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1514912423-13341-1-git-send-email-okaya@codeaurora.org> References: <1514912423-13341-1-git-send-email-okaya@codeaurora.org> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Getting ready to return an error from pci_reset_bridge_secondary_bus() when device is unreachable. Signed-off-by: Sinan Kaya Reviewed-by: Christoph Hellwig --- drivers/pci/pci.c | 4 +++- include/linux/pci.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 09eae93..eae04aa 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -4157,9 +4157,11 @@ void __weak pcibios_reset_secondary_bus(struct pci_dev *dev) * Use the bridge control register to assert reset on the secondary bus. * Devices on the secondary bus are left in power-on state. */ -void pci_reset_bridge_secondary_bus(struct pci_dev *dev) +int pci_reset_bridge_secondary_bus(struct pci_dev *dev) { pcibios_reset_secondary_bus(dev); + + return 0; } EXPORT_SYMBOL_GPL(pci_reset_bridge_secondary_bus); diff --git a/include/linux/pci.h b/include/linux/pci.h index 0c1335a..dbd2ad2 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1094,7 +1094,7 @@ int pcie_get_minimum_link(struct pci_dev *dev, enum pci_bus_speed *speed, int pci_try_reset_bus(struct pci_bus *bus); void pci_reset_secondary_bus(struct pci_dev *dev); void pcibios_reset_secondary_bus(struct pci_dev *dev); -void pci_reset_bridge_secondary_bus(struct pci_dev *dev); +int pci_reset_bridge_secondary_bus(struct pci_dev *dev); void pci_update_resource(struct pci_dev *dev, int resno); int __must_check pci_assign_resource(struct pci_dev *dev, int i); int __must_check pci_reassign_resource(struct pci_dev *dev, int i, resource_size_t add_size, resource_size_t align);