New upstream version 17.11.1

[deb_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 c1466a7..5254394 100644 (file)
--- a/drivers/net/sfc/sfc_port.c
+++ b/drivers/net/sfc/sfc_port.c
@@ -188,10 +188,10 @@ sfc_port_start(struct sfc_adapter *sa)
                goto fail_mac_pdu_set;
 
        if (!port->isolated) {
-               struct ether_addr *mac_addrs = sa->eth_dev->data->mac_addrs;
+               struct ether_addr *addr = &port->default_mac_addr;
 
                sfc_log_init(sa, "set MAC address");
-               rc = efx_mac_addr_set(sa->nic, mac_addrs[0].addr_bytes);
+               rc = efx_mac_addr_set(sa->nic, addr->addr_bytes);
                if (rc != 0)
                        goto fail_mac_addr_set;
 
@@ -279,10 +279,10 @@ 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);
 
-fail_mac_stats_upload:
 fail_mac_stats_periodic:
 fail_mcast_address_list_set:
 fail_mac_filter_set:
@@ -342,6 +342,8 @@ 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;
 
@@ -353,6 +355,10 @@ sfc_port_attach(struct sfc_adapter *sa)
        port->flow_ctrl = EFX_FCNTL_RESPOND | EFX_FCNTL_GENERATE;
        port->flow_ctrl_autoneg = B_TRUE;
 
+       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;
        port->mcast_addrs = rte_calloc_socket("mcast_addr_list_buf",
@@ -404,9 +410,14 @@ sfc_port_attach(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;
@@ -422,6 +433,8 @@ sfc_port_detach(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");
 }