aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2012-03-21 11:56:49 -0400
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2012-03-27 20:32:00 -0400
commit6f43747f6a7ef216fbea1d5b5d94044d504e12ce (patch)
tree254ae2ff9ff896c0ec8c7d8dc6af01c7a3d43818
parent587f83e8dd50d22bc0c62e32ec49fd319b0912fe (diff)
powerpc/pseries: Remove RTAS_POWERMGM_EVENTS
IBM bit 2 in the rtas event-scan and check-exception calls is marked reserved in the PAPR, so remove it from our RAS code. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-rw-r--r--arch/powerpc/include/asm/rtas.h1
-rw-r--r--arch/powerpc/platforms/pseries/ras.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/rtas.h b/arch/powerpc/include/asm/rtas.h
index a01fa3eee6bd..f0a4db31ecb6 100644
--- a/arch/powerpc/include/asm/rtas.h
+++ b/arch/powerpc/include/asm/rtas.h
@@ -74,7 +74,6 @@ struct rtas_suspend_me_data {
74/* RTAS event classes */ 74/* RTAS event classes */
75#define RTAS_INTERNAL_ERROR 0x80000000 /* set bit 0 */ 75#define RTAS_INTERNAL_ERROR 0x80000000 /* set bit 0 */
76#define RTAS_EPOW_WARNING 0x40000000 /* set bit 1 */ 76#define RTAS_EPOW_WARNING 0x40000000 /* set bit 1 */
77#define RTAS_POWERMGM_EVENTS 0x20000000 /* set bit 2 */
78#define RTAS_HOTPLUG_EVENTS 0x10000000 /* set bit 3 */ 77#define RTAS_HOTPLUG_EVENTS 0x10000000 /* set bit 3 */
79#define RTAS_IO_EVENTS 0x08000000 /* set bit 4 */ 78#define RTAS_IO_EVENTS 0x08000000 /* set bit 4 */
80#define RTAS_EVENT_SCAN_ALL_EVENTS 0xffffffff 79#define RTAS_EVENT_SCAN_ALL_EVENTS 0xffffffff
diff --git a/arch/powerpc/platforms/pseries/ras.c b/arch/powerpc/platforms/pseries/ras.c
index 670b45bde8f1..42fda797d008 100644
--- a/arch/powerpc/platforms/pseries/ras.c
+++ b/arch/powerpc/platforms/pseries/ras.c
@@ -223,7 +223,7 @@ static irqreturn_t ras_epow_interrupt(int irq, void *dev_id)
223 status = rtas_call(ras_check_exception_token, 6, 1, NULL, 223 status = rtas_call(ras_check_exception_token, 6, 1, NULL,
224 RTAS_VECTOR_EXTERNAL_INTERRUPT, 224 RTAS_VECTOR_EXTERNAL_INTERRUPT,
225 virq_to_hw(irq), 225 virq_to_hw(irq),
226 RTAS_EPOW_WARNING | RTAS_POWERMGM_EVENTS, 226 RTAS_EPOW_WARNING,
227 critical, __pa(&ras_log_buf), 227 critical, __pa(&ras_log_buf),
228 rtas_get_error_log_max()); 228 rtas_get_error_log_max());
229 229