From: "Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
To: linux-pci@vger.kernel.org, "Bjorn Helgaas" <bhelgaas@google.com>,
"Lorenzo Pieralisi" <lorenzo.pieralisi@arm.com>,
"Rob Herring" <robh@kernel.org>,
"Krzysztof Wilczyński" <kw@linux.com>,
"Igor Mammedov" <imammedo@redhat.com>,
"Lukas Wunner" <lukas@wunner.de>,
"Mika Westerberg" <mika.westerberg@linux.intel.com>,
"Andy Shevchenko" <andriy.shevchenko@intel.com>,
"Rafael J . Wysocki" <rafael@kernel.org>,
"Jesse Barnes" <jbarnes@virtuousgeek.org>,
"Yinghai Lu" <yinghai@kernel.org>,
linux-kernel@vger.kernel.org
Cc: "Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
Subject: [PATCH v2 1/7] PCI: Fix resource double counting on remove & rescan
Date: Thu, 28 Dec 2023 18:57:01 +0200 [thread overview]
Message-ID: <20231228165707.3447-2-ilpo.jarvinen@linux.intel.com> (raw)
In-Reply-To: <20231228165707.3447-1-ilpo.jarvinen@linux.intel.com>
pbus_size_mem() keeps the size of the optional resources in
children_add_size. When calculating the PCI bridge window size,
calculate_memsize() lower bounds size by old_size before adding
children_add_size and performing the window size alignment. This
results in double counting for the resources in children_add_size
because old_size may be based on the previous size of the bridge
window after it has already included children_add_size (that is,
size1 in pbus_size_mem() from an earlier invocation of that
function).
As a result, on repeated remove of the bus & rescan cycles the resource
size keeps increasing when children_add_size is non-zero as can be seen
from this extract:
iomem0: 23fffd00000-23fffdfffff : PCI Bus 0000:03
iomem1: 20000000000-200001fffff : PCI Bus 0000:03
iomem2: 20000000000-200002fffff : PCI Bus 0000:03
iomem3: 20000000000-200003fffff : PCI Bus 0000:03
iomem4: 20000000000-200004fffff : PCI Bus 0000:03
Solve the double counting by moving old_size check later in
calculate_memsize() so that children_add_size is already accounted for.
After the patch, the bridge window retains its size as expected:
iomem0: 23fffd00000-23fffdfffff : PCI Bus 0000:03
iomem1: 20000000000-200000fffff : PCI Bus 0000:03
iomem2: 20000000000-200000fffff : PCI Bus 0000:03
Fixes: a4ac9fea016f ("PCI : Calculate right add_size")
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
---
drivers/pci/setup-bus.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index fd74f1c99dba..e3e6ff8854a7 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -820,11 +820,9 @@ static resource_size_t calculate_memsize(resource_size_t size,
size = min_size;
if (old_size == 1)
old_size = 0;
- if (size < old_size)
- size = old_size;
- size = ALIGN(max(size, add_size) + children_add_size, align);
- return size;
+ size = max(size, add_size) + children_add_size;
+ return ALIGN(max(size, old_size), align);
}
resource_size_t __weak pcibios_window_alignment(struct pci_bus *bus,
--
2.30.2
next prev parent reply other threads:[~2023-12-28 16:57 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-28 16:57 [PATCH v2 0/7] PCI: Solve two bridge window sizing issues Ilpo Järvinen
2023-12-28 16:57 ` Ilpo Järvinen [this message]
2023-12-28 16:57 ` [PATCH v2 2/7] resource: Rename find_resource() to find_empty_resource_slot() Ilpo Järvinen
2024-05-03 20:49 ` Bjorn Helgaas
2024-05-06 12:30 ` Ilpo Järvinen
2023-12-28 16:57 ` [PATCH v2 3/7] resource: Document find_empty_resource_slot() and resource_constraint Ilpo Järvinen
2024-05-03 20:51 ` Bjorn Helgaas
2023-12-28 16:57 ` [PATCH v2 4/7] resource: Use typedef for alignf callback Ilpo Järvinen
2023-12-28 16:57 ` [PATCH v2 5/7] resource: Handle simple alignment inside __find_empty_resource_slot() Ilpo Järvinen
2023-12-28 16:57 ` [PATCH v2 6/7] resource: Export find_empty_resource_slot() Ilpo Järvinen
2023-12-28 16:57 ` [PATCH v2 7/7] PCI: Relax bridge window tail sizing rules Ilpo Järvinen
2024-05-03 20:43 ` Bjorn Helgaas
2024-05-06 11:55 ` Ilpo Järvinen
2023-12-29 12:24 ` [PATCH v2 0/7] PCI: Solve two bridge window sizing issues Mika Westerberg
2024-01-04 12:12 ` Igor Mammedov
2024-01-04 12:18 ` Jonathan Woithe
2024-01-11 8:00 ` Jonathan Woithe
2024-01-18 6:48 ` Jonathan Woithe
2024-01-18 9:27 ` Ilpo Järvinen
2024-01-21 12:54 ` Andy Shevchenko
2024-01-21 22:20 ` Jonathan Woithe
2024-01-22 12:37 ` Ilpo Järvinen
2024-01-22 13:45 ` Igor Mammedov
2024-01-31 22:48 ` Jonathan Woithe
2024-02-01 14:47 ` Ilpo Järvinen
2024-03-15 10:33 ` Ilpo Järvinen
2024-03-15 14:39 ` Andy Shevchenko
2024-04-09 14:53 ` Jonathan Cameron
2024-04-11 10:41 ` Ilpo Järvinen
2024-04-11 11:16 ` Andy Shevchenko
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=20231228165707.3447-2-ilpo.jarvinen@linux.intel.com \
--to=ilpo.jarvinen@linux.intel.com \
--cc=andriy.shevchenko@intel.com \
--cc=bhelgaas@google.com \
--cc=imammedo@redhat.com \
--cc=jbarnes@virtuousgeek.org \
--cc=kw@linux.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=lukas@wunner.de \
--cc=mika.westerberg@linux.intel.com \
--cc=rafael@kernel.org \
--cc=robh@kernel.org \
--cc=yinghai@kernel.org \
/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).