From patchwork Tue Mar 14 16:36:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= X-Patchwork-Id: 69732 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1867573wrd; Tue, 14 Mar 2023 09:51:18 -0700 (PDT) X-Google-Smtp-Source: AK7set/Ih4PoMegwyDFqxPexnVosPKH9vmqHVuzY9IWD+e0AMLdLwEVI754nu3LIm27yxmVyDR9o X-Received: by 2002:a17:90a:d3cc:b0:23b:4005:26ee with SMTP id d12-20020a17090ad3cc00b0023b400526eemr11064393pjw.46.1678812677778; Tue, 14 Mar 2023 09:51:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678812677; cv=none; d=google.com; s=arc-20160816; b=c0tYeYTRbutxXSO+pRyGmVMW/Qf5RVC9SDhggmEloCO4w6Oh6VM8rf+6+5ke4ElYzH FZeJXSoykIzBAqsiAePv01lEwezXhaBn6K70D/aKiTQ5i30I4u2L8d15GACZ+0pam6DP NE6/dtZD46NA8hUNNdxjjFNUVvznYTxpW2Ksmbo/AJeOOtuyZIsOWWF3DLBRKWdGGDuo 0DGpOsMvupgnSOsMET6gntdqxW0oBrrHtJuczTJNzc9/caDKbF7ww5IA5qHuP9zKrs10 KKrnpIH2jK9N/aQxX7NSq09+Sfe1mQddgU3gzRg6Lief+X6IwK74mwLXx+/iDVEFgsyg 4Lvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=eGYKzuFmpRY1YTOUdj3DCQXT7u9J0lqvKoXvHWMd1So=; b=m0MUzfqoTL79qBoEe6r14Cni6B33bfWPCfkdksfE5WEY9XeoREC/FXy6fHUW7fPRAp hq0YPdOoMQjc/6Tncs4VxUQMywqOOG1ghx4FuFc9MzU8Q+ktTbaTVId739Gg75OSk85t gmKTGudf1Ro/6hU/D4HZ4jlpzSSd3b8LejisveGKqsO3XLrKON+eSSg1G76BqwONlN2y 1i6ol+xJo9P7C+7ttwrGz1lCL6qZlug+TWocgxNcpox/H3fijfNzo5NwVe4GVEk1NKJs FdT0wIUowP39FsJugdwf845/BsHQk6J2VGPGJkEf3EB3ubYjhDiMrsfwq14/7R8zfy7L bsfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b="BF/ORxZT"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id lt21-20020a17090b355500b002333adf6321si2625294pjb.47.2023.03.14.09.51.04; Tue, 14 Mar 2023 09:51:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b="BF/ORxZT"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230190AbjCNQfM (ORCPT + 99 others); Tue, 14 Mar 2023 12:35:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229958AbjCNQer (ORCPT ); Tue, 14 Mar 2023 12:34:47 -0400 Received: from relay11.mail.gandi.net (relay11.mail.gandi.net [217.70.178.231]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7B4065B414; Tue, 14 Mar 2023 09:34:31 -0700 (PDT) Received: (Authenticated sender: clement.leger@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id 31ED3100013; Tue, 14 Mar 2023 16:34:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1678811669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eGYKzuFmpRY1YTOUdj3DCQXT7u9J0lqvKoXvHWMd1So=; b=BF/ORxZT5tDRVa1ahD8A4qRcYnLwhr6J+CcX2RHFnEYYHyBFUV+EbVELphVni05XqadlCT yMzD8Wem7NcrHJ3PghDfQC0pQdUeRatKfBZXVrkqzkOBNDPxCUUn5C7zGnxHgqGsRm15h3 97g7JVN+I8Z1iL8dNlKxvtnuTe6VsihMSx+WXgBgUd3vnNEv7Bhsy8Uglh2lL0unXUYS7C 4LdA9jhLEF0FsDVddG5BDO1JV/TFpXpt5HsaPnd0MKG54uzEDsq0vg/3hTGGdvFPjF/Chj IW+j65sHB1ZyiemqaD1V8QXbaFJvuXEU1QUdYTfigSS4rNPIy01zye1u624jWA== From: =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= To: Andrew Lunn , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= , Thomas Petazzoni , Herve Codina , =?utf-8?q?Miqu=C3=A8l_Raynal?= , Milan Stevanovic , Jimmy Lalande , Pascal Eberhard , Arun Ramadoss , linux-renesas-soc@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH RESEND net-next v4 1/3] net: dsa: rzn1-a5psw: use a5psw_reg_rmw() to modify flooding resolution Date: Tue, 14 Mar 2023 17:36:49 +0100 Message-Id: <20230314163651.242259-2-clement.leger@bootlin.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230314163651.242259-1-clement.leger@bootlin.com> References: <20230314163651.242259-1-clement.leger@bootlin.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760362682269992425?= X-GMAIL-MSGID: =?utf-8?q?1760362682269992425?= .port_bridge_flags will be added and allows to modify the flood mask independently for each port. Keeping the existing bridged_ports write in a5psw_flooding_set_resolution() would potentially messed up this. Use a read-modify-write to set that value and move bridged_ports handling in bridge_port_join/leave. Signed-off-by: Clément Léger Reviewed-by: Florian Fainelli Reviewed-by: Vladimir Oltean --- drivers/net/dsa/rzn1_a5psw.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/net/dsa/rzn1_a5psw.c b/drivers/net/dsa/rzn1_a5psw.c index 919027cf2012..7dcca15e0b11 100644 --- a/drivers/net/dsa/rzn1_a5psw.c +++ b/drivers/net/dsa/rzn1_a5psw.c @@ -299,13 +299,9 @@ static void a5psw_flooding_set_resolution(struct a5psw *a5psw, int port, A5PSW_MCAST_DEF_MASK}; int i; - if (set) - a5psw->bridged_ports |= BIT(port); - else - a5psw->bridged_ports &= ~BIT(port); - for (i = 0; i < ARRAY_SIZE(offsets); i++) - a5psw_reg_writel(a5psw, offsets[i], a5psw->bridged_ports); + a5psw_reg_rmw(a5psw, offsets[i], BIT(port), + set ? BIT(port) : 0); } static int a5psw_port_bridge_join(struct dsa_switch *ds, int port, @@ -326,6 +322,8 @@ static int a5psw_port_bridge_join(struct dsa_switch *ds, int port, a5psw_flooding_set_resolution(a5psw, port, true); a5psw_port_mgmtfwd_set(a5psw, port, false); + a5psw->bridged_ports |= BIT(port); + return 0; } @@ -334,6 +332,8 @@ static void a5psw_port_bridge_leave(struct dsa_switch *ds, int port, { struct a5psw *a5psw = ds->priv; + a5psw->bridged_ports &= ~BIT(port); + a5psw_flooding_set_resolution(a5psw, port, false); a5psw_port_mgmtfwd_set(a5psw, port, true); @@ -945,6 +945,8 @@ static int a5psw_probe(struct platform_device *pdev) if (IS_ERR(a5psw->base)) return PTR_ERR(a5psw->base); + a5psw->bridged_ports = BIT(A5PSW_CPU_PORT); + ret = a5psw_pcs_get(a5psw); if (ret) return ret;