cell: add support for power button of future IBM cell blades
Subsystems (2)
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/2 cell: cleanup sysreset_hack for IBM cell blades
From: Christian Krafft <[email protected]>
This patch adds a config option for the sysreset_hack used for IBM Cell blades. The code is moves from pervasive.c into ras.c and gets it's own init method.
arch/powerpc/platforms/cell/pervasive.c +1 -26
@@ -38,8 +38,6 @@#include "pervasive.h" -static int sysreset_hack; -static void cbe_power_save (void ) {unsigned long ctrl, thread_switch_control;
@@ -87,9 +85,6 @@ static void cbe_power_save(void)static int cbe_system_reset_exception (struct pt_regs *regs) { -int cpu; -struct cbe_pmd_regs __iomem *pmd; -switch (regs->msr &SRR1_WAKEMASK ) {case SRR1_WAKEEE :do_IRQ (regs);
@@ -98,19 +93,7 @@ static int cbe_system_reset_exception(sttimer_interrupt (regs);break ;case SRR1_WAKEMT : -/* -* The BMC can inject user triggered system reset exceptions, -* but cannot set the system reset reason in srr1, -* so check an extra register here. -*/ -if (sysreset_hack && (cpu =smp_processor_id ()) ==0 ) { - pmd =cbe_get_cpu_pmd_regs (cpu); -if (in_be64 (&pmd->ras_esc_0) &0xffff ) { -out_be64 (&pmd->ras_esc_0,0 ); -return 0 ; - } - } -break ; +return cbe_sysreset_hack ();#ifdef CONFIG_CBE_RAS case SRR1_WAKESYSERR :cbe_system_error_exception (regs);
@@ -134,8 +117,6 @@ void __init cbe_pervasive_init(void)if (!cpu_has_feature (CPU_FTR_PAUSE_ZERO ))return ; - sysreset_hack =machine_is_compatible ("IBM,CBPLUS-1.0" ); -for_each_possible_cpu (cpu) {struct cbe_pmd_regs __iomem *regs =cbe_get_cpu_pmd_regs (cpu);if (!regs)
@@ -144,12 +125,6 @@ void __init cbe_pervasive_init(void)/* Enable Pause(0) control bit */ out_be64 (®s->pmcr,in_be64 (®s->pmcr) |CBE_PMD_PAUSE_ZERO_CONTROL ); - -/* Enable JTAG system-reset hack */ -if (sysreset_hack) -out_be32 (®s->fir_mode_reg, -in_be32 (®s->fir_mode_reg) | -CBE_PMD_FIR_MODE_M8 ); } ppc_md.power_save = cbe_power_save;
arch/powerpc/platforms/cell/Kconfig +7 -0
@@ -83,6 +83,14 @@ config CBE_RAS depends on PPC_CELL_NATIVE default y +config PPC_IBM_CELL_RESETBUTTON + bool "IBM Cell Blade Pinhole reset button" + depends on CBE_RAS && PPC_IBM_CELL_BLADE + default y + help + Support Pinhole Resetbutton on IBM Cell blades. + This adds a method to trigger system reset via front panel pinhole
button. +
config CBE_THERM
tristate "CBE thermal support"
default m
arch/powerpc/platforms/cell/pervasive.h +9 -0
@@ -30,4 +30,13 @@ extern void cbe_system_error_exception(sextern void cbe_maintenance_exception (struct pt_regs *regs);extern void cbe_thermal_exception (struct pt_regs *regs); +#ifdef CONFIG_PPC_IBM_CELL_RESETBUTTON +extern int cbe_sysreset_hack (void ); +#else +static inline int cbe_sysreset_hack (void ) +{ +return 1 ; +} +#endif /* CONFIG_PPC_IBM_CELL_RESETBUTTON */ +#endif
arch/powerpc/platforms/cell/ras.c +46 -0
52 lines not on this page · raw message
Signature · 13 lines
Mit freundlichen Gruessen, kind regards, Christian Krafft Linux Kernel Development IBM Systems & Technology Group Phone: +49-07031-16-2032 IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Martin Jetter Geschaetsfuehung: Herbert Kircher Sitz der Gesellschaft: Boelingen Registergericht: Amtsgericht Stuttgart, HRB 243294
Arnd Bergmann
AppliedRe: [Cbe-oss-dev] [patch 1/2] cell: cleanup sysreset_hack for IBM cell blades
Quoted 8 lines · On Tuesday 15 July 2008, [email protected] wrote:
From: Christian Krafft <[email protected]>
This patch adds a config option for the
sysreset_hackused for IBM Cell blades. The code is moves frompervasive.cintoras.cand gets it's own init method.Signed-off-by Christian Krafft <[email protected]>
thanks, applied
PATCH 2/2 cell: add support for power button of future IBM cell blades
In reply to a message not in the archiveFrom: Christian Krafft <[email protected]>
This patch adds support for the power button on future IBM cell blades. It actually doesn't shut down the machine. Instead it exposes an input device /dev/input/event0 to userspace which sends KEY_POWER if power button has been pressed.
haldaemon actually recognizes the button, so a plattform independent acpid replacement should handle it correctly.
arch/powerpc/platforms/cell/Kconfig +0 -0
@@ -91,6 +91,14 @@ config PPC_IBM_CELL_RESETBUTTON Support Pinhole Resetbutton on IBM Cell blades. This adds a method to trigger system reset via front panel pinhole
button.
+config PPC_IBM_CELL_POWERBUTTON
+ tristate "IBM Cell Blade power button"
+ depends on PPC_IBM_CELL_BLADE && PPC_PMI && INPUT_EVDEV
+ default y
+ help
+ Support Powerbutton on IBM Cell blades.
+ This will enable the powerbutton as an input device.
+
config CBE_THERM
tristate "CBE thermal support"
default m
arch/powerpc/platforms/cell/cbe_powerbutton.c new file +75 -0
75 lines not on this page · raw message
0);
+ if (IS_ERR(button_pdev)) {
+ ret = PTR_ERR(button_pdev);
+ goto out_free_input;
+ }
+
+ dev->dev.parent = &button_pdev->dev;
+ ret = input_register_device(dev);
+ if (ret) {
+ printk(KERN_ERR "%s: Failed to register device\n", __func__);
+ goto out_free_pdev;
+ }
+
+ button_dev = dev;
+
+ ret = pmi_register_handler(&cbe_pmi_handler);
+ if (ret) {
+ printk(KERN_ERR "%s: Failed to register with pmi.\n",__func__);
+ goto out_free_pdev;
+ }
+
+ goto out;
+
+out_free_pdev:
+ platform_device_unregister(button_pdev);
+out_free_input:
+ input_free_device(dev);
+out:
+ return ret;
+}
+
+static void __exit cbe_powerbutton_exit(void) +{
+ pmi_unregister_handler(&cbe_pmi_handler);
+ platform_device_unregister(button_pdev);
+ input_free_device(button_dev);
+}
+
+module_init(cbe_powerbutton_init); +module_exit(cbe_powerbutton_exit);
+
+MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Christian Krafft <[email protected]>");
arch/powerpc/platforms/cell/Makefile +0 -0
@@ -9,6 +9,8 @@ obj-$(CONFIG_CBE_CPUFREQ_PMI) += cbe_cp obj-$(CONFIG_CBE_CPUFREQ) += cbe-cpufreq.o cbe-cpufreq-y += cbe_cpufreq_pervasive.o
cbe_cpufreq.o
+obj-$(CONFIG_PPC_IBM_CELL_POWERBUTTON) += cbe_powerbutton.o
+
ifeq ($(CONFIG_SMP),y)
obj-$(CONFIG_PPC_CELL_NATIVE) += smp.o
endif
include/asm-powerpc/pmi.h +1 -0
@@ -30,6 +30,7 @@#ifdef __KERNEL__#define PMI_TYPE_FREQ_CHANGE 0x01 +#define PMI_TYPE_POWER_BUTTON 0x02#define PMI_READ_TYPE 0#define PMI_READ_DATA0 1#define PMI_READ_DATA1 2
Signature · 13 lines
Mit freundlichen Gruessen, kind regards, Christian Krafft Linux Kernel Development IBM Systems & Technology Group Phone: +49-07031-16-2032 IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Martin Jetter Geschaetsfuehung: Herbert Kircher Sitz der Gesellschaft: Boelingen Registergericht: Amtsgericht Stuttgart, HRB 243294
Arnd Bergmann
AppliedQuoted 11 lines · On Tuesday 15 July 2008, [email protected] wrote:
From: Christian Krafft <[email protected]>
This patch adds support for the power button on future IBM cell blades. It actually doesn't shut down the machine. Instead it exposes an input device
/dev/input/event0to userspace which sendsKEY_POWERif power button has been pressed.
haldaemon actually recognizes the button, so a plattform independent acpid replacement should handle it correctly.Signed-off-by Christian Krafft <[email protected]>
Thanks, applied.
Note: this patch is line-wrapped, but I'll fix it up for you one more time ;-)