From:   Richard van Schagen <richard@routerhints.com>
To:     Sean Wang <sean.wang@mediatek.com>,
        Landen Chao <Landen.Chao@mediatek.com>,
        DENG Qingfang <dqfext@gmail.com>, Andrew Lunn <andrew@lunn.ch>,
        Florian Fainelli <f.fainelli@gmail.com>,
        Vladimir Oltean <olteanv@gmail.com>,
        "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Matthias Brugger <matthias.bgg@gmail.com>,
        AngeloGioacchino Del Regno 
        <angelogioacchino.delregno@collabora.com>,
        Arinc Unal <arinc.unal@arinc9.com>,
        Frank Wunderlich <frank-w@public-files.de>
Cc:     Richard van Schagen <richard@routerhints.com>,
        netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
        linux-arm-kernel@lists.infradead.org,
        linux-mediatek@lists.infradead.org
Subject: [PATCH net-next v2] net: dsa: mt7530: add support for changing DSA master
Date:   Sat, 11 Feb 2023 19:41:01 +0100
Message-Id: <20230211184101.651462-1-richard@routerhints.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?S21Pbkt5SUpQWnV0NUFaNjlBbjk0NlJPekJpR25iSG8wOVhCSWpLZ2U0ekF5?=
 =?utf-8?B?V2RkSDIvL2RUUzkwa04vSEVCR29TdnRCblJFT0tXSVZWRG1LczRIL2dDRElz?=
 =?utf-8?B?dEJjb2cvZGh6Q1B3cXhIR2RmdHlLTklZd0pSQVgxOWowVVdkdjE3OFBCQWh5?=
 =?utf-8?B?d091cEdkNEM1RmlIeEFzbXo5VG1aZ2dkcEFhRjJIRTUxSDRTWXRScGxHOWRt?=
 =?utf-8?B?Y1EvY0J3eXhWdzNLRU93VVJ0bFAvQytXMlVBdkhiWVhrclRVN2hpd3pqYmYv?=
 =?utf-8?B?MHBlRUlPSUJBeGVmZ21GTmNYbnFYSXZEc1diYmhBeDZEc1A4MXBMUXg3WitG?=
 =?utf-8?B?WTVZR3RQRmd5bEVhWVR4UUl2RFFneEhtMC9QaE1aQWhVMlR2aDUybkFONzN5?=
 =?utf-8?B?M3F1VjNGcmp2bVZDa3d4Ni9XWkNGQXhYVTU0V2Y3d2pLZXZqNE1wQ2lka1lh?=
 =?utf-8?B?NzY2ZW9NSGtOcEZIcklhMUhBYktkZFlMMldsWDlTdTJ5OGh2Qkd1dFp4SXdL?=
 =?utf-8?B?NmxtSitYODB6aFFEWGd1dzNBZVBTeU5IMTZseGVkZXp4bkxxeHNBckhPYW5Z?=
 =?utf-8?B?QXB5QTR0U0JFNXREV0dadTlYTUMrWjhZZkh0N2xaQ0I2M1llRXFXbzg1K25i?=
 =?utf-8?B?MXJWNWpKM2VtUWJYTzNWWjdrbXB3MUFqWHhFbkZxdUJ0aU9lZUZSRGpRdHA2?=
 =?utf-8?B?OXRxaEptZFJ1L0taeXNZaVdBRGpPenYvdVkxblJza3kwN1JNcko4WnZaeldX?=
 =?utf-8?B?NVpZQVpmZWNmaGlRdW9LNGFiWkRZMFFNL0o5Qk1NdWtJYUFsSFBlVmpYQUVG?=
 =?utf-8?B?bEJsNld6OElMSHZWWDM1UUxsaHFBb0FmTDFXcDhjQU03cjZZOVZXNWZEcFlQ?=
 =?utf-8?B?ODhoVGVJcUg5emxKMndMTEgyNVZIeHNWNmxQMm16ZFpWT1M1c0daVlNaV3p4?=
 =?utf-8?B?WGdkdDdMTHBhdkNmcXdJTXVBSUgrVlBMRHZnSzk4N3Z4dmFRb1RZL0k4QlFa?=
 =?utf-8?B?M1RmWERucjk0RGZXSHhOdW5yU2d1TnFZVG1ZZHIvVVcvL1BGeVlSNHZIb2dn?=
 =?utf-8?B?cmhKZmp4UVNwUVhsMmVCa09hTm9Da1hNVlg5MktzS3BNVmpzQjlHMiswSzJX?=
 =?utf-8?B?QVNyN3ZZcnhyQnZlNWNZNG85R0pBbGVRWW1wVU1HNldETzdoeThvOWloVXNU?=
 =?utf-8?B?aHhsbkRhRlNWd3B0eXIwTkhmcklRdlBDeUpBOXhQdEV0N1J3azd3WlA5T3hC?=
 =?utf-8?B?MU9FK0VxUlFpRUNIS1U5OUlrMzE2TSsyUTdteDJWak0vN0kyejI5a2psY2hy?=
 =?utf-8?B?T2FMYWFkRVVveXRGcjJIRStSM01BZUUyK1lCM0U2UUF4WXMwWG1RUm01eCtu?=
 =?utf-8?B?YWoxVWYvS1duT0I3QTh2VWVuZktMQllVOXdZMlhiTFBDV3JJZU9GWmplblBS?=
 =?utf-8?B?VGwzdzJsTFNjYmZCNmpxdkM3cTRuLzEzVkEwUHBrN1Y1a0RidEFoSnFpdDd1?=
 =?utf-8?B?c0lPUnVtSi9FeFFOU2NhcHI0SGtGVjBheHpERk9wdHNYWFNyRTY3NWlLeHNJ?=
 =?utf-8?B?UDM4MmV6R041THVzZ3Q1RkdFa2l6MXJPU2JpTUhjbDFvYzlrZFBJSkh4Y1Rv?=
 =?utf-8?B?SDNLSm5nREF6NnFhbFBMeEtMVSs4dll1eDF1RW41TTF3T1FuTXpXY2xRemNq?=
 =?utf-8?B?SURYZlFtUzB0TWM0eStLZm1LWFRna2k2SXFVVm5najJGOThkMXdNYmRPV3Ex?=
 =?utf-8?B?cWVXaUk1d0RObWQ2cWdJdExUT09wRTd4dzRJMWlKRkc2c0pLeVJIRC9rRzRr?=
 =?utf-8?B?R09ZSGhOT0s4WlBybXlEaXJWcURrWU05dGl4ei8xYk9mYzhMREFjRXU5a1Y1?=
 =?utf-8?B?Y0djZmkyNDVMSUF4V2FlbjUrNTNGMWJPd3dhRmNYWll1czV4b0JxU1JrK2d0?=
 =?utf-8?B?dTVZbjdvL1J4V1hUS3J4eDlFdVBGOElqcVE2d2N6UGJQbG55cFhRQnlkUnYv?=
 =?utf-8?B?MW5WZVVBS25FbVdHcVUrUXgzVXhqeFlKZU04a005S2VzY05ydWxEbFlkOFN3?=
 =?utf-8?B?OVRTTUY5anB5dXRLQ0NWc0hoT1pQNmdJVFlkUmhNZFJnbmFmemVsZVBtZzBr?=
 =?utf-8?B?U1RCS3A2QS9BOFpYdVRDVjBPUU92dFVtK1VvWUxwYTBnSmZNeEFzVzVKSmR3?=
 =?utf-8?B?VVZDZ2hmTDhuVGFES3RkTGtEWlYvRlgzdVVqa0VmTElBTW9XdGkxNXNpclhS?=
 =?utf-8?B?dkMycVdRZi85SFRVZDFuY21LNG9BPT0=?=
X-OriginatorOrg: routerhints.com
X-MS-Exchange-CrossTenant-Network-Message-Id: da0f8893-9450-48e7-174f-08db0c5fea61
X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB7454.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Feb 2023 18:43:49.9214
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 28838f2d-4c9a-459e-ada0-2a4216caa4fd
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 6ZdTjZ8Nw9iqiyP+TmjjUiUtH6lumvKjzjHK3Xq/NKF338CJSH/hQzNgdE4117VhYMx5pgLVe9z/22QTnjJ3Eg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8413
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Add support for changing the master of a port on the MT7530 DSA subdriver.


Tested-by: Arınç ÜNAL <arinc.unal@arinc9.com>
Signed-off-by: Richard van Schagen <richard@routerhints.com>
Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com>
---
 drivers/net/dsa/mt7530.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c
index b5ad4b4fc00c..2374166c4858 100644
--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
@@ -1072,6 +1072,35 @@ mt7530_port_disable(struct dsa_switch *ds, int port)
 	mutex_unlock(&priv->reg_mutex);
 }
 
+static int
+mt7530_port_change_master(struct dsa_switch *ds, int port,
+			  struct net_device *master,
+			  struct netlink_ext_ack *extack)
+{
+	struct mt7530_priv *priv = ds->priv;
+	struct dsa_port *dp = dsa_to_port(ds, port);
+	struct dsa_port *cpu_dp = master->dsa_ptr;
+
+	if (netif_is_lag_master(master)) {
+		NL_SET_ERR_MSG_MOD(extack,
+				   "LAG DSA master not supported");
+		return -EOPNOTSUPP;
+	}
+
+	mutex_lock(&priv->reg_mutex);
+
+	/* Move old to new cpu on User port */
+	priv->ports[port].pm &= ~PCR_MATRIX(BIT(dp->cpu_dp->index));
+	priv->ports[port].pm |= PCR_MATRIX(BIT(cpu_dp->index));
+
+	mt7530_rmw(priv, MT7530_PCR_P(port), PCR_MATRIX_MASK,
+		   priv->ports[port].pm);
+
+	mutex_unlock(&priv->reg_mutex);
+
+	return 0;
+}
+
 static int
 mt7530_port_change_mtu(struct dsa_switch *ds, int port, int new_mtu)
 {
@@ -3157,6 +3186,7 @@ static const struct dsa_switch_ops mt7530_switch_ops = {
 	.set_ageing_time	= mt7530_set_ageing_time,
 	.port_enable		= mt7530_port_enable,
 	.port_disable		= mt7530_port_disable,
+	.port_change_master	= mt7530_port_change_master,
 	.port_change_mtu	= mt7530_port_change_mtu,
 	.port_max_mtu		= mt7530_port_max_mtu,
 	.port_stp_state_set	= mt7530_stp_state_set,
-- 
2.30.2