From patchwork Fri Oct 4 10:24:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?U2t5TGFrZSBIdWFuZyAo6buD5ZWf5r6kKQ==?= X-Patchwork-Id: 13822139 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 25178CFA763 for ; Fri, 4 Oct 2024 10:43:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:MIME-Version: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=zkuyLGxkXdmQD0jlXwZAmn+WPZJIc/U6wuHWbcRh/DQ=; b=esn/pM4/GpDxM8Iu9n9x649prB CJv3zpMzErSENDmWQ3FztR7sMGjxs5Kv/YV13mzlvziRjS8IwKZeaUfdHCGXfYFSGHi5l8hb9ftT+ VarsxL5hKfYMPNPt6WlGBsITApRcj+K2HD1/zYi4JOnhdjOd5sUcb68A+ZLasWbzcEJWDOesPtC23 s6VFfNCiLRLlcxlrg7xrHjO/ualzQmYSXD6sFMOIdkXhjNmziJq/DLxTt4YzblPMCFMR5B1czgc0X jZ0VciE5BDy4Psz/6081K1+mC3UOY/UsNfJUVknIxLC9INDYIZYsmZGOoKWy7hGcUpIDt8lpyGLFn Qg3KmSwA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1swfme-0000000BvX0-0nqt; Fri, 04 Oct 2024 10:43:40 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1swfU4-0000000Bphu-261J; Fri, 04 Oct 2024 10:24:29 +0000 X-UUID: d13fcbe8823a11efb3adad29d29602c1-20241004 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:MIME-Version:Message-ID:Date:Subject:CC:To:From; bh=zkuyLGxkXdmQD0jlXwZAmn+WPZJIc/U6wuHWbcRh/DQ=; b=NM47mvK9KDauCqHFVCgrVKibul7BgMjJEeSPm8RT4C4J5ZnBKPKQRuVoCx66xJ+t4CwmUq4P7aZtidkYI8/0XZjCswkc2cdv7QE29Jqd6Kz6W438O0a3desd0fm3N5QTGSYuzVby46HgcQJrC2D3tuBCNmXpBwYkfUDaADImAPw=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.41,REQID:42fc9084-74d8-4622-8f60-b5cf39578820,IP:0,U RL:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION: release,TS:0 X-CID-META: VersionHash:6dc6a47,CLOUDID:2ce0c040-8751-41b2-98dd-475503d45150,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:0,File:nil,RT:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1, SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0,ARC:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-UUID: d13fcbe8823a11efb3adad29d29602c1-20241004 Received: from mtkmbs09n2.mediatek.inc [(172.21.101.94)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 2130874464; Fri, 04 Oct 2024 03:24:20 -0700 Received: from mtkmbs13n1.mediatek.inc (172.21.101.193) by MTKMBS14N1.mediatek.inc (172.21.101.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Fri, 4 Oct 2024 18:24:15 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkmbs13n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Fri, 4 Oct 2024 18:24:15 +0800 From: Sky Huang To: Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Daniel Golle , Qingfang Deng , SkyLake Huang , Matthias Brugger , AngeloGioacchino Del Regno , , , , CC: Steven Liu , SkyLake.Huang Subject: [PATCH net-next 0/9] net: phy: mediatek: Introduce mtk-phy-lib which integrates common part of MediaTek's internal ethernet PHYs Date: Fri, 4 Oct 2024 18:24:04 +0800 Message-ID: <20241004102413.5838-1-SkyLake.Huang@mediatek.com> X-Mailer: git-send-email 2.18.0 MIME-Version: 1.0 X-TM-AS-Product-Ver: SMEX-14.0.0.3152-9.1.1006-23728.005 X-TM-AS-Result: No-10--7.903700-8.000000 X-TMASE-MatchedRID: 4w+UILKqTL2xxK6sBu9wblz+axQLnAVBtZN20SHV1TRElaZ44wdr5LJl fmud5cD1Q3D47UfnW20+x1RZmmGwb8qQCTSdWC4baK+MsTwM+1ksL3b83U5aWd9zZd3pUn7KB5/ kWgq1QbNqu7Sk3kWJmvZ5MzLbDyyOXs3m3CwSaHIwHabkrQq4iXnUZqRb3abmmKInQ61iaAO0kD 1ZarAcfaSmzoUqa7YjVXPG70nwpNMwfXl56Qt5SNeNTGdHWNS/QPCWRE0Lo8LUM0gUto0wuNlQt UFiiij6ixoMhF/zQlMO2vsCoaXcocnq1QctWs0z3fn7n/ZHGqaK6IJmwLQESNEsTITobgNEJDkG kQuDnwOS0mPUCig0h4M1zP9UvKxoeRdgcXs92xdIOSHptb5tx1p4YXccYb4AloPTLuqc05Vm+j6 YVbX2YJ4GSlhthF4XVdPRFceLeRMM8jMXjBF+sBRFJJyf5BJerSFs54Y4wbX6C0ePs7A07SAJgy d9wrc8XTjkUjg7BzlOHFc5+O/v4cxlJvGCjWzYwaBv8GYEEldi5hWyHC/lLQ== X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--7.903700-8.000000 X-TMASE-Version: SMEX-14.0.0.3152-9.1.1006-23728.005 X-TM-SNTS-SMTP: DA34115C1225704E0385E1559F7EFF124BA09C8EC8386D1693B31CF2DBE0A2292000:8 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241004_032428_607620_7298B578 X-CRM114-Status: GOOD ( 17.59 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org From: "SkyLake.Huang" This patchset is derived from patch[01/13]-patch[9/13] of Message ID: 20240701105417.19941-1-SkyLake.Huang@mediatek.com. This integrates MediaTek's built-in Ethernet PHY helper functions into mtk-phy-lib and add more functions into it. Considering that original patchset may be too large to be reviewed. I break down the original patchset. This is the first one. The rest patch[10/13]-patch[13/13] will be proposed later. Signed-off-by: SkyLake.Huang Tested-by: Daniel Golle Acked-by: Daniel Golle --- [Previous change log in 20240701105417.19941-1-SkyLake.Huang@mediatek.com] Changes in v2: - Apply correct PATCH tag. - Break LED/Token ring/Extend-link-pulse-time features into 3 patches. - Fix contents according to v1 comments. Changes in v3: - Rebase code and now this patch series can apply to net-next tree. [PATCH 4/5] Refactor mtk_gphy_cl22_read_status() with genphy_read_status(). [PATCH 5/5] 1. Add range check for firmware. 2. Fix c45_ids.mmds_present in probe function. 3. Still use genphy_update_link() in read_status because genphy_c45_read_link() can't correct detect link on this phy. Changes in v4: [PATCH 4/5] 1. Change extend_an_new_lp_cnt_limit()'s return type and all return values 2. Refactor comments in extend_an_new_lp_cnt_limit() [PATCH 5/5] 1. Move firmware loading function to mt798x_2p5ge_phy_load_fw() 2. Add AN disable warning in mt798x_2p5ge_phy_config_aneg() 3. Clarify the HDX comments in mt798x_2p5ge_phy_get_features() Changes in v5: - Fix syntax errors of comments in drivers/net/phy/mediatek/* [PATCH 1/5] - Change MEDIATEK_GE_SOC_PHY from bool back to tristate. [PATCH 5/5] 1. Move md32_en_cfg_base & pmb_addr to local variables to achieve symmetric code. 2. Print out firmware date code & version. 3. Don't return error if LED pinctrl switching fails. Also, add comments to this unusual operations. 4. Return -EOPNOTSUPP for AN off case in config_aneg(). Changes in v6: - Re-arrange patch and changes description in cover letter. - Contraint code inside 80 columns wide. [PATCH 4/5] 1. Add LP_DETECTED so extend_an_new_lp_cnt_limit() won't be called every time we poll the PHY for its status. It'll be called only when cable is plugged in and 1G training starts. 2. Call phy_read_paged() instead of calling phy_select_page() & phy_restore_page() pair. [PATCH 5/5] 1. Force casting (fw->data + MT7988_2P5GE_PMB_SIZE - 8) with __be16. 2. Remove parens on RHS of "phydev->c45_ids.mmds_present |=". 3. Add PHY_INTERFACE_MODE_INTERNAL check in mt798x_2p5ge_phy_get_rate_matching() 4. Arrange local variables in reverse Xmas tree order. Changes in v7: [PATCH 5/5] 1. Add phy mode check(PHY_INTERFACE_MODE_INTERNAL) in config_init(). 2. Always return RATE_MATCH_PAUSE in get_rate_matching(). Changes in v8: - Make sure that each variables in drivers/net/phy/mediatek/* follows reverse Xmas tree order. - Split v7 patches in this way: [PATCH net-next v7 1/5] net: phy: mediatek: Re-organize MediaTek ethernet phy drivers -> [PATCH net-next v8 01/13] net: phy: mediatek: Re-organize MediaTek ethernet phy drivers -> [PATCH net-next v8 02/13] net: phy: mediatek: Fix spelling errors and rearrange variables [PATCH net-next v7 2/5] net: phy: mediatek: Move LED and read/write page helper functions into mtk phy lib -> [PATCH net-next v8 03/13] net: phy: mediatek: Move LED helper functions into mtk phy lib -> [PATCH net-next v8 04/13] net: phy: mediatek: Improve readability of mtk-phy-lib.c's mtk_phy_led_hw_ctrl_set() -> [PATCH net-next v8 05/13] net: phy: mediatek: Integrate read/write page helper functions -> [PATCH net-next v8 06/13] net: phy: mediatek: Hook LED helper functions in mtk-ge.c -> [PATCH net-next v8 07/13] net: phy: mediatek: add MT7530 & MT7531's PHY ID macros -> [PATCH net-next v8 08/13] net: phy: mediatek: Change mtk-ge-soc.c line wrapping [PATCH net-next v7 3/5] net: phy: mediatek: Add token ring access helper functions in mtk-phy-lib -> [PATCH net-next v8 09/13] net: phy: mediatek: Add token ring access helper functions in mtk-phy-lib [PATCH net-next v7 4/5] net: phy: mediatek: Extend 1G TX/RX link pulse time -> [PATCH net-next v8 10/13] net: phy: mediatek: Extend 1G TX/RX link pulse time [PATCH net-next v7 5/5] net: phy: add driver for built-in 2.5G ethernet PHY on MT7988 -> [PATCH net-next v8 11/13] net: phy: add driver for built-in 2.5G ethernet PHY on MT7988 - Create another 2 patches to: - fix alignment in callback functions declarations in mtk-ge.c & mtk-ge-soc.c - Remove unnecessary outer parens of "supported_triggers" var - Replace token ring API, tr* & __tr* with mtk_tr* & __mtk_tr* and fix alignment. Changes in v9: [PATCH 03/13][PATCH 06/13][PATCH 11/13] - Add mtk_phy_led_num_dly_cfg helper function to check led number & set delay on/off time. [PATCH 07/13][PATCH 12/13] - Remove "mt753x_phy_led_hw_is_supported," callback function hook in MT7530 part of mtk-ge.c [PATCH 09/13] - Replace EEE1000_SELECT_SIGNEL_DETECTION_FROM_DFE with EEE1000_SELECT_SIGNAL_DETECTION_FROM_DFE. SIGNEL->SIGNAL. [PATCH 11/13] - Add MODULE_FIRMARE() - Replace "MT7988_2P5GE_PMB" with "MT7988_2P5GE_PMB_FW" so we can recognize it literally. - Remove unused macro names: 1. BASE100T_STATUS_EXTEND 2. BASE1000T_STATUS_EXTEND 3. EXTEND_CTRL_AND_STATUS 4. PHY_AUX_DPX_MASK Changes in v10: [PATCH 11/13] - Move release_firmware() to correct position. - Return ret directly in mt798x_2p5ge_phy_load_fw(). --- SkyLake.Huang (9): net: phy: mediatek: Re-organize MediaTek ethernet phy drivers net: phy: mediatek: Fix spelling errors and rearrange variables net: phy: mediatek: Move LED helper functions into mtk phy lib net: phy: mediatek: Improve readability of mtk-phy-lib.c's mtk_phy_led_hw_ctrl_set() net: phy: mediatek: Integrate read/write page helper functions net: phy: mediatek: Hook LED helper functions in mtk-ge.c net: phy: mediatek: add MT7530 & MT7531's PHY ID macros net: phy: mediatek: Change mtk-ge-soc.c line wrapping net: phy: mediatek: Add token ring access helper functions in mtk-phy-lib MAINTAINERS | 6 +- drivers/net/phy/Kconfig | 17 +- drivers/net/phy/Makefile | 3 +- drivers/net/phy/mediatek-ge.c | 111 --- drivers/net/phy/mediatek/Kconfig | 27 + drivers/net/phy/mediatek/Makefile | 4 + .../mtk-ge-soc.c} | 663 ++++++++---------- drivers/net/phy/mediatek/mtk-ge.c | 246 +++++++ drivers/net/phy/mediatek/mtk-phy-lib.c | 358 ++++++++++ drivers/net/phy/mediatek/mtk.h | 98 +++ 10 files changed, 1015 insertions(+), 518 deletions(-) delete mode 100644 drivers/net/phy/mediatek-ge.c create mode 100644 drivers/net/phy/mediatek/Kconfig create mode 100644 drivers/net/phy/mediatek/Makefile rename drivers/net/phy/{mediatek-ge-soc.c => mediatek/mtk-ge-soc.c} (74%) create mode 100644 drivers/net/phy/mediatek/mtk-ge.c create mode 100644 drivers/net/phy/mediatek/mtk-phy-lib.c create mode 100644 drivers/net/phy/mediatek/mtk.h