Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp1518903imm; Fri, 7 Sep 2018 01:26:50 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZ+W0tCHf/qVoR6EtEcEGv5QZZOCPJAMz929x0PcDYUonSKxYq3W+fGE7BWv+WP5NQErkaA X-Received: by 2002:a63:fd06:: with SMTP id d6-v6mr6872743pgh.348.1536308810261; Fri, 07 Sep 2018 01:26:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536308810; cv=none; d=google.com; s=arc-20160816; b=M9IjH3M+HqaFQDLiadd/Gb7Re16rHASy/KfwUA5jarc2hkli2qJWR7Y3tulTAHw1VH 5tlIbbv3NLrtkNUaTb7duOvSOo3QHXs4PckUnMP4TPEeCAxdX6Ic6aIkHKcUvTaSr/qE algy4mPaZeYwJZFFwOlTBG08L2YlnqHbOCuNueAncYz8a4xkSAlp4go5Ff3ZF8GtAzR9 UiWAF2uHZ7Wj6Upkb0f0cYssuVBlCZNDYK+XFUR2ptMMl9cecafcOcEQiQP4LuRd+N/b jFxy3f5Kg8X2SjLcIwuT+NJJVXH1wJ7A83s80MdzxrkZJ919G+XgbL/exrwzaDTlRDPE FOUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature; bh=qys+w+KuRNMCFxzjw+1VloWOF/kuhazsT8XZwPi30r4=; b=YWH8ZFVKjsPs8RWC6ZeHnNPY99WO3243E297Gtrz5ZUV0pSzsElq4Fynhm2E5IoLX2 5a2M6Xj54ONzz9ms10nSJXnQN+7lIwR7phhiS5bEenOuaizPEV0fkcUVflSfy3lAO/GN ds4TNkaXx/NuFwqgpKmJETef5tP+4kjOw2Q1jG/JFOuO9TnhvGRbt1CnAnHeLHJ+xKPt LrTd3biLHuzvyVZ9PX9ES5R9QqXItomtBc57G8ehc2IDVBMX9ql4nMN2DDM3tabU3fCn goKe2NTD+28D/bmXtuEwRQ+lMy5ArHsNDwooXqP45FNakxRJZGh5MUctHFe0NVAZ/M5e XaOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="c4/XB92k"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 g5-v6si7379139plm.445.2018.09.07.01.26.34; Fri, 07 Sep 2018 01:26:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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="c4/XB92k"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 S1728021AbeIGMjy (ORCPT + 99 others); Fri, 7 Sep 2018 08:39:54 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:40996 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727806AbeIGMjx (ORCPT ); Fri, 7 Sep 2018 08:39:53 -0400 Received: by mail-pg1-f194.google.com with SMTP id s15-v6so6599269pgv.8 for ; Fri, 07 Sep 2018 01:00:09 -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; bh=qys+w+KuRNMCFxzjw+1VloWOF/kuhazsT8XZwPi30r4=; b=c4/XB92kJZtTwM5QcIUvrwIc4hwABVpAL6FxknVxyVOPo1m7DFgHA45DOwP7MNdC4f 4++H0GZ8HMGKt/vb64/ye7yqQqgd4CiWLEzoPnE/dykm8dKrH7LJ5wHQ1cvvT6wKZ3pT DgW5JTw45FW5Ko3+dw+4v4HwWeRsrzB67UgfI= 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; bh=qys+w+KuRNMCFxzjw+1VloWOF/kuhazsT8XZwPi30r4=; b=hXF4S7g7G1MtB9SadH9D0z+BhD5Tkw0nUKBKLK2jb3eSpptMx7wlE96sbcN6luaygI a76xi09lx3J23SsAQoeZPdPKdF2W88YPwNS4QLDMELF/H1cKzHAlrL3CcwyjOMjPxryA tcgUT1uOzlkqZl6e06ApBB60mnke2pbeWcy5o3emQ/x5RrHdGO+u7z/RY9kTY4G4LYVL ULVYkFW8wsNHJtyC70lDD75I3Mf3uFeJr3JxSuKoQmg99SqazUvs6/BOegO3UZFshHxV Ll+m0W4FK5Jg5wqRnYTf5LYzij0ZuoYmAW4lMTbrEzI9DpjHPMLFQ7NvDmlURnlal0Xu 5Z/A== X-Gm-Message-State: APzg51Di/T2pwWEd/MUdtw2xqWHoXZN9C6RVdYoIEJEqRYsSrLV+7wqO w5YHjlCs9JDrn/Qz7L4VHpQQGQ== X-Received: by 2002:a63:2d05:: with SMTP id t5-v6mr6916294pgt.403.1536307209430; Fri, 07 Sep 2018 01:00:09 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id y7-v6sm8794078pge.8.2018.09.07.01.00.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Sep 2018 01:00:08 -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 Subject: [PATCH v14 06/16] of/fdt: add helper functions for handling properties Date: Fri, 7 Sep 2018 17:00:30 +0900 Message-Id: <20180907080040.4967-1-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.18.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 --- drivers/of/fdt.c | 62 ++++++++++++++++++++++++++++++++++++++++-- include/linux/of_fdt.h | 10 +++++-- 2 files changed, 68 insertions(+), 4 deletions(-) diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 800ad252cf9c..dc960cea1355 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 @@ -537,8 +538,8 @@ void *of_fdt_unflatten_tree(const unsigned long *blob, EXPORT_SYMBOL_GPL(of_fdt_unflatten_tree); /* Everything below here references initial_boot_params directly. */ -int __initdata dt_root_addr_cells; -int __initdata dt_root_size_cells; +int dt_root_addr_cells; +int dt_root_size_cells; void *initial_boot_params; @@ -1323,3 +1324,60 @@ late_initcall(of_fdt_raw_init); #endif #endif /* CONFIG_OF_EARLY_FLATTREE */ + +bool of_fdt_cells_size_fitted(u64 base, u64 size) +{ + /* if *_cells >= 2, cells can hold 64-bit values anyway */ + if ((dt_root_addr_cells == 1) && (base > U32_MAX)) + return false; + + if ((dt_root_size_cells == 1) && (size > U32_MAX)) + return false; + + return true; +} + +size_t of_fdt_reg_cells_size(void) +{ + return (dt_root_addr_cells + dt_root_size_cells) * sizeof(u32); +} + +#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) +{ + char buf[sizeof(__be32) * 2 * 2]; + /* assume dt_root_[addr|size]_cells <= 2 */ + void *prop; + size_t buf_size; + + buf_size = of_fdt_reg_cells_size(); + prop = buf; + + fill_property(prop, addr, dt_root_addr_cells); + prop += dt_root_addr_cells * sizeof(u32); + + fill_property(prop, size, dt_root_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..9615d6142578 100644 --- a/include/linux/of_fdt.h +++ b/include/linux/of_fdt.h @@ -37,8 +37,8 @@ extern void *of_fdt_unflatten_tree(const unsigned long *blob, struct device_node **mynodes); /* TBD: Temporary export of fdt globals - remove when code fully merged */ -extern int __initdata dt_root_addr_cells; -extern int __initdata dt_root_size_cells; +extern int dt_root_addr_cells; +extern int dt_root_size_cells; extern void *initial_boot_params; extern char __dtb_start[]; @@ -108,5 +108,11 @@ static inline void unflatten_device_tree(void) {} static inline void unflatten_and_copy_device_tree(void) {} #endif /* CONFIG_OF_EARLY_FLATTREE */ +bool of_fdt_cells_size_fitted(u64 base, u64 size); +size_t of_fdt_reg_cells_size(void); +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 */ -- 2.18.0