ice: Determine descriptor count and ring size based on PAGE_SIZE

Currently we set the default number of Tx and Rx descriptors to 128 by
default. For Rx this amounts to a full page (assuming 4K pages) because
each Rx descriptor is 32 Bytes, but for Tx it only amounts to a half
page because each Tx descriptor is 16 Bytes (assuming 4K pages).
Instead of assuming 4K pages, determine the ring size and the number of
descriptors for Tx and Rx based on a calculation using the PAGE_SIZE,
ICE_MAX_NUM_DESC, and ICE_REQ_DESC_MULTIPLE. This change is being made
to improve the performance of the driver when using the default
settings.

Signed-off-by: Brett Creeley <brett.creeley@intel.com>
Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/net/ethernet/intel/ice/ice_txrx.c b/drivers/net/ethernet/intel/ice/ice_txrx.c
index c289d97f477d..fad308c936b2 100644
--- a/drivers/net/ethernet/intel/ice/ice_txrx.c
+++ b/drivers/net/ethernet/intel/ice/ice_txrx.c
@@ -236,9 +236,9 @@ int ice_setup_tx_ring(struct ice_ring *tx_ring)
         if (!tx_ring->tx_buf)
                 return -ENOMEM;
 
-        /* round up to nearest 4K */
+        /* round up to nearest page */
         tx_ring->size = ALIGN(tx_ring->count * sizeof(struct ice_tx_desc),
-                              4096);
+                              PAGE_SIZE);
         tx_ring->desc = dmam_alloc_coherent(dev, tx_ring->size, &tx_ring->dma,
                                             GFP_KERNEL);
         if (!tx_ring->desc) {
@@ -339,9 +339,9 @@ int ice_setup_rx_ring(struct ice_ring *rx_ring)
         if (!rx_ring->rx_buf)
                 return -ENOMEM;
 
-        /* round up to nearest 4K */
-        rx_ring->size = rx_ring->count * sizeof(union ice_32byte_rx_desc);
-        rx_ring->size = ALIGN(rx_ring->size, 4096);
+        /* round up to nearest page */
+        rx_ring->size = ALIGN(rx_ring->count * sizeof(union ice_32byte_rx_desc),
+                              PAGE_SIZE);
         rx_ring->desc = dmam_alloc_coherent(dev, rx_ring->size, &rx_ring->dma,
                                             GFP_KERNEL);
         if (!rx_ring->desc) {