linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Arnd Bergmann <arnd@arndb.de>
To: Josh Cartwright <josh.cartwright@ni.com>
Cc: arm@kernel.org, linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, John Linn <john.linn@xilinx.com>
Subject: Re: [PATCH v2 2/4] zynq: move static peripheral mappings
Date: Tue, 23 Oct 2012 14:50:11 +0000	[thread overview]
Message-ID: <201210231450.11540.arnd@arndb.de> (raw)
In-Reply-To: <20121022211219.GC31538@beefymiracle.amer.corp.natinst.com>

On Monday 22 October 2012, Josh Cartwright wrote:
> Shifting them up into the vmalloc region prevents the following warning,
> when booting a zynq qemu target with more than 512mb of RAM:
> 
>   BUG: mapping for 0xe0000000 at 0xe0000000 out of vmalloc space
> 
> In addition, it allows for reuse of these mappings when the proper
> drivers issue requests via ioremap().
> 
> Signed-off-by: Josh Cartwright <josh.cartwright@ni.com>

This looks like a bug fix that should be backported to older kernels,
so it would be good to add 'Cc: stable@vger.kernel.org' below your
Signed-off-by.


> diff --git a/arch/arm/mach-zynq/include/mach/zynq_soc.h b/arch/arm/mach-zynq/include/mach/zynq_soc.h
> index d0d3f8f..ae3b236 100644
> --- a/arch/arm/mach-zynq/include/mach/zynq_soc.h
> +++ b/arch/arm/mach-zynq/include/mach/zynq_soc.h
> @@ -15,33 +15,37 @@
>  #ifndef __MACH_XILINX_SOC_H__
>  #define __MACH_XILINX_SOC_H__
>  
> +#include <asm/pgtable.h>
> +
>  #define PERIPHERAL_CLOCK_RATE		2500000
>  
> -/* For now, all mappings are flat (physical = virtual)
> +/* Static peripheral mappings are mapped at the top of the
> + * vmalloc region
>   */
> -#define UART0_PHYS			0xE0000000
> -#define UART0_VIRT			UART0_PHYS
> +#define UART0_PHYS		0xE0000000
> +#define UART0_SIZE		SZ_4K
> +#define UART0_VIRT		(VMALLOC_END - UART0_SIZE)

There are plans to move the uart location into a fixed virtual
address in the future, but it hasn't been decided yet.
It will still need a fixed mapping though, just to a different
address.

> -#define TTC0_PHYS			0xF8001000
> -#define TTC0_VIRT			TTC0_PHYS
> +#define TTC0_PHYS		0xF8001000
> +#define TTC0_SIZE		SZ_4K
> +#define TTC0_VIRT		(UART0_VIRT - TTC0_SIZE)

It's quite likely that this does not have to be a fixed mapping
any more. Just have a look at how drivers/clocksource/dw_apb_timer_of.c
calls of_iomap() to get the address.

> -#define PL310_L2CC_PHYS			0xF8F02000
> -#define PL310_L2CC_VIRT			PL310_L2CC_PHYS
> +#define PL310_L2CC_PHYS		0xF8F02000
> +#define PL310_L2CC_SIZE		SZ_4K
> +#define PL310_L2CC_VIRT		(TTC0_VIRT - PL310_L2CC_SIZE)

This address would not need a fixed mapping by calling l2x0_of_init
rather than l2x0_init.

> -#define SCU_PERIPH_PHYS			0xF8F00000
> -#define SCU_PERIPH_VIRT			SCU_PERIPH_PHYS
> +#define SCU_PERIPH_PHYS		0xF8F00000
> +#define SCU_PERIPH_SIZE		SZ_8K
> +#define SCU_PERIPH_VIRT		(PL310_L2CC_VIRT - SCU_PERIPH_SIZE)

And your patch 3 already obsoletes this mapping.

	Arnd

  reply	other threads:[~2012-10-23 14:50 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-22 21:10 [PATCH v2 0/4] zynq subarch cleanups Josh Cartwright
2012-10-22 21:11 ` [PATCH v2 1/4] ARM: annotate VMALLOC_END definition with _AC Josh Cartwright
2012-10-22 21:12 ` [PATCH v2 2/4] zynq: move static peripheral mappings Josh Cartwright
2012-10-23 14:50   ` Arnd Bergmann [this message]
2012-10-23 16:26     ` Josh Cartwright
2012-10-23 17:48       ` Arnd Bergmann
2012-10-23 20:27       ` Nick Bowler
2012-10-23 23:42         ` Josh Cartwright
2012-10-24 20:19           ` Nick Bowler
2012-10-23 20:09     ` Rob Herring
2012-10-23 20:53       ` Josh Cartwright
2012-10-23 21:17         ` Nick Bowler
2012-10-23 21:24           ` Josh Cartwright
2012-10-22 21:12 ` [PATCH v2 3/4] zynq: use GIC device tree bindings Josh Cartwright
2012-10-22 21:13 ` [PATCH v2 4/4] zynq: remove use of CLKDEV_LOOKUP Josh Cartwright
2012-10-23 14:41 ` [PATCH v2 0/4] zynq subarch cleanups Arnd Bergmann
2012-10-23 20:50   ` Rob Herring

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=201210231450.11540.arnd@arndb.de \
    --to=arnd@arndb.de \
    --cc=arm@kernel.org \
    --cc=john.linn@xilinx.com \
    --cc=josh.cartwright@ni.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.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).