fm10k: don't clear the RXQCTL register when enabling or disabling queues

Ensure that other bits in the RXQCTL register do not get cleared. This
ensures that bits related to queue ownership are maintained.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Krishneil Singh <Krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Orabug: 25394529
(cherry picked from commit c689eff124cb231d91777a447fa05b30939da7b1)
Signed-off-by: Jack Vogel <jack.vogel@oracle.com>

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
index ff749d192924ff5746d541adc829775bd840b114..d5902239fce2d164652d045296adab14229f1655 100644 (file)
--- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
@@ -738,15 +738,15 @@ static void fm10k_configure_rx_ring(struct fm10k_intfc *interface,
        u64 rdba = ring->dma;
        struct fm10k_hw *hw = &interface->hw;
        u32 size = ring->count * sizeof(union fm10k_rx_desc);
-       u32 rxqctl = FM10K_RXQCTL_ENABLE | FM10K_RXQCTL_PF;
-       u32 rxdctl = FM10K_RXDCTL_WRITE_BACK_MIN_DELAY;
+       u32 rxqctl, rxdctl = FM10K_RXDCTL_WRITE_BACK_MIN_DELAY;
        u32 srrctl = FM10K_SRRCTL_BUFFER_CHAINING_EN;
        u32 rxint = FM10K_INT_MAP_DISABLE;
        u8 rx_pause = interface->rx_pause;
        u8 reg_idx = ring->reg_idx;
 
        /* disable queue to avoid issues while updating state */
-       fm10k_write_reg(hw, FM10K_RXQCTL(reg_idx), 0);
+       rxqctl = fm10k_read_reg(hw, FM10K_RXQCTL(reg_idx));
+       rxqctl &= ~FM10K_RXQCTL_ENABLE;
        fm10k_write_flush(hw);
 
        /* possible poll here to verify ring resources have been cleaned */
@@ -801,6 +801,8 @@ static void fm10k_configure_rx_ring(struct fm10k_intfc *interface,
        fm10k_write_reg(hw, FM10K_RXINT(reg_idx), rxint);
 
        /* enable queue */
+       rxqctl = fm10k_read_reg(hw, FM10K_RXQCTL(reg_idx));
+       rxqctl |= FM10K_RXQCTL_ENABLE;
        fm10k_write_reg(hw, FM10K_RXQCTL(reg_idx), rxqctl);
 
        /* place buffers on ring for receive data */