Skip to content

Commit a0ce093

Browse files
davem330davem330
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2 parents f4803f1 + ef7f8ce commit a0ce093

File tree

350 files changed

+3949
-1320
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

350 files changed

+3949
-1320
lines changed

‎.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ Linus Lüssing <[email protected]> <[email protected]>
107107
Maciej W. Rozycki <[email protected]> <[email protected]>
108108
Marcin Nowakowski <[email protected]> <[email protected]>
109109
Mark Brown <[email protected]>
110+
Mark Yao <[email protected]> <[email protected]>
110111
Martin Kepplinger <[email protected]> <[email protected]>
111112
Martin Kepplinger <[email protected]> <[email protected]>
112113
Matthieu CASTET <[email protected]>

‎Documentation/admin-guide/kernel-parameters.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ parameter is applicable::
109109
IPV6 IPv6 support is enabled.
110110
ISAPNP ISA PnP code is enabled.
111111
ISDN Appropriate ISDN support is enabled.
112+
ISOL CPU Isolation is enabled.
112113
JOY Appropriate joystick support is enabled.
113114
KGDB Kernel debugger support is enabled.
114115
KVM Kernel Virtual Machine support is enabled.

‎Documentation/admin-guide/kernel-parameters.txt

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -328,11 +328,15 @@
328328
not play well with APC CPU idle - disable it if you have
329329
APC and your system crashes randomly.
330330

331-
apic= [APIC,X86-32] Advanced Programmable Interrupt Controller
331+
apic= [APIC,X86] Advanced Programmable Interrupt Controller
332332
Change the output verbosity whilst booting
333333
Format: { quiet (default) | verbose | debug }
334334
Change the amount of debugging information output
335335
when initialising the APIC and IO-APIC components.
336+
For X86-32, this can also be used to specify an APIC
337+
driver name.
338+
Format: apic=driver_name
339+
Examples: apic=bigsmp
336340

337341
apic_extnmi= [APIC,X86] External NMI delivery setting
338342
Format: { bsp (default) | all | none }
@@ -1737,7 +1741,7 @@
17371741
isapnp= [ISAPNP]
17381742
Format: <RDP>,<reset>,<pci_scan>,<verbosity>
17391743

1740-
isolcpus= [KNL,SMP] Isolate a given set of CPUs from disturbance.
1744+
isolcpus= [KNL,SMP,ISOL] Isolate a given set of CPUs from disturbance.
17411745
[Deprecated - use cpusets instead]
17421746
Format: [flag-list,]<cpu-list>
17431747

@@ -2662,7 +2666,7 @@
26622666
Valid arguments: on, off
26632667
Default: on
26642668

2665-
nohz_full= [KNL,BOOT]
2669+
nohz_full= [KNL,BOOT,SMP,ISOL]
26662670
The argument is a cpu list, as described above.
26672671
In kernels built with CONFIG_NO_HZ_FULL=y, set
26682672
the specified list of CPUs whose tick will be stopped
@@ -2708,6 +2712,8 @@
27082712
steal time is computed, but won't influence scheduler
27092713
behaviour
27102714

2715+
nopti [X86-64] Disable kernel page table isolation
2716+
27112717
nolapic [X86-32,APIC] Do not enable or use the local APIC.
27122718

27132719
nolapic_timer [X86-32,APIC] Do not use the local APIC timer.
@@ -3282,6 +3288,12 @@
32823288
pt. [PARIDE]
32833289
See Documentation/blockdev/paride.txt.
32843290

3291+
pti= [X86_64]
3292+
Control user/kernel address space isolation:
3293+
on - enable
3294+
off - disable
3295+
auto - default setting
3296+
32853297
pty.legacy_count=
32863298
[KNL] Number of legacy pty's. Overwrites compiled-in
32873299
default number.

‎Documentation/admin-guide/thunderbolt.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ If supported by your machine this will be exposed by the WMI bus with
230230
a sysfs attribute called "force_power".
231231

232232
For example the intel-wmi-thunderbolt driver exposes this attribute in:
233-
/sys/devices/platform/PNP0C14:00/wmi_bus/wmi_bus-PNP0C14:00/86CCFD48-205E-4A77-9C48-2021CBEDE341/force_power
233+
/sys/bus/wmi/devices/86CCFD48-205E-4A77-9C48-2021CBEDE341/force_power
234234

235235
To force the power to on, write 1 to this attribute file.
236236
To disable force power, write 0 to this attribute file.

‎Documentation/gpu/i915.rst

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -341,10 +341,7 @@ GuC
341341
GuC-specific firmware loader
342342
----------------------------
343343

344-
.. kernel-doc:: drivers/gpu/drm/i915/intel_guc_loader.c
345-
:doc: GuC-specific firmware loader
346-
347-
.. kernel-doc:: drivers/gpu/drm/i915/intel_guc_loader.c
344+
.. kernel-doc:: drivers/gpu/drm/i915/intel_guc_fw.c
348345
:internal:
349346

350347
GuC-based command submission

‎Documentation/x86/x86_64/mm.txt

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ ffffea0000000000 - ffffeaffffffffff (=40 bits) virtual memory map (1TB)
1212
... unused hole ...
1313
ffffec0000000000 - fffffbffffffffff (=44 bits) kasan shadow memory (16TB)
1414
... unused hole ...
15-
fffffe8000000000 - fffffeffffffffff (=39 bits) cpu_entry_area mapping
15+
vaddr_end for KASLR
16+
fffffe0000000000 - fffffe7fffffffff (=39 bits) cpu_entry_area mapping
17+
fffffe8000000000 - fffffeffffffffff (=39 bits) LDT remap for PTI
1618
ffffff0000000000 - ffffff7fffffffff (=39 bits) %esp fixup stacks
1719
... unused hole ...
1820
ffffffef00000000 - fffffffeffffffff (=64 GB) EFI region mapping space
@@ -29,20 +31,22 @@ Virtual memory map with 5 level page tables:
2931
hole caused by [56:63] sign extension
3032
ff00000000000000 - ff0fffffffffffff (=52 bits) guard hole, reserved for hypervisor
3133
ff10000000000000 - ff8fffffffffffff (=55 bits) direct mapping of all phys. memory
32-
ff90000000000000 - ff91ffffffffffff (=49 bits) hole
33-
ff92000000000000 - ffd1ffffffffffff (=54 bits) vmalloc/ioremap space
34+
ff90000000000000 - ff9fffffffffffff (=52 bits) LDT remap for PTI
35+
ffa0000000000000 - ffd1ffffffffffff (=54 bits) vmalloc/ioremap space (12800 TB)
3436
ffd2000000000000 - ffd3ffffffffffff (=49 bits) hole
3537
ffd4000000000000 - ffd5ffffffffffff (=49 bits) virtual memory map (512TB)
3638
... unused hole ...
3739
ffdf000000000000 - fffffc0000000000 (=53 bits) kasan shadow memory (8PB)
3840
... unused hole ...
39-
fffffe8000000000 - fffffeffffffffff (=39 bits) cpu_entry_area mapping
41+
vaddr_end for KASLR
42+
fffffe0000000000 - fffffe7fffffffff (=39 bits) cpu_entry_area mapping
43+
... unused hole ...
4044
ffffff0000000000 - ffffff7fffffffff (=39 bits) %esp fixup stacks
4145
... unused hole ...
4246
ffffffef00000000 - fffffffeffffffff (=64 GB) EFI region mapping space
4347
... unused hole ...
4448
ffffffff80000000 - ffffffff9fffffff (=512 MB) kernel text mapping, from phys 0
45-
ffffffffa0000000 - [fixmap start] (~1526 MB) module mapping space
49+
ffffffffa0000000 - fffffffffeffffff (1520 MB) module mapping space
4650
[fixmap start] - ffffffffff5fffff kernel-internal fixmap range
4751
ffffffffff600000 - ffffffffff600fff (=4 kB) legacy vsyscall ABI
4852
ffffffffffe00000 - ffffffffffffffff (=2 MB) unused hole
@@ -66,9 +70,10 @@ memory window (this size is arbitrary, it can be raised later if needed).
6670
The mappings are not part of any other kernel PGD and are only available
6771
during EFI runtime calls.
6872

69-
The module mapping space size changes based on the CONFIG requirements for the
70-
following fixmap section.
71-
7273
Note that if CONFIG_RANDOMIZE_MEMORY is enabled, the direct mapping of all
7374
physical memory, vmalloc/ioremap space and virtual memory map are randomized.
7475
Their order is preserved but their base will be offset early at boot time.
76+
77+
Be very careful vs. KASLR when changing anything here. The KASLR address
78+
range must not overlap with anything except the KASAN shadow area, which is
79+
correct as KASAN disables KASLR.

‎MAINTAINERS

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2622,50 +2622,48 @@ F: fs/bfs/
26222622
F: include/uapi/linux/bfs_fs.h
26232623

26242624
BLACKFIN ARCHITECTURE
2625-
M: Steven Miao <[email protected]>
26262625
L: [email protected] (moderated for non-subscribers)
26272626
T: git git://git.code.sf.net/p/adi-linux/code
26282627
W: http://blackfin.uclinux.org
2629-
S: Supported
2628+
S: Orphan
26302629
F: arch/blackfin/
26312630

26322631
BLACKFIN EMAC DRIVER
26332632
L: [email protected] (moderated for non-subscribers)
26342633
W: http://blackfin.uclinux.org
2635-
S: Supported
2634+
S: Orphan
26362635
F: drivers/net/ethernet/adi/
26372636

26382637
BLACKFIN MEDIA DRIVER
2639-
M: Scott Jiang <[email protected]>
26402638
L: [email protected] (moderated for non-subscribers)
26412639
W: http://blackfin.uclinux.org/
2642-
S: Supported
2640+
S: Orphan
26432641
F: drivers/media/platform/blackfin/
26442642
F: drivers/media/i2c/adv7183*
26452643
F: drivers/media/i2c/vs6624*
26462644

26472645
BLACKFIN RTC DRIVER
26482646
L: [email protected] (moderated for non-subscribers)
26492647
W: http://blackfin.uclinux.org
2650-
S: Supported
2648+
S: Orphan
26512649
F: drivers/rtc/rtc-bfin.c
26522650

26532651
BLACKFIN SDH DRIVER
26542652
L: [email protected] (moderated for non-subscribers)
26552653
W: http://blackfin.uclinux.org
2656-
S: Supported
2654+
S: Orphan
26572655
F: drivers/mmc/host/bfin_sdh.c
26582656

26592657
BLACKFIN SERIAL DRIVER
26602658
L: [email protected] (moderated for non-subscribers)
26612659
W: http://blackfin.uclinux.org
2662-
S: Supported
2660+
S: Orphan
26632661
F: drivers/tty/serial/bfin_uart.c
26642662

26652663
BLACKFIN WATCHDOG DRIVER
26662664
L: [email protected] (moderated for non-subscribers)
26672665
W: http://blackfin.uclinux.org
2668-
S: Supported
2666+
S: Orphan
26692667
F: drivers/watchdog/bfin_wdt.c
26702668

26712669
BLINKM RGB LED DRIVER
@@ -5154,15 +5152,15 @@ F: sound/usb/misc/ua101.c
51545152
EFI TEST DRIVER
51555153
L: [email protected]
51565154
M: Ivan Hu <[email protected]>
5157-
M: Matt Fleming <[email protected]>
5155+
M: Ard Biesheuvel <[email protected]>
51585156
S: Maintained
51595157
F: drivers/firmware/efi/test/
51605158

51615159
EFI VARIABLE FILESYSTEM
51625160
M: Matthew Garrett <[email protected]>
51635161
M: Jeremy Kerr <[email protected]>
5164-
M: Matt Fleming <[email protected]>
5165-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git
5162+
M: Ard Biesheuvel <[email protected]>
5163+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git
51665164
L: [email protected]
51675165
S: Maintained
51685166
F: fs/efivarfs/
@@ -5323,7 +5321,6 @@ S: Supported
53235321
F: security/integrity/evm/
53245322

53255323
EXTENSIBLE FIRMWARE INTERFACE (EFI)
5326-
M: Matt Fleming <[email protected]>
53275324
M: Ard Biesheuvel <[email protected]>
53285325
L: [email protected]
53295326
T: git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git
@@ -10152,7 +10149,7 @@ F: drivers/irqchip/irq-ompic.c
1015210149
F: drivers/irqchip/irq-or1k-*
1015310150

1015410151
OPENVSWITCH
10155-
M: Pravin Shelar <pshelar@nicira.com>
10152+
M: Pravin B Shelar <pshelar@ovn.org>
1015610153
L: [email protected]
1015710154
L: [email protected]
1015810155
W: http://openvswitch.org
@@ -13508,6 +13505,7 @@ M: Mika Westerberg <[email protected]>
1350813505
M: Yehezkel Bernat <[email protected]>
1350913506
T: git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git
1351013507
S: Maintained
13508+
F: Documentation/admin-guide/thunderbolt.rst
1351113509
F: drivers/thunderbolt/
1351213510
F: include/linux/thunderbolt.h
1351313511

‎Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VERSION = 4
33
PATCHLEVEL = 15
44
SUBLEVEL = 0
5-
EXTRAVERSION = -rc5
5+
EXTRAVERSION = -rc7
66
NAME = Fearless Coyote
77

88
# *DOCUMENTATION*
@@ -789,6 +789,9 @@ KBUILD_CFLAGS += $(call cc-disable-warning, pointer-sign)
789789
# disable invalid "can't wrap" optimizations for signed / pointers
790790
KBUILD_CFLAGS += $(call cc-option,-fno-strict-overflow)
791791

792+
# Make sure -fstack-check isn't enabled (like gentoo apparently did)
793+
KBUILD_CFLAGS += $(call cc-option,-fno-stack-check,)
794+
792795
# conserve stack if available
793796
KBUILD_CFLAGS += $(call cc-option,-fconserve-stack)
794797

‎arch/arc/boot/dts/axc003.dtsi

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,14 @@
3535
reg = <0x80 0x10>, <0x100 0x10>;
3636
#clock-cells = <0>;
3737
clocks = <&input_clk>;
38+
39+
/*
40+
* Set initial core pll output frequency to 90MHz.
41+
* It will be applied at the core pll driver probing
42+
* on early boot.
43+
*/
44+
assigned-clocks = <&core_clk>;
45+
assigned-clock-rates = <90000000>;
3846
};
3947

4048
core_intc: archs-intc@cpu {

‎arch/arc/boot/dts/axc003_idu.dtsi

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,14 @@
3535
reg = <0x80 0x10>, <0x100 0x10>;
3636
#clock-cells = <0>;
3737
clocks = <&input_clk>;
38+
39+
/*
40+
* Set initial core pll output frequency to 100MHz.
41+
* It will be applied at the core pll driver probing
42+
* on early boot.
43+
*/
44+
assigned-clocks = <&core_clk>;
45+
assigned-clock-rates = <100000000>;
3846
};
3947

4048
core_intc: archs-intc@cpu {

‎arch/arc/boot/dts/hsdk.dts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,14 @@
114114
reg = <0x00 0x10>, <0x14B8 0x4>;
115115
#clock-cells = <0>;
116116
clocks = <&input_clk>;
117+
118+
/*
119+
* Set initial core pll output frequency to 1GHz.
120+
* It will be applied at the core pll driver probing
121+
* on early boot.
122+
*/
123+
assigned-clocks = <&core_clk>;
124+
assigned-clock-rates = <1000000000>;
117125
};
118126

119127
serial: serial@5000 {

‎arch/arc/configs/hsdk_defconfig

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,11 @@ CONFIG_SERIAL_8250_DW=y
4949
CONFIG_SERIAL_OF_PLATFORM=y
5050
# CONFIG_HW_RANDOM is not set
5151
# CONFIG_HWMON is not set
52+
CONFIG_DRM=y
53+
# CONFIG_DRM_FBDEV_EMULATION is not set
54+
CONFIG_DRM_UDL=y
5255
CONFIG_FB=y
53-
CONFIG_FB_UDL=y
5456
CONFIG_FRAMEBUFFER_CONSOLE=y
55-
CONFIG_USB=y
5657
CONFIG_USB_EHCI_HCD=y
5758
CONFIG_USB_EHCI_HCD_PLATFORM=y
5859
CONFIG_USB_OHCI_HCD=y

‎arch/arc/include/asm/uaccess.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -668,6 +668,7 @@ __arc_strncpy_from_user(char *dst, const char __user *src, long count)
668668
return 0;
669669

670670
__asm__ __volatile__(
671+
" mov lp_count, %5 \n"
671672
" lp 3f \n"
672673
"1: ldb.ab %3, [%2, 1] \n"
673674
" breq.d %3, 0, 3f \n"
@@ -684,8 +685,8 @@ __arc_strncpy_from_user(char *dst, const char __user *src, long count)
684685
" .word 1b, 4b \n"
685686
" .previous \n"
686687
: "+r"(res), "+r"(dst), "+r"(src), "=r"(val)
687-
: "g"(-EFAULT), "l"(count)
688-
: "memory");
688+
: "g"(-EFAULT), "r"(count)
689+
: "lp_count", "lp_start", "lp_end", "memory");
689690

690691
return res;
691692
}

‎arch/arc/kernel/setup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ static void read_arc_build_cfg_regs(void)
199199
unsigned int exec_ctrl;
200200

201201
READ_BCR(AUX_EXEC_CTRL, exec_ctrl);
202-
cpu->extn.dual_enb = exec_ctrl & 1;
202+
cpu->extn.dual_enb = !(exec_ctrl & 1);
203203

204204
/* dual issue always present for this core */
205205
cpu->extn.dual = 1;

‎arch/arc/kernel/stacktrace.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ arc_unwind_core(struct task_struct *tsk, struct pt_regs *regs,
163163
*/
164164
static int __print_sym(unsigned int address, void *unused)
165165
{
166-
__print_symbol(" %s\n", address);
166+
printk(" %pS\n", (void *)address);
167167
return 0;
168168
}
169169

0 commit comments

Comments
 (0)