Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70694a8b authored by Christian Krafft's avatar Christian Krafft Committed by Benjamin Herrenschmidt
Browse files

powerpc/cell: Cleanup sysreset_hack for IBM cell blades 



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.

Signed-off-by: default avatarChristian Krafft <krafft@de.ibm.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 880e7105

arch/powerpc/platforms/cell/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -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.c

+1 −26
Original line number Diff line number Diff line
@@ -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(struct pt_regs *regs) 
		timer_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(&regs->pmcr, in_be64(&regs->pmcr) |

					    CBE_PMD_PAUSE_ZERO_CONTROL);



		/* Enable JTAG system-reset hack */

		if (sysreset_hack)

			out_be32(&regs->fir_mode_reg,

				in_be32(&regs->fir_mode_reg) |

				CBE_PMD_FIR_MODE_M8);

	}



	ppc_md.power_save = cbe_power_save;

arch/powerpc/platforms/cell/pervasive.h

+9 −0
Original line number Diff line number Diff line
@@ -30,4 +30,13 @@ extern void cbe_system_error_exception(struct pt_regs *regs); 
extern 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
Original line number Diff line number Diff line
@@ -236,6 +236,52 @@ static struct notifier_block cbe_ptcal_reboot_notifier = { 
	.notifier_call = cbe_ptcal_notify_reboot

};



#ifdef CONFIG_PPC_IBM_CELL_RESETBUTTON

static int sysreset_hack;



static int __init cbe_sysreset_init(void)

{

	struct cbe_pmd_regs __iomem *regs;



	sysreset_hack = machine_is_compatible("IBM,CBPLUS-1.0");

	if (!sysreset_hack)

		return 0;



	regs = cbe_get_cpu_pmd_regs(0);

	if (!regs)

		return 0;



	/* Enable JTAG system-reset hack */

	out_be32(&regs->fir_mode_reg,

		in_be32(&regs->fir_mode_reg) |

		CBE_PMD_FIR_MODE_M8);



	return 0;

}

device_initcall(cbe_sysreset_init);



int cbe_sysreset_hack(void)

{

	struct cbe_pmd_regs __iomem *regs;



	/*

	 * 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 && (smp_processor_id() == 0)) {

		regs = cbe_get_cpu_pmd_regs(0);

		if (!regs)

			return 0;

		if (in_be64(&regs->ras_esc_0) & 0x0000ffff) {

			out_be64(&regs->ras_esc_0, 0);

			return 0;

		}

	}

	return 1;

}

#endif /* CONFIG_PPC_IBM_CELL_RESETBUTTON */



int __init cbe_ptcal_init(void)

{

	int ret;