From patchwork Wed Nov 21 10:13:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Russkikh X-Patchwork-Id: 10692297 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 C486E13BB for ; Wed, 21 Nov 2018 10:15:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B24022B8E8 for ; Wed, 21 Nov 2018 10:15:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A65B52B8F5; Wed, 21 Nov 2018 10:15:11 +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 25F2C2B8E8 for ; Wed, 21 Nov 2018 10:15:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729355AbeKUUrs (ORCPT ); Wed, 21 Nov 2018 15:47:48 -0500 Received: from mail-eopbgr740052.outbound.protection.outlook.com ([40.107.74.52]:4512 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728512AbeKUUrr (ORCPT ); Wed, 21 Nov 2018 15:47:47 -0500 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=HIWCAjNKeISIbrGuQ9pX5MAuryzfHbMpyzz0KRrmQoo=; b=qfE4osLHUxs9DMNEpyXPSUPJOc7uoLYZ2HOsjSBODbnQ9YoplRZCAQAxhORHcq9j8zT2+Gc3q3fmK+GZxTeRgXI7FYw/3jj5Z+1fsFlQL/UFwmHB+k9Y4PJwGGRT2A+9am3iZV6Ji0YJFmEptKlQviZfnuSc7/XIMupxTfffhlo= Received: from BY1PR0701MB1660.namprd07.prod.outlook.com (10.162.110.22) by BY1PR0701MB1287.namprd07.prod.outlook.com (10.160.108.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1339.26; Wed, 21 Nov 2018 10:13:53 +0000 Received: from BY1PR0701MB1660.namprd07.prod.outlook.com ([fe80::f8ee:2260:e410:fffd]) by BY1PR0701MB1660.namprd07.prod.outlook.com ([fe80::f8ee:2260:e410:fffd%3]) with mapi id 15.20.1361.015; Wed, 21 Nov 2018 10:13:53 +0000 From: Igor Russkikh To: "linux-usb@vger.kernel.org" , "davem@davemloft.net" , "netdev@vger.kernel.org" CC: "andrew@lunn.ch" , Dmitry Bezrukov , Igor Russkikh Subject: [PATCH v3 net-next 15/21] net: usb: aqc111: Add support for VLAN_CTAG_TX/RX offload Thread-Topic: [PATCH v3 net-next 15/21] net: usb: aqc111: Add support for VLAN_CTAG_TX/RX offload Thread-Index: AQHUgYLn6+NBReLF/Ua9iKT9NiQRvA== Date: Wed, 21 Nov 2018 10:13:53 +0000 Message-ID: <519a2f7fa8275a4a8fc0eeb28db87f2f517eb8b9.1542794577.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: AM6PR0402CA0007.eurprd04.prod.outlook.com (2603:10a6:209::20) 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;BY1PR0701MB1287;6:CwAylWguZAstEmjCSnUMqKTLqBT0Hl0eBkNRLORTa72o5FhPtxjW98RJnee0zbodA1p1YY+q3zrdNUCtYoVyGvSrtqcIURYPkN8TWtVPhcLQpuV5/TYyGpgMTF/BjEPY4OzpuZOqBuUe+Wi4yk0Jd+5km0eKWyn36pd9GzDm0+OvE/DarlY8C9O3JI3DqzeqvvbL+k7H9hadPY1Vy2e5xkYCCicSJMkDDIjiEU8oTFxTwB6p1LVTkYJJ+lULimLcMDJyux26KeAg+8jThGN8H+udohwbNEPgYswQdG6iMN26wXqFi8MXtsMTguZT7KER3WI33CSolboj/0f0SMhqg48mZXaPvUC2zIyagBORXfxW4ieswEZ1A4tzgf9owszWE9gENoNiFE7bxweQAADt/0/ZvvhnMw0DSXGceC/GyqerLquczdi7wAvSGP44lWzdbnGxF4Sv62ZGaPPfVBOeCaO7vaAF7KuCbDlzIWaIo7E=;5:IqpsRtlKN4PumW0ZRiMWTO1k7bQ8KVIULJeYqcIry65EK5KdUViZo0gvvFSL70zYfJ8YRaaZLnodcayT9zDiR38do+6yPbkNgaJLby5lZq7OKIiAepSyFL9zHtVpY6OXig8GyHKOpiZQJagmr0O3824iVcpCHn+MwM/QDPzqjgc=;7:9hWI/S5M1uqIKaOWne1KtBc+Jlx4O57xjIIpTAF91TeZp+fRE40pUkhOXLMCnBXZyoruxBnx/62tEuL9eaPfzOWk5B0ZuZzY0dsYLsbv4ExSXNLP60kVYKBENlJmOg/ELn4JgpIFPWMyYGQ0vB1eRg== x-ms-office365-filtering-correlation-id: 21f8caa7-143a-4506-48fd-08d64f9a09ec x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390098)(7020095)(4652040)(8989299)(5600074)(711020)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020);SRVR:BY1PR0701MB1287; x-ms-traffictypediagnostic: BY1PR0701MB1287: x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(6040522)(2401047)(8121501046)(5005006)(3002001)(10201501046)(93006095)(93001095)(3231442)(944501410)(52105112)(148016)(149066)(150057)(6041310)(20161123560045)(20161123562045)(20161123558120)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699051)(76991095);SRVR:BY1PR0701MB1287;BCL:0;PCL:0;RULEID:;SRVR:BY1PR0701MB1287; x-forefront-prvs: 08635C03D4 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(39850400004)(396003)(346002)(136003)(366004)(376002)(189003)(199004)(106356001)(25786009)(66066001)(5660300001)(2906002)(7736002)(305945005)(97736004)(6512007)(2900100001)(2501003)(110136005)(2201001)(478600001)(36756003)(68736007)(54906003)(316002)(6436002)(14454004)(575784001)(105586002)(72206003)(14444005)(81156014)(386003)(6506007)(102836004)(4326008)(76176011)(81166006)(71200400001)(186003)(26005)(8676002)(8936002)(71190400001)(107886003)(99286004)(256004)(118296001)(52116002)(86362001)(44832011)(53936002)(6486002)(3846002)(6116002)(476003)(11346002)(486006)(2616005)(446003);DIR:OUT;SFP:1101;SCL:1;SRVR:BY1PR0701MB1287;H:BY1PR0701MB1660.namprd07.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: aquantia.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: 1Rm/Wlbj3yCq8jPDVIJKelUGg1nm7FCMvnlGExHYKiI3/V5L6gXwOg0K/2ow3oodP1xc51WfM+r3b3AfNC7+v5XZQ6WGnb1CCDi0EGOgGSS3mRLJxJiMwGYug1pjsTCP8nh9tw6mYMJXuL/goF/pxMiqkS150LCAHFmLsytrTxw8IGO6NRjH2PUb6hydw9Aq2qgjBynumgChBkQzAbiunu2NC4dsYdRtvgAGHtSE3zQOJzM8LEDqtiQXKhxf6zDjMaSyXzrEJuXXIcDFeHaNBDhYz59Bv3VI5I4SCWAX+Ows5VCHMsg0n0L4y5Xed1WCdR7B2svInwYzJ+qsNZhZKTwP3wO4QPxrLbJwPIzrXng= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 21f8caa7-143a-4506-48fd-08d64f9a09ec X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Nov 2018 10:13:53.4542 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 83e2e134-991c-4ede-8ced-34d47e38e6b1 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR0701MB1287 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 | 17 +++++++++++++++++ drivers/net/usb/aqc111.h | 12 +++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/drivers/net/usb/aqc111.c b/drivers/net/usb/aqc111.c index ace30b2db758..c2522d9c424e 100644 --- a/drivers/net/usb/aqc111.c +++ b/drivers/net/usb/aqc111.c @@ -452,6 +452,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; @@ -712,6 +713,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_cfg = AQ_PHY_POWER_EN; @@ -791,6 +793,7 @@ static int aqc111_rx_fixup(struct usbnet *dev, struct sk_buff *skb) u32 desc_offset = 0; /*RX Header Offset*/ u16 pkt_count = 0; u64 desc_hdr = 0; + u16 vlan_tag = 0; u32 skb_len = 0; if (!skb) @@ -863,6 +866,12 @@ static int aqc111_rx_fixup(struct usbnet *dev, struct sk_buff *skb) if (aqc111_data->rx_checksum) aqc111_rx_checksum(new_skb, pkt_desc); + if (*pkt_desc & AQ_RX_PD_VLAN) { + vlan_tag = *pkt_desc >> AQ_RX_PD_VLAN_SHIFT; + __vlan_hwaccel_put_tag(new_skb, htons(ETH_P_8021Q), + vlan_tag & VLAN_VID_MASK); + } + usbnet_skb_return(dev, new_skb); if (pkt_count == 0) break; @@ -890,6 +899,7 @@ static struct sk_buff *aqc111_tx_fixup(struct usbnet *dev, struct sk_buff *skb, int headroom = 0; int tailroom = 0; u64 tx_desc = 0; + u16 tci = 0; /*Length of actual data*/ tx_desc |= skb->len & AQ_TX_DESC_LEN_MASK; @@ -907,6 +917,13 @@ static struct sk_buff *aqc111_tx_fixup(struct usbnet *dev, struct sk_buff *skb, tx_desc |= AQ_TX_DESC_DROP_PADD; } + /* Vlan Tag */ + if (vlan_get_tag(skb, &tci) >= 0) { + tx_desc |= AQ_TX_DESC_VLAN; + tx_desc |= ((u64)tci & AQ_TX_DESC_VLAN_MASK) << + AQ_TX_DESC_VLAN_SHIFT; + } + 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 a57c1184c422..d09326d46273 100644 --- a/drivers/net/usb/aqc111.h +++ b/drivers/net/usb/aqc111.h @@ -26,12 +26,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 @@ -168,8 +173,11 @@ struct aqc111_data { /* TX Descriptor */ #define AQ_TX_DESC_LEN_MASK 0x1FFFFF #define AQ_TX_DESC_DROP_PADD BIT(28) +#define AQ_TX_DESC_VLAN BIT(29) #define AQ_TX_DESC_MSS_MASK 0x7FFF #define AQ_TX_DESC_MSS_SHIFT 0x20 +#define AQ_TX_DESC_VLAN_MASK 0xFFFF +#define AQ_TX_DESC_VLAN_SHIFT 0x30 #define AQ_RX_HW_PAD 0x02 @@ -183,10 +191,12 @@ struct aqc111_data { #define AQ_RX_PD_L3_IP 0x20 #define AQ_RX_PD_L3_IP6 0x40 +#define AQ_RX_PD_VLAN BIT(10) #define AQ_RX_PD_RX_OK BIT(11) #define AQ_RX_PD_DROP BIT(31) #define AQ_RX_PD_LEN_MASK 0x7FFF0000 #define AQ_RX_PD_LEN_SHIFT 0x10 +#define AQ_RX_PD_VLAN_SHIFT 0x20 /* RX Descriptor header */ #define AQ_RX_DH_PKT_CNT_MASK 0x1FFF