mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-29 18:19:02 +00:00
d59d69f9e1
Manually rebased:
backport-5.15/704-15-v5.19-net-mtk_eth_soc-move-MAC_MCR-setting-to-mac_finish.patch
Removed upstreamed:
backport-5.15/060-v6.0-01-tools-build-Add-feature-test-for-init_disassemble_in.patch[1]
backport-5.15/060-v6.0-02-tools-include-add-dis-asm-compat.h-to-handle-version.patch[2]
backport-5.15/060-v6.0-03-tools-perf-Fix-compilation-error-with-new-binutils.patch[3]
backport-5.15/060-v6.0-04-tools-bpf_jit_disasm-Fix-compilation-error-with-new-.patch[4]
backport-5.15/060-v6.0-05-tools-bpftool-Fix-compilation-error-with-new-binutil.patch[5]
pending-5.15/733-02-net-ethernet-mtk_eth_soc-fix-RX-data-corruption-issu.patch[6]
bcm47xx/patches-5.15/170-bgmac-fix-initial-chip-reset-to-support-BCM5358.patch[7]
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=51b99dc38c1a053e2e732d7f9e2740e343ae7eae
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=451c9d7b16169645ed291ebb2ca9844caa088f2d
3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=97f005c0bdbaf656a7808586d234965385a06c58
4. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=1c27fab243333821375e4d63128d60093fdbe149
5. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=4441a90091931fd81607567961dc122f24f735bb
6. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=2adc29350a5b4669544566f71f208d2abaec60ab
7. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=04bfc5bcdfc0fdb73587487c71b04d63807ae15a
Build system: x86_64
Build-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod
Run-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod
Signed-off-by: John Audia <therealgraysky@proton.me>
76 lines
2.3 KiB
Diff
76 lines
2.3 KiB
Diff
From 1f0dfd443eea7fc3e818e96f7c8264913ba41859 Mon Sep 17 00:00:00 2001
|
|
From: Frank Wunderlich <frank-w@public-files.de>
|
|
Date: Fri, 10 Jun 2022 19:05:38 +0200
|
|
Subject: [PATCH 12/13] net: dsa: mt7530: rework mt753[01]_setup
|
|
|
|
Enumerate available cpu-ports instead of using hardcoded constant.
|
|
|
|
Suggested-by: Vladimir Oltean <olteanv@gmail.com>
|
|
Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
|
|
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
|
|
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/dsa/mt7530.c | 25 +++++++++++++++++++++----
|
|
1 file changed, 21 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/net/dsa/mt7530.c
|
|
+++ b/drivers/net/dsa/mt7530.c
|
|
@@ -2105,11 +2105,12 @@ static int
|
|
mt7530_setup(struct dsa_switch *ds)
|
|
{
|
|
struct mt7530_priv *priv = ds->priv;
|
|
+ struct device_node *dn = NULL;
|
|
struct device_node *phy_node;
|
|
struct device_node *mac_np;
|
|
struct mt7530_dummy_poll p;
|
|
phy_interface_t interface;
|
|
- struct device_node *dn;
|
|
+ struct dsa_port *cpu_dp;
|
|
u32 id, val;
|
|
int ret, i;
|
|
|
|
@@ -2117,7 +2118,19 @@ mt7530_setup(struct dsa_switch *ds)
|
|
* controller also is the container for two GMACs nodes representing
|
|
* as two netdev instances.
|
|
*/
|
|
- dn = dsa_to_port(ds, MT7530_CPU_PORT)->master->dev.of_node->parent;
|
|
+ dsa_switch_for_each_cpu_port(cpu_dp, ds) {
|
|
+ dn = cpu_dp->master->dev.of_node->parent;
|
|
+ /* It doesn't matter which CPU port is found first,
|
|
+ * their masters should share the same parent OF node
|
|
+ */
|
|
+ break;
|
|
+ }
|
|
+
|
|
+ if (!dn) {
|
|
+ dev_err(ds->dev, "parent OF node of DSA master not found");
|
|
+ return -EINVAL;
|
|
+ }
|
|
+
|
|
ds->assisted_learning_on_cpu_port = true;
|
|
ds->mtu_enforcement_ingress = true;
|
|
|
|
@@ -2281,6 +2294,7 @@ mt7531_setup(struct dsa_switch *ds)
|
|
{
|
|
struct mt7530_priv *priv = ds->priv;
|
|
struct mt7530_dummy_poll p;
|
|
+ struct dsa_port *cpu_dp;
|
|
u32 val, id;
|
|
int ret, i;
|
|
|
|
@@ -2355,8 +2369,11 @@ mt7531_setup(struct dsa_switch *ds)
|
|
CORE_PLL_GROUP4, val);
|
|
|
|
/* BPDU to CPU port */
|
|
- mt7530_rmw(priv, MT7531_CFC, MT7531_CPU_PMAP_MASK,
|
|
- BIT(MT7530_CPU_PORT));
|
|
+ dsa_switch_for_each_cpu_port(cpu_dp, ds) {
|
|
+ mt7530_rmw(priv, MT7531_CFC, MT7531_CPU_PMAP_MASK,
|
|
+ BIT(cpu_dp->index));
|
|
+ break;
|
|
+ }
|
|
mt7530_rmw(priv, MT753X_BPC, MT753X_BPDU_PORT_FW_MASK,
|
|
MT753X_BPDU_CPU_ONLY);
|
|
|