From nobody Mon Apr 6 17:26:12 2026 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (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 5A6B4345CC9 for ; Wed, 18 Mar 2026 21:55:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773870910; cv=none; b=EADN7EVnuUZWUEwE83k5KF9pt+fnVft+pccVZ6BmYq2bI4GAGeR9VU0W7iO6o5AV2D/A1dPDS11S7fEeeud5H3qWQ2nBdDI6eWf+y0e8uQlWuyuFeU8Q17gIdzFxE9gLziToJgUpGi397/jrSfsILsx73S2SBY2EW1WwrgDiv6U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773870910; c=relaxed/simple; bh=S/RhJnzS81TpYiJxm8RqeCtmAiLI4W6UmQTEyLwMEvA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DjaKsSC1FaYCXD1mCDjhcjML/pi+Yfm83ZYG0zeQacAN1AnffhcFrh+42y75dopjmElxSNuv6kGK3WSdsoM7NYE6694f4cEWT/Weiju5aSPKzgEcbxrQWmFV+g2ZPZCY81dzEky1Rvients9O/VXGlOdBbesEMABebCdrtNYsl8= 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=Ex37gTtX; arc=none smtp.client-ip=209.85.128.51 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="Ex37gTtX" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-48558d6ef83so2414245e9.3 for ; Wed, 18 Mar 2026 14:55:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773870908; x=1774475708; 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=jxnQrg34XYw02BI8HXDNaula82Z0PNll3rpcD4G9L3I=; b=Ex37gTtXlhOk7aFwkufSdEGoY8E6h9aKKsKtARjASDkWDuNWq7HjOLJfdw1am50CIz b4Qu4EnWWl1ghUZ2tCpYn+aHZWgSeFl9q0CSAitTwMXiyppM6FEzzn4SJIjTvZfw7lCA UMpjIZKHLpdKl5ZQsA+WuNDxcBIljWUPlEEuGgzOqHi3Sciageev43K8mIQilXE3svJF G1JG0IkmY3e/l/suduJG3BnnE/brLzycZMui0gK9N1D9/0AQiJVhbOQ+cZJ8GS4WRru2 WiNPKToZTGkrFaiyoCmgFW5+h9WHIuEK63/xEiXyRHOI/IphouPjeb0gQimwESVtx4hj baiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773870908; x=1774475708; 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=jxnQrg34XYw02BI8HXDNaula82Z0PNll3rpcD4G9L3I=; b=WuGjpSwsONRv7mLeUVtK0mBRGQAtsq9IDumcP8u/XtGei4Ndoq5NVpCfRmvPvsvOqa +n2xte3LRct7SkWJ/irxmHYWAtpSBS5iBScW+GujW41RMaxiy9ZTjoadKbqcTBYXGT9J oFznKq0b7y0cUOcud9x63VpfwnsvYOxJHJUBBELiSjWII43U/QiP4fplo1WHqxhinWyg 1vlJRnpLYxtdlrhRMubbZO2fsIklqdgfN1qoZG2OSWvYkCof6A+ZHcfoRkkS0NCWqg7j hW5wo1/LzQiDtZw8onrwooxQdvLDobPUepFX6v0yiZjI7l0lKeGMNUjfC95FKCpGDOS4 1F9Q== X-Forwarded-Encrypted: i=1; AJvYcCWDvawHzEO8F2L4LAZJ7FZzK6JVN+9nJCThYd39FNUUTZGC6o1SEVMs+CLC3lV/qRlyWXaCKgsdYNf6oFk=@vger.kernel.org X-Gm-Message-State: AOJu0YwX1S/wG62xuXyNqmAS0X/6EjFRnwJh15KCTZppSLOtFo8hXG0L GvLGxDWCgf3bfS5Qd+Pxth72w62diev6ySlocTzcmlhSXP79HLI9NbBBzGl818U1 X-Gm-Gg: ATEYQzyIxWxERabWi3rTpxszr+ouRGMOC08Fjg9msaJ9K6A/3jMjBFIE9o/3N4txYhu qa49WqtgNkJ6O+5HAHMPX3p87e7diqY9RB4L0eZ7pcmIFRKE7yA6un2THcjTsjR2Q5jaDhaU7o9 +KqeJT4szg5ySgPoMX4sLG2mYavWowOngOOfvxUSp5IkgvEmTvnVmbXiAQVTr2Hg+uitNSiPbpD j5V/XxR09JpjLvOfJg57JL0gBE/4EH9lS00jal0whCAXdNO9ZQDuMTkUtD36eX9K2M4ilwcR8ws cthj0KTIo2Z7aCM/GtE7iuWY/fXmnu8RweHqDI5orJ9U4Yp/BgucZ5Mw9vikOamfIkBgVFQvgxK pQtdbsAAw4k9xyrF0WQS9GP4gOFUapK3qLSl+8ii7h5ccugf4K8RwxcpENKHTt67j0401D5SWAb CP10WlqyJxhQS8qYQmlUyia/8= X-Received: by 2002:a05:600c:c8f:b0:485:2ce2:4c75 with SMTP id 5b1f17b1804b1-486f442206emr92342215e9.1.1773870907488; Wed, 18 Mar 2026 14:55:07 -0700 (PDT) Received: from nas.local ([2001:912:1ac0:1e10:c662:37ff:fe09:94df]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-486f8c292e2sm19373735e9.2.2026.03.18.14.55.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Mar 2026 14:55:07 -0700 (PDT) From: Damien Dejean To: andrew@lunn.ch, krzk+dt@kernel.org, robh@kernel.org, kuba@kernel.org, maxime.chevallier@bootlin.com, pabeni@redhat.com Cc: netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, edumazet@google.com, davem@davemloft.net, hkallweit1@gmail.com, Damien Dejean Subject: [PATCH net-next v9 2/4] net: phy: realtek: add RTL8224 pair order support Date: Wed, 18 Mar 2026 22:54:59 +0100 Message-ID: <20260318215502.106528-3-dam.dejean@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260318215502.106528-1-dam.dejean@gmail.com> References: <20260318215502.106528-1-dam.dejean@gmail.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" The RTL8224 has a register to configure a pair swap (from ABCD order to DCBA) providing PCB designers more flexbility when wiring the chip. The swap parameter has to be set correctly for each of the 4 ports before the chip can detect a link. After a reset, this register is (unfortunately) left in a random state, thus it has to be initialized. On most of the devices the bootloader does it once for all and we can rely on the value set, on some other it is not and the kernel has to do it. The MDI pair swap can be set in the device tree using the property enet-phy-pair-order. The property is set to 0 to keep the default order (ABCD), or 1 to reverse the pairs (DCBA). Signed-off-by: Damien Dejean --- drivers/net/phy/realtek/Kconfig | 1 + drivers/net/phy/realtek/realtek_main.c | 64 ++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) diff --git a/drivers/net/phy/realtek/Kconfig b/drivers/net/phy/realtek/Kcon= fig index b05c2a1e9024..a741b34d193e 100644 --- a/drivers/net/phy/realtek/Kconfig +++ b/drivers/net/phy/realtek/Kconfig @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config REALTEK_PHY tristate "Realtek PHYs" + select PHY_PACKAGE help Currently supports RTL821x/RTL822x and fast ethernet PHYs =20 diff --git a/drivers/net/phy/realtek/realtek_main.c b/drivers/net/phy/realt= ek/realtek_main.c index 530b4e26d16e..63134e300c33 100644 --- a/drivers/net/phy/realtek/realtek_main.c +++ b/drivers/net/phy/realtek/realtek_main.c @@ -171,6 +171,8 @@ =20 #define RTL8224_SRAM_RTCT_LEN(pair) (0x8028 + (pair) * 4) =20 +#define RTL8224_VND1_MDI_PAIR_SWAP 0xa90 + #define RTL8366RB_POWER_SAVE 0x15 #define RTL8366RB_POWER_SAVE_ON BIT(12) =20 @@ -1820,6 +1822,66 @@ static int rtl8224_cable_test_get_status(struct phy_= device *phydev, bool *finish return rtl8224_cable_test_report(phydev, finished); } =20 +static int rtl8224_package_modify_mmd(struct phy_device *phydev, int devad, + u32 regnum, u16 mask, u16 set) +{ + int val, ret; + + phy_lock_mdio_bus(phydev); + + val =3D __phy_package_read_mmd(phydev, 0, devad, regnum); + if (val < 0) { + ret =3D val; + goto exit; + } + + val &=3D ~mask; + val |=3D set; + + ret =3D __phy_package_write_mmd(phydev, 0, devad, regnum, val); + +exit: + phy_unlock_mdio_bus(phydev); + return ret; +} + +static int rtl8224_mdi_config_order(struct phy_device *phydev) +{ + struct device_node *np =3D phydev->mdio.dev.of_node; + u8 port_offset =3D phydev->mdio.addr & 3; + u32 order =3D 0; + int ret; + + ret =3D of_property_read_u32(np, "enet-phy-pair-order", &order); + + /* Do nothing in case the property is not present */ + if (ret =3D=3D -EINVAL || ret =3D=3D -ENOSYS) + return 0; + + if (ret) + return ret; + + if (order & ~1) + return -EINVAL; + + return rtl8224_package_modify_mmd(phydev, MDIO_MMD_VEND1, + RTL8224_VND1_MDI_PAIR_SWAP, + BIT(port_offset), + order ? BIT(port_offset) : 0); +} + +static int rtl8224_config_init(struct phy_device *phydev) +{ + return rtl8224_mdi_config_order(phydev); +} + +static int rtl8224_probe(struct phy_device *phydev) +{ + /* Chip exposes 4 ports, join all of them in the same package */ + return devm_phy_package_join(&phydev->mdio.dev, phydev, + phydev->mdio.addr & ~3, 0); +} + static bool rtlgen_supports_2_5gbps(struct phy_device *phydev) { int val; @@ -2395,6 +2457,8 @@ static struct phy_driver realtek_drvs[] =3D { PHY_ID_MATCH_EXACT(0x001ccad0), .name =3D "RTL8224 2.5Gbps PHY", .flags =3D PHY_POLL_CABLE_TEST, + .probe =3D rtl8224_probe, + .config_init =3D rtl8224_config_init, .get_features =3D rtl822x_c45_get_features, .config_aneg =3D rtl822x_c45_config_aneg, .read_status =3D rtl822x_c45_read_status, --=20 2.47.3