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: 988395 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-snps-arc-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="XvpWVU3G"; 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 bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42fqfb2n5Nz9sLt for ; Wed, 24 Oct 2018 10:41:42 +1100 (AEDT) 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=nEK12TwimGCujNUldIGwHId5Lafwq/X4Yeeo8waJe0Y=; b=XvpWVU3GaKopasRjOYAevt8ZXl bUlc/zfAjWmj5FAptuJQ7d7pKjVdwpSZTFw5WgP9jV7LEQQ0Y9ixVS6IszQFJuKuW2CcarfrgYkq9 GZN0ZgNLePqnImUL0Xua7aklkdO72hDScLu4bmuHOj8LJ7uCfqQ/4cM0zlEXf4LhTXRkYVYuhCHSF 2usBwAV5hF8uuvavFCs/k/0WdtGTn8nKwIz2PeSGuU8+EshQGZJC49R0sbIzNK6Co0RE5MWFILubo n5zXa825YxNlNhuQZ6aVIB6+x1Tg2sAKfb3SpWscEjaGNJt1eSuPwWoN/f2HEVr35Iq8fr8fW65FI zk3U5V9A==; 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 1gF6It-0006qZ-EX; Tue, 23 Oct 2018 23:41:39 +0000 Received: from mail-pl1-x644.google.com ([2607:f8b0:4864:20::644]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gF6Ig-0006jW-83; Tue, 23 Oct 2018 23:41:32 +0000 Received: by mail-pl1-x644.google.com with SMTP id t6-v6so1319532plo.9; Tue, 23 Oct 2018 16:41:15 -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=UxHFjrCF1CTz6Adt5w6wotGcP3WyJYRk2gDBgE9nWFWIeKs2nlxgsbepYnedZytfnr lHUeTKpmGBijl03Piw0jcwT6kAtxe1kqC83hJ0r94ssWLlBQNN+SLH7jFz0v9y9Jo6Bx zTMfbGsI4tMQYiZpQgG+WjTuedc86hRXhp6/mb+3xGMPDZX1Z38NkINuhqB3ENUQa1ur /OrDI38m90/Xz2SJkvMJ3J6q0yCd4rpEGLhzuX5u9rxoECG0bvSYB2b9gv1i96FUsvlf XhQ8SH5NmYtQnflvJ2rYr+vCL4fcKQPtqdtFfXUBc0uaUcaQm3rGY2IY7Bx3EZ5Sjsmm CKlg== X-Gm-Message-State: AGRZ1gJGMDJIE0HPM+n6on3fE1tSvhGNW+X3zoTFXCKS0IRSkCpl68Qf ExbXYox3yK5L/NExXUDKwsM= 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181023_164126_329859_B9EA7B35 X-CRM114-Status: GOOD ( 17.55 ) X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:644 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (f.fainelli[at]gmail.com) 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-snps-arc@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux on Synopsys ARC Processors List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "open list:MIPS" , Alan Kao , "open list:SUPERH" , Benjamin Herrenschmidt , Will Deacon , Paul Mackerras , "open list:GENERIC INCLUDE/ASM HEADER FILES" , Michael Ellerman , "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" MIME-Version: 1.0 Sender: "linux-snps-arc" Errors-To: linux-snps-arc-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org 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"