Skip to content

Commit 13209a8

Browse files
davem330davem330
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
The MSCC bug fix in 'net' had to be slightly adjusted because the register accesses are done slightly differently in net-next. Signed-off-by: David S. Miller <[email protected]>
2 parents 3161071 + 98790bb commit 13209a8

File tree

422 files changed

+3499
-1702
lines changed

Some content is hidden

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

422 files changed

+3499
-1702
lines changed

‎.mailmap

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,8 @@ Vladimir Davydov <[email protected]> <[email protected]>
288288
Vladimir Davydov <[email protected]> <[email protected]>
289289
Takashi YOSHII <[email protected]>
290290
Will Deacon <[email protected]> <[email protected]>
291+
Wolfram Sang <[email protected]> <[email protected]>
292+
Wolfram Sang <[email protected]> <[email protected]>
291293
Yakir Yang <[email protected]> <[email protected]>
292294
Yusuke Goda <[email protected]>
293295
Gustavo Padovan <[email protected]>

‎Documentation/devicetree/bindings/dma/fsl-edma.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ Required properties:
1010
- compatible :
1111
- "fsl,vf610-edma" for eDMA used similar to that on Vybrid vf610 SoC
1212
- "fsl,imx7ulp-edma" for eDMA2 used similar to that on i.mx7ulp
13-
- "fsl,fsl,ls1028a-edma" for eDMA used similar to that on Vybrid vf610 SoC
13+
- "fsl,ls1028a-edma" followed by "fsl,vf610-edma" for eDMA used on the
14+
LS1028A SoC.
1415
- reg : Specifies base physical address(s) and size of the eDMA registers.
1516
The 1st region is eDMA control register's address and size.
1617
The 2nd and the 3rd regions are programmable channel multiplexing

‎Documentation/devicetree/bindings/net/dsa/b53.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,9 @@ Ethernet switch connected via MDIO to the host, CPU port wired to eth0:
110110
#size-cells = <0>;
111111

112112
ports {
113+
#address-cells = <1>;
114+
#size-cells = <0>;
115+
113116
port0@0 {
114117
reg = <0>;
115118
label = "lan1";

‎Documentation/usb/raw-gadget.rst

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,8 @@ differences are:
2727
3. Raw Gadget provides a way to select a UDC device/driver to bind to,
2828
while GadgetFS currently binds to the first available UDC.
2929

30-
4. Raw Gadget uses predictable endpoint names (handles) across different
31-
UDCs (as long as UDCs have enough endpoints of each required transfer
32-
type).
30+
4. Raw Gadget explicitly exposes information about endpoints addresses and
31+
capabilities allowing a user to write UDC-agnostic gadgets.
3332

3433
5. Raw Gadget has ioctl-based interface instead of a filesystem-based one.
3534

@@ -50,12 +49,36 @@ The typical usage of Raw Gadget looks like:
5049
Raw Gadget and react to those depending on what kind of USB device
5150
needs to be emulated.
5251

52+
Note, that some UDC drivers have fixed addresses assigned to endpoints, and
53+
therefore arbitrary endpoint addresses can't be used in the descriptors.
54+
Nevertheles, Raw Gadget provides a UDC-agnostic way to write USB gadgets.
55+
Once a USB_RAW_EVENT_CONNECT event is received via USB_RAW_IOCTL_EVENT_FETCH,
56+
the USB_RAW_IOCTL_EPS_INFO ioctl can be used to find out information about
57+
endpoints that the UDC driver has. Based on that information, the user must
58+
chose UDC endpoints that will be used for the gadget being emulated, and
59+
properly assign addresses in endpoint descriptors.
60+
61+
You can find usage examples (along with a test suite) here:
62+
63+
https://github.com/xairy/raw-gadget
64+
65+
Internal details
66+
~~~~~~~~~~~~~~~~
67+
68+
Currently every endpoint read/write ioctl submits a USB request and waits until
69+
its completion. This is the desired mode for coverage-guided fuzzing (as we'd
70+
like all USB request processing happen during the lifetime of a syscall),
71+
and must be kept in the implementation. (This might be slow for real world
72+
applications, thus the O_NONBLOCK improvement suggestion below.)
73+
5374
Potential future improvements
5475
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
5576

56-
- Implement ioctl's for setting/clearing halt status on endpoints.
57-
58-
- Reporting more events (suspend, resume, etc.) through
59-
USB_RAW_IOCTL_EVENT_FETCH.
77+
- Report more events (suspend, resume, etc.) through USB_RAW_IOCTL_EVENT_FETCH.
6078

6179
- Support O_NONBLOCK I/O.
80+
81+
- Support USB 3 features (accept SS endpoint companion descriptor when
82+
enabling endpoints; allow providing stream_id for bulk transfers).
83+
84+
- Support ISO transfer features (expose frame_number for completed requests).

‎MAINTAINERS

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5507,10 +5507,10 @@ F: drivers/gpu/drm/vboxvideo/
55075507

55085508
DRM DRIVER FOR VMWARE VIRTUAL GPU
55095509
M: "VMware Graphics" <[email protected]>
5510-
M: Thomas Hellstrom <thellstrom@vmware.com>
5510+
M: Roland Scheidegger <sroland@vmware.com>
55115511
L: [email protected]
55125512
S: Supported
5513-
T: git git://people.freedesktop.org/~thomash/linux
5513+
T: git git://people.freedesktop.org/~sroland/linux
55145514
F: drivers/gpu/drm/vmwgfx/
55155515
F: include/uapi/drm/vmwgfx_drm.h
55165516

@@ -7829,7 +7829,7 @@ T: git git://linuxtv.org/media_tree.git
78297829
F: drivers/media/platform/sti/hva
78307830

78317831
HWPOISON MEMORY FAILURE HANDLING
7832-
M: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
7832+
M: Naoya Horiguchi <naoya.[email protected]>
78337833
L: [email protected]
78347834
S: Maintained
78357835
F: mm/hwpoison-inject.c
@@ -7941,7 +7941,7 @@ F: Documentation/i2c/busses/i2c-parport.rst
79417941
F: drivers/i2c/busses/i2c-parport.c
79427942

79437943
I2C SUBSYSTEM
7944-
M: Wolfram Sang <wsa@the-dreams.de>
7944+
M: Wolfram Sang <wsa@kernel.org>
79457945
L: [email protected]
79467946
S: Maintained
79477947
W: https://i2c.wiki.kernel.org/
@@ -9185,6 +9185,11 @@ L: [email protected]
91859185
S: Maintained
91869186
W: http://lse.sourceforge.net/kdump/
91879187
F: Documentation/admin-guide/kdump/
9188+
F: fs/proc/vmcore.c
9189+
F: include/linux/crash_core.h
9190+
F: include/linux/crash_dump.h
9191+
F: include/uapi/linux/vmcore.h
9192+
F: kernel/crash_*.c
91889193

91899194
KEENE FM RADIO TRANSMITTER DRIVER
91909195
M: Hans Verkuil <[email protected]>
@@ -10662,6 +10667,13 @@ L: [email protected]
1066210667
S: Maintained
1066310668
F: drivers/net/ethernet/mediatek/
1066410669

10670+
MEDIATEK I2C CONTROLLER DRIVER
10671+
M: Qii Wang <[email protected]>
10672+
L: [email protected]
10673+
S: Maintained
10674+
F: Documentation/devicetree/bindings/i2c/i2c-mt65xx.txt
10675+
F: drivers/i2c/busses/i2c-mt65xx.c
10676+
1066510677
MEDIATEK JPEG DRIVER
1066610678
M: Rick Chang <[email protected]>
1066710679
M: Bin Liu <[email protected]>

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VERSION = 5
33
PATCHLEVEL = 7
44
SUBLEVEL = 0
5-
EXTRAVERSION = -rc5
5+
EXTRAVERSION = -rc6
66
NAME = Kleptomaniac Octopus
77

88
# *DOCUMENTATION*

‎arch/arc/configs/hsdk_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ CONFIG_DRM_UDL=y
6565
CONFIG_DRM_ETNAVIV=y
6666
CONFIG_FB=y
6767
CONFIG_FRAMEBUFFER_CONSOLE=y
68+
CONFIG_USB=y
6869
CONFIG_USB_EHCI_HCD=y
6970
CONFIG_USB_EHCI_HCD_PLATFORM=y
7071
CONFIG_USB_OHCI_HCD=y

‎arch/arc/include/asm/dsp-impl.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,14 @@
1515

1616
/* clobbers r5 register */
1717
.macro DSP_EARLY_INIT
18+
#ifdef CONFIG_ISA_ARCV2
1819
lr r5, [ARC_AUX_DSP_BUILD]
1920
bmsk r5, r5, 7
2021
breq r5, 0, 1f
2122
mov r5, DSP_CTRL_DISABLED_ALL
2223
sr r5, [ARC_AUX_DSP_CTRL]
2324
1:
25+
#endif
2426
.endm
2527

2628
/* clobbers r10, r11 registers pair */

‎arch/arc/include/asm/entry-arcv2.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,8 @@
233233

234234
#ifdef CONFIG_ARC_IRQ_NO_AUTOSAVE
235235
__RESTORE_REGFILE_HARD
236+
237+
; SP points to PC/STAT32: hw restores them despite NO_AUTOSAVE
236238
add sp, sp, SZ_PT_REGS - 8
237239
#else
238240
add sp, sp, PT_r0

‎arch/arc/kernel/Makefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
# Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (www.synopsys.com)
44
#
55

6-
# Pass UTS_MACHINE for user_regset definition
7-
CFLAGS_ptrace.o += -DUTS_MACHINE='"$(UTS_MACHINE)"'
8-
96
obj-y := arcksyms.o setup.o irq.o reset.o ptrace.o process.o devtree.o
107
obj-y += signal.o traps.o sys.o troubleshoot.o stacktrace.o disasm.o
118
obj-$(CONFIG_ISA_ARCOMPACT) += entry-compact.o intc-compact.o

‎arch/arc/kernel/ptrace.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ static const struct user_regset arc_regsets[] = {
253253
};
254254

255255
static const struct user_regset_view user_arc_view = {
256-
.name = UTS_MACHINE,
256+
.name = "arc",
257257
.e_machine = EM_ARC_INUSE,
258258
.regsets = arc_regsets,
259259
.n = ARRAY_SIZE(arc_regsets)

‎arch/arc/kernel/setup.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include <linux/clocksource.h>
1212
#include <linux/console.h>
1313
#include <linux/module.h>
14+
#include <linux/sizes.h>
1415
#include <linux/cpu.h>
1516
#include <linux/of_clk.h>
1617
#include <linux/of_fdt.h>
@@ -424,12 +425,12 @@ static void arc_chk_core_config(void)
424425
if ((unsigned int)__arc_dccm_base != cpu->dccm.base_addr)
425426
panic("Linux built with incorrect DCCM Base address\n");
426427

427-
if (CONFIG_ARC_DCCM_SZ != cpu->dccm.sz)
428+
if (CONFIG_ARC_DCCM_SZ * SZ_1K != cpu->dccm.sz)
428429
panic("Linux built with incorrect DCCM Size\n");
429430
#endif
430431

431432
#ifdef CONFIG_ARC_HAS_ICCM
432-
if (CONFIG_ARC_ICCM_SZ != cpu->iccm.sz)
433+
if (CONFIG_ARC_ICCM_SZ * SZ_1K != cpu->iccm.sz)
433434
panic("Linux built with incorrect ICCM Size\n");
434435
#endif
435436

‎arch/arc/kernel/troubleshoot.c

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -191,10 +191,9 @@ void show_regs(struct pt_regs *regs)
191191
if (user_mode(regs))
192192
show_faulting_vma(regs->ret); /* faulting code, not data */
193193

194-
pr_info("ECR: 0x%08lx EFA: 0x%08lx ERET: 0x%08lx\n",
195-
regs->event, current->thread.fault_address, regs->ret);
196-
197-
pr_info("STAT32: 0x%08lx", regs->status32);
194+
pr_info("ECR: 0x%08lx EFA: 0x%08lx ERET: 0x%08lx\nSTAT: 0x%08lx",
195+
regs->event, current->thread.fault_address, regs->ret,
196+
regs->status32);
198197

199198
#define STS_BIT(r, bit) r->status32 & STATUS_##bit##_MASK ? #bit" " : ""
200199

@@ -210,11 +209,10 @@ void show_regs(struct pt_regs *regs)
210209
(regs->status32 & STATUS_U_MASK) ? "U " : "K ",
211210
STS_BIT(regs, DE), STS_BIT(regs, AE));
212211
#endif
213-
pr_cont(" BTA: 0x%08lx\n", regs->bta);
214-
pr_info("BLK: %pS\n SP: 0x%08lx FP: 0x%08lx\n",
215-
(void *)regs->blink, regs->sp, regs->fp);
212+
pr_cont(" BTA: 0x%08lx\n SP: 0x%08lx FP: 0x%08lx BLK: %pS\n",
213+
regs->bta, regs->sp, regs->fp, (void *)regs->blink);
216214
pr_info("LPS: 0x%08lx\tLPE: 0x%08lx\tLPC: 0x%08lx\n",
217-
regs->lp_start, regs->lp_end, regs->lp_count);
215+
regs->lp_start, regs->lp_end, regs->lp_count);
218216

219217
/* print regs->r0 thru regs->r12
220218
* Sequential printing was generating horrible code

‎arch/arc/kernel/unwind.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1178,11 +1178,9 @@ int arc_unwind(struct unwind_frame_info *frame)
11781178
#endif
11791179

11801180
/* update frame */
1181-
#ifndef CONFIG_AS_CFI_SIGNAL_FRAME
11821181
if (frame->call_frame
11831182
&& !UNW_DEFAULT_RA(state.regs[retAddrReg], state.dataAlign))
11841183
frame->call_frame = 0;
1185-
#endif
11861184
cfa = FRAME_REG(state.cfa.reg, unsigned long) + state.cfa.offs;
11871185
startLoc = min_t(unsigned long, UNW_SP(frame), cfa);
11881186
endLoc = max_t(unsigned long, UNW_SP(frame), cfa);

‎arch/arc/plat-eznps/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
menuconfig ARC_PLAT_EZNPS
88
bool "\"EZchip\" ARC dev platform"
9+
depends on ISA_ARCOMPACT
910
select CPU_BIG_ENDIAN
1011
select CLKSRC_NPS if !PHYS_ADDR_T_64BIT
1112
select EZNPS_GIC

‎arch/arm/boot/dts/am574x-idk.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,7 @@
4040
status = "okay";
4141
dual_emac;
4242
};
43+
44+
&m_can0 {
45+
status = "disabled";
46+
};

‎arch/arm/boot/dts/dra7.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@
172172
#address-cells = <1>;
173173
ranges = <0x51000000 0x51000000 0x3000
174174
0x0 0x20000000 0x10000000>;
175+
dma-ranges;
175176
/**
176177
* To enable PCI endpoint mode, disable the pcie1_rc
177178
* node and enable pcie1_ep mode.
@@ -185,7 +186,6 @@
185186
device_type = "pci";
186187
ranges = <0x81000000 0 0 0x03000 0 0x00010000
187188
0x82000000 0 0x20013000 0x13000 0 0xffed000>;
188-
dma-ranges = <0x02000000 0x0 0x00000000 0x00000000 0x1 0x00000000>;
189189
bus-range = <0x00 0xff>;
190190
#interrupt-cells = <1>;
191191
num-lanes = <1>;
@@ -230,6 +230,7 @@
230230
#address-cells = <1>;
231231
ranges = <0x51800000 0x51800000 0x3000
232232
0x0 0x30000000 0x10000000>;
233+
dma-ranges;
233234
status = "disabled";
234235
pcie2_rc: pcie@51800000 {
235236
reg = <0x51800000 0x2000>, <0x51802000 0x14c>, <0x1000 0x2000>;
@@ -240,7 +241,6 @@
240241
device_type = "pci";
241242
ranges = <0x81000000 0 0 0x03000 0 0x00010000
242243
0x82000000 0 0x30013000 0x13000 0 0xffed000>;
243-
dma-ranges = <0x02000000 0x0 0x00000000 0x00000000 0x1 0x00000000>;
244244
bus-range = <0x00 0xff>;
245245
#interrupt-cells = <1>;
246246
num-lanes = <1>;

‎arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@
7575
imx27-phycard-s-rdk {
7676
pinctrl_i2c1: i2c1grp {
7777
fsl,pins = <
78-
MX27_PAD_I2C2_SDA__I2C2_SDA 0x0
79-
MX27_PAD_I2C2_SCL__I2C2_SCL 0x0
78+
MX27_PAD_I2C_DATA__I2C_DATA 0x0
79+
MX27_PAD_I2C_CLK__I2C_CLK 0x0
8080
>;
8181
};
8282

‎arch/arm/boot/dts/imx6dl-yapp4-ursa.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
};
3939

4040
&switch_ports {
41-
/delete-node/ port@2;
41+
/delete-node/ port@3;
4242
};
4343

4444
&touchscreen {

‎arch/arm/boot/dts/iwg20d-q7-dbcm-ca.dtsi

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@
7272
adi,input-depth = <8>;
7373
adi,input-colorspace = "rgb";
7474
adi,input-clock = "1x";
75-
adi,input-style = <1>;
76-
adi,input-justification = "evenly";
7775

7876
ports {
7977
#address-cells = <1>;

0 commit comments

Comments
 (0)