From patchwork Tue Jul 18 11:41:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijay Kilari X-Patchwork-Id: 9848091 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 7D42960392 for ; Tue, 18 Jul 2017 11:45:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6A89C283C3 for ; Tue, 18 Jul 2017 11:45:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5FA3A28497; Tue, 18 Jul 2017 11:45:09 +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=-2.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_MED,RCVD_IN_SORBS_SPAM, RCVD_IN_SORBS_WEB,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 1233D283C3 for ; Tue, 18 Jul 2017 11:45:09 +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 1dXQu3-0006j0-8d; Tue, 18 Jul 2017 11:42:59 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dXQu1-0006hV-Cj for xen-devel@lists.xen.org; Tue, 18 Jul 2017 11:42:57 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id DF/48-01712-044FD695; Tue, 18 Jul 2017 11:42:56 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrKIsWRWlGSWpSXmKPExsXiVRvspOvwJTf S4OhJNoslHxezODB6HN39mymAMYo1My8pvyKBNePF7utMBYc5K+48XMHcwHiCvYuRi0NIYCKj xNWFHYwgDovASxaJ+W/Os4A4EgL9rBKTp30AynAAOXESq/75Q5jlEvN6gUo4gZpVJTr+v4Ua1 MYk0bvoNBNIgk1ARuLI8wNgtoiAtMS1z5fBFjALbGOS2HR9KjtIQljAVeL6mQVgNgvQpBmzr4 NN5RVwk5g6YSMLxDIFiTmTbEDCnEDhRV2X2CEWu0rc6FvJOoFRYAEjwypGjeLUorLUIl1Dc72 kosz0jJLcxMwcXUMDU73c1OLixPTUnMSkYr3k/NxNjMDAYgCCHYwXT3seYpTkYFIS5V19IDdS iC8pP6UyI7E4I76oNCe1+BCjDAeHkgRvySegnGBRanpqRVpmDjDEYdISHDxKIrw3QdK8xQWJu cWZ6RCpU4zGHJMObP/CxPFqwv9vTEIsefl5qVLivGtASgVASjNK8+AGwWLvEqOslDAvI9BpQj wFqUW5mSWo8q8YxTkYlYR5X4JM4cnMK4Hb9wroFCagU4R9c0BOKUlESEk1ME412d6luLr44m7 P39mTFY1rLCa5XZfVOnRp4d2l5yeYPg1Mf3hmdd65abwFm3I6klt395zme2aSJrjpjOfSxv6a 0P8N2Q0nA5pcv63P+/D9NfsL3YbUzV/9+l55/i8/smDT7Q6t8q2RR4pUk/8eSvn9oGC2oFt8u Djfhe652yXui+i8Z7vQtlWJpTgj0VCLuag4EQDvhasIuAIAAA== X-Env-Sender: vijay.kilari@gmail.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1500378174!100500941!1 X-Originating-IP: [74.125.83.66] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.25; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7973 invoked from network); 18 Jul 2017 11:42:55 -0000 Received: from mail-pg0-f66.google.com (HELO mail-pg0-f66.google.com) (74.125.83.66) by server-7.tower-206.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 18 Jul 2017 11:42:55 -0000 Received: by mail-pg0-f66.google.com with SMTP id v190so2548851pgv.1 for ; Tue, 18 Jul 2017 04:42:55 -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=Fa3TUFVcAOEr7THsoYAlFR+5v2WtuYQV4kvyZv/T9/U=; b=EjvudjvhJWlAeHKBl4yqDd/9zQAnw6dCihOSwOTYpCfmQMRyzrG80a5Ctbh/55l5hO hCn+zU9eAFVN78vIrY+JiHdg0JN+PW7mOYtn31ucIlkC+ny/sOuFNOOxPHMimiwlGhi7 QvyF5eQETg2q8pZcCriP33BI3l516+XiIPNvnFcK65jZfs64BCyQfVkiAbPhuvbZSpk7 yRK396cyVtwSHDHRnAXN78YaJYxqAOrv5f+XIx6OT1+rvNGY/ynBnnx7ZNUg4oxjup/Y SS51Ir1nfSjb+Mp1I25D4+uh7R/8LCtF/epSy97jWsXAYwqSUJPXy1FVaP6W0FT7NehD FYoQ== 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=Fa3TUFVcAOEr7THsoYAlFR+5v2WtuYQV4kvyZv/T9/U=; b=h9rnK2PW//UjBhvImWHugA5mKR14WiQGviTQu6lC8eGpLEbLtWGTUqUHaIWM7UC0aQ xxE3tGoz4K8KlI810uKO5aKoZH/r2DLSpqwIZJdnysK4Miyro28ZlOLdr6ub29iW7o6P UfG13kbIeX5whAqQv6p+M+3SsL+IYJ2GCMxbYjbX64OYm+h/ksuxpZoZiosS2nGA3LK0 0BRDnikLfge9Iu//IUVL8Z5Q+WKTTs13jGJnHHZzqJGogyEugxSiheWO1bRFCESauOsc qlVEGqBJyoi0cdsrhVnPz4X58eClLXHWQ66Byu/QAj9XhACE9fCsOsDJlfr1IN3zXNql RwWA== X-Gm-Message-State: AIVw112L2fO/AK9vgHiPyy/UunQNbpWJpMhGf8PSvucjUIGSPqLPDKnM sEM1y7unupJd7b/u X-Received: by 10.84.134.34 with SMTP id 31mr1272769plg.57.1500378174219; Tue, 18 Jul 2017 04:42:54 -0700 (PDT) Received: from cavium-Vostro-2520.caveonetworks.com ([111.93.218.67]) by smtp.gmail.com with ESMTPSA id r27sm4879707pfe.0.2017.07.18.04.42.50 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 18 Jul 2017 04:42:53 -0700 (PDT) From: vijay.kilari@gmail.com To: xen-devel@lists.xen.org Date: Tue, 18 Jul 2017 17:11:32 +0530 Message-Id: <1500378106-2620-11-git-send-email-vijay.kilari@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1500378106-2620-1-git-send-email-vijay.kilari@gmail.com> References: <1500378106-2620-1-git-send-email-vijay.kilari@gmail.com> Cc: kevin.tian@intel.com, sstabellini@kernel.org, wei.liu2@citrix.com, George.Dunlap@eu.citrix.com, andrew.cooper3@citrix.com, dario.faggioli@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 v3 10/24] NUMA: Allow numa initialization with DT 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 The common code allows numa initialization only when ACPI_NUMA config is enabled. Allow initialization when NUMA config is enabled for DT. In this patch, along with acpi_numa, check for acpi_disabled is added. Signed-off-by: Vijaya Kumar K --- xen/common/numa.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/xen/common/numa.c b/xen/common/numa.c index 74c4697..5e985d2 100644 --- a/xen/common/numa.c +++ b/xen/common/numa.c @@ -324,7 +324,7 @@ static int __init numa_scan_nodes(paddr_t start, paddr_t end) for ( i = 0; i < MAX_NUMNODES; i++ ) cutoff_node(i, start, end); - if ( acpi_numa <= 0 ) + if ( !acpi_disabled && acpi_numa <= 0 ) return -1; if ( !arch_sanitize_nodes_memory() ) @@ -430,11 +430,9 @@ void __init numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn) return; #endif -#ifdef CONFIG_ACPI_NUMA if ( !numa_off && !numa_scan_nodes(pfn_to_paddr(start_pfn), pfn_to_paddr(end_pfn)) ) return; -#endif printk(KERN_INFO "%s\n", numa_off ? "NUMA turned off" : "No NUMA configuration found");