* [PATCH] pci: fix merging left out for BAR print out
2008-08-30 7:58 [PATCH] x86: unify using pci_mmcfg_insert_resource Yinghai Lu
@ 2008-08-30 7:58 ` Yinghai Lu
2008-08-30 7:58 ` [PATCH] x86: split e820 reserved entries record to late v4 Yinghai Lu
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Yinghai Lu @ 2008-08-30 7:58 UTC (permalink / raw)
To: Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Andrew Morton,
Jesse Barnes, Linus Torvalds
Cc: linux-kernel, Yinghai Lu
print out for Device BAR address before kernel try to update them.
also change it to KERN_DEBUG instead...
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index cce2f4c..4ee06c3 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -304,6 +304,8 @@ static int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
} else {
res->start = l64;
res->end = l64 + sz64;
+ printk(KERN_DEBUG "PCI: %s reg %x 64bit mmio: [%llx, %llx]\n",
+ pci_name(dev), pos, res->start, res->end);
}
} else {
sz = pci_size(l, sz, mask);
@@ -313,6 +315,10 @@ static int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
res->start = l;
res->end = l + sz;
+ printk(KERN_DEBUG "PCI: %s reg %x %s: [%llx, %llx]\n", pci_name(dev),
+ pos, (res->flags & IORESOURCE_IO) ? "io port":"32bit mmio",
+ res->start, res->end);
+
}
out:
@@ -383,7 +389,7 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child)
res->start = base;
if (!res->end)
res->end = limit + 0xfff;
- printk(KERN_INFO "PCI: bridge %s io port: [%llx, %llx]\n", pci_name(dev), res->start, res->end);
+ printk(KERN_DEBUG "PCI: bridge %s io port: [%llx, %llx]\n", pci_name(dev), res->start, res->end);
}
res = child->resource[1];
@@ -395,7 +401,7 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child)
res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM;
res->start = base;
res->end = limit + 0xfffff;
- printk(KERN_INFO "PCI: bridge %s 32bit mmio: [%llx, %llx]\n", pci_name(dev), res->start, res->end);
+ printk(KERN_DEBUG "PCI: bridge %s 32bit mmio: [%llx, %llx]\n", pci_name(dev), res->start, res->end);
}
res = child->resource[2];
@@ -431,7 +437,7 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child)
res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM | IORESOURCE_PREFETCH;
res->start = base;
res->end = limit + 0xfffff;
- printk(KERN_INFO "PCI: bridge %s %sbit mmio pref: [%llx, %llx]\n", pci_name(dev), (res->flags & PCI_PREF_RANGE_TYPE_64)?"64":"32",res->start, res->end);
+ printk(KERN_DEBUG "PCI: bridge %s %sbit mmio pref: [%llx, %llx]\n", pci_name(dev), (res->flags & PCI_PREF_RANGE_TYPE_64)?"64":"32",res->start, res->end);
}
}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH] x86: split e820 reserved entries record to late v4
2008-08-30 7:58 [PATCH] x86: unify using pci_mmcfg_insert_resource Yinghai Lu
2008-08-30 7:58 ` [PATCH] pci: fix merging left out for BAR print out Yinghai Lu
@ 2008-08-30 7:58 ` Yinghai Lu
2008-08-30 7:58 ` [PATCH] x86: split e820 reserved entries record to late v4 - fix v3 Yinghai Lu
2008-09-10 18:49 ` [PATCH] x86: unify using pci_mmcfg_insert_resource Jesse Barnes
3 siblings, 0 replies; 6+ messages in thread
From: Yinghai Lu @ 2008-08-30 7:58 UTC (permalink / raw)
To: Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Andrew Morton,
Jesse Barnes, Linus Torvalds
Cc: linux-kernel, Yinghai Lu
Linus said we should register some entries in e820 later,
so could let BAR res register at first, or even pnp?
this one replace
| commit a2bd7274b47124d2fc4dfdb8c0591f545ba749dd
| Author: Yinghai Lu <yhlu.kernel@gmail.com>
| Date: Mon Aug 25 00:56:08 2008 -0700
|
| x86: fix HPET regression in 2.6.26 versus 2.6.25, check hpet against BAR, v3
v2: insert e820 reserve resources before pnp_system_init
v3: fix merging problem in tip/x86/core
please drop the one in tip/x86/core use this one instead
v4: address Linus's review about comments and condition in _late()
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
---
arch/x86/kernel/e820.c | 24 +++++++++++++++++++++++-
arch/x86/pci/i386.c | 3 +++
include/asm-x86/e820.h | 1 +
3 files changed, 27 insertions(+), 1 deletion(-)
Index: linux-2.6/arch/x86/kernel/e820.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/e820.c
+++ linux-2.6/arch/x86/kernel/e820.c
@@ -1271,6 +1271,7 @@ static inline const char *e820_type_to_s
/*
* Mark e820 reserved areas as busy for the resource manager.
*/
+static struct resource __initdata *e820_res;
void __init e820_reserve_resources(void)
{
int i;
@@ -1278,6 +1279,7 @@ void __init e820_reserve_resources(void)
u64 end;
res = alloc_bootmem_low(sizeof(struct resource) * e820.nr_map);
+ e820_res = res;
for (i = 0; i < e820.nr_map; i++) {
end = e820.map[i].addr + e820.map[i].size - 1;
#ifndef CONFIG_RESOURCES_64BIT
@@ -1291,7 +1293,14 @@ void __init e820_reserve_resources(void)
res->end = end;
res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
- insert_resource(&iomem_resource, res);
+
+ /*
+ * don't register the region that could be conflicted with
+ * pci device BAR resource and insert them later in
+ * pcibios_resource_survey()
+ */
+ if (e820.map[i].type != E820_RESERVED || res->start < (1ULL<<20))
+ insert_resource(&iomem_resource, res);
res++;
}
@@ -1303,6 +1312,19 @@ void __init e820_reserve_resources(void)
}
}
+void __init e820_reserve_resources_late(void)
+{
+ int i;
+ struct resource *res;
+
+ res = e820_res;
+ for (i = 0; i < e820.nr_map; i++) {
+ if (!res->parent && res->end)
+ insert_resource(&iomem_resource, res);
+ res++;
+ }
+}
+
char *__init default_machine_specific_memory_setup(void)
{
char *who = "BIOS-e820";
Index: linux-2.6/arch/x86/pci/i386.c
===================================================================
--- linux-2.6.orig/arch/x86/pci/i386.c
+++ linux-2.6/arch/x86/pci/i386.c
@@ -33,6 +33,7 @@
#include <linux/bootmem.h>
#include <asm/pat.h>
+#include <asm/e820.h>
#include "pci.h"
@@ -230,6 +231,8 @@ void __init pcibios_resource_survey(void
pcibios_allocate_bus_resources(&pci_root_buses);
pcibios_allocate_resources(0);
pcibios_allocate_resources(1);
+
+ e820_reserve_resources_late();
}
/**
Index: linux-2.6/include/asm-x86/e820.h
===================================================================
--- linux-2.6.orig/include/asm-x86/e820.h
+++ linux-2.6/include/asm-x86/e820.h
@@ -122,6 +122,7 @@ extern void e820_register_active_regions
extern u64 e820_hole_size(u64 start, u64 end);
extern void finish_e820_parsing(void);
extern void e820_reserve_resources(void);
+extern void e820_reserve_resources_late(void);
extern void setup_memory_map(void);
extern char *default_machine_specific_memory_setup(void);
extern char *machine_specific_memory_setup(void);
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH] x86: split e820 reserved entries record to late v4 - fix v3
2008-08-30 7:58 [PATCH] x86: unify using pci_mmcfg_insert_resource Yinghai Lu
2008-08-30 7:58 ` [PATCH] pci: fix merging left out for BAR print out Yinghai Lu
2008-08-30 7:58 ` [PATCH] x86: split e820 reserved entries record to late v4 Yinghai Lu
@ 2008-08-30 7:58 ` Yinghai Lu
2008-09-10 18:49 ` [PATCH] x86: unify using pci_mmcfg_insert_resource Jesse Barnes
3 siblings, 0 replies; 6+ messages in thread
From: Yinghai Lu @ 2008-08-30 7:58 UTC (permalink / raw)
To: Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Andrew Morton,
Jesse Barnes, Linus Torvalds
Cc: linux-kernel, Yinghai Lu
try to insert_resource second time, by expand the resource...
for case: e820 reserved entry is partially overlapped with bar res...
hope it will never happen
v2: according to Linus, add insert_resource_expand_to_fit, and change
__insert_resource to static without lock
v3: use reserve_region_with_split() instead to hand overlapping
with test case by extend 0xe0000000 - 0xeffffff to 0xdd800000 -
get
e0000000-efffffff : PCI MMCONFIG 0
e0000000-efffffff : reserved
in /proc/iomem
get
found conflict for reserved [dd800000, efffffff], try to reserve with split
__reserve_region_with_split: (PCI Bus #80) [dd000000, ddffffff], res: (reserved) [dd800000, efffffff]
__reserve_region_with_split: (PCI Bus #00) [de000000, dfffffff], res: (reserved) [de000000, efffffff]
initcall pci_subsys_init+0x0/0x121 returned 0 after 381 msecs
in dmesg
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
---
arch/x86/kernel/e820.c | 8 +++-
include/linux/ioport.h | 3 +
kernel/resource.c | 95 ++++++++++++++++++++++++++++++++++++++++++-------
3 files changed, 92 insertions(+), 14 deletions(-)
Index: linux-2.6/arch/x86/kernel/e820.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/e820.c
+++ linux-2.6/arch/x86/kernel/e820.c
@@ -1319,8 +1319,12 @@ void __init e820_reserve_resources_late(
res = e820_res;
for (i = 0; i < e820.nr_map; i++) {
- if (!res->parent && res->end)
- insert_resource(&iomem_resource, res);
+ if (!res->parent && res->end && insert_resource(&iomem_resource, res)) {
+ printk(KERN_WARNING "found conflict for %s [%08llx, %08llx], try to reserve with split\n",
+ res->name, res->start, res->end);
+
+ reserve_region_with_split(&iomem_resource, res->start, res->end, res->name);
+ }
res++;
}
}
Index: linux-2.6/include/linux/ioport.h
===================================================================
--- linux-2.6.orig/include/linux/ioport.h
+++ linux-2.6/include/linux/ioport.h
@@ -108,6 +108,9 @@ extern struct resource iomem_resource;
extern int request_resource(struct resource *root, struct resource *new);
extern int release_resource(struct resource *new);
+extern void reserve_region_with_split(struct resource *root,
+ resource_size_t start, resource_size_t end,
+ char *name);
extern int insert_resource(struct resource *parent, struct resource *new);
extern int allocate_resource(struct resource *root, struct resource *new,
resource_size_t size, resource_size_t min,
Index: linux-2.6/kernel/resource.c
===================================================================
--- linux-2.6.orig/kernel/resource.c
+++ linux-2.6/kernel/resource.c
@@ -363,32 +363,30 @@ int allocate_resource(struct resource *r
EXPORT_SYMBOL(allocate_resource);
/**
- * insert_resource - Inserts a resource in the resource tree
+ * __insert_resource - Inserts a resource in the resource tree
* @parent: parent of the new resource
* @new: new resource to insert
*
- * Returns 0 on success, -EBUSY if the resource can't be inserted.
+ * Returns NULL on success, or first conflict resource.
*
- * This function is equivalent to request_resource when no conflict
+ * This function is equivalent to __request_resource when no conflict
* happens. If a conflict happens, and the conflicting resources
* entirely fit within the range of the new resource, then the new
* resource is inserted and the conflicting resources become children of
* the new resource.
*/
-int insert_resource(struct resource *parent, struct resource *new)
+static struct resource *__insert_resource(struct resource *parent, struct resource *new)
{
- int result;
+ struct resource *ret_res;
struct resource *first, *next;
- write_lock(&resource_lock);
-
for (;; parent = first) {
- result = 0;
+ ret_res = NULL;
first = __request_resource(parent, new);
if (!first)
goto out;
- result = -EBUSY;
+ ret_res = first;
if (first == parent)
goto out;
@@ -400,15 +398,17 @@ int insert_resource(struct resource *par
for (next = first; ; next = next->sibling) {
/* Partial overlap? Bad, and unfixable */
- if (next->start < new->start || next->end > new->end)
+ if (next->start < new->start || next->end > new->end) {
+ ret_res = next;
goto out;
+ }
if (!next->sibling)
break;
if (next->sibling->start > new->end)
break;
}
- result = 0;
+ ret_res = NULL;
new->parent = parent;
new->sibling = next->sibling;
@@ -428,8 +428,79 @@ int insert_resource(struct resource *par
}
out:
+ return ret_res;
+}
+
+/**
+ * insert_resource - Inserts a resource in the resource tree
+ * @parent: parent of the new resource
+ * @new: new resource to insert
+ *
+ * Returns 0 on success, -EBUSY if the resource can't be inserted.
+ */
+int insert_resource(struct resource *parent, struct resource *new)
+{
+ struct resource *res_conflict;
+
+ write_lock(&resource_lock);
+ res_conflict = __insert_resource(parent, new);
+ write_unlock(&resource_lock);
+
+ return res_conflict ? -EBUSY : 0;
+}
+
+static void __init __reserve_region_with_split(struct resource *root,
+ resource_size_t start, resource_size_t end,
+ char *name)
+{
+ struct resource *parent = root;
+ struct resource *conflict;
+ struct resource *res = kzalloc(sizeof(*res), GFP_KERNEL);
+
+ if (!res)
+ return;
+
+ res->name = name;
+ res->start = start;
+ res->end = end;
+ res->flags = IORESOURCE_BUSY;
+
+ for (;;) {
+ conflict = __request_resource(parent, res);
+ if (!conflict)
+ break;
+ if (conflict != parent) {
+ parent = conflict;
+ if (!(conflict->flags & IORESOURCE_BUSY))
+ continue;
+ }
+
+ /* Uhhuh, that didn't work out.. */
+ kfree(res);
+ res = NULL;
+ break;
+ }
+
+ if (!res) {
+ printk(KERN_DEBUG " __reserve_region_with_split: (%s) [%llx, %llx], res: (%s) [%llx, %llx]\n",
+ conflict->name, conflict->start, conflict->end,
+ name, start, end);
+ /* failed, split and try again */
+ if (conflict->start > start)
+ __reserve_region_with_split(root, start, conflict->start, name);
+ if (conflict->end < end)
+ __reserve_region_with_split(root, conflict->end+1, end, name);
+ }
+
+}
+
+void reserve_region_with_split(struct resource *root,
+ resource_size_t start, resource_size_t end,
+ char *name)
+{
+ write_lock(&resource_lock);
+ __reserve_region_with_split(root, start, end, name);
write_unlock(&resource_lock);
- return result;
}
/**
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] x86: unify using pci_mmcfg_insert_resource
2008-08-30 7:58 [PATCH] x86: unify using pci_mmcfg_insert_resource Yinghai Lu
` (2 preceding siblings ...)
2008-08-30 7:58 ` [PATCH] x86: split e820 reserved entries record to late v4 - fix v3 Yinghai Lu
@ 2008-09-10 18:49 ` Jesse Barnes
2008-09-11 8:20 ` Ingo Molnar
3 siblings, 1 reply; 6+ messages in thread
From: Jesse Barnes @ 2008-09-10 18:49 UTC (permalink / raw)
To: Yinghai Lu
Cc: Ingo Molnar, Thomas Gleixner, H. Peter Anvin, Andrew Morton,
Linus Torvalds, linux-kernel
Ingo, is this stuff in the same branch with the BAR debugging fix?
Thanks,
Jesse
On Saturday, August 30, 2008 12:58 am Yinghai Lu wrote:
> even with known_bridge insert them late too.
>
> Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
>
> Index: linux-2.6/arch/x86/pci/mmconfig-shared.c
> ===================================================================
> --- linux-2.6.orig/arch/x86/pci/mmconfig-shared.c
> +++ linux-2.6/arch/x86/pci/mmconfig-shared.c
> @@ -209,7 +209,7 @@ static int __init pci_mmcfg_check_hostbr
> return name != NULL;
> }
>
> -static void __init pci_mmcfg_insert_resources(unsigned long
> resource_flags) +static void __init pci_mmcfg_insert_resources(void)
> {
> #define PCI_MMCFG_RESOURCE_NAME_LEN 19
> int i;
> @@ -233,7 +233,7 @@ static void __init pci_mmcfg_insert_reso
> cfg->pci_segment);
> res->start = cfg->address;
> res->end = res->start + (num_buses << 20) - 1;
> - res->flags = IORESOURCE_MEM | resource_flags;
> + res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
> insert_resource(&iomem_resource, res);
> names += PCI_MMCFG_RESOURCE_NAME_LEN;
> }
> @@ -434,11 +434,9 @@ static void __init __pci_mmcfg_init(int
> (pci_mmcfg_config[0].address == 0))
> return;
>
> - if (pci_mmcfg_arch_init()) {
> - if (known_bridge)
> - pci_mmcfg_insert_resources(IORESOURCE_BUSY);
> + if (pci_mmcfg_arch_init())
> pci_probe = (pci_probe & ~PCI_PROBE_MASK) | PCI_PROBE_MMCONF;
> - } else {
> + else {
> /*
> * Signal not to attempt to insert mmcfg resources because
> * the architecture mmcfg setup could not initialize.
> @@ -475,7 +473,7 @@ static int __init pci_mmcfg_late_insert_
> * marked so it won't cause request errors when __request_region is
> * called.
> */
> - pci_mmcfg_insert_resources(0);
> + pci_mmcfg_insert_resources();
>
> return 0;
> }
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] x86: unify using pci_mmcfg_insert_resource
2008-09-10 18:49 ` [PATCH] x86: unify using pci_mmcfg_insert_resource Jesse Barnes
@ 2008-09-11 8:20 ` Ingo Molnar
0 siblings, 0 replies; 6+ messages in thread
From: Ingo Molnar @ 2008-09-11 8:20 UTC (permalink / raw)
To: Jesse Barnes
Cc: Yinghai Lu, Thomas Gleixner, H. Peter Anvin, Andrew Morton,
Linus Torvalds, linux-kernel
* Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> Ingo, is this stuff in the same branch with the BAR debugging fix?
it's in x86/core:
# x86/core: ebd60cd: x86: unify using pci_mmcfg_insert_resource
and has spread to other topics as well:
# irq/sparseirq: ebd60cd: x86: unify using pci_mmcfg_insert_resource
# timers/hpet-percpu: ebd60cd: x86: unify using pci_mmcfg_insert_resource
# x86/mm-debug: ebd60cd: x86: unify using pci_mmcfg_insert_resource
# x86/spinlocks: ebd60cd: x86: unify using pci_mmcfg_insert_resource
# x86/unify-cpu-detect: ebd60cd: x86: unify using pci_mmcfg_insert_resource
i.e. it's quite intervoven. You should be able to cherry pick it cleanly
into your tree without any other -tip changes if you track -tip as a
remote:
git cherry-pick ebd60cd
if it's not that simple then please let me know and i'll separate it out
into a separate, -git based topic.
Ingo
^ permalink raw reply [flat|nested] 6+ messages in thread