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>
Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH v5 08/53] PCI: Remove duplicated code for resource sorting
Date: Wed, 16 Sep 2015 14:57:06 -0700 [thread overview]
Message-ID: <1442440671-5361-9-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1442440671-5361-1-git-send-email-yinghai@kernel.org>
Now sort_resources() and pdev_sort_resources() all have sorting
code.
As we are going to call sort_resources() several places later for
alt_size support, so choose to remove related code in
pdev_sort_resources().
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
drivers/pci/setup-bus.c | 22 +++-------------------
1 file changed, 3 insertions(+), 19 deletions(-)
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 555a7a3..44d63c0 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -214,9 +214,8 @@ static void pdev_sort_resources(struct pci_dev *dev,
for (i = 0; i < PCI_NUM_RESOURCES; i++) {
struct resource *r;
- struct pci_dev_resource *dev_res, *tmp;
+ struct pci_dev_resource *tmp;
resource_size_t r_align;
- struct list_head *n;
r = &dev->resource[i];
@@ -239,22 +238,7 @@ static void pdev_sort_resources(struct pci_dev *dev,
tmp->res = r;
tmp->dev = dev;
- /* fallback is smallest one or list is empty*/
- n = head;
- list_for_each_entry(dev_res, head, list) {
- resource_size_t align;
-
- align = __pci_resource_alignment(dev_res->dev,
- dev_res->res,
- realloc_head);
-
- if (r_align > align) {
- n = &dev_res->list;
- break;
- }
- }
- /* Insert it just before n*/
- list_add_tail(&tmp->list, n);
+ list_add_tail(&tmp->list, head);
}
}
@@ -557,9 +541,9 @@ static void __assign_resources_sorted(struct list_head *head,
}
free_list(&save_head);
+requested_and_reassign:
sort_resources(head);
-requested_and_reassign:
/* Satisfy the must-have resource requests */
assign_requested_resources_sorted(head, fail_head);
--
1.8.4.5
next prev parent reply other threads:[~2015-09-16 21:58 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-16 21:56 [PATCH v5 00/53] PCI: Resource allocation cleanup for v4.4 Yinghai Lu
2015-09-16 21:56 ` [PATCH v5 01/53] PCI: Cleanup res_to_dev_res() printout Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 02/53] PCI: Reuse res_to_dev_res() in reassign_resources_sorted() Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 03/53] PCI: Use correct align for optional only resources during sorting Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 04/53] PCI: Optimize bus min_align/size calculation during sizing Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 05/53] PCI: Optimize bus align/size calculation for optional " Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 06/53] PCI: Don't add too much optional size for hotplug bridge MMIO Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 07/53] PCI: Reorder resources list for required/optional resources Yinghai Lu
2015-09-16 21:57 ` Yinghai Lu [this message]
2015-09-16 21:57 ` [PATCH v5 09/53] PCI: Rename pdev_sort_resources() to pdev_assign_resources_prepare() Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 10/53] PCI: Treat ROM resource as optional during realloc Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 11/53] PCI: Add debug printout during releasing partial assigned resources Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 12/53] PCI: Simplify res reference using in __assign_resources_sorted() Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 13/53] PCI: Separate realloc list checking after allocation Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 14/53] PCI: Add __add_to_list() Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 15/53] PCI: Cache window alignment value during bus sizing Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 16/53] PCI: Check if resource is allocated before trying to assign one Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 17/53] PCI: Separate out save_resources()/restore_resources() Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 18/53] PCI: Move comment to pci_need_to_release() Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 19/53] PCI: Separate required+optional assigning to another function Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 20/53] PCI: Skip required+optional if there is no optional Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 21/53] PCI: Move saved required resource list out of required+optional assigning Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 22/53] PCI: Add alt_size ressource allocation support Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 23/53] PCI: Add support for more than two alt_size entries under same bridge Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 24/53] PCI: Fix size calculation with old_size on rescan path Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 25/53] PCI: Don't add too much optional size for hotplug bridge io Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 26/53] PCI: Move ISA io port align out of calculate_iosize() Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 27/53] PCI: Don't add too much io port for hotplug bridge with old size Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 28/53] PCI: Unify calculate_size() for io port and MMIO Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 29/53] PCI: Allow bridge optional only io port resource required size to be 0 Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 30/53] PCI: Unify skip_ioresource_align() Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 31/53] PCI: Kill macro checking for bus io port sizing Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 32/53] resources: Split out __allocate_resource() Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 33/53] resources: Make allocate_resource() return best fit resource Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 34/53] PCI, x86: Allocate from high in available window for MMIO Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 35/53] PCI: Add debug print out for min_align and alt_size Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 36/53] PCI: Check pref compatible bit for mem64 resource of PCIe device Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 37/53] PCI: Only treat non-pref mmio64 as pref if all bridges have MEM_64 Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 38/53] PCI: Add has_mem64 for struct host_bridge Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 39/53] PCI: Only treat non-pref mmio64 as pref if host bridge has mmio64 Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 40/53] PCI: Restore pref MMIO allocation logic for host bridge without mmio64 Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 41/53] sparc/PCI: Add mem64 resource parsing for root bus Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 42/53] sparc/PCI: Add IORESOURCE_MEM_64 for 64-bit resource in OF parsing Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 43/53] powerpc/PCI: " Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 44/53] OF/PCI: Add IORESOURCE_MEM_64 for 64-bit resource Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 45/53] PCI: Treat optional as required in first try for bridge rescan Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 46/53] PCI: Get new realloc size for bridge for last try Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 47/53] PCI: Don't release sibling bridge resources during hotplug Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 48/53] PCI: Don't release fixed resource for realloc Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 49/53] PCI: Claim fixed resource during remove/rescan path Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 50/53] PCI: Set resource to FIXED for LSI devices Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 51/53] PCI, x86: Add pci=assign_pref_bars to reallocate pref BARs Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 52/53] PCI: Introduce resource_disabled() Yinghai Lu
2015-09-16 21:57 ` [PATCH v5 53/53] PCI: Don't set flags to 0 when assign resource fail Yinghai Lu
2015-09-17 14:55 ` [PATCH v5 00/53] PCI: Resource allocation cleanup for v4.4 Bjorn Helgaas
2015-09-17 15:38 ` 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=1442440671-5361-9-git-send-email-yinghai@kernel.org \
--to=yinghai@kernel.org \
--cc=benh@kernel.crashing.org \
--cc=bhelgaas@google.com \
--cc=davem@davemloft.net \
--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).