Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1298129

[PATCH v2 02/16] resource: make resource flags handled properly

Show all headers | View raw

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.

Link: http://lkml.kernel.org/r/<CA+55aFy4WQrWexC4u2LxX9Mw2NVoznw7p3Yh=iF4Xtf7zKWnRw@mail.gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Toshi Kani <toshi.kani@hpe.com>
---
 kernel/resource.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/kernel/resource.c b/kernel/resource.c
index f150dbb..d30a175 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);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 01/16] resource: Add System RAM resource type Toshi Kani <toshi.kani@hpe.com> - 2015-12-25 23:20 +0100
  [PATCH v2 02/16] resource: make resource flags handled properly Toshi Kani <toshi.kani@hpe.com> - 2015-12-25 23:20 +0100
  [PATCH v2 13/16] resource: Add walk_iomem_res_desc() Toshi Kani <toshi.kani@hpe.com> - 2015-12-25 23:20 +0100
  [PATCH v2 10/16] resource: Change walk_system_ram to use System RAM type Toshi Kani <toshi.kani@hpe.com> - 2015-12-25 23:20 +0100
  [PATCH v2 09/16] drivers: Initialize resource entry to zero Toshi Kani <toshi.kani@hpe.com> - 2015-12-25 23:20 +0100
    Re: [PATCH v2 09/16] drivers: Initialize resource entry to zero Simon Horman <horms@verge.net.au> - 2015-12-28 22:40 +0100
  [PATCH v2 11/16] arm/samsung: Change s3c_pm_run_res() to use System RAM type Toshi Kani <toshi.kani@hpe.com> - 2015-12-25 23:20 +0100
  [PATCH v2 07/16] kexec: Set IORESOURCE_SYSTEM_RAM to System RAM Toshi Kani <toshi.kani@hpe.com> - 2015-12-25 23:20 +0100
  [PATCH v2 03/16] resource: Add I/O resource descriptor Toshi Kani <toshi.kani@hpe.com> - 2015-12-25 23:20 +0100
  [PATCH v2 06/16] arch: Set IORESOURCE_SYSTEM_RAM to System RAM Toshi Kani <toshi.kani@hpe.com> - 2015-12-25 23:20 +0100
  [PATCH v2 08/16] xen, mm: Set IORESOURCE_SYSTEM_RAM to System RAM Toshi Kani <toshi.kani@hpe.com> - 2015-12-25 23:20 +0100
  [PATCH v2 14/16] x86,nvdimm,kexec: Use walk_iomem_res_desc() for iomem search Toshi Kani <toshi.kani@hpe.com> - 2015-12-25 23:20 +0100
    Re: [PATCH v2 14/16] x86,nvdimm,kexec: Use walk_iomem_res_desc() for  iomem search Borislav Petkov <bp@alien8.de> - 2015-12-26 11:40 +0100
      Re: [PATCH v2 14/16] x86,nvdimm,kexec: Use walk_iomem_res_desc() for  iomem search Toshi Kani <toshi.kani@hpe.com> - 2015-12-27 01:40 +0100
        Re: [PATCH v2 14/16] x86, nvdimm, kexec: Use walk_iomem_res_desc()  for iomem search Minfei Huang <mhuang@redhat.com> - 2015-12-27 03:20 +0100
          Re: [PATCH v2 14/16] x86, nvdimm, kexec: Use walk_iomem_res_desc()  for iomem search Borislav Petkov <bp@alien8.de> - 2015-12-27 11:30 +0100
    Re: [PATCH v2 14/16] x86,nvdimm,kexec: Use walk_iomem_res_desc() for  iomem search Minfei Huang <mhuang@redhat.com> - 2015-12-26 17:10 +0100
      Re: [PATCH v2 14/16] x86,nvdimm,kexec: Use walk_iomem_res_desc() for  iomem search Toshi Kani <toshi.kani@hpe.com> - 2015-12-27 01:40 +0100
  [PATCH v2 16/16] ACPI/EINJ: Allow memory error injection to NVDIMM Toshi Kani <toshi.kani@hpe.com> - 2015-12-25 23:20 +0100
  [PATCH v2 12/16] memremap: Change region_intersects() to take @flags and @desc Toshi Kani <toshi.kani@hpe.com> - 2015-12-25 23:20 +0100

csiph-web