From patchwork Fri Oct 5 10:24:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Russkikh X-Patchwork-Id: 10627857 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 317E015A6 for ; Fri, 5 Oct 2018 10:25:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 22F1428FD5 for ; Fri, 5 Oct 2018 10:25:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1708328FEF; Fri, 5 Oct 2018 10:25:53 +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 D59CB28FD5 for ; Fri, 5 Oct 2018 10:25:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728431AbeJERXh (ORCPT ); Fri, 5 Oct 2018 13:23:37 -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 S1727601AbeJERXg (ORCPT ); Fri, 5 Oct 2018 13:23:36 -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=1AEOvRnw0ShJCh44U/wrkfGgZsFEgFNF56E6fg9EVrU=; b=CQdJect0gLFjacKvMZNNMfmceXX2lj/usyOZiNXMVnDSYCYcmr+pMX5J1eRvFptWOkJG+f8VZnkaHA3873hW+f+gXMw+SaTDQIncmmRYhtwjYnK7CzJshhp3Q7sxrFSGSrTSFsUGsliSwWJ+2IaIu/XcaMrYmnNBSPStbPcVHfg= 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:24:44 +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:24:44 +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 03/19] net: usb: aqc111: Add implementation of read and write commands Thread-Topic: [PATCH net-next 03/19] net: usb: aqc111: Add implementation of read and write commands Thread-Index: AQHUXJWiGx+E4yv7+0qn4xmIjlMPkQ== Date: Fri, 5 Oct 2018 10:24:44 +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:tpwx+ChDL0dOPgTUxLhiDdMl9Qs/Q3RdGYzDG8pXAU7l1wJrKjI7Jjy25DX0bQYHUyH9R6WurFm6JJnZcNaRtBINuEpfvromnXOL0mKqam1DipZAZPQJ6QYuLwLSUhkdl+G31L74vXDMVUe3hp0d1ucuHcbfL50iayit6yl/5gT0o6jnRfZXV6dRr2wd/tjyfibhh1w/Qii6eskDpY8sI7/ZWF+qpfBFBg+XWONgwzsSkd4UePbSe51b1d+aaR2XICQhNpROlAKgcwOulQZQ+QSXYPjI72vq6V7RXUKsaaerqlpi2XWaqK5S4yYp095fSpguutDqeoSnXDTaVnT34GMTx4qi+iqxib+40bmGsCAmFOx0wvxC76qL70QG1fC7dWLGDMtFOaWkxcujfNkv1Z8KuDfChfKJ+/zGRqXu5fOj45u9TmbltJVlY2F+H5Sg1rKHz7lMn2jNAZtm0hnIWw==;5:FpE1vUZZequ3yOuPi3NcS03h6K9eMPNRmEY5nMD0eTScQ9jsr1qXrj1tDle/fhtL0AvBhWoPfYX3Zb4jAO6VR/H2BZtcNAPwwULZvZZicp6G/uBxo5zf8Iet3aelwEg4LNz8VhVf2c1TJE5gXCGXSEN4YbL9xvwcxaCZaLwjpZs=;7:dqJuY+7CZkicgW9VLbMaojQgQMIGATuH53xWeXXX7x0DIQI0nScx/7GrYZhYFGhTBch1NPvw88ST9KliVpxXsLwCG2RULgui5GtjboK/LxvXG195gahmew2jhU94+Cj5JSjosI4lwfxTVqC0f7ISMbh8AlXkxRCYmxjHLexHPQhVMcqVIAhhjsBD3/mLszb8DJWBIjiTSh67jyeZRX9HsVis0x7BFpccO+FouWlR9VQAL3utHJjPVujt5VVkRQ8R x-ms-office365-filtering-correlation-id: 396ebeda-5156-425b-2754-08d62aacc4b0 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:(112561432440764); 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)(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: WA/Ykj+BS44bTM1HvGkhN3PBRkB3KXlhbxDFyTFEDzTYtp1DIaOBeg9nqTMmaW8XQLoDUIhBZWSU+7nx6MaeSFZV0BzPVCMvSOOpzQwxTdqJXouriESXGofoA7K82rGnTee7ZbP+APHc335nbkYj1atHVtCkmlpGunuZUmdqONx3vLivSDgVEMuHUjIrG0IOjg5GjRX4/cpfDO3zyCLAbbgYnZOdNOIieG9wnjwMyDXv6CsoM7dModdMsCekno6mrH/E7RLclAa/QT+uekjRnMEAvZfTKFlVfxYKM5XDHNvSax+0PHAj7+5hAb2Q0lhAVdsUUXP4ptfhIUwHPhp/G9xSIUYomAhlETVl+pDVyCI= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 396ebeda-5156-425b-2754-08d62aacc4b0 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Oct 2018 10:24:44.7905 (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 Read/write command register defines and functions Signed-off-by: Dmitry Bezrukov Signed-off-by: Igor Russkikh --- drivers/net/usb/aqc111.c | 124 +++++++++++++++++++++++++++++++++++++++++++++++ drivers/net/usb/aqc111.h | 19 ++++++++ 2 files changed, 143 insertions(+) create mode 100644 drivers/net/usb/aqc111.h diff --git a/drivers/net/usb/aqc111.c b/drivers/net/usb/aqc111.c index c914e19387f2..7f3e5a615750 100644 --- a/drivers/net/usb/aqc111.c +++ b/drivers/net/usb/aqc111.c @@ -14,6 +14,130 @@ #include #include +#include "aqc111.h" + +static int __aqc111_read_cmd(struct usbnet *dev, u8 cmd, u16 value, + u16 index, u16 size, void *data, int nopm) +{ + int ret; + int (*fn)(struct usbnet *dev, u8 cmd, u8 reqtype, u16 value, + u16 index, void *data, u16 size); + + if (nopm) + fn = usbnet_read_cmd_nopm; + else + fn = usbnet_read_cmd; + + ret = fn(dev, cmd, USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, + value, index, data, size); + if (size == 2) + le16_to_cpus(data); + + if (unlikely(ret < 0)) + netdev_warn(dev->net, + "Failed to read(0x%x) reg index 0x%04x: %d\n", + cmd, index, ret); + return ret; +} + +static int aqc111_read_cmd_nopm(struct usbnet *dev, u8 cmd, u16 value, + u16 index, u16 size, void *data) +{ + return __aqc111_read_cmd(dev, cmd, value, index, size, data, 1); +} + +static int aqc111_read_cmd(struct usbnet *dev, u8 cmd, u16 value, + u16 index, u16 size, void *data) +{ + return __aqc111_read_cmd(dev, cmd, value, index, size, data, 0); +} + +static int __aq_write_cmd(struct usbnet *dev, u8 cmd, u8 reqtype, + u16 value, u16 index, const void *data, u16 size) +{ + void *buf = NULL; + int err = -ENOMEM; + + netdev_dbg(dev->net, + "%s cmd=%#x reqtype=%#x value=%#x index=%#x size=%d\n", + __func__, cmd, reqtype, value, index, size); + + if (data) { + buf = kmemdup(data, size, GFP_KERNEL); + if (!buf) + goto out; + } + + if (size == 2) + cpu_to_le16s(buf); + else if (size == 4) + cpu_to_le32s(buf); + + err = usb_control_msg(dev->udev, usb_sndctrlpipe(dev->udev, 0), + cmd, reqtype, value, index, buf, size, + (cmd == AQ_PHY_POWER) ? AQ_USB_PHY_SET_TIMEOUT : + AQ_USB_SET_TIMEOUT); + + kfree(buf); + +out: + return err; +} + +static int aq_write_cmd_nopm(struct usbnet *dev, u8 cmd, u8 reqtype, + u16 value, u16 index, const void *data, u16 size) +{ + return __aq_write_cmd(dev, cmd, reqtype, value, index, + data, size); +} + +static int aq_write_cmd(struct usbnet *dev, u8 cmd, u8 reqtype, + u16 value, u16 index, const void *data, u16 size) +{ + int ret; + + if (usb_autopm_get_interface(dev->intf) < 0) + return -ENODEV; + ret = __aq_write_cmd(dev, cmd, reqtype, value, index, data, size); + usb_autopm_put_interface(dev->intf); + return ret; +} + +static int __aqc111_write_cmd(struct usbnet *dev, u8 cmd, u16 value, + u16 index, u16 size, void *data, int nopm) +{ + int ret; + int (*fn)(struct usbnet *dev, u8 cmd, u8 reqtype, u16 value, + u16 index, const void *data, u16 size); + + if (nopm) + fn = aq_write_cmd_nopm; + else + fn = aq_write_cmd; + + ret = fn(dev, cmd, USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, + value, index, data, size); + + if (unlikely(ret < 0)) + netdev_warn(dev->net, + "Failed to write(0x%x) reg 0x%04x: %d\n", + cmd, value, ret); + + return ret; +} + +static int aqc111_write_cmd_nopm(struct usbnet *dev, u8 cmd, u16 value, + u16 index, u16 size, void *data) +{ + return __aqc111_write_cmd(dev, cmd, value, index, size, data, 1); +} + +static int aqc111_write_cmd(struct usbnet *dev, u8 cmd, u16 value, + u16 index, u16 size, void *data) +{ + return __aqc111_write_cmd(dev, cmd, value, index, size, data, 0); +} + static const struct net_device_ops aqc111_netdev_ops = { .ndo_open = usbnet_open, .ndo_stop = usbnet_stop, diff --git a/drivers/net/usb/aqc111.h b/drivers/net/usb/aqc111.h new file mode 100644 index 000000000000..1698a6a104fe --- /dev/null +++ b/drivers/net/usb/aqc111.h @@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later + * Aquantia Corp. Aquantia AQtion USB to 5GbE Controller + * Copyright (C) 2003-2005 David Hollis + * Copyright (C) 2005 Phil Chang + * Copyright (C) 2002-2003 TiVo Inc. + * Copyright (C) 2017-2018 ASIX + * Copyright (C) 2018 Aquantia Corp. + */ + +#ifndef __LINUX_USBNET_AQC111_H +#define __LINUX_USBNET_AQC111_H + +#define AQ_PHY_POWER 0x31 + +#define AQ_USB_PHY_SET_TIMEOUT 10000 +#define AQ_USB_SET_TIMEOUT 4000 + +#endif /* __LINUX_USBNET_AQC111_H */ +