From patchwork Wed Jul 11 07:41:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 10519125 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 A74416028E for ; Wed, 11 Jul 2018 08:11:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 95B3E28DAC for ; Wed, 11 Jul 2018 08:11:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 86EFE28DB7; Wed, 11 Jul 2018 08:11:17 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2845D28DAC for ; Wed, 11 Jul 2018 08:11:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=K8/IHcoaH0kjwPRLELvnfuTjAKTYizU/R8NwvWq4lvg=; b=ElYymRh9ETPxkag96bXrOYVdwZ ladd/B6wbcnAAD1Yh40x5yt5uw2OlgmskHm46Oqw6d7MxAWwEI4+ThWPSBabT1Q0WzlYhk6sZemIN 6zTrieicz+a0nswTWRJxY/jwARvogzjZ7nSdq7+nomZXyMJrUVAMKReZdZUiFBicaacnCB0Puijp7 M5uJnj17E7t9It4tJ91T/vB8THWzz25Xmt4Izhj0Quk5nouN99pQmmGkYb6CXVBi85YuBdspILlIA D064FpCKh+oUsmabH5EWPu2v+6hJ0WIbrRKqA6CJRjW4b8um1DJJuqqa4I2WW0PA8D4DYZ8b4HryI keD+TuXA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fdADO-0006qd-Vc; Wed, 11 Jul 2018 08:11:11 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fdA1I-0006Dd-38 for linux-arm-kernel@bombadil.infradead.org; Wed, 11 Jul 2018 07:58:40 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=QlhV7eDSbsU4GPDGTwzyQDGWNJMnX8a7YNDVlGTagBM=; b=LHfhhrSZTwjjtb8quPXfU/OCQ t6locdiYAnUBXscEtFABxWeor26O4ZnzKw6xpxWQF2IvWdW27rdL3FbzFh8MUtRxIvPywx5axKmPJ SDOAOYj5aa4P/bkHmSFWGAv03A+st0URQ7HdbI+t5JYr5nSQ/xlgBhaOxrFSa3LKBZc7wv2Qdjt05 uiBfET2dT0b9LJXx/AzVCupKSFu4JX8G3zNSGU3vsG0lZRrsgOM5ij2pMPtRRkyJ/iI+Y0IPchXDI hRg9UTTFQ9K5smEp+f7r25xyu+m9jb1U3ApKhxNuwa4UzcnTx4MfxOOPYJlehSSbbs4Bsvdz86H2l BcCBclj0g==; Received: from mail-pf0-x22b.google.com ([2607:f8b0:400e:c00::22b]) by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fd9lM-00054m-Ht for linux-arm-kernel@lists.infradead.org; Wed, 11 Jul 2018 07:42:14 +0000 Received: by mail-pf0-x22b.google.com with SMTP id s21-v6so17884896pfm.6 for ; Wed, 11 Jul 2018 00:42:02 -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=QlhV7eDSbsU4GPDGTwzyQDGWNJMnX8a7YNDVlGTagBM=; b=DXQZ5WpyyE/KxO3vIz5rWYCBHP7Lq8wvgXXdAfcutCKQ1PjOwNUMf9pHWjihE7kCN6 wCRwpC0/G/+BB97oJk3u5bGddZchoyATlbRWnK7k31Ymk75J2/XTNuV8C0Y80zVDHCxL t5Xdfigyj0cD+P2602F/sN+miEljoBN2AMtak= 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=QlhV7eDSbsU4GPDGTwzyQDGWNJMnX8a7YNDVlGTagBM=; b=CXT69W3D0MMpXhWOc9wTmhe7k/3TAd+4jtmSjdaOvIHBDrhG4IkZ66YLAbay8CzwKg qjcO8MghmUPJnzqTWxH7cAj/MeJf1mcZp3c2q9WwX1XNf8IuNV8MzT37Xg0uKBt7vljp f7sloaZtQjVT4Z42m1VmoZ4lzt1NLAlwgAdS+4mRHj+dwYwDOeidVIQuKmtTK3eTRaWt QKDoi3gSdDrhwNJZIjFw7X9BBxvEYQqLAlJFbq5FzDL0MzRJ4CIc1Km1b2zfhLpaiaRD EcIYKjOXMda1Iy1XStlacgoN4Fzdo324FDUXVWx8ZFTfz1l77NtX35b2140sjzNIHHHc 0xSw== X-Gm-Message-State: APt69E3cuj5WBEkGp814gmnK0/OyjWXbDsplMY9YuSEweREHcFNVp1F5 GTPYiOyIpIExtqqU5Yw/LDhCWC+z/6M= X-Google-Smtp-Source: AAOMgpegZfCzTeGeI34W9GwuZRPHGlYM+klyyBzHIdC+msiNgWb5Ob7JJ7bq5GGETlnrvsXOjO1YhQ== X-Received: by 2002:a65:6689:: with SMTP id b9-v6mr25416801pgw.326.1531294920730; Wed, 11 Jul 2018 00:42:00 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id p20-v6sm29051873pff.90.2018.07.11.00.41.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Jul 2018 00:42:00 -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 Subject: [PATCH v11 05/15] of/fdt: add helper functions for handling properties Date: Wed, 11 Jul 2018 16:41:53 +0900 Message-Id: <20180711074203.3019-6-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180711074203.3019-1-takahiro.akashi@linaro.org> References: <20180711074203.3019-1-takahiro.akashi@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180711_084212_589743_7B17949F X-CRM114-Status: GOOD ( 18.00 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ard.biesheuvel@linaro.org, bhsharma@redhat.com, kexec@lists.infradead.org, linux-kernel@vger.kernel.org, AKASHI Takahiro , Rob Herring , james.morse@arm.com, Frank Rowand , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 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 */