[PATCH v9 42/60] PCI: Move saved required resource list out of required+optional assigning

[Yinghai Lu]

We will need to share saved required list for alt_size support, so move
it out from required+optional assigning.

Signed-off-by: Yinghai Lu <ying...@kernel.org>
---
 drivers/pci/setup-bus.c | 30 --
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 5a2cd66..1df6345 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -456,6 +456,9 @@ static bool has_addon(struct list_head *head,
int add_count = 0;
struct pci_dev_resource *dev_res, *tmp_res;
 
+   if (!realloc_head)
+   return false;
+
/* check if we have add really */
list_for_each_entry(dev_res, head, list) {
tmp_res = res_to_dev_res(realloc_head, dev_res->res);
@@ -492,9 +495,9 @@ static void restore_resource(struct pci_dev_resource 
*save_res,
 }
 
 static bool __assign_resources_required_optional_sorted(struct list_head *head,
+struct list_head *save_head,
 struct list_head *realloc_head)
 {
-   LIST_HEAD(save_head);
LIST_HEAD(local_fail_head);
struct pci_dev_resource *save_res;
struct pci_dev_resource *dev_res, *tmp_res;
@@ -502,12 +505,6 @@ static bool 
__assign_resources_required_optional_sorted(struct list_head *head,
resource_size_t add_align, add_size;
struct resource *res;
 
-   if (!has_addon(head, realloc_head))
-   return false;
-
-   if (!save_resources(head, _head))
-   return false;
-
/* Update res in head list with add_size in realloc_head list */
list_for_each_entry(dev_res, head, list) {
res = dev_res->res;
@@ -548,7 +545,6 @@ static bool 
__assign_resources_required_optional_sorted(struct list_head *head,
/* Remove head list from realloc_head list */
list_for_each_entry(dev_res, head, list)
remove_from_list(realloc_head, dev_res->res);
-   free_list(_head);
free_list(head);
 
return true;
@@ -562,7 +558,7 @@ static bool 
__assign_resources_required_optional_sorted(struct list_head *head,
if (res->parent && !pci_need_to_release(fail_type, res)) {
/* remove it from realloc_head list */
remove_from_list(realloc_head, res);
-   remove_from_list(_head, res);
+   remove_from_list(save_head, res);
list_del(_res->list);
kfree(dev_res);
}
@@ -581,11 +577,9 @@ static bool 
__assign_resources_required_optional_sorted(struct list_head *head,
}
}
/* Restore start/end/flags from saved list */
-   list_for_each_entry(save_res, _head, list)
+   list_for_each_entry(save_res, save_head, list)
restore_resource(save_res, save_res->res);
 
-   free_list(_head);
-
return false;
 }
 
@@ -603,16 +597,24 @@ static void __assign_resources_sorted(struct list_head 
*head,
 *then try to reassign add_size for some resources.
 */
 
+   LIST_HEAD(save_head);
+
/* Check required+optional add */
-   if (realloc_head &&
-   __assign_resources_required_optional_sorted(head, realloc_head))
+   if (has_addon(head, realloc_head) &&
+   save_resources(head, _head) &&
+   __assign_resources_required_optional_sorted(head, _head,
+  realloc_head)) {
+   free_list(_head);
return;
+   }
 
sort_resources(head);
 
/* Satisfy the must-have resource requests */
assign_requested_resources_sorted(head, fail_head);
 
+   free_list(_head);
+
/* Try to satisfy any additional optional resource
requests */
if (realloc_head)
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v9 35/60] PCI: Add __add_to_list()

[Yinghai Lu]

For alt_size support, we will add more entries to realloc list.

Add new __add_to_list() to take alt_size, alt_align.

And simplify add_to_list() not to take add/alt input.

Signed-off-by: Yinghai Lu <ying...@kernel.org>
---
 drivers/pci/setup-bus.c | 51 ++---
 1 file changed, 31 insertions(+), 20 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 715e627..936564f 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -66,6 +66,8 @@ struct pci_dev_resource {
resource_size_t end;
resource_size_t add_size;
resource_size_t min_align;
+   resource_size_t alt_size;
+   resource_size_t alt_align;
unsigned long flags;
 };
 
@@ -88,15 +90,16 @@ static void free_list(struct list_head *head)
  * @add_size:  additional size to be optionally added
  *  to the resource
  */
-static int add_to_list(struct list_head *head,
+static int __add_to_list(struct list_head *head,
 struct pci_dev *dev, struct resource *res,
-resource_size_t add_size, resource_size_t min_align)
+resource_size_t add_size, resource_size_t min_align,
+resource_size_t alt_size, resource_size_t alt_align)
 {
struct pci_dev_resource *tmp;
 
tmp = kzalloc(sizeof(*tmp), GFP_KERNEL);
if (!tmp) {
-   pr_warn("add_to_list: kmalloc() failed!\n");
+   pr_warn("__add_to_list: kmalloc() failed!\n");
return -ENOMEM;
}
 
@@ -107,12 +110,20 @@ static int add_to_list(struct list_head *head,
tmp->flags = res->flags;
tmp->add_size = add_size;
tmp->min_align = min_align;
+   tmp->alt_size = alt_size;
+   tmp->alt_align = alt_align;
 
list_add(>list, head);
 
return 0;
 }
 
+static int add_to_list(struct list_head *head,
+struct pci_dev *dev, struct resource *res)
+{
+   return __add_to_list(head, dev, res, 0, 0, 0, 0);
+}
+
 static void remove_from_list(struct list_head *head,
 struct resource *res)
 {
@@ -378,9 +389,7 @@ static void assign_requested_resources_sorted(struct 
list_head *head,
if (resource_size(res) &&
pci_assign_resource(dev_res->dev, idx)) {
if (fail_head)
-   add_to_list(fail_head, dev_res->dev, res,
-   0 /* don't care */,
-   0 /* don't care */);
+   add_to_list(fail_head, dev_res->dev, res);
reset_resource(res);
}
}
@@ -466,7 +475,7 @@ static void __assign_resources_sorted(struct list_head 
*head,
 
/* Save original start, end, flags etc at first */
list_for_each_entry(dev_res, head, list) {
-   if (add_to_list(_head, dev_res->dev, dev_res->res, 0, 0)) {
+   if (add_to_list(_head, dev_res->dev, dev_res->res)) {
free_list(_head);
goto requested_and_reassign;
}
@@ -1057,8 +1066,8 @@ static void pbus_size_io(struct pci_bus *bus, 
resource_size_t min_size,
b_res->end = b_res->start + size0 - 1;
b_res->flags |= IORESOURCE_STARTALIGN;
if (size1 > size0 && realloc_head) {
-   add_to_list(realloc_head, bus->self, b_res, size1-size0,
-   min_align);
+   __add_to_list(realloc_head, bus->self, b_res,
+ size1 - size0, min_align, 0, 0);
dev_printk(KERN_DEBUG, >self->dev, "bridge window %pR to 
%pR add_size %llx\n",
   b_res, >busn_res,
   (unsigned long long)size1-size0);
@@ -1262,7 +1271,8 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned 
long mask,
add_to_align_test_list(_test_add_list,
align, r_size);
r->end = r->start - 1;
-   add_to_list(realloc_head, dev, r, r_size, 0/* 
don't care */);
+   __add_to_list(realloc_head, dev, r,
+ r_size, align, 0, 0);
sum_add_size += r_size;
if (align > max_add_align)
max_add_align = align;
@@ -1333,8 +1343,8 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned 
long mask,
b_res->end = size0 + min_align - 1;
b_res->flags |= IORESOURCE_STARTALIGN;
if (size1 > size0 && realloc_head) {
-   add_to_list(realloc_head, bus->s

[PATCH v9 39/60] PCI: Move comment to pci_need_to_release()

[Yinghai Lu]

Move comment from caller to pci_need_to_release(), as we will have one new
caller for alt_size support.

Signed-off-by: Yinghai Lu <ying...@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 9485b03..a8e3eaa 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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v9 28/60] PCI: Don't add too much optional size for hotplug bridge MMIO

[Yinghai Lu]

Current code will always add 2M for hotplug bridge MMIO even
there is child device under it already.

For example:
40:03.0 --- 43:00.0 --- 44:02.0 -+- 45:00.0
 \- 45:00.1

44:02.0 will need 1M as must for 45:00.0 and 45:00.1
When we calculate add_size for 44:02.0, we pass 2M as additional
size for hotplug bridge, total will be 3M.

That is different from code before changes for optional support,
or even current code that treat optional as required directly by
not passing realloc list. We only need 2M as total.

The optional size should be 1M, and total size should be 2M.

This patch change to comparing required+optional with min_sum_size to
get smaller optional size.

Signed-off-by: Yinghai Lu <ying...@kernel.org>
---
 drivers/pci/setup-bus.c | 28 +++-
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index d8db9e3..53014e1 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -1199,7 +1199,6 @@ out:
  * @type2: second match type
  * @type3: third match type
  * @min_size : the minimum memory window that must to be allocated
- * @add_size : additional optional memory window
  * @realloc_head : track the additional memory window on this list
  *
  * Calculate the size of the bus and minimal alignment which
@@ -1212,10 +1211,11 @@ out:
 static int pbus_size_mem(struct pci_bus *bus, unsigned long mask,
 unsigned long type, unsigned long type2,
 unsigned long type3,
-resource_size_t min_size, resource_size_t add_size,
+resource_size_t min_size,
 struct list_head *realloc_head)
 {
struct pci_dev *dev;
+   resource_size_t min_sum_size = 0;
resource_size_t min_align = 0, min_add_align = 0;
resource_size_t max_align = 0, max_add_align = 0;
resource_size_t size = 0, size0 = 0, size1 = 0, sum_add_size = 0;
@@ -1227,6 +1227,11 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned 
long mask,
if (!b_res)
return -ENOSPC;
 
+   if (realloc_head) {
+   min_sum_size = min_size;
+   min_size = 0;
+   }
+
list_for_each_entry(dev, >devices, bus_list) {
int i;
 
@@ -1299,8 +1304,8 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned 
long mask,
}
free_align_test_list(_test_list);
 
-   if ((sum_add_size - size) < add_size)
-   sum_add_size = size + add_size;
+   if (sum_add_size < min_sum_size)
+   sum_add_size = min_sum_size;
if (sum_add_size > size && realloc_head) {
min_add_align = calculate_mem_align(_test_add_list,
max_add_align, sum_add_size,
@@ -1437,7 +1442,7 @@ void __pci_bus_size_bridges(struct pci_bus *bus, struct 
list_head *realloc_head)
 {
struct pci_dev *dev;
unsigned long mask, prefmask, type2 = 0, type3 = 0;
-   resource_size_t additional_mem_size = 0, additional_io_size = 0;
+   resource_size_t min_mem_size = 0, additional_io_size = 0;
struct resource *b_res;
int ret;
 
@@ -1474,7 +1479,7 @@ void __pci_bus_size_bridges(struct pci_bus *bus, struct 
list_head *realloc_head)
case PCI_CLASS_BRIDGE_PCI:
if (bus->self->is_hotplug_bridge) {
additional_io_size  = pci_hotplug_io_size;
-   additional_mem_size = pci_hotplug_mem_size;
+   min_mem_size = pci_hotplug_mem_size;
}
/* Fall through */
default:
@@ -1494,8 +1499,7 @@ void __pci_bus_size_bridges(struct pci_bus *bus, struct 
list_head *realloc_head)
prefmask |= IORESOURCE_MEM_64;
ret = pbus_size_mem(bus, prefmask, prefmask,
  prefmask, prefmask,
- realloc_head ? 0 : additional_mem_size,
- additional_mem_size, realloc_head);
+ min_mem_size, realloc_head);
 
/*
 * If successful, all non-prefetchable resources
@@ -1518,8 +1522,7 @@ void __pci_bus_size_bridges(struct pci_bus *bus, struct 
list_head *realloc_head)
prefmask &= ~IORESOURCE_MEM_64;
ret = pbus_size_mem(bus, prefmask, prefmask,
 prefmask, prefmask,
-realloc_head ? 0 : additional_mem_size,
-additional_mem_size, realloc_head);
+min_mem_size, realloc_head);
 
/*
 * If successful, only non-prefetchable resources
@@ -1528,7 +1531,7 @

[PATCH v9 07/60] PCI: Ignore BAR for ALi M1533 PCI-ISA bridge

[Yinghai Lu]

Meelis reported strange conflicts on sparc v210:
pci 0001:00:07.0: can't claim BAR 2 [mem 0x7ff-0x7ff000f]: address 
conflict with 0001:00:07.0 [mem 0x7ff-0x7ff000f]
pci 0001:00:06.0: can't claim BAR 0 [io 0x7fe0100-0x7fe010f]: address 
conflict with 0001:00:07.0 [io 0x7fe0100-0x7fe0100]
pci 0001:00:0d.0: can't claim BAR 0 [io 0x7fe01000900-0x7fe01000907]: address 
conflict with 0001:00:07.0 [io 0x7fe0100-0x7fe0100]
pci 0001:00:0d.0: can't claim BAR 1 [io 0x7fe01000918-0x7fe0100091f]: address 
conflict with 0001:00:07.0 [io 0x7fe0100-0x7fe0100]
pci 0001:00:0d.0: can't claim BAR 2 [io 0x7fe01000910-0x7fe01000917]: address 
conflict with 0001:00:07.0 [io 0x7fe0100-0x7fe0100]
pci 0001:00:0d.0: can't claim BAR 3 [io 0x7fe01000908-0x7fe0100090f]: address 
conflict with 0001:00:07.0 [io 0x7fe0100-0x7fe0100]
pci 0001:00:0d.0: can't claim BAR 4 [io 0x7fe01000920-0x7fe0100092f]: address 
conflict with 0001:00:07.0 [io 0x7fe0100-0x7fe0100]
PCI: /pci@1e,60 can't claim Video RAM area [mem 
0x7ff000a-0x7ff000b]: address conflict with 0001:00:07.0 [mem 
0x7ff-0x7ff000f]
PCI: /pci@1e,60 can't claim System ROM [mem 0x7ff000f-0x7ff000f]: 
address conflict with 0001:00:07.0 [mem 0x7ff-0x7ff000f]
PCI: /pci@1e,60 can't claim Video ROM [mem 0x7ff000c-0x7ff000c7fff]: 
address conflict with 0001:00:07.0 [mem 0x7ff-0x7ff000f]

we have
pci_bus 0001:00: root bus resource [io  0x7fe0100-0x7fe01ff] (bus 
address [0x-0xff])
pci_bus 0001:00: root bus resource [mem 0x7ff-0x7ff] (bus 
address [0x-0x])

so pci bus address in the bars for 0001:00:07.0 has all 0s.

0001:00:07.0 ISA bridge: ULi Electronics Inc. M1533/M1535/M1543 PCI to ISA 
Bridge [Aladdin IV/V/V+]
Region 0: [virtual] I/O ports at  [size=64K]
Region 1: Memory at  (32-bit, non-prefetchable) [size=1M]
Region 2: Memory at  (32-bit, non-prefetchable) [size=1M]
00: b9 10 33 15 0f 00 10 02 00 00 01 06 00 00 00 00
10: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
20: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
30: 00 00 00 00 a0 00 00 00 00 00 00 00 00 00 00 00

According to http://www.versalogic.com/Support/Downloads/pdf/ali1543.pdf
page 28: The indices before 40h are read-only.
and we have all 0 from 0x10-0x2f, according to lspci.
So those BAR do not work as regular BAR, just clean flags, and ignore them all
the way include claim and sizing and alloc etc.

Reported-by: Meelis Roos <mr...@linux.ee>
Signed-off-by: Yinghai Lu <ying...@kernel.org>
---
 drivers/pci/quirks.c | 15 +++
 1 file changed, 15 insertions(+)

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 7354127..3618c06 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -433,6 +433,21 @@ static void quirk_amd_nl_class(struct pci_dev *pdev)
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_NL_USB,
quirk_amd_nl_class);
 
+
+/*
+ * ALi m1533 pci to isa bridge does not have BAR according to datasheet,
+ * clear the flags, so we will try to claim them or reallocate res.
+ */
+static void quirk_ali1533(struct pci_dev *dev)
+{
+   int i;
+
+   for (i = 0; i < PCI_ROM_RESOURCE; i++)
+   dev->resource[i].flags = 0;
+}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533,
+quirk_ali1533);
+
 static void piix4_io_quirk(struct pci_dev *dev, const char *name, unsigned int 
port, unsigned int enable)
 {
u32 devres;
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v9 09/60] powerpc/PCI: Add IORESOURCE_MEM_64 for 64-bit resource in OF parsing

[Yinghai Lu]

For device resource PREF bit setting under bridge 64-bit pref resource,
we need to make sure only set PREF for 64bit resource, so set
IORESOUCE_MEM_64 for 64bit resource during of device resource flags
parsing.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=96261
Link: https://bugzilla.kernel.org/show_bug.cgi?id=96241
Signed-off-by: Yinghai Lu <ying...@kernel.org>
Cc: Benjamin Herrenschmidt <b...@kernel.crashing.org>
Cc: Paul Mackerras <pau...@samba.org>
Cc: Michael Ellerman <m...@ellerman.id.au>
Cc: Gavin Shan <gws...@linux.vnet.ibm.com>
Cc: Yijing Wang <wangyij...@huawei.com>
Cc: Anton Blanchard <an...@samba.org>
Cc: linuxppc-...@lists.ozlabs.org
---
 arch/powerpc/kernel/pci_of_scan.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/powerpc/kernel/pci_of_scan.c 
b/arch/powerpc/kernel/pci_of_scan.c
index 349ed11..d7305d7 100644
--- a/arch/powerpc/kernel/pci_of_scan.c
+++ b/arch/powerpc/kernel/pci_of_scan.c
@@ -44,8 +44,10 @@ static unsigned int pci_parse_of_flags(u32 addr0, int bridge)
 
if (addr0 & 0x0200) {
flags = IORESOURCE_MEM | PCI_BASE_ADDRESS_SPACE_MEMORY;
-   flags |= (addr0 >> 22) & PCI_BASE_ADDRESS_MEM_TYPE_64;
flags |= (addr0 >> 28) & PCI_BASE_ADDRESS_MEM_TYPE_1M;
+   if (addr0 & 0x0100)
+   flags |= IORESOURCE_MEM_64
+| PCI_BASE_ADDRESS_MEM_TYPE_64;
if (addr0 & 0x4000)
flags |= IORESOURCE_PREFETCH
 | PCI_BASE_ADDRESS_MEM_PREFETCH;
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v9 25/60] PCI: Use correct align for optional only resources during sorting

[Yinghai Lu]

During sorting before assign, we only put resource with non-zero align
in the sorted list, so for optional resources that required size is 0 and
only have optional parts, we need to have correct align.

While treating SRIOV as optional resources, we always read alignment for
SRIOV bars every time, so they are ok.
Hotplug bridge resources are using STARTALIGN so it is ok when size is 0
if we have correct start for them.

Later we want to treat the ROM BAR as optional resource, and it has
SIZEALIGN, so align=size will be 0. We need to find a way to get align
for them.

We can use optional resource align instead in that case, and it
is ok for SRIOV path and hotplug bridge resource path.

We need to pass realloc list from sizing stage to sorting stage, and
get entry from realloc list and calculate align from the entry.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=81431
Reported-by: TJ <li...@iam.tj>
Signed-off-by: Yinghai Lu <ying...@kernel.org>
---
 drivers/pci/setup-bus.c | 49 ++---
 1 file changed, 42 insertions(+), 7 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 6f6cf25..31334a1 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -145,9 +145,42 @@ static resource_size_t get_res_add_align(struct list_head 
*head,
return dev_res->min_align;
 }
 
+static resource_size_t __pci_resource_alignment(
+   struct pci_dev *dev,
+   struct resource *r,
+   struct list_head *realloc_head)
+{
+   resource_size_t r_align = pci_resource_alignment(dev, r);
+   resource_size_t orig_start, orig_end;
+   struct pci_dev_resource *dev_res;
+
+   if (r_align || !realloc_head)
+   return r_align;
+
+   dev_res = res_to_dev_res(realloc_head, r);
+   if (!dev_res || !dev_res->add_size)
+   return r_align;
+
+   orig_start = r->start;
+   orig_end = r->end;
+   r->end += dev_res->add_size;
+   if ((r->flags & IORESOURCE_STARTALIGN)) {
+   resource_size_t r_size = resource_size(r);
+
+   r->start = dev_res->min_align;
+   r->end = r->start + r_size - 1;
+   }
+   r_align = pci_resource_alignment(dev, r);
+   r->start = orig_start;
+   r->end = orig_end;
+
+   return r_align;
+}
 
 /* Sort resources by alignment */
-static void pdev_sort_resources(struct pci_dev *dev, struct list_head *head)
+static void pdev_sort_resources(struct pci_dev *dev,
+struct list_head *realloc_head,
+struct list_head *head)
 {
int i;
 
@@ -165,7 +198,7 @@ static void pdev_sort_resources(struct pci_dev *dev, struct 
list_head *head)
if (!(r->flags) || r->parent)
continue;
 
-   r_align = pci_resource_alignment(dev, r);
+   r_align = __pci_resource_alignment(dev, r, realloc_head);
if (!r_align) {
dev_warn(>dev, "BAR %d: %pR has bogus alignment\n",
 i, r);
@@ -183,8 +216,9 @@ static void pdev_sort_resources(struct pci_dev *dev, struct 
list_head *head)
list_for_each_entry(dev_res, head, list) {
resource_size_t align;
 
-   align = pci_resource_alignment(dev_res->dev,
-dev_res->res);
+   align = __pci_resource_alignment(dev_res->dev,
+dev_res->res,
+realloc_head);
 
if (r_align > align) {
n = _res->list;
@@ -197,6 +231,7 @@ static void pdev_sort_resources(struct pci_dev *dev, struct 
list_head *head)
 }
 
 static void __dev_sort_resources(struct pci_dev *dev,
+struct list_head *realloc_head,
 struct list_head *head)
 {
u16 class = dev->class >> 8;
@@ -213,7 +248,7 @@ static void __dev_sort_resources(struct pci_dev *dev,
return;
}
 
-   pdev_sort_resources(dev, head);
+   pdev_sort_resources(dev, realloc_head, head);
 }
 
 static inline void reset_resource(struct resource *res)
@@ -507,7 +542,7 @@ static void pdev_assign_resources_sorted(struct pci_dev 
*dev,
 {
LIST_HEAD(head);
 
-   __dev_sort_resources(dev, );
+   __dev_sort_resources(dev, add_head, );
__assign_resources_sorted(, add_head, fail_head);
 
 }
@@ -520,7 +555,7 @@ static void pbus_assign_resources_sorted(const struct 
pci_bus *bus,
LIST_HEAD(head);
 
list_for_each_entry(dev, >devices, bus_list)
-   __dev_sort_resource

[PATCH v9 10/60] OF/PCI: Add IORESOURCE_MEM_64 for 64-bit resource

[Yinghai Lu]

For device resource PREF bit setting under bridge 64-bit pref resource,
we need to make sure only set PREF for 64bit resource, so set
IORESOUCE_MEM_64 for 64bit resource during OF device resource flags
parsing.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=96261
Link: https://bugzilla.kernel.org/show_bug.cgi?id=96241
Signed-off-by: Yinghai Lu <ying...@kernel.org>
Cc: Grant Likely <grant.lik...@linaro.org>
Cc: Rob Herring <robh...@kernel.org>
Cc: devicet...@vger.kernel.org
Tested-by: Khalid Aziz <khalid.a...@oracle.com>
---
 drivers/of/address.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/of/address.c b/drivers/of/address.c
index 9582c57..95c39c8 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -128,9 +128,11 @@ static unsigned int of_bus_pci_get_flags(const __be32 
*addr)
flags |= IORESOURCE_IO;
break;
case 0x02: /* 32 bits */
-   case 0x03: /* 64 bits */
flags |= IORESOURCE_MEM;
break;
+   case 0x03: /* 64 bits */
+   flags |= IORESOURCE_MEM | IORESOURCE_MEM_64;
+   break;
}
if (w & 0x4000)
flags |= IORESOURCE_PREFETCH;
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v9 13/60] PCI: Add has_mem64 for struct host_bridge

[Yinghai Lu]

Add has_mem64 for struct host_bridge, on root bus that does not support
mmio64 above 4g, will not set that.

We will use that info next two following patches:
1. Don't treat non-pref mmio64 as pref mmio, so will not put
   it under bridge's pref range when rescan the devices
2. will keep pref mmio64 and pref mmio32 under bridge pref bar.

Signed-off-by: Yinghai Lu <ying...@kernel.org>
Tested-by: Khalid Aziz <khalid.a...@oracle.com>
---
 drivers/pci/probe.c | 7 +++
 include/linux/pci.h | 1 +
 2 files changed, 8 insertions(+)

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 6faabe3..b89daef 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -2194,6 +2194,13 @@ struct pci_bus *pci_create_root_bus(struct device 
*parent, int bus,
} else
bus_addr[0] = '\0';
dev_info(>dev, "root bus resource %pR%s\n", res, bus_addr);
+
+   if (resource_type(res) == IORESOURCE_MEM) {
+   if ((res->end - offset) > 0x)
+   bridge->has_mem64 = 1;
+   if ((res->start - offset) > 0x)
+   res->flags |= IORESOURCE_MEM_64;
+   }
}
 
down_write(_bus_sem);
diff --git a/include/linux/pci.h b/include/linux/pci.h
index f96f86a..c135edc 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -413,6 +413,7 @@ struct pci_host_bridge {
void (*release_fn)(struct pci_host_bridge *);
void *release_data;
unsigned int ignore_reset_delay:1;  /* for entire hierarchy */
+   unsigned int has_mem64:1;
/* Resource alignment requirements */
resource_size_t (*align_resource)(struct pci_dev *dev,
const struct resource *res,
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v9 36/60] PCI: Cache window alignment value during bus sizing

[Yinghai Lu]

There are several calling to window_alignment(), and we will have more
for alt_size support, cache the value instead of keeping on getting it.

Signed-off-by: Yinghai Lu <ying...@kernel.org>
---
 drivers/pci/setup-bus.c | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 936564f..e5b3d8c 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -1241,6 +1241,7 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned 
long mask,
mask | IORESOURCE_PREFETCH, type);
LIST_HEAD(align_test_list);
LIST_HEAD(align_test_add_list);
+   resource_size_t window_align;
 
if (!b_res)
return -ENOSPC;
@@ -1250,6 +1251,8 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned 
long mask,
min_size = 0;
}
 
+   window_align = window_alignment(bus, b_res->flags);
+
list_for_each_entry(dev, >devices, bus_list) {
int i;
 
@@ -1312,10 +1315,10 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned 
long mask,
}
}
 
-   max_align = max(max_align, window_alignment(bus, b_res->flags));
+   max_align = max(max_align, window_align);
if (size || min_size) {
min_align = calculate_mem_align(_test_list, max_align,
-size, window_alignment(bus, b_res->flags));
+   size, window_align);
size0 = calculate_memsize(size, min_size,
  resource_size(b_res), min_align);
}
@@ -1326,7 +1329,7 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned 
long mask,
if (sum_add_size > size && realloc_head) {
min_add_align = calculate_mem_align(_test_add_list,
max_add_align, sum_add_size,
-   window_alignment(bus, b_res->flags));
+   window_align);
size1 = calculate_memsize(sum_add_size, min_size,
 resource_size(b_res), min_add_align);
}
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v9 20/60] PCI: Treat optional as required in first try for bridge rescan

[Yinghai Lu]

For rescan bridge/bus that children are removed before, we should treat
optional as required just like root bus the boot time in 19aa7ee432ce
(PCI: make re-allocation try harder by reassigning ranges higher in
the heirarchy).

The reason: allocate required and expand to optional path do not
put failed resource to fail list, so will lose required info before
next try.

So we are using following way:
1. First and following try before last try:
   We don't keep realloc list so treat every optional as required.
   allocate for required+optional and put failed in the fail list.
   then size info (include must and optonal separatedly) will be kept
   for next try.
2. last try:
   a: try to allocate required+optional to see if all get allocated.
   b: try to allocate required then expand to optional.

Signed-off-by: Yinghai Lu <ying...@kernel.org>
---
 drivers/pci/setup-bus.c | 19 ++-
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index fcc6d62..e4972f5 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -1846,25 +1846,34 @@ void __init pci_assign_unassigned_resources(void)
 void pci_assign_unassigned_bridge_resources(struct pci_dev *bridge)
 {
struct pci_bus *parent = bridge->subordinate;
-   LIST_HEAD(add_list); /* list of resources that
+   LIST_HEAD(realloc_head); /* list of resources that
want additional resources */
+   struct list_head *add_list = NULL;
int tried_times = 0;
LIST_HEAD(fail_head);
struct pci_dev_resource *fail_res;
int retval;
unsigned long type_mask = IORESOURCE_IO | IORESOURCE_MEM |
  IORESOURCE_PREFETCH | IORESOURCE_MEM_64;
+   int pci_try_num = 2;
 
 again:
-   __pci_bus_size_bridges(parent, _list);
-   __pci_bridge_assign_resources(bridge, _list, _head);
-   pci_bus_check_realloc(_list);
+   /*
+* last try will use add_list, otherwise will try good to have as
+* must have, so can realloc parent bridge resource
+*/
+   if (tried_times + 1 == pci_try_num)
+   add_list = _head;
+   __pci_bus_size_bridges(parent, add_list);
+   __pci_bridge_assign_resources(bridge, add_list, _head);
+   if (add_list)
+   pci_bus_check_realloc(add_list);
tried_times++;
 
if (list_empty(_head))
goto enable_all;
 
-   if (tried_times >= 2) {
+   if (tried_times >= pci_try_num) {
/* still fail, don't need to try more */
free_list(_head);
goto enable_all;
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v9 46/60] PCI: Don't add too much optional size for hotplug bridge io

[Yinghai Lu]

Same as patch for MMIO (PCI: Don't add too much optional size for hotplug
bridge MMIO), and this one is for io port.

It will compare required+optional with min_sum_size to get smaller
optional size.

Signed-off-by: Yinghai Lu <ying...@kernel.org>
---
 drivers/pci/setup-bus.c | 26 --
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index c8b3ea6..0ece6b6 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -1177,7 +1177,6 @@ static resource_size_t window_alignment(struct pci_bus 
*bus,
  *
  * @bus : the bus
  * @min_size : the minimum io window that must to be allocated
- * @add_size : additional optional io window
  * @realloc_head : track the additional io window on this list
  *
  * Sizing the IO windows of the PCI-PCI bridge is trivial,
@@ -1186,9 +1185,11 @@ static resource_size_t window_alignment(struct pci_bus 
*bus,
  * We must be careful with the ISA aliasing though.
  */
 static void pbus_size_io(struct pci_bus *bus, resource_size_t min_size,
-   resource_size_t add_size, struct list_head *realloc_head)
+struct list_head *realloc_head)
 {
struct pci_dev *dev;
+   resource_size_t min_sum_size = 0;
+   resource_size_t sum_add_size;
struct resource *b_res = find_free_bus_resource(bus, IORESOURCE_IO,
IORESOURCE_IO);
resource_size_t size = 0, size0 = 0, size1 = 0;
@@ -1198,6 +1199,11 @@ static void pbus_size_io(struct pci_bus *bus, 
resource_size_t min_size,
if (!b_res)
return;
 
+   if (realloc_head) {
+   min_sum_size = min_size;
+   min_size = 0;
+   }
+
min_align = window_alignment(bus, IORESOURCE_IO);
list_for_each_entry(dev, >devices, bus_list) {
int i;
@@ -1227,10 +1233,11 @@ static void pbus_size_io(struct pci_bus *bus, 
resource_size_t min_size,
 
size0 = calculate_iosize(size, min_size, size1,
resource_size(b_res), min_align);
-   if (children_add_size > add_size)
-   add_size = children_add_size;
-   size1 = (!realloc_head || (realloc_head && !add_size)) ? size0 :
-   calculate_iosize(size, min_size, add_size + size1,
+   sum_add_size = children_add_size + size + size1;
+   if (sum_add_size < min_sum_size)
+   sum_add_size = min_sum_size;
+   size1 = !realloc_head ? size0 :
+   calculate_iosize(size, min_size, sum_add_size - size,
resource_size(b_res), min_align);
if (!size0 && !size1) {
if (b_res->start || b_res->end)
@@ -1758,7 +1765,7 @@ void __pci_bus_size_bridges(struct pci_bus *bus, struct 
list_head *realloc_head)
 {
struct pci_dev *dev;
unsigned long mask, prefmask, type2 = 0, type3 = 0;
-   resource_size_t min_mem_size = 0, additional_io_size = 0;
+   resource_size_t min_mem_size = 0, min_io_size = 0;
struct resource *b_res;
int ret;
 
@@ -1794,13 +1801,12 @@ void __pci_bus_size_bridges(struct pci_bus *bus, struct 
list_head *realloc_head)
 
case PCI_CLASS_BRIDGE_PCI:
if (bus->self->is_hotplug_bridge) {
-   additional_io_size  = pci_hotplug_io_size;
+   min_io_size  = pci_hotplug_io_size;
min_mem_size = pci_hotplug_mem_size;
}
/* Fall through */
default:
-   pbus_size_io(bus, realloc_head ? 0 : additional_io_size,
-additional_io_size, realloc_head);
+   pbus_size_io(bus, min_io_size, realloc_head);
 
/*
 * If there's a 64-bit prefetchable MMIO window, compute
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v9 27/60] PCI: Optimize bus align/size calculation for optional during sizing

[Yinghai Lu]

Current add_align always use max align, that make required+optional
to get allocated more than needed in some cases.

Now we have new calculate_mem_align(), so we could use it for
add_align calculation.

Need to create separated list for required+optional align/size info.

After that we can get smaller add_align/size, and we have more chance
to make required+optional to get allocated sucessfully.

The result for bridge that have Intel 4x10g card installed:

 pci :20:03.2: bridge window [mem 0x-0x000f 64bit pref]
to [bus 2a-31] calculate_mem for required
 align/size:
   0080/0080, 0080/0080, 0080/0080,
   0080/0080, 8000/8000, 8000/8000,
   8000/8000, 8000/8000
 original min_align/min_size: 0040/0240
 new min_align/min_size: 0040/0240

 pci :20:03.2: bridge window [mem 0x-0x000f 64bit pref]
to [bus 2a-31] calculate_mem for required+optional
 align/size:
   0080/0080, 0080/0080, 0080/0080,
   0080/0080, 0001/0020, 0001/0020,
   0001/0020, 0001/0020, 8000/8000,
   8000/8000, 8000/8000, 8000/8000,
   4000/0008, 4000/0008, 4000/0008,
   4000/0008
 original code min_align/min_size: 0080/0300
 new min_align/min_size: 0010/02b0

so required align/size: 0x40/0x240, and
new required+optional align/size: 0x10/0x2b0, and it is much better
than original required+optional align/size: 0x80/0x300
and even have smaller min_align than required.

-v2: remove not used size1 in calculate_memsize

Link: https://bugzilla.kernel.org/show_bug.cgi?id=81431
Reported-by: TJ <li...@iam.tj>
Signed-off-by: Yinghai Lu <ying...@kernel.org>


 drivers/pci/setup-bus.c |   82 +---
 1 file changed, 51 insertions(+), 31 deletions(-)
---
 drivers/pci/setup-bus.c | 82 ++---
 1 file changed, 51 insertions(+), 31 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 6e67608..d8db9e3 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -944,7 +944,6 @@ static resource_size_t calculate_iosize(resource_size_t 
size,
 
 static resource_size_t calculate_memsize(resource_size_t size,
resource_size_t min_size,
-   resource_size_t size1,
resource_size_t old_size,
resource_size_t align)
 {
@@ -954,7 +953,7 @@ static resource_size_t calculate_memsize(resource_size_t 
size,
old_size = 0;
if (size < old_size)
size = old_size;
-   size = ALIGN(size + size1, align);
+   size = ALIGN(size, align);
return size;
 }
 
@@ -1217,26 +1216,23 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned 
long mask,
 struct list_head *realloc_head)
 {
struct pci_dev *dev;
-   resource_size_t min_align, align, size, size0, size1;
-   resource_size_t max_align = 0;
+   resource_size_t min_align = 0, min_add_align = 0;
+   resource_size_t max_align = 0, max_add_align = 0;
+   resource_size_t size = 0, size0 = 0, size1 = 0, sum_add_size = 0;
struct resource *b_res = find_free_bus_resource(bus,
mask | IORESOURCE_PREFETCH, type);
-   resource_size_t children_add_size = 0;
-   resource_size_t children_add_align = 0;
-   resource_size_t add_align = 0;
LIST_HEAD(align_test_list);
+   LIST_HEAD(align_test_add_list);
 
if (!b_res)
return -ENOSPC;
 
-   size = 0;
-
list_for_each_entry(dev, >devices, bus_list) {
int i;
 
for (i = 0; i < PCI_NUM_RESOURCES; i++) {
struct resource *r = >resource[i];
-   resource_size_t r_size;
+   resource_size_t r_size, align;
int flags = pci_resource_pref_compatible(dev, r);
 
if (r->parent || (flags & IORESOURCE_PCI_FIXED) ||
@@ -1244,19 +1240,23 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned 
long mask,
 (flags & mask) != type2 &&
 (flags & mask) != type3))
continue;
+
r_size = resource_size(r);
+   align = pci_resource_alignment(dev, r);
 #ifdef CONFIG_PCI_IOV
/* put SRIOV requested res to the optional list */
if (realloc_head && i >= PCI_IOV_RESOURCES &&
i <= PCI_IOV_RESOURCE_END) {
-   add_align = max(pci_resource_alignment(dev, r), 
add_align);

[PATCH v9 43/60] PCI: Add alt_size ressource allocation support

[Yinghai Lu]

On system with several pcie switches, BIOS allocate very tight resources
to the bridge bar, and it is not aligned to min_align as kernel allocation
code.

For example:
  02:03.0---0c:00.0---0d:04.0---18:00.0

  18:00.0 need 0x1000, and 0x0001.
BIOS only allocate 0x1010 to 0d:04.0 and above bridges.
Later after using /sys/bus/pci/devices/:0c:00.0/remove to remove 0c:00.0,
rescan with /sys/bus/pci/rescan can not allocate 0x1800 to 0c:00.0.
as current min_align solution will need 0x1800.

Another example:
  00:1c.0---02:00.0---03:01.0---04:00.0---05:19.0---06:00.0

  06:00.0 need 0x400 and 0x80.
BIOS only allocate 0x480 to 05:19.0 and 04:00.0.
when 05:19.0 get removed via /sys/bus/pci/devices/:05:19.0/remove,
rescan with /sys/bus/pci/rescan will fail.
 pci :05:19.0: BAR 14: no space for [mem size 0x0600]
 pci :05:19.0: BAR 14: failed to assign [mem size 0x0600]
 pci :06:00.0: BAR 2: no space for [mem size 0x0400 64bit]
 pci :06:00.0: BAR 2: failed to assign [mem size 0x0400 64bit]
 pci :06:00.0: BAR 0: no space for [mem size 0x0080]
 pci :06:00.0: BAR 0: failed to assign [mem size 0x0080]
current code try to use align 0x200 and size 0x600, but parent
bridge only have 0x480.

Introduce alt_align/alt_size and store them in realloc list in addition
to addon info, and will try it after min_align/min_size allocation fails.

The alt_align is max_align, and alt_size is aligned size with bridge
minimum window alignment.

On my test setup:
  00:1c.7---61:00.0---62:00.0

  62:00.0 needs 0x80 and 0x2, and 00:1c.7 only have 9M allocated
for mmio, with this patch we have

 pci :61:00.0: bridge window [mem 0x0040-0x00ff] to [bus 62]
   add_size 0 add_align 0 alt_size 90 alt_align 80
   req_size c0 req_align 40
 pci :61:00.0: BAR 14: no space for [mem size 0x00c0]
 pci :61:00.0: BAR 14: failed to assign [mem size 0x00c0]
 pci :61:00.0: BAR 14: assigned [mem 0xdf00-0xdf8f]
 pci :62:00.0: BAR 0: assigned [mem 0xdf00-0xdf7f pref]
 pci :62:00.0: BAR 1: assigned [mem 0xdf80-0xdf81]
 pci :61:00.0: PCI bridge to [bus 62]
 pci :61:00.0:   bridge window [io  0x6000-0x6fff]
 pci :61:00.0:   bridge window [mem 0xdf00-0xdf8f]
 pci :00:1c.7: PCI bridge to [bus 61-68]
 pci :00:1c.7:   bridge window [io  0x6000-0x6fff]
 pci :00:1c.7:   bridge window [mem 0xdf00-0xdf8f]

So for 61:00.0 first try with 12M fails, and second try with 9M the
alt_size works. Later 62:00.0 get correct resource allocated too.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=100451
Reported-by: Yijing Wang <wangyij...@huawei.com>
Tested-by: Yijing Wang <wangyij...@huawei.com>
Signed-off-by: Yinghai Lu <ying...@kernel.org>
---
 drivers/pci/setup-bus.c | 203 +---
 1 file changed, 191 insertions(+), 12 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 1df6345..51c3b3d 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -323,7 +323,7 @@ static void reassign_resources_sorted(struct list_head 
*realloc_head,
 {
struct resource *res;
struct pci_dev_resource *add_res, *tmp;
-   resource_size_t add_size, align;
+   resource_size_t add_size, align, r_size;
int idx;
 
list_for_each_entry_safe(add_res, tmp, realloc_head, list) {
@@ -339,12 +339,23 @@ static void reassign_resources_sorted(struct list_head 
*realloc_head,
idx = res - _res->dev->resource[0];
add_size = add_res->add_size;
align = add_res->min_align;
-   if (!resource_size(res)) {
+   if (!add_size || !align) /* alt_size only */
+   goto out;
+
+   r_size = resource_size(res);
+   if (!r_size) {
res->start = align;
res->end = res->start + add_size - 1;
if (pci_assign_resource(add_res->dev, idx))
reset_resource(res);
} else {
+   /* could just assigned with alt, add difference ? */
+   resource_size_t size;
+
+   size = add_res->end - add_res->start + 1;
+   if (r_size < size)
+   add_size += size - r_size;
+
res->flags |= add_res->flags &
 (IORESOURCE_STARTALIGN|IORESOURCE_SIZEALIGN);
if (pci_reassign_resource(add_res->dev, idx,
@@ -583,6 +594,104 @@ static bool 
__assign_resources_required_optional_sorted(struct list_head *head,
return false;
 }
 
+static bool __has_alt(struct list_head *head,
+   struct list_head *realloc_head)
+{
+   int a

[PATCH v9 31/60] PCI: Rename pdev_sort_resources() to pdev_assign_resources_prepare()

[Yinghai Lu]

pdev_sort_resources() etc was checking devices resources and putting
resources that need to assign to one list in sorted order.

Now we don't do sorting in those functions anymore, so change to
pdev_assign_resources_prepare() instead.

Signed-off-by: Yinghai Lu <ying...@kernel.org>
---
 drivers/pci/setup-bus.c | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index cba7ccc..194d5da 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -205,8 +205,8 @@ static resource_size_t __pci_resource_alignment(
return r_align;
 }
 
-/* Sort resources by alignment */
-static void pdev_sort_resources(struct pci_dev *dev,
+/* check resources and save to the list */
+static void pdev_assign_resources_prepare(struct pci_dev *dev,
 struct list_head *realloc_head,
 struct list_head *head)
 {
@@ -242,7 +242,7 @@ static void pdev_sort_resources(struct pci_dev *dev,
}
 }
 
-static void __dev_sort_resources(struct pci_dev *dev,
+static void __dev_assign_resources_prepare(struct pci_dev *dev,
 struct list_head *realloc_head,
 struct list_head *head)
 {
@@ -260,7 +260,7 @@ static void __dev_sort_resources(struct pci_dev *dev,
return;
}
 
-   pdev_sort_resources(dev, realloc_head, head);
+   pdev_assign_resources_prepare(dev, realloc_head, head);
 }
 
 static inline void reset_resource(struct resource *res)
@@ -566,7 +566,7 @@ static void pdev_assign_resources_sorted(struct pci_dev 
*dev,
 {
LIST_HEAD(head);
 
-   __dev_sort_resources(dev, add_head, );
+   __dev_assign_resources_prepare(dev, add_head, );
__assign_resources_sorted(, add_head, fail_head);
 
 }
@@ -579,7 +579,7 @@ static void pbus_assign_resources_sorted(const struct 
pci_bus *bus,
LIST_HEAD(head);
 
list_for_each_entry(dev, >devices, bus_list)
-   __dev_sort_resources(dev, realloc_head, );
+   __dev_assign_resources_prepare(dev, realloc_head, );
 
__assign_resources_sorted(, realloc_head, fail_head);
 }
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v9 19/60] PCI: Separate realloc list checking after allocation

[Yinghai Lu]

We check the realloc list, as list must be empty after allocation.

Separate the realloc list checking to another function.

Add checking that is missed in acpiphp driver.

-v2: change to WARN_ON according to Rafael.

Signed-off-by: Yinghai Lu <ying...@kernel.org>
Cc: "Rafael J. Wysocki" <r...@rjwysocki.net>
Cc: Len Brown <l...@kernel.org>
Cc: linux-a...@vger.kernel.org
---
 drivers/pci/hotplug/acpiphp_glue.c |  1 +
 drivers/pci/pci.h  |  1 +
 drivers/pci/setup-bus.c| 12 +---
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/drivers/pci/hotplug/acpiphp_glue.c 
b/drivers/pci/hotplug/acpiphp_glue.c
index ff53856..ce9fb21 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -507,6 +507,7 @@ static void enable_slot(struct acpiphp_slot *slot)
}
}
__pci_bus_assign_resources(bus, _list, NULL);
+   pci_bus_check_realloc(_list);
 
acpiphp_sanitize_bus(bus);
pcie_bus_configure_settings(bus);
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index d6e8c0c..51f38d3 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -240,6 +240,7 @@ void __pci_bus_size_bridges(struct pci_bus *bus,
 void __pci_bus_assign_resources(const struct pci_bus *bus,
struct list_head *realloc_head,
struct list_head *fail_head);
+void pci_bus_check_realloc(struct list_head *realloc_head);
 bool pci_bus_clip_resource(struct pci_dev *dev, int idx);
 
 void pci_reassigndev_resource_alignment(struct pci_dev *dev);
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 1ad5d8f..fcc6d62 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -280,6 +280,12 @@ out:
}
 }
 
+void pci_bus_check_realloc(struct list_head *realloc_head)
+{
+   if (WARN_ON(!list_empty(realloc_head)))
+   free_list(realloc_head);
+}
+
 /**
  * assign_requested_resources_sorted() - satisfy resource requests
  *
@@ -1777,7 +1783,7 @@ again:
/* Depth last, allocate resources and update the hardware. */
__pci_bus_assign_resources(bus, add_list, _head);
if (add_list)
-   BUG_ON(!list_empty(add_list));
+   pci_bus_check_realloc(add_list);
tried_times++;
 
/* any device complain? */
@@ -1852,7 +1858,7 @@ void pci_assign_unassigned_bridge_resources(struct 
pci_dev *bridge)
 again:
__pci_bus_size_bridges(parent, _list);
__pci_bridge_assign_resources(bridge, _list, _head);
-   BUG_ON(!list_empty(_list));
+   pci_bus_check_realloc(_list);
tried_times++;
 
if (list_empty(_head))
@@ -1911,6 +1917,6 @@ void pci_assign_unassigned_bus_resources(struct pci_bus 
*bus)
 _list);
up_read(_bus_sem);
__pci_bus_assign_resources(bus, _list, NULL);
-   BUG_ON(!list_empty(_list));
+   pci_bus_check_realloc(_list);
 }
 EXPORT_SYMBOL_GPL(pci_assign_unassigned_bus_resources);
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v9 06/60] PCI: Kill wrong quirk about M7101

[Yinghai Lu]

Meelis reported that qla2000 driver does not get loaded on one sparc system.

schizo f00732d0: PCI host bridge to bus 0001:00
pci_bus 0001:00: root bus resource [io  0x7fe0100-0x7fe01ff] (bus 
address [0x-0xff])
pci 0001:00:06.0: quirk: [io  0x7fe01000800-0x7fe0100083f] claimed by ali7101 
ACPI
pci 0001:00:06.0: quirk: [io  0x7fe01000600-0x7fe0100061f] claimed by ali7101 
SMB
pci 0001:00:07.0: can't claim BAR 0 [io  0x7fe0100-0x7fe0100]: address 
conflict with 0001:00:06.0 [io  0x7fe01000600-0x7fe0100061f]

So the quirk for M7101 claim the io range early.

According to spec with M7101 in M1543 page 103/104,
http://www.versalogic.com/Support/Downloads/pdf/ali1543.pdf
0xe0, and 0xe2 do not include address info for acpi/smb.

Kill wrong quirk about them.

Link: http://kodu.ut.ee/~mroos/dm/dm.v240
Link: http://kodu.ut.ee/~mroos/dm/dm.sb100
Reported-by: Meelis Roos <mr...@linux.ee>
Cc: Meelis Roos <mr...@linux.ee>
Signed-off-by: Yinghai Lu <ying...@kernel.org>
Tested-by: Khalid Aziz <khalid.a...@oracle.com>
---
 drivers/pci/quirks.c | 18 --
 1 file changed, 18 deletions(-)

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 7e32730..7354127 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -433,24 +433,6 @@ static void quirk_amd_nl_class(struct pci_dev *pdev)
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_NL_USB,
quirk_amd_nl_class);
 
-/*
- * Let's make the southbridge information explicit instead
- * of having to worry about people probing the ACPI areas,
- * for example.. (Yes, it happens, and if you read the wrong
- * ACPI register it will put the machine to sleep with no
- * way of waking it up again. Bummer).
- *
- * ALI M7101: Two IO regions pointed to by words at
- * 0xE0 (64 bytes of ACPI registers)
- * 0xE2 (32 bytes of SMB registers)
- */
-static void quirk_ali7101_acpi(struct pci_dev *dev)
-{
-   quirk_io_region(dev, 0xE0, 64, PCI_BRIDGE_RESOURCES, "ali7101 ACPI");
-   quirk_io_region(dev, 0xE2, 32, PCI_BRIDGE_RESOURCES+1, "ali7101 SMB");
-}
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101, 
quirk_ali7101_acpi);
-
 static void piix4_io_quirk(struct pci_dev *dev, const char *name, unsigned int 
port, unsigned int enable)
 {
u32 devres;
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v9 05/60] sparc/PCI: Keep resource idx order with bridge register number

[Yinghai Lu]

On one system found strang "no compatible bridge window" warning

PCI: Claiming :00:01.0: Resource 14: 00020001..000200010fff 
[10220c]
PCI: Claiming :01:00.0: Resource 1: 00020001..00020001 
[100214]
pci :01:00.0: can't claim BAR 1 [mem 0x20001-0x20001 
64bit]: no compatible bridge window

and we already had pref_compat support that add extra pref bit for device
resource.

It turns out that pci_resource_compatible()/pci_up_path_over_pref_mem64()
just check resource with bridge pref mmio register idx 15, and we have put
resource to use mmio register idx 14 during of_scan_pci_bridge()
as the bridge does not mmio resource.

We already fix pci_up_path_over_pref_mem64() to check all bus resources.

And at the same time, this patch will make resource to consistent sequence
like other arch or directly from pci_read_bridge_bases(),
even non-pref mmio is missing, or out of ordering in firmware reporting.

So hold i = 1 for non pref mmio, and i = 2 for pref mmio.

Signed-off-by: Yinghai Lu <ying...@kernel.org>
Tested-by: Khalid Aziz <khalid.a...@oracle.com>
---
 arch/sparc/kernel/pci.c | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
index 0e82584..36a0dfb 100644
--- a/arch/sparc/kernel/pci.c
+++ b/arch/sparc/kernel/pci.c
@@ -472,7 +472,7 @@ static void of_scan_pci_bridge(struct pci_pbm_info *pbm,
pci_read_bridge_bases(bus);
goto after_ranges;
}
-   i = 1;
+   i = 3;
for (; len >= 32; len -= 32, ranges += 8) {
u64 start;
 
@@ -504,6 +504,12 @@ static void of_scan_pci_bridge(struct pci_pbm_info *pbm,
   " for bridge %s\n", node->full_name);
continue;
}
+   } else if ((flags & IORESOURCE_PREFETCH) &&
+  !bus->resource[2]->flags) {
+   res = bus->resource[2];
+   } else if (((flags & (IORESOURCE_MEM | IORESOURCE_PREFETCH)) ==
+   IORESOURCE_MEM) && !bus->resource[1]->flags) {
+   res = bus->resource[1];
} else {
if (i >= PCI_NUM_RESOURCES - PCI_BRIDGE_RESOURCES) {
printk(KERN_ERR "PCI: too many memory ranges"
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v9 26/60] PCI: Optimize bus min_align/size calculation during sizing

[Yinghai Lu]

During bus mmio resource sizing stage, current code try to get alignment as
small as possible and use that to align size to get final size. But it does
not handle resource that size is bigger than alignment in optimal way, kernel
only use max alignment for them.

For example:
 When we have resources with align/size: 1M/2M, 512M/512M,
 current code will have bus resource min_align/size: 512M/1024M,
 but optimal value should be 256M/768M, as we can fit them into
 [256M,768M) or [512M,1280M) instead of [512M,1536M).

 0M256M512M   768M   1024M  1280M
 |--|---|--|--|--|--|
when we have [256M,1024M)
|-|
|-2M-|  |---512M--|
when we have [512M,1280M)
||
|---512M--|-2M-|

For following cases that we have resource size that is bigger
than resource alignment:
1. SRIOV bar.
2. PCI bridges with children that need several MMIOs that are more than 1M.

We can keep on trying to allocate children devices resources from range
[offset, offset + aligned_size) and offset is aligned with half min_align.
If it sucesses, we can use that half min_align as new min_align.

After this patch, we get:
 align/size: 1M/2M, 2M/4M, 4M/8M, 8M/16M
 new min_align/min_size: 4M/32M, and original is 8M/32M

 align/size: 1M/2M, 2M/4M, 4M/8M
 new min_align/min_size: 2M/14M, and original is 4M/16M

 align/size: 1M/2M, 512M/512M
 new min_align/min_size: 256M/768M, and original is 512M/1024M

The real result from one system with one pcie card that has
four functions that support sriov:
 children resources with align/size:
   0080/0080, 0080/0080, 0080/0080,
   0080/0080, 0001/0020, 0001/0020,
   0001/0020, 0001/0020, 8000/8000,
   8000/8000, 8000/8000, 8000/8000,
   4000/0008, 4000/0008, 4000/0008,
   4000/0008
for the bridge:
With original code we have min_align/min_size: 0040/02c0,
and with this patch we have min_align/min_size: 0010/02b0
So min_align will be 1M instead of 4M and we even have smaller size.

-v2: Need to check more offset with every min_alignment.
-v3: skip r_size <= 1 for optional only bridge resources.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=81431
Reported-by: TJ <li...@iam.tj>
Signed-off-by: Yinghai Lu <ying...@kernel.org>
---
 drivers/pci/setup-bus.c | 195 ++--
 1 file changed, 157 insertions(+), 38 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 31334a1..6e67608 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -30,6 +30,34 @@
 
 unsigned int pci_flags;
 
+static inline bool is_before(resource_size_t align1, resource_size_t size1,
+resource_size_t align2, resource_size_t size2)
+{
+   resource_size_t size1_left, size2_left;
+
+   /* big align is before small align */
+   if (align1 > align2)
+   return true;
+
+   /*
+* for same align:
+*   aligned is before not aligned
+*   for not aligned, big remainder is before small remainder
+*/
+   if (align1 == align2) {
+   size1_left = size1 & (align1 - 1);
+   if (!size1_left)
+   size1_left = align1;
+   size2_left = size2 & (align2 - 1);
+   if (!size2_left)
+   size2_left = align2;
+   if (size1_left > size2_left)
+   return true;
+   }
+
+   return false;
+}
+
 struct pci_dev_resource {
struct list_head list;
struct resource *res;
@@ -1042,26 +1070,125 @@ static void pbus_size_io(struct pci_bus *bus, 
resource_size_t min_size,
}
 }
 
-static inline resource_size_t calculate_mem_align(resource_size_t *aligns,
- int max_order)
+struct align_test_res {
+   struct list_head list;
+   struct resource res;
+   resource_size_t size;
+   resource_size_t align;
+};
+
+static void free_align_test_list(struct list_head *head)
 {
-   resource_size_t align = 0;
-   resource_size_t min_align = 0;
-   int order;
+   struct align_test_res *p, *tmp;
 
-   for (order = 0; order <= max_order; order++) {
-   resource_size_t align1 = 1;
+   list_for_each_entry_safe(p, tmp, head, list) {
+   list_del(>list);
+   kfree(p);
+   }
+}
 
-   align1 <<= (order + 20);
+static int add_to_align_test_list(struct list_head *head,
+ resource_size_t align, resource_size_t size)
+{
+   struct align_test_res *tmp;
+
+   tmp = kzalloc(sizeof(*tmp), GFP_KERNEL);
+  

[PATCH v9 24/60] PCI: Reuse res_to_dev_res() in reassign_resources_sorted()

[Yinghai Lu]

Now res_to_dev_res() does not print out debug message anymore, so
we can reuse it in reassign_resource_sorted() without confusing printout.

Signed-off-by: Yinghai Lu <ying...@kernel.org>
---
 drivers/pci/setup-bus.c | 11 +--
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 598254a..6f6cf25 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -240,26 +240,17 @@ static void reassign_resources_sorted(struct list_head 
*realloc_head,
 {
struct resource *res;
struct pci_dev_resource *add_res, *tmp;
-   struct pci_dev_resource *dev_res;
resource_size_t add_size, align;
int idx;
 
list_for_each_entry_safe(add_res, tmp, realloc_head, list) {
-   bool found_match = false;
-
res = add_res->res;
/* skip resource that has been reset */
if (!res->flags)
goto out;
 
/* skip this resource if not found in head list */
-   list_for_each_entry(dev_res, head, list) {
-   if (dev_res->res == res) {
-   found_match = true;
-   break;
-   }
-   }
-   if (!found_match)/* just skip */
+   if (!res_to_dev_res(head, res))
continue;
 
idx = res - _res->dev->resource[0];
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v9 57/60] PCI, x86: Add pci=assign_pref_bars to reallocate pref BARs

[Yinghai Lu]

Now some BIOS tend to allocate pref MMIO under non-pref MMIO, or allocate
64bit pref MMIO under 4G.

Add pci=assign_pref_bars to clear and allocate resource to pref BARS.
So could reallocate pref mmio64 above 4G and pref under bridges pref BARs.

Signed-off-by: Yinghai Lu <ying...@kernel.org>
---
 arch/x86/include/asm/pci_x86.h |  1 +
 arch/x86/pci/common.c  |  3 +++
 arch/x86/pci/i386.c| 56 ++
 3 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/arch/x86/include/asm/pci_x86.h b/arch/x86/include/asm/pci_x86.h
index 81a7abf..23bc5d6 100644
--- a/arch/x86/include/asm/pci_x86.h
+++ b/arch/x86/include/asm/pci_x86.h
@@ -34,6 +34,7 @@ do {  \
 #define PCI_NOASSIGN_ROMS  0x8
 #define PCI_ROOT_NO_CRS0x10
 #define PCI_NOASSIGN_BARS  0x20
+#define PCI_ASSIGN_PREF_BARS   0x40
 
 extern unsigned int pci_probe;
 extern unsigned long pirq_table_addr;
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index 70de6d1..0d9112d 100644
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -606,6 +606,9 @@ char *__init pcibios_setup(char *str)
} else if (!strcmp(str, "assign-busses")) {
pci_probe |= PCI_ASSIGN_ALL_BUSSES;
return NULL;
+   } else if (!strcmp(str, "assign_pref_bars")) {
+   pci_probe |= PCI_ASSIGN_PREF_BARS;
+   return NULL;
} else if (!strcmp(str, "use_crs")) {
pci_probe |= PCI_USE__CRS;
return NULL;
diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c
index 21f3e3e..6f27780 100644
--- a/arch/x86/pci/i386.c
+++ b/arch/x86/pci/i386.c
@@ -228,16 +228,25 @@ static void pcibios_allocate_bridge_resources(struct 
pci_dev *dev)
continue;
if (r->parent)  /* Already allocated */
continue;
-   if (!r->start || pci_claim_bridge_resource(dev, idx) < 0) {
-   /*
-* Something is wrong with the region.
-* Invalidate the resource to prevent
-* child resource allocations in this
-* range.
-*/
-   r->start = r->end = 0;
-   r->flags = 0;
-   }
+
+   if ((r->flags & IORESOURCE_PREFETCH) &&
+   (pci_probe & PCI_ASSIGN_PREF_BARS))
+   goto clear;
+
+   if (!r->start)
+   goto clear;
+
+   if (pci_claim_bridge_resource(dev, idx) == 0)
+   continue;
+
+clear:
+   /*
+* Something is wrong with the region.
+* Invalidate the resource to prevent
+* child resource allocations in this range.
+*/
+   r->start = r->end = 0;
+   r->flags = 0;
}
 }
 
@@ -283,21 +292,26 @@ static void pcibios_allocate_dev_resources(struct pci_dev 
*dev, int pass)
else
disabled = !(command & PCI_COMMAND_MEMORY);
if (pass == disabled) {
+   if ((r->flags & IORESOURCE_PREFETCH) &&
+   (pci_probe & PCI_ASSIGN_PREF_BARS))
+   goto clear;
+
dev_dbg(>dev,
"BAR %d: reserving %pr (d=%d, p=%d)\n",
idx, r, disabled, pass);
-   if (pci_claim_resource(dev, idx) < 0) {
-   if (r->flags & IORESOURCE_PCI_FIXED) {
-   dev_info(>dev, "BAR %d %pR 
is immovable\n",
-idx, r);
-   } else {
-   /* We'll assign a new address 
later */
-   pcibios_save_fw_addr(dev,
-   idx, r->start);
-   r->end -= r->start;
-   r->start = 0;
-   }
+   if (pci_claim_resource(dev, idx) == 0)
+   continue;
+   if (r->flags & IORESOURCE_PCI_FIXED) {
+   dev_info(>dev, "BAR %d %pR is 
immovable\n",
+idx, r);
+   continue;
   

[PATCH v9 54/60] resources: Make allocate_resource() return best fit resource

[Yinghai Lu]

Current code just allocate from first avail window.

We can find all suitable empty slots and pick one with smallest size, so
we could save the big slot for needed ones later when we have several pci
bridges under parent bridge and some bridges get assigned from bios and we
need to assign others in kernel.

For examples: we have window
[0xc000, 0xd000), and [0xe000,0xe100)

and we try allocate 0x20 size resource.

in this patch will reserve [0xc000, 0xd000) and
[0xe000,0xe100) at first, then pick [0xe000,0xe100)
to allocate 0x20 size.

-v2: updated after __allocate_resource change, and add field in constraint
instead of passing it directly.
-v3: Use best fit instead of just fit according to Bjorn.

Signed-off-by: Yinghai Lu <ying...@kernel.org>
---
 kernel/resource.c | 81 ++-
 1 file changed, 68 insertions(+), 13 deletions(-)

diff --git a/kernel/resource.c b/kernel/resource.c
index 62321b0..c468875 100644
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -48,6 +48,7 @@ struct resource_constraint {
resource_size_t (*alignf)(void *, const struct resource *,
resource_size_t, resource_size_t);
void *alignf_data;
+   bool fit;
 };
 
 static DEFINE_RWLOCK(resource_lock);
@@ -589,12 +590,15 @@ static void resource_clip(struct resource *res, 
resource_size_t min,
  * alignment constraints
  */
 static int __find_resource(struct resource *root, struct resource *old,
-struct resource *new,
+struct resource *new, struct resource *avail,
 resource_size_t  size,
 struct resource_constraint *constraint)
 {
struct resource *this = root->child;
-   struct resource tmp = *new, avail, alloc;
+   struct resource tmp = *new, availx, alloc;
+
+   if (!avail || avail == new)
+   avail = 
 
tmp.start = root->start;
/*
@@ -618,15 +622,16 @@ static int __find_resource(struct resource *root, struct 
resource *old,
arch_remove_reservations();
 
/* Check for overflow after ALIGN() */
-   avail.start = ALIGN(tmp.start, constraint->align);
-   avail.end = tmp.end;
-   avail.flags = new->flags & ~IORESOURCE_UNSET;
-   if (avail.start >= tmp.start) {
-   alloc.flags = avail.flags;
-   alloc.start = 
constraint->alignf(constraint->alignf_data, ,
+   avail->start = ALIGN(tmp.start, constraint->align);
+   avail->end = tmp.end;
+   avail->flags = new->flags & ~IORESOURCE_UNSET;
+   if (avail->start >= tmp.start) {
+   alloc.flags = avail->flags;
+   alloc.start = constraint->alignf(
+   constraint->alignf_data, avail,
size, constraint->align);
alloc.end = alloc.start + size - 1;
-   if (resource_contains(, )) {
+   if (resource_contains(avail, )) {
new->start = alloc.start;
new->end = alloc.end;
return 0;
@@ -643,6 +648,11 @@ next:  if (!this || this->end == root->end)
return -EBUSY;
 }
 
+struct good_resource {
+   struct list_head list;
+   struct resource avail;
+   struct resource new;
+};
 /*
  * Find empty slot in the resource tree given range and alignment.
  */
@@ -650,7 +660,49 @@ static int find_resource(struct resource *root, struct 
resource *new,
resource_size_t size,
struct resource_constraint  *constraint)
 {
-   return  __find_resource(root, NULL, new, size, constraint);
+   int ret = -1;
+   LIST_HEAD(head);
+   struct good_resource *good, *tmp;
+   resource_size_t avail_size = (resource_size_t)-1ULL;
+
+   if (!constraint->fit)
+   return __find_resource(root, NULL, new, NULL, size,
+   constraint);
+
+   /* find all suitable ones and add to the list */
+   for (;;) {
+   good = kzalloc(sizeof(*good), GFP_KERNEL);
+   if (!good)
+   break;
+
+   good->new.start = new->start;
+   good->new.end = new->end;
+   good->new.flags = new->flags;
+   ret = __find_resource(root, NULL, >new, >avail,
+   size, constraint);
+   if (ret || __request_resource(root, >avail)) {
+   ret = -EBUSY;
+   kfree(good);
+   break;
+   

[PATCH v9 58/60] PCI: Introduce resource_disabled()

[Yinghai Lu]

Current is using !flags, and we are going to use
IORESOURCE_DISABLED instead of clearing resource flags.

Let's convert all !flags to helper function resource_disabled().
resource_disabled will check !flags and IORESOURCE_DISABLED both.

Cc: linux-al...@vger.kernel.org
Cc: linux-i...@vger.kernel.org
Cc: linux-am33-l...@redhat.com
Cc: linuxppc-...@lists.ozlabs.org
Cc: linux-s...@vger.kernel.org
Cc: sparcli...@vger.kernel.org
Cc: linux-...@vger.kernel.org
Cc: linux-xte...@linux-xtensa.org
Cc: io...@lists.linux-foundation.org
Cc: linux...@vger.kernel.org
Signed-off-by: Yinghai Lu <ying...@kernel.org>
Acked-by: Michael Ellerman <m...@ellerman.id.au>
---
 arch/alpha/kernel/pci.c   |  2 +-
 arch/ia64/pci/pci.c   |  4 ++--
 arch/microblaze/pci/pci-common.c  | 15 ---
 arch/mn10300/unit-asb2305/pci-asb2305.c   |  4 ++--
 arch/mn10300/unit-asb2305/pci.c   |  4 ++--
 arch/powerpc/kernel/pci-common.c  | 16 +---
 arch/powerpc/platforms/powernv/pci-ioda.c | 12 ++--
 arch/s390/pci/pci.c   |  2 +-
 arch/sparc/kernel/pci.c   |  2 +-
 arch/x86/pci/i386.c   |  4 ++--
 arch/xtensa/kernel/pci.c  |  4 ++--
 drivers/iommu/intel-iommu.c   |  3 ++-
 drivers/pci/host/pcie-rcar.c  |  2 +-
 drivers/pci/iov.c |  2 +-
 drivers/pci/probe.c   |  2 +-
 drivers/pci/quirks.c  |  4 ++--
 drivers/pci/rom.c |  2 +-
 drivers/pci/setup-bus.c   |  8 
 drivers/pci/setup-res.c   |  2 +-
 include/linux/ioport.h|  4 
 20 files changed, 53 insertions(+), 45 deletions(-)

diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c
index 5f387ee..c89c8ef 100644
--- a/arch/alpha/kernel/pci.c
+++ b/arch/alpha/kernel/pci.c
@@ -282,7 +282,7 @@ pcibios_claim_one_bus(struct pci_bus *b)
for (i = 0; i < PCI_NUM_RESOURCES; i++) {
struct resource *r = >resource[i];
 
-   if (r->parent || !r->start || !r->flags)
+   if (r->parent || !r->start || resource_disabled(r))
continue;
if (pci_has_flag(PCI_PROBE_ONLY) ||
(r->flags & IORESOURCE_PCI_FIXED)) {
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index 8f6ac2f..f00373f 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -333,7 +333,7 @@ void pcibios_fixup_device_resources(struct pci_dev *dev)
for (idx = 0; idx < PCI_BRIDGE_RESOURCES; idx++) {
struct resource *r = >resource[idx];
 
-   if (!r->flags || r->parent || !r->start)
+   if (resource_disabled(r) || r->parent || !r->start)
continue;
 
pci_claim_resource(dev, idx);
@@ -351,7 +351,7 @@ static void pcibios_fixup_bridge_resources(struct pci_dev 
*dev)
for (idx = PCI_BRIDGE_RESOURCES; idx < PCI_NUM_RESOURCES; idx++) {
struct resource *r = >resource[idx];
 
-   if (!r->flags || r->parent || !r->start)
+   if (resource_disabled(r) || r->parent || !r->start)
continue;
 
pci_claim_bridge_resource(dev, idx);
diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c
index 09b1af6..c123d3c 100644
--- a/arch/microblaze/pci/pci-common.c
+++ b/arch/microblaze/pci/pci-common.c
@@ -705,7 +705,7 @@ static void pcibios_fixup_resources(struct pci_dev *dev)
}
for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
struct resource *res = dev->resource + i;
-   if (!res->flags)
+   if (resource_disabled(res))
continue;
if (res->start == 0) {
pr_debug("PCI:%s Resource %d %016llx-%016llx [%x]",
@@ -806,7 +806,7 @@ static void pcibios_fixup_bridge(struct pci_bus *bus)
pci_bus_for_each_resource(bus, res, i) {
if (!res)
continue;
-   if (!res->flags)
+   if (resource_disabled(res))
continue;
if (i >= 3 && bus->self->transparent)
continue;
@@ -985,7 +985,7 @@ static void pcibios_allocate_bus_resources(struct pci_bus 
*bus)
 pci_domain_nr(bus), bus->number);
 
pci_bus_for_each_resource(bus, res, i) {
-   if (!res || !res->flags
+   if (!res || resource_disabled(res)
|| res->start > res->end || res->parent)
continue;
if (bus->parent == NULL)
@@ -1087,7 +1087,8 @@ static void __init pcib

[PATCH v9 45/60] PCI: Fix size calculation with old_size on rescan path

[Yinghai Lu]

On booting path, we don't pass realloc at first, and treat all optional
just as required, in some case we can have smaller size/align with optional
than required only.

  04:00.0 has children bridges: 05:03.0, 05:04.0
pref layout after booting path like followings:

pci :04:00.0: BAR 9: assigned [mem 0x8400-0x9fff 64bit pref]
pci :05:04.0: BAR 9: assigned [mem 0x8800-0x9fff 64bit pref]
pci :05:03.0: BAR 9: assigned [mem 0x8400-0x841f 64bit pref]
pci :05:03.0: PCI bridge to [bus 08-0f]
pci :05:03.0:   bridge window [mem 0x8400-0x841f 64bit pref]
pci :05:04.0: PCI bridge to [bus 10]
pci :05:04.0:   bridge window [mem 0x8800-0x9fff 64bit pref]
pci :04:00.0: PCI bridge to [bus 05-10]
pci :04:00.0:   bridge window [mem 0x8400-0x9fff 64bit pref]

so the old size in rescan for 04:00.0 would be 0x1c00, and align is 
0x400

during remove and rescan:

pci :05:03.0: bridge window [mem 0x-0x 64bit pref] 
to [bus 08-0f] add_size 20 add_align 10 alt_size 0 alt_align 0 
must_size 0 must_align 0
pci :05:03.0: bridge window [mem 0x-0x] to [bus 
08-0f] add_size 20 add_align 10 alt_size 0 alt_align 0 must_size 0 
must_align 0
pci :05:04.0: bridge window [mem 0x0800-0x1fff 64bit pref] to [bus 
10] add_size 0 add_align 0 alt_size 1010 alt_align 1000 must_size 
1800 must_align 800
pci :05:03.0: BAR 9: [mem 0x-0x 64bit pref] 
get_res_add_size add_size   20
pci :05:03.0: BAR 9: [mem 0x-0x 64bit pref] 
get_res_add_align min_align 10
pci :04:00.0: bridge window [mem 0x0800-0x27ff 64bit pref] to [bus 
05-10] add_size 0 add_align 0 alt_size 1010 alt_align 1000 must_size 
2000 must_align 800

align old size 0x1c00 to 0x200 as size0, 0x1c00 as size1.
so for 04:00.0 will have big must and no optional size anymore.

So don't align old size, then we will have same size0 and size1,
and use smaller add_align as must align.

After the patch, rescan works properly.

Signed-off-by: Yinghai Lu <ying...@kernel.org>
---
 drivers/pci/setup-bus.c | 13 -
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 9c9d9de..c8b3ea6 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -1134,9 +1134,9 @@ static resource_size_t calculate_memsize(resource_size_t 
size,
size = min_size;
if (old_size == 1)
old_size = 0;
+   size = ALIGN(size, align);
if (size < old_size)
size = old_size;
-   size = ALIGN(size, align);
return size;
 }
 
@@ -1596,6 +1596,17 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned 
long mask,
b_res->flags = 0;
return 0;
}
+
+   /*
+* It happens when boot path is not passing realloc
+* and later rescan is passing realloc.
+* The old value from boot path is bigger, and calculate_size will
+* use old value as size0 and size1, and also have
+* chance optional align is smaller than must only align.
+*/
+   if(size0 == size1 && min_align > min_add_align)
+   min_align = min_add_align;
+
b_res->start = min_align;
b_res->end = size0 + min_align - 1;
b_res->flags |= IORESOURCE_STARTALIGN;
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v9 15/60] PCI: Restore pref MMIO allocation logic for host bridge without mmio64

[Yinghai Lu]

>From 5b2854155 (PCI: Restrict 64-bit prefetchable bridge windows to 64-bit
resources), we change the logic for pref mmio allocation:
When bridge pref support mmio64, we will only put children pref
that support mmio64 into it, and will put children pref mmio32
into bridge's non-pref mmio32.

That could leave bridge pref bar not used when that pref bar is mmio64,
and children res only has mmio32.
Also could have allocation failure when non-pref mmio32 is not big
enough space for those children pref mmio32.

That is not rational when the host bridge does not 64bit mmio above 4g
at all.

The patch restore to old logic:
when host bridge does not have has_mem64, put children pref mmio64 and
pref mmio32 all under bridges pref bars.

Signed-off-by: Yinghai Lu <ying...@kernel.org>
Tested-by: Khalid Aziz <khalid.a...@oracle.com>
---
 drivers/pci/bus.c   |  4 +++-
 drivers/pci/setup-bus.c | 13 +
 drivers/pci/setup-res.c |  9 ++---
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c
index d3346d2..0859e77 100644
--- a/drivers/pci/bus.c
+++ b/drivers/pci/bus.c
@@ -202,8 +202,10 @@ int pci_bus_alloc_resource(struct pci_bus *bus, struct 
resource *res,
 {
 #ifdef CONFIG_PCI_BUS_ADDR_T_64BIT
int rc;
+   unsigned long mmio64 = pci_find_host_bridge(bus)->has_mem64 ?
+   IORESOURCE_MEM_64 : 0;
 
-   if (res->flags & IORESOURCE_MEM_64) {
+   if (res->flags & mmio64) {
rc = pci_bus_alloc_from_region(bus, res, size, align, min,
   type_mask, alignf, alignf_data,
   _high);
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 0befb0a..86c51ef 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -1312,7 +1312,8 @@ void __pci_bus_size_bridges(struct pci_bus *bus, struct 
list_head *realloc_head)
b_res = >self->resource[PCI_BRIDGE_RESOURCES];
mask = IORESOURCE_MEM;
prefmask = IORESOURCE_MEM | IORESOURCE_PREFETCH;
-   if (b_res[2].flags & IORESOURCE_MEM_64) {
+   if ((b_res[2].flags & IORESOURCE_MEM_64) &&
+   pci_find_host_bridge(bus)->has_mem64) {
prefmask |= IORESOURCE_MEM_64;
ret = pbus_size_mem(bus, prefmask, prefmask,
  prefmask, prefmask,
@@ -1514,17 +1515,21 @@ static void pci_bridge_release_resources(struct pci_bus 
*bus,
 *io port.
 * 2. if there is non pref mmio assign fail, release bridge
 *nonpref mmio.
-* 3. if there is 64bit pref mmio assign fail, and bridge pref
+* 3. if there is pref mmio assign fail, and host bridge does
+*have 64bit mmio, release bridge pref mmio.
+* 4. if there is 64bit pref mmio assign fail, and bridge pref
 *is 64bit, release bridge pref mmio.
-* 4. if there is pref mmio assign fail, and bridge pref is
+* 5. if there is pref mmio assign fail, and bridge pref is
 *32bit mmio, release bridge pref mmio
-* 5. if there is pref mmio assign fail, and bridge pref is not
+* 6. if there is pref mmio assign fail, and bridge pref is not
 *assigned, release bridge nonpref mmio.
 */
if (type & IORESOURCE_IO)
idx = 0;
else if (!(type & IORESOURCE_PREFETCH))
idx = 1;
+   else if (!pci_find_host_bridge(bus)->has_mem64)
+   idx = 2;
else if ((type & IORESOURCE_MEM_64) &&
 (b_res[2].flags & IORESOURCE_MEM_64))
idx = 2;
diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c
index d5b3970..c401cfd 100644
--- a/drivers/pci/setup-res.c
+++ b/drivers/pci/setup-res.c
@@ -212,6 +212,8 @@ static int __pci_assign_resource(struct pci_bus *bus, 
struct pci_dev *dev,
struct resource *res = dev->resource + resno;
resource_size_t min;
int ret;
+   unsigned long mmio64 = pci_find_host_bridge(bus)->has_mem64 ?
+   IORESOURCE_MEM_64 : 0;
 
min = (res->flags & IORESOURCE_IO) ? PCIBIOS_MIN_IO : PCIBIOS_MIN_MEM;
 
@@ -223,7 +225,7 @@ static int __pci_assign_resource(struct pci_bus *bus, 
struct pci_dev *dev,
 * things differently than they were sized, not everything will fit.
 */
ret = pci_bus_alloc_resource(bus, res, size, align, min,
-IORESOURCE_PREFETCH | IORESOURCE_MEM_64,
+IORESOURCE_PREFETCH | mmio64,
 pcibios_align_resource, dev);
if (ret == 0)
return 0;
@@ -232,7 +234,8 @@ static int __pci

[PATCH v9 23/60] PCI: Cleanup res_to_dev_res() printout

[Yinghai Lu]

Now get_res_add_size() and get_res_add_align() all have same printout
from res_to_dev_res(), and it is confusing.

Move out debug messages printout from res_to_dev_res(),
so later we will reuse res_to_dev_res() in other functions.

-v2: does not print out when add_size or min_align is 0
-v3: change to %#llx according to Bjorn.

Signed-off-by: Yinghai Lu <ying...@kernel.org>
---
 drivers/pci/setup-bus.c | 34 --
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 7f7f46c..598254a 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -104,19 +104,9 @@ static struct pci_dev_resource *res_to_dev_res(struct 
list_head *head,
 {
struct pci_dev_resource *dev_res;
 
-   list_for_each_entry(dev_res, head, list) {
-   if (dev_res->res == res) {
-   int idx = res - _res->dev->resource[0];
-
-   dev_printk(KERN_DEBUG, _res->dev->dev,
-"res[%d]=%pR res_to_dev_res add_size %llx 
min_align %llx\n",
-idx, dev_res->res,
-(unsigned long long)dev_res->add_size,
-(unsigned long long)dev_res->min_align);
-
+   list_for_each_entry(dev_res, head, list)
+   if (dev_res->res == res)
return dev_res;
-   }
-   }
 
return NULL;
 }
@@ -127,7 +117,15 @@ static resource_size_t get_res_add_size(struct list_head 
*head,
struct pci_dev_resource *dev_res;
 
dev_res = res_to_dev_res(head, res);
-   return dev_res ? dev_res->add_size : 0;
+   if (!dev_res || !dev_res->add_size)
+   return 0;
+
+   dev_printk(KERN_DEBUG, _res->dev->dev,
+  "BAR %d: %pR get_res_add_size add_size   %#llx\n",
+  (int)(res - _res->dev->resource[0]),
+  res, (unsigned long long)dev_res->add_size);
+
+   return dev_res->add_size;
 }
 
 static resource_size_t get_res_add_align(struct list_head *head,
@@ -136,7 +134,15 @@ static resource_size_t get_res_add_align(struct list_head 
*head,
struct pci_dev_resource *dev_res;
 
dev_res = res_to_dev_res(head, res);
-   return dev_res ? dev_res->min_align : 0;
+   if (!dev_res || !dev_res->min_align)
+   return 0;
+
+   dev_printk(KERN_DEBUG, _res->dev->dev,
+  "BAR %d: %pR get_res_add_align min_align %#llx\n",
+  (int)(res - _res->dev->resource[0]),
+  res, (unsigned long long)dev_res->min_align);
+
+   return dev_res->min_align;
 }
 
 
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v9 55/60] PCI, x86: Allocate from high in available window for MMIO

[Yinghai Lu]

 bridge to [bus 0a-0f]
pcieport :02:03.0:   bridge window [io  0x2000-0x2fff]
pcieport :02:03.0:   bridge window [mem 0xb000-0xb24f]

So we allocate high for 0a:00.0 and etc, and leave low range like 0xb000 to
0b:04.0 and 0f:00.0

Signed-off-by: Yinghai Lu <ying...@kernel.org>
---
 arch/x86/pci/i386.c | 20 
 drivers/pci/setup-bus.c | 11 ++-
 include/linux/pci.h |  3 +++
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c
index 3f17726..21f3e3e 100644
--- a/arch/x86/pci/i386.c
+++ b/arch/x86/pci/i386.c
@@ -129,6 +129,24 @@ static void __init pcibios_fw_addr_list_del(void)
pcibios_fw_addr_done = true;
 }
 
+resource_size_t
+pcibios_align_end_resource(void *data, const struct resource *res,
+   resource_size_t size, resource_size_t align)
+{
+   resource_size_t start = res->start;
+
+   /* Take near end */
+   if (res->end + 1 > size) {
+   resource_size_t new_start;
+
+   new_start = round_down(res->end + 1 - size, align);
+   if (new_start > start)
+   start = new_start;
+   }
+
+   return start;
+}
+
 /*
  * We need to avoid collisions with `mirrored' VGA ports
  * and other strange ISA hardware, so we always want the
@@ -155,6 +173,8 @@ pcibios_align_resource(void *data, const struct resource 
*res,
if (start & 0x300)
start = (start + 0x3ff) & ~0x3ff;
} else if (res->flags & IORESOURCE_MEM) {
+   start = pcibios_align_end_resource(data, res, size, align);
+
/* The low 1MB range is reserved for ISA cards */
if (start < BIOS_END)
start = BIOS_END;
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index cfded80..081eb08 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -1319,6 +1319,15 @@ static void sort_align_test(struct list_head *head)
}
 }
 
+resource_size_t __weak pcibios_align_end_resource(void *data,
+ const struct resource *res,
+ resource_size_t size,
+ resource_size_t align)
+{
+   /* default is not aligned to end */
+   return res->start;
+}
+
 static bool is_align_size_good(struct list_head *head,
resource_size_t min_align, resource_size_t size,
resource_size_t start)
@@ -1336,7 +1345,7 @@ static bool is_align_size_good(struct list_head *head,
list_for_each_entry(p, head, list)
if (allocate_resource(, >res, p->size,
0, (resource_size_t)-1ULL,
-   p->align, NULL, NULL))
+   p->align, pcibios_align_end_resource, NULL))
return false;
 
return true;
diff --git a/include/linux/pci.h b/include/linux/pci.h
index c135edc..32640fd 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -783,6 +783,9 @@ char *pcibios_setup(char *str);
 resource_size_t pcibios_align_resource(void *, const struct resource *,
resource_size_t,
resource_size_t);
+resource_size_t pcibios_align_end_resource(void *, const struct resource *,
+   resource_size_t,
+   resource_size_t);
 void pcibios_update_irq(struct pci_dev *, int irq);
 
 /* Weak but can be overriden by arch */
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v9 47/60] PCI: Move ISA io port align out of calculate_iosize()

[Yinghai Lu]

We need to move ISA io port align out of calculate_iosize(),
so we could unify calculate_iosize and calculate_memsize later.

That extra aligning or offset is to work around ISA devices:
When one bridge have several children devices, and every device
has several io port resources and resource size < 0x400.
We need to check size, and add extra size to make sure bit8/9
to be zero.

Also need to apply same checking for optional size path.

Signed-off-by: Yinghai Lu <ying...@kernel.org>
---
 drivers/pci/setup-bus.c | 39 +++
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 0ece6b6..00e7f95 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -1114,11 +1114,6 @@ static resource_size_t calculate_iosize(resource_size_t 
size,
size = min_size;
if (old_size == 1)
old_size = 0;
-   /* To be fixed in 2.5: we should have sort of HAVE_ISA
-  flag in the struct pci_bus. */
-#if defined(CONFIG_ISA) || defined(CONFIG_EISA)
-   size = (size & 0xff) + ((size & ~0xffUL) << 2);
-#endif
size = ALIGN(size + size1, align);
if (size < old_size)
size = old_size;
@@ -1172,6 +1167,18 @@ static resource_size_t window_alignment(struct pci_bus 
*bus,
return max(align, arch_align);
 }
 
+static resource_size_t size_aligned_for_isa(resource_size_t size)
+{
+   /*
+* To be fixed in 2.5: we should have sort of HAVE_ISA
+*  flag in the struct pci_bus.
+*/
+#if defined(CONFIG_ISA) || defined(CONFIG_EISA)
+   size = (size & 0xff) + ((size & ~0xffUL) << 2);
+#endif
+   return size;
+}
+
 /**
  * pbus_size_io() - size the io window of a given bus
  *
@@ -1189,11 +1196,10 @@ static void pbus_size_io(struct pci_bus *bus, 
resource_size_t min_size,
 {
struct pci_dev *dev;
resource_size_t min_sum_size = 0;
-   resource_size_t sum_add_size;
struct resource *b_res = find_free_bus_resource(bus, IORESOURCE_IO,
IORESOURCE_IO);
resource_size_t size = 0, size0 = 0, size1 = 0;
-   resource_size_t children_add_size = 0;
+   resource_size_t sum_add_size = 0, sum_add_size1 = 0;
resource_size_t min_align, align;
 
if (!b_res)
@@ -1210,7 +1216,7 @@ static void pbus_size_io(struct pci_bus *bus, 
resource_size_t min_size,
 
for (i = 0; i < PCI_NUM_RESOURCES; i++) {
struct resource *r = >resource[i];
-   unsigned long r_size;
+   unsigned long r_size, r_add_size;
 
if (r->parent || !(r->flags & IORESOURCE_IO))
continue;
@@ -1226,18 +1232,27 @@ static void pbus_size_io(struct pci_bus *bus, 
resource_size_t min_size,
if (align > min_align)
min_align = align;
 
-   if (realloc_head)
-   children_add_size += 
get_res_add_size(realloc_head, r);
+   if (realloc_head) {
+   r_add_size = get_res_add_size(realloc_head, r);
+   r_add_size += r_size;
+   if (r_add_size < 0x400)
+   /* Might be re-aligned for ISA */
+   sum_add_size += r_add_size;
+   else
+   sum_add_size1 += r_add_size;
+   }
}
}
 
+   size = size_aligned_for_isa(size);
size0 = calculate_iosize(size, min_size, size1,
resource_size(b_res), min_align);
-   sum_add_size = children_add_size + size + size1;
+   sum_add_size = size_aligned_for_isa(sum_add_size);
+   sum_add_size += sum_add_size1;
if (sum_add_size < min_sum_size)
sum_add_size = min_sum_size;
size1 = !realloc_head ? size0 :
-   calculate_iosize(size, min_size, sum_add_size - size,
+   calculate_iosize(sum_add_size, min_size, 0,
resource_size(b_res), min_align);
if (!size0 && !size1) {
if (b_res->start || b_res->end)
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v9 60/60] PCI: Only try to assign io port only for root bus that support it

[Yinghai Lu]

The PCI subsystem always assumes that I/O is supported on root bus and
tries to assign an I/O window to each child bus even if that is not the
case.

The use cases is on Intel 8 socket system that have 8 root buses,
last two root buses would not have io port resources from _CRS.

Check if root bus supports I/O, and later during sizing and
assigning, check that flags and skip those resources.

Signed-off-by: Yinghai Lu <ying...@kernel.org>
---
 drivers/pci/probe.c | 6 ++
 drivers/pci/setup-bus.c | 9 +
 include/linux/pci.h | 1 +
 3 files changed, 16 insertions(+)

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 720c3d8..6268fe6 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -342,6 +342,9 @@ static void pci_read_bridge_io(struct pci_bus *child)
struct pci_bus_region region;
struct resource *res;
 
+   if (!pci_find_host_bridge(child)->has_ioport)
+   return;
+
io_mask = PCI_IO_RANGE_MASK;
io_granularity = 0x1000;
if (dev->io_window_1k) {
@@ -2195,6 +2198,9 @@ struct pci_bus *pci_create_root_bus(struct device 
*parent, int bus,
bus_addr[0] = '\0';
dev_info(>dev, "root bus resource %pR%s\n", res, bus_addr);
 
+   if (resource_type(res) == IORESOURCE_IO)
+   bridge->has_ioport = 1;
+
if (resource_type(res) == IORESOURCE_MEM) {
if ((res->end - offset) > 0x)
bridge->has_mem64 = 1;
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index cf55828..6e29a8f 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -226,6 +226,10 @@ static void pdev_assign_resources_prepare(struct pci_dev 
*dev,
if (resource_disabled(r) || r->parent)
continue;
 
+   if ((r->flags & IORESOURCE_IO) &&
+   !pci_find_host_bridge(dev->bus)->has_ioport)
+   continue;
+
r_align = __pci_resource_alignment(dev, r, realloc_head);
if (!r_align) {
dev_warn(>dev, "BAR %d: %pR has bogus alignment\n",
@@ -1189,6 +1193,11 @@ static void pbus_size_io(struct pci_bus *bus, 
resource_size_t min_size,
min_size = 0;
}
 
+   if (!pci_find_host_bridge(bus)->has_ioport) {
+   b_res->flags |= IORESOURCE_UNSET | IORESOURCE_DISABLED;
+   return;
+   }
+
min_align = window_alignment(bus, IORESOURCE_IO);
list_for_each_entry(dev, >devices, bus_list) {
int i;
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 32640fd..d0574b4 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -414,6 +414,7 @@ struct pci_host_bridge {
void *release_data;
unsigned int ignore_reset_delay:1;  /* for entire hierarchy */
unsigned int has_mem64:1;
+   unsigned int has_ioport:1;
/* Resource alignment requirements */
resource_size_t (*align_resource)(struct pci_dev *dev,
const struct resource *res,
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v9 48/60] PCI: Don't add too much io port for hotplug bridge with old size

[Yinghai Lu]

Now we add too much for hotplug bridge io port.
For example, when hotplug bridge has two children bridges,
every child bridge will need 0x1000, so size1 will be 0x2000
and size is 0. The min_size for the hotplug bridge is 0x100.
with old version calculate_iosize, we get 0x3000 for final
size as we are using size to compare with min_size at first.
That is not right, we should have 0x2000.

We can check size+size1 with min_size for io port, and just add size1
to size without passing extra size1 into calculate_iosize().

Signed-off-by: Yinghai Lu <ying...@kernel.org>
---
 drivers/pci/setup-bus.c | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 00e7f95..a425a47 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -1106,7 +1106,6 @@ static struct resource *find_free_bus_resource(struct 
pci_bus *bus,
 
 static resource_size_t calculate_iosize(resource_size_t size,
resource_size_t min_size,
-   resource_size_t size1,
resource_size_t old_size,
resource_size_t align)
 {
@@ -1114,7 +1113,7 @@ static resource_size_t calculate_iosize(resource_size_t 
size,
size = min_size;
if (old_size == 1)
old_size = 0;
-   size = ALIGN(size + size1, align);
+   size = ALIGN(size, align);
if (size < old_size)
size = old_size;
return size;
@@ -1245,14 +1244,15 @@ static void pbus_size_io(struct pci_bus *bus, 
resource_size_t min_size,
}
 
size = size_aligned_for_isa(size);
-   size0 = calculate_iosize(size, min_size, size1,
+   size += size1;
+   size0 = calculate_iosize(size, min_size,
resource_size(b_res), min_align);
sum_add_size = size_aligned_for_isa(sum_add_size);
sum_add_size += sum_add_size1;
if (sum_add_size < min_sum_size)
sum_add_size = min_sum_size;
size1 = !realloc_head ? size0 :
-   calculate_iosize(sum_add_size, min_size, 0,
+   calculate_iosize(sum_add_size, min_size,
resource_size(b_res), min_align);
if (!size0 && !size1) {
if (b_res->start || b_res->end)
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v9 41/60] PCI: Skip required+optional if there is no optional

[Yinghai Lu]

If the bridge does not support hotplug and has no child with sriov support,
We will not have optional resources. We could get out early and
don't try required+optional allocation.

Also in the loop that update res with optional add info, skip resource
that add_size is 0.

Signed-off-by: Yinghai Lu <ying...@kernel.org>
---
 drivers/pci/setup-bus.c | 32 +---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index b813340..5a2cd66 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -450,6 +450,24 @@ static bool pci_need_to_release(unsigned long mask, struct 
resource *res)
return false;   /* should not get here */
 }
 
+static bool has_addon(struct list_head *head,
+   struct list_head *realloc_head)
+{
+   int add_count = 0;
+   struct pci_dev_resource *dev_res, *tmp_res;
+
+   /* check if we have add really */
+   list_for_each_entry(dev_res, head, list) {
+   tmp_res = res_to_dev_res(realloc_head, dev_res->res);
+   if (!tmp_res || !tmp_res->add_size)
+   continue;
+
+   add_count++;
+   }
+
+   return add_count != 0;
+}
+
 static bool save_resources(struct list_head *head,
   struct list_head *save_head)
 {
@@ -481,16 +499,24 @@ static bool 
__assign_resources_required_optional_sorted(struct list_head *head,
struct pci_dev_resource *save_res;
struct pci_dev_resource *dev_res, *tmp_res;
unsigned long fail_type;
-   resource_size_t add_align;
+   resource_size_t add_align, add_size;
struct resource *res;
 
+   if (!has_addon(head, realloc_head))
+   return false;
+
if (!save_resources(head, _head))
return false;
 
/* Update res in head list with add_size in realloc_head list */
list_for_each_entry(dev_res, head, list) {
res = dev_res->res;
-   res->end += get_res_add_size(realloc_head, res);
+   add_size = get_res_add_size(realloc_head, res);
+
+   if (!add_size)
+   continue;
+
+   res->end += add_size;
 
/*
 * There are two kinds of additional resources in the list:
@@ -578,7 +604,7 @@ static void __assign_resources_sorted(struct list_head 
*head,
 */
 
/* Check required+optional add */
-   if (realloc_head && !list_empty(realloc_head) &&
+   if (realloc_head &&
__assign_resources_required_optional_sorted(head, realloc_head))
return;
 
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v9 01/60] PCI: Add pci_find_root_bus_resource()

[Yinghai Lu]

Add pci_find_root_bus_resource() to return root bus res
for resource.

For sparc mem64 support, We need that host bridge window res,
  1. we need direct parent for request_resource_conflict() calling in
  pci_register_legacy_regions().
  2. check if return is NULL to decide if region is valid or not.

Convert old pci_find_parent_resource() to pci_find_bus_resource(),
and reuse it in pci_find_root_bus_resource().
So we avoid changing pcibios_bus_to_resource().

Signed-off-by: Yinghai Lu <ying...@kernel.org>
---
 drivers/pci/pci.c   | 36 +---
 include/linux/pci.h |  2 ++
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 314db8c..c8cae87 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -415,18 +415,9 @@ int pci_find_ht_capability(struct pci_dev *dev, int ht_cap)
 }
 EXPORT_SYMBOL_GPL(pci_find_ht_capability);
 
-/**
- * pci_find_parent_resource - return resource region of parent bus of given 
region
- * @dev: PCI device structure contains resources to be searched
- * @res: child resource record for which parent is sought
- *
- *  For given resource region of given device, return the resource
- *  region of parent bus the given region is contained in.
- */
-struct resource *pci_find_parent_resource(const struct pci_dev *dev,
- struct resource *res)
+static struct resource *pci_find_bus_resource(const struct pci_bus *bus,
+ struct resource *res)
 {
-   const struct pci_bus *bus = dev->bus;
struct resource *r;
int i;
 
@@ -456,8 +447,31 @@ struct resource *pci_find_parent_resource(const struct 
pci_dev *dev,
}
return NULL;
 }
+
+/**
+ * pci_find_parent_resource - return resource region of parent bus of given 
region
+ * @dev: PCI device structure contains resources to be searched
+ * @res: child resource record for which parent is sought
+ *
+ *  For given resource region of given device, return the resource
+ *  region of parent bus the given region is contained in.
+ */
+struct resource *pci_find_parent_resource(const struct pci_dev *dev,
+ struct resource *res)
+{
+   return pci_find_bus_resource(dev->bus, res);
+}
 EXPORT_SYMBOL(pci_find_parent_resource);
 
+struct resource *pci_find_root_bus_resource(struct pci_bus *bus,
+   struct resource *res)
+{
+   while (bus->parent)
+   bus = bus->parent;
+
+   return pci_find_bus_resource(bus, res);
+}
+
 /**
  * pci_find_pcie_root_port - return PCIe Root Port
  * @dev: PCI device to query
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 6ae25aa..8b3896b 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -792,6 +792,8 @@ void pcibios_resource_to_bus(struct pci_bus *bus, struct 
pci_bus_region *region,
 struct resource *res);
 void pcibios_bus_to_resource(struct pci_bus *bus, struct resource *res,
 struct pci_bus_region *region);
+struct resource *pci_find_root_bus_resource(struct pci_bus *bus,
+   struct resource *res);
 void pcibios_scan_specific_bus(int busn);
 struct pci_bus *pci_find_bus(int domain, int busnr);
 void pci_bus_add_devices(const struct pci_bus *bus);
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v9 32/60] PCI: Treat ROM resource as optional during realloc

[Yinghai Lu]

Current on realloc path, we just ignore ROM resource if we can not assign
them in first try.

Treat ROM resources as optional resources,so try to allocate them together
with required ones, if can not assign them, could go with other required
resources only, and try to allocate them second time in expand path.

Signed-off-by: Yinghai Lu <ying...@kernel.org>
---
 drivers/pci/setup-bus.c | 37 -
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 194d5da..e9e67bc 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -377,18 +377,10 @@ static void assign_requested_resources_sorted(struct 
list_head *head,
idx = res - _res->dev->resource[0];
if (resource_size(res) &&
pci_assign_resource(dev_res->dev, idx)) {
-   if (fail_head) {
-   /*
-* if the failed res is for ROM BAR, and it will
-* be enabled later, don't add it to the list
-*/
-   if (!((idx == PCI_ROM_RESOURCE) &&
- (!(res->flags & IORESOURCE_ROM_ENABLE
-   add_to_list(fail_head,
-   dev_res->dev, res,
-   0 /* don't care */,
-   0 /* don't care */);
-   }
+   if (fail_head)
+   add_to_list(fail_head, dev_res->dev, res,
+   0 /* don't care */,
+   0 /* don't care */);
reset_resource(res);
}
}
@@ -1186,6 +1178,19 @@ out:
return good_align;
 }
 
+static inline bool is_optional(int i)
+{
+
+   if (i == PCI_ROM_RESOURCE)
+   return true;
+
+#ifdef CONFIG_PCI_IOV
+   if (i >= PCI_IOV_RESOURCES && i <= PCI_IOV_RESOURCE_END)
+   return true;
+#endif
+
+   return false;
+}
 /**
  * pbus_size_mem() - size the memory window of a given bus
  *
@@ -1244,10 +1249,8 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned 
long mask,
 
r_size = resource_size(r);
align = pci_resource_alignment(dev, r);
-#ifdef CONFIG_PCI_IOV
-   /* put SRIOV requested res to the optional list */
-   if (realloc_head && i >= PCI_IOV_RESOURCES &&
-   i <= PCI_IOV_RESOURCE_END) {
+   /* put SRIOV/ROM res to realloc list */
+   if (realloc_head && is_optional(i)) {
add_to_align_test_list(_test_add_list,
align, r_size);
r->end = r->start - 1;
@@ -1257,7 +1260,7 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned 
long mask,
max_add_align = align;
continue;
}
-#endif
+
if (align > (1ULL<<37)) { /*128 Gb*/
dev_warn(>dev, "disabling BAR %d: %pR (bad 
alignment %#llx)\n",
i, r, (unsigned long long) align);
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v9 17/60] PCI: Claim fixed resource during remove/rescan path

[Yinghai Lu]

During driver loading kernel will check if resources get reserved.
so we need to make sure resources get reserved before pci_bus_add().

On remove/rescan path, we will leave those fixed resource
not reserved. In that path, We don't call pcibios_resource_survery()
before pci_assign_unassigned_bus_resources(), and that is intentional
for us to get new resources for rescan. We do need to use rescan to make
device get resource allocated while ignoring BIOS allocate resource.

But fixed resources are not allocated via
pci_assign_unassigned_bus_resources(), so we need to reserve them
explicitly.

Signed-off-by: Yinghai Lu <ying...@kernel.org>
---
 drivers/pci/quirks.c | 17 +
 1 file changed, 17 insertions(+)

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 3618c06..d45455f 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -323,6 +323,23 @@ static void quirk_s3_64M(struct pci_dev *dev)
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_S3, PCI_DEVICE_ID_S3_868,   
quirk_s3_64M);
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_S3, PCI_DEVICE_ID_S3_968,   
quirk_s3_64M);
 
+/* for pci remove and rescan */
+static void quirk_allocate_fixed(struct pci_dev *dev)
+{
+   int i;
+   for (i = 0; i < PCI_NUM_RESOURCES; i++) {
+   struct resource *r = >resource[i];
+
+   if (r->parent ||
+   !(r->flags & IORESOURCE_PCI_FIXED) ||
+   !(r->flags & (IORESOURCE_IO | IORESOURCE_MEM)))
+   continue;
+
+   pci_claim_resource(dev, i);
+   }
+}
+DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID,PCI_ANY_ID, quirk_allocate_fixed);
+
 static void quirk_io(struct pci_dev *dev, int pos, unsigned size,
 const char *name)
 {
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v9 29/60] PCI: Reorder resources list for required/optional resources

[Yinghai Lu]

We try to allocate required+optional before allocate required only and
expand with optional.

At first we update size and alignment for required+optional resource.
And after that we reorder them with new alignment, but current we only
do that STARTALIGN ones.

For SIZEALIGN type resource, after add back add_size, the alignment
get changed, so need to do sorting like STARTALIGN type resources.

Also we need to reorder the sorting back after we restore
resource to required only when required+optional fail to allocate for all.

So move out the reordering code from the loop to separated function,
and call it two times accordingly.

Signed-off-by: Yinghai Lu <ying...@kernel.org>
---
 drivers/pci/setup-bus.c | 62 +
 1 file changed, 37 insertions(+), 25 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 53014e1..885b9f8 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -286,6 +286,31 @@ static inline void reset_resource(struct resource *res)
res->flags = 0;
 }
 
+static void sort_resources(struct list_head *head)
+{
+   struct pci_dev_resource *res1, *tmp_res, *res2;
+
+   list_for_each_entry_safe(res1, tmp_res, head, list) {
+   resource_size_t align1, size1, align2, size2;
+
+   align1 = pci_resource_alignment(res1->dev, res1->res);
+   size1 = resource_size(res1->res);
+
+   /* reorder it */
+   list_for_each_entry(res2, head, list) {
+   if (res2 == res1)
+   break;
+
+   align2 = pci_resource_alignment(res2->dev, res2->res);
+   size2 = resource_size(res2->res);
+   if (is_before(align1, size1, align2, size2)) {
+   list_move_tail(>list, >list);
+   break;
+   }
+   }
+   }
+}
+
 /**
  * reassign_resources_sorted() - satisfy any additional resource requests
  *
@@ -454,9 +479,9 @@ static void __assign_resources_sorted(struct list_head 
*head,
LIST_HEAD(save_head);
LIST_HEAD(local_fail_head);
struct pci_dev_resource *save_res;
-   struct pci_dev_resource *dev_res, *tmp_res, *dev_res2;
+   struct pci_dev_resource *dev_res, *tmp_res;
unsigned long fail_type;
-   resource_size_t add_align, align;
+   resource_size_t add_align;
 
/* Check if optional add_size is there */
if (!realloc_head || list_empty(realloc_head))
@@ -471,47 +496,32 @@ static void __assign_resources_sorted(struct list_head 
*head,
}
 
/* Update res in head list with add_size in realloc_head list */
-   list_for_each_entry_safe(dev_res, tmp_res, head, list) {
+   list_for_each_entry(dev_res, head, list) {
dev_res->res->end += get_res_add_size(realloc_head,
dev_res->res);
 
/*
 * There are two kinds of additional resources in the list:
-* 1. bridge resource  -- IORESOURCE_STARTALIGN
-* 2. SR-IOV resource   -- IORESOURCE_SIZEALIGN
-* Here just fix the additional alignment for bridge
+* 1. bridge resource with IORESOURCE_STARTALIGN
+*need to update start to change alignment
+* 2. resource with IORESOURCE_SIZEALIGN
+*update size above already change alignment.
 */
if (!(dev_res->res->flags & IORESOURCE_STARTALIGN))
continue;
 
add_align = get_res_add_align(realloc_head, dev_res->res);
 
-   /*
-* The "head" list is sorted by the alignment to make sure
-* resources with bigger alignment will be assigned first.
-* After we change the alignment of a dev_res in "head" list,
-* we need to reorder the list by alignment to make it
-* consistent.
-*/
-   if (add_align > dev_res->res->start) {
+   if (add_align) {
resource_size_t r_size = resource_size(dev_res->res);
 
dev_res->res->start = add_align;
dev_res->res->end = add_align + r_size - 1;
-
-   list_for_each_entry(dev_res2, head, list) {
-   align = pci_resource_alignment(dev_res2->dev,
-  dev_res2->res);
-   if (add_align > align) {
-   list_move_tail(_res->list,
-  

[PATCH v9 14/60] PCI: Only treat non-pref mmio64 as pref if host bridge has mmio64

[Yinghai Lu]

If host bridge does not have mmio64 above 4G, We don't need to
treat device non-pref mmio64 as as pref mmio64.

Signed-off-by: Yinghai Lu <ying...@kernel.org>
Tested-by: Khalid Aziz <khalid.a...@oracle.com>
---
 drivers/pci/setup-bus.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index d627218..0befb0a 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -742,7 +742,7 @@ int pci_claim_bridge_resource(struct pci_dev *bridge, int i)
 static bool pci_up_path_over_pref_mem64(struct pci_bus *bus)
 {
if (pci_is_root_bus(bus))
-   return true;
+   return to_pci_host_bridge(bus->bridge)->has_mem64;
 
if (bus->self) {
int i;
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v9 40/60] PCI: Separate required+optional assigning to another function

[Yinghai Lu]

__assign_resources_sorted() is getting too big if we put alt_size support
into it.  Split out required+optional assigning code to another function.

Signed-off-by: Yinghai Lu <ying...@kernel.org>
---
 drivers/pci/setup-bus.c | 47 +++
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index a8e3eaa..b813340 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -473,20 +473,9 @@ static void restore_resource(struct pci_dev_resource 
*save_res,
res->flags = save_res->flags;
 }
 
-static void __assign_resources_sorted(struct list_head *head,
-struct list_head *realloc_head,
-struct list_head *fail_head)
+static bool __assign_resources_required_optional_sorted(struct list_head *head,
+struct list_head *realloc_head)
 {
-   /*
-* Should not assign requested resources at first.
-*   they could be adjacent, so later reassign can not reallocate
-*   them one by one in parent resource window.
-* Try to assign requested + add_size at beginning
-*  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.
-*/
-
LIST_HEAD(save_head);
LIST_HEAD(local_fail_head);
struct pci_dev_resource *save_res;
@@ -495,12 +484,8 @@ static void __assign_resources_sorted(struct list_head 
*head,
resource_size_t add_align;
struct resource *res;
 
-   /* Check if optional add_size is there */
-   if (!realloc_head || list_empty(realloc_head))
-   goto requested_and_reassign;
-
if (!save_resources(head, _head))
-   goto requested_and_reassign;
+   return false;
 
/* Update res in head list with add_size in realloc_head list */
list_for_each_entry(dev_res, head, list) {
@@ -539,7 +524,8 @@ static void __assign_resources_sorted(struct list_head 
*head,
remove_from_list(realloc_head, dev_res->res);
free_list(_head);
free_list(head);
-   return;
+
+   return true;
}
 
/* check failed type */
@@ -574,7 +560,28 @@ static void __assign_resources_sorted(struct list_head 
*head,
 
free_list(_head);
 
-requested_and_reassign:
+   return false;
+}
+
+static void __assign_resources_sorted(struct list_head *head,
+struct list_head *realloc_head,
+struct list_head *fail_head)
+{
+   /*
+* Should not assign required resources at first.
+*   they could be adjacent, so later reassign can not reallocate
+*   them one by one in parent resource window.
+* Try to assign required + optional at beginning
+*  if could do that, could get out early.
+*  if could not do that, we still try to assign required at first,
+*then try to reassign add_size for some resources.
+*/
+
+   /* Check required+optional add */
+   if (realloc_head && !list_empty(realloc_head) &&
+   __assign_resources_required_optional_sorted(head, realloc_head))
+   return;
+
sort_resources(head);
 
/* Satisfy the must-have resource requests */
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v9 00/60] PCI: Resource allocation cleanup for v4.5

[Yinghai Lu]

Hi,

After 5b28541552ef (PCI: Restrict 64-bit prefetchable bridge windows
to 64-bit resources), we have several reports on resource allocation
failure, and we try to fix the problem with resource clip, and find
more problems.

One is realloc fail with two graphics cards above 4G.
One is from sparc that have problem with clip as we don't parse
mem64 for it.

Other report is about pci remove/rescan does not work on some setup
when BIOS tend to allocate small bus size.

This patchset enhance resource allocation to address those problems.

patch 1-10: parse MEM64 for sparc and other system with OF
patch 11-15: MMIO64 allocation enhancement
treat non-pref mmio64 if parent bridges are all pcie.
restore old pref allocation logic if hostbridge does not support mmio64.
patch 16-18: FIXED resource handling during realloc
don't realloc resource if device firmware does not support bar change.
patch 19-22: bridge MMIO allocation with hotplug and last try.
treat optional as required on first try when hotplug.
MMIO size set to 0 for last try during realloc
patch 23-56: enhancement for mmio resource allocation:
optimize bus mmio alignment calculation.
optimize bus mmio optional alignment calculation.
add support for alt size to prefer small bus size to small bus 
alignment.
treat ROM bar as optional resource.
during allocation, will pick up best fit resource, and allocate near 
end.
patch 57: add pci=assign_pref_bars to clear and assign pref bars.
patch 58-59: don't clear resource when allocation fails
patch 60: don't try io port allocation if root bus does not have io port.

I put latest copy at:
  git://git.kernel.org/pub/scm/linux/kernel/git/yinghai/linux-yinghai.git 
for-pci-v4.5-next

That is based on v4.4-rc4.

Yijing and Wei Yang both tested the branch, and the patchset fixs rescan
problem, and is working well on powerpc setup.

Khalid Aziz tested on some sparc platforms that have different offset to
mem space start or support 64bit mmio.

Thanks

Yinghai

v2:
- fix resource_disabled allocation from powerpc.
- other warnings that were found by Fengguang's build robot.
- io port alignment clean up.
- rebased to v4.2-rc2.
- better for two alt_size support.

v3:
- fix reset bridge resource on last try: only with bridge resources.
- remove/rescan path checking with old_size.

v4:
- Update changelog according to Bjorn.
- split calculate_size patch to two.
- use required instead of must.

v5:
- update changelog.
- add one debug patch.
- add one patch that get resource allocation near end of avialable window.

v6:
- reorder patches according to Bjorn.

v7:
- add some patches that fix problems on sparc that Khalid Aziz found.

v8:
- update patch 2, 3 to remove the assumpation about mem64_offset == 
mem_offset.
- add one patch for pci_find_root_bus_resource() to support above change.
- update pref_compatible flags handling after pci_find_root_bus_resource().
- add patch for quirk that ignore BAR for M1533 PCI-ISA bridge.

v9: rebased for v4.5


Yinghai Lu (60):
  PCI: Add pci_find_root_bus_resource()
  sparc/PCI: Use correct bus address to resource offset
  sparc/PCI: Reserve legacy mmio after PCI mmio
  sparc/PCI: Add IORESOURCE_MEM_64 for 64-bit resource in OF parsing
  sparc/PCI: Keep resource idx order with bridge register number
  PCI: Kill wrong quirk about M7101
  PCI: Ignore BAR for ALi M1533 PCI-ISA bridge
  powerpc/PCI: Keep resource idx order with bridge register number
  powerpc/PCI: Add IORESOURCE_MEM_64 for 64-bit resource in OF parsing
  OF/PCI: Add IORESOURCE_MEM_64 for 64-bit resource
  PCI: Check pref compatible bit for mem64 resource of PCIe device
  PCI: Only treat non-pref mmio64 as pref if all bridges have MEM_64
  PCI: Add has_mem64 for struct host_bridge
  PCI: Only treat non-pref mmio64 as pref if host bridge has mmio64
  PCI: Restore pref MMIO allocation logic for host bridge without mmio64
  PCI: Don't release fixed resource for realloc
  PCI: Claim fixed resource during remove/rescan path
  PCI: Set resource to FIXED for LSI devices
  PCI: Separate realloc list checking after allocation
  PCI: Treat optional as required in first try for bridge rescan
  PCI: Get new realloc size for bridge for last try
  PCI: Don't release sibling bridge resources during hotplug
  PCI: Cleanup res_to_dev_res() printout
  PCI: Reuse res_to_dev_res() in reassign_resources_sorted()
  PCI: Use correct align for optional only resources during sorting
  PCI: Optimize bus min_align/size calculation during sizing
  PCI: Optimize bus align/size calculation for optional during sizing
  PCI: Don't add too much optional size for hotplug bridge MMIO
  PCI: Reorder resources list for required/optional resources
  PCI: Remove duplicated code for resource sorting
  PCI: Rename pdev_sort_resources() to pdev_assign_resources_prepare()
  PCI: Treat ROM resource as optional

[PATCH v9 08/60] powerpc/PCI: Keep resource idx order with bridge register number

[Yinghai Lu]

Same as sparc version.

Make resource with consistent sequence
like other arch or directly from pci_read_bridge_bases(),
even non-pref mmio is missing, or out of ordering in firmware reporting.

So hold i = 1 for non pref mmio, and i = 2 for pref mmio.

Signed-off-by: Yinghai Lu <ying...@kernel.org>
---
 arch/powerpc/kernel/pci_of_scan.c | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/arch/powerpc/kernel/pci_of_scan.c 
b/arch/powerpc/kernel/pci_of_scan.c
index 2e710c1..349ed11 100644
--- a/arch/powerpc/kernel/pci_of_scan.c
+++ b/arch/powerpc/kernel/pci_of_scan.c
@@ -255,7 +255,7 @@ void of_scan_pci_bridge(struct pci_dev *dev)
bus->resource[i] = res;
++res;
}
-   i = 1;
+   i = 3;
for (; len >= 32; len -= 32, ranges += 8) {
flags = pci_parse_of_flags(of_read_number(ranges, 1), 1);
size = of_read_number([6], 2);
@@ -268,6 +268,12 @@ void of_scan_pci_bridge(struct pci_dev *dev)
   " for bridge %s\n", node->full_name);
continue;
}
+   } else if ((flags & IORESOURCE_PREFETCH) &&
+  !bus->resource[2]->flags) {
+   res = bus->resource[2];
+   } else if (((flags & (IORESOURCE_MEM | IORESOURCE_PREFETCH)) ==
+   IORESOURCE_MEM) && !bus->resource[1]->flags) {
+   res = bus->resource[1];
} else {
if (i >= PCI_NUM_RESOURCES - PCI_BRIDGE_RESOURCES) {
printk(KERN_ERR "PCI: too many memory ranges"
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v9 22/60] PCI: Don't release sibling bridge resources during hotplug

[Yinghai Lu]

On hotplug path, we can not touch sibling bridges that is outside
of the slot.

That could happen when BIOS does not assign some bridge BARs and
later kernel can not assign resource to them in first try.

Check if fail dev is the parent bridge, then just use subordinate
bus instead use parent bus.

Reported-by: Andreas Noever <andreas.noe...@gmail.com>
Signed-off-by: Yinghai Lu <ying...@kernel.org>
---
 drivers/pci/setup-bus.c | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index c2e3999..7f7f46c 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -1902,10 +1902,16 @@ again:
 * Try to release leaf bridge's resources that doesn't fit resource of
 * child device under that bridge
 */
-   list_for_each_entry(fail_res, _head, list)
-   pci_bus_release_bridge_resources(fail_res->dev->bus,
+   list_for_each_entry(fail_res, _head, list) {
+   struct pci_bus *bus = fail_res->dev->bus;
+
+   if (fail_res->dev == bridge)
+   bus = bridge->subordinate;
+
+   pci_bus_release_bridge_resources(bus,
 fail_res->flags & type_mask,
 whole_subtree);
+   }
 
/* restore size and flags */
list_for_each_entry(fail_res, _head, list) {
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v9 21/60] PCI: Get new realloc size for bridge for last try

[Yinghai Lu]

Current realloc path would not shrink bridge resource through
pbus_size_mem() checking with the old size.

That cause problem: when "required+optional" resource allocation fails,
the cached bridge resource size will prevent "required" resource to get
allocated smaller resource.

Clear the old resource size for last try or third and later try.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=81431
Tested-by: TJ <li...@iam.tj>
Signed-off-by: Yinghai Lu <ying...@kernel.org>
---
 drivers/pci/setup-bus.c | 23 +--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index e4972f5..c2e3999 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -1739,6 +1739,17 @@ static enum enable_type pci_realloc_detect(struct 
pci_bus *bus,
 }
 #endif
 
+static void reset_bridge_resource_size(struct pci_dev *dev,
+  struct resource *res)
+{
+   int idx = res - >resource[0];
+
+   if (idx >= PCI_BRIDGE_RESOURCES && idx <= PCI_BRIDGE_RESOURCE_END) {
+   res->start = 0;
+   res->end = res->start - 1;
+   }
+}
+
 /*
  * first try will not touch pci bridge res
  * second and later try will clear small leaf bridge res
@@ -1823,8 +1834,13 @@ again:
res->start = fail_res->start;
res->end = fail_res->end;
res->flags = fail_res->flags;
-   if (fail_res->dev->subordinate)
+   if (fail_res->dev->subordinate) {
res->flags = 0;
+   /* last or third times and later */
+   if (tried_times + 1 == pci_try_num ||
+   tried_times + 1 > 2)
+   reset_bridge_resource_size(fail_res->dev, res);
+   }
}
free_list(_head);
 
@@ -1898,8 +1914,11 @@ again:
res->start = fail_res->start;
res->end = fail_res->end;
res->flags = fail_res->flags;
-   if (fail_res->dev->subordinate)
+   if (fail_res->dev->subordinate) {
res->flags = 0;
+   /* last time */
+   reset_bridge_resource_size(fail_res->dev, res);
+   }
}
free_list(_head);
 
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v9 33/60] PCI: Add debug printout during releasing partial assigned resources

[Yinghai Lu]

We try to assign required+optional at first, and we only accept the result
if all resources get allocated. Otherwise will release assigned in the
list, and try to assign required and expand to optional.

We have to do that to make sure any required has priority over any optional.

When that happens, we only print out "assigned" info, that is confusing
as it looks like same range is assigned to two peer resources at the same
time.

Add printout for releasing so we have whole picture in debug messages.

Signed-off-by: Yinghai Lu <ying...@kernel.org>
---
 drivers/pci/setup-bus.c | 14 +++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index e9e67bc..0fc9659 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -526,9 +526,17 @@ static void __assign_resources_sorted(struct list_head 
*head,
 
free_list(_fail_head);
/* Release assigned resource */
-   list_for_each_entry(dev_res, head, list)
-   if (dev_res->res->parent)
-   release_resource(dev_res->res);
+   list_for_each_entry(dev_res, head, list) {
+   struct resource *res = dev_res->res;
+
+   if (res->parent) {
+   dev_printk(KERN_DEBUG, _res->dev->dev,
+  "BAR %d: released %pR\n",
+  (int)(res - _res->dev->resource[0]),
+  res);
+   release_resource(res);
+   }
+   }
/* Restore start/end/flags from saved list */
list_for_each_entry(save_res, _head, list) {
struct resource *res = save_res->res;
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH v8 00/61] PCI: Resource allocation cleanup for v4.4

[Yinghai Lu]

On Tue, Dec 1, 2015 at 1:23 PM, Khalid Aziz  wrote:
> The device does work with this patch.

Good.

> Doesn't this warning mean BAR6
> resources could not be reserved which means the device driver may not be
> able to get the BAR6 resource at some point if another device grabs the
> unreserved resource?

Current sparc pci only have checking, does not have assign unassigned
bar from firmware.

because firmware does not assign resource to that BAR6, the driver may
not need that bar at all.

>
> David M had pointed out an issue with how OF driver uses the same address
> range for all ROMs enabling them only one at a time. That seems to be in
> play here in the issue I am seeing. Does this patch series need to address
> this?

That trick may have problem when we have devices under bridge. as bridge
window need to be setup at first.

If the driver really need to use that trick, it should borrow from BAR0 (MEM)
instead.

Thanks

Yinghai
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH v8 00/61] PCI: Resource allocation cleanup for v4.4

[Yinghai Lu]

On Tue, Dec 1, 2015 at 1:23 PM, Khalid Aziz  wrote:
> The device does work with this patch.

Good.

> Doesn't this warning mean BAR6
> resources could not be reserved which means the device driver may not be
> able to get the BAR6 resource at some point if another device grabs the
> unreserved resource?

Current sparc pci only have checking, does not have assign unassigned
bar from firmware.

because firmware does not assign resource to that BAR6, the driver may
not need that bar at all.

>
> David M had pointed out an issue with how OF driver uses the same address
> range for all ROMs enabling them only one at a time. That seems to be in
> play here in the issue I am seeing. Does this patch series need to address
> this?

That trick may have problem when we have devices under bridge. as bridge
window need to be setup at first.

If the driver really need to use that trick, it should borrow from BAR0 (MEM)
instead.

Thanks

Yinghai
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH v8 00/61] PCI: Resource allocation cleanup for v4.4

[Yinghai Lu]

On Mon, Nov 23, 2015 at 1:31 PM, Khalid Aziz  wrote:
>> Looks like only the device BAR6 is not assigned form OF?
>
> Any progress on this? Do you need any more information from me?

Should be one warning about this device in that system.

We don't need to do anything about it if the device is working with
this patch set.

Thanks

Yinghai
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH v8 00/61] PCI: Resource allocation cleanup for v4.4

[Yinghai Lu]

On Mon, Nov 23, 2015 at 1:31 PM, Khalid Aziz  wrote:
>> Looks like only the device BAR6 is not assigned form OF?
>
> Any progress on this? Do you need any more information from me?

Should be one warning about this device in that system.

We don't need to do anything about it if the device is working with
this patch set.

Thanks

Yinghai
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 00/25] mpt3sas: Mergering mpt2sas & mpt3sas driver code

[Yinghai Lu]

On Wed, Nov 11, 2015 at 5:09 PM, Martin K. Petersen
 wrote:
>> "Sreekanth" == Sreekanth Reddy  writes:
>
> The patches in the single-module portion of the series did not compile
> individually and I gave up untangling them. They were fundamentally too
> intertwined and I squashed them into one commit. Since it's mostly
> boilerplate stuff it should not matter too much from a bisection
> perspective.

on opensuse 13.1 gcc
gcc --version
gcc (SUSE Linux) 4.8.1 20130909 [gcc-4_8-branch revision 202388]

got:

In file included from drivers/scsi/mpt3sas/mpt3sas_scsih.c:59:0:
drivers/scsi/mpt3sas/mpt3sas_scsih.c: In function ‘_scsih_io_done’:
drivers/scsi/mpt3sas/mpt3sas_base.h:1414:1: error: inlining failed in
call to always_inline ‘mpt3sas_scsi_direct_io_get’: function body not
available
 mpt3sas_scsi_direct_io_get(struct MPT3SAS_ADAPTER *ioc, u16 smid);
 ^
drivers/scsi/mpt3sas/mpt3sas_scsih.c:4448:32: error: called from here
  if (mpt3sas_scsi_direct_io_get(ioc, smid) &&
^
In file included from drivers/scsi/mpt3sas/mpt3sas_scsih.c:59:0:
drivers/scsi/mpt3sas/mpt3sas_base.h:1416:1: error: inlining failed in
call to always_inline ‘mpt3sas_scsi_direct_io_set’: function body not
available
 mpt3sas_scsi_direct_io_set(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8
direct_io);
 ^
drivers/scsi/mpt3sas/mpt3sas_scsih.c:4454:29: error: called from here
   mpt3sas_scsi_direct_io_set(ioc, smid, 0);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 00/25] mpt3sas: Mergering mpt2sas & mpt3sas driver code

[Yinghai Lu]

On Wed, Nov 11, 2015 at 5:09 PM, Martin K. Petersen
 wrote:
>> "Sreekanth" == Sreekanth Reddy  writes:
>
> The patches in the single-module portion of the series did not compile
> individually and I gave up untangling them. They were fundamentally too
> intertwined and I squashed them into one commit. Since it's mostly
> boilerplate stuff it should not matter too much from a bisection
> perspective.

on opensuse 13.1 gcc
gcc --version
gcc (SUSE Linux) 4.8.1 20130909 [gcc-4_8-branch revision 202388]

got:

In file included from drivers/scsi/mpt3sas/mpt3sas_scsih.c:59:0:
drivers/scsi/mpt3sas/mpt3sas_scsih.c: In function ‘_scsih_io_done’:
drivers/scsi/mpt3sas/mpt3sas_base.h:1414:1: error: inlining failed in
call to always_inline ‘mpt3sas_scsi_direct_io_get’: function body not
available
 mpt3sas_scsi_direct_io_get(struct MPT3SAS_ADAPTER *ioc, u16 smid);
 ^
drivers/scsi/mpt3sas/mpt3sas_scsih.c:4448:32: error: called from here
  if (mpt3sas_scsi_direct_io_get(ioc, smid) &&
^
In file included from drivers/scsi/mpt3sas/mpt3sas_scsih.c:59:0:
drivers/scsi/mpt3sas/mpt3sas_base.h:1416:1: error: inlining failed in
call to always_inline ‘mpt3sas_scsi_direct_io_set’: function body not
available
 mpt3sas_scsi_direct_io_set(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8
direct_io);
 ^
drivers/scsi/mpt3sas/mpt3sas_scsih.c:4454:29: error: called from here
   mpt3sas_scsi_direct_io_set(ioc, smid, 0);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: Question with maxcpus= parameter.

[Yinghai Lu]

On Mon, Nov 9, 2015 at 1:09 AM, Zhenzhong Duan
 wrote:

> I know that, what confused me is uek2(2.6.39-400.249.4.el6uek.x86_64) works
> with maxcpus=,
> but uek3(3.8.13-44.1.1.el6uek.x86_64) not when I don't comment out the
> script.
> I have ever suspected uek2 send CPU ADD event for only 4 cpus.
> dyndbg="file kobject_uevent.c +p" is used when debug, vimdiff with both
> dmesg:

Should be a regression. Can you bisect it?

Thanks

Yinghai
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: Question with maxcpus= parameter.

[Yinghai Lu]

On Mon, Nov 9, 2015 at 1:09 AM, Zhenzhong Duan
 wrote:

> I know that, what confused me is uek2(2.6.39-400.249.4.el6uek.x86_64) works
> with maxcpus=,
> but uek3(3.8.13-44.1.1.el6uek.x86_64) not when I don't comment out the
> script.
> I have ever suspected uek2 send CPU ADD event for only 4 cpus.
> dyndbg="file kobject_uevent.c +p" is used when debug, vimdiff with both
> dmesg:

Should be a regression. Can you bisect it?

Thanks

Yinghai
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: Question with maxcpus= parameter.

[Yinghai Lu]

On Sun, Nov 8, 2015 at 9:47 PM, Zhenzhong Duan
 wrote:
> Tried nr_cpus=4, works.
>

nr_cpus and maxcpus are different.

maxcpus=4 means kernel will only bring up 4 cpus, but other cpus still
can be brought up online.
if there are more cpu are there according acpi MADT.

nr_cpus=4 that means 4 is hard limit, just like you compiled kernel
with CONFIG_NR_CPUS=4.

Yinghai
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: Question with maxcpus= parameter.

[Yinghai Lu]

On Sun, Nov 8, 2015 at 9:47 PM, Zhenzhong Duan
 wrote:
> Tried nr_cpus=4, works.
>

nr_cpus and maxcpus are different.

maxcpus=4 means kernel will only bring up 4 cpus, but other cpus still
can be brought up online.
if there are more cpu are there according acpi MADT.

nr_cpus=4 that means 4 is hard limit, just like you compiled kernel
with CONFIG_NR_CPUS=4.

Yinghai
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: Fwd: [PATCH] x86: Use larger chunks in mtrr_cleanup

[Yinghai Lu]

On Mon, Sep 14, 2015 at 7:46 AM, Stuart Hayes  wrote:
>
> Booting with 'disable_mtrr_cleanup' works, but the system I am working with
> isn't actually failing--it just gets ugly error messages.  And the BIOS on the
> system I am working with had set up the MTRRs correctly.

Please post boot log and /proc/mtrr for:
1. without your patch
2. without your patch and with disable_mtrr_cleanup in boot command line.
3. with your patch.

Thanks

Yinghai
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: Fwd: [PATCH] x86: Use larger chunks in mtrr_cleanup

[Yinghai Lu]

On Mon, Sep 14, 2015 at 7:46 AM, Stuart Hayes  wrote:
>
> Booting with 'disable_mtrr_cleanup' works, but the system I am working with
> isn't actually failing--it just gets ugly error messages.  And the BIOS on the
> system I am working with had set up the MTRRs correctly.

Please post boot log and /proc/mtrr for:
1. without your patch
2. without your patch and with disable_mtrr_cleanup in boot command line.
3. with your patch.

Thanks

Yinghai
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH v8 00/61] PCI: Resource allocation cleanup for v4.4

[Yinghai Lu]

On Fri, Oct 30, 2015 at 2:47 PM, Khalid Aziz  wrote:
>
> I applied patches 1-8 and 11-16 to 4.3.0-rc7 to test on sparc platforms. I
> am seeing a "can't claim BAR" message on a T4:
>
> pci :04:00.0: can't claim BAR 6 [mem 0x840-0x840]:
> address conflict with :04:00.0 [mem 0x840-0x840007f]

PCI: scan_bus[/pci@400/pci@1/pci@0/pci@0/pci@0] bus no 4
  * /pci@400/pci@1/pci@0/pci@0/pci@0/display@0
create device, devfn: 0, type: display
class: 0x3 device name: :04:00.0
parse addresses (80 bytes) @ fff8001fffe34f40
  start: 840, end: 840007f, i: 10
  start: 8400080, end: 8400081, i: 14
  start: 851, end: 851007f, i: 18
  start: 840, end: 840, i: 30

so the BAR 6 the ROM bar is overlapping with BAR0.
and the ROM bar get rejected.

Looks like only the device BAR6 is not assigned form OF?

Thanks

Yinghai
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH v8 00/61] PCI: Resource allocation cleanup for v4.4

[Yinghai Lu]

On Fri, Oct 30, 2015 at 2:47 PM, Khalid Aziz  wrote:
>
> I applied patches 1-8 and 11-16 to 4.3.0-rc7 to test on sparc platforms. I
> am seeing a "can't claim BAR" message on a T4:
>
> pci :04:00.0: can't claim BAR 6 [mem 0x840-0x840]:
> address conflict with :04:00.0 [mem 0x840-0x840007f]

PCI: scan_bus[/pci@400/pci@1/pci@0/pci@0/pci@0] bus no 4
  * /pci@400/pci@1/pci@0/pci@0/pci@0/display@0
create device, devfn: 0, type: display
class: 0x3 device name: :04:00.0
parse addresses (80 bytes) @ fff8001fffe34f40
  start: 840, end: 840007f, i: 10
  start: 8400080, end: 8400081, i: 14
  start: 851, end: 851007f, i: 18
  start: 840, end: 840, i: 30

so the BAR 6 the ROM bar is overlapping with BAR0.
and the ROM bar get rejected.

Looks like only the device BAR6 is not assigned form OF?

Thanks

Yinghai
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v8 50/61] PCI: Unify calculate_size() for io port and MMIO

[Yinghai Lu]

Now calculate_memsize() and calculate_iosize() is the same.

Change them to calculate_size().

Signed-off-by: Yinghai Lu 
---
 drivers/pci/setup-bus.c | 25 +
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index d4e8da1..a6eea60 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -1104,22 +1104,7 @@ static struct resource *find_free_bus_resource(struct 
pci_bus *bus,
return NULL;
 }
 
-static resource_size_t calculate_iosize(resource_size_t size,
-   resource_size_t min_size,
-   resource_size_t old_size,
-   resource_size_t align)
-{
-   if (size < min_size)
-   size = min_size;
-   if (old_size == 1)
-   old_size = 0;
-   size = ALIGN(size, align);
-   if (size < old_size)
-   size = old_size;
-   return size;
-}
-
-static resource_size_t calculate_memsize(resource_size_t size,
+static resource_size_t calculate_size(resource_size_t size,
resource_size_t min_size,
resource_size_t old_size,
resource_size_t align)
@@ -1245,14 +1230,14 @@ static void pbus_size_io(struct pci_bus *bus, 
resource_size_t min_size,
 
size = size_aligned_for_isa(size);
size += size1;
-   size0 = calculate_iosize(size, min_size,
+   size0 = calculate_size(size, min_size,
resource_size(b_res), min_align);
sum_add_size = size_aligned_for_isa(sum_add_size);
sum_add_size += sum_add_size1;
if (sum_add_size < min_sum_size)
sum_add_size = min_sum_size;
size1 = !realloc_head ? size0 :
-   calculate_iosize(sum_add_size, min_size,
+   calculate_size(sum_add_size, min_size,
resource_size(b_res), min_align);
if (!size0 && !size1) {
if (b_res->start || b_res->end)
@@ -1580,7 +1565,7 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned 
long mask,
if (size || min_size) {
min_align = calculate_mem_align(_test_list, max_align,
size, window_align);
-   size0 = calculate_memsize(size, min_size,
+   size0 = calculate_size(size, min_size,
  resource_size(b_res), min_align);
}
free_align_test_list(_test_list);
@@ -1605,7 +1590,7 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned 
long mask,
min_add_align = calculate_mem_align(_test_add_list,
max_add_align, sum_add_size,
window_align);
-   size1 = calculate_memsize(sum_add_size, min_size,
+   size1 = calculate_size(sum_add_size, min_size,
 resource_size(b_res), min_add_align);
}
free_align_test_list(_test_add_list);
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v8 53/61] PCI: Kill macro checking for bus io port sizing

[Yinghai Lu]

We can use new generic version skip_isa_ioresource_align() instead
of macro, and then kill the marco.

Signed-off-by: Yinghai Lu 
---
 drivers/pci/setup-bus.c | 17 +++--
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index f1c7b46..419eaaf 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -1160,15 +1160,12 @@ int skip_isa_ioresource_align(struct pci_bus *bus)
return 0;
 }
 
-static resource_size_t size_aligned_for_isa(resource_size_t size)
+static resource_size_t size_aligned_for_isa(resource_size_t size,
+   struct pci_bus *bus)
 {
-   /*
-* To be fixed in 2.5: we should have sort of HAVE_ISA
-*  flag in the struct pci_bus.
-*/
-#if defined(CONFIG_ISA) || defined(CONFIG_EISA)
-   size = (size & 0xff) + ((size & ~0xffUL) << 2);
-#endif
+   if (!skip_isa_ioresource_align(bus))
+   size = (size & 0xff) + ((size & ~0xffUL) << 2);
+
return size;
 }
 
@@ -1237,12 +1234,12 @@ static void pbus_size_io(struct pci_bus *bus, 
resource_size_t min_size,
}
}
 
-   size = size_aligned_for_isa(size);
+   size = size_aligned_for_isa(size, bus);
size += size1;
if (size || min_size)
size0 = calculate_size(size, min_size,
resource_size(b_res), min_align);
-   sum_add_size = size_aligned_for_isa(sum_add_size);
+   sum_add_size = size_aligned_for_isa(sum_add_size, bus);
sum_add_size += sum_add_size1;
if (sum_add_size < min_sum_size)
sum_add_size = min_sum_size;
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v8 32/61] PCI: Rename pdev_sort_resources() to pdev_assign_resources_prepare()

[Yinghai Lu]

pdev_sort_resources() etc was checking devices resources and putting
resources that need to assign to one list in sorted order.

Now we don't do sorting in those functions anymore, so change to
pdev_assign_resources_prepare() instead.

Signed-off-by: Yinghai Lu 
---
 drivers/pci/setup-bus.c | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index bcf7cba..74ad4ce 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -205,8 +205,8 @@ static resource_size_t __pci_resource_alignment(
return r_align;
 }
 
-/* Sort resources by alignment */
-static void pdev_sort_resources(struct pci_dev *dev,
+/* check resources and save to the list */
+static void pdev_assign_resources_prepare(struct pci_dev *dev,
 struct list_head *realloc_head,
 struct list_head *head)
 {
@@ -242,7 +242,7 @@ static void pdev_sort_resources(struct pci_dev *dev,
}
 }
 
-static void __dev_sort_resources(struct pci_dev *dev,
+static void __dev_assign_resources_prepare(struct pci_dev *dev,
 struct list_head *realloc_head,
 struct list_head *head)
 {
@@ -260,7 +260,7 @@ static void __dev_sort_resources(struct pci_dev *dev,
return;
}
 
-   pdev_sort_resources(dev, realloc_head, head);
+   pdev_assign_resources_prepare(dev, realloc_head, head);
 }
 
 static inline void reset_resource(struct resource *res)
@@ -566,7 +566,7 @@ static void pdev_assign_resources_sorted(struct pci_dev 
*dev,
 {
LIST_HEAD(head);
 
-   __dev_sort_resources(dev, add_head, );
+   __dev_assign_resources_prepare(dev, add_head, );
__assign_resources_sorted(, add_head, fail_head);
 
 }
@@ -579,7 +579,7 @@ static void pbus_assign_resources_sorted(const struct 
pci_bus *bus,
LIST_HEAD(head);
 
list_for_each_entry(dev, >devices, bus_list)
-   __dev_sort_resources(dev, realloc_head, );
+   __dev_assign_resources_prepare(dev, realloc_head, );
 
__assign_resources_sorted(, realloc_head, fail_head);
 }
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v8 01/61] sparc/PCI: Add mem64 resource parsing for root bus

[Yinghai Lu]

Found "no compatible bridge window" warning in boot log from T5-8.

pci :00:01.0: can't claim BAR 15 [mem 0x1-0x4afff pref]: no 
compatible bridge window

That resource is above 4G, but does not get offset correctly as
root bus only report io and mem32.

pci_sun4v f02dbcfc: PCI host bridge to bus :00
pci_bus :00: root bus resource [io  0x8040-0x80400fff] (bus 
address [0x-0xfff])
pci_bus :00: root bus resource [mem 0x8000-0x80007eff] (bus 
address [0x-0x7eff])
pci_bus :00: root bus resource [bus 00-77]

Add mem64 handling in pci_common for sparc, so we can have 64bit resource
registered for root bus at first.

After patch, will have:
pci_sun4v f02dbcfc: PCI host bridge to bus :00
pci_bus :00: root bus resource [io  0x8040-0x80400fff] (bus 
address [0x-0xfff])
pci_bus :00: root bus resource [mem 0x8000-0x80007eff] (bus 
address [0x-0x7eff])
pci_bus :00: root bus resource [mem 0x8001-0x8007] (bus 
address [0x1-0x7])
pci_bus :00: root bus resource [bus 00-77]

-v2: mem64_space should use mem_space.start as offset.
-v3: add IORESOURCE_MEM_64 flag
-v4: set name for mem64_space, otherwise /proc/iomem will have  for name

Fixes: commit d63e2e1f3df9 ("sparc/PCI: Clip bridge windows to fit in upstream 
windows")
Link: 
http://lkml.kernel.org/r/cae9fiqu1gjy1lyrxs+ma5lcteee4xmtjrg0axj9k_tsu+m9...@mail.gmail.com
Reported-by: David Ahern 
Tested-by: David Ahern 
Signed-off-by: Yinghai Lu 
Tested-by: Khalid Aziz 

 arch/sparc/kernel/pci.c|7 ++-
 arch/sparc/kernel/pci_common.c |   17 +++--
 arch/sparc/kernel/pci_impl.h   |1 +
 3 files changed, 22 insertions(+), 3 deletions(-)
---
 arch/sparc/kernel/pci.c|  7 ++-
 arch/sparc/kernel/pci_common.c | 17 +++--
 arch/sparc/kernel/pci_impl.h   |  1 +
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
index b91d7f1..badf095 100644
--- a/arch/sparc/kernel/pci.c
+++ b/arch/sparc/kernel/pci.c
@@ -185,8 +185,10 @@ static unsigned long pci_parse_of_flags(u32 addr0)
 
if (addr0 & 0x0200) {
flags = IORESOURCE_MEM | PCI_BASE_ADDRESS_SPACE_MEMORY;
-   flags |= (addr0 >> 22) & PCI_BASE_ADDRESS_MEM_TYPE_64;
flags |= (addr0 >> 28) & PCI_BASE_ADDRESS_MEM_TYPE_1M;
+   if (addr0 & 0x0100)
+   flags |= IORESOURCE_MEM_64
+| PCI_BASE_ADDRESS_MEM_TYPE_64;
if (addr0 & 0x4000)
flags |= IORESOURCE_PREFETCH
 | PCI_BASE_ADDRESS_MEM_PREFETCH;
@@ -655,6 +657,9 @@ struct pci_bus *pci_scan_one_pbm(struct pci_pbm_info *pbm,
pbm->io_space.start);
pci_add_resource_offset(, >mem_space,
pbm->mem_space.start);
+   if (pbm->mem64_space.flags)
+   pci_add_resource_offset(, >mem64_space,
+   pbm->mem_space.start);
pbm->busn.start = pbm->pci_first_busno;
pbm->busn.end   = pbm->pci_last_busno;
pbm->busn.flags = IORESOURCE_BUS;
diff --git a/arch/sparc/kernel/pci_common.c b/arch/sparc/kernel/pci_common.c
index 944a065..33524c1 100644
--- a/arch/sparc/kernel/pci_common.c
+++ b/arch/sparc/kernel/pci_common.c
@@ -406,6 +406,7 @@ void pci_determine_mem_io_space(struct pci_pbm_info *pbm)
}
 
num_pbm_ranges = i / sizeof(*pbm_ranges);
+   memset(>mem64_space, 0, sizeof(struct resource));
 
for (i = 0; i < num_pbm_ranges; i++) {
const struct linux_prom_pci_ranges *pr = _ranges[i];
@@ -451,7 +452,12 @@ void pci_determine_mem_io_space(struct pci_pbm_info *pbm)
break;
 
case 3:
-   /* XXX 64-bit MEM handling XXX */
+   /* 64-bit MEM handling */
+   pbm->mem64_space.start = a;
+   pbm->mem64_space.end = a + size - 1UL;
+   pbm->mem64_space.flags = IORESOURCE_MEM;
+   saw_mem = 1;
+   break;
 
default:
break;
@@ -465,15 +471,22 @@ void pci_determine_mem_io_space(struct pci_pbm_info *pbm)
prom_halt();
}
 
-   printk("%s: PCI IO[%llx] MEM[%llx]\n",
+   printk("%s: PCI IO[%llx] MEM[%llx]",
   pbm->name,
   pbm->io_space.start,
   pbm->mem_space.start);
+   if (pbm->mem64_space.flags)
+   printk(" MEM64[%llx]",
+  pbm->mem64_space.start);
+   printk("\n");
 
pbm->io_space

[PATCH v8 03/61] sparc/PCI: Use correct bus address to resource offset

[Yinghai Lu]

After we add 64bit mmio parsing, we got some "no compatible bridge window"
warning on anther new model that support 64bit resource.

It turns out that we can not use mem_space.start as 64bit mem space
offset, aka mem_space.start != offset.

Use child_phys_addr to calculate exact offset and recorde offset in
pbm.

After patch we get correct offset.

/pci@305: PCI IO [io  0x2007e-0x2007e0fff] offset 2007e
/pci@305: PCI MEM [mem 0x20010-0x27eff] offset 2
/pci@305: PCI MEM64 [mem 0x20001-0x2000d] offset 2
...
pci_sun4v f02ae7f8: PCI host bridge to bus :00
pci_bus :00: root bus resource [io  0x2007e-0x2007e0fff] (bus 
address [0x-0xfff])
pci_bus :00: root bus resource [mem 0x20010-0x27eff] (bus 
address [0x0010-0x7eff])
pci_bus :00: root bus resource [mem 0x20001-0x2000d] (bus 
address [0x1-0xd])

-v2: to make it simple, do not add mem64_offset, and assume
 mem64_offset == mem_offset even that is not same as mem_space.start,
 otherwise would make pci_mmap_resource() path too complicated.

-v3: put back mem64_offset, as we found T4 has mem_offset != mem64_offset
 check overlapping between mem64_space and mem_space.

-v5: use pcibios_bus_to_region() requested by Bjorn.
 use pci_find_root_bus_resource().

Signed-off-by: Yinghai Lu 
Tested-by: Khalid Aziz 
---
 arch/sparc/kernel/pci.c| 50 +++---
 arch/sparc/kernel/pci_common.c | 32 ---
 arch/sparc/kernel/pci_impl.h   |  4 
 3 files changed, 50 insertions(+), 36 deletions(-)

diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
index badf095..269630a 100644
--- a/arch/sparc/kernel/pci.c
+++ b/arch/sparc/kernel/pci.c
@@ -654,12 +654,12 @@ struct pci_bus *pci_scan_one_pbm(struct pci_pbm_info *pbm,
printk("PCI: Scanning PBM %s\n", node->full_name);
 
pci_add_resource_offset(, >io_space,
-   pbm->io_space.start);
+   pbm->io_offset);
pci_add_resource_offset(, >mem_space,
-   pbm->mem_space.start);
+   pbm->mem_offset);
if (pbm->mem64_space.flags)
pci_add_resource_offset(, >mem64_space,
-   pbm->mem_space.start);
+   pbm->mem64_offset);
pbm->busn.start = pbm->pci_first_busno;
pbm->busn.end   = pbm->pci_last_busno;
pbm->busn.flags = IORESOURCE_BUS;
@@ -733,30 +733,28 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
 static int __pci_mmap_make_offset_bus(struct pci_dev *pdev, struct 
vm_area_struct *vma,
  enum pci_mmap_state mmap_state)
 {
-   struct pci_pbm_info *pbm = pdev->dev.archdata.host_controller;
-   unsigned long space_size, user_offset, user_size;
-
-   if (mmap_state == pci_mmap_io) {
-   space_size = resource_size(>io_space);
-   } else {
-   space_size = resource_size(>mem_space);
-   }
+   unsigned long user_offset, user_size;
+   struct resource res, *root_bus_res;
+   struct pci_bus_region region;
 
/* Make sure the request is in range. */
user_offset = vma->vm_pgoff << PAGE_SHIFT;
user_size = vma->vm_end - vma->vm_start;
 
-   if (user_offset >= space_size ||
-   (user_offset + user_size) > space_size)
+   region.start = user_offset;
+   region.end = user_offset + user_size - 1;
+   memset(, 0, sizeof(res));
+   if (mmap_state == pci_mmap_io)
+   res.flags = IORESOURCE_IO;
+   else
+   res.flags = IORESOURCE_MEM;
+
+   pcibios_bus_to_resource(pdev->bus, , );
+   root_bus_res = pci_find_root_bus_resource(pdev->bus, );
+   if (!root_bus_res)
return -EINVAL;
 
-   if (mmap_state == pci_mmap_io) {
-   vma->vm_pgoff = (pbm->io_space.start +
-user_offset) >> PAGE_SHIFT;
-   } else {
-   vma->vm_pgoff = (pbm->mem_space.start +
-user_offset) >> PAGE_SHIFT;
-   }
+   vma->vm_pgoff = res.start >> PAGE_SHIFT;
 
return 0;
 }
@@ -977,16 +975,12 @@ void pci_resource_to_user(const struct pci_dev *pdev, int 
bar,
  const struct resource *rp, resource_size_t *start,
  resource_size_t *end)
 {
-   struct pci_pbm_info *pbm = pdev->dev.archdata.host_controller;
-   unsigned long offset;
+   struct pci_bus_region region;
 
-   if (rp->flags & IORESOURCE_IO)
-   offset = pbm->io_space.start;
-   else
-   o

[PATCH v8 08/61] PCI: Ignore BAR for ALi M1533 PCI-ISA bridge

[Yinghai Lu]

Meelis reported strange conflicts on sparc v210:
pci 0001:00:07.0: can't claim BAR 2 [mem 0x7ff-0x7ff000f]: address 
conflict with 0001:00:07.0 [mem 0x7ff-0x7ff000f]
pci 0001:00:06.0: can't claim BAR 0 [io 0x7fe0100-0x7fe010f]: address 
conflict with 0001:00:07.0 [io 0x7fe0100-0x7fe0100]
pci 0001:00:0d.0: can't claim BAR 0 [io 0x7fe01000900-0x7fe01000907]: address 
conflict with 0001:00:07.0 [io 0x7fe0100-0x7fe0100]
pci 0001:00:0d.0: can't claim BAR 1 [io 0x7fe01000918-0x7fe0100091f]: address 
conflict with 0001:00:07.0 [io 0x7fe0100-0x7fe0100]
pci 0001:00:0d.0: can't claim BAR 2 [io 0x7fe01000910-0x7fe01000917]: address 
conflict with 0001:00:07.0 [io 0x7fe0100-0x7fe0100]
pci 0001:00:0d.0: can't claim BAR 3 [io 0x7fe01000908-0x7fe0100090f]: address 
conflict with 0001:00:07.0 [io 0x7fe0100-0x7fe0100]
pci 0001:00:0d.0: can't claim BAR 4 [io 0x7fe01000920-0x7fe0100092f]: address 
conflict with 0001:00:07.0 [io 0x7fe0100-0x7fe0100]
PCI: /pci@1e,60 can't claim Video RAM area [mem 
0x7ff000a-0x7ff000b]: address conflict with 0001:00:07.0 [mem 
0x7ff-0x7ff000f]
PCI: /pci@1e,60 can't claim System ROM [mem 0x7ff000f-0x7ff000f]: 
address conflict with 0001:00:07.0 [mem 0x7ff-0x7ff000f]
PCI: /pci@1e,60 can't claim Video ROM [mem 0x7ff000c-0x7ff000c7fff]: 
address conflict with 0001:00:07.0 [mem 0x7ff-0x7ff000f]

we have
pci_bus 0001:00: root bus resource [io  0x7fe0100-0x7fe01ff] (bus 
address [0x-0xff])
pci_bus 0001:00: root bus resource [mem 0x7ff-0x7ff] (bus 
address [0x-0x])

so pci bus address in the bars for 0001:00:07.0 has all 0s.

0001:00:07.0 ISA bridge: ULi Electronics Inc. M1533/M1535/M1543 PCI to ISA 
Bridge [Aladdin IV/V/V+]
Region 0: [virtual] I/O ports at  [size=64K]
Region 1: Memory at  (32-bit, non-prefetchable) [size=1M]
Region 2: Memory at  (32-bit, non-prefetchable) [size=1M]
00: b9 10 33 15 0f 00 10 02 00 00 01 06 00 00 00 00
10: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
20: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
30: 00 00 00 00 a0 00 00 00 00 00 00 00 00 00 00 00

According to http://www.versalogic.com/Support/Downloads/pdf/ali1543.pdf
page 28: The indices before 40h are read-only.
and we have all 0 from 0x10-0x2f, according to lspci.
So those BAR do not work as regular BAR, just clean flags, and ignore them all
the way include claim and sizing and alloc etc.

Reported-by: Meelis Roos 
Signed-off-by: Yinghai Lu 
---
 drivers/pci/quirks.c | 15 +++
 1 file changed, 15 insertions(+)

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 55bb661..af75580 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -433,6 +433,21 @@ static void quirk_amd_nl_class(struct pci_dev *pdev)
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_NL_USB,
quirk_amd_nl_class);
 
+
+/*
+ * ALi m1533 pci to isa bridge does not have BAR according to datasheet,
+ * clear the flags, so we will try to claim them or reallocate res.
+ */
+static void quirk_ali1533(struct pci_dev *dev)
+{
+   int i;
+
+   for (i = 0; i < PCI_ROM_RESOURCE; i++)
+   dev->resource[i].flags = 0;
+}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533,
+quirk_ali1533);
+
 static void piix4_io_quirk(struct pci_dev *dev, const char *name, unsigned int 
port, unsigned int enable)
 {
u32 devres;
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v8 06/61] sparc/PCI: Keep resource idx order with bridge register number

[Yinghai Lu]

On one system found strang "no compatible bridge window" warning

PCI: Claiming :00:01.0: Resource 14: 00020001..000200010fff 
[10220c]
PCI: Claiming :01:00.0: Resource 1: 00020001..00020001 
[100214]
pci :01:00.0: can't claim BAR 1 [mem 0x20001-0x20001 
64bit]: no compatible bridge window

and we already had pref_compat support that add extra pref bit for device
resource.

It turns out that pci_resource_compatible()/pci_up_path_over_pref_mem64()
just check resource with bridge pref mmio register idx 15, and we have put
resource to use mmio register idx 14 during of_scan_pci_bridge()
as the bridge does not mmio resource.

We already fix pci_up_path_over_pref_mem64() to check all bus resources.

And at the same time, this patch will make resource to consistent sequence
like other arch or directly from pci_read_bridge_bases(),
even non-pref mmio is missing, or out of ordering in firmware reporting.

So hold i = 1 for non pref mmio, and i = 2 for pref mmio.

Signed-off-by: Yinghai Lu 
Tested-by: Khalid Aziz 
---
 arch/sparc/kernel/pci.c | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
index 0e82584..36a0dfb 100644
--- a/arch/sparc/kernel/pci.c
+++ b/arch/sparc/kernel/pci.c
@@ -472,7 +472,7 @@ static void of_scan_pci_bridge(struct pci_pbm_info *pbm,
pci_read_bridge_bases(bus);
goto after_ranges;
}
-   i = 1;
+   i = 3;
for (; len >= 32; len -= 32, ranges += 8) {
u64 start;
 
@@ -504,6 +504,12 @@ static void of_scan_pci_bridge(struct pci_pbm_info *pbm,
   " for bridge %s\n", node->full_name);
continue;
}
+   } else if ((flags & IORESOURCE_PREFETCH) &&
+  !bus->resource[2]->flags) {
+   res = bus->resource[2];
+   } else if (((flags & (IORESOURCE_MEM | IORESOURCE_PREFETCH)) ==
+   IORESOURCE_MEM) && !bus->resource[1]->flags) {
+   res = bus->resource[1];
} else {
if (i >= PCI_NUM_RESOURCES - PCI_BRIDGE_RESOURCES) {
printk(KERN_ERR "PCI: too many memory ranges"
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v8 04/61] sparc/PCI: Reserve legacy mmio after PCI mmio

[Yinghai Lu]

On one system found bunch of claim resource fail from pci device.
pci_sun4v f02b894c: PCI host bridge to bus :00
pci_bus :00: root bus resource [io  0x2007e-0x2007e0fff] (bus 
address [0x-0xfff])
pci_bus :00: root bus resource [mem 0x2-0x27eff] (bus 
address [0x-0x7eff])
pci_bus :00: root bus resource [mem 0x20001-0x20007] (bus 
address [0x1-0x7])
...
PCI: Claiming :00:02.0: Resource 14: 0002..0002004f 
[200]
pci :00:02.0: can't claim BAR 14 [mem 0x2-0x2004f]: 
address conflict with Video RAM area [??? 0x2000a-0x2000b flags 
0x8000]
pci :02:00.0: can't claim BAR 0 [mem 0x2-0x2000f]: no 
compatible bridge window
PCI: Claiming :02:00.0: Resource 3: 00020010..000200103fff [200]
pci :02:00.0: can't claim BAR 3 [mem 0x20010-0x200103fff]: no 
compatible bridge window
PCI: Claiming :02:00.1: Resource 0: 00020020..0002002f [200]
pci :02:00.1: can't claim BAR 0 [mem 0x20020-0x2002f]: no 
compatible bridge window
PCI: Claiming :02:00.1: Resource 3: 000200104000..000200107fff [200]
pci :02:00.1: can't claim BAR 3 [mem 0x200104000-0x200107fff]: no 
compatible bridge window
PCI: Claiming :02:00.2: Resource 0: 00020030..0002003f [200]
pci :02:00.2: can't claim BAR 0 [mem 0x20030-0x2003f]: no 
compatible bridge window
PCI: Claiming :02:00.2: Resource 3: 000200108000..00020010bfff [200]
pci :02:00.2: can't claim BAR 3 [mem 0x200108000-0x20010bfff]: no 
compatible bridge window
PCI: Claiming :02:00.3: Resource 0: 00020040..0002004f [200]
pci :02:00.3: can't claim BAR 0 [mem 0x20040-0x2004f]: no 
compatible bridge window
PCI: Claiming :02:00.3: Resource 3: 00020010c000..00020010 [200]
pci :02:00.3: can't claim BAR 3 [mem 0x20010c000-0x20010]: no 
compatible bridge window

The bridge 00:02.0 resource does not get reserved as Video RAM take the 
position early,
and following children all failed.

Move down Video RAM area reservation after pci mmio get reserved,
so we leave pci driver to use those regions.

-v5: merge simplify one and use pcibios_bus_to_resource()
 and pci_find_root_bus_resource()

Signed-off-by: Yinghai Lu 
Tested-by: Khalid Aziz 
---
 arch/sparc/kernel/pci.c|  1 +
 arch/sparc/kernel/pci_common.c | 59 ++
 arch/sparc/kernel/pci_impl.h   |  1 +
 3 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
index 269630a..0e82584 100644
--- a/arch/sparc/kernel/pci.c
+++ b/arch/sparc/kernel/pci.c
@@ -677,6 +677,7 @@ struct pci_bus *pci_scan_one_pbm(struct pci_pbm_info *pbm,
pci_bus_register_of_sysfs(bus);
 
pci_claim_bus_resources(bus);
+   pci_register_legacy_regions(bus);
pci_bus_add_devices(bus);
return bus;
 }
diff --git a/arch/sparc/kernel/pci_common.c b/arch/sparc/kernel/pci_common.c
index 76998f8..09380a5 100644
--- a/arch/sparc/kernel/pci_common.c
+++ b/arch/sparc/kernel/pci_common.c
@@ -328,41 +328,46 @@ void pci_get_pbm_props(struct pci_pbm_info *pbm)
}
 }
 
-static void pci_register_legacy_regions(struct resource *io_res,
-   struct resource *mem_res)
+static void pci_register_region(struct pci_bus *bus, const char *name,
+   resource_size_t rstart, resource_size_t size)
 {
-   struct resource *p;
+   struct resource *res, *conflict, *root_bus_res;
+   struct pci_bus_region region;
 
-   /* VGA Video RAM. */
-   p = kzalloc(sizeof(*p), GFP_KERNEL);
-   if (!p)
+   res = kzalloc(sizeof(*res), GFP_KERNEL);
+   if (!res)
return;
 
-   p->name = "Video RAM area";
-   p->start = mem_res->start + 0xaUL;
-   p->end = p->start + 0x1UL;
-   p->flags = IORESOURCE_BUSY;
-   request_resource(mem_res, p);
+   res->flags = IORESOURCE_MEM;
 
-   p = kzalloc(sizeof(*p), GFP_KERNEL);
-   if (!p)
+   region.start = rstart;
+   region.end = rstart + size - 1UL;
+   pcibios_bus_to_resource(bus, res, );
+   root_bus_res = pci_find_root_bus_resource(bus, res);
+   if (!root_bus_res) {
+   kfree(res);
return;
+   }
+
+   res->name = name;
+   res->flags |= IORESOURCE_BUSY;
+   conflict = request_resource_conflict(root_bus_res, res);
+   if (conflict) {
+   dev_printk(KERN_DEBUG, >dev,
+   " can't claim %s %pR: address conflict with %s %pR\n",
+   res->name, res, conflict->name, conflict);
+   kfree(res);
+   }
+}
 
-   p

[PATCH v8 11/61] OF/PCI: Add IORESOURCE_MEM_64 for 64-bit resource

[Yinghai Lu]

For device resource PREF bit setting under bridge 64-bit pref resource,
we need to make sure only set PREF for 64bit resource, so set
IORESOUCE_MEM_64 for 64bit resource during OF device resource flags
parsing.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=96261
Link: https://bugzilla.kernel.org/show_bug.cgi?id=96241
Signed-off-by: Yinghai Lu 
Cc: Grant Likely 
Cc: Rob Herring 
Cc: devicet...@vger.kernel.org
Tested-by: Khalid Aziz 
---
 drivers/of/address.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/of/address.c b/drivers/of/address.c
index 384574c..3399602 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -128,9 +128,11 @@ static unsigned int of_bus_pci_get_flags(const __be32 
*addr)
flags |= IORESOURCE_IO;
break;
case 0x02: /* 32 bits */
-   case 0x03: /* 64 bits */
flags |= IORESOURCE_MEM;
break;
+   case 0x03: /* 64 bits */
+   flags |= IORESOURCE_MEM | IORESOURCE_MEM_64;
+   break;
}
if (w & 0x4000)
flags |= IORESOURCE_PREFETCH;
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v8 05/61] sparc/PCI: Add IORESOURCE_MEM_64 for 64-bit resource in OF parsing

[Yinghai Lu]

For device resource PREF bit setting under bridge 64-bit pref resource,
we need to make sure only set PREF for 64bit resource, so set
IORESOUCE_MEM_64 for 64bit resource during of device resource flags
parsing.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=96261
Link: https://bugzilla.kernel.org/show_bug.cgi?id=96241
Signed-off-by: Yinghai Lu 
Cc: "David S. Miller" 
Cc: sparcli...@vger.kernel.org
Tested-by: Khalid Aziz 
---
 arch/sparc/kernel/of_device_32.c | 5 +++--
 arch/sparc/kernel/of_device_64.c | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/arch/sparc/kernel/of_device_32.c b/arch/sparc/kernel/of_device_32.c
index 185aa96..3e9f273 100644
--- a/arch/sparc/kernel/of_device_32.c
+++ b/arch/sparc/kernel/of_device_32.c
@@ -83,11 +83,12 @@ static unsigned long of_bus_pci_get_flags(const u32 *addr, 
unsigned long flags)
case 0x01:
flags |= IORESOURCE_IO;
break;
-
case 0x02: /* 32 bits */
-   case 0x03: /* 64 bits */
flags |= IORESOURCE_MEM;
break;
+   case 0x03: /* 64 bits */
+   flags |= IORESOURCE_MEM | IORESOURCE_MEM_64;
+   break;
}
if (w & 0x4000)
flags |= IORESOURCE_PREFETCH;
diff --git a/arch/sparc/kernel/of_device_64.c b/arch/sparc/kernel/of_device_64.c
index 7bbdc26..defee61 100644
--- a/arch/sparc/kernel/of_device_64.c
+++ b/arch/sparc/kernel/of_device_64.c
@@ -146,11 +146,12 @@ static unsigned long of_bus_pci_get_flags(const u32 
*addr, unsigned long flags)
case 0x01:
flags |= IORESOURCE_IO;
break;
-
case 0x02: /* 32 bits */
-   case 0x03: /* 64 bits */
flags |= IORESOURCE_MEM;
break;
+   case 0x03: /* 64 bits */
+   flags |= IORESOURCE_MEM | IORESOURCE_MEM_64;
+   break;
}
if (w & 0x4000)
flags |= IORESOURCE_PREFETCH;
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v8 21/61] PCI: Treat optional as required in first try for bridge rescan

[Yinghai Lu]

For rescan bridge/bus that children are removed before, we should treat
optional as required just like root bus the boot time in 19aa7ee432ce
(PCI: make re-allocation try harder by reassigning ranges higher in
the heirarchy).

The reason: allocate required and expand to optional path do not
put failed resource to fail list, so will lose required info before
next try.

So we are using following way:
1. First and following try before last try:
   We don't keep realloc list so treat every optional as required.
   allocate for required+optional and put failed in the fail list.
   then size info (include must and optonal separatedly) will be kept
   for next try.
2. last try:
   a: try to allocate required+optional to see if all get allocated.
   b: try to allocate required then expand to optional.

Signed-off-by: Yinghai Lu 
---
 drivers/pci/setup-bus.c | 19 ++-
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 53ab81f..5505942 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -1802,25 +1802,34 @@ void __init pci_assign_unassigned_resources(void)
 void pci_assign_unassigned_bridge_resources(struct pci_dev *bridge)
 {
struct pci_bus *parent = bridge->subordinate;
-   LIST_HEAD(add_list); /* list of resources that
+   LIST_HEAD(realloc_head); /* list of resources that
want additional resources */
+   struct list_head *add_list = NULL;
int tried_times = 0;
LIST_HEAD(fail_head);
struct pci_dev_resource *fail_res;
int retval;
unsigned long type_mask = IORESOURCE_IO | IORESOURCE_MEM |
  IORESOURCE_PREFETCH | IORESOURCE_MEM_64;
+   int pci_try_num = 2;
 
 again:
-   __pci_bus_size_bridges(parent, _list);
-   __pci_bridge_assign_resources(bridge, _list, _head);
-   pci_bus_check_realloc(_list);
+   /*
+* last try will use add_list, otherwise will try good to have as
+* must have, so can realloc parent bridge resource
+*/
+   if (tried_times + 1 == pci_try_num)
+   add_list = _head;
+   __pci_bus_size_bridges(parent, add_list);
+   __pci_bridge_assign_resources(bridge, add_list, _head);
+   if (add_list)
+   pci_bus_check_realloc(add_list);
tried_times++;
 
if (list_empty(_head))
goto enable_all;
 
-   if (tried_times >= 2) {
+   if (tried_times >= pci_try_num) {
/* still fail, don't need to try more */
free_list(_head);
goto enable_all;
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v8 07/61] PCI: Kill wrong quirk about M7101

[Yinghai Lu]

Meelis reported that qla2000 driver does not get loaded on one sparc system.

schizo f00732d0: PCI host bridge to bus 0001:00
pci_bus 0001:00: root bus resource [io  0x7fe0100-0x7fe01ff] (bus 
address [0x-0xff])
pci 0001:00:06.0: quirk: [io  0x7fe01000800-0x7fe0100083f] claimed by ali7101 
ACPI
pci 0001:00:06.0: quirk: [io  0x7fe01000600-0x7fe0100061f] claimed by ali7101 
SMB
pci 0001:00:07.0: can't claim BAR 0 [io  0x7fe0100-0x7fe0100]: address 
conflict with 0001:00:06.0 [io  0x7fe01000600-0x7fe0100061f]

So the quirk for M7101 claim the io range early.

According to spec with M7101 in M1543 page 103/104,
http://www.versalogic.com/Support/Downloads/pdf/ali1543.pdf
0xe0, and 0xe2 do not include address info for acpi/smb.

Kill wrong quirk about them.

Link: http://kodu.ut.ee/~mroos/dm/dm.v240
Link: http://kodu.ut.ee/~mroos/dm/dm.sb100
Reported-by: Meelis Roos 
Cc: Meelis Roos 
Signed-off-by: Yinghai Lu 
Tested-by: Khalid Aziz 
---
 drivers/pci/quirks.c | 18 --
 1 file changed, 18 deletions(-)

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index b03373f..55bb661 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -433,24 +433,6 @@ static void quirk_amd_nl_class(struct pci_dev *pdev)
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_NL_USB,
quirk_amd_nl_class);
 
-/*
- * Let's make the southbridge information explicit instead
- * of having to worry about people probing the ACPI areas,
- * for example.. (Yes, it happens, and if you read the wrong
- * ACPI register it will put the machine to sleep with no
- * way of waking it up again. Bummer).
- *
- * ALI M7101: Two IO regions pointed to by words at
- * 0xE0 (64 bytes of ACPI registers)
- * 0xE2 (32 bytes of SMB registers)
- */
-static void quirk_ali7101_acpi(struct pci_dev *dev)
-{
-   quirk_io_region(dev, 0xE0, 64, PCI_BRIDGE_RESOURCES, "ali7101 ACPI");
-   quirk_io_region(dev, 0xE2, 32, PCI_BRIDGE_RESOURCES+1, "ali7101 SMB");
-}
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101, 
quirk_ali7101_acpi);
-
 static void piix4_io_quirk(struct pci_dev *dev, const char *name, unsigned int 
port, unsigned int enable)
 {
u32 devres;
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v8 00/61] PCI: Resource allocation cleanup for v4.4

[Yinghai Lu]

Hi,

After 5b28541552ef (PCI: Restrict 64-bit prefetchable bridge windows
to 64-bit resources), we have several reports on resource allocation
failure, and we try to fix the problem with resource clip, and find
more problems.

One is realloc fail with two graphics cards above 4G.
One is from sparc that have problem with clip as we don't parse
mem64 for it.

Other report is about pci remove/rescan does not work on some setup
when BIOS tend to allocate small bus size.

This patchset enhance resource allocation to address those problems.

patch 1-11: parse MEM64 for sparc and other system with OF
patch 12-16: MMIO64 allocation enhancement
treat non-pref mmio64 if parent bridges are all pcie.
restore old pref allocation logic if hostbridge does not support mmio64.
patch 17-19: FIXED resource handling during realloc
don't realloc resource if device firmware does not support bar change.
patch 20-23: bridge MMIO allocation with hotplug and last try.
treat optional as required on first try when hotplug.
MMIO size set to 0 for last try during realloc
patch 24-57: enhancement for mmio resource allocation:
optimize bus mmio alignment calculation.
optimize bus mmio optional alignment calculation.
add support for alt size to prefer small bus size to small bus 
alignment.
treat ROM bar as optional resource.
during allocation, will pick up best fit resource, and allocate near 
end.
patch 58: add pci=assign_pref_bars to clear and assign pref bars.
patch 59-60: don't clear resource when allocation fails
patch 61: don't try io port allocation if root bus does not have io port.

I put latest copy at:
  git://git.kernel.org/pub/scm/linux/kernel/git/yinghai/linux-yinghai.git 
for-pci-v4.4-next

That is based on v4.3-rc4+.

Yijing and Wei Yang both tested the branch, and the patchset fixs rescan
problem, and is working well on powerpc setup.

Khalid Aziz tested on some sparc platforms that have different offset to
mem space start or support 64bit mmio.

Thanks

Yinghai

v2:
- fix resource_disabled allocation from powerpc.
- other warnings that were found by Fengguang's build robot.
- io port alignment clean up.
- rebased to v4.2-rc2.
- better for two alt_size support.

v3:
- fix reset bridge resource on last try: only with bridge resources.
- remove/rescan path checking with old_size.

v4:
- Update changelog according to Bjorn.
- split calculate_size patch to two.
- use required instead of must.

v5:
- update changelog.
- add one debug patch.
- add one patch that get resource allocation near end of avialable window.

v6:
- reorder patches according to Bjorn.

v7:
- add some patches that fix problems on sparc that Khalid Aziz found.

v8:
- update patch 2, 3 to remove the assumpation about mem64_offset == 
mem_offset.
- add one patch for pci_find_root_bus_resource() to support above change.
- update pref_compatible flags handling after pci_find_root_bus_resource().
- add patch for quirk that ignore BAR for M1533 PCI-ISA bridge.

Yinghai Lu (61):
  sparc/PCI: Add mem64 resource parsing for root bus
  PCI: Add pci_find_root_bus_resource()
  sparc/PCI: Use correct bus address to resource offset
  sparc/PCI: Reserve legacy mmio after PCI mmio
  sparc/PCI: Add IORESOURCE_MEM_64 for 64-bit resource in OF parsing
  sparc/PCI: Keep resource idx order with bridge register number
  PCI: Kill wrong quirk about M7101
  PCI: Ignore BAR for ALi M1533 PCI-ISA bridge
  powerpc/PCI: Keep resource idx order with bridge register number
  powerpc/PCI: Add IORESOURCE_MEM_64 for 64-bit resource in OF parsing
  OF/PCI: Add IORESOURCE_MEM_64 for 64-bit resource
  PCI: Check pref compatible bit for mem64 resource of PCIe device
  PCI: Only treat non-pref mmio64 as pref if all bridges have MEM_64
  PCI: Add has_mem64 for struct host_bridge
  PCI: Only treat non-pref mmio64 as pref if host bridge has mmio64
  PCI: Restore pref MMIO allocation logic for host bridge without mmio64
  PCI: Don't release fixed resource for realloc
  PCI: Claim fixed resource during remove/rescan path
  PCI: Set resource to FIXED for LSI devices
  PCI: Separate realloc list checking after allocation
  PCI: Treat optional as required in first try for bridge rescan
  PCI: Get new realloc size for bridge for last try
  PCI: Don't release sibling bridge resources during hotplug
  PCI: Cleanup res_to_dev_res() printout
  PCI: Reuse res_to_dev_res() in reassign_resources_sorted()
  PCI: Use correct align for optional only resources during sorting
  PCI: Optimize bus min_align/size calculation during sizing
  PCI: Optimize bus align/size calculation for optional during sizing
  PCI: Don't add too much optional size for hotplug bridge MMIO
  PCI: Reorder resources list for required/optional resources
  PCI: Remove duplicated code for resource sorting
  PCI: Rename pdev_sort_resources() to pdev_assign_resources_prepare()
  PCI: Treat

[PATCH v8 15/61] PCI: Only treat non-pref mmio64 as pref if host bridge has mmio64

[Yinghai Lu]

If host bridge does not have mmio64 above 4G, We don't need to
treat device non-pref mmio64 as as pref mmio64.

Signed-off-by: Yinghai Lu 
Tested-by: Khalid Aziz 
---
 drivers/pci/setup-bus.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index b1e4595..95d18ef 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -742,7 +742,7 @@ int pci_claim_bridge_resource(struct pci_dev *bridge, int i)
 static bool pci_up_path_over_pref_mem64(struct pci_bus *bus)
 {
if (pci_is_root_bus(bus))
-   return true;
+   return to_pci_host_bridge(bus->bridge)->has_mem64;
 
if (bus->self) {
int i;
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v8 17/61] PCI: Don't release fixed resource for realloc

[Yinghai Lu]

We should not release bridge resource if there is fixed resources
under it, otherwise the children firmware would stop working.

Reported-by: Paul Johnson 
Suggested-by: Bjorn Helgaas 
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=92351
Signed-off-by: Yinghai Lu 
Cc: sta...@vger.kernel.org
---
 drivers/pci/setup-bus.c |  6 --
 include/linux/ioport.h  |  2 +-
 kernel/resource.c   | 28 ++--
 3 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 0d64677..8cd6c6b 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -1497,14 +1497,16 @@ static void pci_bridge_release_resources(struct pci_bus 
*bus,
 
r = _res[idx];
 
-   if (!r->parent)
+   if (!r->parent || r->flags & IORESOURCE_PCI_FIXED)
return;
 
/*
 * if there are children under that, we should release them
 *  all
 */
-   release_child_resources(r);
+   if (!release_child_resources(r))
+   return;
+
if (!release_resource(r)) {
type = old_flags = r->flags & type_mask;
dev_printk(KERN_DEBUG, >dev, "resource %d %pR released\n",
diff --git a/include/linux/ioport.h b/include/linux/ioport.h
index 388e3ae..27dbb18 100644
--- a/include/linux/ioport.h
+++ b/include/linux/ioport.h
@@ -141,7 +141,7 @@ extern struct resource iomem_resource;
 extern struct resource *request_resource_conflict(struct resource *root, 
struct resource *new);
 extern int request_resource(struct resource *root, struct resource *new);
 extern int release_resource(struct resource *new);
-void release_child_resources(struct resource *new);
+bool release_child_resources(struct resource *new);
 extern void reserve_region_with_split(struct resource *root,
 resource_size_t start, resource_size_t end,
 const char *name);
diff --git a/kernel/resource.c b/kernel/resource.c
index f150dbb..6927298 100644
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -275,11 +275,35 @@ static void __release_child_resources(struct resource *r)
}
 }
 
-void release_child_resources(struct resource *r)
+static bool __has_fixed_child_resources(struct resource *r)
 {
+   struct resource *p;
+
+   p = r->child;
+   while (p) {
+   if (p->flags & IORESOURCE_PCI_FIXED)
+   return true;
+
+   if (__has_fixed_child_resources(p))
+   return true;
+
+   p = p->sibling;
+   }
+
+   return false;
+}
+
+bool release_child_resources(struct resource *r)
+{
+   bool fixed;
+
write_lock(_lock);
-   __release_child_resources(r);
+   fixed = __has_fixed_child_resources(r);
+   if (!fixed)
+   __release_child_resources(r);
write_unlock(_lock);
+
+   return !fixed;
 }
 
 /**
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v8 18/61] PCI: Claim fixed resource during remove/rescan path

[Yinghai Lu]

During driver loading kernel will check if resources get reserved.
so we need to make sure resources get reserved before pci_bus_add().

On remove/rescan path, we will leave those fixed resource
not reserved. In that path, We don't call pcibios_resource_survery()
before pci_assign_unassigned_bus_resources(), and that is intentional
for us to get new resources for rescan. We do need to use rescan to make
device get resource allocated while ignoring BIOS allocate resource.

But fixed resources are not allocated via
pci_assign_unassigned_bus_resources(), so we need to reserve them
explicitly.

Signed-off-by: Yinghai Lu 
---
 drivers/pci/quirks.c | 17 +
 1 file changed, 17 insertions(+)

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index af75580..1d85f37 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -323,6 +323,23 @@ static void quirk_s3_64M(struct pci_dev *dev)
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_S3, PCI_DEVICE_ID_S3_868,   
quirk_s3_64M);
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_S3, PCI_DEVICE_ID_S3_968,   
quirk_s3_64M);
 
+/* for pci remove and rescan */
+static void quirk_allocate_fixed(struct pci_dev *dev)
+{
+   int i;
+   for (i = 0; i < PCI_NUM_RESOURCES; i++) {
+   struct resource *r = >resource[i];
+
+   if (r->parent ||
+   !(r->flags & IORESOURCE_PCI_FIXED) ||
+   !(r->flags & (IORESOURCE_IO | IORESOURCE_MEM)))
+   continue;
+
+   pci_claim_resource(dev, i);
+   }
+}
+DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID,PCI_ANY_ID, quirk_allocate_fixed);
+
 static void quirk_io(struct pci_dev *dev, int pos, unsigned size,
 const char *name)
 {
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v8 27/61] PCI: Optimize bus min_align/size calculation during sizing

[Yinghai Lu]

During bus mmio resource sizing stage, current code try to get alignment as
small as possible and use that to align size to get final size. But it does
not handle resource that size is bigger than alignment in optimal way, kernel
only use max alignment for them.

For example:
 When we have resources with align/size: 1M/2M, 512M/512M,
 current code will have bus resource min_align/size: 512M/1024M,
 but optimal value should be 256M/768M, as we can fit them into
 [256M,768M) or [512M,1280M) instead of [512M,1536M).

 0M256M512M   768M   1024M  1280M
 |--|---|--|--|--|--|
when we have [256M,1024M)
|-|
|-2M-|  |---512M--|
when we have [512M,1280M)
||
|---512M--|-2M-|

For following cases that we have resource size that is bigger
than resource alignment:
1. SRIOV bar.
2. PCI bridges with children that need several MMIOs that are more than 1M.

We can keep on trying to allocate children devices resources from range
[offset, offset + aligned_size) and offset is aligned with half min_align.
If it sucesses, we can use that half min_align as new min_align.

After this patch, we get:
 align/size: 1M/2M, 2M/4M, 4M/8M, 8M/16M
 new min_align/min_size: 4M/32M, and original is 8M/32M

 align/size: 1M/2M, 2M/4M, 4M/8M
 new min_align/min_size: 2M/14M, and original is 4M/16M

 align/size: 1M/2M, 512M/512M
 new min_align/min_size: 256M/768M, and original is 512M/1024M

The real result from one system with one pcie card that has
four functions that support sriov:
 children resources with align/size:
   0080/0080, 0080/0080, 0080/0080,
   0080/0080, 0001/0020, 0001/0020,
   0001/0020, 0001/0020, 8000/8000,
   8000/8000, 8000/8000, 8000/8000,
   4000/0008, 4000/0008, 4000/0008,
   4000/0008
for the bridge:
With original code we have min_align/min_size: 0040/02c0,
and with this patch we have min_align/min_size: 0010/02b0
So min_align will be 1M instead of 4M and we even have smaller size.

-v2: Need to check more offset with every min_alignment.
-v3: skip r_size <= 1 for optional only bridge resources.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=81431
Reported-by: TJ 
Signed-off-by: Yinghai Lu 
---
 drivers/pci/setup-bus.c | 195 ++--
 1 file changed, 157 insertions(+), 38 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index ab67cdb..8f0ad46 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -30,6 +30,34 @@
 
 unsigned int pci_flags;
 
+static inline bool is_before(resource_size_t align1, resource_size_t size1,
+resource_size_t align2, resource_size_t size2)
+{
+   resource_size_t size1_left, size2_left;
+
+   /* big align is before small align */
+   if (align1 > align2)
+   return true;
+
+   /*
+* for same align:
+*   aligned is before not aligned
+*   for not aligned, big remainder is before small remainder
+*/
+   if (align1 == align2) {
+   size1_left = size1 & (align1 - 1);
+   if (!size1_left)
+   size1_left = align1;
+   size2_left = size2 & (align2 - 1);
+   if (!size2_left)
+   size2_left = align2;
+   if (size1_left > size2_left)
+   return true;
+   }
+
+   return false;
+}
+
 struct pci_dev_resource {
struct list_head list;
struct resource *res;
@@ -1042,26 +1070,125 @@ static void pbus_size_io(struct pci_bus *bus, 
resource_size_t min_size,
}
 }
 
-static inline resource_size_t calculate_mem_align(resource_size_t *aligns,
- int max_order)
+struct align_test_res {
+   struct list_head list;
+   struct resource res;
+   resource_size_t size;
+   resource_size_t align;
+};
+
+static void free_align_test_list(struct list_head *head)
 {
-   resource_size_t align = 0;
-   resource_size_t min_align = 0;
-   int order;
+   struct align_test_res *p, *tmp;
 
-   for (order = 0; order <= max_order; order++) {
-   resource_size_t align1 = 1;
+   list_for_each_entry_safe(p, tmp, head, list) {
+   list_del(>list);
+   kfree(p);
+   }
+}
 
-   align1 <<= (order + 20);
+static int add_to_align_test_list(struct list_head *head,
+ resource_size_t align, resource_size_t size)
+{
+   struct align_test_res *tmp;
+
+   tmp = kzalloc(sizeof(*tmp), GFP_KERNEL);
+   if (!tmp)
+   return -ENOMEM;

[PATCH v8 30/61] PCI: Reorder resources list for required/optional resources

[Yinghai Lu]

We try to allocate required+optional before allocate required only and
expand with optional.

At first we update size and alignment for required+optional resource.
And after that we reorder them with new alignment, but current we only
do that STARTALIGN ones.

For SIZEALIGN type resource, after add back add_size, the alignment
get changed, so need to do sorting like STARTALIGN type resources.

Also we need to reorder the sorting back after we restore
resource to required only when required+optional fail to allocate for all.

So move out the reordering code from the loop to separated function,
and call it two times accordingly.

Signed-off-by: Yinghai Lu 
---
 drivers/pci/setup-bus.c | 62 +
 1 file changed, 37 insertions(+), 25 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 5e1cc7e..5ea06c6 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -286,6 +286,31 @@ static inline void reset_resource(struct resource *res)
res->flags = 0;
 }
 
+static void sort_resources(struct list_head *head)
+{
+   struct pci_dev_resource *res1, *tmp_res, *res2;
+
+   list_for_each_entry_safe(res1, tmp_res, head, list) {
+   resource_size_t align1, size1, align2, size2;
+
+   align1 = pci_resource_alignment(res1->dev, res1->res);
+   size1 = resource_size(res1->res);
+
+   /* reorder it */
+   list_for_each_entry(res2, head, list) {
+   if (res2 == res1)
+   break;
+
+   align2 = pci_resource_alignment(res2->dev, res2->res);
+   size2 = resource_size(res2->res);
+   if (is_before(align1, size1, align2, size2)) {
+   list_move_tail(>list, >list);
+   break;
+   }
+   }
+   }
+}
+
 /**
  * reassign_resources_sorted() - satisfy any additional resource requests
  *
@@ -454,9 +479,9 @@ static void __assign_resources_sorted(struct list_head 
*head,
LIST_HEAD(save_head);
LIST_HEAD(local_fail_head);
struct pci_dev_resource *save_res;
-   struct pci_dev_resource *dev_res, *tmp_res, *dev_res2;
+   struct pci_dev_resource *dev_res, *tmp_res;
unsigned long fail_type;
-   resource_size_t add_align, align;
+   resource_size_t add_align;
 
/* Check if optional add_size is there */
if (!realloc_head || list_empty(realloc_head))
@@ -471,47 +496,32 @@ static void __assign_resources_sorted(struct list_head 
*head,
}
 
/* Update res in head list with add_size in realloc_head list */
-   list_for_each_entry_safe(dev_res, tmp_res, head, list) {
+   list_for_each_entry(dev_res, head, list) {
dev_res->res->end += get_res_add_size(realloc_head,
dev_res->res);
 
/*
 * There are two kinds of additional resources in the list:
-* 1. bridge resource  -- IORESOURCE_STARTALIGN
-* 2. SR-IOV resource   -- IORESOURCE_SIZEALIGN
-* Here just fix the additional alignment for bridge
+* 1. bridge resource with IORESOURCE_STARTALIGN
+*need to update start to change alignment
+* 2. resource with IORESOURCE_SIZEALIGN
+*update size above already change alignment.
 */
if (!(dev_res->res->flags & IORESOURCE_STARTALIGN))
continue;
 
add_align = get_res_add_align(realloc_head, dev_res->res);
 
-   /*
-* The "head" list is sorted by the alignment to make sure
-* resources with bigger alignment will be assigned first.
-* After we change the alignment of a dev_res in "head" list,
-* we need to reorder the list by alignment to make it
-* consistent.
-*/
-   if (add_align > dev_res->res->start) {
+   if (add_align) {
resource_size_t r_size = resource_size(dev_res->res);
 
dev_res->res->start = add_align;
dev_res->res->end = add_align + r_size - 1;
-
-   list_for_each_entry(dev_res2, head, list) {
-   align = pci_resource_alignment(dev_res2->dev,
-  dev_res2->res);
-   if (add_align > align) {
-   list_move_tail(_res->list,
-  _res2->list);
-   break;
-  

[PATCH v8 26/61] PCI: Use correct align for optional only resources during sorting

[Yinghai Lu]

During sorting before assign, we only put resource with non-zero align
in the sorted list, so for optional resources that required size is 0 and
only have optional parts, we need to have correct align.

While treating SRIOV as optional resources, we always read alignment for
SRIOV bars every time, so they are ok.
Hotplug bridge resources are using STARTALIGN so it is ok when size is 0
if we have correct start for them.

Later we want to treat the ROM BAR as optional resource, and it has
SIZEALIGN, so align=size will be 0. We need to find a way to get align
for them.

We can use optional resource align instead in that case, and it
is ok for SRIOV path and hotplug bridge resource path.

We need to pass realloc list from sizing stage to sorting stage, and
get entry from realloc list and calculate align from the entry.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=81431
Reported-by: TJ 
Signed-off-by: Yinghai Lu 
---
 drivers/pci/setup-bus.c | 49 ++---
 1 file changed, 42 insertions(+), 7 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index e075495..ab67cdb 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -145,9 +145,42 @@ static resource_size_t get_res_add_align(struct list_head 
*head,
return dev_res->min_align;
 }
 
+static resource_size_t __pci_resource_alignment(
+   struct pci_dev *dev,
+   struct resource *r,
+   struct list_head *realloc_head)
+{
+   resource_size_t r_align = pci_resource_alignment(dev, r);
+   resource_size_t orig_start, orig_end;
+   struct pci_dev_resource *dev_res;
+
+   if (r_align || !realloc_head)
+   return r_align;
+
+   dev_res = res_to_dev_res(realloc_head, r);
+   if (!dev_res || !dev_res->add_size)
+   return r_align;
+
+   orig_start = r->start;
+   orig_end = r->end;
+   r->end += dev_res->add_size;
+   if ((r->flags & IORESOURCE_STARTALIGN)) {
+   resource_size_t r_size = resource_size(r);
+
+   r->start = dev_res->min_align;
+   r->end = r->start + r_size - 1;
+   }
+   r_align = pci_resource_alignment(dev, r);
+   r->start = orig_start;
+   r->end = orig_end;
+
+   return r_align;
+}
 
 /* Sort resources by alignment */
-static void pdev_sort_resources(struct pci_dev *dev, struct list_head *head)
+static void pdev_sort_resources(struct pci_dev *dev,
+struct list_head *realloc_head,
+struct list_head *head)
 {
int i;
 
@@ -165,7 +198,7 @@ static void pdev_sort_resources(struct pci_dev *dev, struct 
list_head *head)
if (!(r->flags) || r->parent)
continue;
 
-   r_align = pci_resource_alignment(dev, r);
+   r_align = __pci_resource_alignment(dev, r, realloc_head);
if (!r_align) {
dev_warn(>dev, "BAR %d: %pR has bogus alignment\n",
 i, r);
@@ -183,8 +216,9 @@ static void pdev_sort_resources(struct pci_dev *dev, struct 
list_head *head)
list_for_each_entry(dev_res, head, list) {
resource_size_t align;
 
-   align = pci_resource_alignment(dev_res->dev,
-dev_res->res);
+   align = __pci_resource_alignment(dev_res->dev,
+dev_res->res,
+realloc_head);
 
if (r_align > align) {
n = _res->list;
@@ -197,6 +231,7 @@ static void pdev_sort_resources(struct pci_dev *dev, struct 
list_head *head)
 }
 
 static void __dev_sort_resources(struct pci_dev *dev,
+struct list_head *realloc_head,
 struct list_head *head)
 {
u16 class = dev->class >> 8;
@@ -213,7 +248,7 @@ static void __dev_sort_resources(struct pci_dev *dev,
return;
}
 
-   pdev_sort_resources(dev, head);
+   pdev_sort_resources(dev, realloc_head, head);
 }
 
 static inline void reset_resource(struct resource *res)
@@ -507,7 +542,7 @@ static void pdev_assign_resources_sorted(struct pci_dev 
*dev,
 {
LIST_HEAD(head);
 
-   __dev_sort_resources(dev, );
+   __dev_sort_resources(dev, add_head, );
__assign_resources_sorted(, add_head, fail_head);
 
 }
@@ -520,7 +555,7 @@ static void pbus_assign_resources_sorted(const struct 
pci_bus *bus,
LIST_HEAD(head);
 
list_for_each_entry(dev, >devices, bus_list)
-   __dev_sort_resources(dev, );
+   __dev_sort_r

[PATCH v8 29/61] PCI: Don't add too much optional size for hotplug bridge MMIO

[Yinghai Lu]

Current code will always add 2M for hotplug bridge MMIO even
there is child device under it already.

For example:
40:03.0 --- 43:00.0 --- 44:02.0 -+- 45:00.0
 \- 45:00.1

44:02.0 will need 1M as must for 45:00.0 and 45:00.1
When we calculate add_size for 44:02.0, we pass 2M as additional
size for hotplug bridge, total will be 3M.

That is different from code before changes for optional support,
or even current code that treat optional as required directly by
not passing realloc list. We only need 2M as total.

The optional size should be 1M, and total size should be 2M.

This patch change to comparing required+optional with min_sum_size to
get smaller optional size.

Signed-off-by: Yinghai Lu 
---
 drivers/pci/setup-bus.c | 28 +++-
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 0c6977c9..5e1cc7e 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -1199,7 +1199,6 @@ out:
  * @type2: second match type
  * @type3: third match type
  * @min_size : the minimum memory window that must to be allocated
- * @add_size : additional optional memory window
  * @realloc_head : track the additional memory window on this list
  *
  * Calculate the size of the bus and minimal alignment which
@@ -1212,10 +1211,11 @@ out:
 static int pbus_size_mem(struct pci_bus *bus, unsigned long mask,
 unsigned long type, unsigned long type2,
 unsigned long type3,
-resource_size_t min_size, resource_size_t add_size,
+resource_size_t min_size,
 struct list_head *realloc_head)
 {
struct pci_dev *dev;
+   resource_size_t min_sum_size = 0;
resource_size_t min_align = 0, min_add_align = 0;
resource_size_t max_align = 0, max_add_align = 0;
resource_size_t size = 0, size0 = 0, size1 = 0, sum_add_size = 0;
@@ -1227,6 +1227,11 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned 
long mask,
if (!b_res)
return -ENOSPC;
 
+   if (realloc_head) {
+   min_sum_size = min_size;
+   min_size = 0;
+   }
+
list_for_each_entry(dev, >devices, bus_list) {
int i;
 
@@ -1298,8 +1303,8 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned 
long mask,
}
free_align_test_list(_test_list);
 
-   if ((sum_add_size - size) < add_size)
-   sum_add_size = size + add_size;
+   if (sum_add_size < min_sum_size)
+   sum_add_size = min_sum_size;
if (sum_add_size > size && realloc_head) {
min_add_align = calculate_mem_align(_test_add_list,
max_add_align, sum_add_size,
@@ -1436,7 +1441,7 @@ void __pci_bus_size_bridges(struct pci_bus *bus, struct 
list_head *realloc_head)
 {
struct pci_dev *dev;
unsigned long mask, prefmask, type2 = 0, type3 = 0;
-   resource_size_t additional_mem_size = 0, additional_io_size = 0;
+   resource_size_t min_mem_size = 0, additional_io_size = 0;
struct resource *b_res;
int ret;
 
@@ -1473,7 +1478,7 @@ void __pci_bus_size_bridges(struct pci_bus *bus, struct 
list_head *realloc_head)
case PCI_CLASS_BRIDGE_PCI:
if (bus->self->is_hotplug_bridge) {
additional_io_size  = pci_hotplug_io_size;
-   additional_mem_size = pci_hotplug_mem_size;
+   min_mem_size = pci_hotplug_mem_size;
}
/* Fall through */
default:
@@ -1493,8 +1498,7 @@ void __pci_bus_size_bridges(struct pci_bus *bus, struct 
list_head *realloc_head)
prefmask |= IORESOURCE_MEM_64;
ret = pbus_size_mem(bus, prefmask, prefmask,
  prefmask, prefmask,
- realloc_head ? 0 : additional_mem_size,
- additional_mem_size, realloc_head);
+ min_mem_size, realloc_head);
 
/*
 * If successful, all non-prefetchable resources
@@ -1517,8 +1521,7 @@ void __pci_bus_size_bridges(struct pci_bus *bus, struct 
list_head *realloc_head)
prefmask &= ~IORESOURCE_MEM_64;
ret = pbus_size_mem(bus, prefmask, prefmask,
 prefmask, prefmask,
-realloc_head ? 0 : additional_mem_size,
-additional_mem_size, realloc_head);
+min_mem_size, realloc_head);
 
/*
 * If successful, only non-prefetchable resources
@@ -1527,7 +1530,7 @@ void __pci_bus_size_bridg

[PATCH v8 23/61] PCI: Don't release sibling bridge resources during hotplug

[Yinghai Lu]

On hotplug path, we can not touch sibling bridges that is outside
of the slot.

That could happen when BIOS does not assign some bridge BARs and
later kernel can not assign resource to them in first try.

Check if fail dev is the parent bridge, then just use subordinate
bus instead use parent bus.

Reported-by: Andreas Noever 
Signed-off-by: Yinghai Lu 
---
 drivers/pci/setup-bus.c | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 278cb6d..10270e4 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -1858,10 +1858,16 @@ again:
 * Try to release leaf bridge's resources that doesn't fit resource of
 * child device under that bridge
 */
-   list_for_each_entry(fail_res, _head, list)
-   pci_bus_release_bridge_resources(fail_res->dev->bus,
+   list_for_each_entry(fail_res, _head, list) {
+   struct pci_bus *bus = fail_res->dev->bus;
+
+   if (fail_res->dev == bridge)
+   bus = bridge->subordinate;
+
+   pci_bus_release_bridge_resources(bus,
 fail_res->flags & type_mask,
 whole_subtree);
+   }
 
/* restore size and flags */
list_for_each_entry(fail_res, _head, list) {
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v8 43/61] PCI: Move saved required resource list out of required+optional assigning

[Yinghai Lu]

We will need to share saved required list for alt_size support, so move
it out from required+optional assigning.

Signed-off-by: Yinghai Lu 
---
 drivers/pci/setup-bus.c | 30 --
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 5143ea2..ede619c 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -456,6 +456,9 @@ static bool has_addon(struct list_head *head,
int add_count = 0;
struct pci_dev_resource *dev_res, *tmp_res;
 
+   if (!realloc_head)
+   return false;
+
/* check if we have add really */
list_for_each_entry(dev_res, head, list) {
tmp_res = res_to_dev_res(realloc_head, dev_res->res);
@@ -492,9 +495,9 @@ static void restore_resource(struct pci_dev_resource 
*save_res,
 }
 
 static bool __assign_resources_required_optional_sorted(struct list_head *head,
+struct list_head *save_head,
 struct list_head *realloc_head)
 {
-   LIST_HEAD(save_head);
LIST_HEAD(local_fail_head);
struct pci_dev_resource *save_res;
struct pci_dev_resource *dev_res, *tmp_res;
@@ -502,12 +505,6 @@ static bool 
__assign_resources_required_optional_sorted(struct list_head *head,
resource_size_t add_align, add_size;
struct resource *res;
 
-   if (!has_addon(head, realloc_head))
-   return false;
-
-   if (!save_resources(head, _head))
-   return false;
-
/* Update res in head list with add_size in realloc_head list */
list_for_each_entry(dev_res, head, list) {
res = dev_res->res;
@@ -548,7 +545,6 @@ static bool 
__assign_resources_required_optional_sorted(struct list_head *head,
/* Remove head list from realloc_head list */
list_for_each_entry(dev_res, head, list)
remove_from_list(realloc_head, dev_res->res);
-   free_list(_head);
free_list(head);
 
return true;
@@ -562,7 +558,7 @@ static bool 
__assign_resources_required_optional_sorted(struct list_head *head,
if (res->parent && !pci_need_to_release(fail_type, res)) {
/* remove it from realloc_head list */
remove_from_list(realloc_head, res);
-   remove_from_list(_head, res);
+   remove_from_list(save_head, res);
list_del(_res->list);
kfree(dev_res);
}
@@ -581,11 +577,9 @@ static bool 
__assign_resources_required_optional_sorted(struct list_head *head,
}
}
/* Restore start/end/flags from saved list */
-   list_for_each_entry(save_res, _head, list)
+   list_for_each_entry(save_res, save_head, list)
restore_resource(save_res, save_res->res);
 
-   free_list(_head);
-
return false;
 }
 
@@ -603,16 +597,24 @@ static void __assign_resources_sorted(struct list_head 
*head,
 *then try to reassign add_size for some resources.
 */
 
+   LIST_HEAD(save_head);
+
/* Check required+optional add */
-   if (realloc_head &&
-   __assign_resources_required_optional_sorted(head, realloc_head))
+   if (has_addon(head, realloc_head) &&
+   save_resources(head, _head) &&
+   __assign_resources_required_optional_sorted(head, _head,
+  realloc_head)) {
+   free_list(_head);
return;
+   }
 
sort_resources(head);
 
/* Satisfy the must-have resource requests */
assign_requested_resources_sorted(head, fail_head);
 
+   free_list(_head);
+
/* Try to satisfy any additional optional resource
requests */
if (realloc_head)
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v8 33/61] PCI: Treat ROM resource as optional during realloc

[Yinghai Lu]

Current on realloc path, we just ignore ROM resource if we can not assign
them in first try.

Treat ROM resources as optional resources,so try to allocate them together
with required ones, if can not assign them, could go with other required
resources only, and try to allocate them second time in expand path.

Signed-off-by: Yinghai Lu 
---
 drivers/pci/setup-bus.c | 37 -
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 74ad4ce..d2d38bc 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -377,18 +377,10 @@ static void assign_requested_resources_sorted(struct 
list_head *head,
idx = res - _res->dev->resource[0];
if (resource_size(res) &&
pci_assign_resource(dev_res->dev, idx)) {
-   if (fail_head) {
-   /*
-* if the failed res is for ROM BAR, and it will
-* be enabled later, don't add it to the list
-*/
-   if (!((idx == PCI_ROM_RESOURCE) &&
- (!(res->flags & IORESOURCE_ROM_ENABLE
-   add_to_list(fail_head,
-   dev_res->dev, res,
-   0 /* don't care */,
-   0 /* don't care */);
-   }
+   if (fail_head)
+   add_to_list(fail_head, dev_res->dev, res,
+   0 /* don't care */,
+   0 /* don't care */);
reset_resource(res);
}
}
@@ -1186,6 +1178,19 @@ out:
return good_align;
 }
 
+static inline bool is_optional(int i)
+{
+
+   if (i == PCI_ROM_RESOURCE)
+   return true;
+
+#ifdef CONFIG_PCI_IOV
+   if (i >= PCI_IOV_RESOURCES && i <= PCI_IOV_RESOURCE_END)
+   return true;
+#endif
+
+   return false;
+}
 /**
  * pbus_size_mem() - size the memory window of a given bus
  *
@@ -1243,10 +1248,8 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned 
long mask,
 
r_size = resource_size(r);
align = pci_resource_alignment(dev, r);
-#ifdef CONFIG_PCI_IOV
-   /* put SRIOV requested res to the optional list */
-   if (realloc_head && i >= PCI_IOV_RESOURCES &&
-   i <= PCI_IOV_RESOURCE_END) {
+   /* put SRIOV/ROM res to realloc list */
+   if (realloc_head && is_optional(i)) {
add_to_align_test_list(_test_add_list,
align, r_size);
r->end = r->start - 1;
@@ -1256,7 +1259,7 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned 
long mask,
max_add_align = align;
continue;
}
-#endif
+
if (align > (1ULL<<37)) { /*128 Gb*/
dev_warn(>dev, "disabling BAR %d: %pR (bad 
alignment %#llx)\n",
i, r, (unsigned long long) align);
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v8 31/61] PCI: Remove duplicated code for resource sorting

[Yinghai Lu]

Now sort_resources() and pdev_sort_resources() all have sorting
code.

As we are going to call sort_resources() several places later for
alt_size support, so choose to remove related code in
pdev_sort_resources().

Signed-off-by: Yinghai Lu 
---
 drivers/pci/setup-bus.c | 22 +++---
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 5ea06c6..bcf7cba 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -214,9 +214,8 @@ static void pdev_sort_resources(struct pci_dev *dev,
 
for (i = 0; i < PCI_NUM_RESOURCES; i++) {
struct resource *r;
-   struct pci_dev_resource *dev_res, *tmp;
+   struct pci_dev_resource *tmp;
resource_size_t r_align;
-   struct list_head *n;
 
r = >resource[i];
 
@@ -239,22 +238,7 @@ static void pdev_sort_resources(struct pci_dev *dev,
tmp->res = r;
tmp->dev = dev;
 
-   /* fallback is smallest one or list is empty*/
-   n = head;
-   list_for_each_entry(dev_res, head, list) {
-   resource_size_t align;
-
-   align = __pci_resource_alignment(dev_res->dev,
-dev_res->res,
-realloc_head);
-
-   if (r_align > align) {
-   n = _res->list;
-   break;
-   }
-   }
-   /* Insert it just before n*/
-   list_add_tail(>list, n);
+   list_add_tail(>list, head);
}
 }
 
@@ -563,9 +547,9 @@ static void __assign_resources_sorted(struct list_head 
*head,
}
free_list(_head);
 
+requested_and_reassign:
sort_resources(head);
 
-requested_and_reassign:
/* Satisfy the must-have resource requests */
assign_requested_resources_sorted(head, fail_head);
 
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v8 37/61] PCI: Cache window alignment value during bus sizing

[Yinghai Lu]

There are several calling to window_alignment(), and we will have more
for alt_size support, cache the value instead of keeping on getting it.

Signed-off-by: Yinghai Lu 
---
 drivers/pci/setup-bus.c | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index b86417d..deed016 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -1241,6 +1241,7 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned 
long mask,
mask | IORESOURCE_PREFETCH, type);
LIST_HEAD(align_test_list);
LIST_HEAD(align_test_add_list);
+   resource_size_t window_align;
 
if (!b_res)
return -ENOSPC;
@@ -1250,6 +1251,8 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned 
long mask,
min_size = 0;
}
 
+   window_align = window_alignment(bus, b_res->flags);
+
list_for_each_entry(dev, >devices, bus_list) {
int i;
 
@@ -1311,10 +1314,10 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned 
long mask,
}
}
 
-   max_align = max(max_align, window_alignment(bus, b_res->flags));
+   max_align = max(max_align, window_align);
if (size || min_size) {
min_align = calculate_mem_align(_test_list, max_align,
-size, window_alignment(bus, b_res->flags));
+   size, window_align);
size0 = calculate_memsize(size, min_size,
  resource_size(b_res), min_align);
}
@@ -1325,7 +1328,7 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned 
long mask,
if (sum_add_size > size && realloc_head) {
min_add_align = calculate_mem_align(_test_add_list,
max_add_align, sum_add_size,
-   window_alignment(bus, b_res->flags));
+   window_align);
size1 = calculate_memsize(sum_add_size, min_size,
 resource_size(b_res), min_add_align);
}
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v8 20/61] PCI: Separate realloc list checking after allocation

[Yinghai Lu]

We check the realloc list, as list must be empty after allocation.

Separate the realloc list checking to another function.

Add checking that is missed in acpiphp driver.

-v2: change to WARN_ON according to Rafael.

Signed-off-by: Yinghai Lu 
Cc: "Rafael J. Wysocki" 
Cc: Len Brown 
Cc: linux-a...@vger.kernel.org
---
 drivers/pci/hotplug/acpiphp_glue.c |  1 +
 drivers/pci/pci.h  |  1 +
 drivers/pci/setup-bus.c| 12 +---
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/drivers/pci/hotplug/acpiphp_glue.c 
b/drivers/pci/hotplug/acpiphp_glue.c
index ff53856..ce9fb21 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -507,6 +507,7 @@ static void enable_slot(struct acpiphp_slot *slot)
}
}
__pci_bus_assign_resources(bus, _list, NULL);
+   pci_bus_check_realloc(_list);
 
acpiphp_sanitize_bus(bus);
pcie_bus_configure_settings(bus);
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index 39d2c50..c34c2aa 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -238,6 +238,7 @@ void __pci_bus_size_bridges(struct pci_bus *bus,
 void __pci_bus_assign_resources(const struct pci_bus *bus,
struct list_head *realloc_head,
struct list_head *fail_head);
+void pci_bus_check_realloc(struct list_head *realloc_head);
 bool pci_bus_clip_resource(struct pci_dev *dev, int idx);
 
 void pci_reassigndev_resource_alignment(struct pci_dev *dev);
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index d49c6e5..53ab81f 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -280,6 +280,12 @@ out:
}
 }
 
+void pci_bus_check_realloc(struct list_head *realloc_head)
+{
+   if (WARN_ON(!list_empty(realloc_head)))
+   free_list(realloc_head);
+}
+
 /**
  * assign_requested_resources_sorted() - satisfy resource requests
  *
@@ -1733,7 +1739,7 @@ again:
/* Depth last, allocate resources and update the hardware. */
__pci_bus_assign_resources(bus, add_list, _head);
if (add_list)
-   BUG_ON(!list_empty(add_list));
+   pci_bus_check_realloc(add_list);
tried_times++;
 
/* any device complain? */
@@ -1808,7 +1814,7 @@ void pci_assign_unassigned_bridge_resources(struct 
pci_dev *bridge)
 again:
__pci_bus_size_bridges(parent, _list);
__pci_bridge_assign_resources(bridge, _list, _head);
-   BUG_ON(!list_empty(_list));
+   pci_bus_check_realloc(_list);
tried_times++;
 
if (list_empty(_head))
@@ -1867,6 +1873,6 @@ void pci_assign_unassigned_bus_resources(struct pci_bus 
*bus)
 _list);
up_read(_bus_sem);
__pci_bus_assign_resources(bus, _list, NULL);
-   BUG_ON(!list_empty(_list));
+   pci_bus_check_realloc(_list);
 }
 EXPORT_SYMBOL_GPL(pci_assign_unassigned_bus_resources);
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v8 39/61] PCI: Separate out save_resources()/restore_resources()

[Yinghai Lu]

We need to save/restore resources several times for alt_size support,
separate the save_resources()/resources() to save some lines later.

Signed-off-by: Yinghai Lu 
---
 drivers/pci/setup-bus.c | 49 ++---
 1 file changed, 30 insertions(+), 19 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index ca34346..dc83c2c 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -436,6 +436,29 @@ static bool pci_need_to_release(unsigned long mask, struct 
resource *res)
return false;   /* should not get here */
 }
 
+static bool save_resources(struct list_head *head,
+  struct list_head *save_head)
+{
+   struct pci_dev_resource *dev_res;
+
+   /* Save original start, end, flags etc at first */
+   list_for_each_entry(dev_res, head, list)
+   if (add_to_list(save_head, dev_res->dev, dev_res->res)) {
+   free_list(save_head);
+   return false;
+   }
+
+   return true;
+}
+
+static void restore_resource(struct pci_dev_resource *save_res,
+struct resource *res)
+{
+   res->start = save_res->start;
+   res->end = save_res->end;
+   res->flags = save_res->flags;
+}
+
 static void __assign_resources_sorted(struct list_head *head,
 struct list_head *realloc_head,
 struct list_head *fail_head)
@@ -473,13 +496,8 @@ static void __assign_resources_sorted(struct list_head 
*head,
if (!realloc_head || list_empty(realloc_head))
goto requested_and_reassign;
 
-   /* Save original start, end, flags etc at first */
-   list_for_each_entry(dev_res, head, list) {
-   if (add_to_list(_head, dev_res->dev, dev_res->res)) {
-   free_list(_head);
-   goto requested_and_reassign;
-   }
-   }
+   if (!save_resources(head, _head))
+   goto requested_and_reassign;
 
/* Update res in head list with add_size in realloc_head list */
list_for_each_entry(dev_res, head, list) {
@@ -548,12 +566,9 @@ static void __assign_resources_sorted(struct list_head 
*head,
}
}
/* Restore start/end/flags from saved list */
-   list_for_each_entry(save_res, _head, list) {
-   res = save_res->res;
-   res->start = save_res->start;
-   res->end = save_res->end;
-   res->flags = save_res->flags;
-   }
+   list_for_each_entry(save_res, _head, list)
+   restore_resource(save_res, save_res->res);
+
free_list(_head);
 
 requested_and_reassign:
@@ -1981,9 +1996,7 @@ again:
list_for_each_entry(fail_res, _head, list) {
struct resource *res = fail_res->res;
 
-   res->start = fail_res->start;
-   res->end = fail_res->end;
-   res->flags = fail_res->flags;
+   restore_resource(fail_res, res);
if (fail_res->dev->subordinate) {
res->flags = 0;
/* last or third times and later */
@@ -2067,9 +2080,7 @@ again:
list_for_each_entry(fail_res, _head, list) {
struct resource *res = fail_res->res;
 
-   res->start = fail_res->start;
-   res->end = fail_res->end;
-   res->flags = fail_res->flags;
+   restore_resource(fail_res, res);
if (fail_res->dev->subordinate) {
res->flags = 0;
/* last time */
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v8 44/61] PCI: Add alt_size ressource allocation support

[Yinghai Lu]

On system with several pcie switches, BIOS allocate very tight resources
to the bridge bar, and it is not aligned to min_align as kernel allocation
code.

For example:
  02:03.0---0c:00.0---0d:04.0---18:00.0

  18:00.0 need 0x1000, and 0x0001.
BIOS only allocate 0x1010 to 0d:04.0 and above bridges.
Later after using /sys/bus/pci/devices/:0c:00.0/remove to remove 0c:00.0,
rescan with /sys/bus/pci/rescan can not allocate 0x1800 to 0c:00.0.
as current min_align solution will need 0x1800.

Another example:
  00:1c.0---02:00.0---03:01.0---04:00.0---05:19.0---06:00.0

  06:00.0 need 0x400 and 0x80.
BIOS only allocate 0x480 to 05:19.0 and 04:00.0.
when 05:19.0 get removed via /sys/bus/pci/devices/:05:19.0/remove,
rescan with /sys/bus/pci/rescan will fail.
 pci :05:19.0: BAR 14: no space for [mem size 0x0600]
 pci :05:19.0: BAR 14: failed to assign [mem size 0x0600]
 pci :06:00.0: BAR 2: no space for [mem size 0x0400 64bit]
 pci :06:00.0: BAR 2: failed to assign [mem size 0x0400 64bit]
 pci :06:00.0: BAR 0: no space for [mem size 0x0080]
 pci :06:00.0: BAR 0: failed to assign [mem size 0x0080]
current code try to use align 0x200 and size 0x600, but parent
bridge only have 0x480.

Introduce alt_align/alt_size and store them in realloc list in addition
to addon info, and will try it after min_align/min_size allocation fails.

The alt_align is max_align, and alt_size is aligned size with bridge
minimum window alignment.

On my test setup:
  00:1c.7---61:00.0---62:00.0

  62:00.0 needs 0x80 and 0x2, and 00:1c.7 only have 9M allocated
for mmio, with this patch we have

 pci :61:00.0: bridge window [mem 0x0040-0x00ff] to [bus 62]
   add_size 0 add_align 0 alt_size 90 alt_align 80
   req_size c0 req_align 40
 pci :61:00.0: BAR 14: no space for [mem size 0x00c0]
 pci :61:00.0: BAR 14: failed to assign [mem size 0x00c0]
 pci :61:00.0: BAR 14: assigned [mem 0xdf00-0xdf8f]
 pci :62:00.0: BAR 0: assigned [mem 0xdf00-0xdf7f pref]
 pci :62:00.0: BAR 1: assigned [mem 0xdf80-0xdf81]
 pci :61:00.0: PCI bridge to [bus 62]
 pci :61:00.0:   bridge window [io  0x6000-0x6fff]
 pci :61:00.0:   bridge window [mem 0xdf00-0xdf8f]
 pci :00:1c.7: PCI bridge to [bus 61-68]
 pci :00:1c.7:   bridge window [io  0x6000-0x6fff]
 pci :00:1c.7:   bridge window [mem 0xdf00-0xdf8f]

So for 61:00.0 first try with 12M fails, and second try with 9M the
alt_size works. Later 62:00.0 get correct resource allocated too.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=100451
Reported-by: Yijing Wang 
Tested-by: Yijing Wang 
Signed-off-by: Yinghai Lu 
---
 drivers/pci/setup-bus.c | 203 +---
 1 file changed, 191 insertions(+), 12 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index ede619c..dea0344 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -323,7 +323,7 @@ static void reassign_resources_sorted(struct list_head 
*realloc_head,
 {
struct resource *res;
struct pci_dev_resource *add_res, *tmp;
-   resource_size_t add_size, align;
+   resource_size_t add_size, align, r_size;
int idx;
 
list_for_each_entry_safe(add_res, tmp, realloc_head, list) {
@@ -339,12 +339,23 @@ static void reassign_resources_sorted(struct list_head 
*realloc_head,
idx = res - _res->dev->resource[0];
add_size = add_res->add_size;
align = add_res->min_align;
-   if (!resource_size(res)) {
+   if (!add_size || !align) /* alt_size only */
+   goto out;
+
+   r_size = resource_size(res);
+   if (!r_size) {
res->start = align;
res->end = res->start + add_size - 1;
if (pci_assign_resource(add_res->dev, idx))
reset_resource(res);
} else {
+   /* could just assigned with alt, add difference ? */
+   resource_size_t size;
+
+   size = add_res->end - add_res->start + 1;
+   if (r_size < size)
+   add_size += size - r_size;
+
res->flags |= add_res->flags &
 (IORESOURCE_STARTALIGN|IORESOURCE_SIZEALIGN);
if (pci_reassign_resource(add_res->dev, idx,
@@ -583,6 +594,104 @@ static bool 
__assign_resources_required_optional_sorted(struct list_head *head,
return false;
 }
 
+static bool __has_alt(struct list_head *head,
+   struct list_head *realloc_head)
+{
+   int alt_count = 0;
+   struct pci_dev_resource *dev_res, *alt_res;
+
+   i

[PATCH v8 34/61] PCI: Add debug printout during releasing partial assigned resources

[Yinghai Lu]

We try to assign required+optional at first, and we only accept the result
if all resources get allocated. Otherwise will release assigned in the
list, and try to assign required and expand to optional.

We have to do that to make sure any required has priority over any optional.

When that happens, we only print out "assigned" info, that is confusing
as it looks like same range is assigned to two peer resources at the same
time.

Add printout for releasing so we have whole picture in debug messages.

Signed-off-by: Yinghai Lu 
---
 drivers/pci/setup-bus.c | 14 +++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index d2d38bc..c9dfd1c 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -526,9 +526,17 @@ static void __assign_resources_sorted(struct list_head 
*head,
 
free_list(_fail_head);
/* Release assigned resource */
-   list_for_each_entry(dev_res, head, list)
-   if (dev_res->res->parent)
-   release_resource(dev_res->res);
+   list_for_each_entry(dev_res, head, list) {
+   struct resource *res = dev_res->res;
+
+   if (res->parent) {
+   dev_printk(KERN_DEBUG, _res->dev->dev,
+  "BAR %d: released %pR\n",
+  (int)(res - _res->dev->resource[0]),
+  res);
+   release_resource(res);
+   }
+   }
/* Restore start/end/flags from saved list */
list_for_each_entry(save_res, _head, list) {
struct resource *res = save_res->res;
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v8 24/61] PCI: Cleanup res_to_dev_res() printout

[Yinghai Lu]

Now get_res_add_size() and get_res_add_align() all have same printout
from res_to_dev_res(), and it is confusing.

Move out debug messages printout from res_to_dev_res(),
so later we will reuse res_to_dev_res() in other functions.

-v2: does not print out when add_size or min_align is 0
-v3: change to %#llx according to Bjorn.

Signed-off-by: Yinghai Lu 
---
 drivers/pci/setup-bus.c | 34 --
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 10270e4..f905c81 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -104,19 +104,9 @@ static struct pci_dev_resource *res_to_dev_res(struct 
list_head *head,
 {
struct pci_dev_resource *dev_res;
 
-   list_for_each_entry(dev_res, head, list) {
-   if (dev_res->res == res) {
-   int idx = res - _res->dev->resource[0];
-
-   dev_printk(KERN_DEBUG, _res->dev->dev,
-"res[%d]=%pR res_to_dev_res add_size %llx 
min_align %llx\n",
-idx, dev_res->res,
-(unsigned long long)dev_res->add_size,
-(unsigned long long)dev_res->min_align);
-
+   list_for_each_entry(dev_res, head, list)
+   if (dev_res->res == res)
return dev_res;
-   }
-   }
 
return NULL;
 }
@@ -127,7 +117,15 @@ static resource_size_t get_res_add_size(struct list_head 
*head,
struct pci_dev_resource *dev_res;
 
dev_res = res_to_dev_res(head, res);
-   return dev_res ? dev_res->add_size : 0;
+   if (!dev_res || !dev_res->add_size)
+   return 0;
+
+   dev_printk(KERN_DEBUG, _res->dev->dev,
+  "BAR %d: %pR get_res_add_size add_size   %#llx\n",
+  (int)(res - _res->dev->resource[0]),
+  res, (unsigned long long)dev_res->add_size);
+
+   return dev_res->add_size;
 }
 
 static resource_size_t get_res_add_align(struct list_head *head,
@@ -136,7 +134,15 @@ static resource_size_t get_res_add_align(struct list_head 
*head,
struct pci_dev_resource *dev_res;
 
dev_res = res_to_dev_res(head, res);
-   return dev_res ? dev_res->min_align : 0;
+   if (!dev_res || !dev_res->min_align)
+   return 0;
+
+   dev_printk(KERN_DEBUG, _res->dev->dev,
+  "BAR %d: %pR get_res_add_align min_align %#llx\n",
+  (int)(res - _res->dev->resource[0]),
+  res, (unsigned long long)dev_res->min_align);
+
+   return dev_res->min_align;
 }
 
 
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v8 35/61] PCI: Simplify res reference using in __assign_resources_sorted()

[Yinghai Lu]

There are couples of dev_res->res reference, to make code more readable
use res instead of dev_res->res directly.

Signed-off-by: Yinghai Lu 
---
 drivers/pci/setup-bus.c | 32 
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index c9dfd1c..d575c56 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -458,6 +458,7 @@ static void __assign_resources_sorted(struct list_head 
*head,
struct pci_dev_resource *dev_res, *tmp_res;
unsigned long fail_type;
resource_size_t add_align;
+   struct resource *res;
 
/* Check if optional add_size is there */
if (!realloc_head || list_empty(realloc_head))
@@ -473,8 +474,8 @@ static void __assign_resources_sorted(struct list_head 
*head,
 
/* Update res in head list with add_size in realloc_head list */
list_for_each_entry(dev_res, head, list) {
-   dev_res->res->end += get_res_add_size(realloc_head,
-   dev_res->res);
+   res = dev_res->res;
+   res->end += get_res_add_size(realloc_head, res);
 
/*
 * There are two kinds of additional resources in the list:
@@ -483,16 +484,16 @@ static void __assign_resources_sorted(struct list_head 
*head,
 * 2. resource with IORESOURCE_SIZEALIGN
 *update size above already change alignment.
 */
-   if (!(dev_res->res->flags & IORESOURCE_STARTALIGN))
+   if (!(res->flags & IORESOURCE_STARTALIGN))
continue;
 
-   add_align = get_res_add_align(realloc_head, dev_res->res);
+   add_align = get_res_add_align(realloc_head, res);
 
if (add_align) {
-   resource_size_t r_size = resource_size(dev_res->res);
+   resource_size_t r_size = resource_size(res);
 
-   dev_res->res->start = add_align;
-   dev_res->res->end = add_align + r_size - 1;
+   res->start = add_align;
+   res->end = add_align + r_size - 1;
}
}
 
@@ -514,21 +515,21 @@ static void __assign_resources_sorted(struct list_head 
*head,
/* check failed type */
fail_type = pci_fail_res_type_mask(_fail_head);
/* remove not need to be released assigned res from head list etc */
-   list_for_each_entry_safe(dev_res, tmp_res, head, list)
-   if (dev_res->res->parent &&
-   !pci_need_to_release(fail_type, dev_res->res)) {
+   list_for_each_entry_safe(dev_res, tmp_res, head, list) {
+   res = dev_res->res;
+   if (res->parent && !pci_need_to_release(fail_type, res)) {
/* remove it from realloc_head list */
-   remove_from_list(realloc_head, dev_res->res);
-   remove_from_list(_head, dev_res->res);
+   remove_from_list(realloc_head, res);
+   remove_from_list(_head, res);
list_del(_res->list);
kfree(dev_res);
}
+   }
 
free_list(_fail_head);
/* Release assigned resource */
list_for_each_entry(dev_res, head, list) {
-   struct resource *res = dev_res->res;
-
+   res = dev_res->res;
if (res->parent) {
dev_printk(KERN_DEBUG, _res->dev->dev,
   "BAR %d: released %pR\n",
@@ -539,8 +540,7 @@ static void __assign_resources_sorted(struct list_head 
*head,
}
/* Restore start/end/flags from saved list */
list_for_each_entry(save_res, _head, list) {
-   struct resource *res = save_res->res;
-
+   res = save_res->res;
res->start = save_res->start;
res->end = save_res->end;
res->flags = save_res->flags;
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v8 42/61] PCI: Skip required+optional if there is no optional

[Yinghai Lu]

If the bridge does not support hotplug and has no child with sriov support,
We will not have optional resources. We could get out early and
don't try required+optional allocation.

Also in the loop that update res with optional add info, skip resource
that add_size is 0.

Signed-off-by: Yinghai Lu 
---
 drivers/pci/setup-bus.c | 32 +---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index c49bfde..5143ea2 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -450,6 +450,24 @@ static bool pci_need_to_release(unsigned long mask, struct 
resource *res)
return false;   /* should not get here */
 }
 
+static bool has_addon(struct list_head *head,
+   struct list_head *realloc_head)
+{
+   int add_count = 0;
+   struct pci_dev_resource *dev_res, *tmp_res;
+
+   /* check if we have add really */
+   list_for_each_entry(dev_res, head, list) {
+   tmp_res = res_to_dev_res(realloc_head, dev_res->res);
+   if (!tmp_res || !tmp_res->add_size)
+   continue;
+
+   add_count++;
+   }
+
+   return add_count != 0;
+}
+
 static bool save_resources(struct list_head *head,
   struct list_head *save_head)
 {
@@ -481,16 +499,24 @@ static bool 
__assign_resources_required_optional_sorted(struct list_head *head,
struct pci_dev_resource *save_res;
struct pci_dev_resource *dev_res, *tmp_res;
unsigned long fail_type;
-   resource_size_t add_align;
+   resource_size_t add_align, add_size;
struct resource *res;
 
+   if (!has_addon(head, realloc_head))
+   return false;
+
if (!save_resources(head, _head))
return false;
 
/* Update res in head list with add_size in realloc_head list */
list_for_each_entry(dev_res, head, list) {
res = dev_res->res;
-   res->end += get_res_add_size(realloc_head, res);
+   add_size = get_res_add_size(realloc_head, res);
+
+   if (!add_size)
+   continue;
+
+   res->end += add_size;
 
/*
 * There are two kinds of additional resources in the list:
@@ -578,7 +604,7 @@ static void __assign_resources_sorted(struct list_head 
*head,
 */
 
/* Check required+optional add */
-   if (realloc_head && !list_empty(realloc_head) &&
+   if (realloc_head &&
__assign_resources_required_optional_sorted(head, realloc_head))
return;
 
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v8 48/61] PCI: Move ISA io port align out of calculate_iosize()

[Yinghai Lu]

We need to move ISA io port align out of calculate_iosize(),
so we could unify calculate_iosize and calculate_memsize later.

That extra aligning or offset is to work around ISA devices:
When one bridge have several children devices, and every device
has several io port resources and resource size < 0x400.
We need to check size, and add extra size to make sure bit8/9
to be zero.

Also need to apply same checking for optional size path.

Signed-off-by: Yinghai Lu 
---
 drivers/pci/setup-bus.c | 39 +++
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index d4aeedc..4e7f0aa 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -1114,11 +1114,6 @@ static resource_size_t calculate_iosize(resource_size_t 
size,
size = min_size;
if (old_size == 1)
old_size = 0;
-   /* To be fixed in 2.5: we should have sort of HAVE_ISA
-  flag in the struct pci_bus. */
-#if defined(CONFIG_ISA) || defined(CONFIG_EISA)
-   size = (size & 0xff) + ((size & ~0xffUL) << 2);
-#endif
size = ALIGN(size + size1, align);
if (size < old_size)
size = old_size;
@@ -1172,6 +1167,18 @@ static resource_size_t window_alignment(struct pci_bus 
*bus,
return max(align, arch_align);
 }
 
+static resource_size_t size_aligned_for_isa(resource_size_t size)
+{
+   /*
+* To be fixed in 2.5: we should have sort of HAVE_ISA
+*  flag in the struct pci_bus.
+*/
+#if defined(CONFIG_ISA) || defined(CONFIG_EISA)
+   size = (size & 0xff) + ((size & ~0xffUL) << 2);
+#endif
+   return size;
+}
+
 /**
  * pbus_size_io() - size the io window of a given bus
  *
@@ -1189,11 +1196,10 @@ static void pbus_size_io(struct pci_bus *bus, 
resource_size_t min_size,
 {
struct pci_dev *dev;
resource_size_t min_sum_size = 0;
-   resource_size_t sum_add_size;
struct resource *b_res = find_free_bus_resource(bus, IORESOURCE_IO,
IORESOURCE_IO);
resource_size_t size = 0, size0 = 0, size1 = 0;
-   resource_size_t children_add_size = 0;
+   resource_size_t sum_add_size = 0, sum_add_size1 = 0;
resource_size_t min_align, align;
 
if (!b_res)
@@ -1210,7 +1216,7 @@ static void pbus_size_io(struct pci_bus *bus, 
resource_size_t min_size,
 
for (i = 0; i < PCI_NUM_RESOURCES; i++) {
struct resource *r = >resource[i];
-   unsigned long r_size;
+   unsigned long r_size, r_add_size;
 
if (r->parent || !(r->flags & IORESOURCE_IO))
continue;
@@ -1226,18 +1232,27 @@ static void pbus_size_io(struct pci_bus *bus, 
resource_size_t min_size,
if (align > min_align)
min_align = align;
 
-   if (realloc_head)
-   children_add_size += 
get_res_add_size(realloc_head, r);
+   if (realloc_head) {
+   r_add_size = get_res_add_size(realloc_head, r);
+   r_add_size += r_size;
+   if (r_add_size < 0x400)
+   /* Might be re-aligned for ISA */
+   sum_add_size += r_add_size;
+   else
+   sum_add_size1 += r_add_size;
+   }
}
}
 
+   size = size_aligned_for_isa(size);
size0 = calculate_iosize(size, min_size, size1,
resource_size(b_res), min_align);
-   sum_add_size = children_add_size + size + size1;
+   sum_add_size = size_aligned_for_isa(sum_add_size);
+   sum_add_size += sum_add_size1;
if (sum_add_size < min_sum_size)
sum_add_size = min_sum_size;
size1 = !realloc_head ? size0 :
-   calculate_iosize(size, min_size, sum_add_size - size,
+   calculate_iosize(sum_add_size, min_size, 0,
resource_size(b_res), min_align);
if (!size0 && !size1) {
if (b_res->start || b_res->end)
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v8 57/61] PCI: Add debug print out for min_align and alt_size

[Yinghai Lu]

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 
---
 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 1889351..673778c 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, _res->dev->dev,
-  "BAR %d: %pR get_res_add_size add_size   %#llx\n",
-  (int)(res - _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, _res->dev->dev,
-  "BAR %d: %pR get_res_add_align min_align %#llx\n",
-  (int)(res - _res->dev->resource[0]),
-  res, (unsigned long long)dev_res->min_align);
-
return dev_res->min_align;
 }
 
@@ -1271,6 +1261,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)
@@ -1284,7 +1276,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;
 
@@ -1294,6 +1287,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(>list, head);
 
@@ -1359,6 +1354,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;
@@ -1366,9 +1374,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;
 
@@ -1393,6 +1398,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;
 }
 
@@ -1410,6 +1420,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;
 
@@ -1434,6 +1454,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,
+

[PATCH v8 55/61] resources: Make allocate_resource() return best fit resource

[Yinghai Lu]

Current code just allocate from first avail window.

We can find all suitable empty slots and pick one with smallest size, so
we could save the big slot for needed ones later when we have several pci
bridges under parent bridge and some bridges get assigned from bios and we
need to assign others in kernel.

For examples: we have window
[0xc000, 0xd000), and [0xe000,0xe100)

and we try allocate 0x20 size resource.

in this patch will reserve [0xc000, 0xd000) and
[0xe000,0xe100) at first, then pick [0xe000,0xe100)
to allocate 0x20 size.

-v2: updated after __allocate_resource change, and add field in constraint
instead of passing it directly.
-v3: Use best fit instead of just fit according to Bjorn.

Signed-off-by: Yinghai Lu 
---
 kernel/resource.c | 81 ++-
 1 file changed, 68 insertions(+), 13 deletions(-)

diff --git a/kernel/resource.c b/kernel/resource.c
index 62321b0..c468875 100644
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -48,6 +48,7 @@ struct resource_constraint {
resource_size_t (*alignf)(void *, const struct resource *,
resource_size_t, resource_size_t);
void *alignf_data;
+   bool fit;
 };
 
 static DEFINE_RWLOCK(resource_lock);
@@ -589,12 +590,15 @@ static void resource_clip(struct resource *res, 
resource_size_t min,
  * alignment constraints
  */
 static int __find_resource(struct resource *root, struct resource *old,
-struct resource *new,
+struct resource *new, struct resource *avail,
 resource_size_t  size,
 struct resource_constraint *constraint)
 {
struct resource *this = root->child;
-   struct resource tmp = *new, avail, alloc;
+   struct resource tmp = *new, availx, alloc;
+
+   if (!avail || avail == new)
+   avail = 
 
tmp.start = root->start;
/*
@@ -618,15 +622,16 @@ static int __find_resource(struct resource *root, struct 
resource *old,
arch_remove_reservations();
 
/* Check for overflow after ALIGN() */
-   avail.start = ALIGN(tmp.start, constraint->align);
-   avail.end = tmp.end;
-   avail.flags = new->flags & ~IORESOURCE_UNSET;
-   if (avail.start >= tmp.start) {
-   alloc.flags = avail.flags;
-   alloc.start = 
constraint->alignf(constraint->alignf_data, ,
+   avail->start = ALIGN(tmp.start, constraint->align);
+   avail->end = tmp.end;
+   avail->flags = new->flags & ~IORESOURCE_UNSET;
+   if (avail->start >= tmp.start) {
+   alloc.flags = avail->flags;
+   alloc.start = constraint->alignf(
+   constraint->alignf_data, avail,
size, constraint->align);
alloc.end = alloc.start + size - 1;
-   if (resource_contains(, )) {
+   if (resource_contains(avail, )) {
new->start = alloc.start;
new->end = alloc.end;
return 0;
@@ -643,6 +648,11 @@ next:  if (!this || this->end == root->end)
return -EBUSY;
 }
 
+struct good_resource {
+   struct list_head list;
+   struct resource avail;
+   struct resource new;
+};
 /*
  * Find empty slot in the resource tree given range and alignment.
  */
@@ -650,7 +660,49 @@ static int find_resource(struct resource *root, struct 
resource *new,
resource_size_t size,
struct resource_constraint  *constraint)
 {
-   return  __find_resource(root, NULL, new, size, constraint);
+   int ret = -1;
+   LIST_HEAD(head);
+   struct good_resource *good, *tmp;
+   resource_size_t avail_size = (resource_size_t)-1ULL;
+
+   if (!constraint->fit)
+   return __find_resource(root, NULL, new, NULL, size,
+   constraint);
+
+   /* find all suitable ones and add to the list */
+   for (;;) {
+   good = kzalloc(sizeof(*good), GFP_KERNEL);
+   if (!good)
+   break;
+
+   good->new.start = new->start;
+   good->new.end = new->end;
+   good->new.flags = new->flags;
+   ret = __find_resource(root, NULL, >new, >avail,
+   size, constraint);
+   if (ret || __request_resource(root, >avail)) {
+   ret = -EBUSY;
+   kfree(good);
+   break;
+   }

[PATCH v8 47/61] PCI: Don't add too much optional size for hotplug bridge io

[Yinghai Lu]

Same as patch for MMIO (PCI: Don't add too much optional size for hotplug
bridge MMIO), and this one is for io port.

It will compare required+optional with min_sum_size to get smaller
optional size.

Signed-off-by: Yinghai Lu 
---
 drivers/pci/setup-bus.c | 26 --
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 00a39be..d4aeedc 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -1177,7 +1177,6 @@ static resource_size_t window_alignment(struct pci_bus 
*bus,
  *
  * @bus : the bus
  * @min_size : the minimum io window that must to be allocated
- * @add_size : additional optional io window
  * @realloc_head : track the additional io window on this list
  *
  * Sizing the IO windows of the PCI-PCI bridge is trivial,
@@ -1186,9 +1185,11 @@ static resource_size_t window_alignment(struct pci_bus 
*bus,
  * We must be careful with the ISA aliasing though.
  */
 static void pbus_size_io(struct pci_bus *bus, resource_size_t min_size,
-   resource_size_t add_size, struct list_head *realloc_head)
+struct list_head *realloc_head)
 {
struct pci_dev *dev;
+   resource_size_t min_sum_size = 0;
+   resource_size_t sum_add_size;
struct resource *b_res = find_free_bus_resource(bus, IORESOURCE_IO,
IORESOURCE_IO);
resource_size_t size = 0, size0 = 0, size1 = 0;
@@ -1198,6 +1199,11 @@ static void pbus_size_io(struct pci_bus *bus, 
resource_size_t min_size,
if (!b_res)
return;
 
+   if (realloc_head) {
+   min_sum_size = min_size;
+   min_size = 0;
+   }
+
min_align = window_alignment(bus, IORESOURCE_IO);
list_for_each_entry(dev, >devices, bus_list) {
int i;
@@ -1227,10 +1233,11 @@ static void pbus_size_io(struct pci_bus *bus, 
resource_size_t min_size,
 
size0 = calculate_iosize(size, min_size, size1,
resource_size(b_res), min_align);
-   if (children_add_size > add_size)
-   add_size = children_add_size;
-   size1 = (!realloc_head || (realloc_head && !add_size)) ? size0 :
-   calculate_iosize(size, min_size, add_size + size1,
+   sum_add_size = children_add_size + size + size1;
+   if (sum_add_size < min_sum_size)
+   sum_add_size = min_sum_size;
+   size1 = !realloc_head ? size0 :
+   calculate_iosize(size, min_size, sum_add_size - size,
resource_size(b_res), min_align);
if (!size0 && !size1) {
if (b_res->start || b_res->end)
@@ -1757,7 +1764,7 @@ void __pci_bus_size_bridges(struct pci_bus *bus, struct 
list_head *realloc_head)
 {
struct pci_dev *dev;
unsigned long mask, prefmask, type2 = 0, type3 = 0;
-   resource_size_t min_mem_size = 0, additional_io_size = 0;
+   resource_size_t min_mem_size = 0, min_io_size = 0;
struct resource *b_res;
int ret;
 
@@ -1793,13 +1800,12 @@ void __pci_bus_size_bridges(struct pci_bus *bus, struct 
list_head *realloc_head)
 
case PCI_CLASS_BRIDGE_PCI:
if (bus->self->is_hotplug_bridge) {
-   additional_io_size  = pci_hotplug_io_size;
+   min_io_size  = pci_hotplug_io_size;
min_mem_size = pci_hotplug_mem_size;
}
/* Fall through */
default:
-   pbus_size_io(bus, realloc_head ? 0 : additional_io_size,
-additional_io_size, realloc_head);
+   pbus_size_io(bus, min_io_size, realloc_head);
 
/*
 * If there's a 64-bit prefetchable MMIO window, compute
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v8 49/61] PCI: Don't add too much io port for hotplug bridge with old size

[Yinghai Lu]

Now we add too much for hotplug bridge io port.
For example, when hotplug bridge has two children bridges,
every child bridge will need 0x1000, so size1 will be 0x2000
and size is 0. The min_size for the hotplug bridge is 0x100.
with old version calculate_iosize, we get 0x3000 for final
size as we are using size to compare with min_size at first.
That is not right, we should have 0x2000.

We can check size+size1 with min_size for io port, and just add size1
to size without passing extra size1 into calculate_iosize().

Signed-off-by: Yinghai Lu 
---
 drivers/pci/setup-bus.c | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 4e7f0aa..d4e8da1 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -1106,7 +1106,6 @@ static struct resource *find_free_bus_resource(struct 
pci_bus *bus,
 
 static resource_size_t calculate_iosize(resource_size_t size,
resource_size_t min_size,
-   resource_size_t size1,
resource_size_t old_size,
resource_size_t align)
 {
@@ -1114,7 +1113,7 @@ static resource_size_t calculate_iosize(resource_size_t 
size,
size = min_size;
if (old_size == 1)
old_size = 0;
-   size = ALIGN(size + size1, align);
+   size = ALIGN(size, align);
if (size < old_size)
size = old_size;
return size;
@@ -1245,14 +1244,15 @@ static void pbus_size_io(struct pci_bus *bus, 
resource_size_t min_size,
}
 
size = size_aligned_for_isa(size);
-   size0 = calculate_iosize(size, min_size, size1,
+   size += size1;
+   size0 = calculate_iosize(size, min_size,
resource_size(b_res), min_align);
sum_add_size = size_aligned_for_isa(sum_add_size);
sum_add_size += sum_add_size1;
if (sum_add_size < min_sum_size)
sum_add_size = min_sum_size;
size1 = !realloc_head ? size0 :
-   calculate_iosize(sum_add_size, min_size, 0,
+   calculate_iosize(sum_add_size, min_size,
resource_size(b_res), min_align);
if (!size0 && !size1) {
if (b_res->start || b_res->end)
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v8 51/61] PCI: Allow bridge optional only io port resource required size to be 0

[Yinghai Lu]

When there is no child device under the non hotplug bridge,
We can use 0 for required size, and do not use old size as required size.

That will save some io port range for other bridges, as BIOS could do
some partial assign, and we want to use those not used io port range.

When there is child device, size will not be 0.
when the bridge supports hotplug, min_size will not be 0.
So they will still honor the old size as required size.

Signed-off-by: Yinghai Lu 
---
 drivers/pci/setup-bus.c | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index a6eea60..bbc10d8 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -1230,8 +1230,9 @@ static void pbus_size_io(struct pci_bus *bus, 
resource_size_t min_size,
 
size = size_aligned_for_isa(size);
size += size1;
-   size0 = calculate_size(size, min_size,
-   resource_size(b_res), min_align);
+   if (size || min_size)
+   size0 = calculate_size(size, min_size,
+   resource_size(b_res), min_align);
sum_add_size = size_aligned_for_isa(sum_add_size);
sum_add_size += sum_add_size1;
if (sum_add_size < min_sum_size)
@@ -1247,7 +1248,7 @@ static void pbus_size_io(struct pci_bus *bus, 
resource_size_t min_size,
return;
}
 
-   b_res->start = min_align;
+   b_res->start = size0 ? min_align : 0;
b_res->end = b_res->start + size0 - 1;
b_res->flags |= IORESOURCE_STARTALIGN;
if (size1 > size0 && realloc_head) {
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v8 46/61] PCI: Fix size calculation with old_size on rescan path

[Yinghai Lu]

On booting path, we don't pass realloc at first, and treat all optional
just as required, in some case we can have smaller size/align with optional
than required only.

  04:00.0 has children bridges: 05:03.0, 05:04.0
pref layout after booting path like followings:

pci :04:00.0: BAR 9: assigned [mem 0x8400-0x9fff 64bit pref]
pci :05:04.0: BAR 9: assigned [mem 0x8800-0x9fff 64bit pref]
pci :05:03.0: BAR 9: assigned [mem 0x8400-0x841f 64bit pref]
pci :05:03.0: PCI bridge to [bus 08-0f]
pci :05:03.0:   bridge window [mem 0x8400-0x841f 64bit pref]
pci :05:04.0: PCI bridge to [bus 10]
pci :05:04.0:   bridge window [mem 0x8800-0x9fff 64bit pref]
pci :04:00.0: PCI bridge to [bus 05-10]
pci :04:00.0:   bridge window [mem 0x8400-0x9fff 64bit pref]

so the old size in rescan for 04:00.0 would be 0x1c00, and align is 
0x400

during remove and rescan:

pci :05:03.0: bridge window [mem 0x-0x 64bit pref] 
to [bus 08-0f] add_size 20 add_align 10 alt_size 0 alt_align 0 
must_size 0 must_align 0
pci :05:03.0: bridge window [mem 0x-0x] to [bus 
08-0f] add_size 20 add_align 10 alt_size 0 alt_align 0 must_size 0 
must_align 0
pci :05:04.0: bridge window [mem 0x0800-0x1fff 64bit pref] to [bus 
10] add_size 0 add_align 0 alt_size 1010 alt_align 1000 must_size 
1800 must_align 800
pci :05:03.0: BAR 9: [mem 0x-0x 64bit pref] 
get_res_add_size add_size   20
pci :05:03.0: BAR 9: [mem 0x-0x 64bit pref] 
get_res_add_align min_align 10
pci :04:00.0: bridge window [mem 0x0800-0x27ff 64bit pref] to [bus 
05-10] add_size 0 add_align 0 alt_size 1010 alt_align 1000 must_size 
2000 must_align 800

align old size 0x1c00 to 0x200 as size0, 0x1c00 as size1.
so for 04:00.0 will have big must and no optional size anymore.

So don't align old size, then we will have same size0 and size1,
and use smaller add_align as must align.

After the patch, rescan works properly.

Signed-off-by: Yinghai Lu 
---
 drivers/pci/setup-bus.c | 13 -
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 7e7663a..00a39be 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -1134,9 +1134,9 @@ static resource_size_t calculate_memsize(resource_size_t 
size,
size = min_size;
if (old_size == 1)
old_size = 0;
+   size = ALIGN(size, align);
if (size < old_size)
size = old_size;
-   size = ALIGN(size, align);
return size;
 }
 
@@ -1595,6 +1595,17 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned 
long mask,
b_res->flags = 0;
return 0;
}
+
+   /*
+* It happens when boot path is not passing realloc
+* and later rescan is passing realloc.
+* The old value from boot path is bigger, and calculate_size will
+* use old value as size0 and size1, and also have
+* chance optional align is smaller than must only align.
+*/
+   if(size0 == size1 && min_align > min_add_align)
+   min_align = min_add_align;
+
b_res->start = min_align;
b_res->end = size0 + min_align - 1;
b_res->flags |= IORESOURCE_STARTALIGN;
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v8 58/61] PCI, x86: Add pci=assign_pref_bars to reallocate pref BARs

[Yinghai Lu]

Now some BIOS tend to allocate pref MMIO under non-pref MMIO, or allocate
64bit pref MMIO under 4G.

Add pci=assign_pref_bars to clear and allocate resource to pref BARS.
So could reallocate pref mmio64 above 4G and pref under bridges pref BARs.

Signed-off-by: Yinghai Lu 
---
 arch/x86/include/asm/pci_x86.h |  1 +
 arch/x86/pci/common.c  |  3 +++
 arch/x86/pci/i386.c| 56 ++
 3 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/arch/x86/include/asm/pci_x86.h b/arch/x86/include/asm/pci_x86.h
index 81a7abf..23bc5d6 100644
--- a/arch/x86/include/asm/pci_x86.h
+++ b/arch/x86/include/asm/pci_x86.h
@@ -34,6 +34,7 @@ do {  \
 #define PCI_NOASSIGN_ROMS  0x8
 #define PCI_ROOT_NO_CRS0x10
 #define PCI_NOASSIGN_BARS  0x20
+#define PCI_ASSIGN_PREF_BARS   0x40
 
 extern unsigned int pci_probe;
 extern unsigned long pirq_table_addr;
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index 7c018df..7dc28c2 100644
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -606,6 +606,9 @@ char *__init pcibios_setup(char *str)
} else if (!strcmp(str, "assign-busses")) {
pci_probe |= PCI_ASSIGN_ALL_BUSSES;
return NULL;
+   } else if (!strcmp(str, "assign_pref_bars")) {
+   pci_probe |= PCI_ASSIGN_PREF_BARS;
+   return NULL;
} else if (!strcmp(str, "use_crs")) {
pci_probe |= PCI_USE__CRS;
return NULL;
diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c
index 21f3e3e..6f27780 100644
--- a/arch/x86/pci/i386.c
+++ b/arch/x86/pci/i386.c
@@ -228,16 +228,25 @@ static void pcibios_allocate_bridge_resources(struct 
pci_dev *dev)
continue;
if (r->parent)  /* Already allocated */
continue;
-   if (!r->start || pci_claim_bridge_resource(dev, idx) < 0) {
-   /*
-* Something is wrong with the region.
-* Invalidate the resource to prevent
-* child resource allocations in this
-* range.
-*/
-   r->start = r->end = 0;
-   r->flags = 0;
-   }
+
+   if ((r->flags & IORESOURCE_PREFETCH) &&
+   (pci_probe & PCI_ASSIGN_PREF_BARS))
+   goto clear;
+
+   if (!r->start)
+   goto clear;
+
+   if (pci_claim_bridge_resource(dev, idx) == 0)
+   continue;
+
+clear:
+   /*
+* Something is wrong with the region.
+* Invalidate the resource to prevent
+* child resource allocations in this range.
+*/
+   r->start = r->end = 0;
+   r->flags = 0;
}
 }
 
@@ -283,21 +292,26 @@ static void pcibios_allocate_dev_resources(struct pci_dev 
*dev, int pass)
else
disabled = !(command & PCI_COMMAND_MEMORY);
if (pass == disabled) {
+   if ((r->flags & IORESOURCE_PREFETCH) &&
+   (pci_probe & PCI_ASSIGN_PREF_BARS))
+   goto clear;
+
dev_dbg(>dev,
"BAR %d: reserving %pr (d=%d, p=%d)\n",
idx, r, disabled, pass);
-   if (pci_claim_resource(dev, idx) < 0) {
-   if (r->flags & IORESOURCE_PCI_FIXED) {
-   dev_info(>dev, "BAR %d %pR 
is immovable\n",
-idx, r);
-   } else {
-   /* We'll assign a new address 
later */
-   pcibios_save_fw_addr(dev,
-   idx, r->start);
-   r->end -= r->start;
-   r->start = 0;
-   }
+   if (pci_claim_resource(dev, idx) == 0)
+   continue;
+   if (r->flags & IORESOURCE_PCI_FIXED) {
+   dev_info(>dev, "BAR %d %pR is 
immovable\n",
+idx, r);
+   continue;

[PATCH v8 13/61] PCI: Only treat non-pref mmio64 as pref if all bridges have MEM_64

[Yinghai Lu]

If any bridge up to root only have 32bit pref mmio, We don't need to
treat device non-pref mmio64 as as pref mmio64.

We need to move pci_bridge_check_ranges calling early.
for parent bridges pref mmio BAR may not allocated by BIOS, res flags
is still 0, we need to have it correct set before we check them for
child device resources.

-v2: check all bus resources instead of just res[15].

Signed-off-by: Yinghai Lu 
Tested-by: Khalid Aziz 
---
 drivers/pci/setup-bus.c | 31 +--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 6c43c43..b1e4595 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -739,6 +739,29 @@ int pci_claim_bridge_resource(struct pci_dev *bridge, int 
i)
return -EINVAL;
 }
 
+static bool pci_up_path_over_pref_mem64(struct pci_bus *bus)
+{
+   if (pci_is_root_bus(bus))
+   return true;
+
+   if (bus->self) {
+   int i;
+   bool found = false;
+   struct resource *res;
+
+   pci_bus_for_each_resource(bus, res, i)
+   if (res->flags & IORESOURCE_MEM_64) {
+   found = true;
+   break;
+   }
+
+   if (!found)
+   return false;
+   }
+
+   return pci_up_path_over_pref_mem64(bus->parent);
+}
+
 int pci_resource_pref_compatible(const struct pci_dev *dev,
 struct resource *res)
 {
@@ -747,7 +770,8 @@ int pci_resource_pref_compatible(const struct pci_dev *dev,
 
if ((res->flags & IORESOURCE_MEM) &&
(res->flags & IORESOURCE_MEM_64) &&
-   dev->on_all_pcie_path)
+   dev->on_all_pcie_path &&
+   pci_up_path_over_pref_mem64(dev->bus))
return res->flags | IORESOURCE_PREFETCH;
 
return res->flags;
@@ -1239,6 +1263,10 @@ void __pci_bus_size_bridges(struct pci_bus *bus, struct 
list_head *realloc_head)
struct resource *b_res;
int ret;
 
+   if (!pci_is_root_bus(bus) &&
+   (bus->self->class >> 8) == PCI_CLASS_BRIDGE_PCI)
+   pci_bridge_check_ranges(bus);
+
list_for_each_entry(dev, >devices, bus_list) {
struct pci_bus *b = dev->subordinate;
if (!b)
@@ -1266,7 +1294,6 @@ void __pci_bus_size_bridges(struct pci_bus *bus, struct 
list_head *realloc_head)
break;
 
case PCI_CLASS_BRIDGE_PCI:
-   pci_bridge_check_ranges(bus);
if (bus->self->is_hotplug_bridge) {
additional_io_size  = pci_hotplug_io_size;
additional_mem_size = pci_hotplug_mem_size;
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v8 36/61] PCI: Add __add_to_list()

[Yinghai Lu]

For alt_size support, we will add more entries to realloc list.

Add new __add_to_list() to take alt_size, alt_align.

And simplify add_to_list() not to take add/alt input.

Signed-off-by: Yinghai Lu 
---
 drivers/pci/setup-bus.c | 51 ++---
 1 file changed, 31 insertions(+), 20 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index d575c56..b86417d 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -66,6 +66,8 @@ struct pci_dev_resource {
resource_size_t end;
resource_size_t add_size;
resource_size_t min_align;
+   resource_size_t alt_size;
+   resource_size_t alt_align;
unsigned long flags;
 };
 
@@ -88,15 +90,16 @@ static void free_list(struct list_head *head)
  * @add_size:  additional size to be optionally added
  *  to the resource
  */
-static int add_to_list(struct list_head *head,
+static int __add_to_list(struct list_head *head,
 struct pci_dev *dev, struct resource *res,
-resource_size_t add_size, resource_size_t min_align)
+resource_size_t add_size, resource_size_t min_align,
+resource_size_t alt_size, resource_size_t alt_align)
 {
struct pci_dev_resource *tmp;
 
tmp = kzalloc(sizeof(*tmp), GFP_KERNEL);
if (!tmp) {
-   pr_warn("add_to_list: kmalloc() failed!\n");
+   pr_warn("__add_to_list: kmalloc() failed!\n");
return -ENOMEM;
}
 
@@ -107,12 +110,20 @@ static int add_to_list(struct list_head *head,
tmp->flags = res->flags;
tmp->add_size = add_size;
tmp->min_align = min_align;
+   tmp->alt_size = alt_size;
+   tmp->alt_align = alt_align;
 
list_add(>list, head);
 
return 0;
 }
 
+static int add_to_list(struct list_head *head,
+struct pci_dev *dev, struct resource *res)
+{
+   return __add_to_list(head, dev, res, 0, 0, 0, 0);
+}
+
 static void remove_from_list(struct list_head *head,
 struct resource *res)
 {
@@ -378,9 +389,7 @@ static void assign_requested_resources_sorted(struct 
list_head *head,
if (resource_size(res) &&
pci_assign_resource(dev_res->dev, idx)) {
if (fail_head)
-   add_to_list(fail_head, dev_res->dev, res,
-   0 /* don't care */,
-   0 /* don't care */);
+   add_to_list(fail_head, dev_res->dev, res);
reset_resource(res);
}
}
@@ -466,7 +475,7 @@ static void __assign_resources_sorted(struct list_head 
*head,
 
/* Save original start, end, flags etc at first */
list_for_each_entry(dev_res, head, list) {
-   if (add_to_list(_head, dev_res->dev, dev_res->res, 0, 0)) {
+   if (add_to_list(_head, dev_res->dev, dev_res->res)) {
free_list(_head);
goto requested_and_reassign;
}
@@ -1057,8 +1066,8 @@ static void pbus_size_io(struct pci_bus *bus, 
resource_size_t min_size,
b_res->end = b_res->start + size0 - 1;
b_res->flags |= IORESOURCE_STARTALIGN;
if (size1 > size0 && realloc_head) {
-   add_to_list(realloc_head, bus->self, b_res, size1-size0,
-   min_align);
+   __add_to_list(realloc_head, bus->self, b_res,
+ size1 - size0, min_align, 0, 0);
dev_printk(KERN_DEBUG, >self->dev, "bridge window %pR to 
%pR add_size %llx\n",
   b_res, >busn_res,
   (unsigned long long)size1-size0);
@@ -1261,7 +1270,8 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned 
long mask,
add_to_align_test_list(_test_add_list,
align, r_size);
r->end = r->start - 1;
-   add_to_list(realloc_head, dev, r, r_size, 0/* 
don't care */);
+   __add_to_list(realloc_head, dev, r,
+ r_size, align, 0, 0);
sum_add_size += r_size;
if (align > max_add_align)
max_add_align = align;
@@ -1332,8 +1342,8 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned 
long mask,
b_res->end = size0 + min_align - 1;
b_res->flags |= IORESOURCE_STARTALIGN;
if (size1 > size0 && realloc_head) {
-   add_to_list(realloc_head, bus->self, b

[PATCH v8 19/61] PCI: Set resource to FIXED for LSI devices

[Yinghai Lu]

LSI HBA firmware stop responding pci read from host if pci core ever change
pci device BAR values.

Set their resources to FIXED, so will allow realloc to skip them.

Reported-by: Paul Johnson 
Suggested-by: Bjorn Helgaas 
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=92351
Signed-off-by: Yinghai Lu 
Cc: sta...@vger.kernel.org
---
 drivers/pci/pci.h   |  1 +
 drivers/pci/quirks.c| 20 
 drivers/pci/setup-bus.c |  4 
 3 files changed, 25 insertions(+)

diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index 6ad0f05..39d2c50 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -170,6 +170,7 @@ static inline void pci_msix_clear_and_set_ctrl(struct 
pci_dev *dev, u16 clear, u
 }
 
 void pci_realloc_get_opt(char *);
+bool pci_realloc_user_enabled(void);
 
 static inline int pci_no_d1d2(struct pci_dev *dev)
 {
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 1d85f37..be0bdfb 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -323,6 +323,26 @@ static void quirk_s3_64M(struct pci_dev *dev)
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_S3, PCI_DEVICE_ID_S3_868,   
quirk_s3_64M);
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_S3, PCI_DEVICE_ID_S3_968,   
quirk_s3_64M);
 
+/*
+ * LSI devices firmware does not like BAR get changed
+ */
+static void quirk_bar_fixed(struct pci_dev *dev)
+{
+   int i;
+
+   if (pci_realloc_user_enabled())
+   return;
+
+   for (i = 0; i < PCI_STD_RESOURCE_END; i++) {
+   struct resource *r = >resource[i];
+
+   if (!r->start || !r->flags)
+   continue;
+   r->flags |= IORESOURCE_PCI_FIXED;
+   }
+}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_LSI_LOGIC,  PCI_ANY_ID, 
quirk_bar_fixed);
+
 /* for pci remove and rescan */
 static void quirk_allocate_fixed(struct pci_dev *dev)
 {
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 8cd6c6b..d49c6e5 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -1634,6 +1634,10 @@ void __init pci_realloc_get_opt(char *str)
else if (!strncmp(str, "on", 2))
pci_realloc_enable = user_enabled;
 }
+bool pci_realloc_user_enabled(void)
+{
+   return pci_realloc_enable == user_enabled;
+}
 static bool pci_realloc_enabled(enum enable_type enable)
 {
return enable >= user_enabled;
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v8 52/61] PCI: Unify skip_ioresource_align()

[Yinghai Lu]

There are powerpc generic version and x86 local version for
skip_ioresource_align().

Move the powerpc version to setup-bus.c, and kill x86 local version.

Also kill dummy version in microblaze.

Cc: Michal Simek 
Cc: Paul Mackerras 
Cc: Michael Ellerman 
Cc: Arnd Bergmann 
Cc: linuxppc-...@lists.ozlabs.org
Cc: linux-a...@vger.kernel.org
Signed-off-by: Yinghai Lu 
Reviewed-by: Thomas Gleixner 
Acked-by: Michael Ellerman 
---
 arch/microblaze/pci/pci-common.c |  8 
 arch/powerpc/kernel/pci-common.c | 11 +--
 arch/x86/include/asm/pci_x86.h   |  1 -
 arch/x86/pci/common.c|  4 ++--
 arch/x86/pci/i386.c  | 12 ++--
 drivers/pci/setup-bus.c  |  9 +
 include/asm-generic/pci-bridge.h |  2 ++
 7 files changed, 16 insertions(+), 31 deletions(-)

diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c
index ae838ed..09b1af6 100644
--- a/arch/microblaze/pci/pci-common.c
+++ b/arch/microblaze/pci/pci-common.c
@@ -878,11 +878,6 @@ void pcibios_fixup_bus(struct pci_bus *bus)
 }
 EXPORT_SYMBOL(pcibios_fixup_bus);
 
-static int skip_isa_ioresource_align(struct pci_dev *dev)
-{
-   return 0;
-}
-
 /*
  * We need to avoid collisions with `mirrored' VGA ports
  * and other strange ISA hardware, so we always want the
@@ -899,12 +894,9 @@ static int skip_isa_ioresource_align(struct pci_dev *dev)
 resource_size_t pcibios_align_resource(void *data, const struct resource *res,
resource_size_t size, resource_size_t align)
 {
-   struct pci_dev *dev = data;
resource_size_t start = res->start;
 
if (res->flags & IORESOURCE_IO) {
-   if (skip_isa_ioresource_align(dev))
-   return start;
if (start & 0x300)
start = (start + 0x3ff) & ~0x3ff;
}
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index 7587b2a..8853667 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -1052,15 +1052,6 @@ void pci_fixup_cardbus(struct pci_bus *bus)
pcibios_setup_bus_devices(bus);
 }
 
-
-static int skip_isa_ioresource_align(struct pci_dev *dev)
-{
-   if (pci_has_flag(PCI_CAN_SKIP_ISA_ALIGN) &&
-   !(dev->bus->bridge_ctl & PCI_BRIDGE_CTL_ISA))
-   return 1;
-   return 0;
-}
-
 /*
  * We need to avoid collisions with `mirrored' VGA ports
  * and other strange ISA hardware, so we always want the
@@ -1081,7 +1072,7 @@ resource_size_t pcibios_align_resource(void *data, const 
struct resource *res,
resource_size_t start = res->start;
 
if (res->flags & IORESOURCE_IO) {
-   if (skip_isa_ioresource_align(dev))
+   if (skip_isa_ioresource_align(dev->bus))
return start;
if (start & 0x300)
start = (start + 0x3ff) & ~0x3ff;
diff --git a/arch/x86/include/asm/pci_x86.h b/arch/x86/include/asm/pci_x86.h
index fa1195d..81a7abf 100644
--- a/arch/x86/include/asm/pci_x86.h
+++ b/arch/x86/include/asm/pci_x86.h
@@ -28,7 +28,6 @@ do {  \
 #define PCI_ASSIGN_ROMS0x1000
 #define PCI_BIOS_IRQ_SCAN  0x2000
 #define PCI_ASSIGN_ALL_BUSSES  0x4000
-#define PCI_CAN_SKIP_ISA_ALIGN 0x8000
 #define PCI_USE__CRS   0x1
 #define PCI_CHECK_ENABLE_AMD_MMCONF0x2
 #define PCI_HAS_IO_ECS 0x4
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index dc78a4a..7c018df 100644
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -83,7 +83,7 @@ DEFINE_RAW_SPINLOCK(pci_config_lock);
 
 static int __init can_skip_ioresource_align(const struct dmi_system_id *d)
 {
-   pci_probe |= PCI_CAN_SKIP_ISA_ALIGN;
+   pci_add_flags(PCI_CAN_SKIP_ISA_ALIGN);
printk(KERN_INFO "PCI: %s detected, can skip ISA alignment\n", 
d->ident);
return 0;
 }
@@ -619,7 +619,7 @@ char *__init pcibios_setup(char *str)
pci_routeirq = 1;
return NULL;
} else if (!strcmp(str, "skip_isa_align")) {
-   pci_probe |= PCI_CAN_SKIP_ISA_ALIGN;
+   pci_add_flags(PCI_CAN_SKIP_ISA_ALIGN);
return NULL;
} else if (!strcmp(str, "noioapicquirk")) {
noioapicquirk = 1;
diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c
index 0a9f2ca..3f17726 100644
--- a/arch/x86/pci/i386.c
+++ b/arch/x86/pci/i386.c
@@ -33,6 +33,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -128,15 +129,6 @@ static void __init pcibios_fw_addr_list_del(void)
pcibios_fw_addr_done = true;
 }
 
-static int
-skip_isa_ioresource_align(struct pci_dev *dev) {
-
-   if ((pci_probe & PCI_CAN_SKIP_ISA_ALIGN) &&
-   !(dev->bus->bridge_ctl & PCI_BRIDGE_CTL_ISA))
-   retu