From patchwork Thu Jan 18 21:00:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 125034 Delivered-To: patch@linaro.org Received: by 10.46.64.27 with SMTP id n27csp294710lja; Thu, 18 Jan 2018 13:01:21 -0800 (PST) X-Google-Smtp-Source: ACJfBotsBF/FFLjgE862b35o7vFMs7Jui3RXWrHMOmmuY/v8QfHbSP/0E0ltU8+oK7n24rYKROUv X-Received: by 10.101.85.195 with SMTP id k3mr26520623pgs.191.1516309281264; Thu, 18 Jan 2018 13:01:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516309281; cv=none; d=google.com; s=arc-20160816; b=bq+I5TUT9VxMopVFRtPuZ5Zpqv7uASWokUSeZERbZHlsygt9TbXH8a8HMkpZHeCWpo Xl4+n9fja857hMr5/FXj4j/IhQj5MghFDdi6HoSH+S7zIqqXoAXB8vExTUJDyP60o8IB YqVal2P9pLyUQ9Cv3s0URXrROPt8GJcF+CxTlTYc+BZlCtKXqociWh1Vv6k16oofDZZa IhpQ/YDu6f1+I8yjCJ2RptW46Kk5sFjtM5tdUyoYf3WN424BT6dXofHdVcnxpsxUwayN 4crMlyUfOaJVjqjljuQNF6/LcfRU3xgXmfu9uze9UnZD1VP9bhPKP4Bhu+6gGS34N41R pzuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=5q6SIM/NHxjHlZ4+Tl1tLq8UICn/+cd2QqHlGAjM6FE=; b=MAHS9ukFlDzsqn85SOi8JDtKwDOTUJa4Q0REaE3OnAE/gqL2If9NLwd3isoxPi06tg LiQBtWMHY7ZcykjV0QYCJBqVCCeVyLY8YkL/Tn/gQ4xdlrvuZV7M8U7keSwNUP4krJkh GkOhNTuXbeJsqknedIygqmxLfV//hlydHRqoQE1wgKKKM4DF6ehSnlpKEWO8LpAknlvn Jxw81e6oKgAQor8eIxM0dq+hD/0TsXIbctIwpUKLt9U60NuIP+u9Bxg8aPKYFDgBmX3P usdzjsbAuQ1xv850nq/AVAjZklOi5hJn+tJSEQmxt95pRdIUOccl6BsLfVH+385xFb+i eDFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=eN/mTBzi; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c16si4933770pgu.706.2018.01.18.13.01.21; Thu, 18 Jan 2018 13:01:21 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-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=@microsoft.com header.s=selector1 header.b=eN/mTBzi; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754866AbeARVBU (ORCPT + 10 others); Thu, 18 Jan 2018 16:01:20 -0500 Received: from mail-by2nam01on0100.outbound.protection.outlook.com ([104.47.34.100]:31312 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754631AbeARVBQ (ORCPT ); Thu, 18 Jan 2018 16:01:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=5q6SIM/NHxjHlZ4+Tl1tLq8UICn/+cd2QqHlGAjM6FE=; b=eN/mTBziiZc+u/kesxyOyPtaOKrYlvYZot0Lq6jdy4O4cqjzRnHMXTWUA032fwZBZ4O5q/Ll2kG6PFKheHjBlAoA3L9s1Qx++Ka+Dl2qlcoDxEHBtR2XOaw5kjmQN2t58OKu8sSJDkP8GmTTMx0jnFNJv0NoSBBVaaAXd0ZSYF4= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0805.namprd21.prod.outlook.com (10.167.105.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.428.7; Thu, 18 Jan 2018 21:01:12 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::6485:b98:d15e:9da7]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::6485:b98:d15e:9da7%2]) with mapi id 15.20.0428.008; Thu, 18 Jan 2018 21:01:12 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "stable-commits@vger.kernel.org" CC: Sumit Semwal , Bjorn Helgaas , Sasha Levin Subject: [added to the 4.1 stable tree] PCI: Remove pci_resource_bar() and pci_iov_resource_bar() Thread-Topic: [added to the 4.1 stable tree] PCI: Remove pci_resource_bar() and pci_iov_resource_bar() Thread-Index: AQHTkJ9PHiPUcr6YJUWXCTldzhfR7g== Date: Thu, 18 Jan 2018 21:00:02 +0000 Message-ID: <20180118205908.3220-74-alexander.levin@microsoft.com> References: <20180118205908.3220-1-alexander.levin@microsoft.com> In-Reply-To: <20180118205908.3220-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [167.220.98.9] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB0805; 7:5oRPowWu+d3c2XUztvVYku7dLNzHPVZRj2p/YPG1SFcV3VkGvPvCcqMs5hAtqYOzRM0Yc7DJG4Ylwt9hhvwUi8tnnHfqW2wtMbF2r3KmZ7ZEdQMiPkcwbcFjibG2JW4UxON20epWam13+Lq4H32dtq92d+L7/iWQiUl9xyyBU+gVhAv/q5JAQOdWBq70CqTQDOyCTQNqk10Bty130rwLmu0Y/N9Y/60Y93QTfvhNUefbS3fxS9859jhwrNh+eAOA x-ms-office365-filtering-correlation-id: 007c545a-deb0-43da-4fb0-08d55eb69b84 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(3008032)(4534125)(4602075)(4627221)(201703031133081)(201702281549075)(48565401081)(2017052603307)(7193020); SRVR:DM5PR2101MB0805; x-ms-traffictypediagnostic: DM5PR2101MB0805: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(211936372134217)(153496737603132)(104084551191319); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(61425038)(6040495)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3231046)(2400067)(944501161)(3002001)(6055026)(61426038)(61427038)(6041282)(20161123560045)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011); SRVR:DM5PR2101MB0805; BCL:0; PCL:0; RULEID:(100000803126)(100110400120); SRVR:DM5PR2101MB0805; x-forefront-prvs: 05568D1FF7 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(39860400002)(39380400002)(366004)(376002)(346002)(396003)(189003)(199004)(2906002)(2900100001)(6512007)(86362001)(305945005)(97736004)(68736007)(10090500001)(2501003)(6666003)(7736002)(105586002)(5250100002)(2950100002)(5660300001)(6116002)(36756003)(6486002)(26005)(86612001)(54906003)(4326008)(3280700002)(3846002)(6346003)(6436002)(3660700001)(10290500003)(478600001)(107886003)(76176011)(66066001)(1076002)(81156014)(99286004)(81166006)(106356001)(53936002)(102836004)(22452003)(110136005)(59450400001)(14454004)(316002)(72206003)(25786009)(6506007)(8676002)(8936002)(22906009); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB0805; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: 4nf7hr0y5V8nYVgifWEFhAYBi87oVuf6otYTiFKlLhMLlcoSGzl8Z9Q9Arr3mcpDvBtu0cnmdhaeYjBEVOqY4g== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 007c545a-deb0-43da-4fb0-08d55eb69b84 X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Jan 2018 21:00:02.5878 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0805 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Sumit Semwal This patch has been added to the stable tree. If you have any objections, please let us know. -- 2.11.0 =============== [ Upstream commit 286c2378aaccc7343ebf17ec6cd86567659caf70 ] pci_std_update_resource() only deals with standard BARs, so we don't have to worry about the complications of VF BARs in an SR-IOV capability. Compute the BAR address inline and remove pci_resource_bar(). That makes pci_iov_resource_bar() unused, so remove that as well. Signed-off-by: Bjorn Helgaas Reviewed-by: Gavin Shan Signed-off-by: Sasha Levin --- drivers/pci/iov.c | 18 ------------------ drivers/pci/pci.c | 30 ------------------------------ drivers/pci/pci.h | 6 ------ drivers/pci/setup-res.c | 13 +++++++------ 4 files changed, 7 insertions(+), 60 deletions(-) diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c index 2a8f5e9af69c..06959425cdea 100644 --- a/drivers/pci/iov.c +++ b/drivers/pci/iov.c @@ -552,24 +552,6 @@ void pci_iov_release(struct pci_dev *dev) } /** - * pci_iov_resource_bar - get position of the SR-IOV BAR - * @dev: the PCI device - * @resno: the resource number - * - * Returns position of the BAR encapsulated in the SR-IOV capability. - */ -int pci_iov_resource_bar(struct pci_dev *dev, int resno) -{ - if (resno < PCI_IOV_RESOURCES || resno > PCI_IOV_RESOURCE_END) - return 0; - - BUG_ON(!dev->is_physfn); - - return dev->sriov->pos + PCI_SRIOV_BAR + - 4 * (resno - PCI_IOV_RESOURCES); -} - -/** * pci_iov_update_resource - update a VF BAR * @dev: the PCI device * @resno: the resource number diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index b5b80a5560ed..409f895b5a3d 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -4270,36 +4270,6 @@ int pci_select_bars(struct pci_dev *dev, unsigned long flags) } EXPORT_SYMBOL(pci_select_bars); -/** - * pci_resource_bar - get position of the BAR associated with a resource - * @dev: the PCI device - * @resno: the resource number - * @type: the BAR type to be filled in - * - * Returns BAR position in config space, or 0 if the BAR is invalid. - */ -int pci_resource_bar(struct pci_dev *dev, int resno, enum pci_bar_type *type) -{ - int reg; - - if (resno < PCI_ROM_RESOURCE) { - *type = pci_bar_unknown; - return PCI_BASE_ADDRESS_0 + 4 * resno; - } else if (resno == PCI_ROM_RESOURCE) { - *type = pci_bar_mem32; - return dev->rom_base_reg; - } else if (resno < PCI_BRIDGE_RESOURCES) { - /* device specific resource */ - *type = pci_bar_unknown; - reg = pci_iov_resource_bar(dev, resno); - if (reg) - return reg; - } - - dev_err(&dev->dev, "BAR %d: invalid resource\n", resno); - return 0; -} - /* Some architectures require additional programming to enable VGA */ static arch_set_vga_state_t arch_set_vga_state; diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 0f7972545091..9dac40998336 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -208,7 +208,6 @@ bool pci_bus_read_dev_vendor_id(struct pci_bus *bus, int devfn, u32 *pl, int pci_setup_device(struct pci_dev *dev); int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, struct resource *res, unsigned int reg); -int pci_resource_bar(struct pci_dev *dev, int resno, enum pci_bar_type *type); void pci_configure_ari(struct pci_dev *dev); void __pci_bus_size_bridges(struct pci_bus *bus, struct list_head *realloc_head); @@ -263,7 +262,6 @@ static inline void pci_restore_ats_state(struct pci_dev *dev) #ifdef CONFIG_PCI_IOV int pci_iov_init(struct pci_dev *dev); void pci_iov_release(struct pci_dev *dev); -int pci_iov_resource_bar(struct pci_dev *dev, int resno); void pci_iov_update_resource(struct pci_dev *dev, int resno); resource_size_t pci_sriov_resource_alignment(struct pci_dev *dev, int resno); void pci_restore_iov_state(struct pci_dev *dev); @@ -278,10 +276,6 @@ static inline void pci_iov_release(struct pci_dev *dev) { } -static inline int pci_iov_resource_bar(struct pci_dev *dev, int resno) -{ - return 0; -} static inline void pci_restore_iov_state(struct pci_dev *dev) { } diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c index 6bdd4957d3ef..3ec798ead2c9 100644 --- a/drivers/pci/setup-res.c +++ b/drivers/pci/setup-res.c @@ -32,7 +32,6 @@ static void pci_std_update_resource(struct pci_dev *dev, int resno) u16 cmd; u32 new, check, mask; int reg; - enum pci_bar_type type; struct resource *res = dev->resource + resno; /* @@ -61,14 +60,16 @@ static void pci_std_update_resource(struct pci_dev *dev, int resno) else mask = (u32)PCI_BASE_ADDRESS_MEM_MASK; - reg = pci_resource_bar(dev, resno, &type); - if (!reg) - return; - if (type != pci_bar_unknown) { + if (resno < PCI_ROM_RESOURCE) { + reg = PCI_BASE_ADDRESS_0 + 4 * resno; + } else if (resno == PCI_ROM_RESOURCE) { if (!(res->flags & IORESOURCE_ROM_ENABLE)) return; + + reg = dev->rom_base_reg; new |= PCI_ROM_ADDRESS_ENABLE; - } + } else + return; /* * We can't update a 64-bit BAR atomically, so when possible,