From nobody Wed Oct 1 23:46:50 2025 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.153.233]) (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 6F6DB283C87; Mon, 29 Sep 2025 09:14:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=68.232.153.233 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759137251; cv=none; b=k6cPwNZro7CAsJDwOpFL9gfuEMOnkfbYVeQvYmsR/zt1MrEOZ25ZLWAcfU+AJKKxIoRbfqJthjAdrT2vLA8wta80AsCOE0V+t3BwdxmDTrmJTZWCMAJ6WzZERjCzlsHSXlnFgCcl8QWp/rDdAz3YqsHTGITV5VI1gpVuHXCYnkc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759137251; c=relaxed/simple; bh=3A0XwV/s9Cz0cJD1NLMBEssaMoEiPQPonBn6LqMuYqw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=oitPIY+r/8kT+kjWksj/d8DMkvXy9tc6zBMhjLSj8QhUp7q5L0pkfQ/FkJg3OciHOu9Jz1bbWs0s/HegO9zynRWyYDLh+sUeqg6E+fiSgIrnwR+8gojLCdlPzvVEWkdN1fMFJyHYcyonTnK3SRawK58lQFdlNkt6+NEQHxIPElI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=microchip.com; spf=pass smtp.mailfrom=microchip.com; dkim=pass (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b=MDvQCAnA; arc=none smtp.client-ip=68.232.153.233 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=microchip.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=microchip.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b="MDvQCAnA" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1759137249; x=1790673249; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=3A0XwV/s9Cz0cJD1NLMBEssaMoEiPQPonBn6LqMuYqw=; b=MDvQCAnAkAolbI2RSZ63yOOiGK7l8JRQ+5WReZPQ2RpzJ6QYU4cIDwVp S3I3IS3cCMEZDJ5yBfCVfF1tiBadBax6WqIuRM01VFyiuzEVzS2VMWoor ZbSMqVvwcd2gOFzXOfNLCTqf7/oxkmQq0JZiL2qsOZ7J8e8efmVuiKki6 3QRGHDuPq6n5mfZe6G9bwtiGaLcLObbYs48/raM7CM6+kchCnfPIR9kjN CS8gCFGecMENP7imi70aZ+tMDPnaRzKRUc2ya5JORaFglCnGmtNY9sibP xqkhQa5BSvPG7EoWGUqflyl+tHF3IS4IBllLAJgONdUp8lUrtf3zYFoYR A==; X-CSE-ConnectionGUID: PK2+grhpRW+bN+pyp3oWNw== X-CSE-MsgGUID: /xFCO+0LRTik8BQNARG6oQ== X-IronPort-AV: E=Sophos;i="6.18,301,1751266800"; d="scan'208";a="53066879" X-Amp-Result: SKIPPED(no attachment in message) Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa1.microchip.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 29 Sep 2025 02:14:02 -0700 Received: from chn-vm-ex03.mchp-main.com (10.10.85.151) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.58; Mon, 29 Sep 2025 02:13:52 -0700 Received: from DEN-DL-M31836.microchip.com (10.10.85.11) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server id 15.1.2507.58 via Frontend Transport; Mon, 29 Sep 2025 02:13:49 -0700 From: Horatiu Vultur To: , , , , , , , , , , , , , CC: , , Horatiu Vultur Subject: [PATCH net v3 1/2] phy: mscc: Use PHY_ID_MATCH_MODEL for VSC8584, VSC8582, VSC8575, VSC856X Date: Mon, 29 Sep 2025 11:13:01 +0200 Message-ID: <20250929091302.106116-2-horatiu.vultur@microchip.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250929091302.106116-1-horatiu.vultur@microchip.com> References: <20250929091302.106116-1-horatiu.vultur@microchip.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" As the PHYs VSC8584, VSC8582, VSC8575 and VSC856X exists only as rev B, we can use PHY_ID_MATCH_MODEL to match exactly on revision B of the PHY. Because of this change then there is not need the check if it is a different revision than rev B in the function vsc8584_probe() as we already know that this will never happen. These changes are a preparation for the next patch because in that patch we will make the PHYs VSC8574 and VSC8572 to use vsc8584_probe() and these PHYs have multiple revision. Signed-off-by: Horatiu Vultur --- drivers/net/phy/mscc/mscc.h | 8 ++++---- drivers/net/phy/mscc/mscc_main.c | 23 ++++------------------- 2 files changed, 8 insertions(+), 23 deletions(-) diff --git a/drivers/net/phy/mscc/mscc.h b/drivers/net/phy/mscc/mscc.h index 2d8eca54c40a2..2eef5956b9cc5 100644 --- a/drivers/net/phy/mscc/mscc.h +++ b/drivers/net/phy/mscc/mscc.h @@ -289,12 +289,12 @@ enum rgmii_clock_delay { #define PHY_ID_VSC8540 0x00070760 #define PHY_ID_VSC8541 0x00070770 #define PHY_ID_VSC8552 0x000704e0 -#define PHY_ID_VSC856X 0x000707e0 +#define PHY_ID_VSC856X 0x000707e1 #define PHY_ID_VSC8572 0x000704d0 #define PHY_ID_VSC8574 0x000704a0 -#define PHY_ID_VSC8575 0x000707d0 -#define PHY_ID_VSC8582 0x000707b0 -#define PHY_ID_VSC8584 0x000707c0 +#define PHY_ID_VSC8575 0x000707d1 +#define PHY_ID_VSC8582 0x000707b1 +#define PHY_ID_VSC8584 0x000707c1 #define PHY_VENDOR_MSCC 0x00070400 =20 #define MSCC_VDDMAC_1500 1500 diff --git a/drivers/net/phy/mscc/mscc_main.c b/drivers/net/phy/mscc/mscc_m= ain.c index ef0ef1570d392..d05f6ed052ad0 100644 --- a/drivers/net/phy/mscc/mscc_main.c +++ b/drivers/net/phy/mscc/mscc_main.c @@ -1724,12 +1724,6 @@ static int vsc8584_config_init(struct phy_device *ph= ydev) * in this pre-init function. */ if (phy_package_init_once(phydev)) { - /* The following switch statement assumes that the lowest - * nibble of the phy_id_mask is always 0. This works because - * the lowest nibble of the PHY_ID's below are also 0. - */ - WARN_ON(phydev->drv->phy_id_mask & 0xf); - switch (phydev->phy_id & phydev->drv->phy_id_mask) { case PHY_ID_VSC8504: case PHY_ID_VSC8552: @@ -2290,11 +2284,6 @@ static int vsc8584_probe(struct phy_device *phydev) VSC8531_DUPLEX_COLLISION}; int ret; =20 - if ((phydev->phy_id & MSCC_DEV_REV_MASK) !=3D VSC8584_REVB) { - dev_err(&phydev->mdio.dev, "Only VSC8584 revB is supported.\n"); - return -ENOTSUPP; - } - vsc8531 =3D devm_kzalloc(&phydev->mdio.dev, sizeof(*vsc8531), GFP_KERNEL); if (!vsc8531) return -ENOMEM; @@ -2587,9 +2576,8 @@ static struct phy_driver vsc85xx_driver[] =3D { .config_inband =3D vsc85xx_config_inband, }, { - .phy_id =3D PHY_ID_VSC856X, + PHY_ID_MATCH_MODEL(PHY_ID_VSC856X), .name =3D "Microsemi GE VSC856X SyncE", - .phy_id_mask =3D 0xfffffff0, /* PHY_GBIT_FEATURES */ .soft_reset =3D &genphy_soft_reset, .config_init =3D &vsc8584_config_init, @@ -2667,9 +2655,8 @@ static struct phy_driver vsc85xx_driver[] =3D { .config_inband =3D vsc85xx_config_inband, }, { - .phy_id =3D PHY_ID_VSC8575, + PHY_ID_MATCH_MODEL(PHY_ID_VSC8575), .name =3D "Microsemi GE VSC8575 SyncE", - .phy_id_mask =3D 0xfffffff0, /* PHY_GBIT_FEATURES */ .soft_reset =3D &genphy_soft_reset, .config_init =3D &vsc8584_config_init, @@ -2693,9 +2680,8 @@ static struct phy_driver vsc85xx_driver[] =3D { .config_inband =3D vsc85xx_config_inband, }, { - .phy_id =3D PHY_ID_VSC8582, + PHY_ID_MATCH_MODEL(PHY_ID_VSC8582), .name =3D "Microsemi GE VSC8582 SyncE", - .phy_id_mask =3D 0xfffffff0, /* PHY_GBIT_FEATURES */ .soft_reset =3D &genphy_soft_reset, .config_init =3D &vsc8584_config_init, @@ -2719,9 +2705,8 @@ static struct phy_driver vsc85xx_driver[] =3D { .config_inband =3D vsc85xx_config_inband, }, { - .phy_id =3D PHY_ID_VSC8584, + PHY_ID_MATCH_MODEL(PHY_ID_VSC8584), .name =3D "Microsemi GE VSC8584 SyncE", - .phy_id_mask =3D 0xfffffff0, /* PHY_GBIT_FEATURES */ .soft_reset =3D &genphy_soft_reset, .config_init =3D &vsc8584_config_init, --=20 2.34.1