From patchwork Fri Oct 5 10:24:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Russkikh X-Patchwork-Id: 10627841 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 87B5115A6 for ; Fri, 5 Oct 2018 10:25:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7A57A28FD5 for ; Fri, 5 Oct 2018 10:25:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6EA9128FEF; Fri, 5 Oct 2018 10:25:28 +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 BA55128FD5 for ; Fri, 5 Oct 2018 10:25:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728361AbeJERX3 (ORCPT ); Fri, 5 Oct 2018 13:23:29 -0400 Received: from mail-bl2nam02on0081.outbound.protection.outlook.com ([104.47.38.81]:6901 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728325AbeJERX2 (ORCPT ); Fri, 5 Oct 2018 13:23:28 -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=dDB5MXhpj3pmbu9KEg/2w6dpA3H3OocI4Q/svGjXSrU=; b=khsgpWC3EjSlCnEeAOnAwa3P9YpJkmWc7ZkioX2ZQ4FjfHYL+HiXm9HMV9dZnhGRTmx6a8jIWZfYrZxRRqFyLFEYazscIt7akjWvmv7+6x2SjWnv7TCfwh8mmI8zeykmvyqg93nCKF5Fb/q/YZMvNzPRsFnG1fREFMLg9Qcz6mQ= 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:53 +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:53 +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 05/19] net: usb: aqc111: Introduce PHY access Thread-Topic: [PATCH net-next 05/19] net: usb: aqc111: Introduce PHY access Thread-Index: AQHUXJWnbMH19LOOjk6SmoUJV2lZjQ== Date: Fri, 5 Oct 2018 10:24:53 +0000 Message-ID: <6b4837b970d7709bc2e11d89a7e21e5f10584e30.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;BY1PR0701MB1641;6:HnOe2WRZtktCZp16Hij2H7C+ao9MDGQ3r0sbpNzhIGEFNXYkxh0qtYCK6VvkxbA3JrW8W4GX1awy0sttUCDblOXbHdUOQBAMDFeiOCeywFEKpHKKFuvgoAQzbK78J2G8LOAUw7yXOtXdJnlbtQKaGIYbQojENsdcFk5yDzahKhdN/ggS0chiuSJangL7sUv1eOhePd2sphil89mjIXi5V8jKbJZEnzjBraOYeHUG1zhXIDFOziGZtZ4ge8mydkkNcYthMw+nP4892yz1HnO091qAjq5f1VdiyvPBI7McXONE0MdtsepN3yKmIcmqacjMNt9n/YsL2qMV2Lfx5FdP9aIlRTMoqyQ1/nhqMqxg78SaeDOtgDHMJ5rErQqlcZe7B7OAlHj9SqO0fGeKmqQyx9xZGcG4RtCO5nSWZmrNKW9zVd0YHdROM9eeZ6bikIc3cjKPlnzrifJXLllO3BF+LA==;5:TjC44tgM/FPhi4XswCYUbvK0V7HmQaAgLnh5mJCni/tr5mDBAMrXQhf8Yie0M7lo8NIwSUSZSZ1eLPR0HOZFi7tgOuQ4mj4BfizjnytRf6DZzVO0bHyRHn2QBWCnd7yHdM/59q6mOmfZXPa1XuaO+AY+dxlVP9YvY1vF5Ea86p0=;7:x6CgIZqIz8qUHMNBq2P1GXk7VSPXQ0dh81c5j0jtwFjVXNeH+Ei3N7j+/hOS26EDKTEukxYJfN1Wc5aNH4s8mxiWbdfJG82zRUGaCUZWKH2vuU477pST2+bKAEqe8XHmFB6tyw6P3NCtl2S8aAYnVagHR+hc02NlhoY9kWv+JaIZpCXmG5ZLUkJFWrt5QKpqIZ+ntkxnTbjTaT2lPCQYQvs4LaRKIWlKaX6FySdQN+f0UoiZ7SB5vPoJoSlDKrH9 x-ms-office365-filtering-correlation-id: 1bf88636-5075-4e28-4479-08d62aacc9d4 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: DhkuOjYHSGbvR0fwHGE6Zyz6tdnogrysXj6a1XYv5RqxK2zKPMHFWTHIv+rVWQ+M3SJCuO/AIFhk0gJN8ErnjMIk7GfaLKnweqs14krcFAG/uGa/ZYw3qVuSVGBOXq+JjCyBFMX4CAK18tZlO0uiiIUYMobAuDSEyZTIIWE5e2pzqRAUacF23Xc1jVakK0TaJ8kd6rnhvMufEH61rbZurQojxUHc34teQrb+0ta20A/lBKodWp61zvfS1q+R6/3hhTtgQDs3/jQslkltgitF0iOHU2Il0yP2WwbUOH4+A5T8bQJbEwe6G2sFJ9u5guJ5LfDC79CKtMjFPI2qxOfdVCH/RW7lM4T8tPbFtMMYUHY= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1bf88636-5075-4e28-4479-08d62aacc9d4 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Oct 2018 10:24:53.3377 (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 Implement PHY power up/down sequences. AQC111, depending on FW used, may has PHY being controlled either directly (dpa = 1) or via vendor command interface (dpa = 0). Drivers supports both themes. We determine this from firmware versioning agreement. Signed-off-by: Dmitry Bezrukov Signed-off-by: Igor Russkikh --- drivers/net/usb/aqc111.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++ drivers/net/usb/aqc111.h | 70 ++++++++++++++++++++++++++++++++++++ 2 files changed, 163 insertions(+) diff --git a/drivers/net/usb/aqc111.c b/drivers/net/usb/aqc111.c index 22bb259d71fb..30219bb6ddfd 100644 --- a/drivers/net/usb/aqc111.c +++ b/drivers/net/usb/aqc111.c @@ -138,15 +138,44 @@ static int aqc111_write_cmd(struct usbnet *dev, u8 cmd, u16 value, return __aqc111_write_cmd(dev, cmd, value, index, size, data, 0); } +static int aq_mdio_read_cmd(struct usbnet *dev, u16 value, u16 index, + u16 size, void *data) +{ + return aqc111_read_cmd(dev, AQ_PHY_CMD, value, index, size, data); +} + +static int aq_mdio_write_cmd(struct usbnet *dev, u16 value, u16 index, + u16 size, void *data) +{ + return aqc111_write_cmd(dev, AQ_PHY_CMD, value, index, size, data); +} + static const struct net_device_ops aqc111_netdev_ops = { .ndo_open = usbnet_open, .ndo_stop = usbnet_stop, }; +static void aqc111_read_fw_version(struct usbnet *dev, + struct aqc111_data *aqc111_data) +{ + aqc111_read_cmd(dev, AQ_ACCESS_MAC, AQ_FW_VER_MAJOR, + 1, 1, &aqc111_data->fw_ver.major); + aqc111_read_cmd(dev, AQ_ACCESS_MAC, AQ_FW_VER_MINOR, + 1, 1, &aqc111_data->fw_ver.minor); + aqc111_read_cmd(dev, AQ_ACCESS_MAC, AQ_FW_VER_REV, + 1, 1, &aqc111_data->fw_ver.rev); + + if (aqc111_data->fw_ver.major & 0x80) + aqc111_data->fw_ver.major &= ~0x80; + else + aqc111_data->dpa = 1; +} + static int aqc111_bind(struct usbnet *dev, struct usb_interface *intf) { int ret; struct usb_device *udev = interface_to_usbdev(intf); + struct aqc111_data *aqc111_data; /* Check if vendor configuration */ if (udev->actconfig->desc.bConfigurationValue != 1) { @@ -162,8 +191,18 @@ static int aqc111_bind(struct usbnet *dev, struct usb_interface *intf) return ret; } + aqc111_data = kzalloc(sizeof(*aqc111_data), GFP_KERNEL); + if (!aqc111_data) + return -ENOMEM; + + /* store aqc111_data pointer in device data field */ + dev->data[0] = (unsigned long)aqc111_data; + memset(aqc111_data, 0, sizeof(*aqc111_data)); + dev->net->netdev_ops = &aqc111_netdev_ops; + aqc111_read_fw_version(dev, aqc111_data); + return 0; } @@ -172,6 +211,8 @@ static void aqc111_unbind(struct usbnet *dev, struct usb_interface *intf) u8 reg8; u16 reg16; + struct aqc111_data *aqc111_data = (struct aqc111_data *)dev->data[0]; + /* Force bz */ reg16 = SFR_PHYPWR_RSTCTL_BZ; aqc111_write_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_PHYPWR_RSTCTL, @@ -179,12 +220,52 @@ static void aqc111_unbind(struct usbnet *dev, struct usb_interface *intf) reg16 = 0; aqc111_write_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_PHYPWR_RSTCTL, 2, 2, ®16); + + /* Power down ethernet PHY */ + if (aqc111_data->dpa) { + reg8 = 0x00; + aqc111_write_cmd_nopm(dev, AQ_PHY_POWER, 0, + 0, 1, ®8); + } else { + aqc111_data->phy_ops.low_power = 1; + aqc111_data->phy_ops.phy_power = 0; + aqc111_write_cmd_nopm(dev, AQ_PHY_OPS, 0, 0, + 4, &aqc111_data->phy_ops); + } + + kfree(aqc111_data); } static int aqc111_reset(struct usbnet *dev) { u8 reg8 = 0; u16 reg16 = 0; + struct aqc111_data *aqc111_data = (struct aqc111_data *)dev->data[0]; + + /* Power up ethernet PHY */ + aqc111_data->phy_ops.phy_ctrl1 = 0; + aqc111_data->phy_ops.phy_ctrl2 = 0; + + aqc111_data->phy_ops.phy_power = 1; + if (aqc111_data->dpa) { + aqc111_read_cmd(dev, AQ_PHY_POWER, 0, 0, 1, ®8); + if (reg8 == 0x00) { + reg8 = 0x02; + aqc111_write_cmd(dev, AQ_PHY_POWER, 0, 0, 1, ®8); + msleep(200); + } + + aq_mdio_read_cmd(dev, AQ_GLB_STD_CTRL_REG, AQ_PHY_GLOBAL_ADDR, + 2, ®16); + if (reg16 & AQ_PHY_LOW_POWER_MODE) { + reg16 &= ~AQ_PHY_LOW_POWER_MODE; + aq_mdio_write_cmd(dev, AQ_GLB_STD_CTRL_REG, + AQ_PHY_GLOBAL_ADDR, 2, ®16); + } + } else { + aqc111_write_cmd(dev, AQ_PHY_OPS, 0, 0, + 4, &aqc111_data->phy_ops); + } reg8 = 0xFF; aqc111_write_cmd(dev, AQ_ACCESS_MAC, SFR_BM_INT_MASK, 1, 1, ®8); @@ -204,6 +285,7 @@ static int aqc111_reset(struct usbnet *dev) static int aqc111_stop(struct usbnet *dev) { u16 reg16 = 0; + struct aqc111_data *aqc111_data = (struct aqc111_data *)dev->data[0]; aqc111_read_cmd(dev, AQ_ACCESS_MAC, SFR_MEDIUM_STATUS_MODE, 2, 2, ®16); @@ -214,6 +296,17 @@ static int aqc111_stop(struct usbnet *dev) aqc111_write_cmd(dev, AQ_ACCESS_MAC, SFR_RX_CTL, 2, 2, ®16); + /* Put PHY to low power*/ + if (aqc111_data->dpa) { + reg16 = AQ_PHY_LOW_POWER_MODE; + aq_mdio_write_cmd(dev, AQ_GLB_STD_CTRL_REG, AQ_PHY_GLOBAL_ADDR, + 2, ®16); + } else { + aqc111_data->phy_ops.low_power = 1; + aqc111_write_cmd(dev, AQ_PHY_OPS, 0, 0, + 4, &aqc111_data->phy_ops); + } + return 0; } diff --git a/drivers/net/usb/aqc111.h b/drivers/net/usb/aqc111.h index 6b34202fa22b..8738d2c4ae90 100644 --- a/drivers/net/usb/aqc111.h +++ b/drivers/net/usb/aqc111.h @@ -12,6 +12,17 @@ #define AQ_ACCESS_MAC 0x01 #define AQ_PHY_POWER 0x31 +#define AQ_PHY_CMD 0x32 +#define AQ_PHY_OPS 0x61 + +#define AQC111_PHY_ID 0x00 +#define AQ_PHY_ADDR(mmd) ((AQC111_PHY_ID << 8) | mmd) + +#define AQ_PHY_GLOBAL_MMD 0x1E +#define AQ_PHY_GLOBAL_ADDR AQ_PHY_ADDR(AQ_PHY_GLOBAL_MMD) + +#define AQ_GLB_STD_CTRL_REG 0x0000 + #define AQ_PHY_LOW_POWER_MODE 0x0800 #define AQ_USB_PHY_SET_TIMEOUT 10000 #define AQ_USB_SET_TIMEOUT 4000 @@ -102,6 +113,65 @@ #define SFR_BULK_OUT_FLUSH_EN 0x01 #define SFR_BULK_OUT_EFF_EN 0x02 +#define AQ_FW_VER_MAJOR 0xDA +#define AQ_FW_VER_MINOR 0xDB +#define AQ_FW_VER_REV 0xDC + +/******************************************************************************/ + +struct aqc111_phy_options { + union { + struct { + u8 adv_100M: 1; + u8 adv_1G: 1; + u8 adv_2G5: 1; + u8 adv_5G: 1; + u8 rsvd1: 4; + }; + u8 advertising; + }; + union { + struct { + u8 eee_100M: 1; + u8 eee_1G: 1; + u8 eee_2G5: 1; + u8 eee_5G: 1; + u8 rsvd2: 4; + }; + u8 eee; + }; + union { + struct { + u8 pause: 1; + u8 asym_pause: 1; + u8 low_power: 1; + u8 phy_power: 1; + u8 wol: 1; + u8 downshift: 1; + u8 rsvd4: 2; + }; + u8 phy_ctrl1; + }; + union { + struct { + u8 dsh_ret_cnt: 4; + u8 magic_packet:1; + u8 rsvd5: 3; + }; + u8 phy_ctrl2; + }; +}; + +struct aqc111_data { + struct { + u8 major; + u8 minor; + u8 rev; + } fw_ver; + u8 dpa; /*direct PHY access*/ + struct aqc111_phy_options phy_ops; +} __packed; + static struct { unsigned char ctrl; unsigned char timer_l;