[PATCH 1/3] powerpc: ipic: Fix mcp status helper functions

Subsystems: linux for powerpc (32-bit and 64-bit), the rest

STALE4262d

3 messages, 1 author, 2015-01-06 · open the first message on its own page

[PATCH 1/3] powerpc: ipic: Fix mcp status helper functions

From: <hidden>
Date: 2015-01-06 11:27:13

From: Esben Haabendal <redacted>

Read and write the SERSR (System Error Status Register) instead of the
SERMR (System Error Mask Register), to actually get and clear the status
bits.

Signed-off-by: Esben Haabendal <redacted>
---
 arch/powerpc/sysdev/ipic.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/sysdev/ipic.c b/arch/powerpc/sysdev/ipic.c
index b287337..2e41a73 100644
--- a/arch/powerpc/sysdev/ipic.c
+++ b/arch/powerpc/sysdev/ipic.c
@@ -843,12 +843,12 @@ void ipic_disable_mcp(enum ipic_mcp_irq mcp_irq)
 
 u32 ipic_get_mcp_status(void)
 {
-	return ipic_read(primary_ipic->regs, IPIC_SERMR);
+	return ipic_read(primary_ipic->regs, IPIC_SERSR);
 }
 
 void ipic_clear_mcp_status(u32 mask)
 {
-	ipic_write(primary_ipic->regs, IPIC_SERMR, mask);
+	ipic_write(primary_ipic->regs, IPIC_SERSR, mask);
 }
 
 /* Return an interrupt vector or NO_IRQ if no interrupt is pending. */
-- 
2.1.4

[PATCH 3/3] powerpc: Add .gitignore entry for built DTB files

From: <hidden>
Date: 2015-01-06 11:27:26

From: Esben Haabendal <redacted>

Signed-off-by: Esben Haabendal <redacted>
---
 arch/powerpc/boot/.gitignore | 1 +
 1 file changed, 1 insertion(+)
diff --git a/arch/powerpc/boot/.gitignore b/arch/powerpc/boot/.gitignore
index d61c035..38e6492 100644
--- a/arch/powerpc/boot/.gitignore
+++ b/arch/powerpc/boot/.gitignore
@@ -29,6 +29,7 @@ zImage.*lds
 zImage.miboot
 zImage.pmac
 zImage.pseries
+*.dtb
 zconf.h
 zlib.h
 zutil.h
-- 
2.1.4

[PATCH 2/3] powerpc: Add machine_check cpu function for e300c3 cpus

From: <hidden>
Date: 2015-01-06 11:27:41

From: Esben Haabendal <redacted>

Signed-off-by: Esben Haabendal <redacted>
---
 arch/powerpc/kernel/cputable.c | 1 +
 1 file changed, 1 insertion(+)
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index 8084059..f337666 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -1133,6 +1133,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
 		.icache_bsize		= 32,
 		.dcache_bsize		= 32,
 		.cpu_setup		= __setup_cpu_603,
+		.machine_check		= machine_check_generic,
 		.num_pmcs		= 4,
 		.oprofile_cpu_type	= "ppc/e300",
 		.oprofile_type		= PPC_OPROFILE_FSL_EMB,
-- 
2.1.4
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help