From patchwork Thu Jan 18 21:00:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 125032 Delivered-To: patch@linaro.org Received: by 10.46.64.27 with SMTP id n27csp294687lja; Thu, 18 Jan 2018 13:01:19 -0800 (PST) X-Google-Smtp-Source: ACJfBos7UKC8vga0SaXtjdW6WLfsS30vyZ+9VoHYJEM4Q4ICu2OPITsPWVPzuSFjdjPpIJD9wJpA X-Received: by 10.101.80.202 with SMTP id s10mr22826387pgp.226.1516309279340; Thu, 18 Jan 2018 13:01:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516309279; cv=none; d=google.com; s=arc-20160816; b=tJaLIV5G7hGaElTO0ibArJdUH/vZxUEOUifk2nWm4kgdIfSfNmZkF4Pc/0pG9IS5OQ 68EjkzfF9TMfrQT2LChBV5/6IwUlabaX9UyAa+T9mmsWBHmv9oMolVQh0Zmv+MYWkdo8 Rk9SR5jqMYyIOpQtLoiy+wOf5qMiLlZteNqieujJJGzpb6SjSZhK81J53aHqLaxUul9q gLVLHC0h7kHvMj7ffsuW/XV1SEVmpvWpsAFbU7JwJzh3dUlmpsD55P3DtoKnRm8d0Gup FpPTCs/dgV6zHEVR95CSy4Kg1dt5wpgExyKObjesPT9piI9+O267IrTLSh1XguJwQpW6 zEUQ== 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=QGYbF+STVIibfEqvWs7+C7v8rq+nqHs0d/eKeRhmJDQ=; b=fNDFRYudXZX3SmD5T78cpcilVQrWVSn2lJAL4k6cvJ5c8p6tCJSjrWoL9X5YJdl7PI tRJXoETDfVkEgM3e+bOgazDroO2YplWghMkkvVShjCl2je55IxMKB9GXDMJ5j93w7GFb KHhebQMkndR9bxLJwklmew2NYqCmMzcDEPQIi6JVjCUiFxUyCM1Fe71YD2OnL9qcK07/ dL2ZA/gDRh1MrhNDTMk4X1UBOskI35xzQ9U8ym5gxLcuuJW+bCKh/0P0HDHEqL0yKeI8 MS8BO9XB9NUb32c3x+N8t+AUAfUqu5YgM2YXSDkYA/+EuC4/WLD1Ti5ZJAJR6UYjbayZ Strg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=oR3MAxsP; 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.19; Thu, 18 Jan 2018 13:01:19 -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=oR3MAxsP; 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 S1754854AbeARVBR (ORCPT + 10 others); Thu, 18 Jan 2018 16:01:17 -0500 Received: from mail-dm3nam03on0105.outbound.protection.outlook.com ([104.47.41.105]:26547 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753890AbeARVBP (ORCPT ); Thu, 18 Jan 2018 16:01:15 -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=QGYbF+STVIibfEqvWs7+C7v8rq+nqHs0d/eKeRhmJDQ=; b=oR3MAxsPziHycca3eatCkt1ac2Z5nHKRV+6pOrER1ZjObI0rf1U9MTl9gXzuI1YQJBhP2UNeefJA3Br+LDErVIE9ZLioY44qxAJnLpE4GupYOBwm3+a8O7lpN+Q1yNoiAMqJPTSzGAfYQLrXrmuBn4ryF+GDME3vt2PPYBvAriw= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0917.namprd21.prod.outlook.com (52.132.132.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.444.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: Separate VF BAR updates from standard BAR updates Thread-Topic: [added to the 4.1 stable tree] PCI: Separate VF BAR updates from standard BAR updates Thread-Index: AQHTkJ9Oep9wor44Z0GoEUpqiOGv9Q== Date: Thu, 18 Jan 2018 21:00:01 +0000 Message-ID: <20180118205908.3220-73-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; DM5PR2101MB0917; 7:K2kNAiLK3kmj7LtFcMLvkEfu105m47nZPCUyaLngdC0IEky5jwBGYQI/RJSmfvMKKq5vfwcu41uW+2d0foWuiRs/+P3PSRzlYyHPWWES7YT1EvemF+kftapWhqH/Tv9TAwaceR3DCd0nn6A2rfIvLfIOJGtmmkL59K1ZrpzLQe9jz9rDTsQbnGHmuwdHUQbexEoO2SHFqdRk10Chimf5+IyBCiDjLwjSjEnUbVUot9yJ7J4njHavMH1dWTmwaiIN x-ms-office365-filtering-correlation-id: be6dc456-4222-466c-6702-08d55eb69b3a 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:DM5PR2101MB0917; x-ms-traffictypediagnostic: DM5PR2101MB0917: 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)(3002001)(3231046)(2400067)(944501161)(10201501046)(6055026)(61426038)(61427038)(6041282)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:DM5PR2101MB0917; BCL:0; PCL:0; RULEID:(100000803126)(100110400120); SRVR:DM5PR2101MB0917; x-forefront-prvs: 05568D1FF7 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(979002)(366004)(346002)(39860400002)(396003)(376002)(39380400002)(199004)(189003)(15650500001)(59450400001)(53936002)(6512007)(5250100002)(102836004)(107886003)(72206003)(6506007)(5660300001)(2900100001)(6486002)(478600001)(6666003)(14454004)(86612001)(26005)(10290500003)(6346003)(2950100002)(4326008)(2501003)(6436002)(25786009)(97736004)(76176011)(22452003)(8936002)(106356001)(6116002)(3846002)(66066001)(1076002)(36756003)(99286004)(316002)(2906002)(110136005)(54906003)(86362001)(575784001)(68736007)(305945005)(7736002)(105586002)(3660700001)(3280700002)(81156014)(8676002)(81166006)(10090500001)(22906009)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB0917; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX: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: 8O4tKsgguzGcmWRRXdLuyaxFQlqR1qhFFuM1YQsZu0YJFyAozIhi030tptYHt2xynWKr0XnKqfqzPjs1ikeHpA== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: be6dc456-4222-466c-6702-08d55eb69b3a X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Jan 2018 21:00:01.9941 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0917 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 6ffa2489c51da77564a0881a73765ea2169f955d ] Previously pci_update_resource() used the same code path for updating standard BARs and VF BARs in SR-IOV capabilities. Split the VF BAR update into a new pci_iov_update_resource() internal interface, which makes it simpler to compute the BAR address (we can get rid of pci_resource_bar() and pci_iov_resource_bar()). This patch: - Renames pci_update_resource() to pci_std_update_resource(), - Adds pci_iov_update_resource(), - Makes pci_update_resource() a wrapper that calls the appropriate one, No functional change intended. Signed-off-by: Bjorn Helgaas Reviewed-by: Gavin Shan Signed-off-by: Sasha Levin --- drivers/pci/iov.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++ drivers/pci/pci.h | 1 + drivers/pci/setup-res.c | 13 +++++++++++-- 3 files changed, 62 insertions(+), 2 deletions(-) diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c index ee0ebff103a4..2a8f5e9af69c 100644 --- a/drivers/pci/iov.c +++ b/drivers/pci/iov.c @@ -569,6 +569,56 @@ int pci_iov_resource_bar(struct pci_dev *dev, int resno) 4 * (resno - PCI_IOV_RESOURCES); } +/** + * pci_iov_update_resource - update a VF BAR + * @dev: the PCI device + * @resno: the resource number + * + * Update a VF BAR in the SR-IOV capability of a PF. + */ +void pci_iov_update_resource(struct pci_dev *dev, int resno) +{ + struct pci_sriov *iov = dev->is_physfn ? dev->sriov : NULL; + struct resource *res = dev->resource + resno; + int vf_bar = resno - PCI_IOV_RESOURCES; + struct pci_bus_region region; + u32 new; + int reg; + + /* + * The generic pci_restore_bars() path calls this for all devices, + * including VFs and non-SR-IOV devices. If this is not a PF, we + * have nothing to do. + */ + if (!iov) + return; + + /* + * Ignore unimplemented BARs, unused resource slots for 64-bit + * BARs, and non-movable resources, e.g., those described via + * Enhanced Allocation. + */ + if (!res->flags) + return; + + if (res->flags & IORESOURCE_UNSET) + return; + + if (res->flags & IORESOURCE_PCI_FIXED) + return; + + pcibios_resource_to_bus(dev->bus, ®ion, res); + new = region.start; + new |= res->flags & ~PCI_BASE_ADDRESS_MEM_MASK; + + reg = iov->pos + PCI_SRIOV_BAR + 4 * vf_bar; + pci_write_config_dword(dev, reg, new); + if (res->flags & IORESOURCE_MEM_64) { + new = region.start >> 16 >> 16; + pci_write_config_dword(dev, reg + 4, new); + } +} + resource_size_t __weak pcibios_iov_resource_alignment(struct pci_dev *dev, int resno) { diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 0c039200ed79..0f7972545091 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -264,6 +264,7 @@ static inline void pci_restore_ats_state(struct pci_dev *dev) 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); int pci_iov_bus_range(struct pci_bus *bus); diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c index 232f9254c11a..6bdd4957d3ef 100644 --- a/drivers/pci/setup-res.c +++ b/drivers/pci/setup-res.c @@ -25,8 +25,7 @@ #include #include "pci.h" - -void pci_update_resource(struct pci_dev *dev, int resno) +static void pci_std_update_resource(struct pci_dev *dev, int resno) { struct pci_bus_region region; bool disable; @@ -105,6 +104,16 @@ void pci_update_resource(struct pci_dev *dev, int resno) pci_write_config_word(dev, PCI_COMMAND, cmd); } +void pci_update_resource(struct pci_dev *dev, int resno) +{ + if (resno <= PCI_ROM_RESOURCE) + pci_std_update_resource(dev, resno); +#ifdef CONFIG_PCI_IOV + else if (resno >= PCI_IOV_RESOURCES && resno <= PCI_IOV_RESOURCE_END) + pci_iov_update_resource(dev, resno); +#endif +} + int pci_claim_resource(struct pci_dev *dev, int resource) { struct resource *res = &dev->resource[resource];