From patchwork Fri Sep 28 06:48:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 147772 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp371159lji; Thu, 27 Sep 2018 23:48:25 -0700 (PDT) X-Google-Smtp-Source: ACcGV63qmb2C/0a/lev7ehfCQdxBkEwAApdmYIMoDc4wnK6oXpCFX9t7LxXYMr7EfvxIMP8XJNz4 X-Received: by 2002:a63:f64f:: with SMTP id u15-v6mr4384928pgj.258.1538117305481; Thu, 27 Sep 2018 23:48:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538117305; cv=none; d=google.com; s=arc-20160816; b=dFihdQYjeriL9UiGtyNzK5zRCXfRn15HaNm/sXRowUYPe94dWgOopviVLDaLb5b0jE nK0s0WlncIEMBFoTOmmbP+NvkR3L+YcNP5yQiNdhiN+FFoLFfRuA86fV+yFRwWnUdId6 K3WD2EzEFGVn27Q5rqr64WdSYHr174HuLv65MebPzk1fwkDHK194XFDuQSll5ts23a3U ag7auOtkvoMiIyT4bx12FyC6chxi2YZIw5qalvRxb1sQzk2mnE9J795k8349AFZ6BSX9 o3/ldFwiWYQz3azMck3a+hJDbWhC/lE4uCUGoixIY1X3meMUnuTWixgAaFUYdBZ/LuXZ G+UA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Pt0GdTUj/ouoBc0plwl0qxBtF8IeFfWdoXUu09cJo+Q=; b=K15x49k154ESC33CieohWQcubKNQdQQN2tKLy7GMQ+t56r5bPL1w0V86FgPUJVm7fc vnAAwz16up4gYlDW5TcPVP1AKCo6uEqKftpWRj05jmlAKCEbhz0A6kDp3i5g2+vhaRdO ipyng+6QDt8f0vRMhpfWcQUKqMzZuia3zO64n4wZqNhug/iY72q7+gAXyJOCuxLIikLT I+xcictJkaaviVrHd1EEzqDEuFJlFetBTFjO6dlOJ329TyPpI5q/wkFn1LZHTVJ8eKtr IEoUAi0E9+SjIsjKMikvDod7tk8afp90ZPtj28sMieqBEHsK9yrKQ86UrsKW2KozVQ+t kQ+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=a1qa43cU; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c185-v6si4322892pfg.158.2018.09.27.23.48.25; Thu, 27 Sep 2018 23:48:25 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=a1qa43cU; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729066AbeI1NKh (ORCPT + 6 others); Fri, 28 Sep 2018 09:10:37 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:34872 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729065AbeI1NKh (ORCPT ); Fri, 28 Sep 2018 09:10:37 -0400 Received: by mail-pf1-f194.google.com with SMTP id p12-v6so3645823pfh.2 for ; Thu, 27 Sep 2018 23:48:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Pt0GdTUj/ouoBc0plwl0qxBtF8IeFfWdoXUu09cJo+Q=; b=a1qa43cUD3aEMCBBW+bPEPzCN0FPKwq7mNCLZT1Q8/I1oH07mIv3ms6vWZ0nRdjueB RWCSvRKjgb6jdgEZYiv0PSwrzd6TycaifX8EGVal+obfRXgDcaEMCtDQq3NzhlXgp3jV +q/uY98I7cnuQEWg2SjjZxoM4ZG3JndQxgZNo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Pt0GdTUj/ouoBc0plwl0qxBtF8IeFfWdoXUu09cJo+Q=; b=IvEA0kUCCVCP5kiEQilXTKRIJqTCi1sBzZxPy/qyflleBQo9FYH58KfGClgXy1O/Q1 qorDRGqp7c7kItaiArn5+wDGs5l2uuDgRtbCvw1kZJS0nPNgf0OC8d5q3ixF+Onrx/eQ T50WCj5V+gOc0eF09jgr9DAUf8/kyLm1SXuIgqFiLePAc9SePjYIKsXjALb318WEzsFL o7o8xJShlIA3E5i6WiAT91et8yXA84hHg9VvlpMBGHgM9NFmwfX9jA5HLCyyP6+m5n0x 99uihMT3/+Jlz/5ckK20uIyBQRgW4MJeVj6tev1D8ptPntk6Ba1ZhrNMCpQl6pPW23oP cCkw== X-Gm-Message-State: ABuFfohW6Mm5Rjt66Ji70j4vqKwclcgc93SiBRLcFuJ9qpCfWdcYHtxR MKS+k4lx6YA/UX6xkk+DefJ+uw== X-Received: by 2002:a17:902:a40e:: with SMTP id p14-v6mr1085759plq.338.1538117302650; Thu, 27 Sep 2018 23:48:22 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id 89-v6sm9522313pfk.134.2018.09.27.23.48.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Sep 2018 23:48:21 -0700 (PDT) From: AKASHI Takahiro To: catalin.marinas@arm.com, will.deacon@arm.com, dhowells@redhat.com, vgoyal@redhat.com, herbert@gondor.apana.org.au, davem@davemloft.net, dyoung@redhat.com, bhe@redhat.com, arnd@arndb.de, schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com Cc: prudo@linux.ibm.com, ard.biesheuvel@linaro.org, james.morse@arm.com, bhsharma@redhat.com, kexec@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, AKASHI Takahiro , Rob Herring , Frank Rowand , devicetree@vger.kernel.org Subject: [PATCH v15 06/16] of/fdt: add helper functions for handling properties Date: Fri, 28 Sep 2018 15:48:31 +0900 Message-Id: <20180928064841.14117-7-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20180928064841.14117-1-takahiro.akashi@linaro.org> References: <20180928064841.14117-1-takahiro.akashi@linaro.org> MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org These functions will be used later to handle kexec-specific properties in arm64's kexec_file implementation. Signed-off-by: AKASHI Takahiro Cc: Rob Herring Cc: Frank Rowand Cc: devicetree@vger.kernel.org --- drivers/of/fdt.c | 56 ++++++++++++++++++++++++++++++++++++++++++ include/linux/of_fdt.h | 4 +++ 2 files changed, 60 insertions(+) -- 2.19.0 diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 800ad252cf9c..c65c31562ccb 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -25,6 +25,7 @@ #include #include #include +#include #include /* for COMMAND_LINE_SIZE */ #include @@ -1323,3 +1324,58 @@ late_initcall(of_fdt_raw_init); #endif #endif /* CONFIG_OF_EARLY_FLATTREE */ + +#define FDT_ALIGN(x, a) (((x) + (a) - 1) & ~((a) - 1)) +#define FDT_TAGALIGN(x) (FDT_ALIGN((x), FDT_TAGSIZE)) + +int fdt_prop_len(const char *prop_name, int len) +{ + return (strlen(prop_name) + 1) + + sizeof(struct fdt_property) + + FDT_TAGALIGN(len); +} + +static void fill_property(void *buf, u64 val64, int cells) +{ + __be32 val32; + + while (cells) { + val32 = cpu_to_fdt32((val64 >> (32 * (--cells))) & U32_MAX); + memcpy(buf, &val32, sizeof(val32)); + buf += sizeof(val32); + } +} + +int fdt_setprop_reg(void *fdt, int nodeoffset, const char *name, + u64 addr, u64 size) +{ + int addr_cells, size_cells; + char buf[sizeof(__be32) * 2 * 2]; + /* assume dt_root_[addr|size]_cells <= 2 */ + void *prop; + size_t buf_size; + + addr_cells = fdt_address_cells(fdt, 0); + if (addr_cells < 0) + return addr_cells; + size_cells = fdt_size_cells(fdt, 0); + if (size_cells < 0) + return size_cells; + + /* if *_cells >= 2, cells can hold 64-bit values anyway */ + if ((addr_cells == 1) && (addr > U32_MAX)) + return -FDT_ERR_BADVALUE; + + if ((size_cells == 1) && (size > U32_MAX)) + return -FDT_ERR_BADVALUE; + + buf_size = (addr_cells + size_cells) * sizeof(u32); + prop = buf; + + fill_property(prop, addr, addr_cells); + prop += addr_cells * sizeof(u32); + + fill_property(prop, size, size_cells); + + return fdt_setprop(fdt, nodeoffset, name, buf, buf_size); +} diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h index b9cd9ebdf9b9..842af6ea92ea 100644 --- a/include/linux/of_fdt.h +++ b/include/linux/of_fdt.h @@ -108,5 +108,9 @@ static inline void unflatten_device_tree(void) {} static inline void unflatten_and_copy_device_tree(void) {} #endif /* CONFIG_OF_EARLY_FLATTREE */ +int fdt_prop_len(const char *prop_name, int len); +int fdt_setprop_reg(void *fdt, int nodeoffset, const char *name, + u64 addr, u64 size); + #endif /* __ASSEMBLY__ */ #endif /* _LINUX_OF_FDT_H */