From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yw1-f170.google.com (mail-yw1-f170.google.com [209.85.128.170]) (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 2E7133B2FDC for ; Fri, 5 Jun 2026 04:56:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780635415; cv=none; b=DX2fTXjMijDIqp++9Jzj9EVXu+RtN1x37taXY+WmYogqLlfte1TGtsXK7/X90c91I8x+VPjO5AZ6haKIOnXvLQYOAAsVvsFrc45q0QAKt2C8vuQkFKJ99IfUtB++MgBPvX+9IL8EiiB5qMgwFgn4tFTLl/uifTXSJw0CVfPf81M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780635415; c=relaxed/simple; bh=mWtqvokkNY0OMKtPyvUg9pSyjnftJ/9lXl/rcD/dICM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KMtFA3qkuNWJDwv8TPiXuHVIra5dE7f1OVQRhfmjWI7DKq3PqnUIdx8HfxvcP1LEQkE5RJUOiUDdhUnN/rGUSOOsSx8Hd01hoPIsnjn+wq7iItuBW+LZOsMlokDUMrx5rCfrdSA3iJ40QzrAq1H8ZMESYf1bE5xFj132ze1M+U4= 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=qihDW02b; arc=none smtp.client-ip=209.85.128.170 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="qihDW02b" Received: by mail-yw1-f170.google.com with SMTP id 00721157ae682-7e2fc11088dso13631857b3.2 for ; Thu, 04 Jun 2026 21:56:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780635412; x=1781240212; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=+HeBzSN7Bi1btALPQSDlRLmfvwWO13MW01wePrMLTlc=; b=qihDW02bu1gcP+RVzT1rKd6Tez6jYHzNCSoiDLGahh1H/3S1WVV4/thw6kNL3DkQGw Psbnxt4v4QaaEPzQY+DSBV0H4qV+A7yr3mgrnvi9smvZkzWfhffkzzwUyly+tdXGgECp pqtUBvJ32XvIhpScK0swQDpdre51zaNuQxEmvFpJYcQ4BzkI4eRX78vsoIvbzjKZG3Dq zuciRtIn4+aeJq6bPFUE2DEKkjylS4NoTFmNYvb7qtgd+xcYPPk6gZAL1NOc/v25dL0p HqiHQIcFzzA1l5CJRlG1K1uHCm29k1JgOwy1+fN9cWWRjtBC6ODF6VpzaUc3nM0N43OX yYWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780635412; x=1781240212; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=+HeBzSN7Bi1btALPQSDlRLmfvwWO13MW01wePrMLTlc=; b=Qv7qJD8+OB9rP8Nk1B+1S1As9eNuDSAaqlUt5IYj6qjvNr5LP4R2ZNEnd/sIgEpVrK 4LGvZFyWEWvgLXckGlalPY3MKO64BufTtpQd49kq8B129z+Ph5LSInmNbreQWt2QFyAS dWOoQrFL8fBqPpp3SuD3nPCTkGf38+arI50wfiQNuDH1XUzJiLC5seF38X2qWEOq6OsE vQa3k1a/RhmkVqYXLCwi6RlOGk9TjAMwbyP9ln7Y+wkPqBGqAEZ3qa+wrSsFaRltmOEf g9oem+5wK9vmXEEHygHKdi6e5z6wUb2JMDqSDbbc/1Tkca5o9QJbn9G0hQlNU74bQA7I g8fA== X-Forwarded-Encrypted: i=1; AFNElJ/IoFPQBFwlt+MmB1h1KFPlW/HYnUMyakt+nuWlcoLE4X9qzRZfX7l9gfgFEizJiAymsrT6gzavW/53qp4=@vger.kernel.org X-Gm-Message-State: AOJu0YzBe7R4HkphBXIwwjQaOpUGzw6r+AAoPwaBYXCqlW5ZS+bTCULc x6RC/KxfLSCOd0Isk2Hi6IFHiy/GWZrwWzHz7Dw4tBlW0kuPAikABl7R X-Gm-Gg: Acq92OFOHpgk9OuzVGsRv6Y4rqP3Y8lifXFkJLk4+864xcWwE4ysRPZNaEPkdfEYDH/ Wx0kGof7rZfXfmsOA3JaZN2sIRiH7ZAlBrK80E1x5xaK5QqvHSioYHDVGvFmiSrIyFu/DTlaVB4 bvKt8Rqn54iykskpXSSC+mVp6qslG+8ec5lN7P8PDZkX+0+29YJy+OKjAy8f/ernuzWtmDL8mfc FhZD5BJP9096h3cn528sZTqKlhyVLTXF6RP2+lbfSD9BV4p4AjD/GBuZZvNYtpOQQVdM5biQ5xY UE9CVRHlL6y9PmOo4F03eJ61d0X9x7kYXWk0giI5FitdnM6rpsRQC/lgEnP8DlPfDR4FIlNfzhs 4UD1s//o9QTQNfnuSFP44uENxbP6dhDsxI/2txmh+TDRVZTCyJm5fZPn+rGdyVgnLvst1Uedqki q3HdBbe7ixR1YF/0UGxFP61EU/KDE6AcVRZUnFtoWTAfzbEnsjtg== X-Received: by 2002:a05:690c:6706:b0:7be:5f3e:5309 with SMTP id 00721157ae682-7ed0cee8e26mr17752967b3.38.1780635412187; Thu, 04 Jun 2026 21:56:52 -0700 (PDT) Received: from tresc054937.tre-sc.gov.br ([187.65.210.13]) by smtp.gmail.com with ESMTPSA id 00721157ae682-7ea215825d2sm45840207b3.16.2026.06.04.21.56.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jun 2026 21:56:50 -0700 (PDT) From: Luiz Angelo Daros de Luca Date: Fri, 05 Jun 2026 01:56:11 -0300 Subject: [net-next PATCH v12 3/9] net: dsa: realtek: rtl8365mb: use dsa helpers for port iteration Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260605-realtek_forward-v12-3-78eb7b31df72@gmail.com> References: <20260605-realtek_forward-v12-0-78eb7b31df72@gmail.com> In-Reply-To: <20260605-realtek_forward-v12-0-78eb7b31df72@gmail.com> To: Andrew Lunn , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Linus Walleij , =?utf-8?q?Alvin_=C5=A0ipraga?= , Yury Norov , Rasmus Villemoes , Russell King Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Abdulkader Alrezej , Mieczyslaw Nalewaj , Luiz Angelo Daros de Luca X-Mailer: b4 0.15.2 Convert open-coded port iteration loops to use the DSA helpers and restructure rtl8365mb_setup() into clear blocking, user, and CPU port phases. As part of this refactoring, unused ports are explicitly placed into a blocked, isolated state with learning disabled, ensuring safe default hardware behavior. The driver also does not allocate a virtual IRQ mapping for unused ports. To accommodate this, a guard check is added to the interrupt handler (rtl8365mb_irq) to safely skip ports without a valid IRQ mapping. The irq domain teardown, however, does clean all ports as external PHYs may still map the IRQ. Furthermore, since the new initialization loop starts with all ports administratively isolated by default, CPU port forwarding and isolation masks are explicitly configured at the end of the setup phase to prevent egress traffic from being blocked. Suggested-by: Abdulkader Alrezej Reviewed-by: Linus Walleij Reviewed-by: Mieczyslaw Nalewaj Signed-off-by: Luiz Angelo Daros de Luca --- drivers/net/dsa/realtek/rtl8365mb.c | 166 +++++++++++++++++++++++------------- 1 file changed, 105 insertions(+), 61 deletions(-) diff --git a/drivers/net/dsa/realtek/rtl8365mb.c b/drivers/net/dsa/realtek/rtl8365mb.c index 37e1d7654b1d..14fee2a3001b 100644 --- a/drivers/net/dsa/realtek/rtl8365mb.c +++ b/drivers/net/dsa/realtek/rtl8365mb.c @@ -1554,18 +1554,15 @@ static void rtl8365mb_stats_setup(struct realtek_priv *priv) { struct rtl8365mb *mb = priv->chip_data; struct dsa_switch *ds = &priv->ds; - int i; + struct dsa_port *dp; /* Per-chip global mutex to protect MIB counter access, since doing * so requires accessing a series of registers in a particular order. */ mutex_init(&mb->mib_lock); - for (i = 0; i < priv->num_ports; i++) { - struct rtl8365mb_port *p = &mb->ports[i]; - - if (dsa_is_unused_port(ds, i)) - continue; + dsa_switch_for_each_available_port(dp, ds) { + struct rtl8365mb_port *p = &mb->ports[dp->index]; /* Per-port spinlock to protect the stats64 data */ spin_lock_init(&p->stats_lock); @@ -1581,13 +1578,10 @@ static void rtl8365mb_stats_teardown(struct realtek_priv *priv) { struct rtl8365mb *mb = priv->chip_data; struct dsa_switch *ds = &priv->ds; - int i; - - for (i = 0; i < priv->num_ports; i++) { - struct rtl8365mb_port *p = &mb->ports[i]; + struct dsa_port *dp; - if (dsa_is_unused_port(ds, i)) - continue; + dsa_switch_for_each_available_port(dp, ds) { + struct rtl8365mb_port *p = &mb->ports[dp->index]; cancel_delayed_work_sync(&p->mib_work); } @@ -1646,6 +1640,9 @@ static irqreturn_t rtl8365mb_irq(int irq, void *data) for_each_set_bit(line, &line_changes, priv->num_ports) { int child_irq = irq_find_mapping(priv->irqdomain, line); + if (!child_irq) + continue; + handle_nested_irq(child_irq); } @@ -1667,10 +1664,14 @@ static struct irq_chip rtl8365mb_irq_chip = { static int rtl8365mb_irq_map(struct irq_domain *domain, unsigned int irq, irq_hw_number_t hwirq) { - irq_set_chip_data(irq, domain->host_data); + struct realtek_priv *priv = domain->host_data; + struct rtl8365mb *mb = priv->chip_data; + + irq_set_chip_data(irq, priv); irq_set_chip_and_handler(irq, &rtl8365mb_irq_chip, handle_simple_irq); irq_set_nested_thread(irq, 1); irq_set_noprobe(irq); + irq_set_parent(irq, mb->irq); return 0; } @@ -1709,13 +1710,14 @@ static int rtl8365mb_irq_disable(struct realtek_priv *priv) static int rtl8365mb_irq_setup(struct realtek_priv *priv) { struct rtl8365mb *mb = priv->chip_data; + struct dsa_switch *ds = &priv->ds; struct device_node *intc; + struct dsa_port *dp; u32 irq_trig; int virq; int irq; u32 val; int ret; - int i; intc = of_get_child_by_name(priv->dev->of_node, "interrupt-controller"); if (!intc) { @@ -1736,6 +1738,9 @@ static int rtl8365mb_irq_setup(struct realtek_priv *priv) goto out_put_node; } + /* Store the irq so that we know to map and free it during teardown */ + mb->irq = irq; + priv->irqdomain = irq_domain_create_linear(of_fwnode_handle(intc), priv->num_ports, &rtl8365mb_irqdomain_ops, priv); if (!priv->irqdomain) { @@ -1744,8 +1749,8 @@ static int rtl8365mb_irq_setup(struct realtek_priv *priv) goto out_put_node; } - for (i = 0; i < priv->num_ports; i++) { - virq = irq_create_mapping(priv->irqdomain, i); + dsa_switch_for_each_available_port(dp, ds) { + virq = irq_create_mapping(priv->irqdomain, dp->index); if (!virq) { dev_err(priv->dev, "failed to create irq domain mapping\n"); @@ -1799,9 +1804,6 @@ static int rtl8365mb_irq_setup(struct realtek_priv *priv) goto out_remove_irqdomain; } - /* Store the irq so that we know to free it during teardown */ - mb->irq = irq; - ret = rtl8365mb_irq_enable(priv); if (ret) goto out_free_irq; @@ -1812,18 +1814,20 @@ static int rtl8365mb_irq_setup(struct realtek_priv *priv) out_free_irq: free_irq(mb->irq, priv); - mb->irq = 0; out_remove_irqdomain: - for (i = 0; i < priv->num_ports; i++) { - virq = irq_find_mapping(priv->irqdomain, i); - irq_dispose_mapping(virq); + dsa_switch_for_each_port(dp, ds) { + virq = irq_find_mapping(priv->irqdomain, dp->index); + + if (virq) + irq_dispose_mapping(virq); } irq_domain_remove(priv->irqdomain); priv->irqdomain = NULL; out_put_node: + mb->irq = 0; of_node_put(intc); return ret; @@ -1832,8 +1836,9 @@ static int rtl8365mb_irq_setup(struct realtek_priv *priv) static void rtl8365mb_irq_teardown(struct realtek_priv *priv) { struct rtl8365mb *mb = priv->chip_data; + struct dsa_switch *ds = &priv->ds; + struct dsa_port *dp; int virq; - int i; if (mb->irq) { free_irq(mb->irq, priv); @@ -1841,9 +1846,15 @@ static void rtl8365mb_irq_teardown(struct realtek_priv *priv) } if (priv->irqdomain) { - for (i = 0; i < priv->num_ports; i++) { - virq = irq_find_mapping(priv->irqdomain, i); - irq_dispose_mapping(virq); + /* Unused ports with a linked PHY still have an active IRQ + * mapping that must be disposed of during teardown. Loop + * through all ports. + */ + dsa_switch_for_each_port(dp, ds) { + virq = irq_find_mapping(priv->irqdomain, dp->index); + + if (virq) + irq_dispose_mapping(virq); } irq_domain_remove(priv->irqdomain); @@ -1961,10 +1972,11 @@ static int rtl8365mb_setup(struct dsa_switch *ds) { struct realtek_priv *priv = ds->priv; struct rtl8365mb_cpu *cpu; - struct dsa_port *cpu_dp; + u32 downports_mask = 0; + u32 upports_mask = 0; struct rtl8365mb *mb; + struct dsa_port *dp; int ret; - int i; mb = priv->chip_data; cpu = &mb->cpu; @@ -1991,67 +2003,99 @@ static int rtl8365mb_setup(struct dsa_switch *ds) else if (ret) dev_info(priv->dev, "no interrupt support\n"); - for (i = 0; i < priv->num_ports; i++) { + dsa_switch_for_each_port(dp, ds) { /* Cascading (DSA links) is not supported yet. * Historically, the driver has always been broken * without a dedicated CPU port because CPU tagging * would be disabled, rendering the switch entirely * non-functional for DSA operations. */ - if (dsa_is_dsa_port(ds, i)) { + if (dsa_port_is_dsa(dp)) { dev_err(priv->dev, "Cascading (DSA link) not supported\n"); ret = -EOPNOTSUPP; goto out_teardown_irq; } } - /* Configure CPU tagging */ - dsa_switch_for_each_cpu_port(cpu_dp, ds) { - cpu->mask |= BIT(cpu_dp->index); + /* Start with all ports blocked, including unused ports */ + dsa_switch_for_each_port(dp, ds) { + struct rtl8365mb_port *p = &mb->ports[dp->index]; - if (cpu->trap_port == RTL8365MB_MAX_NUM_PORTS) - cpu->trap_port = cpu_dp->index; - } - cpu->enable = cpu->mask > 0; + /* Set the initial STP state of all ports to DISABLED, otherwise + * ports will still forward frames to the CPU despite being + * administratively down by default. + */ + rtl8365mb_port_stp_state_set(ds, dp->index, BR_STATE_DISABLED); - if (!cpu->enable) { - dev_err(priv->dev, "no CPU port defined\n"); - ret = -EINVAL; - goto out_teardown_irq; - } + /* Start with all port completely isolated */ + ret = rtl8365mb_port_set_isolation(priv, dp->index, 0); + if (ret) + goto out_teardown_irq; - ret = rtl8365mb_cpu_config(priv); - if (ret) - goto out_teardown_irq; + /* Disable learning */ + ret = rtl8365mb_port_set_learning(priv, dp->index, false); + if (ret) + goto out_teardown_irq; - /* Configure ports */ - for (i = 0; i < priv->num_ports; i++) { - struct rtl8365mb_port *p = &mb->ports[i]; + /* Set up per-port private data */ + p->priv = priv; + p->index = dp->index; + + /* Collect CPU ports. If we support cascade switches, it should + * also include the upstream DSA ports. + */ + if (!dsa_port_is_cpu(dp)) + continue; + + upports_mask |= BIT(dp->index); + } - if (dsa_is_unused_port(ds, i)) + /* Configure user ports */ + dsa_switch_for_each_port(dp, ds) { + if (!dsa_port_is_user(dp)) continue; /* Forward only to the CPU */ - ret = rtl8365mb_port_set_isolation(priv, i, cpu->mask); + ret = rtl8365mb_port_set_isolation(priv, dp->index, + upports_mask); if (ret) goto out_teardown_irq; - /* Disable learning */ - ret = rtl8365mb_port_set_learning(priv, i, false); + /* If we support cascade switches, it should also include the + * downstream DSA ports. + */ + downports_mask |= BIT(dp->index); + } + + /* Configure CPU tagging */ + /* If we support cascade switches, it should also include the upstream + * DSA ports. + */ + dsa_switch_for_each_cpu_port(dp, ds) { + /* Use the first CPU port as trap_port */ + if (cpu->trap_port == RTL8365MB_MAX_NUM_PORTS) + cpu->trap_port = dp->index; + + /* Forward to all user ports */ + ret = rtl8365mb_port_set_isolation(priv, dp->index, + downports_mask); if (ret) goto out_teardown_irq; + } - /* Set the initial STP state of all ports to DISABLED, otherwise - * ports will still forward frames to the CPU despite being - * administratively down by default. - */ - rtl8365mb_port_stp_state_set(ds, i, BR_STATE_DISABLED); + cpu->mask = upports_mask; + cpu->enable = cpu->mask > 0; - /* Set up per-port private data */ - p->priv = priv; - p->index = i; + if (!cpu->enable) { + dev_err(priv->dev, "no CPU port defined\n"); + ret = -EINVAL; + goto out_teardown_irq; } + ret = rtl8365mb_cpu_config(priv); + if (ret) + goto out_teardown_irq; + ret = rtl8365mb_port_change_mtu(ds, cpu->trap_port, ETH_DATA_LEN); if (ret) goto out_teardown_irq; -- 2.54.0