From patchwork Thu Oct 1 05:53:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinghai Lu X-Patchwork-Id: 524816 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 CE3E6140D70 for ; Thu, 1 Oct 2015 16:54:59 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754035AbbJAGy5 (ORCPT ); Thu, 1 Oct 2015 02:54:57 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:47858 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754937AbbJAGyx (ORCPT ); Thu, 1 Oct 2015 02:54:53 -0400 Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id t915scLH023230 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 1 Oct 2015 05:54:38 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userv0022.oracle.com (8.13.8/8.13.8) with ESMTP id t915scAt029771 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Thu, 1 Oct 2015 05:54:38 GMT Received: from abhmp0015.oracle.com (abhmp0015.oracle.com [141.146.116.21]) by userv0121.oracle.com (8.13.8/8.13.8) with ESMTP id t915sbam027603; Thu, 1 Oct 2015 05:54:37 GMT Received: from linux-siqj.site (/10.154.161.115) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 30 Sep 2015 22:54:37 -0700 From: Yinghai Lu To: Bjorn Helgaas , David Miller , Benjamin Herrenschmidt , Wei Yang , TJ , Yijing Wang Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Yinghai Lu Subject: [PATCH v6 49/53] PCI: Only treat non-pref mmio64 as pref if host bridge has mmio64 Date: Wed, 30 Sep 2015 22:53:23 -0700 Message-Id: <1443678807-786-50-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1443678807-786-1-git-send-email-yinghai@kernel.org> References: <1443678807-786-1-git-send-email-yinghai@kernel.org> X-Source-IP: userv0022.oracle.com [156.151.31.74] Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org If host bridge does not have mmio64 above 4G, We don't need to treat device non-pref mmio64 as as pref mmio64. Signed-off-by: Yinghai Lu --- drivers/pci/setup-bus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 3b27c8c..d95b46a 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -981,7 +981,7 @@ int pci_claim_bridge_resource(struct pci_dev *bridge, int i) static bool pci_up_path_over_pref_mem64(struct pci_bus *bus) { if (pci_is_root_bus(bus)) - return true; + return to_pci_host_bridge(bus->bridge)->has_mem64; if (bus->self && !(bus->self->resource[PCI_BRIDGE_RESOURCES + 2].flags & IORESOURCE_MEM_64))