From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from relay.smtp-ext.broadcom.com (relay.smtp-ext.broadcom.com [192.19.166.231]) (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 2ADA84DD3A7; Tue, 22 Sep 2026 23:24:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.19.166.231 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790119496; cv=none; b=DMkGHANUfBF0MIWogrGiwZ+KUmUmRAF2cy7jefsPZOHDaAB+4BTwC5ASJE5DQMgRBmzBbR4YGZ6JrYh+EbAX+CESmHddXfG9Ujm9qASi2AL4agJpmXpInw1pRVjV0PjhHuqs9/SNfik3j0y2Zb5/z9pNuP7BH88pk/sGb+7r/Vk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790119496; c=relaxed/simple; bh=PxXs5ByY0xAMpGbGAZcXoQitZ5OzNulQmfjO483+Uh4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=G0V9F81gPvtF380bMDtzlIfrVK3xWc9K/06rvS1stTbSHXPoeR+8yQ0kY8xuJH7Dnga+78qieDojcP6zE4Db+rKLBs0NuOebWRwnTdxYLTDv4LT3yIcYQ3+mE7y3kUVc3jSFcQmpFr61CiuOgzFAUCzKVbt2yoFVSLSGe+hQZkM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=rjsa3O6J; arc=none smtp.client-ip=192.19.166.231 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="rjsa3O6J" Received: from mail-lvn-it-01.broadcom.com (mail-lvn-it-01.lvn.broadcom.net [10.36.132.253]) by relay.smtp-ext.broadcom.com (Postfix) with ESMTP id 0B1BCC0000E4; Tue, 22 Sep 2026 16:24:47 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 relay.smtp-ext.broadcom.com 0B1BCC0000E4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1790119487; bh=PxXs5ByY0xAMpGbGAZcXoQitZ5OzNulQmfjO483+Uh4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rjsa3O6JOHtwwLVXZ9VEqiXltjieaLlpLYg6lGhhCLyeP1zRP6lsuFIKfp6F75ZUq CfuEPO0M2NIQsXG/Bl1Jw+tan59JHqVCQykA02q+nkgNviQABjV2yp3qpopZE6qz+J NJffKK2FatuGNY59PlAdCql5a0OLDV1K/SXJT6cs= Received: from stbirv-lnx-1.igp.broadcom.net (stbirv-lnx-1.igp.broadcom.net [10.67.48.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail-lvn-it-01.broadcom.com (Postfix) with ESMTPSA id DC0FEB06; Tue, 22 Sep 2026 16:24:46 -0700 (PDT) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , Doug Berger , Broadcom internal kernel review list , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Zak Kemble , Simon Horman , Ryo Takakura , linux-kernel@vger.kernel.org (open list), Nicolai Buchwitz Subject: [PATCH net v2 10/10] net: systemport: Update TDMA queue mapping dynamically on changeupper Date: Tue, 22 Sep 2026 16:24:40 -0700 Message-Id: <20260922232440.598918-11-florian.fainelli@broadcom.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260922232440.598918-1-florian.fainelli@broadcom.com> References: <20260922232440.598918-1-florian.fainelli@broadcom.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit When DSA upper devices are dynamically attached or detached while the master SYSTEMPORT interface is already up and running (netif_running()), bcm_sysport_map_queues() and bcm_sysport_unmap_queues() updated the internal software mappings but did not update the TDMA_DESC_RING_MAPPING hardware registers, because programming was previously deferred until bcm_sysport_init_tx_ring(). Update TDMA_DESC_RING_MAPPING registers immediately if netif_running() is true during map_queues and unmap_queues. Fixes: 1593cd40d785 ("net: systemport: use standard netdevice notifier to detect DSA presence") Assisted-by: LLM Signed-off-by: Florian Fainelli --- drivers/net/ethernet/broadcom/bcmsysport.c | 23 +++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c index dedd49ad6c4e..ca1b86953dba 100644 --- a/drivers/net/ethernet/broadcom/bcmsysport.c +++ b/drivers/net/ethernet/broadcom/bcmsysport.c @@ -2315,6 +2315,7 @@ static int bcm_sysport_map_queues(struct net_device *dev, struct bcm_sysport_tx_ring *ring; unsigned int num_tx_queues; unsigned int q, qp, port; + u32 reg; /* We can't be setting up queue inspection for non directly attached * switches @@ -2350,14 +2351,21 @@ static int bcm_sysport_map_queues(struct net_device *dev, if (ring->inspect) continue; - /* Just remember the mapping actual programming done - * during bcm_sysport_init_tx_ring - */ ring->switch_queue = qp; ring->switch_port = port; ring->inspect = true; if (qp + port * num_tx_queues < ARRAY_SIZE(priv->ring_map)) priv->ring_map[qp + port * num_tx_queues] = ring; + + if (netif_running(dev)) { + reg = tdma_readl(priv, TDMA_DESC_RING_MAPPING(q)); + reg &= ~(RING_QID_MASK | + RING_PORT_ID_MASK << RING_PORT_ID_SHIFT | + RING_IGNORE_STATUS); + reg |= (qp & RING_QID_MASK); + reg |= (port << RING_PORT_ID_SHIFT); + tdma_writel(priv, reg, TDMA_DESC_RING_MAPPING(q)); + } qp++; } @@ -2372,6 +2380,7 @@ static int bcm_sysport_unmap_queues(struct net_device *dev, struct bcm_sysport_tx_ring *ring; unsigned int num_tx_queues; unsigned int q, qp, port; + u32 reg; port = dp->index; @@ -2390,6 +2399,14 @@ static int bcm_sysport_unmap_queues(struct net_device *dev, qp = ring->switch_queue; if (qp + port * num_tx_queues < ARRAY_SIZE(priv->ring_map)) priv->ring_map[qp + port * num_tx_queues] = NULL; + + if (netif_running(dev)) { + reg = tdma_readl(priv, TDMA_DESC_RING_MAPPING(q)); + reg &= ~(RING_QID_MASK | + RING_PORT_ID_MASK << RING_PORT_ID_SHIFT); + reg |= RING_IGNORE_STATUS; + tdma_writel(priv, reg, TDMA_DESC_RING_MAPPING(q)); + } } return 0; -- 2.34.1