Page MenuHomeFreeBSD
Files F153717950

D19725.id55496.diff
No OneTemporary
Actions

D19725.id55496.diff
View Options

Index: sys/dev/ioat/ioat.c
===================================================================
--- sys/dev/ioat/ioat.c
+++ sys/dev/ioat/ioat.c
@@ -324,6 +324,7 @@
ioat_detach(device_t device)
{
struct ioat_softc *ioat;
+ int i, error;
ioat = DEVICE2SOFTC(device);
@@ -359,6 +360,26 @@
bus_release_resource(device, SYS_RES_MEMORY,
ioat->pci_resource_id, ioat->pci_resource);
+ for (i = 0; i < 1 << ioat->ring_size_order; i++) {
+ error = bus_dmamap_destroy(ioat->data_tag,
+ ioat->ring[i].src_dmamap);
+ if (error != 0) {
+ ioat_log_message(0,
+ "%s: bus_dmamap_destroy failed %d\n", __func__,
+ error);
+ return (error);
+ }
+ error = bus_dmamap_destroy(ioat->data_tag,
+ ioat->ring[i].dst_dmamap);
+ if (error != 0) {
+ ioat_log_message(0,
+ "%s: bus_dmamap_destroy failed %d\n", __func__,
+ error);
+ return (error);
+ }
+ }
+ bus_dma_tag_destroy(ioat->data_tag);
+
if (ioat->ring != NULL)
ioat_free_ring(ioat, 1 << ioat->ring_size_order, ioat->ring);
@@ -523,6 +544,15 @@
ioat->hw_desc_ring = hw_desc;
+ error = bus_dma_tag_create(bus_get_dma_tag(ioat->device),
+ 1, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL,
+ BUS_SPACE_MAXADDR, 1, BUS_SPACE_MAXADDR, 0, NULL, NULL,
+ &ioat->data_tag);
+ if (error != 0) {
+ ioat_log_message(0, "%s: bus_dma_tag_create failed %d\n",
+ __func__, error);
+ return (error);
+ }
ioat->ring = malloc(num_descriptors * sizeof(*ring), M_IOAT,
M_ZERO | M_WAITOK);
@@ -530,6 +560,22 @@
for (i = 0; i < num_descriptors; i++) {
memset(&ring[i].bus_dmadesc, 0, sizeof(ring[i].bus_dmadesc));
ring[i].id = i;
+ error = bus_dmamap_create(ioat->data_tag, 0,
+ &ring[i].src_dmamap);
+ if (error != 0) {
+ ioat_log_message(0,
+ "%s: bus_dmamap_create failed %d\n", __func__,
+ error);
+ return (error);
+ }
+ error = bus_dmamap_create(ioat->data_tag, 0,
+ &ring[i].dst_dmamap);
+ if (error != 0) {
+ ioat_log_message(0,
+ "%s: bus_dmamap_create failed %d\n", __func__,
+ error);
+ return (error);
+ }
}
for (i = 0; i < num_descriptors; i++) {
@@ -724,6 +770,9 @@
ioat->chan_idx, ioat->tail, dmadesc, dmadesc->callback_fn,
dmadesc->callback_arg);
+ bus_dmamap_unload(ioat->data_tag, desc->dst_dmamap);
+ bus_dmamap_unload(ioat->data_tag, desc->src_dmamap);
+
if (dmadesc->callback_fn != NULL)
dmadesc->callback_fn(dmadesc->callback_arg, 0);
@@ -999,7 +1048,8 @@
{
struct ioat_generic_hw_descriptor *hw_desc;
struct ioat_descriptor *desc;
- int mflags;
+ bus_dma_segment_t seg;
+ int mflags, nseg, error;
mtx_assert(&ioat->submit_lock, MA_OWNED);
@@ -1032,9 +1082,27 @@
hw_desc->u.control_generic.fence = 1;
hw_desc->size = size;
- hw_desc->src_addr = src;
- hw_desc->dest_addr = dst;
+ nseg = -1;
+ error = _bus_dmamap_load_phys(ioat->data_tag, desc->src_dmamap,
+ src, size, 0, &seg, &nseg);
+ if (error != 0) {
+ ioat_log_message(0, "%s: _bus_dmamap_load_phys failed %d\n",
+ __func__, error);
+ return (NULL);
+ }
+ hw_desc->src_addr = seg.ds_addr;
+
+ nseg = -1;
+ error = _bus_dmamap_load_phys(ioat->data_tag, desc->dst_dmamap,
+ dst, size, 0, &seg, &nseg);
+ if (error != 0) {
+ ioat_log_message(0, "%s: _bus_dmamap_load_phys failed %d\n",
+ __func__, error);
+ return (NULL);
+ }
+ hw_desc->dest_addr = seg.ds_addr;
+
desc->bus_dmadesc.callback_fn = callback_fn;
desc->bus_dmadesc.callback_arg = callback_arg;
return (desc);
Index: sys/dev/ioat/ioat_internal.h
===================================================================
--- sys/dev/ioat/ioat_internal.h
+++ sys/dev/ioat/ioat_internal.h
@@ -414,6 +414,8 @@
struct ioat_descriptor {
struct bus_dmadesc bus_dmadesc;
uint32_t id;
+ bus_dmamap_t src_dmamap;
+ bus_dmamap_t dst_dmamap;
};
/* Unused by this driver at this time. */
@@ -457,6 +459,8 @@
bus_dma_tag_t hw_desc_tag;
bus_dmamap_t hw_desc_map;
+ bus_dma_tag_t data_tag;
+
bus_dma_tag_t comp_update_tag;
bus_dmamap_t comp_update_map;
uint64_t *comp_update;

File Metadata

Mime Type
text/plain
Expires
Fri, Apr 24, 4:38 AM (3 h, 13 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32060393
Default Alt Text
D19725.id55496.diff (4 KB)

Event Timeline