mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-28 03:40:04 +00:00
Code Issues Releases Wiki Activity

[PATCH] powerpc: Remove ItLpRegSave area from the paca

Browse source 
On iSeries, the paca contains, amongst other things an ItLpRegSave
structure used by the hypervisor to save registers.  The hypervisor
locates this area through a pointer at the beginning of the paca, so
the structure itself can be located elsewhere.  This patch moves the
reg_save area out into its own array.  This reduces the amount of
iSeries specific gunk which is visible to general powerpc code via
paca.h

Built and booted on POWER5 LPAR and iSeries RS64.

Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
David Gibson 2005-11-24 16:34:45 +11:00 committed by Paul Mackerras
parent 456752f750
commit 1888e7b51c
4 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
arch/powerpc/kernel/paca.c
View file

@ -17,6 +17,7 @@
#include <asm/page.h> #include <asm/page.h>
#include <asm/lppaca.h> #include <asm/lppaca.h>
#include <asm/iseries/it_lp_queue.h> #include <asm/iseries/it_lp_queue.h>
#include <asm/iseries/it_lp_reg_save.h>
#include <asm/paca.h> #include <asm/paca.h>
@ -26,8 +27,7 @@ extern unsigned long __toc_start;
/* The Paca is an array with one entry per processor. Each contains an /* The Paca is an array with one entry per processor. Each contains an
* lppaca, which contains the information shared between the * lppaca, which contains the information shared between the
* hypervisor and Linux. Each also contains an ItLpRegSave area which * hypervisor and Linux.
* is used by the hypervisor to save registers.
* On systems with hardware multi-threading, there are two threads * On systems with hardware multi-threading, there are two threads
* per processor. The Paca array must contain an entry for each thread. * per processor. The Paca array must contain an entry for each thread.
* The VPD Areas will give a max logical processors = 2 * max physical * The VPD Areas will give a max logical processors = 2 * max physical
@ -57,11 +57,7 @@ extern unsigned long __toc_start;
#ifdef CONFIG_PPC_ISERIES #ifdef CONFIG_PPC_ISERIES
#define PACA_INIT_ISERIES(number) \ #define PACA_INIT_ISERIES(number) \
.lppaca_ptr = &paca[number].lppaca, \ .lppaca_ptr = &paca[number].lppaca, \
.reg_save_ptr = &paca[number].reg_save, \ .reg_save_ptr = &iseries_reg_save[number],
.reg_save = { \
.xDesc = 0xd397d9e2, /* "LpRS" */ \
.xSize = sizeof(struct ItLpRegSave) \
}
#define PACA_INIT(number) \ #define PACA_INIT(number) \
{ \ { \

7
arch/powerpc/platforms/iseries/lpardata.c
View file

@ -225,3 +225,10 @@ struct ItVpdAreas itVpdAreas = {
0,0 0,0
} }
}; };
struct ItLpRegSave iseries_reg_save[] = {
[0 ... (NR_CPUS-1)] = {
.xDesc = 0xd397d9e2, /* "LpRS" */
.xSize = sizeof(struct ItLpRegSave),
},
};

2
include/asm-powerpc/iseries/it_lp_reg_save.h
View file

@ -81,4 +81,6 @@ struct ItLpRegSave {
u8 xRsvd3[176]; // Reserved 350-3FF u8 xRsvd3[176]; // Reserved 350-3FF
}; };
extern struct ItLpRegSave iseries_reg_save[];
#endif /* _ITLPREGSAVE_H */ #endif /* _ITLPREGSAVE_H */

14
include/asm-powerpc/paca.h
View file

@ -18,7 +18,6 @@
#include <linux/config.h> #include <linux/config.h>
#include <asm/types.h> #include <asm/types.h>
#include <asm/lppaca.h> #include <asm/lppaca.h>
#include <asm/iseries/it_lp_reg_save.h>
#include <asm/mmu.h> #include <asm/mmu.h>
register struct paca_struct *local_paca asm("r13"); register struct paca_struct *local_paca asm("r13");
@ -31,9 +30,9 @@ struct task_struct;
* *
* This structure is not directly accessed by firmware or the service * This structure is not directly accessed by firmware or the service
* processor except for the first two pointers that point to the * processor except for the first two pointers that point to the
* lppaca area and the ItLpRegSave area for this CPU. Both the * lppaca area and the ItLpRegSave area for this CPU. The lppaca
* lppaca and ItLpRegSave objects are currently contained within the * object is currently contained within the PACA but it doesn't need
* PACA but they do not need to be. * to be.
*/ */
struct paca_struct { struct paca_struct {
/* /*
@ -48,7 +47,9 @@ struct paca_struct {
* accessed by the firmware * accessed by the firmware
*/ */
struct lppaca *lppaca_ptr; /* Pointer to LpPaca for PLIC */ struct lppaca *lppaca_ptr; /* Pointer to LpPaca for PLIC */
struct ItLpRegSave *reg_save_ptr; /* Pointer to LpRegSave for PLIC */ #ifdef CONFIG_PPC_ISERIES
void *reg_save_ptr; /* Pointer to LpRegSave for PLIC */
#endif /* CONFIG_PPC_ISERIES */
/* /*
* MAGIC: the spinlock functions in arch/ppc64/lib/locks.c * MAGIC: the spinlock functions in arch/ppc64/lib/locks.c
@ -110,9 +111,6 @@ struct paca_struct {
* cross a page boundary. * cross a page boundary.
*/ */
struct lppaca lppaca __attribute__((__aligned__(0x400))); struct lppaca lppaca __attribute__((__aligned__(0x400)));
#ifdef CONFIG_PPC_ISERIES
struct ItLpRegSave reg_save;
#endif
}; };
extern struct paca_struct paca[]; extern struct paca_struct paca[];