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

Commit 56f1f4b2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc 

Pull sparc fixes from David Miller:

 1) Do serial locking in a way that makes things clear that these are
    IRQ spinlocks.

 2) Conversion to generic idle loop broke first generation Niagara
    machines, need to have %pil interrupts enabled during cpu yield
    hypervisor call.

 3) Do not use magic constants for iterations over tsb tables, from Doug
    Wilson.

 4) Fix erroneous truncation of 64-bit system call return values to
    32-bit.  From Dave Kleikamp.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc64: Make sure %pil interrupts are enabled during hypervisor yield.
  sparc64:tsb.c:use array size macro rather than number
  sparc64: don't treat 64-bit syscall return codes as 32-bit
  sparc: serial: Clean up the locking for -rt
parents 8a109446 cb3042d6

arch/sparc/kernel/process_64.c

+3 −1
Original line number Diff line number Diff line
@@ -58,9 +58,12 @@ void arch_cpu_idle(void) 
{

	if (tlb_type != hypervisor) {

		touch_nmi_watchdog();

		local_irq_enable();

	} else {

		unsigned long pstate;



		local_irq_enable();



                /* The sun4v sleeping code requires that we have PSTATE.IE cleared over

                 * the cpu sleep hypervisor call.

                 */
@@ -82,7 +85,6 @@ void arch_cpu_idle(void) 
			: "=&r" (pstate)

			: "i" (PSTATE_IE));

	}

	local_irq_enable();

}



#ifdef CONFIG_HOTPLUG_CPU

arch/sparc/kernel/syscalls.S

+2 −2
Original line number Diff line number Diff line
@@ -189,7 +189,8 @@ linux_sparc_syscall32: 
	 mov	%i0, %l5				! IEU1

5:	call	%l7					! CTI	Group brk forced

	 srl	%i5, 0, %o5				! IEU1

	ba,a,pt	%xcc, 3f

	ba,pt	%xcc, 3f

	 sra	%o0, 0, %o0



	/* Linux native system calls enter here... */

	.align	32
@@ -217,7 +218,6 @@ linux_sparc_syscall: 
3:	stx	%o0, [%sp + PTREGS_OFF + PT_V9_I0]

ret_sys_call:

	ldx	[%sp + PTREGS_OFF + PT_V9_TSTATE], %g3

	sra	%o0, 0, %o0

	mov	%ulo(TSTATE_XCARRY | TSTATE_ICARRY), %g2

	sllx	%g2, 32, %g2

arch/sparc/mm/tsb.c

+1 −1
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ void __init pgtable_cache_init(void) 
		prom_halt();

	}



	for (i = 0; i < 8; i++) {

	for (i = 0; i < ARRAY_SIZE(tsb_cache_names); i++) {

		unsigned long size = 8192 << i;

		const char *name = tsb_cache_names[i];

drivers/tty/serial/sunhv.c

+10 −12
Original line number Diff line number Diff line
@@ -433,13 +433,10 @@ static void sunhv_console_write_paged(struct console *con, const char *s, unsign 
	unsigned long flags;

	int locked = 1;



	local_irq_save(flags);

	if (port->sysrq) {

		locked = 0;

	} else if (oops_in_progress) {

		locked = spin_trylock(&port->lock);

	} else

		spin_lock(&port->lock);

	if (port->sysrq || oops_in_progress)

		locked = spin_trylock_irqsave(&port->lock, flags);

	else

		spin_lock_irqsave(&port->lock, flags);



	while (n > 0) {

		unsigned long ra = __pa(con_write_page);
@@ -470,8 +467,7 @@ static void sunhv_console_write_paged(struct console *con, const char *s, unsign 
	}



	if (locked)

		spin_unlock(&port->lock);

	local_irq_restore(flags);

		spin_unlock_irqrestore(&port->lock, flags);

}



static inline void sunhv_console_putchar(struct uart_port *port, char c)
@@ -492,7 +488,10 @@ static void sunhv_console_write_bychar(struct console *con, const char *s, unsig 
	unsigned long flags;

	int i, locked = 1;



	local_irq_save(flags);

	if (port->sysrq || oops_in_progress)

		locked = spin_trylock_irqsave(&port->lock, flags);

	else

		spin_lock_irqsave(&port->lock, flags);

	if (port->sysrq) {

		locked = 0;

	} else if (oops_in_progress) {
@@ -507,8 +506,7 @@ static void sunhv_console_write_bychar(struct console *con, const char *s, unsig 
	}



	if (locked)

		spin_unlock(&port->lock);

	local_irq_restore(flags);

		spin_unlock_irqrestore(&port->lock, flags);

}



static struct console sunhv_console = {

drivers/tty/serial/sunsab.c

+5 −9
Original line number Diff line number Diff line
@@ -844,20 +844,16 @@ static void sunsab_console_write(struct console *con, const char *s, unsigned n) 
	unsigned long flags;

	int locked = 1;



	local_irq_save(flags);

	if (up->port.sysrq) {

		locked = 0;

	} else if (oops_in_progress) {

		locked = spin_trylock(&up->port.lock);

	} else

		spin_lock(&up->port.lock);

	if (up->port.sysrq || oops_in_progress)

		locked = spin_trylock_irqsave(&up->port.lock, flags);

	else

		spin_lock_irqsave(&up->port.lock, flags);



	uart_console_write(&up->port, s, n, sunsab_console_putchar);

	sunsab_tec_wait(up);



	if (locked)

		spin_unlock(&up->port.lock);

	local_irq_restore(flags);

		spin_unlock_irqrestore(&up->port.lock, flags);

}



static int sunsab_console_setup(struct console *con, char *options)