From patchwork Thu Jan 18 21:00:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 125038 Delivered-To: patch@linaro.org Received: by 10.46.64.27 with SMTP id n27csp294757lja; Thu, 18 Jan 2018 13:01:26 -0800 (PST) X-Google-Smtp-Source: ACJfBovWH7v8b+mwMc3uEFo61O3qpHw+ZEzEUFv6VnOMclar2fyfRN9MAUtetRseRqCQmPaokZ6I X-Received: by 10.99.172.25 with SMTP id v25mr21225878pge.148.1516309285976; Thu, 18 Jan 2018 13:01:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516309285; cv=none; d=google.com; s=arc-20160816; b=EHCO+vQsympneoduNs4n/soXI3gm+BWTvyyeBcyPXXAjJ7einfW1bv+FXqLYX2XENI 81B9Udopjfjb/BVy7AcdNCZ3n71J9J2kK5So6QnUeqiAk1S5DJHypGx5MIABSo/Vypw+ gmsK9auwF5e3q1O0UoSKX91oOPTyJBQFy/pyMjYByJZaC2VDV43oGRzxPYoCeXBC361z u+/XMUEwEYS3z4vbTwE8c738c10y5YvQ6EMHuuuqwXsjmnpwWzJZzudfdUcF+CvR4dNL 0yAFhpk9xAhwRjB3baxpFsjjC9nO1RSkt7bjbXzZss7hDtum9TscUvwBwq4uSpsvR7+6 ay6A== 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=yQYlBq7QEKobADNwzfIw2iE34xlCuLI303ezzzoXLno=; b=jPeVkv1508ZNFBV+JmNQ3xd9d4NuQbsaiOjvRXBpzLxVAZ9b4BAgcUlUl7gPOReTnB PXVDG0bQZdOOfK4v8GY4RjEb1S/qoTQl/YGwf18r+8mLLbRKW5e+tKvq1zDoSV+9ME7E AuSlL6eX7jHXKK/3KBgFOKVFwSWEjXEzFKofFXyTOH9vpwvqEv/Q5nsuIdQsdLx8hZGz LXtSIFy3fyisQnkrvlvr8nV1hbjYRnqoLXHVzkf9m/ExwI9MwJOardnaLZU7zPbGHfXj GnmIxcohFPb8qZnilFt+M3/VFWPyTTojkf7+y+zCnDsGTdZ7/hZINAqodTo2Vhr+598k r+6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=NLXNYNQy; 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.25; Thu, 18 Jan 2018 13:01:25 -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=NLXNYNQy; 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 S1754848AbeARVBY (ORCPT + 10 others); Thu, 18 Jan 2018 16:01:24 -0500 Received: from mail-by2nam01on0104.outbound.protection.outlook.com ([104.47.34.104]:11884 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754843AbeARVBU (ORCPT ); Thu, 18 Jan 2018 16:01:20 -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=yQYlBq7QEKobADNwzfIw2iE34xlCuLI303ezzzoXLno=; b=NLXNYNQy3SzDqEvft0gz08I/iwHt0qYDwt78MybXQt6hwexceWG5Q5wsQ7/7UICIarMSTB6lWdwLw4Y2+KaqAc/BdmLBogTn+XATHIYL1+XMIDmCmu5izMiMx1bPS9Nm7/O1Bxxmjvxcg+o4abTsJ9y75+KtoxeoU8Jh+/zs0eg= 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:15 +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:15 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "stable-commits@vger.kernel.org" CC: Sumit Semwal , Gavin Shan , Bjorn Helgaas , Sasha Levin Subject: [added to the 4.1 stable tree] PCI: Do any VF BAR updates before enabling the BARs Thread-Topic: [added to the 4.1 stable tree] PCI: Do any VF BAR updates before enabling the BARs Thread-Index: AQHTkJ9QheSOL/NaP0m1ZA/3SkpofQ== Date: Thu, 18 Jan 2018 21:00:05 +0000 Message-ID: <20180118205908.3220-79-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:yTANIUbi8RsN2B05FFv3yR7EOa+BkXBycsP5gge1l3ZZlBEnUOGn5KhpK+mAhO3nW0AYsCaIKWNrlsWlsSsM9TtTpH4DjU1PlYr4C9PkB4AT0JqPzMevw7VdnPj5mGlntV6kqODAqewCdCXqp3bVe5UWs/kCwq499PVjTEG2k0kHHaRHbfYTrX5XqW3oh8vxYWVfHz0BiRoP77BC4WbhCMB+ieKsJ60DjU4CgFkea6BtYtVzp5Ka2W6GjhsbvvkG x-ms-office365-filtering-correlation-id: 609f3ad5-6ece-4c95-2c39-08d55eb69cc6 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)(274839183919467)(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)(54534003)(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)(15650500001)(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: 1NQDuUaBxyIQbQFei5709OZqq0viycZ8SCOYsIuIZCXyZ8HRzBaQz3uj6vECHthP8j5wZxDyYoyBAQFRQsslvg== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 609f3ad5-6ece-4c95-2c39-08d55eb69cc6 X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Jan 2018 21:00:05.0409 (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 f40ec3c748c6912f6266c56a7f7992de61b255ed ] Previously we enabled VFs and enable their memory space before calling pcibios_sriov_enable(). But pcibios_sriov_enable() may update the VF BARs: for example, on PPC PowerNV we may change them to manage the association of VFs to PEs. Because 64-bit BARs cannot be updated atomically, it's unsafe to update them while they're enabled. The half-updated state may conflict with other devices in the system. Call pcibios_sriov_enable() before enabling the VFs so any BAR updates happen while the VF BARs are disabled. [bhelgaas: changelog] Tested-by: Carol Soto Signed-off-by: Gavin Shan Signed-off-by: Bjorn Helgaas Signed-off-by: Sasha Levin --- drivers/pci/iov.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c index 846d4f604ebd..089a1f41e44e 100644 --- a/drivers/pci/iov.c +++ b/drivers/pci/iov.c @@ -302,13 +302,6 @@ static int sriov_enable(struct pci_dev *dev, int nr_virtfn) return rc; } - pci_iov_set_numvfs(dev, nr_virtfn); - iov->ctrl |= PCI_SRIOV_CTRL_VFE | PCI_SRIOV_CTRL_MSE; - pci_cfg_access_lock(dev); - pci_write_config_word(dev, iov->pos + PCI_SRIOV_CTRL, iov->ctrl); - msleep(100); - pci_cfg_access_unlock(dev); - iov->initial_VFs = initial; if (nr_virtfn < initial) initial = nr_virtfn; @@ -319,6 +312,13 @@ static int sriov_enable(struct pci_dev *dev, int nr_virtfn) return retval; } + pci_iov_set_numvfs(dev, nr_virtfn); + iov->ctrl |= PCI_SRIOV_CTRL_VFE | PCI_SRIOV_CTRL_MSE; + pci_cfg_access_lock(dev); + pci_write_config_word(dev, iov->pos + PCI_SRIOV_CTRL, iov->ctrl); + msleep(100); + pci_cfg_access_unlock(dev); + for (i = 0; i < initial; i++) { rc = virtfn_add(dev, i, 0); if (rc)