linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: catalin.marinas@arm.com (Catalin Marinas)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/7] ARM: Align machine_desc.phys_io to a 1MB section
Date: Thu, 20 May 2010 14:21:41 +0100	[thread overview]
Message-ID: <20100520132141.7521.41564.stgit@e102109-lin.cambridge.arm.com> (raw)
In-Reply-To: <20100520131833.7521.66668.stgit@e102109-lin.cambridge.arm.com>

Platforms like RealView don't pass a section-aligned pointer via the
machine_desc structure. This patch aligns the pointer in the
__create_page_tables function. Reported by Tony Thompson.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
---
 arch/arm/kernel/head.S |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
index eb62bf9..82ea924 100644
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
@@ -302,6 +302,8 @@ __create_page_tables:
 	movhi	r3, #0x0800
 	add	r6, r0, r3
 	ldr	r3, [r8, #MACHINFO_PHYSIO]
+	mov	r3, r3, lsr #20			@ 1MB-aligned address
+	mov	r3, r3, lsl #20
 	orr	r3, r3, r7
 1:	str	r3, [r0], #4
 	add	r3, r3, #1 << 20

  parent reply	other threads:[~2010-05-20 13:21 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-20 13:21 [PATCH 0/7] Patches for 2.6.35 Catalin Marinas
2010-05-20 13:21 ` [PATCH 1/7] ARM: Improve the L2 cache performance when PL310 is used Catalin Marinas
2010-05-20 13:21 ` Catalin Marinas [this message]
2010-05-20 13:21 ` [PATCH 3/7] ARM: Avoid the CONSISTENT_DMA_SIZE warning on noMMU builds Catalin Marinas
2010-05-20 13:21 ` [PATCH 4/7] ARM: The v6_dma_inv_range() function must preserve data on SMP Catalin Marinas
2010-05-20 13:21 ` [PATCH 5/7] ARM: Add a config option for the ARM11MPCore DMA cache maintenance workaround Catalin Marinas
2010-05-20 13:22 ` [PATCH 6/7] ARM: Add support for the MOVW/MOVT relocations in Thumb-2 Catalin Marinas
2010-05-20 13:22 ` [PATCH 7/7] ARM: Remove dummy loads from the original relocation address Catalin Marinas

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100520132141.7521.41564.stgit@e102109-lin.cambridge.arm.com \
    --to=catalin.marinas@arm.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).