[PATCH 02/17] resource: Handle resource flags properly

From: Borislav Petkov <bp@alien8.de>
To: Ingo Molnar <mingo@kernel.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	Dan Williams <dan.j.williams@intel.com>,
	Ingo Molnar <mingo@redhat.com>,
	Jakub Sitnicki <jsitnicki@gmail.com>,
	Jiang Liu <jiang.liu@linux.intel.com>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	linux-arch@vger.kernel.org, linux-mm <linux-mm@kvack.org>,
	"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
	Vinod Koul <vinod.koul@intel.com>
Subject: [PATCH 02/17] resource: Handle resource flags properly
Date: Tue, 26 Jan 2016 21:57:18 +0100	[thread overview]
Message-ID: <1453841853-11383-3-git-send-email-bp@alien8.de> (raw)
Message-ID: <20160126205718.R1EiEeaXvmioHje08t-EP8o0DgvyypUgjYw8rFAJYVQ@z> (raw)
In-Reply-To: <1453841853-11383-1-git-send-email-bp@alien8.de>

From: Toshi Kani <toshi.kani@hpe.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@hpe.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jakub Sitnicki <jsitnicki@gmail.com>
Cc: Jiang Liu <jiang.liu@linux.intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-arch@vger.kernel.org
Cc: linux-mm <linux-mm@kvack.org>
Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Cc: Vinod Koul <vinod.koul@intel.com>
Link: http://lkml.kernel.org/r/1452020081-26534-2-git-send-email-toshi.kani@hpe.com
Signed-off-by: Borislav Petkov <bp@suse.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

