Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 12d8dcdf authored by derfelot's avatar derfelot
Browse files

Merge Linux 4.4.296 kernel 

Changes in 4.4.296: (24 commits)
        nfc: fix segfault in nfc_genl_dump_devices_done
        parisc/agp: Annotate parisc agp init functions with __init
        i2c: rk3x: Handle a spurious start completion interrupt flag
        net: netlink: af_netlink: Prevent empty skb by adding a check on len.
        hwmon: (dell-smm) Fix warning on /proc/i8k creation error
        mac80211: send ADDBA requests using the tid/queue of the aggregation session
        recordmcount.pl: look for jgnop instruction as well as bcrl on s390
        dm btree remove: fix use after free in rebalance_children()
        nfsd: fix use-after-free due to delegation race
        soc/tegra: fuse: Fix bitwise vs. logical OR warning
        igbvf: fix double free in `igbvf_probe`
        USB: gadget: bRequestType is a bitfield, not a enum
        PCI/MSI: Clear PCI_MSIX_FLAGS_MASKALL on error
        USB: serial: option: add Telit FN990 compositions
        timekeeping: Really make sure wall_to_monotonic isn't positive
        net: systemport: Add global locking for descriptor lifecycle
        net: lan78xx: Avoid unnecessary self assignment
        ARM: 8805/2: remove unneeded naked function usage
        Input: touchscreen - avoid bitwise vs logical OR warning
        xen/blkfront: harden blkfront against event channel storms
        xen/netfront: harden netfront against event channel storms
        xen/console: harden hvc_xen against event channel storms
        xen/netback: don't queue unlimited number of packages
        Linux 4.4.296
parents dec5e5f3 3d70a885

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 4

SUBLEVEL = 295

SUBLEVEL = 296

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arm/mm/copypage-fa.c

+17 −18
Original line number Diff line number Diff line
@@ -17,26 +17,25 @@ 
/*

 * Faraday optimised copy_user_page

 */

static void __naked

fa_copy_user_page(void *kto, const void *kfrom)

static void fa_copy_user_page(void *kto, const void *kfrom)

{

	asm("\

	stmfd	sp!, {r4, lr}			@ 2\n\

	mov	r2, %0				@ 1\n\

1:	ldmia	r1!, {r3, r4, ip, lr}		@ 4\n\

	stmia	r0, {r3, r4, ip, lr}		@ 4\n\

	mcr	p15, 0, r0, c7, c14, 1		@ 1   clean and invalidate D line\n\

	add	r0, r0, #16			@ 1\n\

	ldmia	r1!, {r3, r4, ip, lr}		@ 4\n\

	stmia	r0, {r3, r4, ip, lr}		@ 4\n\

	mcr	p15, 0, r0, c7, c14, 1		@ 1   clean and invalidate D line\n\

	add	r0, r0, #16			@ 1\n\

	subs	r2, r2, #1			@ 1\n\

	int tmp;



	asm volatile ("\

1:	ldmia	%1!, {r3, r4, ip, lr}		@ 4\n\

	stmia	%0, {r3, r4, ip, lr}		@ 4\n\

	mcr	p15, 0, %0, c7, c14, 1		@ 1   clean and invalidate D line\n\

	add	%0, %0, #16			@ 1\n\

	ldmia	%1!, {r3, r4, ip, lr}		@ 4\n\

	stmia	%0, {r3, r4, ip, lr}		@ 4\n\

	mcr	p15, 0, %0, c7, c14, 1		@ 1   clean and invalidate D line\n\

	add	%0, %0, #16			@ 1\n\

	subs	%2, %2, #1			@ 1\n\

	bne	1b				@ 1\n\

	mcr	p15, 0, r2, c7, c10, 4		@ 1   drain WB\n\

	ldmfd	sp!, {r4, pc}			@ 3"

	:

	: "I" (PAGE_SIZE / 32));

	mcr	p15, 0, %2, c7, c10, 4		@ 1   drain WB"

	: "+&r" (kto), "+&r" (kfrom), "=&r" (tmp)

	: "2" (PAGE_SIZE / 32)

	: "r3", "r4", "ip", "lr");

}



void fa_copy_user_highpage(struct page *to, struct page *from,

arch/arm/mm/copypage-feroceon.c

+48 −50
Original line number Diff line number Diff line
@@ -13,58 +13,56 @@ 
#include <linux/init.h>

#include <linux/highmem.h>



static void __naked

feroceon_copy_user_page(void *kto, const void *kfrom)

static void feroceon_copy_user_page(void *kto, const void *kfrom)

{

	asm("\

	stmfd	sp!, {r4-r9, lr}		\n\

	mov	ip, %2				\n\

1:	mov	lr, r1				\n\

	ldmia	r1!, {r2 - r9}			\n\

	pld	[lr, #32]			\n\

	pld	[lr, #64]			\n\

	pld	[lr, #96]			\n\

	pld	[lr, #128]			\n\

	pld	[lr, #160]			\n\

	pld	[lr, #192]			\n\

	pld	[lr, #224]			\n\

	stmia	r0, {r2 - r9}			\n\

	ldmia	r1!, {r2 - r9}			\n\

	mcr	p15, 0, r0, c7, c14, 1		@ clean and invalidate D line\n\

	add	r0, r0, #32			\n\

	stmia	r0, {r2 - r9}			\n\

	ldmia	r1!, {r2 - r9}			\n\

	mcr	p15, 0, r0, c7, c14, 1		@ clean and invalidate D line\n\

	add	r0, r0, #32			\n\

	stmia	r0, {r2 - r9}			\n\

	ldmia	r1!, {r2 - r9}			\n\

	mcr	p15, 0, r0, c7, c14, 1		@ clean and invalidate D line\n\

	add	r0, r0, #32			\n\

	stmia	r0, {r2 - r9}			\n\

	ldmia	r1!, {r2 - r9}			\n\

	mcr	p15, 0, r0, c7, c14, 1		@ clean and invalidate D line\n\

	add	r0, r0, #32			\n\

	stmia	r0, {r2 - r9}			\n\

	ldmia	r1!, {r2 - r9}			\n\

	mcr	p15, 0, r0, c7, c14, 1		@ clean and invalidate D line\n\

	add	r0, r0, #32			\n\

	stmia	r0, {r2 - r9}			\n\

	ldmia	r1!, {r2 - r9}			\n\

	mcr	p15, 0, r0, c7, c14, 1		@ clean and invalidate D line\n\

	add	r0, r0, #32			\n\

	stmia	r0, {r2 - r9}			\n\

	ldmia	r1!, {r2 - r9}			\n\

	mcr	p15, 0, r0, c7, c14, 1		@ clean and invalidate D line\n\

	add	r0, r0, #32			\n\

	stmia	r0, {r2 - r9}			\n\

	subs	ip, ip, #(32 * 8)		\n\

	mcr	p15, 0, r0, c7, c14, 1		@ clean and invalidate D line\n\

	add	r0, r0, #32			\n\

	int tmp;



	asm volatile ("\

1:	ldmia	%1!, {r2 - r7, ip, lr}		\n\

	pld	[%1, #0]			\n\

	pld	[%1, #32]			\n\

	pld	[%1, #64]			\n\

	pld	[%1, #96]			\n\

	pld	[%1, #128]			\n\

	pld	[%1, #160]			\n\

	pld	[%1, #192]			\n\

	stmia	%0, {r2 - r7, ip, lr}		\n\

	ldmia	%1!, {r2 - r7, ip, lr}		\n\

	mcr	p15, 0, %0, c7, c14, 1		@ clean and invalidate D line\n\

	add	%0, %0, #32			\n\

	stmia	%0, {r2 - r7, ip, lr}		\n\

	ldmia	%1!, {r2 - r7, ip, lr}		\n\

	mcr	p15, 0, %0, c7, c14, 1		@ clean and invalidate D line\n\

	add	%0, %0, #32			\n\

	stmia	%0, {r2 - r7, ip, lr}		\n\

	ldmia	%1!, {r2 - r7, ip, lr}		\n\

	mcr	p15, 0, %0, c7, c14, 1		@ clean and invalidate D line\n\

	add	%0, %0, #32			\n\

	stmia	%0, {r2 - r7, ip, lr}		\n\

	ldmia	%1!, {r2 - r7, ip, lr}		\n\

	mcr	p15, 0, %0, c7, c14, 1		@ clean and invalidate D line\n\

	add	%0, %0, #32			\n\

	stmia	%0, {r2 - r7, ip, lr}		\n\

	ldmia	%1!, {r2 - r7, ip, lr}		\n\

	mcr	p15, 0, %0, c7, c14, 1		@ clean and invalidate D line\n\

	add	%0, %0, #32			\n\

	stmia	%0, {r2 - r7, ip, lr}		\n\

	ldmia	%1!, {r2 - r7, ip, lr}		\n\

	mcr	p15, 0, %0, c7, c14, 1		@ clean and invalidate D line\n\

	add	%0, %0, #32			\n\

	stmia	%0, {r2 - r7, ip, lr}		\n\

	ldmia	%1!, {r2 - r7, ip, lr}		\n\

	mcr	p15, 0, %0, c7, c14, 1		@ clean and invalidate D line\n\

	add	%0, %0, #32			\n\

	stmia	%0, {r2 - r7, ip, lr}		\n\

	subs	%2, %2, #(32 * 8)		\n\

	mcr	p15, 0, %0, c7, c14, 1		@ clean and invalidate D line\n\

	add	%0, %0, #32			\n\

	bne	1b				\n\

	mcr	p15, 0, ip, c7, c10, 4		@ drain WB\n\

	ldmfd	sp!, {r4-r9, pc}"

	:

	: "r" (kto), "r" (kfrom), "I" (PAGE_SIZE));

	mcr	p15, 0, %2, c7, c10, 4		@ drain WB"

	: "+&r" (kto), "+&r" (kfrom), "=&r" (tmp)

	: "2" (PAGE_SIZE)

	: "r2", "r3", "r4", "r5", "r6", "r7", "ip", "lr");

}



void feroceon_copy_user_highpage(struct page *to, struct page *from,

arch/arm/mm/copypage-v4mc.c

+9 −10
Original line number Diff line number Diff line
@@ -40,12 +40,11 @@ static DEFINE_RAW_SPINLOCK(minicache_lock); 
 * instruction.  If your processor does not supply this, you have to write your

 * own copy_user_highpage that does the right thing.

 */

static void __naked

mc_copy_user_page(void *from, void *to)

static void mc_copy_user_page(void *from, void *to)

{

	asm volatile(

	"stmfd	sp!, {r4, lr}			@ 2\n\

	mov	r4, %2				@ 1\n\

	int tmp;



	asm volatile ("\

	ldmia	%0!, {r2, r3, ip, lr}		@ 4\n\

1:	mcr	p15, 0, %1, c7, c6, 1		@ 1   invalidate D line\n\

	stmia	%1!, {r2, r3, ip, lr}		@ 4\n\
@@ -55,13 +54,13 @@ mc_copy_user_page(void *from, void *to) 
	mcr	p15, 0, %1, c7, c6, 1		@ 1   invalidate D line\n\

	stmia	%1!, {r2, r3, ip, lr}		@ 4\n\

	ldmia	%0!, {r2, r3, ip, lr}		@ 4\n\

	subs	r4, r4, #1			@ 1\n\

	subs	%2, %2, #1			@ 1\n\

	stmia	%1!, {r2, r3, ip, lr}		@ 4\n\

	ldmneia	%0!, {r2, r3, ip, lr}		@ 4\n\

	bne	1b				@ 1\n\

	ldmfd	sp!, {r4, pc}			@ 3"

	:

	: "r" (from), "r" (to), "I" (PAGE_SIZE / 64));

	bne	1b				@ "

	: "+&r" (from), "+&r" (to), "=&r" (tmp)

	: "2" (PAGE_SIZE / 64)

	: "r2", "r3", "ip", "lr");

}



void v4_mc_copy_user_highpage(struct page *to, struct page *from,

arch/arm/mm/copypage-v4wb.c

+20 −21
Original line number Diff line number Diff line
@@ -22,29 +22,28 @@ 
 * instruction.  If your processor does not supply this, you have to write your

 * own copy_user_highpage that does the right thing.

 */

static void __naked

v4wb_copy_user_page(void *kto, const void *kfrom)

static void v4wb_copy_user_page(void *kto, const void *kfrom)

{

	asm("\

	stmfd	sp!, {r4, lr}			@ 2\n\

	mov	r2, %2				@ 1\n\

	ldmia	r1!, {r3, r4, ip, lr}		@ 4\n\

1:	mcr	p15, 0, r0, c7, c6, 1		@ 1   invalidate D line\n\

	stmia	r0!, {r3, r4, ip, lr}		@ 4\n\

	ldmia	r1!, {r3, r4, ip, lr}		@ 4+1\n\

	stmia	r0!, {r3, r4, ip, lr}		@ 4\n\

	ldmia	r1!, {r3, r4, ip, lr}		@ 4\n\

	mcr	p15, 0, r0, c7, c6, 1		@ 1   invalidate D line\n\

	stmia	r0!, {r3, r4, ip, lr}		@ 4\n\

	ldmia	r1!, {r3, r4, ip, lr}		@ 4\n\

	subs	r2, r2, #1			@ 1\n\

	stmia	r0!, {r3, r4, ip, lr}		@ 4\n\

	ldmneia	r1!, {r3, r4, ip, lr}		@ 4\n\

	int tmp;



	asm volatile ("\

	ldmia	%1!, {r3, r4, ip, lr}		@ 4\n\

1:	mcr	p15, 0, %0, c7, c6, 1		@ 1   invalidate D line\n\

	stmia	%0!, {r3, r4, ip, lr}		@ 4\n\

	ldmia	%1!, {r3, r4, ip, lr}		@ 4+1\n\

	stmia	%0!, {r3, r4, ip, lr}		@ 4\n\

	ldmia	%1!, {r3, r4, ip, lr}		@ 4\n\

	mcr	p15, 0, %0, c7, c6, 1		@ 1   invalidate D line\n\

	stmia	%0!, {r3, r4, ip, lr}		@ 4\n\

	ldmia	%1!, {r3, r4, ip, lr}		@ 4\n\

	subs	%2, %2, #1			@ 1\n\

	stmia	%0!, {r3, r4, ip, lr}		@ 4\n\

	ldmneia	%1!, {r3, r4, ip, lr}		@ 4\n\

	bne	1b				@ 1\n\

	mcr	p15, 0, r1, c7, c10, 4		@ 1   drain WB\n\

	ldmfd	 sp!, {r4, pc}			@ 3"

	:

	: "r" (kto), "r" (kfrom), "I" (PAGE_SIZE / 64));

	mcr	p15, 0, %1, c7, c10, 4		@ 1   drain WB"

	: "+&r" (kto), "+&r" (kfrom), "=&r" (tmp)

	: "2" (PAGE_SIZE / 64)

	: "r3", "r4", "ip", "lr");

}



void v4wb_copy_user_highpage(struct page *to, struct page *from,