From patchwork Mon Nov 26 09:33:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Russkikh X-Patchwork-Id: 1003083 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=aquantia.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=AQUANTIA1COM.onmicrosoft.com header.i=@AQUANTIA1COM.onmicrosoft.com header.b="R2a+hKf1"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 433MDR0tcSz9s3C for ; Mon, 26 Nov 2018 20:33:43 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726509AbeKZU1M (ORCPT ); Mon, 26 Nov 2018 15:27:12 -0500 Received: from mail-eopbgr710071.outbound.protection.outlook.com ([40.107.71.71]:11008 "EHLO NAM05-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726266AbeKZU1L (ORCPT ); Mon, 26 Nov 2018 15:27:11 -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=PSezwCg4qt7D3MVYpaZNNyf7f/4nXoRTXSUklHj7tC8=; b=R2a+hKf10GU52MwVGuAikp2strG03kbjabdz0lkxjj3mD1yjQJYoURPvu0zKFeOPK4kt0Z2VsgDDEhC1bvITqdg9beNaUyeIkNPW3R6ZIFn6IsDK+YvW5vB5dxy7CUAmGKopFGgKgQVijm3iG/B2hTqcGZ+rnAJMT7/yiww9pyI= Received: from BY1PR0701MB1660.namprd07.prod.outlook.com (10.162.110.22) by BY1PR0701MB1894.namprd07.prod.outlook.com (10.162.143.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1361.18; Mon, 26 Nov 2018 09:33:38 +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.019; Mon, 26 Nov 2018 09:33:38 +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 v4 net-next 17/21] net: usb: aqc111: Initialize ethtool_ops structure Thread-Topic: [PATCH v4 net-next 17/21] net: usb: aqc111: Initialize ethtool_ops structure Thread-Index: AQHUhWsc7W+pWS5ICk6yDAYxz12N8A== Date: Mon, 26 Nov 2018 09:33:38 +0000 Message-ID: <393b443f043354b8e3cceb9ea20d19195766a2cc.1543224254.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: AM6PR03CA0024.eurprd03.prod.outlook.com (2603:10a6:20b::37) 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; BY1PR0701MB1894; 6:3JKPD+M9KRh/RwghEAuqJ8KNlAQHGRIt8mjMTAzK79LaARQBzOBOf5xx+K8Abco9yVS61RbQu+uIuhHAxxfKzdsTHZSve4GjCvFLkwW24wMsuBx2/mQdTmginDuoh4g0Xh3xSG52UdVP8QuGznQSwgfmTGRRNugD8EX8bp221Ieb8Nbt7/WmNbm9Z3DrCxfOk46AG2MxxHTdvZEmDPigsuLvAZJtW6qQ32yfiOwSECs2Z+iPknCAXkjyXmmBsetkMjMBQgOb7JSobKzoooRT7aOWrH2/f/B19o2dAqBJ/t12aS/+WW6HNADJVTLCEIho4bUhPCe5xD02wW0U5vYpCsVjx6AmA9kcZf5MNXceqbM1nWFdWpttwsjbeco89ClyJj4bJK5LLjJJ8lAn6f9vHAbnmbj7a/RpuseeXYv6QcyZMfVwGHjjaBGdeNlERFjf3mcyfNSX5O0/IywzvaGlDg==; 5:3MqRLj/vl2wxhjGzpewNzL5vqxpZQco4rtSTX5nLg08d5Cq165sQExsiKo5u2KRQAFY3eRtyLM0h70ejHBHkMQ3ry7ZS5dMNK2fpMnpkUawkCGqRJ8khz3ePUdg5zzFF0MDmc98/kAuVRY7zCFhspG9OPfZxA64WK7P3Fmbx+2I=; 7:oW//Krn0Uf9x2vht6780liem/0p/Lf9ylR4H7kKTAET8TX31Uu5eW8HHdbXKkb3X8TcgmRi7szO/K8RUTlB43BnnkRKOMhHNkFYA8rCSqy+tRm2IH70mplSbqMXvw6wCcO4+jYfjADwonKMv8N6PVg== x-ms-office365-filtering-correlation-id: 1765d080-ecb9-42dd-4123-08d653823e75 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:BY1PR0701MB1894; x-ms-traffictypediagnostic: BY1PR0701MB1894: 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)(3231443)(944501410)(52105112)(10201501046)(93006095)(93001095)(148016)(149066)(150057)(6041310)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(201708071742011)(7699051)(76991095); SRVR:BY1PR0701MB1894; BCL:0; PCL:0; RULEID:; SRVR:BY1PR0701MB1894; x-forefront-prvs: 086831DFB4 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39840400004)(376002)(396003)(136003)(366004)(346002)(199004)(189003)(14454004)(102836004)(97736004)(71200400001)(71190400001)(54906003)(6436002)(72206003)(105586002)(110136005)(11346002)(446003)(186003)(486006)(25786009)(2906002)(7736002)(86362001)(5660300001)(316002)(305945005)(2201001)(2501003)(53936002)(99286004)(36756003)(52116002)(6506007)(6116002)(76176011)(386003)(4326008)(3846002)(68736007)(6512007)(107886003)(476003)(81166006)(478600001)(118296001)(26005)(106356001)(8676002)(256004)(81156014)(2616005)(6486002)(66066001)(44832011)(8936002); DIR:OUT; SFP:1101; SCL:1; SRVR:BY1PR0701MB1894; 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: Gc9kjbZ8inkAOtrek+x+20Bhy4G/pI27GuFryG5O6LsU1pOpnLVX2cJnBMa/8g8EJ+AYYcUIYUDGLoxhUSmh5T5jovrEpphzpC5UfiPKeKSceZ398aY4npIFAZKwKcVizwukuV607FV8XE3v9C7ahlDM3ZShwIPcQKT1ysIhgmeLWcGSAuLsI1/E2N2gsAeVHR2oUqqo2Jyv+qsO6ez/PGKnkyIB7eVdKo9BewpM6EENhzrY0mBX9sPiCuwNs7JAC3yZmXdMN8RO8c4E3FWsjLnASiN61KTohnqELEFpWmFWcR1MwvtLrz2kVO81Q1S8ZxFqNpVrWjhTcm+nauPBCGMjO2EP2tCMnT1SV40nnjY= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1765d080-ecb9-42dd-4123-08d653823e75 X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Nov 2018 09:33:38.2604 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 83e2e134-991c-4ede-8ced-34d47e38e6b1 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR0701MB1894 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Dmitry Bezrukov Implement get_drvinfo, set/get_msglevel, get_link callbacks Signed-off-by: Dmitry Bezrukov Signed-off-by: Igor Russkikh --- drivers/net/usb/aqc111.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/drivers/net/usb/aqc111.c b/drivers/net/usb/aqc111.c index 3b42843d7017..9fc036d5354b 100644 --- a/drivers/net/usb/aqc111.c +++ b/drivers/net/usb/aqc111.c @@ -9,6 +9,7 @@ #include #include +#include #include #include #include @@ -18,6 +19,8 @@ #include "aqc111.h" +#define DRIVER_NAME "aqc111" + static int aqc111_read_cmd_nopm(struct usbnet *dev, u8 cmd, u16 value, u16 index, u16 size, void *data) { @@ -178,6 +181,23 @@ static int aqc111_write16_cmd_async(struct usbnet *dev, u8 cmd, u16 value, sizeof(tmp), &tmp); } +static void aqc111_get_drvinfo(struct net_device *net, + struct ethtool_drvinfo *info) +{ + struct usbnet *dev = netdev_priv(net); + struct aqc111_data *aqc111_data = dev->driver_priv; + + /* Inherit standard device info */ + usbnet_get_drvinfo(net, info); + strlcpy(info->driver, DRIVER_NAME, sizeof(info->driver)); + snprintf(info->fw_version, sizeof(info->fw_version), "%u.%u.%u", + aqc111_data->fw_ver.major, + aqc111_data->fw_ver.minor, + aqc111_data->fw_ver.rev); + info->eedump_len = 0x00; + info->regdump_len = 0x00; +} + static void aqc111_set_phy_speed(struct usbnet *dev, u8 autoneg, u16 speed) { struct aqc111_data *aqc111_data = dev->driver_priv; @@ -225,6 +245,13 @@ static void aqc111_set_phy_speed(struct usbnet *dev, u8 autoneg, u16 speed) aqc111_write32_cmd(dev, AQ_PHY_OPS, 0, 0, &aqc111_data->phy_cfg); } +static const struct ethtool_ops aqc111_ethtool_ops = { + .get_drvinfo = aqc111_get_drvinfo, + .get_msglevel = usbnet_get_msglevel, + .set_msglevel = usbnet_set_msglevel, + .get_link = ethtool_op_get_link, +}; + static int aqc111_change_mtu(struct net_device *net, int new_mtu) { struct usbnet *dev = netdev_priv(net); @@ -533,6 +560,7 @@ static int aqc111_bind(struct usbnet *dev, struct usb_interface *intf) dev->net->max_mtu = 16334; dev->net->netdev_ops = &aqc111_netdev_ops; + dev->net->ethtool_ops = &aqc111_ethtool_ops; if (usb_device_no_sg_constraint(dev->udev)) dev->can_dma_sg = 1;