net/sfc: fix main MAC address handling

[dpdk.git] / drivers / net / sfc / sfc_port.c

diff --git a/drivers/net/sfc/sfc_port.c b/drivers/net/sfc/sfc_port.c
index d4498fa..5254394 100644 (file)
--- a/drivers/net/sfc/sfc_port.c
+++ b/drivers/net/sfc/sfc_port.c
@@ -1,5 +1,7 @@
 /*-
- * Copyright (c) 2016 Solarflare Communications Inc.
+ *   BSD LICENSE
+ *
+ * Copyright (c) 2016-2017 Solarflare Communications Inc.
  * All rights reserved.
  *
  * This software was jointly developed between OKTET Labs (under contract
@@ -149,6 +151,7 @@ sfc_port_start(struct sfc_adapter *sa)
        uint32_t phy_adv_cap;
        const uint32_t phy_pause_caps =
                ((1u << EFX_PHY_CAP_PAUSE) | (1u << EFX_PHY_CAP_ASYM));
+       unsigned int i;
 
        sfc_log_init(sa, "entry");
 
@@ -184,26 +187,29 @@ sfc_port_start(struct sfc_adapter *sa)
        if (rc != 0)
                goto fail_mac_pdu_set;
 
-       sfc_log_init(sa, "set MAC address");
-       rc = efx_mac_addr_set(sa->nic,
-                             sa->eth_dev->data->mac_addrs[0].addr_bytes);
-       if (rc != 0)
-               goto fail_mac_addr_set;
-
-       sfc_log_init(sa, "set MAC filters");
-       port->promisc = (sa->eth_dev->data->promiscuous != 0) ?
-                       B_TRUE : B_FALSE;
-       port->allmulti = (sa->eth_dev->data->all_multicast != 0) ?
-                        B_TRUE : B_FALSE;
-       rc = sfc_set_rx_mode(sa);
-       if (rc != 0)
-               goto fail_mac_filter_set;
+       if (!port->isolated) {
+               struct ether_addr *addr = &port->default_mac_addr;
 
-       sfc_log_init(sa, "set multicast address list");
-       rc = efx_mac_multicast_list_set(sa->nic, port->mcast_addrs,
-                                       port->nb_mcast_addrs);
-       if (rc != 0)
-               goto fail_mcast_address_list_set;
+               sfc_log_init(sa, "set MAC address");
+               rc = efx_mac_addr_set(sa->nic, addr->addr_bytes);
+               if (rc != 0)
+                       goto fail_mac_addr_set;
+
+               sfc_log_init(sa, "set MAC filters");
+               port->promisc = (sa->eth_dev->data->promiscuous != 0) ?
+                               B_TRUE : B_FALSE;
+               port->allmulti = (sa->eth_dev->data->all_multicast != 0) ?
+                                B_TRUE : B_FALSE;
+               rc = sfc_set_rx_mode(sa);
+               if (rc != 0)
+                       goto fail_mac_filter_set;
+
+               sfc_log_init(sa, "set multicast address list");
+               rc = efx_mac_multicast_list_set(sa->nic, port->mcast_addrs,
+                                               port->nb_mcast_addrs);
+               if (rc != 0)
+                       goto fail_mcast_address_list_set;
+       }
 
        if (port->mac_stats_reset_pending) {
                rc = sfc_port_reset_mac_stats(sa);
@@ -217,6 +223,10 @@ sfc_port_start(struct sfc_adapter *sa)
        efx_mac_stats_get_mask(sa->nic, port->mac_stats_mask,
                               sizeof(port->mac_stats_mask));
 
+       for (i = 0, port->mac_stats_nb_supported = 0; i < EFX_MAC_NSTATS; ++i)
+               if (EFX_MAC_STAT_SUPPORTED(port->mac_stats_mask, i))
+                       port->mac_stats_nb_supported++;
+
        port->mac_stats_update_generation = 0;
 
        if (port->mac_stats_update_period_ms != 0) {
@@ -240,6 +250,18 @@ sfc_port_start(struct sfc_adapter *sa)
                }
        }
 
+       if ((port->mac_stats_update_period_ms != 0) &&
+           port->mac_stats_periodic_dma_supported) {
+               /*
+                * Request an explicit MAC stats upload immediately to
+                * preclude bogus figures readback if the user decides
+                * to read stats before periodic DMA is really started
+                */
+               rc = efx_mac_stats_upload(sa->nic, &port->mac_stats_dma_mem);
+               if (rc != 0)
+                       goto fail_mac_stats_upload;
+       }
+
        sfc_log_init(sa, "disable MAC drain");
        rc = efx_mac_drain(sa->nic, B_FALSE);
        if (rc != 0)
@@ -257,6 +279,7 @@ fail_port_init_dev_link:
        (void)efx_mac_drain(sa->nic, B_TRUE);
 
 fail_mac_drain:
+fail_mac_stats_upload:
        (void)efx_mac_stats_periodic(sa->nic, &port->mac_stats_dma_mem,
                                     0, B_FALSE);
 
@@ -294,23 +317,47 @@ sfc_port_stop(struct sfc_adapter *sa)
 }
 
 int
-sfc_port_init(struct sfc_adapter *sa)
+sfc_port_configure(struct sfc_adapter *sa)
 {
        const struct rte_eth_dev_data *dev_data = sa->eth_dev->data;
        struct sfc_port *port = &sa->port;
+
+       sfc_log_init(sa, "entry");
+
+       if (dev_data->dev_conf.rxmode.jumbo_frame)
+               port->pdu = dev_data->dev_conf.rxmode.max_rx_pkt_len;
+       else
+               port->pdu = EFX_MAC_PDU(dev_data->mtu);
+
+       return 0;
+}
+
+void
+sfc_port_close(struct sfc_adapter *sa)
+{
+       sfc_log_init(sa, "entry");
+}
+
+int
+sfc_port_attach(struct sfc_adapter *sa)
+{
+       struct sfc_port *port = &sa->port;
+       const efx_nic_cfg_t *encp = efx_nic_cfg_get(sa->nic);
+       const struct ether_addr *from;
        long kvarg_stats_update_period_ms;
        int rc;
 
        sfc_log_init(sa, "entry");
 
+       efx_phy_adv_cap_get(sa->nic, EFX_PHY_CAP_PERM, &port->phy_adv_cap_mask);
+
        /* Enable flow control by default */
        port->flow_ctrl = EFX_FCNTL_RESPOND | EFX_FCNTL_GENERATE;
        port->flow_ctrl_autoneg = B_TRUE;
 
-       if (dev_data->dev_conf.rxmode.jumbo_frame)
-               port->pdu = dev_data->dev_conf.rxmode.max_rx_pkt_len;
-       else
-               port->pdu = EFX_MAC_PDU(dev_data->mtu);
+       RTE_BUILD_BUG_ON(sizeof(encp->enc_mac_addr) != sizeof(*from));
+       from = (const struct ether_addr *)(encp->enc_mac_addr);
+       ether_addr_copy(from, &port->default_mac_addr);
 
        port->max_mcast_addrs = EFX_MAC_MULTICAST_LIST_MAX;
        port->nb_mcast_addrs = 0;
@@ -363,16 +410,21 @@ sfc_port_init(struct sfc_adapter *sa)
        return 0;
 
 fail_kvarg_stats_update_period_ms:
+       sfc_dma_free(sa, &port->mac_stats_dma_mem);
+
 fail_mac_stats_dma_alloc:
        rte_free(port->mac_stats_buf);
+
 fail_mac_stats_buf_alloc:
+       rte_free(port->mcast_addrs);
+
 fail_mcast_addr_list_buf_alloc:
        sfc_log_init(sa, "failed %d", rc);
        return rc;
 }
 
 void
-sfc_port_fini(struct sfc_adapter *sa)
+sfc_port_detach(struct sfc_adapter *sa)
 {
        struct sfc_port *port = &sa->port;
 
@@ -381,6 +433,8 @@ sfc_port_fini(struct sfc_adapter *sa)
        sfc_dma_free(sa, &port->mac_stats_dma_mem);
        rte_free(port->mac_stats_buf);
 
+       rte_free(port->mcast_addrs);
+
        sfc_log_init(sa, "done");
 }