It will cover the whole region to BUSY, except that some regions that have
children under them.
those children normally is PCI bar but it is falling into E820_RESERVED.
We can not put BUSY on them, otherwise driver can not use pci_request_region()
later
/proc/iomem will have
00010000-00094fff : System RAM
00095000-0009ffff : reserved
000a0000-000bffff : PCI Bus 0000:00
000a0000-000bffff : reserved
000c0000-000cffff : reserved
000d0000-000dffff : PCI Bus 0000:00
000d0000-000dffff : reserved
000e0000-000fffff : reserved
v5: Add function pointer to put string comparing with caller
Tested-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
Tested-by: Andy Isaacson <adi@xxxxxxxxxxxxx>
Signed-off-by: Yinghai Lu <yinghai@xxxxxxxxxx>
---
arch/x86/kernel/e820.c | 18 +++++++++++++++---
include/linux/ioport.h | 3 +++
kernel/resource.c | 29 ++++++++++++++++++++++++-----
3 files changed, 42 insertions(+), 8 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
@@ -1094,7 +1094,7 @@ void __init e820_reserve_resources(void)
* pci device BAR resource and insert them later in
* pcibios_resource_survey()
*/
- if (e820.map[i].type != E820_RESERVED || res->start < (1ULL<<20)) {
+ if (e820.map[i].type != E820_RESERVED) {
res->flags |= IORESOURCE_BUSY;
insert_resource(&iomem_resource, res);
}
@@ -1128,6 +1128,14 @@ static unsigned long ram_alignment(resou
#define MAX_RESOURCE_SIZE ((resource_size_t)-1)
+static int __init check_func(struct resource *cf)
+{
+ if (strstr(cf->name, "PCI Bus"))
+ return 1;
+
+ return 0;
+}
+
void __init e820_reserve_resources_late(void)
{
int i;
@@ -1135,8 +1143,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_expand_to_fit(&iomem_resource, res);
+ if (!res->parent && res->end) {
+ if (res->start < (1ULL<<20))
+ reserve_region_with_split_check_child(&iomem_resource, res->start, res->end, res->name, check_func);
+ else
+ insert_resource_expand_to_fit(&iomem_resource, res);
+ }
res++;
}
Index: linux-2.6/include/linux/ioport.h
===================================================================
--- linux-2.6.orig/include/linux/ioport.h
+++ linux-2.6/include/linux/ioport.h
@@ -120,6 +120,9 @@ void release_child_resources(struct reso
extern void reserve_region_with_split(struct resource *root,
resource_size_t start, resource_size_t end,
const char *name);
+void reserve_region_with_split_check_child(struct resource *root,
+ resource_size_t start, resource_size_t end,
+ const char *name, int (*check_func)(struct resource *cf));
extern struct resource *insert_resource_conflict(struct resource *parent, struct resource *new);
extern int insert_resource(struct resource *parent, struct resource *new);
extern void insert_resource_expand_to_fit(struct resource *root, struct resource *new);
Index: linux-2.6/kernel/resource.c
===================================================================
--- linux-2.6.orig/kernel/resource.c
+++ linux-2.6/kernel/resource.c
@@ -607,9 +607,14 @@ int adjust_resource(struct resource *res
return result;
}
+static int __init check_func_nop(struct resource *cf)
+{
+ return 1;
+}
+
static void __init __reserve_region_with_split(struct resource *root,
resource_size_t start, resource_size_t end,
- const char *name)
+ const char *name, bool check_child, int (*check_func)(struct resource *cf))
{
struct resource *parent = root;
struct resource *conflict;
@@ -631,13 +636,18 @@ static void __init __reserve_region_with
kfree(res);
/* conflict covered whole area */
- if (conflict->start <= start && conflict->end >= end)
+ if (conflict->start <= start && conflict->end >= end) {
+ if (check_child && !conflict->child && check_func(conflict))
+ __reserve_region_with_split(conflict, start, end, name, false, check_func_nop);
return;
+ }
if (conflict->start > start)
- __reserve_region_with_split(root, start, conflict->start-1, name);
+ __reserve_region_with_split(root, start, conflict->start-1, name, check_child, check_func);
if (conflict->end < end)
- __reserve_region_with_split(root, conflict->end+1, end, name);
+ __reserve_region_with_split(root, conflict->end+1, end, name, check_child, check_func);
+ if (check_child && !conflict->child && check_func(conflict))
+ __reserve_region_with_split(conflict, conflict->start, conflict->end, name, false, check_func_nop);
}
void __init reserve_region_with_split(struct resource *root,
@@ -645,7 +655,16 @@ void __init reserve_region_with_split(st
const char *name)
{
write_lock(&resource_lock);
- __reserve_region_with_split(root, start, end, name);
+ __reserve_region_with_split(root, start, end, name, false, check_func_nop);
+ write_unlock(&resource_lock);
+}
+
+void __init reserve_region_with_split_check_child(struct resource *root,
+ resource_size_t start, resource_size_t end,
+ const char *name, int (*check_func)(struct resource *cf))
+{
+ write_lock(&resource_lock);
+ __reserve_region_with_split(root, start, end, name, true, check_func);
write_unlock(&resource_lock);
}
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
