Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6e565f2 authored by Michael Ellerman's avatar Michael Ellerman Committed by Benjamin Herrenschmidt
Browse files

powerpc: Remove remaining iSeries chunks 



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: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 0d7614f0

arch/powerpc/include/asm/abs_addr.h

+2 −30
Original line number Original line Diff line number Diff line
@@ -18,38 +18,10 @@ 
#include <asm/page.h>

#include <asm/page.h>

#include <asm/prom.h>

#include <asm/prom.h>





struct mschunks_map {

#define phys_to_abs(pa) (pa)

        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;

}





/* Convenience macros */

/* 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)

#define abs_to_virt(aa) __va(aa)





#endif /* __KERNEL__ */

#endif /* __KERNEL__ */