release v4.10-3

CHANGELOG.md

@@ -1,3 +1,7 @@
+v4.10-3 2017-03-13
+--------------------
+Update to Linux 4.10.2
+
 v4.10-2 2017-02-27
 --------------------
 Update to Linux 4.10.1

aur/PKGBUILD

@@ -2,18 +2,18 @@
 
 pkgbase=linux-samus4
 pkgver=4.10
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 url="https://github.com/raphael/linux-samus"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'lzop')
 options=('!strip')
-source=("https://github.com/raphael/linux-samus/archive/v4.10-2.tar.gz"
+source=("https://github.com/raphael/linux-samus/archive/v4.10-${pkgrel}.tar.gz"
         "config"
         "linux.preset"
         )
 _kernelname=${pkgbase#linux}
-_linuxsrc=linux-samus-4.10-2/build/linux/
+_linuxsrc=linux-samus-4.10-${pkgrel}/build/linux/
 
 # $srcdir is: /home/raphael/src/kernel-pkg/src
 prepare() {

build/linux-4.10.2-ph+_4.10.2-ph+-4.dsc

@@ -0,0 +1,23 @@
+Format: 3.0 (quilt)
+Source: linux-4.10.2-ph+
+Binary: linux-image-4.10.2-ph+, linux-headers-4.10.2-ph+, linux-firmware-image-4.10.2-ph+, linux-libc-dev
+Architecture: any all
+Version: 4.10.2-ph+-4
+Maintainer: Anonymous <root@chromia>
+Homepage: http://www.kernel.org/
+Standards-Version: 3.8.4
+Build-Depends: bc, kmod, cpio
+Package-List:
+ linux-firmware-image-4.10.2-ph+ deb kernel optional arch=all
+ linux-headers-4.10.2-ph+ deb kernel optional arch=any
+ linux-image-4.10.2-ph+ deb kernel optional arch=any
+ linux-libc-dev deb devel optional arch=any
+Checksums-Sha1:
+ dfa02f505bea115c233795212ffa8cc0e1c8294d 305117254 linux-4.10.2-ph+_4.10.2-ph+.orig.tar.gz
+ bf0a3267b4600d63c48c948a7a16cc3576137918 1288 linux-4.10.2-ph+_4.10.2-ph+-4.debian.tar.gz
+Checksums-Sha256:
+ 1fba1ea232e584ba701f4985c92535fc86ec6a60e21aaaefe1e327bf51556011 305117254 linux-4.10.2-ph+_4.10.2-ph+.orig.tar.gz
+ 8294d4d3a436e9151d85b3e72d36cd95ca43b557a382572c0f8e6a58782533e2 1288 linux-4.10.2-ph+_4.10.2-ph+-4.debian.tar.gz
+Files:
+ ce1b938aed781653fb1ccfd0d23ca475 305117254 linux-4.10.2-ph+_4.10.2-ph+.orig.tar.gz
+ 25f8f92a1ef38f5e8ac4df1aa7b1b59a 1288 linux-4.10.2-ph+_4.10.2-ph+-4.debian.tar.gz

build/linux-4.10.2-ph+_4.10.2-ph+-4_amd64.changes

@@ -0,0 +1,43 @@
+Format: 1.8
+Date: Mon, 13 Mar 2017 10:41:11 -0700
+Source: linux-4.10.2-ph+
+Binary: linux-image-4.10.2-ph+ linux-headers-4.10.2-ph+ linux-firmware-image-4.10.2-ph+ linux-libc-dev
+Architecture: source amd64 all
+Version: 4.10.2-ph+-4
+Distribution: vivid
+Urgency: low
+Maintainer: Anonymous <root@chromia>
+Changed-By: Anonymous <root@chromia>
+Description:
+ linux-firmware-image-4.10.2-ph+ - Linux kernel firmware, version 4.10.2-ph+
+ linux-headers-4.10.2-ph+ - Linux kernel headers for 4.10.2-ph+ on ${kernel:debarch}
+ linux-image-4.10.2-ph+ - Linux kernel, version 4.10.2-ph+
+ linux-libc-dev - Linux support headers for userspace development
+Changes:
+ linux-4.10.2-ph+ (4.10.2-ph+-4) vivid; urgency=low
+ .
+   * Custom built Linux kernel.
+Checksums-Sha1:
+ d4b773f832afed050a405cc0aeea4ff72bdf2e2d 1170 linux-4.10.2-ph+_4.10.2-ph+-4.dsc
+ dfa02f505bea115c233795212ffa8cc0e1c8294d 305117254 linux-4.10.2-ph+_4.10.2-ph+.orig.tar.gz
+ bf0a3267b4600d63c48c948a7a16cc3576137918 1288 linux-4.10.2-ph+_4.10.2-ph+-4.debian.tar.gz
+ 52f8c286247ab1f381813c4cb82f349548aca8ff 736292 linux-firmware-image-4.10.2-ph+_4.10.2-ph+-4_amd64.deb
+ 5331cc0388106defc7c5bf6c85911559b5bb8fb2 10507490 linux-headers-4.10.2-ph+_4.10.2-ph+-4_amd64.deb
+ a2d9b88d666005889dbe5c73f5245988e37166ba 18281328 linux-image-4.10.2-ph+_4.10.2-ph+-4_amd64.deb
+ 7c0311163830094a905ae4ed99114374a33e4fc6 893126 linux-libc-dev_4.10.2-ph+-4_amd64.deb
+Checksums-Sha256:
+ 50f69bd3bbbb56866f249c626c0a231afc6721246d298b47592fc25455ac0cf3 1170 linux-4.10.2-ph+_4.10.2-ph+-4.dsc
+ 1fba1ea232e584ba701f4985c92535fc86ec6a60e21aaaefe1e327bf51556011 305117254 linux-4.10.2-ph+_4.10.2-ph+.orig.tar.gz
+ 8294d4d3a436e9151d85b3e72d36cd95ca43b557a382572c0f8e6a58782533e2 1288 linux-4.10.2-ph+_4.10.2-ph+-4.debian.tar.gz
+ 480c5ecbeb86eb981df7fb080f39f10694721cb569ae6bedbf036905090e2392 736292 linux-firmware-image-4.10.2-ph+_4.10.2-ph+-4_amd64.deb
+ 3d1a21574c18d8ab0b0e69b17e2d20f80336b0911838cca3607b6f1dbe027601 10507490 linux-headers-4.10.2-ph+_4.10.2-ph+-4_amd64.deb
+ 51987a63bb58632319d136161018e5517612a0514a0f71e90bde32f7190b7e21 18281328 linux-image-4.10.2-ph+_4.10.2-ph+-4_amd64.deb
+ 0f876dc83f528edb92f2f3bcfd320f43dbaaa923fc18e706ee1bb8baedf57cb1 893126 linux-libc-dev_4.10.2-ph+-4_amd64.deb
+Files:
+ a3a670dd6e57095f935f58e9b6eee7de 1170 kernel optional linux-4.10.2-ph+_4.10.2-ph+-4.dsc
+ ce1b938aed781653fb1ccfd0d23ca475 305117254 kernel optional linux-4.10.2-ph+_4.10.2-ph+.orig.tar.gz
+ 25f8f92a1ef38f5e8ac4df1aa7b1b59a 1288 kernel optional linux-4.10.2-ph+_4.10.2-ph+-4.debian.tar.gz
+ 769ac06b4cac3130b640ff6036b3cbe3 736292 kernel optional linux-firmware-image-4.10.2-ph+_4.10.2-ph+-4_amd64.deb
+ 10bff0335140db513c850c13ebdf14fe 10507490 kernel optional linux-headers-4.10.2-ph+_4.10.2-ph+-4_amd64.deb
+ 7bb1701d7b446e5d26f14da660e0368d 18281328 kernel optional linux-image-4.10.2-ph+_4.10.2-ph+-4_amd64.deb
+ 2e343641e3c3cf0e285d66299e51752c 893126 devel optional linux-libc-dev_4.10.2-ph+-4_amd64.deb

build/linux/Makefile

@@ -1,6 +1,6 @@
 VERSION = 4
 PATCHLEVEL = 10
-SUBLEVEL = 1
+SUBLEVEL = 2
 EXTRAVERSION =
 NAME = Fearless Coyote
 

build/linux/arch/arm/boot/dts/at91-sama5d2_xplained.dts

@@ -148,6 +148,8 @@
 			uart1: serial@f8020000 {
 				pinctrl-names = "default";
 				pinctrl-0 = <&pinctrl_uart1_default>;
+				atmel,use-dma-rx;
+				atmel,use-dma-tx;
 				status = "okay";
 			};
 

build/linux/arch/arm/boot/dts/at91-sama5d4_xplained.dts

@@ -110,6 +110,8 @@
 			};
 
 			usart3: serial@fc00c000 {
+				atmel,use-dma-rx;
+				atmel,use-dma-tx;
 				status = "okay";
 			};
 

build/linux/arch/arm/include/asm/kvm_mmu.h

@@ -150,18 +150,12 @@ static inline void __coherent_cache_guest_page(struct kvm_vcpu *vcpu,
 	 * and iterate over the range.
 	 */
 
-	bool need_flush = !vcpu_has_cache_enabled(vcpu) || ipa_uncached;
-
 	VM_BUG_ON(size & ~PAGE_MASK);
 
-	if (!need_flush && !icache_is_pipt())
-		goto vipt_cache;
-
 	while (size) {
 		void *va = kmap_atomic_pfn(pfn);
 
-		if (need_flush)
-			kvm_flush_dcache_to_poc(va, PAGE_SIZE);
+		kvm_flush_dcache_to_poc(va, PAGE_SIZE);
 
 		if (icache_is_pipt())
 			__cpuc_coherent_user_range((unsigned long)va,
@@ -173,7 +167,6 @@ static inline void __coherent_cache_guest_page(struct kvm_vcpu *vcpu,
 		kunmap_atomic(va);
 	}
 
-vipt_cache:
 	if (!icache_is_pipt() && !icache_is_vivt_asid_tagged()) {
 		/* any kind of VIPT cache */
 		__flush_icache_all();

build/linux/arch/arm64/include/asm/kvm_mmu.h

@@ -241,8 +241,7 @@ static inline void __coherent_cache_guest_page(struct kvm_vcpu *vcpu,
 {
 	void *va = page_address(pfn_to_page(pfn));
 
-	if (!vcpu_has_cache_enabled(vcpu) || ipa_uncached)
-		kvm_flush_dcache_to_poc(va, size);
+	kvm_flush_dcache_to_poc(va, size);
 
 	if (!icache_is_aliasing()) {		/* PIPT */
 		flush_icache_range((unsigned long)va,

build/linux/arch/arm64/kernel/cpufeature.c

@@ -654,15 +654,15 @@ static u64 __raw_read_system_reg(u32 sys_id)
 	case SYS_ID_ISAR2_EL1:		return read_cpuid(ID_ISAR2_EL1);
 	case SYS_ID_ISAR3_EL1:		return read_cpuid(ID_ISAR3_EL1);
 	case SYS_ID_ISAR4_EL1:		return read_cpuid(ID_ISAR4_EL1);
-	case SYS_ID_ISAR5_EL1:		return read_cpuid(ID_ISAR4_EL1);
+	case SYS_ID_ISAR5_EL1:		return read_cpuid(ID_ISAR5_EL1);
 	case SYS_MVFR0_EL1:		return read_cpuid(MVFR0_EL1);
 	case SYS_MVFR1_EL1:		return read_cpuid(MVFR1_EL1);
 	case SYS_MVFR2_EL1:		return read_cpuid(MVFR2_EL1);
 
 	case SYS_ID_AA64PFR0_EL1:	return read_cpuid(ID_AA64PFR0_EL1);
-	case SYS_ID_AA64PFR1_EL1:	return read_cpuid(ID_AA64PFR0_EL1);
+	case SYS_ID_AA64PFR1_EL1:	return read_cpuid(ID_AA64PFR1_EL1);
 	case SYS_ID_AA64DFR0_EL1:	return read_cpuid(ID_AA64DFR0_EL1);
-	case SYS_ID_AA64DFR1_EL1:	return read_cpuid(ID_AA64DFR0_EL1);
+	case SYS_ID_AA64DFR1_EL1:	return read_cpuid(ID_AA64DFR1_EL1);
 	case SYS_ID_AA64MMFR0_EL1:	return read_cpuid(ID_AA64MMFR0_EL1);
 	case SYS_ID_AA64MMFR1_EL1:	return read_cpuid(ID_AA64MMFR1_EL1);
 	case SYS_ID_AA64MMFR2_EL1:	return read_cpuid(ID_AA64MMFR2_EL1);

build/linux/arch/arm64/mm/dma-mapping.c

@@ -352,6 +352,13 @@ static int __swiotlb_dma_supported(struct device *hwdev, u64 mask)
 	return 1;
 }
 
+static int __swiotlb_dma_mapping_error(struct device *hwdev, dma_addr_t addr)
+{
+	if (swiotlb)
+		return swiotlb_dma_mapping_error(hwdev, addr);
+	return 0;
+}
+
 static struct dma_map_ops swiotlb_dma_ops = {
 	.alloc = __dma_alloc,
 	.free = __dma_free,
@@ -366,7 +373,7 @@ static struct dma_map_ops swiotlb_dma_ops = {
 	.sync_sg_for_cpu = __swiotlb_sync_sg_for_cpu,
 	.sync_sg_for_device = __swiotlb_sync_sg_for_device,
 	.dma_supported = __swiotlb_dma_supported,
-	.mapping_error = swiotlb_dma_mapping_error,
+	.mapping_error = __swiotlb_dma_mapping_error,
 };
 
 static int __init atomic_pool_init(void)

build/linux/arch/arm64/mm/mmu.c

@@ -108,10 +108,8 @@ static bool pgattr_change_is_safe(u64 old, u64 new)
 static void alloc_init_pte(pmd_t *pmd, unsigned long addr,
 				  unsigned long end, unsigned long pfn,
 				  pgprot_t prot,
-				  phys_addr_t (*pgtable_alloc)(void),
-				  bool page_mappings_only)
+				  phys_addr_t (*pgtable_alloc)(void))
 {
-	pgprot_t __prot = prot;
 	pte_t *pte;
 
 	BUG_ON(pmd_sect(*pmd));
@@ -129,18 +127,7 @@ static void alloc_init_pte(pmd_t *pmd, unsigned long addr,
 	do {
 		pte_t old_pte = *pte;
 
-		/*
-		 * Set the contiguous bit for the subsequent group of PTEs if
-		 * its size and alignment are appropriate.
-		 */
-		if (((addr | PFN_PHYS(pfn)) & ~CONT_PTE_MASK) == 0) {
-			if (end - addr >= CONT_PTE_SIZE && !page_mappings_only)
-				__prot = __pgprot(pgprot_val(prot) | PTE_CONT);
-			else
-				__prot = prot;
-		}
-
-		set_pte(pte, pfn_pte(pfn, __prot));
+		set_pte(pte, pfn_pte(pfn, prot));
 		pfn++;
 
 		/*
@@ -159,7 +146,6 @@ static void alloc_init_pmd(pud_t *pud, unsigned long addr, unsigned long end,
 				  phys_addr_t (*pgtable_alloc)(void),
 				  bool page_mappings_only)
 {
-	pgprot_t __prot = prot;
 	pmd_t *pmd;
 	unsigned long next;
 
@@ -186,18 +172,7 @@ static void alloc_init_pmd(pud_t *pud, unsigned long addr, unsigned long end,
 		/* try section mapping first */
 		if (((addr | next | phys) & ~SECTION_MASK) == 0 &&
 		      !page_mappings_only) {
-			/*
-			 * Set the contiguous bit for the subsequent group of
-			 * PMDs if its size and alignment are appropriate.
-			 */
-			if (((addr | phys) & ~CONT_PMD_MASK) == 0) {
-				if (end - addr >= CONT_PMD_SIZE)
-					__prot = __pgprot(pgprot_val(prot) |
-							  PTE_CONT);
-				else
-					__prot = prot;
-			}
-			pmd_set_huge(pmd, phys, __prot);
+			pmd_set_huge(pmd, phys, prot);
 
 			/*
 			 * After the PMD entry has been populated once, we
@@ -207,8 +182,7 @@ static void alloc_init_pmd(pud_t *pud, unsigned long addr, unsigned long end,
 						      pmd_val(*pmd)));
 		} else {
 			alloc_init_pte(pmd, addr, next, __phys_to_pfn(phys),
-				       prot, pgtable_alloc,
-				       page_mappings_only);
+				       prot, pgtable_alloc);
 
 			BUG_ON(pmd_val(old_pmd) != 0 &&
 			       pmd_val(old_pmd) != pmd_val(*pmd));

build/linux/arch/mips/bcm47xx/buttons.c

@@ -17,6 +17,12 @@
 		.active_low	= 1,					\
 	}
 
+#define BCM47XX_GPIO_KEY_H(_gpio, _code)				\
+	{								\
+		.code		= _code,				\
+		.gpio		= _gpio,				\
+	}
+
 /* Asus */
 
 static const struct gpio_keys_button
@@ -79,8 +85,8 @@ bcm47xx_buttons_asus_wl500gpv2[] __initconst = {
 
 static const struct gpio_keys_button
 bcm47xx_buttons_asus_wl500w[] __initconst = {
-	BCM47XX_GPIO_KEY(6, KEY_RESTART),
-	BCM47XX_GPIO_KEY(7, KEY_WPS_BUTTON),
+	BCM47XX_GPIO_KEY_H(6, KEY_RESTART),
+	BCM47XX_GPIO_KEY_H(7, KEY_WPS_BUTTON),
 };
 
 static const struct gpio_keys_button

build/linux/arch/mips/cavium-octeon/octeon-memcpy.S

@@ -208,18 +208,18 @@ EXC(	STORE	t2, UNIT(6)(dst),	s_exc_p10u)
 	ADD	src, src, 16*NBYTES
 EXC(	STORE	t3, UNIT(7)(dst),	s_exc_p9u)
 	ADD	dst, dst, 16*NBYTES
-EXC(	LOAD	t0, UNIT(-8)(src),	l_exc_copy)
-EXC(	LOAD	t1, UNIT(-7)(src),	l_exc_copy)
-EXC(	LOAD	t2, UNIT(-6)(src),	l_exc_copy)
-EXC(	LOAD	t3, UNIT(-5)(src),	l_exc_copy)
+EXC(	LOAD	t0, UNIT(-8)(src),	l_exc_copy_rewind16)
+EXC(	LOAD	t1, UNIT(-7)(src),	l_exc_copy_rewind16)
+EXC(	LOAD	t2, UNIT(-6)(src),	l_exc_copy_rewind16)
+EXC(	LOAD	t3, UNIT(-5)(src),	l_exc_copy_rewind16)
 EXC(	STORE	t0, UNIT(-8)(dst),	s_exc_p8u)
 EXC(	STORE	t1, UNIT(-7)(dst),	s_exc_p7u)
 EXC(	STORE	t2, UNIT(-6)(dst),	s_exc_p6u)
 EXC(	STORE	t3, UNIT(-5)(dst),	s_exc_p5u)
-EXC(	LOAD	t0, UNIT(-4)(src),	l_exc_copy)
-EXC(	LOAD	t1, UNIT(-3)(src),	l_exc_copy)
-EXC(	LOAD	t2, UNIT(-2)(src),	l_exc_copy)
-EXC(	LOAD	t3, UNIT(-1)(src),	l_exc_copy)
+EXC(	LOAD	t0, UNIT(-4)(src),	l_exc_copy_rewind16)
+EXC(	LOAD	t1, UNIT(-3)(src),	l_exc_copy_rewind16)
+EXC(	LOAD	t2, UNIT(-2)(src),	l_exc_copy_rewind16)
+EXC(	LOAD	t3, UNIT(-1)(src),	l_exc_copy_rewind16)
 EXC(	STORE	t0, UNIT(-4)(dst),	s_exc_p4u)
 EXC(	STORE	t1, UNIT(-3)(dst),	s_exc_p3u)
 EXC(	STORE	t2, UNIT(-2)(dst),	s_exc_p2u)
@@ -383,6 +383,10 @@ done:
 	 nop
 	END(memcpy)
 
+l_exc_copy_rewind16:
+	/* Rewind src and dst by 16*NBYTES for l_exc_copy */
+	SUB	src, src, 16*NBYTES
+	SUB	dst, dst, 16*NBYTES
 l_exc_copy:
 	/*
 	 * Copy bytes from src until faulting load address (or until a

build/linux/arch/mips/include/asm/checksum.h

@@ -186,7 +186,9 @@ static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
 	"	daddu	%0, %4		\n"
 	"	dsll32	$1, %0, 0	\n"
 	"	daddu	%0, $1		\n"
+	"	sltu	$1, %0, $1	\n"
 	"	dsra32	%0, %0, 0	\n"
+	"	addu	%0, $1		\n"
 #endif
 	"	.set	pop"
 	: "=r" (sum)