Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 28 Nov 2019 00:42:45 +0000 (UTC)
From:      Alexander Motin <mav@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject:   svn commit: r355153 - stable/12/sys/dev/ioat
Message-ID:  <201911280042.xAS0gjkT063207@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mav
Date: Thu Nov 28 00:42:45 2019
New Revision: 355153
URL: https://svnweb.freebsd.org/changeset/base/355153

Log:
  MFC r354703: Pass more reasonable WAIT flags to bus_dma(9) calls.

Modified:
  stable/12/sys/dev/ioat/ioat.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/ioat/ioat.c
==============================================================================
--- stable/12/sys/dev/ioat/ioat.c	Thu Nov 28 00:41:42 2019	(r355152)
+++ stable/12/sys/dev/ioat/ioat.c	Thu Nov 28 00:42:45 2019	(r355153)
@@ -497,13 +497,14 @@ ioat3_attach(device_t device)
 	    &ioat->comp_update_tag);
 
 	error = bus_dmamem_alloc(ioat->comp_update_tag,
-	    (void **)&ioat->comp_update, BUS_DMA_ZERO, &ioat->comp_update_map);
+	    (void **)&ioat->comp_update, BUS_DMA_ZERO | BUS_DMA_WAITOK,
+	    &ioat->comp_update_map);
 	if (ioat->comp_update == NULL)
 		return (ENOMEM);
 
 	error = bus_dmamap_load(ioat->comp_update_tag, ioat->comp_update_map,
 	    ioat->comp_update, sizeof(uint64_t), ioat_comp_update_map, ioat,
-	    0);
+	    BUS_DMA_NOWAIT);
 	if (error != 0)
 		return (error);
 
@@ -524,7 +525,7 @@ ioat3_attach(device_t device)
 		return (error);
 
 	error = bus_dmamap_load(ioat->hw_desc_tag, ioat->hw_desc_map, hw_desc,
-	    ringsz, ioat_dmamap_cb, &ioat->hw_desc_bus_addr, BUS_DMA_WAITOK);
+	    ringsz, ioat_dmamap_cb, &ioat->hw_desc_bus_addr, BUS_DMA_NOWAIT);
 	if (error)
 		return (error);
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911280042.xAS0gjkT063207>