From patchwork Fri Oct 5 10:25:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Russkikh X-Patchwork-Id: 10627835 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 BD7B915A6 for ; Fri, 5 Oct 2018 10:25:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B147A28FD5 for ; Fri, 5 Oct 2018 10:25:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A562C28FEF; Fri, 5 Oct 2018 10:25:19 +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 0F76528FD5 for ; Fri, 5 Oct 2018 10:25:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727958AbeJERXV (ORCPT ); Fri, 5 Oct 2018 13:23:21 -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 S1727572AbeJERXV (ORCPT ); Fri, 5 Oct 2018 13:23:21 -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=jh/Q1M3NhQz9BZL4iuxxXGpo0Rh2Mqs3gM/fjrekj+o=; b=dO/smp9XGuNn5rjGCLEtWCiLzIFdGWELCJwCLGMeUq20NB1Nol6KxBh3Bi5I7ENIzoFzLw61sj1MzoXBZrnP0zxa8vWDytO9TK51c7p+DJIaamkrzAhrAolrnrSkAWO3vDevB/yeKDwjXPhC5h4LU0ak0JYI0Dp0mBQeu2IeZ2Q= 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:06 +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:06 +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 09/19] net: usb: aqc111: Implement RX data path Thread-Topic: [PATCH net-next 09/19] net: usb: aqc111: Implement RX data path Thread-Index: AQHUXJWtHVnyRkM7bE+Q/Cy3fGadwg== Date: Fri, 5 Oct 2018 10:25:03 +0000 Message-ID: <81aef6c50a93d22c6b91e966c89d7520dcbaaf87.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:61veZCxOwlTg+z7sN0U+JPJ+s2CN9UGIyzmgQkcZvbshuHLbguPbfLfNX8oJbgLpsiogJBv2UiLz9GLwr5w/ELU/QvrDXA70s+6ed1VYFOpkIwJjiYKCaB9+WIatBbBGHUz/HDsnYn4eSTgrul6+eEcrTcyFFchefysIva2Zyvaf5QEXk1FsNaO6q2gV1IhP6H9zOptt72d8LMRfnBWnEf/6J+ls92rCvmZX8YFkxVFRgsNafhO+i87ycKk746yv8M54AAP1+uIcB5VFzAfCmK+wZrTLsvU0mjDp6qjzEvFd35cg17NCH9/FDNxMRLHKzP91ZbTc3z/IY2LD/P91Jd/Ec9sfmWKaAdqPJEIX20WH0PjrPboROK6WNzms26tr140xOR5qhGRLvg5Qn1DFbKBQ5tQ0x14Asuax2KpBe5caxgRm6y2QzKSjx+kpLgrx2Lgv0sWtQI7V0sh4EiYKkg==;5:JT1jQONQTppHiAaCW4t3I0zH2j32Sx83wz6uQD1jAji7c5v7YD64IFCOvwUoJ5tJPa04USVjX49TRwTDGp3/hjRDCI+rSTGQ0Y8Clq1ZymQeYMXXwwXhksy0FogUBEl1qaEFfsnSV0jVUWjVO5HUdjh5i7dwZ1lyQjSs98LmUNg=;7:ep71ifhw5TjwMXSTbWnr5um+QUlsIrNnNB4G9SGXh4B093NmvEFurq20nJweyLIeOYsIXN7CFVNQQua7BskmAzN7sWk1Idst1qH1ghBjUergJ+TGYRNzZHYTxLGwOItCuI6xdLo4WoqRv7GO8NyIvRggeIVETle4ZElw7qF8IZRQ9+N/KNNG+x5zX/3mNkaPZHzYnS74QPgWumPsmpT8CY4A8zZE+JJcqjNyt22q42pMfcfSMEVaR/v6Y6Yu6FGH x-ms-office365-filtering-correlation-id: 3ab7c105-741b-4958-d129-08d62aaccfa8 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: KxgAp7RMPHQx5v31hOg1KewCR4uMFngfMSJtRxE7pqM7XOeynGhQOprlLGaq8TFu/uhuEEMqzqLv7c9A7BKp17pMLZR6WYXAy/mmIwlk/H/MYy0z5dMBYWVNT/YFcMukB5mu4uNTUmRwAHzcl8RVoo5izRYvAkZfV43BJq4v0uxqbBVAmVoz3Gmbrl1q/UjdfuqV5h5rszmqyLY6sitBKl8MO4NVwTL7oo6OJ0qmr2yQjlzDL/bUBmjfc4WIFJi5Tt/mBAzqSOKZ9DIwwAhOz/ApNHCu/bD260f+r5vAwEpDdL9tKyOz1dqpAj9sgJIqXu2sKno0DZC3azT082SQFA== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3ab7c105-741b-4958-d129-08d62aaccfa8 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Oct 2018 10:25:03.2286 (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 | 100 +++++++++++++++++++++++++++++++++++++++++++++++ drivers/net/usb/aqc111.h | 39 ++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/drivers/net/usb/aqc111.c b/drivers/net/usb/aqc111.c index 46832fd56f0a..fc068e731335 100644 --- a/drivers/net/usb/aqc111.c +++ b/drivers/net/usb/aqc111.c @@ -362,6 +362,9 @@ static int aqc111_bind(struct usbnet *dev, struct usb_interface *intf) if (ret) goto out; + /* Set Rx urb size */ + dev->rx_urb_size = URB_SIZE; + /* Set TX needed headroom & tailroom */ dev->net->needed_headroom += AQ_TX_HEADER_SIZE; dev->net->needed_tailroom += AQ_TX_HEADER_SIZE; @@ -621,6 +624,8 @@ static int aqc111_reset(struct usbnet *dev) usb_speed = dev->udev->speed; + dev->rx_urb_size = URB_SIZE; + if (usb_device_no_sg_constraint(dev->udev)) dev->can_dma_sg = 1; @@ -708,6 +713,100 @@ static int aqc111_stop(struct usbnet *dev) return 0; } +static int aqc111_rx_fixup(struct usbnet *dev, struct sk_buff *skb) +{ + struct sk_buff *new_skb = NULL; + u32 skb_len = 0; + u32 desc_offset = 0; /*RX Header Offset*/ + u32 start_of_descs = 0; + u16 pkt_count = 0; + u32 pkt_total_offset = 0; + struct aq_rx_packet_desc *pkt_desc = NULL; + struct aq_rx_desc_header desc_hdr; + + if (!skb) + goto err; + + if (skb->len == 0) + goto err; + + skb_len = skb->len; + /* RX Offset Header */ + skb_trim(skb, skb->len - sizeof(struct aq_rx_desc_header)); + memcpy(&desc_hdr, skb_tail_pointer(skb), + sizeof(struct aq_rx_desc_header)); + le64_to_cpus(&desc_hdr); + + /* Check these packets */ + desc_offset = (u32)desc_hdr.desc_offset; + pkt_count = desc_hdr.pkt_count; + start_of_descs = skb_len - ((pkt_count + 1) * + sizeof(struct aq_rx_desc_header)); + + /* self check descs position */ + if (start_of_descs != desc_offset) + goto err; + + /* self check desc_offset from header*/ + if (desc_offset >= skb_len) + goto err; + + if (pkt_count == 0) + goto err; + + /* Get the first RX packet header */ + pkt_desc = (struct aq_rx_packet_desc *)(skb->data + desc_offset); + + while (pkt_count--) { + u32 pkt_len = (u32)(pkt_desc->length & 0x7FFF); + u32 pkt_len_with_padd = ((pkt_len + 7) & 0x7FFF8); + + le64_to_cpus(pkt_desc); + + pkt_total_offset += pkt_len_with_padd; + if (pkt_total_offset > desc_offset || + (pkt_count == 0 && pkt_total_offset != desc_offset)) { + goto err; + } + + if (pkt_desc->drop || !pkt_desc->rx_ok || + pkt_len > (dev->hard_mtu + AQ_RX_HW_PAD)) { + skb_pull(skb, pkt_len_with_padd); + /* Next RX Packet Header */ + pkt_desc++; + continue; + } + + /* Clone SKB */ + new_skb = skb_clone(skb, GFP_ATOMIC); + + if (!new_skb) + goto err; + + new_skb->len = pkt_len; + skb_pull(new_skb, AQ_RX_HW_PAD); + skb_set_tail_pointer(new_skb, new_skb->len); + + new_skb->truesize = new_skb->len + sizeof(struct sk_buff); + + usbnet_skb_return(dev, new_skb); + if (pkt_count == 0) + break; + + skb_pull(skb, pkt_len_with_padd); + + /* Next RX Packet Header */ + pkt_desc++; + + new_skb = NULL; + } + + return 1; + +err: + return 0; +} + static struct sk_buff *aqc111_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags) { @@ -769,6 +868,7 @@ static const struct driver_info aqc111_info = { .stop = aqc111_stop, .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_AVOID_UNLINK_URBS | FLAG_MULTI_PACKET, + .rx_fixup = aqc111_rx_fixup, .tx_fixup = aqc111_tx_fixup, }; diff --git a/drivers/net/usb/aqc111.h b/drivers/net/usb/aqc111.h index 049012e26b26..679ca9f992f7 100644 --- a/drivers/net/usb/aqc111.h +++ b/drivers/net/usb/aqc111.h @@ -10,6 +10,8 @@ #ifndef __LINUX_USBNET_AQC111_H #define __LINUX_USBNET_AQC111_H +#define URB_SIZE (1024 * 62) + #define AQ_ACCESS_MAC 0x01 #define AQ_FLASH_PARAMETERS 0x20 #define AQ_PHY_POWER 0x31 @@ -228,6 +230,8 @@ struct aqc111_int_data { #define AQ_INT_SPEED_1G 0x11 #define AQ_INT_SPEED_100M 0x13 +#define AQ_RX_HW_PAD 0x02 + struct aq_tx_packet_desc { struct { u32 length:21; @@ -246,6 +250,41 @@ struct aq_tx_packet_desc { #define AQ_TX_HEADER_SIZE sizeof(struct aq_tx_packet_desc) +struct aq_rx_packet_desc { + struct { + u16 l4_err:1; + u16 l3_err:1; + u16 l4_pkt_type:3; + u16 l3_pkt_type:2; + u16 ce:1; + u16 tco_match:1; + u16 node_id_match:1; + u16 vlan_ind : 1; + u16 rx_ok:1; + u16 reserved1 : 3; + u16 bmc:1; + }; + struct { + u16 length:15; + u16 drop:1; + }; + u16 vlan_tag; + struct { + u8 wuf_detect:1; + u8 wuf_wake:1; + u8 wuf_ind:6; + u8 reserved2:8; + }; +}; + +struct aq_rx_desc_header { + struct { + u32 pkt_count:13; + u32 desc_offset:19; + }; + u32 rx_throughput; +}; + static struct { unsigned char ctrl; unsigned char timer_l;