From patchwork Sat Jun 18 02:24:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinghai Lu X-Patchwork-Id: 637383 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3rWgw60bKcz9t1W for ; Sat, 18 Jun 2016 12:25:58 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752843AbcFRCZi (ORCPT ); Fri, 17 Jun 2016 22:25:38 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:45127 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751103AbcFRCZh (ORCPT ); Fri, 17 Jun 2016 22:25:37 -0400 Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u5I2PLOZ005606 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sat, 18 Jun 2016 02:25:21 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by aserv0021.oracle.com (8.13.8/8.13.8) with ESMTP id u5I2PK2w031703 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sat, 18 Jun 2016 02:25:21 GMT Received: from abhmp0014.oracle.com (abhmp0014.oracle.com [141.146.116.20]) by aserv0122.oracle.com (8.13.8/8.13.8) with ESMTP id u5I2PKRV030813; Sat, 18 Jun 2016 02:25:20 GMT Received: from userv0022.oracle.com (/10.132.126.127) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 17 Jun 2016 19:25:20 -0700 From: Yinghai Lu To: Bjorn Helgaas , David Miller , Benjamin Herrenschmidt , Linus Torvalds Cc: Wei Yang , Khalid Aziz , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Yinghai Lu , sparclinux@vger.kernel.org Subject: [PATCH v13 06/16] sparc/PCI: Reserve legacy mmio after PCI mmio Date: Fri, 17 Jun 2016 19:24:51 -0700 Message-Id: <20160618022501.15648-7-yinghai@kernel.org> X-Mailer: git-send-email 2.8.3 In-Reply-To: <20160618022501.15648-1-yinghai@kernel.org> References: <20160618022501.15648-1-yinghai@kernel.org> X-Source-IP: aserv0021.oracle.com [141.146.126.233] Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org On one system found bunch of claim resource fail from pci device. pci_sun4v f02b894c: PCI host bridge to bus 0000:00 pci_bus 0000:00: root bus resource [io 0x2007e00000000-0x2007e0fffffff] (bus address [0x0000-0xfffffff]) pci_bus 0000:00: root bus resource [mem 0x2000000000000-0x200007effffff] (bus address [0x00000000-0x7effffff]) pci_bus 0000:00: root bus resource [mem 0x2000100000000-0x20007ffffffff] (bus address [0x100000000-0x7ffffffff]) ... PCI: Claiming 0000:00:02.0: Resource 14: 0002000000000000..00020000004fffff [200] pci 0000:00:02.0: can't claim BAR 14 [mem 0x2000000000000-0x20000004fffff]: address conflict with Video RAM area [??? 0x20000000a0000-0x20000000bffff flags 0x80000000] pci 0000:02:00.0: can't claim BAR 0 [mem 0x2000000000000-0x20000000fffff]: no compatible bridge window PCI: Claiming 0000:02:00.0: Resource 3: 0002000000100000..0002000000103fff [200] pci 0000:02:00.0: can't claim BAR 3 [mem 0x2000000100000-0x2000000103fff]: no compatible bridge window PCI: Claiming 0000:02:00.1: Resource 0: 0002000000200000..00020000002fffff [200] pci 0000:02:00.1: can't claim BAR 0 [mem 0x2000000200000-0x20000002fffff]: no compatible bridge window PCI: Claiming 0000:02:00.1: Resource 3: 0002000000104000..0002000000107fff [200] pci 0000:02:00.1: can't claim BAR 3 [mem 0x2000000104000-0x2000000107fff]: no compatible bridge window PCI: Claiming 0000:02:00.2: Resource 0: 0002000000300000..00020000003fffff [200] pci 0000:02:00.2: can't claim BAR 0 [mem 0x2000000300000-0x20000003fffff]: no compatible bridge window PCI: Claiming 0000:02:00.2: Resource 3: 0002000000108000..000200000010bfff [200] pci 0000:02:00.2: can't claim BAR 3 [mem 0x2000000108000-0x200000010bfff]: no compatible bridge window PCI: Claiming 0000:02:00.3: Resource 0: 0002000000400000..00020000004fffff [200] pci 0000:02:00.3: can't claim BAR 0 [mem 0x2000000400000-0x20000004fffff]: no compatible bridge window PCI: Claiming 0000:02:00.3: Resource 3: 000200000010c000..000200000010ffff [200] pci 0000:02:00.3: can't claim BAR 3 [mem 0x200000010c000-0x200000010ffff]: no compatible bridge window The bridge 00:02.0 resource does not get reserved as Video RAM take the position early, and following children resources reservation all fail. Move down Video RAM area reservation after pci mmio get reserved, so we leave pci driver to use those regions. -v5: merge simplify one and use pcibios_bus_to_resource() -v6: use pci_find_bus_resource() Signed-off-by: Yinghai Lu Tested-by: Khalid Aziz Cc: sparclinux@vger.kernel.org --- arch/sparc/kernel/pci.c | 1 + arch/sparc/kernel/pci_common.c | 59 ++++++++++++++++++++++-------------------- arch/sparc/kernel/pci_impl.h | 1 + 3 files changed, 33 insertions(+), 28 deletions(-) diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c index e16da35..654cf21 100644 --- a/arch/sparc/kernel/pci.c +++ b/arch/sparc/kernel/pci.c @@ -686,6 +686,7 @@ struct pci_bus *pci_scan_one_pbm(struct pci_pbm_info *pbm, pci_bus_register_of_sysfs(bus); pci_claim_bus_resources(bus); + pci_register_legacy_regions(bus); pci_bus_add_devices(bus); return bus; } diff --git a/arch/sparc/kernel/pci_common.c b/arch/sparc/kernel/pci_common.c index 76998f8..1ebc7ff 100644 --- a/arch/sparc/kernel/pci_common.c +++ b/arch/sparc/kernel/pci_common.c @@ -328,41 +328,46 @@ void pci_get_pbm_props(struct pci_pbm_info *pbm) } } -static void pci_register_legacy_regions(struct resource *io_res, - struct resource *mem_res) +static void pci_register_region(struct pci_bus *bus, const char *name, + resource_size_t rstart, resource_size_t size) { - struct resource *p; + struct resource *res, *conflict, *bus_res; + struct pci_bus_region region; - /* VGA Video RAM. */ - p = kzalloc(sizeof(*p), GFP_KERNEL); - if (!p) + res = kzalloc(sizeof(*res), GFP_KERNEL); + if (!res) return; - p->name = "Video RAM area"; - p->start = mem_res->start + 0xa0000UL; - p->end = p->start + 0x1ffffUL; - p->flags = IORESOURCE_BUSY; - request_resource(mem_res, p); + res->flags = IORESOURCE_MEM; - p = kzalloc(sizeof(*p), GFP_KERNEL); - if (!p) + region.start = rstart; + region.end = rstart + size - 1UL; + pcibios_bus_to_resource(bus, res, ®ion); + bus_res = pci_find_bus_resource(bus, res); + if (!bus_res) { + kfree(res); return; + } + + res->name = name; + res->flags |= IORESOURCE_BUSY; + conflict = request_resource_conflict(bus_res, res); + if (conflict) { + dev_printk(KERN_DEBUG, &bus->dev, + " can't claim %s %pR: address conflict with %s %pR\n", + res->name, res, conflict->name, conflict); + kfree(res); + } +} - p->name = "System ROM"; - p->start = mem_res->start + 0xf0000UL; - p->end = p->start + 0xffffUL; - p->flags = IORESOURCE_BUSY; - request_resource(mem_res, p); +void pci_register_legacy_regions(struct pci_bus *bus) +{ + /* VGA Video RAM. */ + pci_register_region(bus, "Video RAM area", 0xa0000UL, 0x20000UL); - p = kzalloc(sizeof(*p), GFP_KERNEL); - if (!p) - return; + pci_register_region(bus, "System ROM", 0xf0000UL, 0x10000UL); - p->name = "Video ROM"; - p->start = mem_res->start + 0xc0000UL; - p->end = p->start + 0x7fffUL; - p->flags = IORESOURCE_BUSY; - request_resource(mem_res, p); + pci_register_region(bus, "Video ROM", 0xc0000UL, 0x8000UL); } static void pci_register_iommu_region(struct pci_pbm_info *pbm) @@ -504,8 +509,6 @@ void pci_determine_mem_io_space(struct pci_pbm_info *pbm) if (pbm->mem64_space.flags) request_resource(&iomem_resource, &pbm->mem64_space); - pci_register_legacy_regions(&pbm->io_space, - &pbm->mem_space); pci_register_iommu_region(pbm); } diff --git a/arch/sparc/kernel/pci_impl.h b/arch/sparc/kernel/pci_impl.h index 2853af7..ff8f5e1 100644 --- a/arch/sparc/kernel/pci_impl.h +++ b/arch/sparc/kernel/pci_impl.h @@ -167,6 +167,7 @@ void pci_get_pbm_props(struct pci_pbm_info *pbm); struct pci_bus *pci_scan_one_pbm(struct pci_pbm_info *pbm, struct device *parent); void pci_determine_mem_io_space(struct pci_pbm_info *pbm); +void pci_register_legacy_regions(struct pci_bus *bus); /* Error reporting support. */ void pci_scan_for_target_abort(struct pci_pbm_info *, struct pci_bus *);