public inbox for linuxppc-dev@ozlabs.org 
 help / color / mirror / Atom feed
From: Sergei Shtylyov <sshtylyov@ru•mvista.com>
To: Stefan Roese <sr@denx•de>
Cc: linuxppc-dev@ozlabs•org, linuxppc-embedded@ozlabs•org
Subject: Re: [PATCH] ppc: ioremap() on PPC44x platforms now accepts 64bit addresses
Date: Mon, 29 Jan 2007 15:45:14 +0300	[thread overview]
Message-ID: <45BDEC5A.2020103@ru.mvista.com> (raw)
In-Reply-To: <200701290942.10515.sr@denx.de>

Hello.

Stefan Roese wrote:
> [PATCH] ppc: ioremap() on PPC44x platforms now accepts 64bit addresses

> On systems that supply a real 64bit address (with
> CONFIG_RESOURCES_64BIT enabled), don't use the fixup function. This
> allows us to use the fixup function when no ERPN is specified and use
> the 64 bit address when the ERPN is supplied.

> Signed-off-by: Stefan Roese <sr@denx•de>

[...]

> diff --git a/arch/ppc/mm/pgtable.c b/arch/ppc/mm/pgtable.c
> index 354a940..2f9a311 100644
> --- a/arch/ppc/mm/pgtable.c
> +++ b/arch/ppc/mm/pgtable.c
> @@ -156,9 +156,19 @@ ioremap64(unsigned long long addr, unsigned long size)
>  void __iomem *
>  ioremap(phys_addr_t addr, unsigned long size)
>  {
> -	phys_addr_t addr64 = fixup_bigphys_addr(addr, size);
> -
> -	return ioremap64(addr64, size);
> +	/*
> +	 * On systems that supply a real 64bit address
> +	 * (with CONFIG_RESOURCES_64BIT enabled), don't use the
> +	 * fixup function.
> +	 * This allows us to use the fixup function when no ERPN
> +	 * is specified and use the 64 bit address when the ERPN
> +	 * is suppied.
> +	 */
> +	if ((unsigned long long)addr & 0xffffffff00000000ULL)
> +		return ioremap64(addr, size);

    I'm sorry but is this actually needed? From looking at the 
arch/ppc/syslib/ibm44x_common.c and include/asm-ppc/ibm44x.h I got an 
impression that fixup_bigphys_addr() returns addresses >= 4GB intact anyway

> +	else
> +		return ioremap64(fixup_bigphys_addr(addr, size),
> +				 size);
>  }
>  #endif /* CONFIG_PHYS_64BIT */

WBR, Sergei

  reply	other threads:[~2007-01-29 13:04 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-01-19  8:05 [PATCH] ppc: ioremap() on PPC44x platforms now accepts 64bit addresses Stefan Roese
2007-01-19 11:57 ` Josh Boyer
2007-01-28 21:00   ` Stefan Roese
2007-01-29  8:42   ` Stefan Roese
2007-01-29 12:45     ` Sergei Shtylyov [this message]
2007-01-29 13:26       ` Stefan Roese

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=45BDEC5A.2020103@ru.mvista.com \
    --to=sshtylyov@ru$(echo .)mvista.com \
    --cc=linuxppc-dev@ozlabs$(echo .)org \
    --cc=linuxppc-embedded@ozlabs$(echo .)org \
    --cc=sr@denx$(echo .)de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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