1 files changed, 29 insertions, 55 deletions

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
index c0e6ab42e0e1..732b1e6ecc43 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
@@ -1,30 +1,5 @@
-/*******************************************************************************
-
-  Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2016 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <linux.nics@intel.com>
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 1999 - 2018 Intel Corporation. */
 
 /* ethtool support for ixgbe */
 
@@ -161,6 +136,8 @@ static const char ixgbe_gstrings_test[][ETH_GSTRING_LEN] = {
 static const char ixgbe_priv_flags_strings[][ETH_GSTRING_LEN] = {
 #define IXGBE_PRIV_FLAGS_LEGACY_RX      BIT(0)
         "legacy-rx",
+#define IXGBE_PRIV_FLAGS_VF_IPSEC_EN    BIT(1)
+        "vf-ipsec",
 };
 
 #define IXGBE_PRIV_FLAGS_STR_LEN ARRAY_SIZE(ixgbe_priv_flags_strings)
@@ -536,7 +513,7 @@ static void ixgbe_set_msglevel(struct net_device *netdev, u32 data)
 
 static int ixgbe_get_regs_len(struct net_device *netdev)
 {
-#define IXGBE_REGS_LEN  1139
+#define IXGBE_REGS_LEN  1145
         return IXGBE_REGS_LEN * sizeof(u32);
 }
 
@@ -899,6 +876,14 @@ static void ixgbe_get_regs(struct net_device *netdev,
         /* X540 specific DCB registers  */
         regs_buff[1137] = IXGBE_READ_REG(hw, IXGBE_RTTQCNCR);
         regs_buff[1138] = IXGBE_READ_REG(hw, IXGBE_RTTQCNTG);
+
+        /* Security config registers */
+        regs_buff[1139] = IXGBE_READ_REG(hw, IXGBE_SECTXCTRL);
+        regs_buff[1140] = IXGBE_READ_REG(hw, IXGBE_SECTXSTAT);
+        regs_buff[1141] = IXGBE_READ_REG(hw, IXGBE_SECTXBUFFAF);
+        regs_buff[1142] = IXGBE_READ_REG(hw, IXGBE_SECTXMINIFG);
+        regs_buff[1143] = IXGBE_READ_REG(hw, IXGBE_SECRXCTRL);
+        regs_buff[1144] = IXGBE_READ_REG(hw, IXGBE_SECRXSTAT);
 }
 
 static int ixgbe_get_eeprom_len(struct net_device *netdev)
@@ -926,7 +911,7 @@ static int ixgbe_get_eeprom(struct net_device *netdev,
         last_word = (eeprom->offset + eeprom->len - 1) >> 1;
         eeprom_len = last_word - first_word + 1;
 
-        eeprom_buff = kmalloc(sizeof(u16) * eeprom_len, GFP_KERNEL);
+        eeprom_buff = kmalloc_array(eeprom_len, sizeof(u16), GFP_KERNEL);
         if (!eeprom_buff)
                 return -ENOMEM;
 
@@ -1088,7 +1073,7 @@ static int ixgbe_set_ringparam(struct net_device *netdev,
         /* allocate temporary buffer to store rings in */
         i = max_t(int, adapter->num_tx_queues + adapter->num_xdp_queues,
                   adapter->num_rx_queues);
-        temp_ring = vmalloc(i * sizeof(struct ixgbe_ring));
+        temp_ring = vmalloc(array_size(i, sizeof(struct ixgbe_ring)));
 
         if (!temp_ring) {
                 err = -ENOMEM;
@@ -1715,35 +1700,17 @@ static int ixgbe_intr_test(struct ixgbe_adapter *adapter, u64 *data)
 
 static void ixgbe_free_desc_rings(struct ixgbe_adapter *adapter)
 {
-        struct ixgbe_ring *tx_ring = &adapter->test_tx_ring;
-        struct ixgbe_ring *rx_ring = &adapter->test_rx_ring;
-        struct ixgbe_hw *hw = &adapter->hw;
-        u32 reg_ctl;
-
-        /* shut down the DMA engines now so they can be reinitialized later */
+        /* Shut down the DMA engines now so they can be reinitialized later,
+         * since the test rings and normally used rings should overlap on
+         * queue 0 we can just use the standard disable Rx/Tx calls and they
+         * will take care of disabling the test rings for us.
+         */
 
         /* first Rx */
-        hw->mac.ops.disable_rx(hw);
-        ixgbe_disable_rx_queue(adapter, rx_ring);
+        ixgbe_disable_rx(adapter);
 
         /* now Tx */
-        reg_ctl = IXGBE_READ_REG(hw, IXGBE_TXDCTL(tx_ring->reg_idx));
-        reg_ctl &= ~IXGBE_TXDCTL_ENABLE;
-        IXGBE_WRITE_REG(hw, IXGBE_TXDCTL(tx_ring->reg_idx), reg_ctl);
-
-        switch (hw->mac.type) {
-        case ixgbe_mac_82599EB:
-        case ixgbe_mac_X540:
-        case ixgbe_mac_X550:
-        case ixgbe_mac_X550EM_x:
-        case ixgbe_mac_x550em_a:
-                reg_ctl = IXGBE_READ_REG(hw, IXGBE_DMATXCTL);
-                reg_ctl &= ~IXGBE_DMATXCTL_TE;
-                IXGBE_WRITE_REG(hw, IXGBE_DMATXCTL, reg_ctl);
-                break;
-        default:
-                break;
-        }
+        ixgbe_disable_tx(adapter);
 
         ixgbe_reset(adapter);
 
@@ -3444,6 +3411,9 @@ static u32 ixgbe_get_priv_flags(struct net_device *netdev)
         if (adapter->flags2 & IXGBE_FLAG2_RX_LEGACY)
                 priv_flags |= IXGBE_PRIV_FLAGS_LEGACY_RX;
 
+        if (adapter->flags2 & IXGBE_FLAG2_VF_IPSEC_ENABLED)
+                priv_flags |= IXGBE_PRIV_FLAGS_VF_IPSEC_EN;
+
         return priv_flags;
 }
 
@@ -3456,6 +3426,10 @@ static int ixgbe_set_priv_flags(struct net_device *netdev, u32 priv_flags)
         if (priv_flags & IXGBE_PRIV_FLAGS_LEGACY_RX)
                 flags2 |= IXGBE_FLAG2_RX_LEGACY;
 
+        flags2 &= ~IXGBE_FLAG2_VF_IPSEC_ENABLED;
+        if (priv_flags & IXGBE_PRIV_FLAGS_VF_IPSEC_EN)
+                flags2 |= IXGBE_FLAG2_VF_IPSEC_ENABLED;
+
         if (flags2 != adapter->flags2) {
                 adapter->flags2 = flags2;