From patchwork Tue Nov 13 14:44:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Russkikh X-Patchwork-Id: 10680879 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 EA42414D6 for ; Tue, 13 Nov 2018 14:45:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D6D9D1FF62 for ; Tue, 13 Nov 2018 14:45:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CAD072950F; Tue, 13 Nov 2018 14:45:29 +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 D128C1FF62 for ; Tue, 13 Nov 2018 14:45:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387956AbeKNAnw (ORCPT ); Tue, 13 Nov 2018 19:43:52 -0500 Received: from mail-eopbgr810043.outbound.protection.outlook.com ([40.107.81.43]:6290 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2387890AbeKNAnv (ORCPT ); Tue, 13 Nov 2018 19:43:51 -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=1hxCJCo0e74bRzb3MeNwMjqqwv8DkGheaW2PRyhP7xc=; b=d8bgv9h8hHUUHR1CdpmiA/LelOPtcevBeJLyZRObz/865nVZVARb58Pzuwn5kPO/Lv/8EYBEEBHW2yBA1vubjcIs2Fr01vuZOvdC1LbmXb2Q6J/1ZCN51U5om0QjH8nuu0zCJqBtI4CJnggmLWZCaxmjXG5IMIeC3BNRgtXx0Pw= Received: from BY1PR0701MB1660.namprd07.prod.outlook.com (10.162.110.22) by BY1PR0701MB1208.namprd07.prod.outlook.com (10.160.105.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1294.36; Tue, 13 Nov 2018 14:44:45 +0000 Received: from BY1PR0701MB1660.namprd07.prod.outlook.com ([fe80::c031:16d9:9580:3d11]) by BY1PR0701MB1660.namprd07.prod.outlook.com ([fe80::c031:16d9:9580:3d11%6]) with mapi id 15.20.1294.045; Tue, 13 Nov 2018 14:44:45 +0000 From: Igor Russkikh To: "David S . Miller" CC: "linux-usb@vger.kernel.org" , "netdev@vger.kernel.org" , Dmitry Bezrukov , Igor Russkikh Subject: [PATCH v2 net-next 06/21] net: usb: aqc111: Introduce link management Thread-Topic: [PATCH v2 net-next 06/21] net: usb: aqc111: Introduce link management Thread-Index: AQHUe19rPI3tifQELEeNhBmDloP9ug== Date: Tue, 13 Nov 2018 14:44:45 +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: AM5P189CA0013.EURP189.PROD.OUTLOOK.COM (2603:10a6:206:15::26) 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;BY1PR0701MB1208;6:jWwIm4j0+OB8FZNgLaHp5xnUXRSuLT72mD4KxOrMd1utcBTyqpUayo/dzbv4hu89UzK6CK+33zJkiy7IdajauUW2y7gSYQvjZXbLwLaktZct7TGT5RO6vUQS2xv/McvMpYkAGFDw+Khfpof5VureI88tqvCHQB9V+OcML5ESs6O+GS3LeD2rGwxiwyPiIia0KtR2erft4KdG8jfILS1xOhsf94AjICBRXZ+A+8+Tpa59CKj+B8DeaYX6sXMPiHDfks973SqCGe0ARRC9YrvI4eOZX+T6N3hIdMBb/q8sFPfJXcM+3Zn/EKi4BgdpsQc4r9lgDxugl2VTYilLBZni/zMGyQuOq54vvaOjCO9A9rgJY4bUpVHuFVlvvvB2zK886OZ1lA+Iuw17xbKH99c97Tlww6J66bstwFJMd1aulpBSotx7BR0cQs42EJgwvkrg7ugIWFCp2ly/g76CoWz04A==;5:sIWKpT6nTOoMKwzS6DKQko3Z7+yhh9ZDuGHufZ8H9xkT4+j8Zc4FC8bLxCUeEKeOIdDuxjfu4KT+wZBxPCxu1zG7eZBq/EhCD9HR+F4DkTnwlhnhjv8lUZkqAPeYA4Qkgf07CynoXyg5nH5UxFOnyFTvdZlpyNdZdArJ1OM7YiY=;7:T1fwlpkvcYVgRiYdTHmt6SbyfyLjE+vlJgbDKpb4PbsSy78jKZFbhUDI3cmLzKWiYmmHA+cCxWVHQDUQ/+qD+2uTU12hqAysUii7RccUrsCtteZAPigIJRsCDRsSfRt/5dPlAOyVtAHced/vBenRbw== x-ms-office365-filtering-correlation-id: b4e43d94-e1a6-4ac5-40dc-08d649768d54 x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390060)(7020095)(4652040)(8989299)(5600074)(711020)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020);SRVR:BY1PR0701MB1208; x-ms-traffictypediagnostic: BY1PR0701MB1208: 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)(3231406)(944501410)(52105112)(10201501046)(93006095)(93001095)(3002001)(148016)(149066)(150057)(6041310)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699051)(76991095);SRVR:BY1PR0701MB1208;BCL:0;PCL:0;RULEID:;SRVR:BY1PR0701MB1208; x-forefront-prvs: 085551F5A8 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(39850400004)(346002)(376002)(396003)(366004)(136003)(199004)(189003)(71190400001)(71200400001)(54906003)(72206003)(44832011)(4744004)(305945005)(2906002)(66066001)(4326008)(118296001)(107886003)(105586002)(106356001)(36756003)(99286004)(52116002)(2900100001)(76176011)(476003)(14454004)(2616005)(6916009)(6506007)(186003)(575784001)(386003)(486006)(86362001)(8676002)(8936002)(102836004)(11346002)(446003)(5660300001)(6486002)(256004)(81156014)(14444005)(81166006)(53936002)(25786009)(68736007)(26005)(97736004)(316002)(7736002)(3846002)(478600001)(6116002)(6436002)(6512007);DIR:OUT;SFP:1101;SCL:1;SRVR:BY1PR0701MB1208;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: YFekY3ErQIaV5V96tNnJKiHT1G8MBCl1clodhjJMt10+PaBzqNtwSpeB/7rF+54GHr8VR1dS6DnIB3GskFKRlmutnqnOrqPVQ8ejky9jPUvLtU7R8lII8X9nJLarw/0r/kgm0muQAdfRLBIUcuJLrz2v4VM6rs7jEZH9ty1ZIsR8B7JiWxbGT7zeGTyx4LiLPiR2ocK4v88yftIL2mkeNq1o2zK4W5CaWZ/Bndt0BnMWZQllXYGNEvXBwtU/yyHUFnZmh0GJ8QAQnTogFTzFJM8RhAdOkkLDS2iQxdmVRaPzAftbQZ9cHiXyrfHsoJ908wGdWoZBmzzC1wWjsoOcrkeL5dKar2oxB29IUFgc7QQ= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-Network-Message-Id: b4e43d94-e1a6-4ac5-40dc-08d649768d54 X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Nov 2018 14:44:45.0805 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 83e2e134-991c-4ede-8ced-34d47e38e6b1 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR0701MB1208 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 | 312 +++++++++++++++++++++++++++++++++++++++++++++++ drivers/net/usb/aqc111.h | 45 +++++++ 2 files changed, 357 insertions(+) diff --git a/drivers/net/usb/aqc111.c b/drivers/net/usb/aqc111.c index c91acb7b7c4e..2b78b5d7d29b 100644 --- a/drivers/net/usb/aqc111.c +++ b/drivers/net/usb/aqc111.c @@ -168,6 +168,122 @@ static int aqc111_mdio_write(struct usbnet *dev, u16 value, return aqc111_write16_cmd(dev, AQ_PHY_CMD, value, index, data); } +static void aqc111_set_phy_speed_fw_iface(struct usbnet *dev, + struct aqc111_data *aqc111_data) +{ + aqc111_write32_cmd(dev, AQ_PHY_OPS, 0, 0, &aqc111_data->phy_cfg); +} + +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; + aqc111_mdio_write(dev, AQ_AUTONEG_STD_CTRL_REG, AQ_PHY_AUTONEG_ADDR, + ®16_1); + + reg16_1 = AQ_ANEG_EX_PHY_ID | AQ_ANEG_ADV_AQRATE; + if (aqc111_data->phy_cfg & AQ_DOWNSHIFT) { + reg16_1 |= AQ_ANEG_EN_DSH; + reg16_1 |= (aqc111_data->phy_cfg & AQ_DSH_RETRIES_MASK) >> + AQ_DSH_RETRIES_SHIFT; + } + + reg16_2 = AQ_ANEG_ADV_LT; + if (aqc111_data->phy_cfg & AQ_PAUSE) + reg16_3 |= AQ_ANEG_PAUSE; + + if (aqc111_data->phy_cfg & AQ_ASYM_PAUSE) + reg16_3 |= AQ_ANEG_ASYM_PAUSE; + + if (aqc111_data->phy_cfg & AQ_ADV_5G) { + reg16_1 |= AQ_ANEG_ADV_5G_N; + reg16_2 |= AQ_ANEG_ADV_5G_T; + } + if (aqc111_data->phy_cfg & AQ_ADV_2G5) { + reg16_1 |= AQ_ANEG_ADV_2G5_N; + reg16_2 |= AQ_ANEG_ADV_2G5_T; + } + if (aqc111_data->phy_cfg & AQ_ADV_1G) + reg16_1 |= AQ_ANEG_ADV_1G; + + if (aqc111_data->phy_cfg & AQ_ADV_100M) + reg16_3 |= AQ_ANEG_100M; + + aqc111_mdio_write(dev, AQ_AUTONEG_VEN_PROV1_REG, + AQ_PHY_AUTONEG_ADDR, ®16_1); + aqc111_mdio_write(dev, AQ_AUTONEG_10GT_CTRL_REG, + AQ_PHY_AUTONEG_ADDR, ®16_2); + + aqc111_mdio_read(dev, AQ_AUTONEG_ADV_REG, AQ_PHY_AUTONEG_ADDR, + ®16_1); + reg16_1 &= ~AQ_ANEG_ABILITY_MASK; + reg16_1 |= reg16_3; + aqc111_mdio_write(dev, AQ_AUTONEG_ADV_REG, AQ_PHY_AUTONEG_ADDR, + ®16_1); + + /* Restart auto-negotiation */ + reg16_1 = AQ_ANEG_EX_PAGE_CTRL | AQ_ANEG_EN_ANEG | + AQ_ANEG_RESTART_ANEG; + + aqc111_mdio_write(dev, AQ_AUTONEG_STD_CTRL_REG, + AQ_PHY_AUTONEG_ADDR, ®16_1); +} + +static void aqc111_set_phy_speed(struct usbnet *dev, u8 autoneg, u16 speed) +{ + struct aqc111_data *aqc111_data = dev->driver_priv; + + aqc111_data->phy_cfg &= ~AQ_ADV_MASK; + aqc111_data->phy_cfg |= AQ_PAUSE; + aqc111_data->phy_cfg |= AQ_ASYM_PAUSE; + aqc111_data->phy_cfg |= AQ_DOWNSHIFT; + aqc111_data->phy_cfg &= ~AQ_DSH_RETRIES_MASK; + aqc111_data->phy_cfg |= (3 << AQ_DSH_RETRIES_SHIFT) & + AQ_DSH_RETRIES_MASK; + + if (autoneg == AUTONEG_ENABLE) { + switch (speed) { + case SPEED_5000: + aqc111_data->phy_cfg |= AQ_ADV_5G; + /* fall-through */ + case SPEED_2500: + aqc111_data->phy_cfg |= AQ_ADV_2G5; + /* fall-through */ + case SPEED_1000: + aqc111_data->phy_cfg |= AQ_ADV_1G; + /* fall-through */ + case SPEED_100: + aqc111_data->phy_cfg |= AQ_ADV_100M; + /* fall-through */ + } + } else { + switch (speed) { + case SPEED_5000: + aqc111_data->phy_cfg |= AQ_ADV_5G; + break; + case SPEED_2500: + aqc111_data->phy_cfg |= AQ_ADV_2G5; + break; + case SPEED_1000: + aqc111_data->phy_cfg |= AQ_ADV_1G; + break; + case SPEED_100: + aqc111_data->phy_cfg |= AQ_ADV_100M; + 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, @@ -192,6 +308,7 @@ static void aqc111_read_fw_version(struct usbnet *dev, static int aqc111_bind(struct usbnet *dev, struct usb_interface *intf) { struct usb_device *udev = interface_to_usbdev(intf); + enum usb_device_speed usb_speed = udev->speed; struct aqc111_data *aqc111_data; int ret; @@ -219,6 +336,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; } @@ -243,6 +363,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_cfg &= ~AQ_ADV_MASK; aqc111_data->phy_cfg |= AQ_LOW_POWER; aqc111_data->phy_cfg &= ~AQ_PHY_POWER_EN; aqc111_write32_cmd_nopm(dev, AQ_PHY_OPS, 0, 0, @@ -252,6 +373,187 @@ 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_data *aqc111_data = dev->driver_priv; + u64 *event_data = NULL; + int link = 0; + + if (urb->actual_length < sizeof(*event_data)) + return; + + event_data = urb->transfer_buffer; + le64_to_cpus(event_data); + + if (*event_data & AQ_LS_MASK) + link = 1; + else + link = 0; + + aqc111_data->link_speed = (*event_data & AQ_SPEED_MASK) >> + AQ_SPEED_SHIFT; + 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) +{ + enum usb_device_speed usb_speed = dev->udev->speed; + u16 link_speed = 0, usb_host = 0; + u8 buf[5] = { 0 }; + u8 queue_num = 0; + u16 reg16 = 0; + u8 reg8 = 0; + + 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 */ + aqc111_mdio_write(dev, AQ_GLB_ING_PAUSE_CTRL_REG, + AQ_PHY_AUTONEG_ADDR, ®16); + aqc111_mdio_write(dev, AQ_GLB_EGR_PAUSE_CTRL_REG, + AQ_PHY_AUTONEG_ADDR, ®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_write16_cmd(dev, AQ_ACCESS_MAC, SFR_PAUSE_WATERLVL_LOW, + 2, ®16); + netdev_info(dev->net, "Link Speed %d, USB %d", link_speed, usb_host); +} + +static int aqc111_link_reset(struct usbnet *dev) +{ + struct aqc111_data *aqc111_data = dev->driver_priv; + u16 reg16 = 0; + u8 reg8 = 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_write16_cmd(dev, AQ_ACCESS_MAC, SFR_RX_CTL, 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_write16_cmd(dev, AQ_ACCESS_MAC, SFR_MEDIUM_STATUS_MODE, + 2, ®16); + + reg16 = SFR_MEDIUM_XGMIIMODE | SFR_MEDIUM_FULL_DUPLEX; + aqc111_write16_cmd(dev, AQ_ACCESS_MAC, SFR_MEDIUM_STATUS_MODE, + 2, ®16); + + aqc111_read16_cmd(dev, AQ_ACCESS_MAC, SFR_MEDIUM_STATUS_MODE, + 2, ®16); + + reg16 |= SFR_MEDIUM_RECEIVE_EN | SFR_MEDIUM_RXFLOW_CTRLEN | + SFR_MEDIUM_TXFLOW_CTRLEN; + aqc111_write16_cmd(dev, AQ_ACCESS_MAC, SFR_MEDIUM_STATUS_MODE, + 2, ®16); + + reg16 = SFR_RX_CTL_IPE | SFR_RX_CTL_AB | SFR_RX_CTL_START; + aqc111_write16_cmd(dev, AQ_ACCESS_MAC, SFR_RX_CTL, 2, ®16); + + netif_carrier_on(dev->net); + } else { + aqc111_read16_cmd(dev, AQ_ACCESS_MAC, SFR_MEDIUM_STATUS_MODE, + 2, ®16); + reg16 &= ~SFR_MEDIUM_RECEIVE_EN; + aqc111_write16_cmd(dev, AQ_ACCESS_MAC, SFR_MEDIUM_STATUS_MODE, + 2, ®16); + + aqc111_read16_cmd(dev, AQ_ACCESS_MAC, SFR_RX_CTL, 2, ®16); + reg16 &= ~SFR_RX_CTL_START; + aqc111_write16_cmd(dev, AQ_ACCESS_MAC, SFR_RX_CTL, 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) { struct aqc111_data *aqc111_data = dev->driver_priv; @@ -292,6 +594,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; } @@ -319,6 +627,8 @@ static int aqc111_stop(struct usbnet *dev) &aqc111_data->phy_cfg); } + netif_carrier_off(dev->net); + return 0; } @@ -326,6 +636,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 ac0bbeabf563..fd49a43e6d93 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 @@ -123,6 +155,7 @@ #define AQ_ADV_1G BIT(1) #define AQ_ADV_2G5 BIT(2) #define AQ_ADV_5G BIT(3) +#define AQ_ADV_MASK 0x0F #define AQ_PAUSE BIT(16) #define AQ_ASYM_PAUSE BIT(17) @@ -137,6 +170,10 @@ /******************************************************************************/ struct aqc111_data { + u8 link_speed; + u8 link; + u8 autoneg; + u32 advertised_speed; struct { u8 major; u8 minor; @@ -146,6 +183,14 @@ struct aqc111_data { u32 phy_cfg; }; +#define AQ_LS_MASK 0x8000 +#define AQ_SPEED_MASK 0x7F00 +#define AQ_SPEED_SHIFT 0x0008 +#define AQ_INT_SPEED_5G 0x000F +#define AQ_INT_SPEED_2_5G 0x0010 +#define AQ_INT_SPEED_1G 0x0011 +#define AQ_INT_SPEED_100M 0x0013 + static struct { unsigned char ctrl; unsigned char timer_l;