From patchwork Tue Oct 27 20:55:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinghai Lu X-Patchwork-Id: 7502351 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 6060ABEEA4 for ; Tue, 27 Oct 2015 21:03:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E6E4A2096B for ; Tue, 27 Oct 2015 21:03:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 536F920961 for ; Tue, 27 Oct 2015 21:03:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965939AbbJ0VCX (ORCPT ); Tue, 27 Oct 2015 17:02:23 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:40105 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965718AbbJ0VCT (ORCPT ); Tue, 27 Oct 2015 17:02:19 -0400 Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id t9RKv6q8003519 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 27 Oct 2015 20:57:06 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by aserv0022.oracle.com (8.13.8/8.13.8) with ESMTP id t9RKv6K3010780 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Tue, 27 Oct 2015 20:57:06 GMT Received: from abhmp0017.oracle.com (abhmp0017.oracle.com [141.146.116.23]) by aserv0121.oracle.com (8.13.8/8.13.8) with ESMTP id t9RKv3oU027344; Tue, 27 Oct 2015 20:57:03 GMT Received: from aserv0021.oracle.com (/10.132.126.176) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 27 Oct 2015 13:57:03 -0700 From: Yinghai Lu To: Bjorn Helgaas , David Miller , Benjamin Herrenschmidt , Wei Yang , TJ , Yijing Wang , Khalid Aziz Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Yinghai Lu Subject: [PATCH v8 56/61] PCI, x86: Allocate from high in available window for MMIO Date: Tue, 27 Oct 2015 13:55:48 -0700 Message-Id: <1445979353-1728-57-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1445979353-1728-1-git-send-email-yinghai@kernel.org> References: <1445979353-1728-1-git-send-email-yinghai@kernel.org> X-Source-IP: aserv0022.oracle.com [141.146.126.234] 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.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, 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 Current code just use aligned start from avialable window, that could waste big alignment from start. We can align to the end from avialable window, so will save start with big align to others: like second try for pref mmio after first try already have non-pref assigned. pci tree: -[0000:00]-+-00.0 +-1c.0-[01-10]--+-00.0-[02-10]--+-01.0-[03]----00.0 PLX Technology, Inc. Device 87b1 | | +-02.0-[04-09]--+-00.0-[05-09]--+-01.0-[06]----00.0 PLX Technology, Inc. Device 87b1 | | | | +-02.0-[07]----00.0 Broadcom Corporation Device 8650 | | | | +-03.0-[08]-- | | | | \-04.0-[09]----00.0 Altera Corporation Device 0201 | | | +-00.1 PLX Technology, Inc. Device 87d0 | | | +-00.2 PLX Technology, Inc. Device 87d0 | | | +-00.3 PLX Technology, Inc. Device 87d0 | | | \-00.4 PLX Technology, Inc. Device 87d0 | | +-03.0-[0a-0f]--+-00.0-[0b-0f]--+-01.0-[0c]----00.0 PLX Technology, Inc. Device 87b1 | | | | +-02.0-[0d]----00.0 Broadcom Corporation Device 8650 | | | | +-03.0-[0e]-- | | | | \-04.0-[0f]----00.0 Altera Corporation Device 0201 | | | +-00.1 PLX Technology, Inc. Device 87d0 | | | +-00.2 PLX Technology, Inc. Device 87d0 | | | +-00.3 PLX Technology, Inc. Device 87d0 | | | \-00.4 PLX Technology, Inc. Device 87d0 | | \-04.0-[10]-- | +-00.1 PLX Technology, Inc. Device 87d0 | +-00.2 PLX Technology, Inc. Device 87d0 | +-00.3 PLX Technology, Inc. Device 87d0 | \-00.4 PLX Technology, Inc. Device 87d0 +-1c.3-[11]----00.0 hotplug device under 0000:02:03.0 before the patch: pci 0000:0a:00.0: BAR 9: no space for [mem size 0x03000000 64bit pref] pci 0000:0a:00.0: BAR 9: failed to assign [mem size 0x03000000 64bit pref] pci 0000:0a:00.0: BAR 8: assigned [mem 0xb0000000-0xb01fffff] ************** pci 0000:0a:00.0: BAR 0: assigned [mem 0xb0200000-0xb023ffff] pci 0000:0a:00.1: BAR 0: assigned [mem 0xb0240000-0xb0241fff] pci 0000:0a:00.2: BAR 0: assigned [mem 0xb0242000-0xb0243fff] pci 0000:0a:00.3: BAR 0: assigned [mem 0xb0244000-0xb0245fff] pci 0000:0a:00.4: BAR 0: assigned [mem 0xb0246000-0xb0247fff] pci 0000:0b:04.0: BAR 9: no space for [mem size 0x03000000 64bit pref] pci 0000:0b:04.0: BAR 9: failed to assign [mem size 0x03000000 64bit pref] pci 0000:0b:01.0: BAR 8: assigned [mem 0xb0000000-0xb00fffff] pci 0000:0b:02.0: BAR 8: assigned [mem 0xb0100000-0xb01fffff] pci 0000:0c:00.0: BAR 0: assigned [mem 0xb0000000-0xb003ffff] pci 0000:0b:01.0: PCI bridge to [bus 0c] pci 0000:0b:01.0: bridge window [mem 0xb0000000-0xb00fffff] pci 0000:0d:00.0: BAR 0: assigned [mem 0xb0100000-0xb013ffff 64bit] pci 0000:0b:02.0: PCI bridge to [bus 0d] pci 0000:0b:02.0: bridge window [mem 0xb0100000-0xb01fffff] pci 0000:0b:03.0: PCI bridge to [bus 0e] pci 0000:0f:00.0: BAR 0: no space for [mem size 0x02000000 64bit pref] pci 0000:0f:00.0: BAR 0: failed to assign [mem size 0x02000000 64bit pref] pci 0000:0f:00.0: BAR 2: no space for [mem size 0x00010000 64bit pref] pci 0000:0f:00.0: BAR 2: failed to assign [mem size 0x00010000 64bit pref] pci 0000:0b:04.0: PCI bridge to [bus 0f] pci 0000:0a:00.0: PCI bridge to [bus 0b-0f] pci 0000:0a:00.0: bridge window [mem 0xb0000000-0xb01fffff] pcieport 0000:02:03.0: PCI bridge to [bus 0a-0f] pcieport 0000:02:03.0: bridge window [io 0x2000-0x2fff] pcieport 0000:02:03.0: bridge window [mem 0xb0000000-0xb24fffff] pcieport 0000:02:03.0: bridge window [mem 0x80200000-0x803fffff 64bit pref] PCI: No. 2 try to assign unassigned res pcieport 0000:02:03.0: resource 9 [mem 0x80200000-0x803fffff 64bit pref] released pcieport 0000:02:03.0: PCI bridge to [bus 0a-0f] pcieport 0000:02:03.0: BAR 9: no space for [mem size 0x03000000 64bit pref] pcieport 0000:02:03.0: BAR 9: failed to assign [mem size 0x03000000 64bit pref] pcieport 0000:02:03.0: BAR 9: no space for [mem size 0x02100000 64bit pref] pcieport 0000:02:03.0: BAR 9: failed to assign [mem size 0x02100000 64bit pref] pci 0000:0a:00.0: BAR 9: no space for [mem size 0x03000000 64bit pref] pci 0000:0a:00.0: BAR 9: failed to assign [mem size 0x03000000 64bit pref] pci 0000:0a:00.0: BAR 9: no space for [mem size 0x02100000 64bit pref] ************** pci 0000:0a:00.0: BAR 9: failed to assign [mem size 0x02100000 64bit pref] pci 0000:0b:04.0: BAR 9: no space for [mem size 0x03000000 64bit pref] pci 0000:0b:04.0: BAR 9: failed to assign [mem size 0x03000000 64bit pref] pci 0000:0b:04.0: BAR 9: no space for [mem size 0x02100000 64bit pref] ************** pci 0000:0b:04.0: BAR 9: failed to assign [mem size 0x02100000 64bit pref] pci 0000:0b:01.0: PCI bridge to [bus 0c] pci 0000:0b:01.0: bridge window [mem 0xb0000000-0xb00fffff] pci 0000:0b:02.0: PCI bridge to [bus 0d] pci 0000:0b:02.0: bridge window [mem 0xb0100000-0xb01fffff] pci 0000:0b:03.0: PCI bridge to [bus 0e] pci 0000:0f:00.0: BAR 0: no space for [mem size 0x02000000 64bit pref] pci 0000:0f:00.0: BAR 0: failed to assign [mem size 0x02000000 64bit pref] pci 0000:0f:00.0: BAR 2: no space for [mem size 0x00010000 64bit pref] pci 0000:0f:00.0: BAR 2: failed to assign [mem size 0x00010000 64bit pref] pci 0000:0b:04.0: PCI bridge to [bus 0f] pci 0000:0a:00.0: PCI bridge to [bus 0b-0f] pci 0000:0a:00.0: bridge window [mem 0xb0000000-0xb01fffff] pcieport 0000:02:03.0: PCI bridge to [bus 0a-0f] pcieport 0000:02:03.0: bridge window [io 0x2000-0x2fff] pcieport 0000:02:03.0: bridge window [mem 0xb0000000-0xb24fffff] after the patch: pci 0000:0a:00.0: BAR 9: no space for [mem size 0x03000000 64bit pref] pci 0000:0a:00.0: BAR 9: failed to assign [mem size 0x03000000 64bit pref] pci 0000:0a:00.0: BAR 8: assigned [mem 0xb2300000-0xb24fffff] ************* pci 0000:0a:00.0: BAR 0: assigned [mem 0xb22c0000-0xb22fffff] pci 0000:0a:00.1: BAR 0: assigned [mem 0xb22be000-0xb22bffff] pci 0000:0a:00.2: BAR 0: assigned [mem 0xb22bc000-0xb22bdfff] pci 0000:0a:00.3: BAR 0: assigned [mem 0xb22ba000-0xb22bbfff] pci 0000:0a:00.4: BAR 0: assigned [mem 0xb22b8000-0xb22b9fff] pci 0000:0b:04.0: BAR 9: no space for [mem size 0x03000000 64bit pref] pci 0000:0b:04.0: BAR 9: failed to assign [mem size 0x03000000 64bit pref] pci 0000:0b:01.0: BAR 8: assigned [mem 0xb2400000-0xb24fffff] pci 0000:0b:02.0: BAR 8: assigned [mem 0xb2300000-0xb23fffff] pci 0000:0c:00.0: BAR 0: assigned [mem 0xb24c0000-0xb24fffff] pci 0000:0b:01.0: PCI bridge to [bus 0c] pci 0000:0b:01.0: bridge window [mem 0xb2400000-0xb24fffff] pci 0000:0d:00.0: BAR 0: assigned [mem 0xb23c0000-0xb23fffff 64bit] pci 0000:0b:02.0: PCI bridge to [bus 0d] pci 0000:0b:02.0: bridge window [mem 0xb2300000-0xb23fffff] pci 0000:0b:03.0: PCI bridge to [bus 0e] pci 0000:0f:00.0: BAR 0: no space for [mem size 0x02000000 64bit pref] pci 0000:0f:00.0: BAR 0: failed to assign [mem size 0x02000000 64bit pref] pci 0000:0f:00.0: BAR 2: no space for [mem size 0x00010000 64bit pref] pci 0000:0f:00.0: BAR 2: failed to assign [mem size 0x00010000 64bit pref] pci 0000:0b:04.0: PCI bridge to [bus 0f] pci 0000:0a:00.0: PCI bridge to [bus 0b-0f] pci 0000:0a:00.0: bridge window [mem 0xb2300000-0xb24fffff] pcieport 0000:02:03.0: PCI bridge to [bus 0a-0f] pcieport 0000:02:03.0: bridge window [io 0x2000-0x2fff] pcieport 0000:02:03.0: bridge window [mem 0xb0000000-0xb24fffff] pcieport 0000:02:03.0: bridge window [mem 0x9fc00000-0x9fdfffff 64bit pref] PCI: No. 2 try to assign unassigned res pcieport 0000:02:03.0: resource 9 [mem 0x9fc00000-0x9fdfffff 64bit pref] released pcieport 0000:02:03.0: PCI bridge to [bus 0a-0f] pcieport 0000:02:03.0: BAR 9: no space for [mem size 0x03000000 64bit pref] pcieport 0000:02:03.0: BAR 9: failed to assign [mem size 0x03000000 64bit pref] pcieport 0000:02:03.0: BAR 9: no space for [mem size 0x02100000 64bit pref] pcieport 0000:02:03.0: BAR 9: failed to assign [mem size 0x02100000 64bit pref] pci 0000:0a:00.0: BAR 9: no space for [mem size 0x03000000 64bit pref] pci 0000:0a:00.0: BAR 9: failed to assign [mem size 0x03000000 64bit pref] pci 0000:0a:00.0: BAR 9: assigned [mem 0xb0000000-0xb20fffff 64bit pref] ********* pci 0000:0b:04.0: BAR 9: no space for [mem size 0x03000000 64bit pref] pci 0000:0b:04.0: BAR 9: failed to assign [mem size 0x03000000 64bit pref] pci 0000:0b:04.0: BAR 9: assigned [mem 0xb0000000-0xb20fffff 64bit pref] ********* pci 0000:0b:01.0: PCI bridge to [bus 0c] pci 0000:0b:01.0: bridge window [mem 0xb2400000-0xb24fffff] pci 0000:0b:02.0: PCI bridge to [bus 0d] pci 0000:0b:02.0: bridge window [mem 0xb2300000-0xb23fffff] pci 0000:0b:03.0: PCI bridge to [bus 0e] pci 0000:0f:00.0: BAR 0: assigned [mem 0xb0000000-0xb1ffffff 64bit pref] ******** pci 0000:0f:00.0: BAR 2: assigned [mem 0xb20f0000-0xb20fffff 64bit pref] ******** pci 0000:0b:04.0: PCI bridge to [bus 0f] pci 0000:0b:04.0: bridge window [mem 0xb0000000-0xb20fffff 64bit pref] pci 0000:0a:00.0: PCI bridge to [bus 0b-0f] pci 0000:0a:00.0: bridge window [mem 0xb2300000-0xb24fffff] pci 0000:0a:00.0: bridge window [mem 0xb0000000-0xb20fffff 64bit pref] pcieport 0000:02:03.0: PCI bridge to [bus 0a-0f] pcieport 0000:02:03.0: bridge window [io 0x2000-0x2fff] pcieport 0000:02:03.0: bridge window [mem 0xb0000000-0xb24fffff] So we allocate high for 0a:00.0 and etc, and leave low range like 0xb0000000 to 0b:04.0 and 0f:00.0 Signed-off-by: Yinghai Lu --- arch/x86/pci/i386.c | 20 ++++++++++++++++++++ drivers/pci/setup-bus.c | 11 ++++++++++- include/linux/pci.h | 3 +++ 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c index 3f17726..21f3e3e 100644 --- a/arch/x86/pci/i386.c +++ b/arch/x86/pci/i386.c @@ -129,6 +129,24 @@ static void __init pcibios_fw_addr_list_del(void) pcibios_fw_addr_done = true; } +resource_size_t +pcibios_align_end_resource(void *data, const struct resource *res, + resource_size_t size, resource_size_t align) +{ + resource_size_t start = res->start; + + /* Take near end */ + if (res->end + 1 > size) { + resource_size_t new_start; + + new_start = round_down(res->end + 1 - size, align); + if (new_start > start) + start = new_start; + } + + return start; +} + /* * We need to avoid collisions with `mirrored' VGA ports * and other strange ISA hardware, so we always want the @@ -155,6 +173,8 @@ pcibios_align_resource(void *data, const struct resource *res, if (start & 0x300) start = (start + 0x3ff) & ~0x3ff; } else if (res->flags & IORESOURCE_MEM) { + start = pcibios_align_end_resource(data, res, size, align); + /* The low 1MB range is reserved for ISA cards */ if (start < BIOS_END) start = BIOS_END; diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 419eaaf..1889351 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -1319,6 +1319,15 @@ static void sort_align_test(struct list_head *head) } } +resource_size_t __weak pcibios_align_end_resource(void *data, + const struct resource *res, + resource_size_t size, + resource_size_t align) +{ + /* default is not aligned to end */ + return res->start; +} + static bool is_align_size_good(struct list_head *head, resource_size_t min_align, resource_size_t size, resource_size_t start) @@ -1336,7 +1345,7 @@ static bool is_align_size_good(struct list_head *head, list_for_each_entry(p, head, list) if (allocate_resource(&root, &p->res, p->size, 0, (resource_size_t)-1ULL, - p->align, NULL, NULL)) + p->align, pcibios_align_end_resource, NULL)) return false; return true; diff --git a/include/linux/pci.h b/include/linux/pci.h index cffaed4..6bc56f1 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -774,6 +774,9 @@ char *pcibios_setup(char *str); resource_size_t pcibios_align_resource(void *, const struct resource *, resource_size_t, resource_size_t); +resource_size_t pcibios_align_end_resource(void *, const struct resource *, + resource_size_t, + resource_size_t); void pcibios_update_irq(struct pci_dev *, int irq); /* Weak but can be overriden by arch */