linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Michael Ellerman <michael@ellerman.id.au>
To: <linuxppc-dev@ozlabs.org>
Subject: [PATCH 01/18] powerpc: Remove remaining iSeries chunks
Date: Thu, 26 Jul 2012 17:19:47 +1000	[thread overview]
Message-ID: <1343287204-7700-1-git-send-email-michael@ellerman.id.au> (raw)

In commit f5339277 "powerpc: Remove FW_FEATURE ISERIES from arch code", we
removed the bulk of the iSeries code, but missed a few bits.

Remove the mschunks bits, these were only ever used on iSeries as far as I
know, and are definitely not used anymore.

Make it even clearer that phys_to_abs() is a nop, by making it a macro. We
still have a few users of this, but should clean those up.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
---
 arch/powerpc/include/asm/abs_addr.h |   32 ++------------------------------
 1 file changed, 2 insertions(+), 30 deletions(-)

diff --git a/arch/powerpc/include/asm/abs_addr.h b/arch/powerpc/include/asm/abs_addr.h
index 9d92ba0..419aab7 100644
--- a/arch/powerpc/include/asm/abs_addr.h
+++ b/arch/powerpc/include/asm/abs_addr.h
@@ -18,38 +18,10 @@
 #include <asm/page.h>
 #include <asm/prom.h>
 
-struct mschunks_map {
-        unsigned long num_chunks;
-        unsigned long chunk_size;
-        unsigned long chunk_shift;
-        unsigned long chunk_mask;
-        u32 *mapping;
-};
-
-extern struct mschunks_map mschunks_map;
-
-/* Chunks are 256 KB */
-#define MSCHUNKS_CHUNK_SHIFT	(18)
-#define MSCHUNKS_CHUNK_SIZE	(1UL << MSCHUNKS_CHUNK_SHIFT)
-#define MSCHUNKS_OFFSET_MASK	(MSCHUNKS_CHUNK_SIZE - 1)
-
-static inline unsigned long chunk_to_addr(unsigned long chunk)
-{
-	return chunk << MSCHUNKS_CHUNK_SHIFT;
-}
-
-static inline unsigned long addr_to_chunk(unsigned long addr)
-{
-	return addr >> MSCHUNKS_CHUNK_SHIFT;
-}
-
-static inline unsigned long phys_to_abs(unsigned long pa)
-{
-	return pa;
-}
+#define phys_to_abs(pa) (pa)
 
 /* Convenience macros */
-#define virt_to_abs(va) phys_to_abs(__pa(va))
+#define virt_to_abs(va) __pa(va)
 #define abs_to_virt(aa) __va(aa)
 
 #endif /* __KERNEL__ */
-- 
1.7.9.5

             reply	other threads:[~2012-07-26  7:19 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-26  7:19 Michael Ellerman [this message]
2012-07-26  7:19 ` [PATCH 02/18] powerpc/crypto: Remove users of virt_to_abs() and phys_to_abs() in nx crypto driver Michael Ellerman
2012-07-26  7:19 ` [PATCH 03/18] IB/ehca: Don't use phys_to_abs(), it's a nop Michael Ellerman
2012-07-26  7:19 ` [PATCH 04/18] powerpc/mm: Replace abs_to_virt() with __va() Michael Ellerman
2012-07-26  7:19 ` [PATCH 05/18] powerpc/pasemi: Remove uses of virt_to_abs() and abs_to_virt() Michael Ellerman
2012-07-26  7:19 ` [PATCH 06/18] powerpc/dart: " Michael Ellerman
2012-07-26  7:19 ` [PATCH 07/18] IB/ehca: " Michael Ellerman
2012-07-26  7:19 ` [PATCH 08/18] drivers/macintosh/smu.c: Replace abs_to_virt() with __va() Michael Ellerman
2012-07-26  7:19 ` [PATCH 09/18] ehea: Remove uses of virt_to_abs() and abs_to_virt() Michael Ellerman
2012-07-26  7:19 ` [PATCH 10/18] powerpc/kernel: Remove uses of abs_to_virt() and virt_to_abs() Michael Ellerman
2012-07-26  7:19 ` [PATCH 11/18] powerpc/pseries: " Michael Ellerman
2012-07-26  7:19 ` [PATCH 12/18] powerpc/mm: " Michael Ellerman
2012-07-26  7:19 ` [PATCH 13/18] powerpc/ps3: Replace virt_to_abs() with __pa() Michael Ellerman
2012-07-26  7:20 ` [PATCH 14/18] powerpc: Remove phys_to_abs() now all users have been removed Michael Ellerman
2012-07-26  7:20 ` [PATCH 15/18] powerpc: Remove abs_to_virt() now all users have been fixed Michael Ellerman
2012-07-26  7:20 ` [PATCH 16/18] powerpc: Remove virt_to_abs() " Michael Ellerman
2012-07-26  7:20 ` [PATCH 17/18] powerpc: Remove all includes of <asm/abs_addr.h> Michael Ellerman
2012-07-26  7:20 ` [PATCH 18/18] powerpc: Remove <asm/abs_addr.h> Michael Ellerman

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=1343287204-7700-1-git-send-email-michael@ellerman.id.au \
    --to=michael@ellerman.id.au \
    --cc=linuxppc-dev@ozlabs.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).