diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-11-25 11:32:39 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-11-29 10:00:35 +0100 |
| commit | 953d9c384f2ef96e57dfd06cdc9ce63815a2c7ab (patch) | |
| tree | c0264c6ee5ffe4e0aeeb2c30b5b78e6c8139fb3e /target/linux/layerscape/patches-4.14/810-kvm-support-layerscape.patch | |
| parent | 7581a7bebccbdbca5d486dc8f55e0f16fc60ca87 (diff) | |
| download | upstream-953d9c384f2ef96e57dfd06cdc9ce63815a2c7ab.tar.gz upstream-953d9c384f2ef96e57dfd06cdc9ce63815a2c7ab.tar.bz2 upstream-953d9c384f2ef96e57dfd06cdc9ce63815a2c7ab.zip | |
kernel: bump 4.14 to 4.14.156
Refreshed all patches.
Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/layerscape/patches-4.14/810-kvm-support-layerscape.patch')
| -rw-r--r-- | target/linux/layerscape/patches-4.14/810-kvm-support-layerscape.patch | 14 |
1 files changed, 7 insertions, 7 deletions
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 502a99fa87..470aa683fa 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 -@@ -1027,9 +1027,11 @@ static int stage2_pmdp_test_and_clear_yo +@@ -1028,9 +1028,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; -@@ -1040,7 +1042,7 @@ int kvm_phys_addr_ioremap(struct kvm *kv +@@ -1041,7 +1043,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); -@@ -1064,6 +1066,30 @@ out: +@@ -1065,6 +1067,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; -@@ -1340,6 +1366,18 @@ static int user_mem_abort(struct kvm_vcp +@@ -1341,6 +1367,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 -@@ -1381,6 +1419,11 @@ static int user_mem_abort(struct kvm_vcp +@@ -1382,6 +1420,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; -@@ -1917,6 +1960,9 @@ int kvm_arch_prepare_memory_region(struc +@@ -1918,6 +1961,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; -@@ -1927,9 +1973,13 @@ int kvm_arch_prepare_memory_region(struc +@@ -1928,9 +1974,13 @@ int kvm_arch_prepare_memory_region(struc goto out; } |