On Mon, May 19, 2014 at 02:03:14PM +0100, Alan wrote:
> From: Alan <alan@xxxxxxxxxxxxxxx>
>
> This is needed for some of the Xeon Phi type systems.
>
> Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
I applied this to my pci/resource branch for v3.16. Nikhil
posted essentially the same patch a couple years ago, so I added
his signed-off-by and adopted his use of ARRAY_SIZE() to connect the
"order > 13" test with the aligns[] declaration.
Bjorn
> ---
> 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 d219d44..4184112 100644
> --- a/drivers/pci/setup-bus.c
> +++ b/drivers/pci/setup-bus.c
> @@ -921,7 +921,7 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask,
> {
> struct pci_dev *dev;
> resource_size_t min_align, align, size, size0, size1;
> - resource_size_t aligns[12]; /* Alignments from 1Mb to 2Gb */
> + resource_size_t aligns[14]; /* Alignments from 1Mb to 8Gb */
> int order, max_order;
> struct resource *b_res = find_free_bus_resource(bus, type);
> unsigned int mem64_mask = 0;
> @@ -960,7 +960,7 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask,
> /* For bridges size != alignment */
> align = pci_resource_alignment(dev, r);
> order = __ffs(align) - 20;
> - if (order > 11) {
> + if (order > 13) {
> dev_warn(&dev->dev, "disabling BAR %d: %pR "
> "(bad alignment %#llx)\n", i, r,
> (unsigned long long) align);
>
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
