From patchwork Mon May 6 14:40:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Kamil_Hor=C3=A1k=2C_2N?= X-Patchwork-Id: 13655593 X-Patchwork-Delegate: kuba@kernel.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on2055.outbound.protection.outlook.com [40.107.14.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7A56813D2B5; Mon, 6 May 2024 14:41:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.14.55 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715006505; cv=fail; b=FhP2VI8MsUcGqJkb2bN4JTh3uimBOMJkUVgDyv4bzH644/MeM8xjBl7nQVTORH2yDvirsJflRbc5FPt3W7dQ9TBnYu/8yF/F6bKKxvstoXya/GxfIOB3AnnNyACkcDf1Y4AKiJkab5QR2CmDoZ1hIs7LsEqRrLWyC0lYQVxyEng= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715006505; c=relaxed/simple; bh=puC6Cw5xCrNMwjcwdeeGTnh5+2CtzvKEf9qP8gu6EU4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=B/V6YoKDK14cozP1dSB1ipN1yptbaGPcrK18kYkosQcnqu3MQVu6wmX3YVdU9O+VxNyVFilbfrX2a3gNyyFgANNxizqVLP4F6BvUgdwguykRtHcjVrxUzzzc6zPY3o3hQ7njewGtNPvGqHk8Tv7/U3Jk7eB/HyJsPSrlUISK1bI= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=axis.com; spf=pass smtp.mailfrom=2n.com; dkim=pass (1024-bit key) header.d=axis.com header.i=@axis.com header.b=CyTvyzq5; arc=fail smtp.client-ip=40.107.14.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=axis.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=2n.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=axis.com header.i=@axis.com header.b="CyTvyzq5" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mHujMI7vM+rqCVmi3ir/VXWTM20cRjoHCXU/lIsFDlkccmVmjwDCHujslkjQ8tDW/MEdkki60FgG7Ce+PvY3IBBYBof1puAqICGqPm+Bbol1+AtMgkM1RF6brdN0xx47qzcnI8U+85FhQJyqYyX9GfCCEAzdkdUAC/6eZ3JnlF7VPXmmpB2znqNhbMG8AfKFfl5oMqzJLldC/x2LGtUpYeotKnTOJIIh38IFlppjxUZHTdz+VUTTnnm8CHOI0gNLycxJNGwnWLzOxVFXZ1jDxOjaxPXUlydsrhR3yAU3GYrLmal63mvYzwSRxDdIs3vGzFEqiHd1BfjgLE0eqyST2A== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=jNBlp7XZyp2eH/hSpcqQ5vddpGpjjouZPcjb21p6Pe8=; b=Tz7WEGcM/k/isLrvN/DCdyDP19/XH+OdS/DCFzcZZ2qKJ3WT4sRQ3UT6HxXFdip5BTDPfOncTp7a+uPj5Fab7RrcpRrb/3L6A0F9Px1Xebc21yWJ3eNPI2GR0KTxttF/1IqPiE4Udae5pdfcZpAJq/uTsemyUb42IlrWeUVeX5dCf9g8Lm+lMq5yLvgDkN/J9AvHqwu0dIavn9zkYXMkUQ204DTr1ET3lX/WxbeplmVjJ/JhebEqRlbGcUGsWSRJ1lYKjE3VgOjRBqVxITIg5l21ds//jyx1wJbnOEc4ka2nOgUc/PbIiHR416ug9zlnrlaBHEPDdO3BrD8rMUZFhg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 195.60.68.100) smtp.rcpttodomain=broadcom.com smtp.mailfrom=2n.com; dmarc=fail (p=none sp=none pct=100) action=none header.from=axis.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jNBlp7XZyp2eH/hSpcqQ5vddpGpjjouZPcjb21p6Pe8=; b=CyTvyzq5X6OkMwa0E+R7V/Kz4yMbzfIIPwlaREvkPXYICg0vT/P7MTiGdW1Obs3W+DI5+poWqRs2KSSOmB86DhpYg8+doPxxYAraE6U1qkLuwuvwjJmn1j6NbzngP1xn6aOz39PIHLosAC4tsaMDgqorEstPUg3mawTJKKGQ1rk= Received: from DUZPR01CA0069.eurprd01.prod.exchangelabs.com (2603:10a6:10:3c2::12) by DU0PR02MB8451.eurprd02.prod.outlook.com (2603:10a6:10:3cb::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.41; Mon, 6 May 2024 14:41:39 +0000 Received: from DU2PEPF00028D06.eurprd03.prod.outlook.com (2603:10a6:10:3c2:cafe::42) by DUZPR01CA0069.outlook.office365.com (2603:10a6:10:3c2::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.31 via Frontend Transport; Mon, 6 May 2024 14:41:39 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 195.60.68.100) smtp.mailfrom=2n.com; dkim=none (message not signed) header.d=none;dmarc=fail action=none header.from=axis.com; Received-SPF: Pass (protection.outlook.com: domain of 2n.com designates 195.60.68.100 as permitted sender) receiver=protection.outlook.com; client-ip=195.60.68.100; helo=mail.axis.com; pr=C Received: from mail.axis.com (195.60.68.100) by DU2PEPF00028D06.mail.protection.outlook.com (10.167.242.166) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7544.18 via Frontend Transport; Mon, 6 May 2024 14:41:39 +0000 Received: from pcczc3457tyd.2n.cz.axis.com (10.0.5.60) by se-mail01w.axis.com (10.20.40.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Mon, 6 May 2024 16:41:38 +0200 From: =?utf-8?q?Kamil_Hor=C3=A1k_-_2N?= To: , , , CC: , , Subject: [PATCH v3 1/3] net: phy: bcm54811: New link mode for BroadR-Reach Date: Mon, 6 May 2024 16:40:13 +0200 Message-ID: <20240506144015.2409715-2-kamilh@axis.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240506144015.2409715-1-kamilh@axis.com> References: <20240506144015.2409715-1-kamilh@axis.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: se-mail01w.axis.com (10.20.40.7) To se-mail01w.axis.com (10.20.40.7) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU2PEPF00028D06:EE_|DU0PR02MB8451:EE_ X-MS-Office365-Filtering-Correlation-Id: a016ff9a-a0e2-4d0a-9fc4-08dc6ddaa372 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|1800799015|376005|36860700004|82310400017; X-Microsoft-Antispam-Message-Info: IAdMcnEfczt8CAt1JzRNy4Hr9LEfRLmyRLsyptc9yaNgGcOqll3YSBbMksQHuurEVd6VFRA6w5SRHfFZ4ubdoJFBetVAgN1fMDWi3Z1Rf7Ll8nTYWfWEomlfp1bmykUE9rx/vqP17nJ348YLbFj9nxp0+ZgB4heUf/Y9ZDoPWR5AfhUQM7yFwTRlG1XLfY5HJ56uNB5AOcS257JxKM5MiWAsn55705Y+FtenkPgBXM6keFdZji3prOi+/LzRHt9Ob6EQn69Fb1zC6CrvHtA1vciPTU0LqUYlhGUT8rgvr3B3q3YALDec1mrrIhNDv13kHa2S+O0viDZedpNlfuNvXzAJUJLZReeXx08RgEJxJlVKayrEj2iUYD+Uw58d3OzO6lWLtaVWQL3eIb2MB5guOovyKIxsYJC/kPCPpvIaDQACjNUJjFpbUKBOtZVLp73yHPHy+YPNNOjCP8Ue87gLHZnSDz5gJCUzx/y1r14pZ6ABaWWYk+yfgqg14EWgCEzFkeiu4i3CzEDRbnCtFmbtpKzoJwygvTg2UQ/0Z6gYUsfY2wrPZQ7Ty9TQHd4TWXZ0fyiZFMwSE9Ni4HkAAjuRAc0SAX7AnUA3MsgL6aSwwA2SMg5JtufH8jD828Fha+d6v8fIY0kFfEwhUHM62YvTYOgeeeIuW7sQQqPTMamqgD2ZQC/eTE/WDDkn3ZUdc8HGKtHZd2YtWdnHf9lemJp+sq2bRal8UoQ3V+d+IUEJoaglsJgUVVunL6shil7BRtoMhpWNmaRkJkpweEdqV8ypxcFTW67z+YHUBRlGQD4k60Y2Gj+Exui7xkmXvMJtpEjwPYjR16wDu//oo3LehXzurpImxRTRCNBgcEFB8l7QgDKJgliI7jB+3cniQlUvnFFA0xl/IWFpX7hkQbEAKLoa4Al1+Tpn3eYrsxp+mADcJ/IZUbbqxgnWoz/2EuR56N+dQwFzF/JVY+67Z5qOmaVV3nGKPBPEJjeog09OzH8q3dhOU7uvVK2Y66WuJwqgChWw6DqoWSUBYPTTqld4N7nclYycK17MMCEY346HBqUk0TdANmLvkrsUsGgeHMr714b9Dmrqu86ruXTJ2udOX3nDtMvwAv+LSdN80BOYWfsFx74W9Ttubu+f56ifr4zece3AIv2OdD8WYKviLtVoeEUTIVqjhvaN3wFBOfr37tIBNCk6g/DL9BR66jsm6/GaRR+QvpWGdCchtOqZ9h0AHZierLUYmrYPZ+IZ+5MwwMAvSSZaCOM936BOGlPcR1g+tpSqTJR/aPO7zEv+Dw39J5VIFWcb28E94lLMDQrUNzoOqjxzYzpHrn+jW7SBDjnwPwAVAPgV2VFotZwCFtcAy6RqGFa5f0WQoOHdPBg2a6cXrEo= X-Forefront-Antispam-Report: CIP:195.60.68.100;CTRY:SE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.axis.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(1800799015)(376005)(36860700004)(82310400017);DIR:OUT;SFP:1101; X-OriginatorOrg: axis.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2024 14:41:39.1482 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a016ff9a-a0e2-4d0a-9fc4-08dc6ddaa372 X-MS-Exchange-CrossTenant-Id: 78703d3c-b907-432f-b066-88f7af9ca3af X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=78703d3c-b907-432f-b066-88f7af9ca3af;Ip=[195.60.68.100];Helo=[mail.axis.com] X-MS-Exchange-CrossTenant-AuthSource: DU2PEPF00028D06.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR02MB8451 X-Patchwork-Delegate: kuba@kernel.org Introduce new link modes necessary for the BroadR-Reach mode on bcm5481x PHY by Broadcom and new PHY tunable to choose between normal (IEEE) ethernet and BroadR-Reach modes of the PHY. --- drivers/net/phy/phy-core.c | 9 +++++---- include/uapi/linux/ethtool.h | 9 ++++++++- net/ethtool/common.c | 7 +++++++ net/ethtool/ioctl.c | 1 + 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/drivers/net/phy/phy-core.c b/drivers/net/phy/phy-core.c index 15f349e5995a..129e223d8985 100644 --- a/drivers/net/phy/phy-core.c +++ b/drivers/net/phy/phy-core.c @@ -13,10 +13,9 @@ */ const char *phy_speed_to_str(int speed) { - BUILD_BUG_ON_MSG(__ETHTOOL_LINK_MODE_MASK_NBITS != 102, - "Enum ethtool_link_mode_bit_indices and phylib are out of sync. " - "If a speed or mode has been added please update phy_speed_to_str " - "and the PHY settings array.\n"); + BUILD_BUG_ON_MSG(__ETHTOOL_LINK_MODE_MASK_NBITS != 103, + "Enum ethtool_link_mode_bit_indices and phylib are out of sync. If a speed or mode has been added please update phy_speed_to_str and the PHY settings array.\n" + ); switch (speed) { case SPEED_10: @@ -265,6 +264,8 @@ static const struct phy_setting settings[] = { PHY_SETTING( 10, FULL, 10baseT1S_Full ), PHY_SETTING( 10, HALF, 10baseT1S_Half ), PHY_SETTING( 10, HALF, 10baseT1S_P2MP_Half ), + PHY_SETTING( 10, FULL, 1BR10 ), + }; #undef PHY_SETTING diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h index 041e09c3515d..105432565e6d 100644 --- a/include/uapi/linux/ethtool.h +++ b/include/uapi/linux/ethtool.h @@ -289,11 +289,18 @@ struct ethtool_tunable { #define ETHTOOL_PHY_EDPD_NO_TX 0xfffe #define ETHTOOL_PHY_EDPD_DISABLE 0 +/* + * BroadR-Reach Mode Control + */ +#define ETHTOOL_PHY_BRR_MODE_ON 1 +#define ETHTOOL_PHY_BRR_MODE_OFF 0 + enum phy_tunable_id { ETHTOOL_PHY_ID_UNSPEC, ETHTOOL_PHY_DOWNSHIFT, ETHTOOL_PHY_FAST_LINK_DOWN, ETHTOOL_PHY_EDPD, + ETHTOOL_PHY_BRR_MODE, /* * Add your fresh new phy tunable attribute above and remember to update * phy_tunable_strings[] in net/ethtool/common.c @@ -1845,7 +1852,7 @@ enum ethtool_link_mode_bit_indices { ETHTOOL_LINK_MODE_10baseT1S_Full_BIT = 99, ETHTOOL_LINK_MODE_10baseT1S_Half_BIT = 100, ETHTOOL_LINK_MODE_10baseT1S_P2MP_Half_BIT = 101, - + ETHTOOL_LINK_MODE_1BR10_BIT = 102, /* must be last entry */ __ETHTOOL_LINK_MODE_MASK_NBITS }; diff --git a/net/ethtool/common.c b/net/ethtool/common.c index 6b2a360dcdf0..5e37804958e9 100644 --- a/net/ethtool/common.c +++ b/net/ethtool/common.c @@ -98,6 +98,7 @@ phy_tunable_strings[__ETHTOOL_PHY_TUNABLE_COUNT][ETH_GSTRING_LEN] = { [ETHTOOL_PHY_DOWNSHIFT] = "phy-downshift", [ETHTOOL_PHY_FAST_LINK_DOWN] = "phy-fast-link-down", [ETHTOOL_PHY_EDPD] = "phy-energy-detect-power-down", + [ETHTOOL_PHY_BRR_MODE] = "phy-broadrreach-mode", }; #define __LINK_MODE_NAME(speed, type, duplex) \ @@ -211,6 +212,7 @@ const char link_mode_names[][ETH_GSTRING_LEN] = { __DEFINE_LINK_MODE_NAME(10, T1S, Full), __DEFINE_LINK_MODE_NAME(10, T1S, Half), __DEFINE_LINK_MODE_NAME(10, T1S_P2MP, Half), + __DEFINE_SPECIAL_MODE_NAME(1BR10, "1BR10"), }; static_assert(ARRAY_SIZE(link_mode_names) == __ETHTOOL_LINK_MODE_MASK_NBITS); @@ -374,6 +376,11 @@ const struct link_mode_info link_mode_params[] = { __DEFINE_LINK_MODE_PARAMS(10, T1S, Full), __DEFINE_LINK_MODE_PARAMS(10, T1S, Half), __DEFINE_LINK_MODE_PARAMS(10, T1S_P2MP, Half), + [ETHTOOL_LINK_MODE_1BR10_BIT] = { + .speed = SPEED_10, + .lanes = 1, + .duplex = DUPLEX_FULL, + }, }; static_assert(ARRAY_SIZE(link_mode_params) == __ETHTOOL_LINK_MODE_MASK_NBITS); diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c index 5a55270aa86e..9e68c8562fa3 100644 --- a/net/ethtool/ioctl.c +++ b/net/ethtool/ioctl.c @@ -2722,6 +2722,7 @@ static int ethtool_phy_tunable_valid(const struct ethtool_tunable *tuna) switch (tuna->id) { case ETHTOOL_PHY_DOWNSHIFT: case ETHTOOL_PHY_FAST_LINK_DOWN: + case ETHTOOL_PHY_BRR_MODE: if (tuna->len != sizeof(u8) || tuna->type_id != ETHTOOL_TUNABLE_U8) return -EINVAL; From patchwork Mon May 6 14:40:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Kamil_Hor=C3=A1k=2C_2N?= X-Patchwork-Id: 13655594 Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02on2048.outbound.protection.outlook.com [40.107.247.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1E4CE153834; Mon, 6 May 2024 14:41:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.247.48 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715006508; cv=fail; b=TJAiuEbPZ76RTvXKBMLvmnk9jOT0LP1Iazel95TwnZIm0A7hpVtcFfIeBpmukFhpHPMPwRSyxSRWClY1Mw6PJ9hBE9P7VReIEPDz2BjS5ba2y3KcwEiSiKGkZSDZMwUWZLrCJHOKKZt6RtDMERhEt8kh/xXGNKSJWUnunS1GJS4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715006508; c=relaxed/simple; bh=DYqFGcoNFDoHBokmsqHRgZB9QQYz8/pV46TOgqTZh8E=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=CBpadO0/6Q3LfbeCyvI98vNdhAuEobBV78kEREAZdD3a6evZgZnZhwkBfPrOtwS3Hg8Qw5l/9ysTSTS35fUL9wpdWYp965iEv80wGYWPX/+ReH/DrTYPBTBylALAqRMYULVz5xA+Oek/fmeinVWygI2kuKn5SNOatpf+YDI7WSU= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=axis.com; spf=pass smtp.mailfrom=2n.com; dkim=pass (1024-bit key) header.d=axis.com header.i=@axis.com header.b=Ho3CV7O0; arc=fail smtp.client-ip=40.107.247.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=axis.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=2n.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=axis.com header.i=@axis.com header.b="Ho3CV7O0" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=T3AGKUg7DyXMmWHp/xWRUnjSoCLQlrQIdX0cTkC+2BBkCP1HNGRzNrH2wjgkw6JJiCJZvAfqjSwrvpQKwg83GWdzcdVY5+rjqX9npeIdtqOUiiFbam5J02aM3rT8X0xf2vy9bxV0kYAKpi/i5a97/QDBCeuFSbm/HbxVR+ih/OBdv7iAskM24R7HmeMm8dBXJbxeROehzYV+LQHCMkVTsyRzV3+DVIqxVEtqiwhb7mFHWRDffcbuTDmQXsOWsfHfGn1TcGWIpfPu9wuPkYNv3Wf2O97TXrOiChJfBvqlhQ5s7iGvF5wzH6YFvmk12qRzNOJcgp2WxtYiXg54UoTk+w== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=H48Bn+YtoQpRblEDvG6v5+WSZ3Vtl0voti3vm89jKSo=; b=A7GCjwbrO4cjWGAnFOziZOymkHEPiUMquTmx6wh7ynztiVD+MOsBAdu5xIRa4X2vVfrU7TGYOh884pvZs0Ieis8U/7L06RdCHMic8wGeXlV42plCMFbpbkZqYKHdB46JCdxAxZPH/gpu/CerNO5Mzy1SC0eqywyXyG315qcqH21Qy9ZBzBZiFjjR1A3iG2G/I2yXyl1HnvOV3nI768L2ng6FoOwzH5sqfKcZ2Pa5rTCtsHORl8p0U+460JoFGdXcsI3B6Qa3Ocq5UteUd+ZNSBlGAti+hFt+tn96clmXwoiVxK1mnChzcGXgFxsyDLpDCxj8Sj9d9tHX24L6m0guLw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 195.60.68.100) smtp.rcpttodomain=broadcom.com smtp.mailfrom=2n.com; dmarc=fail (p=none sp=none pct=100) action=none header.from=axis.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=H48Bn+YtoQpRblEDvG6v5+WSZ3Vtl0voti3vm89jKSo=; b=Ho3CV7O0BS2pmhre3YD2SUk3XCUhEcGE4g0DHiDNgOUkaGosPLwn6jnETTL31TkG+qkinTvzVNfaY1QPmTf79C0/dF/6+MEg0lTr10eE9zcJPOVSfm1dfXlxym5C1ar1PxWCsAaiKwF7Zt2EDmcE8Yx3CG4FVqE5fnHobc6LPWo= Received: from DB8PR04CA0018.eurprd04.prod.outlook.com (2603:10a6:10:110::28) by DBAPR02MB6471.eurprd02.prod.outlook.com (2603:10a6:10:191::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.41; Mon, 6 May 2024 14:41:42 +0000 Received: from DU2PEPF00028D05.eurprd03.prod.outlook.com (2603:10a6:10:110:cafe::d1) by DB8PR04CA0018.outlook.office365.com (2603:10a6:10:110::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.41 via Frontend Transport; Mon, 6 May 2024 14:41:42 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 195.60.68.100) smtp.mailfrom=2n.com; dkim=none (message not signed) header.d=none;dmarc=fail action=none header.from=axis.com; Received-SPF: Pass (protection.outlook.com: domain of 2n.com designates 195.60.68.100 as permitted sender) receiver=protection.outlook.com; client-ip=195.60.68.100; helo=mail.axis.com; pr=C Received: from mail.axis.com (195.60.68.100) by DU2PEPF00028D05.mail.protection.outlook.com (10.167.242.165) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7544.18 via Frontend Transport; Mon, 6 May 2024 14:41:41 +0000 Received: from pcczc3457tyd.2n.cz.axis.com (10.0.5.60) by se-mail01w.axis.com (10.20.40.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Mon, 6 May 2024 16:41:40 +0200 From: =?utf-8?q?Kamil_Hor=C3=A1k_-_2N?= To: , , , CC: , , Subject: [PATCH v3 2/3] net: phy: bcm54811: Add LRE registers definitions Date: Mon, 6 May 2024 16:40:14 +0200 Message-ID: <20240506144015.2409715-3-kamilh@axis.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240506144015.2409715-1-kamilh@axis.com> References: <20240506144015.2409715-1-kamilh@axis.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: se-mail01w.axis.com (10.20.40.7) To se-mail01w.axis.com (10.20.40.7) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU2PEPF00028D05:EE_|DBAPR02MB6471:EE_ X-MS-Office365-Filtering-Correlation-Id: 0a3fe91c-c50e-4e8d-2ed7-08dc6ddaa4ad X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|82310400017|1800799015|376005|36860700004; X-Microsoft-Antispam-Message-Info: d/58IhMzqNlOc3b1Nqg5Mw54qbHCh4Y/0kg4qgAxfHf4S18rns9Lyop1sYO51SrdpIeVNkV63GOXi/VlNu04jdnc1venwCyEoKnsRTQOPTer6x00tjpoCuCoWOxaIUrvUzg9YO5Q0opTJ3CE8JsYolmfoNR/IWIvEvsOXN1u++GSyGZqEPWKLj6XRpWgFsP6v+CMv4GBIf3njf85PdljXt0cdxJikBpeO9zW3KkH9wC2WGWGMn7e681Pp96HNa+iXwsjYfVoSLACdNL0P1fcMetW8HDK3QX+gQFwO4drXoiOoR4pAWsuqEtlw/+2f+AXIbYtGXjEuNAH9IZQMhmbqHm2L6/N3ObG9lYD4in2PLU76QoGI2yXstxZVFW4hOc5CdLNZt8H0PxHq5RcKIY1yUHlCLp2ZGPFWojPT/p4NUQ3Xioy2Z+1+OctcVOt3UpF07cSj3rMmSFK5jjNSiyFG+B1eAkCNBwJxorSfwsn2I+UXe4r3I2IyWl1yzje+IPwCTNJ3rEBHsRPRIAVQo0/EntxOAeoGpP9dMJFcu1AZdo/H2OewGg8vqasN3z7VRmauX/JxDuqwsCPZJc9XUWtfVrekYCwTOYforiMC0HiVgm3H7hw/b3SG/2m1pBTVVrG2kmNN9CFJm6WSm0n7cbPc8f7rHfEGpqbmJ5ohNKIaoWtr2ZV517U0b86MDaqLuGJH2f39F+lZXvF6STXdwIq9Vhe2OWSZmu6DHHBU1Pq75M4+qCme9UA3+lziNvMt4weYm4XmOCtYOniegl4qvLh99UBGmW3q2lcAo6WPSKA0E/caKq6ibGoqzrOglGtcRwSUG1JqyirG/Nbwx/TClXEkJzKtLF/Ebn1/mMcBHQ09ERxA6G58/iAosYucyh5P5QHoQU7XTkZH4mwtkDZg0fAM+PAby7kyocAWtPmhxGQwyCtC4F6D9w7qUW2HcgCy3n/xwpa38d1XAcHMtPP77e6I0zaHXcpyW1qdBHeqVRRXyi+do5wM7+A9A29T6L0cwTlExPBdanREzfIW+OHUvb8KoOFWgzIAsfsVOMKQrq4XdPDPbe5iaPKVrh9NRKAnwO6vMAmjQh1KQCsGWst0dGUvF4JIoXjk1TURHhOntq6TEOtpYUAyAvUvJ/7TkzuVGdTVcoPBJuvvGrlKji17uHH3me8ybn7Rjn02TyML9/H7tewQ4/SXQk78t8yynJNF1KEUzZSYT9hE3xzALIJ5+VKBXHi6kQdnrQV1MRkaZuPJYVNWllizaOgyckXbowMgNZ714NFz63AtmD/uVtUKxxJxG980BF+UejEOWBE0aIGfAYioBOJ28Om0R8aoG7xgyPneBou9UIIgT+N326KPPmXDgQ1cEm1AbMTw2wFJPtxPX2KcxRFSIESW0EmzAdjGXSE X-Forefront-Antispam-Report: CIP:195.60.68.100;CTRY:SE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.axis.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(82310400017)(1800799015)(376005)(36860700004);DIR:OUT;SFP:1101; X-OriginatorOrg: axis.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2024 14:41:41.2097 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0a3fe91c-c50e-4e8d-2ed7-08dc6ddaa4ad X-MS-Exchange-CrossTenant-Id: 78703d3c-b907-432f-b066-88f7af9ca3af X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=78703d3c-b907-432f-b066-88f7af9ca3af;Ip=[195.60.68.100];Helo=[mail.axis.com] X-MS-Exchange-CrossTenant-AuthSource: DU2PEPF00028D05.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR02MB6471 Add the definitions of LRE registers for Broadcom BCM5481x PHY --- include/linux/brcmphy.h | 91 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 90 insertions(+), 1 deletion(-) diff --git a/include/linux/brcmphy.h b/include/linux/brcmphy.h index 1394ba302367..9c0b78c1b6fb 100644 --- a/include/linux/brcmphy.h +++ b/include/linux/brcmphy.h @@ -270,16 +270,105 @@ #define BCM5482_SSD_SGMII_SLAVE 0x15 /* SGMII Slave Register */ #define BCM5482_SSD_SGMII_SLAVE_EN 0x0002 /* Slave mode enable */ #define BCM5482_SSD_SGMII_SLAVE_AD 0x0001 /* Slave auto-detection */ +#define BCM5482_SSD_SGMII_SLAVE_AD 0x0001 /* Slave auto-detection */ + +/* BroadR-Reach LRE Registers. */ +#define MII_BCM54XX_LRECR 0x00 /* LRE Control Register */ +#define MII_BCM54XX_LRESR 0x01 /* LRE Status Register */ +#define MII_BCM54XX_LREPHYSID1 0x02 /* LRE PHYS ID 1 */ +#define MII_BCM54XX_LREPHYSID2 0x03 /* LRE PHYS ID 2 */ +#define MII_BCM54XX_LREANAA 0x04 /* LDS Auto-Negotiation Advertised Ability */ +#define MII_BCM54XX_LREANAC 0x05 /* LDS Auto-Negotiation Advertised Control */ +#define MII_BCM54XX_LREANPT 0x06 /* LDS Ability Next Page Transmit */ +#define MII_BCM54XX_LRELPA 0x07 /* LDS Link Partner Ability */ +#define MII_BCM54XX_LRELPNPM 0x08 /* LDS Link Partner Next Page Message */ +#define MII_BCM54XX_LRELPNPC 0x09 /* LDS Link Partner Next Page Control */ +#define MII_BCM54XX_LRELDSE 0x0a /* LDS Expansion Register */ +#define MII_BCM54XX_LREES 0x0f /* LRE Extended Status */ + +/* LRE control register. */ +#define LRECR_RESET 0x8000 /* Reset to default state */ +#define LRECR_LOOPBACK 0x4000 /* Internal Loopback */ +#define LRECR_LDSRES 0x2000 /* Restart LDS Process */ +#define LRECR_LDSEN 0x1000 /* LDS Enable */ +#define LRECR_PDOWN 0x0800 /* Enable low power state */ +#define LRECR_ISOLATE 0x0400 /* Isolate data paths from MII */ +#define LRECR_SPEED100 0x0200 /* Select 100 Mbps */ +#define LRECR_SPEED10 0x0000 /* Select 10 Mbps */ +#define LRECR_4PAIRS 0x0020 /* Select 4 Pairs */ +#define LRECR_2PAIRS 0x0010 /* Select 2 Pairs */ +#define LRECR_1PAIR 0x0000 /* Select 1 Pair */ +#define LRECR_MASTER 0x0008 /* Force Master when LDS disabled */ +#define LRECR_SLAVE 0x0000 /* Force Slave when LDS disabled */ + +/* LRE status register. */ +#define LRESR_ERCAP 0x0001 /* Ext-reg capability */ +#define LRESR_JCD 0x0002 /* Jabber detected */ +#define LRESR_LSTATUS 0x0004 /* Link status */ +#define LRESR_LDSABILITY 0x0008 /* Can do LDS */ +#define LRESR_8023 0x0010 /* Has IEEE 802.3 Support */ +#define LRESR_LDSCOMPLETE 0x0020 /* LDS Auto-negotiation complete */ +#define LRESR_MFPS 0x0040 /* Can suppress Management Frames Preamble */ +#define LRESR_RESV 0x0080 /* Unused... */ +#define LRESR_ESTATEN 0x0100 /* Extended Status in R15 */ +#define LRESR_10_1PAIR 0x0200 /* Can do 10Mbps 1 Pair */ +#define LRESR_10_2PAIR 0x0400 /* Can do 10Mbps 2 Pairs */ +#define LRESR_100_2PAIR 0x0800 /* Can do 100Mbps 2 Pairs */ +#define LRESR_100_4PAIR 0x1000 /* Can do 100Mbps 4 Pairs */ +#define LRESR_100_1PAIR 0x2000 /* Can do 100Mbps 1 Pair */ + +/* LDS Auto-Negotiation Advertised Ability. */ +#define LREANAA_PAUSE_ASYM 0x8000 /* Can pause asymmetrically */ +#define LREANAA_PAUSE 0x4000 /* Can pause */ +#define LREANAA_100_1PAIR 0x0020 /* Can do 100Mbps 1 Pair */ +#define LREANAA_100_4PAIR 0x0010 /* Can do 100Mbps 4 Pair */ +#define LREANAA_100_2PAIR 0x0008 /* Can do 100Mbps 2 Pair */ +#define LREANAA_10_2PAIR 0x0004 /* Can do 10Mbps 2 Pair */ +#define LREANAA_10_1PAIR 0x0002 /* Can do 10Mbps 1 Pair */ + +#define LRE_ADVERTISE_FULL (LREANAA_100_1PAIR | LREANAA_100_4PAIR | \ + LREANAA_100_2PAIR | LREANAA_10_2PAIR | \ + LREANAA_10_1PAIR) + +#define LRE_ADVERTISE_ALL LRE_ADVERTISE_FULL + +/* LDS Link Partner Ability. */ +#define LRELPA_PAUSE_ASYM 0x8000 /* Supports asymmetric pause */ +#define LRELPA_PAUSE 0x4000 /* Supports pause capability */ +#define LRELPA_100_1PAIR 0x0020 /* 100Mbps 1 Pair capable */ +#define LRELPA_100_4PAIR 0x0010 /* 100Mbps 4 Pair capable */ +#define LRELPA_100_2PAIR 0x0008 /* 100Mbps 2 Pair capable */ +#define LRELPA_10_2PAIR 0x0004 /* 10Mbps 2 Pair capable */ +#define LRELPA_10_1PAIR 0x0002 /* 10Mbps 1 Pair capable */ + +/* LDS Expansion register. */ +#define LDSE_DOWNGRADE 0x8000 /* Can do LDS Speed Downgrade */ +#define LDSE_MASTER 0x4000 /* Master / Slave */ +#define LDSE_PAIRS_MASK 0x3000 /* Pair Count Mask */ +#define LDSE_4PAIRS 0x2000 /* 4 Pairs Connection */ +#define LDSE_2PAIRS 0x1000 /* 2 Pairs Connection */ +#define LDSE_1PAIR 0x0000 /* 1 Pair Connection */ +#define LDSE_CABLEN_MASK 0x0FFF /* Cable Length Mask */ /* BCM54810 Registers */ #define BCM54810_EXP_BROADREACH_LRE_MISC_CTL (MII_BCM54XX_EXP_SEL_ER + 0x90) #define BCM54810_EXP_BROADREACH_LRE_MISC_CTL_EN (1 << 0) #define BCM54810_SHD_CLK_CTL 0x3 #define BCM54810_SHD_CLK_CTL_GTXCLK_EN (1 << 9) +#define BCM54810_SHD_SCR3_TRDDAPD 0x0100 + +/* BCM54811 Registers */ +#define BCM54811_EXP_BROADREACH_LRE_OVERLAY_CTL (MII_BCM54XX_EXP_SEL_ER + 0x9A) +/* Access Control Override Enable */ +#define BCM54811_EXP_BROADREACH_LRE_OVERLAY_CTL_EN BIT(15) +/* Access Control Override Value */ +#define BCM54811_EXP_BROADREACH_LRE_OVERLAY_CTL_OVERRIDE_VAL BIT(14) +/* Access Control Value */ +#define BCM54811_EXP_BROADREACH_LRE_OVERLAY_CTL_VAL BIT(13) /* BCM54612E Registers */ #define BCM54612E_EXP_SPARE0 (MII_BCM54XX_EXP_SEL_ETC + 0x34) -#define BCM54612E_LED4_CLK125OUT_EN (1 << 1) +#define BCM54612E_LED4_CLK125OUT_EN BIT(1) /* Wake-on-LAN registers */ From patchwork Mon May 6 14:40:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Kamil_Hor=C3=A1k=2C_2N?= X-Patchwork-Id: 13655595 X-Patchwork-Delegate: kuba@kernel.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on2041.outbound.protection.outlook.com [40.107.15.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 955C6153BDE; Mon, 6 May 2024 14:41:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.15.41 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715006509; cv=fail; b=HZGrBLGR6BdipthISFGpAq0Sl5Ln6nYl18kQlcdv3CTQlnEgHY00ceNIsBDncW7NdrXaMrwDB3d11aUJ3YdDYCbFDwxDEqqHhc06d3Sz0PNOtnO5wNpIP/Gb0oZ+OFZEfue+LLrgrxEf0dMISLtxL/N5Dd2pP7PMnrKp4MccAiU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715006509; c=relaxed/simple; bh=WmAR9U0Gn2Nh2vDpuXL5eLJ29h3oGuLoUcKDpjH9BZ0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=pHbwwyomhKJQsfo20GNzwlp/iaEoTgs3Dcju17ZZcl4ttZmWtjzSt5KwNSfv6R3TV2x7sgxGfc7Gpsvav8rFfahweFC9jI+zsEQtblXxBEWI3ylBrB56EDeD4JijpFC0tCdU+8zlULTRgqaYfrS5s3bp9nnAcZkD9iFpqOFYCcg= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=axis.com; spf=pass smtp.mailfrom=2n.com; dkim=pass (1024-bit key) header.d=axis.com header.i=@axis.com header.b=eOYpMrBI; arc=fail smtp.client-ip=40.107.15.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=axis.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=2n.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=axis.com header.i=@axis.com header.b="eOYpMrBI" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k8QVMIT/uw2GvgobKTbMt/OTchqjaxQPer+Dy2lfn1ceNvaSxlibHkBKnI/46Sf04ao2gEpufMnirilSzHsQSncu658ocLSQkTgIhuZ7ivFRPQTcBPtE/+OBk+cAkSU3r0pQHAAd+7suDEPqCSDu9UJcKU7bs829suhiNvWIEP3l/AkIfFflyhgxmJ2CiUD/B31AmMB2VZTXjy9ACWct1dBnWctqnXLtAGVX8LvYdePk/GdUH+SMmMHppGzAO+IFFSZhBLBCrXJASzlCusKDsg8e2zNqq8CHw50TpLzCv6MCLpNG1j6OtnpU/wrgbdQrc5LUm7fc3c6Mo7nv6tADSg== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=b0ulcU0UgSJifHHm7A5J71+Uifs30gHXkzxczWPYpgQ=; b=a5Vdmc7P4hgfyBGkDDZxIWw974MfvFM/7/spZPGdrAP2mxkFpMhJDi43L5lPE1kRBY+7T/fECqIuHYQ/7YSMPzEMg3B9DO94w5g5lFH0BOEI9Thmf32OdRYzymsFEaUKLZbopnh1KZ54+XT0NiLPK6dfSCrGBW/XTTl2xRxrwCGdCXW1zDCYgNDQuV3IuNdUuesqclvtoH7r1VS0vT13Uin1ZqIHX1UPHEeGamwDZtDTj5ypboVTqOqvpKjPiYUbxXE68Jt1asipEWu6QdOc3bb7xfmISA5u/bhCjbxfzvXaU3YQARlgKZ+wWJ5dZ9Eu3Baewav7U4rICtQBUcBOUQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 195.60.68.100) smtp.rcpttodomain=broadcom.com smtp.mailfrom=2n.com; dmarc=fail (p=none sp=none pct=100) action=none header.from=axis.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=b0ulcU0UgSJifHHm7A5J71+Uifs30gHXkzxczWPYpgQ=; b=eOYpMrBITXwaXRj4lV59090EFr/nAv/KcJnhu3G7Q4Cjs31uhMca9W4ETjHX5mfWJhZV/YsW4eWV1XDqz3a0Xqtw1v/jytnLl37mwNrHXgSJYAff1ZewYYoRfL84Ef97Fx88cgCryq8G1Yns4FxVSIn9Oj89OjzgbTGsoeQmKrE= Received: from DU2PR04CA0046.eurprd04.prod.outlook.com (2603:10a6:10:234::21) by AM9PR02MB6625.eurprd02.prod.outlook.com (2603:10a6:20b:2cc::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.41; Mon, 6 May 2024 14:41:44 +0000 Received: from DU2PEPF00028D04.eurprd03.prod.outlook.com (2603:10a6:10:234:cafe::89) by DU2PR04CA0046.outlook.office365.com (2603:10a6:10:234::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.41 via Frontend Transport; Mon, 6 May 2024 14:41:43 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 195.60.68.100) smtp.mailfrom=2n.com; dkim=none (message not signed) header.d=none;dmarc=fail action=none header.from=axis.com; Received-SPF: Pass (protection.outlook.com: domain of 2n.com designates 195.60.68.100 as permitted sender) receiver=protection.outlook.com; client-ip=195.60.68.100; helo=mail.axis.com; pr=C Received: from mail.axis.com (195.60.68.100) by DU2PEPF00028D04.mail.protection.outlook.com (10.167.242.164) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7519.19 via Frontend Transport; Mon, 6 May 2024 14:41:43 +0000 Received: from pcczc3457tyd.2n.cz.axis.com (10.0.5.60) by se-mail01w.axis.com (10.20.40.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Mon, 6 May 2024 16:41:42 +0200 From: =?utf-8?q?Kamil_Hor=C3=A1k_-_2N?= To: , , , CC: , , Subject: [PATCH v3 3/3] net: phy: bcm-phy-lib: Implement BroadR-Reach link modes Date: Mon, 6 May 2024 16:40:15 +0200 Message-ID: <20240506144015.2409715-4-kamilh@axis.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240506144015.2409715-1-kamilh@axis.com> References: <20240506144015.2409715-1-kamilh@axis.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: se-mail01w.axis.com (10.20.40.7) To se-mail01w.axis.com (10.20.40.7) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU2PEPF00028D04:EE_|AM9PR02MB6625:EE_ X-MS-Office365-Filtering-Correlation-Id: 551e6d2f-865b-48ca-7183-08dc6ddaa626 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|82310400017|376005|36860700004|1800799015; X-Microsoft-Antispam-Message-Info: =?utf-8?q?FiabWXBNIUv8jeH4OlXaxIfIfLyuJ1t?= =?utf-8?q?y6VZ5p6hseNT9VeRAH9ZmxYi4NFlRAP+VPzdfW5Sz1hDgsish8fz5ddu8kZ4/sUCl?= =?utf-8?q?1fsmKYRRiuAEmqAovvJDELCs6p+SfDdmEgXTFV17aIgiD+8Dm1l22xz+XWqxmklbn?= =?utf-8?q?eJRubWktVsE0QxcMemKhSRu7Q3qtE+SoGVZ1B7qkYRLyB9bhxgJJOJEsEgxiWYBWM?= =?utf-8?q?oG1Coz83ZkPQo/m4L5n5Xede6jV5uKQb5Mzw09rXna+OVx2VYQDsNTUUWHZCmZ3LV?= =?utf-8?q?sI0FgF2yvHJbi8Vg4347UcVMa/B2aln1r4/jS2Ynr2S1SurcPQqMAHdmdlFDvmX9r?= =?utf-8?q?9T0wDU75iLTI+I/Z+O5yqOhCLFYfuYFDH7500tgx2hAdw+WTIweFCSsve5vsX1Aor?= =?utf-8?q?VjlvLgdEtx3O3lbB5JwhNPgTzo//H8Q67IRBRu7AFQ7deCeE1wX4i26acXHDLfDBV?= =?utf-8?q?4MrxCTK0E5EYf7S/oGh3eRKFRsM1pnahBNxYkfKrgAuklu9bvB943r+rvb7VwlCu5?= =?utf-8?q?LBWQaaYO3QIEN2GHfiv/wbGaDMeIgMywDkVcFfEJfYrggUCEHDAv/x1aqrbnEdgl4?= =?utf-8?q?JnbmXnb27RTBjo/MYY2juvvyQQStzuT2X07hhkhbceGwb75jFYMCt5nomqbNKBr42?= =?utf-8?q?SXRGCjnul5iQEcsAY3/DOuCfxVTudMSFZEuew1qTVMn/2rei+oO2k2IOCY/0t/e8R?= =?utf-8?q?OPn7v5+VKhnFu+qvdOdx1XSFr81INu02Z2Xmvhqy4wRwcjhLURFf2qDoax9sq9Xtq?= =?utf-8?q?X/AM0SssT9NCPhdpQC38stE7MFvkvlNEQAp41E9FPeXxts+QFh631HjDCg8wxePx9?= =?utf-8?q?SOHdky+c6HhnEnBGp5WzdObWnR9URPBX3by9imh6jCrpHCWB/wThUS2QXhtoy/2Pe?= =?utf-8?q?BM6c//Hzv3YL+kg3v/seS1awwg4gRSy3O5Ma1sfsV6oLe8C9kSX9clq62hka0CzCT?= =?utf-8?q?3ESliTltjWXW+5OUNlEH7DQYy7l1tA8MX+aygjdPb/+4bLSHXhlmOyScF84liUZDf?= =?utf-8?q?WAcY/Di4YYt7KXwXPANe8PI7/g2c+qt7XjgpgRDvpqNHVl3rLNiPeCj4p15liLceI?= =?utf-8?q?PQauXzA4zJ1LHnGs7hiBJVTDeYyFLk/HZEaKcPkX37BjcAeXa9j6COjKcTvR3Cn14?= =?utf-8?q?UbxlENcAiuH2X0xrjZzOhSfcbVltblQ8aXq7bUXP0jW5PgS6xyJKaE0j9kxOmJTpp?= =?utf-8?q?BLWYlxYZk2HYec0hPPqzvcv20Oafnl9/7RSuVTqPw4TKBBHJl9H0hzuvPqMkvkCfF?= =?utf-8?q?uxEmVVnRnfqwasH3SWRkXM6HOZ2r/MhwqY8q3pzYw1q0Ty24Wbf/yFCLCqT6vSmen?= =?utf-8?q?lhQeMIq9sraJ?= X-Forefront-Antispam-Report: CIP:195.60.68.100;CTRY:SE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.axis.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(82310400017)(376005)(36860700004)(1800799015);DIR:OUT;SFP:1101; X-OriginatorOrg: axis.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2024 14:41:43.6821 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 551e6d2f-865b-48ca-7183-08dc6ddaa626 X-MS-Exchange-CrossTenant-Id: 78703d3c-b907-432f-b066-88f7af9ca3af X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=78703d3c-b907-432f-b066-88f7af9ca3af;Ip=[195.60.68.100];Helo=[mail.axis.com] X-MS-Exchange-CrossTenant-AuthSource: DU2PEPF00028D04.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR02MB6625 X-Patchwork-Delegate: kuba@kernel.org Implement single-pair BroadR-Reach modes on bcm5481x PHY by Broadcom. Create set of functions alternative to IEEE 802.3 to handle configuration of these modes on compatible Broadcom PHYs. Signed-off-by: Kamil Horák - 2N --- drivers/net/phy/bcm-phy-lib.c | 122 ++++++++++++ drivers/net/phy/bcm-phy-lib.h | 4 + drivers/net/phy/broadcom.c | 338 ++++++++++++++++++++++++++++++++-- 3 files changed, 449 insertions(+), 15 deletions(-) diff --git a/drivers/net/phy/bcm-phy-lib.c b/drivers/net/phy/bcm-phy-lib.c index 876f28fd8256..9fa2a20e641f 100644 --- a/drivers/net/phy/bcm-phy-lib.c +++ b/drivers/net/phy/bcm-phy-lib.c @@ -794,6 +794,46 @@ static int _bcm_phy_cable_test_get_status(struct phy_device *phydev, return ret; } +static int bcm_setup_forced(struct phy_device *phydev) +{ + u16 ctl = 0; + + phydev->pause = 0; + phydev->asym_pause = 0; + + if (phydev->speed == SPEED_100) + ctl |= LRECR_SPEED100; + + if (phydev->duplex != DUPLEX_FULL) + return -EOPNOTSUPP; + + return phy_modify(phydev, MII_BCM54XX_LRECR, LRECR_SPEED100, ctl); +} + +/** + * bcm_linkmode_adv_to_mii_adv_t + * @advertising: the linkmode advertisement settings + * + * A small helper function that translates linkmode advertisement + * settings to phy autonegotiation advertisements for the + * MII_BCM54XX_LREANAA register. + */ +static inline u32 bcm_linkmode_adv_to_mii_adv_t(unsigned long *advertising) +{ + u32 result = 0; + + if (linkmode_test_bit(ETHTOOL_LINK_MODE_1BR10_BIT, advertising)) + result |= LREANAA_10_1PAIR; + if (linkmode_test_bit(ETHTOOL_LINK_MODE_100baseT1_Full_BIT, advertising)) + result |= LREANAA_100_1PAIR; + if (linkmode_test_bit(ETHTOOL_LINK_MODE_Pause_BIT, advertising)) + result |= LRELPA_PAUSE; + if (linkmode_test_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT, advertising)) + result |= LRELPA_PAUSE_ASYM; + + return result; +} + int bcm_phy_cable_test_start(struct phy_device *phydev) { return _bcm_phy_cable_test_start(phydev, false); @@ -1066,6 +1106,88 @@ int bcm_phy_led_brightness_set(struct phy_device *phydev, } EXPORT_SYMBOL_GPL(bcm_phy_led_brightness_set); +int bcm_setup_master_slave(struct phy_device *phydev) +{ + u16 ctl = 0; + + switch (phydev->master_slave_set) { + case MASTER_SLAVE_CFG_MASTER_PREFERRED: + case MASTER_SLAVE_CFG_MASTER_FORCE: + ctl = LRECR_MASTER; + break; + case MASTER_SLAVE_CFG_SLAVE_PREFERRED: + case MASTER_SLAVE_CFG_SLAVE_FORCE: + break; + case MASTER_SLAVE_CFG_UNKNOWN: + case MASTER_SLAVE_CFG_UNSUPPORTED: + return 0; + default: + phydev_warn(phydev, "Unsupported Master/Slave mode\n"); + return -EOPNOTSUPP; + } + + return phy_modify_changed(phydev, MII_BCM54XX_LRECR, LRECR_MASTER, ctl); +} +EXPORT_SYMBOL_GPL(bcm_setup_master_slave); + +int bcm_config_aneg(struct phy_device *phydev, bool changed) +{ + int err; + + if (genphy_config_eee_advert(phydev)) + changed = true; + + err = bcm_setup_master_slave(phydev); + if (err < 0) + return err; + else if (err) + changed = true; + + if (phydev->autoneg != AUTONEG_ENABLE) + return bcm_setup_forced(phydev); + + err = bcm_config_advert(phydev); + if (err < 0) /* error */ + return err; + else if (err) + changed = true; + + return genphy_check_and_restart_aneg(phydev, changed); +} +EXPORT_SYMBOL_GPL(bcm_config_aneg); + +/** + * bcm_config_advert - sanitize and advertise auto-negotiation parameters + * @phydev: target phy_device struct + * + * Description: Writes MII_BCM54XX_LREANAA with the appropriate values, + * after sanitizing the values to make sure we only advertise + * what is supported. Returns < 0 on error, 0 if the PHY's advertisement + * hasn't changed, and > 0 if it has changed. + */ +int bcm_config_advert(struct phy_device *phydev) +{ + int err; + u32 adv; + + /* Only allow advertising what this PHY supports */ + linkmode_and(phydev->advertising, phydev->advertising, + phydev->supported); + + adv = bcm_linkmode_adv_to_mii_adv_t(phydev->advertising); + + /* Setup BroadR-Reach mode advertisement */ + err = phy_modify_changed(phydev, MII_BCM54XX_LREANAA, + LRE_ADVERTISE_ALL | LREANAA_PAUSE | + LREANAA_PAUSE_ASYM, adv); + + if (err < 0) + return err; + + return err > 0 ? 1 : 0; +} +EXPORT_SYMBOL_GPL(bcm_config_advert); + MODULE_DESCRIPTION("Broadcom PHY Library"); MODULE_LICENSE("GPL v2"); MODULE_AUTHOR("Broadcom Corporation"); diff --git a/drivers/net/phy/bcm-phy-lib.h b/drivers/net/phy/bcm-phy-lib.h index b52189e45a84..0f6d06c0b7af 100644 --- a/drivers/net/phy/bcm-phy-lib.h +++ b/drivers/net/phy/bcm-phy-lib.h @@ -121,4 +121,8 @@ irqreturn_t bcm_phy_wol_isr(int irq, void *dev_id); int bcm_phy_led_brightness_set(struct phy_device *phydev, u8 index, enum led_brightness value); +int bcm_setup_master_slave(struct phy_device *phydev); +int bcm_config_aneg(struct phy_device *phydev, bool changed); +int bcm_config_advert(struct phy_device *phydev); + #endif /* _LINUX_BCM_PHY_LIB_H */ diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c index 370e4ed45098..2d8898fd2228 100644 --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c @@ -553,18 +553,46 @@ static int bcm54810_write_mmd(struct phy_device *phydev, int devnum, u16 regnum, return -EOPNOTSUPP; } -static int bcm54811_config_init(struct phy_device *phydev) +static int bcm5481x_get_brrmode(struct phy_device *phydev, u8 *data) { - int err, reg; + int reg; - /* Disable BroadR-Reach function. */ reg = bcm_phy_read_exp(phydev, BCM54810_EXP_BROADREACH_LRE_MISC_CTL); - reg &= ~BCM54810_EXP_BROADREACH_LRE_MISC_CTL_EN; - err = bcm_phy_write_exp(phydev, BCM54810_EXP_BROADREACH_LRE_MISC_CTL, - reg); - if (err < 0) + + *data = (reg & BCM54810_EXP_BROADREACH_LRE_MISC_CTL_EN) ? + ETHTOOL_PHY_BRR_MODE_ON : ETHTOOL_PHY_BRR_MODE_OFF; + + return 0; +} + +static int bcm5481x_set_brrmode(struct phy_device *phydev, u8 on) +{ + int reg; + int err; + + reg = bcm_phy_read_exp(phydev, BCM54810_EXP_BROADREACH_LRE_MISC_CTL); + + if (on) + reg |= BCM54810_EXP_BROADREACH_LRE_MISC_CTL_EN; + else + reg &= ~BCM54810_EXP_BROADREACH_LRE_MISC_CTL_EN; + + err = bcm_phy_write_exp(phydev, BCM54810_EXP_BROADREACH_LRE_MISC_CTL, reg); + if (err) return err; + /* Ensure LRE or IEEE register set is accessed according to the brr on/off, + * thus set the override + */ + return bcm_phy_write_exp(phydev, BCM54811_EXP_BROADREACH_LRE_OVERLAY_CTL, + BCM54811_EXP_BROADREACH_LRE_OVERLAY_CTL_EN | + on ? 0 : BCM54811_EXP_BROADREACH_LRE_OVERLAY_CTL_OVERRIDE_VAL); +} + +static int bcm54811_config_init(struct phy_device *phydev) +{ + int err, reg; + err = bcm54xx_config_init(phydev); /* Enable CLK125 MUX on LED4 if ref clock is enabled. */ @@ -576,18 +604,16 @@ static int bcm54811_config_init(struct phy_device *phydev) return err; } - return err; + /* Configure BroadR-Reach function. */ + return bcm5481x_set_brrmode(phydev, ETHTOOL_PHY_BRR_MODE_OFF); } -static int bcm5481_config_aneg(struct phy_device *phydev) +static int bcm5481x_config_delay_swap(struct phy_device *phydev) { struct device_node *np = phydev->mdio.dev.of_node; - int ret; - - /* Aneg firstly. */ - ret = genphy_config_aneg(phydev); + int ret = 0; - /* Then we can set up the delay. */ + /* Set up the delay. */ bcm54xx_config_clock_delay(phydev); if (of_property_read_bool(np, "enet-phy-lane-swap")) { @@ -601,6 +627,56 @@ static int bcm5481_config_aneg(struct phy_device *phydev) return ret; } +static int bcm5481_config_aneg(struct phy_device *phydev) +{ + int ret; + u8 brr_mode; + + /* Aneg firstly. */ + ret = bcm5481x_get_brrmode(phydev, &brr_mode); + if (ret) + return ret; + + if (brr_mode == ETHTOOL_PHY_BRR_MODE_ON) + ret = bcm_config_aneg(phydev, false); + else + ret = genphy_config_aneg(phydev); + + if (ret) + return ret; + + /* Then we can set up the delay and swap. */ + return bcm5481x_config_delay_swap(phydev); +} + +static int bcm54811_config_aneg(struct phy_device *phydev) +{ + int ret; + u8 brr_mode; + + /* Aneg firstly. */ + ret = bcm5481x_get_brrmode(phydev, &brr_mode); + if (ret) + return ret; + + if (brr_mode == ETHTOOL_PHY_BRR_MODE_ON) { + /* BCM54811 is only capable of autonegotiation in IEEE mode */ + if (phydev->autoneg) + return -EOPNOTSUPP; + + ret = bcm_config_aneg(phydev, false); + + } else { + ret = genphy_config_aneg(phydev); + } + + if (ret) + return ret; + + /* Then we can set up the delay and swap. */ + return bcm5481x_config_delay_swap(phydev); +} + struct bcm54616s_phy_priv { bool mode_1000bx_en; }; @@ -1062,6 +1138,234 @@ static void bcm54xx_link_change_notify(struct phy_device *phydev) bcm_phy_write_exp(phydev, MII_BCM54XX_EXP_EXP08, ret); } +static int bcm54811_read_abilities(struct phy_device *phydev) +{ + int val, err; + int i; + static const int modes_array[] = {ETHTOOL_LINK_MODE_100baseT1_Full_BIT, + ETHTOOL_LINK_MODE_1BR10_BIT, + ETHTOOL_LINK_MODE_1000baseT_Full_BIT, + ETHTOOL_LINK_MODE_1000baseX_Full_BIT, + ETHTOOL_LINK_MODE_1000baseT_Half_BIT, + ETHTOOL_LINK_MODE_100baseT_Full_BIT, + ETHTOOL_LINK_MODE_100baseT_Half_BIT, + ETHTOOL_LINK_MODE_10baseT_Full_BIT, + ETHTOOL_LINK_MODE_10baseT_Half_BIT}; + + u8 brr_mode; + + for (i = 0; i < ARRAY_SIZE(modes_array); i++) + linkmode_clear_bit(modes_array[i], phydev->supported); + + err = bcm5481x_get_brrmode(phydev, &brr_mode); + + if (err) + return err; + + if (brr_mode == ETHTOOL_PHY_BRR_MODE_ON) { + linkmode_set_bit_array(phy_basic_ports_array, + ARRAY_SIZE(phy_basic_ports_array), + phydev->supported); + + val = phy_read(phydev, MII_BCM54XX_LRESR); + if (val < 0) + return val; + + linkmode_mod_bit(ETHTOOL_LINK_MODE_Autoneg_BIT, + phydev->supported, 1); + linkmode_mod_bit(ETHTOOL_LINK_MODE_100baseT1_Full_BIT, + phydev->supported, + val & LRESR_100_1PAIR); + linkmode_mod_bit(ETHTOOL_LINK_MODE_1BR10_BIT, + phydev->supported, + val & LRESR_10_1PAIR); + } else { + return genphy_read_abilities(phydev); + } + + return err; +} + +static int bcm5481x_get_tunable(struct phy_device *phydev, + struct ethtool_tunable *tuna, void *data) +{ + switch (tuna->id) { + case ETHTOOL_PHY_BRR_MODE: + return bcm5481x_get_brrmode(phydev, data); + default: + return -EOPNOTSUPP; + } +} + +static int bcm5481x_set_tunable(struct phy_device *phydev, + struct ethtool_tunable *tuna, const void *data) +{ + int res; + + switch (tuna->id) { + case ETHTOOL_PHY_BRR_MODE: + res = bcm5481x_set_brrmode(phydev, *(const u8 *)data); + if (res >= 0) + res = bcm54811_read_abilities(phydev); + break; + default: + res = -EOPNOTSUPP; + } + + return res; +} + +static int bcm_read_master_slave(struct phy_device *phydev) +{ + int cfg, state; + int val; + + /* In BroadR-Reach mode we are always capable of master-slave + * and there is no preferred master or slave configuration + */ + phydev->master_slave_get = MASTER_SLAVE_CFG_UNKNOWN; + phydev->master_slave_state = MASTER_SLAVE_STATE_UNKNOWN; + + val = phy_read(phydev, MII_BCM54XX_LRECR); + if (val < 0) + return val; + + if ((val & LRECR_LDSEN) == 0) { + if (val & LRECR_MASTER) + cfg = MASTER_SLAVE_CFG_MASTER_FORCE; + else + cfg = MASTER_SLAVE_CFG_SLAVE_FORCE; + } + + val = phy_read(phydev, MII_BCM54XX_LRELDSE); + if (val < 0) + return val; + + if (val & LDSE_MASTER) + state = MASTER_SLAVE_STATE_MASTER; + else + state = MASTER_SLAVE_STATE_SLAVE; + + phydev->master_slave_get = cfg; + phydev->master_slave_state = state; + + return 0; +} + +/* Read LDS Link Partner Ability in BroadR-Reach mode */ +static int bcm_read_lpa(struct phy_device *phydev) +{ + int i, lrelpa; + + if (phydev->autoneg != AUTONEG_ENABLE) { + if (!phydev->autoneg_complete) { + /* aneg not yet done, reset all relevant bits */ + static int br_bits[] = { ETHTOOL_LINK_MODE_Autoneg_BIT, + ETHTOOL_LINK_MODE_Pause_BIT, + ETHTOOL_LINK_MODE_Asym_Pause_BIT, + ETHTOOL_LINK_MODE_1BR10_BIT, + ETHTOOL_LINK_MODE_100baseT1_Full_BIT }; + for (i = 0; i < ARRAY_SIZE(br_bits); i++) + linkmode_clear_bit(br_bits[i], phydev->lp_advertising); + + return 0; + } + + /* Long-Distance-Signalling Link Partner Ability */ + lrelpa = phy_read(phydev, MII_BCM54XX_LRELPA); + if (lrelpa < 0) + return lrelpa; + + linkmode_mod_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT, + phydev->lp_advertising, lrelpa & LRELPA_PAUSE_ASYM); + linkmode_mod_bit(ETHTOOL_LINK_MODE_Pause_BIT, + phydev->lp_advertising, lrelpa & LRELPA_PAUSE); + linkmode_mod_bit(ETHTOOL_LINK_MODE_100baseT1_Full_BIT, + phydev->lp_advertising, lrelpa & LRELPA_100_1PAIR); + linkmode_mod_bit(ETHTOOL_LINK_MODE_1BR10_BIT, + phydev->lp_advertising, lrelpa & LRELPA_10_1PAIR); + } else { + linkmode_zero(phydev->lp_advertising); + } + + return 0; +} + +static int bcm_read_status_fixed(struct phy_device *phydev) +{ + int lrecr = phy_read(phydev, MII_BCM54XX_LRECR); + + if (lrecr < 0) + return lrecr; + + phydev->duplex = DUPLEX_FULL; + + if (lrecr & LRECR_SPEED100) + phydev->speed = SPEED_100; + else + phydev->speed = SPEED_10; + + return 0; +} + +static int bcm54811_read_status(struct phy_device *phydev) +{ + int err; + u8 brr_mode; + + err = bcm5481x_get_brrmode(phydev, &brr_mode); + + if (err) + return err; + + if (brr_mode == ETHTOOL_PHY_BRR_MODE_ON) { + /* Get the status in BroadRReach mode just like genphy_read_status + * does in normal mode + */ + + int err, old_link = phydev->link; + + /* Update the link, but return if there was an error + * genphy_update_link() functions equally on IEEE and LRE + * register set + */ + + err = genphy_update_link(phydev); + if (err) + return err; + + /* why bother the PHY if nothing can have changed */ + if (phydev->autoneg == AUTONEG_ENABLE && old_link && phydev->link) + return 0; + + phydev->speed = SPEED_UNKNOWN; + phydev->duplex = DUPLEX_UNKNOWN; + phydev->pause = 0; + phydev->asym_pause = 0; + + err = bcm_read_master_slave(phydev); + if (err < 0) + return err; + + /* Read LDS Link Partner Ability */ + err = bcm_read_lpa(phydev); + if (err < 0) + return err; + + if (phydev->autoneg == AUTONEG_ENABLE && phydev->autoneg_complete) { + phy_resolve_aneg_linkmode(phydev); + } else if (phydev->autoneg == AUTONEG_DISABLE) { + err = bcm_read_status_fixed(phydev); + if (err < 0) + return err; + } + } else { + err = genphy_read_status(phydev); + } + + return err; +} + static struct phy_driver broadcom_drivers[] = { { .phy_id = PHY_ID_BCM5411, @@ -1212,9 +1516,13 @@ static struct phy_driver broadcom_drivers[] = { .get_stats = bcm54xx_get_stats, .probe = bcm54xx_phy_probe, .config_init = bcm54811_config_init, - .config_aneg = bcm5481_config_aneg, + .config_aneg = bcm54811_config_aneg, .config_intr = bcm_phy_config_intr, .handle_interrupt = bcm_phy_handle_interrupt, + .read_status = bcm54811_read_status, + .get_tunable = bcm5481x_get_tunable, + .set_tunable = bcm5481x_set_tunable, + .get_features = bcm54811_read_abilities, .suspend = bcm54xx_suspend, .resume = bcm54xx_resume, .link_change_notify = bcm54xx_link_change_notify,