From patchwork Sun Oct 19 01:45:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel J Blueman X-Patchwork-Id: 5100571 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id F11E1C11AC for ; Sun, 19 Oct 2014 01:47:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 28893201C8 for ; Sun, 19 Oct 2014 01:47:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3911F201ED for ; Sun, 19 Oct 2014 01:47:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751823AbaJSBrU (ORCPT ); Sat, 18 Oct 2014 21:47:20 -0400 Received: from numascale.com ([213.162.240.84]:33164 "EHLO numascale.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751792AbaJSBrN (ORCPT ); Sat, 18 Oct 2014 21:47:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=numascale.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=uuGPrI4TyZ3gLNBlO2J/nr773+ECX8WVfqACsbvjo5c=; b=hhvDk/p2RG6SFdpuiMxc6rQ4WUDnAF/XJ+vnsFg430eY3mTqMFc61ygkN8/MGwtf0qaSwt45zCXw36sfqtqbnoFuPCRGJ0mq9cScQ/N0D+zLs5vRg2+z8zecclksl5gYF1X41vD1I9w3h1fmAkhTRqZRKFVjGT3H9Esbjp+4A+8=; Received: from [115.42.131.38] (port=40214 helo=meiko.int.numascale.com) by cpanel21.proisp.no with esmtpsa (UNKNOWN:AES128-SHA256:128) (Exim 4.82) (envelope-from ) id 1XffaG-003BXU-DN; Sun, 19 Oct 2014 03:47:00 +0200 From: Daniel J Blueman To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Bjorn Helgaas Cc: Daniel J Blueman , x86@kernel.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, Steffen Persvold Subject: [PATCH v2 5/5] Numachip: use 2GB memory block size Date: Sun, 19 Oct 2014 09:45:52 +0800 Message-Id: <1413683152-31302-5-git-send-email-daniel@numascale.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1413683152-31302-1-git-send-email-daniel@numascale.com> References: <1413683152-31302-1-git-send-email-daniel@numascale.com> X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - cpanel21.proisp.no X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - numascale.com X-Get-Message-Sender-Via: cpanel21.proisp.no: authenticated_id: daniel@numascale.com X-Source: X-Source-Args: X-Source-Dir: Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, 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 Use appropriate memory block size to reduce sysfs entry creation time by 16x. Boot-tested with the four permutations of X86_UV and X86_NUMACHIP. Signed-off-by: Daniel J Blueman --- arch/x86/mm/init_64.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 5621c47..22ea6de 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -53,6 +53,7 @@ #include #include #include +#include #include #include "mm_internal.h" @@ -1235,9 +1236,9 @@ static unsigned long probe_memory_block_size(void) /* start from 2g */ unsigned long bz = 1UL<<31; -#ifdef CONFIG_X86_UV - if (is_uv_system()) { - printk(KERN_INFO "UV: memory block size 2GB\n"); +#ifdef CONFIG_X86_64 + if (is_uv_system() || is_numachip_system()) { + pr_info("Memory block size 2GB for large-SMP system\n"); return 2UL * 1024 * 1024 * 1024; } #endif