* [PATCH 0/4] Patches from my local tree
@ 2010-11-18 4:52 mikey
2010-11-18 4:52 ` [PATCH 1/4] powerpc: remove unneeded cpu_setup/restore from POWER7 cputable entry mikey
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: mikey @ 2010-11-18 4:52 UTC (permalink / raw)
To: Benjamin Herrenschmidt; +Cc: linuxppc-dev
Below are a few patches from my local tree
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/4] powerpc: remove unneeded cpu_setup/restore from POWER7 cputable entry
2010-11-18 4:52 [PATCH 0/4] Patches from my local tree mikey
@ 2010-11-18 4:52 ` mikey
2010-11-18 4:52 ` [PATCH 2/4] powerpc: remove POWER6 oprofile workarounds for POWER7 mikey
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: mikey @ 2010-11-18 4:52 UTC (permalink / raw)
To: Benjamin Herrenschmidt; +Cc: linuxppc-dev
These are not needed so just remove them
Signed-off-by: Michael Neuling <mikey@neuling.org>
---
arch/powerpc/kernel/cputable.c | 2 --
arch/powerpc/kernel/misc.S | 5 -----
2 files changed, 7 deletions(-)
Index: linux-2.6-ozlabs/arch/powerpc/kernel/cputable.c
===================================================================
--- linux-2.6-ozlabs.orig/arch/powerpc/kernel/cputable.c
+++ linux-2.6-ozlabs/arch/powerpc/kernel/cputable.c
@@ -457,8 +457,6 @@
.dcache_bsize = 128,
.num_pmcs = 6,
.pmc_type = PPC_PMC_IBM,
- .cpu_setup = __setup_cpu_power7,
- .cpu_restore = __restore_cpu_power7,
.oprofile_cpu_type = "ppc64/power7",
.oprofile_type = PPC_OPROFILE_POWER4,
.oprofile_mmcra_sihv = POWER6_MMCRA_SIHV,
Index: linux-2.6-ozlabs/arch/powerpc/kernel/misc.S
===================================================================
--- linux-2.6-ozlabs.orig/arch/powerpc/kernel/misc.S
+++ linux-2.6-ozlabs/arch/powerpc/kernel/misc.S
@@ -122,8 +122,3 @@
mtlr r0
mr r3,r4
blr
-
-_GLOBAL(__setup_cpu_power7)
-_GLOBAL(__restore_cpu_power7)
- /* place holder */
- blr
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2/4] powerpc: remove POWER6 oprofile workarounds for POWER7
2010-11-18 4:52 [PATCH 0/4] Patches from my local tree mikey
2010-11-18 4:52 ` [PATCH 1/4] powerpc: remove unneeded cpu_setup/restore from POWER7 cputable entry mikey
@ 2010-11-18 4:52 ` mikey
2010-11-18 4:52 ` [PATCH 3/4] powerpc: add POWER7+ cputable entry mikey
2010-11-18 4:52 ` [PATCH 4/4] powerpc: hash_preload: avoid avoidable void mikey
3 siblings, 0 replies; 5+ messages in thread
From: mikey @ 2010-11-18 4:52 UTC (permalink / raw)
To: Benjamin Herrenschmidt; +Cc: linuxppc-dev
These are not needed on POWER7 so remove them.
Signed-off-by: Michael Neuling <mikey@neuling.org>
---
arch/powerpc/kernel/cputable.c | 4 ----
1 file changed, 4 deletions(-)
Index: linux-2.6-ozlabs/arch/powerpc/kernel/cputable.c
===================================================================
--- linux-2.6-ozlabs.orig/arch/powerpc/kernel/cputable.c
+++ linux-2.6-ozlabs/arch/powerpc/kernel/cputable.c
@@ -459,10 +459,6 @@
.pmc_type = PPC_PMC_IBM,
.oprofile_cpu_type = "ppc64/power7",
.oprofile_type = PPC_OPROFILE_POWER4,
- .oprofile_mmcra_sihv = POWER6_MMCRA_SIHV,
- .oprofile_mmcra_sipr = POWER6_MMCRA_SIPR,
- .oprofile_mmcra_clear = POWER6_MMCRA_THRM |
- POWER6_MMCRA_OTHER,
.platform = "power7",
},
{ /* Cell Broadband Engine */
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 3/4] powerpc: add POWER7+ cputable entry
2010-11-18 4:52 [PATCH 0/4] Patches from my local tree mikey
2010-11-18 4:52 ` [PATCH 1/4] powerpc: remove unneeded cpu_setup/restore from POWER7 cputable entry mikey
2010-11-18 4:52 ` [PATCH 2/4] powerpc: remove POWER6 oprofile workarounds for POWER7 mikey
@ 2010-11-18 4:52 ` mikey
2010-11-18 4:52 ` [PATCH 4/4] powerpc: hash_preload: avoid avoidable void mikey
3 siblings, 0 replies; 5+ messages in thread
From: mikey @ 2010-11-18 4:52 UTC (permalink / raw)
To: Benjamin Herrenschmidt; +Cc: linuxppc-dev
This adds the POWER7+ cputable entry for the PVR 0x004a0000. Rest is
the same as vanilla POWER7.
Signed-off-by: Michael Neuling <mikey@neuling.org>
---
arch/powerpc/kernel/cputable.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
Index: linux-2.6-ozlabs/arch/powerpc/kernel/cputable.c
===================================================================
--- linux-2.6-ozlabs.orig/arch/powerpc/kernel/cputable.c
+++ linux-2.6-ozlabs/arch/powerpc/kernel/cputable.c
@@ -461,6 +461,22 @@
.oprofile_type = PPC_OPROFILE_POWER4,
.platform = "power7",
},
+ { /* Power7+ */
+ .pvr_mask = 0xffff0000,
+ .pvr_value = 0x004A0000,
+ .cpu_name = "POWER7+ (raw)",
+ .cpu_features = CPU_FTRS_POWER7,
+ .cpu_user_features = COMMON_USER_POWER7,
+ .mmu_features = MMU_FTR_HPTE_TABLE |
+ MMU_FTR_TLBIE_206,
+ .icache_bsize = 128,
+ .dcache_bsize = 128,
+ .num_pmcs = 6,
+ .pmc_type = PPC_PMC_IBM,
+ .oprofile_cpu_type = "ppc64/power7",
+ .oprofile_type = PPC_OPROFILE_POWER4,
+ .platform = "power7+",
+ },
{ /* Cell Broadband Engine */
.pvr_mask = 0xffff0000,
.pvr_value = 0x00700000,
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 4/4] powerpc: hash_preload: avoid avoidable void
2010-11-18 4:52 [PATCH 0/4] Patches from my local tree mikey
` (2 preceding siblings ...)
2010-11-18 4:52 ` [PATCH 3/4] powerpc: add POWER7+ cputable entry mikey
@ 2010-11-18 4:52 ` mikey
3 siblings, 0 replies; 5+ messages in thread
From: mikey @ 2010-11-18 4:52 UTC (permalink / raw)
To: Benjamin Herrenschmidt; +Cc: linuxppc-dev
Change pgdir from a void to real type. Having this as a void is
stupid and has already caused 1 bug.
Signed-off-by: Michael Neuling <mikey@neuling.org>
---
arch/powerpc/mm/hash_utils_64.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: linux-2.6-ozlabs/arch/powerpc/mm/hash_utils_64.c
===================================================================
--- linux-2.6-ozlabs.orig/arch/powerpc/mm/hash_utils_64.c
+++ linux-2.6-ozlabs/arch/powerpc/mm/hash_utils_64.c
@@ -1070,7 +1070,7 @@
unsigned long access, unsigned long trap)
{
unsigned long vsid;
- void *pgdir;
+ pgd_t *pgdir;
pte_t *ptep;
unsigned long flags;
int rc, ssize, local = 0;
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-11-18 4:52 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-11-18 4:52 [PATCH 0/4] Patches from my local tree mikey
2010-11-18 4:52 ` [PATCH 1/4] powerpc: remove unneeded cpu_setup/restore from POWER7 cputable entry mikey
2010-11-18 4:52 ` [PATCH 2/4] powerpc: remove POWER6 oprofile workarounds for POWER7 mikey
2010-11-18 4:52 ` [PATCH 3/4] powerpc: add POWER7+ cputable entry mikey
2010-11-18 4:52 ` [PATCH 4/4] powerpc: hash_preload: avoid avoidable void mikey
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.