Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4C4F3C433B4 for ; Mon, 12 Apr 2021 02:22:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 19AF16120C for ; Mon, 12 Apr 2021 02:22:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236606AbhDLCXI (ORCPT ); Sun, 11 Apr 2021 22:23:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:59238 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235857AbhDLCXI (ORCPT ); Sun, 11 Apr 2021 22:23:08 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id CA21361208; Mon, 12 Apr 2021 02:22:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1618194171; bh=WZCMwAGFnvc5scj3oAnPubj0BKdiE2EluAN1IxFi1Mg=; h=From:To:Cc:Subject:Date:From; b=p68ERWFsJpYkXyVpnSsOz//LfxaxtiOM93b1Bd0YQTIL5UkIKbJjdrUqMml3r2Rgk TgtwNF+m/GywkpzuOlu9wI6arEmDupJsZEoYo3Vw47pUDVwG8ujfpXEipbVUjFJn4f eyPnXSXuK7qhQ8eOeLTDqYyH8PN4D/S4Sn+A2VT/MMeLiqOPq0NeYppwzPggikRlXc FTByNlB9AxIyEPRHnVtJFAFyKfvAFfHsMpjU0FDjMiB8gIdlhtlTUeq0dKm/emxMjk UiNn1UvSYqKwQPw+TtvS8e+uL5B2Eh5p6EiwYBDQxob3Q9DwAYfgO8Cd8/wMuPOWEW 6uJsGTR9ICZlQ== From: Sasha Levin To: stable@vger.kernel.org, fido_max@inbox.ru Cc: Vladimir Oltean , "David S . Miller" Subject: FAILED: Patch "net: dsa: Fix type was not set for devlink port" failed to apply to 5.4-stable tree Date: Sun, 11 Apr 2021 22:22:49 -0400 Message-Id: <20210412022249.283344-1-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Patchwork-Hint: ignore X-stable: review Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . Thanks, Sasha ------------------ original commit in Linus's tree ------------------ From fb6ec87f7229b92baa81b35cbc76f2626d5bfadb Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Mon, 29 Mar 2021 18:30:16 +0300 Subject: [PATCH] net: dsa: Fix type was not set for devlink port If PHY is not available on DSA port (described at devicetree but absent or failed to detect) then kernel prints warning after 3700 secs: [ 3707.948771] ------------[ cut here ]------------ [ 3707.948784] Type was not set for devlink port. [ 3707.948894] WARNING: CPU: 1 PID: 17 at net/core/devlink.c:8097 0xc083f9d8 We should unregister the devlink port as a user port and re-register it as an unused port before executing "continue" in case of dsa_port_setup error. Fixes: 86f8b1c01a0a ("net: dsa: Do not make user port errors fatal") Signed-off-by: Maxim Kochetkov Reviewed-by: Vladimir Oltean Signed-off-by: David S. Miller --- net/dsa/dsa2.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c index d142eb2b288b..3c3e56a1f34d 100644 --- a/net/dsa/dsa2.c +++ b/net/dsa/dsa2.c @@ -795,8 +795,14 @@ static int dsa_tree_setup_switches(struct dsa_switch_tree *dst) list_for_each_entry(dp, &dst->ports, list) { err = dsa_port_setup(dp); - if (err) + if (err) { + dsa_port_devlink_teardown(dp); + dp->type = DSA_PORT_TYPE_UNUSED; + err = dsa_port_devlink_setup(dp); + if (err) + goto teardown; continue; + } } return 0; -- 2.30.2