Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1035368AbdDUFFz (ORCPT ); Fri, 21 Apr 2017 01:05:55 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:37798 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1035249AbdDUFFx (ORCPT ); Fri, 21 Apr 2017 01:05:53 -0400 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 Subject: [PATCH 11/13] PCI: Add has_mem64 for struct host_bridge Date: Thu, 20 Apr 2017 22:04:58 -0700 Message-Id: <20170421050500.13957-12-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-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1545 Lines: 47 Add has_mem64 for struct host_bridge, on root bus that does not support mmio64 above 4g, will not set that. We will use that info next two following patches: 1. Don't treat non-pref mmio64 as pref mmio, so will not put it under bridge's pref range when rescan the devices 2. will keep pref mmio64 and pref mmio32 under bridge pref bar. Signed-off-by: Yinghai Lu Tested-by: Khalid Aziz --- drivers/pci/probe.c | 7 +++++++ include/linux/pci.h | 1 + 2 files changed, 8 insertions(+) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 676b55f..8f439e0 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -818,6 +818,13 @@ int pci_register_host_bridge(struct pci_host_bridge *bridge) addr[0] = '\0'; dev_info(&bus->dev, "root bus resource %pR%s\n", res, addr); + + if (resource_type(res) == IORESOURCE_MEM) { + if ((res->end - offset) > 0xffffffff) + bridge->has_mem64 = 1; + if ((res->start - offset) > 0xffffffff) + res->flags |= IORESOURCE_MEM_64; + } } down_write(&pci_bus_sem); diff --git a/include/linux/pci.h b/include/linux/pci.h index b14dd94..a3693ef 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -436,6 +436,7 @@ struct pci_host_bridge { void *release_data; struct msi_controller *msi; unsigned int ignore_reset_delay:1; /* for entire hierarchy */ + unsigned int has_mem64:1; /* Resource alignment requirements */ resource_size_t (*align_resource)(struct pci_dev *dev, const struct resource *res, -- 2.9.3