Page MenuHomeFreeBSD
Files F107251688

D32164.diff
No OneTemporary
Actions

D32164.diff
View Options

diff --git a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h
--- a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h
+++ b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h
@@ -92,6 +92,7 @@
#define DMA_BIT_MASK(n) ((2ULL << ((n) - 1)) - 1ULL)
int linux_dma_tag_init(struct device *, u64);
+int linux_dma_tag_init_coherent(struct device *, u64);
void *linux_dma_alloc_coherent(struct device *dev, size_t size,
dma_addr_t *dma_handle, gfp_t flag);
dma_addr_t linux_dma_map_phys(struct device *dev, vm_paddr_t phys, size_t len);
@@ -125,10 +126,10 @@
dma_set_coherent_mask(struct device *dev, u64 dma_mask)
{
- if (!dma_supported(dev, dma_mask))
+ if (!dev->dma_priv || !dma_supported(dev, dma_mask))
return -EIO;
- /* XXX Currently we don't support a separate coherent mask. */
- return 0;
+
+ return (linux_dma_tag_init_coherent(dev, dma_mask));
}
static inline int
diff --git a/sys/compat/linuxkpi/common/src/linux_pci.c b/sys/compat/linuxkpi/common/src/linux_pci.c
--- a/sys/compat/linuxkpi/common/src/linux_pci.c
+++ b/sys/compat/linuxkpi/common/src/linux_pci.c
@@ -110,13 +110,31 @@
struct linux_dma_priv {
uint64_t dma_mask;
- struct mtx lock;
bus_dma_tag_t dmat;
+ uint64_t dma_coherent_mask;
+ bus_dma_tag_t dmat_coherent;
+ struct mtx lock;
struct pctrie ptree;
};
#define DMA_PRIV_LOCK(priv) mtx_lock(&(priv)->lock)
#define DMA_PRIV_UNLOCK(priv) mtx_unlock(&(priv)->lock)
+static int
+linux_pdev_dma_uninit(struct pci_dev *pdev)
+{
+ struct linux_dma_priv *priv;
+
+ priv = pdev->dev.dma_priv;
+ if (priv->dmat)
+ bus_dma_tag_destroy(priv->dmat);
+ if (priv->dmat_coherent)
+ bus_dma_tag_destroy(priv->dmat_coherent);
+ mtx_destroy(&priv->lock);
+ pdev->dev.dma_priv = NULL;
+ free(priv, M_DEVBUF);
+ return (0);
+}
+
static int
linux_pdev_dma_init(struct pci_dev *pdev)
{
@@ -124,34 +142,26 @@
int error;
priv = malloc(sizeof(*priv), M_DEVBUF, M_WAITOK | M_ZERO);
- pdev->dev.dma_priv = priv;
mtx_init(&priv->lock, "lkpi-priv-dma", NULL, MTX_DEF);
-
pctrie_init(&priv->ptree);
- /* create a default DMA tag */
+ pdev->dev.dma_priv = priv;
+
+ /* Create a default DMA tags. */
error = linux_dma_tag_init(&pdev->dev, DMA_BIT_MASK(64));
- if (error) {
- mtx_destroy(&priv->lock);
- free(priv, M_DEVBUF);
- pdev->dev.dma_priv = NULL;
- }
- return (error);
-}
+ if (error != 0)
+ goto err;
+ /* Coherent is lower 32bit only by default in Linux. */
+ error = linux_dma_tag_init_coherent(&pdev->dev, DMA_BIT_MASK(32));
+ if (error != 0)
+ goto err;
-static int
-linux_pdev_dma_uninit(struct pci_dev *pdev)
-{
- struct linux_dma_priv *priv;
+ return (error);
- priv = pdev->dev.dma_priv;
- if (priv->dmat)
- bus_dma_tag_destroy(priv->dmat);
- mtx_destroy(&priv->lock);
- free(priv, M_DEVBUF);
- pdev->dev.dma_priv = NULL;
- return (0);
+err:
+ linux_pdev_dma_uninit(pdev);
+ return (error);
}
int
@@ -185,6 +195,37 @@
return (-error);
}
+int
+linux_dma_tag_init_coherent(struct device *dev, u64 dma_mask)
+{
+ struct linux_dma_priv *priv;
+ int error;
+
+ priv = dev->dma_priv;
+
+ if (priv->dmat_coherent) {
+ if (priv->dma_coherent_mask == dma_mask)
+ return (0);
+
+ bus_dma_tag_destroy(priv->dmat_coherent);
+ }
+
+ priv->dma_coherent_mask = dma_mask;
+
+ error = bus_dma_tag_create(bus_get_dma_tag(dev->bsddev),
+ 1, 0, /* alignment, boundary */
+ dma_mask, /* lowaddr */
+ BUS_SPACE_MAXADDR, /* highaddr */
+ NULL, NULL, /* filtfunc, filtfuncarg */
+ BUS_SPACE_MAXSIZE, /* maxsize */
+ 1, /* nsegments */
+ BUS_SPACE_MAXSIZE, /* maxsegsz */
+ 0, /* flags */
+ NULL, NULL, /* lockfunc, lockfuncarg */
+ &priv->dmat_coherent);
+ return (-error);
+}
+
static struct pci_driver *
linux_pci_find(device_t dev, const struct pci_device_id **idp)
{
@@ -704,6 +745,7 @@
void *vaddr;
uint64_t dma_addr;
bus_dmamap_t dmamap;
+ bus_dma_tag_t dmat;
};
static uma_zone_t linux_dma_trie_zone;
@@ -749,44 +791,10 @@
PCTRIE_DEFINE(LINUX_DMA, linux_dma_obj, dma_addr, linux_dma_trie_alloc,
linux_dma_trie_free);
-void *
-linux_dma_alloc_coherent(struct device *dev, size_t size,
- dma_addr_t *dma_handle, gfp_t flag)
-{
- struct linux_dma_priv *priv;
- vm_paddr_t high;
- size_t align;
- void *mem;
-
- if (dev == NULL || dev->dma_priv == NULL) {
- *dma_handle = 0;
- return (NULL);
- }
- priv = dev->dma_priv;
- if (priv->dma_mask)
- high = priv->dma_mask;
- else if (flag & GFP_DMA32)
- high = BUS_SPACE_MAXADDR_32BIT;
- else
- high = BUS_SPACE_MAXADDR;
- align = PAGE_SIZE << get_order(size);
- mem = (void *)kmem_alloc_contig(size, flag & GFP_NATIVE_MASK, 0, high,
- align, 0, VM_MEMATTR_DEFAULT);
- if (mem != NULL) {
- *dma_handle = linux_dma_map_phys(dev, vtophys(mem), size);
- if (*dma_handle == 0) {
- kmem_free((vm_offset_t)mem, size);
- mem = NULL;
- }
- } else {
- *dma_handle = 0;
- }
- return (mem);
-}
-
#if defined(__i386__) || defined(__amd64__) || defined(__aarch64__)
-dma_addr_t
-linux_dma_map_phys(struct device *dev, vm_paddr_t phys, size_t len)
+static dma_addr_t
+linux_dma_map_phys_common(struct device *dev, vm_paddr_t phys, size_t len,
+ bus_dma_tag_t dmat)
{
struct linux_dma_priv *priv;
struct linux_dma_obj *obj;
@@ -801,25 +809,26 @@
* bus_dma API. This avoids tracking collisions in the pctrie
* with the additional benefit of reducing overhead.
*/
- if (bus_dma_id_mapped(priv->dmat, phys, len))
+ if (bus_dma_id_mapped(dmat, phys, len))
return (phys);
obj = uma_zalloc(linux_dma_obj_zone, M_NOWAIT);
if (obj == NULL) {
return (0);
}
+ obj->dmat = dmat;
DMA_PRIV_LOCK(priv);
- if (bus_dmamap_create(priv->dmat, 0, &obj->dmamap) != 0) {
+ if (bus_dmamap_create(obj->dmat, 0, &obj->dmamap) != 0) {
DMA_PRIV_UNLOCK(priv);
uma_zfree(linux_dma_obj_zone, obj);
return (0);
}
nseg = -1;
- if (_bus_dmamap_load_phys(priv->dmat, obj->dmamap, phys, len,
+ if (_bus_dmamap_load_phys(obj->dmat, obj->dmamap, phys, len,
BUS_DMA_NOWAIT, &seg, &nseg) != 0) {
- bus_dmamap_destroy(priv->dmat, obj->dmamap);
+ bus_dmamap_destroy(obj->dmat, obj->dmamap);
DMA_PRIV_UNLOCK(priv);
uma_zfree(linux_dma_obj_zone, obj);
return (0);
@@ -830,8 +839,8 @@
error = LINUX_DMA_PCTRIE_INSERT(&priv->ptree, obj);
if (error != 0) {
- bus_dmamap_unload(priv->dmat, obj->dmamap);
- bus_dmamap_destroy(priv->dmat, obj->dmamap);
+ bus_dmamap_unload(obj->dmat, obj->dmamap);
+ bus_dmamap_destroy(obj->dmat, obj->dmamap);
DMA_PRIV_UNLOCK(priv);
uma_zfree(linux_dma_obj_zone, obj);
return (0);
@@ -841,12 +850,22 @@
}
#else
dma_addr_t
-linux_dma_map_phys(struct device *dev, vm_paddr_t phys, size_t len)
+linux_dma_map_phys_common(struct device *dev __unused, vm_paddr_t phys,
+ size_t len __unused, bus_dma_tag_t dmat __unused)
{
return (phys);
}
#endif
+dma_addr_t
+linux_dma_map_phys(struct device *dev, vm_paddr_t phys, size_t len)
+{
+ struct linux_dma_priv *priv;
+
+ priv = dev->dma_priv;
+ return (linux_dma_map_phys_common(dev, phys, len, priv->dmat));
+}
+
#if defined(__i386__) || defined(__amd64__) || defined(__aarch64__)
void
linux_dma_unmap(struct device *dev, dma_addr_t dma_addr, size_t len)
@@ -866,8 +885,8 @@
return;
}
LINUX_DMA_PCTRIE_REMOVE(&priv->ptree, dma_addr);
- bus_dmamap_unload(priv->dmat, obj->dmamap);
- bus_dmamap_destroy(priv->dmat, obj->dmamap);
+ bus_dmamap_unload(obj->dmat, obj->dmamap);
+ bus_dmamap_destroy(obj->dmat, obj->dmamap);
DMA_PRIV_UNLOCK(priv);
uma_zfree(linux_dma_obj_zone, obj);
@@ -879,6 +898,43 @@
}
#endif
+void *
+linux_dma_alloc_coherent(struct device *dev, size_t size,
+ dma_addr_t *dma_handle, gfp_t flag)
+{
+ struct linux_dma_priv *priv;
+ vm_paddr_t high;
+ size_t align;
+ void *mem;
+
+ if (dev == NULL || dev->dma_priv == NULL) {
+ *dma_handle = 0;
+ return (NULL);
+ }
+ priv = dev->dma_priv;
+ if (priv->dma_coherent_mask)
+ high = priv->dma_coherent_mask;
+ else
+ /* Coherent is lower 32bit only by default in Linux. */
+ high = BUS_SPACE_MAXADDR_32BIT;
+ align = PAGE_SIZE << get_order(size);
+ /* Always zero the allocation. */
+ flag |= M_ZERO;
+ mem = (void *)kmem_alloc_contig(size, flag & GFP_NATIVE_MASK, 0, high,
+ align, 0, VM_MEMATTR_DEFAULT);
+ if (mem != NULL) {
+ *dma_handle = linux_dma_map_phys_common(dev, vtophys(mem), size,
+ priv->dmat_coherent);
+ if (*dma_handle == 0) {
+ kmem_free((vm_offset_t)mem, size);
+ mem = NULL;
+ }
+ } else {
+ *dma_handle = 0;
+ }
+ return (mem);
+}
+
int
linux_dma_map_sg_attrs(struct device *dev, struct scatterlist *sgl, int nents,
enum dma_data_direction dir __unused, unsigned long attrs __unused)

File Metadata

Mime Type
text/plain
Expires
Sun, Jan 12, 6:46 PM (4 h, 48 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15772098
Default Alt Text
D32164.diff (8 KB)

Event Timeline