xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
To: xen-devel@lists.xen.org
Cc: edgar.iglesias@xilinx.com, julien.grall@arm.com, sstabellini@kernel.org
Subject: [RFC for-4.8 v2 4/7] xen/device-tree: Make dt_match_node match props
Date: Fri,  3 Jun 2016 15:29:09 +0200	[thread overview]
Message-ID: <1464960552-6645-5-git-send-email-edgar.iglesias@gmail.com> (raw)
In-Reply-To: <1464960552-6645-1-git-send-email-edgar.iglesias@gmail.com>

From: "Edgar E. Iglesias" <edgar.iglesias@xilinx.com>

Make dt_match_node match for existing properties.
We only search for the existance of the properties, not
for specific values.

Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
---
 xen/common/device_tree.c      | 9 ++++++++-
 xen/include/xen/device_tree.h | 3 +++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c
index 06a2837..fbee354 100644
--- a/xen/common/device_tree.c
+++ b/xen/common/device_tree.c
@@ -323,8 +323,9 @@ dt_match_node(const struct dt_device_match *matches,
         return NULL;
 
     while ( matches->path || matches->type ||
-            matches->compatible || matches->not_available )
+            matches->compatible || matches->not_available || matches->props)
     {
+        const char **props = matches->props;
         bool_t match = 1;
 
         if ( matches->path )
@@ -339,6 +340,12 @@ dt_match_node(const struct dt_device_match *matches,
         if ( matches->not_available )
             match &= !dt_device_is_available(node);
 
+        while ( match && props && *props )
+        {
+            match &= dt_find_property(node, *props, NULL) != NULL;
+            props++;
+        }
+
         if ( match )
             return matches;
         matches++;
diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h
index b348913..f13d186 100644
--- a/xen/include/xen/device_tree.h
+++ b/xen/include/xen/device_tree.h
@@ -30,6 +30,7 @@ struct dt_device_match {
     const char *type;
     const char *compatible;
     const bool_t not_available;
+    const char **props;
     const void *data;
 };
 
@@ -37,11 +38,13 @@ struct dt_device_match {
 #define __DT_MATCH_TYPE(typ)            .type = typ
 #define __DT_MATCH_COMPATIBLE(compat)   .compatible = compat
 #define __DT_MATCH_NOT_AVAILABLE()      .not_available = 1
+#define __DT_MATCH_PROPS(p...)          .props = (const char *[]) { p, NULL }
 
 #define DT_MATCH_PATH(p)                { __DT_MATCH_PATH(p) }
 #define DT_MATCH_TYPE(typ)              { __DT_MATCH_TYPE(typ) }
 #define DT_MATCH_COMPATIBLE(compat)     { __DT_MATCH_COMPATIBLE(compat) }
 #define DT_MATCH_NOT_AVAILABLE()        { __DT_MATCH_NOT_AVAILABLE() }
+#define DT_MATCH_PROPS(p...)            { __DT_MATCH_PROPS(p) }
 
 typedef u32 dt_phandle;
 
-- 
2.5.0


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

  parent reply	other threads:[~2016-06-03 13:29 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-03 13:29 [RFC for-4.8 v2 0/7] xen/arm: Add support for mapping mmio-sram nodes into dom0 Edgar E. Iglesias
2016-06-03 13:29 ` [RFC for-4.8 v2 1/7] xen/arm: Add MATTR_MEM_NC for normal non-cacheable memory Edgar E. Iglesias
2016-06-06 17:23   ` Julien Grall
2016-06-07 20:34     ` Edgar E. Iglesias
2016-06-03 13:29 ` [RFC for-4.8 v2 2/7] xen/arm: Rename and generalize un/map_regions_rw_cache Edgar E. Iglesias
2016-06-06 17:55   ` Julien Grall
2016-06-07 20:55     ` Edgar E. Iglesias
2016-06-03 13:29 ` [RFC for-4.8 v2 3/7] xen/device-tree: Add __DT_MATCH macros without braces Edgar E. Iglesias
2016-06-06 17:36   ` Julien Grall
2016-06-03 13:29 ` Edgar E. Iglesias [this message]
2016-06-06 17:39   ` [RFC for-4.8 v2 4/7] xen/device-tree: Make dt_match_node match props Julien Grall
2016-06-07 20:43     ` Edgar E. Iglesias
2016-06-08  8:44       ` Julien Grall
2016-06-09 16:04         ` Edgar E. Iglesias
2016-06-09 16:23           ` Julien Grall
2016-06-09 16:30             ` Edgar E. Iglesias
2016-06-03 13:29 ` [RFC for-4.8 v2 5/7] xen/arm: domain_build: Plumb for different mapping attributes Edgar E. Iglesias
2016-06-06 18:00   ` Julien Grall
2016-06-03 13:29 ` [RFC for-4.8 v2 6/7] xen/device-tree: Add an mmio-sram bus Edgar E. Iglesias
2016-06-06 18:05   ` Julien Grall
2016-06-08  0:21     ` Edgar E. Iglesias
2016-06-08  8:52       ` Julien Grall
2016-06-03 13:29 ` [RFC for-4.8 v2 7/7] xen/arm: Map mmio-sram nodes as normal un-cached rwx memory Edgar E. Iglesias
2016-06-06 18:08   ` Julien Grall

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1464960552-6645-5-git-send-email-edgar.iglesias@gmail.com \
    --to=edgar.iglesias@gmail.com \
    --cc=edgar.iglesias@xilinx.com \
    --cc=julien.grall@arm.com \
    --cc=sstabellini@kernel.org \
    --cc=xen-devel@lists.xen.org \
    --subject='Re: [RFC for-4.8 v2 4/7] xen/device-tree: Make dt_match_node match props' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).