From patchwork Wed Apr 20 01:40:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Daney X-Patchwork-Id: 8884791 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 7830ABF29F for ; Wed, 20 Apr 2016 01:42:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9246D2026F for ; Wed, 20 Apr 2016 01:42:57 +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 A586620260 for ; Wed, 20 Apr 2016 01:42:56 +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 1ash98-0000wK-2q; Wed, 20 Apr 2016 01:41:38 +0000 Received: from mail-pf0-x233.google.com ([2607:f8b0:400e:c00::233]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ash8h-0000Q0-7D for linux-arm-kernel@lists.infradead.org; Wed, 20 Apr 2016 01:41:12 +0000 Received: by mail-pf0-x233.google.com with SMTP id e128so12362886pfe.3 for ; Tue, 19 Apr 2016 18:40:54 -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=kZkE+iW9XLbVzA1490XinbDJcwY4EOx/bvHs7/gZRw42NMB0mZvHZgE9AATvDT5nVj 82YEVhPI+C5PNihZklF5A72QPIUZwwwm7UoOwjs0Hp/Dtve3+m5ItN2r/7i2oeqbyziX VV87f3zk3xO/7JItiSXGH0IlfmnfKciVc4SwsGYhJ4bl1H6UumczL4glTjAVSe/CgIrb T4Y5fZTtp97EJMYPrEXoUZDDVkPFM8edtDr4fqoPz9LugeyCwv3SxHS5LwqZ5pKzjQ+r ZZZA7BQgyzyr0+9iHjQjc1UxrcTog8zAulA0SK4JgH2vsrik3dlcn+qZnLsnu4rYn0w1 PFxw== 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=ZUlNJNsJK7QHs8UKWFCQEWmJXxY5CtsQU+zw8sfpiZ57Sgus3Z1x1nvzWdcORTdgmP gPQBpoZ8OjrHbD/6yjsQkfj11XfrhvqLYBWSsggntv0P4MjgqaSDuzjDmTOdMIVNdpc5 aoQBQHBMi6YcX+kEbHD4HqXP7s8mjYVKp/J7Hmf2Taehu2a+3NvbNnt4H9XSiPOsLXd/ KdQ0RQBn2cDu+KMmQCw1gUjEbwdnHeA11lQf51AU8z7OqPynt8iy+0MOju3wf2X/VL/K hF7KF3xml7cdoBUBpUWITFsgTAFoS6omqnVjxBKCp53uC20IElNk4yDU+vQgoB4Dv4r6 ZlXQ== X-Gm-Message-State: AOPr4FUBthescKx8fMqIJo94xSvQskM/ULHLIUWTenoRCZBRDRCsji7zQ1yj51gqCxDr4Q== X-Received: by 10.98.80.150 with SMTP id g22mr8603782pfj.132.1461116454187; Tue, 19 Apr 2016 18:40:54 -0700 (PDT) Received: from dl.caveonetworks.com ([64.2.3.194]) by smtp.gmail.com with ESMTPSA id c200sm36302488pfb.33.2016.04.19.18.40.47 (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 19 Apr 2016 18:40:52 -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 u3K1ekCr023063; Tue, 19 Apr 2016 18:40:46 -0700 Received: (from ddaney@localhost) by dl.caveonetworks.com (8.14.5/8.14.5/Submit) id u3K1ek1v023061; Tue, 19 Apr 2016 18:40:46 -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 Subject: [PATCH v5 06/14] arm64, numa: rework numa_add_memblk() Date: Tue, 19 Apr 2016 18:40:31 -0700 Message-Id: <1461116439-22991-7-git-send-email-ddaney.cavm@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1461116439-22991-1-git-send-email-ddaney.cavm@gmail.com> References: <1461116439-22991-1-git-send-email-ddaney.cavm@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160419_184111_399023_A2A31430 X-CRM114-Status: GOOD ( 16.99 ) 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: Robert Richter , 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=-5.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=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; }