[PATCH net 1/4] eth: fbnic: set FBNIC_QUEUE_RDE_CTL0_EN_HDR_SPLIT on RDE_CTL0

[Bobby Eshleman]

From: Bobby Eshleman <bobbyeshle...@meta.com>

Fix EN_HDR_SPLIT configuration by writing the field to RDE_CTL0 instead
of RDE_CTL1.

Because drop mode configuration and header splitting enablement both use
RDE_CTL0, we consolidate these configurations into the single function
fbnic_config_drop_mode.

Fixes: 2b30fc01a6c7 ("eth: fbnic: Add support for HDS configuration")
Signed-off-by: Bobby Eshleman <bobbyeshle...@meta.com>
Acked-by: Mohsin Bashir <mohsin.ba...@gmail.com>
---
 drivers/net/ethernet/meta/fbnic/fbnic_txrx.c | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/drivers/net/ethernet/meta/fbnic/fbnic_txrx.c 
b/drivers/net/ethernet/meta/fbnic/fbnic_txrx.c
index 13d508ce637f..e119526fce14 100644
--- a/drivers/net/ethernet/meta/fbnic/fbnic_txrx.c
+++ b/drivers/net/ethernet/meta/fbnic/fbnic_txrx.c
@@ -2575,7 +2575,8 @@ static void fbnic_enable_bdq(struct fbnic_ring *hpq, 
struct fbnic_ring *ppq)
 }
 
 static void fbnic_config_drop_mode_rcq(struct fbnic_napi_vector *nv,
-                                      struct fbnic_ring *rcq, bool tx_pause)
+                                      struct fbnic_ring *rcq, bool tx_pause,
+                                      bool hdr_split)
 {
        struct fbnic_net *fbn = netdev_priv(nv->napi.dev);
        u32 drop_mode, rcq_ctl;
@@ -2588,22 +2589,26 @@ static void fbnic_config_drop_mode_rcq(struct 
fbnic_napi_vector *nv,
        /* Specify packet layout */
        rcq_ctl = FIELD_PREP(FBNIC_QUEUE_RDE_CTL0_DROP_MODE_MASK, drop_mode) |
            FIELD_PREP(FBNIC_QUEUE_RDE_CTL0_MIN_HROOM_MASK, FBNIC_RX_HROOM) |
-           FIELD_PREP(FBNIC_QUEUE_RDE_CTL0_MIN_TROOM_MASK, FBNIC_RX_TROOM);
+           FIELD_PREP(FBNIC_QUEUE_RDE_CTL0_MIN_TROOM_MASK, FBNIC_RX_TROOM) |
+           FIELD_PREP(FBNIC_QUEUE_RDE_CTL0_EN_HDR_SPLIT, hdr_split);
 
        fbnic_ring_wr32(rcq, FBNIC_QUEUE_RDE_CTL0, rcq_ctl);
 }
 
-void fbnic_config_drop_mode(struct fbnic_net *fbn, bool tx_pause)
+void fbnic_config_drop_mode(struct fbnic_net *fbn, bool txp)
 {
+       bool hds;
        int i, t;
 
+       hds = fbn->hds_thresh < FBNIC_HDR_BYTES_MIN;
+
        for (i = 0; i < fbn->num_napi; i++) {
                struct fbnic_napi_vector *nv = fbn->napi[i];
 
                for (t = 0; t < nv->rxt_count; t++) {
                        struct fbnic_q_triad *qt = &nv->qt[nv->txt_count + t];
 
-                       fbnic_config_drop_mode_rcq(nv, &qt->cmpl, tx_pause);
+                       fbnic_config_drop_mode_rcq(nv, &qt->cmpl, txp, hds);
                }
        }
 }
@@ -2654,20 +2659,18 @@ static void fbnic_enable_rcq(struct fbnic_napi_vector 
*nv,
 {
        struct fbnic_net *fbn = netdev_priv(nv->napi.dev);
        u32 log_size = fls(rcq->size_mask);
-       u32 hds_thresh = fbn->hds_thresh;
        u32 rcq_ctl = 0;
-
-       fbnic_config_drop_mode_rcq(nv, rcq, fbn->tx_pause);
+       bool hdr_split;
+       u32 hds_thresh;
 
        /* Force lower bound on MAX_HEADER_BYTES. Below this, all frames should
         * be split at L4. It would also result in the frames being split at
         * L2/L3 depending on the frame size.
         */
-       if (fbn->hds_thresh < FBNIC_HDR_BYTES_MIN) {
-               rcq_ctl = FBNIC_QUEUE_RDE_CTL0_EN_HDR_SPLIT;
-               hds_thresh = FBNIC_HDR_BYTES_MIN;
-       }
+       hdr_split = fbn->hds_thresh < FBNIC_HDR_BYTES_MIN;
+       fbnic_config_drop_mode_rcq(nv, rcq, fbn->tx_pause, hdr_split);
 
+       hds_thresh = max(fbn->hds_thresh, FBNIC_HDR_BYTES_MIN);
        rcq_ctl |= FIELD_PREP(FBNIC_QUEUE_RDE_CTL1_PADLEN_MASK, FBNIC_RX_PAD) |
                   FIELD_PREP(FBNIC_QUEUE_RDE_CTL1_MAX_HDR_MASK, hds_thresh) |
                   FIELD_PREP(FBNIC_QUEUE_RDE_CTL1_PAYLD_OFF_MASK,

-- 
2.47.3