net/bnxt: fix link status when port is stopped

[dpdk.git] / drivers / net / enetc / enetc_ethdev.c

diff --git a/drivers/net/enetc/enetc_ethdev.c b/drivers/net/enetc/enetc_ethdev.c
index 1b567f0..1b4337b 100644 (file)
--- a/drivers/net/enetc/enetc_ethdev.c
+++ b/drivers/net/enetc/enetc_ethdev.c
@@ -19,6 +19,9 @@ enetc_dev_start(struct rte_eth_dev *dev)
        uint32_t val;
 
        PMD_INIT_FUNC_TRACE();
+       if (hw->device_id == ENETC_DEV_ID_VF)
+               return 0;
+
        val = enetc_port_rd(enetc_hw, ENETC_PM0_CMD_CFG);
        enetc_port_wr(enetc_hw, ENETC_PM0_CMD_CFG,
                      val | ENETC_PM0_TX_EN | ENETC_PM0_RX_EN);
@@ -55,6 +58,9 @@ enetc_dev_stop(struct rte_eth_dev *dev)
 
        PMD_INIT_FUNC_TRACE();
        dev->data->dev_started = 0;
+       if (hw->device_id == ENETC_DEV_ID_VF)
+               return 0;
+
        /* Disable port */
        val = enetc_port_rd(enetc_hw, ENETC_PMR);
        enetc_port_wr(enetc_hw, ENETC_PMR, val & (~ENETC_PMR_EN));
@@ -100,27 +106,27 @@ enetc_link_update(struct rte_eth_dev *dev, int wait_to_complete __rte_unused)
        status = enetc_port_rd(enetc_hw, ENETC_PM0_STATUS);
 
        if (status & ENETC_LINK_MODE)
-               link.link_duplex = ETH_LINK_FULL_DUPLEX;
+               link.link_duplex = RTE_ETH_LINK_FULL_DUPLEX;
        else
-               link.link_duplex = ETH_LINK_HALF_DUPLEX;
+               link.link_duplex = RTE_ETH_LINK_HALF_DUPLEX;
 
        if (status & ENETC_LINK_STATUS)
-               link.link_status = ETH_LINK_UP;
+               link.link_status = RTE_ETH_LINK_UP;
        else
-               link.link_status = ETH_LINK_DOWN;
+               link.link_status = RTE_ETH_LINK_DOWN;
 
        switch (status & ENETC_LINK_SPEED_MASK) {
        case ENETC_LINK_SPEED_1G:
-               link.link_speed = ETH_SPEED_NUM_1G;
+               link.link_speed = RTE_ETH_SPEED_NUM_1G;
                break;
 
        case ENETC_LINK_SPEED_100M:
-               link.link_speed = ETH_SPEED_NUM_100M;
+               link.link_speed = RTE_ETH_SPEED_NUM_100M;
                break;
 
        default:
        case ENETC_LINK_SPEED_10M:
-               link.link_speed = ETH_SPEED_NUM_10M;
+               link.link_speed = RTE_ETH_SPEED_NUM_10M;
        }
 
        return rte_eth_linkstatus_set(dev, &link);
@@ -160,11 +166,20 @@ enetc_hardware_init(struct enetc_eth_hw *hw)
        /* Enabling Station Interface */
        enetc_wr(enetc_hw, ENETC_SIMR, ENETC_SIMR_EN);
 
-       *mac = (uint32_t)enetc_port_rd(enetc_hw, ENETC_PSIPMAR0(0));
-       high_mac = (uint32_t)*mac;
-       mac++;
-       *mac = (uint16_t)enetc_port_rd(enetc_hw, ENETC_PSIPMAR1(0));
-       low_mac = (uint16_t)*mac;
+
+       if (hw->device_id == ENETC_DEV_ID_VF) {
+               *mac = (uint32_t)enetc_rd(enetc_hw, ENETC_SIPMAR0);
+               high_mac = (uint32_t)*mac;
+               mac++;
+               *mac = (uint32_t)enetc_rd(enetc_hw, ENETC_SIPMAR1);
+               low_mac = (uint16_t)*mac;
+       } else {
+               *mac = (uint32_t)enetc_port_rd(enetc_hw, ENETC_PSIPMAR0(0));
+               high_mac = (uint32_t)*mac;
+               mac++;
+               *mac = (uint16_t)enetc_port_rd(enetc_hw, ENETC_PSIPMAR1(0));
+               low_mac = (uint16_t)*mac;
+       }
 
        if ((high_mac | low_mac) == 0) {
                char *first_byte;
@@ -207,10 +222,10 @@ enetc_dev_infos_get(struct rte_eth_dev *dev __rte_unused,
        dev_info->max_tx_queues = MAX_TX_RINGS;
        dev_info->max_rx_pktlen = ENETC_MAC_MAXFRM_SIZE;
        dev_info->rx_offload_capa =
-               (DEV_RX_OFFLOAD_IPV4_CKSUM |
-                DEV_RX_OFFLOAD_UDP_CKSUM |
-                DEV_RX_OFFLOAD_TCP_CKSUM |
-                DEV_RX_OFFLOAD_KEEP_CRC);
+               (RTE_ETH_RX_OFFLOAD_IPV4_CKSUM |
+                RTE_ETH_RX_OFFLOAD_UDP_CKSUM |
+                RTE_ETH_RX_OFFLOAD_TCP_CKSUM |
+                RTE_ETH_RX_OFFLOAD_KEEP_CRC);
 
        return 0;
 }
@@ -463,7 +478,7 @@ enetc_rx_queue_setup(struct rte_eth_dev *dev,
                               RTE_ETH_QUEUE_STATE_STOPPED;
        }
 
-       rx_ring->crc_len = (uint8_t)((rx_offloads & DEV_RX_OFFLOAD_KEEP_CRC) ?
+       rx_ring->crc_len = (uint8_t)((rx_offloads & RTE_ETH_RX_OFFLOAD_KEEP_CRC) ?
                                     RTE_ETHER_CRC_LEN : 0);
 
        return 0;
@@ -705,7 +720,7 @@ enetc_dev_configure(struct rte_eth_dev *dev)
        enetc_port_wr(enetc_hw, ENETC_PTCMSDUR(0), ENETC_MAC_MAXFRM_SIZE);
        enetc_port_wr(enetc_hw, ENETC_PTXMBAR, 2 * ENETC_MAC_MAXFRM_SIZE);
 
-       if (rx_offloads & DEV_RX_OFFLOAD_KEEP_CRC) {
+       if (rx_offloads & RTE_ETH_RX_OFFLOAD_KEEP_CRC) {
                int config;
 
                config = enetc_port_rd(enetc_hw, ENETC_PM0_CMD_CFG);
@@ -713,10 +728,10 @@ enetc_dev_configure(struct rte_eth_dev *dev)
                enetc_port_wr(enetc_hw, ENETC_PM0_CMD_CFG, config);
        }
 
-       if (rx_offloads & DEV_RX_OFFLOAD_IPV4_CKSUM)
+       if (rx_offloads & RTE_ETH_RX_OFFLOAD_IPV4_CKSUM)
                checksum &= ~L3_CKSUM;
 
-       if (rx_offloads & (DEV_RX_OFFLOAD_UDP_CKSUM | DEV_RX_OFFLOAD_TCP_CKSUM))
+       if (rx_offloads & (RTE_ETH_RX_OFFLOAD_UDP_CKSUM | RTE_ETH_RX_OFFLOAD_TCP_CKSUM))
                checksum &= ~L4_CKSUM;
 
        enetc_port_wr(enetc_hw, ENETC_PAR_PORT_CFG, checksum);