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: Andrew Morton <akpm@linux-foundation.org>,
linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH v2 18/49] PCI: Move comment to pci_need_to_release()
Date: Tue, 14 Jul 2015 15:46:49 -0700 [thread overview]
Message-ID: <1436914040-13206-19-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1436914040-13206-1-git-send-email-yinghai@kernel.org>
Move comment from caller to callee, as we will have one new caller
for alt_size support later.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
drivers/pci/setup-bus.c | 27 +++++++++++++++------------
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 2e3d00b..f8b9a24 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -415,6 +415,20 @@ static unsigned long pci_fail_res_type_mask(struct list_head *fail_head)
static bool pci_need_to_release(unsigned long mask, struct resource *res)
{
+ /*
+ * Separate three resource type checking if we need to release
+ * assigned resource.
+ * 1. if there is io port assign fail, will release assigned
+ * io port.
+ * 2. if there is pref mmio assign fail, release assigned
+ * pref mmio.
+ * if assigned pref mmio's parent is non-pref mmio and there
+ * is non-pref mmio assign fail, will release that assigned
+ * pref mmio.
+ * 3. if there is non-pref mmio assign fail or pref mmio
+ * assigned fail, will release assigned non-pref mmio.
+ */
+
if (res->flags & IORESOURCE_IO)
return !!(mask & IORESOURCE_IO);
@@ -471,19 +485,8 @@ static void __assign_resources_sorted(struct list_head *head,
* if could do that, could get out early.
* if could not do that, we still try to assign requested at first,
* then try to reassign add_size for some resources.
- *
- * Separate three resource type checking if we need to release
- * assigned resource after requested + add_size try.
- * 1. if there is io port assign fail, will release assigned
- * io port.
- * 2. if there is pref mmio assign fail, release assigned
- * pref mmio.
- * if assigned pref mmio's parent is non-pref mmio and there
- * is non-pref mmio assign fail, will release that assigned
- * pref mmio.
- * 3. if there is non-pref mmio assign fail or pref mmio
- * assigned fail, will release assigned non-pref mmio.
*/
+
LIST_HEAD(save_head);
LIST_HEAD(local_fail_head);
struct pci_dev_resource *save_res;
--
1.8.4.5
next prev parent reply other threads:[~2015-07-14 22:48 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-14 22:46 [PATCH v2 00/49] PCI: Resource allocation cleanup for v4.3 Yinghai Lu
2015-07-14 22:46 ` [PATCH v2 01/49] PCI: Cleanup res_to_dev_res() printout for addon resources Yinghai Lu
2015-07-14 22:46 ` [PATCH v2 02/49] PCI: Reuse res_to_dev_res in reassign_resources_sorted Yinghai Lu
2015-07-14 22:46 ` [PATCH v2 03/49] PCI: Use correct align for optional only resources during sorting Yinghai Lu
2015-07-14 22:46 ` [PATCH v2 04/49] PCI: Optimize bus align/size calculation during sizing Yinghai Lu
2015-07-14 22:46 ` [PATCH v2 05/49] PCI: Optimize bus align/size calculation for optional " Yinghai Lu
2015-07-14 22:46 ` [PATCH v2 06/49] PCI: Don't add too much optional size for hotplug bridge mmio Yinghai Lu
2015-07-14 22:46 ` [PATCH v2 07/49] PCI: Reorder resources list for must/optional resources Yinghai Lu
2015-07-14 22:46 ` [PATCH v2 08/49] PCI: Remove duplicated code for resource sorting Yinghai Lu
2015-07-14 22:46 ` [PATCH v2 09/49] PCI: Rename pdev_sort_resources to pdev_check_resources Yinghai Lu
2015-07-14 22:46 ` [PATCH v2 10/49] PCI: Treat ROM resource as optional during realloc Yinghai Lu
2015-07-14 22:46 ` [PATCH v2 11/49] PCI: Add debug printout during releasing partial assigned resources Yinghai Lu
2015-07-14 22:46 ` [PATCH v2 12/49] PCI: Simplify res reference using in __assign_resourcs_sorted Yinghai Lu
2015-07-14 22:46 ` [PATCH v2 13/49] PCI: Separate realloc list checking after allocation Yinghai Lu
2015-07-14 22:46 ` [PATCH v2 14/49] PCI: Add __add_to_list() Yinghai Lu
2015-07-14 22:46 ` [PATCH v2 15/49] PCI: Cache window alignment value Yinghai Lu
2015-07-14 22:46 ` [PATCH v2 16/49] PCI: Check if resource is allocated before pci_assign Yinghai Lu
2015-07-14 22:46 ` [PATCH v2 17/49] PCI: Separate out save_resources/restore_resource Yinghai Lu
2015-07-14 22:46 ` Yinghai Lu [this message]
2015-07-14 22:46 ` [PATCH v2 19/49] PCI: Separate must+optional assigning to another function Yinghai Lu
2015-07-14 22:46 ` [PATCH v2 20/49] PCI: Skip must+optional if there is no optional addon Yinghai Lu
2015-07-14 22:46 ` [PATCH v2 21/49] PCI: Move saved required resource list out of must+optional assigning Yinghai Lu
2015-07-14 22:46 ` [PATCH v2 22/49] PCI: Add alt_size allocation support Yinghai Lu
2015-07-14 22:46 ` [PATCH v2 23/49] PCI: Add support for more than two alt_size under same bridge Yinghai Lu
2015-07-14 22:46 ` [PATCH v2 24/49] PCI: Better support for two alt_size Yinghai Lu
2015-07-14 22:46 ` [PATCH v2 25/49] PCI: Don't add too much optional size for hotplug bridge io Yinghai Lu
2015-07-14 22:46 ` [PATCH v2 26/49] PCI: Move ISA ioport align out of calculate_iosize Yinghai Lu
2015-07-14 22:46 ` [PATCH v2 27/49] PCI: Unifiy calculate_size for io port and mmio Yinghai Lu
2015-07-14 22:46 ` [PATCH v2 28/49] PCI: Allow optional only io resource must size to be 0 Yinghai Lu
2015-07-14 22:47 ` [PATCH v2 29/49] PCI: Unify skip_ioresource_align() Yinghai Lu
2015-07-14 22:47 ` [PATCH v2 30/49] PCI: Kill macro checking for bus io port sizing Yinghai Lu
2015-07-14 22:47 ` [PATCH v2 31/49] resources: Split out __allocate_resource() Yinghai Lu
2015-07-14 22:47 ` [PATCH v2 32/49] resources: Make allocate_resource return just fit resource Yinghai Lu
2015-07-14 22:47 ` [PATCH v2 33/49] PCI: Check pref compatible bit for mem64 resource of pcie device Yinghai Lu
2015-07-14 22:47 ` [PATCH v2 34/49] PCI: Only treat non-pef mmio64 as pref if all bridges has MEM_64 Yinghai Lu
2015-07-14 22:47 ` [PATCH v2 35/49] PCI: Add has_mem64 for host_bridge Yinghai Lu
2015-07-14 22:47 ` [PATCH v2 36/49] PCI: Only treat non-pef mmio64 as pref if host-bridge has_mem64 Yinghai Lu
2015-07-14 22:47 ` [PATCH v2 37/49] PCI: Restore pref mmio allocation logic for hostbridge without mmio64 Yinghai Lu
2015-07-14 22:47 ` [PATCH v2 38/49] sparc/PCI: Add mem64 resource parsing for root bus Yinghai Lu
2015-07-14 22:47 ` [PATCH v2 39/49] sparc/PCI: Add IORESOURCE_MEM_64 for 64-bit resource in of parsing Yinghai Lu
2015-07-14 22:47 ` [PATCH v2 40/49] powerpc/PCI: " Yinghai Lu
2015-07-14 22:47 ` [PATCH v2 41/49] of/PCI: Add IORESOURCE_MEM_64 for 64-bit resource Yinghai Lu
2015-07-14 22:47 ` [PATCH v2 42/49] PCI: Treat optional as must in first try for bridge rescan Yinghai Lu
2015-07-14 22:47 ` [PATCH v2 43/49] PCI: Get new realloc size for bridge for last try Yinghai Lu
2015-07-14 22:47 ` [PATCH v2 44/49] PCI: Don't release sibiling bridge resources during hotplug Yinghai Lu
2015-07-14 22:47 ` [PATCH v2 45/49] PCI: Don't release fixed resource for realloc Yinghai Lu
2015-07-14 22:47 ` [PATCH v2 46/49] PCI: Set resource to FIXED for lsi devices Yinghai Lu
2015-07-14 22:47 ` [PATCH v2 47/49] PCI, x86: Add pci=assign_pref_bars to re-allocate pref bars Yinghai Lu
2015-07-14 22:47 ` [PATCH v2 48/49] PCI: Introduce resource_disabled() Yinghai Lu
2015-07-14 22:47 ` [PATCH v2 49/49] PCI: Don't set flags to 0 when assign resource fail Yinghai Lu
2015-07-17 1:51 ` [PATCH v2 00/49] PCI: Resource allocation cleanup for v4.3 Wei Yang
2015-07-17 3:59 ` 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=1436914040-13206-19-git-send-email-yinghai@kernel.org \
--to=yinghai@kernel.org \
--cc=akpm@linux-foundation.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).