git: 98a6984a9e10 - main - LinuxKPI: Use macro for implementation of some dma_map_* functions

[Vladimir Kondratyev]

The branch main has been updated by wulf:

URL: https://cgit.FreeBSD.org/src/commit/?id=98a6984a9e10c5c1677643eb4d9a758e3af131da

commit 98a6984a9e10c5c1677643eb4d9a758e3af131da
Author:     Vladimir Kondratyev <wulf at FreeBSD.org>
AuthorDate: 2021-07-05 00:20:23 +0000
Commit:     Vladimir Kondratyev <wulf at FreeBSD.org>
CommitDate: 2021-07-05 00:20:23 +0000

    LinuxKPI: Use macro for implementation of some dma_map_* functions
    
    This allows to remove unimplemented attrs parameter which type differs
    between Linux kernel versions and to compile both drm-kmod and ofed
    callers unmodified.
    Also convert it to 'unsigned long' type to match modern Linuxes.
    
    Reviewed by:    hselasky
    Differential revision:  https://reviews.freebsd.org/D30932
---
 .../linuxkpi/common/include/linux/dma-mapping.h    | 59 ++++++++--------------
 sys/compat/linuxkpi/common/src/linux_pci.c         |  5 +-
 2 files changed, 24 insertions(+), 40 deletions(-)

diff --git a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h
index d074b563cd41..5b5bc9e90815 100644
--- a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h
+++ b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h
@@ -63,13 +63,13 @@ struct dma_map_ops {
 	    void *vaddr, dma_addr_t dma_handle);
 	dma_addr_t (*map_page)(struct device *dev, struct page *page,
 	    unsigned long offset, size_t size, enum dma_data_direction dir,
-	    struct dma_attrs *attrs);
+	    unsigned long attrs);
 	void (*unmap_page)(struct device *dev, dma_addr_t dma_handle,
-	    size_t size, enum dma_data_direction dir, struct dma_attrs *attrs);
+	    size_t size, enum dma_data_direction dir, unsigned long attrs);
 	int (*map_sg)(struct device *dev, struct scatterlist *sg,
-	    int nents, enum dma_data_direction dir, struct dma_attrs *attrs);
+	    int nents, enum dma_data_direction dir, unsigned long attrs);
 	void (*unmap_sg)(struct device *dev, struct scatterlist *sg, int nents,
-	    enum dma_data_direction dir, struct dma_attrs *attrs);
+	    enum dma_data_direction dir, unsigned long attrs);
 	void (*sync_single_for_cpu)(struct device *dev, dma_addr_t dma_handle,
 	    size_t size, enum dma_data_direction dir);
 	void (*sync_single_for_device)(struct device *dev,
@@ -97,9 +97,11 @@ void *linux_dma_alloc_coherent(struct device *dev, size_t size,
 dma_addr_t linux_dma_map_phys(struct device *dev, vm_paddr_t phys, size_t len);
 void linux_dma_unmap(struct device *dev, dma_addr_t dma_addr, size_t size);
 int linux_dma_map_sg_attrs(struct device *dev, struct scatterlist *sgl,
-    int nents, enum dma_data_direction dir, struct dma_attrs *attrs);
+    int nents, enum dma_data_direction dir __unused,
+    unsigned long attrs __unused);
 void linux_dma_unmap_sg_attrs(struct device *dev, struct scatterlist *sg,
-    int nents, enum dma_data_direction dir, struct dma_attrs *attrs);
+    int nents __unused, enum dma_data_direction dir __unused,
+    unsigned long attrs __unused);
 
 static inline int
 dma_supported(struct device *dev, u64 mask)
@@ -164,21 +166,11 @@ dma_free_coherent(struct device *dev, size_t size, void *cpu_addr,
 	kmem_free((vm_offset_t)cpu_addr, size);
 }
 
-static inline dma_addr_t
-dma_map_single_attrs(struct device *dev, void *ptr, size_t size,
-    enum dma_data_direction dir, struct dma_attrs *attrs)
-{
+#define	dma_map_single_attrs(dev, ptr, size, dir, attrs)	\
+	linux_dma_map_phys(dev, vtophys(ptr), size)
 
-	return (linux_dma_map_phys(dev, vtophys(ptr), size));
-}
-
-static inline void
-dma_unmap_single_attrs(struct device *dev, dma_addr_t dma_addr, size_t size,
-    enum dma_data_direction dir, struct dma_attrs *attrs)
-{
-
-	linux_dma_unmap(dev, dma_addr, size);
-}
+#define	dma_unmap_single_attrs(dev, dma_addr, size, dir, attrs)	\
+	linux_dma_unmap(dev, dma_addr, size)
 
 static inline dma_addr_t
 dma_map_page_attrs(struct device *dev, struct page *page, size_t offset,
@@ -188,21 +180,12 @@ dma_map_page_attrs(struct device *dev, struct page *page, size_t offset,
 	return (linux_dma_map_phys(dev, VM_PAGE_TO_PHYS(page) + offset, size));
 }
 
-static inline int
-dma_map_sg_attrs(struct device *dev, struct scatterlist *sgl, int nents,
-    enum dma_data_direction dir, struct dma_attrs *attrs)
-{
-
-	return (linux_dma_map_sg_attrs(dev, sgl, nents, dir, attrs));
-}
+/* linux_dma_(un)map_sg_attrs does not support attrs yet */
+#define	dma_map_sg_attrs(dev, sgl, nents, dir, attrs)	\
+	linux_dma_map_sg_attrs(dev, sgl, nents, dir, 0)
 
-static inline void
-dma_unmap_sg_attrs(struct device *dev, struct scatterlist *sg, int nents,
-    enum dma_data_direction dir, struct dma_attrs *attrs)
-{
-
-	linux_dma_unmap_sg_attrs(dev, sg, nents, dir, attrs);
-}
+#define	dma_unmap_sg_attrs(dev, sg, nents, dir, attrs)	\
+	linux_dma_unmap_sg_attrs(dev, sg, nents, dir, 0)
 
 static inline dma_addr_t
 dma_map_page(struct device *dev, struct page *page,
@@ -276,10 +259,10 @@ static inline unsigned int dma_set_max_seg_size(struct device *dev,
 	return (0);
 }
 
-#define dma_map_single(d, a, s, r) dma_map_single_attrs(d, a, s, r, NULL)
-#define dma_unmap_single(d, a, s, r) dma_unmap_single_attrs(d, a, s, r, NULL)
-#define dma_map_sg(d, s, n, r) dma_map_sg_attrs(d, s, n, r, NULL)
-#define dma_unmap_sg(d, s, n, r) dma_unmap_sg_attrs(d, s, n, r, NULL)
+#define dma_map_single(d, a, s, r) dma_map_single_attrs(d, a, s, r, 0)
+#define dma_unmap_single(d, a, s, r) dma_unmap_single_attrs(d, a, s, r, 0)
+#define dma_map_sg(d, s, n, r) dma_map_sg_attrs(d, s, n, r, 0)
+#define dma_unmap_sg(d, s, n, r) dma_unmap_sg_attrs(d, s, n, r, 0)
 
 #define	DEFINE_DMA_UNMAP_ADDR(name)		dma_addr_t name
 #define	DEFINE_DMA_UNMAP_LEN(name)		__u32 name
diff --git a/sys/compat/linuxkpi/common/src/linux_pci.c b/sys/compat/linuxkpi/common/src/linux_pci.c
index c35d259a45be..ae45df9c6514 100644
--- a/sys/compat/linuxkpi/common/src/linux_pci.c
+++ b/sys/compat/linuxkpi/common/src/linux_pci.c
@@ -881,7 +881,7 @@ linux_dma_unmap(struct device *dev, dma_addr_t dma_addr, size_t len)
 
 int
 linux_dma_map_sg_attrs(struct device *dev, struct scatterlist *sgl, int nents,
-    enum dma_data_direction dir, struct dma_attrs *attrs)
+    enum dma_data_direction dir __unused, unsigned long attrs __unused)
 {
 	struct linux_dma_priv *priv;
 	struct scatterlist *sg;
@@ -921,7 +921,8 @@ linux_dma_map_sg_attrs(struct device *dev, struct scatterlist *sgl, int nents,
 
 void
 linux_dma_unmap_sg_attrs(struct device *dev, struct scatterlist *sgl,
-    int nents, enum dma_data_direction dir, struct dma_attrs *attrs)
+    int nents __unused, enum dma_data_direction dir __unused,
+    unsigned long attrs __unused)
 {
 	struct linux_dma_priv *priv;