From patchwork Fri Nov 1 08:11:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 178260 Delivered-To: patch@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp142212ill; Fri, 1 Nov 2019 01:13:04 -0700 (PDT) X-Google-Smtp-Source: APXvYqyhEiNm7VbqdPOkUPu7J+8HnUy5zDy9ax+xcScUyvbSm2LwHYdA3O/5eN07e+mnFdS+4/GR X-Received: by 2002:a17:906:6094:: with SMTP id t20mr8485912ejj.316.1572595984475; Fri, 01 Nov 2019 01:13:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572595984; cv=none; d=google.com; s=arc-20160816; b=xZbrfCmU2QYZ2qQJWH4ASsKRLpyX4aDK87jIO2tpC4mGbGDdTb87eMdKVfAneDaGyo FkeIyHk4781OuKdlLRwAzsFRg4TXzcWjHldNyuvKiHDN3WpMqMOZth6UrnmTzKR6rk03 YY6mPg0Arpzkq+SrTVmGJTviPtNo+/ggPAVoqPdcEHvTkeOAtd8TMvWi89tUlDTXCzpy EbhIuP14YXmuhx9DfJ6Uwv1koq43Jb0/A9AG/PVsVHd2nDXUPOvNe+J2GM5IBHz16Z1S P7nWlSrusokpjdKmu2My8S1FCZlIBmUORfI7Eayz2N++nB/n4Hr1HBvVz8BEBa3W5KjJ LpZg== 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:dkim-filter; bh=k87jkR6FkJFPOR/z5eR3eSaQD14H4HrO88Los1fgxD4=; b=vZqXBVO9buu5HSCEF0BqpPl7wNRIKAidKCVCfOimimIYuY+MxtNoSSinazNGk2jeK9 lLxWOPWBZiT1itVQZwVJUg/MjgCo4Tq845ahix6+TySpp52vs9owJBXVIU5XoDMAUUhC a2Huybkh1n9Ox2ZhbctnJ6+6xyD7AAuW7Yc/YnHDL+PAdc91FeukV23e7iUVWCA8uTaC zbrpACxE75tF7C2fjh8JbdPBozFrGzkJIiBZbwR3EaV01gVmHJ2htmH7C7f/NH67DfKY e98hYVTPYH81sDio94InumIt1GSBMM3lF6lIKlzUSZPlERy9kPKHvebkt8zru7iPlr2O Zuhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=OWwQEmBq; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s1si5436716ejl.235.2019.11.01.01.13.04; Fri, 01 Nov 2019 01:13:04 -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=@nifty.com header.s=dec2015msa header.b=OWwQEmBq; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729975AbfKAIND (ORCPT + 8 others); Fri, 1 Nov 2019 04:13:03 -0400 Received: from conuserg-12.nifty.com ([210.131.2.79]:30663 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729942AbfKAIND (ORCPT ); Fri, 1 Nov 2019 04:13:03 -0400 X-Greylist: delayed 7038 seconds by postgrey-1.27 at vger.kernel.org; Fri, 01 Nov 2019 04:13:01 EDT Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id xA18BsBO023869; Fri, 1 Nov 2019 17:11:55 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com xA18BsBO023869 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1572595916; bh=k87jkR6FkJFPOR/z5eR3eSaQD14H4HrO88Los1fgxD4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OWwQEmBqJtBONHOI+kqzoJQI4R+sA7iR9sb2oScPbRgvf6U28x2BNYAEr4jzQR9Ax 5ltA/eXOJUZvjCgF4FGNElAjNbbG7nJQ5A+H9/r20jiz6a3zC9OVYzd1oAb1/njDYK yrrDm305qM1vx/9jL0j1DYToeZ3In9qwNG0F5pnwrM/kJ9sI+YCEndtsEv+B4a8Nk6 wdtXzJ9kcqgBG+e6wJTgotLqbjCpPZVrJksALYACl5uUoARP6dqxcVaO5XbbMKEQcO Ip61PjA/oZLV9q40iQoPVYx4uOvuC33hWzya8yguDuSICi4tsaA51w6SRZcEjs8wQd xgBT+fTTh/VLA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: devicetree@vger.kernel.org, Rob Herring , Frank Rowand Cc: linux-arm-kernel@lists.infradead.org, David Gibson , linuxppc-dev@lists.ozlabs.org, Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH v2 1/3] libfdt: add SPDX-License-Identifier to libfdt wrappers Date: Fri, 1 Nov 2019 17:11:46 +0900 Message-Id: <20191101081148.23274-2-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191101081148.23274-1-yamada.masahiro@socionext.com> References: <20191101081148.23274-1-yamada.masahiro@socionext.com> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org These are kernel source code even though they are just two-line wrappers. Files without explicit license information fall back to GPL-2.0-only, which is the project default. Signed-off-by: Masahiro Yamada --- Changes in v2: None lib/fdt.c | 1 + lib/fdt_empty_tree.c | 1 + lib/fdt_ro.c | 1 + lib/fdt_rw.c | 1 + lib/fdt_strerror.c | 1 + lib/fdt_sw.c | 1 + lib/fdt_wip.c | 1 + 7 files changed, 7 insertions(+) -- 2.17.1 diff --git a/lib/fdt.c b/lib/fdt.c index 97f20069fc37..041f8922a23c 100644 --- a/lib/fdt.c +++ b/lib/fdt.c @@ -1,2 +1,3 @@ +// SPDX-License-Identifier: GPL-2.0-only #include #include "../scripts/dtc/libfdt/fdt.c" diff --git a/lib/fdt_empty_tree.c b/lib/fdt_empty_tree.c index 5d30c58150ad..452221227bf3 100644 --- a/lib/fdt_empty_tree.c +++ b/lib/fdt_empty_tree.c @@ -1,2 +1,3 @@ +// SPDX-License-Identifier: GPL-2.0-only #include #include "../scripts/dtc/libfdt/fdt_empty_tree.c" diff --git a/lib/fdt_ro.c b/lib/fdt_ro.c index f73c04ea7be4..9f696d19f060 100644 --- a/lib/fdt_ro.c +++ b/lib/fdt_ro.c @@ -1,2 +1,3 @@ +// SPDX-License-Identifier: GPL-2.0-only #include #include "../scripts/dtc/libfdt/fdt_ro.c" diff --git a/lib/fdt_rw.c b/lib/fdt_rw.c index 0c1f0f4a4b13..2a61e9c6dd44 100644 --- a/lib/fdt_rw.c +++ b/lib/fdt_rw.c @@ -1,2 +1,3 @@ +// SPDX-License-Identifier: GPL-2.0-only #include #include "../scripts/dtc/libfdt/fdt_rw.c" diff --git a/lib/fdt_strerror.c b/lib/fdt_strerror.c index 8713e3ff4707..4554e5fdac12 100644 --- a/lib/fdt_strerror.c +++ b/lib/fdt_strerror.c @@ -1,2 +1,3 @@ +// SPDX-License-Identifier: GPL-2.0-only #include #include "../scripts/dtc/libfdt/fdt_strerror.c" diff --git a/lib/fdt_sw.c b/lib/fdt_sw.c index 9ac7e50c76ce..d3345ca399cf 100644 --- a/lib/fdt_sw.c +++ b/lib/fdt_sw.c @@ -1,2 +1,3 @@ +// SPDX-License-Identifier: GPL-2.0-only #include #include "../scripts/dtc/libfdt/fdt_sw.c" diff --git a/lib/fdt_wip.c b/lib/fdt_wip.c index 45b3fc3d3ba1..9674d4c3b115 100644 --- a/lib/fdt_wip.c +++ b/lib/fdt_wip.c @@ -1,2 +1,3 @@ +// SPDX-License-Identifier: GPL-2.0-only #include #include "../scripts/dtc/libfdt/fdt_wip.c" From patchwork Fri Nov 1 08:11:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 178261 Delivered-To: patch@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp142840ill; Fri, 1 Nov 2019 01:13:49 -0700 (PDT) X-Google-Smtp-Source: APXvYqytKMr2lCzG3gec6RZvjDG3iBry200wQIYzKvUkWO89QI7QJPJRlnPDoFvF9yRP/xGsMtH6 X-Received: by 2002:a05:6402:1acd:: with SMTP id ba13mr10848822edb.141.1572596029216; Fri, 01 Nov 2019 01:13:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572596029; cv=none; d=google.com; s=arc-20160816; b=rGDDxvOIO4dSwAenhKPFMI5BK0aq9GvwiSdvwjpqgQ0mrTeMS+UOzztkQ4uaSFJKQG fJDIgGwJ0BleAiK9etrHHqjXdATU/tJmVYb6z73PaHbDMogXw359jcxWP9+7ftU+Ldkk TBaG+AOBDSs6EiNQkZjb4BJ+0ZcqgrUaPK3GK8OJlevGPNSruUqy8JblslcIWBMVTTuq rXA3Gei9sPJatapBzRbjDbeILLT1BsAuYc4r7kdlbRZ9+bMTppLtdDZvi1/kWHTGNKkg itgUBWSW0bkpVo0fR3aGA0Ti9Xe2BgAYNB3boO9wmnoTvu3ym4/xN5Chn1FA1bxhKyqz 2y6A== 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:dkim-filter; bh=DKT4oSakV7/N8zOuTi41t5buaEiHmVd7tLzjZjmza/c=; b=AIw2T4UkNp5jD8uibRDJxzdkdJGMj2IxsYPIqSvWaEfKRcWXXgE3Cpm4bxf95mRRO4 wPOgMhU2fhKu3m2OatMq4Ycc8Z7APsAomByNOqh8g3kGV3CYfom0vflwMZE76vOHu/yf 0lnSFzVZ2oMNZxZV8TKPMJB2uqVrRx8V+zuL/FOrDHSdqKDWjJNB+iehOj+zpI9xZnb9 5Bl9aLKKVXv457tMzBI/dSis/hroCisIKOUSPdSq/Wm9zD+mpt4ByExmtHGMj+Gc5OHv kUa3mmxVOxEHRoS22R0gKOZ7uVG/0V/8C9JDMPfZldBBzCN+M9mRwFX8F42J9E9JMF0q x7Cg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=p+lZLhCI; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f29si5955342edb.337.2019.11.01.01.13.49; Fri, 01 Nov 2019 01:13:49 -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=@nifty.com header.s=dec2015msa header.b=p+lZLhCI; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729975AbfKAINs (ORCPT + 8 others); Fri, 1 Nov 2019 04:13:48 -0400 Received: from conuserg-12.nifty.com ([210.131.2.79]:32036 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730157AbfKAINs (ORCPT ); Fri, 1 Nov 2019 04:13:48 -0400 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id xA18BsBP023869; Fri, 1 Nov 2019 17:11:59 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com xA18BsBP023869 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1572595919; bh=DKT4oSakV7/N8zOuTi41t5buaEiHmVd7tLzjZjmza/c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p+lZLhCIGNRrhqAVFCd4/+xWCG0VsMH/8bnzDKcUTnmj9pdpm+/pphxn+sgtHJ4Po kXgppL5ksqa87WfyKlm6sHsuZDMmC28gCCT+xrzoIqF/sCw+cw5dmxDg7sO/eI6kJk Whv9Mo/sJ3q1SenXgmW8EmgGfZ/E0kURYOCDRWWx22erdYJa/U/Ygp9cTYE2+EWh57 sWY+Y0zds89mWG2sD5TEN1qc11Lj6OqYHlyArtQ856eBhpaVs8aXoUrsBbAKzeAY13 xDlIFDW+uE76tkZSVgWCX0WlT+BbIqNZwKXhbhIjpv/X80bvh04p63u3nspYZJqXRs hkKfNiugxQbsw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: devicetree@vger.kernel.org, Rob Herring , Frank Rowand Cc: linux-arm-kernel@lists.infradead.org, David Gibson , linuxppc-dev@lists.ozlabs.org, Masahiro Yamada , Russell King , linux-kernel@vger.kernel.org Subject: [PATCH v2 2/3] ARM: decompressor: simplify libfdt builds Date: Fri, 1 Nov 2019 17:11:47 +0900 Message-Id: <20191101081148.23274-3-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191101081148.23274-1-yamada.masahiro@socionext.com> References: <20191101081148.23274-1-yamada.masahiro@socionext.com> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Copying source files during the build time may not end up with as clean code as you expect. lib/fdt*.c simply wrap scripts/dtc/libfdt/fdt*.c, and it works nicely. Let's follow that approach for the arm decompressor, too. Add four wrappers, arch/arm/boot/compressed/fdt*.c and remove the Makefile messes. Another nice thing is we no longer need to maintain the separate libfdt_env.h since we can include , and the -- 2.17.1 diff stat also looks nice. Signed-off-by: Masahiro Yamada --- Changes in v2: None arch/arm/boot/compressed/.gitignore | 9 ------- arch/arm/boot/compressed/Makefile | 33 +++++++------------------ arch/arm/boot/compressed/atags_to_fdt.c | 1 + arch/arm/boot/compressed/fdt.c | 2 ++ arch/arm/boot/compressed/fdt_ro.c | 2 ++ arch/arm/boot/compressed/fdt_rw.c | 2 ++ arch/arm/boot/compressed/fdt_wip.c | 2 ++ arch/arm/boot/compressed/libfdt_env.h | 22 ----------------- 8 files changed, 18 insertions(+), 55 deletions(-) create mode 100644 arch/arm/boot/compressed/fdt.c create mode 100644 arch/arm/boot/compressed/fdt_ro.c create mode 100644 arch/arm/boot/compressed/fdt_rw.c create mode 100644 arch/arm/boot/compressed/fdt_wip.c delete mode 100644 arch/arm/boot/compressed/libfdt_env.h diff --git a/arch/arm/boot/compressed/.gitignore b/arch/arm/boot/compressed/.gitignore index 86b2f5d28240..2fdb4885846b 100644 --- a/arch/arm/boot/compressed/.gitignore +++ b/arch/arm/boot/compressed/.gitignore @@ -6,12 +6,3 @@ hyp-stub.S piggy_data vmlinux vmlinux.lds - -# borrowed libfdt files -fdt.c -fdt.h -fdt_ro.c -fdt_rw.c -fdt_wip.c -libfdt.h -libfdt_internal.h diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile index 9219389bbe61..a0d645c66980 100644 --- a/arch/arm/boot/compressed/Makefile +++ b/arch/arm/boot/compressed/Makefile @@ -76,29 +76,23 @@ compress-$(CONFIG_KERNEL_LZMA) = lzma compress-$(CONFIG_KERNEL_XZ) = xzkern compress-$(CONFIG_KERNEL_LZ4) = lz4 -# Borrowed libfdt files for the ATAG compatibility mode - -libfdt := fdt_rw.c fdt_ro.c fdt_wip.c fdt.c -libfdt_hdrs := fdt.h libfdt.h libfdt_internal.h - -libfdt_objs := $(addsuffix .o, $(basename $(libfdt))) - -$(addprefix $(obj)/,$(libfdt) $(libfdt_hdrs)): $(obj)/%: $(srctree)/scripts/dtc/libfdt/% - $(call cmd,shipped) +ifeq ($(CONFIG_ARM_ATAG_DTB_COMPAT),y) +libfdt_objs = fdt_rw.o fdt_ro.o fdt_wip.o fdt.o atags_to_fdt.o -$(addprefix $(obj)/,$(libfdt_objs) atags_to_fdt.o): \ - $(addprefix $(obj)/,$(libfdt_hdrs)) +OBJS += $(libfdt_objs) -ifeq ($(CONFIG_ARM_ATAG_DTB_COMPAT),y) -OBJS += $(libfdt_objs) atags_to_fdt.o +# -fstack-protector-strong triggers protection checks in this code, +# but it is being used too early to link to meaningful stack_chk logic. +nossp_flags := $(call cc-option, -fno-stack-protector) +$(foreach o, $(libfdt_objs), \ + $(eval CFLAGS_$(o) := -I $(srctree)/scripts/dtc/libfdt) $(nossp_flags)) endif targets := vmlinux vmlinux.lds piggy_data piggy.o \ lib1funcs.o ashldi3.o bswapsdi2.o \ head.o $(OBJS) -clean-files += piggy_data lib1funcs.S ashldi3.S bswapsdi2.S \ - $(libfdt) $(libfdt_hdrs) hyp-stub.S +clean-files += piggy_data lib1funcs.S ashldi3.S bswapsdi2.S hyp-stub.S KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING KBUILD_CFLAGS += $(DISABLE_ARM_SSP_PER_TASK_PLUGIN) @@ -108,15 +102,6 @@ ORIG_CFLAGS := $(KBUILD_CFLAGS) KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS)) endif -# -fstack-protector-strong triggers protection checks in this code, -# but it is being used too early to link to meaningful stack_chk logic. -nossp_flags := $(call cc-option, -fno-stack-protector) -CFLAGS_atags_to_fdt.o := $(nossp_flags) -CFLAGS_fdt.o := $(nossp_flags) -CFLAGS_fdt_ro.o := $(nossp_flags) -CFLAGS_fdt_rw.o := $(nossp_flags) -CFLAGS_fdt_wip.o := $(nossp_flags) - ccflags-y := -fpic $(call cc-option,-mno-single-pic-base,) -fno-builtin -I$(obj) asflags-y := -DZIMAGE diff --git a/arch/arm/boot/compressed/atags_to_fdt.c b/arch/arm/boot/compressed/atags_to_fdt.c index 330cd3c2eae5..53a60ba066a1 100644 --- a/arch/arm/boot/compressed/atags_to_fdt.c +++ b/arch/arm/boot/compressed/atags_to_fdt.c @@ -1,4 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 +#include #include #include diff --git a/arch/arm/boot/compressed/fdt.c b/arch/arm/boot/compressed/fdt.c new file mode 100644 index 000000000000..f8ea7a201ab1 --- /dev/null +++ b/arch/arm/boot/compressed/fdt.c @@ -0,0 +1,2 @@ +// SPDX-License-Identifier: GPL-2.0-only +#include "../../../../lib/fdt.c" diff --git a/arch/arm/boot/compressed/fdt_ro.c b/arch/arm/boot/compressed/fdt_ro.c new file mode 100644 index 000000000000..93970a4ad5ae --- /dev/null +++ b/arch/arm/boot/compressed/fdt_ro.c @@ -0,0 +1,2 @@ +// SPDX-License-Identifier: GPL-2.0-only +#include "../../../../lib/fdt_ro.c" diff --git a/arch/arm/boot/compressed/fdt_rw.c b/arch/arm/boot/compressed/fdt_rw.c new file mode 100644 index 000000000000..f7c6b8b7e01c --- /dev/null +++ b/arch/arm/boot/compressed/fdt_rw.c @@ -0,0 +1,2 @@ +// SPDX-License-Identifier: GPL-2.0-only +#include "../../../../lib/fdt_rw.c" diff --git a/arch/arm/boot/compressed/fdt_wip.c b/arch/arm/boot/compressed/fdt_wip.c new file mode 100644 index 000000000000..048d2c7a088d --- /dev/null +++ b/arch/arm/boot/compressed/fdt_wip.c @@ -0,0 +1,2 @@ +// SPDX-License-Identifier: GPL-2.0-only +#include "../../../../lib/fdt_wip.c" diff --git a/arch/arm/boot/compressed/libfdt_env.h b/arch/arm/boot/compressed/libfdt_env.h deleted file mode 100644 index b36c0289a308..000000000000 --- a/arch/arm/boot/compressed/libfdt_env.h +++ /dev/null @@ -1,22 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _ARM_LIBFDT_ENV_H -#define _ARM_LIBFDT_ENV_H - -#include -#include -#include - -#define INT_MAX ((int)(~0U>>1)) - -typedef __be16 fdt16_t; -typedef __be32 fdt32_t; -typedef __be64 fdt64_t; - -#define fdt16_to_cpu(x) be16_to_cpu(x) -#define cpu_to_fdt16(x) cpu_to_be16(x) -#define fdt32_to_cpu(x) be32_to_cpu(x) -#define cpu_to_fdt32(x) cpu_to_be32(x) -#define fdt64_to_cpu(x) be64_to_cpu(x) -#define cpu_to_fdt64(x) cpu_to_be64(x) - -#endif From patchwork Fri Nov 1 08:11:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 178262 Delivered-To: patch@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp142900ill; Fri, 1 Nov 2019 01:13:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqxP8YCbluXg2QeYFNtFaibiH1UE2sCPiPIr1wU6sz9KpB6BugpA99Z4CMe1Oj2ukUTugcR8 X-Received: by 2002:a50:9f65:: with SMTP id b92mr11107175edf.63.1572596034042; Fri, 01 Nov 2019 01:13:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572596034; cv=none; d=google.com; s=arc-20160816; b=I9NE3XdmAcYUF2XFBEsWfE1/3w3gSVEDRrcIFfqa3NFv/KJ7pWDR4RmB9MM/Q6AtFL KKo0uK2MXrEx6YxJAbqnHQn9w54lC/AJrm5SH0WtmdJ+Xj8shBsU3rkMVI+vM8bCyEkb 4NtcwXH2tE1XteSwMZcul+5/4WI2JrcYu+eX4LK16YSDK9WiluQhsFOMRnJn0qDobYVZ MaLgDK5L7TTNFNUEQ6EIEJdm+9tPaCWhu0dK8AucB6tw9K8PLoiLYkY2xkrygmLLwKsY HK+pe0k+4xOaKFeq888CIhV6L105PDHQfIa0ctuULjR2vEEgC/WRCseVLG3vDVv9KMbR R1wQ== 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:dkim-filter; bh=dMOvEpUrv3gUpGiwcs/+Eb8AZVQbVFB1v4ogmdr2bko=; b=ADEG110UW6q9DX4Uen5DuBeVX58PRQnu+kqYzYXR+4pZOY7CgE7XMzT8ilx8ZXZQ8O KoQJkyovV+Zq0AOmxDBjPs+yDfRoI0F6WWUY2eugE1zQlvbRVUVcaXX6zcXDIsUtZXrS TGYBFObAw8MvGcR3hvJJib0MyR21G4KE4e7Wx3A3IR31xSy4XlbL54nG7OWdrFUziD8/ pNA+3svTl7SRkhjeQxe0iCvM7fXn+4zMbYXau6DlDq8MieUvKIfK6uVm8oPzEW68LVMP I7pPerbhdkZq9gciqKsBHtWEKOSQKnk505DLoKV3BQ3kpPtnjeVvscIihrC6j/pjlEfx H7nQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=24wqhJT7; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 9si5235312ejw.272.2019.11.01.01.13.53; Fri, 01 Nov 2019 01:13:54 -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=@nifty.com header.s=dec2015msa header.b=24wqhJT7; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730276AbfKAINx (ORCPT + 8 others); Fri, 1 Nov 2019 04:13:53 -0400 Received: from conuserg-12.nifty.com ([210.131.2.79]:32221 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730157AbfKAINx (ORCPT ); Fri, 1 Nov 2019 04:13:53 -0400 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id xA18BsBQ023869; Fri, 1 Nov 2019 17:11:59 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com xA18BsBQ023869 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1572595923; bh=dMOvEpUrv3gUpGiwcs/+Eb8AZVQbVFB1v4ogmdr2bko=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=24wqhJT7RJMf50vgPNVtuOw7sfdCTIBCGMN1/+85H2fjdBWjCBMgKq4Gi/Zo8KO2Y VlgD461HyHetk8JzsJ7Ekalb9WtIQBjoIaG78+XXVkIjX89OQ/6jth0bvnMY7mY/Zy kZ1FsZLs884Twsxjffd5wE/JArN05kQGyzXNHNkQnzTcfwsuqyMuM02JwDm5mdrvDY 5imCL2rnn/7JQ+QTDtFB+kbwLTgcoxcrAjnIIPElUvBT0solhQTWvr+EhskjVm4OS1 vqipju34mMQPwLWkDveV8HSaTxr8C3ugI1gbtT2+b+racWCIlXeZnHt+T/q7S8T8kL VV3/6jEArBPKQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: devicetree@vger.kernel.org, Rob Herring , Frank Rowand Cc: linux-arm-kernel@lists.infradead.org, David Gibson , linuxppc-dev@lists.ozlabs.org, Masahiro Yamada , Benjamin Herrenschmidt , Michael Ellerman , Paul Mackerras , linux-kernel@vger.kernel.org Subject: [PATCH v2 3/3] libfdt: define INT32_MAX and UINT32_MAX in libfdt_env.h Date: Fri, 1 Nov 2019 17:11:48 +0900 Message-Id: <20191101081148.23274-4-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191101081148.23274-1-yamada.masahiro@socionext.com> References: <20191101081148.23274-1-yamada.masahiro@socionext.com> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The libfdt in the upstream DTC project added references to (U)INT32_MAX by the following commits: Commit 812b1956a076 ("libfdt: Tweak data handling to satisfy Coverity") Commit 7fcf8208b8a9 ("libfdt: add fdt_append_addrrange()") The kernel needs to adjust libfdt_env.h before pulling in the changes. As for the user-space programs, defines (U)INT32_MAX along with (u)int32_t. In the kernel, on the other hand, we usually use s32 / u32 instead of (u)int32_t for the fixed-width types. Accordingly, we already have S32_MAX / U32_MAX for their max values. So, we won't add (U)INT32_MAX to any more. Instead, add them to the in-kernel libfdt_env.h to compile fdt.c and fdt_addresses.c Signed-off-by: Masahiro Yamada --- Changes in v2: - Fix ppc libfdt_env.h arch/powerpc/boot/libfdt_env.h | 2 ++ include/linux/libfdt_env.h | 3 +++ 2 files changed, 5 insertions(+) -- 2.17.1 diff --git a/arch/powerpc/boot/libfdt_env.h b/arch/powerpc/boot/libfdt_env.h index 2abc8e83b95e..9757d4f6331e 100644 --- a/arch/powerpc/boot/libfdt_env.h +++ b/arch/powerpc/boot/libfdt_env.h @@ -6,6 +6,8 @@ #include #define INT_MAX ((int)(~0U>>1)) +#define UINT32_MAX ((u32)~0U) +#define INT32_MAX ((s32)(UINT32_MAX >> 1)) #include "of.h" diff --git a/include/linux/libfdt_env.h b/include/linux/libfdt_env.h index edb0f0c30904..0bd83bdb2482 100644 --- a/include/linux/libfdt_env.h +++ b/include/linux/libfdt_env.h @@ -11,6 +11,9 @@ typedef __be16 fdt16_t; typedef __be32 fdt32_t; typedef __be64 fdt64_t; +#define INT32_MAX S32_MAX +#define UINT32_MAX U32_MAX + #define fdt32_to_cpu(x) be32_to_cpu(x) #define cpu_to_fdt32(x) cpu_to_be32(x) #define fdt64_to_cpu(x) be64_to_cpu(x)