From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) (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 776CD2ED87C for ; Sun, 25 Jan 2026 20:03:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769371388; cv=none; b=kY0e3Ft7qt+rPoR2QEOL+Yq6Jt/jSq+xTRWif1e7Pay/FT5fp7sfdeZGj6mp0yXOQu8kxGS32fweNfpq08QFFYMDWJ0QZO73q9OiGOgSfg0VwifRgecHmTSO0t0DfcqHN0zOppIhZcjerjyMBgnGXb32JmBRL2CkZnWKQIrbVwo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769371388; c=relaxed/simple; bh=zX0hvxkuGDXQOHT/dO0h+VlGuaLocZjx0MrL6MxaSPY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rYnH2mbij3NwA3IJCTfxfPRGUgpqpy1BShwLhULcNkYaVqjHq3s6w/4fhzcVQOQXxGnIexmh7T95MtPC0w5ilnYgpK77RkgVCiWOBGOCtA4FRXIGtM9/1mUeB1JKq0KEF49zA8ikNOskyvc/U1AfhQ7RNurPkWbcfQbNifiTomU= 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=hljpeDQI; arc=none smtp.client-ip=209.85.221.48 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="hljpeDQI" Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-42fb6ce71c7so3633143f8f.1 for ; Sun, 25 Jan 2026 12:03:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769371385; x=1769976185; 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=V4+ulA35JyJCbjFvyxZuNovtvFtG6lbRB2yZddCZVz8=; b=hljpeDQIk5u/vWjCpOzGGQp0w0D8vSxPefZEAZZQ/WNnLuksqyRXOWsPu6i+0KxfUm IV7arwFsP02P0rAK7omYPzeK8jxE+59AsU9MVwWevPXjyOT/1TYUjZaRtsyjCsUt26j4 DfMCZ9dSvdnfV1cp3ISf1RXRguiJbtlIidbW2Dszj7kSXxuXht5FEKH00jV/nD4tvo/o nOPmFhgY/gL1yTW/RU+qWMvPcQjfmUHCgZIoR4xWWZ6sb/6Pl2efUGo8IfU79DteGtE/ UjC3QEGQrSnIqopxVnzbcQ/wjFgQsE1K6/+M45t6rx9erCrxGSELo6OrRXHczyb08XpH YuCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769371385; x=1769976185; 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=V4+ulA35JyJCbjFvyxZuNovtvFtG6lbRB2yZddCZVz8=; b=vYIdVVab+GQohLWVXRGGqX3DwykMbrjBVrVDahwNPi0MTzAGzRa5ZPIHcZCoi/d3SU zuVpJbSXd9lzoweORX/GphtxIEkenh+XnnCreU0vJnIAILRc01aQzuuOzp/Wm5Lw6Hqm 1TUGgMLQ9NCVPiZYbujFMohBjPk/yJZJzaX9avgonvPLiwHmHYcvTi/41G3LmSN2Rcmi rFCmxHduPUOkefa8n51vqxMNtRXu6l3rpWdXvoP9LNTVOU3lo/b7xURzRfCWQU3ignEL puQSVslOS8eXAPNcGDnZjEcFzdcgKFS9HQW9Ot3By1aeaM9x8FTwGvx0lUjaeOZG+OHp OF2A== X-Forwarded-Encrypted: i=1; AJvYcCXtR8impDYbvlgrN1674s19l/6NvIqSsZHX1C6HqKMXnyhMGbH8fIQEaosNu8RqFjVPE/vba2ueXAuRe2Q=@vger.kernel.org X-Gm-Message-State: AOJu0YzhW3dCI2qui4KDeylPLWKUD35b9PJYDbJJBVoiRv/pmCIV2RfY B2exjgKeHmWewANW38cQ5v53GDt9L7IujQyAwfh8UBXfRH+fQm+Bkrsx X-Gm-Gg: AZuq6aJXVIhUGkqPVYpJcThDAeftSW5Xw7rFO0Odg/2m7qOcpXs6M1995urtLjs73re mjE3wkE2ib1GfTWzYCPjL5ZYFvSFRzH/uCb4YZKgSs87df+0rcAZHJgGxx5DJTerd9YUbdmI2nz ttonPk4x7jKL2dkPqvgRQzB6I8J5LFh8Rll1+TcsPrYCpUGaqbO9MaeDauUH56BwMTs99VSz333 kPuxiXGsn4sWypXMDKhr2UCxc+m4fCoFIZxkLzJf5LEb8EzM0KM2Km1TSdCNTcy7QrRHzSXSa7U pSvtpNEORHXuUJdoP2Mx7z9wigBihQuYFby/YHeFRDYnj9fVRkkGz1yob08I1ldJn4VNQ8/sdB0 FCRRqbtg1/wYaIgdvtk42VqVUQDf6Ri+Y+wBWWPIwQsmRGk0QLyNJZLnrbh9JSObga2kkaTH7mS zmCMcA0+z4+pwj2lbm4tIm0A== X-Received: by 2002:a05:6000:4025:b0:431:c60:c600 with SMTP id ffacd0b85a97d-435ca193b14mr3988486f8f.35.1769371384555; Sun, 25 Jan 2026 12:03:04 -0800 (PST) Received: from nas.local ([2001:912:1ac0:1e00:c662:37ff:fe09:93df]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-435b1f7c269sm24418036f8f.43.2026.01.25.12.03.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jan 2026 12:03:04 -0800 (PST) From: Damien Dejean To: andrew@lunn.ch, krzk+dt@kernel.org, robh@kernel.org Cc: netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, edumazet@google.com, davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, hkallweit1@gmail.com, Damien Dejean Subject: [PATCH v3 2/4] net: phy: realtek: add RTL8224 pair order support Date: Sun, 25 Jan 2026 21:02:57 +0100 Message-ID: <20260125200259.2903271-2-dam.dejean@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260125200259.2903271-1-dam.dejean@gmail.com> References: <20260125200259.2903271-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: 8bit 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-lane-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 | 50 ++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/drivers/net/phy/realtek/Kconfig b/drivers/net/phy/realtek/Kconfig 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 diff --git a/drivers/net/phy/realtek/realtek_main.c b/drivers/net/phy/realtek/realtek_main.c index 6ff0385201a5..9c149b05c767 100644 --- a/drivers/net/phy/realtek/realtek_main.c +++ b/drivers/net/phy/realtek/realtek_main.c @@ -18,6 +18,7 @@ #include #include +#include "../phylib.h" #include "realtek.h" #define RTL8201F_IER 0x13 @@ -162,6 +163,8 @@ #define RTL8224_SRAM_RTCT_LEN(pair) (0x8028 + (pair) * 4) +#define RTL8224_VND1_MDI_PAIR_SWAP 0xa90 + #define RTL8366RB_POWER_SAVE 0x15 #define RTL8366RB_POWER_SAVE_ON BIT(12) @@ -1683,6 +1686,51 @@ static int rtl8224_cable_test_get_status(struct phy_device *phydev, bool *finish return rtl8224_cable_test_report(phydev, finished); } +static int rtl8224_mdi_config_order(struct phy_device *phydev) +{ + struct device_node *np = phydev->mdio.dev.of_node; + u8 port_offset = phydev->mdio.addr & 3; + u32 order = 0; + int ret, val; + + ret = of_property_read_u32(np, "enet-phy-lane-order", &order); + + /* Do nothing in case the property is not present */ + if (ret == -EINVAL) + return 0; + + if (ret) + return ret; + + if (order & ~1) + return -EINVAL; + + val = __phy_package_read_mmd(phydev, 0, MDIO_MMD_VEND1, + RTL8224_VND1_MDI_PAIR_SWAP); + if (val < 0) + return val; + + if (order) + val |= (1 << port_offset); + else + val &= ~(1 << port_offset); + + return __phy_package_write_mmd(phydev, 0, MDIO_MMD_VEND1, + RTL8224_VND1_MDI_PAIR_SWAP, val); +} + +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; @@ -2212,6 +2260,8 @@ static struct phy_driver realtek_drvs[] = { PHY_ID_MATCH_EXACT(0x001ccad0), .name = "RTL8224 2.5Gbps PHY", .flags = PHY_POLL_CABLE_TEST, + .probe = rtl8224_probe, + .config_init = rtl8224_config_init, .get_features = rtl822x_c45_get_features, .config_aneg = rtl822x_c45_config_aneg, .read_status = rtl822x_c45_read_status, -- 2.47.3