From patchwork Fri Oct 5 10:25:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Russkikh X-Patchwork-Id: 10627843 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0830315A6 for ; Fri, 5 Oct 2018 10:25:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EF62428FD5 for ; Fri, 5 Oct 2018 10:25:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E3D3F28FFB; Fri, 5 Oct 2018 10:25:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 67A7828FD5 for ; Fri, 5 Oct 2018 10:25:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728485AbeJERXk (ORCPT ); Fri, 5 Oct 2018 13:23:40 -0400 Received: from mail-bl2nam02on0081.outbound.protection.outlook.com ([104.47.38.81]:6901 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727601AbeJERXj (ORCPT ); Fri, 5 Oct 2018 13:23:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=AQUANTIA1COM.onmicrosoft.com; s=selector1-aquantia-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6yB5LLXCv1IwBsw44851SwMvDQgY7eBv0bWJ3FLtLDs=; b=lVjVkNYSc2c/tnRLDBjBkvOl+JGOH/q0qJd2aOErKxuVkLZwOkgv+jpWHAB1rRMNsrIdVnjjIav1zoXU5lXuv7loWd9pCblu6pXMWAF0EiBaqlfTD50lllGKKxcBmQL/m45mDkNSEYrExdOW8JWqscEakpb+/8P4mHBY8NwTpBw= Received: from BY1PR0701MB1660.namprd07.prod.outlook.com (10.162.110.22) by BY1PR0701MB1641.namprd07.prod.outlook.com (10.162.110.158) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1207.21; Fri, 5 Oct 2018 10:25:17 +0000 Received: from BY1PR0701MB1660.namprd07.prod.outlook.com ([fe80::346d:e756:e70e:17]) by BY1PR0701MB1660.namprd07.prod.outlook.com ([fe80::346d:e756:e70e:17%2]) with mapi id 15.20.1207.021; Fri, 5 Oct 2018 10:25:17 +0000 From: Igor Russkikh To: "David S . Miller" CC: "linux-usb@vger.kernel.org" , "netdev@vger.kernel.org" , Igor Russkikh , Dmitry Bezrukov Subject: [PATCH net-next 15/19] net: usb: aqc111: Add support for VLAN_CTAG_TX/RX offload Thread-Topic: [PATCH net-next 15/19] net: usb: aqc111: Add support for VLAN_CTAG_TX/RX offload Thread-Index: AQHUXJW2Xwc6DH7XaEKC2SzuGJL5kg== Date: Fri, 5 Oct 2018 10:25:17 +0000 Message-ID: <7d3c26e57edd4cc4f0995e66ec71be9d1c8f53d9.1538734658.git.igor.russkikh@aquantia.com> References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM5PR0602CA0024.eurprd06.prod.outlook.com (2603:10a6:203:a3::34) To BY1PR0701MB1660.namprd07.prod.outlook.com (2a01:111:e400:522a::22) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Igor.Russkikh@aquantia.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [95.79.108.179] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;BY1PR0701MB1641;6:YNNrf9PxXE9hpN1MkpbaJJjYbkeVmICTfrlBhDqzvS6/HMpeXfgdSfmu2LcezIJgKJLR9RO7YIGd76eqbJh1TykE0tIcMH1mSy1Y71UPO2y0ZsWQVCdnjm90O2vNuXq+k3SGw5w+QI0+pz7jEQHNX1w4gjtqdxBDvALGPtsEwZX25Jtgxtu2i0yQ4/nlG0SquXnzPbzfvprrdO0+gEu5K9cvcn4CiC4O8Gv7ZW1ZMxE+I3G4ucIlc3v0+BHL7u0ljrkggDBEeOMLIf8n3wsUEDEAMNrfhc+/IW8i7ZS0ZIgpYtX2JQJVqNmACUjLpEhxOGAd6rKXVMyCEyJI2fF3SUUeLPXJVMgkaUWdRoLNZleLs2AbQwKQ3OMRSNuj5c21e+noq0MHjsm9vCuLxdLN/EaXyk9uzQ/B8rpOO1CW8tOWpO31zOYPiygohKpYUNaltlh3tQq84DIq3A4atBao5w==;5:DSV7LIAyh5kIWuVGvIUZmHm4BnOchCn5Yiv/OAIF1kzPYu9hhQV0NbzpKOHZBxDBcRTTflf0Rk3J19gsTQGGPEfrM2GQFK3HCpu3AZCdbsPnN+Cgpus3fWX6r488/ocq/6OurUTGfSg2XFTD71ZC+aMB6eMU7K/SlvlVIGe+Lak=;7:A1gF/5hx37rdPGgK8flVmmZnxYjhEkRvOAtlJpI2Ednz5BSvPOPQUJyeMLTiOs3UQvXw3mW4bRoCsU+sFX0IRGh29Fmo7vve9Je4FVVRFflgEZQbK7aBVocoD9P3ZcCDJt4Fu9C4R7Etjn4R8bGHh//6EFVO/hQjdoe5d5skMEfoC+FwT404c9uQF/DEaXAqZ6tm+joaYCY1Dj4qFO9h6cgT/yPc/Zt8ka5XklKXM77g2svX9ReFbdNnvBOCGPMB x-ms-office365-filtering-correlation-id: d29ead49-ad01-4b63-912a-08d62aacd854 x-microsoft-antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(2017052603328)(7153060)(7193020);SRVR:BY1PR0701MB1641; x-ms-traffictypediagnostic: BY1PR0701MB1641: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:; x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(6040522)(2401047)(8121501046)(5005006)(3231355)(944501410)(52105095)(3002001)(10201501046)(93006095)(93001095)(149066)(150057)(6041310)(20161123564045)(20161123562045)(20161123558120)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699051);SRVR:BY1PR0701MB1641;BCL:0;PCL:0;RULEID:;SRVR:BY1PR0701MB1641; x-forefront-prvs: 0816F1D86E x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(376002)(366004)(346002)(136003)(39850400004)(396003)(199004)(189003)(575784001)(81166006)(81156014)(6436002)(86362001)(8676002)(118296001)(316002)(14454004)(6512007)(8936002)(66066001)(256004)(386003)(2900100001)(11346002)(2906002)(6506007)(6486002)(52116002)(36756003)(107886003)(3846002)(486006)(53936002)(71190400001)(476003)(99286004)(105586002)(14444005)(97736004)(26005)(44832011)(2616005)(68736007)(54906003)(186003)(5660300001)(5250100002)(71200400001)(446003)(76176011)(7736002)(4326008)(102836004)(106356001)(305945005)(478600001)(6116002)(6916009)(72206003)(25786009);DIR:OUT;SFP:1101;SCL:1;SRVR:BY1PR0701MB1641;H:BY1PR0701MB1660.namprd07.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: aquantia.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: 11hd2Dvj4tr7lzUXOaUup9zce5DDKvV1+K96XS9nYmCIs6qVpPN3mP/imd+OFKC1abB0S7uHYGImT+PIvcfWrYQ2DLS3RypjA9VQEyVjxP5CvXglK25Df03zkokjlrZxKeZshZUA3VgsBOjnZ23wiQmW/baNNZbMqQ26mqHPNmJogO54fHdL9vkdqSOPQZYXEt62Vmzus0BPaPtPN/CyRw60OTz5t9LGzT9DX1Hu9cOZltOsBhLriXSkbxmOy8tZBqYo2KsQMLCvVFHdz7hrVxLe7jC816URQO2ByzDihS5lgy+R7p/NkQlyq1RZFPgQKFVp3liiBlqiD3BRiX56dHOCTMF0PbTyuDRdj9/GU6s= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-Network-Message-Id: d29ead49-ad01-4b63-912a-08d62aacd854 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Oct 2018 10:25:17.7135 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 83e2e134-991c-4ede-8ced-34d47e38e6b1 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR0701MB1641 Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Dmitry Bezrukov Signed-off-by: Dmitry Bezrukov Signed-off-by: Igor Russkikh --- drivers/net/usb/aqc111.c | 14 ++++++++++++++ drivers/net/usb/aqc111.h | 7 ++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/drivers/net/usb/aqc111.c b/drivers/net/usb/aqc111.c index cc23c39beab3..a9051dd7c5bd 100644 --- a/drivers/net/usb/aqc111.c +++ b/drivers/net/usb/aqc111.c @@ -524,6 +524,7 @@ static int aqc111_bind(struct usbnet *dev, struct usb_interface *intf) dev->net->hw_features |= AQ_SUPPORT_HW_FEATURE; dev->net->features |= AQ_SUPPORT_FEATURE; + dev->net->vlan_features |= AQ_SUPPORT_VLAN_FEATURE; aqc111_read_fw_version(dev, aqc111_data); aqc111_data->autoneg = AUTONEG_ENABLE; @@ -817,6 +818,7 @@ static int aqc111_reset(struct usbnet *dev) dev->net->hw_features |= AQ_SUPPORT_HW_FEATURE; dev->net->features |= AQ_SUPPORT_FEATURE; + dev->net->vlan_features |= AQ_SUPPORT_VLAN_FEATURE; /* Power up ethernet PHY */ aqc111_data->phy_ops.advertising = 0; @@ -992,6 +994,11 @@ static int aqc111_rx_fixup(struct usbnet *dev, struct sk_buff *skb) new_skb->truesize = new_skb->len + sizeof(struct sk_buff); if (aqc111_data->rx_checksum) aqc111_rx_checksum(new_skb, &pkt_desc); + if (pkt_desc->vlan_ind) + __vlan_hwaccel_put_tag(new_skb, + htons(ETH_P_8021Q), + pkt_desc->vlan_tag & + VLAN_VID_MASK); usbnet_skb_return(dev, new_skb); if (pkt_count == 0) @@ -1020,6 +1027,7 @@ static struct sk_buff *aqc111_tx_fixup(struct usbnet *dev, struct sk_buff *skb, int tailroom = 0; int padding_size = 0; struct sk_buff *new_skb = NULL; + u16 tci = 0; memset(&tx_hdr, 0x00, sizeof(tx_hdr)); @@ -1038,6 +1046,12 @@ static struct sk_buff *aqc111_tx_fixup(struct usbnet *dev, struct sk_buff *skb, tx_hdr.drop_padding = 1; } + /* Vlan Tag */ + if (vlan_get_tag(skb, &tci) >= 0) { + tx_hdr.vlan_tag = 1; + tx_hdr.vlan_info = tci; + } + if (!dev->can_dma_sg && (dev->net->features & NETIF_F_SG) && skb_linearize(skb)) return NULL; diff --git a/drivers/net/usb/aqc111.h b/drivers/net/usb/aqc111.h index 2f324ec66a65..e33459d90ddd 100644 --- a/drivers/net/usb/aqc111.h +++ b/drivers/net/usb/aqc111.h @@ -68,12 +68,17 @@ /* Feature. ********************************************/ #define AQ_SUPPORT_FEATURE (NETIF_F_SG | NETIF_F_IP_CSUM |\ NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM |\ - NETIF_F_TSO) + NETIF_F_TSO | NETIF_F_HW_VLAN_CTAG_TX |\ + NETIF_F_HW_VLAN_CTAG_RX) #define AQ_SUPPORT_HW_FEATURE (NETIF_F_SG | NETIF_F_IP_CSUM |\ NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM |\ NETIF_F_TSO) +#define AQ_SUPPORT_VLAN_FEATURE (NETIF_F_SG | NETIF_F_IP_CSUM |\ + NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM |\ + NETIF_F_TSO) + /* SFR Reg. ********************************************/ #define SFR_GENERAL_STATUS 0x03