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

Commit fa877c71 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] Clean up linker script using standard macros.
  [IA64] Use standard macros for page-aligned data.
  [IA64] Use .ref.text, not .text.init for start_ap.
  [IA64] sgi-xp: fix printk format warnings
  [IA64] ioc4_serial: fix printk format warnings
  [IA64] mbcs: fix printk format warnings
  [IA64] pci_br, fix infinite loop in find_free_ate()
  [IA64] kdump: Short path to freeze CPUs
  [IA64] kdump: Try INIT regardless of
  [IA64] kdump: Mask INIT first in panic-kdump path
  [IA64] kdump: Don't return APs to SAL from kdump
  [IA64] kexec: Unregister MCA handler before kexec
  [IA64] kexec: Make INIT safe while transition to
  [IA64] kdump: Mask MCA/INIT on frozen cpus

Fix up conflict in arch/ia64/kernel/vmlinux.lds.S as per Tony's
suggestion.
parents 9eead2a8 6ae86350

arch/ia64/include/asm/mca.h

+2 −0
Original line number Diff line number Diff line
@@ -145,12 +145,14 @@ extern void ia64_mca_ucmc_handler(struct pt_regs *, struct ia64_sal_os_state *); 
extern void ia64_init_handler(struct pt_regs *,

			      struct switch_stack *,

			      struct ia64_sal_os_state *);

extern void ia64_os_init_on_kdump(void);

extern void ia64_monarch_init_handler(void);

extern void ia64_slave_init_handler(void);

extern void ia64_mca_cmc_vector_setup(void);

extern int  ia64_reg_MCA_extension(int (*fn)(void *, struct ia64_sal_os_state *));

extern void ia64_unreg_MCA_extension(void);

extern unsigned long ia64_get_rnat(unsigned long *);

extern void ia64_set_psr_mc(void);

extern void ia64_mca_printk(const char * fmt, ...)

	 __attribute__ ((format (printf, 1, 2)));

arch/ia64/kernel/crash.c

+57 −26
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
int kdump_status[NR_CPUS];

static atomic_t kdump_cpu_frozen;

atomic_t kdump_in_progress;

static int kdump_freeze_monarch;

static int kdump_on_init = 1;

static int kdump_on_fatal_mca = 1;
@@ -108,10 +109,38 @@ machine_crash_shutdown(struct pt_regs *pt) 
	 */

	kexec_disable_iosapic();

#ifdef CONFIG_SMP

	/*

	 * If kdump_on_init is set and an INIT is asserted here, kdump will

	 * be started again via INIT monarch.

	 */

	local_irq_disable();

	ia64_set_psr_mc();	/* mask MCA/INIT */

	if (atomic_inc_return(&kdump_in_progress) != 1)

		unw_init_running(kdump_cpu_freeze, NULL);



	/*

	 * Now this cpu is ready for kdump.

	 * Stop all others by IPI or INIT.  They could receive INIT from

	 * outside and might be INIT monarch, but only thing they have to

	 * do is falling into kdump_cpu_freeze().

	 *

	 * If an INIT is asserted here:

	 * - All receivers might be slaves, since some of cpus could already

	 *   be frozen and INIT might be masked on monarch.  In this case,

	 *   all slaves will be frozen soon since kdump_in_progress will let

	 *   them into DIE_INIT_SLAVE_LEAVE.

	 * - One might be a monarch, but INIT rendezvous will fail since

	 *   at least this cpu already have INIT masked so it never join

	 *   to the rendezvous.  In this case, all slaves and monarch will

	 *   be frozen soon with no wait since the INIT rendezvous is skipped

	 *   by kdump_in_progress.

	 */

	kdump_smp_send_stop();

	/* not all cpu response to IPI, send INIT to freeze them */

	if (kdump_wait_cpu_freeze() && kdump_on_init) 	{

	if (kdump_wait_cpu_freeze()) {

		kdump_smp_send_init();

		/* wait again, don't go ahead if possible */

		kdump_wait_cpu_freeze();

	}

#endif

}
@@ -129,17 +158,17 @@ void 
kdump_cpu_freeze(struct unw_frame_info *info, void *arg)

{

	int cpuid;



	local_irq_disable();

	cpuid = smp_processor_id();

	crash_save_this_cpu();

	current->thread.ksp = (__u64)info->sw - 16;



	ia64_set_psr_mc();	/* mask MCA/INIT and stop reentrance */



	atomic_inc(&kdump_cpu_frozen);

	kdump_status[cpuid] = 1;

	mb();

#ifdef CONFIG_HOTPLUG_CPU

	if (cpuid != 0)

		ia64_jump_to_sal(&sal_boot_rendez_state[cpuid]);

#endif

	for (;;)

		cpu_relax();

}
@@ -150,6 +179,20 @@ kdump_init_notifier(struct notifier_block *self, unsigned long val, void *data) 
	struct ia64_mca_notify_die *nd;

	struct die_args *args = data;



	if (atomic_read(&kdump_in_progress)) {

		switch (val) {

		case DIE_INIT_MONARCH_LEAVE:

			if (!kdump_freeze_monarch)

				break;

			/* fall through */

		case DIE_INIT_SLAVE_LEAVE:

		case DIE_INIT_MONARCH_ENTER:

		case DIE_MCA_RENDZVOUS_LEAVE:

			unw_init_running(kdump_cpu_freeze, NULL);

			break;

		}

	}



	if (!kdump_on_init && !kdump_on_fatal_mca)

		return NOTIFY_DONE;
@@ -162,43 +205,31 @@ kdump_init_notifier(struct notifier_block *self, unsigned long val, void *data) 
	}



	if (val != DIE_INIT_MONARCH_LEAVE &&

	    val != DIE_INIT_SLAVE_LEAVE &&

	    val != DIE_INIT_MONARCH_PROCESS &&

	    val != DIE_MCA_RENDZVOUS_LEAVE &&

	    val != DIE_MCA_MONARCH_LEAVE)

		return NOTIFY_DONE;



	nd = (struct ia64_mca_notify_die *)args->err;

	/* Reason code 1 means machine check rendezvous*/

	if ((val == DIE_INIT_MONARCH_LEAVE || val == DIE_INIT_SLAVE_LEAVE

	    || val == DIE_INIT_MONARCH_PROCESS) && nd->sos->rv_rc == 1)

		return NOTIFY_DONE;



	switch (val) {

	case DIE_INIT_MONARCH_PROCESS:

		if (kdump_on_init) {

			atomic_set(&kdump_in_progress, 1);

			*(nd->monarch_cpu) = -1;

		/* Reason code 1 means machine check rendezvous*/

		if (kdump_on_init && (nd->sos->rv_rc != 1)) {

			if (atomic_inc_return(&kdump_in_progress) != 1)

				kdump_freeze_monarch = 1;

		}

		break;

	case DIE_INIT_MONARCH_LEAVE:

		if (kdump_on_init)

		/* Reason code 1 means machine check rendezvous*/

		if (kdump_on_init && (nd->sos->rv_rc != 1))

			machine_kdump_on_init();

		break;

	case DIE_INIT_SLAVE_LEAVE:

		if (atomic_read(&kdump_in_progress))

			unw_init_running(kdump_cpu_freeze, NULL);

		break;

	case DIE_MCA_RENDZVOUS_LEAVE:

		if (atomic_read(&kdump_in_progress))

			unw_init_running(kdump_cpu_freeze, NULL);

		break;

	case DIE_MCA_MONARCH_LEAVE:

		/* *(nd->data) indicate if MCA is recoverable */

		if (kdump_on_fatal_mca && !(*(nd->data))) {

			atomic_set(&kdump_in_progress, 1);

			*(nd->monarch_cpu) = -1;

			if (atomic_inc_return(&kdump_in_progress) == 1)

				machine_kdump_on_init();

			/* We got fatal MCA while kdump!? No way!! */

		}

		break;

	}

arch/ia64/kernel/head.S

+3 −3
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ RestRR: \ 
	mov _tmp2=((ia64_rid(IA64_REGION_ID_KERNEL, (num<<61)) << 8) | (pgsize << 2) | vhpt);; \

	mov rr[_tmp1]=_tmp2



	.section __special_page_section,"ax"

	__PAGE_ALIGNED_DATA



	.global empty_zero_page

empty_zero_page:
@@ -181,7 +181,7 @@ swapper_pg_dir: 
halt_msg:

	stringz "Halting kernel\n"



	.section .text.head,"ax"

	__REF



	.global start_ap
@@ -1242,7 +1242,7 @@ GLOBAL_ENTRY(ia64_jump_to_sal) 
	movl r16=SAL_PSR_BITS_TO_SET;;

	mov cr.ipsr=r16

	mov cr.ifs=r0;;

	rfi;;

	rfi;;			// note: this unmask MCA/INIT (psr.mc)

1:

	/*

	 * Invalidate all TLB data/inst

arch/ia64/kernel/machine_kexec.c

+15 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 
#include <asm/delay.h>

#include <asm/meminit.h>

#include <asm/processor.h>

#include <asm/sal.h>

#include <asm/mca.h>



typedef NORET_TYPE void (*relocate_new_kernel_t)(

					unsigned long indirection_page,
@@ -85,13 +87,26 @@ static void ia64_machine_kexec(struct unw_frame_info *info, void *arg) 
	void *pal_addr = efi_get_pal_addr();

	unsigned long code_addr = (unsigned long)page_address(image->control_code_page);

	int ii;

	u64 fp, gp;

	ia64_fptr_t *init_handler = (ia64_fptr_t *)ia64_os_init_on_kdump;



	BUG_ON(!image);

	if (image->type == KEXEC_TYPE_CRASH) {

		crash_save_this_cpu();

		current->thread.ksp = (__u64)info->sw - 16;



		/* Register noop init handler */

		fp = ia64_tpa(init_handler->fp);

		gp = ia64_tpa(ia64_getreg(_IA64_REG_GP));

		ia64_sal_set_vectors(SAL_VECTOR_OS_INIT, fp, gp, 0, fp, gp, 0);

	} else {

		/* Unregister init handlers of current kernel */

		ia64_sal_set_vectors(SAL_VECTOR_OS_INIT, 0, 0, 0, 0, 0, 0);

	}



	/* Unregister mca handler - No more recovery on current kernel */

	ia64_sal_set_vectors(SAL_VECTOR_OS_MCA, 0, 0, 0, 0, 0, 0);



	/* Interrupts aren't acceptable while we reboot */

	local_irq_disable();

arch/ia64/kernel/mca.c

+13 −2
Original line number Diff line number Diff line
@@ -1682,14 +1682,25 @@ ia64_init_handler(struct pt_regs *regs, struct switch_stack *sw, 


	if (!sos->monarch) {

		ia64_mc_info.imi_rendez_checkin[cpu] = IA64_MCA_RENDEZ_CHECKIN_INIT;



#ifdef CONFIG_KEXEC

		while (monarch_cpu == -1 && !atomic_read(&kdump_in_progress))

			udelay(1000);

#else

		while (monarch_cpu == -1)

			cpu_relax();	/* spin until monarch enters */

#endif



		NOTIFY_INIT(DIE_INIT_SLAVE_ENTER, regs, (long)&nd, 1);

		NOTIFY_INIT(DIE_INIT_SLAVE_PROCESS, regs, (long)&nd, 1);



#ifdef CONFIG_KEXEC

		while (monarch_cpu != -1 && !atomic_read(&kdump_in_progress))

			udelay(1000);

#else

		while (monarch_cpu != -1)

			cpu_relax();	/* spin until monarch leaves */

#endif



		NOTIFY_INIT(DIE_INIT_SLAVE_LEAVE, regs, (long)&nd, 1);