From patchwork Wed Sep 7 06:56:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 9318297 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 813496077F for ; Wed, 7 Sep 2016 06:58:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 758282909C for ; Wed, 7 Sep 2016 06:58:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6A3352909E; Wed, 7 Sep 2016 06:58:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.7 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=no version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1C8932909C for ; Wed, 7 Sep 2016 06:58:29 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bhWml-00009B-1z; Wed, 07 Sep 2016 06:56:39 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bhWmj-00008U-GF for xen-devel@lists.xen.org; Wed, 07 Sep 2016 06:56:37 +0000 Received: from [193.109.254.147] by server-7.bemta-6.messagelabs.com id D6/01-15404-42ABFC75; Wed, 07 Sep 2016 06:56:36 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrDIsWRWlGSWpSXmKPExsVyMfSOk67KrvP hBu97xC2WfFzM4sDocXT3b6YAxijWzLyk/IoE1oz/r44wFUwSqnh/wbKBsY+vi5GLQ0ign1Hi 9PlNLCAOi8BLFomv7xcxgjgSAv2sElOmLmLqYuQEcmIkvm94wg5hV0ls3nuUGcQWElCXOP1uB xvEqPuMErNXnGQDSbAJmEjs/fMArFlEQFri2ufLjCA2s4CvxM2dx8HiwgLuEnc+zACzWQRUJX a2nGcFsXmB4h9XX2aFWCYncfLYZDCbU8BDYub2l+wQi90l9nyayjyBUWABI8MqRo3i1KKy1CJ dQ3O9pKLM9IyS3MTMHF1DAzO93NTi4sT01JzEpGK95PzcTYzA0GIAgh2MtzcGHGKU5GBSEuXd Oul8uBBfUn5KZUZicUZ8UWlOavEhRhkODiUJ3u07gHKCRanpqRVpmTnAIIdJS3DwKInwzgZJ8 xYXJOYWZ6ZDpE4xWnJs+X1tLRPHss13gOS2qffWMgmx5OXnpUqJ854BaRAAacgozYMbB4vES4 yyUsK8jEAHCvEUpBblZpagyr9iFOdgVBLmfQ4yhSczrwRu6yugg5iADlq3+zTIQSWJCCmpBsZ psUZzO4zrtB4czXm6ZOGqHNcf1b+bS3/ycUR9jZNt+Lgh/4Tx0YB968+mFBv13Dp0V9HjzOqb 9Td3M1V2T3v545EBo3tLvm8Ll7jTA5tC7YUMa6SCW2ZFL7/Z529RxqIamva5/w/jybp3c3iCv 3rnnGAMXrJtrwfjxCrRp38OLXMImFDLv1GJpTgj0VCLuag4EQB4Wa3evwIAAA== X-Env-Sender: edgar.iglesias@gmail.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1473231395!5058193!1 X-Originating-IP: [209.85.220.66] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.84; banners=-,-,- X-VirusChecked: Checked Received: (qmail 49839 invoked from network); 7 Sep 2016 06:56:36 -0000 Received: from mail-pa0-f66.google.com (HELO mail-pa0-f66.google.com) (209.85.220.66) by server-15.tower-27.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 7 Sep 2016 06:56:36 -0000 Received: by mail-pa0-f66.google.com with SMTP id pp5so432647pac.2 for ; Tue, 06 Sep 2016 23:56:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RXdAK7WbQaGcy0AdrJmRDyPVy/OGC0wpGXRFaJCU+DQ=; b=wiQ78sna7JxaoZgZMh/6ToUm+sDSTz+23JZuRbslzGhHAYOimMWzwc3N/nwehhdmoa k98ZXNYPZWMDXsDk5HyW224/6cD4e2EfladSsh7Au47cLdNuVjAv2ZwDAShVMVsWUXf8 OvtZumLKoXtBefTfFzENE/NMBKjmEq76s7/BqPeX32k1lItIMEaRqLaF7Uo+MGTO5ZiC Be8A5Ao2k+DoYMHbxYVr9dB5cv4ZLG9wGNfEDTwznoTla9EFsrefJ69C7Hdfw+UmjofI 1itkll4MUJLU9JxCEDYVjcPF8hje/M/l9SdnpAbNJrMqr2k6WFN+QKWVyhkNpFtEssmk /6HA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=RXdAK7WbQaGcy0AdrJmRDyPVy/OGC0wpGXRFaJCU+DQ=; b=i4HgWDFQODLazZm54rWXjhiN6gLoMxzfWIsWgw+7AeAknRRp4cXbcf+hqNGIh1TRXs cpbVLGWIRr5z+UObhae420F5urb3ZRMi3PtV9ED5ex8swmGpnmRszpdwClUf9dQHxGjq qV+O82FGZdoeJpn/qWbFNGJiUNck6K4M1szpjbTFpKx0Kj8kT5EXt6/260vYObDFTuL/ Q3lDScPmT2ClaWyg10Va4+uJvyh83gN7JE2K4UWZfBESmGDAre4tW4aG05A/YiG3pXfG 31MGLa2CxZA8Fb7dspQiKKBcimPdGAajJhKiUwWKkXyTutmsYrM1o59yH2As5vt3HgwR 776Q== X-Gm-Message-State: AE9vXwPqUTfa6qRbTdNwwpkY7Q2mExtlzdyXwlTezUjcpgZWWGbyTK8BLiWQD+9Kklnmug== X-Received: by 10.66.249.74 with SMTP id ys10mr22862513pac.29.1473231394706; Tue, 06 Sep 2016 23:56:34 -0700 (PDT) Received: from localhost ([40.140.7.61]) by smtp.gmail.com with ESMTPSA id i7sm45917324paf.9.2016.09.06.23.56.33 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Tue, 06 Sep 2016 23:56:34 -0700 (PDT) From: "Edgar E. Iglesias" To: xen-devel@lists.xen.org Date: Wed, 7 Sep 2016 08:56:15 +0200 Message-Id: <1473231377-7800-5-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1473231377-7800-1-git-send-email-edgar.iglesias@gmail.com> References: <1473231377-7800-1-git-send-email-edgar.iglesias@gmail.com> Cc: edgar.iglesias@xilinx.com, julien.grall@arm.com, sstabellini@kernel.org Subject: [Xen-devel] [PATCH v3 4/6] xen/device-tree: Make dt_match_node match props X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: "Edgar E. Iglesias" Make dt_match_node match for existing properties. We only search for the existence of the properties, not for specific values. Signed-off-by: Edgar E. Iglesias Acked-by: Julien Grall --- xen/common/device_tree.c | 5 ++++- xen/include/xen/device_tree.h | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index b39c8ca..1be074b 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -319,7 +319,7 @@ 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->prop) { bool_t match = 1; @@ -335,6 +335,9 @@ dt_match_node(const struct dt_device_match *matches, if ( matches->not_available ) match &= !dt_device_is_available(node); + if ( matches->prop ) + match &= dt_find_property(node, matches->prop, NULL) != NULL; + if ( match ) return matches; matches++; diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index da153a5..c71ddb9 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -29,6 +29,11 @@ struct dt_device_match { const char *type; const char *compatible; const bool_t not_available; + /* + * Property name to search for. We only search for the properties + * existence. + */ + const char *prop; const void *data; }; @@ -36,11 +41,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_PROP(p) .prop = p #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_PROP(p) { __DT_MATCH_PROP(p) } typedef u32 dt_phandle;