From: Bjorn Helgaas <bhelgaas@google.com>
To: Yongji Xie <elohimes@gmail.com>
Cc: zhong@linux.vnet.ibm.com, Alexey Kardashevskiy <aik@ozlabs.ru>,
linux-pci@vger.kernel.org, Gavin Shan <gwshan@linux.vnet.ibm.com>,
Alex Williamson <alex.williamson@redhat.com>,
Paul Mackerras <paulus@samba.org>,
Michael Ellerman <mpe@ellerman.id.au>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
linuxppc-dev@lists.ozlabs.org
Subject: [PATCH v11 2/7] PCI: A fix for caculating bridge window's size and alignment
Date: Mon, 17 Apr 2017 16:36:39 -0500 [thread overview]
Message-ID: <20170417213639.21092.22951.stgit@bhelgaas-glaptop.roam.corp.google.com> (raw)
In-Reply-To: <20170417212705.21092.90222.stgit@bhelgaas-glaptop.roam.corp.google.com>
From: Yongji Xie <elohimes@gmail.com>
In case that one device's alignment is greater than its size,
we may get an incorrect size and alignment for its bus's memory
window in pbus_size_mem(). This patch fixes this case.
Signed-off-by: Yongji Xie <elohimes@gmail.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/pci/setup-bus.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index cb389277df41..958da7db9033 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -1066,10 +1066,10 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask,
r->flags = 0;
continue;
}
- size += r_size;
+ size += max(r_size, align);
/* Exclude ranges with size > align from
calculation of the alignment. */
- if (r_size == align)
+ if (r_size <= align)
aligns[order] += align;
if (order > max_order)
max_order = order;
next prev parent reply other threads:[~2017-04-17 21:36 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-17 21:36 [PATCH v11 0/7] PCI: Introduce a way to enforce all MMIO BARs not to share PAGE_SIZE Bjorn Helgaas
2017-04-17 21:36 ` [PATCH v11 1/7] PCI: Ignore requested alignment for IOV BARs Bjorn Helgaas
2017-04-17 21:36 ` Bjorn Helgaas [this message]
2017-04-17 21:45 ` [PATCH v11 2/7] PCI: A fix for caculating bridge window's size and alignment Yinghai Lu
2017-04-18 2:16 ` Yongji Xie
2017-04-17 21:36 ` [PATCH v11 3/7] PCI: Add pcibios_default_alignment() for arch-specific alignment control Bjorn Helgaas
2017-04-17 21:36 ` [PATCH v11 4/7] powerpc/powernv: Override pcibios_default_alignment() to force PCI devices to be page aligned Bjorn Helgaas
2017-04-18 5:30 ` Michael Ellerman
2017-04-18 13:53 ` Bjorn Helgaas
2017-04-19 1:47 ` Michael Ellerman
2017-04-19 2:12 ` Yongji Xie
2017-04-19 17:53 ` Bjorn Helgaas
2017-04-17 21:37 ` [PATCH v11 5/7] PCI: Factor pci_reassigndev_resource_alignment() Bjorn Helgaas
2017-04-17 21:37 ` [PATCH v11 6/7] PCI: Don't reassign resources that are already aligned Bjorn Helgaas
2017-04-17 21:37 ` [PATCH v11 7/7] PCI: Don't resize resources when realigning all devices in system Bjorn Helgaas
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=20170417213639.21092.22951.stgit@bhelgaas-glaptop.roam.corp.google.com \
--to=bhelgaas@google.com \
--cc=aik@ozlabs.ru \
--cc=alex.williamson@redhat.com \
--cc=benh@kernel.crashing.org \
--cc=elohimes@gmail.com \
--cc=gwshan@linux.vnet.ibm.com \
--cc=linux-pci@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=paulus@samba.org \
--cc=zhong@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).