From patchwork Fri Oct 5 10:24:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Russkikh X-Patchwork-Id: 10627839 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 30EC015A6 for ; Fri, 5 Oct 2018 10:25:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 20B7B28FD5 for ; Fri, 5 Oct 2018 10:25:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1507E28FEF; Fri, 5 Oct 2018 10:25:26 +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 06C9828FD5 for ; Fri, 5 Oct 2018 10:25:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728379AbeJERXa (ORCPT ); Fri, 5 Oct 2018 13:23:30 -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 S1727535AbeJERX3 (ORCPT ); Fri, 5 Oct 2018 13:23:29 -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=NNKL1wpkAudQGKXCQHNJ3ufcmN1oBnCMZ9Bn/YVGIFc=; b=BKgucqzwncUX3vI/IP3wfGao67s19ZME5zeuzdEtCCxO9YhydPG23wK0aj2kyEfS1K4WYqLew9IvdmZkSjnuppYVDPgKSmyhjRfVSvbe9DNAC5jz+0/3ba1rP7ncJDH6GQIlnbMAsqV7lBdGMNPtTOelesgC5X+zw5fu2HQpGAA= 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:56 +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:55 +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 06/19] net: usb: aqc111: Introduce link management Thread-Topic: [PATCH net-next 06/19] net: usb: aqc111: Introduce link management Thread-Index: AQHUXJWpOxNZRzWMWk6UuLXYxo5ppg== Date: Fri, 5 Oct 2018 10:24:55 +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:SRdKJoETbTaUWW0C7yV6bAfI+g/SVjTmw/eb7sq4Kmip3iFa/3lF/mhuXMVyqbdSayf5mYx2LuvU6gWoSqrYK6gYlqIU4qRB8XlY0VsAYO2Szf4zAFVnIjBF4XhIY4blTZEa9cetyvO4fwQdTQXpnIUW8wyy1nouYFOOjbigfjU5kkV+FOm+un2J2ei+GNWGb2/lJp0bzQ8aAJwmNSbvvZmApHCK/0y8R1Jp9+LEv0jMzTVeAT9BYTSL2cUhrqTGLHSa5jmBjH3OiCtMoukg58UXtUzRi1AOHvlWohow2t1WQDs1ssf+gAqS6tfu427ZppowKtBen9pDOGlq7XVH+Vvhywb9/d/jv0Zxm5iQmb0ARukIZDXoQ/LhBxCZH+8HiF+7vxyN4+mGGkIvXTUgRk1BGBKMhIjzrMkqw6iwRkVxXaY/aTUF0p90uE4Vz3+XNhdK3gRBZA5SksMoN+cjrw==;5:5R5J5jPCIfl+HxyqczS4d6a5ayyqC3haafW2GYOLHSKs9JOVKazj9ttowXB8hjOJet7pJ5G+D8ebu8scW54KESLkHELTYDLY1GQ4QFVF5SSLtObB89N6ruQlRrB7P0Hx16cyFgBbcuxcyh0xM9+9yCb9IwzB+PhCQhrLqKXCSJ0=;7:PwjKLCBEy/SZ4BGiqLzFCMEOzGpVTiCmoZGXlC6HYjL/I0j59mGyPRXKLye5CVssNnaSIl2GtgI72+MErjIDIDU9jRk3JFi8WV2Zb5G1YSV+1lixbprtXLUnQ//dQZKrfRm0Qs5EbNmpVt5XIcLiHs6FppemRp9i2a5pcyQ2rk4W0UUu23Ht03zaNY1JsJpg8UhzIp6EH81FOQe3M4Q77H8eI9xT/xcg1nlHREUWS9csHdCOBiGC/UBQr3vtik8P x-ms-office365-filtering-correlation-id: 575248c6-5e0c-4f30-acfc-08d62aaccb3e 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)(4744004)(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: Fbw3u94eAllqGHVj4K83Vk0YbnodBq+EggqYLSgHoAGnl7Pr0Rii4Y41sYYLchmYDtAjq03WAxwgSIIPRdO160V5iiRP5Cz8QBOoXFmsnMDmxL4UM4NNcyaWGOI6/BOhtU5Fu5EV+RTyvDtmnkwkgmpOyAIkcwSyyqXqCYupyiRNmzj0nB4d9FVupZ0n3fKoMbZQXbNJfdZzGzG7H3OwJF9Ld1HdyMlp41RK6KAszaQRLHZAuImSJfJ8wXJUdACR3jdtVZZKGR5IKdZoFoI5MRDmgkBd8CPx3qncojjIXq6lq7jAbiouDLGKBPscOsXsCh2NkEAqYUFpACT4NBfwIWi1Fb4oEW/v+r3ryhOg1bg= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 575248c6-5e0c-4f30-acfc-08d62aaccb3e X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Oct 2018 10:24:55.8221 (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 Add full hardware initialization sequence and link configuration logic Signed-off-by: Dmitry Bezrukov Signed-off-by: Igor Russkikh --- drivers/net/usb/aqc111.c | 330 +++++++++++++++++++++++++++++++++++++++++++++++ drivers/net/usb/aqc111.h | 51 ++++++++ 2 files changed, 381 insertions(+) diff --git a/drivers/net/usb/aqc111.c b/drivers/net/usb/aqc111.c index 30219bb6ddfd..1d366f4a1c51 100644 --- a/drivers/net/usb/aqc111.c +++ b/drivers/net/usb/aqc111.c @@ -150,6 +150,122 @@ static int aq_mdio_write_cmd(struct usbnet *dev, u16 value, u16 index, return aqc111_write_cmd(dev, AQ_PHY_CMD, value, index, size, data); } +static void aqc111_set_phy_speed_fw_iface(struct usbnet *dev, + struct aqc111_data *aqc111_data) +{ + aqc111_write_cmd(dev, AQ_PHY_OPS, 0, 0, 4, &aqc111_data->phy_ops); +} + +static void aqc111_set_phy_speed_direct(struct usbnet *dev, + struct aqc111_data *aqc111_data) +{ + u16 reg16_1 = 0; + u16 reg16_2 = 0; + u16 reg16_3 = 0; + + /* Disable auto-negotiation */ + reg16_1 = AQ_ANEG_EX_PAGE_CTRL; + aq_mdio_write_cmd(dev, AQ_AUTONEG_STD_CTRL_REG, AQ_PHY_AUTONEG_ADDR, + 2, ®16_1); + + reg16_1 = AQ_ANEG_EX_PHY_ID | AQ_ANEG_ADV_AQRATE; + if (aqc111_data->phy_ops.downshift) { + reg16_1 |= AQ_ANEG_EN_DSH; + reg16_1 |= aqc111_data->phy_ops.dsh_ret_cnt & 0x0F; + } + + reg16_2 = AQ_ANEG_ADV_LT; + if (aqc111_data->phy_ops.pause) + reg16_3 |= AQ_ANEG_PAUSE; + + if (aqc111_data->phy_ops.asym_pause) + reg16_3 |= AQ_ANEG_ASYM_PAUSE; + + if (aqc111_data->phy_ops.adv_5G) { + reg16_1 |= AQ_ANEG_ADV_5G_N; + reg16_2 |= AQ_ANEG_ADV_5G_T; + } + if (aqc111_data->phy_ops.adv_2G5) { + reg16_1 |= AQ_ANEG_ADV_2G5_N; + reg16_2 |= AQ_ANEG_ADV_2G5_T; + } + if (aqc111_data->phy_ops.adv_1G) + reg16_1 |= AQ_ANEG_ADV_1G; + + if (aqc111_data->phy_ops.adv_5G) + reg16_3 |= AQ_ANEG_100M; + + aq_mdio_write_cmd(dev, AQ_AUTONEG_VEN_PROV1_REG, + AQ_PHY_AUTONEG_ADDR, 2, ®16_1); + aq_mdio_write_cmd(dev, AQ_AUTONEG_10GT_CTRL_REG, + AQ_PHY_AUTONEG_ADDR, 2, ®16_2); + + aq_mdio_read_cmd(dev, AQ_AUTONEG_ADV_REG, AQ_PHY_AUTONEG_ADDR, + 2, ®16_1); + reg16_1 &= ~AQ_ANEG_ABILITY_MASK; + reg16_1 |= reg16_3; + aq_mdio_write_cmd(dev, AQ_AUTONEG_ADV_REG, AQ_PHY_AUTONEG_ADDR, + 2, ®16_1); + + /* Restart auto-negotiation */ + reg16_1 = AQ_ANEG_EX_PAGE_CTRL | AQ_ANEG_EN_ANEG | + AQ_ANEG_RESTART_ANEG; + + aq_mdio_write_cmd(dev, AQ_AUTONEG_STD_CTRL_REG, + AQ_PHY_AUTONEG_ADDR, 2, ®16_1); +} + +static void aqc111_set_phy_speed(struct usbnet *dev, u8 autoneg, u16 speed) +{ + struct aqc111_data *aqc111_data = (struct aqc111_data *)dev->data[0]; + + aqc111_data->phy_ops.advertising = 0; + aqc111_data->phy_ops.pause = 1; + aqc111_data->phy_ops.asym_pause = 1; + aqc111_data->phy_ops.downshift = 1; + aqc111_data->phy_ops.dsh_ret_cnt = 3; + if (autoneg == AUTONEG_ENABLE) { + switch (speed) { + case SPEED_5000: + aqc111_data->phy_ops.adv_5G = 1; + case SPEED_2500: + aqc111_data->phy_ops.adv_2G5 = 1; + case SPEED_1000: + aqc111_data->phy_ops.adv_1G = 1; + case SPEED_100: + aqc111_data->phy_ops.adv_100M = 1; + } + } else { + switch (speed) { + case SPEED_5000: + { + aqc111_data->phy_ops.adv_5G = 1; + break; + } + case SPEED_2500: + { + aqc111_data->phy_ops.adv_2G5 = 1; + break; + } + case SPEED_1000: + { + aqc111_data->phy_ops.adv_1G = 1; + break; + } + case SPEED_100: + { + aqc111_data->phy_ops.adv_100M = 1; + break; + } + } + } + + if (aqc111_data->dpa) + aqc111_set_phy_speed_direct(dev, aqc111_data); + else + aqc111_set_phy_speed_fw_iface(dev, aqc111_data); +} + static const struct net_device_ops aqc111_netdev_ops = { .ndo_open = usbnet_open, .ndo_stop = usbnet_stop, @@ -176,6 +292,7 @@ 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; + enum usb_device_speed usb_speed = dev->udev->speed; /* Check if vendor configuration */ if (udev->actconfig->desc.bConfigurationValue != 1) { @@ -202,6 +319,9 @@ static int aqc111_bind(struct usbnet *dev, struct usb_interface *intf) dev->net->netdev_ops = &aqc111_netdev_ops; aqc111_read_fw_version(dev, aqc111_data); + aqc111_data->autoneg = AUTONEG_ENABLE; + aqc111_data->advertised_speed = (usb_speed == USB_SPEED_SUPER) ? + SPEED_5000 : SPEED_1000; return 0; } @@ -227,6 +347,7 @@ static void aqc111_unbind(struct usbnet *dev, struct usb_interface *intf) aqc111_write_cmd_nopm(dev, AQ_PHY_POWER, 0, 0, 1, ®8); } else { + aqc111_data->phy_ops.advertising = 0; aqc111_data->phy_ops.low_power = 1; aqc111_data->phy_ops.phy_power = 0; aqc111_write_cmd_nopm(dev, AQ_PHY_OPS, 0, 0, @@ -236,13 +357,212 @@ static void aqc111_unbind(struct usbnet *dev, struct usb_interface *intf) kfree(aqc111_data); } +static void aqc111_status(struct usbnet *dev, struct urb *urb) +{ + struct aqc111_int_data *event = NULL; + struct aqc111_data *aqc111_data = (struct aqc111_data *)dev->data[0]; + int link = 0; + + if (urb->actual_length < 8) + return; + + event = urb->transfer_buffer; + + if (event->link_status) + link = 1; + else + link = 0; + + aqc111_data->link_speed = event->link_speed; + aqc111_data->link = link; + + if (netif_carrier_ok(dev->net) != link) + usbnet_defer_kevent(dev, EVENT_LINK_RESET); +} + +static void aqc111_configure_rx(struct usbnet *dev, + struct aqc111_data *aqc111_data) +{ + u8 reg8 = 0; + u8 queue_num = 0; + u16 reg16 = 0; + u16 link_speed = 0, usb_host = 0; + u8 buf[5] = { 0 }; + enum usb_device_speed usb_speed = dev->udev->speed; + + buf[0] = 0x00; + buf[1] = 0xF8; + buf[2] = 0x07; + switch (aqc111_data->link_speed) { + case AQ_INT_SPEED_5G: + { + link_speed = 5000; + reg8 = 0x05; + reg16 = 0x001F; + break; + } + case AQ_INT_SPEED_2_5G: + { + link_speed = 2500; + reg16 = 0x003F; + break; + } + case AQ_INT_SPEED_1G: + { + link_speed = 1000; + reg16 = 0x009F; + break; + } + case AQ_INT_SPEED_100M: + { + link_speed = 100; + queue_num = 1; + reg16 = 0x063F; + buf[1] = 0xFB; + buf[2] = 0x4; + break; + } + } + + if (aqc111_data->dpa) { + /* Set Phy Flow control */ + aq_mdio_write_cmd(dev, AQ_GLB_ING_PAUSE_CTRL_REG, + AQ_PHY_AUTONEG_ADDR, 2, ®16); + aq_mdio_write_cmd(dev, AQ_GLB_EGR_PAUSE_CTRL_REG, + AQ_PHY_AUTONEG_ADDR, 2, ®16); + } + + aqc111_write_cmd(dev, AQ_ACCESS_MAC, SFR_INTER_PACKET_GAP_0, + 1, 1, ®8); + + aqc111_write_cmd(dev, AQ_ACCESS_MAC, SFR_TX_PAUSE_RESEND_T, 3, 3, buf); + + switch (usb_speed) { + case USB_SPEED_SUPER: + { + usb_host = 3; + break; + } + case USB_SPEED_HIGH: + { + usb_host = 2; + break; + } + case USB_SPEED_FULL: + case USB_SPEED_LOW: + { + usb_host = 1; + queue_num = 0; + break; + } + default: + { + usb_host = 0; + break; + } + } + + memcpy(buf, &AQC111_BULKIN_SIZE[queue_num], 5); + /* RX bulk configuration */ + aqc111_write_cmd(dev, AQ_ACCESS_MAC, SFR_RX_BULKIN_QCTRL, 5, 5, buf); + + /* Set high low water level */ + reg16 = 0x0810; + + aqc111_write_cmd(dev, AQ_ACCESS_MAC, SFR_PAUSE_WATERLVL_LOW, + 2, 2, ®16); + netdev_info(dev->net, "Link Speed %d, USB %d", link_speed, usb_host); +} + +static int aqc111_link_reset(struct usbnet *dev) +{ + u8 reg8 = 0; + u16 reg16 = 0; + struct aqc111_data *aqc111_data = (struct aqc111_data *)dev->data[0]; + + if (aqc111_data->link == 1) { /* Link up */ + aqc111_configure_rx(dev, aqc111_data); + + /* Vlan Tag Filter */ + reg8 = SFR_VLAN_CONTROL_VSO; + + aqc111_write_cmd(dev, AQ_ACCESS_MAC, SFR_VLAN_ID_CONTROL, + 1, 1, ®8); + + reg8 = 0x0; + aqc111_write_cmd(dev, AQ_ACCESS_MAC, SFR_BMRX_DMA_CONTROL, + 1, 1, ®8); + + aqc111_write_cmd(dev, AQ_ACCESS_MAC, SFR_BMTX_DMA_CONTROL, + 1, 1, ®8); + + aqc111_write_cmd(dev, AQ_ACCESS_MAC, SFR_ARC_CTRL, 1, 1, ®8); + + reg16 = SFR_RX_CTL_IPE | SFR_RX_CTL_AB; + aqc111_write_cmd(dev, AQ_ACCESS_MAC, SFR_RX_CTL, 2, 2, ®16); + + reg8 = SFR_RX_PATH_READY; + aqc111_write_cmd(dev, AQ_ACCESS_MAC, SFR_ETH_MAC_PATH, + 1, 1, ®8); + + reg8 = SFR_BULK_OUT_EFF_EN; + aqc111_write_cmd(dev, AQ_ACCESS_MAC, SFR_BULK_OUT_CTRL, + 1, 1, ®8); + + reg16 = 0; + aqc111_write_cmd(dev, AQ_ACCESS_MAC, SFR_MEDIUM_STATUS_MODE, + 2, 2, ®16); + + reg16 = SFR_MEDIUM_XGMIIMODE | SFR_MEDIUM_FULL_DUPLEX; + aqc111_write_cmd(dev, AQ_ACCESS_MAC, SFR_MEDIUM_STATUS_MODE, + 2, 2, ®16); + + aqc111_read_cmd(dev, AQ_ACCESS_MAC, SFR_MEDIUM_STATUS_MODE, + 2, 2, ®16); + + reg16 |= SFR_MEDIUM_RECEIVE_EN | SFR_MEDIUM_RXFLOW_CTRLEN | + SFR_MEDIUM_TXFLOW_CTRLEN; + 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); + + netif_carrier_on(dev->net); + } else { + aqc111_read_cmd(dev, AQ_ACCESS_MAC, SFR_MEDIUM_STATUS_MODE, + 2, 2, ®16); + reg16 &= ~SFR_MEDIUM_RECEIVE_EN; + 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); + + reg8 = SFR_BULK_OUT_FLUSH_EN | SFR_BULK_OUT_EFF_EN; + aqc111_write_cmd(dev, AQ_ACCESS_MAC, SFR_BULK_OUT_CTRL, + 1, 1, ®8); + reg8 = SFR_BULK_OUT_EFF_EN; + aqc111_write_cmd(dev, AQ_ACCESS_MAC, SFR_BULK_OUT_CTRL, + 1, 1, ®8); + + netif_carrier_off(dev->net); + } + return 0; +} + static int aqc111_reset(struct usbnet *dev) { u8 reg8 = 0; u16 reg16 = 0; + enum usb_device_speed usb_speed; struct aqc111_data *aqc111_data = (struct aqc111_data *)dev->data[0]; + usb_speed = dev->udev->speed; + /* Power up ethernet PHY */ + aqc111_data->phy_ops.advertising = 0; aqc111_data->phy_ops.phy_ctrl1 = 0; aqc111_data->phy_ops.phy_ctrl2 = 0; @@ -279,6 +599,12 @@ static int aqc111_reset(struct usbnet *dev) SFR_MONITOR_MODE_RW_FLAG); aqc111_write_cmd(dev, AQ_ACCESS_MAC, SFR_MONITOR_MODE, 1, 1, ®8); + netif_carrier_off(dev->net); + + /* Phy advertise */ + aqc111_set_phy_speed(dev, aqc111_data->autoneg, + aqc111_data->advertised_speed); + return 0; } @@ -307,6 +633,8 @@ static int aqc111_stop(struct usbnet *dev) 4, &aqc111_data->phy_ops); } + netif_carrier_off(dev->net); + return 0; } @@ -314,6 +642,8 @@ static const struct driver_info aqc111_info = { .description = "Aquantia AQtion USB to 5GbE Controller", .bind = aqc111_bind, .unbind = aqc111_unbind, + .status = aqc111_status, + .link_reset = aqc111_link_reset, .reset = aqc111_reset, .stop = aqc111_stop, }; diff --git a/drivers/net/usb/aqc111.h b/drivers/net/usb/aqc111.h index 8738d2c4ae90..5c5602e6d236 100644 --- a/drivers/net/usb/aqc111.h +++ b/drivers/net/usb/aqc111.h @@ -18,12 +18,44 @@ #define AQC111_PHY_ID 0x00 #define AQ_PHY_ADDR(mmd) ((AQC111_PHY_ID << 8) | mmd) +#define AQ_PHY_AUTONEG_MMD 0x07 +#define AQ_PHY_AUTONEG_ADDR AQ_PHY_ADDR(AQ_PHY_AUTONEG_MMD) + +#define AQ_AUTONEG_STD_CTRL_REG 0x0000 + #define AQ_ANEG_EX_PAGE_CTRL 0x2000 + #define AQ_ANEG_EN_ANEG 0x1000 + #define AQ_ANEG_RESTART_ANEG 0x0200 + +#define AQ_AUTONEG_ADV_REG 0x0010 + #define AQ_ANEG_100M 0x0100 + #define AQ_ANEG_PAUSE 0x0400 + #define AQ_ANEG_ASYM_PAUSE 0x0800 + #define AQ_ANEG_ABILITY_MASK 0x0FE0 + +#define AQ_AUTONEG_10GT_CTRL_REG 0x0020 + #define AQ_ANEG_ADV_10G_T 0x1000 + #define AQ_ANEG_ADV_5G_T 0x0100 + #define AQ_ANEG_ADV_2G5_T 0x0080 + #define AQ_ANEG_ADV_LT 0x0001 + +#define AQ_AUTONEG_VEN_PROV1_REG 0xC400 + #define AQ_ANEG_ADV_1G 0x8000 + #define AQ_ANEG_ADV_AQRATE 0x1000 + #define AQ_ANEG_ADV_5G_N 0x0800 + #define AQ_ANEG_ADV_2G5_N 0x0400 + #define AQ_ANEG_EX_PHY_ID 0x0040 + #define AQ_ANEG_EN_DSH 0x0010 + #define AQ_ANEG_DSH_RETRY 0x0003 + #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_GLB_ING_PAUSE_CTRL_REG 0x7148 +#define AQ_GLB_EGR_PAUSE_CTRL_REG 0x4148 + #define AQ_USB_PHY_SET_TIMEOUT 10000 #define AQ_USB_SET_TIMEOUT 4000 @@ -163,6 +195,10 @@ struct aqc111_phy_options { }; struct aqc111_data { + u8 link_speed; + u8 link; + u8 autoneg; + u32 advertised_speed; struct { u8 major; u8 minor; @@ -172,6 +208,21 @@ struct aqc111_data { struct aqc111_phy_options phy_ops; } __packed; +struct aqc111_int_data { + u8 res1; + u8 link_speed: 7; + u8 link_status: 1; + __le16 res2; + __le16 res3; + __le16 res4; +} __packed; + +#define AQ_INT_SPEED_10G 0x0E +#define AQ_INT_SPEED_5G 0x0F +#define AQ_INT_SPEED_2_5G 0x10 +#define AQ_INT_SPEED_1G 0x11 +#define AQ_INT_SPEED_100M 0x13 + static struct { unsigned char ctrl; unsigned char timer_l;