From patchwork Wed Dec 12 01:37:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Arve_Hj=C3=B8nnev=C3=A5g?= X-Patchwork-Id: 205348 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2694F2C008C for ; Wed, 12 Dec 2012 12:41:29 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TibH6-0001ej-Qr; Wed, 12 Dec 2012 01:38:16 +0000 Received: from mail-pb0-f47.google.com ([209.85.160.47]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TibH2-0001dk-35 for linux-arm-kernel@lists.infradead.org; Wed, 12 Dec 2012 01:38:13 +0000 Received: by mail-pb0-f47.google.com with SMTP id un1so83993pbc.34 for ; Tue, 11 Dec 2012 17:38:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=android.com; s=20120917; h=from:to:cc:subject:date:message-id:x-mailer:mime-version :content-type:content-transfer-encoding; bh=wibsrHe9wz8ECgeHoJx6IJMhxrowybKUltV/bbz5VQY=; b=NnrAEpkJZE1HJfDouOEom8AlkkyPse3vuKGeVU8CNph3AlZDFflVv32NQiI/t/nsuT c8aoL0vKoAgSbhTDgrxsfZRjUr1SOCIig/6lAah86B/wBjY1HO+Z1N5d3OG9HRP1mslK gtdbepw81L7exHammdZFZ14UUpetbq1AjGEMRts2PfVwumfgNGECz7iDOi88WrOnDCFa wEmK60IEuZDCNzt7+6cKJPkp82Nw7+hk/+S0zZpsUBlqshtQtMM/2oyrwMiwoMFC7EVT W972zmf7lYrxjtJso8sjx7HL1nXjHGiCd4Q3vkdTSdLZoopZIk9/regz5nUW+B5e7Rij LbgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:mime-version :content-type:content-transfer-encoding:x-gm-message-state; bh=wibsrHe9wz8ECgeHoJx6IJMhxrowybKUltV/bbz5VQY=; b=ViQrnrwC7OiaylkzZbA0M1ZDeYP8pSlcoZBFuGkKZB3TQ1+PTUSZ9315upYeFRCt6+ GLnAn0llC6CGK2ilV9dmX9ysZyNEoh9+A7cZqW8mqUCjBCx5b+oppQmb0F2fA+8BZ32g IAPb7uHWFZa0fvlmGkBBLHBHYJLNvzw+t3ttrTlh7RDNQKh12gBotXSpy9aX/1wYeYW1 vYe4m2Ell3937Z/WHJPxpsA2ij61uDedKbx/oUYgfHXDnSSeVcKfR4rn0pFuWEv+fJym KE5wjVddYlzgR+8Mfz9rCXZoOVccMnBpEkAlnRQrfZDh3xUxghSKhHFeihk/eyLxW8bI jNiw== Received: by 10.66.77.38 with SMTP id p6mr221280paw.47.1355276289578; Tue, 11 Dec 2012 17:38:09 -0800 (PST) Received: from arveh.mtv.corp.google.com (arveh.mtv.corp.google.com [172.18.104.28]) by mx.google.com with ESMTPS id wg3sm14665373pbc.28.2012.12.11.17.38.07 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 11 Dec 2012 17:38:08 -0800 (PST) From: =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= To: linux-kernel@vger.kernel.org Subject: [PATCH] ARM: mm: Split memory banks that span multiple sections when sparsemem is enabled Date: Tue, 11 Dec 2012 17:37:53 -0800 Message-Id: <1355276275-17859-1-git-send-email-arve@android.com> X-Mailer: git-send-email 1.7.7.3 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQkejeNUxR8gHAomOBcmnZkeGHw18BOc79Blr9t7OTPK7L4MYa7aBoLJ0fJEwA1ASAutaMuN X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121211_203812_265991_2071E23D X-CRM114-Status: GOOD ( 12.42 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.160.47 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= , "moderated list:ARM PORT" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org This fixes a crash in mem_init which assumes all pages in a memory bank are part of the same page array. Signed-off-by: Arve Hjønnevåg --- arch/arm/mm/mmu.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index 941dfb9..516956c 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -917,6 +917,28 @@ void __init sanity_check_meminfo(void) struct membank *bank = &meminfo.bank[j]; *bank = meminfo.bank[i]; +#ifdef CONFIG_SPARSEMEM + if (pfn_to_section_nr(bank_pfn_start(bank)) != + pfn_to_section_nr(bank_pfn_end(bank) - 1)) { + phys_addr_t sz; + unsigned long start_pfn = bank_pfn_start(bank); + unsigned long end_pfn = SECTION_ALIGN_UP(start_pfn + 1); + sz = ((phys_addr_t)(end_pfn - start_pfn) << PAGE_SHIFT); + + if (meminfo.nr_banks >= NR_BANKS) { + pr_crit("NR_BANKS too low, ignoring %lld bytes of memory\n", + (unsigned long long)(bank->size - sz)); + } else { + memmove(bank + 1, bank, + (meminfo.nr_banks - i) * sizeof(*bank)); + meminfo.nr_banks++; + bank[1].size -= sz; + bank[1].start = __pfn_to_phys(end_pfn); + } + bank->size = sz; + } +#endif + if (bank->start > ULONG_MAX) highmem = 1;