From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755460AbaDGRq2 (ORCPT ); Mon, 7 Apr 2014 13:46:28 -0400 Received: from mail-bk0-f51.google.com ([209.85.214.51]:41126 "EHLO mail-bk0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753281AbaDGRqZ (ORCPT ); Mon, 7 Apr 2014 13:46:25 -0400 Date: Mon, 7 Apr 2014 19:46:17 +0200 From: Andreas Herrmann To: Rob Herring Cc: linux-kernel@vger.kernel.org, Grant Likely , Rob Herring , Ralf Baechle , linux-mips@linux-mips.org, David Daney Subject: Re: [PATCH 01/20] mips: octeon: convert to use unflatten_and_copy_device_tree Message-ID: <20140407174617.GA12379@alberich> References: <1396563423-30893-1-git-send-email-robherring2@gmail.com> <1396563423-30893-2-git-send-email-robherring2@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <1396563423-30893-2-git-send-email-robherring2@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Apr 03, 2014 at 05:16:44PM -0500, Rob Herring wrote: > From: Rob Herring > > The octeon FDT code can be simplified by using > unflatten_and_copy_device_tree function. This removes all accesses to > FDT header data by the arch code. Hi Rob, I think (in general) this modification is ok. But I suggest to use following (slightly modified) version. Thanks, Andreas -- 8< -- Subject: MIPS: Octeon: Convert to use unflatten_and_copy_device_tree From: Rob Herring The octeon FDT code can be simplified by using unflatten_and_copy_device_tree function. This removes all accesses to FDT header data by the arch code. [andreas.herrmann: * Fixed compile problem: arch/mips/cavium-octeon/setup.c: In function 'device_tree_init': arch/mips/cavium-octeon/setup.c:1070:7: error: assignment discards 'const' qualifier from pointer target type [-Werror] arch/mips/cavium-octeon/setup.c:1073:7: error: assignment discards 'const' qualifier from pointer target type [-Werror] * Removed (now) obsolete extern declarations (for __dtb_octeon_3xxx_end, __dtb_octeon_68xx_end)] Tested-by: Andreas Herrmann Cc: Ralf Baechle Cc: linux-mips@linux-mips.org Signed-off-by: Rob Herring --- arch/mips/cavium-octeon/setup.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c index 331b837..72ae938 100644 --- a/arch/mips/cavium-octeon/setup.c +++ b/arch/mips/cavium-octeon/setup.c @@ -1053,36 +1053,26 @@ void prom_free_prom_memory(void) int octeon_prune_device_tree(void); extern const char __dtb_octeon_3xxx_begin; -extern const char __dtb_octeon_3xxx_end; extern const char __dtb_octeon_68xx_begin; -extern const char __dtb_octeon_68xx_end; void __init device_tree_init(void) { - int dt_size; - struct boot_param_header *fdt; + const void *fdt; bool do_prune; if (octeon_bootinfo->minor_version >= 3 && octeon_bootinfo->fdt_addr) { fdt = phys_to_virt(octeon_bootinfo->fdt_addr); if (fdt_check_header(fdt)) panic("Corrupt Device Tree passed to kernel."); - dt_size = be32_to_cpu(fdt->totalsize); do_prune = false; } else if (OCTEON_IS_MODEL(OCTEON_CN68XX)) { - fdt = (struct boot_param_header *)&__dtb_octeon_68xx_begin; - dt_size = &__dtb_octeon_68xx_end - &__dtb_octeon_68xx_begin; + fdt = &__dtb_octeon_68xx_begin; do_prune = true; } else { - fdt = (struct boot_param_header *)&__dtb_octeon_3xxx_begin; - dt_size = &__dtb_octeon_3xxx_end - &__dtb_octeon_3xxx_begin; + fdt = &__dtb_octeon_3xxx_begin; do_prune = true; } - /* Copy the default tree from init memory. */ - initial_boot_params = early_init_dt_alloc_memory_arch(dt_size, 8); - if (initial_boot_params == NULL) - panic("Could not allocate initial_boot_params"); - memcpy(initial_boot_params, fdt, dt_size); + initial_boot_params = (void *)fdt; if (do_prune) { octeon_prune_device_tree(); @@ -1090,7 +1080,7 @@ void __init device_tree_init(void) } else { pr_info("Using passed Device Tree.\n"); } - unflatten_device_tree(); + unflatten_and_copy_device_tree(); } static int __initdata disable_octeon_edac_p; -- 1.7.9.5