[PATCH] powerpc: Move various ppc64 files with no ppc32 equivalent to powerpc
This patch moves a bunch of files from arch/ppc64 and include/asm-ppc64 which have no equivalents in ppc32 code into arch/powerpc and include/asm-powerpc. The file affected are: abs_addr.h compat.h lppaca.h paca.h tce.h cpu_setup_power4.S ioctl32.c firmware.c pacaData.c The only changes apart from the move and corresponding Makefile changes are: - #ifndef/#define in includes updated to _ASM_POWERPC_ form - trailing whitespace removed - comments giving full paths removed - pacaData.c renamed paca.c to remove studlyCaps - Misplaced { moved in lppaca.h Built and booted on POWER5 LPAR (ARCH=powerpc and ARCH=ppc64), built for 32-bit powermac (ARCH=powerpc). Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:

committed by
Paul Mackerras

parent
584224e409
commit
8882a4da1c
73
include/asm-powerpc/abs_addr.h
Normal file
73
include/asm-powerpc/abs_addr.h
Normal file
@@ -0,0 +1,73 @@
|
||||
#ifndef _ASM_POWERPC_ABS_ADDR_H
|
||||
#define _ASM_POWERPC_ABS_ADDR_H
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
/*
|
||||
* c 2001 PPC 64 Team, IBM Corp
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version
|
||||
* 2 of the License, or (at your option) any later version.
|
||||
*/
|
||||
|
||||
#include <asm/types.h>
|
||||
#include <asm/page.h>
|
||||
#include <asm/prom.h>
|
||||
#include <asm/lmb.h>
|
||||
#include <asm/firmware.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)
|
||||
{
|
||||
unsigned long chunk;
|
||||
|
||||
/* This is a no-op on non-iSeries */
|
||||
if (!firmware_has_feature(FW_FEATURE_ISERIES))
|
||||
return pa;
|
||||
|
||||
chunk = addr_to_chunk(pa);
|
||||
|
||||
if (chunk < mschunks_map.num_chunks)
|
||||
chunk = mschunks_map.mapping[chunk];
|
||||
|
||||
return chunk_to_addr(chunk) + (pa & MSCHUNKS_OFFSET_MASK);
|
||||
}
|
||||
|
||||
/* Convenience macros */
|
||||
#define virt_to_abs(va) phys_to_abs(__pa(va))
|
||||
#define abs_to_virt(aa) __va(aa)
|
||||
|
||||
/*
|
||||
* Converts Virtual Address to Real Address for
|
||||
* Legacy iSeries Hypervisor calls
|
||||
*/
|
||||
#define iseries_hv_addr(virtaddr) \
|
||||
(0x8000000000000000 | virt_to_abs(virtaddr))
|
||||
|
||||
#endif /* _ASM_POWERPC_ABS_ADDR_H */
|
Reference in New Issue
Block a user