From nobody Mon Jun 22 18:12:28 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3D17DC433F5 for ; Fri, 18 Mar 2022 20:14:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240578AbiCRUPu (ORCPT ); Fri, 18 Mar 2022 16:15:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40976 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239851AbiCRUPk (ORCPT ); Fri, 18 Mar 2022 16:15:40 -0400 Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BF8C218A7A9 for ; Fri, 18 Mar 2022 13:13:59 -0700 (PDT) Received: by mail-lf1-x134.google.com with SMTP id t25so15757054lfg.7 for ; Fri, 18 Mar 2022 13:13:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=waldekranz-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:organization:content-transfer-encoding; bh=2ZJOcMdF9DzKhm/fJPtO5SnzEXwErjJt/hDqOg/WJc8=; b=QOuIyvnAaXQP5F1WRGC8O0VbHEQ6gEp7fwi4Kyi4BjZU9CZ3BFN1LyzSSNPJBJVD8a 1bvdNXsu22C5CmQwoU/uxH5NWI9pDMeRqwKAjDMVsrZjZhG63VI+rj+AbE8QKF2+uUQG p2fGH7u3d0nKSH64QzIUu3+kv23y51fADm/ZAk/hZEKBlB9VycnSUKfAxFY/vpq78+p5 WniHtM7hLcf49bP2/QEZHtnB53KfDnqoB+rOdkM0kRSvrpXdDHPEHS5dwPxqRVqnjTY0 7riCR6Gi854YvhKDNEIZp6UWGXEUVQ+J4wIAM8vs4KA7MIqh7Y3R8Nuyvi6HZ0OQV5Vz o0WA== 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:organization:content-transfer-encoding; bh=2ZJOcMdF9DzKhm/fJPtO5SnzEXwErjJt/hDqOg/WJc8=; b=E6rxmiSRCMWKeSCcWedpX7w0YIpii6jac8dzw8ZXs9vtv+lEPu6cFxNdf4cTqIZuVZ s7b5RylIvuisPEV25AjCr8SCXJhyVwVb7rhUT9W585iISCpkyjg8VpxcZL7/7GNjXqnU cE4SUG/YD1PqnCrX1nMR+RrXH3lHNhJGBEQTLOuFP/9tEIjio1YvK14CY6ir3rMrIKXc cSxApdR0J/6DviWCriHgQM9ZolSCdVTRw9A0pzKNLBQVGKNnORzm5sFZNbrSiOD7i+/5 ZK5ilKoBTW7ZcKcoeOZ/IAVpqdsu3PLhVv9mH3aFhnPCqSonL7Oz4bOFcjqPPxydqKZH mfmQ== X-Gm-Message-State: AOAM533emrswl57UZ3WN9eUvRX74QoihTCgEeLz8cor0g9Re1bV3dp7b wcb+9s0tX76Ok9pT1C6IAHoJcQ== X-Google-Smtp-Source: ABdhPJztr619VArVriWnwc6+AAMRU1IiL9Xq0Pl/tdAkr2QE+P5FseUm70/ioo9yeIlMftrrjdVhUA== X-Received: by 2002:a19:f115:0:b0:448:277f:8e with SMTP id p21-20020a19f115000000b00448277f008emr6798140lfh.503.1647634437698; Fri, 18 Mar 2022 13:13:57 -0700 (PDT) Received: from veiron.westermo.com (static-193-12-47-89.cust.tele2.se. [193.12.47.89]) by smtp.gmail.com with ESMTPSA id u6-20020a197906000000b00448a5b9d066sm981692lfc.189.2022.03.18.13.13.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Mar 2022 13:13:57 -0700 (PDT) From: Tobias Waldekranz To: davem@davemloft.net, kuba@kernel.org Cc: =?UTF-8?q?Marek=20Beh=C3=BAn?= , Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , Paolo Abeni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 1/2] net: dsa: mv88e6xxx: Require ops be implemented to claim STU support Date: Fri, 18 Mar 2022 21:13:20 +0100 Message-Id: <20220318201321.4010543-2-tobias@waldekranz.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220318201321.4010543-1-tobias@waldekranz.com> References: <20220318201321.4010543-1-tobias@waldekranz.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Organization: Westermo Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Simply having a physical STU table in the device doesn't do us any good if there's no implementation of the relevant ops to access that table. So ensure that chips that claim STU support can also talk to the hardware. This fixes an issue where chips that had a their ->info->max_sid set (due to their family membership), but no implementation (due to their chip-specific ops struct) would fail to probe. Fixes: 49c98c1dc7d9 ("net: dsa: mv88e6xxx: Disentangle STU from VTU") Reported-by: Marek Beh=C3=BAn Signed-off-by: Tobias Waldekranz Reviewed-by: Florian Fainelli Reviewed-by: Vladimir Oltean Tested-by: Marek Beh=C3=BAn --- drivers/net/dsa/mv88e6xxx/chip.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/dsa/mv88e6xxx/chip.h b/drivers/net/dsa/mv88e6xxx/c= hip.h index 6a0b66354e1d..5e03cfe50156 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.h +++ b/drivers/net/dsa/mv88e6xxx/chip.h @@ -730,7 +730,9 @@ struct mv88e6xxx_hw_stat { =20 static inline bool mv88e6xxx_has_stu(struct mv88e6xxx_chip *chip) { - return chip->info->max_sid > 0; + return chip->info->max_sid > 0 && + chip->info->ops->stu_loadpurge && + chip->info->ops->stu_getnext; } =20 static inline bool mv88e6xxx_has_pvt(struct mv88e6xxx_chip *chip) --=20 2.25.1 From nobody Mon Jun 22 18:12:28 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 18C8DC433F5 for ; Fri, 18 Mar 2022 20:14:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240601AbiCRUPy (ORCPT ); Fri, 18 Mar 2022 16:15:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42836 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240595AbiCRUPl (ORCPT ); Fri, 18 Mar 2022 16:15:41 -0400 Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [IPv6:2a00:1450:4864:20::136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 016A0201687 for ; Fri, 18 Mar 2022 13:14:00 -0700 (PDT) Received: by mail-lf1-x136.google.com with SMTP id bt26so15784701lfb.3 for ; Fri, 18 Mar 2022 13:14:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=waldekranz-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:organization:content-transfer-encoding; bh=f6gea0UG9jF1oSbEYIKOlY6k/1X2Ig9+3aPWLWMPbTs=; b=qW/8IFYanN7dg2cRHPnA7zIPpJrXbVuhw18VcKSZEZ1dsDD8MWoglqFCf9fjr8Tp0e rc6SbupQj6ePG68aNTApxmOLXCaLoxefPnejYjP9QVLKON0V93rqsf1P9XJXqkK6mAhF /4rx6Z5F+pnoH7nd5v8Kwjyh+/NaaClc0waQ9FwR07O+JcU7p4EfO+G9Od+yJd3HxCCY e/oFCl5ylO2jm372mQqiA7mX847cqn2EhbSkDqGLxdJyc+y+BLAIvMMphtDivNRoBm1F yTREk/hp1jY0klZQjmfTQdclkd4lElmh7N/oTF4lSK5x0ENgsinvubiV7xaSoVFZ7UZ/ NlgQ== 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:organization:content-transfer-encoding; bh=f6gea0UG9jF1oSbEYIKOlY6k/1X2Ig9+3aPWLWMPbTs=; b=k3wE2ny+25/HhkTYv6NYHmeOmxQ82484E1wjZUDPSssiLNP9kvhOeGi5l8/XVx8svH G3JRi7ogbTNQUi4GMykFDDZlmn3e9i9vxBLyTMqrNjYNlxtZQOmOk6Yzk+vJ5l0L/5H3 EC0xgZrlghH+xSXQbOp/7JOYgVcZzTNp+OgOGIn6QH/t9oH8kGAe1gHzaNb/mTLKEGGX qnuYZySg+HxeD0N0IlOCRRiC5IDD+Ec0JPT5Al07Iir4PPYde4q4TAwOX9ejSLTxmRRf 1kR8YWINCzD56o22+YP0wWKvH3VR7W8MvJjrUFXe5og/EXCdpCYxoj7mklKkte8nm7MK Zzsw== X-Gm-Message-State: AOAM5305Tltj6EypmV2meFYgihQ33T6t8BEJPXBjWdL7fAjySq7wLWg6 ZAbIEYWeP9TR4cupMm2kX0iy8Q== X-Google-Smtp-Source: ABdhPJxsMgi1afxkpBpYy8ig1qY/KutmgQgFJnK1vP49Krrid3LqS1GwMkq9UFX7Cetlwa4A+whZCw== X-Received: by 2002:a05:6512:39cd:b0:44a:cd5:e5e6 with SMTP id k13-20020a05651239cd00b0044a0cd5e5e6mr2466427lfu.574.1647634438845; Fri, 18 Mar 2022 13:13:58 -0700 (PDT) Received: from veiron.westermo.com (static-193-12-47-89.cust.tele2.se. [193.12.47.89]) by smtp.gmail.com with ESMTPSA id u6-20020a197906000000b00448a5b9d066sm981692lfc.189.2022.03.18.13.13.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Mar 2022 13:13:58 -0700 (PDT) From: Tobias Waldekranz To: davem@davemloft.net, kuba@kernel.org Cc: Marek Behun , Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , Paolo Abeni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 2/2] net: dsa: mv88e6xxx: Ensure STU support in VLAN MSTI callback Date: Fri, 18 Mar 2022 21:13:21 +0100 Message-Id: <20220318201321.4010543-3-tobias@waldekranz.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220318201321.4010543-1-tobias@waldekranz.com> References: <20220318201321.4010543-1-tobias@waldekranz.com> MIME-Version: 1.0 Organization: Westermo Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In the same way that we check for STU support in the MST state callback, we should also verify it before trying to change a VLANs MSTI membership. Fixes: acaf4d2e36b3 ("net: dsa: mv88e6xxx: MST Offloading") Signed-off-by: Tobias Waldekranz Reviewed-by: Florian Fainelli Reviewed-by: Vladimir Oltean Tested-by: Marek Beh=C3=BAn --- drivers/net/dsa/mv88e6xxx/chip.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/c= hip.c index b36393ba6d49..afb9417ffca0 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -2678,6 +2678,9 @@ static int mv88e6xxx_vlan_msti_set(struct dsa_switch = *ds, u8 old_sid, new_sid; int err; =20 + if (!mv88e6xxx_has_stu(chip)) + return -EOPNOTSUPP; + mv88e6xxx_reg_lock(chip); =20 err =3D mv88e6xxx_vtu_get(chip, msti->vid, &vlan); --=20 2.25.1