From: Yinghai Lu <yinghai@kernel.org>
To: Bjorn Helgaas <bhelgaas@google.com>,
David Miller <davem@davemloft.net>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Wei Yang <weiyang@linux.vnet.ibm.com>, TJ <linux@iam.tj>,
Yijing Wang <wangyijing@huawei.com>,
Khalid Aziz <khalid.aziz@oracle.com>
Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH v10 13/59] PCI: Add has_mem64 for struct host_bridge
Date: Wed, 24 Feb 2016 18:12:04 -0800 [thread overview]
Message-ID: <1456366370-28995-14-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1456366370-28995-1-git-send-email-yinghai@kernel.org>
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 <yinghai@kernel.org>
Tested-by: Khalid Aziz <khalid.aziz@oracle.com>
---
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 2c3e264..bcda915 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -2189,6 +2189,13 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus,
} else
bus_addr[0] = '\0';
dev_info(&b->dev, "root bus resource %pR%s\n", res, bus_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 ca8d70a..d4592e3 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -413,6 +413,7 @@ struct pci_host_bridge {
void (*release_fn)(struct pci_host_bridge *);
void *release_data;
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,
--
1.8.4.5
next prev parent reply other threads:[~2016-02-25 3:13 UTC|newest]
Thread overview: 77+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-25 2:11 [PATCH v10 00/59] PCI: Resource allocation cleanup for v4.6 Yinghai Lu
2016-02-25 2:11 ` [PATCH v10 01/59] PCI: Add pci_find_root_bus_resource() Yinghai Lu
2016-03-10 3:54 ` Bjorn Helgaas
2016-03-11 21:21 ` Yinghai Lu
2016-02-25 2:11 ` [PATCH v10 02/59] sparc/PCI: Use correct bus address to resource offset Yinghai Lu
2016-03-10 18:24 ` Bjorn Helgaas
2016-03-10 19:47 ` David Miller
2016-03-12 8:22 ` Yinghai Lu
2016-03-12 11:26 ` Bjorn Helgaas
2016-03-19 6:01 ` Yinghai Lu
2016-02-25 2:11 ` [PATCH v10 03/59] sparc/PCI: Reserve legacy mmio after PCI mmio Yinghai Lu
2016-02-25 2:11 ` [PATCH v10 04/59] sparc/PCI: Add IORESOURCE_MEM_64 for 64-bit resource in OF parsing Yinghai Lu
2016-02-25 2:11 ` [PATCH v10 05/59] sparc/PCI: Keep resource idx order with bridge register number Yinghai Lu
2016-02-25 2:11 ` [PATCH v10 06/59] PCI: Kill wrong quirk about M7101 Yinghai Lu
2016-03-10 17:40 ` Bjorn Helgaas
2016-03-11 22:08 ` Yinghai Lu
2016-03-12 1:06 ` Linus Torvalds
2016-03-12 7:52 ` Meelis Roos
2016-03-12 8:26 ` Yinghai Lu
2016-03-12 8:39 ` Meelis Roos
2016-04-25 20:57 ` Bjorn Helgaas
2016-02-25 2:11 ` [PATCH v10 07/59] PCI: Ignore BAR for ALi M1533 PCI-ISA bridge Yinghai Lu
2016-03-10 17:54 ` Bjorn Helgaas
2016-03-11 22:21 ` Yinghai Lu
2016-02-25 2:11 ` [PATCH v10 08/59] powerpc/PCI: Keep resource idx order with bridge register number Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 09/59] powerpc/PCI: Add IORESOURCE_MEM_64 for 64-bit resource in OF parsing Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 10/59] OF/PCI: Add IORESOURCE_MEM_64 for 64-bit resource Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 11/59] PCI: Check pref compatible bit for mem64 resource of PCIe device Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 12/59] PCI: Only treat non-pref mmio64 as pref if all bridges have MEM_64 Yinghai Lu
2016-02-25 2:12 ` Yinghai Lu [this message]
2016-02-25 2:12 ` [PATCH v10 14/59] PCI: Only treat non-pref mmio64 as pref if host bridge has mmio64 Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 15/59] PCI: Restore pref MMIO allocation logic for host bridge without mmio64 Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 16/59] PCI: Don't release fixed resource for realloc Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 17/59] PCI: Claim fixed resource during remove/rescan path Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 18/59] PCI: Set resource to FIXED for LSI devices Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 19/59] PCI: Separate realloc list checking after allocation Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 20/59] PCI: Treat optional as required in first try for bridge rescan Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 21/59] PCI: Get new realloc size for bridge for last try Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 22/59] PCI: Don't release sibling bridge resources during hotplug Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 23/59] PCI: Cleanup res_to_dev_res() printout Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 24/59] PCI: Reuse res_to_dev_res() in reassign_resources_sorted() Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 25/59] PCI: Use correct align for optional only resources during sorting Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 26/59] PCI: Optimize bus min_align/size calculation during sizing Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 27/59] PCI: Optimize bus align/size calculation for optional " Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 28/59] PCI: Don't add too much optional size for hotplug bridge MMIO Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 29/59] PCI: Reorder resources list for required/optional resources Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 30/59] PCI: Remove duplicated code for resource sorting Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 31/59] PCI: Rename pdev_sort_resources() to pdev_assign_resources_prepare() Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 32/59] PCI: Treat ROM resource as optional during realloc Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 33/59] PCI: Add debug printout during releasing partial assigned resources Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 34/59] PCI: Simplify res reference using in __assign_resources_sorted() Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 35/59] PCI: Add __add_to_list() Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 36/59] PCI: Cache window alignment value during bus sizing Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 37/59] PCI: Check if resource is allocated before trying to assign one Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 38/59] PCI: Separate out save_resources()/restore_resources() Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 39/59] PCI: Move comment to pci_need_to_release() Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 40/59] PCI: Separate required+optional assigning to another function Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 41/59] PCI: Skip required+optional if there is no optional Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 42/59] PCI: Move saved required resource list out of required+optional assigning Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 43/59] PCI: Add alt_size ressource allocation support Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 44/59] PCI: Add support for more than two alt_size entries under same bridge Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 45/59] PCI: Fix size calculation with old_size on rescan path Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 46/59] PCI: Don't add too much optional size for hotplug bridge io Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 47/59] PCI: Move ISA io port align out of calculate_iosize() Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 48/59] PCI: Don't add too much io port for hotplug bridge with old size Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 49/59] PCI: Unify calculate_size() for io port and MMIO Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 50/59] PCI: Allow bridge optional only io port resource required size to be 0 Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 51/59] PCI: Unify skip_ioresource_align() Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 52/59] PCI: Kill macro checking for bus io port sizing Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 53/59] resources: Make allocate_resource() return best fit resource Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 54/59] PCI, x86: Allocate from high in available window for MMIO Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 55/59] PCI: Add debug print out for min_align and alt_size Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 56/59] PCI, x86: Add pci=assign_pref_bars to reallocate pref BARs Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 57/59] PCI: Introduce resource_disabled() Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 58/59] PCI: Don't set flags to 0 when assign resource fail Yinghai Lu
2016-02-25 2:12 ` [PATCH v10 59/59] PCI: Only try to assign io port only for root bus that support it Yinghai Lu
2016-03-10 18:30 ` [PATCH v10 00/59] PCI: Resource allocation cleanup for v4.6 Bjorn Helgaas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1456366370-28995-14-git-send-email-yinghai@kernel.org \
--to=yinghai@kernel.org \
--cc=benh@kernel.crashing.org \
--cc=bhelgaas@google.com \
--cc=davem@davemloft.net \
--cc=khalid.aziz@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux@iam.tj \
--cc=wangyijing@huawei.com \
--cc=weiyang@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).