From nobody Tue Feb 10 23:58:55 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