From: Michael Brown <mcb30@ipxe.org>
Date: Mon, 29 Sep 2025 11:04:13 +0000 (+0100)
Subject: [gve] Add concept of a queue page list base device address
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9f554ec9d07db63e3132b31df5f5ae68a0debe07;p=thirdparty%2Fipxe.git

[gve] Add concept of a queue page list base device address

Allow for the existence of a queue page list where the base device
address is non-zero, as will be the case for the raw DMA addressing
(RDA) operating mode.

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

diff --git a/src/drivers/net/gve.c b/src/drivers/net/gve.c
index 62e02f050..d1f129e2e 100644
--- a/src/drivers/net/gve.c
+++ b/src/drivers/net/gve.c
@@ -848,14 +848,14 @@ static void gve_free_qpl ( struct gve_nic *nic __unused,
 }
 
 /**
- * Get buffer address (within queue page list address space)
+ * Get buffer offset (within queue page list allocation)
  *
  * @v queue		Descriptor queue
  * @v index		Buffer index
  * @ret addr		Buffer address within queue page list address space
  */
 static inline __attribute__ (( always_inline)) size_t
-gve_address ( struct gve_queue *queue, unsigned int index ) {
+gve_offset ( struct gve_queue *queue, unsigned int index ) {
 
 	/* We allocate sufficient pages for the maximum fill level of
 	 * buffers, and reuse the pages in strict rotation as we
@@ -864,6 +864,20 @@ gve_address ( struct gve_queue *queue, unsigned int index ) {
 	return ( ( index & ( queue->fill - 1 ) ) * GVE_BUF_SIZE );
 }
 
+/**
+ * Get buffer address (within queue page list address space)
+ *
+ * @v queue		Descriptor queue
+ * @v index		Buffer index
+ * @ret addr		Buffer address within queue page list address space
+ */
+static inline __attribute__ (( always_inline)) physaddr_t
+gve_address ( struct gve_queue *queue, unsigned int index ) {
+
+	/* Pages are allocated as a single contiguous block */
+	return ( queue->qpl.base + gve_offset ( queue, index ) );
+}
+
 /**
  * Get buffer address
  *
@@ -874,8 +888,8 @@ gve_address ( struct gve_queue *queue, unsigned int index ) {
 static inline __attribute__ (( always_inline )) void *
 gve_buffer ( struct gve_queue *queue, unsigned int index ) {
 
-	/* Pages are currently allocated as a single contiguous block */
-	return ( queue->qpl.data + gve_address ( queue, index ) );
+	/* Pages are allocated as a single contiguous block */
+	return ( queue->qpl.data + gve_offset ( queue, index ) );
 }
 
 /**
@@ -1326,7 +1340,7 @@ static int gve_transmit ( struct net_device *netdev, struct io_buffer *iobuf ) {
 		DBGC2 ( gve, "GVE %p TX %#04x %#02x:%#02x len %#04x/%#04x at "
 			"%#08zx\n", gve, index, desc->type, desc->count,
 			be16_to_cpu ( desc->len ), be16_to_cpu ( desc->total ),
-			gve_address ( tx, index ) );
+			gve_offset ( tx, index ) );
 	}
 	assert ( ( tx->prod - tx->cons ) <= tx->fill );
 
@@ -1401,7 +1415,7 @@ static void gve_poll_rx ( struct net_device *netdev ) {
 		len = be16_to_cpu ( cmplt->len );
 		DBGC2 ( gve, "GVE %p RX %#04x %#02x:%#02x len %#04zx at "
 			"%#08zx\n", gve, index, cmplt->seq, cmplt->flags,
-			len, gve_address ( rx, index ) );
+			len, gve_offset ( rx, index ) );
 
 		/* Accumulate a complete packet */
 		if ( cmplt->flags & GVE_RXF_ERROR ) {
diff --git a/src/drivers/net/gve.h b/src/drivers/net/gve.h
index 333839be6..e3d6c3f76 100644
--- a/src/drivers/net/gve.h
+++ b/src/drivers/net/gve.h
@@ -524,6 +524,13 @@ struct gve_qpl {
 	unsigned int count;
 	/** Queue page list ID */
 	unsigned int id;
+	/** Queue page list base device address
+	 *
+	 * This will be zero if queue page list addressing is in use,
+	 * or the DMA address of the first page if raw DMA addressing
+	 * is in use.
+	 */
+	physaddr_t base;
 };
 
 /**