From patchwork Tue Sep 22 00:21:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 53990 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by patches.linaro.org (Postfix) with ESMTPS id 4593822B1E for ; Tue, 22 Sep 2015 00:23:53 +0000 (UTC) Received: by lbbmp1 with SMTP id mp1sf43795692lbb.2 for ; Mon, 21 Sep 2015 17:23:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:cc:mime-version :content-type:content-transfer-encoding:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list; bh=cyia5PwQ8vge5fDP0jiIbZwE13I1VqA7vaIA3I/baYY=; b=DfNDmkQQ1qEjBMGd5pSS7QzjH0N59R3jWipkfsh4ECeV6GhTGQH9U0PPYCTd4DRO7N XOGTTeEHS0XyqjQYpVyasTCam3quhwFWPgdFdwOhbCqUXwJ57I4gzQ9W1P8tfjy3M6bz JQ5EtGVepqugRxY9MCGYNnckhMpKZf03+4pn9FoG1lBoGOwGMf5chmgmzXSaafkWOnvg tjb2HwxappD/6WF3YMyj7Bi0dwm9V1ES6twdUvO1Gn8o4N5dBeYG0SKTUZIsoZBnr6xZ j7MZg8b9O1EqhCBIV54T0p2zE1S6KKYNnTAgvFPpst9pwg40ZwDIuQHXUqt8Cm2D67On wSvA== X-Gm-Message-State: ALoCoQkW/vIXeS2p5LKOK3dmafC4gt0wjxCQrOWISuSb5CNSHK9j6FXJvVeqUTZLmKgT2gWCNyvb X-Received: by 10.180.12.170 with SMTP id z10mr204715wib.1.1442881432120; Mon, 21 Sep 2015 17:23:52 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.242.163 with SMTP id wr3ls187844lac.105.gmail; Mon, 21 Sep 2015 17:23:51 -0700 (PDT) X-Received: by 10.112.125.134 with SMTP id mq6mr8665086lbb.19.1442881431971; Mon, 21 Sep 2015 17:23:51 -0700 (PDT) Received: from mail-lb0-f178.google.com (mail-lb0-f178.google.com. [209.85.217.178]) by mx.google.com with ESMTPS id s12si17627119lbp.106.2015.09.21.17.23.51 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Sep 2015 17:23:51 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.178 as permitted sender) client-ip=209.85.217.178; Received: by lbbvu2 with SMTP id vu2so59817470lbb.0 for ; Mon, 21 Sep 2015 17:23:51 -0700 (PDT) X-Received: by 10.112.180.230 with SMTP id dr6mr8642773lbc.72.1442881431863; Mon, 21 Sep 2015 17:23:51 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp178850lbq; Mon, 21 Sep 2015 17:23:51 -0700 (PDT) X-Received: by 10.180.99.5 with SMTP id em5mr17030546wib.43.1442881431298; Mon, 21 Sep 2015 17:23:51 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id c13si34781914wjr.154.2015.09.21.17.23.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Sep 2015 17:23:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; 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 1ZeBLn-0001LI-No; Tue, 22 Sep 2015 00:22:27 +0000 Received: from mail-pa0-f52.google.com ([209.85.220.52]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZeBLZ-00019v-NG for linux-arm-kernel@lists.infradead.org; Tue, 22 Sep 2015 00:22:14 +0000 Received: by padbj2 with SMTP id bj2so5632962pad.3 for ; Mon, 21 Sep 2015 17:21:53 -0700 (PDT) X-Received: by 10.68.107.5 with SMTP id gy5mr27218233pbb.121.1442881312916; Mon, 21 Sep 2015 17:21:52 -0700 (PDT) Received: from localhost.localdomain ([70.35.39.2]) by smtp.gmail.com with ESMTPSA id xv12sm26924984pac.38.2015.09.21.17.21.49 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 21 Sep 2015 17:21:52 -0700 (PDT) From: Ard Biesheuvel To: linux-efi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, leif.lindholm@linaro.org, mark.rutland@arm.com, catalin.marinas@arm.com, will.deacon@arm.com, msalter@redhat.com Subject: [PATCH v3 2/6] arm64: override generic version of early_init_dt_add_memory_arch() Date: Mon, 21 Sep 2015 17:21:24 -0700 Message-Id: <1442881288-13962-3-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1442881288-13962-1-git-send-email-ard.biesheuvel@linaro.org> References: <1442881288-13962-1-git-send-email-ard.biesheuvel@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150921_172213_833634_4609C019 X-CRM114-Status: GOOD ( 10.78 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.220.52 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.220.52 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 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: Ard Biesheuvel MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ard.biesheuvel@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.178 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 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 --- 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 ad87ce826cce..d88e83ebf60d 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -374,3 +374,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); +}