Skip to content

Commit 2b9b750

Browse files
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2 parents 9206eb0 + ccda4af commit 2b9b750

File tree

275 files changed

+3148
-1202
lines changed

Some content is hidden

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

275 files changed

+3148
-1202
lines changed

.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ Peter Oruba <[email protected]>
159159
Peter Oruba <[email protected]>
160160
161161
Praveen BP <[email protected]>
162+
162163
163164
164165

Documentation/ABI/testing/sysfs-class-led-trigger-pattern

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ Description:
3737
0-| / \/ \/
3838
+---0----1----2----3----4----5----6------------> time (s)
3939

40-
2. To make the LED go instantly from one brigntess value to another,
41-
we should use use zero-time lengths (the brightness must be same as
40+
2. To make the LED go instantly from one brightness value to another,
41+
we should use zero-time lengths (the brightness must be same as
4242
the previous tuple's). So the format should be:
4343
"brightness_1 duration_1 brightness_1 0 brightness_2 duration_2
4444
brightness_2 0 ...". For example:

Documentation/devicetree/bindings/arm/shmobile.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ SoCs:
2727
compatible = "renesas,r8a77470"
2828
- RZ/G2M (R8A774A1)
2929
compatible = "renesas,r8a774a1"
30-
- RZ/G2E (RA8774C0)
30+
- RZ/G2E (R8A774C0)
3131
compatible = "renesas,r8a774c0"
3232
- R-Car M1A (R8A77781)
3333
compatible = "renesas,r8a7778"

Documentation/devicetree/bindings/i2c/i2c-omap.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
I2C for OMAP platforms
22

33
Required properties :
4-
- compatible : Must be "ti,omap2420-i2c", "ti,omap2430-i2c", "ti,omap3-i2c"
5-
or "ti,omap4-i2c"
4+
- compatible : Must be
5+
"ti,omap2420-i2c" for OMAP2420 SoCs
6+
"ti,omap2430-i2c" for OMAP2430 SoCs
7+
"ti,omap3-i2c" for OMAP3 SoCs
8+
"ti,omap4-i2c" for OMAP4+ SoCs
9+
"ti,am654-i2c", "ti,omap4-i2c" for AM654 SoCs
610
- ti,hwmods : Must be "i2c<n>", n being the instance number (1-based)
711
- #address-cells = <1>;
812
- #size-cells = <0>;
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
Kernel driver i2c-nvidia-gpu
2+
3+
Datasheet: not publicly available.
4+
5+
Authors:
6+
Ajay Gupta <[email protected]>
7+
8+
Description
9+
-----------
10+
11+
i2c-nvidia-gpu is a driver for I2C controller included in NVIDIA Turing
12+
and later GPUs and it is used to communicate with Type-C controller on GPUs.
13+
14+
If your 'lspci -v' listing shows something like the following,
15+
16+
01:00.3 Serial bus controller [0c80]: NVIDIA Corporation Device 1ad9 (rev a1)
17+
18+
then this driver should support the I2C controller of your GPU.

Documentation/x86/x86_64/mm.txt

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,23 +34,24 @@ __________________|____________|__________________|_________|___________________
3434
____________________________________________________________|___________________________________________________________
3535
| | | |
3636
ffff800000000000 | -128 TB | ffff87ffffffffff | 8 TB | ... guard hole, also reserved for hypervisor
37-
ffff880000000000 | -120 TB | ffffc7ffffffffff | 64 TB | direct mapping of all physical memory (page_offset_base)
38-
ffffc80000000000 | -56 TB | ffffc8ffffffffff | 1 TB | ... unused hole
37+
ffff880000000000 | -120 TB | ffff887fffffffff | 0.5 TB | LDT remap for PTI
38+
ffff888000000000 | -119.5 TB | ffffc87fffffffff | 64 TB | direct mapping of all physical memory (page_offset_base)
39+
ffffc88000000000 | -55.5 TB | ffffc8ffffffffff | 0.5 TB | ... unused hole
3940
ffffc90000000000 | -55 TB | ffffe8ffffffffff | 32 TB | vmalloc/ioremap space (vmalloc_base)
4041
ffffe90000000000 | -23 TB | ffffe9ffffffffff | 1 TB | ... unused hole
4142
ffffea0000000000 | -22 TB | ffffeaffffffffff | 1 TB | virtual memory map (vmemmap_base)
4243
ffffeb0000000000 | -21 TB | ffffebffffffffff | 1 TB | ... unused hole
4344
ffffec0000000000 | -20 TB | fffffbffffffffff | 16 TB | KASAN shadow memory
44-
fffffc0000000000 | -4 TB | fffffdffffffffff | 2 TB | ... unused hole
45-
| | | | vaddr_end for KASLR
46-
fffffe0000000000 | -2 TB | fffffe7fffffffff | 0.5 TB | cpu_entry_area mapping
47-
fffffe8000000000 | -1.5 TB | fffffeffffffffff | 0.5 TB | LDT remap for PTI
48-
ffffff0000000000 | -1 TB | ffffff7fffffffff | 0.5 TB | %esp fixup stacks
4945
__________________|____________|__________________|_________|____________________________________________________________
5046
|
51-
| Identical layout to the 47-bit one from here on:
47+
| Identical layout to the 56-bit one from here on:
5248
____________________________________________________________|____________________________________________________________
5349
| | | |
50+
fffffc0000000000 | -4 TB | fffffdffffffffff | 2 TB | ... unused hole
51+
| | | | vaddr_end for KASLR
52+
fffffe0000000000 | -2 TB | fffffe7fffffffff | 0.5 TB | cpu_entry_area mapping
53+
fffffe8000000000 | -1.5 TB | fffffeffffffffff | 0.5 TB | ... unused hole
54+
ffffff0000000000 | -1 TB | ffffff7fffffffff | 0.5 TB | %esp fixup stacks
5455
ffffff8000000000 | -512 GB | ffffffeeffffffff | 444 GB | ... unused hole
5556
ffffffef00000000 | -68 GB | fffffffeffffffff | 64 GB | EFI region mapping space
5657
ffffffff00000000 | -4 GB | ffffffff7fffffff | 2 GB | ... unused hole
@@ -83,31 +84,32 @@ Notes:
8384
__________________|____________|__________________|_________|___________________________________________________________
8485
| | | |
8586
0000800000000000 | +64 PB | ffff7fffffffffff | ~16K PB | ... huge, still almost 64 bits wide hole of non-canonical
86-
| | | | virtual memory addresses up to the -128 TB
87+
| | | | virtual memory addresses up to the -64 PB
8788
| | | | starting offset of kernel mappings.
8889
__________________|____________|__________________|_________|___________________________________________________________
8990
|
9091
| Kernel-space virtual memory, shared between all processes:
9192
____________________________________________________________|___________________________________________________________
9293
| | | |
9394
ff00000000000000 | -64 PB | ff0fffffffffffff | 4 PB | ... guard hole, also reserved for hypervisor
94-
ff10000000000000 | -60 PB | ff8fffffffffffff | 32 PB | direct mapping of all physical memory (page_offset_base)
95-
ff90000000000000 | -28 PB | ff9fffffffffffff | 4 PB | LDT remap for PTI
95+
ff10000000000000 | -60 PB | ff10ffffffffffff | 0.25 PB | LDT remap for PTI
96+
ff11000000000000 | -59.75 PB | ff90ffffffffffff | 32 PB | direct mapping of all physical memory (page_offset_base)
97+
ff91000000000000 | -27.75 PB | ff9fffffffffffff | 3.75 PB | ... unused hole
9698
ffa0000000000000 | -24 PB | ffd1ffffffffffff | 12.5 PB | vmalloc/ioremap space (vmalloc_base)
9799
ffd2000000000000 | -11.5 PB | ffd3ffffffffffff | 0.5 PB | ... unused hole
98100
ffd4000000000000 | -11 PB | ffd5ffffffffffff | 0.5 PB | virtual memory map (vmemmap_base)
99101
ffd6000000000000 | -10.5 PB | ffdeffffffffffff | 2.25 PB | ... unused hole
100102
ffdf000000000000 | -8.25 PB | fffffdffffffffff | ~8 PB | KASAN shadow memory
101-
fffffc0000000000 | -4 TB | fffffdffffffffff | 2 TB | ... unused hole
102-
| | | | vaddr_end for KASLR
103-
fffffe0000000000 | -2 TB | fffffe7fffffffff | 0.5 TB | cpu_entry_area mapping
104-
fffffe8000000000 | -1.5 TB | fffffeffffffffff | 0.5 TB | ... unused hole
105-
ffffff0000000000 | -1 TB | ffffff7fffffffff | 0.5 TB | %esp fixup stacks
106103
__________________|____________|__________________|_________|____________________________________________________________
107104
|
108105
| Identical layout to the 47-bit one from here on:
109106
____________________________________________________________|____________________________________________________________
110107
| | | |
108+
fffffc0000000000 | -4 TB | fffffdffffffffff | 2 TB | ... unused hole
109+
| | | | vaddr_end for KASLR
110+
fffffe0000000000 | -2 TB | fffffe7fffffffff | 0.5 TB | cpu_entry_area mapping
111+
fffffe8000000000 | -1.5 TB | fffffeffffffffff | 0.5 TB | ... unused hole
112+
ffffff0000000000 | -1 TB | ffffff7fffffffff | 0.5 TB | %esp fixup stacks
111113
ffffff8000000000 | -512 GB | ffffffeeffffffff | 444 GB | ... unused hole
112114
ffffffef00000000 | -68 GB | fffffffeffffffff | 64 GB | EFI region mapping space
113115
ffffffff00000000 | -4 GB | ffffffff7fffffff | 2 GB | ... unused hole

Documentation/x86/zero-page.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Offset Proto Name Meaning
2525
0C8/004 ALL ext_cmd_line_ptr cmd_line_ptr high 32bits
2626
140/080 ALL edid_info Video mode setup (struct edid_info)
2727
1C0/020 ALL efi_info EFI 32 information (struct efi_info)
28-
1E0/004 ALL alk_mem_k Alternative mem check, in KB
28+
1E0/004 ALL alt_mem_k Alternative mem check, in KB
2929
1E4/004 ALL scratch Scratch field for the kernel setup code
3030
1E8/001 ALL e820_entries Number of entries in e820_table (below)
3131
1E9/001 ALL eddbuf_entries Number of entries in eddbuf (below)

MAINTAINERS

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6607,9 +6607,9 @@ F: arch/*/include/asm/suspend*.h
66076607

66086608
HID CORE LAYER
66096609
M: Jiri Kosina <[email protected]>
6610-
R: Benjamin Tissoires <[email protected]>
6610+
M: Benjamin Tissoires <[email protected]>
66116611
6612-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git
6612+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git
66136613
S: Maintained
66146614
F: drivers/hid/
66156615
F: include/linux/hid*
@@ -6861,6 +6861,13 @@ L: [email protected]
68616861
S: Maintained
68626862
F: drivers/i2c/i2c-core-acpi.c
68636863

6864+
I2C CONTROLLER DRIVER FOR NVIDIA GPU
6865+
M: Ajay Gupta <[email protected]>
6866+
6867+
S: Maintained
6868+
F: Documentation/i2c/busses/i2c-nvidia-gpu
6869+
F: drivers/i2c/busses/i2c-nvidia-gpu.c
6870+
68646871
I2C MUXES
68656872
M: Peter Rosin <[email protected]>
68666873
@@ -8360,7 +8367,7 @@ F: drivers/media/dvb-frontends/lgdt3305.*
83608367
LIBATA PATA ARASAN COMPACT FLASH CONTROLLER
83618368
M: Viresh Kumar <[email protected]>
83628369
8363-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
8370+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
83648371
S: Maintained
83658372
F: include/linux/pata_arasan_cf_data.h
83668373
F: drivers/ata/pata_arasan_cf.c
@@ -8377,7 +8384,7 @@ F: drivers/ata/ata_generic.c
83778384
LIBATA PATA FARADAY FTIDE010 AND GEMINI SATA BRIDGE DRIVERS
83788385
M: Linus Walleij <[email protected]>
83798386
8380-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
8387+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
83818388
S: Maintained
83828389
F: drivers/ata/pata_ftide010.c
83838390
F: drivers/ata/sata_gemini.c
@@ -8396,7 +8403,7 @@ F: include/linux/ahci_platform.h
83968403
LIBATA SATA PROMISE TX2/TX4 CONTROLLER DRIVER
83978404
M: Mikael Pettersson <[email protected]>
83988405
8399-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
8406+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
84008407
S: Maintained
84018408
F: drivers/ata/sata_promise.*
84028409

@@ -10777,6 +10784,14 @@ L: [email protected]
1077710784
S: Maintained
1077810785
F: arch/arm/mach-omap2/omap_hwmod.*
1077910786

10787+
OMAP I2C DRIVER
10788+
M: Vignesh R <[email protected]>
10789+
10790+
10791+
S: Maintained
10792+
F: Documentation/devicetree/bindings/i2c/i2c-omap.txt
10793+
F: drivers/i2c/busses/i2c-omap.c
10794+
1078010795
OMAP IMAGING SUBSYSTEM (OMAP3 ISP and OMAP4 ISS)
1078110796
M: Laurent Pinchart <[email protected]>
1078210797
@@ -15429,9 +15444,9 @@ F: include/linux/usb/gadget*
1542915444

1543015445
USB HID/HIDBP DRIVERS (USB KEYBOARDS, MICE, REMOTE CONTROLS, ...)
1543115446
M: Jiri Kosina <[email protected]>
15432-
R: Benjamin Tissoires <[email protected]>
15447+
M: Benjamin Tissoires <[email protected]>
1543315448
15434-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git
15449+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git
1543515450
S: Maintained
1543615451
F: Documentation/hid/hiddev.txt
1543715452
F: drivers/hid/usbhid/

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VERSION = 4
33
PATCHLEVEL = 20
44
SUBLEVEL = 0
5-
EXTRAVERSION = -rc1
5+
EXTRAVERSION = -rc2
66
NAME = "People's Front"
77

88
# *DOCUMENTATION*

arch/alpha/include/asm/termios.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,15 @@
7373
})
7474

7575
#define user_termios_to_kernel_termios(k, u) \
76-
copy_from_user(k, u, sizeof(struct termios))
76+
copy_from_user(k, u, sizeof(struct termios2))
7777

7878
#define kernel_termios_to_user_termios(u, k) \
79+
copy_to_user(u, k, sizeof(struct termios2))
80+
81+
#define user_termios_to_kernel_termios_1(k, u) \
82+
copy_from_user(k, u, sizeof(struct termios))
83+
84+
#define kernel_termios_to_user_termios_1(u, k) \
7985
copy_to_user(u, k, sizeof(struct termios))
8086

8187
#endif /* _ALPHA_TERMIOS_H */

arch/alpha/include/uapi/asm/ioctls.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@
3232
#define TCXONC _IO('t', 30)
3333
#define TCFLSH _IO('t', 31)
3434

35+
#define TCGETS2 _IOR('T', 42, struct termios2)
36+
#define TCSETS2 _IOW('T', 43, struct termios2)
37+
#define TCSETSW2 _IOW('T', 44, struct termios2)
38+
#define TCSETSF2 _IOW('T', 45, struct termios2)
39+
3540
#define TIOCSWINSZ _IOW('t', 103, struct winsize)
3641
#define TIOCGWINSZ _IOR('t', 104, struct winsize)
3742
#define TIOCSTART _IO('t', 110) /* start output, like ^Q */

arch/alpha/include/uapi/asm/termbits.h

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,19 @@ struct termios {
2626
speed_t c_ospeed; /* output speed */
2727
};
2828

29+
/* Alpha has identical termios and termios2 */
30+
31+
struct termios2 {
32+
tcflag_t c_iflag; /* input mode flags */
33+
tcflag_t c_oflag; /* output mode flags */
34+
tcflag_t c_cflag; /* control mode flags */
35+
tcflag_t c_lflag; /* local mode flags */
36+
cc_t c_cc[NCCS]; /* control characters */
37+
cc_t c_line; /* line discipline (== c_cc[19]) */
38+
speed_t c_ispeed; /* input speed */
39+
speed_t c_ospeed; /* output speed */
40+
};
41+
2942
/* Alpha has matching termios and ktermios */
3043

3144
struct ktermios {
@@ -152,6 +165,7 @@ struct ktermios {
152165
#define B3000000 00034
153166
#define B3500000 00035
154167
#define B4000000 00036
168+
#define BOTHER 00037
155169

156170
#define CSIZE 00001400
157171
#define CS5 00000000
@@ -169,6 +183,9 @@ struct ktermios {
169183
#define CMSPAR 010000000000 /* mark or space (stick) parity */
170184
#define CRTSCTS 020000000000 /* flow control */
171185

186+
#define CIBAUD 07600000
187+
#define IBSHIFT 16
188+
172189
/* c_lflag bits */
173190
#define ISIG 0x00000080
174191
#define ICANON 0x00000100

arch/arm/boot/dts/imx53-ppd.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
};
5656

5757
chosen {
58-
stdout-path = "&uart1:115200n8";
58+
stdout-path = "serial0:115200n8";
5959
};
6060

6161
memory@70000000 {

arch/arm/boot/dts/imx6sll.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,7 @@
740740
i2c1: i2c@21a0000 {
741741
#address-cells = <1>;
742742
#size-cells = <0>;
743-
compatible = "fs,imx6sll-i2c", "fsl,imx21-i2c";
743+
compatible = "fsl,imx6sll-i2c", "fsl,imx21-i2c";
744744
reg = <0x021a0000 0x4000>;
745745
interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;
746746
clocks = <&clks IMX6SLL_CLK_I2C1>;

arch/arm/boot/dts/imx6sx-sdb.dtsi

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,9 @@
117117
regulator-name = "enet_3v3";
118118
regulator-min-microvolt = <3300000>;
119119
regulator-max-microvolt = <3300000>;
120-
gpios = <&gpio2 6 GPIO_ACTIVE_LOW>;
120+
gpio = <&gpio2 6 GPIO_ACTIVE_LOW>;
121+
regulator-boot-on;
122+
regulator-always-on;
121123
};
122124

123125
reg_pcie_gpio: regulator-pcie-gpio {
@@ -180,6 +182,7 @@
180182
phy-supply = <&reg_enet_3v3>;
181183
phy-mode = "rgmii";
182184
phy-handle = <&ethphy1>;
185+
phy-reset-gpios = <&gpio2 7 GPIO_ACTIVE_LOW>;
183186
status = "okay";
184187

185188
mdio {
@@ -373,6 +376,8 @@
373376
MX6SX_PAD_RGMII1_RD3__ENET1_RX_DATA_3 0x3081
374377
MX6SX_PAD_RGMII1_RX_CTL__ENET1_RX_EN 0x3081
375378
MX6SX_PAD_ENET2_RX_CLK__ENET2_REF_CLK_25M 0x91
379+
/* phy reset */
380+
MX6SX_PAD_ENET2_CRS__GPIO2_IO_7 0x10b0
376381
>;
377382
};
378383

arch/arm/boot/dts/vf610m4-colibri.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
compatible = "fsl,vf610m4";
5151

5252
chosen {
53-
bootargs = "console=ttyLP2,115200 clk_ignore_unused init=/linuxrc rw";
54-
stdout-path = "&uart2";
53+
bootargs = "clk_ignore_unused init=/linuxrc rw";
54+
stdout-path = "serial2:115200";
5555
};
5656

5757
memory@8c000000 {

arch/arm/configs/multi_v7_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
CONFIG_SYSVIPC=y
22
CONFIG_NO_HZ=y
33
CONFIG_HIGH_RES_TIMERS=y
4-
CONFIG_PREEMPT=y
54
CONFIG_CGROUPS=y
65
CONFIG_BLK_DEV_INITRD=y
76
CONFIG_EMBEDDED=y

arch/arm/include/asm/pgtable-2level.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#ifndef _ASM_PGTABLE_2LEVEL_H
1111
#define _ASM_PGTABLE_2LEVEL_H
1212

13-
#define __PAGETABLE_PMD_FOLDED
13+
#define __PAGETABLE_PMD_FOLDED 1
1414

1515
/*
1616
* Hardware-wise, we have a two level page table structure, where the first

arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@
139139
clock-names = "stmmaceth";
140140
tx-fifo-depth = <16384>;
141141
rx-fifo-depth = <16384>;
142+
snps,multicast-filter-bins = <256>;
142143
status = "disabled";
143144
};
144145

@@ -154,6 +155,7 @@
154155
clock-names = "stmmaceth";
155156
tx-fifo-depth = <16384>;
156157
rx-fifo-depth = <16384>;
158+
snps,multicast-filter-bins = <256>;
157159
status = "disabled";
158160
};
159161

@@ -169,6 +171,7 @@
169171
clock-names = "stmmaceth";
170172
tx-fifo-depth = <16384>;
171173
rx-fifo-depth = <16384>;
174+
snps,multicast-filter-bins = <256>;
172175
status = "disabled";
173176
};
174177

0 commit comments

Comments
 (0)