From patchwork Thu Oct 27 11:32:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 13021979 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 699D8ECAAA1 for ; Thu, 27 Oct 2022 11:34:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=YQKRtk9lH9wolCRKeX21iNX8/ggLDzrqRqoB++7BPVQ=; b=wa16badJyrzLor Z91thVS54r0pITNAIw0ZnfcsQJVBZdwEftkuIayJ/MuVtmATdb67EGTrcB4Ip1hxWsgK5+IUOxxGo p7FTuJNSkKJHHnUOpI6/yHs8QDYuEvJD6IxycRmGsm2mA0fWC6V+QiVHByxqORLZenO0NuaimOQgb sa7uHxLzCnpZfIghK7C3BwnUU9h3Lovel1kF1DYoBf9eegkF2wVLmQ1+9dXIV5OACQt1LIFMSpd8D 3sq6ocpugDNrRTBwwIFrBA7aEImvo1UUKIeDTaO1NfNuEWaDRRknDvOj6UZFWp3eY/ik9QA4HuhnR qpWLzcHpGOOCvfp5+X9w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oo18C-00D3j4-N1; Thu, 27 Oct 2022 11:33:04 +0000 Received: from 0001.3ffe.de ([159.69.201.130] helo=mail.3ffe.de) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oo189-00D3hs-Ut for linux-arm-kernel@lists.infradead.org; Thu, 27 Oct 2022 11:33:03 +0000 Received: from mwalle01.kontron.local. (unknown [213.135.10.150]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.3ffe.de (Postfix) with ESMTPSA id 7E33E1B40; Thu, 27 Oct 2022 13:32:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walle.cc; s=mail2022082101; t=1666870376; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=86Syqd89b1/HCshZzD+et9Bo2opsZhhVIvgaLhrsOcI=; b=mvJXS1/G8NnG3D8HvhI7aMBDN2AXxviQSZavm7F0DzocELCt0oHdv4/KtBG5eJQ7oGQuHa gmQ4L6B6yEJJ2fneIa9NrNWrDt4jgLaN3G0cIMq56FyxznBTnb78gxVtlUeHys9Pu8q3FD uty1ze5E+RFo9Wcx1tZrZWGBVkLQhp/nPJdxWgSddvpdP3TgpUHll5nFJlAWiBXIdZikHj dmotv999hjgrG09N0X8YkS72kyk1hm2Cw8+06a5oocyBcFw8qyHa/m8WJ+fRWS/rZTsNN/ PoMnKhHxwRZ7l6SX4CAWBpRxS6xlhfYycrSjpwtw6/yDINY7LmShYi3ud4N+dQ== From: Michael Walle To: Shawn Guo , Li Yang , Rob Herring , Krzysztof Kozlowski , Vladimir Oltean Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Heiko Thiery , Michael Walle Subject: [PATCH] Revert "arm64: dts: ls1028a: sl28: use ocelot-8021q tagging by default" Date: Thu, 27 Oct 2022 13:32:48 +0200 Message-Id: <20221027113248.420216-1-michael@walle.cc> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Spam: Yes X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221027_043302_204105_C7820080 X-CRM114-Status: GOOD ( 11.15 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This reverts commit be0b178c50c37a666d54f435da71cf9f008362a0. This commit will break networking on the sl28 boards if the tagger is not compiled into the kernel. If a non-default tagger is used, the kernel doesn't do a request_module(). Fixing that is also not that trivial because the tagger modules are loaded by ids, not by name. Thus for now, just revert to the default tagger until that is fixed. Fixes: be0b178c50c3 ("arm64: dts: ls1028a: sl28: use ocelot-8021q tagging by default") Reported-by: Heiko Thiery Signed-off-by: Michael Walle --- Vladimir, I'm not sure how to fix that one. Adding aliases to the tagger modules? Something like "MODULE_ALIAS("dsa_tag-ocelot-8021q");" and then do a request_module() in dsa_find_tagger_by_name(), too? .../arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts | 8 -------- 1 file changed, 8 deletions(-) diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts index 72429b37a8b4..771c50c7f50a 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts @@ -324,14 +324,6 @@ &lpuart1 { status = "okay"; }; -&mscc_felix_port4 { - dsa-tag-protocol = "ocelot-8021q"; -}; - -&mscc_felix_port5 { - dsa-tag-protocol = "ocelot-8021q"; -}; - &usb0 { status = "okay"; };