Page MenuHomeFreeBSD
Files F142988308

D32255.id102859.diff
No OneTemporary
Actions

D32255.id102859.diff
View Options

Index: sys/compat/linuxkpi/common/include/linux/dma-mapping.h
===================================================================
--- sys/compat/linuxkpi/common/include/linux/dma-mapping.h
+++ sys/compat/linuxkpi/common/include/linux/dma-mapping.h
@@ -103,6 +103,7 @@
void linux_dma_unmap_sg_attrs(struct device *dev, struct scatterlist *sg,
int nents __unused, enum dma_data_direction dir __unused,
unsigned long attrs __unused);
+void linuxkpi_dma_sync(struct device *, dma_addr_t, size_t, bus_dmasync_op_t);
static inline int
dma_supported(struct device *dev, u64 dma_mask)
@@ -167,12 +168,6 @@
kmem_free((vm_offset_t)cpu_addr, size);
}
-#define dma_map_single_attrs(dev, ptr, size, dir, attrs) \
- linux_dma_map_phys(dev, vtophys(ptr), 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,
size_t size, enum dma_data_direction dir, unsigned long attrs)
@@ -205,9 +200,28 @@
}
static inline void
-dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle, size_t size,
+dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma, size_t size,
enum dma_data_direction direction)
{
+ bus_dmasync_op_t op;
+
+ switch (direction) {
+ case DMA_BIDIRECTIONAL:
+ op = BUS_DMASYNC_POSTREAD;
+ linuxkpi_dma_sync(dev, dma, size, op);
+ op = BUS_DMASYNC_PREREAD;
+ break;
+ case DMA_TO_DEVICE:
+ op = BUS_DMASYNC_POSTWRITE;
+ break;
+ case DMA_FROM_DEVICE:
+ op = BUS_DMASYNC_POSTREAD;
+ break;
+ default:
+ return;
+ }
+
+ linuxkpi_dma_sync(dev, dma, size, op);
}
static inline void
@@ -218,9 +232,26 @@
}
static inline void
-dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle,
+dma_sync_single_for_device(struct device *dev, dma_addr_t dma,
size_t size, enum dma_data_direction direction)
{
+ bus_dmasync_op_t op;
+
+ switch (direction) {
+ case DMA_BIDIRECTIONAL:
+ op = BUS_DMASYNC_PREWRITE;
+ break;
+ case DMA_TO_DEVICE:
+ op = BUS_DMASYNC_PREREAD;
+ break;
+ case DMA_FROM_DEVICE:
+ op = BUS_DMASYNC_PREWRITE;
+ break;
+ default:
+ return;
+ }
+
+ linuxkpi_dma_sync(dev, dma, size, op);
}
static inline void
@@ -260,6 +291,34 @@
return (0);
}
+static inline dma_addr_t
+_dma_map_single_attrs(struct device *dev, void *ptr, size_t size,
+ enum dma_data_direction direction, unsigned long attrs __unused)
+{
+ dma_addr_t dma;
+
+ dma = linux_dma_map_phys(dev, vtophys(ptr), size);
+ if (!dma_mapping_error(dev, dma))
+ dma_sync_single_for_device(dev, dma, size, direction);
+
+ return (dma);
+}
+
+static inline void
+_dma_unmap_single_attrs(struct device *dev, dma_addr_t dma, size_t size,
+ enum dma_data_direction direction, unsigned long attrs __unused)
+{
+
+ dma_sync_single_for_cpu(dev, dma, size, direction);
+ linux_dma_unmap(dev, dma, size);
+}
+
+#define dma_map_single_attrs(dev, ptr, size, dir, attrs) \
+ _dma_map_single_attrs(dev, ptr, size, dir, 0)
+
+#define dma_unmap_single_attrs(dev, dma_addr, size, dir, attrs) \
+ _dma_unmap_single_attrs(dev, dma_addr, size, dir, 0)
+
#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)
Index: sys/compat/linuxkpi/common/src/linux_pci.c
===================================================================
--- sys/compat/linuxkpi/common/src/linux_pci.c
+++ sys/compat/linuxkpi/common/src/linux_pci.c
@@ -1,7 +1,7 @@
/*-
* Copyright (c) 2015-2016 Mellanox Technologies, Ltd.
* All rights reserved.
- * Copyright (c) 2020-2021 The FreeBSD Foundation
+ * Copyright (c) 2020-2022 The FreeBSD Foundation
*
* Portions of this software were developed by Björn Zeeb
* under sponsorship from the FreeBSD Foundation.
@@ -957,9 +957,32 @@
return (mem);
}
+void
+linuxkpi_dma_sync(struct device *dev, dma_addr_t dma_addr, size_t size,
+ bus_dmasync_op_t op)
+{
+ struct linux_dma_priv *priv;
+ struct linux_dma_obj *obj;
+
+ priv = dev->dma_priv;
+
+ if (pctrie_is_empty(&priv->ptree))
+ return;
+
+ DMA_PRIV_LOCK(priv);
+ obj = LINUX_DMA_PCTRIE_LOOKUP(&priv->ptree, dma_addr);
+ if (obj == NULL) {
+ DMA_PRIV_UNLOCK(priv);
+ return;
+ }
+
+ bus_dmamap_sync(obj->dmat, obj->dmamap, op);
+ DMA_PRIV_UNLOCK(priv);
+}
+
int
linux_dma_map_sg_attrs(struct device *dev, struct scatterlist *sgl, int nents,
- enum dma_data_direction dir __unused, unsigned long attrs __unused)
+ enum dma_data_direction direction, unsigned long attrs __unused)
{
struct linux_dma_priv *priv;
struct scatterlist *sg;
@@ -992,6 +1015,21 @@
sg_dma_address(sg) = seg.ds_addr;
}
+
+ switch (direction) {
+ case DMA_BIDIRECTIONAL:
+ bus_dmamap_sync(priv->dmat, sgl->dma_map, BUS_DMASYNC_PREWRITE);
+ break;
+ case DMA_TO_DEVICE:
+ bus_dmamap_sync(priv->dmat, sgl->dma_map, BUS_DMASYNC_PREREAD);
+ break;
+ case DMA_FROM_DEVICE:
+ bus_dmamap_sync(priv->dmat, sgl->dma_map, BUS_DMASYNC_PREWRITE);
+ break;
+ default:
+ break;
+ }
+
DMA_PRIV_UNLOCK(priv);
return (nents);
@@ -999,7 +1037,7 @@
void
linux_dma_unmap_sg_attrs(struct device *dev, struct scatterlist *sgl,
- int nents __unused, enum dma_data_direction dir __unused,
+ int nents __unused, enum dma_data_direction direction,
unsigned long attrs __unused)
{
struct linux_dma_priv *priv;
@@ -1007,6 +1045,22 @@
priv = dev->dma_priv;
DMA_PRIV_LOCK(priv);
+
+ switch (direction) {
+ case DMA_BIDIRECTIONAL:
+ bus_dmamap_sync(priv->dmat, sgl->dma_map, BUS_DMASYNC_POSTREAD);
+ bus_dmamap_sync(priv->dmat, sgl->dma_map, BUS_DMASYNC_PREREAD);
+ break;
+ case DMA_TO_DEVICE:
+ bus_dmamap_sync(priv->dmat, sgl->dma_map, BUS_DMASYNC_POSTWRITE);
+ break;
+ case DMA_FROM_DEVICE:
+ bus_dmamap_sync(priv->dmat, sgl->dma_map, BUS_DMASYNC_POSTREAD);
+ break;
+ default:
+ break;
+ }
+
bus_dmamap_unload(priv->dmat, sgl->dma_map);
bus_dmamap_destroy(priv->dmat, sgl->dma_map);
DMA_PRIV_UNLOCK(priv);

File Metadata

Mime Type
text/plain
Expires
Mon, Jan 26, 2:59 AM (8 h, 56 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27994718
Default Alt Text
D32255.id102859.diff (5 KB)

Event Timeline