From nobody Thu Feb 12 05:10:47 2026 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2043.outbound.protection.outlook.com [40.107.7.43]) (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 8BFB6194AD7; Mon, 17 Jun 2024 11:41:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.7.43 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718624475; cv=fail; b=fBqTD8fRIsUCp78L7vXmm8F3hnUZ4xLBnE4MhCVyqiaWvTqnP7GtO4WSwhXLhasjhtIqaH01ooVVsIUv7nddhVyitL4WbppouXWChDWQNHgK2dH/G6sXCY71qZL3YFVRdZWCwqLnJCd0Sr/epWXJkK1uBENnET3tSsjjxVafxuI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718624475; c=relaxed/simple; bh=pd0j4+WYR4lmq/ooYHLgmJZdsbG6EwpDSxp/kLQtVMI=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=p4O5xNk10e7xELjBA5EYNSDWLcLEOT0N7yXlXTJDburntVBTtjk3iQAg0K0pFFbunn+okOg+Bl/+SyFtWptQsSaViyhfaELOzsBIRYQv5kcP2J81SDtoxW1supb9KkoVvPqgwNJp29iJdVnJ4IZT+tVwJBYuMtj4ZhhIqODOVSQ= 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=lNvaEKB7; arc=fail smtp.client-ip=40.107.7.43 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="lNvaEKB7" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N7ZInOz9ENES0dxutIxRCcxkYugQIV5W1dUwnH8GO6RfdB+0ODS/JxRhejf+srrJxaUFKDh33AxTRPELlafikocATjITL8Dv2JGx1mc4+qa5ZP+FvW1nkeymzOpz71oN4m5n0cd7ZhIx2u/+p999je7N+oWrI22Nlr0KEktIkltF7lqZOP4DwMXhCU4p7IwUhjDoyqC08faL9Ife3SXiwwBfCC015dSKzMRm80rsadrZzzT8v0Bghf6gJ70EJODSz8grvH2Dx/S0r6im2GQtqpuW8N7TaxOZbEvMsefYz6ip4SBpfJVC2D56tnSxpAtqddQPfUedS93AptilC1oJWw== 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=IZNHvL0AuPvCWeaJj5GGE7vccsFtV1zs+5P3wepFuZo=; b=kKWOqYyQmsabhXFJvyBno2zxTvzHnOel5iPTJia9FNGJyfkyBZF+5rrHqIkWUPKm10xRaqHYB4WwrqwmGJ65etp88ppSyVx7F0jfSYASq0lCK6NDvIBN7pB6Ajb38PlGnULhT2LNXsZgX0x1Z8Vwn+hvE+tMNjrQ7wp5uAUlNaC+ieKYHfDmvXxP00mRxvU1rtVi7tkhfsMuWrikeFvU6u6Lm/ruBHo/onLFqfm/qQPM7xWzaCABdIjmiqUQP4XR+mWq9gLmUVb6HXFqabhEl1Ggl8PTNbjI7i+wQg9kZ9XeP3J717kxgMh9y1j9jdrmXz9C6JfyCvXNSfwVKVb8og== 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=IZNHvL0AuPvCWeaJj5GGE7vccsFtV1zs+5P3wepFuZo=; b=lNvaEKB7NOiM9VcVkQpY+pmutg8c2gTQgrK6gbE4cHCwtH8pBaOBMRiUckJTplUDUG8ZCzKyvWX282lCMeMH2UfA5rFnBkozk8m+Hlq7lYBwqmNL50K44Fn0SzgKVH8quF+tzmZpolLAKXCxoo9qZLmtlH1RCZ6R4JJNHzdonuI= Received: from AS4P250CA0003.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:5df::19) by VI0PR02MB10874.eurprd02.prod.outlook.com (2603:10a6:800:205::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7677.30; Mon, 17 Jun 2024 11:41:09 +0000 Received: from AMS0EPF00000192.eurprd05.prod.outlook.com (2603:10a6:20b:5df:cafe::13) by AS4P250CA0003.outlook.office365.com (2603:10a6:20b:5df::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7677.30 via Frontend Transport; Mon, 17 Jun 2024 11:41:09 +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 AMS0EPF00000192.mail.protection.outlook.com (10.167.16.218) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7677.15 via Frontend Transport; Mon, 17 Jun 2024 11:41:08 +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.2507.39; Mon, 17 Jun 2024 13:41:07 +0200 From: =?UTF-8?q?Kamil=20Hor=C3=A1k=20-=202N?= To: , , , , , , , , , , , CC: , , , Subject: [PATCH v7 4/4] net: phy: bcm-phy-lib: Implement BroadR-Reach link modes Date: Mon, 17 Jun 2024 13:38:41 +0200 Message-ID: <20240617113841.3694934-5-kamilh@axis.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240617113841.3694934-1-kamilh@axis.com> References: <20240617113841.3694934-1-kamilh@axis.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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: AMS0EPF00000192:EE_|VI0PR02MB10874:EE_ X-MS-Office365-Filtering-Correlation-Id: 97b80a81-3a59-4946-e16a-08dc8ec260fb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230037|376011|7416011|36860700010|82310400023|1800799021|921017; X-Microsoft-Antispam-Message-Info: =?utf-8?B?c3E1SXFtUDdETjVWNWtmQ2hNTk5WZ3ZEUWJ6WXFLYUc4ZmdJM3k2Rkp3RFBO?= =?utf-8?B?enJNRXo4ZVp4Nit5QXM1V2JPMC9OTTE4RE4xVGJGRnU5eTB3UHJJbVBTVW1k?= =?utf-8?B?S0pyODVUQ3gyVWxCN3A3eGxEdmVBUDFOSFNEb3JGRXMxMmZIR1M0N1lsY1Mx?= =?utf-8?B?OGRvWmNrczc0cHNiU2NTZ1JmeTlRSVFMb205VkxPT3VkVThmai9WVWtOQS92?= =?utf-8?B?bjVSTFRSeVVLVmlMTnpQZ2NtWStMTkFPYnZpd3dMWXBuT3h1YXZYR2V4Y05Y?= =?utf-8?B?MTFUMWRhZ2ExODV0MkJPaEk1YmpjbFMvK3J4M1VXYmZGY2pQL01jYkpEb2p4?= =?utf-8?B?MVBWdFBqNlVwUTFSWXBHZTFBV3Y3QlRxVnM4Qyt2ZW9WdnVyVFlxQ3V0Szhm?= =?utf-8?B?S2dqSnJMMWFhdFBkSFJnKzNGV3NjZXNkOWcva1FRNWg2MTlkVVJLUXdJODlq?= =?utf-8?B?NlpQNWJFQ0FLOXQzUlZDWE80dFNtaENkeU5CeWd1dDB2VFBoMTRyN3U5dENM?= =?utf-8?B?TWhSMHoyZlV3a0djRG1lZVhXTU9uTzJyZGhTdGxFNHllZmY4OXNxU3phVE4z?= =?utf-8?B?Q0dWUVlGTEx5OGlqWTg2WWMxcWFTNGMybWJ1VkdDSXlvcnhPVXNscXhIYmJv?= =?utf-8?B?TVFsajEydVZUK3dJQW44VlZCL1lpZmdqcDdVL3c1Rnp6S3JDZXozUXoraC85?= =?utf-8?B?aHRRYWdYRVZ0dDZWQkNTRVNOUyt6QzkwSDY0d3V5Skc1UGtaZ2I1Znk2bXZL?= =?utf-8?B?RjV1aUFFVmJWZlJ6bDVsYzhKbXZyYWJnSUNoQ091bEU1MFZPSzJjaXBTTkhN?= =?utf-8?B?MnN0YThoQnl5WE9NbHFNR0c3N05XRUQ3MGtYbkk5dWNsSFB1aE5xa2NVelZN?= =?utf-8?B?MldvZSszZXZLT1lJa0VRNU4vZnVyOHQvY1MzVXM5VWtBVWwvK0gvZGJaSnRD?= =?utf-8?B?SDlkOW9iay9nYjFUMkQ1Qy9CbDE3ZjVQc1phMCsxeWpkc0p5dTRCanZYRVBC?= =?utf-8?B?bkJRYzJ3eCsyLzJMUEpNc3hDcEprY3hXcS8yWmlyV1BCYXorOEJtTjJhajVW?= =?utf-8?B?bXltQ2tJV2JFdWxRTlFzN0JlYWNIT2lESFJtSlUzeUNtaTZ6UWtoU2NPYXB3?= =?utf-8?B?K3pGcTNLQVk1WFdob242V1Jyc2l2eUJkMDVsOXNLTWdJNkZPMk85T3hKMlNI?= =?utf-8?B?NEcwRXBTc0tLVnAxUjI2WXVKVmhRRFlkeW96aVFNcWdJZXA4SkVYQVZaZEp6?= =?utf-8?B?bmtScUJJdFA4QThEdmh6OFZUWlNpbWJTd0VkTHA2WG55R3lsZGhVWk5wUCs0?= =?utf-8?B?V2pKNGdtSmVxaU5DRG55aEZoN25PZ0hicXQ3aVZlWVNDRFdiYkUyMXpsek9Q?= =?utf-8?B?L1hENFhVOVZiZDJiM1ZNVGlaN0tPS3dEOVVJRTJFVzVDelN3TXFLbjB1d3Fu?= =?utf-8?B?T1JkdDc3d0VWdkhxWnpRQUc3aERQUmVvUXRLalU0Q3RoQ05UVmp1ZXVLRm1P?= =?utf-8?B?d0xLd2ZQcERWM0NkSGl5QnRBcHlmY1N0RTkyS1hHOVAySUpXZkc3S2dGMTNk?= =?utf-8?B?M1VTcWpUWUNmbkZud2l1eU1TWTdwblN2cVJQVEZ1RWU0TzlwZ1dGTXVZZklQ?= =?utf-8?B?aVQxSHhGZDJZRHZTR0JmNmhOQWg5VmNNNTJ2NXNGMG1hZU5MY1NMYXNhVWZk?= =?utf-8?B?VHhXNGQ5T0grVVg1R1lqZU5sYWxkR1dwVmsvZ2RWZUc5RXdER3NuZGgrdVVV?= =?utf-8?B?WEo0MGVEMCs5ZkZTSDZjdDAyYVV5VnMvV2VIL2haanAxT0Zab0VWRWd0YnNp?= =?utf-8?B?Z0hoQ3c4QzYwOWtNbWM0VGQrZVlPLzcvSXppV0FZOFRKQ3orQW1nMkcycTY5?= =?utf-8?B?QmZaQnVIdHV5U0ZsZE5MbG96cEFKUDNuL2JvVTNUb0xWZ2dKek1mSm04a2dz?= =?utf-8?Q?VC1sn5kSfXQ=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:InfoDomainNonexistent;CAT:NONE;SFS:(13230037)(376011)(7416011)(36860700010)(82310400023)(1800799021)(921017);DIR:OUT;SFP:1101; X-OriginatorOrg: axis.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jun 2024 11:41:08.1374 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 97b80a81-3a59-4946-e16a-08dc8ec260fb 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: AMS0EPF00000192.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI0PR02MB10874 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=C3=A1k - 2N --- drivers/net/phy/bcm-phy-lib.c | 125 ++++++++++++ drivers/net/phy/bcm-phy-lib.h | 4 + drivers/net/phy/broadcom.c | 370 ++++++++++++++++++++++++++++++++-- 3 files changed, 482 insertions(+), 17 deletions(-) diff --git a/drivers/net/phy/bcm-phy-lib.c b/drivers/net/phy/bcm-phy-lib.c index 876f28fd8256..e4f1766cbc10 100644 --- a/drivers/net/phy/bcm-phy-lib.c +++ b/drivers/net/phy/bcm-phy-lib.c @@ -794,6 +794,47 @@ static int _bcm_phy_cable_test_get_status(struct phy_d= evice *phydev, return ret; } =20 +static int bcm_setup_lre_forced(struct phy_device *phydev) +{ + u16 ctl =3D 0; + + phydev->pause =3D 0; + phydev->asym_pause =3D 0; + + if (phydev->speed =3D=3D SPEED_100) + ctl |=3D LRECR_SPEED100; + + if (phydev->duplex !=3D DUPLEX_FULL) + return -EOPNOTSUPP; + + return phy_modify(phydev, MII_BCM54XX_LRECR, LRECR_SPEED100, ctl); +} + +/** + * bcm_linkmode_adv_to_lre_adv_t - translate linkmode advertisement to LDS + * @advertising: the linkmode advertisement settings + * @return: LDS Auto-Negotiation Advertised Ability register value + * + * A small helper function that translates linkmode advertisement + * settings to phy LDS autonegotiation advertisements for the + * MII_BCM54XX_LREANAA register of Broadcom PHYs capable of LDS + */ +static u32 bcm_linkmode_adv_to_lre_adv_t(unsigned long *advertising) +{ + u32 result =3D 0; + + if (linkmode_test_bit(ETHTOOL_LINK_MODE_10baseT1BRR_Full_BIT, advertising= )) + result |=3D LREANAA_10_1PAIR; + if (linkmode_test_bit(ETHTOOL_LINK_MODE_100baseT1_Full_BIT, advertising)) + result |=3D LREANAA_100_1PAIR; + if (linkmode_test_bit(ETHTOOL_LINK_MODE_Pause_BIT, advertising)) + result |=3D LRELPA_PAUSE; + if (linkmode_test_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT, advertising)) + result |=3D 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 +1107,90 @@ int bcm_phy_led_brightness_set(struct phy_device *ph= ydev, } EXPORT_SYMBOL_GPL(bcm_phy_led_brightness_set); =20 +int bcm_setup_master_slave(struct phy_device *phydev) +{ + u16 ctl =3D 0; + + switch (phydev->master_slave_set) { + case MASTER_SLAVE_CFG_MASTER_PREFERRED: + case MASTER_SLAVE_CFG_MASTER_FORCE: + ctl =3D 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_lre_aneg(struct phy_device *phydev, bool changed) +{ + int err; + + if (genphy_config_eee_advert(phydev)) + changed =3D true; + + err =3D bcm_setup_master_slave(phydev); + if (err < 0) + return err; + else if (err) + changed =3D true; + + if (phydev->autoneg !=3D AUTONEG_ENABLE) + return bcm_setup_lre_forced(phydev); + + err =3D bcm_config_lre_advert(phydev); + if (err < 0) + return err; + else if (err) + changed =3D true; + + return genphy_check_and_restart_aneg(phydev, changed); +} +EXPORT_SYMBOL_GPL(bcm_config_lre_aneg); + +/** + * bcm_config_lre_advert - sanitize and advertise Long-Distance Signaling + * auto-negotiation parameters + * @phydev: target phy_device struct + * @return: 0 if the PHY's advertisement hasn't changed, < 0 on error, + * > 0 if it has changed + * + * Description: Writes MII_BCM54XX_LREANAA with the appropriate values, + * after sanitizing the values to make sure we only advertise + * what is supported. + */ +int bcm_config_lre_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 =3D bcm_linkmode_adv_to_lre_adv_t(phydev->advertising); + + /* Setup BroadR-Reach mode advertisement */ + err =3D phy_modify_changed(phydev, MII_BCM54XX_LREANAA, + LRE_ADVERTISE_ALL | LREANAA_PAUSE | + LREANAA_PAUSE_ASYM, adv); + + if (err < 0) + return err; + + return err; +} +EXPORT_SYMBOL_GPL(bcm_config_lre_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..fecdd66ad736 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); =20 +int bcm_setup_master_slave(struct phy_device *phydev); +int bcm_config_lre_aneg(struct phy_device *phydev, bool changed); +int bcm_config_lre_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..5e590c8f82c4 100644 --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c @@ -5,6 +5,9 @@ * Broadcom BCM5411, BCM5421 and BCM5461 Gigabit Ethernet * transceivers. * + * Broadcom BCM54810, BCM54811 BroadR-Reach transceivers. + * + * * Copyright (c) 2006 Maciej W. Rozycki * * Inspired by code written by Amy Fong. @@ -553,18 +556,97 @@ static int bcm54810_write_mmd(struct phy_device *phyd= ev, int devnum, u16 regnum, return -EOPNOTSUPP; } =20 -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; =20 - /* Disable BroadR-Reach function. */ reg =3D bcm_phy_read_exp(phydev, BCM54810_EXP_BROADREACH_LRE_MISC_CTL); - reg &=3D ~BCM54810_EXP_BROADREACH_LRE_MISC_CTL_EN; - err =3D bcm_phy_write_exp(phydev, BCM54810_EXP_BROADREACH_LRE_MISC_CTL, - reg); - if (err < 0) + + *data =3D (reg & BCM54810_EXP_BROADREACH_LRE_MISC_CTL_EN) ? 1 : 0; + + return 0; +} + +static int bcm54811_read_abilities(struct phy_device *phydev) +{ + static const int modes_array[] =3D { ETHTOOL_LINK_MODE_100baseT1_Full_BIT, + ETHTOOL_LINK_MODE_10baseT1BRR_Full_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 }; + int i, val, err; + u8 brr_mode; + + for (i =3D 0; i < ARRAY_SIZE(modes_array); i++) + linkmode_clear_bit(modes_array[i], phydev->supported); + + err =3D bcm5481x_get_brrmode(phydev, &brr_mode); + if (err) + return err; + + if (brr_mode) { + linkmode_set_bit_array(phy_basic_ports_array, + ARRAY_SIZE(phy_basic_ports_array), + phydev->supported); + + val =3D 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_10baseT1BRR_Full_BIT, + phydev->supported, + val & LRESR_10_1PAIR); + } else { + return genphy_read_abilities(phydev); + } + + return 0; +} + +static int bcm5481x_set_brrmode(struct phy_device *phydev, bool on) +{ + int reg; + int err; + + reg =3D bcm_phy_read_exp(phydev, BCM54810_EXP_BROADREACH_LRE_MISC_CTL); + + if (on) + reg |=3D BCM54810_EXP_BROADREACH_LRE_MISC_CTL_EN; + else + reg &=3D ~BCM54810_EXP_BROADREACH_LRE_MISC_CTL_EN; + + err =3D bcm_phy_write_exp(phydev, BCM54810_EXP_BROADREACH_LRE_MISC_CTL, r= eg); + if (err) + return err; + + /* Update the abilities based on the current brr on/off setting */ + err =3D bcm54811_read_abilities(phydev); + if (err) return err; =20 + /* Ensure LRE or IEEE register set is accessed according to the brr on/of= f, + * 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; + bool brr =3D false; + struct device_node *np =3D phydev->mdio.dev.of_node; + err =3D bcm54xx_config_init(phydev); =20 /* Enable CLK125 MUX on LED4 if ref clock is enabled. */ @@ -576,29 +658,79 @@ static int bcm54811_config_init(struct phy_device *ph= ydev) return err; } =20 - return err; + /* Configure BroadR-Reach function. */ + brr =3D of_property_read_bool(np, "brr-mode"); + + /* With BCM54811, BroadR-Reach implies no autoneg */ + if (brr) + phydev->autoneg =3D 0; + + return bcm5481x_set_brrmode(phydev, brr); } =20 -static int bcm5481_config_aneg(struct phy_device *phydev) +static int bcm5481x_config_delay_swap(struct phy_device *phydev) { struct device_node *np =3D phydev->mdio.dev.of_node; - int ret; =20 - /* Aneg firstly. */ - ret =3D genphy_config_aneg(phydev); - - /* Then we can set up the delay. */ + /* Set up the delay. */ bcm54xx_config_clock_delay(phydev); =20 if (of_property_read_bool(np, "enet-phy-lane-swap")) { /* Lane Swap - Undocumented register...magic! */ - ret =3D bcm_phy_write_exp(phydev, MII_BCM54XX_EXP_SEL_ER + 0x9, + int ret =3D bcm_phy_write_exp(phydev, MII_BCM54XX_EXP_SEL_ER + 0x9, 0x11B); if (ret < 0) return ret; } =20 - return ret; + return 0; +} + +static int bcm5481_config_aneg(struct phy_device *phydev) +{ + int ret; + u8 brr_mode; + + ret =3D bcm5481x_get_brrmode(phydev, &brr_mode); + if (ret) + return ret; + + /* Aneg firstly. */ + if (brr_mode) + ret =3D bcm_config_lre_aneg(phydev, false); + else + ret =3D 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 =3D bcm5481x_get_brrmode(phydev, &brr_mode); + if (ret) + return ret; + + if (brr_mode) { + /* BCM54811 is only capable of autonegotiation in IEEE mode */ + phydev->autoneg =3D 0; + ret =3D bcm_config_lre_aneg(phydev, false); + } else { + ret =3D genphy_config_aneg(phydev); + } + + if (ret) + return ret; + + /* Then we can set up the delay and swap. */ + return bcm5481x_config_delay_swap(phydev); } =20 struct bcm54616s_phy_priv { @@ -1062,6 +1194,208 @@ static void bcm54xx_link_change_notify(struct phy_d= evice *phydev) bcm_phy_write_exp(phydev, MII_BCM54XX_EXP_EXP08, ret); } =20 +static int bcm_read_master_slave(struct phy_device *phydev) +{ + int cfg =3D MASTER_SLAVE_CFG_UNKNOWN, 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 =3D MASTER_SLAVE_CFG_UNKNOWN; + phydev->master_slave_state =3D MASTER_SLAVE_STATE_UNKNOWN; + + val =3D phy_read(phydev, MII_BCM54XX_LRECR); + if (val < 0) + return val; + + if ((val & LRECR_LDSEN) =3D=3D 0) { + if (val & LRECR_MASTER) + cfg =3D MASTER_SLAVE_CFG_MASTER_FORCE; + else + cfg =3D MASTER_SLAVE_CFG_SLAVE_FORCE; + } + + val =3D phy_read(phydev, MII_BCM54XX_LRELDSE); + if (val < 0) + return val; + + if (val & LDSE_MASTER) + state =3D MASTER_SLAVE_STATE_MASTER; + else + state =3D MASTER_SLAVE_STATE_SLAVE; + + phydev->master_slave_get =3D cfg; + phydev->master_slave_state =3D 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 !=3D AUTONEG_ENABLE) { + if (!phydev->autoneg_complete) { + /* aneg not yet done, reset all relevant bits */ + static const int br_bits[] =3D { ETHTOOL_LINK_MODE_Autoneg_BIT, + ETHTOOL_LINK_MODE_Pause_BIT, + ETHTOOL_LINK_MODE_Asym_Pause_BIT, + ETHTOOL_LINK_MODE_10baseT1BRR_Full_BIT, + ETHTOOL_LINK_MODE_100baseT1_Full_BIT }; + for (i =3D 0; i < ARRAY_SIZE(br_bits); i++) + linkmode_clear_bit(br_bits[i], phydev->lp_advertising); + + return 0; + } + + /* Long-Distance Signaling Link Partner Ability */ + lrelpa =3D 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_10baseT1BRR_Full_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 =3D phy_read(phydev, MII_BCM54XX_LRECR); + + if (lrecr < 0) + return lrecr; + + phydev->duplex =3D DUPLEX_FULL; + + if (lrecr & LRECR_SPEED100) + phydev->speed =3D SPEED_100; + else + phydev->speed =3D SPEED_10; + + return 0; +} + +/** + * lre_update_link - update link status in @phydev + * @phydev: target phy_device struct + * + * Description: Update the value in phydev->link to reflect the + * current link value. In order to do this, we need to read + * the status register twice, keeping the second value. + * This is a genphy_update_link modified to work on LRE registers + * of BroadR-Reach PHY + */ +static int lre_update_link(struct phy_device *phydev) +{ + int status =3D 0, lrecr; + + lrecr =3D phy_read(phydev, MII_BCM54XX_LRECR); + if (lrecr < 0) + return lrecr; + + /* Autoneg is being started, therefore disregard BMSR value and + * report link as down. + */ + if (lrecr & BMCR_ANRESTART) + goto done; + + /* The link state is latched low so that momentary link + * drops can be detected. Do not double-read the status + * in polling mode to detect such short link drops except + * the link was already down. + */ + if (!phy_polling_mode(phydev) || !phydev->link) { + status =3D phy_read(phydev, MII_BCM54XX_LRESR); + if (status < 0) + return status; + else if (status & LRESR_LSTATUS) + goto done; + } + + /* Read link and autonegotiation status */ + status =3D phy_read(phydev, MII_BCM54XX_LRESR); + if (status < 0) + return status; +done: + phydev->link =3D status & LRESR_LSTATUS ? 1 : 0; + phydev->autoneg_complete =3D status & LRESR_LDSCOMPLETE ? 1 : 0; + + /* Consider the case that autoneg was started and "aneg complete" + * bit has been reset, but "link up" bit not yet. + */ + if (phydev->autoneg =3D=3D AUTONEG_ENABLE && !phydev->autoneg_complete) + phydev->link =3D 0; + + return 0; +} + +static int bcm54811_read_status(struct phy_device *phydev) +{ + int err; + u8 brr_mode; + + err =3D bcm5481x_get_brrmode(phydev, &brr_mode); + + if (err) + return err; + + if (brr_mode) { + /* Get the status in BroadRReach mode just like genphy_read_status + * does in normal mode + */ + + int err, old_link =3D phydev->link; + + /* Update the link, but return if there was an error */ + + err =3D lre_update_link(phydev); + if (err) + return err; + + /* why bother the PHY if nothing can have changed */ + if (phydev->autoneg =3D=3D AUTONEG_ENABLE && old_link && phydev->link) + return 0; + + phydev->speed =3D SPEED_UNKNOWN; + phydev->duplex =3D DUPLEX_UNKNOWN; + phydev->pause =3D 0; + phydev->asym_pause =3D 0; + + err =3D bcm_read_master_slave(phydev); + if (err < 0) + return err; + + /* Read LDS Link Partner Ability */ + err =3D bcm_read_lpa(phydev); + if (err < 0) + return err; + + if (phydev->autoneg =3D=3D AUTONEG_ENABLE && phydev->autoneg_complete) { + phy_resolve_aneg_linkmode(phydev); + } else if (phydev->autoneg =3D=3D AUTONEG_DISABLE) { + err =3D bcm_read_status_fixed(phydev); + if (err < 0) + return err; + } + } else { + err =3D genphy_read_status(phydev); + } + + return err; +} + static struct phy_driver broadcom_drivers[] =3D { { .phy_id =3D PHY_ID_BCM5411, @@ -1212,9 +1546,11 @@ static struct phy_driver broadcom_drivers[] =3D { .get_stats =3D bcm54xx_get_stats, .probe =3D bcm54xx_phy_probe, .config_init =3D bcm54811_config_init, - .config_aneg =3D bcm5481_config_aneg, + .config_aneg =3D bcm54811_config_aneg, .config_intr =3D bcm_phy_config_intr, .handle_interrupt =3D bcm_phy_handle_interrupt, + .read_status =3D bcm54811_read_status, + .get_features =3D bcm54811_read_abilities, .suspend =3D bcm54xx_suspend, .resume =3D bcm54xx_resume, .link_change_notify =3D bcm54xx_link_change_notify, --=20 2.39.2