From patchwork Wed Nov 11 14:31:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Brandt X-Patchwork-Id: 7596071 X-Patchwork-Delegate: horms@verge.net.au Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1C44F9F2F7 for ; Wed, 11 Nov 2015 14:31:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 34D6920619 for ; Wed, 11 Nov 2015 14:31:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5CAEB20617 for ; Wed, 11 Nov 2015 14:31:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751324AbbKKOba (ORCPT ); Wed, 11 Nov 2015 09:31:30 -0500 Received: from relmlor4.renesas.com ([210.160.252.174]:21728 "EHLO relmlie3.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752089AbbKKOba (ORCPT ); Wed, 11 Nov 2015 09:31:30 -0500 Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie3.idc.renesas.com with ESMTP; 11 Nov 2015 23:31:28 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id CF0004DAF4; Wed, 11 Nov 2015 23:31:28 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id B6828480A3; Wed, 11 Nov 2015 23:31:28 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id B0117480A6; Wed, 11 Nov 2015 23:31:28 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac4.idc.renesas.com with ESMTP id ZAB28878; Wed, 11 Nov 2015 23:31:28 +0900 X-IronPort-AV: E=Sophos;i="5.20,276,1444662000"; d="scan'208";a="199538448" Received: from unknown (HELO rtamta01.rta.renesas.com) ([143.103.48.75]) by relmlii2.idc.renesas.com with ESMTP; 11 Nov 2015 23:31:27 +0900 Received: from localhost.localdomain (unknown [143.103.58.49]) by rtamta01.rta.renesas.com (Postfix) with ESMTP id 6D91A37F; Wed, 11 Nov 2015 14:31:24 +0000 (UTC) From: Chris Brandt To: linux@arm.linux.org.uk Cc: linux-arm-kernel@lists.infradead.org, linux-sh@vger.kernel.org, Chris Brandt Subject: [PATCH] ARM: xip: Fix module loading Date: Wed, 11 Nov 2015 09:31:09 -0500 Message-Id: <1447252269-22864-1-git-send-email-chris.brandt@renesas.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 For an XIP kernel, RAM start at _sdata instead of _stext. This fixes an issue where when you load a module, vmalloc would return virtual memory that the MMU has incorrectly mapped to non-RAM physical addresses. This fix is similar to what is already done in arm_memblock_init(). Signed-off-by: Chris Brandt --- arch/arm/mm/mmu.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index dd5a56b..d60cb8c 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -1383,7 +1383,11 @@ static void __init kmap_init(void) static void __init map_lowmem(void) { struct memblock_region *reg; +#ifdef CONFIG_XIP_KERNEL + phys_addr_t kernel_x_start = round_down(__pa(_sdata), SECTION_SIZE); +#else phys_addr_t kernel_x_start = round_down(__pa(_stext), SECTION_SIZE); +#endif phys_addr_t kernel_x_end = round_up(__pa(__init_end), SECTION_SIZE); /* Map all the lowmem memory banks. */