From patchwork Mon Oct 7 17:10:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Harvey X-Patchwork-Id: 13825063 X-Patchwork-Delegate: kuba@kernel.org Received: from finn.localdomain (finn.gateworks.com [108.161.129.64]) (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 73AE31DCB0C; Mon, 7 Oct 2024 17:10:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=108.161.129.64 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728321048; cv=none; b=RXXKVuZBbd3MMaoM3WQQmsV1hUQZHMzSfcLeTJmBdC009dm546VBC+SBCWANEkYYGtdoqh2EtP4nR9DJOrxboSPaWWhttMJnxUMuf3qpbnHB03BXdTO3XdWlH84BBnghvMB8VMYp3+EtmiBimNP2EVRZ7GZQSrYdVuu+6OqpiQs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728321048; c=relaxed/simple; bh=+Lf6Lx4ZUuyRtEXHzSyOLeGyiwoNL+r+8vUo7hDjvVc=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=m/CyCA9tB1Dq9F2GhczbdkoSpxiFmyGXDCHohKfHG5mHkKAUQG5cclqXlXtdAw/xZYgiHdkPi/38Y7Ofd3BqHpyiNE/Bu0O+5FHITnJFYt7BY6LET2qLdNXOsYpvL/TQwP1NIzEah+agMxNaD50KWbddcMjfOWEchi8oQ774ymA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gateworks.com; spf=pass smtp.mailfrom=gateworks.com; arc=none smtp.client-ip=108.161.129.64 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gateworks.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gateworks.com Received: from syn-068-189-091-139.biz.spectrum.com ([68.189.91.139] helo=tharvey.pdc.gateworks.com) by finn.localdomain with esmtp (Exim 4.95) (envelope-from ) id 1sxrFi-000mSJ-JR; Mon, 07 Oct 2024 17:10:34 +0000 From: Tim Harvey To: Woojung Huh , UNGLinuxDriver@microchip.com, Andrew Lunn , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Tim Harvey Subject: [PATCH v2] net: phy: disable eee due to errata on various KSZ switches Date: Mon, 7 Oct 2024 10:10:32 -0700 Message-Id: <20241007171032.3510003-1-tharvey@gateworks.com> X-Mailer: git-send-email 2.25.1 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org The well-known errata regarding EEE not being functional on various KSZ switches has been refactored a few times. Recently the refactoring has excluded several switches that the errata should also apply to. Disable EEE for additional switches with this errata. The original workaround for the errata was applied with a register write to manually disable the EEE feature in MMD 7:60 which was being applied for KSZ9477/KSZ9897/KSZ9567 switch ID's. Then came commit ("26dd2974c5b5 net: phy: micrel: Move KSZ9477 errata fixes to PHY driver") and commit ("6068e6d7ba50 net: dsa: microchip: remove KSZ9477 PHY errata handling") which moved the errata from the switch driver to the PHY driver but only for PHY_ID_KSZ9477 (PHY ID) however that PHY code was dead code because an entry was never added for PHY_ID_KSZ9477 via MODULE_DEVICE_TABLE. This was apparently realized much later and commit ("54a4e5c16382 net: phy: micrel: add Microchip KSZ 9477 to the device table") added the PHY_ID_KSZ9477 to the PHY driver but as the errata was only being applied to PHY_ID_KSZ9477 it's not completely clear what switches that relates to. Later commit ("6149db4997f5 net: phy: micrel: fix KSZ9477 PHY issues after suspend/resume") breaks this again for all but KSZ9897 by only applying the errata for that PHY ID. The most recent time this was affected was with commit ("08c6d8bae48c net: phy: Provide Module 4 KSZ9477 errata (DS80000754C)") which removes the blatant register write to MMD 7:60 and replaces it by setting phydev->eee_broken_modes = -1 so that the generic phy-c45 code disables EEE but this is only done for the KSZ9477_CHIP_ID (Switch ID). Signed-off-by: Tim Harvey --- v2: added fixes tag and history of issue --- drivers/net/dsa/microchip/ksz_common.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c index b074b4bb0629..d2bd82a1067c 100644 --- a/drivers/net/dsa/microchip/ksz_common.c +++ b/drivers/net/dsa/microchip/ksz_common.c @@ -2578,11 +2578,19 @@ static u32 ksz_get_phy_flags(struct dsa_switch *ds, int port) if (!port) return MICREL_KSZ8_P1_ERRATA; break; + case KSZ8795_CHIP_ID: + case KSZ8794_CHIP_ID: + case KSZ8765_CHIP_ID: + /* KSZ87xx DS80000687C Module 2 */ + case KSZ9896_CHIP_ID: + /* KSZ9896 Errata DS80000757A Module 2 */ + case KSZ9897_CHIP_ID: + /* KSZ9897 Errata DS00002394C Module 4 */ + case KSZ9567_CHIP_ID: + /* KSZ9567 Errata DS80000756A Module 4 */ case KSZ9477_CHIP_ID: - /* KSZ9477 Errata DS80000754C - * - * Module 4: Energy Efficient Ethernet (EEE) feature select must - * be manually disabled + /* KSZ9477 Errata DS80000754C Module 4 */ + /* Energy Efficient Ethernet (EEE) feature select must be manually disabled * The EEE feature is enabled by default, but it is not fully * operational. It must be manually disabled through register * controls. If not disabled, the PHY ports can auto-negotiate