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

Commit 9cf52b29 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC/64]: Consolidate of_register_driver
  [SPARC] Videopix Frame Grabber: Convert device_lock_sem to mutex
  [SPARC]: Support for new termios.
  [SPARC64]: Check of_get_property() return in pci_determine_mem_io_space().
  [SPARC64]: Fix boot failures due to bootmem.
  [SPARC64]: Implement atomic backoff.
parents 95218430 5c457083

arch/sparc/kernel/of_device.c

+0 −20
Original line number Diff line number Diff line
@@ -585,24 +585,6 @@ static int __init of_debug(char *str) 


__setup("of_debug=", of_debug);



int of_register_driver(struct of_platform_driver *drv, struct bus_type *bus)

{

	/* initialize common driver fields */

	if (!drv->driver.name)

		drv->driver.name = drv->name;

	if (!drv->driver.owner)

		drv->driver.owner = drv->owner;

	drv->driver.bus = bus;



	/* register with core */

	return driver_register(&drv->driver);

}



void of_unregister_driver(struct of_platform_driver *drv)

{

	driver_unregister(&drv->driver);

}



struct of_device* of_platform_device_create(struct device_node *np,

					    const char *bus_id,

					    struct device *parent,
@@ -628,6 +610,4 @@ struct of_device* of_platform_device_create(struct device_node *np, 
	return dev;

}



EXPORT_SYMBOL(of_register_driver);

EXPORT_SYMBOL(of_unregister_driver);

EXPORT_SYMBOL(of_platform_device_create);

arch/sparc64/kernel/irq.c

+4 −4
Original line number Diff line number Diff line
@@ -877,7 +877,7 @@ void __cpuinit sun4v_register_mondo_queues(int this_cpu) 
static void __init alloc_one_mondo(unsigned long *pa_ptr, unsigned long qmask)

{

	unsigned long size = PAGE_ALIGN(qmask + 1);

	void *p = __alloc_bootmem_low(size, size, 0);

	void *p = __alloc_bootmem(size, size, 0);

	if (!p) {

		prom_printf("SUN4V: Error, cannot allocate mondo queue.\n");

		prom_halt();
@@ -889,7 +889,7 @@ static void __init alloc_one_mondo(unsigned long *pa_ptr, unsigned long qmask) 
static void __init alloc_one_kbuf(unsigned long *pa_ptr, unsigned long qmask)

{

	unsigned long size = PAGE_ALIGN(qmask + 1);

	void *p = __alloc_bootmem_low(size, size, 0);

	void *p = __alloc_bootmem(size, size, 0);



	if (!p) {

		prom_printf("SUN4V: Error, cannot allocate kbuf page.\n");
@@ -906,7 +906,7 @@ static void __init init_cpu_send_mondo_info(struct trap_per_cpu *tb) 


	BUILD_BUG_ON((NR_CPUS * sizeof(u16)) > (PAGE_SIZE - 64));



	page = alloc_bootmem_low_pages(PAGE_SIZE);

	page = alloc_bootmem_pages(PAGE_SIZE);

	if (!page) {

		prom_printf("SUN4V: Error, cannot allocate cpu mondo page.\n");

		prom_halt();
@@ -953,7 +953,7 @@ void __init init_IRQ(void) 
	kill_prom_timer();



	size = sizeof(struct ino_bucket) * NUM_IVECS;

	ivector_table = alloc_bootmem_low(size);

	ivector_table = alloc_bootmem(size);

	if (!ivector_table) {

		prom_printf("Fatal error, cannot allocate ivector_table\n");

		prom_halt();

arch/sparc64/kernel/of_device.c

+0 −20
Original line number Diff line number Diff line
@@ -869,26 +869,6 @@ static int __init of_debug(char *str) 


__setup("of_debug=", of_debug);



int of_register_driver(struct of_platform_driver *drv, struct bus_type *bus)

{

	/* initialize common driver fields */

	if (!drv->driver.name)

		drv->driver.name = drv->name;

	if (!drv->driver.owner)

		drv->driver.owner = drv->owner;

	drv->driver.bus = bus;



	/* register with core */

	return driver_register(&drv->driver);

}

EXPORT_SYMBOL(of_register_driver);



void of_unregister_driver(struct of_platform_driver *drv)

{

	driver_unregister(&drv->driver);

}

EXPORT_SYMBOL(of_unregister_driver);



struct of_device* of_platform_device_create(struct device_node *np,

					    const char *bus_id,

					    struct device *parent,

arch/sparc64/kernel/pci_common.c

+7 −0
Original line number Diff line number Diff line
@@ -396,6 +396,13 @@ void pci_determine_mem_io_space(struct pci_pbm_info *pbm) 


	saw_mem = saw_io = 0;

	pbm_ranges = of_get_property(pbm->prom_node, "ranges", &i);

	if (!pbm_ranges) {

		prom_printf("PCI: Fatal error, missing PBM ranges property "

			    " for %s\n",

			    pbm->name);

		prom_halt();

	}



	num_pbm_ranges = i / sizeof(*pbm_ranges);



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

arch/sparc64/lib/atomic.S

+27 −11
Original line number Diff line number Diff line 
/* $Id: atomic.S,v 1.4 2001/11/18 00:12:56 davem Exp $

 * atomic.S: These things are too big to do inline.

/* atomic.S: These things are too big to do inline.

 *

 * Copyright (C) 1999 David S. Miller (davem@redhat.com)

 * Copyright (C) 1999, 2007 David S. Miller (davem@davemloft.net)

 */



#include <asm/asi.h>

#include <asm/backoff.h>



	.text
@@ -16,27 +16,31 @@ 
	.globl	atomic_add

	.type	atomic_add,#function

atomic_add: /* %o0 = increment, %o1 = atomic_ptr */

	BACKOFF_SETUP(%o2)

1:	lduw	[%o1], %g1

	add	%g1, %o0, %g7

	cas	[%o1], %g1, %g7

	cmp	%g1, %g7

	bne,pn	%icc, 1b

	bne,pn	%icc, 2f

	 nop

	retl

	 nop

2:	BACKOFF_SPIN(%o2, %o3, 1b)

	.size	atomic_add, .-atomic_add



	.globl	atomic_sub

	.type	atomic_sub,#function

atomic_sub: /* %o0 = decrement, %o1 = atomic_ptr */

	BACKOFF_SETUP(%o2)

1:	lduw	[%o1], %g1

	sub	%g1, %o0, %g7

	cas	[%o1], %g1, %g7

	cmp	%g1, %g7

	bne,pn	%icc, 1b

	bne,pn	%icc, 2f

	 nop

	retl

	 nop

2:	BACKOFF_SPIN(%o2, %o3, 1b)

	.size	atomic_sub, .-atomic_sub



	/* On SMP we need to use memory barriers to ensure
@@ -60,89 +64,101 @@ atomic_sub: /* %o0 = decrement, %o1 = atomic_ptr */ 
	.globl	atomic_add_ret

	.type	atomic_add_ret,#function

atomic_add_ret: /* %o0 = increment, %o1 = atomic_ptr */

	BACKOFF_SETUP(%o2)

	ATOMIC_PRE_BARRIER

1:	lduw	[%o1], %g1

	add	%g1, %o0, %g7

	cas	[%o1], %g1, %g7

	cmp	%g1, %g7

	bne,pn	%icc, 1b

	bne,pn	%icc, 2f

	 add	%g7, %o0, %g7

	sra	%g7, 0, %o0

	ATOMIC_POST_BARRIER

	retl

	 nop

2:	BACKOFF_SPIN(%o2, %o3, 1b)

	.size	atomic_add_ret, .-atomic_add_ret



	.globl	atomic_sub_ret

	.type	atomic_sub_ret,#function

atomic_sub_ret: /* %o0 = decrement, %o1 = atomic_ptr */

	BACKOFF_SETUP(%o2)

	ATOMIC_PRE_BARRIER

1:	lduw	[%o1], %g1

	sub	%g1, %o0, %g7

	cas	[%o1], %g1, %g7

	cmp	%g1, %g7

	bne,pn	%icc, 1b

	bne,pn	%icc, 2f

	 sub	%g7, %o0, %g7

	sra	%g7, 0, %o0

	ATOMIC_POST_BARRIER

	retl

	 nop

2:	BACKOFF_SPIN(%o2, %o3, 1b)

	.size	atomic_sub_ret, .-atomic_sub_ret



	.globl	atomic64_add

	.type	atomic64_add,#function

atomic64_add: /* %o0 = increment, %o1 = atomic_ptr */

	BACKOFF_SETUP(%o2)

1:	ldx	[%o1], %g1

	add	%g1, %o0, %g7

	casx	[%o1], %g1, %g7

	cmp	%g1, %g7

	bne,pn	%xcc, 1b

	bne,pn	%xcc, 2f

	 nop

	retl

	 nop

2:	BACKOFF_SPIN(%o2, %o3, 1b)

	.size	atomic64_add, .-atomic64_add



	.globl	atomic64_sub

	.type	atomic64_sub,#function

atomic64_sub: /* %o0 = decrement, %o1 = atomic_ptr */

	BACKOFF_SETUP(%o2)

1:	ldx	[%o1], %g1

	sub	%g1, %o0, %g7

	casx	[%o1], %g1, %g7

	cmp	%g1, %g7

	bne,pn	%xcc, 1b

	bne,pn	%xcc, 2f

	 nop

	retl

	 nop

2:	BACKOFF_SPIN(%o2, %o3, 1b)

	.size	atomic64_sub, .-atomic64_sub



	.globl	atomic64_add_ret

	.type	atomic64_add_ret,#function

atomic64_add_ret: /* %o0 = increment, %o1 = atomic_ptr */

	BACKOFF_SETUP(%o2)

	ATOMIC_PRE_BARRIER

1:	ldx	[%o1], %g1

	add	%g1, %o0, %g7

	casx	[%o1], %g1, %g7

	cmp	%g1, %g7

	bne,pn	%xcc, 1b

	bne,pn	%xcc, 2f

	 add	%g7, %o0, %g7

	mov	%g7, %o0

	ATOMIC_POST_BARRIER

	retl

	 nop

2:	BACKOFF_SPIN(%o2, %o3, 1b)

	.size	atomic64_add_ret, .-atomic64_add_ret



	.globl	atomic64_sub_ret

	.type	atomic64_sub_ret,#function

atomic64_sub_ret: /* %o0 = decrement, %o1 = atomic_ptr */

	BACKOFF_SETUP(%o2)

	ATOMIC_PRE_BARRIER

1:	ldx	[%o1], %g1

	sub	%g1, %o0, %g7

	casx	[%o1], %g1, %g7

	cmp	%g1, %g7

	bne,pn	%xcc, 1b

	bne,pn	%xcc, 2f

	 sub	%g7, %o0, %g7

	mov	%g7, %o0

	ATOMIC_POST_BARRIER

	retl

	 nop

2:	BACKOFF_SPIN(%o2, %o3, 1b)

	.size	atomic64_sub_ret, .-atomic64_sub_ret