[dma] Move I/O buffer DMA operations to iobuf.h

Include a potential DMA mapping within the definition of an I/O
buffer, and move all I/O buffer DMA mapping functions from dma.h to
iobuf.h.  This avoids the need for drivers to maintain a separate list
of DMA mappings for each I/O buffer that they may handle.

Network device drivers typically do not keep track of transmit I/O
buffers, since the network device core already maintains a transmit
queue.  Drivers will typically call netdev_tx_complete_next() to
complete a transmission without first obtaining the relevant I/O
buffer pointer (and will rely on the network device core automatically
cancelling any pending transmissions when the device is closed).

To allow this driver design approach to be retained, update the
netdev_tx_complete() family of functions to automatically perform the
DMA unmapping operation if required.  For symmetry, also update the
netdev_rx() family of functions to behave the same way.

As a further convenience for drivers, allow the network device core to
automatically perform DMA mapping on the transmit datapath before
calling the driver's transmit() method.  This avoids the need to
introduce a mapping error handling code path into the typically
error-free transmit methods.

With these changes, the modifications required to update a typical
network device driver to use the new DMA API are fairly minimal:

- Allocate and free descriptor rings and similar coherent structures
  using dma_alloc()/dma_free() rather than malloc_phys()/free_phys()

- Allocate and free receive buffers using alloc_rx_iob()/free_rx_iob()
  rather than alloc_iob()/free_iob()

- Calculate DMA addresses using dma() or iob_dma() rather than
  virt_to_bus()

- Set a 64-bit DMA mask if needed using dma_set_mask_64bit() and
  thereafter eliminate checks on DMA address ranges

- Either record the DMA device in netdev->dma, or call iob_map_tx() as
  part of the transmit() method

- Ensure that debug messages use virt_to_phys() when displaying
  "hardware" addresses

Signed-off-by: Michael Brown <mcb30@ipxe.org>

1 files changed, 7 insertions, 23 deletions

diff --git a/src/drivers/net/intelxl.h b/src/drivers/net/intelxl.h
index cffc0da96..a4a776d28 100644
--- a/src/drivers/net/intelxl.h
+++ b/src/drivers/net/intelxl.h
@@ -1030,24 +1030,6 @@ union intelxl_receive_address {
 	uint8_t raw[ETH_ALEN];
 };
 
-/** Transmit ring */
-struct intelxl_tx_ring {
-	/** Descriptor ring */
-	struct intelxl_ring ring;
-	/** DMA mappings */
-	struct dma_mapping map[INTELXL_TX_NUM_DESC];
-};
-
-/** Receive ring */
-struct intelxl_rx_ring {
-	/** Descriptor ring */
-	struct intelxl_ring ring;
-	/** I/O buffers */
-	struct io_buffer *iobuf[INTELXL_RX_NUM_DESC];
-	/** DMA mappings */
-	struct dma_mapping map[INTELXL_RX_NUM_DESC];
-};
-
 /** MSI-X interrupt */
 struct intelxl_msix {
 	/** PCI capability */
@@ -1098,10 +1080,12 @@ struct intelxl_nic {
 	/** Current VF event data buffer */
 	union intelxl_admin_buffer vbuf;
 
-	/** Transmit ring */
-	struct intelxl_tx_ring tx;
-	/** Receive ring */
-	struct intelxl_rx_ring rx;
+	/** Transmit descriptor ring */
+	struct intelxl_ring tx;
+	/** Receive descriptor ring */
+	struct intelxl_ring rx;
+	/** Receive I/O buffers */
+	struct io_buffer *rx_iobuf[INTELXL_RX_NUM_DESC];
 };
 
 extern int intelxl_msix_enable ( struct intelxl_nic *intelxl,
@@ -1121,7 +1105,7 @@ extern int intelxl_alloc_ring ( struct intelxl_nic *intelxl,
 				struct intelxl_ring *ring );
 extern void intelxl_free_ring ( struct intelxl_nic *intelxl,
 				struct intelxl_ring *ring );
-extern void intelxl_flush ( struct intelxl_nic *intelxl );
+extern void intelxl_empty_rx ( struct intelxl_nic *intelxl );
 extern int intelxl_transmit ( struct net_device *netdev,
 			      struct io_buffer *iobuf );
 extern void intelxl_poll ( struct net_device *netdev );