From patchwork Thu Nov 24 12:34:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Igor Ryzhov X-Patchwork-Id: 17247 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id F3406558D; Thu, 24 Nov 2016 13:34:47 +0100 (CET) Received: from mail-lf0-f67.google.com (mail-lf0-f67.google.com [209.85.215.67]) by dpdk.org (Postfix) with ESMTP id 5B6C1558A for ; Thu, 24 Nov 2016 13:34:46 +0100 (CET) Received: by mail-lf0-f67.google.com with SMTP id p100so1829042lfg.2 for ; Thu, 24 Nov 2016 04:34:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nfware-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=lQI812SJWGDzYCsqm6Ebzn4V9pgePhXcGfJbKRIZimY=; b=lQ4FAGGxgSfuQDCqUG1K2HnS1tsdzY5FKawyFCqFQrF7sMkiPYNVfm0EErxTU8st1k vDoyXWbfBaUJQ6goClTIlCJA3kXoTSsNBcZoOAeFiMZe12Mq8oI9gI7leemGjFtq1w33 JPlt0qPYZeI4q6O63Sl4uyb6Fzk8DdQdk5tIxbvVhfkivcRDfR4R8rh06jJR3yBaY4Vn L/YmlGGbBMn8sbVl2X61D4SdpL7EQsv9MiWdsk0lKn3ai9xLYukKArW57A8R5MhN095K RmIBqLUpDMqCEwVcbHWpBGcCERGbvVISNUIRhOQ/Gz9nSVk/Gs8LedCA8XX+gvNpzoIz CT1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=lQI812SJWGDzYCsqm6Ebzn4V9pgePhXcGfJbKRIZimY=; b=WPchfWFM1i5BVzuLvLyFdwYGV8O768f5+BnDCl4QncMP3LOWtLs/F+pnB1rWF/YpoP bpAxBHZe+1vC6bx6XgIoEL6cmphQafB1WCTWt1eW4AQbQcOPKRFqsfgUwuimZkwhHHZ1 Ai9pI+T1Rukb26FaQmmsvRyOUn06QMXkCbNm+JRrYt4IcnuOAE266QgatSVNRP8whVjh 957TeT+Zn/UeOAU4eaEcHCbb1DqnUHsBqc+07HwHhUKGQf+rvxvKdJ41XUyhkcdqM9eA 1VaX+uOw7nUxsN8RgOzixWKQsvcmu6Blv+08MDSyq0i/Y664KWo2PWkPOswSTw9BMaI3 eNiw== X-Gm-Message-State: AKaTC01UTQDxxls/xD8D/xeR27r2mRyOWgfgzjtcoPHt3EYmmkJUIdQME3U7yi7cGQHGLQ== X-Received: by 10.46.76.1 with SMTP id z1mr1195482lja.41.1479990885763; Thu, 24 Nov 2016 04:34:45 -0800 (PST) Received: from localhost.localdomain (vpn.arccn.ru. [95.182.74.2]) by smtp.gmail.com with ESMTPSA id 20sm3200144ljb.37.2016.11.24.04.34.45 (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 24 Nov 2016 04:34:45 -0800 (PST) From: Igor Ryzhov To: dev@dpdk.org Cc: helin.zhang@intel.com, jingjing.wu@intel.com Date: Thu, 24 Nov 2016 15:34:39 +0300 Message-Id: <1479990879-26598-1-git-send-email-iryzhov@nfware.com> X-Mailer: git-send-email 2.6.4 MIME-Version: 1.0 Subject: [dpdk-dev] [RFC PATCH] i40e: fix setting of default MAC address X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" While testing X710 cards in our lab I found that setting of default MAC address doesn't work correctly for i40e driver. I compared DPDK driver implementation with Linux driver implementation and found that a lot of code is lost in DPDK. I tried to make DPDK implementation similar to Linux implementation and it worked for me – now everything is working. But I'm not sure that my changes are correct so, please, maintainers, check the patch very careful. Signed-off-by: Igor Ryzhov --- drivers/net/i40e/i40e_ethdev.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 67778ba..b73f9c8 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -9694,6 +9694,7 @@ static int i40e_get_eeprom(struct rte_eth_dev *dev, static void i40e_set_default_mac_addr(struct rte_eth_dev *dev, struct ether_addr *mac_addr) { + struct i40e_vsi *vsi = I40E_DEV_PRIVATE_TO_MAIN_VSI(dev->data->dev_private); struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private); if (!is_valid_assigned_ether_addr(mac_addr)) { @@ -9701,8 +9702,33 @@ static void i40e_set_default_mac_addr(struct rte_eth_dev *dev, return; } - /* Flags: 0x3 updates port address */ - i40e_aq_mac_address_write(hw, 0x3, mac_addr->addr_bytes, NULL); + i40e_aq_mac_address_write(hw, I40E_AQC_WRITE_TYPE_LAA_WOL, mac_addr->addr_bytes, NULL); + + if (!memcmp(&dev->data->mac_addrs[0].addr_bytes, hw->mac.addr, ETH_ADDR_LEN)) { + struct i40e_aqc_remove_macvlan_element_data element; + + memset(&element, 0, sizeof(element)); + memcpy(element.mac_addr, &dev->data->mac_addrs[0].addr_bytes, ETH_ADDR_LEN); + element.flags = I40E_AQC_MACVLAN_DEL_PERFECT_MATCH; + i40e_aq_remove_macvlan(hw, vsi->seid, &element, 1, NULL); + } else { + i40e_vsi_delete_mac(vsi, &dev->data->mac_addrs[0]); + } + + if (!memcmp(mac_addr->addr_bytes, hw->mac.addr, ETH_ADDR_LEN)) { + struct i40e_aqc_add_macvlan_element_data element; + + memset(&element, 0, sizeof(element)); + memcpy(element.mac_addr, hw->mac.addr, ETH_ADDR_LEN); + element.flags = CPU_TO_LE16(I40E_AQC_MACVLAN_ADD_PERFECT_MATCH); + i40e_aq_add_macvlan(hw, vsi->seid, &element, 1, NULL); + } else { + struct i40e_mac_filter_info filter; + + memcpy(&filter.mac_addr, mac_addr, ETH_ADDR_LEN); + filter.filter_type = RTE_MAC_PERFECT_MATCH; + i40e_vsi_add_mac(vsi, &filter); + } } static int