From patchwork Fri Jan 10 12:59:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gnandiba@amd.com X-Patchwork-Id: 64406 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 99FBEA04F9; Fri, 10 Jan 2020 13:59:59 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6B1E71EA1E; Fri, 10 Jan 2020 13:59:59 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2067.outbound.protection.outlook.com [40.107.220.67]) by dpdk.org (Postfix) with ESMTP id D55391EA0D for ; Fri, 10 Jan 2020 13:59:57 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oE7JmYW9fcAv2PZkepTpzANq8Rsr9w67kKB9E1Ix7FKNXJk+Me0coagH3JiUfV5Dve0/78QhAnILaZP7lNY/BLDNGGn/fV+8S6JjSAXh72/z2JB+Ub+9qL/GS7vdxYFbn2tHfJmhnaaSW5+lX4aY3kkTkn86iSRZgkeOY4b37Sx92LHl1LnIxb8AaCxOB3Rcj7yEXtrM+ygu8Aga7tPpJXgVTcYnkl5LyBJYK9gHLlNmUhTu3UkVqkPNWWe3S4NbzWIx5kkRu7/tAhXzl4F5f9aRvSBFkF4YRYqWrcyhoaL5HeCugSxlx/BAn0Ew4uNyYcMegO3b2hK1bcwbmo1KVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vTSXkYw+s2H67Y7froEyDDwgdhJm97/4Yms9/SXzpmM=; b=Isehr6dF4hfjcemu7HeGiXFTNt4E1N8lMGE9QOsKfYpvyPoNI/+hGI9lpKvYSBIFWXq/YEnbKBe5I+EflUUT/XhbKljlRIYQK50lC+XEQNf3vb7bgriClbABuuCoOuzL3ycHy4bV3lJEdiw4K5k9hNxgW3sgUfi0rP6NiurGotXQ8252dk6yDVh9UAgE20+NegSUSpYAvdUyyUjnbsxCq2Y8s35PEfhPRhXRUFscHyCN/1sguCHjJwG/8nr0/VfucsKrSMR8Fo5ljQ1P0KTz5toCRs3EFpEojx0yaSdfduFreK4lqGsc7rM8YVKErelqdU5b3fKmsBKzfN3KDgI1dQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vTSXkYw+s2H67Y7froEyDDwgdhJm97/4Yms9/SXzpmM=; b=ZIEXJFDJKxOlLDK0qTnI7FlHIIXPky1KU/Zlp51Gdj7WYSnpm7TBHh7DUi5T1gaDzaYswokLol0An6BckM4vvWSs+lYahUhoGHF3Ybwizi/d5es13b6d2TvhNU4M7dowqzFeCGdxoYM6O+emeCcYjxO832mszjsK71rCY0ZsP1s= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Girish.Nandibasappa@amd.com; Received: from DM6PR12MB3948.namprd12.prod.outlook.com (10.255.172.208) by DM6PR12MB3835.namprd12.prod.outlook.com (10.255.173.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2623.9; Fri, 10 Jan 2020 12:59:56 +0000 Received: from DM6PR12MB3948.namprd12.prod.outlook.com ([fe80::b84f:565d:8588:aade]) by DM6PR12MB3948.namprd12.prod.outlook.com ([fe80::b84f:565d:8588:aade%3]) with mapi id 15.20.2623.013; Fri, 10 Jan 2020 12:59:56 +0000 From: gnandiba@amd.com To: dev@dpdk.org Date: Fri, 10 Jan 2020 18:29:37 +0530 Message-Id: <20200110125937.6194-1-gnandiba@amd.com> X-Mailer: git-send-email 2.17.1 X-ClientProxiedBy: MAXPR01CA0092.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:49::34) To DM6PR12MB3948.namprd12.prod.outlook.com (2603:10b6:5:1c4::16) MIME-Version: 1.0 Received: from amar-Wallaby.amd.com (165.204.156.251) by MAXPR01CA0092.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:49::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2623.9 via Frontend Transport; Fri, 10 Jan 2020 12:59:55 +0000 X-Mailer: git-send-email 2.17.1 X-Originating-IP: [165.204.156.251] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 5e4bfec2-31f0-4b02-e676-08d795ccfdb7 X-MS-TrafficTypeDiagnostic: DM6PR12MB3835: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2449; X-Forefront-PRVS: 02788FF38E X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4636009)(376002)(39860400002)(346002)(136003)(396003)(366004)(189003)(199004)(2906002)(52116002)(7696005)(478600001)(66476007)(66556008)(66946007)(1076003)(186003)(36756003)(9686003)(16526019)(316002)(26005)(6486002)(6666004)(2616005)(8676002)(81156014)(956004)(5660300002)(6916009)(81166006)(8936002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR12MB3835; H:DM6PR12MB3948.namprd12.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PLq7osnqwJ+R/eeMoMmAxLC0QLyJfUIr89taJWkxTVCX7GVIV1CTbNolEcbkE49PjVUfmWGvTuvv30jF2Kxhb//xPUUaC8BICE6JIYJ9/GarYFf54qeRTXpPIxlZkLrlTnxuT817llyUrZRl+GAUueUO6hmKsPZR+TmUzAN2Vg5O31FTaA18jUeZs5LZG+pd5Nt6d2MFUaIFXbBPUMgdNgrYi91JMmXCngdkiqbtqDRc/zCv7O49PQkejb/AU35q5bEVXZQCocZxmFEyDCarKHVavDeRAS5m4kiJbqENFU6hb7hzuQOvx0STcNPzJsBGf6R3QTGcbGqzJIO5iKrcRvLw6QX9sSn+lLpvxns7xe3GNFoPosdDfuRzXihLn+8Y6Sx28iceV7jWoRdU77+SWjq/MDdI0wdv0Isjtm+iXw4hhe8OWa36lvEAvSqsjsDE X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5e4bfec2-31f0-4b02-e676-08d795ccfdb7 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2020 12:59:56.1267 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: KRz7LSGSPjjTbm1le/6CJa/T8uNOewb5m3eMuxaYc9BvbuFw/jov1cDYHoq6jgKcdbzZdm7MaPOEnBMqMPJ+gg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3835 Subject: [dpdk-dev] [PATCH v2 1/2] net/axgbe: 1/2.5Gbps support enabled for axgbe X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Girish Nandibasappa Added support for 1Gbps and 2.5Gbps in axgbe dpdk driver Signed-off-by: Girish Nandibasappa Acked-by: Ravi Kumar --- drivers/net/axgbe/axgbe_phy_impl.c | 50 ++++++++++++++++++++++++++++-- 1 file changed, 48 insertions(+), 2 deletions(-) diff --git a/drivers/net/axgbe/axgbe_phy_impl.c b/drivers/net/axgbe/axgbe_phy_impl.c index 2267c5f81..f0dc11695 100644 --- a/drivers/net/axgbe/axgbe_phy_impl.c +++ b/drivers/net/axgbe/axgbe_phy_impl.c @@ -610,8 +610,7 @@ static void axgbe_phy_sfp_parse_eeprom(struct axgbe_port *pdata) if (sfp_base[AXGBE_SFP_BASE_EXT_ID] != AXGBE_SFP_EXT_ID_SFP) return; - if (axgbe_phy_sfp_parse_quirks(pdata)) - return; + axgbe_phy_sfp_parse_quirks(pdata); /* Assume ACTIVE cable unless told it is PASSIVE */ if (sfp_base[AXGBE_SFP_BASE_CABLE] & AXGBE_SFP_BASE_CABLE_PASSIVE) { @@ -1238,6 +1237,47 @@ static void axgbe_phy_kr_mode(struct axgbe_port *pdata) phy_data->cur_mode = AXGBE_MODE_KR; } +static void axgbe_phy_kx_2500_mode(struct axgbe_port *pdata) +{ + struct axgbe_phy_data *phy_data = pdata->phy_data; + unsigned int s0; + + axgbe_phy_set_redrv_mode(pdata); + /* 2.5G/KX */ + axgbe_phy_start_ratechange(pdata); + s0 = 0; + XP_SET_BITS(s0, XP_DRIVER_SCRATCH_0, COMMAND, 2); + XP_SET_BITS(s0, XP_DRIVER_SCRATCH_0, SUB_COMMAND, 0); + + XP_IOWRITE(pdata, XP_DRIVER_SCRATCH_0, s0); + XP_IOWRITE(pdata, XP_DRIVER_SCRATCH_1, 0); + + XP_IOWRITE_BITS(pdata, XP_DRIVER_INT_REQ, REQUEST, 1); + + phy_data->cur_mode = AXGBE_MODE_KX_2500; +} + +static void axgbe_phy_sgmii_1000_mode(struct axgbe_port *pdata) +{ + struct axgbe_phy_data *phy_data = pdata->phy_data; + unsigned int s0; + + axgbe_phy_set_redrv_mode(pdata); + + /* 1G/SGMII */ + axgbe_phy_start_ratechange(pdata); + s0 = 0; + XP_SET_BITS(s0, XP_DRIVER_SCRATCH_0, COMMAND, 1); + XP_SET_BITS(s0, XP_DRIVER_SCRATCH_0, SUB_COMMAND, 2); + + XP_IOWRITE(pdata, XP_DRIVER_SCRATCH_0, s0); + XP_IOWRITE(pdata, XP_DRIVER_SCRATCH_1, 0); + + XP_IOWRITE_BITS(pdata, XP_DRIVER_INT_REQ, REQUEST, 1); + + phy_data->cur_mode = AXGBE_MODE_SGMII_1000; +} + static enum axgbe_mode axgbe_phy_cur_mode(struct axgbe_port *pdata) { struct axgbe_phy_data *phy_data = pdata->phy_data; @@ -1408,6 +1448,12 @@ static void axgbe_phy_set_mode(struct axgbe_port *pdata, enum axgbe_mode mode) case AXGBE_MODE_SFI: axgbe_phy_sfi_mode(pdata); break; + case AXGBE_MODE_KX_2500: + axgbe_phy_kx_2500_mode(pdata); + break; + case AXGBE_MODE_SGMII_1000: + axgbe_phy_sgmii_1000_mode(pdata); + break; default: break; } From patchwork Fri Jan 10 13:00:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gnandiba@amd.com X-Patchwork-Id: 64407 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6BBBDA04F9; Fri, 10 Jan 2020 14:00:36 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 443B61EA21; Fri, 10 Jan 2020 14:00:36 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2061.outbound.protection.outlook.com [40.107.220.61]) by dpdk.org (Postfix) with ESMTP id ED5211EA12 for ; Fri, 10 Jan 2020 14:00:33 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OeShHzqo10jZK0DoVtRpeP19NLSTXKRBgwi7/OdF3AId65jKFN3IiPR5JWzJVwSmBayxQsHjDZihEQzAd64DHGAp/x+QUhhNMltgW39UasGi3BYB45zG1riH+wynkumRkk/dhUPjkExH8+kDwi5RI9S7JZATdoJ6jTsZqGV61wt3jG1B2FQZpcNHHzSww3OZw4ClaRp9i3fTIc4VuvUqNr3XWCKtFmQxoASYtQPZ34IjHBXu8Ck31xEgQfr2MX/kkig/FlMzc2bHGPCBB6qbdOGeCw6STBcBIBLmqt9scauBmn8Sg9CGVjKGmbc876/ewD1dOJ/JF2T3gsIqONHYbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CtXjM5QIWOW8lUv71kZAy2oGJCQer88SnHg+ROt2gys=; b=DGVQ33DoR5ZSN5kSddgMFZpPdUVB7CYWDJe+ZoiQ2hZjViYSEBPM7v/CdpQ4sM8PYazccbjq4U6CqhN8InJpQ6UDjsrvIrKH/XcFD6CoXuYePTXBOooOLFpf4Mj5KfWv2OM8bsI8/oj92UHTPUi34wGEBFmzNXeRscKT4DKA8ADjq4OmYuDyHd6flNrXRoI0TCb0+5EkbZzuTSyqXkc9Kv5fpoIKJhTUCULT9dSQlxxu+ocHAwH03FEtaiZ2LG6YDTGdeS7CjqT+BzZ9ACUPdSOJXiJq90PQxNEFHip9d5rnl0GRT87oLBdbA92F0C/F67vPxn66hTKUp9URb6h7Qw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CtXjM5QIWOW8lUv71kZAy2oGJCQer88SnHg+ROt2gys=; b=n0F4FIzfLD1Elbo4dveCPHumIQf7Xs6HsqqkLVFDnq3ajjeF7Rk5wqehFtAG3gmazIUkYGiTRxf6VbcP6nmvND6Q5CgoJ9tYXD4PDYCN0j9wwXwQqAf2I4YhsjNYAIYtX6kLy0RI0ff39HQsyTOT1Rvm/9cmVQHPJoSU+26k5Lo= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Girish.Nandibasappa@amd.com; Received: from DM6PR12MB3948.namprd12.prod.outlook.com (10.255.172.208) by DM6PR12MB3835.namprd12.prod.outlook.com (10.255.173.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2623.9; Fri, 10 Jan 2020 13:00:31 +0000 Received: from DM6PR12MB3948.namprd12.prod.outlook.com ([fe80::b84f:565d:8588:aade]) by DM6PR12MB3948.namprd12.prod.outlook.com ([fe80::b84f:565d:8588:aade%3]) with mapi id 15.20.2623.013; Fri, 10 Jan 2020 13:00:31 +0000 From: gnandiba@amd.com To: dev@dpdk.org Date: Fri, 10 Jan 2020 18:30:11 +0530 Message-Id: <20200110130011.6244-1-gnandiba@amd.com> X-Mailer: git-send-email 2.17.1 X-ClientProxiedBy: MA1PR0101CA0068.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:20::30) To DM6PR12MB3948.namprd12.prod.outlook.com (2603:10b6:5:1c4::16) MIME-Version: 1.0 Received: from amar-Wallaby.amd.com (165.204.156.251) by MA1PR0101CA0068.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:20::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2623.9 via Frontend Transport; Fri, 10 Jan 2020 13:00:30 +0000 X-Mailer: git-send-email 2.17.1 X-Originating-IP: [165.204.156.251] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 31427ef2-977e-4d1e-ee63-08d795cd12e2 X-MS-TrafficTypeDiagnostic: DM6PR12MB3835: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:186; X-Forefront-PRVS: 02788FF38E X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4636009)(376002)(39860400002)(346002)(136003)(396003)(366004)(189003)(199004)(2906002)(52116002)(7696005)(478600001)(66476007)(66556008)(30864003)(66946007)(1076003)(186003)(36756003)(9686003)(16526019)(316002)(26005)(6486002)(6666004)(2616005)(8676002)(81156014)(956004)(5660300002)(6916009)(81166006)(8936002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR12MB3835; H:DM6PR12MB3948.namprd12.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yp9oytIcuDVkW5755dWYw0Rtjl6sZ3xTC+dONBL35WxVqzEjhqHaRL1Pvf2cqa3V7814YE8op5RdDLcCK6lpq1lWSM6ZzbYicZdWpkIauE988s4vGdBJsQz+XyrrcCcXqjr1j4Oohexr0g6s5uM4e+ep5UUgZ532vgWGencrQhre23T5XCpPjBUjEf+Dw3i/WIEtpT4bR/YKrr2euf8oTMYJBmtNS8IxoO4n5NwpA6/BcnKqxWq64aFQNWMh2beT6fyfXnMCTDUmhM6zLCHE44dDhQXlwS9DD6hqy6jfmJmuhTvIKCDNMVlmT7n4HEdQwLJTHTt+XjIP+DAHyZJg819JVx0YfiE0s8/AtfUzdSTteDEfqqlJm+oR7HoAdQGA1s4pfcxiatAA7fzXn8YVfDNKD3BrVTgcUqDFACmUg5LamBA+wfpkT2Bv7OIeHxcL X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 31427ef2-977e-4d1e-ee63-08d795cd12e2 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2020 13:00:31.5649 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: VJIHBbR7Q1FkfYNfsga8vMv+ONc9QzXdiwCPE2GQBPrqovwKrfVM//mJJTHUso1IGSdqieFp58gJGS2DUBQdzg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3835 Subject: [dpdk-dev] [PATCH v2 2/2] net/axgbe: auto-negotiation support enabled for 1Gbps X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Girish Nandibasappa Added CL37 Auto-neg support for 1Gbps interface in axgbe DPDK driver Signed-off-by: Girish Nandibasappa --- drivers/net/axgbe/axgbe_common.h | 1 + drivers/net/axgbe/axgbe_mdio.c | 192 +++++++++++++++++++++++++++-- drivers/net/axgbe/axgbe_phy_impl.c | 37 ++++++ 3 files changed, 219 insertions(+), 11 deletions(-) diff --git a/drivers/net/axgbe/axgbe_common.h b/drivers/net/axgbe/axgbe_common.h index 34f60f156..99fa92d5c 100644 --- a/drivers/net/axgbe/axgbe_common.h +++ b/drivers/net/axgbe/axgbe_common.h @@ -1296,6 +1296,7 @@ #define AXGBE_AN_CL37_PCS_MODE_BASEX 0x00 #define AXGBE_AN_CL37_PCS_MODE_SGMII 0x04 #define AXGBE_AN_CL37_TX_CONFIG_MASK 0x08 +#define AXGBE_AN_CL37_MII_CTRL_8BIT 0x0100 #define AXGBE_PMA_CDR_TRACK_EN_MASK 0x01 #define AXGBE_PMA_CDR_TRACK_EN_OFF 0x00 diff --git a/drivers/net/axgbe/axgbe_mdio.c b/drivers/net/axgbe/axgbe_mdio.c index 2721e5cc9..3902b1ec3 100644 --- a/drivers/net/axgbe/axgbe_mdio.c +++ b/drivers/net/axgbe/axgbe_mdio.c @@ -29,6 +29,19 @@ static void axgbe_an37_disable_interrupts(struct axgbe_port *pdata) XMDIO_WRITE(pdata, MDIO_MMD_PCS, MDIO_PCS_DIG_CTRL, reg); } +static void axgbe_an37_enable_interrupts(struct axgbe_port *pdata) +{ + unsigned int reg; + + reg = XMDIO_READ(pdata, MDIO_MMD_PCS, MDIO_PCS_DIG_CTRL); + reg |= AXGBE_PCS_CL37_BP; + XMDIO_WRITE(pdata, MDIO_MMD_PCS, MDIO_PCS_DIG_CTRL, reg); + + reg = XMDIO_READ(pdata, MDIO_MMD_VEND2, MDIO_VEND2_AN_CTRL); + reg |= AXGBE_AN_CL37_INT_MASK; + XMDIO_WRITE(pdata, MDIO_MMD_VEND2, MDIO_VEND2_AN_CTRL, reg); +} + static void axgbe_an73_clear_interrupts(struct axgbe_port *pdata) { XMDIO_WRITE(pdata, MDIO_MMD_AN, MDIO_AN_INT, 0); @@ -54,7 +67,7 @@ static void axgbe_an_enable_interrupts(struct axgbe_port *pdata) break; case AXGBE_AN_MODE_CL37: case AXGBE_AN_MODE_CL37_SGMII: - PMD_DRV_LOG(ERR, "Unsupported AN_MOD_37\n"); + axgbe_an37_enable_interrupts(pdata); break; default: break; @@ -254,6 +267,12 @@ static void axgbe_an37_set(struct axgbe_port *pdata, bool enable, XMDIO_WRITE(pdata, MDIO_MMD_VEND2, MDIO_CTRL1, reg); } +static void axgbe_an37_restart(struct axgbe_port *pdata) +{ + axgbe_an37_enable_interrupts(pdata); + axgbe_an37_set(pdata, true, true); +} + static void axgbe_an37_disable(struct axgbe_port *pdata) { axgbe_an37_set(pdata, false, false); @@ -302,7 +321,7 @@ static void axgbe_an_restart(struct axgbe_port *pdata) break; case AXGBE_AN_MODE_CL37: case AXGBE_AN_MODE_CL37_SGMII: - PMD_DRV_LOG(ERR, "Unsupported AN_MODE_CL37\n"); + axgbe_an37_restart(pdata); break; default: break; @@ -321,7 +340,7 @@ static void axgbe_an_disable(struct axgbe_port *pdata) break; case AXGBE_AN_MODE_CL37: case AXGBE_AN_MODE_CL37_SGMII: - PMD_DRV_LOG(ERR, "Unsupported AN_MODE_CL37\n"); + axgbe_an37_disable(pdata); break; default: break; @@ -573,6 +592,53 @@ static void axgbe_an73_state_machine(struct axgbe_port *pdata) axgbe_an73_enable_interrupts(pdata); } +static void axgbe_an37_state_machine(struct axgbe_port *pdata) +{ + enum axgbe_an cur_state = pdata->an_state; + + if (!pdata->an_int) + return; + if (pdata->an_int & AXGBE_AN_CL37_INT_CMPLT) { + pdata->an_state = AXGBE_AN_COMPLETE; + pdata->an_int &= ~AXGBE_AN_CL37_INT_CMPLT; + + /* If SGMII is enabled, check the link status */ + if (pdata->an_mode == AXGBE_AN_MODE_CL37_SGMII && + !(pdata->an_status & AXGBE_SGMII_AN_LINK_STATUS)) + pdata->an_state = AXGBE_AN_NO_LINK; + } + + cur_state = pdata->an_state; + + switch (pdata->an_state) { + case AXGBE_AN_READY: + break; + case AXGBE_AN_COMPLETE: + break; + case AXGBE_AN_NO_LINK: + break; + default: + pdata->an_state = AXGBE_AN_ERROR; + break; + } + + if (pdata->an_state == AXGBE_AN_ERROR) { + PMD_DRV_LOG(ERR, "error during auto-negotiation, state=%u\n", + cur_state); + pdata->an_int = 0; + axgbe_an37_clear_interrupts(pdata); + } + + if (pdata->an_state >= AXGBE_AN_COMPLETE) { + pdata->an_result = pdata->an_state; + pdata->an_state = AXGBE_AN_READY; + if (pdata->phy_if.phy_impl.an_post) + pdata->phy_if.phy_impl.an_post(pdata); + } + + axgbe_an37_enable_interrupts(pdata); +} + static void axgbe_an73_isr(struct axgbe_port *pdata) { /* Disable AN interrupts */ @@ -580,6 +646,7 @@ static void axgbe_an73_isr(struct axgbe_port *pdata) /* Save the interrupt(s) that fired */ pdata->an_int = XMDIO_READ(pdata, MDIO_MMD_AN, MDIO_AN_INT); + axgbe_an73_clear_interrupts(pdata); if (pdata->an_int) { /* Clear the interrupt(s) that fired and process them */ @@ -593,6 +660,29 @@ static void axgbe_an73_isr(struct axgbe_port *pdata) } } +static void axgbe_an37_isr(struct axgbe_port *pdata) +{ + unsigned int reg = 0; + /* Disable AN interrupts */ + axgbe_an37_disable_interrupts(pdata); + + /* Save the interrupt(s) that fired */ + reg = XMDIO_READ(pdata, MDIO_MMD_VEND2, MDIO_VEND2_AN_STAT); + pdata->an_int = reg & AXGBE_AN_CL37_INT_MASK; + pdata->an_status = reg & ~AXGBE_AN_CL37_INT_MASK; + axgbe_an37_clear_interrupts(pdata); + + if (pdata->an_int & 0x01) { + /* Clear the interrupt(s) that fired and process them */ + reg &= ~AXGBE_AN_CL37_INT_MASK; + XMDIO_WRITE(pdata, MDIO_MMD_VEND2, MDIO_VEND2_AN_STAT, reg); + axgbe_an37_state_machine(pdata); + } else { + /* Enable AN interrupts */ + axgbe_an37_enable_interrupts(pdata); + } +} + static void axgbe_an_isr(struct axgbe_port *pdata) { switch (pdata->an_mode) { @@ -602,7 +692,7 @@ static void axgbe_an_isr(struct axgbe_port *pdata) break; case AXGBE_AN_MODE_CL37: case AXGBE_AN_MODE_CL37_SGMII: - PMD_DRV_LOG(ERR, "AN_MODE_37 not supported\n"); + axgbe_an37_isr(pdata); break; default: break; @@ -614,6 +704,48 @@ static void axgbe_an_combined_isr(struct axgbe_port *pdata) axgbe_an_isr(pdata); } +static void axgbe_an37_init(struct axgbe_port *pdata) +{ + unsigned int advertising; + unsigned int reg = 0; + + advertising = pdata->phy_if.phy_impl.an_advertising(pdata); + + reg = XMDIO_READ(pdata, MDIO_MMD_VEND2, MDIO_VEND2_AN_ADVERTISE); + if (advertising & ADVERTISED_Pause) + reg |= 0x100; + else + reg &= ~0x100; + if (advertising & ADVERTISED_Asym_Pause) + reg |= 0x80; + else + reg &= ~0x80; + + /* Full duplex, but not half */ + reg |= AXGBE_AN_CL37_FD_MASK; + reg &= ~AXGBE_AN_CL37_HD_MASK; + + XMDIO_WRITE(pdata, MDIO_MMD_VEND2, MDIO_VEND2_AN_ADVERTISE, reg); + + /* Set up the Control register */ + reg = XMDIO_READ(pdata, MDIO_MMD_VEND2, MDIO_VEND2_AN_CTRL); + reg &= ~AXGBE_AN_CL37_TX_CONFIG_MASK; + reg &= ~AXGBE_AN_CL37_PCS_MODE_MASK; + + switch (pdata->an_mode) { + case AXGBE_AN_MODE_CL37: + reg |= AXGBE_AN_CL37_PCS_MODE_BASEX; + break; + case AXGBE_AN_MODE_CL37_SGMII: + reg |= AXGBE_AN_CL37_PCS_MODE_SGMII; + break; + default: + break; + } + reg |= AXGBE_AN_CL37_MII_CTRL_8BIT; + XMDIO_WRITE(pdata, MDIO_MMD_VEND2, MDIO_VEND2_AN_CTRL, reg); +} + static void axgbe_an73_init(struct axgbe_port *pdata) { unsigned int advertising, reg; @@ -673,7 +805,7 @@ static void axgbe_an_init(struct axgbe_port *pdata) break; case AXGBE_AN_MODE_CL37: case AXGBE_AN_MODE_CL37_SGMII: - PMD_DRV_LOG(ERR, "Unsupported AN_CL37\n"); + axgbe_an37_init(pdata); break; default: break; @@ -782,9 +914,6 @@ static int __axgbe_phy_config_aneg(struct axgbe_port *pdata) /* Disable and stop any in progress auto-negotiation */ axgbe_an_disable_all(pdata); - /* Clear any auto-negotitation interrupts */ - axgbe_an_clear_interrupts_all(pdata); - pdata->an_result = AXGBE_AN_READY; pdata->an_state = AXGBE_AN_READY; pdata->kr_state = AXGBE_RX_BPA; @@ -792,6 +921,7 @@ static int __axgbe_phy_config_aneg(struct axgbe_port *pdata) /* Re-enable auto-negotiation interrupt */ rte_intr_enable(&pdata->pci_dev->intr_handle); + axgbe_an37_enable_interrupts(pdata); axgbe_an_init(pdata); axgbe_an_restart(pdata); @@ -875,10 +1005,26 @@ static void axgbe_phy_status_result(struct axgbe_port *pdata) axgbe_set_mode(pdata, mode); } +static int autoneg_time_out(unsigned long autoneg_start_time) +{ + unsigned long autoneg_timeout; + unsigned long ticks; + + autoneg_timeout = autoneg_start_time + (AXGBE_LINK_TIMEOUT * + 2 * rte_get_timer_hz()); + ticks = rte_get_timer_cycles(); + if (time_after(ticks, autoneg_timeout)) + return 1; + else + return 0; +} + static void axgbe_phy_status(struct axgbe_port *pdata) { unsigned int link_aneg; - int an_restart; + int an_restart, ret; + unsigned int reg = 0; + unsigned long autoneg_start_time; if (axgbe_test_bit(AXGBE_LINK_ERR, &pdata->dev_state)) { pdata->phy.link = 0; @@ -896,8 +1042,32 @@ static void axgbe_phy_status(struct axgbe_port *pdata) if (pdata->phy.link) { if (link_aneg && !axgbe_phy_aneg_done(pdata)) { - axgbe_check_link_timeout(pdata); - return; + if (axgbe_cur_mode(pdata) == AXGBE_MODE_SGMII_1000) { + /*autoneg not complete, so re-intializing*/ + /* and restarting it*/ + axgbe_an_init(pdata); + axgbe_an_restart(pdata); + reg = XMDIO_READ(pdata, MDIO_MMD_VEND2, + MDIO_VEND2_AN_STAT); + autoneg_start_time = rte_get_timer_cycles(); + /*poll for autoneg to complete*/ + while (!(reg & AXGBE_AN_CL37_INT_CMPLT)) { + ret = + autoneg_time_out(autoneg_start_time); + if (ret) + break; + reg = XMDIO_READ(pdata, + MDIO_MMD_VEND2, + MDIO_VEND2_AN_STAT); + if (reg & AXGBE_AN_CL37_INT_CMPLT) { + axgbe_an37_isr(pdata); + break; + } + } + } else { + axgbe_check_link_timeout(pdata); + return; + } } axgbe_phy_status_result(pdata); if (axgbe_test_bit(AXGBE_LINK_INIT, &pdata->dev_state)) diff --git a/drivers/net/axgbe/axgbe_phy_impl.c b/drivers/net/axgbe/axgbe_phy_impl.c index f0dc11695..a324a2bc9 100644 --- a/drivers/net/axgbe/axgbe_phy_impl.c +++ b/drivers/net/axgbe/axgbe_phy_impl.c @@ -957,6 +957,41 @@ static enum axgbe_mode axgbe_phy_an73_outcome(struct axgbe_port *pdata) return mode; } +static enum axgbe_mode axgbe_phy_an37_sgmii_outcome(struct axgbe_port *pdata) +{ + enum axgbe_mode mode; + + pdata->phy.lp_advertising |= ADVERTISED_Autoneg; + pdata->phy.lp_advertising |= ADVERTISED_1000baseT_Full; + + if (pdata->phy.pause_autoneg) + axgbe_phy_phydev_flowctrl(pdata); + + switch (pdata->an_status & AXGBE_SGMII_AN_LINK_SPEED) { + case AXGBE_SGMII_AN_LINK_SPEED_100: + if (pdata->an_status & AXGBE_SGMII_AN_LINK_DUPLEX) { + pdata->phy.lp_advertising |= ADVERTISED_100baseT_Full; + mode = AXGBE_MODE_SGMII_100; + } else { + mode = AXGBE_MODE_UNKNOWN; + } + break; + case AXGBE_SGMII_AN_LINK_SPEED_1000: + if (pdata->an_status & AXGBE_SGMII_AN_LINK_DUPLEX) { + pdata->phy.lp_advertising |= ADVERTISED_1000baseT_Full; + mode = AXGBE_MODE_SGMII_1000; + } else { + /* Half-duplex not supported */ + mode = AXGBE_MODE_UNKNOWN; + } + break; + default: + mode = AXGBE_MODE_UNKNOWN; + break; + } + return mode; +} + static enum axgbe_mode axgbe_phy_an_outcome(struct axgbe_port *pdata) { switch (pdata->an_mode) { @@ -966,6 +1001,7 @@ static enum axgbe_mode axgbe_phy_an_outcome(struct axgbe_port *pdata) return axgbe_phy_an73_redrv_outcome(pdata); case AXGBE_AN_MODE_CL37: case AXGBE_AN_MODE_CL37_SGMII: + return axgbe_phy_an37_sgmii_outcome(pdata); default: return AXGBE_MODE_UNKNOWN; } @@ -1957,6 +1993,7 @@ static int axgbe_phy_start(struct axgbe_port *pdata) default: break; } + pdata->phy.advertising &= axgbe_phy_an_advertising(pdata); return ret; }