From nobody Mon Feb 9 13:10:19 2026 Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B7954261B62 for ; Tue, 11 Nov 2025 09:11:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762852273; cv=none; b=YvCXXLvp/ck4vn5YMF+GvbbfF7CuS74kr4nzInTyNy3lMNEbkpNRukYHZPV6YHTf8C1pQM73+DxQASTyvpqugpyX4caNv4UvZdyD+q2OZwdDjtSt/T18OCUcN/aVkMAg+hkPupwkHSsuLETtIxsS8GD7wn6EAVSIXa2ExvbJcx0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762852273; c=relaxed/simple; bh=lqV5WRM2NSFAJWw74e2ONru1rtp/SZ+WcUnGqRa/bLc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Dh6XXrJAf0kkeJrUtwCWTiSbpn6EWk3uNoej/b0zO2WwDNHGZokIVyacQNsYJxqC0ieR1sy0r9WD64x3jAMDCT2Z0dL3wBSCE60t76Bzxo9lutszZgMEQ6pxG7VcmKmT3nFns6U7PkP5SmIwp/a4vu2bdCB5V+tMVqoZeiCERlQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=kCJj3DaH; arc=none smtp.client-ip=209.85.215.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kCJj3DaH" Received: by mail-pg1-f173.google.com with SMTP id 41be03b00d2f7-b679450ecb6so3218956a12.2 for ; Tue, 11 Nov 2025 01:11:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762852270; x=1763457070; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DdoqcLpLAaqwgFbl0QBXFrgUcQK68Y6GkxJRdLyp9fM=; b=kCJj3DaHT80ENJiaozJoMP0mxBtxgNFmxAKXxX+CDMOi2JXXcdsk0Odxi9y3bvX5uP gEuLehrSe0Kh6Z530CA6MvfzvB9UQpmZI5IRCiq4ggfhutLdTL/E+XTELXl7T/c+c/2q Sr5SNqGIIY4KrDVAb9jnHa7x6TJ1vcvrrIuoOxd6CSm2Sgu0jU4XvmS9U44oCWB7tc/Y FBEOYmkWfR6o6MhNsC1qXy5Z687mzpis35OiYn8qpEeLxcXpB8BbkGWpJ4dpgpmh83pe KsRvw5vCX98hMjLe2xthpiD8LCDTP9vP5InNvDizw1ve1YRm5d2Feigs19iLmmy0F/Gz PwBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762852270; x=1763457070; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=DdoqcLpLAaqwgFbl0QBXFrgUcQK68Y6GkxJRdLyp9fM=; b=lMo9ZU3rob6PCfBfQ0mRVC0OHyxB1hBotqBZeUMbv42WboBRIpufnFztC/gZFgCVGx a7+cg0eH9fE9lRCXTjfmu/Iobg0tU4MP6YA5cwrg3QnBTk5FoLJVMeiAwIgKwNvmu3hb lDfvVGHs35N7QwrqkVUAEakiVDf3CfRUCmm9CVUy8uaB65nX26F+0P7nVMIDCbIZAuL0 SpVpaN/8wAHd4cr1Nx4DNWRNgLTer7tuEqAESJpX9R67rASaVfDfv+ebjgJyE0czypZe jboLwc+j3SG34ccq0ThMRHMWxJ0M0yldXwxcecR5DkUyMtRTsnNlzH4zuW+UjvYtD/tK kAYA== X-Forwarded-Encrypted: i=1; AJvYcCWBZWJ8L2Pp9kbYagIGhtyNuF8Rpg7X/OjmKu7MG9tqEtRSuYLXR3C1eZ1FdWE4aeeeifVGyWj6iEnSa+M=@vger.kernel.org X-Gm-Message-State: AOJu0YwaNyvX5UrAnV7PZYPwykIEBHMlenXg+F19a9eNZsmGMnMNmB// +06DgKWfUv370uvK9YC9CLE6umjrDHzweM8caZ+hmN0fsuKGT1OgCtff X-Gm-Gg: ASbGncsVO4W824hS716J1jJg5foBO1Hz15g/UqQb6ieK5nbC/6pi1hMj9W+yxS2ro3N qvlnSzAvBDctb/I6BrL0Cxigf3yBSyqXoRMLEQT+c/SEIjcN1O/TnQgL8gu9wpGcS1SWDYKJhU2 Fw3R/fs0g/nwYBVlCoD9eBdUyGsEb3D4p0Q7KOh+rq3Vkm3uST2IAOdPhVkanES6KgSMqXneOAf EotWqhhbRjG993glzyhj65+kl+zGNQh5YRGTVtBDkIaBYQFpzqQBtDR5tt+9MtkLajYK81gsVvo uvi5SNl++sIRjXLN4szxLTSw22uS/RdBqnatKv2DRbxgzwp2zEo6uWk/zgD4ANjiOXVymloqvTY FZEIqIlz1GSfIETre24Cumks9dbxmzxVg43uzNPo8LOhadrgFyBFd6xWLTGGdZvEfXb9mQ/j+Zo h4Df8M6TF9o5HOCWVgoK9yQA== X-Google-Smtp-Source: AGHT+IEplxamzvFzNgi3OD1pMrtWSJCi9ogRE5FJIgYLTfsbriTNnGpDHIDuvjqeLpXuDDLdxABm5w== X-Received: by 2002:a17:902:f684:b0:290:dc5d:c0d0 with SMTP id d9443c01a7336-297e56d0e12mr165153635ad.49.1762852269852; Tue, 11 Nov 2025 01:11:09 -0800 (PST) Received: from iku.. ([2401:4900:1c06:79c0:4ab7:69ea:ca5e:a64f]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29650c5cf37sm172715415ad.35.2025.11.11.01.11.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Nov 2025 01:11:09 -0800 (PST) From: Prabhakar X-Google-Original-From: Prabhakar To: Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Horatiu Vultur , Geert Uytterhoeven , Vladimir Oltean , Vadim Fedorenko Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Prabhakar , Biju Das , Fabrizio Castro , Lad Prabhakar Subject: [PATCH net-next v3 1/3] net: phy: mscc: Simplify LED mode update using phy_modify() Date: Tue, 11 Nov 2025 09:10:45 +0000 Message-ID: <20251111091047.831005-2-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251111091047.831005-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20251111091047.831005-1-prabhakar.mahadev-lad.rj@bp.renesas.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 Content-Type: text/plain; charset="utf-8" From: Lad Prabhakar The vsc85xx_led_cntl_set() function currently performs a manual read-modify-write sequence protected by the PHY lock to update the LED mode register (MSCC_PHY_LED_MODE_SEL). Replace this sequence with a call to phy_modify(), which already handles read-modify-write operations with proper locking inside the PHY core. Signed-off-by: Lad Prabhakar Reviewed-by: Andrew Lunn --- v2->v3: - Added Reviewed-by tag. v1->v2: - New patch --- drivers/net/phy/mscc/mscc_main.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/net/phy/mscc/mscc_main.c b/drivers/net/phy/mscc/mscc_m= ain.c index 8678ebf89cca..032050ec0bc9 100644 --- a/drivers/net/phy/mscc/mscc_main.c +++ b/drivers/net/phy/mscc/mscc_main.c @@ -177,17 +177,10 @@ static int vsc85xx_led_cntl_set(struct phy_device *ph= ydev, u8 led_num, u8 mode) { - int rc; - u16 reg_val; + u16 mask =3D LED_MODE_SEL_MASK(led_num); + u16 val =3D LED_MODE_SEL(led_num, mode); =20 - mutex_lock(&phydev->lock); - reg_val =3D phy_read(phydev, MSCC_PHY_LED_MODE_SEL); - reg_val &=3D ~LED_MODE_SEL_MASK(led_num); - reg_val |=3D LED_MODE_SEL(led_num, (u16)mode); - rc =3D phy_write(phydev, MSCC_PHY_LED_MODE_SEL, reg_val); - mutex_unlock(&phydev->lock); - - return rc; + return phy_modify(phydev, MSCC_PHY_LED_MODE_SEL, mask, val); } =20 static int vsc85xx_mdix_get(struct phy_device *phydev, u8 *mdix) --=20 2.43.0 From nobody Mon Feb 9 13:10:19 2026 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5734829C351 for ; Tue, 11 Nov 2025 09:11:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762852280; cv=none; b=YoBzgDU5qxjewgFCL3ghzvz6K/NhnE94tCGtqLypTOs+OypGk58xuUmPyZnuTEHoEUsTmV9Ig25l1ylIrJVsrNnp8y7GPtz+EV/WvueIKYxlH/wO/+MBbCNGMaAoxCLyDukM+mD/t14GZCDuTmnjnz9+8THKoUh5GrGLUa7ExQ0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762852280; c=relaxed/simple; bh=jcWGjzMSe/bUvpkL2HB/YbFJrUOryEcY53ec7kWHavI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IvyAQpLK4u40FjVbpvTZssR6RRNa4HQiRGouxCgr/VdhVsBJlZK6sBY8LQRnXCuksMAHQ0KQzNzeeNPFOALsS0Lts84gqLBcA5Y3GIgeyMgGy2lxTXo4nOrex9Ig52qs0jG6qO0W0XPk4Ab2gM2WBhSnCRXgSdeO15tsZmMY09k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=bOdWjj/W; arc=none smtp.client-ip=209.85.210.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bOdWjj/W" Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-7aa2170adf9so3291787b3a.0 for ; Tue, 11 Nov 2025 01:11:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762852277; x=1763457077; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cnuSLNJpozflXXStfLE1DxUP0tpYGi8nHHaLe8eo2uk=; b=bOdWjj/Was9MwOLB9+FF83rtQ2KyP45MRkPYmGxagCsm0GJGrfvYM2YfKTn/e5za2/ RxWllbU6FufGEKz3RTc/L4q4TBmJCke66NuUydXgOeCwE8W2r0epZuPUd4WssRA6uvGG TdMRfCAlDE2QJgF85qZJbPFRVL/0sy2vFuaM332YMgsjW3M/Z4NiWfmU5ESASOTwiYeT AfcpFBDNdCUDUNVA7R+SREMkeCafRWmoDpukGz7s+KgDoOTGbZQ/GRNB7aCsXjn0TPX4 uYvhdx2UiOwy1JkeLYJ5Y9uREgNCIkJeUP95g4o+JHJ7PNrdgj1pooSapB4OXxmcQUJq g5bA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762852277; x=1763457077; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=cnuSLNJpozflXXStfLE1DxUP0tpYGi8nHHaLe8eo2uk=; b=Jqs7e40naC73dwSmMh3m3MFQcO6VN0ftyzprBa91+N3rrAGCv59lr30lBllyRsQ2fp UZgJlBJ+XAxM+4XFB6Tsp5aG02qlpQc7GeOGhwE0EHsb8LwESGKo2Zm3UM9gGNd5ZRTx gINRMW0JzkYgoEMnXKX4XYunYlIBS+QlPVwW3EAc5kPceV1IIf9Sq1phneWkKp1jMK4w 08ZykklCC9MQyvQVKaDqS+v3wA3va4AAoPLZXT+W8a3fSMu58+7MdflbZOtdsJINBDaq KbacrGEp0twedIat7+FDcG6vYsXA5ftY25cNI5Les0z8n/R0/M3eT3OECoodPuORf7O/ TkIg== X-Forwarded-Encrypted: i=1; AJvYcCVIlV3kvDSG+qOPRTC+u5abZ1aZCpIVEP9zbExbscO9vqz4vgOVhea0CyQgfKeM5kRaGKalquW8BL35s0c=@vger.kernel.org X-Gm-Message-State: AOJu0YxE7fo9JGdMFrABQO+qv5gzWefRlVt1CFZNuShx7/QPPg5sXshX MwYac5KGnKTe03SQitEFjUQuIqwBS3e+V5Kap6thDIEWYbl6YaNseaRO X-Gm-Gg: ASbGnct4Do9hKOjh0aeMCH7iRgMQd2D7/8k1vWouFfWBqfMEcnTHKHWTaHTfUIeeL3y KOylisynv5mtMZN4qAHICJo374hfJy3IH3UMFSBD8Vu3ccjmgdvgjZ72Vm1EOcql2i73u63lFbb j0ca9kvoHOwTCDBIb4UxeGRhDix3Et8cqPhqiA93hrCAw+EEyRNEhVbjWna6TyPVaZOQPgv3T4l irNciePWv1qLhn5hcPKCBORPhQOpHTC3EA0RTXO8D3ZAJoaWiFHO7g5GLSl7QfPmnnoxHiRNgB9 kVXDHf3e+JymX0vhvyr1DQurLnBaKOsdMmAAYvV5CFahZYxLJpnXLfDfMfl5gWN2Eg+NQfS5GH3 Y+Oo04pzx3yxMJ4TTsqArm31+sQo1nS7Bvwk5pxBh5zfsCtRC0L02sJZlJxJhX9tLwnMRgao4mj mBnCyNYDuxr/DGDAn8Zyu+0yfpCGIkHiH3 X-Google-Smtp-Source: AGHT+IH5smDV0RfqJdcQPYkVf2qwjppINZBZuD7Pb0expMILc0K/ZLMG1v5REakorx9qj+6vc75s5w== X-Received: by 2002:a17:902:f68a:b0:298:33c9:ed9e with SMTP id d9443c01a7336-29833c9ef5dmr62150035ad.28.1762852277321; Tue, 11 Nov 2025 01:11:17 -0800 (PST) Received: from iku.. ([2401:4900:1c06:79c0:4ab7:69ea:ca5e:a64f]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29650c5cf37sm172715415ad.35.2025.11.11.01.11.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Nov 2025 01:11:16 -0800 (PST) From: Prabhakar X-Google-Original-From: Prabhakar To: Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Horatiu Vultur , Geert Uytterhoeven , Vladimir Oltean , Vadim Fedorenko Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Prabhakar , Biju Das , Fabrizio Castro , Lad Prabhakar Subject: [PATCH net-next v3 2/3] net: phy: mscc: Consolidate probe functions into a common helper Date: Tue, 11 Nov 2025 09:10:46 +0000 Message-ID: <20251111091047.831005-3-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251111091047.831005-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20251111091047.831005-1-prabhakar.mahadev-lad.rj@bp.renesas.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 Content-Type: text/plain; charset="utf-8" From: Lad Prabhakar Unify the probe implementations of the VSC85xx PHY family into a single vsc85xx_probe_common() helper. The existing probe functions for the vsc85xx, vsc8514, vsc8574, and vsc8584 variants contained almost identical initialization logic, differing only in configuration parameters such as the number of LEDs, supported LED modes, hardware statistics, and PTP support. Introduce a vsc85xx_probe_config structure to describe the per-variant parameters, and move all common setup code into the shared helper. Each variant's probe function now defines a constant configuration instance and calls vsc85xx_probe_common(). Also mark the default LED mode array parameter as const to match its usage. Signed-off-by: Lad Prabhakar Reviewed-by: Andrew Lunn --- v2->v3: - Grouped check_rate_magic check v1->v2: - New patch --- drivers/net/phy/mscc/mscc_main.c | 237 ++++++++++++++++--------------- 1 file changed, 124 insertions(+), 113 deletions(-) diff --git a/drivers/net/phy/mscc/mscc_main.c b/drivers/net/phy/mscc/mscc_m= ain.c index 032050ec0bc9..0ae0199d28bb 100644 --- a/drivers/net/phy/mscc/mscc_main.c +++ b/drivers/net/phy/mscc/mscc_main.c @@ -22,6 +22,24 @@ #include "mscc_serdes.h" #include "mscc.h" =20 +struct vsc85xx_probe_config { + const struct vsc85xx_hw_stat *hw_stats; + u8 nleds; + u16 supp_led_modes; + size_t nstats; + bool use_package; + size_t shared_size; + bool has_ptp; + bool check_rate_magic; +}; + +static const u32 vsc85xx_default_led_modes_4[] =3D { + VSC8531_LINK_1000_ACTIVITY, + VSC8531_LINK_100_ACTIVITY, + VSC8531_LINK_ACTIVITY, + VSC8531_DUPLEX_COLLISION +}; + static const struct vsc85xx_hw_stat vsc85xx_hw_stats[] =3D { { .string =3D "phy_receive_errors", @@ -436,7 +454,7 @@ static int vsc85xx_dt_led_mode_get(struct phy_device *p= hydev, #endif /* CONFIG_OF_MDIO */ =20 static int vsc85xx_dt_led_modes_get(struct phy_device *phydev, - u32 *default_mode) + const u32 *default_mode) { struct vsc8531_private *priv =3D phydev->priv; char led_dt_prop[28]; @@ -2211,132 +2229,125 @@ static int vsc85xx_config_inband(struct phy_devic= e *phydev, unsigned int modes) reg_val); } =20 +static int vsc85xx_probe_common(struct phy_device *phydev, + const struct vsc85xx_probe_config *cfg, + const u32 *default_led_mode) +{ + struct vsc8531_private *vsc8531; + int ret; + + vsc8531 =3D devm_kzalloc(&phydev->mdio.dev, sizeof(*vsc8531), GFP_KERNEL); + if (!vsc8531) + return -ENOMEM; + + phydev->priv =3D vsc8531; + + /* Check rate magic if needed (only for non-package PHYs) */ + if (cfg->check_rate_magic) { + ret =3D vsc85xx_edge_rate_magic_get(phydev); + if (ret < 0) + return ret; + + vsc8531->rate_magic =3D ret; + } + + /* Set up package if needed */ + if (cfg->use_package) { + vsc8584_get_base_addr(phydev); + devm_phy_package_join(&phydev->mdio.dev, phydev, + vsc8531->base_addr, cfg->shared_size); + } + + /* Configure LED settings */ + vsc8531->nleds =3D cfg->nleds; + vsc8531->supp_led_modes =3D cfg->supp_led_modes; + + /* Configure hardware stats */ + vsc8531->hw_stats =3D cfg->hw_stats; + vsc8531->nstats =3D cfg->nstats; + vsc8531->stats =3D devm_kcalloc(&phydev->mdio.dev, vsc8531->nstats, + sizeof(u64), GFP_KERNEL); + if (!vsc8531->stats) + return -ENOMEM; + + /* PTP setup for VSC8584 */ + if (cfg->has_ptp) { + if (phy_package_probe_once(phydev)) { + ret =3D vsc8584_ptp_probe_once(phydev); + if (ret) + return ret; + } + + ret =3D vsc8584_ptp_probe(phydev); + if (ret) + return ret; + } + + /* Parse LED modes from device tree */ + return vsc85xx_dt_led_modes_get(phydev, default_led_mode); +} + static int vsc8514_probe(struct phy_device *phydev) { - struct vsc8531_private *vsc8531; - u32 default_mode[4] =3D {VSC8531_LINK_1000_ACTIVITY, - VSC8531_LINK_100_ACTIVITY, VSC8531_LINK_ACTIVITY, - VSC8531_DUPLEX_COLLISION}; - - vsc8531 =3D devm_kzalloc(&phydev->mdio.dev, sizeof(*vsc8531), GFP_KERNEL); - if (!vsc8531) - return -ENOMEM; - - phydev->priv =3D vsc8531; - - vsc8584_get_base_addr(phydev); - devm_phy_package_join(&phydev->mdio.dev, phydev, - vsc8531->base_addr, 0); - - vsc8531->nleds =3D 4; - vsc8531->supp_led_modes =3D VSC85XX_SUPP_LED_MODES; - vsc8531->hw_stats =3D vsc85xx_hw_stats; - vsc8531->nstats =3D ARRAY_SIZE(vsc85xx_hw_stats); - vsc8531->stats =3D devm_kcalloc(&phydev->mdio.dev, vsc8531->nstats, - sizeof(u64), GFP_KERNEL); - if (!vsc8531->stats) - return -ENOMEM; - - return vsc85xx_dt_led_modes_get(phydev, default_mode); + static const struct vsc85xx_probe_config vsc8514_cfg =3D { + .nleds =3D 4, + .supp_led_modes =3D VSC85XX_SUPP_LED_MODES, + .hw_stats =3D vsc85xx_hw_stats, + .nstats =3D ARRAY_SIZE(vsc85xx_hw_stats), + .use_package =3D true, + .shared_size =3D 0, + .has_ptp =3D false, + .check_rate_magic =3D false, + }; + + return vsc85xx_probe_common(phydev, &vsc8514_cfg, vsc85xx_default_led_mod= es_4); } =20 static int vsc8574_probe(struct phy_device *phydev) { - struct vsc8531_private *vsc8531; - u32 default_mode[4] =3D {VSC8531_LINK_1000_ACTIVITY, - VSC8531_LINK_100_ACTIVITY, VSC8531_LINK_ACTIVITY, - VSC8531_DUPLEX_COLLISION}; - - vsc8531 =3D devm_kzalloc(&phydev->mdio.dev, sizeof(*vsc8531), GFP_KERNEL); - if (!vsc8531) - return -ENOMEM; - - phydev->priv =3D vsc8531; - - vsc8584_get_base_addr(phydev); - devm_phy_package_join(&phydev->mdio.dev, phydev, - vsc8531->base_addr, 0); - - vsc8531->nleds =3D 4; - vsc8531->supp_led_modes =3D VSC8584_SUPP_LED_MODES; - vsc8531->hw_stats =3D vsc8584_hw_stats; - vsc8531->nstats =3D ARRAY_SIZE(vsc8584_hw_stats); - vsc8531->stats =3D devm_kcalloc(&phydev->mdio.dev, vsc8531->nstats, - sizeof(u64), GFP_KERNEL); - if (!vsc8531->stats) - return -ENOMEM; - - return vsc85xx_dt_led_modes_get(phydev, default_mode); + static const struct vsc85xx_probe_config vsc8574_cfg =3D { + .nleds =3D 4, + .supp_led_modes =3D VSC8584_SUPP_LED_MODES, + .hw_stats =3D vsc8584_hw_stats, + .nstats =3D ARRAY_SIZE(vsc8584_hw_stats), + .use_package =3D true, + .shared_size =3D 0, + .has_ptp =3D false, + .check_rate_magic =3D false, + }; + + return vsc85xx_probe_common(phydev, &vsc8574_cfg, vsc85xx_default_led_mod= es_4); } =20 static int vsc8584_probe(struct phy_device *phydev) { - struct vsc8531_private *vsc8531; - u32 default_mode[4] =3D {VSC8531_LINK_1000_ACTIVITY, - VSC8531_LINK_100_ACTIVITY, VSC8531_LINK_ACTIVITY, - VSC8531_DUPLEX_COLLISION}; - int ret; - - vsc8531 =3D devm_kzalloc(&phydev->mdio.dev, sizeof(*vsc8531), GFP_KERNEL); - if (!vsc8531) - return -ENOMEM; - - phydev->priv =3D vsc8531; - - vsc8584_get_base_addr(phydev); - devm_phy_package_join(&phydev->mdio.dev, phydev, vsc8531->base_addr, - sizeof(struct vsc85xx_shared_private)); - - vsc8531->nleds =3D 4; - vsc8531->supp_led_modes =3D VSC8584_SUPP_LED_MODES; - vsc8531->hw_stats =3D vsc8584_hw_stats; - vsc8531->nstats =3D ARRAY_SIZE(vsc8584_hw_stats); - vsc8531->stats =3D devm_kcalloc(&phydev->mdio.dev, vsc8531->nstats, - sizeof(u64), GFP_KERNEL); - if (!vsc8531->stats) - return -ENOMEM; - - if (phy_package_probe_once(phydev)) { - ret =3D vsc8584_ptp_probe_once(phydev); - if (ret) - return ret; - } - - ret =3D vsc8584_ptp_probe(phydev); - if (ret) - return ret; - - return vsc85xx_dt_led_modes_get(phydev, default_mode); + static const struct vsc85xx_probe_config vsc8584_cfg =3D { + .nleds =3D 4, + .supp_led_modes =3D VSC8584_SUPP_LED_MODES, + .hw_stats =3D vsc8584_hw_stats, + .nstats =3D ARRAY_SIZE(vsc8584_hw_stats), + .use_package =3D true, + .shared_size =3D sizeof(struct vsc85xx_shared_private), + .has_ptp =3D true, + .check_rate_magic =3D false, + }; + + return vsc85xx_probe_common(phydev, &vsc8584_cfg, vsc85xx_default_led_mod= es_4); } =20 static int vsc85xx_probe(struct phy_device *phydev) { - struct vsc8531_private *vsc8531; - int rate_magic; - u32 default_mode[2] =3D {VSC8531_LINK_1000_ACTIVITY, - VSC8531_LINK_100_ACTIVITY}; - - rate_magic =3D vsc85xx_edge_rate_magic_get(phydev); - if (rate_magic < 0) - return rate_magic; - - vsc8531 =3D devm_kzalloc(&phydev->mdio.dev, sizeof(*vsc8531), GFP_KERNEL); - if (!vsc8531) - return -ENOMEM; - - phydev->priv =3D vsc8531; - - vsc8531->rate_magic =3D rate_magic; - vsc8531->nleds =3D 2; - vsc8531->supp_led_modes =3D VSC85XX_SUPP_LED_MODES; - vsc8531->hw_stats =3D vsc85xx_hw_stats; - vsc8531->nstats =3D ARRAY_SIZE(vsc85xx_hw_stats); - vsc8531->stats =3D devm_kcalloc(&phydev->mdio.dev, vsc8531->nstats, - sizeof(u64), GFP_KERNEL); - if (!vsc8531->stats) - return -ENOMEM; - - return vsc85xx_dt_led_modes_get(phydev, default_mode); + static const struct vsc85xx_probe_config vsc85xx_cfg =3D { + .nleds =3D 2, + .supp_led_modes =3D VSC85XX_SUPP_LED_MODES, + .hw_stats =3D vsc85xx_hw_stats, + .nstats =3D ARRAY_SIZE(vsc85xx_hw_stats), + .use_package =3D false, + .has_ptp =3D false, + .check_rate_magic =3D true, + }; + + return vsc85xx_probe_common(phydev, &vsc85xx_cfg, vsc85xx_default_led_mod= es_4); } =20 static void vsc85xx_remove(struct phy_device *phydev) --=20 2.43.0 From nobody Mon Feb 9 13:10:19 2026 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7985729C351 for ; Tue, 11 Nov 2025 09:11:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762852288; cv=none; b=TDolssVvAknWT+1We+LOMouDK+mvJRkKl7gKEsk36pYj2QZgEsg7Yd2DMEuZT3DcG41VepQCZ/Kfud0QvOCkuN13ykNh5C11dEXCDD52ukHr2EDGAOcvtOTuzOUASgh7vNzVq3hpEXz2xw/onnr2x+jEES8XOWi9blmBMJeSEZY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762852288; c=relaxed/simple; bh=hi+Mbvni3sUiq7gcbfGwvOV8gqyLUJy22niIHpNMHl4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Uj0Y9ubzggytopVpaa/VdNuP+UiJ16zyBGI2xecQrfUVsT7ExgRM+cRMGwCDdWVhBMUJb26wV8WNSHROxtSte1D/ojDgTBhpEWF6SV+jiOUP0c7klX4U43kfCgTEL2JdkQXfsdSnZIUxXI7tmzzDrnq74Jj+jbchscNqVKviPyU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=CSHYhdnl; arc=none smtp.client-ip=209.85.214.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CSHYhdnl" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-29599f08202so50649365ad.3 for ; Tue, 11 Nov 2025 01:11:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762852286; x=1763457086; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2OylpUqdmU6cqqZsOYqpKungxWRV/E7s8zZgt2DxW3g=; b=CSHYhdnlspdmz8RjLQMgCCl2Dctd7bDiXLNNqTyFy1moiltUF9XAbDRCyW5GwF5zEg pJT9bq8aLldwDzoB6jaoXvmjRA2DaGlyw2YcVLEEKTZD6/z8HW0stwtrKjrzU4XhH+ng a1aaZQRfu1SfPbX6uPTADz7GW4x8yZBYBvI5/BmKmyCMQr+8t4/0PCPfklkqcMqARfbR e1ed1BT2Gz1Jv9hsVHb29FwqxNk8gJIEV52ipg2YGX2edCAm8SxN5Vh8+sAwB3PnYLYC 0N3PbuTcw2qLxyIn65Pozwl1ASSoJbgYW8AH6jVXrE0W9UFApDdWKuiqcQ+Thy7Zflfz GQGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762852286; x=1763457086; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=2OylpUqdmU6cqqZsOYqpKungxWRV/E7s8zZgt2DxW3g=; b=O5aCWoh9sWYzlgOA6dqkvX9ChjVBeooKb+TpQL0zREJgNe5H3NFXkR9fadwdgEXJLY YSMHbzeOUJr+J4XDoKSdIzxQFvhzHaTL09TvJw1gI8+v9mCLQR6sjVdT+u4qZ7tl4Zwt LPVrTG8HXX+tNB6g9VHWIKPJzzI626ITB/gsHlgYM325LADySplCwFx87VsaukyymB0B p8zOUboOgN2ZiWhzFRhY0CkK15yVYfhEary10BtWzviJbTB4x52kJHQ5EXnFReg2S0pd p1dL9mibuj/IDf8VzUJvMUVbrfnNS4qgCHhdyl+s3TCsNftoyDRi4ksW61F8mWSzuraM td2w== X-Forwarded-Encrypted: i=1; AJvYcCXkraoVjayiRU5/WGSEUKCPG5+o5bTs7sLfsUfKUYOdDoO1f9tYVhB9MbaPxoZFMMqHPdTeShErmPuHjG0=@vger.kernel.org X-Gm-Message-State: AOJu0Yy1JnJPKOXGv7vIeFHK7F1Roy3ZrqvLrSVHwgn3t1PKj4N2Pipn WWWT8nCZz41jAlTrcidQyxGP5+UBRujrFAXQkUwjrnQE6YFdPxiEALl8 X-Gm-Gg: ASbGnctGHkXhtro044w8HJFsF/j3FYtqo7zltcfCkM4cngvmwEBB8P/hSyAPKqvOPUQ ni/zQUEt/VuQdRriYHb7p+zdVaKLEMyr+pY/9srb/KpEmayNVQt5BgtuPJcujDCMvHAv1X28beG XJl8/I9u1XQkh3WIxi8IyDKTw0As9pNnqAoR+eJZ6PZ3XqfAJFjmW84Ypq3aIYuds3UhottMAP0 NG4jyGqqH/a3i8xxYsJW1PYZcVA0YNj4K6OAg0THGHxyYhQOgQdMc57/rr6LlU+9HAlR605F+Uu m5fRRyOqvMH0NNfrcArzRQNBQ1VwkhVtHAsMsjJTcV8wjtVxLqPr005i4wOKdjgwxAL30wO9izc Q7/u3tpzbiqcziBDBgd1WbtxHQsoB3dbH+/4JlZyrjDSVCWsFZkD3ilZE1HCs1O1AsHn04dDpOd auotQRhK5upQUYu/vv0iuF6GEv9d7Upm7E X-Google-Smtp-Source: AGHT+IEjzeaVZLcsNjouAs4SMLmQxhuMksaQukjQ3wGqSwDL4XCXui95c20r7KGI0KATcccgAI41EQ== X-Received: by 2002:a17:902:e888:b0:295:62d:5004 with SMTP id d9443c01a7336-297e564f1c9mr160328325ad.26.1762852285495; Tue, 11 Nov 2025 01:11:25 -0800 (PST) Received: from iku.. ([2401:4900:1c06:79c0:4ab7:69ea:ca5e:a64f]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29650c5cf37sm172715415ad.35.2025.11.11.01.11.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Nov 2025 01:11:23 -0800 (PST) From: Prabhakar X-Google-Original-From: Prabhakar To: Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Horatiu Vultur , Geert Uytterhoeven , Vladimir Oltean , Vadim Fedorenko Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Prabhakar , Biju Das , Fabrizio Castro , Lad Prabhakar Subject: [PATCH net-next v3 3/3] net: phy: mscc: Add support for PHY LED control Date: Tue, 11 Nov 2025 09:10:47 +0000 Message-ID: <20251111091047.831005-4-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251111091047.831005-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20251111091047.831005-1-prabhakar.mahadev-lad.rj@bp.renesas.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 Content-Type: text/plain; charset="utf-8" From: Lad Prabhakar Add support for the PHY LED controller in the MSCC VSC85xx driver. The implementation provides LED brightness and hardware control through the LED subsystem and integrates with the standard 'netdev' trigger. Introduce new register definitions for the LED behavior register (MSCC_PHY_LED_BEHAVIOR =3D 30) and the LED combine disable bits, which control whether LEDs indicate link-only or combined link and activity status. Implement a helper, vsc8541_led_combine_disable_set(), to update these bits safely using phy_modify(). Add support for LED brightness control and hardware mode configuration. The new callbacks implement the standard LED class operations, allowing user control through sysfs. The brightness control maps to PHY LED force on/off modes. The hardware control get and set functions translate between the PHY-specific LED mode encodings and the LED subsystem TRIGGER_NETDEV_* rules. The combine feature is managed automatically based on the selected rules. When both RX and TX activity are disabled, the combine feature is turned off, causing LEDs to indicate link-only status. When either RX or TX activity is enabled, the combine feature remains active and LEDs indicate combined link and activity. Register the LED callbacks for all VSC85xx PHY variants so that the LED subsystem can manage their indicators consistently. Existing device tree LED configuration and default behavior are preserved. Signed-off-by: Lad Prabhakar Reviewed-by: Andrew Lunn --- v2->v3: - Added Reviewed-by tag. v1->v2: - Added LED control support to all VSC85xx PHY variants. - Renamed led callbacks to vsc85xx_* for consistency. - Defaulted the LEDs on probe to the default array before parsing DT. - Used phy_modify() in vsc85xx_led_brightness_set() - Return value of phy_read() checked in vsc85xx_led_hw_control_get() - Reverse Christmas tree in vsc85xx_led_hw_is_supported() - Updated the commit message to clarify the LED combine feature behavior. --- drivers/net/phy/mscc/mscc.h | 4 + drivers/net/phy/mscc/mscc_main.c | 246 +++++++++++++++++++++++++++++++ 2 files changed, 250 insertions(+) diff --git a/drivers/net/phy/mscc/mscc.h b/drivers/net/phy/mscc/mscc.h index 2eef5956b9cc..65c9d7bd9315 100644 --- a/drivers/net/phy/mscc/mscc.h +++ b/drivers/net/phy/mscc/mscc.h @@ -85,6 +85,10 @@ enum rgmii_clock_delay { #define LED_MODE_SEL_MASK(x) (GENMASK(3, 0) << LED_MODE_SEL_POS(x)) #define LED_MODE_SEL(x, mode) (((mode) << LED_MODE_SEL_POS(x)) & LED_MO= DE_SEL_MASK(x)) =20 +#define MSCC_PHY_LED_BEHAVIOR 30 +#define LED_COMBINE_DIS_MASK(x) BIT(x) +#define LED_COMBINE_DIS(x, dis) (((dis) ? 1 : 0) << (x)) + #define MSCC_EXT_PAGE_CSR_CNTL_17 17 #define MSCC_EXT_PAGE_CSR_CNTL_18 18 =20 diff --git a/drivers/net/phy/mscc/mscc_main.c b/drivers/net/phy/mscc/mscc_m= ain.c index 0ae0199d28bb..28d558807608 100644 --- a/drivers/net/phy/mscc/mscc_main.c +++ b/drivers/net/phy/mscc/mscc_main.c @@ -201,6 +201,15 @@ static int vsc85xx_led_cntl_set(struct phy_device *phy= dev, return phy_modify(phydev, MSCC_PHY_LED_MODE_SEL, mask, val); } =20 +static int vsc85xx_led_combine_disable_set(struct phy_device *phydev, + u8 led_num, bool combine_disable) +{ + u16 mask =3D LED_COMBINE_DIS_MASK(led_num); + u16 val =3D LED_COMBINE_DIS(led_num, combine_disable); + + return phy_modify(phydev, MSCC_PHY_LED_BEHAVIOR, mask, val); +} + static int vsc85xx_mdix_get(struct phy_device *phydev, u8 *mdix) { u16 reg_val; @@ -2234,6 +2243,7 @@ static int vsc85xx_probe_common(struct phy_device *ph= ydev, const u32 *default_led_mode) { struct vsc8531_private *vsc8531; + struct device_node *np; int ret; =20 vsc8531 =3D devm_kzalloc(&phydev->mdio.dev, sizeof(*vsc8531), GFP_KERNEL); @@ -2283,10 +2293,186 @@ static int vsc85xx_probe_common(struct phy_device = *phydev, return ret; } =20 + /* + * Check for LED configuration in device tree if available + * or fall back to default `vsc8531,led-x-mode` DT properties. + */ + np =3D of_get_child_by_name(phydev->mdio.dev.of_node, "leds"); + if (np) { + of_node_put(np); + + /* Force to defaults */ + for (unsigned int i =3D 0; i < vsc8531->nleds; i++) + vsc8531->leds_mode[i] =3D default_led_mode[i]; + + return 0; + } + /* Parse LED modes from device tree */ return vsc85xx_dt_led_modes_get(phydev, default_led_mode); } =20 +static int vsc85xx_led_brightness_set(struct phy_device *phydev, + u8 index, enum led_brightness value) +{ + struct vsc8531_private *vsc8531 =3D phydev->priv; + + if (index >=3D vsc8531->nleds) + return -EINVAL; + + return vsc85xx_led_cntl_set(phydev, index, value =3D=3D LED_OFF ? + VSC8531_FORCE_LED_OFF : VSC8531_FORCE_LED_ON); +} + +static int vsc85xx_led_hw_is_supported(struct phy_device *phydev, u8 index, + unsigned long rules) +{ + static const unsigned long supported =3D BIT(TRIGGER_NETDEV_LINK_1000) | + BIT(TRIGGER_NETDEV_LINK_100) | + BIT(TRIGGER_NETDEV_LINK_10) | + BIT(TRIGGER_NETDEV_LINK) | + BIT(TRIGGER_NETDEV_RX) | + BIT(TRIGGER_NETDEV_TX); + struct vsc8531_private *vsc8531 =3D phydev->priv; + + if (index >=3D vsc8531->nleds) + return -EINVAL; + + if (rules & ~supported) + return -EOPNOTSUPP; + + return 0; +} + +static int vsc85xx_led_hw_control_get(struct phy_device *phydev, u8 index, + unsigned long *rules) +{ + struct vsc8531_private *vsc8531 =3D phydev->priv; + u8 mode, behavior; + int rc; + + if (index >=3D vsc8531->nleds) + return -EINVAL; + + rc =3D phy_read(phydev, MSCC_PHY_LED_MODE_SEL); + if (rc < 0) + return rc; + mode =3D (rc & LED_MODE_SEL_MASK(index)) >> LED_MODE_SEL_POS(index); + + rc =3D phy_read(phydev, MSCC_PHY_LED_BEHAVIOR); + if (rc < 0) + return rc; + behavior =3D (rc & LED_COMBINE_DIS_MASK(index)) >> index; + + switch (mode) { + case VSC8531_LINK_ACTIVITY: + case VSC8531_ACTIVITY: + *rules =3D BIT(TRIGGER_NETDEV_LINK); + break; + + case VSC8531_LINK_1000_ACTIVITY: + *rules =3D BIT(TRIGGER_NETDEV_LINK_1000) | + BIT(TRIGGER_NETDEV_LINK); + break; + + case VSC8531_LINK_100_ACTIVITY: + *rules =3D BIT(TRIGGER_NETDEV_LINK_100) | + BIT(TRIGGER_NETDEV_LINK); + break; + + case VSC8531_LINK_10_ACTIVITY: + *rules =3D BIT(TRIGGER_NETDEV_LINK_10) | + BIT(TRIGGER_NETDEV_LINK); + break; + + case VSC8531_LINK_100_1000_ACTIVITY: + *rules =3D BIT(TRIGGER_NETDEV_LINK_1000) | + BIT(TRIGGER_NETDEV_LINK_100) | + BIT(TRIGGER_NETDEV_LINK); + break; + + case VSC8531_LINK_10_1000_ACTIVITY: + *rules =3D BIT(TRIGGER_NETDEV_LINK_1000) | + BIT(TRIGGER_NETDEV_LINK_10) | + BIT(TRIGGER_NETDEV_LINK); + break; + + case VSC8531_LINK_10_100_ACTIVITY: + *rules =3D BIT(TRIGGER_NETDEV_LINK_100) | + BIT(TRIGGER_NETDEV_LINK_10) | + BIT(TRIGGER_NETDEV_LINK); + break; + + default: + *rules =3D 0; + break; + } + + if (!behavior && *rules) + *rules |=3D BIT(TRIGGER_NETDEV_RX) | BIT(TRIGGER_NETDEV_TX); + + return 0; +} + +static int vsc85xx_led_hw_control_set(struct phy_device *phydev, u8 index, + unsigned long rules) +{ + struct vsc8531_private *vsc8531 =3D phydev->priv; + u8 mode =3D VSC8531_FORCE_LED_ON; + bool combine_disable =3D false; + bool has_rx, has_tx; + int ret; + + if (index >=3D vsc8531->nleds) + return -EINVAL; + + if (rules & BIT(TRIGGER_NETDEV_LINK)) + mode =3D VSC8531_LINK_ACTIVITY; + + if (rules & BIT(TRIGGER_NETDEV_LINK_10)) + mode =3D VSC8531_LINK_10_ACTIVITY; + + if (rules & BIT(TRIGGER_NETDEV_LINK_100)) + mode =3D VSC8531_LINK_100_ACTIVITY; + + if (rules & BIT(TRIGGER_NETDEV_LINK_1000)) + mode =3D VSC8531_LINK_1000_ACTIVITY; + + if (rules & BIT(TRIGGER_NETDEV_LINK_100) && + rules & BIT(TRIGGER_NETDEV_LINK_1000)) + mode =3D VSC8531_LINK_100_1000_ACTIVITY; + + if (rules & BIT(TRIGGER_NETDEV_LINK_10) && + rules & BIT(TRIGGER_NETDEV_LINK_1000)) + mode =3D VSC8531_LINK_10_1000_ACTIVITY; + + if (rules & BIT(TRIGGER_NETDEV_LINK_10) && + rules & BIT(TRIGGER_NETDEV_LINK_100)) + mode =3D VSC8531_LINK_10_100_ACTIVITY; + + /* + * The VSC85xx PHYs provides an option to control LED behavior. By + * default, the LEDx combine function is enabled, meaning the LED + * will be on when there is link/activity or duplex/collision. If + * the combine function is disabled, the LED will be on only for + * link or duplex. + * + * To control this behavior, we check the selected rules. If both + * RX and TX activity are not selected, the LED combine function + * is disabled; otherwise, it remains enabled. + */ + has_rx =3D !!(rules & BIT(TRIGGER_NETDEV_RX)); + has_tx =3D !!(rules & BIT(TRIGGER_NETDEV_TX)); + if (!has_rx && !has_tx) + combine_disable =3D true; + + ret =3D vsc85xx_led_combine_disable_set(phydev, index, combine_disable); + if (ret < 0) + return ret; + + return vsc85xx_led_cntl_set(phydev, index, mode); +} + static int vsc8514_probe(struct phy_device *phydev) { static const struct vsc85xx_probe_config vsc8514_cfg =3D { @@ -2380,6 +2566,10 @@ static struct phy_driver vsc85xx_driver[] =3D { .get_sset_count =3D &vsc85xx_get_sset_count, .get_strings =3D &vsc85xx_get_strings, .get_stats =3D &vsc85xx_get_stats, + .led_brightness_set =3D vsc85xx_led_brightness_set, + .led_hw_is_supported =3D vsc85xx_led_hw_is_supported, + .led_hw_control_get =3D vsc85xx_led_hw_control_get, + .led_hw_control_set =3D vsc85xx_led_hw_control_set, }, { .phy_id =3D PHY_ID_VSC8502, @@ -2404,6 +2594,10 @@ static struct phy_driver vsc85xx_driver[] =3D { .get_sset_count =3D &vsc85xx_get_sset_count, .get_strings =3D &vsc85xx_get_strings, .get_stats =3D &vsc85xx_get_stats, + .led_brightness_set =3D vsc85xx_led_brightness_set, + .led_hw_is_supported =3D vsc85xx_led_hw_is_supported, + .led_hw_control_get =3D vsc85xx_led_hw_control_get, + .led_hw_control_set =3D vsc85xx_led_hw_control_set, }, { .phy_id =3D PHY_ID_VSC8504, @@ -2431,6 +2625,10 @@ static struct phy_driver vsc85xx_driver[] =3D { .get_stats =3D &vsc85xx_get_stats, .inband_caps =3D vsc85xx_inband_caps, .config_inband =3D vsc85xx_config_inband, + .led_brightness_set =3D vsc85xx_led_brightness_set, + .led_hw_is_supported =3D vsc85xx_led_hw_is_supported, + .led_hw_control_get =3D vsc85xx_led_hw_control_get, + .led_hw_control_set =3D vsc85xx_led_hw_control_set, }, { .phy_id =3D PHY_ID_VSC8514, @@ -2456,6 +2654,10 @@ static struct phy_driver vsc85xx_driver[] =3D { .get_stats =3D &vsc85xx_get_stats, .inband_caps =3D vsc85xx_inband_caps, .config_inband =3D vsc85xx_config_inband, + .led_brightness_set =3D vsc85xx_led_brightness_set, + .led_hw_is_supported =3D vsc85xx_led_hw_is_supported, + .led_hw_control_get =3D vsc85xx_led_hw_control_get, + .led_hw_control_set =3D vsc85xx_led_hw_control_set, }, { .phy_id =3D PHY_ID_VSC8530, @@ -2480,6 +2682,10 @@ static struct phy_driver vsc85xx_driver[] =3D { .get_sset_count =3D &vsc85xx_get_sset_count, .get_strings =3D &vsc85xx_get_strings, .get_stats =3D &vsc85xx_get_stats, + .led_brightness_set =3D vsc85xx_led_brightness_set, + .led_hw_is_supported =3D vsc85xx_led_hw_is_supported, + .led_hw_control_get =3D vsc85xx_led_hw_control_get, + .led_hw_control_set =3D vsc85xx_led_hw_control_set, }, { .phy_id =3D PHY_ID_VSC8531, @@ -2504,6 +2710,10 @@ static struct phy_driver vsc85xx_driver[] =3D { .get_sset_count =3D &vsc85xx_get_sset_count, .get_strings =3D &vsc85xx_get_strings, .get_stats =3D &vsc85xx_get_stats, + .led_brightness_set =3D vsc85xx_led_brightness_set, + .led_hw_is_supported =3D vsc85xx_led_hw_is_supported, + .led_hw_control_get =3D vsc85xx_led_hw_control_get, + .led_hw_control_set =3D vsc85xx_led_hw_control_set, }, { .phy_id =3D PHY_ID_VSC8540, @@ -2528,6 +2738,10 @@ static struct phy_driver vsc85xx_driver[] =3D { .get_sset_count =3D &vsc85xx_get_sset_count, .get_strings =3D &vsc85xx_get_strings, .get_stats =3D &vsc85xx_get_stats, + .led_brightness_set =3D vsc85xx_led_brightness_set, + .led_hw_is_supported =3D vsc85xx_led_hw_is_supported, + .led_hw_control_get =3D vsc85xx_led_hw_control_get, + .led_hw_control_set =3D vsc85xx_led_hw_control_set, }, { .phy_id =3D PHY_ID_VSC8541, @@ -2552,6 +2766,10 @@ static struct phy_driver vsc85xx_driver[] =3D { .get_sset_count =3D &vsc85xx_get_sset_count, .get_strings =3D &vsc85xx_get_strings, .get_stats =3D &vsc85xx_get_stats, + .led_brightness_set =3D vsc85xx_led_brightness_set, + .led_hw_is_supported =3D vsc85xx_led_hw_is_supported, + .led_hw_control_get =3D vsc85xx_led_hw_control_get, + .led_hw_control_set =3D vsc85xx_led_hw_control_set, }, { .phy_id =3D PHY_ID_VSC8552, @@ -2578,6 +2796,10 @@ static struct phy_driver vsc85xx_driver[] =3D { .get_stats =3D &vsc85xx_get_stats, .inband_caps =3D vsc85xx_inband_caps, .config_inband =3D vsc85xx_config_inband, + .led_brightness_set =3D vsc85xx_led_brightness_set, + .led_hw_is_supported =3D vsc85xx_led_hw_is_supported, + .led_hw_control_get =3D vsc85xx_led_hw_control_get, + .led_hw_control_set =3D vsc85xx_led_hw_control_set, }, { PHY_ID_MATCH_EXACT(PHY_ID_VSC856X), @@ -2601,6 +2823,10 @@ static struct phy_driver vsc85xx_driver[] =3D { .get_stats =3D &vsc85xx_get_stats, .inband_caps =3D vsc85xx_inband_caps, .config_inband =3D vsc85xx_config_inband, + .led_brightness_set =3D vsc85xx_led_brightness_set, + .led_hw_is_supported =3D vsc85xx_led_hw_is_supported, + .led_hw_control_get =3D vsc85xx_led_hw_control_get, + .led_hw_control_set =3D vsc85xx_led_hw_control_set, }, { .phy_id =3D PHY_ID_VSC8572, @@ -2629,6 +2855,10 @@ static struct phy_driver vsc85xx_driver[] =3D { .get_stats =3D &vsc85xx_get_stats, .inband_caps =3D vsc85xx_inband_caps, .config_inband =3D vsc85xx_config_inband, + .led_brightness_set =3D vsc85xx_led_brightness_set, + .led_hw_is_supported =3D vsc85xx_led_hw_is_supported, + .led_hw_control_get =3D vsc85xx_led_hw_control_get, + .led_hw_control_set =3D vsc85xx_led_hw_control_set, }, { .phy_id =3D PHY_ID_VSC8574, @@ -2657,6 +2887,10 @@ static struct phy_driver vsc85xx_driver[] =3D { .get_stats =3D &vsc85xx_get_stats, .inband_caps =3D vsc85xx_inband_caps, .config_inband =3D vsc85xx_config_inband, + .led_brightness_set =3D vsc85xx_led_brightness_set, + .led_hw_is_supported =3D vsc85xx_led_hw_is_supported, + .led_hw_control_get =3D vsc85xx_led_hw_control_get, + .led_hw_control_set =3D vsc85xx_led_hw_control_set, }, { PHY_ID_MATCH_EXACT(PHY_ID_VSC8575), @@ -2682,6 +2916,10 @@ static struct phy_driver vsc85xx_driver[] =3D { .get_stats =3D &vsc85xx_get_stats, .inband_caps =3D vsc85xx_inband_caps, .config_inband =3D vsc85xx_config_inband, + .led_brightness_set =3D vsc85xx_led_brightness_set, + .led_hw_is_supported =3D vsc85xx_led_hw_is_supported, + .led_hw_control_get =3D vsc85xx_led_hw_control_get, + .led_hw_control_set =3D vsc85xx_led_hw_control_set, }, { PHY_ID_MATCH_EXACT(PHY_ID_VSC8582), @@ -2707,6 +2945,10 @@ static struct phy_driver vsc85xx_driver[] =3D { .get_stats =3D &vsc85xx_get_stats, .inband_caps =3D vsc85xx_inband_caps, .config_inband =3D vsc85xx_config_inband, + .led_brightness_set =3D vsc85xx_led_brightness_set, + .led_hw_is_supported =3D vsc85xx_led_hw_is_supported, + .led_hw_control_get =3D vsc85xx_led_hw_control_get, + .led_hw_control_set =3D vsc85xx_led_hw_control_set, }, { PHY_ID_MATCH_EXACT(PHY_ID_VSC8584), @@ -2733,6 +2975,10 @@ static struct phy_driver vsc85xx_driver[] =3D { .link_change_notify =3D &vsc85xx_link_change_notify, .inband_caps =3D vsc85xx_inband_caps, .config_inband =3D vsc85xx_config_inband, + .led_brightness_set =3D vsc85xx_led_brightness_set, + .led_hw_is_supported =3D vsc85xx_led_hw_is_supported, + .led_hw_control_get =3D vsc85xx_led_hw_control_get, + .led_hw_control_set =3D vsc85xx_led_hw_control_set, } =20 }; --=20 2.43.0