From patchwork Tue Oct 20 23:04:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Daney X-Patchwork-Id: 7453641 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4CF45BEEA4 for ; Tue, 20 Oct 2015 23:06:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6662C20869 for ; Tue, 20 Oct 2015 23:06:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 81DEB208B9 for ; Tue, 20 Oct 2015 23:06:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753502AbbJTXFG (ORCPT ); Tue, 20 Oct 2015 19:05:06 -0400 Received: from mail-ig0-f176.google.com ([209.85.213.176]:38649 "EHLO mail-ig0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753204AbbJTXEz (ORCPT ); Tue, 20 Oct 2015 19:04:55 -0400 Received: by igbdj2 with SMTP id dj2so25863296igb.1; Tue, 20 Oct 2015 16:04:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/fYSalTRHc5sI98/vKpcVUQcKsNnSx6IC93/gFnxIKo=; b=YpKbs7hILCM8Fo77MoybdgOvdE2r10kyUQrKta3Z9b9Xp1f10OEjL60BwLx1ZLzghT RSQ2Zp+g9tGlblEdxbvnx5bKDS6ULIEff+oBb88WveWt5XvZXgxBGmg71gmrpGlYi/J2 KwZfaUElHLpeCW/K87hPcIxH06Ir5Qr8Ju9qVYqk76xrerikMuruj9auhdeDP/jhObp4 /7x1CaeJiT7sD0tTsmuYRluwMqPWMdOMratwbyY+2pL9JmS1z09AP/FUYrzmumEwgm7E 0gzReL63/rcLw8KADfGU51LQnig8MQn6PJEgU3j0bESHLGTA/V7yMQyZJ/tJJT6hohpv zIBg== X-Received: by 10.50.79.166 with SMTP id k6mr27616491igx.24.1445382295162; Tue, 20 Oct 2015 16:04:55 -0700 (PDT) Received: from dl.caveonetworks.com (64.2.3.194.ptr.us.xo.net. [64.2.3.194]) by smtp.gmail.com with ESMTPSA id ij6sm12495651igb.1.2015.10.20.16.04.48 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 20 Oct 2015 16:04:48 -0700 (PDT) Received: from dl.caveonetworks.com (localhost.localdomain [127.0.0.1]) by dl.caveonetworks.com (8.14.5/8.14.5) with ESMTP id t9KN4lgM002455; Tue, 20 Oct 2015 16:04:47 -0700 Received: (from ddaney@localhost) by dl.caveonetworks.com (8.14.5/8.14.5/Submit) id t9KN4kJb002454; Tue, 20 Oct 2015 16:04:46 -0700 From: David Daney To: linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, Bjorn Helgaas , "Michael S. Tsirkin" , =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= , linux-api@vger.kernel.org, "Sean O. Stalley" , yinghai@kernel.org, rajatxjain@gmail.com, gong.chen@linux.intel.com Cc: David Daney Subject: [PATCH v6 5/5] PCI: Handle Enhanced Allocation (EA) capability for SRIOV devices. Date: Tue, 20 Oct 2015 16:04:42 -0700 Message-Id: <1445382282-2396-6-git-send-email-ddaney.cavm@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1445382282-2396-1-git-send-email-ddaney.cavm@gmail.com> References: <1445382282-2396-1-git-send-email-ddaney.cavm@gmail.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: David Daney SRIOV BARs can be specified via EA entries. Extend the EA parser to extract the SRIOV BAR resources, and modify sriov_init() to use resources previously obtained via EA. Acked-by: Sean O. Stalley Signed-off-by: David Daney --- drivers/pci/iov.c | 11 +++++++++-- drivers/pci/pci.c | 6 ++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c index ee0ebff..c789e68 100644 --- a/drivers/pci/iov.c +++ b/drivers/pci/iov.c @@ -436,8 +436,15 @@ found: nres = 0; for (i = 0; i < PCI_SRIOV_NUM_BARS; i++) { res = &dev->resource[i + PCI_IOV_RESOURCES]; - bar64 = __pci_read_base(dev, pci_bar_unknown, res, - pos + PCI_SRIOV_BAR + i * 4); + /* + * If it is already FIXED, don't change it, something + * (perhaps EA or header fixups) wants it this way. + */ + if (res->flags & IORESOURCE_PCI_FIXED) + bar64 = (res->flags & IORESOURCE_MEM_64) ? 1 : 0; + else + bar64 = __pci_read_base(dev, pci_bar_unknown, res, + pos + PCI_SRIOV_BAR + i * 4); if (!res->flags) continue; if (resource_size(res) & (PAGE_SIZE - 1)) { diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index f1f6308..c048d69 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -2176,6 +2176,12 @@ static struct resource *pci_ea_get_resource(struct pci_dev *dev, u8 bei, { if (bei <= PCI_EA_BEI_BAR5 && prop <= PCI_EA_P_IO) return &dev->resource[bei]; +#ifdef CONFIG_PCI_IOV + else if (bei >= PCI_EA_BEI_VF_BAR0 && bei <= PCI_EA_BEI_VF_BAR5 && + (prop == PCI_EA_P_VF_MEM || prop == PCI_EA_P_VF_MEM_PREFETCH)) + return &dev->resource[PCI_IOV_RESOURCES + + bei - PCI_EA_BEI_VF_BAR0]; +#endif else if (bei == PCI_EA_BEI_ROM) return &dev->resource[PCI_ROM_RESOURCE]; else