From patchwork Fri Apr 21 05:04:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinghai Lu X-Patchwork-Id: 9691851 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5BDE66038D for ; Fri, 21 Apr 2017 05:08:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4DD791FFAD for ; Fri, 21 Apr 2017 05:08:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 428A9285E4; Fri, 21 Apr 2017 05:08:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DC5F11FFAD for ; Fri, 21 Apr 2017 05:08:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1035326AbdDUFIm (ORCPT ); Fri, 21 Apr 2017 01:08:42 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:37771 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1035259AbdDUFFl (ORCPT ); Fri, 21 Apr 2017 01:05:41 -0400 Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id v3L55W4Y019889 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 21 Apr 2017 05:05:33 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by aserv0021.oracle.com (8.13.8/8.14.4) with ESMTP id v3L55W10005803 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 21 Apr 2017 05:05:32 GMT Received: from abhmp0014.oracle.com (abhmp0014.oracle.com [141.146.116.20]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id v3L55WgQ016846; Fri, 21 Apr 2017 05:05:32 GMT Received: from dhcp-whq-twvpn-3-vpnpool-10-159-248-209.vpn.oracle.com (/69.181.250.163) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 20 Apr 2017 22:05:31 -0700 From: Yinghai Lu To: Bjorn Helgaas , David Miller , Benjamin Herrenschmidt Cc: Wei Yang , Khalid Aziz , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Yinghai Lu , sparclinux@vger.kernel.org Subject: [PATCH 05/13] sparc/PCI: Keep resource idx order with bridge register number Date: Thu, 20 Apr 2017 22:04:52 -0700 Message-Id: <20170421050500.13957-6-yinghai@kernel.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170421050500.13957-1-yinghai@kernel.org> References: <20170421050500.13957-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 X-Virus-Scanned: ClamAV using ClamSMTP On one system found strange "no compatible bridge window" warning even we already had pref_compat support that add extra pref bit for device resource. PCI: Claiming 0000:00:01.0: Resource 14: 0002000100000000..000200010fffffff [10220c] PCI: Claiming 0000:01:00.0: Resource 1: 0002000100000000..000200010000ffff [100214] pci 0000:01:00.0: can't claim BAR 1 [mem 0x2000100000000-0x200010000ffff 64bit]: no compatible bridge window It turns out that pci_resource_compatible()/pci_up_path_over_pref_mem64() just check resource with bridge pref mmio register idx 15, and we have put resource to use mmio register idx 14 during of_scan_pci_bridge() as the bridge does not have mmio resource. We already fix pci_up_path_over_pref_mem64() to check all bus resources. And at the same time, this patch make resource to have consistent sequence like other arch or directly from pci_read_bridge_bases(), even when non-pref mmio is missing, or out of ordering in firmware reporting. Just hold i = 1 for non pref mmio, and i = 2 for pref mmio. Signed-off-by: Yinghai Lu Tested-by: Khalid Aziz Cc: sparclinux@vger.kernel.org --- arch/sparc/kernel/pci.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c index adb9653..887441e 100644 --- a/arch/sparc/kernel/pci.c +++ b/arch/sparc/kernel/pci.c @@ -481,7 +481,7 @@ static void of_scan_pci_bridge(struct pci_pbm_info *pbm, pci_read_bridge_bases(bus); goto after_ranges; } - i = 1; + i = 3; for (; len >= 32; len -= 32, ranges += 8) { u64 start; @@ -513,6 +513,12 @@ static void of_scan_pci_bridge(struct pci_pbm_info *pbm, " for bridge %s\n", node->full_name); continue; } + } else if ((flags & IORESOURCE_PREFETCH) && + !bus->resource[2]->flags) { + res = bus->resource[2]; + } else if (((flags & (IORESOURCE_MEM | IORESOURCE_PREFETCH)) == + IORESOURCE_MEM) && !bus->resource[1]->flags) { + res = bus->resource[1]; } else { if (i >= PCI_NUM_RESOURCES - PCI_BRIDGE_RESOURCES) { printk(KERN_ERR "PCI: too many memory ranges"