From patchwork Fri Oct 5 10:25:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Russkikh X-Patchwork-Id: 10627845 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 6C8A1184E 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 5CC9F28FD5 for ; Fri, 5 Oct 2018 10:25:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 512E628FEF; Fri, 5 Oct 2018 10:25:34 +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 ABAA028FE7 for ; Fri, 5 Oct 2018 10:25:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728500AbeJERXk (ORCPT ); Fri, 5 Oct 2018 13:23:40 -0400 Received: from mail-bl2nam02on0086.outbound.protection.outlook.com ([104.47.38.86]:26494 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727535AbeJERXj (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=itBi+jXBlaAWAPFZRdZRQiG646B9SCY8v2TnCTK9Rz4=; b=RDoErofjRSvAqW7ss5ErJ0/YeUn00SEzFJ6yskuOPEPQxcXrn448Shi9RzAhbiQdrN106cgKfdAdeQIn0Hc8gzNioZy/6iLKkEQUFJKufff1Qhzz5mgW0EqHAtKUzN3lC24yqGRDSVB7ZaHojliO2I3UGH2jI+ByFAXJi15TdOA= 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:15 +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:15 +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 14/19] net: usb: aqc111: Implement set_rx_mode callback Thread-Topic: [PATCH net-next 14/19] net: usb: aqc111: Implement set_rx_mode callback Thread-Index: AQHUXJW0RL638SKir0W/2MFfAcpOVQ== Date: Fri, 5 Oct 2018 10:25:15 +0000 Message-ID: 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:TBUO4BhSlpbV+yesTISDoDrsgBKV8S+xi/plYR9pikl6rOkOa4TdXhAF284HyH0Az1nO3rV34QSupBe+2uQPDnMugYX0xz6Lr5S9XSwKKD6i3qpwy5npJtoACYOCbnHncy1tl0RvNRO77BgllreO3C3qAbcZNQxlmhi2pVNb1czZnoGGcF0Beoa8MlhxVWD72UoIGEE5NgjK4avb/+B23M3dgB2EJT/BeXjSiisToFPCRp44s0creXZjnWzMY6XwbQA5X+L8rV/j1Hs1B2zUWzGk5LmKd7qLvmuDWc30Vw5lukysrRzSekjG3t3QVq14BXOCQBx5Wr0T9xF1prRAjZDwyqY2bgjbdzqCdC5kZjW2+4FlaZpRxqGheu10hgVZuU/xL4LVER/viCI6skuX8KAzncTYfKUgn1lVcDikbGlsWagGbCroe4/tQ3/slG3ZBSiC/zUWkoMTCl2fRyEiXg==;5:Bs3xxsBl4GA/UADD96TmLOxnFt7klYRQ7yFdhRKWTMfpWo4djjLkOptkb455QVUYnWpSsvGict/o3DPkxkrxIvWVaV3UTQ+H1lyZXwUQAF5wittvNKa1ZAPU6l/8RMH9TTIQxHp0PCzrn4/l0lb8ykInfw9I+iJ/q44Ynjd3VBc=;7:3HjRiK054RRxXHYVgGC2t0UaYuKO+npy8p4ZrybNvoz06Nz7SMhtkmFFBCDDeNnZvHYN5pXWo3eU/RXpv8SM3k/xhQVMF42olX/m0G1n0blEVV3C0Z7oMitP3uHoRv+7EpPuGaZg9XuHC4B64TyAYKCcjAfW1saTQnxn8dLqQ/M10987HQMlMGXHjeyrIV/+e176aygACeTDUaqCNBlbOu/cC8edMsRNWc+uns+7QPP9wEGC6Kh41And8GBqAjHw x-ms-office365-filtering-correlation-id: 11f16b19-a6a1-464b-14ae-08d62aacd6f6 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: WeIlyQSowRmIj5j1VdMKvlvpzROA9YzfiVZe4Bcwu/pcTZTNXZ4ClrayWN9XGmj/gJ9U6gefQr1PBBHlFZvXU6IIIOHz32flcnFcsEqOCLV6l3OAEeMJsIfhTJoBieNilQHybELwLhj+e2FJSXEsX5vAdlFt0QCHJ+yt+G+Kc5s4ctAuHNu+OgqJMYXU9O8pNepREVA5kP7w+IKnpX4QYbFIdOCccg/aGm2LxyvZRQUt+wFhJ/biJh2qXQIUWkvC3veqOhmCfahXHfDaDrrisrT7eZWGvQgN4DdBF+JzkiRgwtXdxgyEpudvxlMwg7LAp3vSYs0zWWbk1Nk8Xg9sQyK6KQtdckNdPS0rSkkDPJM= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 11f16b19-a6a1-464b-14ae-08d62aacd6f6 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Oct 2018 10:25:15.2915 (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 | 72 ++++++++++++++++++++++++++++++++++++++++++++---- drivers/net/usb/aqc111.h | 4 +++ 2 files changed, 71 insertions(+), 5 deletions(-) diff --git a/drivers/net/usb/aqc111.c b/drivers/net/usb/aqc111.c index f61fa7446b72..cc23c39beab3 100644 --- a/drivers/net/usb/aqc111.c +++ b/drivers/net/usb/aqc111.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -139,6 +140,24 @@ static int aqc111_write_cmd(struct usbnet *dev, u8 cmd, u16 value, return __aqc111_write_cmd(dev, cmd, value, index, size, data, 0); } +static void aqc111_write_cmd_async(struct usbnet *dev, u8 cmd, u16 value, + u16 index, u16 size, void *data) +{ + if (size == 2) { + u16 buf; + + buf = *((u16 *)data); + cpu_to_le16s(&buf); + usbnet_write_cmd_async(dev, cmd, USB_DIR_OUT | USB_TYPE_VENDOR | + USB_RECIP_DEVICE, value, index, &buf, + size); + } else { + usbnet_write_cmd_async(dev, cmd, USB_DIR_OUT | USB_TYPE_VENDOR | + USB_RECIP_DEVICE, value, index, data, + size); + } +} + static int aq_mdio_read_cmd(struct usbnet *dev, u16 value, u16 index, u16 size, void *data) { @@ -332,6 +351,44 @@ static int aqc111_set_mac_addr(struct net_device *net, void *p) ETH_ALEN, net->dev_addr); } +static void aqc111_set_rx_mode(struct net_device *net) +{ + struct usbnet *dev = netdev_priv(net); + struct aqc111_data *aqc111_data = (struct aqc111_data *)dev->data[0]; + u8 *m_filter = ((u8 *)dev->data) + 12; + int mc_count = 0; + + mc_count = netdev_mc_count(net); + + aqc111_data->rxctl &= ~(SFR_RX_CTL_PRO | SFR_RX_CTL_AMALL | + SFR_RX_CTL_AM); + + if (net->flags & IFF_PROMISC) { + aqc111_data->rxctl |= SFR_RX_CTL_PRO; + } else if ((net->flags & IFF_ALLMULTI) || mc_count > AQ_MAX_MCAST) { + aqc111_data->rxctl |= SFR_RX_CTL_AMALL; + } else if (!netdev_mc_empty(net)) { + u32 crc_bits = 0; + struct netdev_hw_addr *ha = NULL; + + memset(m_filter, 0, AQ_MCAST_FILTER_SIZE); + netdev_for_each_mc_addr(ha, net) { + crc_bits = ether_crc(ETH_ALEN, ha->addr) >> 26; + m_filter[crc_bits >> 3] |= BIT(crc_bits & 7); + } + + aqc111_write_cmd_async(dev, AQ_ACCESS_MAC, + SFR_MULTI_FILTER_ARRY, + AQ_MCAST_FILTER_SIZE, + AQ_MCAST_FILTER_SIZE, m_filter); + + aqc111_data->rxctl |= SFR_RX_CTL_AM; + } + + aqc111_write_cmd_async(dev, AQ_ACCESS_MAC, SFR_RX_CTL, + 2, 2, &aqc111_data->rxctl); +} + static int aqc111_set_features(struct net_device *net, netdev_features_t features) { @@ -381,6 +438,7 @@ static const struct net_device_ops aqc111_netdev_ops = { .ndo_change_mtu = aqc111_change_mtu, .ndo_set_mac_address = aqc111_set_mac_addr, .ndo_validate_addr = eth_validate_addr, + .ndo_set_rx_mode = aqc111_set_rx_mode, .ndo_set_features = aqc111_set_features, }; @@ -681,6 +739,7 @@ static int aqc111_link_reset(struct usbnet *dev) aqc111_write_cmd(dev, AQ_ACCESS_MAC, SFR_ARC_CTRL, 1, 1, ®8); reg16 = SFR_RX_CTL_IPE | SFR_RX_CTL_AB; + aqc111_data->rxctl = reg16; aqc111_write_cmd(dev, AQ_ACCESS_MAC, SFR_RX_CTL, 2, 2, ®16); reg8 = SFR_RX_PATH_READY; @@ -701,6 +760,8 @@ static int aqc111_link_reset(struct usbnet *dev) aqc111_configure_csum_offload(dev); + aqc111_set_rx_mode(dev->net); + aqc111_read_cmd(dev, AQ_ACCESS_MAC, SFR_MEDIUM_STATUS_MODE, 2, 2, ®16); @@ -712,8 +773,9 @@ static int aqc111_link_reset(struct usbnet *dev) aqc111_write_cmd(dev, AQ_ACCESS_MAC, SFR_MEDIUM_STATUS_MODE, 2, 2, ®16); - reg16 = SFR_RX_CTL_IPE | SFR_RX_CTL_AB | SFR_RX_CTL_START; - aqc111_write_cmd(dev, AQ_ACCESS_MAC, SFR_RX_CTL, 2, 2, ®16); + aqc111_data->rxctl |= SFR_RX_CTL_START; + aqc111_write_cmd(dev, AQ_ACCESS_MAC, SFR_RX_CTL, + 2, 2, &aqc111_data->rxctl); netif_carrier_on(dev->net); } else { @@ -723,9 +785,9 @@ static int aqc111_link_reset(struct usbnet *dev) aqc111_write_cmd(dev, AQ_ACCESS_MAC, SFR_MEDIUM_STATUS_MODE, 2, 2, ®16); - aqc111_read_cmd(dev, AQ_ACCESS_MAC, SFR_RX_CTL, 2, 2, ®16); - reg16 &= ~SFR_RX_CTL_START; - aqc111_write_cmd(dev, AQ_ACCESS_MAC, SFR_RX_CTL, 2, 2, ®16); + aqc111_data->rxctl &= ~SFR_RX_CTL_START; + aqc111_write_cmd(dev, AQ_ACCESS_MAC, SFR_RX_CTL, + 2, 2, &aqc111_data->rxctl); reg8 = SFR_BULK_OUT_FLUSH_EN | SFR_BULK_OUT_EFF_EN; aqc111_write_cmd(dev, AQ_ACCESS_MAC, SFR_BULK_OUT_CTRL, diff --git a/drivers/net/usb/aqc111.h b/drivers/net/usb/aqc111.h index 9cf357777df9..2f324ec66a65 100644 --- a/drivers/net/usb/aqc111.h +++ b/drivers/net/usb/aqc111.h @@ -12,6 +12,9 @@ #define URB_SIZE (1024 * 62) +#define AQ_MCAST_FILTER_SIZE 8 +#define AQ_MAX_MCAST 64 + #define AQ_ACCESS_MAC 0x01 #define AQ_FLASH_PARAMETERS 0x20 #define AQ_PHY_POWER 0x31 @@ -207,6 +210,7 @@ struct aqc111_phy_options { }; struct aqc111_data { + u16 rxctl; u8 rx_checksum; u8 link_speed; u8 link;