From patchwork Sat Feb 20 01:13:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Daney X-Patchwork-Id: 8365471 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9674AC0553 for ; Sat, 20 Feb 2016 01:17:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B75D42057F for ; Sat, 20 Feb 2016 01:17:42 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EAB6F20571 for ; Sat, 20 Feb 2016 01:17:41 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aWw9G-0004I6-17; Sat, 20 Feb 2016 01:15:50 +0000 Received: from mail-pf0-x22c.google.com ([2607:f8b0:400e:c00::22c]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aWw7O-0001oB-Md for linux-arm-kernel@lists.infradead.org; Sat, 20 Feb 2016 01:13:56 +0000 Received: by mail-pf0-x22c.google.com with SMTP id c10so61680396pfc.2 for ; Fri, 19 Feb 2016 17:13:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/V0OAHUmGlYuNh/g8HlvZglj5P9FBnM7e77KGRilayo=; b=CIKlSNf4gVM0DHAbILWIteYFR7HkOBCnrsBh1MWS3xnFBVm3iZdEJRveoWs+VwuV2O fCFhbDA/EQGJA1o9ho2j7XVqS9UiI9/eEtWhEXn0XJIoEVlbO2XvpWe6TbZhTeHMQn3w K1B3pGuc/PBY/GkMGMmvbpsDx0KyL9JYfgyhifwFLLblnJZQi+aXSx9XTIFIrplCNjun wpdsSfcaZYR9Mc53b9R2xc8xHcOx0ED0e3D2jY237c7TJFu7QnP/igQgEq0DrKYfgGFD iKO83MopJdJhxnQQAs9CqdrjguNcihpKI0sZikx9zXs9G4dKt3Vpk6USL9wuL1R7Kqw0 JQ4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=/V0OAHUmGlYuNh/g8HlvZglj5P9FBnM7e77KGRilayo=; b=P4ghfYxTbvrIPY/oNAFHUVDEkowXkuoQbs5tq4C/naddgn6uO56Aii69UQFxXDjItP GiPAFvWgZef1zdOo6DrujypABWoEgtuRpPAaVb1LihF5d2ffjJi6n93elIE05PzZRYSL hMhV8mOOyo1iuJ12/2K+AWWcWjQho2LGdUD/VkWG0Nzfue8FSVoVEJnF5QvKYluVRnIe +JJH5ver+Z8bOmG3GbUAXJnVaHsOda1fI6ZLzAXskB3dXlTG7mLA4tRVX6L3SETUZQ4c WtsXORoZNxHu3187DOADkmmzrLxQ53lokZBSXhg/zgOW5KSKEyizJ5alCRVKQ1ED9geE 4N3Q== X-Gm-Message-State: AG10YORgPANFiRZYuX5gCoIN7MBSFMGzonfyOsTk7nQtn7f+ElmHtFK71u6AhwhKKynXgg== X-Received: by 10.98.17.129 with SMTP id 1mr22289625pfr.30.1455930813000; Fri, 19 Feb 2016 17:13:33 -0800 (PST) Received: from dl.caveonetworks.com ([64.2.3.194]) by smtp.gmail.com with ESMTPSA id n78sm20355469pfb.53.2016.02.19.17.13.27 (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 19 Feb 2016 17:13:31 -0800 (PST) Received: from dl.caveonetworks.com (localhost.localdomain [127.0.0.1]) by dl.caveonetworks.com (8.14.5/8.14.5) with ESMTP id u1K1DR8k005422; Fri, 19 Feb 2016 17:13:27 -0800 Received: (from ddaney@localhost) by dl.caveonetworks.com (8.14.5/8.14.5/Submit) id u1K1DRrr005421; Fri, 19 Feb 2016 17:13:27 -0800 From: David Daney To: Will Deacon , linux-arm-kernel@lists.infradead.org, Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , devicetree@vger.kernel.org, Ard Biesheuvel , Frank Rowand , Grant Likely , Catalin Marinas , Matt Fleming , linux-efi@vger.kernel.org, Ganapatrao Kulkarni , Robert Richter Subject: [PATCH v11 02/10] arm64: override generic version of early_init_dt_add_memory_arch() Date: Fri, 19 Feb 2016 17:13:11 -0800 Message-Id: <1455930799-5371-3-git-send-email-ddaney.cavm@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1455930799-5371-1-git-send-email-ddaney.cavm@gmail.com> References: <1455930799-5371-1-git-send-email-ddaney.cavm@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160219_171354_971089_97810686 X-CRM114-Status: GOOD ( 10.43 ) X-Spam-Score: -2.7 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, David Daney MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Ard Biesheuvel Override the __weak early_init_dt_add_memory_arch() with our own version. We need this in a subsequent patch to make the handling of the memory nodes conditional on whether we are booting via UEFI or not. Note that for now, all that our version does is invoke the generic implementation. Signed-off-by: Ard Biesheuvel Signed-off-by: Robert Richter Signed-off-by: David Daney --- arch/arm64/mm/init.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index f3b061e..208c1d3 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -380,3 +380,8 @@ static int __init keepinitrd_setup(char *__unused) __setup("keepinitrd", keepinitrd_setup); #endif + +void __init early_init_dt_add_memory_arch(u64 base, u64 size) +{ + early_init_dt_add_memory(base, size); +}