amd-xgbe: Fix to ensure dependent features are toggled with RX checksum offload

commit f04dd30f1bef1ed2e74a4050af6e5e5e3869bac3 upstream.

According to the XGMAC specification, enabling features such as Layer 3
and Layer 4 Packet Filtering, Split Header and Virtualized Network support
automatically selects the IPC Full Checksum Offload Engine on the receive
side.

When RX checksum offload is disabled, these dependent features must also
be disabled to prevent abnormal behavior caused by mismatched feature
dependencies.

Ensure that toggling RX checksum offload (disabling or enabling) properly
disables or enables all dependent features, maintaining consistent and
expected behavior in the network device.

Cc: stable@vger.kernel.org
Fixes: 1a510ccf5869 ("amd-xgbe: Add support for VXLAN offload capabilities")
Signed-off-by: Vishal Badole <Vishal.Badole@amd.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20250424130248.428865-1-Vishal.Badole@amd.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
index 230726d7b74f6343e7d5262e1a02ba455fc0b713..d41b58fad37bbf216c35ed05ef0261e30080aefd 100644 (file)
--- a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
@@ -373,8 +373,13 @@ static int xgbe_map_rx_buffer(struct xgbe_prv_data *pdata,
        }
 
        /* Set up the header page info */
-       xgbe_set_buffer_data(&rdata->rx.hdr, &ring->rx_hdr_pa,
-                            XGBE_SKB_ALLOC_SIZE);
+       if (pdata->netdev->features & NETIF_F_RXCSUM) {
+               xgbe_set_buffer_data(&rdata->rx.hdr, &ring->rx_hdr_pa,
+                                    XGBE_SKB_ALLOC_SIZE);
+       } else {
+               xgbe_set_buffer_data(&rdata->rx.hdr, &ring->rx_hdr_pa,
+                                    pdata->rx_buf_size);
+       }
 
        /* Set up the buffer page info */
        xgbe_set_buffer_data(&rdata->rx.buf, &ring->rx_buf_pa,

diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
index f393228d41c7be7756551dbc353227b205e2c78e..f1b0fb02b3cd14fd78424b937d59fa4ec0b513d1 100644 (file)
--- a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
@@ -320,6 +320,18 @@ static void xgbe_config_sph_mode(struct xgbe_prv_data *pdata)
        XGMAC_IOWRITE_BITS(pdata, MAC_RCR, HDSMS, XGBE_SPH_HDSMS_SIZE);
 }
 
+static void xgbe_disable_sph_mode(struct xgbe_prv_data *pdata)
+{
+       unsigned int i;
+
+       for (i = 0; i < pdata->channel_count; i++) {
+               if (!pdata->channel[i]->rx_ring)
+                       break;
+
+               XGMAC_DMA_IOWRITE_BITS(pdata->channel[i], DMA_CH_CR, SPH, 0);
+       }
+}
+
 static int xgbe_write_rss_reg(struct xgbe_prv_data *pdata, unsigned int type,
                              unsigned int index, unsigned int val)
 {
@@ -3545,8 +3557,12 @@ static int xgbe_init(struct xgbe_prv_data *pdata)
        xgbe_config_tx_coalesce(pdata);
        xgbe_config_rx_buffer_size(pdata);
        xgbe_config_tso_mode(pdata);
-       xgbe_config_sph_mode(pdata);
-       xgbe_config_rss(pdata);
+
+       if (pdata->netdev->features & NETIF_F_RXCSUM) {
+               xgbe_config_sph_mode(pdata);
+               xgbe_config_rss(pdata);
+       }
+
        desc_if->wrapper_tx_desc_init(pdata);
        desc_if->wrapper_rx_desc_init(pdata);
        xgbe_enable_dma_interrupts(pdata);
@@ -3702,5 +3718,9 @@ void xgbe_init_function_ptrs_dev(struct xgbe_hw_if *hw_if)
        hw_if->disable_vxlan = xgbe_disable_vxlan;
        hw_if->set_vxlan_id = xgbe_set_vxlan_id;
 
+       /* For Split Header*/
+       hw_if->enable_sph = xgbe_config_sph_mode;
+       hw_if->disable_sph = xgbe_disable_sph_mode;
+
        DBGPR("<--xgbe_init_function_ptrs\n");
 }

diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
index 6b73648b3779368f8a01cbc95f8afb88bc07786d..34d45cebefb5d3b938c6be484dae80a6d0ef28f3 100644 (file)
--- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
@@ -2257,10 +2257,17 @@ static int xgbe_set_features(struct net_device *netdev,
        if (ret)
                return ret;
 
-       if ((features & NETIF_F_RXCSUM) && !rxcsum)
+       if ((features & NETIF_F_RXCSUM) && !rxcsum) {
+               hw_if->enable_sph(pdata);
+               hw_if->enable_vxlan(pdata);
                hw_if->enable_rx_csum(pdata);
-       else if (!(features & NETIF_F_RXCSUM) && rxcsum)
+               schedule_work(&pdata->restart_work);
+       } else if (!(features & NETIF_F_RXCSUM) && rxcsum) {
+               hw_if->disable_sph(pdata);
+               hw_if->disable_vxlan(pdata);
                hw_if->disable_rx_csum(pdata);
+               schedule_work(&pdata->restart_work);
+       }
 
        if ((features & NETIF_F_HW_VLAN_CTAG_RX) && !rxvlan)
                hw_if->enable_rx_vlan_stripping(pdata);

diff --git a/drivers/net/ethernet/amd/xgbe/xgbe.h b/drivers/net/ethernet/amd/xgbe/xgbe.h
index ad136ed493ed1f2266c93e85c216ed84197dac54..173f4dad470f556a642e3d62c48be41de55a4aab 100644 (file)
--- a/drivers/net/ethernet/amd/xgbe/xgbe.h
+++ b/drivers/net/ethernet/amd/xgbe/xgbe.h
@@ -865,6 +865,10 @@ struct xgbe_hw_if {
        void (*enable_vxlan)(struct xgbe_prv_data *);
        void (*disable_vxlan)(struct xgbe_prv_data *);
        void (*set_vxlan_id)(struct xgbe_prv_data *);
+
+       /* For Split Header */
+       void (*enable_sph)(struct xgbe_prv_data *pdata);
+       void (*disable_sph)(struct xgbe_prv_data *pdata);
 };
 
 /* This structure represents implementation specific routines for an