[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1453841853-11383-3-git-send-email-bp@alien8.de>
Date: Tue, 26 Jan 2016 21:57:18 +0100
From: Borislav Petkov <bp@...en8.de>
To: Ingo Molnar <mingo@...nel.org>
Cc: LKML <linux-kernel@...r.kernel.org>,
Andrew Morton <akpm@...ux-foundation.org>,
Dan Williams <dan.j.williams@...el.com>,
Ingo Molnar <mingo@...hat.com>,
Jakub Sitnicki <jsitnicki@...il.com>,
Jiang Liu <jiang.liu@...ux.intel.com>,
Linus Torvalds <torvalds@...ux-foundation.org>,
linux-arch@...r.kernel.org, linux-mm <linux-mm@...ck.org>,
"Rafael J. Wysocki" <rafael.j.wysocki@...el.com>,
Vinod Koul <vinod.koul@...el.com>
Subject: [PATCH 02/17] resource: Handle resource flags properly
From: Toshi Kani <toshi.kani@....com>
I/O resource flags consist of I/O resource types and modifier bits.
Therefore, checking an I/O resource type in 'flags' must be performed
with a bitwise operation.
Fix find_next_iomem_res() and region_intersects() that simply compare
'flags' against a given value.
Also change __request_region() to set 'res->flags' from resource_type()
and resource_ext_type() of the parent, so that children nodes will
inherit the extended I/O resource type.
Signed-off-by: Toshi Kani <toshi.kani@....com>
Cc: Andrew Morton <akpm@...ux-foundation.org>
Cc: Dan Williams <dan.j.williams@...el.com>
Cc: Ingo Molnar <mingo@...hat.com>
Cc: Jakub Sitnicki <jsitnicki@...il.com>
Cc: Jiang Liu <jiang.liu@...ux.intel.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: linux-arch@...r.kernel.org
Cc: linux-mm <linux-mm@...ck.org>
Cc: "Rafael J. Wysocki" <rafael.j.wysocki@...el.com>
Cc: Vinod Koul <vinod.koul@...el.com>
Link: http://lkml.kernel.org/r/1452020081-26534-2-git-send-email-toshi.kani@hpe.com
Signed-off-by: Borislav Petkov <bp@...e.de>
---
kernel/resource.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/kernel/resource.c b/kernel/resource.c
index 09c0597840b0..96afc8027487 100644
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -358,7 +358,7 @@ static int find_next_iomem_res(struct resource *res, char *name,
read_lock(&resource_lock);
for (p = iomem_resource.child; p; p = next_resource(p, sibling_only)) {
- if (p->flags != res->flags)
+ if ((p->flags & res->flags) != res->flags)
continue;
if (name && strcmp(p->name, name))
continue;
@@ -519,7 +519,8 @@ int region_intersects(resource_size_t start, size_t size, const char *name)
read_lock(&resource_lock);
for (p = iomem_resource.child; p ; p = p->sibling) {
- bool is_type = strcmp(p->name, name) == 0 && p->flags == flags;
+ bool is_type = strcmp(p->name, name) == 0 &&
+ ((p->flags & flags) == flags);
if (start >= p->start && start <= p->end)
is_type ? type++ : other++;
@@ -1071,7 +1072,7 @@ struct resource * __request_region(struct resource *parent,
res->name = name;
res->start = start;
res->end = start + n - 1;
- res->flags = resource_type(parent);
+ res->flags = resource_type(parent) | resource_ext_type(parent);
res->flags |= IORESOURCE_BUSY | flags;
write_lock(&resource_lock);
--
2.3.5
Powered by blists - more mailing lists