From patchwork Wed Sep 29 21:03:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 12526589 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 084F4C433EF for ; Wed, 29 Sep 2021 21:07:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D9C3461381 for ; Wed, 29 Sep 2021 21:06:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346019AbhI2VIj (ORCPT ); Wed, 29 Sep 2021 17:08:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50866 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345622AbhI2VIi (ORCPT ); Wed, 29 Sep 2021 17:08:38 -0400 Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [IPv6:2a00:1450:4864:20::130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3173BC06161C for ; Wed, 29 Sep 2021 14:06:57 -0700 (PDT) Received: by mail-lf1-x130.google.com with SMTP id b20so16378625lfv.3 for ; Wed, 29 Sep 2021 14:06:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qWI4Ka7n0dQPnT0TU9YWQ06UE86yJzfw98UR0cjXhAs=; b=sve1s1NYfV8LKdtjDZJcKI0g55R/QRdpEVt7PgzFvk0gk62D4SYQ55qtejDYGfvIU2 HR4npCkP2G6Ny7GJic8GGkhp6pUX3iTJF+R2KAPrXN5mRc1D1eTwQfvhj0jes5piGDzT Rz2qWD5FfrkAPLvARIBphD+Qd7HmjaCD1MLKXPKjeDGXWI50TF5ubZwHLJxVO7Rsv8+E zE+5fbbhxc4LW54IHQ0ZbVpl1XtoUeOVFJ+JUpRbriQnPfOtd8hH3zgIecarsU30+JLx BbGsdqjTLR4HlJWXx7FqKwqwLv0B/qaNdz96/tqfxBP+Sf9UqvdhTbOLTXtXxfGofTKW DtmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qWI4Ka7n0dQPnT0TU9YWQ06UE86yJzfw98UR0cjXhAs=; b=tETbwSU1F27AH0YEKQXX0q87jnUsMHqS89ccfaq/oF5B+2AWBr3J2yqqVVk8+hnG4e GBfoWMUIiwkR4MQbUpck0TLfreII/zjRVI2KewlYbyq2unRzAGb0taFQK3H6WmIx6CO+ prThV5XRyre91iyoPXEeLXkAPvSe9uicmVOa/1fiRC1NCXFRXv7HlmfZx+pYzZx3DkY/ 4lorJSMD3WNDbcab8SCbN3WCcJTDyrSv3b6kDEyHMk9hgRD+Y1eiEVpCFbx2UJW2vIn9 XcXDCK/S38UPhJNx66W5w6Q6DJXiIB/8lCpr2gznSg+ywMfF46pzk+c8rWPNNtlNI/xR LvTw== X-Gm-Message-State: AOAM531SVK81CwKUxz4mg3bx3I6GO96U+Nh8xGpyTkpGLBd+WThRPxuo 1GXve7ra9JkiuLb+0bEEt4Kavg== X-Google-Smtp-Source: ABdhPJxchcvhxFwXhLHuhkk+QFtTCMVirQcfnW0iAHZFgGTqqoSyi9CANBBOZyvE43pPHRzl6ZMLdA== X-Received: by 2002:ac2:59c6:: with SMTP id x6mr1930673lfn.298.1632949615472; Wed, 29 Sep 2021 14:06:55 -0700 (PDT) Received: from localhost.localdomain (c-fdcc225c.014-348-6c756e10.bbcust.telenor.se. [92.34.204.253]) by smtp.gmail.com with ESMTPSA id s9sm112613lfp.291.2021.09.29.14.06.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Sep 2021 14:06:54 -0700 (PDT) From: Linus Walleij To: Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S . Miller" , Jakub Kicinski Cc: netdev@vger.kernel.org, Linus Walleij , =?utf-8?q?Alvin_=C5=A0ipraga?= , Mauri Sandberg , DENG Qingfang Subject: [PATCH net-next 1/4 v4] net: dsa: rtl8366rb: Support disabling learning Date: Wed, 29 Sep 2021 23:03:46 +0200 Message-Id: <20210929210349.130099-2-linus.walleij@linaro.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210929210349.130099-1-linus.walleij@linaro.org> References: <20210929210349.130099-1-linus.walleij@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org The RTL8366RB hardware supports disabling learning per-port so let's make use of this feature. Rename some unfortunately named registers in the process. Suggested-by: Vladimir Oltean Cc: Alvin Šipraga Cc: Mauri Sandberg Cc: Florian Fainelli Cc: DENG Qingfang Signed-off-by: Linus Walleij Reviewed-by: Vladimir Oltean --- ChangeLog v3->v4: - No changes, rebased on other patches. ChangeLog v2->v3: - Disable learning by default, learning will be turned on selectively using the callback. ChangeLog v1->v2: - New patch suggested by Vladimir. --- drivers/net/dsa/rtl8366rb.c | 50 ++++++++++++++++++++++++++++++++----- 1 file changed, 44 insertions(+), 6 deletions(-) diff --git a/drivers/net/dsa/rtl8366rb.c b/drivers/net/dsa/rtl8366rb.c index bb9d017c2f9f..b3056064b937 100644 --- a/drivers/net/dsa/rtl8366rb.c +++ b/drivers/net/dsa/rtl8366rb.c @@ -14,6 +14,7 @@ #include #include +#include #include #include #include @@ -42,9 +43,12 @@ /* Port Enable Control register */ #define RTL8366RB_PECR 0x0001 -/* Switch Security Control registers */ -#define RTL8366RB_SSCR0 0x0002 -#define RTL8366RB_SSCR1 0x0003 +/* Switch per-port learning disablement register */ +#define RTL8366RB_PORT_LEARNDIS_CTRL 0x0002 + +/* Security control, actually aging register */ +#define RTL8366RB_SECURITY_CTRL 0x0003 + #define RTL8366RB_SSCR2 0x0004 #define RTL8366RB_SSCR2_DROP_UNKNOWN_DA BIT(0) @@ -927,13 +931,14 @@ static int rtl8366rb_setup(struct dsa_switch *ds) /* layer 2 size, see rtl8366rb_change_mtu() */ rb->max_mtu[i] = 1532; - /* Enable learning for all ports */ - ret = regmap_write(smi->map, RTL8366RB_SSCR0, 0); + /* Disable learning for all ports */ + ret = regmap_write(smi->map, RTL8366RB_PORT_LEARNDIS_CTRL, + RTL8366RB_PORT_ALL); if (ret) return ret; /* Enable auto ageing for all ports */ - ret = regmap_write(smi->map, RTL8366RB_SSCR1, 0); + ret = regmap_write(smi->map, RTL8366RB_SECURITY_CTRL, 0); if (ret) return ret; @@ -1272,6 +1277,37 @@ static int rtl8366rb_vlan_filtering(struct dsa_switch *ds, int port, return ret; } +static int +rtl8366rb_port_pre_bridge_flags(struct dsa_switch *ds, int port, + struct switchdev_brport_flags flags, + struct netlink_ext_ack *extack) +{ + /* We support enabling/disabling learning */ + if (flags.mask & ~(BR_LEARNING)) + return -EINVAL; + + return 0; +} + +static int +rtl8366rb_port_bridge_flags(struct dsa_switch *ds, int port, + struct switchdev_brport_flags flags, + struct netlink_ext_ack *extack) +{ + struct realtek_smi *smi = ds->priv; + int ret; + + if (flags.mask & BR_LEARNING) { + ret = regmap_update_bits(smi->map, RTL8366RB_PORT_LEARNDIS_CTRL, + BIT(port), + (flags.val & BR_LEARNING) ? 0 : BIT(port)); + if (ret) + return ret; + } + + return 0; +} + static int rtl8366rb_change_mtu(struct dsa_switch *ds, int port, int new_mtu) { struct realtek_smi *smi = ds->priv; @@ -1682,6 +1718,8 @@ static const struct dsa_switch_ops rtl8366rb_switch_ops = { .port_vlan_del = rtl8366_vlan_del, .port_enable = rtl8366rb_port_enable, .port_disable = rtl8366rb_port_disable, + .port_pre_bridge_flags = rtl8366rb_port_pre_bridge_flags, + .port_bridge_flags = rtl8366rb_port_bridge_flags, .port_change_mtu = rtl8366rb_change_mtu, .port_max_mtu = rtl8366rb_max_mtu, }; From patchwork Wed Sep 29 21:03:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 12526591 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4A914C433EF for ; Wed, 29 Sep 2021 21:07:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 31182613A9 for ; Wed, 29 Sep 2021 21:07:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346399AbhI2VIn (ORCPT ); Wed, 29 Sep 2021 17:08:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50874 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345622AbhI2VIk (ORCPT ); Wed, 29 Sep 2021 17:08:40 -0400 Received: from mail-lf1-x129.google.com (mail-lf1-x129.google.com [IPv6:2a00:1450:4864:20::129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD716C06161C for ; Wed, 29 Sep 2021 14:06:58 -0700 (PDT) Received: by mail-lf1-x129.google.com with SMTP id e15so16197817lfr.10 for ; Wed, 29 Sep 2021 14:06:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=A16Q8X6j77E5oCaHJ/vqDItQyNAq42o/Cp5ylsoL1I4=; b=DeGSG/1vfgJbP0xompUzNaZBarbudv2K8owGvX3esH6MrLY4O2EZd9wCqlJrLD/lR7 KxgjmuLOtExkySp4Hq3anjlzkJcoXzzz1+0iS78kFG1CaLA87DgD3ZVTSzTC3zFSsImS JZjvNQ50ZaBxE14bN8vryLwJp0BDJL8VyYpmjm/H89DfcTy+/VJFTQDYyxCmof4lHtcr GQNoNykQKSape0ANuRxWtWv8Z5aa/p34N2HivCmMKC09cZbSTw4+lsZBHNWHnyvdoriM SxqRgPvVr0/55ih8dlpbzYFsiL5n5sqn66DlQvYsU08kzjlo0WHRy0/PDJVfXgwK6zEN sBoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=A16Q8X6j77E5oCaHJ/vqDItQyNAq42o/Cp5ylsoL1I4=; b=nPgZz7XPTrB3PQqBAkXeqZEYkKiZW2y7Yoju873Zto1L3pTr4HhpgON909JmBNV1IF vZKh/YM0qfIYGXPRLdizbJz+UKeMtQn/9xj/5EUgO6YHQ4AUQz6oJcDpLbWTMh7+5nPf e49Vrrotp2fGMf6rVGaYBJ2pTbDU2zYrynV0oTFOQn4w/TFZgQ+PqtMiRcTsXbcgGFF3 DfFbozTFjnHijDF4RQaDrumVVGnlUJuUfEACHL27OnASfgaUg04cwGowyBrlm/xWY0gq O3n2Jy59RqM7aeNXXIwxucnXDS2nMt/E9TTxdO2BsiSBOgVLFfGSeNHfJKBoCR56u5sK 9s7g== X-Gm-Message-State: AOAM532O6t53L9U5cn5OGHK6TFpFj4qFi0aPTbJgOlTJPLz/H4Q+43j4 AaGUMb8JSXJUTEcPTDPDoZg5aQ== X-Google-Smtp-Source: ABdhPJxg1EPQ8G4NpBKTNLQ9bcHz6Qu4HUGYoS3eYpRhIFTlyI1dHhcNa5yAja3fUEkReBEpLdpj/A== X-Received: by 2002:a2e:b890:: with SMTP id r16mr2140243ljp.157.1632949617083; Wed, 29 Sep 2021 14:06:57 -0700 (PDT) Received: from localhost.localdomain (c-fdcc225c.014-348-6c756e10.bbcust.telenor.se. [92.34.204.253]) by smtp.gmail.com with ESMTPSA id s9sm112613lfp.291.2021.09.29.14.06.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Sep 2021 14:06:56 -0700 (PDT) From: Linus Walleij To: Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S . Miller" , Jakub Kicinski Cc: netdev@vger.kernel.org, Linus Walleij , =?utf-8?q?Alvin_=C5=A0ipraga?= , Mauri Sandberg , DENG Qingfang Subject: [PATCH net-next 2/4 v4] net: dsa: rtl8366rb: Support flood control Date: Wed, 29 Sep 2021 23:03:47 +0200 Message-Id: <20210929210349.130099-3-linus.walleij@linaro.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210929210349.130099-1-linus.walleij@linaro.org> References: <20210929210349.130099-1-linus.walleij@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Now that we have implemented bridge flag handling we can easily support flood control as well so let's do it. Cc: Vladimir Oltean Cc: Alvin Šipraga Cc: Mauri Sandberg Cc: Florian Fainelli Cc: DENG Qingfang Signed-off-by: Linus Walleij --- ChangeLog v3->v4: - No changes, rebased on the other patches. ChangeLog v2->v3: - Move the UNMC under the multicast setting as it is related to multicast to unknown address. - Add some more registers from the API, unfortunately we don't know how to make use of them. - Use tabs for indentation in copypaste bug. - Since we don't know how to make the elaborate storm control work just mention flood control in the message. ChangeLog v1->v2: - New patch --- drivers/net/dsa/rtl8366rb.c | 55 +++++++++++++++++++++++++++++++++++-- 1 file changed, 53 insertions(+), 2 deletions(-) diff --git a/drivers/net/dsa/rtl8366rb.c b/drivers/net/dsa/rtl8366rb.c index b3056064b937..52e750ea790e 100644 --- a/drivers/net/dsa/rtl8366rb.c +++ b/drivers/net/dsa/rtl8366rb.c @@ -164,6 +164,26 @@ */ #define RTL8366RB_VLAN_INGRESS_CTRL2_REG 0x037f +/* Storm registers are for flood control + * + * 02e2 and 02e3 are defined in the header for the RTL8366RB API + * but there are no usage examples. The implementation only activates + * the filter per port in the CTRL registers. + */ +#define RTL8366RB_STORM_FILTERING_1_REG 0x02e2 +#define RTL8366RB_STORM_FILTERING_PERIOD_BIT BIT(0) +#define RTL8366RB_STORM_FILTERING_PERIOD_MSK GENMASK(1, 0) +#define RTL8366RB_STORM_FILTERING_COUNT_BIT BIT(1) +#define RTL8366RB_STORM_FILTERING_COUNT_MSK GENMASK(3, 2) +#define RTL8366RB_STORM_FILTERING_BC_BIT BIT(5) +#define RTL8366RB_STORM_FILTERING_2_REG 0x02e3 +#define RTL8366RB_STORM_FILTERING_MC_BIT BIT(0) +#define RTL8366RB_STORM_FILTERING_UNDA_BIT BIT(5) +#define RTL8366RB_STORM_BC_CTRL 0x03e0 +#define RTL8366RB_STORM_MC_CTRL 0x03e1 +#define RTL8366RB_STORM_UNDA_CTRL 0x03e2 +#define RTL8366RB_STORM_UNMC_CTRL 0x03e3 + /* LED control registers */ #define RTL8366RB_LED_BLINKRATE_REG 0x0430 #define RTL8366RB_LED_BLINKRATE_MASK 0x0007 @@ -1282,8 +1302,8 @@ rtl8366rb_port_pre_bridge_flags(struct dsa_switch *ds, int port, struct switchdev_brport_flags flags, struct netlink_ext_ack *extack) { - /* We support enabling/disabling learning */ - if (flags.mask & ~(BR_LEARNING)) + if (flags.mask & ~(BR_LEARNING | BR_BCAST_FLOOD | + BR_MCAST_FLOOD | BR_FLOOD)) return -EINVAL; return 0; @@ -1305,6 +1325,37 @@ rtl8366rb_port_bridge_flags(struct dsa_switch *ds, int port, return ret; } + if (flags.mask & BR_BCAST_FLOOD) { + ret = regmap_update_bits(smi->map, RTL8366RB_STORM_BC_CTRL, + BIT(port), + (flags.val & BR_BCAST_FLOOD) ? BIT(port) : 0); + if (ret) + return ret; + } + + if (flags.mask & BR_MCAST_FLOOD) { + ret = regmap_update_bits(smi->map, RTL8366RB_STORM_MC_CTRL, + BIT(port), + (flags.val & BR_MCAST_FLOOD) ? BIT(port) : 0); + if (ret) + return ret; + /* UNMC = Unknown multicast address */ + ret = regmap_update_bits(smi->map, RTL8366RB_STORM_UNMC_CTRL, + BIT(port), + (flags.val & BR_FLOOD) ? BIT(port) : 0); + if (ret) + return ret; + } + + if (flags.mask & BR_FLOOD) { + /* UNDA = Unknown destination address */ + ret = regmap_update_bits(smi->map, RTL8366RB_STORM_UNDA_CTRL, + BIT(port), + (flags.val & BR_FLOOD) ? BIT(port) : 0); + if (ret) + return ret; + } + return 0; } From patchwork Wed Sep 29 21:03:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 12526593 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1F2A3C433FE for ; Wed, 29 Sep 2021 21:07:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 082FD61381 for ; Wed, 29 Sep 2021 21:07:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346473AbhI2VIp (ORCPT ); Wed, 29 Sep 2021 17:08:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50880 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346024AbhI2VIm (ORCPT ); Wed, 29 Sep 2021 17:08:42 -0400 Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [IPv6:2a00:1450:4864:20::132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A709C061766 for ; Wed, 29 Sep 2021 14:07:00 -0700 (PDT) Received: by mail-lf1-x132.google.com with SMTP id e15so16198108lfr.10 for ; Wed, 29 Sep 2021 14:07:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5IQ8G0uxxR5Pb6926edFohGE/OhQAa2EdYE4PQBssMg=; b=pyONePkp8ygMO06zowvqr60r1rWLX5j3ewHNiRBxldS1WUXRh+tO9zubNTEXKacDR0 Kr+kf3tyWHbTqXBKbTnuIlIABTAIv0pyfiKAwaB0afn0ykQDK42VLQfVvmRDWB4uF9H/ h+BZvGoezp1cgE+ypSz8OgFGTZn0cxi0swc7CWYYpueHCtFsQiOakiYTPfC3z9/PgGPC 0FF5WUggMow7mGnWL7sCF/n2NSxUatOJxMuzz14SpiPs7n4bd3cWSiF6WKkOE1MjVLu1 TgfnE1fiu/pG/cLKAmGZ3wb8v/UDZGFWdVOW0XkoPN1S3oQu5J3gIKpUINGOZqRjy5Qg Ivxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5IQ8G0uxxR5Pb6926edFohGE/OhQAa2EdYE4PQBssMg=; b=lvH3IEeTZ+XkBfkMai8Gttzj2fUnBAtRO7B0DTEB0ytMyXiKIaOpokOhGJWolLRSRB MhfK4ypBKzk/AtcnN8F30MHvx2DaUWXcT+j66/w18XxA0+fnCtdi4+vfpwG+WfM8TkTV Q3ZyNo5sIsRN4HBzs3iPMpUTW/9x8dOED2E59PdRsg0c6sb5I1udtdpokamQoo8eWCqj wnCGNM5fzQ5/WUrQbIa3QMqbxkCYdUOO22DMu1I4a8VkdxGX99FMqzvz9L+77d/WVTJ9 CaMh+P/XbzEaTFH3z5G8N6BAhIQbadqSkfOyKGNa33MlGqKT2M7qln186aIrFptk41ll mVLg== X-Gm-Message-State: AOAM531SOu97yoFHvrfy+e+YmxCFHiXV668j/QdmPX+gwrRTTg8knygd VyzeGy4Bu6RzoCnho+ma7g3Tnw== X-Google-Smtp-Source: ABdhPJwnUvwn+bBwa6+IuBprbE/+bWsgoSGxDyiAAtUhyot5EpM3vFX/xSsU4XG6tIHSp69rDLz66A== X-Received: by 2002:a05:6512:3196:: with SMTP id i22mr1800249lfe.416.1632949618790; Wed, 29 Sep 2021 14:06:58 -0700 (PDT) Received: from localhost.localdomain (c-fdcc225c.014-348-6c756e10.bbcust.telenor.se. [92.34.204.253]) by smtp.gmail.com with ESMTPSA id s9sm112613lfp.291.2021.09.29.14.06.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Sep 2021 14:06:58 -0700 (PDT) From: Linus Walleij To: Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S . Miller" , Jakub Kicinski Cc: netdev@vger.kernel.org, Linus Walleij , Mauri Sandberg , DENG Qingfang , =?utf-8?q?Alvin_=C5=A0ipraga?= Subject: [PATCH net-next 3/4 v4] net: dsa: rtl8366rb: Support fast aging Date: Wed, 29 Sep 2021 23:03:48 +0200 Message-Id: <20210929210349.130099-4-linus.walleij@linaro.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210929210349.130099-1-linus.walleij@linaro.org> References: <20210929210349.130099-1-linus.walleij@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org This implements fast aging per-port using the special "security" register, which will flush any learned L2 LUT entries on a port. Suggested-by: Vladimir Oltean Cc: Mauri Sandberg Cc: DENG Qingfang Cc: Florian Fainelli Reviewed-by: Alvin Šipraga Signed-off-by: Linus Walleij --- ChangeLog v3->v4: - No changes, rebased on the other patches. ChangeLog v2->v3: - Underscore that this only affects learned L2 entries, not static ones. ChangeLog v1->v2: - New patch suggested by Vladimir. --- drivers/net/dsa/rtl8366rb.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/net/dsa/rtl8366rb.c b/drivers/net/dsa/rtl8366rb.c index 52e750ea790e..748f22ab9130 100644 --- a/drivers/net/dsa/rtl8366rb.c +++ b/drivers/net/dsa/rtl8366rb.c @@ -1359,6 +1359,19 @@ rtl8366rb_port_bridge_flags(struct dsa_switch *ds, int port, return 0; } +static void +rtl8366rb_port_fast_age(struct dsa_switch *ds, int port) +{ + struct realtek_smi *smi = ds->priv; + + /* This will age out any learned L2 entries */ + regmap_update_bits(smi->map, RTL8366RB_SECURITY_CTRL, + BIT(port), BIT(port)); + /* Restore the normal state of things */ + regmap_update_bits(smi->map, RTL8366RB_SECURITY_CTRL, + BIT(port), 0); +} + static int rtl8366rb_change_mtu(struct dsa_switch *ds, int port, int new_mtu) { struct realtek_smi *smi = ds->priv; @@ -1771,6 +1784,7 @@ static const struct dsa_switch_ops rtl8366rb_switch_ops = { .port_disable = rtl8366rb_port_disable, .port_pre_bridge_flags = rtl8366rb_port_pre_bridge_flags, .port_bridge_flags = rtl8366rb_port_bridge_flags, + .port_fast_age = rtl8366rb_port_fast_age, .port_change_mtu = rtl8366rb_change_mtu, .port_max_mtu = rtl8366rb_max_mtu, }; From patchwork Wed Sep 29 21:03:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 12526595 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BCB91C433EF for ; Wed, 29 Sep 2021 21:07:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9A2B06135D for ; Wed, 29 Sep 2021 21:07:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346550AbhI2VIq (ORCPT ); Wed, 29 Sep 2021 17:08:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50896 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345622AbhI2VIo (ORCPT ); Wed, 29 Sep 2021 17:08:44 -0400 Received: from mail-lf1-x131.google.com (mail-lf1-x131.google.com [IPv6:2a00:1450:4864:20::131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 354EFC06161C for ; Wed, 29 Sep 2021 14:07:02 -0700 (PDT) Received: by mail-lf1-x131.google.com with SMTP id x27so16328799lfu.5 for ; Wed, 29 Sep 2021 14:07:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3KZeQ1UL+Qr6VrGAkVMnUDxIrRV+iTWbafHkEPoCs9g=; b=M58hkh9SpiSFF7g28cyy/3kzGz+I4WM2ImAvKHGPlvAQpoXgjzo5WLGWVFb2XS+DjO aGc3YjZu4CVVsc+LGQFH5P3tMSUwNuYH5Gt2Y19W330VfK1P3wVoEiCeCqy1U4FGiksp kZLs/GfxDAICvCJToEk9tOHXIlCwuhhqk8ypq/CnIuuYxCJEPSKV8BZutt4hop+Jylrc MpjwotUmbKWHWGCRS5nNPCzcyCkL5GL6ZdQRzn4frd7le3ceCt0x1/f0djx/2nZ15JOY jdKWAvJdW/yvUoZq7h8w1svZxIIA6KiLyB/MSPLYlasCwC8ztIL0eMPCqFykGw6rzp3M 8xVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3KZeQ1UL+Qr6VrGAkVMnUDxIrRV+iTWbafHkEPoCs9g=; b=6j50UzYQHskyFTNJ8zSjfaKVXFX52bLfHrgC3NDHEslxRtM6bR16os3MzB/dPYMrwd k0LhQrlAvo982zUDuMfcHLZbUl7gpvjRdWZSIggAJNsyS3xMTnpkAFooSLw3yhNTCWzl zNcts6FuU0LhPqCXbbooAUb9sVD1Mm8JvfUKamtUuTadALDDBZjYQj1Zmlk83GxDOsQW RYmUYIBejDASJkpaXtUTye7+6kXKQoo+Kpm6RPbvS+9VscM5RkGnric2nfVaytXoUZFL cbSrqiqANOBM1HAaK3jWwL/fIUUCPJHP5dbn9xR6jAHPys5WLshgvOQTeHNRxHCewbkw YJGw== X-Gm-Message-State: AOAM531vvBF4NpnVFu7ifgceTUCwMY49IjJ70GvupeB0yz32nLSNG27H 5wUQ1LcI6JrWqlAEN/43YT18Gw== X-Google-Smtp-Source: ABdhPJwvl5A/2dSRawajr/n/5JVATrjSjztaVBgZZW52qf0v90ip0K2/9Jpmls0s6yKraYlg4xw1gg== X-Received: by 2002:ac2:5e24:: with SMTP id o4mr1731035lfg.522.1632949620530; Wed, 29 Sep 2021 14:07:00 -0700 (PDT) Received: from localhost.localdomain (c-fdcc225c.014-348-6c756e10.bbcust.telenor.se. [92.34.204.253]) by smtp.gmail.com with ESMTPSA id s9sm112613lfp.291.2021.09.29.14.06.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Sep 2021 14:07:00 -0700 (PDT) From: Linus Walleij To: Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S . Miller" , Jakub Kicinski Cc: netdev@vger.kernel.org, Linus Walleij , =?utf-8?q?Alvin_=C5=A0ipraga?= , Mauri Sandberg , DENG Qingfang Subject: [PATCH net-next 4/4 v4] net: dsa: rtl8366rb: Support setting STP state Date: Wed, 29 Sep 2021 23:03:49 +0200 Message-Id: <20210929210349.130099-5-linus.walleij@linaro.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210929210349.130099-1-linus.walleij@linaro.org> References: <20210929210349.130099-1-linus.walleij@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org This adds support for setting the STP state to the RTL8366RB DSA switch. This rids the following message from the kernel on e.g. OpenWrt: DSA: failed to set STP state 3 (-95) Since the RTL8366RB has one STP state register per FID with two bit per port in each, we simply loop over all the FIDs and set the state on all of them. Cc: Vladimir Oltean Cc: Alvin Šipraga Cc: Mauri Sandberg Cc: DENG Qingfang Signed-off-by: Linus Walleij --- ChangeLog v1->v4: - New patch after discovering that we can do really nice bridge offloading with these bits. --- drivers/net/dsa/rtl8366rb.c | 47 +++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/drivers/net/dsa/rtl8366rb.c b/drivers/net/dsa/rtl8366rb.c index 748f22ab9130..c143fdab4802 100644 --- a/drivers/net/dsa/rtl8366rb.c +++ b/drivers/net/dsa/rtl8366rb.c @@ -110,6 +110,14 @@ #define RTL8366RB_POWER_SAVING_REG 0x0021 +/* Spanning tree status (STP) control, two bits per port per FID */ +#define RTL8368S_SPT_STATE_BASE 0x0050 /* 0x0050..0x0057 */ +#define RTL8368S_SPT_STATE_MSK 0x3 +#define RTL8368S_SPT_STATE_DISABLED 0x0 +#define RTL8368S_SPT_STATE_BLOCKING 0x1 +#define RTL8368S_SPT_STATE_LEARNING 0x2 +#define RTL8368S_SPT_STATE_FORWARDING 0x3 + /* CPU port control reg */ #define RTL8368RB_CPU_CTRL_REG 0x0061 #define RTL8368RB_CPU_PORTS_MSK 0x00FF @@ -254,6 +262,7 @@ #define RTL8366RB_NUM_LEDGROUPS 4 #define RTL8366RB_NUM_VIDS 4096 #define RTL8366RB_PRIORITYMAX 7 +#define RTL8366RB_NUM_FIDS 8 #define RTL8366RB_FIDMAX 7 #define RTL8366RB_PORT_1 BIT(0) /* In userspace port 0 */ @@ -1359,6 +1368,43 @@ rtl8366rb_port_bridge_flags(struct dsa_switch *ds, int port, return 0; } +static void +rtl8366rb_port_stp_state_set(struct dsa_switch *ds, int port, u8 state) +{ + struct realtek_smi *smi = ds->priv; + u16 mask; + u32 val; + int i; + + switch (state) { + case BR_STATE_DISABLED: + val = RTL8368S_SPT_STATE_DISABLED; + break; + case BR_STATE_BLOCKING: + case BR_STATE_LISTENING: + val = RTL8368S_SPT_STATE_BLOCKING; + break; + case BR_STATE_LEARNING: + val = RTL8368S_SPT_STATE_LEARNING; + break; + case BR_STATE_FORWARDING: + val = RTL8368S_SPT_STATE_FORWARDING; + break; + default: + dev_err(smi->dev, "unknown bridge state requested\n"); + return; + }; + + mask = (RTL8368S_SPT_STATE_MSK << (port * 2)); + val <<= (port * 2); + + /* Set the same status for the port on all the FIDs */ + for (i = 0; i < RTL8366RB_NUM_FIDS; i++) { + regmap_update_bits(smi->map, RTL8368S_SPT_STATE_BASE + i, + mask, val); + } +} + static void rtl8366rb_port_fast_age(struct dsa_switch *ds, int port) { @@ -1784,6 +1830,7 @@ static const struct dsa_switch_ops rtl8366rb_switch_ops = { .port_disable = rtl8366rb_port_disable, .port_pre_bridge_flags = rtl8366rb_port_pre_bridge_flags, .port_bridge_flags = rtl8366rb_port_bridge_flags, + .port_stp_state_set = rtl8366rb_port_stp_state_set, .port_fast_age = rtl8366rb_port_fast_age, .port_change_mtu = rtl8366rb_change_mtu, .port_max_mtu = rtl8366rb_max_mtu,