From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 E2E883C73E1 for ; Thu, 26 Mar 2026 09:58:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774519108; cv=none; b=rHOPdZhzErlHwfUdpzNskRmiEBq0szc6jduqwChtSlh1BufTGyOAWzMLIUdUOnc0UU/WnV+U5i+Z5VCUwKY/bNlOojBOyHckOHs49vkDrjcDRjGM4+CluPWmiKP97BaJlySh9rnddN6c7/FjGKtklwII/1wW/rIr6kBkDeRIMHs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774519108; c=relaxed/simple; bh=Kd9nV26ZL3EfcjAmrbwca/U9g3js3Zp8Qfl8G8M/fpQ=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=XHibDwnw0U6A+3DsvP5xIYwPgfnVws/2zPQ43Mllja5iJhnGGJpzXQ3zUVM6UoNWQBWjOOAQixp+0syaoQTOVZ4IZL26ecQk7oaTSd8gFIJKmEdeRAHA7YaqYYps8Fzq+Li9/Ecw1KQS77yBVUoHDn6td4QNknFs5ABN3Ot8HnM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=QyjXYB0J; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=PsuhscY0; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="QyjXYB0J"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="PsuhscY0" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1774519100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FfSsmA6/5blQF6q3DGd5Zw/eyjxARekst8GL7QZ0MtI=; b=QyjXYB0JlYDQxskf+K86hOYX5ShxrjNB6+PkG0nNbaqaTE6VSWaXccEl92tuBNt6W3g5I0 xlzP3Gcf0T7nvqlJfm20PESAlfTKkA/tcvIISzKjAO0idMRw8aMYzYkYZdsiot7PeOxxbb ySUxYKIoH7XFLS3J0sSmdXM7xh+a5ik= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-266-qfwCQTDrPyygzbeP7tRDvw-1; Thu, 26 Mar 2026 05:58:18 -0400 X-MC-Unique: qfwCQTDrPyygzbeP7tRDvw-1 X-Mimecast-MFC-AGG-ID: qfwCQTDrPyygzbeP7tRDvw_1774519097 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-48544725bdeso15583895e9.2 for ; Thu, 26 Mar 2026 02:58:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1774519097; x=1775123897; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=FfSsmA6/5blQF6q3DGd5Zw/eyjxARekst8GL7QZ0MtI=; b=PsuhscY0ojlP3Yr7iT0qvnZxX9OnGMtZwnAaUI3Tw9fKyEw+VCfR2v3s0m3keGIc+J lxzcU//M/rkF+NS0Ah7mNkX+HVW0xow7+/WUw+WQUyKxfJ+CSJF6zimE0I4UWcad94Au K+XgK/aguXPCEEA2HL/DqtYG8KAxLU+Tn+zu5dhekBY1cu+nxanPOE35Wyz9SHqJz7Bc VROUNOsUC/w3XK39YgRbvnqOd6iRFneZyJ2/KM9QcvWUo1z5XZy+b/TKAoX0juclH2a/ AuBNTI6zWOtAdU/UhGL3ny9iPCOFxfATS3J/64nKZHkzPbh8wbH6i8yfpgqjdx/+MV38 a/hQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774519097; x=1775123897; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=FfSsmA6/5blQF6q3DGd5Zw/eyjxARekst8GL7QZ0MtI=; b=CxNYkO53oZE/Wq0Kl8WOqbwV/oq/lKuLhjH/ncPp+4ZtdI8SjzFjW5Q2THuWPCIdPF VXmoPrsoIlyor+cCLuNnT4xIjDcEpKjqwxLWfyPMU9Xh0HzQyCWENIv6ZEfxhtwvuz3b F2gucN1hFD8SYFXwgag+D4OrjVdVMBk1xVVm69kfxRGYJG8BcmnUKAjjbAFaMmDmhxxk xN9khkwnNKLUjt6lTMMxN8tc6JtGccAy8M3CsG8/QauYQc4B7792S94Tkrf1tubrL3aQ ULciz8Hji+SYPovXswsBnnpjROMV3iIlvZhnwqINKPwWOBlgAoBRFhjYyl5Utb1oEx+X fttg== X-Forwarded-Encrypted: i=1; AJvYcCUb40qjfZ8s5hebxC+3JgTM7eqhfgCoJn7jNk8BbyMBM/5EV3+OAW3qPu4b1iqgXhij45xI+R2WOf6v/C8=@vger.kernel.org X-Gm-Message-State: AOJu0YzUvJHx9XEDewhin0RW1EFGjzT9+/8kx2bZDOOLyLNFwVw0wTLm TC6SayNVI3RvmOMpi9wemh/RvKxOoEuZlpXyPeEaCAvgvLJ+tfQKdufeUzaAdKak8PWA0ptTG66 J9ckui0C6fLJ0EkrYvZYJAymEDD1bK/nAlhFJYPQsZzPtlo987DHeEXYyBTReN84L9g== X-Gm-Gg: ATEYQzxbQxPALmRMYGY3jlidHMcXQVvBHRKuB80Y/mAXTX191ch21Gy347lbFVLq4Zl aSNfBosgjZYhJEndEfN3EXInu3a/FARij87IAT2bzXhlMeovH6CxqslcD4/kl9f3TXe7ss2aN69 kUhfpncAkkXVccY2Dr0Vo8YXv+GmUN+nItE5cI/1JaowR9zRMB3bpljMb3IN10EnUCBVKAxbhI8 WE5tOVAWncu9jE+1vPN6I5jiUTvJ6p4pVQTMnfL1aMYsBwLw5a6WqnT0sM47U2PFfdRbJB3rgCs kZ8fpOfhSQJt5341NZ1RYP10i5RyBCyvSdWNDUtnE1tC9bScKB4WAbxZoUCSGXnKGcr4Vqj7G4A 1SqBNlWC+1dB4RqvKbXHGDGoyMw3QBLY3Fh+rEWSQPcEF38ql1VsZZc4z X-Received: by 2002:a05:600c:4447:b0:485:3f1c:d8a4 with SMTP id 5b1f17b1804b1-48715fd50c2mr99407395e9.9.1774519096810; Thu, 26 Mar 2026 02:58:16 -0700 (PDT) X-Received: by 2002:a05:600c:4447:b0:485:3f1c:d8a4 with SMTP id 5b1f17b1804b1-48715fd50c2mr99406985e9.9.1774519096349; Thu, 26 Mar 2026 02:58:16 -0700 (PDT) Received: from [192.168.88.32] ([212.105.153.60]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48722be608bsm26666255e9.0.2026.03.26.02.58.14 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 26 Mar 2026 02:58:15 -0700 (PDT) Message-ID: <834f1d4f-b749-41bb-8ae1-04d19e70ba92@redhat.com> Date: Thu, 26 Mar 2026 10:58:14 +0100 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH net-next] net: phy: realtek: support MDI swapping for RTL8226-CG To: Jan Hoffmann , Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Daniel Golle , Markus Stockhausen , Damien Dejean Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org References: <20260322193235.990881-1-jan@3e8.eu> Content-Language: en-US From: Paolo Abeni In-Reply-To: <20260322193235.990881-1-jan@3e8.eu> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 3/22/26 8:31 PM, Jan Hoffmann wrote: > Add support for configuring swapping of MDI pairs (ABCD->DCBA) when the > property "enet-phy-pair-order" is specified. > > Unfortunately, no documentation about this feature is available, so the > configuration involves magic values. As it is unknown whether the > patching step can be safely reversed, only enabling MDI swapping is > supported. Still using human readable macros would improve readability, reduce the change of c&p mistakes. I suggest you use chose some more explanatory names at least for the more used values. > Some other Realtek PHYs also support similar mechanisms: > > - RTL8221B-VB-CG allows to configure MDI swapping via the same register, > but does not need the additional patching step. However, it is unclear > whether a driver implementation for that PHY is necessary, as it is > known to support configuration via strapping pins (which is working > fine at least in Zyxel XGS1210-12 rev B1). > > - The patching step seems to match the one for the integrated PHYs of > some Realtek PCIe/USB NICs (see for example the r8152 driver). > > For now, only implement this for the RTL8226-CG PHY, where it is needed > for the switches Zyxel XGS1010-12 rev A1 and XGS1210-12 rev A1. > > Signed-off-by: Jan Hoffmann > --- > drivers/net/phy/realtek/realtek_main.c | 142 ++++++++++++++++++++++++- > 1 file changed, 141 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/phy/realtek/realtek_main.c b/drivers/net/phy/realtek/realtek_main.c > index 023e47ad605b..2472f54502bd 100644 > --- a/drivers/net/phy/realtek/realtek_main.c > +++ b/drivers/net/phy/realtek/realtek_main.c > @@ -1447,6 +1447,146 @@ static unsigned int rtl822x_inband_caps(struct phy_device *phydev, > } > } > > +static int rtl8226_set_mdi_swap(struct phy_device *phydev, bool swap_enable) > +{ > + u16 val = swap_enable ? BIT(5) : 0; > + > + return phy_modify_mmd(phydev, MDIO_MMD_VEND1, 0x6a21, BIT(5), val); > +} > + > +static int rtl8226_patch_mdi_swap(struct phy_device *phydev) > +{ > + u16 values[4]; > + int ret; > + > + ret = phy_read_mmd(phydev, MDIO_MMD_VEND2, 0xd068); > + if (ret < 0) > + return ret; > + > + if (!(ret & BIT(1))) { > + /* already swapped */ > + return 0; > + } > + > + ret = phy_modify_mmd(phydev, MDIO_MMD_VEND2, 0xd068, 0x7, 0x1); > + if (ret < 0) > + return ret; > + > + /* swap adccal_offset */ > + > + for (int i = 0; i < 4; i++) { > + ret = phy_modify_mmd(phydev, MDIO_MMD_VEND2, 0xd068, 0x3 << 3, i << 3); > + if (ret < 0) > + return ret; > + > + ret = phy_read_mmd(phydev, MDIO_MMD_VEND2, 0xd06a); > + if (ret < 0) > + return ret; > + > + values[i] = ret; > + } > + > + for (int i = 0; i < 4; i++) { > + ret = phy_modify_mmd(phydev, MDIO_MMD_VEND2, 0xd068, 0x3 << 3, i << 3); > + if (ret < 0) > + return ret; > + > + ret = phy_write_mmd(phydev, MDIO_MMD_VEND2, 0xd06a, values[3 - i]); > + if (ret < 0) > + return ret; > + } > + > + /* swap rg_lpf_cap_xg */ > + > + ret = phy_read_mmd(phydev, MDIO_MMD_VEND2, 0xbd5a); > + if (ret < 0) > + return ret; > + > + values[0] = ret & 0x1f; > + values[1] = (ret >> 8) & 0x1f; > + > + ret = phy_read_mmd(phydev, MDIO_MMD_VEND2, 0xbd5c); > + if (ret < 0) > + return ret; > + > + values[2] = ret & 0x1f; > + values[3] = (ret >> 8) & 0x1f; > + > + ret = phy_modify_mmd(phydev, MDIO_MMD_VEND2, 0xbd5a, 0x1f1f, > + values[3] | (values[2] << 8)); It looks like there are a few FIELD_GET/FIELD_PREP use cases above (which will work better together with define for relevant values). /P