From patchwork Tue Mar 28 15:53:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijay Kilari X-Patchwork-Id: 9650065 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A9F06602C8 for ; Tue, 28 Mar 2017 15:56:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9B775283E8 for ; Tue, 28 Mar 2017 15:56:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9008628405; Tue, 28 Mar 2017 15:56:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4E753283E8 for ; Tue, 28 Mar 2017 15:56:37 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cstSB-000777-Kz; Tue, 28 Mar 2017 15:54:39 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cstSA-000754-3E for xen-devel@lists.xen.org; Tue, 28 Mar 2017 15:54:38 +0000 Received: from [193.109.254.147] by server-2.bemta-6.messagelabs.com id 0A/D2-19731-D378AD85; Tue, 28 Mar 2017 15:54:37 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprHIsWRWlGSWpSXmKPExsXiVRvsomvbfiv C4PUCXoslHxezODB6HN39mymAMYo1My8pvyKBNePNs+vsBRu5Kp5eK2pg/MjRxcjFISQwiVHi SvdJFhCHReAli8Sn5ofMXYycHBIC/awSL/ZUQtgxEgcnv2OBsCskXhxfwgZiCwmoSnT8f8sOM ekbo8SB9g5GkASbgIzEkecHmEBsEQFpiWufLzOCFDELNDNJ9O0G6ebgEBYIlXh6gh+khgVo0K bjb8EW8Aq4S1ztus0IUiIhoCAxZ5INSJgTKLzpyVpmiL1uErfPXGScwCiwgJFhFaNGcWpRWWq RrqGhXlJRZnpGSW5iZo6uoYGZXm5qcXFiempOYlKxXnJ+7iZGYFgxAMEOxk/LAg4xSnIwKYny fgi6FSHEl5SfUpmRWJwRX1Sak1p8iFGGg0NJgvd1K1BOsCg1PbUiLTMHGOAwaQkOHiUR3jqQN G9xQWJucWY6ROoUoy7Hh/7Db5iEWPLy81KlxHmfghQJgBRllObBjYBF2yVGWSlhXkago4R4Cl KLcjNLUOVfMYpzMCoJ8yq3AU3hycwrgdv0CugIJqAjxG3AjihJREhJNTCaZnrmGO2s0BFk5Ja PcbgaWs4W9r3eJ06k99Bbq9RFN5l6k95tSrVhN/xoZZYXmWUR9Nr7t9RnqeBlbC+slAMqWfU6 v2gHGv88r1t63ODBnVIvL73Jv+dlnDQqmf0zpPPEQ5uIJxwXfv67WDh/ys+eFA2p4iOrA9myO A+1q5u450tYW1yMU2Ipzkg01GIuKk4EAP7Zl/ixAgAA X-Env-Sender: vijay.kilari@gmail.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1490716475!88674317!1 X-Originating-IP: [74.125.83.68] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.2.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 40040 invoked from network); 28 Mar 2017 15:54:37 -0000 Received: from mail-pg0-f68.google.com (HELO mail-pg0-f68.google.com) (74.125.83.68) by server-5.tower-27.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 28 Mar 2017 15:54:37 -0000 Received: by mail-pg0-f68.google.com with SMTP id o123so19567683pga.1 for ; Tue, 28 Mar 2017 08:54:36 -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=w48va3cExOGJeJin03OTBtMLsg9SImTyKMqB5YUHwOQ=; b=Fs1mj1zgYs2WEpn0cRXgfCLUsyCOUhsXczFMmJlcBhMUzI8car0pzXU3N3icMjNppm /wtxpMSy6BRAtuEbcfYN69hhjsiXHkEFXwmo3xw4SmH1l+dFxfOR9WBma+T2rQdg4uBP 4WCq+o5Dg3w3Q4NI5z+UVklsdzn4mGJqk9xewG09KUJPMNh3ULTmfQMaY/ng+5O/33C4 oynXSvP+cCBrHmLVljYGAnzKy6vx3zqXsNH8LPXawL23f+AEkfpAhvh2gOUnEAuMtKwH l+dxdPPWBWMcup+rU/2VJsQ7kk6PZyAQGXFDAVLnmGtuR4SBdLxV68UrM0AyT3yfrlXT yzzA== 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=w48va3cExOGJeJin03OTBtMLsg9SImTyKMqB5YUHwOQ=; b=BUMpYrNW/Wveu8N5Zrltcr5ZOl6skFOc030xCr1AdNQvWDhjDJc3bTQp9aBmIiizvz WDhRYhR019+54uMe8oAqVWZvl00W9sN2nqbLoPHYUKEJ/Pr2fsJj15mFvOzPoLSJ1B6w jtTtgcppIAYjC9Z9PjfO2Su3och1Q8+MNvpoLAJdB0Vr8BPPHRzUw8sKpvo1P+OUyI6a ou2bu68AIgqlfawr7iXVHZZvQYCsIMLjbII4n5AoF9kQbqcKOzG/aZamb13sH9lgUNmq t6LHeJ6alYA3DfALuyGrimMww2PmI8lesFaANYQ7IJDg237vcvYPlGB1lmFpoW07G71e A3GA== X-Gm-Message-State: AFeK/H3nBvqTLX2gx5ykBTBNbodQtqHef6fQdNU/BOL9qRLHIi7+tp8gBPnD0XjOQnI2HQ== X-Received: by 10.99.247.69 with SMTP id f5mr31818692pgk.63.1490716475536; Tue, 28 Mar 2017 08:54:35 -0700 (PDT) Received: from localhost.localdomain ([14.140.2.178]) by smtp.gmail.com with ESMTPSA id y7sm8298867pfk.93.2017.03.28.08.54.31 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Mar 2017 08:54:35 -0700 (PDT) From: vijay.kilari@gmail.com To: xen-devel@lists.xen.org Date: Tue, 28 Mar 2017 21:23:17 +0530 Message-Id: <1490716413-19796-10-git-send-email-vijay.kilari@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1490716413-19796-1-git-send-email-vijay.kilari@gmail.com> References: <1490716413-19796-1-git-send-email-vijay.kilari@gmail.com> Cc: sstabellini@kernel.org, wei.liu2@citrix.com, George.Dunlap@eu.citrix.com, andrew.cooper3@citrix.com, ian.jackson@eu.citrix.com, tim@xen.org, julien.grall@arm.com, jbeulich@suse.com, Vijaya Kumar K Subject: [Xen-devel] [RFC PATCH v2 09/25] ARM: NUMA: Add existing ARM numa code under CONFIG_NUMA X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Vijaya Kumar K Right now CONFIG_NUMA is not enabled for ARM and existing code in asm-arm/numa.h is for !CONFIG_NUMA. Hence put this code under #ifndef CONFIG_NUMA. This help to make this changes work when CONFIG_NUMA is not enabled. Also define NODES_SHIFT macro for ARM to value 2. This limits number of NUMA nodes supported to 4. There is not hard restrictions on this value set to 2. Signed-off-by: Vijaya Kumar K --- xen/include/asm-arm/numa.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/xen/include/asm-arm/numa.h b/xen/include/asm-arm/numa.h index 53f99af..924bfc0 100644 --- a/xen/include/asm-arm/numa.h +++ b/xen/include/asm-arm/numa.h @@ -3,6 +3,10 @@ typedef uint8_t nodeid_t; +/* Limit number of NUMA nodes supported to 4 */ +#define NODES_SHIFT 2 + +#ifndef CONFIG_NUMA /* Fake one node for now. See also node_online_map. */ #define cpu_to_node(cpu) 0 #define node_to_cpumask(node) (cpu_online_map) @@ -16,6 +20,7 @@ static inline __attribute__((pure)) nodeid_t phys_to_nid(paddr_t addr) #define node_spanned_pages(nid) (total_pages) #define node_start_pfn(nid) (pdx_to_pfn(frametable_base_pdx)) #define __node_distance(a, b) (20) +#endif /* CONFIG_NUMA */ static inline unsigned int arch_get_dma_bitsize(void) {