From nobody Tue Apr 7 07:55:40 2026 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (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 4561637C0F5 for ; Sun, 15 Mar 2026 20:45:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773607514; cv=none; b=QSUrSlv5Mr7ezpID2E8Gl1e6+/oRx/Fv/HWMLkdqufRUAQLntfemY325xjlD2J7nX+GD5YDm+hNzOR4lJKhMXhAVOVDJ2FGIQ3J2TeoNhOM468YSLEcsGTQPXvGpHi39x3gJXko8qqbPv0CE65Gn1drcmQl613ePaMCZucf1Vq4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773607514; c=relaxed/simple; bh=i3rqLKdW4X981tq74BmlDms1zluf/0nTFeXIK2Gd290=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GVAaoaWNAVqBglhUuEVn4VgH4VBjDYhZnwB1oiCqpoMmtISo2xoyU8QDyzxPCYwkgTUM/zfxoB2DUZQB4dRH+wf4LTzLV7N+X6/P4Cq87F2UhQ3iviuC/UwyJ4zz7VRDRCKlTSuzCTbzHX6fk4fPlU9CcwSEy8VO4RCCEQ/WtDI= 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=QRrh9DDT; arc=none smtp.client-ip=209.85.128.49 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="QRrh9DDT" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-4852e09e23dso32493245e9.0 for ; Sun, 15 Mar 2026 13:45:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773607512; x=1774212312; 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=/kdtEx1zDJNFkhoUaR6eWj1/yENGBliRBLy50L54Rj8=; b=QRrh9DDTqfyJmGWKpw/+2V9Ah1M70JB2SDQoeBQ7J8vaKNvSORcl2G9AW7MjtiEmXk BPSxrc55Fg+jZuVVEa19Mqh27fr8xH8oz6cs0d7K60EH52a7dG7nts4aRTXi9d70nUVr 7FfLwFuoMp+OK8S+rsoKb/iziG+wpnZXU3cm2qpjkqzrEtNVkdpq1Diu99mBy9lIlmwV eKsapnXQybqTLlFhCogUDLDAMqwQTQPZdq+KpAPULePrPAFuw3Dljh6V5I2vuitdAGhO aJywBZhZqjfy7mG1oL5dGtey/M/P4Oan/5hOwzlpUwLs7vulqEENfoQl1Hl3oj6yiU2t sSgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773607512; x=1774212312; 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=/kdtEx1zDJNFkhoUaR6eWj1/yENGBliRBLy50L54Rj8=; b=XccxZs2uTdV2fHv/lTNzb1DL86GOfrnOlX0KpUp17FdrLVf21pUSSYnpJV/SzGD89M qI/08+byR/sDjoFkZOrNcWK6l+GK5RCYxhDwXT5cgwy5H4PTNcjQsoegSMSWqC85ghR8 bLztoMu07DaefO3wJvR275NndXvnEGswRyee9rB29PqexarUrMxBS58/1//MDMPjGrXV kGFikmEwwZDZ9jOi85uwgqo0rmpuQkvMk+g0BDzN/d8VOlNSbYML1WEFRmKYFYFXLfqx XGsYEqBpvnU4uSYSkETKgDEmAaMUtT0wvnHjveP9DYXe0Fpk3Pbna/zxgy++sTnPLZYe o0NA== X-Forwarded-Encrypted: i=1; AJvYcCXJHvS94DgAqGyNTNyCiWR4hWu9yhA96CuYSCutWdlIj1IfKNfky54HyB2rOdH1VUpOlmaeQ1daUujlG7Q=@vger.kernel.org X-Gm-Message-State: AOJu0YzkrYGlDDxuXknBPL57Xtqwt4l9TvORjx4Ognc6LRkU5r5i8mhy ucWdEhHCI4L0AEyMCjWFPDGhwpcGG68dwKcEfqGfNQRAJvhwAoCSjhCt X-Gm-Gg: ATEYQzxw8K/MK2XFhNwHV95yGtBxZteanUhKjJo6dlh2MTFfLm1aTQlDLDqT9HxlbR6 vuW3Py+ua3UFbewdMAGgMeqz7m5UoTEfCKS09JBjugdCAYJ/9SdP0rn6NNx1x8xAp2NIe6hUAUs 6MxWjFMDyTqOjKKsqh6z+xhbiZTj8YUFm88h3nGKa8xIegxbVXQabqYx9lc01kLJHGAWvSdda1X M0sxeVsQCy4yk7GvC3GrNarsVLBClcDZYTNvquOq4yiguYBO++aKEw1dlcPft//yWUmTwiTd0V4 tAukBzz5Hg1dMKBnHTRrDHN9gKGykvh9JPvbo3gOAckVVwkBf8NfS7uywU/nF/4C34wAyiv8AP8 7isAO+5ktblMWpmDTnY7nAWBAWwXBr9/M+Na8V8gJMnkQyfTpXzSmxZeCrr/zi5SI1XCUEshnkA qISXEYlQCRawsSaOPnBDI2yJA= X-Received: by 2002:a05:600c:4fc6:b0:485:3f1c:d8a1 with SMTP id 5b1f17b1804b1-485566d2004mr175424705e9.9.1773607511256; Sun, 15 Mar 2026 13:45:11 -0700 (PDT) Received: from nas.local ([2001:912:1ac0:1e00:c662:37ff:fe09:93df]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-485563f8c23sm132043885e9.1.2026.03.15.13.45.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Mar 2026 13:45:10 -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 v8 2/4] net: phy: realtek: add RTL8224 pair order support Date: Sun, 15 Mar 2026 21:44:52 +0100 Message-ID: <20260315204454.124544-3-dam.dejean@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260315204454.124544-1-dam.dejean@gmail.com> References: <20260315204454.124544-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..2feb085f5c9e 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) + 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