Skip to content

Commit 56794e5

Browse files
author
Paolo Abeni
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR. Adjacent changes: drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c 23c93c3 ("bnxt_en: do not map packet buffers twice") 6d1add9 ("bnxt_en: Modify TX ring indexing logic.") tools/testing/selftests/net/Makefile 2258b66 ("selftests: add vlan hw filter tests") a0bc96c ("selftests: net: verify fq per-band packet limit") Signed-off-by: Paolo Abeni <[email protected]>
2 parents 5a78a81 + 7c5e046 commit 56794e5

File tree

290 files changed

+2280
-2236
lines changed

Some content is hidden

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

290 files changed

+2280
-2236
lines changed

‎.mailmap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,10 @@ Gao Xiang <[email protected]> <[email protected]>
191191
Gao Xiang <[email protected]> <[email protected]>
192192
Gao Xiang <[email protected]> <[email protected]>
193193
Gao Xiang <[email protected]> <[email protected]>
194+
Geliang Tang <[email protected]> <[email protected]>
195+
Geliang Tang <[email protected]> <[email protected]>
196+
Geliang Tang <[email protected]> <[email protected]>
197+
Geliang Tang <[email protected]> <[email protected]>
194198
Georgi Djakov <[email protected]> <[email protected]>
195199
Gerald Schaefer <[email protected]> <[email protected]>
196200
Gerald Schaefer <[email protected]> <[email protected]>

‎Documentation/devicetree/bindings/display/panel/panel-simple-dsi.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ properties:
4242
- lg,acx467akm-7
4343
# LG Corporation 7" WXGA TFT LCD panel
4444
- lg,ld070wx3-sl01
45+
# LG Corporation 5" HD TFT LCD panel
46+
- lg,lh500wx1-sd03
4547
# One Stop Displays OSD101T2587-53TS 10.1" 1920x1200 panel
4648
- osddisplays,osd101t2587-53ts
4749
# Panasonic 10" WUXGA TFT LCD panel

‎Documentation/devicetree/bindings/display/panel/panel-simple.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,6 @@ properties:
208208
- lemaker,bl035-rgb-002
209209
# LG 7" (800x480 pixels) TFT LCD panel
210210
- lg,lb070wv8
211-
# LG Corporation 5" HD TFT LCD panel
212-
- lg,lh500wx1-sd03
213211
# LG LP079QX1-SP0V 7.9" (1536x2048 pixels) TFT LCD panel
214212
- lg,lp079qx1-sp0v
215213
# LG 9.7" (2048x1536 pixels) TFT LCD panel

‎MAINTAINERS

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6050,10 +6050,8 @@ M: Mikulas Patocka <[email protected]>
60506050
M: [email protected]
60516051
L: [email protected]
60526052
S: Maintained
6053-
W: http://sources.redhat.com/dm
60546053
Q: http://patchwork.kernel.org/project/dm-devel/list/
60556054
T: git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git
6056-
T: quilt http://people.redhat.com/agk/patches/linux/editing/
60576055
F: Documentation/admin-guide/device-mapper/
60586056
F: drivers/md/Kconfig
60596057
F: drivers/md/Makefile
@@ -9534,6 +9532,7 @@ F: drivers/bus/hisi_lpc.c
95349532
HISILICON NETWORK SUBSYSTEM 3 DRIVER (HNS3)
95359533
M: Yisen Zhuang <[email protected]>
95369534
M: Salil Mehta <[email protected]>
9535+
M: Jijie Shao <[email protected]>
95379536
L: [email protected]
95389537
S: Maintained
95399538
W: http://www.hisilicon.com
@@ -12201,6 +12200,8 @@ LINUX FOR POWERPC (32-BIT AND 64-BIT)
1220112200
M: Michael Ellerman <[email protected]>
1220212201
R: Nicholas Piggin <[email protected]>
1220312202
R: Christophe Leroy <[email protected]>
12203+
R: Aneesh Kumar K.V <[email protected]>
12204+
R: Naveen N. Rao <[email protected]>
1220412205
L: [email protected]
1220512206
S: Supported
1220612207
W: https://github.com/linuxppc/wiki/wiki

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VERSION = 6
33
PATCHLEVEL = 7
44
SUBLEVEL = 0
5-
EXTRAVERSION = -rc5
5+
EXTRAVERSION = -rc6
66
NAME = Hurr durr I'ma ninja sloth
77

88
# *DOCUMENTATION*

‎arch/arc/Kconfig

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ config ARC
4949
select OF
5050
select OF_EARLY_FLATTREE
5151
select PCI_SYSCALL if PCI
52-
select PERF_USE_VMALLOC if ARC_CACHE_VIPT_ALIASING
5352
select HAVE_ARCH_JUMP_LABEL if ISA_ARCV2 && !CPU_ENDIAN_BE32
5453
select TRACE_IRQFLAGS_SUPPORT
5554

@@ -232,10 +231,6 @@ config ARC_CACHE_PAGES
232231
Note that Global I/D ENABLE + Per Page DISABLE works but corollary
233232
Global DISABLE + Per Page ENABLE won't work
234233

235-
config ARC_CACHE_VIPT_ALIASING
236-
bool "Support VIPT Aliasing D$"
237-
depends on ARC_HAS_DCACHE && ISA_ARCOMPACT
238-
239234
endif #ARC_CACHE
240235

241236
config ARC_HAS_ICCM

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

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -44,60 +44,17 @@ void dma_cache_wback(phys_addr_t start, unsigned long sz);
4444

4545
#define flush_cache_dup_mm(mm) /* called on fork (VIVT only) */
4646

47-
#ifndef CONFIG_ARC_CACHE_VIPT_ALIASING
48-
4947
#define flush_cache_mm(mm) /* called on munmap/exit */
5048
#define flush_cache_range(mm, u_vstart, u_vend)
5149
#define flush_cache_page(vma, u_vaddr, pfn) /* PF handling/COW-break */
5250

53-
#else /* VIPT aliasing dcache */
54-
55-
/* To clear out stale userspace mappings */
56-
void flush_cache_mm(struct mm_struct *mm);
57-
void flush_cache_range(struct vm_area_struct *vma,
58-
unsigned long start,unsigned long end);
59-
void flush_cache_page(struct vm_area_struct *vma,
60-
unsigned long user_addr, unsigned long page);
61-
62-
/*
63-
* To make sure that userspace mapping is flushed to memory before
64-
* get_user_pages() uses a kernel mapping to access the page
65-
*/
66-
#define ARCH_HAS_FLUSH_ANON_PAGE
67-
void flush_anon_page(struct vm_area_struct *vma,
68-
struct page *page, unsigned long u_vaddr);
69-
70-
#endif /* CONFIG_ARC_CACHE_VIPT_ALIASING */
71-
7251
/*
7352
* A new pagecache page has PG_arch_1 clear - thus dcache dirty by default
7453
* This works around some PIO based drivers which don't call flush_dcache_page
7554
* to record that they dirtied the dcache
7655
*/
7756
#define PG_dc_clean PG_arch_1
7857

79-
#define CACHE_COLORS_NUM 4
80-
#define CACHE_COLORS_MSK (CACHE_COLORS_NUM - 1)
81-
#define CACHE_COLOR(addr) (((unsigned long)(addr) >> (PAGE_SHIFT)) & CACHE_COLORS_MSK)
82-
83-
/*
84-
* Simple wrapper over config option
85-
* Bootup code ensures that hardware matches kernel configuration
86-
*/
87-
static inline int cache_is_vipt_aliasing(void)
88-
{
89-
return IS_ENABLED(CONFIG_ARC_CACHE_VIPT_ALIASING);
90-
}
91-
92-
/*
93-
* checks if two addresses (after page aligning) index into same cache set
94-
*/
95-
#define addr_not_cache_congruent(addr1, addr2) \
96-
({ \
97-
cache_is_vipt_aliasing() ? \
98-
(CACHE_COLOR(addr1) != CACHE_COLOR(addr2)) : 0; \
99-
})
100-
10158
#define copy_to_user_page(vma, page, vaddr, dst, src, len) \
10259
do { \
10360
memcpy(dst, src, len); \

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

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,4 +291,36 @@
291291
/* M = 8-1 N = 8 */
292292
.endm
293293

294+
.macro SAVE_ABI_CALLEE_REGS
295+
push r13
296+
push r14
297+
push r15
298+
push r16
299+
push r17
300+
push r18
301+
push r19
302+
push r20
303+
push r21
304+
push r22
305+
push r23
306+
push r24
307+
push r25
308+
.endm
309+
310+
.macro RESTORE_ABI_CALLEE_REGS
311+
pop r25
312+
pop r24
313+
pop r23
314+
pop r22
315+
pop r21
316+
pop r20
317+
pop r19
318+
pop r18
319+
pop r17
320+
pop r16
321+
pop r15
322+
pop r14
323+
pop r13
324+
.endm
325+
294326
#endif

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

Lines changed: 86 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,91 @@
3333
#include <asm/irqflags-compact.h>
3434
#include <asm/thread_info.h> /* For THREAD_SIZE */
3535

36+
/* Note on the LD/ST addr modes with addr reg wback
37+
*
38+
* LD.a same as LD.aw
39+
*
40+
* LD.a reg1, [reg2, x] => Pre Incr
41+
* Eff Addr for load = [reg2 + x]
42+
*
43+
* LD.ab reg1, [reg2, x] => Post Incr
44+
* Eff Addr for load = [reg2]
45+
*/
46+
47+
.macro PUSHAX aux
48+
lr r9, [\aux]
49+
push r9
50+
.endm
51+
52+
.macro POPAX aux
53+
pop r9
54+
sr r9, [\aux]
55+
.endm
56+
57+
.macro SAVE_R0_TO_R12
58+
push r0
59+
push r1
60+
push r2
61+
push r3
62+
push r4
63+
push r5
64+
push r6
65+
push r7
66+
push r8
67+
push r9
68+
push r10
69+
push r11
70+
push r12
71+
.endm
72+
73+
.macro RESTORE_R12_TO_R0
74+
pop r12
75+
pop r11
76+
pop r10
77+
pop r9
78+
pop r8
79+
pop r7
80+
pop r6
81+
pop r5
82+
pop r4
83+
pop r3
84+
pop r2
85+
pop r1
86+
pop r0
87+
.endm
88+
89+
.macro SAVE_ABI_CALLEE_REGS
90+
push r13
91+
push r14
92+
push r15
93+
push r16
94+
push r17
95+
push r18
96+
push r19
97+
push r20
98+
push r21
99+
push r22
100+
push r23
101+
push r24
102+
push r25
103+
.endm
104+
105+
.macro RESTORE_ABI_CALLEE_REGS
106+
pop r25
107+
pop r24
108+
pop r23
109+
pop r22
110+
pop r21
111+
pop r20
112+
pop r19
113+
pop r18
114+
pop r17
115+
pop r16
116+
pop r15
117+
pop r14
118+
pop r13
119+
.endm
120+
36121
/*--------------------------------------------------------------
37122
* Switch to Kernel Mode stack if SP points to User Mode stack
38123
*
@@ -235,7 +320,7 @@
235320
SWITCH_TO_KERNEL_STK
236321

237322

238-
PUSH 0x003\LVL\()abcd /* Dummy ECR */
323+
st.a 0x003\LVL\()abcd, [sp, -4] /* Dummy ECR */
239324
sub sp, sp, 8 /* skip orig_r0 (not needed)
240325
skip pt_regs->sp, already saved above */
241326

0 commit comments

Comments
 (0)