From patchwork Mon Dec 9 11:14:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Milind Parab X-Patchwork-Id: 1206127 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=cadence.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=cadence.com header.i=@cadence.com header.b="H+P8i5Vl"; dkim=pass (1024-bit key; unprotected) header.d=cadence.com header.i=@cadence.com header.b="PlCFfg6M"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47WgZk2tgyz9sR0 for ; Mon, 9 Dec 2019 22:14:54 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727684AbfLILOv (ORCPT ); Mon, 9 Dec 2019 06:14:51 -0500 Received: from mx0b-0014ca01.pphosted.com ([208.86.201.193]:55352 "EHLO mx0a-0014ca01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726297AbfLILOu (ORCPT ); Mon, 9 Dec 2019 06:14:50 -0500 Received: from pps.filterd (m0042333.ppops.net [127.0.0.1]) by mx0b-0014ca01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id xB9B5kfp030482; Mon, 9 Dec 2019 03:14:37 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cadence.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=proofpoint; bh=BXhnLcZxt92K2EkpcJZICYzz7KJI1bNBG3tZkHOctk0=; b=H+P8i5Vl2321M9hZ498rFVeidlvYeqpyeiIq5e5p/WZ6J1dJapg83+VDYftt7qd0/U7J DulnBqsGof2z75DivpoaLknkTwMtL91rN65+0R2QNpCamQstcr3PLAzuuVEzv+vRuR7O ZIA90xlHY5l5Lr3bRcxsCFEby42sofZiRBSNMdLqZI6LobefWtxcRrKIir6iB5bbtcIG 9TDNPVNHdZyjYB3ztt7+HdgaEh4ulUSFLn2A/ZNfJ5CewQ72PInhXBQddvZpsGImFmYo EMm0VFvdybQE1XEONQQ8UB1HlfFJ78LgU8mv8/mnV3lqx464cNYyDHV5mlI7fa/KDONO Zg== Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2176.outbound.protection.outlook.com [104.47.58.176]) by mx0b-0014ca01.pphosted.com with ESMTP id 2wr9dfdc0a-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Mon, 09 Dec 2019 03:14:37 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BScnWZOa0ESC8IDXVTRRfzszcpeTa9Pjpawyfrj0wt8Eb+/FEtN9DIPXlX26hpP2fAtmij8ZHIr64iN52ZNhJ3dkiONVUWSrqfrT5l+SCHS07/M4Aj93mtw88LkRz9XDcZL0GL3OPhvCVgFzfqY3s9hu6nEO7fStP+uSe8/0KTjNbHUHdEmFs6gljCTfs7k31ifANJx19WhNEXnF2jvIqFiBycKZYSEvFsMZFMB/FLpGHkudiNOO9JEcEYV226FYKol+f/BzLZhysFqkKQiKzGuNAoJRUZBlSHLP1SQsJmlYvWlXFYLj3gfhgJvkv8BOSDabjB5r5pAe+0xcLNQUyw== 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=BXhnLcZxt92K2EkpcJZICYzz7KJI1bNBG3tZkHOctk0=; b=mIg/08yt+jKbPBva2N19HDkeIA3haz3NgPvIxuvNE9PIFqIIBuBBFaLorJrY1DE4y9RB4Rn0FE7BykR7cBY99Fw+tkKF5ed/8CJrQH3Eif7n22+lwQoeZtbvr8cfVSzYYXIzf2fqCjoCQCt/5IKy8rEiRBcJU9eJLWoPgby/cFUXOckf6TOYZfOBbhbSQvzJWWTeKByyx5L4nG05o5fYOl5wUUn7hpb+HJGMpC3cj5lT5n7FqAzG2QuWYq2KF7w/Vz1LxSs33GvaFJ6fBDpF+iU2HZ3lGzPLkYdtRKZFl6STWJPSJ4r767/bhhDSEAuaGj0wAzj9dtGj3VpHXtevLw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 64.207.220.243) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=cadence.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=cadence.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cadence.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BXhnLcZxt92K2EkpcJZICYzz7KJI1bNBG3tZkHOctk0=; b=PlCFfg6MDGythwO98Yo/ySMAJD0+5rSJFDDQPLCT1WryIh9AnyeIx9bwxKDSqV+OYzyiXg/g5HVwYRaYVBqs2fMS7i4OqjdfM5SADyw4MQoeR1MDTFr7zTTarDDXY5hChvUI9H/yLv+Bh+pDUXNzGy8tGC+Owb+U+ytEBZqvd8I= Received: from DM5PR07CA0053.namprd07.prod.outlook.com (2603:10b6:4:ad::18) by BN7PR07MB4257.namprd07.prod.outlook.com (2603:10b6:406:b5::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2516.14; Mon, 9 Dec 2019 11:14:33 +0000 Received: from BN8NAM12FT003.eop-nam12.prod.protection.outlook.com (2a01:111:f400:fe5b::207) by DM5PR07CA0053.outlook.office365.com (2603:10b6:4:ad::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2516.14 via Frontend Transport; Mon, 9 Dec 2019 11:14:33 +0000 Received-SPF: Pass (protection.outlook.com: domain of cadence.com designates 64.207.220.243 as permitted sender) receiver=protection.outlook.com; client-ip=64.207.220.243; helo=wcmailrelayl01.cadence.com; Received: from wcmailrelayl01.cadence.com (64.207.220.243) by BN8NAM12FT003.mail.protection.outlook.com (10.13.182.61) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2495.18 via Frontend Transport; Mon, 9 Dec 2019 11:14:31 +0000 Received: from maileu3.global.cadence.com (maileu3.cadence.com [10.160.88.99]) by wcmailrelayl01.cadence.com (8.14.7/8.14.4) with ESMTP id xB9BENK1031311 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=OK); Mon, 9 Dec 2019 03:14:24 -0800 X-CrossPremisesHeadersFilteredBySendConnector: maileu3.global.cadence.com Received: from maileu3.global.cadence.com (10.160.88.99) by maileu3.global.cadence.com (10.160.88.99) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Mon, 9 Dec 2019 12:14:22 +0100 Received: from lvlabd.cadence.com (10.165.128.103) by maileu3.global.cadence.com (10.160.88.99) with Microsoft SMTP Server (TLS) id 15.0.1367.3 via Frontend Transport; Mon, 9 Dec 2019 12:14:22 +0100 Received: from lvlabd.cadence.com (localhost.localdomain [127.0.0.1]) by lvlabd.cadence.com (8.14.4/8.14.4) with ESMTP id xB9BEM19024300; Mon, 9 Dec 2019 11:14:22 GMT From: Milind Parab To: , , , CC: , , , , , , , , , Milind Parab Subject: [PATCH 1/3] net: macb: fix for fixed-link mode Date: Mon, 9 Dec 2019 11:14:21 +0000 Message-ID: <1575890061-24250-1-git-send-email-mparab@cadence.com> X-Mailer: git-send-email 2.2.2 In-Reply-To: <1575890033-23846-1-git-send-email-mparab@cadence.com> References: <1575890033-23846-1-git-send-email-mparab@cadence.com> MIME-Version: 1.0 X-OrganizationHeadersPreserved: maileu3.global.cadence.com X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:64.207.220.243; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(4636009)(136003)(396003)(346002)(39860400002)(376002)(199004)(189003)(36092001)(7696005)(70206006)(5660300002)(110136005)(54906003)(478600001)(36906005)(70586007)(316002)(86362001)(7416002)(305945005)(4326008)(426003)(336012)(186003)(2616005)(26005)(7126003)(107886003)(2906002)(8936002)(36756003)(8676002)(356004)(81156014)(81166006); DIR:OUT; SFP:1101; SCL:1; SRVR:BN7PR07MB4257; H:wcmailrelayl01.cadence.com; FPR:; SPF:Pass; LANG:en; PTR:ErrorRetry; A:1; MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 48bf3d5d-a446-4a56-59fa-08d77c98f6ca X-MS-TrafficTypeDiagnostic: BN7PR07MB4257: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-Forefront-PRVS: 02462830BE X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: u6OSOFp3lXk0k6crYVsd8GE+NT218S4Y2tDWlYPfU7xDSeJF16vPnXN1JuS7QzkkLLrmDcTn9PoFFT+OsYBN5mw8dReJC0s2PHjmlSBBpYe9RjFleblnA959ra9Gq95XMANgSop5Do080GY5G7UTLoCIOwwnWKLya3HX8C0cIqxk1W1jist7ym/OcSR2lO7m4Cfaxnp6Y22GoFASgnQl23Oco8SxvFHwhfoch4sIX3N6TI0/h3G4IwagXy/7Q8238OK/RnUoskCFn4tIhbLpBO62yiCyJmTSl1OkzRL3n3L4qIfO67t4czd7GmYdIyS6APWSUjL/VnHXyHbgOdbakCv6Xt4//+GOfWBBmwjzs3kgJjzaUMsitR3A5Ui8BEUgD8DTb4Ax599WKsYO9Jc7vwB/J8iX0eWgveCfcLjOaWy/jGLZDaoocLhXUb6UcY6IUiwnCDxXUc0s/fhC+lgTUfo8+GmSYmvZWqqJqcIbqwchoOZD3UdfHQtwW1ZGI8ld X-OriginatorOrg: cadence.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Dec 2019 11:14:31.2022 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 48bf3d5d-a446-4a56-59fa-08d77c98f6ca X-MS-Exchange-CrossTenant-Id: d36035c5-6ce6-4662-a3dc-e762e61ae4c9 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=d36035c5-6ce6-4662-a3dc-e762e61ae4c9; Ip=[64.207.220.243]; Helo=[wcmailrelayl01.cadence.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN7PR07MB4257 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.95, 18.0.572 definitions=2019-12-09_02:2019-12-09, 2019-12-09 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_check_notspam policy=outbound_check score=0 mlxscore=0 malwarescore=0 suspectscore=0 phishscore=0 impostorscore=0 spamscore=0 priorityscore=1501 adultscore=0 bulkscore=0 clxscore=1015 mlxlogscore=937 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-1910280000 definitions=main-1912090095 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch fix the issue with fixed link. With fixed-link device opening fails due to macb_phylink_connect not handling fixed-link mode, in which case no MAC-PHY connection is needed and phylink_connect return success (0), however in current driver attempt is made to search and connect to PHY even for fixed-link. Signed-off-by: Milind Parab Signed-off-by: Russell King --- drivers/net/ethernet/cadence/macb_main.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index 9c767ee252ac..6b68ef34ab19 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -615,17 +615,13 @@ static int macb_phylink_connect(struct macb *bp) { struct net_device *dev = bp->dev; struct phy_device *phydev; + struct device_node *dn = bp->pdev->dev.of_node; int ret; - if (bp->pdev->dev.of_node && - of_parse_phandle(bp->pdev->dev.of_node, "phy-handle", 0)) { - ret = phylink_of_phy_connect(bp->phylink, bp->pdev->dev.of_node, - 0); - if (ret) { - netdev_err(dev, "Could not attach PHY (%d)\n", ret); - return ret; - } - } else { + if (dn) + ret = phylink_of_phy_connect(bp->phylink, dn, 0); + + if (!dn || (ret && !of_parse_phandle(dn, "phy-handle", 0))) { phydev = phy_find_first(bp->mii_bus); if (!phydev) { netdev_err(dev, "no PHY found\n"); @@ -638,6 +634,9 @@ static int macb_phylink_connect(struct macb *bp) netdev_err(dev, "Could not attach to PHY (%d)\n", ret); return ret; } + } else if (ret) { + netdev_err(dev, "Could not attach PHY (%d)\n", ret); + return ret; } phylink_start(bp->phylink); From patchwork Mon Dec 9 11:15:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Milind Parab X-Patchwork-Id: 1206128 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=cadence.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=cadence.com header.i=@cadence.com header.b="ccIHxcVE"; dkim=pass (1024-bit key; unprotected) header.d=cadence.com header.i=@cadence.com header.b="WhL+SQhA"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47Wgbh73JLz9sR1 for ; Mon, 9 Dec 2019 22:15:44 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727545AbfLILPm (ORCPT ); Mon, 9 Dec 2019 06:15:42 -0500 Received: from mx0a-0014ca01.pphosted.com ([208.84.65.235]:11618 "EHLO mx0a-0014ca01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727188AbfLILPm (ORCPT ); Mon, 9 Dec 2019 06:15:42 -0500 Received: from pps.filterd (m0042385.ppops.net [127.0.0.1]) by mx0a-0014ca01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id xB9BD5ii010316; Mon, 9 Dec 2019 03:15:21 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cadence.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=proofpoint; bh=4vRtUnE3XysitoWgSGaWij+7gZphnZWB2sfqpGSjCX0=; b=ccIHxcVE5wgszQtqrsTewyAUVAYc0urFU38rcWWFgaaP7dy6T8A3H8VXicmSoG3E3l4k sUvp1utAAJmIDSppnXdniICgmVcjgJGk14S6KwzwEuiAMqETmxwZOwadOVrTMkVdNt/X Qv8r3AIPRlwCR/5aSxi6oRNpv9/TDK8+1LK8T9JD5MgO6lhncywqofAN4nKJfxQHNokF 5MmcooJAwMZSkWECJ9ONNn4k+CfyROfxn9DRNajxMEm8poUWuHBzAf9mHclJm9HJY8xl He0ZcNMsEfGQegV01kPEmRklwgx9+kA1YNP2bCMArrPpfsD7SBoDCuOLA5WCmik8gPOb 6w== Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2100.outbound.protection.outlook.com [104.47.55.100]) by mx0a-0014ca01.pphosted.com with ESMTP id 2wra705acw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 09 Dec 2019 03:15:21 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BuzlpAdBBsocbfqSOiyXZxe80H4UPNgkc8jqevB6l1a/ZpRfUyj2/QeJCprD5QuRXSyIODPw2STkZk7HVylLlnXliThCLivfBidWFd58L1Tn5XkAX9jiqj34tQ4K+BBEgcd6zb3WABdOJJdrrJeG1A4SUXOaodVXLWlMxXtug5i5WugHL1y4I7h2yReGuh5vfNV3nXPWT3XZLG8CrrfbLnsOPwgVkg80OUtEP9OVXrjawi1rBW01m0LJx4UHytv5jOBhlh4JM1jNBTSNlNDsafvSgoCJby0Zdaw3hGnejCbLDjXkxnht+1Xiul2TOAs39qAS9Vx9J1LeRv/YHwdU8Q== 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=4vRtUnE3XysitoWgSGaWij+7gZphnZWB2sfqpGSjCX0=; b=DTr7qjzEflYBlNVGZ4svuLzgK0g1N0EXizYRbZ8wJ6kMf5guYQLgbr6GwJNgNJZ94oHAfeIYUVxH2Vb0arp6AN7f5R3LAQFKNudX7i+bj/Od/LXcD9cw+ErpqcPjO7SihszCs9hSxLo5LVvFs7RaSwGtTHLUSY1kZhOfgl0bwnYgFY6r20We4xGKrzoDFiorEDCeslU3ymh26XnvE5t4nDe5Z97aJ3T9TlCs0BL9BSA+mQH/3OD6oFntWKDXwEHCcBU9+CmyAUHM8at4tT5Dz1J1v59f1PTxiYOKRlHq1EkIfdwtI97aRoX7rXCVzZ1oCRD90KURHUtUqdoo9IU6HA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 199.43.4.28) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=cadence.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=cadence.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cadence.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4vRtUnE3XysitoWgSGaWij+7gZphnZWB2sfqpGSjCX0=; b=WhL+SQhA3uA72wXeCq71/PALqJFV0UBnqVSW3BdrP3UGzZCvasTOcAhO8btMaXQKMJi0cmn1eFxQnxuXpe78pO4MVSfK7li7a3KnTnyGXfymMs1gLs6TTKXd2IbCZv6HWtcHkarwvpcpzrNY2JELNdA7iTbCfUUWGYEsCLjqz1I= Received: from CO2PR07CA0067.namprd07.prod.outlook.com (2603:10b6:100::35) by MWHPR07MB2752.namprd07.prod.outlook.com (2603:10b6:300:28::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2516.13; Mon, 9 Dec 2019 11:15:18 +0000 Received: from MW2NAM12FT035.eop-nam12.prod.protection.outlook.com (2a01:111:f400:fe5a::207) by CO2PR07CA0067.outlook.office365.com (2603:10b6:100::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2516.14 via Frontend Transport; Mon, 9 Dec 2019 11:15:18 +0000 Received-SPF: Pass (protection.outlook.com: domain of cadence.com designates 199.43.4.28 as permitted sender) receiver=protection.outlook.com; client-ip=199.43.4.28; helo=rmmaillnx1.cadence.com; Received: from rmmaillnx1.cadence.com (199.43.4.28) by MW2NAM12FT035.mail.protection.outlook.com (10.13.181.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2495.18 via Frontend Transport; Mon, 9 Dec 2019 11:15:18 +0000 Received: from maileu3.global.cadence.com (maileu3.cadence.com [10.160.88.99]) by rmmaillnx1.cadence.com (8.14.4/8.14.4) with ESMTP id xB9BFFMB009388 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Mon, 9 Dec 2019 06:15:16 -0500 X-CrossPremisesHeadersFilteredBySendConnector: maileu3.global.cadence.com Received: from maileu3.global.cadence.com (10.160.88.99) by maileu3.global.cadence.com (10.160.88.99) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Mon, 9 Dec 2019 12:15:14 +0100 Received: from lvlabd.cadence.com (10.165.128.103) by maileu3.global.cadence.com (10.160.88.99) with Microsoft SMTP Server (TLS) id 15.0.1367.3 via Frontend Transport; Mon, 9 Dec 2019 12:15:14 +0100 Received: from lvlabd.cadence.com (localhost.localdomain [127.0.0.1]) by lvlabd.cadence.com (8.14.4/8.14.4) with ESMTP id xB9BFEjO024923; Mon, 9 Dec 2019 11:15:14 GMT From: Milind Parab To: , , , CC: , , , , , , , , , Milind Parab Subject: [PATCH 2/3] net: macb: add support for C45 MDIO read/write Date: Mon, 9 Dec 2019 11:15:12 +0000 Message-ID: <1575890112-24877-1-git-send-email-mparab@cadence.com> X-Mailer: git-send-email 2.2.2 In-Reply-To: <1575890033-23846-1-git-send-email-mparab@cadence.com> References: <1575890033-23846-1-git-send-email-mparab@cadence.com> MIME-Version: 1.0 X-OrganizationHeadersPreserved: maileu3.global.cadence.com X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:199.43.4.28; IPV:CAL; SCL:-1; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(4636009)(136003)(346002)(376002)(39860400002)(396003)(189003)(36092001)(199004)(107886003)(7416002)(356004)(7126003)(2616005)(26826003)(305945005)(4326008)(478600001)(86362001)(2906002)(26005)(54906003)(336012)(7696005)(426003)(36756003)(110136005)(81166006)(76130400001)(186003)(5660300002)(70206006)(8676002)(70586007)(8936002)(81156014)(316002); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR07MB2752; H:rmmaillnx1.cadence.com; FPR:; SPF:Pass; LANG:en; PTR:InfoDomainNonexistent; MX:1; A:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a063e2e0-8675-465e-abf0-08d77c991302 X-MS-TrafficTypeDiagnostic: MWHPR07MB2752: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2000; X-Forefront-PRVS: 02462830BE X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FoHjXBt8jnd4tjkhBSxUht2bCFSOjq03oE8a/F8sbsfkdZnw+OZwuEUWE3a7PWNcygjmrClFLYFz7vFk9/cIZhRC+man3MKN5NR78SDpPkZfcRdPh+dC1SjZB/uitJGSZJLYMLXcWodcHGHz3M1kci2sAlzCq3krmL+DIGyeZCf+yet3GPtxQ4DBcdAEF6N1uD0Xk4obIqUgOI1MO2DKOQGcxugTOaGDESlg9NZoiB51EYhSRiQOlBVKetFLVVJh70iwz6a0OqMVeRdYKU+JoWDoCtLDHZMyMOro1vl6bVlD2Zdwp8Kk/h6ogGg+6V1325e7CZpsZplWyDc0s4UiRMgtEu7pyXcHx13sCqfCstdjJNxP60zWK7rWP6zIpFBUpXXKS4PV+7icwu0WLeqnsi4DEP+71BVWZd/9HgpGsTTfPc1t3eqn5zM114MmHk6/31xnLq6okXuTSiNwDPKQjXfCTx22GP7hrdoGZcnyJyB1+8StNeg8bSCzltsDM3lG X-OriginatorOrg: cadence.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Dec 2019 11:15:18.5496 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a063e2e0-8675-465e-abf0-08d77c991302 X-MS-Exchange-CrossTenant-Id: d36035c5-6ce6-4662-a3dc-e762e61ae4c9 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=d36035c5-6ce6-4662-a3dc-e762e61ae4c9; Ip=[199.43.4.28]; Helo=[rmmaillnx1.cadence.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR07MB2752 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.95, 18.0.572 definitions=2019-12-09_02:2019-12-09, 2019-12-09 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_check_notspam policy=outbound_check score=0 mlxlogscore=936 suspectscore=0 malwarescore=0 phishscore=0 lowpriorityscore=0 impostorscore=0 mlxscore=0 bulkscore=0 priorityscore=1501 adultscore=0 clxscore=1015 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-1910280000 definitions=main-1912090096 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch modify MDIO read/write functions to support communication with C45 PHY. Signed-off-by: Milind Parab --- drivers/net/ethernet/cadence/macb.h | 15 ++++-- drivers/net/ethernet/cadence/macb_main.c | 61 +++++++++++++++++++----- 2 files changed, 61 insertions(+), 15 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h index 19fe4f4867c7..dbf7070fcdba 100644 --- a/drivers/net/ethernet/cadence/macb.h +++ b/drivers/net/ethernet/cadence/macb.h @@ -630,10 +630,17 @@ #define GEM_CLK_DIV96 5 /* Constants for MAN register */ -#define MACB_MAN_SOF 1 -#define MACB_MAN_WRITE 1 -#define MACB_MAN_READ 2 -#define MACB_MAN_CODE 2 +#define MACB_MAN_C22_SOF 1 +#define MACB_MAN_C22_WRITE 1 +#define MACB_MAN_C22_READ 2 +#define MACB_MAN_C22_CODE 2 + +#define MACB_MAN_C45_SOF 0 +#define MACB_MAN_C45_ADDR 0 +#define MACB_MAN_C45_WRITE 1 +#define MACB_MAN_C45_POST_READ_INCR 2 +#define MACB_MAN_C45_READ 3 +#define MACB_MAN_C45_CODE 2 /* Capability mask bits */ #define MACB_CAPS_ISR_CLEAR_ON_WRITE 0x00000001 diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index 6b68ef34ab19..17297b01e85e 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -337,11 +337,30 @@ static int macb_mdio_read(struct mii_bus *bus, int mii_id, int regnum) if (status < 0) goto mdio_read_exit; - macb_writel(bp, MAN, (MACB_BF(SOF, MACB_MAN_SOF) - | MACB_BF(RW, MACB_MAN_READ) - | MACB_BF(PHYA, mii_id) - | MACB_BF(REGA, regnum) - | MACB_BF(CODE, MACB_MAN_CODE))); + if (regnum & MII_ADDR_C45) { + macb_writel(bp, MAN, (MACB_BF(SOF, MACB_MAN_C45_SOF) + | MACB_BF(RW, MACB_MAN_C45_ADDR) + | MACB_BF(PHYA, mii_id) + | MACB_BF(REGA, (regnum >> 16) & 0x1F) + | MACB_BF(DATA, regnum & 0xFFFF) + | MACB_BF(CODE, MACB_MAN_C45_CODE))); + + status = macb_mdio_wait_for_idle(bp); + if (status < 0) + goto mdio_read_exit; + + macb_writel(bp, MAN, (MACB_BF(SOF, MACB_MAN_C45_SOF) + | MACB_BF(RW, MACB_MAN_C45_READ) + | MACB_BF(PHYA, mii_id) + | MACB_BF(REGA, (regnum >> 16) & 0x1F) + | MACB_BF(CODE, MACB_MAN_C45_CODE))); + } else { + macb_writel(bp, MAN, (MACB_BF(SOF, MACB_MAN_C22_SOF) + | MACB_BF(RW, MACB_MAN_C22_READ) + | MACB_BF(PHYA, mii_id) + | MACB_BF(REGA, regnum) + | MACB_BF(CODE, MACB_MAN_C22_CODE))); + } status = macb_mdio_wait_for_idle(bp); if (status < 0) @@ -370,12 +389,32 @@ static int macb_mdio_write(struct mii_bus *bus, int mii_id, int regnum, if (status < 0) goto mdio_write_exit; - macb_writel(bp, MAN, (MACB_BF(SOF, MACB_MAN_SOF) - | MACB_BF(RW, MACB_MAN_WRITE) - | MACB_BF(PHYA, mii_id) - | MACB_BF(REGA, regnum) - | MACB_BF(CODE, MACB_MAN_CODE) - | MACB_BF(DATA, value))); + if (regnum & MII_ADDR_C45) { + macb_writel(bp, MAN, (MACB_BF(SOF, MACB_MAN_C45_SOF) + | MACB_BF(RW, MACB_MAN_C45_ADDR) + | MACB_BF(PHYA, mii_id) + | MACB_BF(REGA, (regnum >> 16) & 0x1F) + | MACB_BF(DATA, regnum & 0xFFFF) + | MACB_BF(CODE, MACB_MAN_C45_CODE))); + + status = macb_mdio_wait_for_idle(bp); + if (status < 0) + goto mdio_write_exit; + + macb_writel(bp, MAN, (MACB_BF(SOF, MACB_MAN_C45_SOF) + | MACB_BF(RW, MACB_MAN_C45_WRITE) + | MACB_BF(PHYA, mii_id) + | MACB_BF(REGA, (regnum >> 16) & 0x1F) + | MACB_BF(CODE, MACB_MAN_C45_CODE) + | MACB_BF(DATA, value))); + } else { + macb_writel(bp, MAN, (MACB_BF(SOF, MACB_MAN_C22_SOF) + | MACB_BF(RW, MACB_MAN_C22_WRITE) + | MACB_BF(PHYA, mii_id) + | MACB_BF(REGA, regnum) + | MACB_BF(CODE, MACB_MAN_C22_CODE) + | MACB_BF(DATA, value))); + } status = macb_mdio_wait_for_idle(bp); if (status < 0) From patchwork Mon Dec 9 11:16:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Milind Parab X-Patchwork-Id: 1206129 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=cadence.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=cadence.com header.i=@cadence.com header.b="c5cooQhV"; dkim=pass (1024-bit key; unprotected) header.d=cadence.com header.i=@cadence.com header.b="pdQbpinX"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47Wgcx0DPyz9sPT for ; Mon, 9 Dec 2019 22:16:49 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727448AbfLILQo (ORCPT ); Mon, 9 Dec 2019 06:16:44 -0500 Received: from mx0a-0014ca01.pphosted.com ([208.84.65.235]:35402 "EHLO mx0a-0014ca01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727188AbfLILQo (ORCPT ); Mon, 9 Dec 2019 06:16:44 -0500 Received: from pps.filterd (m0042385.ppops.net [127.0.0.1]) by mx0a-0014ca01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id xB9BDMGn010405; Mon, 9 Dec 2019 03:16:27 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cadence.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=proofpoint; bh=cNFHaK4JURm6IiEnEPYd/JihW1d+nuCyWEh+mAMv9/Y=; b=c5cooQhV5vpjB3c4oVtDFUZVHwtEsMBaWeHZkjnmDS/Vvz+7ZZM5BvSVlO1gTxiksI5u 8ijwbXuZe1AQn+5lC6Jt+a4zphOk+KQtFMCcxjMOmtaVYPXs6Wo9ErBWDCrEhFtJAWEB WKI4vOXm2sO3leNgyt9OV6BJCPqhLIOlCLPTtwpAtvZhYl7RhnyIBuhWfoyMN5E9aGMl QAn25IwapLb4PY5rRMPRH6DNbrJt3I+Cu8hjaNO+bomc6aidpseK6iPZKBNxCmyxkp/r w3rpLM1J5OPZW89+Iefo35RZU5z6+glenN/zezVfpQb1zAt7qB+hRx4g2iQZec2RTZUN Ww== Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2177.outbound.protection.outlook.com [104.47.58.177]) by mx0a-0014ca01.pphosted.com with ESMTP id 2wra705afy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Mon, 09 Dec 2019 03:16:27 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HfB5x5RkJDwi9UBrfEPawBTPtca7dKdndvlvpZ1Prxgtj3G05/yFA8XsxYXyaYvCYSfTu8SzujyjSUM9jONAkG0h+OGjMH7q6Jjkd9UqjofLvBOQbkdr63zrs5LiO5rBp9iWHDQMe7S9lsetcNebdmehuQrU7BeT2d0l6u5uua2s61jP/6fSNkYd0AzPVbhNkO1+Qeb+owETOLXtI2LhW0LtvfMsqUFTzr1aUHIqyHYenXFTGlOg8H5v5IiGg2xigf6VGXhIVHDF7qhw5zW6Zrxkx3zMl0t+irXGma6ra502xZNVxYMFbNWhAMPoh18GM8Jp+0wMneDKAoB36H650Q== 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=cNFHaK4JURm6IiEnEPYd/JihW1d+nuCyWEh+mAMv9/Y=; b=O7eGbR24watWWxKwCmyDg+YA/dZvFMR0q1Lesc6IS0vPbmoGxQsOVMP8gesf/b+ttEEwwVkGmVy2s+USGzwbRXiG95wab1ZRFg37qKEYTIw1mY1UxlDHXr5+Xtn2O6Ikc4rWFOQFeNiqIKUuHdVhXqGNG/xrSksYE4xacFFzh/fCZpyuPCSWEEWh31cC4+utbJVCMQpEfLWOYdZZK4yL3pq+3yBmvafIKZMYtfyicGPAXJWZWPOe0PO0nLE2ZKj8CWFF9o5kO1M0DfxGQEnBbVrgcJJ2gUvYnMytNlqRmeChurkNfB4rte6rWz37gSB7JTz9erPRdHgmvN2PtGAdGg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 158.140.1.28) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=cadence.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=cadence.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cadence.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cNFHaK4JURm6IiEnEPYd/JihW1d+nuCyWEh+mAMv9/Y=; b=pdQbpinXV7BbBSS9CqyNFdwnqIREcuTQc3E+VGAnX82UKNNHuHnvNeUARPenF+vcud7dw3ZuoipTKmyIERNiO0+7fvdARMtgs4ENI5No6POE0URFh5dObbOqQmKerwOtXePy0R/S01mwEzOPq3ayF+duvjFDyMm2hn4O5tTv4Zg= Received: from BN8PR07CA0003.namprd07.prod.outlook.com (2603:10b6:408:ac::16) by BYAPR07MB5318.namprd07.prod.outlook.com (2603:10b6:a03:69::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2495.22; Mon, 9 Dec 2019 11:16:23 +0000 Received: from BN8NAM12FT013.eop-nam12.prod.protection.outlook.com (2a01:111:f400:fe5b::209) by BN8PR07CA0003.outlook.office365.com (2603:10b6:408:ac::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2516.12 via Frontend Transport; Mon, 9 Dec 2019 11:16:23 +0000 Received-SPF: Pass (protection.outlook.com: domain of cadence.com designates 158.140.1.28 as permitted sender) receiver=protection.outlook.com; client-ip=158.140.1.28; helo=sjmaillnx1.cadence.com; Received: from sjmaillnx1.cadence.com (158.140.1.28) by BN8NAM12FT013.mail.protection.outlook.com (10.13.182.227) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2495.18 via Frontend Transport; Mon, 9 Dec 2019 11:16:23 +0000 Received: from maileu3.global.cadence.com (maileu3.cadence.com [10.160.88.99]) by sjmaillnx1.cadence.com (8.14.4/8.14.4) with ESMTP id xB9BGJjH025887 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Mon, 9 Dec 2019 03:16:20 -0800 X-CrossPremisesHeadersFilteredBySendConnector: maileu3.global.cadence.com Received: from maileu3.global.cadence.com (10.160.88.99) by maileu3.global.cadence.com (10.160.88.99) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Mon, 9 Dec 2019 12:16:18 +0100 Received: from lvlabd.cadence.com (10.165.128.103) by maileu3.global.cadence.com (10.160.88.99) with Microsoft SMTP Server (TLS) id 15.0.1367.3 via Frontend Transport; Mon, 9 Dec 2019 12:16:18 +0100 Received: from lvlabd.cadence.com (localhost.localdomain [127.0.0.1]) by lvlabd.cadence.com (8.14.4/8.14.4) with ESMTP id xB9BGIiX025683; Mon, 9 Dec 2019 11:16:18 GMT From: Milind Parab To: , , , CC: , , , , , , , , , Milind Parab Subject: [PATCH 3/3] net: macb: add support for high speed interface Date: Mon, 9 Dec 2019 11:16:16 +0000 Message-ID: <1575890176-25630-1-git-send-email-mparab@cadence.com> X-Mailer: git-send-email 2.2.2 In-Reply-To: <1575890033-23846-1-git-send-email-mparab@cadence.com> References: <1575890033-23846-1-git-send-email-mparab@cadence.com> MIME-Version: 1.0 X-OrganizationHeadersPreserved: maileu3.global.cadence.com X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:158.140.1.28; IPV:CAL; SCL:-1; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(4636009)(346002)(396003)(136003)(39860400002)(376002)(36092001)(199004)(189003)(7416002)(5660300002)(305945005)(36756003)(7636002)(70206006)(4326008)(76130400001)(70586007)(30864003)(107886003)(2906002)(186003)(26826003)(7696005)(26005)(246002)(8676002)(356004)(478600001)(7126003)(110136005)(86362001)(8936002)(54906003)(2616005)(336012)(316002)(426003); DIR:OUT; SFP:1101; SCL:1; SRVR:BYAPR07MB5318; H:sjmaillnx1.cadence.com; FPR:; SPF:Pass; LANG:en; PTR:corp.cadence.com; A:1; MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 539445c0-c80a-40e7-9496-08d77c99396d X-MS-TrafficTypeDiagnostic: BYAPR07MB5318: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-Forefront-PRVS: 02462830BE X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OjOwHFjcIsGN55F+IORL9iSKsvZNr3SX+bwoWs+IWqV4bXCDZTw6untbrxdTET9Kelra71Dy3q8z/NpHq4fv0Ay6Od2a3tFLYl91cbHMTmy/UVEmTzxuf29XXm4z/32nbj6kg7cpZzYOzItP1O1nd0yA7oTp8qz8i0oAFDKQG1/TMdqa8D40wueG8C9njFlGDW4DEieswkfp+kMrCYrkRmYViePUdZdU4IOpOiK/e/yb0bblIH/nW5zQF39VLSxiwqUWDhMmhwBVpisjYR4/RtlPmPoOXWD4swVcL7JcfGaqOlMoMtWLwIE6zfbolnB26g7qYVVHaXzqsuPHgSEmJpYTAK8SR6RxX8aGI8612ykCnTP81/fz1GdzPkJqgYfYW91WqHtlOLRIl+sTiLos2pejzQkQ4PnK1tRu2yILv60PCUqz0lZt++dBAsGcp7lbzomaUrjkX1JRa90ZqTPbMsTxfgFEjDzTtwS1sY7wVkBrDCvPoJh6RQxJkKYPu23a X-OriginatorOrg: cadence.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Dec 2019 11:16:23.0166 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 539445c0-c80a-40e7-9496-08d77c99396d X-MS-Exchange-CrossTenant-Id: d36035c5-6ce6-4662-a3dc-e762e61ae4c9 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=d36035c5-6ce6-4662-a3dc-e762e61ae4c9; Ip=[158.140.1.28]; Helo=[sjmaillnx1.cadence.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR07MB5318 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.95, 18.0.572 definitions=2019-12-09_02:2019-12-09, 2019-12-09 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_check_notspam policy=outbound_check score=0 mlxlogscore=999 suspectscore=0 malwarescore=0 phishscore=0 lowpriorityscore=0 impostorscore=0 mlxscore=0 bulkscore=0 priorityscore=1501 adultscore=0 clxscore=1015 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-1910280000 definitions=main-1912090096 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch add support for high speed USXGMII PCS and 10G speed in Cadence ethernet controller driver. Signed-off-by: Milind Parab --- drivers/net/ethernet/cadence/macb.h | 50 ++++++++ drivers/net/ethernet/cadence/macb_main.c | 142 ++++++++++++++++++++--- 2 files changed, 174 insertions(+), 18 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h index dbf7070fcdba..b731807d1c49 100644 --- a/drivers/net/ethernet/cadence/macb.h +++ b/drivers/net/ethernet/cadence/macb.h @@ -76,10 +76,12 @@ #define MACB_RBQPH 0x04D4 /* GEM register offsets. */ +#define GEM_NCR 0x0000 /* Network Control */ #define GEM_NCFGR 0x0004 /* Network Config */ #define GEM_USRIO 0x000c /* User IO */ #define GEM_DMACFG 0x0010 /* DMA Configuration */ #define GEM_JML 0x0048 /* Jumbo Max Length */ +#define GEM_HS_MAC_CONFIG 0x0050 /* GEM high speed config */ #define GEM_HRB 0x0080 /* Hash Bottom */ #define GEM_HRT 0x0084 /* Hash Top */ #define GEM_SA1B 0x0088 /* Specific1 Bottom */ @@ -164,6 +166,9 @@ #define GEM_DCFG7 0x0298 /* Design Config 7 */ #define GEM_DCFG8 0x029C /* Design Config 8 */ #define GEM_DCFG10 0x02A4 /* Design Config 10 */ +#define GEM_DCFG12 0x02AC /* Design Config 12 */ +#define GEM_USX_CONTROL 0x0A80 /* USXGMII control register */ +#define GEM_USX_STATUS 0x0A88 /* USXGMII status register */ #define GEM_TXBDCTRL 0x04cc /* TX Buffer Descriptor control register */ #define GEM_RXBDCTRL 0x04d0 /* RX Buffer Descriptor control register */ @@ -270,11 +275,19 @@ #define MACB_IRXFCS_OFFSET 19 #define MACB_IRXFCS_SIZE 1 +/* GEM specific NCR bitfields. */ +#define GEM_ENABLE_HS_MAC_OFFSET 31 +#define GEM_ENABLE_HS_MAC_SIZE 1 + /* GEM specific NCFGR bitfields. */ +#define GEM_FD_OFFSET 1 /* Full duplex */ +#define GEM_FD_SIZE 1 #define GEM_GBE_OFFSET 10 /* Gigabit mode enable */ #define GEM_GBE_SIZE 1 #define GEM_PCSSEL_OFFSET 11 #define GEM_PCSSEL_SIZE 1 +#define GEM_PAE_OFFSET 13 /* Pause enable */ +#define GEM_PAE_SIZE 1 #define GEM_CLK_OFFSET 18 /* MDC clock division */ #define GEM_CLK_SIZE 3 #define GEM_DBW_OFFSET 21 /* Data bus width */ @@ -455,11 +468,17 @@ #define MACB_REV_OFFSET 0 #define MACB_REV_SIZE 16 +/* Bitfield in HS_MAC_CONFIG */ +#define GEM_HS_MAC_SPEED_OFFSET 0 +#define GEM_HS_MAC_SPEED_SIZE 3 + /* Bitfields in DCFG1. */ #define GEM_IRQCOR_OFFSET 23 #define GEM_IRQCOR_SIZE 1 #define GEM_DBWDEF_OFFSET 25 #define GEM_DBWDEF_SIZE 3 +#define GEM_NO_PCS_OFFSET 0 +#define GEM_NO_PCS_SIZE 1 /* Bitfields in DCFG2. */ #define GEM_RX_PKT_BUFF_OFFSET 20 @@ -494,6 +513,34 @@ #define GEM_RXBD_RDBUFF_OFFSET 8 #define GEM_RXBD_RDBUFF_SIZE 4 +/* Bitfields in DCFG12. */ +#define GEM_HIGH_SPEED_OFFSET 26 +#define GEM_HIGH_SPEED_SIZE 1 + +/* Bitfields in USX_CONTROL. */ +#define GEM_USX_CTRL_SPEED_OFFSET 14 +#define GEM_USX_CTRL_SPEED_SIZE 3 +#define GEM_SERDES_RATE_OFFSET 12 +#define GEM_SERDES_RATE_SIZE 2 +#define GEM_RX_SCR_BYPASS_OFFSET 9 +#define GEM_RX_SCR_BYPASS_SIZE 1 +#define GEM_TX_SCR_BYPASS_OFFSET 8 +#define GEM_TX_SCR_BYPASS_SIZE 1 +#define GEM_RX_SYNC_RESET_OFFSET 2 +#define GEM_RX_SYNC_RESET_SIZE 1 +#define GEM_TX_EN_OFFSET 1 +#define GEM_TX_EN_SIZE 1 +#define GEM_SIGNAL_OK_OFFSET 0 +#define GEM_SIGNAL_OK_SIZE 1 + +/* Bitfields in USX_STATUS. */ +#define GEM_USX_TX_FAULT_OFFSET 28 +#define GEM_USX_TX_FAULT_SIZE 1 +#define GEM_USX_RX_FAULT_OFFSET 27 +#define GEM_USX_RX_FAULT_SIZE 1 +#define GEM_USX_BLOCK_LOCK_OFFSET 0 +#define GEM_USX_BLOCK_LOCK_SIZE 1 + /* Bitfields in TISUBN */ #define GEM_SUBNSINCR_OFFSET 0 #define GEM_SUBNSINCRL_OFFSET 24 @@ -656,6 +703,8 @@ #define MACB_CAPS_GIGABIT_MODE_AVAILABLE 0x20000000 #define MACB_CAPS_SG_DISABLED 0x40000000 #define MACB_CAPS_MACB_IS_GEM 0x80000000 +#define MACB_CAPS_PCS 0x01000000 +#define MACB_CAPS_HIGH_SPEED 0x02000000 /* LSO settings */ #define MACB_LSO_UFO_ENABLE 0x01 @@ -724,6 +773,7 @@ }) #define MACB_READ_NSR(bp) macb_readl(bp, NSR) +#define GEM_READ_USX_STATUS(bp) gem_readl(bp, USX_STATUS) /* struct macb_dma_desc - Hardware DMA descriptor * @addr: DMA address of data buffer diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index 17297b01e85e..710ee18a0ef0 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -81,6 +81,18 @@ struct sifive_fu540_macb_mgmt { #define MACB_WOL_HAS_MAGIC_PACKET (0x1 << 0) #define MACB_WOL_ENABLED (0x1 << 1) +enum { + HS_MAC_SPEED_100M, + HS_MAC_SPEED_1000M, + HS_MAC_SPEED_2500M, + HS_MAC_SPEED_5000M, + HS_MAC_SPEED_10000M, +}; + +enum { + MACB_SERDES_RATE_10G = 1, +}; + /* Graceful stop timeouts in us. We should allow up to * 1 frame time (10 Mbits/s, full-duplex, ignoring collisions) */ @@ -90,6 +102,8 @@ struct sifive_fu540_macb_mgmt { #define MACB_MDIO_TIMEOUT 1000000 /* in usecs */ +#define MACB_USX_BLOCK_LOCK_TIMEOUT 1000000 /* in usecs */ + /* DMA buffer descriptor might be different size * depends on hardware configuration: * @@ -506,6 +520,7 @@ static void macb_validate(struct phylink_config *config, state->interface != PHY_INTERFACE_MODE_RMII && state->interface != PHY_INTERFACE_MODE_GMII && state->interface != PHY_INTERFACE_MODE_SGMII && + state->interface != PHY_INTERFACE_MODE_USXGMII && !phy_interface_mode_is_rgmii(state->interface)) { bitmap_zero(supported, __ETHTOOL_LINK_MODE_MASK_NBITS); return; @@ -518,6 +533,13 @@ static void macb_validate(struct phylink_config *config, return; } + if (state->interface == PHY_INTERFACE_MODE_USXGMII && + !(bp->caps & MACB_CAPS_HIGH_SPEED && + bp->caps & MACB_CAPS_PCS)) { + bitmap_zero(supported, __ETHTOOL_LINK_MODE_MASK_NBITS); + return; + } + phylink_set_port_modes(mask); phylink_set(mask, Autoneg); phylink_set(mask, Asym_Pause); @@ -527,6 +549,22 @@ static void macb_validate(struct phylink_config *config, phylink_set(mask, 100baseT_Half); phylink_set(mask, 100baseT_Full); + if (bp->caps & MACB_CAPS_GIGABIT_MODE_AVAILABLE && + (state->interface == PHY_INTERFACE_MODE_NA || + state->interface == PHY_INTERFACE_MODE_USXGMII)) { + phylink_set(mask, 10000baseCR_Full); + phylink_set(mask, 10000baseER_Full); + phylink_set(mask, 10000baseKR_Full); + phylink_set(mask, 10000baseLR_Full); + phylink_set(mask, 10000baseLRM_Full); + phylink_set(mask, 10000baseSR_Full); + phylink_set(mask, 10000baseT_Full); + phylink_set(mask, 5000baseT_Full); + phylink_set(mask, 2500baseX_Full); + phylink_set(mask, 1000baseX_Full); + phylink_set(mask, 1000baseT_Full); + } + if (bp->caps & MACB_CAPS_GIGABIT_MODE_AVAILABLE && (state->interface == PHY_INTERFACE_MODE_NA || state->interface == PHY_INTERFACE_MODE_GMII || @@ -544,6 +582,60 @@ static void macb_validate(struct phylink_config *config, __ETHTOOL_LINK_MODE_MASK_NBITS); } +static int gem_mac_usx_configure(struct macb *bp, + const struct phylink_link_state *state) +{ + u32 speed, config, val; + int ret; + + val = gem_readl(bp, NCFGR); + val = GEM_BIT(PCSSEL) | (~GEM_BIT(SGMIIEN) & val); + if (state->pause & MLO_PAUSE_TX) + val |= GEM_BIT(PAE); + gem_writel(bp, NCFGR, val); + gem_writel(bp, NCR, gem_readl(bp, NCR) | GEM_BIT(ENABLE_HS_MAC)); + gem_writel(bp, NCFGR, gem_readl(bp, NCFGR) | GEM_BIT(FD)); + config = gem_readl(bp, USX_CONTROL); + config = GEM_BFINS(SERDES_RATE, MACB_SERDES_RATE_10G, config); + config &= ~GEM_BIT(TX_SCR_BYPASS); + config &= ~GEM_BIT(RX_SCR_BYPASS); + gem_writel(bp, USX_CONTROL, config | GEM_BIT(TX_EN)); + config = gem_readl(bp, USX_CONTROL); + gem_writel(bp, USX_CONTROL, config | GEM_BIT(SIGNAL_OK)); + ret = readx_poll_timeout(GEM_READ_USX_STATUS, bp, val, + val & GEM_BIT(USX_BLOCK_LOCK), + 1, MACB_USX_BLOCK_LOCK_TIMEOUT); + if (ret < 0) { + netdev_warn(bp->dev, "USXGMII block lock failed"); + return -ETIMEDOUT; + } + + switch (state->speed) { + case SPEED_10000: + speed = HS_MAC_SPEED_10000M; + break; + case SPEED_5000: + speed = HS_MAC_SPEED_5000M; + break; + case SPEED_2500: + speed = HS_MAC_SPEED_2500M; + break; + case SPEED_1000: + speed = HS_MAC_SPEED_1000M; + break; + default: + case SPEED_100: + speed = HS_MAC_SPEED_100M; + break; + } + + gem_writel(bp, HS_MAC_CONFIG, GEM_BFINS(HS_MAC_SPEED, speed, + gem_readl(bp, HS_MAC_CONFIG))); + gem_writel(bp, USX_CONTROL, GEM_BFINS(USX_CTRL_SPEED, speed, + gem_readl(bp, USX_CONTROL))); + return 0; +} + static void macb_mac_pcs_get_state(struct phylink_config *config, struct phylink_link_state *state) { @@ -565,30 +657,39 @@ static void macb_mac_config(struct phylink_config *config, unsigned int mode, spin_lock_irqsave(&bp->lock, flags); - old_ctrl = ctrl = macb_or_gem_readl(bp, NCFGR); + if (bp->phy_interface == PHY_INTERFACE_MODE_USXGMII) { + if (gem_mac_usx_configure(bp, state) < 0) { + spin_unlock_irqrestore(&bp->lock, flags); + phylink_mac_change(bp->phylink, false); + return; + } + } else { + old_ctrl = ctrl = macb_or_gem_readl(bp, NCFGR); - /* Clear all the bits we might set later */ - ctrl &= ~(GEM_BIT(GBE) | MACB_BIT(SPD) | MACB_BIT(FD) | MACB_BIT(PAE) | - GEM_BIT(SGMIIEN) | GEM_BIT(PCSSEL)); + /* Clear all the bits we might set later */ + ctrl &= ~(GEM_BIT(GBE) | MACB_BIT(SPD) | + MACB_BIT(FD) | MACB_BIT(PAE) | + GEM_BIT(SGMIIEN) | GEM_BIT(PCSSEL)); - if (state->speed == SPEED_1000) - ctrl |= GEM_BIT(GBE); - else if (state->speed == SPEED_100) - ctrl |= MACB_BIT(SPD); + if (state->speed == SPEED_1000) + ctrl |= GEM_BIT(GBE); + else if (state->speed == SPEED_100) + ctrl |= MACB_BIT(SPD); - if (state->duplex) - ctrl |= MACB_BIT(FD); + if (state->duplex) + ctrl |= MACB_BIT(FD); - /* We do not support MLO_PAUSE_RX yet */ - if (state->pause & MLO_PAUSE_TX) - ctrl |= MACB_BIT(PAE); + /* We do not support MLO_PAUSE_RX yet */ + if (state->pause & MLO_PAUSE_TX) + ctrl |= MACB_BIT(PAE); - if (state->interface == PHY_INTERFACE_MODE_SGMII) - ctrl |= GEM_BIT(SGMIIEN) | GEM_BIT(PCSSEL); + if (state->interface == PHY_INTERFACE_MODE_SGMII) + ctrl |= GEM_BIT(SGMIIEN) | GEM_BIT(PCSSEL); - /* Apply the new configuration, if any */ - if (old_ctrl ^ ctrl) - macb_or_gem_writel(bp, NCFGR, ctrl); + /* Apply the new configuration, if any */ + if (old_ctrl ^ ctrl) + macb_or_gem_writel(bp, NCFGR, ctrl); + } bp->speed = state->speed; @@ -3399,6 +3500,11 @@ static void macb_configure_caps(struct macb *bp, dcfg = gem_readl(bp, DCFG1); if (GEM_BFEXT(IRQCOR, dcfg) == 0) bp->caps |= MACB_CAPS_ISR_CLEAR_ON_WRITE; + if (GEM_BFEXT(NO_PCS, dcfg) == 0) + bp->caps |= MACB_CAPS_PCS; + dcfg = gem_readl(bp, DCFG12); + if (GEM_BFEXT(HIGH_SPEED, dcfg) == 1) + bp->caps |= MACB_CAPS_HIGH_SPEED; dcfg = gem_readl(bp, DCFG2); if ((dcfg & (GEM_BIT(RX_PKT_BUFF) | GEM_BIT(TX_PKT_BUFF))) == 0) bp->caps |= MACB_CAPS_FIFO_MODE;