Home Home > GIT Browse > SLE12-SP4
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-08-08 14:55:52 +0200
committerTakashi Iwai <tiwai@suse.de>2019-08-08 14:56:38 +0200
commitafd9f94af352a7d0eba3c35af18ff2623c506efb (patch)
tree84210c9c6712346f2513552bf0d812b12d82a400
parent2493dd47cbe09302c3c92f11d304123109faaaa3 (diff)
parenta33e0bb59079350b7b89ec75363bf39d5b9341f9 (diff)
Merge branch 'users/jroedel/SLE15/for-next' into SLE15
Pull SEV patch updates from Joerg Roedel
-rw-r--r--patches.arch/0003-dma-introduce-dma_max_mapping_size10
-rw-r--r--patches.kabi/0001-kABI-Preserve-kABI-for-dma_max_mapping_size.patch21
2 files changed, 22 insertions, 9 deletions
diff --git a/patches.arch/0003-dma-introduce-dma_max_mapping_size b/patches.arch/0003-dma-introduce-dma_max_mapping_size
index b8db1f4644..baa380167e 100644
--- a/patches.arch/0003-dma-introduce-dma_max_mapping_size
+++ b/patches.arch/0003-dma-introduce-dma_max_mapping_size
@@ -84,3 +84,13 @@ Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
};
/*
+--- a/arch/x86/mm/mem_encrypt.c
++++ b/arch/x86/mm/mem_encrypt.c
+@@ -424,6 +424,7 @@ static const struct dma_map_ops sev_dma_
+ .sync_sg_for_cpu = swiotlb_sync_sg_for_cpu,
+ .sync_sg_for_device = swiotlb_sync_sg_for_device,
+ .mapping_error = swiotlb_dma_mapping_error,
++ .max_mapping_size = swiotlb_max_mapping_size,
+ };
+
+ /* Architecture __weak replacement functions */
diff --git a/patches.kabi/0001-kABI-Preserve-kABI-for-dma_max_mapping_size.patch b/patches.kabi/0001-kABI-Preserve-kABI-for-dma_max_mapping_size.patch
index e0b839523b..f12d7c4805 100644
--- a/patches.kabi/0001-kABI-Preserve-kABI-for-dma_max_mapping_size.patch
+++ b/patches.kabi/0001-kABI-Preserve-kABI-for-dma_max_mapping_size.patch
@@ -11,11 +11,9 @@ Signed-off-by: Joerg Roedel <jroedel@suse.de>
include/linux/dma-mapping.h | 7 +++----
2 files changed, 3 insertions(+), 5 deletions(-)
-diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
-index 0b0e23f2ddcc..677077510e30 100644
--- a/arch/x86/kernel/pci-swiotlb.c
+++ b/arch/x86/kernel/pci-swiotlb.c
-@@ -60,7 +60,6 @@ static const struct dma_map_ops swiotlb_dma_ops = {
+@@ -60,7 +60,6 @@ static const struct dma_map_ops swiotlb_
.map_page = swiotlb_map_page,
.unmap_page = swiotlb_unmap_page,
.dma_supported = NULL,
@@ -23,8 +21,6 @@ index 0b0e23f2ddcc..677077510e30 100644
};
/*
-diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
-index 4e1cd7c6345c..33531be3f5f8 100644
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
@@ -11,6 +11,7 @@
@@ -43,7 +39,7 @@ index 4e1cd7c6345c..33531be3f5f8 100644
#ifdef ARCH_HAS_DMA_GET_REQUIRED_MASK
u64 (*get_required_mask)(struct device *dev);
#endif
-@@ -604,11 +604,10 @@ static inline u64 dma_get_mask(struct device *dev)
+@@ -604,11 +604,10 @@ static inline u64 dma_get_mask(struct de
static inline size_t dma_max_mapping_size(struct device *dev)
{
@@ -57,6 +53,13 @@ index 4e1cd7c6345c..33531be3f5f8 100644
return size;
}
---
-2.16.3
-
+--- a/arch/x86/mm/mem_encrypt.c
++++ b/arch/x86/mm/mem_encrypt.c
+@@ -424,7 +424,6 @@ static const struct dma_map_ops sev_dma_
+ .sync_sg_for_cpu = swiotlb_sync_sg_for_cpu,
+ .sync_sg_for_device = swiotlb_sync_sg_for_device,
+ .mapping_error = swiotlb_dma_mapping_error,
+- .max_mapping_size = swiotlb_max_mapping_size,
+ };
+
+ /* Architecture __weak replacement functions */