From patchwork Tue Sep 10 14:49:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 19924 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f199.google.com (mail-vc0-f199.google.com [209.85.220.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 84B55246A4 for ; Tue, 10 Sep 2013 14:49:56 +0000 (UTC) Received: by mail-vc0-f199.google.com with SMTP id gf11sf8885275vcb.10 for ; Tue, 10 Sep 2013 07:49:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=mime-version:x-gm-message-state:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=ZFEM5z18poo1HbsdkYUGPkY1bSkoA0QxiViiFZJS1Vg=; b=OejpKu5DfWZFg18FMfZ1OOoLvDqd0cXn3Y3PM/yjdcsZvsIM7BtcAteoUpf1vjT4wd 0R1IE7SgJzzzX20B//Gh8sf6uWWqUoVRDlmvsYloU+HKy30qKXBffPKwftNbgei9wylZ Af/i4jfiZvoXbCireL/waOHipS1phRFWl94f3DWQisr5MLm7YzMutjZdQhPUmwXQ12Da jzzxu3zo4V4miq0LsIXonULht6FQ0hoOXtQLX5u3M835TXMkz5g/Affn1qlAYcEIhRFy +WYpGomiLKzhSldUKAMs6U7lioJaBNvVwOBhtjWCXeazgMGiJyHmU3nq9JFNrx39/h5/ nelg== X-Received: by 10.236.26.202 with SMTP id c50mr8439091yha.14.1378824596365; Tue, 10 Sep 2013 07:49:56 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.1.102 with SMTP id 6ls1732244qel.40.gmail; Tue, 10 Sep 2013 07:49:56 -0700 (PDT) X-Received: by 10.220.140.69 with SMTP id h5mr23365849vcu.0.1378824596121; Tue, 10 Sep 2013 07:49:56 -0700 (PDT) Received: from mail-ve0-f181.google.com (mail-ve0-f181.google.com [209.85.128.181]) by mx.google.com with ESMTPS id dt10si406470vdb.99.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 10 Sep 2013 07:49:56 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.181; Received: by mail-ve0-f181.google.com with SMTP id oy12so4528906veb.26 for ; Tue, 10 Sep 2013 07:49:56 -0700 (PDT) X-Gm-Message-State: ALoCoQljPLiG/x/FUdtW1FXHnN88yfA3EXh6tUqEO7qjkmOfdZb+qcipI0+3QNn0scZ2ybvV/UVH X-Received: by 10.221.27.73 with SMTP id rp9mr920112vcb.29.1378824595966; Tue, 10 Sep 2013 07:49:55 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp4676vcz; Tue, 10 Sep 2013 07:49:55 -0700 (PDT) X-Received: by 10.15.93.205 with SMTP id w53mr3729477eez.60.1378824594918; Tue, 10 Sep 2013 07:49:54 -0700 (PDT) Received: from mail-ee0-f44.google.com (mail-ee0-f44.google.com [74.125.83.44]) by mx.google.com with ESMTPS id x42si15323260eel.116.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 10 Sep 2013 07:49:54 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.83.44 is neither permitted nor denied by best guess record for domain of julien.grall@linaro.org) client-ip=74.125.83.44; Received: by mail-ee0-f44.google.com with SMTP id b47so3965981eek.3 for ; Tue, 10 Sep 2013 07:49:54 -0700 (PDT) X-Received: by 10.15.36.9 with SMTP id h9mr40012583eev.30.1378824594353; Tue, 10 Sep 2013 07:49:54 -0700 (PDT) Received: from belegaer.uk.xensource.com. ([185.25.64.249]) by mx.google.com with ESMTPSA id i1sm31911644eeg.0.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 10 Sep 2013 07:49:53 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Cc: stefano.stabellini@eu.citrix.com, ian.campbell@citrix.com, patches@linaro.org, andre.przywara@linaro.org, Julien Grall Subject: [PATCH v3 23/27] xen/dts: Clean up the exported API for device tree Date: Tue, 10 Sep 2013 15:49:11 +0100 Message-Id: <1378824555-16564-24-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1378824555-16564-1-git-send-email-julien.grall@linaro.org> References: <1378824555-16564-1-git-send-email-julien.grall@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: julien.grall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , All Xen code has been converted to the new device tree API that uses a tree structure to describe the DTS. The Flat Device tree is still used by Xen during early boot stage, but only in internal. Remove entirely unneeded functions or move to a static function. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- Changes in v2: - Don't remove device_tree_get_reg and don't export it --- xen/common/device_tree.c | 92 +++++++---------------------------------- xen/include/xen/device_tree.h | 15 ------- 2 files changed, 14 insertions(+), 93 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 215592e..8e6d8c1 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -103,8 +103,8 @@ struct dt_bus unsigned int (*get_flags)(const __be32 *addr); }; -bool_t __init device_tree_node_matches(const void *fdt, int node, - const char *match) +static bool_t __init device_tree_node_matches(const void *fdt, int node, + const char *match) { const char *name; size_t match_len; @@ -118,7 +118,7 @@ bool_t __init device_tree_node_matches(const void *fdt, int node, && (name[match_len] == '@' || name[match_len] == '\0'); } -bool_t __init device_tree_type_matches(const void *fdt, int node, +static bool_t __init device_tree_type_matches(const void *fdt, int node, const char *match) { const void *prop; @@ -130,8 +130,8 @@ bool_t __init device_tree_type_matches(const void *fdt, int node, return !dt_node_cmp(prop, match); } -bool_t __init device_tree_node_compatible(const void *fdt, int node, - const char *match) +static bool_t __init device_tree_node_compatible(const void *fdt, int node, + const char *match) { int len, l; int mlen; @@ -154,13 +154,6 @@ bool_t __init device_tree_node_compatible(const void *fdt, int node, return 0; } -static __init int device_tree_nr_reg_ranges(const struct fdt_property *prop, - u32 address_cells, u32 size_cells) -{ - u32 reg_cells = address_cells + size_cells; - return fdt32_to_cpu(prop->len) / (reg_cells * sizeof(u32)); -} - static void __init get_val(const u32 **cell, u32 cells, u64 *val) { *val = 0; @@ -175,8 +168,8 @@ static void __init get_val(const u32 **cell, u32 cells, u64 *val) } } -void __init device_tree_get_reg(const u32 **cell, u32 address_cells, - u32 size_cells, u64 *start, u64 *size) +static void __init device_tree_get_reg(const u32 **cell, u32 address_cells, + u32 size_cells, u64 *start, u64 *size) { get_val(cell, address_cells, start); get_val(cell, size_cells, size); @@ -202,13 +195,6 @@ void dt_set_cell(__be32 **cellp, int size, u64 val) (*cellp) += cells; } -void __init device_tree_set_reg(u32 **cell, u32 address_cells, u32 size_cells, - u64 start, u64 size) -{ - dt_set_cell(cell, address_cells, start); - dt_set_cell(cell, size_cells, size); -} - void dt_set_range(__be32 **cellp, const struct dt_device_node *np, u64 address, u64 size) { @@ -216,8 +202,8 @@ void dt_set_range(__be32 **cellp, const struct dt_device_node *np, dt_set_cell(cellp, dt_n_size_cells(np), size); } -u32 __init device_tree_get_u32(const void *fdt, int node, const char *prop_name, - u32 dflt) +static u32 __init device_tree_get_u32(const void *fdt, int node, + const char *prop_name, u32 dflt) { const struct fdt_property *prop; @@ -239,8 +225,9 @@ u32 __init device_tree_get_u32(const void *fdt, int node, const char *prop_name, * Returns 0 if all nodes were iterated over successfully. If @func * returns a value different from 0, that value is returned immediately. */ -int __init device_tree_for_each_node(const void *fdt, - device_tree_node_func func, void *data) +static int __init device_tree_for_each_node(const void *fdt, + device_tree_node_func func, + void *data) { int node; int depth; @@ -275,58 +262,6 @@ int __init device_tree_for_each_node(const void *fdt, return 0; } -struct find_compat { - const char *compatible; - int found; - int node; - int depth; - u32 address_cells; - u32 size_cells; -}; - -static int _find_compatible_node(const void *fdt, - int node, const char *name, int depth, - u32 address_cells, u32 size_cells, - void *data) -{ - struct find_compat *c = (struct find_compat *) data; - - if ( c->found ) - return 1; - - if ( device_tree_node_compatible(fdt, node, c->compatible) ) - { - c->found = 1; - c->node = node; - c->depth = depth; - c->address_cells = address_cells; - c->size_cells = size_cells; - return 1; - } - return 0; -} - -int __init find_compatible_node(const char *compatible, int *node, int *depth, - u32 *address_cells, u32 *size_cells) -{ - int ret; - struct find_compat c; - c.compatible = compatible; - c.found = 0; - - ret = device_tree_for_each_node(device_tree_flattened, _find_compatible_node, &c); - if ( !c.found ) - return ret; - else - { - *node = c.node; - *depth = c.depth; - *address_cells = c.address_cells; - *size_cells = c.size_cells; - return 1; - } -} - /** * device_tree_bootargs - return the bootargs (the Xen command line) * @fdt flat device tree. @@ -394,6 +329,7 @@ static void __init process_memory_node(const void *fdt, int node, int banks; const u32 *cell; paddr_t start, size; + u32 reg_cells = address_cells + size_cells; if ( address_cells < 1 || size_cells < 1 ) { @@ -410,7 +346,7 @@ static void __init process_memory_node(const void *fdt, int node, } cell = (const u32 *)prop->data; - banks = device_tree_nr_reg_ranges(prop, address_cells, size_cells); + banks = fdt32_to_cpu(prop->len) / (reg_cells * sizeof (u32)); for ( i = 0; i < banks && early_info.mem.nr_banks < NR_MEM_BANKS; i++ ) { diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index fae9f97..7810f53 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -181,21 +181,6 @@ extern const void *device_tree_flattened; size_t __init device_tree_early_init(const void *fdt); -void __init device_tree_get_reg(const u32 **cell, u32 address_cells, - u32 size_cells, - u64 *start, u64 *size); -void __init device_tree_set_reg(u32 **cell, u32 address_cells, u32 size_cells, - u64 start, u64 size); -u32 __init device_tree_get_u32(const void *fdt, int node, - const char *prop_name, u32 dflt); -bool_t __init device_tree_node_matches(const void *fdt, int node, - const char *match); -bool_t __init device_tree_node_compatible(const void *fdt, int node, - const char *match); -int __init find_compatible_node(const char *compatible, int *node, int *depth, - u32 *address_cells, u32 *size_cells); -int __init device_tree_for_each_node(const void *fdt, - device_tree_node_func func, void *data); const char __init *device_tree_bootargs(const void *fdt); void __init device_tree_dump(const void *fdt);