From patchwork Fri Oct 5 17:03:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Salil Mehta X-Patchwork-Id: 148267 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp695770lji; Fri, 5 Oct 2018 10:04:46 -0700 (PDT) X-Google-Smtp-Source: ACcGV61M1vcsxOvEQrdmVmP0Kb2FPByV3ARkx0vFWpY1GUz9jv0jAtgTlegcqSFp8O2ryA7arOPe X-Received: by 2002:a62:be1a:: with SMTP id l26-v6mr3092655pff.204.1538759086471; Fri, 05 Oct 2018 10:04:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538759086; cv=none; d=google.com; s=arc-20160816; b=Tepr9ikuvCHjNNCg2u/VyCVLynFOaYaFb44OtgwCtUCmaGDn4/xpQCZp6fjXiSmBvR a2rqQ/E4TZ4hJcRkdVNopY9jFfm4OcCgbXVmViObsoXo9/zJNktWN1gvQm9ckSd8pkD3 aAEXY6X1kWxPQhuhQzgp8H3VeD4ya0nMuaLG9g0CU6GzVIhCed99XPbnJdv4B9S1faHH a1i8LNO+a9vFcjAN6lVM283UcP4zWwZSXADXnPUw57+wUL163t+wX0fFi0lZvNAEIAHQ mn8k1GLgPMFhTjuC1M8xPv/YdA0M3Y31ZK3rXx2n/CF1ga9lSRtDiWyKl0X0Lo7BSqaQ JkNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=nr8DjQc0brPcnZiMIARuMFUnUuhkmM7C31A45CJ0s/8=; b=wBviGFZYHyr2AklxcMm1cc3Z0gFUJVdtQwcrlbMqH3hPe9AeKMu6hFj2yL9Oc6xZMG IMczE5kIjsJ27rCU4pLAOo2RDt7Vt7LubpjrfV7pZy1BB72qFF1NAMC/Q3sYxHrt3Bty xLsoB/RF7eEiD9n0n/xkVgSK8Q9ZadxT1cz8WOj01rsYEPvuzqW+D1AsRMrTyYQSjVDb k78z7JbsrU0bEhReFZA5pxJKhrymb++zKdMURDtCF9sTal49fUnSVseKmig8zc4qkmx2 CkJuA+v1KPdpOuhV4KAjz2C8j2wAFDffEW0Ngutmjsy3I0kC11Cba+fivZeDnEOIC9fu IyQw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e12-v6si1260032pfi.271.2018.10.05.10.04.46; Fri, 05 Oct 2018 10:04:46 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729270AbeJFAEO (ORCPT + 32 others); Fri, 5 Oct 2018 20:04:14 -0400 Received: from szxga07-in.huawei.com ([45.249.212.35]:53820 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728900AbeJFAEO (ORCPT ); Fri, 5 Oct 2018 20:04:14 -0400 Received: from DGGEMS410-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 241F1FB978EA1; Sat, 6 Oct 2018 01:04:34 +0800 (CST) Received: from S00293818-DELL1.china.huawei.com (10.202.226.54) by DGGEMS410-HUB.china.huawei.com (10.3.19.210) with Microsoft SMTP Server id 14.3.399.0; Sat, 6 Oct 2018 01:04:25 +0800 From: Salil Mehta To: CC: , , , , , , , Jian Shen , Zhongzhu Liu Subject: [PATCH net-next 1/6] net: hns3: Remove the default mask configuration for mac vlan table Date: Fri, 5 Oct 2018 18:03:24 +0100 Message-ID: <20181005170329.6512-2-salil.mehta@huawei.com> X-Mailer: git-send-email 2.8.3 In-Reply-To: <20181005170329.6512-1-salil.mehta@huawei.com> References: <20181005170329.6512-1-salil.mehta@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.202.226.54] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jian Shen The default mask configuration has been done by firmware, so the driver doesn't need to do it any more. Signed-off-by: Zhongzhu Liu Signed-off-by: Peng Li Signed-off-by: Jian Shen Signed-off-by: Salil Mehta --- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 10 ------- .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 32 ---------------------- 2 files changed, 42 deletions(-) -- 2.7.4 diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h index e5e66b2..26fda05 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h @@ -177,7 +177,6 @@ enum hclge_opcode_type { HCLGE_OPC_MAC_VLAN_INSERT = 0x1003, HCLGE_OPC_MAC_ETHTYPE_ADD = 0x1010, HCLGE_OPC_MAC_ETHTYPE_REMOVE = 0x1011, - HCLGE_OPC_MAC_VLAN_MASK_SET = 0x1012, /* Multicast linear table commands */ HCLGE_OPC_MTA_MAC_MODE_CFG = 0x1020, @@ -591,15 +590,6 @@ struct hclge_mac_vlan_tbl_entry_cmd { u8 rsv2[6]; }; -#define HCLGE_VLAN_MASK_EN_B 0 -struct hclge_mac_vlan_mask_entry_cmd { - u8 rsv0[2]; - u8 vlan_mask; - u8 rsv1; - u8 mac_mask[6]; - u8 rsv2[14]; -}; - #define HCLGE_MAC_MGR_MASK_VLAN_B BIT(0) #define HCLGE_MAC_MGR_MASK_MAC_B BIT(1) #define HCLGE_MAC_MGR_MASK_ETHERTYPE_B BIT(2) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index 21ca4af..0106c1b 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -1939,36 +1939,11 @@ static int hclge_get_autoneg(struct hnae3_handle *handle) return hdev->hw.mac.autoneg; } -static int hclge_set_default_mac_vlan_mask(struct hclge_dev *hdev, - bool mask_vlan, - u8 *mac_mask) -{ - struct hclge_mac_vlan_mask_entry_cmd *req; - struct hclge_desc desc; - int status; - - req = (struct hclge_mac_vlan_mask_entry_cmd *)desc.data; - hclge_cmd_setup_basic_desc(&desc, HCLGE_OPC_MAC_VLAN_MASK_SET, false); - - hnae3_set_bit(req->vlan_mask, HCLGE_VLAN_MASK_EN_B, - mask_vlan ? 1 : 0); - ether_addr_copy(req->mac_mask, mac_mask); - - status = hclge_cmd_send(&hdev->hw, &desc, 1); - if (status) - dev_err(&hdev->pdev->dev, - "Config mac_vlan_mask failed for cmd_send, ret =%d\n", - status); - - return status; -} - static int hclge_mac_init(struct hclge_dev *hdev) { struct hnae3_handle *handle = &hdev->vport[0].nic; struct net_device *netdev = handle->kinfo.netdev; struct hclge_mac *mac = &hdev->hw.mac; - u8 mac_mask[ETH_ALEN] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; struct hclge_vport *vport; int mtu; int ret; @@ -2011,13 +1986,6 @@ static int hclge_mac_init(struct hclge_dev *hdev) } } - ret = hclge_set_default_mac_vlan_mask(hdev, true, mac_mask); - if (ret) { - dev_err(&hdev->pdev->dev, - "set default mac_vlan_mask fail ret=%d\n", ret); - return ret; - } - if (netdev) mtu = netdev->mtu; else