kernel: Update kernel 4.14 to version 4.14.195

Compile and runtime tested on lantiq/xrx200 and x86/64.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

3 files changed, 15 insertions, 15 deletions

diff --git a/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch b/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch
index 431e48cd20..bf34f7b352 100644
--- a/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch
+++ b/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch
@@ -623,7 +623,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
  EXPORT_SYMBOL(dma_noop_ops);
 --- a/mm/page_alloc.c
 +++ b/mm/page_alloc.c
-@@ -4367,8 +4367,14 @@ void page_frag_free(void *addr)
+@@ -4372,8 +4372,14 @@ void page_frag_free(void *addr)
  {
  	struct page *page = virt_to_head_page(addr);
  
diff --git a/target/linux/layerscape/patches-4.14/707-dpaa-ethernet-support-layerscape.patch b/target/linux/layerscape/patches-4.14/707-dpaa-ethernet-support-layerscape.patch
index 30f2ea720f..f4893afb7a 100644
--- a/target/linux/layerscape/patches-4.14/707-dpaa-ethernet-support-layerscape.patch
+++ b/target/linux/layerscape/patches-4.14/707-dpaa-ethernet-support-layerscape.patch
@@ -1736,7 +1736,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
  
  static void enable_rams_ecc(struct fman_fpm_regs __iomem *fpm_rg)
  {
-@@ -1919,7 +1941,10 @@ _return:
+@@ -1918,7 +1940,10 @@ _return:
  static int fman_init(struct fman *fman)
  {
  	struct fman_cfg *cfg = NULL;
@@ -1748,7 +1748,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
  
  	if (is_init_done(fman->cfg))
  		return -EINVAL;
-@@ -1939,6 +1964,7 @@ static int fman_init(struct fman *fman)
+@@ -1938,6 +1963,7 @@ static int fman_init(struct fman *fman)
  	memset_io((void __iomem *)(fman->base_addr + CGP_OFFSET), 0,
  		  fman->state->fm_port_num_of_cg);
  
@@ -1756,7 +1756,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
  	/* Save LIODN info before FMan reset
  	 * Skipping non-existent port 0 (i = 1)
  	 */
-@@ -1958,6 +1984,9 @@ static int fman_init(struct fman *fman)
+@@ -1957,6 +1983,9 @@ static int fman_init(struct fman *fman)
  		}
  		fman->liodn_base[i] = liodn_base;
  	}
@@ -1766,7 +1766,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
  
  	err = fman_reset(fman);
  	if (err)
-@@ -2186,8 +2215,12 @@ int fman_set_port_params(struct fman *fm
+@@ -2185,8 +2214,12 @@ int fman_set_port_params(struct fman *fm
  	if (err)
  		goto return_err;
  
@@ -1779,7 +1779,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
  
  	if (fman->state->rev_info.major < 6)
  		set_port_order_restoration(fman->fpm_regs, port_id);
-@@ -2813,7 +2846,8 @@ static struct fman *read_dts_node(struct
+@@ -2812,7 +2845,8 @@ static struct fman *read_dts_node(struct
  
  	of_node_put(muram_node);
  
@@ -1899,7 +1899,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
  };
  
  static void add_addr_in_paddr(struct memac_regs __iomem *regs, u8 *adr,
-@@ -940,6 +941,34 @@ int memac_add_hash_mac_address(struct fm
+@@ -939,6 +940,34 @@ int memac_add_hash_mac_address(struct fm
  	return 0;
  }
  
@@ -1934,7 +1934,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
  int memac_del_hash_mac_address(struct fman_mac *memac, enet_addr_t *eth_addr)
  {
  	struct memac_regs __iomem *regs = memac->regs;
-@@ -963,8 +992,12 @@ int memac_del_hash_mac_address(struct fm
+@@ -962,8 +991,12 @@ int memac_del_hash_mac_address(struct fm
  			break;
  		}
  	}
diff --git a/target/linux/layerscape/patches-4.14/810-kvm-support-layerscape.patch b/target/linux/layerscape/patches-4.14/810-kvm-support-layerscape.patch
index 5c8cd44182..11f577982c 100644
--- a/target/linux/layerscape/patches-4.14/810-kvm-support-layerscape.patch
+++ b/target/linux/layerscape/patches-4.14/810-kvm-support-layerscape.patch
@@ -74,7 +74,7 @@ Signed-off-by: Signed-off-by: Biwen Li <biwen.li@nxp.com>
  	kvmppc_booke_queue_irqprio(vcpu, BOOKE_IRQPRIO_DECREMENTER);
 --- a/virt/kvm/arm/mmu.c
 +++ b/virt/kvm/arm/mmu.c
-@@ -1028,9 +1028,11 @@ static int stage2_pmdp_test_and_clear_yo
+@@ -1022,9 +1022,11 @@ static int stage2_pmdp_test_and_clear_yo
   * @guest_ipa:	The IPA at which to insert the mapping
   * @pa:		The physical address of the device
   * @size:	The size of the mapping
@@ -87,7 +87,7 @@ Signed-off-by: Signed-off-by: Biwen Li <biwen.li@nxp.com>
  {
  	phys_addr_t addr, end;
  	int ret = 0;
-@@ -1041,7 +1043,7 @@ int kvm_phys_addr_ioremap(struct kvm *kv
+@@ -1035,7 +1037,7 @@ int kvm_phys_addr_ioremap(struct kvm *kv
  	pfn = __phys_to_pfn(pa);
  
  	for (addr = guest_ipa; addr < end; addr += PAGE_SIZE) {
@@ -96,7 +96,7 @@ Signed-off-by: Signed-off-by: Biwen Li <biwen.li@nxp.com>
  
  		if (writable)
  			pte = kvm_s2pte_mkwrite(pte);
-@@ -1065,6 +1067,30 @@ out:
+@@ -1059,6 +1061,30 @@ out:
  	return ret;
  }
  
@@ -127,7 +127,7 @@ Signed-off-by: Signed-off-by: Biwen Li <biwen.li@nxp.com>
  static bool transparent_hugepage_adjust(kvm_pfn_t *pfnp, phys_addr_t *ipap)
  {
  	kvm_pfn_t pfn = *pfnp;
-@@ -1341,6 +1367,18 @@ static int user_mem_abort(struct kvm_vcp
+@@ -1335,6 +1361,18 @@ static int user_mem_abort(struct kvm_vcp
  		hugetlb = true;
  		gfn = (fault_ipa & PMD_MASK) >> PAGE_SHIFT;
  	} else {
@@ -146,7 +146,7 @@ Signed-off-by: Signed-off-by: Biwen Li <biwen.li@nxp.com>
  		/*
  		 * Pages belonging to memslots that don't have the same
  		 * alignment for userspace and IPA cannot be mapped using
-@@ -1382,6 +1420,11 @@ static int user_mem_abort(struct kvm_vcp
+@@ -1376,6 +1414,11 @@ static int user_mem_abort(struct kvm_vcp
  	if (is_error_noslot_pfn(pfn))
  		return -EFAULT;
  
@@ -158,7 +158,7 @@ Signed-off-by: Signed-off-by: Biwen Li <biwen.li@nxp.com>
  	if (kvm_is_device_pfn(pfn)) {
  		mem_type = PAGE_S2_DEVICE;
  		flags |= KVM_S2PTE_FLAG_IS_IOMAP;
-@@ -1919,6 +1962,9 @@ int kvm_arch_prepare_memory_region(struc
+@@ -1913,6 +1956,9 @@ int kvm_arch_prepare_memory_region(struc
  			gpa_t gpa = mem->guest_phys_addr +
  				    (vm_start - mem->userspace_addr);
  			phys_addr_t pa;
@@ -168,7 +168,7 @@ Signed-off-by: Signed-off-by: Biwen Li <biwen.li@nxp.com>
  
  			pa = (phys_addr_t)vma->vm_pgoff << PAGE_SHIFT;
  			pa += vm_start - vma->vm_start;
-@@ -1929,9 +1975,13 @@ int kvm_arch_prepare_memory_region(struc
+@@ -1923,9 +1969,13 @@ int kvm_arch_prepare_memory_region(struc
  				goto out;
  			}