From patchwork Fri Oct 5 10:25:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Russkikh X-Patchwork-Id: 10627831 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 B0E50112B for ; Fri, 5 Oct 2018 10:25:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A1E1628FD5 for ; Fri, 5 Oct 2018 10:25:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 932ED28FE7; Fri, 5 Oct 2018 10:25:10 +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 0124528FD5 for ; Fri, 5 Oct 2018 10:25:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727848AbeJERXR (ORCPT ); Fri, 5 Oct 2018 13:23:17 -0400 Received: from mail-eopbgr720041.outbound.protection.outlook.com ([40.107.72.41]:60857 "EHLO NAM05-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727572AbeJERXR (ORCPT ); Fri, 5 Oct 2018 13:23:17 -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=Poky3KA/MjuS8P8kNc3gMJZ5t3/zVXpp9IfYYZFrsPk=; b=cnXPRSeqJTXkFZD6k12QCTM8wmKf8KD9d/+fGFSDh0oSlQEz0VcDKN6CeKs215PG9mR1Z35oVQ+kuxsNCs6shKiLxpGoWsRdkwv9ECG80dlrbYwINZdmVTjcNX/asT6DewsTX2EpBWtPa2C6Soj3Mk29OYjNRmiMtB2sQM8t/o4= Received: from BY1PR0701MB1660.namprd07.prod.outlook.com (10.162.110.22) by BY1PR0701MB1781.namprd07.prod.outlook.com (10.162.141.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1207.18; Fri, 5 Oct 2018 10:25:05 +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:05 +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 08/19] net: usb: aqc111: Implement TX data path Thread-Topic: [PATCH net-next 08/19] net: usb: aqc111: Implement TX data path Thread-Index: AQHUXJWskQtMqtUBZ0GTJUFhIAEBQA== Date: Fri, 5 Oct 2018 10:25:00 +0000 Message-ID: <65674cc0cd1b025d859b1b0a5410b21ca9f88176.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;BY1PR0701MB1781;6:G33s461ydaZYkaSfJdBlk5OqYSLnHqFIyDUgw58OwSuHUuD+dse9SbwZSfFCYYq7Uklayd2qL5fa+4DzH7CWUKL3ehpgYb/6kz9FizwZemkCcY8LC2N/jkHVy1Ko0o7oHEaB5nJgln/1nSVL6LZ6oJXGNhUQQ8S8iEHGL05J/5v3UGdUTy42kkjdioe3zzUexKQOybWj5TnyAneECgU+rS0OlVW6MnsuQru3qaa+kHyWCuebU2usoHarIvvmm+CUKtITUFLCMeeFKK8C87dnoOrwTBptUurKs+lLVRYn+wYz7xxgPQzlle1qDrpfgBxYlxw7F0NRoQP8NoIBwPMBkk9jYUuOqBuLOilRotgn0548Q3Z9rL+qiaEAf6ZcGSrFbcxa3mAfhQmsDaCKBo2wX0GpT1wQCKahs9qeCGQJFOiAIvaWhhIagoUcBaB3vJem98R0XEpog1St3P9ycnXvBQ==;5:u9VZthoUey0xJxWSvRYD43LZYs77AtLlx1oU26bDZTYkkoILfPw2EaGBPbbqXzbx1GiwN2GH4oQvjVxMxyInC3MrwBwOhjbLB+oVLINKhzqY6CJY/eS30quvY3mt/n4mgvGKIL5+tgCdUAcrom1Xv8vjsTJ9tH2Cj6/9zCF03Pw=;7:LepKxtiAOKdGtsPyNc8GMNF7QCo2ZlZ0tvqdEnUfAF8w9i7xefPKMUcMj8knNyy9p7anuJqHtObSe2fSPTkmtrQX0z23vWWKz0Z0kpwpc4cYpKmet4AXtfvkZdv3HeeB9lMM2/cxnzj850oBQOwjIcGrKcFSkRJ6oiuI4N5dXG3s0MNaH4+xnVG4ZsL5J2dZ7EyXTrG9VYZK4BKlnoD3NmwzhMSYV+JSQTgyqgXahQ7C0aoJepnkJzCCdnQk6wXZ x-ms-office365-filtering-correlation-id: 44704f22-1da1-4622-7cd6-08d62aacce32 x-microsoft-antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(2017052603328)(7153060)(7193020);SRVR:BY1PR0701MB1781; x-ms-traffictypediagnostic: BY1PR0701MB1781: 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)(5005006)(8121501046)(3231355)(944501410)(52105095)(3002001)(10201501046)(93006095)(93001095)(149066)(150057)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123562045)(201708071742011)(7699051);SRVR:BY1PR0701MB1781;BCL:0;PCL:0;RULEID:;SRVR:BY1PR0701MB1781; x-forefront-prvs: 0816F1D86E x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(396003)(376002)(136003)(366004)(39850400004)(346002)(189003)(199004)(305945005)(4326008)(7736002)(81166006)(81156014)(8676002)(97736004)(186003)(71200400001)(102836004)(6506007)(2906002)(386003)(76176011)(26005)(11346002)(107886003)(446003)(6512007)(2616005)(118296001)(476003)(5660300001)(6486002)(53936002)(68736007)(8936002)(5250100002)(6666003)(44832011)(66066001)(105586002)(486006)(106356001)(25786009)(6916009)(6436002)(71190400001)(72206003)(478600001)(2900100001)(14454004)(575784001)(6116002)(3846002)(86362001)(316002)(36756003)(99286004)(256004)(52116002)(14444005)(54906003);DIR:OUT;SFP:1101;SCL:1;SRVR:BY1PR0701MB1781;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: rp34q30aVlcS3kq9s+/SxBen1DwEr0AHR2I1OQZCI5Uuej1ZZTH+S765am+qyte6IaniISRqa8wa5Z3Vl8E6Py781mYM4mQUW57ZgSY1Zsod2Fhr/d6e6++gEaXxq3QkldJ/GAByRibxRioiUn/nA8rodY8CxvprrJDF0mMrgrfZ+NokILIxSw+GOwNnQ/U+VvxWNlplZ6Lsp36c60p3pqPq4B1N6W+IKoi720FiMkSXcwjFQtdVhd0mr9L4TIpZ94mOvfNnqSQ2+iCos7uYF3jRouvv6U5iMySFweVJNxYi7L2VT2WgYuYUJDf6dHaduCUep0qDTIsCFfJ9nqICRHnWHcI1mGndtK5N8KkkfOc= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 44704f22-1da1-4622-7cd6-08d62aacce32 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Oct 2018 10:25:00.7442 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 83e2e134-991c-4ede-8ced-34d47e38e6b1 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR0701MB1781 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 | 73 ++++++++++++++++++++++++++++++++++++++++++++++++ drivers/net/usb/aqc111.h | 22 +++++++++++++++ 2 files changed, 95 insertions(+) diff --git a/drivers/net/usb/aqc111.c b/drivers/net/usb/aqc111.c index 075f51cd04ab..46832fd56f0a 100644 --- a/drivers/net/usb/aqc111.c +++ b/drivers/net/usb/aqc111.c @@ -287,6 +287,9 @@ static int aqc111_set_mac_addr(struct net_device *net, void *p) static const struct net_device_ops aqc111_netdev_ops = { .ndo_open = usbnet_open, .ndo_stop = usbnet_stop, + .ndo_start_xmit = usbnet_start_xmit, + .ndo_tx_timeout = usbnet_tx_timeout, + .ndo_get_stats64 = usbnet_get_stats64, .ndo_set_mac_address = aqc111_set_mac_addr, .ndo_validate_addr = eth_validate_addr, }; @@ -359,8 +362,18 @@ static int aqc111_bind(struct usbnet *dev, struct usb_interface *intf) if (ret) goto out; + /* Set TX needed headroom & tailroom */ + dev->net->needed_headroom += AQ_TX_HEADER_SIZE; + dev->net->needed_tailroom += AQ_TX_HEADER_SIZE; + dev->net->netdev_ops = &aqc111_netdev_ops; + if (usb_device_no_sg_constraint(dev->udev)) + dev->can_dma_sg = 1; + + dev->net->hw_features |= AQ_SUPPORT_HW_FEATURE; + dev->net->features |= AQ_SUPPORT_FEATURE; + aqc111_read_fw_version(dev, aqc111_data); aqc111_data->autoneg = AUTONEG_ENABLE; aqc111_data->advertised_speed = (usb_speed == USB_SPEED_SUPER) ? @@ -608,6 +621,12 @@ static int aqc111_reset(struct usbnet *dev) usb_speed = dev->udev->speed; + if (usb_device_no_sg_constraint(dev->udev)) + dev->can_dma_sg = 1; + + dev->net->hw_features |= AQ_SUPPORT_HW_FEATURE; + dev->net->features |= AQ_SUPPORT_FEATURE; + /* Power up ethernet PHY */ aqc111_data->phy_ops.advertising = 0; aqc111_data->phy_ops.phy_ctrl1 = 0; @@ -689,6 +708,57 @@ static int aqc111_stop(struct usbnet *dev) return 0; } +static struct sk_buff *aqc111_tx_fixup(struct usbnet *dev, struct sk_buff *skb, + gfp_t flags) +{ + struct aq_tx_packet_desc tx_hdr; + int frame_size = dev->maxpacket; + int headroom = 0; + int tailroom = 0; + int padding_size = 0; + struct sk_buff *new_skb = NULL; + + memset(&tx_hdr, 0x00, sizeof(tx_hdr)); + + /*Length of actual data*/ + tx_hdr.length = (skb->len & 0x1FFFFF); + + headroom = (skb->len + AQ_TX_HEADER_SIZE) % 8; + if (headroom != 0) + padding_size = 8 - headroom; + + if (((skb->len + AQ_TX_HEADER_SIZE + padding_size) % frame_size) == 0) { + padding_size += 8; + tx_hdr.drop_padding = 1; + } + + if (!dev->can_dma_sg && (dev->net->features & NETIF_F_SG) && + skb_linearize(skb)) + return NULL; + + headroom = skb_headroom(skb); + tailroom = skb_tailroom(skb); + + if (!(headroom >= AQ_TX_HEADER_SIZE && tailroom >= padding_size)) { + new_skb = skb_copy_expand(skb, AQ_TX_HEADER_SIZE, + padding_size, flags); + dev_kfree_skb_any(skb); + skb = new_skb; + if (!skb) + return NULL; + } + if (padding_size != 0) + skb_put(skb, padding_size); + /* Copy TX header */ + skb_push(skb, AQ_TX_HEADER_SIZE); + cpu_to_le64s(&tx_hdr); + skb_copy_to_linear_data(skb, &tx_hdr, 8); + + usbnet_set_skb_tx_stats(skb, 1, 0); + + return skb; +} + static const struct driver_info aqc111_info = { .description = "Aquantia AQtion USB to 5GbE Controller", .bind = aqc111_bind, @@ -697,6 +767,9 @@ static const struct driver_info aqc111_info = { .link_reset = aqc111_link_reset, .reset = aqc111_reset, .stop = aqc111_stop, + .flags = FLAG_ETHER | FLAG_FRAMING_AX | + FLAG_AVOID_UNLINK_URBS | FLAG_MULTI_PACKET, + .tx_fixup = aqc111_tx_fixup, }; #define AQC111_USB_ETH_DEV(vid, pid, table) \ diff --git a/drivers/net/usb/aqc111.h b/drivers/net/usb/aqc111.h index 7ca5c5a6ec82..049012e26b26 100644 --- a/drivers/net/usb/aqc111.h +++ b/drivers/net/usb/aqc111.h @@ -60,6 +60,10 @@ #define AQ_USB_PHY_SET_TIMEOUT 10000 #define AQ_USB_SET_TIMEOUT 4000 +/* Feature. ********************************************/ +#define AQ_SUPPORT_FEATURE (NETIF_F_SG) +#define AQ_SUPPORT_HW_FEATURE (NETIF_F_SG) + /* SFR Reg. ********************************************/ #define SFR_GENERAL_STATUS 0x03 @@ -224,6 +228,24 @@ struct aqc111_int_data { #define AQ_INT_SPEED_1G 0x11 #define AQ_INT_SPEED_100M 0x13 +struct aq_tx_packet_desc { + struct { + u32 length:21; + u32 checksum:7; + u32 drop_padding:1; + u32 vlan_tag:1; + u32 cphi:1; + u32 dicf:1; + }; + struct { + u32 max_seg_size:15; + u32 reserved:1; + u32 vlan_info:16; + }; +}; + +#define AQ_TX_HEADER_SIZE sizeof(struct aq_tx_packet_desc) + static struct { unsigned char ctrl; unsigned char timer_l;