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 v8 02/61] PCI: Add pci_find_root_bus_resource()
Date: Tue, 27 Oct 2015 13:54:54 -0700 [thread overview]
Message-ID: <1445979353-1728-3-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1445979353-1728-1-git-send-email-yinghai@kernel.org>
Add pci_find_root_bus_resource() to return root bus res
for resource.
For sparc mem64 support, We need that host bridge window res,
1. we need direct parent for request_resource_conflict() calling in
pci_register_legacy_regions().
2. check if return is NULL to decide if region is valid or not.
Convert old pci_find_parent_resource() to pci_find_bus_resource(),
and reuse it in pci_find_root_bus_resource().
So we avoid changing pcibios_bus_to_resource().
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
drivers/pci/pci.c | 36 +++++++++++++++++++++++++-----------
include/linux/pci.h | 2 ++
2 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 6a9a111..613eef1 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -414,18 +414,9 @@ int pci_find_ht_capability(struct pci_dev *dev, int ht_cap)
}
EXPORT_SYMBOL_GPL(pci_find_ht_capability);
-/**
- * pci_find_parent_resource - return resource region of parent bus of given region
- * @dev: PCI device structure contains resources to be searched
- * @res: child resource record for which parent is sought
- *
- * For given resource region of given device, return the resource
- * region of parent bus the given region is contained in.
- */
-struct resource *pci_find_parent_resource(const struct pci_dev *dev,
- struct resource *res)
+static struct resource *pci_find_bus_resource(const struct pci_bus *bus,
+ struct resource *res)
{
- const struct pci_bus *bus = dev->bus;
struct resource *r;
int i;
@@ -455,8 +446,31 @@ struct resource *pci_find_parent_resource(const struct pci_dev *dev,
}
return NULL;
}
+
+/**
+ * pci_find_parent_resource - return resource region of parent bus of given region
+ * @dev: PCI device structure contains resources to be searched
+ * @res: child resource record for which parent is sought
+ *
+ * For given resource region of given device, return the resource
+ * region of parent bus the given region is contained in.
+ */
+struct resource *pci_find_parent_resource(const struct pci_dev *dev,
+ struct resource *res)
+{
+ return pci_find_bus_resource(dev->bus, res);
+}
EXPORT_SYMBOL(pci_find_parent_resource);
+struct resource *pci_find_root_bus_resource(struct pci_bus *bus,
+ struct resource *res)
+{
+ while (bus->parent)
+ bus = bus->parent;
+
+ return pci_find_bus_resource(bus, res);
+}
+
/**
* pci_wait_for_pending - wait for @mask bit(s) to clear in status word @pos
* @dev: the PCI device to operate on
diff --git a/include/linux/pci.h b/include/linux/pci.h
index e90eb22..05f5eac 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -783,6 +783,8 @@ void pcibios_resource_to_bus(struct pci_bus *bus, struct pci_bus_region *region,
struct resource *res);
void pcibios_bus_to_resource(struct pci_bus *bus, struct resource *res,
struct pci_bus_region *region);
+struct resource *pci_find_root_bus_resource(struct pci_bus *bus,
+ struct resource *res);
void pcibios_scan_specific_bus(int busn);
struct pci_bus *pci_find_bus(int domain, int busnr);
void pci_bus_add_devices(const struct pci_bus *bus);
--
1.8.4.5
next prev parent reply other threads:[~2015-10-27 20:56 UTC|newest]
Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-27 20:54 [PATCH v8 00/61] PCI: Resource allocation cleanup for v4.4 Yinghai Lu
2015-10-27 20:54 ` [PATCH v8 01/61] sparc/PCI: Add mem64 resource parsing for root bus Yinghai Lu
2015-10-27 20:54 ` Yinghai Lu [this message]
2015-10-27 20:54 ` [PATCH v8 03/61] sparc/PCI: Use correct bus address to resource offset Yinghai Lu
2015-10-27 20:54 ` [PATCH v8 04/61] sparc/PCI: Reserve legacy mmio after PCI mmio Yinghai Lu
2015-10-27 20:54 ` [PATCH v8 05/61] sparc/PCI: Add IORESOURCE_MEM_64 for 64-bit resource in OF parsing Yinghai Lu
2015-10-27 20:54 ` [PATCH v8 06/61] sparc/PCI: Keep resource idx order with bridge register number Yinghai Lu
2015-10-27 20:54 ` [PATCH v8 07/61] PCI: Kill wrong quirk about M7101 Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 08/61] PCI: Ignore BAR for ALi M1533 PCI-ISA bridge Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 09/61] powerpc/PCI: Keep resource idx order with bridge register number Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 10/61] powerpc/PCI: Add IORESOURCE_MEM_64 for 64-bit resource in OF parsing Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 11/61] OF/PCI: Add IORESOURCE_MEM_64 for 64-bit resource Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 12/61] PCI: Check pref compatible bit for mem64 resource of PCIe device Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 13/61] PCI: Only treat non-pref mmio64 as pref if all bridges have MEM_64 Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 14/61] PCI: Add has_mem64 for struct host_bridge Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 15/61] PCI: Only treat non-pref mmio64 as pref if host bridge has mmio64 Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 16/61] PCI: Restore pref MMIO allocation logic for host bridge without mmio64 Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 17/61] PCI: Don't release fixed resource for realloc Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 18/61] PCI: Claim fixed resource during remove/rescan path Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 19/61] PCI: Set resource to FIXED for LSI devices Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 20/61] PCI: Separate realloc list checking after allocation Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 21/61] PCI: Treat optional as required in first try for bridge rescan Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 22/61] PCI: Get new realloc size for bridge for last try Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 23/61] PCI: Don't release sibling bridge resources during hotplug Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 24/61] PCI: Cleanup res_to_dev_res() printout Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 25/61] PCI: Reuse res_to_dev_res() in reassign_resources_sorted() Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 26/61] PCI: Use correct align for optional only resources during sorting Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 27/61] PCI: Optimize bus min_align/size calculation during sizing Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 28/61] PCI: Optimize bus align/size calculation for optional " Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 29/61] PCI: Don't add too much optional size for hotplug bridge MMIO Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 30/61] PCI: Reorder resources list for required/optional resources Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 31/61] PCI: Remove duplicated code for resource sorting Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 32/61] PCI: Rename pdev_sort_resources() to pdev_assign_resources_prepare() Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 33/61] PCI: Treat ROM resource as optional during realloc Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 34/61] PCI: Add debug printout during releasing partial assigned resources Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 35/61] PCI: Simplify res reference using in __assign_resources_sorted() Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 36/61] PCI: Add __add_to_list() Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 37/61] PCI: Cache window alignment value during bus sizing Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 38/61] PCI: Check if resource is allocated before trying to assign one Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 39/61] PCI: Separate out save_resources()/restore_resources() Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 40/61] PCI: Move comment to pci_need_to_release() Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 41/61] PCI: Separate required+optional assigning to another function Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 42/61] PCI: Skip required+optional if there is no optional Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 43/61] PCI: Move saved required resource list out of required+optional assigning Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 44/61] PCI: Add alt_size ressource allocation support Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 45/61] PCI: Add support for more than two alt_size entries under same bridge Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 46/61] PCI: Fix size calculation with old_size on rescan path Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 47/61] PCI: Don't add too much optional size for hotplug bridge io Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 48/61] PCI: Move ISA io port align out of calculate_iosize() Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 49/61] PCI: Don't add too much io port for hotplug bridge with old size Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 50/61] PCI: Unify calculate_size() for io port and MMIO Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 51/61] PCI: Allow bridge optional only io port resource required size to be 0 Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 52/61] PCI: Unify skip_ioresource_align() Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 53/61] PCI: Kill macro checking for bus io port sizing Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 54/61] resources: Split out __allocate_resource() Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 55/61] resources: Make allocate_resource() return best fit resource Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 56/61] PCI, x86: Allocate from high in available window for MMIO Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 57/61] PCI: Add debug print out for min_align and alt_size Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 58/61] PCI, x86: Add pci=assign_pref_bars to reallocate pref BARs Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 59/61] PCI: Introduce resource_disabled() Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 60/61] PCI: Don't set flags to 0 when assign resource fail Yinghai Lu
2015-10-27 20:55 ` [PATCH v8 61/61] PCI: Only try to assign io port only for root bus that support it Yinghai Lu
2015-10-30 21:47 ` [PATCH v8 00/61] PCI: Resource allocation cleanup for v4.4 Khalid Aziz
2015-10-31 1:53 ` Yinghai Lu
2015-10-31 18:51 ` David Miller
2015-10-31 20:47 ` Benjamin Herrenschmidt
2015-11-23 21:31 ` Khalid Aziz
2015-11-24 2:39 ` Yinghai Lu
2015-12-01 21:23 ` Khalid Aziz
2015-12-02 4:26 ` Yinghai Lu
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=1445979353-1728-3-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).