diff options
author | Greg Howard <ghoward@sgi.com> | 2005-04-25 16:28:52 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-04-25 16:28:52 -0400 |
commit | 67639deb099c6085acc447c1b7d6a17792dedad0 (patch) | |
tree | b9cdf0d92ff2c02e7ed182a93d7ea270ba752b10 | |
parent | b9e41d7fb62ae26adee84c18048037214ce5d866 (diff) |
[IA64] Altix system controller event handling
The following is an update of the patch I sent yesterday
(3/9/05) incorporating suggestions from Christoph Hellwig and
Andreas Schwab. It allows Altix and Altix-like systems to
handle environmental events generated by the system controllers,
and should apply on top of Jack Steiner's patch of 3/1/05 ("New
chipset support for SN platform") and Mark Goodwin's patch of
3/8/05 ("Altix SN topology support for new chipsets and pci
topology").
Signed-off-by: Greg Howard <ghoward@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
-rw-r--r-- | drivers/char/Makefile | 2 | ||||
-rw-r--r-- | drivers/char/snsc.c | 8 | ||||
-rw-r--r-- | drivers/char/snsc.h | 40 | ||||
-rw-r--r-- | include/asm-ia64/sn/sn_sal.h | 14 |
4 files changed, 63 insertions, 1 deletions
diff --git a/drivers/char/Makefile b/drivers/char/Makefile index 3ea8cc80ea3d..e3f5c32aac55 100644 --- a/drivers/char/Makefile +++ b/drivers/char/Makefile | |||
@@ -42,7 +42,7 @@ obj-$(CONFIG_SX) += sx.o generic_serial.o | |||
42 | obj-$(CONFIG_RIO) += rio/ generic_serial.o | 42 | obj-$(CONFIG_RIO) += rio/ generic_serial.o |
43 | obj-$(CONFIG_HVC_CONSOLE) += hvc_console.o hvsi.o | 43 | obj-$(CONFIG_HVC_CONSOLE) += hvc_console.o hvsi.o |
44 | obj-$(CONFIG_RAW_DRIVER) += raw.o | 44 | obj-$(CONFIG_RAW_DRIVER) += raw.o |
45 | obj-$(CONFIG_SGI_SNSC) += snsc.o | 45 | obj-$(CONFIG_SGI_SNSC) += snsc.o snsc_event.o |
46 | obj-$(CONFIG_MMTIMER) += mmtimer.o | 46 | obj-$(CONFIG_MMTIMER) += mmtimer.o |
47 | obj-$(CONFIG_VIOCONS) += viocons.o | 47 | obj-$(CONFIG_VIOCONS) += viocons.o |
48 | obj-$(CONFIG_VIOTAPE) += viotape.o | 48 | obj-$(CONFIG_VIOTAPE) += viotape.o |
diff --git a/drivers/char/snsc.c b/drivers/char/snsc.c index ffb9143376bb..e3c0b52d943f 100644 --- a/drivers/char/snsc.c +++ b/drivers/char/snsc.c | |||
@@ -374,6 +374,7 @@ scdrv_init(void) | |||
374 | void *salbuf; | 374 | void *salbuf; |
375 | struct class_simple *snsc_class; | 375 | struct class_simple *snsc_class; |
376 | dev_t first_dev, dev; | 376 | dev_t first_dev, dev; |
377 | nasid_t event_nasid = ia64_sn_get_console_nasid(); | ||
377 | 378 | ||
378 | if (alloc_chrdev_region(&first_dev, 0, numionodes, | 379 | if (alloc_chrdev_region(&first_dev, 0, numionodes, |
379 | SYSCTL_BASENAME) < 0) { | 380 | SYSCTL_BASENAME) < 0) { |
@@ -441,6 +442,13 @@ scdrv_init(void) | |||
441 | ia64_sn_irtr_intr_enable(scd->scd_nasid, | 442 | ia64_sn_irtr_intr_enable(scd->scd_nasid, |
442 | 0 /*ignored */ , | 443 | 0 /*ignored */ , |
443 | SAL_IROUTER_INTR_RECV); | 444 | SAL_IROUTER_INTR_RECV); |
445 | |||
446 | /* on the console nasid, prepare to receive | ||
447 | * system controller environmental events | ||
448 | */ | ||
449 | if(scd->scd_nasid == event_nasid) { | ||
450 | scdrv_event_init(scd); | ||
451 | } | ||
444 | } | 452 | } |
445 | return 0; | 453 | return 0; |
446 | } | 454 | } |
diff --git a/drivers/char/snsc.h b/drivers/char/snsc.h index c22c6c55e254..a9efc13cc858 100644 --- a/drivers/char/snsc.h +++ b/drivers/char/snsc.h | |||
@@ -47,4 +47,44 @@ struct sysctl_data_s { | |||
47 | nasid_t scd_nasid; /* Node on which subchannels are opened. */ | 47 | nasid_t scd_nasid; /* Node on which subchannels are opened. */ |
48 | }; | 48 | }; |
49 | 49 | ||
50 | |||
51 | /* argument types */ | ||
52 | #define IR_ARG_INT 0x00 /* 4-byte integer (big-endian) */ | ||
53 | #define IR_ARG_ASCII 0x01 /* null-terminated ASCII string */ | ||
54 | #define IR_ARG_UNKNOWN 0x80 /* unknown data type. The low | ||
55 | * 7 bits will contain the data | ||
56 | * length. */ | ||
57 | #define IR_ARG_UNKNOWN_LENGTH_MASK 0x7f | ||
58 | |||
59 | |||
60 | /* system controller event codes */ | ||
61 | #define EV_CLASS_MASK 0xf000ul | ||
62 | #define EV_SEVERITY_MASK 0x0f00ul | ||
63 | #define EV_COMPONENT_MASK 0x00fful | ||
64 | |||
65 | #define EV_CLASS_POWER 0x1000ul | ||
66 | #define EV_CLASS_FAN 0x2000ul | ||
67 | #define EV_CLASS_TEMP 0x3000ul | ||
68 | #define EV_CLASS_ENV 0x4000ul | ||
69 | #define EV_CLASS_TEST_FAULT 0x5000ul | ||
70 | #define EV_CLASS_TEST_WARNING 0x6000ul | ||
71 | #define EV_CLASS_PWRD_NOTIFY 0x8000ul | ||
72 | |||
73 | #define EV_SEVERITY_POWER_STABLE 0x0000ul | ||
74 | #define EV_SEVERITY_POWER_LOW_WARNING 0x0100ul | ||
75 | #define EV_SEVERITY_POWER_HIGH_WARNING 0x0200ul | ||
76 | #define EV_SEVERITY_POWER_HIGH_FAULT 0x0300ul | ||
77 | #define EV_SEVERITY_POWER_LOW_FAULT 0x0400ul | ||
78 | |||
79 | #define EV_SEVERITY_FAN_STABLE 0x0000ul | ||
80 | #define EV_SEVERITY_FAN_WARNING 0x0100ul | ||
81 | #define EV_SEVERITY_FAN_FAULT 0x0200ul | ||
82 | |||
83 | #define EV_SEVERITY_TEMP_STABLE 0x0000ul | ||
84 | #define EV_SEVERITY_TEMP_ADVISORY 0x0100ul | ||
85 | #define EV_SEVERITY_TEMP_CRITICAL 0x0200ul | ||
86 | #define EV_SEVERITY_TEMP_FAULT 0x0300ul | ||
87 | |||
88 | void scdrv_event_init(struct sysctl_data_s *); | ||
89 | |||
50 | #endif /* _SN_SYSCTL_H_ */ | 90 | #endif /* _SN_SYSCTL_H_ */ |
diff --git a/include/asm-ia64/sn/sn_sal.h b/include/asm-ia64/sn/sn_sal.h index 123c1a50a9dc..f914f6da077c 100644 --- a/include/asm-ia64/sn/sn_sal.h +++ b/include/asm-ia64/sn/sn_sal.h | |||
@@ -64,6 +64,7 @@ | |||
64 | 64 | ||
65 | #define SN_SAL_SYSCTL_IOBRICK_PCI_OP 0x02000042 // reentrant | 65 | #define SN_SAL_SYSCTL_IOBRICK_PCI_OP 0x02000042 // reentrant |
66 | #define SN_SAL_IROUTER_OP 0x02000043 | 66 | #define SN_SAL_IROUTER_OP 0x02000043 |
67 | #define SN_SAL_SYSCTL_EVENT 0x02000044 | ||
67 | #define SN_SAL_IOIF_INTERRUPT 0x0200004a | 68 | #define SN_SAL_IOIF_INTERRUPT 0x0200004a |
68 | #define SN_SAL_HWPERF_OP 0x02000050 // lock | 69 | #define SN_SAL_HWPERF_OP 0x02000050 // lock |
69 | #define SN_SAL_IOIF_ERROR_INTERRUPT 0x02000051 | 70 | #define SN_SAL_IOIF_ERROR_INTERRUPT 0x02000051 |
@@ -850,6 +851,19 @@ ia64_sn_irtr_intr_disable(nasid_t nasid, int subch, u64 intr) | |||
850 | return (int) rv.v0; | 851 | return (int) rv.v0; |
851 | } | 852 | } |
852 | 853 | ||
854 | /* | ||
855 | * Set up a node as the point of contact for system controller | ||
856 | * environmental event delivery. | ||
857 | */ | ||
858 | static inline int | ||
859 | ia64_sn_sysctl_event_init(nasid_t nasid) | ||
860 | { | ||
861 | struct ia64_sal_retval rv; | ||
862 | SAL_CALL_REENTRANT(rv, SN_SAL_SYSCTL_EVENT, (u64) nasid, | ||
863 | 0, 0, 0, 0, 0, 0); | ||
864 | return (int) rv.v0; | ||
865 | } | ||
866 | |||
853 | /** | 867 | /** |
854 | * ia64_sn_get_fit_compt - read a FIT entry from the PROM header | 868 | * ia64_sn_get_fit_compt - read a FIT entry from the PROM header |
855 | * @nasid: NASID of node to read | 869 | * @nasid: NASID of node to read |