From patchwork Fri Oct 5 17:03:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Salil Mehta X-Patchwork-Id: 148269 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp695883lji; Fri, 5 Oct 2018 10:04:51 -0700 (PDT) X-Google-Smtp-Source: ACcGV60ye1U4XZVAgiL0alq+82JJ1xYX7ZN1wM/y28DAN5YA0Onda6pwHcrfIvpm/ojU/GSoGnDg X-Received: by 2002:a17:902:bcc3:: with SMTP id o3-v6mr12805957pls.202.1538759091542; Fri, 05 Oct 2018 10:04:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538759091; cv=none; d=google.com; s=arc-20160816; b=CDyrIMZhBQYaellfu7vEvfKF5JSj0HUce7J3Hy3Vs+gRf8D3d3Zv5nsVTZ0rx8gfGP BLVhSLYGbhYCb98EMRNI+ShwlZs4jYNQP/CpCXHlqxk6dIe+GXNDziLSDWbgLfLtmGvC VfZhaXuA6+zRgLWR2T+ID31c57fx4U2QKDefELC2TOL3hluQHE0Lt7C+HLO43G7miJMJ Lq+Oer4Bv7EvXPdsNKemlu8j66FF07BNTL+c5O52seehqTp1GMekC6Z7EUK5QLtzk/oL lKfSIGCVIGmRLQCvHE4M5czThwTpMPFrFJ7Yk1myDb8heYVDHi7HMQDo9RA+NYFvNAKk HfiQ== 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=orIiw+jIEPuVULyYiEJEYZT/Azjs/yf160lCKgzh7jk=; b=C7e0jvXO+NHVRQHItaIZhakh9ty/CKOPpuPoUn+GkmmR1NQwkW/TExgBcMHz/cuePi e1bEJSPKb5GoZAqGORijy9OphYeUgltTjl3EQa2LU95iq29zae01G8fV1f0lYgweV90A CWj8hRsA1hF7BgpVJjCneiiD5l5Yj//C2qAoJAN0p5Ige91yRnvP2i40BFeGKUylUKug NLDnnQbIP6qAdm/6eeDimA0X8LjK2J2XAgH7ESlgm4JZnr4M+WQIZ67rDVhad3EueWGm ZY1L28wGEkjyr9OQ5//LeWBdMj/yuJGDQ8neBBUcjy9On69O4Q8bsacU5x5lpf+MVAuZ edmQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-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 w15-v6si8561554pgg.529.2018.10.05.10.04.51; Fri, 05 Oct 2018 10:04:51 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of netdev-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 netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729478AbeJFAEY (ORCPT + 10 others); Fri, 5 Oct 2018 20:04:24 -0400 Received: from szxga07-in.huawei.com ([45.249.212.35]:53870 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728021AbeJFAEX (ORCPT ); Fri, 5 Oct 2018 20:04:23 -0400 Received: from DGGEMS410-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 40AE9F7A8140A; Sat, 6 Oct 2018 01:04:44 +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:37 +0800 From: Salil Mehta To: CC: , , , , , , , Zhongzhu Liu , Jian Shen Subject: [PATCH net-next 5/6] net: hns3: Add egress/ingress vlan filter for revision 0x21 Date: Fri, 5 Oct 2018 18:03:28 +0100 Message-ID: <20181005170329.6512-6-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: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Zhongzhu Liu In revision 0x21, hw supports both ingress and egress vlan filter. This patch adds support for it. Signed-off-by: Zhongzhu Liu Signed-off-by: Jian Shen Signed-off-by: Salil Mehta --- .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 45 +++++++++++++++++----- 1 file changed, 36 insertions(+), 9 deletions(-) -- 2.7.4 diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index d95ea9b..ca1a936 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -5523,7 +5523,7 @@ static int hclge_do_ioctl(struct hnae3_handle *handle, struct ifreq *ifr, } static int hclge_set_vlan_filter_ctrl(struct hclge_dev *hdev, u8 vlan_type, - bool filter_en) + u8 fe_type, bool filter_en) { struct hclge_vlan_filter_ctrl_cmd *req; struct hclge_desc desc; @@ -5533,7 +5533,7 @@ static int hclge_set_vlan_filter_ctrl(struct hclge_dev *hdev, u8 vlan_type, req = (struct hclge_vlan_filter_ctrl_cmd *)desc.data; req->vlan_type = vlan_type; - req->vlan_fe = filter_en; + req->vlan_fe = filter_en ? fe_type : 0; ret = hclge_cmd_send(&hdev->hw, &desc, 1); if (ret) @@ -5545,13 +5545,30 @@ static int hclge_set_vlan_filter_ctrl(struct hclge_dev *hdev, u8 vlan_type, #define HCLGE_FILTER_TYPE_VF 0 #define HCLGE_FILTER_TYPE_PORT 1 +#define HCLGE_FILTER_FE_EGRESS_V1_B BIT(0) +#define HCLGE_FILTER_FE_NIC_INGRESS_B BIT(0) +#define HCLGE_FILTER_FE_NIC_EGRESS_B BIT(1) +#define HCLGE_FILTER_FE_ROCE_INGRESS_B BIT(2) +#define HCLGE_FILTER_FE_ROCE_EGRESS_B BIT(3) +#define HCLGE_FILTER_FE_EGRESS (HCLGE_FILTER_FE_NIC_EGRESS_B \ + | HCLGE_FILTER_FE_ROCE_EGRESS_B) +#define HCLGE_FILTER_FE_INGRESS (HCLGE_FILTER_FE_NIC_INGRESS_B \ + | HCLGE_FILTER_FE_ROCE_INGRESS_B) static void hclge_enable_vlan_filter(struct hnae3_handle *handle, bool enable) { struct hclge_vport *vport = hclge_get_vport(handle); struct hclge_dev *hdev = vport->back; - hclge_set_vlan_filter_ctrl(hdev, HCLGE_FILTER_TYPE_VF, enable); + if (hdev->pdev->revision >= 0x21) { + hclge_set_vlan_filter_ctrl(hdev, HCLGE_FILTER_TYPE_VF, + HCLGE_FILTER_FE_EGRESS, enable); + hclge_set_vlan_filter_ctrl(hdev, HCLGE_FILTER_TYPE_PORT, + HCLGE_FILTER_FE_INGRESS, enable); + } else { + hclge_set_vlan_filter_ctrl(hdev, HCLGE_FILTER_TYPE_VF, + HCLGE_FILTER_FE_EGRESS_V1_B, enable); + } } static int hclge_set_vf_vlan_common(struct hclge_dev *hdev, int vfid, @@ -5853,13 +5870,23 @@ static int hclge_init_vlan_config(struct hclge_dev *hdev) int ret; int i; - ret = hclge_set_vlan_filter_ctrl(hdev, HCLGE_FILTER_TYPE_VF, true); - if (ret) - return ret; + if (hdev->pdev->revision >= 0x21) { + ret = hclge_set_vlan_filter_ctrl(hdev, HCLGE_FILTER_TYPE_VF, + HCLGE_FILTER_FE_EGRESS, true); + if (ret) + return ret; - ret = hclge_set_vlan_filter_ctrl(hdev, HCLGE_FILTER_TYPE_PORT, true); - if (ret) - return ret; + ret = hclge_set_vlan_filter_ctrl(hdev, HCLGE_FILTER_TYPE_PORT, + HCLGE_FILTER_FE_INGRESS, true); + if (ret) + return ret; + } else { + ret = hclge_set_vlan_filter_ctrl(hdev, HCLGE_FILTER_TYPE_VF, + HCLGE_FILTER_FE_EGRESS_V1_B, + true); + if (ret) + return ret; + } hdev->vlan_type_cfg.rx_in_fst_vlan_type = HCLGE_DEF_VLAN_TYPE; hdev->vlan_type_cfg.rx_in_sec_vlan_type = HCLGE_DEF_VLAN_TYPE; From patchwork Fri Oct 5 17:03:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Salil Mehta X-Patchwork-Id: 148271 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp695991lji; Fri, 5 Oct 2018 10:04:55 -0700 (PDT) X-Google-Smtp-Source: ACcGV627sCp1MFKqV9/yRfjML09wXM19IS+jOVhS+aMNIRk+tQ7W+qDnQdp4umCeKqzub2HFvJwz X-Received: by 2002:a63:fd58:: with SMTP id m24-v6mr11274559pgj.132.1538759095499; Fri, 05 Oct 2018 10:04:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538759095; cv=none; d=google.com; s=arc-20160816; b=YyBloK/LRH5YVZHTOv/B6DjcPjkrFo/7SqmG5K2Q8lWpdkoAfYUDJTMN/mQZsKwXJv MswqFr8HCmI9gS6pAu/lOs2sFqz9ouyEzn3IjGK+5vi7/Z5g48Q9T/+ibA2xqn8L2P/y 3pMT5mfdD37U8Ingy1xRxvIlNLDodBVm9nmfFgEwqr7o/46hLWPAbtekB/RMjC8dSzBU yTOcigvxysTT0i5aBDd+hdWwWaOVXSApqaJbn6Cr5sBhKJT2HRkAjOUjHjTS9IEfr6Yc wkmMzCXxh+xqnu9BxRi4Dpx5HZxe8LbCyNk/+/uqmHLfT3iVjMPSMRKfsm6ll+xBqhxg /q8A== 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=9O1B72DxoE3xn8YzJQVOQLjKCSVQYbnV/INONgo00YA=; b=XGa37Ml/xNDMADdzVOEKzrBv6TYsaPxFTP6rEVHdbVRJRddBxJABK+K2mLOLtEIso2 CuQFU5uQmQrR1WrT2Q5q8stC+jymAmChgkKsdzCS2ua/GqGgSI8AIeOtXzb6nFXivlnm bc25FESzl274u46qNdwUD2Uma3g2g0/qdQ1otvmFQN9YkMRkBzIvUvwD0+WyDROznqEX 18GEp4tRJY1oX7yIFnY2VJQs5bPZK3k56ohbnNOO+1HpUrDZa3ZcrLiE8UJ41hc4ZJug WkkYdRP6671rcGXNO2pQIOGPLAonzgOgvgR9QUqLrTbwoKk9bCEuPLDcDseB0cha4Z99 pWRg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-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 q23-v6si8735788pgj.229.2018.10.05.10.04.55; Fri, 05 Oct 2018 10:04:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of netdev-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 netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729503AbeJFAE3 (ORCPT + 10 others); Fri, 5 Oct 2018 20:04:29 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:13599 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727958AbeJFAE2 (ORCPT ); Fri, 5 Oct 2018 20:04:28 -0400 Received: from DGGEMS410-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 97609D51EFE39; Sat, 6 Oct 2018 01:04:49 +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:40 +0800 From: Salil Mehta To: CC: , , , , , , , Jian Shen Subject: [PATCH net-next 6/6] net: hns3: Fix for rx vlan id handle to support Rev 0x21 hardware Date: Fri, 5 Oct 2018 18:03:29 +0100 Message-ID: <20181005170329.6512-7-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: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jian Shen In revision 0x20, we use vlan id != 0 to check whether a vlan tag has been offloaded, so vlan id 0 is not supported. In revision 0x21, rx buffer descriptor adds two bits to indicate whether one or more vlan tags have been offloaded, so vlan id 0 is valid now. This patch seperates the handle for vlan id 0, add vlan id 0 support for revision 0x21. Fixes: 5b5455a9ed5a ("net: hns3: Add STRP_TAGP field support for hardware revision 0x21") Signed-off-by: Jian Shen Signed-off-by: Salil Mehta --- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 30 +++++++++++-------------- 1 file changed, 13 insertions(+), 17 deletions(-) -- 2.7.4 diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c index 3f36c38..e9d4564 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c @@ -2200,18 +2200,18 @@ static void hns3_rx_skb(struct hns3_enet_ring *ring, struct sk_buff *skb) napi_gro_receive(&ring->tqp_vector->napi, skb); } -static u16 hns3_parse_vlan_tag(struct hns3_enet_ring *ring, - struct hns3_desc *desc, u32 l234info) +static bool hns3_parse_vlan_tag(struct hns3_enet_ring *ring, + struct hns3_desc *desc, u32 l234info, + u16 *vlan_tag) { struct pci_dev *pdev = ring->tqp->handle->pdev; - u16 vlan_tag; if (pdev->revision == 0x20) { - vlan_tag = le16_to_cpu(desc->rx.ot_vlan_tag); - if (!(vlan_tag & VLAN_VID_MASK)) - vlan_tag = le16_to_cpu(desc->rx.vlan_tag); + *vlan_tag = le16_to_cpu(desc->rx.ot_vlan_tag); + if (!(*vlan_tag & VLAN_VID_MASK)) + *vlan_tag = le16_to_cpu(desc->rx.vlan_tag); - return vlan_tag; + return (*vlan_tag != 0); } #define HNS3_STRP_OUTER_VLAN 0x1 @@ -2220,17 +2220,14 @@ static u16 hns3_parse_vlan_tag(struct hns3_enet_ring *ring, switch (hnae3_get_field(l234info, HNS3_RXD_STRP_TAGP_M, HNS3_RXD_STRP_TAGP_S)) { case HNS3_STRP_OUTER_VLAN: - vlan_tag = le16_to_cpu(desc->rx.ot_vlan_tag); - break; + *vlan_tag = le16_to_cpu(desc->rx.ot_vlan_tag); + return true; case HNS3_STRP_INNER_VLAN: - vlan_tag = le16_to_cpu(desc->rx.vlan_tag); - break; + *vlan_tag = le16_to_cpu(desc->rx.vlan_tag); + return true; default: - vlan_tag = 0; - break; + return false; } - - return vlan_tag; } static int hns3_handle_rx_bd(struct hns3_enet_ring *ring, @@ -2332,8 +2329,7 @@ static int hns3_handle_rx_bd(struct hns3_enet_ring *ring, if (netdev->features & NETIF_F_HW_VLAN_CTAG_RX) { u16 vlan_tag; - vlan_tag = hns3_parse_vlan_tag(ring, desc, l234info); - if (vlan_tag & VLAN_VID_MASK) + if (hns3_parse_vlan_tag(ring, desc, l234info, &vlan_tag)) __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan_tag);