From patchwork Fri May 3 08:37:17 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: 13652507 X-Patchwork-Delegate: kuba@kernel.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2062.outbound.protection.outlook.com [40.107.22.62]) (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 6BA6F79CD; Fri, 3 May 2024 08:41:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.22.62 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714725694; cv=fail; b=dwkqAWSUiJkv6P19c6X2kLCVbCyUUSWnXtYWOhZgBdIeARKXio+eNZovqnMfbwsxnCu1qiLWZTpMKZD6t6dn+Q0YD6aVsk6fRGv7HOWiEaP5NvE08IbbP2VoCWe2OBROO7IicrgATnIQSHiNCgAzEaHvXo6nMNlb0JwY5MuGWFA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714725694; c=relaxed/simple; bh=ql6MX3PQKVCr6P5TajVkFhz95idCAmM1zDB/CutAOpU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=S4RB73Y69b75k+0Lq+WFbfrCZV5VxENZnErH97obWa01/rxkC1MRCtypS/ZQvbkEFqlwC5npUbwRDYmF7yUC6yC6aiYnWfpC3iyovXF8vc2CypPwEV0R6Z+EqHCZUVq3RrGIkHCWyb4hlbmKVd1cqBVcZbuVx/IhYXn+OVOMkuc= 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=XQ3vo+7O; arc=fail smtp.client-ip=40.107.22.62 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="XQ3vo+7O" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=P/+L7Eh+Ich461oGMRd/qxAutgxwH4ZxMCmLuUwGZF/K2k3/OprJvL2MmNstdY8nehh/TmiOGmjGT8X/6hXxZ8IpgzzvAgXyM/kmrIHrv5aHlIQ9rNWu76AdfRWiZsK9L6Y1Tq/GCSSuoL/85SH3Q8JcnTaUoQMOpU8MTPHGUkhzvMPlkZSBxeJnyHLuTUyKvV9aQcBeaPF4iBj+yXtP72tJjGM6t85MXc4yc9euqCDz1a18PRFGaqER63TWStD3eb2+WufxL5hp5brJssOgDXbGQgx7waSQRd31nOAsz1M0zk3aCbsyWB543TRyyJCOCMgKqReTCIQMTpPK22hCOw== 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=3Gfxp8eWvRaT/oL2qcMuBOgBvFCpuRyaGOmIcHLxsXQ=; b=H7Gx0qwzQ30WINN1nRb0kp3rbBY6R/6FdV2lH04s2ph58MS9a/yTfkv8d+HuKL0TcWt1ewu3per6V6PHHBwNYnV0e6MSifbHw7XKrDQYZf7rg5tJV8F16gRsODkG4Acf9pkbMT4H0SchGzfHT2z9jpVoJq3oHKDN+LKiaxul5W4AoTjUafg0A+KO9Xic1saHxJFvdO2miWgFAshuT7bgAZxWOC388U/0pBXefqFzd50tv02ruFy2KimKdfAIEItn+tecDGCVdn8jjoWALiYO2uhpPZ/dagTZltYNUpJFHBrWk4bIgn1QMRYgmaq+P7j4hsZCQFZof8VxKA3gleTI7A== 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=3Gfxp8eWvRaT/oL2qcMuBOgBvFCpuRyaGOmIcHLxsXQ=; b=XQ3vo+7OTvGaDPYRM25D0bTgyhbqxo7TxmZC6KUsZ6rZV4Rk+S1PnrQ/rLtYrIIgWIFKS3Uh/gwORyV/Ct4qT1EZTScce/TZzOuMHAB9wp1Gs/tmpGR5sVUpNHdb0Y3KxWzDHQWidccZPqUTB0F7ka4liysUY8mxc0W1Zsriwio= Received: from DB9PR06CA0005.eurprd06.prod.outlook.com (2603:10a6:10:1db::10) by PAWPR02MB9149.eurprd02.prod.outlook.com (2603:10a6:102:33d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7519.34; Fri, 3 May 2024 08:41:28 +0000 Received: from DB1PEPF000509FB.eurprd03.prod.outlook.com (2603:10a6:10:1db:cafe::1) by DB9PR06CA0005.outlook.office365.com (2603:10a6:10:1db::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.29 via Frontend Transport; Fri, 3 May 2024 08:41:28 +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 DB1PEPF000509FB.mail.protection.outlook.com (10.167.242.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7544.18 via Frontend Transport; Fri, 3 May 2024 08:41:26 +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; Fri, 3 May 2024 10:41:26 +0200 From: =?utf-8?q?Kamil_Hor=C3=A1k_-_2N?= To: , , , CC: , , Subject: [PATCH v2 1/3] net: phy: bcm54811: New link mode for BroadR-Reach Date: Fri, 3 May 2024 10:37:17 +0200 Message-ID: <20240503083719.899312-2-kamilh@axis.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240503083719.899312-1-kamilh@axis.com> References: <20240503083719.899312-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-mail02w.axis.com (10.20.40.8) To se-mail01w.axis.com (10.20.40.7) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB1PEPF000509FB:EE_|PAWPR02MB9149:EE_ X-MS-Office365-Filtering-Correlation-Id: 82266147-aca6-4a74-c6d5-08dc6b4cd245 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|36860700004|376005|1800799015; X-Microsoft-Antispam-Message-Info: =?utf-8?q?06P903iVXY2Say7+nJH9DGg5t99ksIV?= =?utf-8?q?X981GRKJqumX941tI0TaTxxcyLIwWn98WDkfqAnWtKE2FbRtWgrOl0LolHdfQAL7g?= =?utf-8?q?Z5iDN4imLG4ojx8Ui/fBw3FfJ5dipBsl7sIrUDWfRRqBJ4Vp0s02rAcdJjAjUEF6q?= =?utf-8?q?a6t9Ebhxrq2KVDOVUTYr4KGwSsIZ1tPolSO/ivFayTIXwU8gCkQj1ecWlNYGIE1HN?= =?utf-8?q?m1HM5tWIwhTYNprYJ7ZHrvrtvNuKhax4h4FLC3rKvhJyC4LWX+hKbHbPW6bpVRKFU?= =?utf-8?q?ZY4J1TwW8oUvjmgGW7E1zCIx1urcJaY+mIQbLDd7qrxvMyIpCnoyHzlMTOyWFY2H8?= =?utf-8?q?VSI8vX5moRkzjE+2vBtIDa5fS0qiMnF7MREar/Vna9Mjpn7nUs7GVCP1NC8M2O7b/?= =?utf-8?q?/uuDZ8csW3rZ37uzZj+/fOpgtyN7mH4bE3kPrVBP4iuEkIWB3NerXPK0M22qOE1jt?= =?utf-8?q?4knFOA8YbDB63vTyfxzT1I2YpE72Bi3ELjgDMOUBTO+bRrLURJJCkI4cX14XadB6s?= =?utf-8?q?OffkpPGP0qToqnzNFd0/gDs2c8JWUF/fDVPOAJSJ6qDoMoa+rE+fZSj2BPwEMBHqT?= =?utf-8?q?bqLdbq8ME4L6XV3rfH/P43tN86ocI6hGWf6CAoHU+eXMQhzgRa3LvPgnuuEyqRKon?= =?utf-8?q?Q/EOnw3a7CF0wyiZTUhr2eFh39m70HVTzT3s8+ypN09og4M+sqYeQW6Mq1ClKvQCi?= =?utf-8?q?COQAUYXgd0rprLO/j6npKpE5hiDuDSIukPIGuEO5QV2oHe2vNV8LiIZGUwnBKCFln?= =?utf-8?q?09fAdJDUZsg/lfVDta92yac7B/SCNvDLJr53fFtu99jOKaJmouOjWYpulwncq/B9A?= =?utf-8?q?ZBy7JivX73YtcHgRC0vNWD1NMqHjEmSzTFoiKA6dxsJ5Ui2dMoyvFmcV2zhCO32bS?= =?utf-8?q?/GsMQbNOSHdlV3IHfGtwyuPXZS0t91YFAXpahnrtummp5eBMDtPorSLQ4k8PAfhRX?= =?utf-8?q?GFvIGAKDL1Eft/kxeYupjM1YiX+IRQELINunp4ddOm7ewYRxuR+I1QUIYUPS7dpYh?= =?utf-8?q?/5kBvts8S2V7Y4buzv26Y/TNYQZBmlDGU2725bigygx2WOJ2NHHc2LGXvh05WoJ8M?= =?utf-8?q?oKl+EGmPj1GmTbd3CUmuF+UNAcmiA3cmQlv/mKG2tHn9BKWd+/IISjrtribzG6Q9c?= =?utf-8?q?y3tp5XAB/pVn0MBkZi2/m5MI1Yfj4EIv5p6xF+yAFLSqzoRF7mL4ec6gZNPo2Nyzq?= =?utf-8?q?sJGetFq04kbvuY1ETfJLoIT0usyptDeQw74zpiODZe0mb92U3XIPbbCPmuef11cH3?= =?utf-8?q?XaQCOO6/JTQmputKYeGJIjPOeaWBH5eCaBm/XxxIjH+oM+euchk5Xyzs=3D?= 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:ErrorRetry;CAT:NONE;SFS:(13230031)(36860700004)(376005)(1800799015);DIR:OUT;SFP:1101; X-OriginatorOrg: axis.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 May 2024 08:41:26.8461 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 82266147-aca6-4a74-c6d5-08dc6b4cd245 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: DB1PEPF000509FB.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAWPR02MB9149 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. Signed-off-by: Kamil Horák - 2N --- 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;