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

Commit ba22906a 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) Fix panics with SR-IOV, from Babu Moger.

 2) Wire up preadv2/pwritev2.

 3) Allow proper auto-loading of VIO devices, from John Paul Adrian
    Glaubitz.

 4) Recognize Sonoma cpus, from Khalid Aziz.

 5) Fix bootup regressions caused by syscall trace fixes made recently.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc64: Fix bootup regressions on some Kconfig combinations.
  sparc64: recognize and support Sonoma CPU type
  sparc: Implement and wire up vio_hotplug for vio.
  sparc: Implement and wire up modalias_show for vio.
  sparc/pci: Refactor dev_archdata initialization into pci_init_dev_archdata
  sparc/defconfigs: Remove CONFIG_IPV6_PRIVACY
  sparc: Write up preadv2/pwritev2 syscalls.
  sparc/PCI: Fix for panic while enabling SR-IOV
parents 04974df8 49fa5230

arch/sparc/configs/sparc32_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ CONFIG_INET_AH=y 
CONFIG_INET_ESP=y

CONFIG_INET_IPCOMP=y

# CONFIG_INET_LRO is not set

CONFIG_IPV6_PRIVACY=y

CONFIG_INET6_AH=m

CONFIG_INET6_ESP=m

CONFIG_INET6_IPCOMP=m

arch/sparc/configs/sparc64_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ CONFIG_SYN_COOKIES=y 
CONFIG_INET_AH=y

CONFIG_INET_ESP=y

CONFIG_INET_IPCOMP=y

CONFIG_IPV6_PRIVACY=y

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_IPV6_ROUTE_INFO=y

CONFIG_IPV6_OPTIMISTIC_DAD=y

arch/sparc/include/asm/spitfire.h

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
#define SUN4V_CHIP_SPARC_M6	0x06

#define SUN4V_CHIP_SPARC_M7	0x07

#define SUN4V_CHIP_SPARC64X	0x8a

#define SUN4V_CHIP_SPARC_SN	0x8b

#define SUN4V_CHIP_UNKNOWN	0xff



#ifndef __ASSEMBLY__

arch/sparc/include/uapi/asm/unistd.h

+3 −1
Original line number Diff line number Diff line
@@ -423,8 +423,10 @@ 
#define __NR_setsockopt		355

#define __NR_mlock2		356

#define __NR_copy_file_range	357

#define __NR_preadv2		358

#define __NR_pwritev2		359



#define NR_syscalls		358

#define NR_syscalls		360



/* Bitmask values returned from kern_features system call.  */

#define KERN_FEATURE_MIXED_MODE_STACK	0x00000001

arch/sparc/kernel/cherrs.S

+5 −9
Original line number Diff line number Diff line
@@ -214,8 +214,7 @@ do_dcpe_tl1_nonfatal: /* Ok we may use interrupt globals safely. */ 
	subcc		%g1, %g2, %g1		! Next cacheline

	bge,pt		%icc, 1b

	 nop

	ba,pt		%xcc, dcpe_icpe_tl1_common

	 nop

	ba,a,pt		%xcc, dcpe_icpe_tl1_common



do_dcpe_tl1_fatal:

	sethi		%hi(1f), %g7
@@ -224,8 +223,7 @@ do_dcpe_tl1_fatal: 
	mov		0x2, %o0

	call		cheetah_plus_parity_error

	 add		%sp, PTREGS_OFF, %o1

	ba,pt		%xcc, rtrap

	 nop

	ba,a,pt		%xcc, rtrap

	.size		do_dcpe_tl1,.-do_dcpe_tl1



	.globl		do_icpe_tl1
@@ -259,8 +257,7 @@ do_icpe_tl1_nonfatal: /* Ok we may use interrupt globals safely. */ 
	subcc		%g1, %g2, %g1

	bge,pt		%icc, 1b

	 nop

	ba,pt		%xcc, dcpe_icpe_tl1_common

	 nop

	ba,a,pt		%xcc, dcpe_icpe_tl1_common



do_icpe_tl1_fatal:

	sethi		%hi(1f), %g7
@@ -269,8 +266,7 @@ do_icpe_tl1_fatal: 
	mov		0x3, %o0

	call		cheetah_plus_parity_error

	 add		%sp, PTREGS_OFF, %o1

	ba,pt		%xcc, rtrap

	 nop

	ba,a,pt		%xcc, rtrap

	.size		do_icpe_tl1,.-do_icpe_tl1

	

	.type		dcpe_icpe_tl1_common,#function
@@ -456,7 +452,7 @@ __cheetah_log_error: 
	 cmp		%g2, 0x63

	be		c_cee

	 nop

	ba,pt		%xcc, c_deferred

	ba,a,pt		%xcc, c_deferred

	.size		__cheetah_log_error,.-__cheetah_log_error



	/* Cheetah FECC trap handling, we get here from tl{0,1}_fecc