From patchwork Wed Nov 21 10:13:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Russkikh X-Patchwork-Id: 10692255 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 C5A4213BB for ; Wed, 21 Nov 2018 10:13:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B239D29412 for ; Wed, 21 Nov 2018 10:13:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A53612975D; Wed, 21 Nov 2018 10:13:57 +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 3606729412 for ; Wed, 21 Nov 2018 10:13:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729234AbeKUUrn (ORCPT ); Wed, 21 Nov 2018 15:47:43 -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 S1726792AbeKUUrm (ORCPT ); Wed, 21 Nov 2018 15:47:42 -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=I50eVvR1tbq1jcLEA72jRZke77xpMhuyRuAS1fr7yNM=; b=D8HouW1Mx4lFBsg/KapRxSEQS6YsEPXrWdIaxU+3OtPkb9AFaamTL7AmXv4gCMszK5ALvoxhyUcFNPVabgHB7fUqAqlT2IGWvNZLjR02IBu/Br2ZN5mVfku9Xgp3SqrTzNVRuHKV+C6Y3Qwm8Ah/JHrr7AkzGozJ03jih2izLEw= 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:48 +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:49 +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 13/21] net: usb: aqc111: Add support for TSO Thread-Topic: [PATCH v3 net-next 13/21] net: usb: aqc111: Add support for TSO Thread-Index: AQHUgYLlQ6F67Aw+NEiwuf6+PZurHQ== Date: Wed, 21 Nov 2018 10:13:48 +0000 Message-ID: <913d4885a93b10a9ff4d8f1de318cefa54c803e6.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:dOXb+MGmNk+eab6AjAKIOnfciwl6Ei8Sj7LlcBeYHvvkht5o8e3RV9lHXqtdt0YIxqADcK2x1DY+JyBeDB4F5SxOkHZA4e4bNaZkXJgej1TT1oVotjoVHiraFzZypdMr9DsLl2nXuWk/TcGISAPIh0ZJEI6jUULs3zHNiLLjz+a64Ea6nOIn/7qGZ7YDUfVd9lYF+kR+hRYkzrMdL9mCujRKCAEMoqfE3LWYz1ZlsfITCuTZmYxgdgL/ZXPFRatIN0qcmLr8ezqcpQzFvK/o9ULp+dTYTrJaG/mWsLf78gn5PyJO9RBkeiJ32vohfIJgOEr1HPv6WIWnlTplbUWWt33+Nllehjt514TjwK65GgNGUpJSy+qDUZOlbmlGvX5L0CRTpu/DCEmahctKRamxvnPD+TSGJsZNIpcVYM84/qNdprcEAyLXTLeyaK7Q5aBODV6cRxU211WRVTBI0K8djg==;5:1Ky/CTYKP5GOcSn+zJutpqtJ7wojASKgj+TttxvppCOryRhG+qUdjtShxZO9J7GaXAhz49ml7nUbWzNkbBQ9CkSy5zHgLcivzhYuf4YXbGL1pVc4dp+X5MUYnDMAqtp3HtVT0iL3Kl+1YNkxF7kU9cSU2iFSoyUrG2cWE2IDGLQ=;7:Xduvk9S+8kPGe0RgUNqYICHGx3S3qF0KniSE2VxV28pXRcmV5jZMHdHsb+LiHaxly6u0RIP4deLDa1+m60VUsVjiuhwfMCvrYqoA9KA6rOohNjrfLRygK6oBD94mOL6CB9lfrILf8u0Px3Ckn5D/gQ== x-ms-office365-filtering-correlation-id: a1585240-eec8-4fa6-9a20-08d64f9a075c 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)(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: RPJN3P6Wetk8md46gcrFNUv6bxEL6s+ADa57EpuuEJn1KYPu0VX0xA5n03hS9uaRcTr8jskwHg4B87A9a4XfFmxspMwVW3BreHWB7gjJ6V5rXegMrP5SZIVybTp6/pfaVa7v/pKYTmJLPeeDO+8f3QekqUpynDVs24/hULFeCnKSvh2jI7thrSRpT9kRK96Y+nyZa+/4UAGj2xh4qw4y2lraNeO3q34Gg83ZNIuf2kI1dhJFuwXJ/S2NdVQ5296GvSLdAOKzMLCu+iGWZBUzSEzmss/lwrDNlVWQIZb0WR3vy7pNILfVVaj4JknzbZ+DH28bR19TZ9qilSYIVOFFNVjWDKQzcGo3NU6kmrDGUkU= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-Network-Message-Id: a1585240-eec8-4fa6-9a20-08d64f9a075c X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Nov 2018 10:13:48.8914 (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 | 4 ++++ drivers/net/usb/aqc111.h | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/net/usb/aqc111.c b/drivers/net/usb/aqc111.c index 36d0da6efbed..4bb493c7224f 100644 --- a/drivers/net/usb/aqc111.c +++ b/drivers/net/usb/aqc111.c @@ -832,6 +832,10 @@ static struct sk_buff *aqc111_tx_fixup(struct usbnet *dev, struct sk_buff *skb, /*Length of actual data*/ tx_desc |= skb->len & AQ_TX_DESC_LEN_MASK; + /* TSO MSS */ + tx_desc |= ((u64)(skb_shinfo(skb)->gso_size & AQ_TX_DESC_MSS_MASK)) << + AQ_TX_DESC_MSS_SHIFT; + headroom = (skb->len + sizeof(tx_desc)) % 8; if (headroom != 0) padding_size = 8 - headroom; diff --git a/drivers/net/usb/aqc111.h b/drivers/net/usb/aqc111.h index 165cdb8b022c..a7a333914461 100644 --- a/drivers/net/usb/aqc111.h +++ b/drivers/net/usb/aqc111.h @@ -22,10 +22,12 @@ /* Feature. ********************************************/ #define AQ_SUPPORT_FEATURE (NETIF_F_SG | NETIF_F_IP_CSUM |\ - NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM) + NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM |\ + NETIF_F_TSO) #define AQ_SUPPORT_HW_FEATURE (NETIF_F_SG | NETIF_F_IP_CSUM |\ - NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM) + NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM |\ + NETIF_F_TSO) /* SFR Reg. ********************************************/ @@ -162,6 +164,8 @@ struct aqc111_data { /* TX Descriptor */ #define AQ_TX_DESC_LEN_MASK 0x1FFFFF #define AQ_TX_DESC_DROP_PADD BIT(28) +#define AQ_TX_DESC_MSS_MASK 0x7FFF +#define AQ_TX_DESC_MSS_SHIFT 0x20 #define AQ_RX_HW_PAD 0x02