aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-4.9/810-iommu-support-layerscape.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-06-24 13:42:02 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-06-24 16:44:13 +0200
commit6c1bef833d4be35e29446571cd3675814f329c52 (patch)
tree6e5c7d2949862b81cd8071e7d2d641fd7d673880 /target/linux/layerscape/patches-4.9/810-iommu-support-layerscape.patch
parent467adaf6c5c3dd73be74397b0d3d9bee56a72d83 (diff)
downloadupstream-6c1bef833d4be35e29446571cd3675814f329c52.tar.gz
upstream-6c1bef833d4be35e29446571cd3675814f329c52.tar.bz2
upstream-6c1bef833d4be35e29446571cd3675814f329c52.zip
kernel: bump 4.9 to 4.9.183
Refreshed all patches. Remove upstreamed: - 010-revert-staging-vc04_services-prevent-integer-overflow-in-create_pagelist.patch Compile-tested on: ar71xx Runtime-tested on: ar71xx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/layerscape/patches-4.9/810-iommu-support-layerscape.patch')
-rw-r--r--target/linux/layerscape/patches-4.9/810-iommu-support-layerscape.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/layerscape/patches-4.9/810-iommu-support-layerscape.patch b/target/linux/layerscape/patches-4.9/810-iommu-support-layerscape.patch
index 11d5c7b561..9d11b3b805 100644
--- a/target/linux/layerscape/patches-4.9/810-iommu-support-layerscape.patch
+++ b/target/linux/layerscape/patches-4.9/810-iommu-support-layerscape.patch
@@ -995,7 +995,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
};
struct dmar_atsr_unit {
-@@ -4270,27 +4271,40 @@ static inline void init_iommu_pm_ops(voi
+@@ -4268,27 +4269,40 @@ static inline void init_iommu_pm_ops(voi
int __init dmar_parse_one_rmrr(struct acpi_dmar_header *header, void *arg)
{
struct acpi_dmar_reserved_memory *rmrr;
@@ -1041,7 +1041,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
}
static struct dmar_atsr_unit *dmar_find_atsr(struct acpi_dmar_atsr *atsr)
-@@ -4504,6 +4518,7 @@ static void intel_iommu_free_dmars(void)
+@@ -4502,6 +4516,7 @@ static void intel_iommu_free_dmars(void)
list_for_each_entry_safe(rmrru, rmrr_n, &dmar_rmrr_units, list) {
list_del(&rmrru->list);
dmar_free_dev_scope(&rmrru->devices, &rmrru->devices_cnt);
@@ -1049,7 +1049,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
kfree(rmrru);
}
-@@ -5239,6 +5254,45 @@ static void intel_iommu_remove_device(st
+@@ -5240,6 +5255,45 @@ static void intel_iommu_remove_device(st
iommu_device_unlink(iommu->iommu_dev, dev);
}
@@ -1095,7 +1095,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
#ifdef CONFIG_INTEL_IOMMU_SVM
#define MAX_NR_PASID_BITS (20)
static inline unsigned long intel_iommu_get_pts(struct intel_iommu *iommu)
-@@ -5369,19 +5423,21 @@ struct intel_iommu *intel_svm_device_to_
+@@ -5370,19 +5424,21 @@ struct intel_iommu *intel_svm_device_to_
#endif /* CONFIG_INTEL_IOMMU_SVM */
static const struct iommu_ops intel_iommu_ops = {