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 v6 45/53] PCI: Add debug print out for min_align and alt_size
Date: Wed, 30 Sep 2015 22:53:19 -0700 [thread overview]
Message-ID: <1443678807-786-46-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1443678807-786-1-git-send-email-yinghai@kernel.org>
Put all print out for all children align/size and result align/size
together.
We can print out device name at same time with min_align/alt_size
calculation.
So we can shut off debug print out from get_res_add_size() and
get_res_add_align().
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
drivers/pci/setup-bus.c | 76 ++++++++++++++++++++++++++++++++++++-------------
1 file changed, 56 insertions(+), 20 deletions(-)
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 40a76d6..173c83f 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -159,11 +159,6 @@ static resource_size_t get_res_add_size(struct list_head *head,
if (!dev_res || !dev_res->add_size)
return 0;
- dev_printk(KERN_DEBUG, &dev_res->dev->dev,
- "BAR %d: %pR get_res_add_size add_size %#llx\n",
- (int)(res - &dev_res->dev->resource[0]),
- res, (unsigned long long)dev_res->add_size);
-
return dev_res->add_size;
}
@@ -176,11 +171,6 @@ static resource_size_t get_res_add_align(struct list_head *head,
if (!dev_res || !dev_res->min_align)
return 0;
- dev_printk(KERN_DEBUG, &dev_res->dev->dev,
- "BAR %d: %pR get_res_add_align min_align %#llx\n",
- (int)(res - &dev_res->dev->resource[0]),
- res, (unsigned long long)dev_res->min_align);
-
return dev_res->min_align;
}
@@ -1233,6 +1223,8 @@ struct align_test_res {
struct resource res;
resource_size_t size;
resource_size_t align;
+ struct device *dev;
+ int idx;
};
static void free_align_test_list(struct list_head *head)
@@ -1246,7 +1238,8 @@ static void free_align_test_list(struct list_head *head)
}
static int add_to_align_test_list(struct list_head *head,
- resource_size_t align, resource_size_t size)
+ resource_size_t align, resource_size_t size,
+ struct device *dev, int idx)
{
struct align_test_res *tmp;
@@ -1256,6 +1249,8 @@ static int add_to_align_test_list(struct list_head *head,
tmp->align = align;
tmp->size = size;
+ tmp->dev = dev;
+ tmp->idx = idx;
list_add_tail(&tmp->list, head);
@@ -1321,6 +1316,19 @@ static resource_size_t calculate_mem_align(struct list_head *head,
resource_size_t min_align, good_align, aligned_size, start;
int count = 0;
+ list_for_each_entry(p, head, list)
+ count++;
+
+ printk(KERN_DEBUG " ===========BEGIN===calculate_mem_align========\n");
+ if (count) {
+ printk(KERN_DEBUG " align/size:\n");
+ list_for_each_entry(p, head, list)
+ dev_printk(KERN_DEBUG, p->dev,
+ "BAR %d: %08llx/%08llx\n", p->idx,
+ (unsigned long long)p->align,
+ (unsigned long long)p->size);
+ }
+
if (max_align <= align_low) {
good_align = align_low;
goto out;
@@ -1328,9 +1336,6 @@ static resource_size_t calculate_mem_align(struct list_head *head,
good_align = max_align;
- list_for_each_entry(p, head, list)
- count++;
-
if (count <= 1)
goto out;
@@ -1355,6 +1360,11 @@ static resource_size_t calculate_mem_align(struct list_head *head,
} while (min_align > align_low);
out:
+ printk(KERN_DEBUG " min_align/aligned_size: %08llx/%08llx\n",
+ (unsigned long long)good_align,
+ (unsigned long long)ALIGN(size, good_align));
+ printk(KERN_DEBUG " ===========END===calculate_mem_align==========\n");
+
return good_align;
}
@@ -1372,6 +1382,16 @@ static resource_size_t calculate_mem_alt_size(struct list_head *head,
list_for_each_entry(p, head, list)
count++;
+ printk(KERN_DEBUG " ===========BEGIN===calculate_mem_alt_size=====\n");
+ if (count) {
+ printk(KERN_DEBUG " align/size:\n");
+ list_for_each_entry(p, head, list)
+ dev_printk(KERN_DEBUG, p->dev,
+ "BAR %d: %08llx/%08llx\n", p->idx,
+ (unsigned long long)p->align,
+ (unsigned long long)p->size);
+ }
+
if (count <= 1)
goto out;
@@ -1396,6 +1416,11 @@ static resource_size_t calculate_mem_alt_size(struct list_head *head,
}
out:
+ printk(KERN_DEBUG " alt_align/alt_size: %08llx/%08llx\n",
+ (unsigned long long)max_align,
+ (unsigned long long)good_size);
+ printk(KERN_DEBUG " ===========END===calculate_mem_alt_size=======\n");
+
return good_size;
}
@@ -1476,7 +1501,7 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask,
/* put SRIOV/ROM res to realloc list */
if (realloc_head && is_optional(i)) {
add_to_align_test_list(&align_test_add_list,
- align, r_size);
+ align, r_size, &dev->dev, i);
r->end = r->start - 1;
__add_to_list(realloc_head, dev, r,
r_size, align, 0, 0);
@@ -1495,7 +1520,7 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask,
if (r_size > 1) {
add_to_align_test_list(&align_test_list,
- align, r_size);
+ align, r_size, &dev->dev, i);
size += r_size;
if (align > max_align)
max_align = align;
@@ -1512,7 +1537,8 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask,
add_align = align;
add_to_align_test_list(&align_test_add_list,
add_align,
- r_size + add_r_size);
+ r_size + add_r_size,
+ &dev->dev, i);
sum_add_size += r_size + add_r_size;
if (add_align > max_add_align)
max_add_align = add_align;
@@ -1522,14 +1548,14 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask,
add_to_align_test_list(
&align_test_alt_list,
dev_res->alt_align,
- dev_res->alt_size);
+ dev_res->alt_size, &dev->dev, i);
alt_size += dev_res->alt_size;
if (alt_align < dev_res->alt_align)
alt_align = dev_res->alt_align;
} else if (r_size > 1) {
add_to_align_test_list(
&align_test_alt_list,
- align, r_size);
+ align, r_size, &dev->dev, i);
alt_size += r_size;
if (alt_align < align)
alt_align = align;
@@ -1540,6 +1566,9 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask,
max_align = max(max_align, window_align);
if (size || min_size) {
+ dev_printk(KERN_DEBUG, &bus->self->dev,
+ "BAR %d: bridge window %pR to %pR calculate_mem for MUST\n",
+ (int)(b_res - &bus->self->resource[0]), b_res, &bus->busn_res);
min_align = calculate_mem_align(&align_test_list, max_align,
size, window_align);
size0 = calculate_size(size, min_size,
@@ -1549,6 +1578,9 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask,
if (size0 && realloc_head) {
alt_align = max(alt_align, window_align);
+ dev_printk(KERN_DEBUG, &bus->self->dev,
+ "BAR %d: bridge window %pR to %pR calculate_mem for ALT\n",
+ (int)(b_res - &bus->self->resource[0]), b_res, &bus->busn_res);
/* need to increase size to fit more alt */
alt_size = calculate_mem_alt_size(&align_test_alt_list,
alt_align, alt_size,
@@ -1564,6 +1596,9 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask,
if (sum_add_size < min_sum_size)
sum_add_size = min_sum_size;
if (sum_add_size > size && realloc_head) {
+ dev_printk(KERN_DEBUG, &bus->self->dev,
+ "BAR %d: bridge window %pR to %pR calculate_mem for ADD\n",
+ (int)(b_res - &bus->self->resource[0]), b_res, &bus->busn_res);
min_add_align = calculate_mem_align(&align_test_add_list,
max_add_align, sum_add_size,
window_align);
@@ -1621,7 +1656,8 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask,
final_add_size, min_add_align,
alt_size, alt_align);
dev_printk(KERN_DEBUG, &bus->self->dev,
- "bridge window %pR to %pR add_size %llx add_align %llx alt_size %llx alt_align %llx req_size %llx req_align %llx\n",
+ "BAR %d: bridge window %pR to %pR add_size %llx add_align %llx alt_size %llx alt_align %llx req_size %llx req_align %llx\n",
+ (int)(b_res - &bus->self->resource[0]),
b_res, &bus->busn_res,
(unsigned long long)final_add_size,
(unsigned long long)min_add_align,
--
1.8.4.5
next prev parent reply other threads:[~2015-10-01 5:59 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-01 5:52 [PATCH v6 00/53] PCI: Resource allocation cleanup for v4.4 Yinghai Lu
2015-10-01 5:52 ` [PATCH v6 01/53] sparc/PCI: Add mem64 resource parsing for root bus Yinghai Lu
2015-10-02 20:00 ` Khalid Aziz
2015-10-02 22:05 ` Yinghai Lu
2015-10-02 23:05 ` Khalid Aziz
2015-10-02 23:16 ` Yinghai Lu
2015-10-01 5:52 ` [PATCH v6 02/53] sparc/PCI: Add IORESOURCE_MEM_64 for 64-bit resource in OF parsing Yinghai Lu
2015-10-01 5:52 ` [PATCH v6 03/53] powerpc/PCI: " Yinghai Lu
2015-10-01 5:52 ` [PATCH v6 04/53] OF/PCI: Add IORESOURCE_MEM_64 for 64-bit resource Yinghai Lu
2015-10-01 5:52 ` [PATCH v6 05/53] PCI: Don't release fixed resource for realloc Yinghai Lu
2015-10-01 5:52 ` [PATCH v6 06/53] PCI: Claim fixed resource during remove/rescan path Yinghai Lu
2015-10-01 5:52 ` [PATCH v6 07/53] PCI: Set resource to FIXED for LSI devices Yinghai Lu
2015-10-01 5:52 ` [PATCH v6 08/53] PCI: Separate realloc list checking after allocation Yinghai Lu
2015-10-01 5:52 ` [PATCH v6 09/53] PCI: Treat optional as required in first try for bridge rescan Yinghai Lu
2015-10-01 5:52 ` [PATCH v6 10/53] PCI: Get new realloc size for bridge for last try Yinghai Lu
2015-10-01 5:52 ` [PATCH v6 11/53] PCI: Don't release sibling bridge resources during hotplug Yinghai Lu
2015-10-01 5:52 ` [PATCH v6 12/53] PCI: Cleanup res_to_dev_res() printout Yinghai Lu
2015-10-01 5:52 ` [PATCH v6 13/53] PCI: Reuse res_to_dev_res() in reassign_resources_sorted() Yinghai Lu
2015-10-01 5:52 ` [PATCH v6 14/53] PCI: Use correct align for optional only resources during sorting Yinghai Lu
2015-10-01 5:52 ` [PATCH v6 15/53] PCI: Optimize bus min_align/size calculation during sizing Yinghai Lu
2015-10-01 5:52 ` [PATCH v6 16/53] PCI: Optimize bus align/size calculation for optional " Yinghai Lu
2015-10-01 5:52 ` [PATCH v6 17/53] PCI: Don't add too much optional size for hotplug bridge MMIO Yinghai Lu
2015-10-01 5:52 ` [PATCH v6 18/53] PCI: Reorder resources list for required/optional resources Yinghai Lu
2015-10-01 5:52 ` [PATCH v6 19/53] PCI: Remove duplicated code for resource sorting Yinghai Lu
2015-10-01 5:52 ` [PATCH v6 20/53] PCI: Rename pdev_sort_resources() to pdev_assign_resources_prepare() Yinghai Lu
2015-10-01 5:52 ` [PATCH v6 21/53] PCI: Treat ROM resource as optional during realloc Yinghai Lu
2015-10-01 5:52 ` [PATCH v6 22/53] PCI: Add debug printout during releasing partial assigned resources Yinghai Lu
2015-10-01 5:52 ` [PATCH v6 23/53] PCI: Simplify res reference using in __assign_resources_sorted() Yinghai Lu
2015-10-01 5:52 ` [PATCH v6 24/53] PCI: Add __add_to_list() Yinghai Lu
2015-10-01 5:52 ` [PATCH v6 25/53] PCI: Cache window alignment value during bus sizing Yinghai Lu
2015-10-01 5:53 ` [PATCH v6 26/53] PCI: Check if resource is allocated before trying to assign one Yinghai Lu
2015-10-01 5:53 ` [PATCH v6 27/53] PCI: Separate out save_resources()/restore_resources() Yinghai Lu
2015-10-01 5:53 ` [PATCH v6 28/53] PCI: Move comment to pci_need_to_release() Yinghai Lu
2015-10-01 5:53 ` [PATCH v6 29/53] PCI: Separate required+optional assigning to another function Yinghai Lu
2015-10-01 5:53 ` [PATCH v6 30/53] PCI: Skip required+optional if there is no optional Yinghai Lu
2015-10-01 5:53 ` [PATCH v6 31/53] PCI: Move saved required resource list out of required+optional assigning Yinghai Lu
2015-10-01 5:53 ` [PATCH v6 32/53] PCI: Add alt_size ressource allocation support Yinghai Lu
2015-10-01 5:53 ` [PATCH v6 33/53] PCI: Add support for more than two alt_size entries under same bridge Yinghai Lu
2015-10-01 5:53 ` [PATCH v6 34/53] PCI: Fix size calculation with old_size on rescan path Yinghai Lu
2015-10-01 5:53 ` [PATCH v6 35/53] PCI: Don't add too much optional size for hotplug bridge io Yinghai Lu
2015-10-01 5:53 ` [PATCH v6 36/53] PCI: Move ISA io port align out of calculate_iosize() Yinghai Lu
2015-10-01 5:53 ` [PATCH v6 37/53] PCI: Don't add too much io port for hotplug bridge with old size Yinghai Lu
2015-10-01 5:53 ` [PATCH v6 38/53] PCI: Unify calculate_size() for io port and MMIO Yinghai Lu
2015-10-01 5:53 ` [PATCH v6 39/53] PCI: Allow bridge optional only io port resource required size to be 0 Yinghai Lu
2015-10-01 5:53 ` [PATCH v6 40/53] PCI: Unify skip_ioresource_align() Yinghai Lu
2015-10-01 8:17 ` Thomas Gleixner
2015-10-01 5:53 ` [PATCH v6 41/53] PCI: Kill macro checking for bus io port sizing Yinghai Lu
2015-10-01 5:53 ` [PATCH v6 42/53] resources: Split out __allocate_resource() Yinghai Lu
2015-10-01 5:53 ` [PATCH v6 43/53] resources: Make allocate_resource() return best fit resource Yinghai Lu
2015-10-01 5:53 ` [PATCH v6 44/53] PCI, x86: Allocate from high in available window for MMIO Yinghai Lu
2015-10-01 5:53 ` Yinghai Lu [this message]
2015-10-01 5:53 ` [PATCH v6 46/53] PCI: Check pref compatible bit for mem64 resource of PCIe device Yinghai Lu
2015-10-01 5:53 ` [PATCH v6 47/53] PCI: Only treat non-pref mmio64 as pref if all bridges have MEM_64 Yinghai Lu
2015-10-01 5:53 ` [PATCH v6 48/53] PCI: Add has_mem64 for struct host_bridge Yinghai Lu
2015-10-01 5:53 ` [PATCH v6 49/53] PCI: Only treat non-pref mmio64 as pref if host bridge has mmio64 Yinghai Lu
2015-10-01 5:53 ` [PATCH v6 50/53] PCI: Restore pref MMIO allocation logic for host bridge without mmio64 Yinghai Lu
2015-10-01 5:53 ` [PATCH v6 51/53] PCI, x86: Add pci=assign_pref_bars to reallocate pref BARs Yinghai Lu
2015-10-01 5:53 ` [PATCH v6 52/53] PCI: Introduce resource_disabled() Yinghai Lu
2015-10-01 5:53 ` [PATCH v6 53/53] PCI: Don't set flags to 0 when assign resource fail 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=1443678807-786-46-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).