From patchwork Sat Jun 18 06:22:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 12886422 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 29FEDC43334 for ; Sat, 18 Jun 2022 14:48:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232719AbiFROs2 (ORCPT ); Sat, 18 Jun 2022 10:48:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47326 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229510AbiFROs1 (ORCPT ); Sat, 18 Jun 2022 10:48:27 -0400 Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6987217A97; Sat, 18 Jun 2022 07:48:26 -0700 (PDT) Received: by mail-ej1-x62d.google.com with SMTP id n20so6799898ejz.10; Sat, 18 Jun 2022 07:48:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=WlLbgDasKJ1im1j+lOloRZZaui0VTdPP0RSuLZMaCi8=; b=UY1TU11K1ASSWh4jo62ivRwnhP5NHZoa/nSs5/KgycrfEqO9AQfhSlUy3uykE+riVo sOUSmVBtabe48idsgp5ypyOnTRloIX6v+BLsu5rUILoEK1mtNcTnbo0fzhKbZL6kQDjw PPAkTSZVwG4cC5MH05FKkMLlmBpOJ3XPhy4jm4xOysveDIsBTknOhIAkJ8WocQALdjIR Erd5clNJ4esQBKqVSfQ2l9g4zfC8rhTvELIySz6yy9gXOsvkS5FdPi6lz7iZtaz1N3iy 91CQE0azAYJ5HEU44QzWeaITA7I2YHgufi/YlqIEGSFbXIj/27hH+fAs2Oa++uNVK1io 9oAA== 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:mime-version :content-transfer-encoding; bh=WlLbgDasKJ1im1j+lOloRZZaui0VTdPP0RSuLZMaCi8=; b=mfDFYRXzIFadPVJRmm3uWpnAu5lYsAhFsQxRcDVT06qYtVMZmbC0Hgg5CSbyQlWV2D NkEzh+2wrM/KQiEx8a8PNZPUVLS8lhnP/nvdEq+j/94jnh3FatDhQydAXS5oULXiOZtY p6NW05vsAyJtWNFvYbsoVWucUWEVnCjpR5XdsF833muMwKHiL5edDfW4a2NVVhi+1Mbe gIbXsobJ8ZsrNV9ZgcQqynRR+IpAUUnbM4FPm66wwAS/oXjODv28j00i3JEMUPzzEcNm QLpDUSRRVhmZhW++hktiVo3I8IlcE14FZWSE1XQW7q00zJJtah5oONmbVX8vJwqWkRIN 3UPw== X-Gm-Message-State: AJIora/hFdTBJgApYDVBwwFEypgzodejrM9wD1k74IpXWbnOWxVSOuWV McExJbNv/OtDOLc2VcpL/VxWyFe6ySE= X-Google-Smtp-Source: AGRyM1t+IwA+CvOfT/inbDO1uhckKDbqX+arxd1vk83uvy6IWXxT8iH40dsykJZez36LpryYEbJcvQ== X-Received: by 2002:a17:907:1b1e:b0:6d7:31b0:e821 with SMTP id mp30-20020a1709071b1e00b006d731b0e821mr13798089ejc.334.1655563704707; Sat, 18 Jun 2022 07:48:24 -0700 (PDT) Received: from localhost.localdomain (93-42-70-190.ip85.fastwebnet.it. [93.42.70.190]) by smtp.googlemail.com with ESMTPSA id h20-20020a1709070b1400b006fe7d269db8sm3450296ejl.104.2022.06.18.07.48.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jun 2022 07:48:24 -0700 (PDT) From: Christian Marangi To: Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Jonathan McDowell , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Christian Marangi Subject: [PATCH 1/3] net: dsa: qca8k: reduce mgmt ethernet timeout Date: Sat, 18 Jun 2022 08:22:58 +0200 Message-Id: <20220618062300.28541-1-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org The current mgmt ethernet timeout is set to 100ms. This value is too big and would slow down any mdio command in case the mgmt ethernet packet have some problems on the receiving part. Reduce it to just 5ms to handle case when some operation are done on the master port that would cause the mgmt ethernet to not work temporarily. Signed-off-by: Christian Marangi --- drivers/net/dsa/qca8k.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/dsa/qca8k.h b/drivers/net/dsa/qca8k.h index 04408e11402a..ec58d0e80a70 100644 --- a/drivers/net/dsa/qca8k.h +++ b/drivers/net/dsa/qca8k.h @@ -15,7 +15,7 @@ #define QCA8K_ETHERNET_MDIO_PRIORITY 7 #define QCA8K_ETHERNET_PHY_PRIORITY 6 -#define QCA8K_ETHERNET_TIMEOUT 100 +#define QCA8K_ETHERNET_TIMEOUT 5 #define QCA8K_NUM_PORTS 7 #define QCA8K_NUM_CPU_PORTS 2 From patchwork Sat Jun 18 06:22:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 12886423 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 038DEC433EF for ; Sat, 18 Jun 2022 14:48:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233710AbiFROsd (ORCPT ); Sat, 18 Jun 2022 10:48:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47348 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233376AbiFROs3 (ORCPT ); Sat, 18 Jun 2022 10:48:29 -0400 Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5327317A99; Sat, 18 Jun 2022 07:48:27 -0700 (PDT) Received: by mail-ej1-x62b.google.com with SMTP id v1so13548602ejg.13; Sat, 18 Jun 2022 07:48:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=j25IktA0GRUlxfFc2WwUnwO0L6NRqPXuym+pEq9YmO0=; b=CBoORK+LlmkTZ53Rm4y2UAYg9Mx2iKFymD1TX82DuhRxaXTUTK7ZLpAmH+c/4gVBob hQN/r86H+FII8luY3Vh/Qxn3bRKj/YPtzrdpLDx+boOGv5eNSeQ8X494aftDjD8Su1aH 4F1U86yTzAJmLPsMgDeLkhoIgxsWkfAf12mE7pu/yuVWadWGrIKoz87ZJrvriohLnaji 6H4In3ghxRtEspH3U6fRWmUBBsGwDdYE/NG0tEAUI03rNMa7XpcImRnb1YvbXbr71G1b hk8r7lQfKySFKi2KP+LSW8ohNfAjDYWQCxrP5dwMdvOFpjzhkzWLtds11V2TJk/5dgJm SCYQ== 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=j25IktA0GRUlxfFc2WwUnwO0L6NRqPXuym+pEq9YmO0=; b=0ZFLzqVFKy+BsuM1fnONBMOW8dtTkDyX1KMtRZhQCh7Ekasl0pCdo4zx6Qww+e6CSi s3mSDv9pWWs0Pc3l68ep1Un1ZpHduIjINn5z+IjNKT3MN0jQ0jfeD+aQGvNbqvw4XWbz aVQElSFTL/Fyc2xD0D0k3YxxTkcxSGr+MyBoWbb6ygwlfeDI8BhDJY5eepYDtcSgjplk bv05pFTV2aBbNWxIKCo8ztdpKMF4De2gnmVF+ZbxailputTYc/JgUcz/iP3XkqO4+vGe NCht1vi3MdaQjQtgJLxEcBsQNAE4qU9VXhWzazdhIO+CT5gDxG4FGPwm57ED0vWTARZi jf1Q== X-Gm-Message-State: AJIora9wCEdgDSoROkY+XYSIAf0sgoe/JQfyXtAUjZR2YqGdOBDCTmXz 3BcRkfC3pd1iCQngjx0v5mc= X-Google-Smtp-Source: AGRyM1sn5gxncMQnt3aTSNamrjRk8bXBQNtKYXu+zN9Kfabg8QHfnQ9M+lweRJI5CLq489htvunqIA== X-Received: by 2002:a17:906:73de:b0:715:784d:2cdd with SMTP id n30-20020a17090673de00b00715784d2cddmr13623487ejl.273.1655563705751; Sat, 18 Jun 2022 07:48:25 -0700 (PDT) Received: from localhost.localdomain (93-42-70-190.ip85.fastwebnet.it. [93.42.70.190]) by smtp.googlemail.com with ESMTPSA id h20-20020a1709070b1400b006fe7d269db8sm3450296ejl.104.2022.06.18.07.48.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jun 2022 07:48:25 -0700 (PDT) From: Christian Marangi To: Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Jonathan McDowell , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Christian Marangi Subject: [PATCH 2/3] net: dsa: qca8k: change only max_frame_size of mac_frame_size_reg Date: Sat, 18 Jun 2022 08:22:59 +0200 Message-Id: <20220618062300.28541-2-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220618062300.28541-1-ansuelsmth@gmail.com> References: <20220618062300.28541-1-ansuelsmth@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Currently we overwrite the entire MAX_FRAME_SIZE reg instead of tweaking just the MAX_FRAME_SIZE value. Change this and update only the relevant bits. Signed-off-by: Christian Marangi --- drivers/net/dsa/qca8k.c | 8 ++++++-- drivers/net/dsa/qca8k.h | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c index 2727d3169c25..eaaf80f96fa9 100644 --- a/drivers/net/dsa/qca8k.c +++ b/drivers/net/dsa/qca8k.c @@ -2345,7 +2345,9 @@ qca8k_port_change_mtu(struct dsa_switch *ds, int port, int new_mtu) return 0; /* Include L2 header / FCS length */ - return qca8k_write(priv, QCA8K_MAX_FRAME_SIZE, new_mtu + ETH_HLEN + ETH_FCS_LEN); + return regmap_update_bits(priv->regmap, QCA8K_MAX_FRAME_SIZE_REG, + QCA8K_MAX_FRAME_SIZE_MASK, + new_mtu + ETH_HLEN + ETH_FCS_LEN); } static int @@ -3015,7 +3017,9 @@ qca8k_setup(struct dsa_switch *ds) } /* Setup our port MTUs to match power on defaults */ - ret = qca8k_write(priv, QCA8K_MAX_FRAME_SIZE, ETH_FRAME_LEN + ETH_FCS_LEN); + ret = regmap_update_bits(priv->regmap, QCA8K_MAX_FRAME_SIZE_REG, + QCA8K_MAX_FRAME_SIZE_MASK, + ETH_FRAME_LEN + ETH_FCS_LEN); if (ret) dev_warn(priv->dev, "failed setting MTU settings"); diff --git a/drivers/net/dsa/qca8k.h b/drivers/net/dsa/qca8k.h index ec58d0e80a70..1d0c383a95e7 100644 --- a/drivers/net/dsa/qca8k.h +++ b/drivers/net/dsa/qca8k.h @@ -87,7 +87,8 @@ #define QCA8K_MDIO_MASTER_MAX_REG 32 #define QCA8K_GOL_MAC_ADDR0 0x60 #define QCA8K_GOL_MAC_ADDR1 0x64 -#define QCA8K_MAX_FRAME_SIZE 0x78 +#define QCA8K_MAX_FRAME_SIZE_REG 0x78 +#define QCA8K_MAX_FRAME_SIZE_MASK GENMASK(13, 0) #define QCA8K_REG_PORT_STATUS(_i) (0x07c + (_i) * 4) #define QCA8K_PORT_STATUS_SPEED GENMASK(1, 0) #define QCA8K_PORT_STATUS_SPEED_10 0 From patchwork Sat Jun 18 06:23:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 12886424 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DF2D9C433EF for ; Sat, 18 Jun 2022 14:48:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234158AbiFROsg (ORCPT ); Sat, 18 Jun 2022 10:48:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47352 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233452AbiFROs3 (ORCPT ); Sat, 18 Jun 2022 10:48:29 -0400 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8233617A97; Sat, 18 Jun 2022 07:48:28 -0700 (PDT) Received: by mail-ej1-x629.google.com with SMTP id hj18so12979536ejb.0; Sat, 18 Jun 2022 07:48:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TAka2U091hq1pTYLfbpSkbHxbEYvHoamK2SIJoLud0w=; b=OQOlMC+R31QKJmoU9wJB5Kv0I9fftYkXsmLoHLx0SiHNiFUeur0jFaDF1tKUqtmQ90 Ovoq3IcTav4PWmsvpCm0ue5oTuMT4WVoTiZlr3UZuqzqmITVLmfXBrRdmKl0mlsP4OwA y1TuGGFqfxBUgh3VGNicAb+mXY2UF2xSiMz7dzDSY0HgKM50LyXeOjGDsjdCT373lCqf XpVV458qFjUzCzFl2eMNnL6q7xhZ+BG9718qg4rFMgM1R+2fNgExDDFCur8aVG3a48M1 neDiPizURSwJoGdryAmyb8JoBxtEzNQMgChfIUgUhtKqfnNZyEfjEsa0Dr5lWO/iicrW Delw== 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=TAka2U091hq1pTYLfbpSkbHxbEYvHoamK2SIJoLud0w=; b=J//BvxETzbUTGFojMPHYrZwcDeMIGOuV2fqjUFZGFMZX7MJ3kBZnGouOcti+MidjiZ QzfTrZsBq9EEi6QkSXV+FvvmaR0XVKCk8qzgwsHijvM6Tg6DZ3KT01ywRkYWirTY7s2i V4vFVne2qfMoF8XoEItG8mkg4f3xY34EChVXoohH+Cp/wUF7N11gzjTlKOBrHo3bYn6B jy1JZeLi6U3puFfMvHrrrssuQCyYMcr4R+L4PPJEoA0teTOTF0z2+MUEAHBGQ85yXu75 7ao4d4Q/LK2yF5hCilrNi3/DTFeDeXZsdf/ZECM4MpjULLgzjfMhTSScan1BCRh1a9sO +ynA== X-Gm-Message-State: AJIora97CqXDt5caja6HWB/Tu6ddI0w5w/nLMzmYJpOYW79bKS0jNUoT /nWK0UlJE+BktmrjhGTMeKzR8QFkMMQ= X-Google-Smtp-Source: AGRyM1sf0gIEM9qnmpruEfunYcY2rJWY18yBnCyQJQEU9Q+xSQymS9j87O1VpY7q8V9XBCX0VlE3pA== X-Received: by 2002:a17:906:99c5:b0:6ff:4c8f:6376 with SMTP id s5-20020a17090699c500b006ff4c8f6376mr13831933ejn.328.1655563706838; Sat, 18 Jun 2022 07:48:26 -0700 (PDT) Received: from localhost.localdomain (93-42-70-190.ip85.fastwebnet.it. [93.42.70.190]) by smtp.googlemail.com with ESMTPSA id h20-20020a1709070b1400b006fe7d269db8sm3450296ejl.104.2022.06.18.07.48.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jun 2022 07:48:26 -0700 (PDT) From: Christian Marangi To: Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Jonathan McDowell , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Christian Marangi Subject: [PATCH 3/3] net: dsa: qca8k: reset cpu port on MTU change Date: Sat, 18 Jun 2022 08:23:00 +0200 Message-Id: <20220618062300.28541-3-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220618062300.28541-1-ansuelsmth@gmail.com> References: <20220618062300.28541-1-ansuelsmth@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org It was discovered that the Documentation lacks of a fundamental detail on how to correctly change the MAX_FRAME_SIZE of the switch. In fact if the MAX_FRAME_SIZE is changed while the cpu port is on, the switch panics and cease to send any packet. This cause the mgmt ethernet system to not receive any packet (the slow fallback still works) and makes the device not reachable. To recover from this a switch reset is required. To correctly handle this, turn off the cpu ports before changing the MAX_FRAME_SIZE and turn on again after the value is applied. Fixes: f58d2598cf70 ("net: dsa: qca8k: implement the port MTU callbacks") Signed-off-by: Christian Marangi --- drivers/net/dsa/qca8k.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c index eaaf80f96fa9..0b92b9d5954a 100644 --- a/drivers/net/dsa/qca8k.c +++ b/drivers/net/dsa/qca8k.c @@ -2334,6 +2334,7 @@ static int qca8k_port_change_mtu(struct dsa_switch *ds, int port, int new_mtu) { struct qca8k_priv *priv = ds->priv; + int ret; /* We have only have a general MTU setting. * DSA always set the CPU port's MTU to the largest MTU of the slave @@ -2344,10 +2345,29 @@ qca8k_port_change_mtu(struct dsa_switch *ds, int port, int new_mtu) if (!dsa_is_cpu_port(ds, port)) return 0; + /* To change the MAX_FRAME_SIZE the cpu ports must be off or + * the switch panics. + * Turn off both cpu ports before applying the new value to prevent + * this. + */ + if (priv->port_enabled_map & BIT(0)) + qca8k_port_set_status(priv, 0, 0); + + if (priv->port_enabled_map & BIT(6)) + qca8k_port_set_status(priv, 6, 0); + /* Include L2 header / FCS length */ - return regmap_update_bits(priv->regmap, QCA8K_MAX_FRAME_SIZE_REG, - QCA8K_MAX_FRAME_SIZE_MASK, - new_mtu + ETH_HLEN + ETH_FCS_LEN); + ret = regmap_update_bits(priv->regmap, QCA8K_MAX_FRAME_SIZE_REG, + QCA8K_MAX_FRAME_SIZE_MASK, + new_mtu + ETH_HLEN + ETH_FCS_LEN); + + if (priv->port_enabled_map & BIT(0)) + qca8k_port_set_status(priv, 0, 1); + + if (priv->port_enabled_map & BIT(6)) + qca8k_port_set_status(priv, 6, 1); + + return ret; } static int