From patchwork Tue Oct 23 23:40:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 988568 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42g6H7124Jz9sD3 for ; Wed, 24 Oct 2018 21:40:51 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="kr72YR3Z"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 42g6H66L8QzDrPZ for ; Wed, 24 Oct 2018 21:40:50 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="kr72YR3Z"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::643; helo=mail-pl1-x643.google.com; envelope-from=f.fainelli@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="kr72YR3Z"; dkim-atps=neutral Received: from mail-pl1-x643.google.com (mail-pl1-x643.google.com [IPv6:2607:f8b0:4864:20::643]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 42fqf50V9VzDrL3 for ; Wed, 24 Oct 2018 10:41:17 +1100 (AEDT) Received: by mail-pl1-x643.google.com with SMTP id p7-v6so1357422plk.5 for ; Tue, 23 Oct 2018 16:41:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=R7GnanBC/dUP1yUUX1JKpyThiE0iCRjX5YFPvjRZfCc=; b=kr72YR3Z6fsjpNCQWKAq8biRV5Ky6WEsLzLAKNjvGEXzVo0OLzZj/axxUcLvMsJljv GAUecWqvxnSaid8cy+tamZPG6VAbzIplkizh2XlS5+LjIS+KIZ1qIL24fEwrjS9qrQUb EIrpmsjuQqewtt8fFJdBuF7YeJ4v/DEjRBMn+gRA3PAzMbtYHLpSYsorIdL2fqgRdb8C jErR59hy7OjxBnoL5lFmGHiO/fgShVOHMM1Opsl0Z0i099qHGHgcQjLIKmx57lbmB3GZ krgLeNTNlj6Hdsvo4Fwc2fmHtk++Ag4dtLCP4cPAzhB5giHxiZf/r9Wv8RZmhadPX5Ok Ab7w== 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=R7GnanBC/dUP1yUUX1JKpyThiE0iCRjX5YFPvjRZfCc=; b=M/QP5g3tPDYqgFvj2fHhUbFAeBSSHZUT6AvoYVRuKYGO8tT3wqwN8ur+IH/u5NEpgz cpWsINa45w/uyuA4vE8kxgNNU6z3RNC/vjq3VCh9ttSp5qUZutXkrgmKQ0lBovEMf83Y plkp2zMyEUxKrDvdbKIV7/Ys7BXAMzP8EpR0z/k0pjDvfqseEtSD6yboM4kqbrnYE6UG +tLYrIptjQ8XK37sjS562f5bOug2z/gzhoPNGQsIFCJynJirQZH9mYwSHpI3Xbkdmqui luSLoUfazk3ITkzNFctFA/tTgVlL2BBMleJo6BNGVreieeH15N5JpoOef43aS3nA8j0T EQCg== X-Gm-Message-State: AGRZ1gLoEb+vTjscfOt7OP3qapN/+OrAl6USK1PZqsn1sesNEVBphiV9 uLy25DJJDRs8ekikMa6Tn24= X-Google-Smtp-Source: AJdET5e9VIZyzA2DLtMJxPKaSvJZGY+8cFNaWYDcR0p+L+8OVN2SKkA/Vmncd/1gNmmLya56CR05hA== X-Received: by 2002:a17:902:e81:: with SMTP id 1-v6mr295267plx.314.1540338075086; Tue, 23 Oct 2018 16:41:15 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.250]) by smtp.gmail.com with ESMTPSA id a5-v6sm3041223pfo.53.2018.10.23.16.41.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Oct 2018 16:41:13 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Subject: [PATCH 2/2] arm64: Create asm/initrd.h Date: Tue, 23 Oct 2018 16:40:43 -0700 Message-Id: <20181023234044.1138-3-f.fainelli@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181023234044.1138-1-f.fainelli@gmail.com> References: <20181023234044.1138-1-f.fainelli@gmail.com> X-Mailman-Approved-At: Wed, 24 Oct 2018 21:33:24 +1100 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "open list:MIPS" , Alan Kao , "open list:SUPERH" , Will Deacon , Paul Mackerras , "open list:GENERIC INCLUDE/ASM HEADER FILES" , "James E.J. Bottomley" , Geert Uytterhoeven , Catalin Marinas , Matt Turner , "moderated list:H8/300 ARCHITECTURE" , Marc Zyngier , "open list:USER-MODE LINUX UML" , Thomas Gleixner , Richard Henderson , Matt Redfearn , Greg Kroah-Hartman , Ralf Baechle , Richard Kuo , Paul Burton , Andrew Morton , "open list:IA64 Itanium PLATFORM" , James Hogan , Palmer Dabbelt , Max Filippov , Deepa Dinamani , Vincent Chen , "open list:S390" , "open list:C6X ARCHITECTURE" , Yoshinori Sato , "open list:QUALCOMM HEXAGON ARCHITECTURE" , Helge Deller , Jan Henrik Weinstock , Andrey Ryabinin , "open list:TENSILICA XTENSA PORT xtensa" , Jessica Yu , Philippe Ombredanne , Aurelien Jacquiot , "open list:M68K ARCHITECTURE" , Stafford Horne , linux-arm-kernel@lists.infradead.org, Chris Zankel , Tony Luck , "open list:OPENRISC ARCHITECTURE" , Martin Schwidefsky , Kate Stewart , Heiko Carstens , Alexei Starovoitov , Frank Rowand , Florian Fainelli , Daniel Borkmann , "open list:SYNOPSYS ARC ARCHITECTURE" , Fenghua Yu , arnd@arndb.de, Andrey Konovalov , Jeff Dike , Masahiro Yamada , Borislav Petkov , Greentime Hu , Guan Xuetao , "open list:PARISC ARCHITECTURE" , Ard Biesheuvel , Christoffer Dall , "open list:ALPHA PORT" , Olof Johansson , Ley Foon Tan , "David S. Miller" , Rich Felker , Hendrik Brueckner , Thomas Petazzoni , "H. Peter Anvin" , "open list:SPARC + UltraSPARC sparc/sparc64" , "open list:RISC-V ARCHITECTURE" , Greg Ungerer , Jonas Bonn , Richard Weinberger , "maintainer:X86 ARCHITECTURE 32-BIT AND 64-BIT" , Russell King , Ingo Molnar , Mark Salter , "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE" , Albert Ou , Stefan Kristiansson , Rob Herring , "moderated list:NIOS2 ARCHITECTURE" , Michal Simek , Vineet Gupta , Stephen Boyd , Ivan Kokshaysky , "open list:LINUX FOR POWERPC 32-BIT AND 64-BIT" Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" ARM64 is the only architecture that requires a re-definition of __early_init_dt_declare_initrd(). Now that we added the infrastructure in asm-generic to provide an asm/initrd.h file, properly break up that definition from asm/memory.h and make use of that header in drivers/of/fdt.c where this is used. This significantly cuts the number of objects that need to be rebuilt on ARM64 due to the repercusions of including asm/memory.h in several places. Signed-off-by: Florian Fainelli --- arch/arm64/include/asm/initrd.h | 13 +++++++++++++ arch/arm64/include/asm/memory.h | 8 -------- drivers/of/fdt.c | 1 + 3 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 arch/arm64/include/asm/initrd.h diff --git a/arch/arm64/include/asm/initrd.h b/arch/arm64/include/asm/initrd.h new file mode 100644 index 000000000000..0c9572485810 --- /dev/null +++ b/arch/arm64/include/asm/initrd.h @@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __ASM_INITRD_H +#define __ASM_INITRD_H + +#ifdef CONFIG_BLK_DEV_INITRD +#define __early_init_dt_declare_initrd(__start, __end) \ + do { \ + initrd_start = (__start); \ + initrd_end = (__end); \ + } while (0) +#endif + +#endif /* __ASM_INITRD_H */ diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h index b96442960aea..dc3ca21ba240 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -168,14 +168,6 @@ #define IOREMAP_MAX_ORDER (PMD_SHIFT) #endif -#ifdef CONFIG_BLK_DEV_INITRD -#define __early_init_dt_declare_initrd(__start, __end) \ - do { \ - initrd_start = (__start); \ - initrd_end = (__end); \ - } while (0) -#endif - #ifndef __ASSEMBLY__ #include diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 800ad252cf9c..4e4711af907b 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -28,6 +28,7 @@ #include /* for COMMAND_LINE_SIZE */ #include +#include #include "of_private.h"