From nobody Tue Jun 16 15:58:19 2026 Received: from PA4PR04CU001.outbound.protection.outlook.com (mail-francecentralazon11013025.outbound.protection.outlook.com [40.107.162.25]) (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 4C143396579; Thu, 30 Apr 2026 12:50:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.162.25 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777553433; cv=fail; b=q6uUxXiCZsLx3QYB8GsuOjkcCckkM5BwxVypD18aTb6FJGV1CQDZH4pOcjM1H6ENFD5J/ItKUaTg3yjGOueAC2xqmaOczj+1Mq7LJYbYtwIpjS2h1Ni2qFdtUZWnpG6idmMB3Gn0ZVw4OFjvdY1NuKnbFOlBjAZhjFsHILjkIUo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777553433; c=relaxed/simple; bh=8spFHAyQ6ZGQpVuTJpijqF8H/EAo/ZZpgzUWzVQAZE0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Zu3HvDd0YvUjGVw0EjA9o002n868GasUdiduNIRvKC2QP1uuiJfB1n/fcJzUu/nbKQAkkd2KfVNAB7vjqJlMjZKD9mjjBqTGEqc+bb1mKbYpEDbb1YPz42e/6bql45nA+NAqDgS1A1Vx9/jPGE/TxFedjYlPCFD8f/JZ27Q/EwE= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=ericsson.com; spf=pass smtp.mailfrom=ericsson.com; dkim=pass (2048-bit key) header.d=ericsson.com header.i=@ericsson.com header.b=ATOZKQqq; arc=fail smtp.client-ip=40.107.162.25 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=ericsson.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ericsson.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ericsson.com header.i=@ericsson.com header.b="ATOZKQqq" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=AatFrEtQo6Sh6tnyQHp/7NVhvTu1PCj6xb/NwUHWYcpfVai2HXOGvKLm2khNf6mrhGbaKvM6KSspHrandWdCzsJ7tmOMBrtSxIrmuQmoXtQOpCdXMYdaV+GE8J+KwKVQp2rtUdJA3Y1LSjQf0m2fcDac5oRZeh0KItVQA5JZxIR1/UJ7XSCENXg2eMq4zY8srMl5AF0syVOJApnOuw76KpgTxiT4xJCDD7dLS2xrNl3HCa7lPy/wvz3wIHVB++RBuByJtgAmUna03VMR1VlWj4jtIv1Qs4CFJIzHiB9yj1alkN/hU09l6r3coO4liibV60yh+nZjLg66KZP+wA6Zfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=DY91eDW9K6Eu/ZUqc8d7DwBhEYSjjpUafAlSslHd+zY=; b=ObJVwxXaLkwhbBazTVEePO+UagOMIXwxfKjpWjs1vv3c05ouat1UnjsiMjMk+1+0rFM3aG2E8ujy2e2V+57EWGwyWwkMmtxuptbNhwzfDh7cg5YagfPN3QJzS9gL0iZQ0lE8+tQbDaOBHwTsOlgExxNHBgEuA3BKkerSW18O/yZO2QlEZ54+YBfTrJu7v/T6X6ca3C32S1pLrHZWZ1WSmEvnDp8z4wv2R+fi9X/7ZB0PCkHwJjV9UH0Yfu3JSpOybPjESFc3MD8WPxg6vLmw49K2cUxB9Yp1MJexoW+6ssMLTAsAsO8UmVjExyQpMYX7mPDpEIS1WGx8la9RB4cS5g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 192.176.1.74) smtp.rcpttodomain=davemloft.net smtp.mailfrom=ericsson.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=ericsson.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ericsson.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DY91eDW9K6Eu/ZUqc8d7DwBhEYSjjpUafAlSslHd+zY=; b=ATOZKQqqbDlhIEvWjPPTmAsT+C1Hi2cx6e2eTe2KdoXr/FXk9uWfd/kwtxU2YgCuGIXx8YQDtmwrvRe72p/AR6fl/cm2zK27XE/m6C19VzC8AGLh3LdN6eZ+SbjzMirW05SDW8szzJLhjGqNNVGec2kOiA82JSe3Vwa50ATVRaMv+zlHKe8qIY5tCEnUcEMZvjJ2t4WFC8rTrJvkjpfne9kDr0VCo9TVFOhSqQhurhuYbaouARvXrRoJM/NbrRGPmB2Y73twfCt53R05cSaOVYOq0d5o/tZQlkoo5nhkyt56fXQnWcM5SuqQNi7hQHc1PlwRb1tnF4+hnV883UJTNg== Received: from DUZPR01CA0180.eurprd01.prod.exchangelabs.com (2603:10a6:10:4b3::14) by FRWPR07MB10659.eurprd07.prod.outlook.com (2603:10a6:d10:16f::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9846.26; Thu, 30 Apr 2026 12:50:24 +0000 Received: from DU6PEPF0000B61C.eurprd02.prod.outlook.com (2603:10a6:10:4b3:cafe::93) by DUZPR01CA0180.outlook.office365.com (2603:10a6:10:4b3::14) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9846.30 via Frontend Transport; Thu, 30 Apr 2026 12:50:23 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 192.176.1.74) smtp.mailfrom=ericsson.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=ericsson.com; Received-SPF: Pass (protection.outlook.com: domain of ericsson.com designates 192.176.1.74 as permitted sender) receiver=protection.outlook.com; client-ip=192.176.1.74; helo=oa.msg.ericsson.com; pr=C Received: from oa.msg.ericsson.com (192.176.1.74) by DU6PEPF0000B61C.mail.protection.outlook.com (10.167.8.135) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9846.18 via Frontend Transport; Thu, 30 Apr 2026 12:50:22 +0000 Received: from seroius18814.sero.gic.ericsson.se (153.88.142.248) by smtp-central.internal.ericsson.com (100.87.178.61) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.29; Thu, 30 Apr 2026 14:50:20 +0200 Received: from seroius06448.sero.gic.ericsson.se (seroius06448.sero.gic.ericsson.se [10.117.92.228]) by seroius18814.sero.gic.ericsson.se (Postfix) with ESMTP id 9E9094020AA4; Thu, 30 Apr 2026 14:50:19 +0200 (CEST) Received: by seroius06448.sero.gic.ericsson.se (Postfix, from userid 7434092) id 8A2CC1005C88; Thu, 30 Apr 2026 14:50:19 +0200 (CEST) From: Fidan Aliyeva To: , , , , , , CC: , , "Fidan Aliyeva" Subject: [PATCH net-next v2 1/2] mv88e6xxx: Refactor 6352's serdes functions Date: Thu, 30 Apr 2026 14:49:06 +0200 Message-ID: <20260430124907.3533344-2-fidan.aliyeva.ext@ericsson.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20260430124907.3533344-1-fidan.aliyeva.ext@ericsson.com> References: <20260430124907.3533344-1-fidan.aliyeva.ext@ericsson.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU6PEPF0000B61C:EE_|FRWPR07MB10659:EE_ X-MS-Office365-Filtering-Correlation-Id: 5c859bcd-74b5-44ca-8898-08dea6b70b2c X-SMTP-Server: smtp-central.internal.ericsson.com X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|36860700016|376014|22082099003|18002099003|56012099003; X-Microsoft-Antispam-Message-Info: wOD89QhMp0oqBVscabADZNIp4olFfJ8xUdaDbdM5haHqCAeUAlMRLCSrZ9FolgjHGOW49qKgfghV6fxDVh6+3MEy+JpEZcoVNywDKHd27IrecqiKQx3MnOqBG0yCnU8l8K+EWTGabNFhllJHBn/Jp10UUupvGW89tlEAGqwy7zzasxMC73d4J7/gLigbMzlpiGAsoGd4diAcUhPHfBGhut0Hq6yBLAJekNLrx3A1Dwy+WibG9dEEWdyNBYQYcBwf5V+mYxDV/Yi5etf76J+tMsWW3rFEWbXUspX+Qru7KqFT692CyIhAvhhL5vSVAbfvOucVRJNaNxUHvAC5kywLed/Zl6F/eTBZBUTc9YHUGDJBACjZU5JLL9iqJMZjsaOS32oNsYki8JN5QCm8pCEEInEfFQ4we3k5s1DrZgDruCKh2jfdI6z1njND+oLdiTvn35byyJ+WFan0huSaBAmzn4s5VKPaXZquWTGj8SjQXGHF7gbGTBvs7e/mC9aHJDUjZ9IgEZlt9GBnLVPBNw+IaTZW0ozy5RXw0WDVN4i/7ujOijeDMz9oj11M1bdAq823JJR2RI/XV3SUp+GAErBI/MZGg29zvTT+mzaAIenA57NVKEwGYYjltMaLF841vvdltvqxfRDBgJ56EJ4bXgOATWZKVsW7FSmc7shwrOE/zq33rKXsGWxD6KH6OP0r2icNDiMCZ4O1I1eHT4D06wC/hiWWaeF5Re3EYM2vOV89kNsxTj5nfsCWvyJCQaHzFkGzoG7x+LJALUqVG4cyzwKuCw== X-Forefront-Antispam-Report: CIP:192.176.1.74;CTRY:SE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:oa.msg.ericsson.com;PTR:office365.se.ericsson.net;CAT:NONE;SFS:(13230040)(82310400026)(1800799024)(36860700016)(376014)(22082099003)(18002099003)(56012099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XUl+Awcry4gsUojrsEzYY/ktR6OglBwMr36M78kNWDspPhieq5EmEvkvh5zyL3/XOVObKbnolD4npkpVuktfml5+OEgchlhPYETcIlFnjo0M2jn9RtO/P0urWQxG74IkNmj+xpRCGolltznj5BsKJa3Yy0ra3kz6bOHB9rnKU+Jwe+6qrrtex+oVOSi3VuInMEBbbEfxhYVBc+Vu3dZKqKioAPqLtmv4DAurHrC8xvasntv4fyPJweJsmhyCT/gfn/HIjEfXbyBFoiRMQXOapPBzQWMShEe8qvquj3ctbnGw9BGWRkNTw8VSz2/iXiwUhCY64kTqj4zeK56sVVLihO3OiqL7jv3FitfyERtaeZgqXfZKXiBho8OjwHA4B9918hUwYIKlbNdP9LkBLLMSftPvw+bLwn1AbStygjRYNZDeu2qiRZir4gJbWZIvBoQy X-OriginatorOrg: ericsson.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Apr 2026 12:50:22.9085 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5c859bcd-74b5-44ca-8898-08dea6b70b2c X-MS-Exchange-CrossTenant-Id: 92e84ceb-fbfd-47ab-be52-080c6b87953f X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=92e84ceb-fbfd-47ab-be52-080c6b87953f;Ip=[192.176.1.74];Helo=[oa.msg.ericsson.com] X-MS-Exchange-CrossTenant-AuthSource: DU6PEPF0000B61C.eurprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: FRWPR07MB10659 Content-Type: text/plain; charset="utf-8" This is a preparation patch for adding SERDES support for mv88e6321 version of the ethernet switch. The patch aims to make mv88e6352_pcs_init, as well as some of serdes functions, more generic so they can be reused for mv88e6321. Changes: 1. Add mv88e6352_serdes_get_lane function which checks if the port supports SERDES by reading G2 global scratch register. Then returns the address of the SERDES lane. 2. Add this function as .serdes_get_lane member to all the chip versions which use mv88e6352_pcs_init. 3. Replace serdes check by global register in mv88e6352_pcs_init function by mv88e6xxx_serdes_get_lane function making it more generic. 4. Replace serdes check in mv88e6352_serdes_get_regs_len by mv88e6xxx_serdes_get_lane. This function is the only other function which checks the scratch register with lock; thus, can call mv88e6xxx_serdes_get_lane instead. 5. Add mv88e6352_serdes_get_regs_from_lane helper function and refactor mv88e6352_serdes_get_regs to call this function with MV88E6352_ADDR_SERDES. The helper function will later be reused for 6321. mv88e6352_serdes_get_regs itself is not reused because mv886exxx_serdes_get_lane cannot be called inside 6352's serdes_get_regs. The reason is 6352's serdes_get_lane requires register lock which has already been locked by the serdes_get_regs's caller function. 6. Add lane argument to mv88e6352_serdes_read so it can be reused later for 6321. Co-developed-by: Thomas Eckerman Signed-off-by: Thomas Eckerman Signed-off-by: Fidan Aliyeva --- drivers/net/dsa/mv88e6xxx/chip.c | 4 ++ drivers/net/dsa/mv88e6xxx/pcs-6352.c | 12 +++--- drivers/net/dsa/mv88e6xxx/serdes.c | 58 +++++++++++++++++++--------- drivers/net/dsa/mv88e6xxx/serdes.h | 1 + 4 files changed, 49 insertions(+), 26 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/c= hip.c index 8ca5fd40df92..15a8028a02a8 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -4662,6 +4662,7 @@ static const struct mv88e6xxx_ops mv88e6172_ops =3D { .vtu_loadpurge =3D mv88e6352_g1_vtu_loadpurge, .stu_getnext =3D mv88e6352_g1_stu_getnext, .stu_loadpurge =3D mv88e6352_g1_stu_loadpurge, + .serdes_get_lane =3D mv88e6352_serdes_get_lane, .serdes_get_regs_len =3D mv88e6352_serdes_get_regs_len, .serdes_get_regs =3D mv88e6352_serdes_get_regs, .gpio_ops =3D &mv88e6352_gpio_ops, @@ -4765,6 +4766,7 @@ static const struct mv88e6xxx_ops mv88e6176_ops =3D { .vtu_loadpurge =3D mv88e6352_g1_vtu_loadpurge, .stu_getnext =3D mv88e6352_g1_stu_getnext, .stu_loadpurge =3D mv88e6352_g1_stu_loadpurge, + .serdes_get_lane =3D mv88e6352_serdes_get_lane, .serdes_irq_mapping =3D mv88e6352_serdes_irq_mapping, .serdes_get_regs_len =3D mv88e6352_serdes_get_regs_len, .serdes_get_regs =3D mv88e6352_serdes_get_regs, @@ -5040,6 +5042,7 @@ static const struct mv88e6xxx_ops mv88e6240_ops =3D { .vtu_loadpurge =3D mv88e6352_g1_vtu_loadpurge, .stu_getnext =3D mv88e6352_g1_stu_getnext, .stu_loadpurge =3D mv88e6352_g1_stu_loadpurge, + .serdes_get_lane =3D mv88e6352_serdes_get_lane, .serdes_irq_mapping =3D mv88e6352_serdes_irq_mapping, .serdes_get_regs_len =3D mv88e6352_serdes_get_regs_len, .serdes_get_regs =3D mv88e6352_serdes_get_regs, @@ -5475,6 +5478,7 @@ static const struct mv88e6xxx_ops mv88e6352_ops =3D { .gpio_ops =3D &mv88e6352_gpio_ops, .avb_ops =3D &mv88e6352_avb_ops, .ptp_ops =3D &mv88e6352_ptp_ops, + .serdes_get_lane =3D mv88e6352_serdes_get_lane, .serdes_get_sset_count =3D mv88e6352_serdes_get_sset_count, .serdes_get_strings =3D mv88e6352_serdes_get_strings, .serdes_get_stats =3D mv88e6352_serdes_get_stats, diff --git a/drivers/net/dsa/mv88e6xxx/pcs-6352.c b/drivers/net/dsa/mv88e6x= xx/pcs-6352.c index 9ebf0f89f817..4228ae5bb9db 100644 --- a/drivers/net/dsa/mv88e6xxx/pcs-6352.c +++ b/drivers/net/dsa/mv88e6xxx/pcs-6352.c @@ -324,19 +324,17 @@ static int mv88e6352_pcs_init(struct mv88e6xxx_chip *= chip, int port) struct mii_bus *bus; struct device *dev; unsigned int irq; - int err; + int lane, err; - mv88e6xxx_reg_lock(chip); - err =3D mv88e6352_g2_scratch_port_has_serdes(chip, port); - mv88e6xxx_reg_unlock(chip); - if (err <=3D 0) - return err; + lane =3D mv88e6xxx_serdes_get_lane(chip, port); + if (lane < 0) + return 0; irq =3D mv88e6xxx_serdes_irq_mapping(chip, port); bus =3D mv88e6xxx_default_mdio_bus(chip); dev =3D chip->dev; - mpcs =3D marvell_c22_pcs_alloc(dev, bus, MV88E6352_ADDR_SERDES); + mpcs =3D marvell_c22_pcs_alloc(dev, bus, lane); if (!mpcs) return -ENOMEM; diff --git a/drivers/net/dsa/mv88e6xxx/serdes.c b/drivers/net/dsa/mv88e6xxx= /serdes.c index a936ee80ce00..273c3b169f65 100644 --- a/drivers/net/dsa/mv88e6xxx/serdes.c +++ b/drivers/net/dsa/mv88e6xxx/serdes.c @@ -17,10 +17,10 @@ #include "port.h" #include "serdes.h" -static int mv88e6352_serdes_read(struct mv88e6xxx_chip *chip, int reg, - u16 *val) +static int mv88e6352_serdes_read(struct mv88e6xxx_chip *chip, int lane, + int reg, u16 *val) { - return mv88e6xxx_phy_page_read(chip, MV88E6352_ADDR_SERDES, + return mv88e6xxx_phy_page_read(chip, lane, MV88E6352_SERDES_PAGE_FIBER, reg, val); } @@ -102,6 +102,21 @@ int mv88e6xxx_pcs_decode_state(struct device *dev, u16= bmsr, u16 lpa, return 0; } +int mv88e6352_serdes_get_lane(struct mv88e6xxx_chip *chip, int port) +{ + int err; + + mv88e6xxx_reg_lock(chip); + err =3D mv88e6352_g2_scratch_port_has_serdes(chip, port); + mv88e6xxx_reg_unlock(chip); + if (err < 0) + return err; + else if (err =3D=3D 0) + return -ENODEV; + + return MV88E6352_ADDR_SERDES; +} + struct mv88e6352_serdes_hw_stat { char string[ETH_GSTRING_LEN]; int sizeof_stat; @@ -141,14 +156,14 @@ int mv88e6352_serdes_get_strings(struct mv88e6xxx_chi= p *chip, int port, return ARRAY_SIZE(mv88e6352_serdes_hw_stats); } -static uint64_t mv88e6352_serdes_get_stat(struct mv88e6xxx_chip *chip, +static uint64_t mv88e6352_serdes_get_stat(struct mv88e6xxx_chip *chip, int= lane, struct mv88e6352_serdes_hw_stat *stat) { u64 val =3D 0; u16 reg; int err; - err =3D mv88e6352_serdes_read(chip, stat->reg, ®); + err =3D mv88e6352_serdes_read(chip, lane, stat->reg, ®); if (err) { dev_err(chip->dev, "failed to read statistic\n"); return 0; @@ -157,7 +172,7 @@ static uint64_t mv88e6352_serdes_get_stat(struct mv88e6= xxx_chip *chip, val =3D reg; if (stat->sizeof_stat =3D=3D 32) { - err =3D mv88e6352_serdes_read(chip, stat->reg + 1, ®); + err =3D mv88e6352_serdes_read(chip, lane, stat->reg + 1, ®); if (err) { dev_err(chip->dev, "failed to read statistic\n"); return 0; @@ -185,7 +200,7 @@ size_t mv88e6352_serdes_get_stats(struct mv88e6xxx_chip= *chip, int port, for (i =3D 0; i < ARRAY_SIZE(mv88e6352_serdes_hw_stats); i++) { stat =3D &mv88e6352_serdes_hw_stats[i]; - value =3D mv88e6352_serdes_get_stat(chip, stat); + value =3D mv88e6352_serdes_get_stat(chip, MV88E6352_ADDR_SERDES, stat); mv88e6xxx_port->serdes_stats[i] +=3D value; data[i] =3D mv88e6xxx_port->serdes_stats[i]; } @@ -200,35 +215,40 @@ unsigned int mv88e6352_serdes_irq_mapping(struct mv88= e6xxx_chip *chip, int port) int mv88e6352_serdes_get_regs_len(struct mv88e6xxx_chip *chip, int port) { - int err; + int lane =3D -ENODEV; - mv88e6xxx_reg_lock(chip); - err =3D mv88e6352_g2_scratch_port_has_serdes(chip, port); - mv88e6xxx_reg_unlock(chip); - if (err <=3D 0) - return err; + lane =3D mv88e6xxx_serdes_get_lane(chip, port); + if (lane < 0) + return 0; return 32 * sizeof(u16); } -void mv88e6352_serdes_get_regs(struct mv88e6xxx_chip *chip, int port, void= *_p) +static void mv88e6352_serdes_get_regs_from_lane(struct mv88e6xxx_chip *chi= p, int lane, void *_p) { u16 *p =3D _p; u16 reg; int err; int i; - err =3D mv88e6352_g2_scratch_port_has_serdes(chip, port); - if (err <=3D 0) - return; - for (i =3D 0 ; i < 32; i++) { - err =3D mv88e6352_serdes_read(chip, i, ®); + err =3D mv88e6352_serdes_read(chip, lane, i, ®); if (!err) p[i] =3D reg; } } +void mv88e6352_serdes_get_regs(struct mv88e6xxx_chip *chip, int port, void= *_p) +{ + int err; + + err =3D mv88e6352_g2_scratch_port_has_serdes(chip, port); + if (err <=3D 0) + return; + + mv88e6352_serdes_get_regs_from_lane(chip, MV88E6352_ADDR_SERDES, _p); +} + int mv88e6341_serdes_get_lane(struct mv88e6xxx_chip *chip, int port) { u8 cmode =3D chip->ports[port].cmode; diff --git a/drivers/net/dsa/mv88e6xxx/serdes.h b/drivers/net/dsa/mv88e6xxx= /serdes.h index 17a3e85fabaa..21e050b328cc 100644 --- a/drivers/net/dsa/mv88e6xxx/serdes.h +++ b/drivers/net/dsa/mv88e6xxx/serdes.h @@ -115,6 +115,7 @@ int mv88e6xxx_pcs_decode_state(struct device *dev, u16 = bmsr, u16 lpa, u16 status, struct phylink_link_state *state); int mv88e6341_serdes_get_lane(struct mv88e6xxx_chip *chip, int port); +int mv88e6352_serdes_get_lane(struct mv88e6xxx_chip *chip, int port); int mv88e6390_serdes_get_lane(struct mv88e6xxx_chip *chip, int port); int mv88e6390x_serdes_get_lane(struct mv88e6xxx_chip *chip, int port); int mv88e6393x_serdes_get_lane(struct mv88e6xxx_chip *chip, int port); -- 2.36.0 From nobody Tue Jun 16 15:58:19 2026 Received: from OSPPR02CU001.outbound.protection.outlook.com (mail-norwayeastazon11013035.outbound.protection.outlook.com [40.107.159.35]) (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 BB33D2D7DF8; Thu, 30 Apr 2026 12:50:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.159.35 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777553442; cv=fail; b=ktBWg2/rGbSk6LILlpoXDgcbaeJGTPdWyFZLePzp7U6IVKx1ogIY/WVZzjJlc9+H9pf8IkDB7PCgE0B3BQWVznII3fqEBKRBKjfjdyUKESZhlI6WwxrdjVVJzdEalQkKSgHXL08VrYLddXVehr+Rk3cc2wn8QNhAVC1Z516eC1w= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777553442; c=relaxed/simple; bh=Ls7diikslxeqm2Pv21jLLQEdsFin4RXOs0OfkK7aQDs=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=J5TRFVRVFpxseNyLVr4nptKKLhSyQu3KftArt+E+nM5yqbraJGcOqDmW4c7Cho7G67HncaaEgmKER/l1Ptf+zv7UD+k+MwcD0khT5M4ieYob/7UT4tH69PnISlfaLgoOc1LJydta3+UfRqyQY67YgFri8cXliemNci5vEon64wo= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=ericsson.com; spf=pass smtp.mailfrom=ericsson.com; dkim=pass (2048-bit key) header.d=ericsson.com header.i=@ericsson.com header.b=gXu4cSbX; arc=fail smtp.client-ip=40.107.159.35 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=ericsson.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ericsson.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ericsson.com header.i=@ericsson.com header.b="gXu4cSbX" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ITPj7CruWwMgbwh81nbma9oQ3bzUUQElC0925ZbJfHVPfeMdaeF/5Yp3G2kMpg6muznHrtGEaQPtMg970Vql3f1luu4Pz9puY0bXV4tvKzz1waXwU5tuNxGMlpT6FugcNKy/plaAQtem3q3MF+gucG+H4e6VzaEthYIH5S80Oq5/KnUMdtcsgV4pPqVeVHWtCGsdWqfwYnf1hyIMP/59h7QSeB4qz03rmgO5vPZkSnpQ+wJXZDlje49SbMFtmxwZao7yyv+AQZS6hXxCimwSCIMece97fEctGaCfos/oMJFQdgkHwZ1IntdtewZC/panJImC+2YxP2e2mauPbyF5+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=q31y+Y1zmMgn8xKAPozCEs6nDGQExBY43Zmlt2piF9E=; b=MRGSG63sBRiQkcF4iZx9r1j8QqwecybXl75zTTxFxAcMlCi5XDqm9m7aDCdggd8rQXk3P5WXlWb1yvnZccIq0vXm/4ysr3T8utnmjmqis1J9OJ3xR90WCg+Q9TXntRjIuKNdZTuBa6vMkrNfW3nuQ8sXDbN/20VKQw7drpDSnpIFvOD09QQylg225gQuaHFThQGQ3oAxvAGEQshm1SEgT7LpDwVR0OyMHWLkzTVq6g5DKxL/0tjCUgXbyCaZGiOZmoCMcw6YX56YqW/UWwGXn8AP9Fb9wGgcQ2TKMgNJcdQa5s/H0OcHGJHR4Yj6QWrFtyUKTL+rWX6DaihvDtcCUQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 192.176.1.74) smtp.rcpttodomain=davemloft.net smtp.mailfrom=ericsson.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=ericsson.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ericsson.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=q31y+Y1zmMgn8xKAPozCEs6nDGQExBY43Zmlt2piF9E=; b=gXu4cSbXn2LaoxeHh6PbywLXlZPQ9g3U6udqMb6B+9cRXGDdobl0sF/kfeIi+b3t5mHfRB/mE8ZzUeqL3BX1bOtVKZhE2YeTG8YcZLiOMGN168u9jT9vsaEf67kE1+Z9uouvkut4rGKp9bgZNr/uD3fpH+5/ljGRT309ROHsWgWKgwXubQcbAFoigeSwWa+SV8hOss6u9OV0oNDoRrqht5p/j7voB252w7HgwQG44m99zfLGMayXbImWWCigaRBgO1VU9cRlois80b7GoRKM2a1eS9Va7f1nwFyVAO5z3fjG1aNACncuFMwvC9MtWw+husl/JQXStUi1P45ZfJbPYQ== Received: from CW1P123CA0005.GBRP123.PROD.OUTLOOK.COM (2603:10a6:400:293::19) by GVXPR07MB9889.eurprd07.prod.outlook.com (2603:10a6:150:121::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9870.20; Thu, 30 Apr 2026 12:50:31 +0000 Received: from AMS0EPF00000196.eurprd05.prod.outlook.com (2603:10a6:400:293:cafe::8d) by CW1P123CA0005.outlook.office365.com (2603:10a6:400:293::19) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9870.21 via Frontend Transport; Thu, 30 Apr 2026 12:50:31 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 192.176.1.74) smtp.mailfrom=ericsson.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=ericsson.com; Received-SPF: Pass (protection.outlook.com: domain of ericsson.com designates 192.176.1.74 as permitted sender) receiver=protection.outlook.com; client-ip=192.176.1.74; helo=oa.msg.ericsson.com; pr=C Received: from oa.msg.ericsson.com (192.176.1.74) by AMS0EPF00000196.mail.protection.outlook.com (10.167.16.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9846.18 via Frontend Transport; Thu, 30 Apr 2026 12:50:30 +0000 Received: from seroius18815.sero.gic.ericsson.se (153.88.142.248) by smtp-central.internal.ericsson.com (100.87.178.62) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.29; Thu, 30 Apr 2026 14:50:21 +0200 Received: from seroius06448.sero.gic.ericsson.se (seroius06448.sero.gic.ericsson.se [10.117.92.228]) by seroius18815.sero.gic.ericsson.se (Postfix) with ESMTP id 1B6AD402084F; Thu, 30 Apr 2026 14:50:21 +0200 (CEST) Received: by seroius06448.sero.gic.ericsson.se (Postfix, from userid 7434092) id 08D881005C88; Thu, 30 Apr 2026 14:50:21 +0200 (CEST) From: Fidan Aliyeva To: , , , , , , CC: , , "Fidan Aliyeva" Subject: [PATCH net-next v2 2/2] mv88e6xxx: Add SERDES Support for mv88e6321 Date: Thu, 30 Apr 2026 14:49:07 +0200 Message-ID: <20260430124907.3533344-3-fidan.aliyeva.ext@ericsson.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20260430124907.3533344-1-fidan.aliyeva.ext@ericsson.com> References: <20260430124907.3533344-1-fidan.aliyeva.ext@ericsson.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AMS0EPF00000196:EE_|GVXPR07MB9889:EE_ X-MS-Office365-Filtering-Correlation-Id: 9dba9534-96ac-4901-c858-08dea6b70ffb X-SMTP-Server: smtp-central.internal.ericsson.com X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|36860700016|376014|1800799024|56012099003|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: sZ1GJjUp4eVP6Tj3SodJZ7pzrTBLhZHvuoKLdXMd3na2zTttMKlBlJvmNi2UV7Yg9QJUD4dWGMX8TnlYkWi75vapMYNK3h/6Wat3ldQzFlh1Z13g+MMc+7sBvZr202eP++cG9njz3bEmpnIimqPRjMrZb6wZ9cKZzd1cgXnaJBEIzSxKysdvxkuWnDU7NiJrSipHAjVpfPapN5WH8JP+BdW/CUduc6Ve92GKQ8wt6koW5aQByOSAtIuB8bFNjVEv4a5TUhyHmwA+73eYOIcrwvbywz/U3e/kVFY+CqLDBCiRt6iGlDbJS96sJ83AxtpThhmeAtm5yG0mQJ9cZ3evzVe5rMgWSDckqTpuy4zNuLHz5Yh3P/0WZ/dTJB9A58SEoyzecq5OdaaaeW+gjqbERdkjnsAunXkxFbU5PjtzQmfmcSLYolKDuUTG8s2JB0IDYQQGUOrtN1/GmdbS0gwviyMQt4o7t2hl7TdBjpqwT2KJQbSk13BxuKqPnQZmEWjbkhCGBJSblB7MOCcPwjnRfYBxB6GBZjTnyRSs5A57M3TNjnfyfPicUHliaXmlLYtCD4ld2EAQpY7SPGGBPNDPHTVMewCQqEpcdHxu+OAmPoQhNHhkCk8mbKQ7Kt4m4aXEoJVlOx5f9uPphnXEMOzwjbqsR64ahJzTCIQn/CskGRHzJsIu26xQN3pQctaAhfRt0aLp6aQIlgky54VwbNi7MLM7AyuSkl3ktcluXHJm9rz3YlNAi7NHXhEjNgy9zoEfnUfPC0VXQl2T6GU5zl9tKw== X-Forefront-Antispam-Report: CIP:192.176.1.74;CTRY:SE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:oa.msg.ericsson.com;PTR:office365.se.ericsson.net;CAT:NONE;SFS:(13230040)(82310400026)(36860700016)(376014)(1800799024)(56012099003)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: X37LdzSVdMaDjAZCNm9kh0hGqGJJpq5/Xja2awbcxLIc0vY16uhqmMZFZp3t8Bo9UT6SGZtLyhL5XKCoM0gc6K+nFrYqbMybo8e52pxb7JnY4FngN0jCTkQwT0NJIyPd13IZfoHElZLz9DL3YRoYykJwgVsN+UYCm/UrqdQ04d+4S0eye43Y6lciWphI9IF30QKaHSCWYune4ISD9F/qgxM9G7W/jlG7dj0ltbhq9/7jXnYCZkPPwXCRnHAVQhfO9/rnFSJlnhuuNwZHGevnLGDsANM7YSdDPEDitYYFZwo+w7Vre8p2GV5oTmyQNtH4LnKWdNmER5ad5JT8v3TBCjHTFJYOtoGiaEQU8nx2oTzl7eZ2Uk0QdUzlg0eyo/3CsNlvPURQcPJV05totleHOVT7SdqU0M4gUHuTFUwzvxUCQiwSyhAQk9d5D3Mcpmtt X-OriginatorOrg: ericsson.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Apr 2026 12:50:30.9935 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9dba9534-96ac-4901-c858-08dea6b70ffb X-MS-Exchange-CrossTenant-Id: 92e84ceb-fbfd-47ab-be52-080c6b87953f X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=92e84ceb-fbfd-47ab-be52-080c6b87953f;Ip=[192.176.1.74];Helo=[oa.msg.ericsson.com] X-MS-Exchange-CrossTenant-AuthSource: AMS0EPF00000196.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR07MB9889 Content-Type: text/plain; charset="utf-8" Add serdes and pcs_ops functions for mv88e6321. In mv88e6321 2 ports support serdes functionality; port 0 and port 1. These ports are serdes-only ports. Changes: 1. Add a function support to return the lane address for the port based on cmode. Once that in place, reuse mv88e6352's serdes_get_regs_len and pcs_init functions for mv88e6321. 2. Add mv88e6321_serdes_get_regs function by reusing mv88e6352_serdes_get_regs_from_lane Tested on mv88e6321 switch port 0. Builds were done with allyesconfig and allmodconfig W=3D1. Co-developed-by: Thomas Eckerman Signed-off-by: Thomas Eckerman Signed-off-by: Fidan Aliyeva --- drivers/net/dsa/mv88e6xxx/chip.c | 4 ++++ drivers/net/dsa/mv88e6xxx/serdes.c | 29 +++++++++++++++++++++++++++++ drivers/net/dsa/mv88e6xxx/serdes.h | 4 ++++ 3 files changed, 37 insertions(+) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/c= hip.c index 15a8028a02a8..c1f7fa21d964 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -5259,10 +5259,14 @@ static const struct mv88e6xxx_ops mv88e6321_ops =3D= { .vtu_loadpurge =3D mv88e6352_g1_vtu_loadpurge, .stu_getnext =3D mv88e6352_g1_stu_getnext, .stu_loadpurge =3D mv88e6352_g1_stu_loadpurge, + .serdes_get_lane =3D mv88e6321_serdes_get_lane, + .serdes_get_regs_len =3D mv88e6352_serdes_get_regs_len, + .serdes_get_regs =3D mv88e6321_serdes_get_regs, .gpio_ops =3D &mv88e6352_gpio_ops, .avb_ops =3D &mv88e6352_avb_ops, .ptp_ops =3D &mv88e6352_ptp_ops, .phylink_get_caps =3D mv88e632x_phylink_get_caps, + .pcs_ops =3D &mv88e6352_pcs_ops, }; static const struct mv88e6xxx_ops mv88e6341_ops =3D { diff --git a/drivers/net/dsa/mv88e6xxx/serdes.c b/drivers/net/dsa/mv88e6xxx= /serdes.c index 273c3b169f65..3f8c178cf843 100644 --- a/drivers/net/dsa/mv88e6xxx/serdes.c +++ b/drivers/net/dsa/mv88e6xxx/serdes.c @@ -249,6 +249,35 @@ void mv88e6352_serdes_get_regs(struct mv88e6xxx_chip *= chip, int port, void *_p) mv88e6352_serdes_get_regs_from_lane(chip, MV88E6352_ADDR_SERDES, _p); } +int mv88e6321_serdes_get_lane(struct mv88e6xxx_chip *chip, int port) +{ + int lane =3D -ENODEV; + u8 cmode; + + if (port !=3D 0 && port !=3D 1) + return lane; + + cmode =3D chip->ports[port].cmode; + + if (cmode =3D=3D MV88E6XXX_PORT_STS_CMODE_100BASEX || + cmode =3D=3D MV88E6XXX_PORT_STS_CMODE_1000BASEX || + cmode =3D=3D MV88E6XXX_PORT_STS_CMODE_SGMII) + lane =3D port + MV88E6321_PORT0_LANE; + + return lane; +} + +void mv88e6321_serdes_get_regs(struct mv88e6xxx_chip *chip, int port, void= *_p) +{ + int lane; + + lane =3D mv88e6xxx_serdes_get_lane(chip, port); + if (lane < 0) + return; + + mv88e6352_serdes_get_regs_from_lane(chip, lane, _p); +} + int mv88e6341_serdes_get_lane(struct mv88e6xxx_chip *chip, int port) { u8 cmode =3D chip->ports[port].cmode; diff --git a/drivers/net/dsa/mv88e6xxx/serdes.h b/drivers/net/dsa/mv88e6xxx= /serdes.h index 21e050b328cc..c11ea2118efc 100644 --- a/drivers/net/dsa/mv88e6xxx/serdes.h +++ b/drivers/net/dsa/mv88e6xxx/serdes.h @@ -14,6 +14,8 @@ struct phylink_link_state; +#define MV88E6321_PORT0_LANE 0x0c + #define MV88E6352_ADDR_SERDES 0x0f #define MV88E6352_SERDES_PAGE_FIBER 0x01 #define MV88E6352_SERDES_IRQ 0x0b @@ -114,6 +116,7 @@ struct phylink_link_state; int mv88e6xxx_pcs_decode_state(struct device *dev, u16 bmsr, u16 lpa, u16 status, struct phylink_link_state *state); +int mv88e6321_serdes_get_lane(struct mv88e6xxx_chip *chip, int port); int mv88e6341_serdes_get_lane(struct mv88e6xxx_chip *chip, int port); int mv88e6352_serdes_get_lane(struct mv88e6xxx_chip *chip, int port); int mv88e6390_serdes_get_lane(struct mv88e6xxx_chip *chip, int port); @@ -134,6 +137,7 @@ int mv88e6390_serdes_get_strings(struct mv88e6xxx_chip = *chip, int port, size_t mv88e6390_serdes_get_stats(struct mv88e6xxx_chip *chip, int port, uint64_t *data); +void mv88e6321_serdes_get_regs(struct mv88e6xxx_chip *chip, int port, void= *_p); int mv88e6352_serdes_get_regs_len(struct mv88e6xxx_chip *chip, int port); void mv88e6352_serdes_get_regs(struct mv88e6xxx_chip *chip, int port, void= *_p); int mv88e6390_serdes_get_regs_len(struct mv88e6xxx_chip *chip, int port); -- 2.36.0