From: David Brown <davidb@codeaurora.org>
To: David Brown <davidb@codeaurora.org>,
Daniel Walker <dwalker@fifo99.com>,
Bryan Huntsman <bryanh@codeaurora.org>,
Russell King <linux@arm.linux.org.uk>
Cc: Rohit Vaswani <rvaswani@codeaurora.org>,
linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org
Subject: [PATCH 06/24] ARM: msm: io: Change the default static iomappings to be shared
Date: Wed, 12 Sep 2012 09:58:42 -0700 [thread overview]
Message-ID: <1347469140-25069-7-git-send-email-davidb@codeaurora.org> (raw)
In-Reply-To: <1347469140-25069-1-git-send-email-davidb@codeaurora.org>
From: Rohit Vaswani <rvaswani@codeaurora.org>
With 3.4 kernel the static iomappings can be shared with the ioremap
mappings. If ioremap is called with an address for which a static
mapping already exists, then that mapping should be used instead
of creating a new one.
However, the MT_DEVICE_NONSHARED flag prevents this. Hence, get rid
of this flag. Some targets (7X00) that require the static iomappings
to be NONSHARED use the MSM_DEVICE_TYPE and MSM_CHIP_DEVICE_TYPE macros.
Signed-off-by: Rohit Vaswani <rvaswani@codeaurora.org>
Signed-off-by: David Brown <davidb@codeaurora.org>
---
arch/arm/mach-msm/io.c | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/arch/arm/mach-msm/io.c b/arch/arm/mach-msm/io.c
index 2409c0b..af43f6a 100644
--- a/arch/arm/mach-msm/io.c
+++ b/arch/arm/mach-msm/io.c
@@ -29,27 +29,31 @@
#include <mach/board.h>
-#define MSM_CHIP_DEVICE(name, chip) { \
+#define MSM_CHIP_DEVICE_TYPE(name, chip, mem_type) { \
.virtual = (unsigned long) MSM_##name##_BASE, \
.pfn = __phys_to_pfn(chip##_##name##_PHYS), \
.length = chip##_##name##_SIZE, \
- .type = MT_DEVICE_NONSHARED, \
+ .type = mem_type, \
}
+#define MSM_DEVICE_TYPE(name, mem_type) \
+ MSM_CHIP_DEVICE_TYPE(name, MSM, mem_type)
+#define MSM_CHIP_DEVICE(name, chip) \
+ MSM_CHIP_DEVICE_TYPE(name, chip, MT_DEVICE)
#define MSM_DEVICE(name) MSM_CHIP_DEVICE(name, MSM)
#if defined(CONFIG_ARCH_MSM7X00A) || defined(CONFIG_ARCH_MSM7X27) \
|| defined(CONFIG_ARCH_MSM7X25)
static struct map_desc msm_io_desc[] __initdata = {
- MSM_DEVICE(VIC),
- MSM_CHIP_DEVICE(CSR, MSM7X00),
- MSM_DEVICE(DMOV),
- MSM_CHIP_DEVICE(GPIO1, MSM7X00),
- MSM_CHIP_DEVICE(GPIO2, MSM7X00),
- MSM_DEVICE(CLK_CTL),
+ MSM_DEVICE_TYPE(VIC, MT_DEVICE_NONSHARED),
+ MSM_CHIP_DEVICE_TYPE(CSR, MSM7X00, MT_DEVICE_NONSHARED),
+ MSM_DEVICE_TYPE(DMOV, MT_DEVICE_NONSHARED),
+ MSM_CHIP_DEVICE_TYPE(GPIO1, MSM7X00, MT_DEVICE_NONSHARED),
+ MSM_CHIP_DEVICE_TYPE(GPIO2, MSM7X00, MT_DEVICE_NONSHARED),
+ MSM_DEVICE_TYPE(CLK_CTL, MT_DEVICE_NONSHARED),
#if defined(CONFIG_DEBUG_MSM_UART1) || defined(CONFIG_DEBUG_MSM_UART2) || \
defined(CONFIG_DEBUG_MSM_UART3)
- MSM_DEVICE(DEBUG_UART),
+ MSM_DEVICE_TYPE(DEBUG_UART, MT_DEVICE_NONSHARED),
#endif
{
.virtual = (unsigned long) MSM_SHARED_RAM_BASE,
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
next prev parent reply other threads:[~2012-09-12 17:03 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1347469140-25069-1-git-send-email-davidb@codeaurora.org>
2012-09-12 16:58 ` [PATCH 01/24] ARM: msm: Remove msm_hw_reset_hook David Brown
2012-09-12 17:09 ` [GIT PULL] msm-core changes for v3.7 David Brown
2012-09-12 16:58 ` [PATCH 02/24] ARM: msm: clock-pcom: Mark functions static David Brown
2012-09-12 16:58 ` [PATCH 03/24] ARM: msm: Remove unused idle.c David Brown
2012-09-12 16:58 ` [PATCH 04/24] ARM: msm: Fix early debug uart mapping on some memory configs David Brown
2012-09-12 16:58 ` [PATCH 05/24] ARM: msm: io: Remove 7x30 iomap region from 7x00 David Brown
2012-09-12 16:58 ` David Brown [this message]
2012-09-12 16:58 ` [PATCH 07/24] ARM: msm: Add handle_irq handler for 8660 DT machine David Brown
2012-09-12 16:58 ` [PATCH 08/24] ARM: msm: Add msm8660-surf.dts to Makefile.boot David Brown
2012-09-12 16:58 ` [PATCH 09/24] ARM: msm: Remove call to missing FPGA init on 8660 David Brown
2012-09-12 16:58 ` [PATCH 10/24] ARM: msm: Fix sparse warnings due to incorrect type David Brown
2012-09-12 16:58 ` [PATCH 11/24] ARM: msm: Don't touch GIC registers outside of GIC code David Brown
2012-09-12 16:58 ` [PATCH 12/24] ARM: msm: Allow timer.c to compile on multiple targets David Brown
2012-09-12 16:58 ` [PATCH 13/24] ARM: msm: Add DT support to msm_timer David Brown
2012-09-12 16:58 ` [PATCH 14/24] ARM: msm: Move 8660 to DT timer David Brown
2012-09-12 16:58 ` [PATCH 15/24] ARM: msm: Make 8660 a DT only target David Brown
2012-09-12 16:58 ` [PATCH 16/24] ARM: msm: Rename board-msm8x60 to signify its DT only status David Brown
2012-09-12 16:58 ` [PATCH 17/24] ARM: msm: Move io mapping prototypes to common.h David Brown
2012-09-12 16:58 ` [PATCH 18/24] ARM: msm: Add DT support for 8960 David Brown
2012-09-12 16:58 ` [PATCH 19/24] ARM: msm: Remove non-DT targets from 8960 David Brown
2012-09-12 16:58 ` [PATCH 20/24] ARM: msm: dma: use list_move_tail instead of list_del/list_add_tail David Brown
2012-09-12 16:58 ` [PATCH 21/24] ARM: msm: Remove unused acpuclock-arm11 David Brown
2012-09-12 16:58 ` [PATCH 22/24] ARM: msm: Remove uncompiled board-msm7x27 David Brown
2012-09-12 16:58 ` [PATCH 23/24] ARM: msm: Allow msm_iomap-8x60 and msm_iomap-8960 to coexist David Brown
2012-09-12 16:59 ` [PATCH 24/24] ARM: msm: Allow 8960 and 8660 to compile together David Brown
2012-09-17 0:38 ` Olof Johansson
2012-09-13 6:36 ` [GIT PULL] msm-core changes for v3.7 Olof Johansson
2012-09-13 7:31 ` David Brown
2012-09-13 7:33 ` Olof Johansson
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=1347469140-25069-7-git-send-email-davidb@codeaurora.org \
--to=davidb@codeaurora.org \
--cc=bryanh@codeaurora.org \
--cc=dwalker@fifo99.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=rvaswani@codeaurora.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).