From patchwork Mon Apr 18 21:14:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Daney X-Patchwork-Id: 8875321 Return-Path: X-Original-To: patchwork-linux-acpi@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 6A69FBF29F for ; Mon, 18 Apr 2016 21:17:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8807A2024C for ; Mon, 18 Apr 2016 21:17:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8DDFB2011E for ; Mon, 18 Apr 2016 21:17:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751957AbcDRVRg (ORCPT ); Mon, 18 Apr 2016 17:17:36 -0400 Received: from mail-pa0-f48.google.com ([209.85.220.48]:35661 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751938AbcDRVOe (ORCPT ); Mon, 18 Apr 2016 17:14:34 -0400 Received: by mail-pa0-f48.google.com with SMTP id fs9so63778979pac.2; Mon, 18 Apr 2016 14:14:34 -0700 (PDT) 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=r8kj3Yys5l+ueahwFpNk2JXMamqm4CYbXflGrHZjNN4=; b=VshdrAEX49VLbFITiqKRcJPfJ7XTIdbNZVSr/fdsKupiv1pd7qNh49kFVWhFXRMJB3 RHUuD8phcnLE2c9qMVpaYc0XeQSyHKJ0p7MWxBT/wR77TDYwDRuIYg6eJiPWLF8ZP87Q jyhTDOiZ4S7g0nnbUD3m9NAvdwXIFSGT+HNm7OhYIG5KQbwuPNzeJAg3Vgqv6XBx5OKy OFDmmu1ktcj1I1xXy5myvfxSC83WWsQHI7qk5mmtk8Z5Hy/xvrodI6JTzCLXXCJdxSkN rKkwhjj8B3T9rFRb8+Wk818pZhw1dQHPMib6QvhE6CdKMHiooS/cJY5sOfJeAafQsBtw tVrQ== 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=r8kj3Yys5l+ueahwFpNk2JXMamqm4CYbXflGrHZjNN4=; b=A9RYeXZJ7zRs1hb6R+TLK6lNDPLmltQMwA8yEmCLlvi/gAibCk+4aTpt6RcHePfXj1 UzdRLVvrGAs1gdT6fAsYZIG2dQgowL+d+meHSJSP2iTb+i8ffGzm4xE0DWnmQ/cpjSj/ KQ7nRQMxhsoRial+Ps5b3xMwhHo53BSxfPRPEP6dqW0fpHoL+YBcHgTumBLOXFGOcDuW 4YMe8tyYFZi1Do21AQ/gM9Kwdq+wM44BQdg2JOtwYMz6aB/yWHOhqDcc7m/USkx3x698 RGAjRJqFWlQ3M37z1ZxoJrSvC0oaQBxQUD4yG+eoxgkx+7qFzdl/KbXIaY0js5Mb8BwY iPjw== X-Gm-Message-State: AOPr4FVy0zFclRzclBtQ2D1VZtU26zHOJ5kMajhaEvYzHuOwHO8qv133XFjZotpUmvRchg== X-Received: by 10.66.65.109 with SMTP id w13mr52050635pas.142.1461014073589; Mon, 18 Apr 2016 14:14:33 -0700 (PDT) Received: from dl.caveonetworks.com ([64.2.3.194]) by smtp.gmail.com with ESMTPSA id 16sm85828826pfk.28.2016.04.18.14.14.27 (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 18 Apr 2016 14:14:29 -0700 (PDT) Received: from dl.caveonetworks.com (localhost.localdomain [127.0.0.1]) by dl.caveonetworks.com (8.14.5/8.14.5) with ESMTP id u3ILEQoA030861; Mon, 18 Apr 2016 14:14:26 -0700 Received: (from ddaney@localhost) by dl.caveonetworks.com (8.14.5/8.14.5/Submit) id u3ILEQdv030860; Mon, 18 Apr 2016 14:14:26 -0700 From: David Daney To: Will Deacon , linux-arm-kernel@lists.infradead.org, Mark Rutland , Catalin Marinas , Tony Luck , Fenghua Yu , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, "Rafael J. Wysocki" , Len Brown , Rob Herring , Frank Rowand , Grant Likely , Robert Moore , Lv Zheng , Hanjun Guo , Marc Zyngier , linux-ia64@vger.kernel.org, linux-acpi@vger.kernel.org, devel@acpica.org Cc: linux-kernel@vger.kernel.org, Robert Richter , David Daney Subject: [PATCH v4 06/14] arm64, numa: rework numa_add_memblk() Date: Mon, 18 Apr 2016 14:14:04 -0700 Message-Id: <1461014052-30788-7-git-send-email-ddaney.cavm@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1461014052-30788-1-git-send-email-ddaney.cavm@gmail.com> References: <1461014052-30788-1-git-send-email-ddaney.cavm@gmail.com> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable 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: Hanjun Guo Rework numa_add_memblk() to update the parameter "u64 size" to "u64 end", this will make it consistent with x86 and simplifies the arm64 ACPI NUMA code to be added later. Signed-off-by: Hanjun Guo Signed-off-by: Robert Richter Signed-off-by: David Daney --- arch/arm64/mm/numa.c | 12 ++++++------ drivers/of/of_numa.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm64/mm/numa.c b/arch/arm64/mm/numa.c index 98dc104..6cb03f9 100644 --- a/arch/arm64/mm/numa.c +++ b/arch/arm64/mm/numa.c @@ -131,25 +131,25 @@ void __init early_map_cpu_to_node(unsigned int cpu, int nid) * numa_add_memblk - Set node id to memblk * @nid: NUMA node ID of the new memblk * @start: Start address of the new memblk - * @size: Size of the new memblk + * @end: End address of the new memblk * * RETURNS: * 0 on success, -errno on failure. */ -int __init numa_add_memblk(int nid, u64 start, u64 size) +int __init numa_add_memblk(int nid, u64 start, u64 end) { int ret; - ret = memblock_set_node(start, size, &memblock.memory, nid); + ret = memblock_set_node(start, (end - start), &memblock.memory, nid); if (ret < 0) { pr_err("NUMA: memblock [0x%llx - 0x%llx] failed to add on node %d\n", - start, (start + size - 1), nid); + start, (end - 1), nid); return ret; } node_set(nid, numa_nodes_parsed); pr_info("NUMA: Adding memblock [0x%llx - 0x%llx] on node %d\n", - start, (start + size - 1), nid); + start, (end - 1), nid); return ret; } @@ -367,7 +367,7 @@ static int __init dummy_numa_init(void) 0LLU, PFN_PHYS(max_pfn) - 1); for_each_memblock(memory, mblk) { - ret = numa_add_memblk(0, mblk->base, mblk->size); + ret = numa_add_memblk(0, mblk->base, mblk->base + mblk->size); if (!ret) continue; diff --git a/drivers/of/of_numa.c b/drivers/of/of_numa.c index 0f2784b..ed5a097 100644 --- a/drivers/of/of_numa.c +++ b/drivers/of/of_numa.c @@ -91,8 +91,8 @@ static int __init of_numa_parse_memory_nodes(void) pr_debug("NUMA: base = %llx len = %llx, node = %u\n", rsrc.start, rsrc.end - rsrc.start + 1, nid); - r = numa_add_memblk(nid, rsrc.start, - rsrc.end - rsrc.start + 1); + + r = numa_add_memblk(nid, rsrc.start, rsrc.end + 1); if (r) break; }