Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

Pull arm64 fixes from Catalin Marinas: - enable bpf syscall for compat - cpu_suspend fix when checking the idle state type - defconfig update * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: arm64: defconfig: update defconfig for 3.18 arm64: compat: Enable bpf syscall arm64: psci: fix cpu_suspend to check idle state type for index

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fixes from Catalin Marinas: - enable bpf syscall for compat - cpu_suspend fix when checking the idle state type - defconfig update * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: arm64: defconfig: update defconfig for 3.18 arm64: compat: Enable bpf syscall arm64: psci: fix cpu_suspend to check idle state type for index
Linus Torvalds
2 parents b1f368b58b 2d39ad649e
Showing 3 changed files Side-by-side Diff
arch/arm64/configs/defconfig
arch/arm64/include/asm/unistd32.h
arch/arm64/kernel/psci.c
@@ -35,6 +35,9 @@
 CONFIG_ARCH_THUNDER=y
 CONFIG_ARCH_VEXPRESS=y
 CONFIG_ARCH_XGENE=y
+CONFIG_PCI=y
+CONFIG_PCI_MSI=y
+CONFIG_PCI_XGENE=y
 CONFIG_SMP=y
 CONFIG_PREEMPT=y
 CONFIG_KSM=y
@@ -52,6 +55,7 @@
 CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_LRO is not set
 # CONFIG_IPV6 is not set
+CONFIG_BPF_JIT=y
 # CONFIG_WIRELESS is not set
 CONFIG_NET_9P=y
 CONFIG_NET_9P_VIRTIO=y
  
  
  
@@ -65,16 +69,17 @@
 CONFIG_BLK_DEV_SD=y
 # CONFIG_SCSI_LOWLEVEL is not set
 CONFIG_ATA=y
+CONFIG_SATA_AHCI=y
+CONFIG_SATA_AHCI_PLATFORM=y
 CONFIG_AHCI_XGENE=y
-CONFIG_PHY_XGENE=y
 CONFIG_PATA_PLATFORM=y
 CONFIG_PATA_OF_PLATFORM=y
 CONFIG_NETDEVICES=y
 CONFIG_TUN=y
 CONFIG_VIRTIO_NET=y
+CONFIG_NET_XGENE=y
 CONFIG_SMC91X=y
 CONFIG_SMSC911X=y
-CONFIG_NET_XGENE=y
 # CONFIG_WLAN is not set
 CONFIG_INPUT_EVDEV=y
 # CONFIG_SERIO_SERPORT is not set
@@ -87,6 +92,11 @@
 CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_VIRTIO_CONSOLE=y
 # CONFIG_HW_RANDOM is not set
+# CONFIG_HMC_DRV is not set
+CONFIG_SPI=y
+CONFIG_SPI_PL022=y
+CONFIG_GPIO_PL061=y
+CONFIG_GPIO_XGENE=y
 # CONFIG_HWMON is not set
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
  
  
  
  
@@ -97,13 +107,25 @@
 # CONFIG_LOGO_LINUX_MONO is not set
 # CONFIG_LOGO_LINUX_VGA16 is not set
 CONFIG_USB=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_HCD_PLATFORM=y
 CONFIG_USB_ISP1760_HCD=y
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD_PLATFORM=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_ULPI=y
 CONFIG_MMC=y
 CONFIG_MMC_ARMMMCI=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_PLTFM=y
+CONFIG_MMC_SPI=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_EFI=y
+CONFIG_RTC_DRV_XGENE=y
 CONFIG_VIRTIO_BALLOON=y
 CONFIG_VIRTIO_MMIO=y
 # CONFIG_IOMMU_SUPPORT is not set
+CONFIG_PHY_XGENE=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
 # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
@@ -792,4 +792,6 @@
 __SYSCALL(__NR_getrandom, sys_getrandom)
 #define __NR_memfd_create 385
 __SYSCALL(__NR_memfd_create, sys_memfd_create)
+#define __NR_bpf 386
+__SYSCALL(__NR_bpf, sys_bpf)
@@ -528,7 +528,7 @@
 	if (WARN_ON_ONCE(!index))
 		return -EINVAL;
  
-	if (state->type == PSCI_POWER_STATE_TYPE_STANDBY)
+	if (state[index - 1].type == PSCI_POWER_STATE_TYPE_STANDBY)
 		ret = psci_ops.cpu_suspend(state[index - 1], 0);
 	else
 		ret = __cpu_suspend(index, psci_suspend_finisher);
...	...	@@ -35,6 +35,9 @@
35	35	CONFIG_ARCH_THUNDER=y
36	36	CONFIG_ARCH_VEXPRESS=y
37	37	CONFIG_ARCH_XGENE=y
	38	+CONFIG_PCI=y
	39	+CONFIG_PCI_MSI=y
	40	+CONFIG_PCI_XGENE=y
38	41	CONFIG_SMP=y
39	42	CONFIG_PREEMPT=y
40	43	CONFIG_KSM=y
...	...	@@ -52,6 +55,7 @@
52	55	CONFIG_IP_PNP_BOOTP=y
53	56	# CONFIG_INET_LRO is not set
54	57	# CONFIG_IPV6 is not set
	58	+CONFIG_BPF_JIT=y
55	59	# CONFIG_WIRELESS is not set
56	60	CONFIG_NET_9P=y
57	61	CONFIG_NET_9P_VIRTIO=y
58	62
59	63
60	64
...	...	@@ -65,16 +69,17 @@
65	69	CONFIG_BLK_DEV_SD=y
66	70	# CONFIG_SCSI_LOWLEVEL is not set
67	71	CONFIG_ATA=y
	72	+CONFIG_SATA_AHCI=y
	73	+CONFIG_SATA_AHCI_PLATFORM=y
68	74	CONFIG_AHCI_XGENE=y
69		-CONFIG_PHY_XGENE=y
70	75	CONFIG_PATA_PLATFORM=y
71	76	CONFIG_PATA_OF_PLATFORM=y
72	77	CONFIG_NETDEVICES=y
73	78	CONFIG_TUN=y
74	79	CONFIG_VIRTIO_NET=y
	80	+CONFIG_NET_XGENE=y
75	81	CONFIG_SMC91X=y
76	82	CONFIG_SMSC911X=y
77		-CONFIG_NET_XGENE=y
78	83	# CONFIG_WLAN is not set
79	84	CONFIG_INPUT_EVDEV=y
80	85	# CONFIG_SERIO_SERPORT is not set
...	...	@@ -87,6 +92,11 @@
87	92	CONFIG_SERIAL_OF_PLATFORM=y
88	93	CONFIG_VIRTIO_CONSOLE=y
89	94	# CONFIG_HW_RANDOM is not set
	95	+# CONFIG_HMC_DRV is not set
	96	+CONFIG_SPI=y
	97	+CONFIG_SPI_PL022=y
	98	+CONFIG_GPIO_PL061=y
	99	+CONFIG_GPIO_XGENE=y
90	100	# CONFIG_HWMON is not set
91	101	CONFIG_REGULATOR=y
92	102	CONFIG_REGULATOR_FIXED_VOLTAGE=y
93	103
94	104
95	105
96	106
...	...	@@ -97,13 +107,25 @@
97	107	# CONFIG_LOGO_LINUX_MONO is not set
98	108	# CONFIG_LOGO_LINUX_VGA16 is not set
99	109	CONFIG_USB=y
	110	+CONFIG_USB_EHCI_HCD=y
	111	+CONFIG_USB_EHCI_HCD_PLATFORM=y
100	112	CONFIG_USB_ISP1760_HCD=y
	113	+CONFIG_USB_OHCI_HCD=y
	114	+CONFIG_USB_OHCI_HCD_PLATFORM=y
101	115	CONFIG_USB_STORAGE=y
	116	+CONFIG_USB_ULPI=y
102	117	CONFIG_MMC=y
103	118	CONFIG_MMC_ARMMMCI=y
	119	+CONFIG_MMC_SDHCI=y
	120	+CONFIG_MMC_SDHCI_PLTFM=y
	121	+CONFIG_MMC_SPI=y
	122	+CONFIG_RTC_CLASS=y
	123	+CONFIG_RTC_DRV_EFI=y
	124	+CONFIG_RTC_DRV_XGENE=y
104	125	CONFIG_VIRTIO_BALLOON=y
105	126	CONFIG_VIRTIO_MMIO=y
106	127	# CONFIG_IOMMU_SUPPORT is not set
	128	+CONFIG_PHY_XGENE=y
107	129	CONFIG_EXT2_FS=y
108	130	CONFIG_EXT3_FS=y
109	131	# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
...	...	@@ -792,4 +792,6 @@
792	792	__SYSCALL(__NR_getrandom, sys_getrandom)
793	793	#define __NR_memfd_create 385
794	794	__SYSCALL(__NR_memfd_create, sys_memfd_create)
	795	+#define __NR_bpf 386
	796	+__SYSCALL(__NR_bpf, sys_bpf)
...	...	@@ -528,7 +528,7 @@
528	528	if (WARN_ON_ONCE(!index))
529	529	return -EINVAL;
530	530
531		- if (state->type == PSCI_POWER_STATE_TYPE_STANDBY)
	531	+ if (state[index - 1].type == PSCI_POWER_STATE_TYPE_STANDBY)
532	532	ret = psci_ops.cpu_suspend(state[index - 1], 0);
533	533	else
534	534	ret = __cpu_suspend(index, psci_suspend_finisher);