From: olof@lixom.net (Olof Johansson)
To: paulus@samba.org
Cc: linuxppc-dev@ozlabs.org
Subject: [PATCH] powerpc: make ioport_map() handle already mapped ranges
Date: Sat, 12 May 2007 09:32:22 -0500 [thread overview]
Message-ID: <20070512143221.GB12890@lixom.net> (raw)
Make ioport_map() handle already mapped port range without trying
to add _IO_BASE to them.
Signed-off-by: Olof Johansson <olof@lixom.net>
Index: 2.6.21/arch/powerpc/kernel/iomap.c
===================================================================
--- 2.6.21.orig/arch/powerpc/kernel/iomap.c
+++ 2.6.21/arch/powerpc/kernel/iomap.c
@@ -106,7 +106,13 @@ EXPORT_SYMBOL(iowrite32_rep);
void __iomem *ioport_map(unsigned long port, unsigned int len)
{
- return (void __iomem *) (port + _IO_BASE);
+ /* Do nothing if we're being asked to map an already
+ * ioremapped() address
+ */
+ if (port >= IMALLOC_BASE && (port+len) < IMALLOC_END)
+ return (void __iomem *) port;
+ else
+ return (void __iomem *) (port + _IO_BASE);
}
void ioport_unmap(void __iomem *addr)
next reply other threads:[~2007-05-12 14:29 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-12 14:32 Olof Johansson [this message]
2007-05-12 22:18 ` [PATCH] powerpc: make ioport_map() handle already mapped ranges Arnd Bergmann
2007-05-12 22:36 ` Olof Johansson
2007-05-12 23:55 ` Arnd Bergmann
2007-05-13 1:46 ` Benjamin Herrenschmidt
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=20070512143221.GB12890@lixom.net \
--to=olof@lixom.net \
--cc=linuxppc-dev@ozlabs.org \
--cc=paulus@samba.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.