From patchwork Mon Mar 17 17:32:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Beh=C3=BAn?= X-Patchwork-Id: 14019775 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 1B25B1A2C0B; Mon, 17 Mar 2025 17:32:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742232779; cv=none; b=cFAlMprSNxLqs/NQXoRpgWwnWjC8AVYbIcZUDhjUJ7IZfKSDz19z1ey7PANBjTPsMH53QkG0xokqDTwRMXfMTfIAzQhZiiY4xB/xF4Ui7SWtiXpGrbdkGb23sgFgAn1RMDMi3+A/t4nF8n+xdiiRIqaZjFEYojZPxwczZiLKRV0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742232779; c=relaxed/simple; bh=GWXkJbMmNBZ3iyyjfilxQwj6Vp6gqC7I7iHwyIVQcr8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=JzFjJ4LEb7HVnUmlKW1HhlrStqOCfbSFUWF0fOrk3F+xko5nAay7Jaz+R9J6J9cqpfU99b95OGceTmT8DQQIvnlzm0Pl6Licpru2U5LqqqvQeW6SYHjO1qaTBewFoWsFqPiJ6DKtnXq+8bDLRwBm7QbEYuDv4SvXv2TJI/TPhUo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=e1+SBIXs; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="e1+SBIXs" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9BB4CC4CEEF; Mon, 17 Mar 2025 17:32:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742232777; bh=GWXkJbMmNBZ3iyyjfilxQwj6Vp6gqC7I7iHwyIVQcr8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=e1+SBIXsszbvs7O3uqpCLhaeOzk7Wu6oPjt85qQsFUFnywbyxvHVeffdgoJOvMx0V YeHAygjPzIQgcrPVyL2Hx/ZiOfJXoXhzvBTTOPnAQ9KaeriflTboJt/BlbMMEuLI9n JNumBCq9S1RsMIQ/OfZqrMOw8YM36pklcXtGdtQOE4G8neNb7Q/67LZw7HPQ5P/E74 tCV8eK9qctaP98vl3B6F8L7hYAK1quEil7YqiK89/aL9dIbCkWR16s1YajhGa0V4o8 nu/s4XU8L3J3g/JyBAIpLZpIciYI8AuAOVeg4xD7uqiOX+5jvXRl1Gc3Cmm+fN+6RH /NmNpzxWE9S8g== From: =?utf-8?q?Marek_Beh=C3=BAn?= To: Andrew Lunn , Vladimir Oltean , "Russell King (Oracle)" , Vivien Didelot , Tobias Waldekranz , netdev@vger.kernel.org Cc: Lev Olshvang , =?utf-8?q?Marek_Beh=C3=BAn?= , stable@vger.kernel.org Subject: [PATCH net v2 1/7] net: dsa: mv88e6xxx: fix VTU methods for 6320 family Date: Mon, 17 Mar 2025 18:32:44 +0100 Message-ID: <20250317173250.28780-2-kabel@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250317173250.28780-1-kabel@kernel.org> References: <20250317173250.28780-1-kabel@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org The VTU registers of the 6320 family use the 6352 semantics, not 6185. Fix it. Fixes: b8fee9571063 ("net: dsa: mv88e6xxx: add VLAN Get Next support") Signed-off-by: Marek Behún Cc: # 5.15.x Reviewed-by: Andrew Lunn --- drivers/net/dsa/mv88e6xxx/chip.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index 5db96ca52505..06b17c3b2205 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -5169,8 +5169,8 @@ static const struct mv88e6xxx_ops mv88e6320_ops = { .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6352_g1_reset, - .vtu_getnext = mv88e6185_g1_vtu_getnext, - .vtu_loadpurge = mv88e6185_g1_vtu_loadpurge, + .vtu_getnext = mv88e6352_g1_vtu_getnext, + .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge, .gpio_ops = &mv88e6352_gpio_ops, .avb_ops = &mv88e6352_avb_ops, .ptp_ops = &mv88e6352_ptp_ops, @@ -5217,8 +5217,8 @@ static const struct mv88e6xxx_ops mv88e6321_ops = { .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6352_g1_reset, - .vtu_getnext = mv88e6185_g1_vtu_getnext, - .vtu_loadpurge = mv88e6185_g1_vtu_loadpurge, + .vtu_getnext = mv88e6352_g1_vtu_getnext, + .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge, .gpio_ops = &mv88e6352_gpio_ops, .avb_ops = &mv88e6352_avb_ops, .ptp_ops = &mv88e6352_ptp_ops, From patchwork Mon Mar 17 17:32:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Beh=C3=BAn?= X-Patchwork-Id: 14019776 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 E4AC11ADC8F for ; Mon, 17 Mar 2025 17:32:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742232780; cv=none; b=YRKciujKyGhOuwxdCgdDCLLRTbtmQc9FofDpI8CqPadvazfbbXduw6Js3RIuI3GaN0mFwDyzzgf2Hh9onQyHBfeZwAlo3xNNb377Q4TTFl5J13JVCH1JpuuUz4kYRg0YOgBGkoFgJHb4Fy3XvH+/EnxDjoW4GjFAkF6pPll3VIY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742232780; c=relaxed/simple; bh=cQKuPMPAgi/f0AxZTtcKUmZ0QwCU/DG+A983QeIgaIo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=WF6cGDn49Y8F7omTh31nV9JS8DCcnTQ31MlUyD2OUAvR3zMlj6+n3MEwJy8yvcBUxLxFt2U6m5JtMllcj36ccLvh4svm6Veq7tTEJoRAoNM1vmo56IQTvLSTg84CA+8f0p2Bj8r+Jat3jInosNtHVQF9+dpd3FGlPUKMZHXzIbU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=R0Tt/Xs7; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="R0Tt/Xs7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 09621C4CEEC; Mon, 17 Mar 2025 17:32:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742232779; bh=cQKuPMPAgi/f0AxZTtcKUmZ0QwCU/DG+A983QeIgaIo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R0Tt/Xs7TCqUebwEc6inSZita40NP4fj1lk2fHvngGeiKz0qq22EAerL3fUKfwEQx b2aefCCOJTCKlICAWerFQzce8q4UQYPJf7thSVKCIpX32/InFFmRQ74VyiXxG1ktRB HCdfQr7OP3FUKM04L6arMigJeFIEYxgcnX0vpL1IbbHjI9XtxwxOMK6y6tFdSHriGD DxBuVnlffRJSFWR5tiCDewWfh7Q12Evu1gSDMOupkSgdHRTQmVmQ2tm4mqUi6AwfWy zZet+2s1kM45ru16eEFoJWijafM/4D/CH9S5aIQpLhW71j97BN4d7Rrc4aRzfsE4dL /lF6DXM69DhgA== From: =?utf-8?q?Marek_Beh=C3=BAn?= To: Andrew Lunn , Vladimir Oltean , "Russell King (Oracle)" , Vivien Didelot , Tobias Waldekranz , netdev@vger.kernel.org Cc: Lev Olshvang , =?utf-8?q?Marek_Beh=C3=BAn?= Subject: [PATCH net v2 2/7] net: dsa: mv88e6xxx: fix atu_move_port_mask for 6341 family Date: Mon, 17 Mar 2025 18:32:45 +0100 Message-ID: <20250317173250.28780-3-kabel@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250317173250.28780-1-kabel@kernel.org> References: <20250317173250.28780-1-kabel@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org The atu_move_port_mask for 6341 family (Topaz) is 0xf, not 0x1f. The PortVec field is 8 bits wide, not 11 as in 6390 family. Fix this. Fixes: e606ca36bbf2 ("net: dsa: mv88e6xxx: rework ATU Remove") Signed-off-by: Marek Behún Reviewed-by: Andrew Lunn --- drivers/net/dsa/mv88e6xxx/chip.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index 06b17c3b2205..b989123cdbeb 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -5818,7 +5818,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { .global1_addr = 0x1b, .global2_addr = 0x1c, .age_time_coeff = 3750, - .atu_move_port_mask = 0x1f, + .atu_move_port_mask = 0xf, .g1_irqs = 9, .g2_irqs = 10, .stats_type = STATS_TYPE_BANK0 | STATS_TYPE_BANK1, @@ -6296,7 +6296,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { .global1_addr = 0x1b, .global2_addr = 0x1c, .age_time_coeff = 3750, - .atu_move_port_mask = 0x1f, + .atu_move_port_mask = 0xf, .g1_irqs = 9, .g2_irqs = 10, .stats_type = STATS_TYPE_BANK0 | STATS_TYPE_BANK1, From patchwork Mon Mar 17 17:32:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Beh=C3=BAn?= X-Patchwork-Id: 14019777 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 8369A1ABEAC for ; Mon, 17 Mar 2025 17:33:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742232782; cv=none; b=oFk80X2VmbULvng0BAtURfLjTCgK36sEC5trYnqr3V+Fj4Ty4g94Mi6nsnNNDYAgBCCWKiG+XmvhNZowCJUxL78f/MF4VGjJdKKf9j78wA7OZijyncwt+BCiVR2rzE82AVet8o7uMUUmesf43uLggU+Hdj7i0PxLWkRFQteMTZk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742232782; c=relaxed/simple; bh=g9jmRCCIFuce0/70wk1Cz6e3ElFSPAQ1w2eKCGMF+B0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=El/soB0PZyaGLAJFpYk2dsy9Dvn3TXNVRj3DHFVJOvAW8v8q5zjzAoY/z4Fdff3f+N4a3FkEEPrkeSNEQjjOftBinqHEcWKrVlFLJpWeziY0g/Tdjfm0IT+iqw/LoIPYrsUf+oKLyAU+IpeqC6BUBmme10a7ZX+rpgoUR0JTPBw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=qOvOz8un; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="qOvOz8un" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3F00CC4CEEF; Mon, 17 Mar 2025 17:33:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742232782; bh=g9jmRCCIFuce0/70wk1Cz6e3ElFSPAQ1w2eKCGMF+B0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qOvOz8un17JfN9MWsgKHxzw+2I7O/JQtypQFgRPMuBsxabGrj/jN2v9qbFtUH7LoN YFyEouRMNpAVEU/twzNIcoVRJiDEZ9I3ly5nSuW2eZig11cEDezCYDlvnIfpRg378d ZiV9YEtrmu/QVGUUdSJNqS7W0avXd6ifSy4R+LXlu5qxwXkyRqf/rctEGNKzlds8ph zAwZ0jRh8q6yDyiD0LgMyX0TYYE7JGx1IXIEACen/rcSM5EnAyLJB3NVy0IxFsYuwH /Bi49NHvqoQLLhy9FEILZKNgUtf3zZdS8prPeVG3+NdE3V6AGGoJh7PaTgnzCHbWO6 x64xpuruEbGfg== From: =?utf-8?q?Marek_Beh=C3=BAn?= To: Andrew Lunn , Vladimir Oltean , "Russell King (Oracle)" , Vivien Didelot , Tobias Waldekranz , netdev@vger.kernel.org Cc: Lev Olshvang , =?utf-8?q?Marek_Beh=C3=BAn?= Subject: [PATCH net v2 3/7] net: dsa: mv88e6xxx: enable PVT for 6321 switch Date: Mon, 17 Mar 2025 18:32:46 +0100 Message-ID: <20250317173250.28780-4-kabel@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250317173250.28780-1-kabel@kernel.org> References: <20250317173250.28780-1-kabel@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org Commit f36456522168 ("net: dsa: mv88e6xxx: move PVT description in info") did not enable PVT for 6321 switch. Fix it. Fixes: f36456522168 ("net: dsa: mv88e6xxx: move PVT description in info") Signed-off-by: Marek Behún Reviewed-by: Andrew Lunn --- drivers/net/dsa/mv88e6xxx/chip.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index b989123cdbeb..3cddc8f084b3 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -6274,6 +6274,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { .g2_irqs = 10, .stats_type = STATS_TYPE_BANK0 | STATS_TYPE_BANK1, .atu_move_port_mask = 0xf, + .pvt = true, .multi_chip = true, .edsa_support = MV88E6XXX_EDSA_SUPPORTED, .ptp_support = true, From patchwork Mon Mar 17 17:32:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Beh=C3=BAn?= X-Patchwork-Id: 14019778 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 CEA581B042E for ; Mon, 17 Mar 2025 17:33:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742232784; cv=none; b=DizIERFOsB1RlaHgpTUalSLd/+tYtwyN8V7wq4PsH/B6JHvm/KAfcc7HKTzrxAXqVH86drt9+BNGaxo6rZfzls1bmyVY9qUX8FxF9db7vpDPwLY/8UI2qknUEXvqTRLOFg9ktnw55pe4ExeXzoV7PkC2IlxRAZDfNrMZwfHYHBs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742232784; c=relaxed/simple; bh=NZQewo8Vcue7b7MOZnDjfYQf4IrZrqq59kLs4AoFqD4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=JLqrTqKc3EiAwqjAoTPSvRhkMBQm9HwYGQVj6lt6UTro6YNuohyefrqD+Ekc48mAVBrrU1MDDr1Ne02AhddksNHPjMAPz8Q3Sdz1eDhECImmvMSE4KuiIswz+UYtEbl2t/qPn3nTiGn5dGQFX0d6f7d6NctbXAk67y2jKSDAfRk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=jvwdW+Su; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="jvwdW+Su" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7E19FC4CEE3; Mon, 17 Mar 2025 17:33:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742232784; bh=NZQewo8Vcue7b7MOZnDjfYQf4IrZrqq59kLs4AoFqD4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jvwdW+SurrHQjm+sUeW1DYF3Yp8AFHYDyg3haz48eUS1cDMybn3+sOFJ0hs0QZ9YA itx9EmjfInMh6E7DmyOMn4Z5quMWnkQfXTZL9JHQfPfNnXVk6ldlsXZZcFyg0g0RDi NfZ+WH49WxBLNKvDIxKevk3kUM1XhZktXcIg8wGcA2+KUBOS/kYkmPVEcG/GTxboTQ QsmDx06SYBQF4zuCc5zTUL6xwtSOMowCpffY8uiYb4s1oYnG48/piMwzMXsQPxfHks FLmXrXmQXoy35ip2tOMs2DbqOPwAgdr4kQUxX9IuV8nAh3lLdzgkYw9Y/xYlaHmRFA Ioq7UhHO9mGZQ== From: =?utf-8?q?Marek_Beh=C3=BAn?= To: Andrew Lunn , Vladimir Oltean , "Russell King (Oracle)" , Vivien Didelot , Tobias Waldekranz , netdev@vger.kernel.org Cc: Lev Olshvang , =?utf-8?q?Marek_Beh=C3=BAn?= Subject: [PATCH net v2 4/7] net: dsa: mv88e6xxx: enable .port_set_policy() for 6320 family Date: Mon, 17 Mar 2025 18:32:47 +0100 Message-ID: <20250317173250.28780-5-kabel@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250317173250.28780-1-kabel@kernel.org> References: <20250317173250.28780-1-kabel@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org Commit f3a2cd326e44 ("net: dsa: mv88e6xxx: introduce .port_set_policy") did not add the .port_set_policy() method for the 6320 family. Fix it. Fixes: f3a2cd326e44 ("net: dsa: mv88e6xxx: introduce .port_set_policy") Signed-off-by: Marek Behún Reviewed-by: Andrew Lunn --- drivers/net/dsa/mv88e6xxx/chip.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index 3cddc8f084b3..f886a69d7a3c 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -5145,6 +5145,7 @@ static const struct mv88e6xxx_ops mv88e6320_ops = { .port_set_rgmii_delay = mv88e6320_port_set_rgmii_delay, .port_set_speed_duplex = mv88e6185_port_set_speed_duplex, .port_tag_remap = mv88e6095_port_tag_remap, + .port_set_policy = mv88e6352_port_set_policy, .port_set_frame_mode = mv88e6351_port_set_frame_mode, .port_set_ucast_flood = mv88e6352_port_set_ucast_flood, .port_set_mcast_flood = mv88e6352_port_set_mcast_flood, @@ -5194,6 +5195,7 @@ static const struct mv88e6xxx_ops mv88e6321_ops = { .port_set_rgmii_delay = mv88e6320_port_set_rgmii_delay, .port_set_speed_duplex = mv88e6185_port_set_speed_duplex, .port_tag_remap = mv88e6095_port_tag_remap, + .port_set_policy = mv88e6352_port_set_policy, .port_set_frame_mode = mv88e6351_port_set_frame_mode, .port_set_ucast_flood = mv88e6352_port_set_ucast_flood, .port_set_mcast_flood = mv88e6352_port_set_mcast_flood, From patchwork Mon Mar 17 17:32:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Beh=C3=BAn?= X-Patchwork-Id: 14019779 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 992631ADFE3 for ; Mon, 17 Mar 2025 17:33:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742232786; cv=none; b=gZVHsq+NSPdWwCnSw61CmfmBosCEJsSoBaJxRLJJcFpepxtwku7RH/VyIBVdJ6kQ1XTrlCXW97dFRUIy8qyhJEgiVItaW7j96VGxMBz2PDMGQ8gAufjXcoT9/tGf7Qf3KRQLXijX9hS7zC6KT2XPsufjmgOfO+e31YRkk05Xqxs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742232786; c=relaxed/simple; bh=CJ0DTtJu0lCADeOFimn/h8eYkgpKoeQ0+seX7fokLs4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=pIeYMZwfXQr9rYwo0r6nfBTV6n1HgArAKCxKrB2jU+tckCT2lKvaxp+WPsOkA6Qgw3n+We8jwi3khzU0cGPgMRigSAhMTqGXNBz4Sl4oyNWod/uNd/jaFZGUtHNbqtWREOLECeYRhkV9kvg2UTesAQ8ULh4xYA7Cd/FbPJRvNjw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dNed6vg1; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="dNed6vg1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B4474C4CEED; Mon, 17 Mar 2025 17:33:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742232786; bh=CJ0DTtJu0lCADeOFimn/h8eYkgpKoeQ0+seX7fokLs4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dNed6vg1tuHGf8P9fAU+gicu72uXuS4WDEK72ZlDz4FXETQPzLPT1WwOHufUTSTqU 9Q1jGGAlmXpO5bHI6swNTXjdUCOwGnwsHJsxUBipOCbsXV/7OgtkwFK5kUsFMGefVN KrimsUaNOlgpXlcWxcsftRv+25cICj+F93xgQpORoYS7YypWQn589o8GHBATM+EFEJ FHus+T+nc1WvxHHNp5PPY5ikKtFxu2RsTHxSSsvbopvkR9qw9sv6M4Bc2AoaygFc8t fsTJpJWO0FaOIei1+AXOQTE4kNiqI1YZpVGlxFac1gtBkmmvki9Mj8ATIo1SJPfKiZ uyF9C6DLzJO1g== From: =?utf-8?q?Marek_Beh=C3=BAn?= To: Andrew Lunn , Vladimir Oltean , "Russell King (Oracle)" , Vivien Didelot , Tobias Waldekranz , netdev@vger.kernel.org Cc: Lev Olshvang , =?utf-8?q?Marek_Beh=C3=BAn?= Subject: [PATCH net v2 5/7] net: dsa: mv88e6xxx: enable STU methods for 6320 family Date: Mon, 17 Mar 2025 18:32:48 +0100 Message-ID: <20250317173250.28780-6-kabel@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250317173250.28780-1-kabel@kernel.org> References: <20250317173250.28780-1-kabel@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org Commit c050f5e91b47 ("net: dsa: mv88e6xxx: Fill in STU support for all supported chips") introduced STU methods, but did not add them to the 6320 family. Fix it. Fixes: c050f5e91b47 ("net: dsa: mv88e6xxx: Fill in STU support for all supported chips") Signed-off-by: Marek Behún Reviewed-by: Andrew Lunn --- drivers/net/dsa/mv88e6xxx/chip.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index f886a69d7a3c..74b8bae226e4 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -5172,6 +5172,8 @@ static const struct mv88e6xxx_ops mv88e6320_ops = { .reset = mv88e6352_g1_reset, .vtu_getnext = mv88e6352_g1_vtu_getnext, .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge, + .stu_getnext = mv88e6352_g1_stu_getnext, + .stu_loadpurge = mv88e6352_g1_stu_loadpurge, .gpio_ops = &mv88e6352_gpio_ops, .avb_ops = &mv88e6352_avb_ops, .ptp_ops = &mv88e6352_ptp_ops, @@ -5221,6 +5223,8 @@ static const struct mv88e6xxx_ops mv88e6321_ops = { .reset = mv88e6352_g1_reset, .vtu_getnext = mv88e6352_g1_vtu_getnext, .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge, + .stu_getnext = mv88e6352_g1_stu_getnext, + .stu_loadpurge = mv88e6352_g1_stu_loadpurge, .gpio_ops = &mv88e6352_gpio_ops, .avb_ops = &mv88e6352_avb_ops, .ptp_ops = &mv88e6352_ptp_ops, @@ -6241,6 +6245,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { .num_internal_phys = 5, .num_gpio = 15, .max_vid = 4095, + .max_sid = 63, .port_base_addr = 0x10, .phy_base_addr = 0x0, .global1_addr = 0x1b, @@ -6267,6 +6272,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { .num_internal_phys = 5, .num_gpio = 15, .max_vid = 4095, + .max_sid = 63, .port_base_addr = 0x10, .phy_base_addr = 0x0, .global1_addr = 0x1b, From patchwork Mon Mar 17 17:32:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Beh=C3=BAn?= X-Patchwork-Id: 14019780 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 129981B3939; Mon, 17 Mar 2025 17:33:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742232789; cv=none; b=B+4AsSvOcbmIpJFIoUxxFHusi0163iKQwVD+Rbl46nl5yPtQwsjV3BLh3KlvJo2bAqtRykqUeO5MIl4oL4QF8em4ojmz6WXhEgXwFmU8RpkIR95ztqwBEyLfOTYWmtS2r4DCbB4snvdqYfrZahJJfK/biIJX8sVl8/YqL3ZLjGo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742232789; c=relaxed/simple; bh=wERbn4kBmMeAPJCDjs03pPXuCHSsoNStUceXsER8kfY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=nCWfHv0tBDThws+avyalKEdMwjSeKZaNTe3qapiVokZwfWdh8798zYAQdRB8dOYFTwug+vrgyxAxmKA0bVyJH7Fb9SvxJjUyA4BGiUGsCCQDfcLQu754ytZZz87/TD6E9ik/9+UpOhFHIQQMrsJ9hQx9pOHreY4aI8OUaAQckPI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=c29/RMJm; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="c29/RMJm" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E9DFDC4CEEC; Mon, 17 Mar 2025 17:33:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742232788; bh=wERbn4kBmMeAPJCDjs03pPXuCHSsoNStUceXsER8kfY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c29/RMJmA2Qn1op7meFNHGcS3taIA6oFQyis3TENTVDak/fX5dawK/Kg5Q6zwXhAo K5KvWEX2weUC+mNVK3hzyX6BrIHebDPZ0MO8VPaeKIUrnEUxBJ9cfmhIG+hVKVmYCb duYJUfOPYI6M5kcUOr58B5JgfetjFD1LRya+gQ4R1+wweXe86/sUjYChpNjC9t7Uuc PulWntsOPFm4tCVimby8ZY2CGXa8Sbm26952b5Gxy7/a915ot4LidEPExx1vxdu+yh 34v5njjrLzldp3gXIKTGDyHyFhQ1w/AJK6LoNM0AcFtdCJPrg+vm68UdqxJmSDW1Ml 9/Lsozk//3FDQ== From: =?utf-8?q?Marek_Beh=C3=BAn?= To: Andrew Lunn , Vladimir Oltean , "Russell King (Oracle)" , Vivien Didelot , Tobias Waldekranz , netdev@vger.kernel.org Cc: Lev Olshvang , =?utf-8?q?Marek_Beh=C3=BAn?= , stable@vger.kernel.org Subject: [PATCH net v2 6/7] net: dsa: mv88e6xxx: fix internal PHYs for 6320 family Date: Mon, 17 Mar 2025 18:32:49 +0100 Message-ID: <20250317173250.28780-7-kabel@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250317173250.28780-1-kabel@kernel.org> References: <20250317173250.28780-1-kabel@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org Fix internal PHYs definition for the 6320 family, which has only 2 internal PHYs (on ports 3 and 4). Fixes: bc3931557d1d ("net: dsa: mv88e6xxx: Add number of internal PHYs") Signed-off-by: Marek Behún Cc: # 6.6.x Reviewed-by: Andrew Lunn --- drivers/net/dsa/mv88e6xxx/chip.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index 74b8bae226e4..88f479dc328c 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -6242,7 +6242,8 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { .num_databases = 4096, .num_macs = 8192, .num_ports = 7, - .num_internal_phys = 5, + .num_internal_phys = 2, + .internal_phys_offset = 3, .num_gpio = 15, .max_vid = 4095, .max_sid = 63, @@ -6269,7 +6270,8 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { .num_databases = 4096, .num_macs = 8192, .num_ports = 7, - .num_internal_phys = 5, + .num_internal_phys = 2, + .internal_phys_offset = 3, .num_gpio = 15, .max_vid = 4095, .max_sid = 63, From patchwork Mon Mar 17 17:32:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Beh=C3=BAn?= X-Patchwork-Id: 14019781 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 CA4AD1A2C0B; Mon, 17 Mar 2025 17:33:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742232791; cv=none; b=KmEPen63diUo23YbwaOXHVjjbAL7h5e85QnEgHMGmB8IW5Hpn35im9gHin/2UnBx/vEDsZZn9gZe5iKRkH1kTtHxNeSp1BmYtPxPVUNAaBnVe0ifb9u/f85lEJ4oR2Fd72OOCxr0gRHx4H604kW+uy9FFJ1Rh9abhds9BkXMaUU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742232791; c=relaxed/simple; bh=A7r/Ot+sHsy8b4fRDlo5i7NL+lCmZuAEK2cuxuluGNw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Gf/ooPJtm32HQvC4msmYSvVEkHtfLNvCvG6hALymnyHkHQZ41qd4RcXKGaE8IJgnINVIcUXZPT8EHOBzigtXKfu98QucwHmgtKkbVJMHllSZJ15ewwdyxcbVgmfN4i1tHLBwxZBdh2/Zt6kIpDd1uIoUjF/p6cOfRt9wUjDrFI4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=TNAyDWIr; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="TNAyDWIr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 57D65C4CEE3; Mon, 17 Mar 2025 17:33:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742232791; bh=A7r/Ot+sHsy8b4fRDlo5i7NL+lCmZuAEK2cuxuluGNw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TNAyDWIrOyEij3Tm4qO0UYmTyVzbN5jGKWcfXolrsbGVF357HNN/i8TlJJJ424a4S NrCA7PWYaLnU4wLYu/WGYBES7BF3KDt8xsdAg8XVZeJvOEqpTbPcBeoOL373QUsMde LQchtZjttwsa3f3M0rPYewXXcefNL0jPCpv/KvlLDI6cx4csl9xg/CxKI7Qw4z7CG7 RcyvZobqOrh0eVHAaBNRDxJ5Px7hC346wKXkdrkUADfbtQ1d3PitAOoaYC2mqWoRdO qGiIPupGo79MoBuoMiC09qpkv0S+WC+F4YpcYBk8J6Bf30/Ln3Iz0rqMEGVGVlThNU QedBDziDtJQ/A== From: =?utf-8?q?Marek_Beh=C3=BAn?= To: Andrew Lunn , Vladimir Oltean , "Russell King (Oracle)" , Vivien Didelot , Tobias Waldekranz , netdev@vger.kernel.org Cc: Lev Olshvang , =?utf-8?q?Marek_Beh=C3=BAn?= , stable@vger.kernel.org Subject: [PATCH net v2 7/7] net: dsa: mv88e6xxx: workaround RGMII transmit delay erratum for 6320 family Date: Mon, 17 Mar 2025 18:32:50 +0100 Message-ID: <20250317173250.28780-8-kabel@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250317173250.28780-1-kabel@kernel.org> References: <20250317173250.28780-1-kabel@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org Implement the workaround for erratum 3.3 RGMII timing may be out of spec when transmit delay is enabled for the 6320 family, which says: When transmit delay is enabled via Port register 1 bit 14 = 1, duty cycle may be out of spec. Under very rare conditions this may cause the attached device receive CRC errors. Signed-off-by: Marek Behún Cc: # 5.4.x Reviewed-by: Andrew Lunn --- drivers/net/dsa/mv88e6xxx/chip.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index 88f479dc328c..901929f96b38 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -3674,6 +3674,21 @@ static int mv88e6xxx_stats_setup(struct mv88e6xxx_chip *chip) return mv88e6xxx_g1_stats_clear(chip); } +static int mv88e6320_setup_errata(struct mv88e6xxx_chip *chip) +{ + u16 dummy; + int err; + + /* Workaround for erratum + * 3.3 RGMII timing may be out of spec when transmit delay is enabled + */ + err = mv88e6xxx_port_hidden_write(chip, 0, 0xf, 0x7, 0xe000); + if (err) + return err; + + return mv88e6xxx_port_hidden_read(chip, 0, 0xf, 0x7, &dummy); +} + /* Check if the errata has already been applied. */ static bool mv88e6390_setup_errata_applied(struct mv88e6xxx_chip *chip) { @@ -5130,6 +5145,7 @@ static const struct mv88e6xxx_ops mv88e6290_ops = { static const struct mv88e6xxx_ops mv88e6320_ops = { /* MV88E6XXX_FAMILY_6320 */ + .setup_errata = mv88e6320_setup_errata, .ieee_pri_map = mv88e6085_g1_ieee_pri_map, .ip_pri_map = mv88e6085_g1_ip_pri_map, .irl_init_all = mv88e6352_g2_irl_init_all, @@ -5182,6 +5198,7 @@ static const struct mv88e6xxx_ops mv88e6320_ops = { static const struct mv88e6xxx_ops mv88e6321_ops = { /* MV88E6XXX_FAMILY_6320 */ + .setup_errata = mv88e6320_setup_errata, .ieee_pri_map = mv88e6085_g1_ieee_pri_map, .ip_pri_map = mv88e6085_g1_ip_pri_map, .irl_init_all = mv88e6352_g2_irl_init_all,