From patchwork Wed Aug 1 07:58:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 143252 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp549204ljj; Wed, 1 Aug 2018 01:00:21 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeoLCMXfgHkAWjc5iSs+TkqiOK2Z4fMy6fg2+VsohVcvyhWedq3fPFUX96MChZBj+p7t1GH X-Received: by 2002:a17:902:a716:: with SMTP id w22-v6mr23500472plq.271.1533110421751; Wed, 01 Aug 2018 01:00:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533110421; cv=none; d=google.com; s=arc-20160816; b=T9tUKzaB0xHxgZspDjhLeXj4/SGStXObHDQA+lKS/mqDvXTpf0Fg/czRx4aI0kZDwc lRedbiu+Bshfl5xjtra8fRCiaMbKn4hgbfjyrva94B6xQfQ212kJpL23wzd0uGMj3CEK PHcgLHnqCs/Ps6v/ZBfN41r2Q+/J7FRNTpWAMHS+GiCYr/NHw2wW5uDm3BYdCOqRXTxp JpxsZlDY8XVdQJx9RfkcAdI6CHTQRBChSNFXBk8E0viYyc/fU/FO8SbEdzCBk7ECtdof f7nQU/Tn+UYExnjmfSXDnUYrCtZX+5wqdgoALGdTQAkwbFQrVp0ecJMkzfFzlh2vq6zx qV3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=fLowSY6mJuob0j2AasYwzHifbnb4+IvdIDuIYU6ROck=; b=wWykIghdw03kQnj/aiHQ8JN7M3tUsan2dixyyzu7h1Dre/6s7bQFZ5b3An8j0rat7G 4eNf0L5Mw3zhkZhkhQPSJxOxp9+ZW9TKb3qOw5KmoQRJA7FjRFRI9MIMoI3hc3zmuUTU ebGSlmMaNbP8PE6JUK8EXbsQcZp0Ic9S9PV+lklSRj8ziNf9cBJGMKhA5Wx/0dvcDyVu 2LQokfxJ5gqDg8GiZsjHYKVXDdK6l+bC0TBoITjzP0hzhGjb35A+JTI8LCP74bSmM1Uf 1HtfIeI36emctL4m3YpaqBKoE6qGTVLw/El/oTB5t82dpZlkHSnvNhZqfCQankEWd3lf 7DvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=H3hOaDS8; 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 c8-v6si17713422pfc.136.2018.08.01.01.00.21; Wed, 01 Aug 2018 01:00:21 -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=H3hOaDS8; 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 S2388086AbeHAJop (ORCPT + 31 others); Wed, 1 Aug 2018 05:44:45 -0400 Received: from mail-pl0-f67.google.com ([209.85.160.67]:34404 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387647AbeHAJoo (ORCPT ); Wed, 1 Aug 2018 05:44:44 -0400 Received: by mail-pl0-f67.google.com with SMTP id f6-v6so8421932plo.1 for ; Wed, 01 Aug 2018 01:00:18 -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; bh=fLowSY6mJuob0j2AasYwzHifbnb4+IvdIDuIYU6ROck=; b=H3hOaDS8j/Rt/AB/RW/jmcBKq5R0eDYWCPfojUYOtNVXx1+uDbbdhODFEqq7MTGhNX qx/PaUQr2nVxCGOFifDySvBW8chTOklnAvvijFuskd0+qCGdEh3wkiThBBNhugWphatt 08uTkcFREfQVSd7tfOheDtLEAWf35gAEHjJyQ= 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; bh=fLowSY6mJuob0j2AasYwzHifbnb4+IvdIDuIYU6ROck=; b=P1T1UuApMUfd8O2VhgJKoYVzrsLrgzltlYTG8cu2DlE2BzHlXbskStIgnvVgivM1yE quXjMPxRBeLb4OrGNHlQK9ULTaIMwj40vJZDyjcxoyDrqyy60KOwHSrbXGJmOXfi3mwI fKExsWLzrWpbuiFkwVqM3e9KFtFnYYu3B6KASxl/USWEjCd7FuBJzboYZQA94mjLvyTN 0cZTNONDF4IWK/VH5FrM0gATECK9ksNUPn32FcfxqQSGXyBQL+oUxw967NmChvbQe5GR 2eCvNSlFQAor5h02yC0hXQUlReoxZWXz6QT46E6zTCzf2EcpuNGIFz/RNiGW+PI8Ey/p rwxQ== X-Gm-Message-State: AOUpUlGhYMNEB/KPAiSzm9xAB/3CALR/a8uBJm1Ga+mLYOiZOCkTneRl p47BLSCBzYlKga2g3PzcjyHyXw== X-Received: by 2002:a17:902:8f93:: with SMTP id z19-v6mr23221318plo.241.1533110418466; Wed, 01 Aug 2018 01:00:18 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id e21-v6sm36306037pfl.187.2018.08.01.01.00.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Aug 2018 01:00:17 -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 v13 06/16] of/fdt: add helper functions for handling properties Date: Wed, 1 Aug 2018 16:58:10 +0900 Message-Id: <20180801075820.3753-7-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180801075820.3753-1-takahiro.akashi@linaro.org> References: <20180801075820.3753-1-takahiro.akashi@linaro.org> 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(-) -- 2.18.0 diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 6da20b9688f7..f7c9d69ce86c 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; @@ -1330,3 +1331,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 */