From patchwork Mon Mar 8 09:22:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 12121853 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=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, 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 C6D0EC433DB for ; Mon, 8 Mar 2021 09:23:12 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F026C651EE for ; Mon, 8 Mar 2021 09:23:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F026C651EE Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; 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=nMhx7UKdy5ZwWCAYTx5FMHieb/+a8hMiawchhESXOgE=; b=T2CDz7oceTjt0XVKT2Xki0O0k1 0gdfwcQvdmhoDAgTFmNwzZ7vFEdlF0FgqTS0Lb9AWMMN0fvA4Qd0qyQrIWZfyl7Ujgmo0VWk6eM7p /1MCoGhL/F3KvSotgucCsQjn4ZXQmfJUmK+2HjTv6ttn0/ARkfnyIR+4UF9TD+7w5mKeXeXoTVDKg pdd8D3YmpNHYCK9OyV0JCczyYxndaThVXFbXb9G8WSG5qxOqNYmOMI/hPzqhhXhyuSHDQJ9uKfFUx ShZM8+R51XFawTW1suowKll2Hs/i4b32MOIu18d+iZmFEo2EGQY4ub/i4eCAjiWKnMjDg2o8oxX0T 87lrr+eg==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lJC6U-00GALC-JV; Mon, 08 Mar 2021 09:23:06 +0000 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lJC6Q-00GAJx-Hz for linux-amlogic@lists.infradead.org; Mon, 08 Mar 2021 09:23:05 +0000 Received: by mail-wr1-x42f.google.com with SMTP id b18so10633427wrn.6 for ; Mon, 08 Mar 2021 01:23:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=f64vzvUYp/6BIz2bYRDqXZcELW1TUj1vEHLZdr8FG/k=; b=0UV6grLle2JlyxB+vpGpxgFbYU0LPkv6t4Em4wd9KxppTar9HyPhGVFyjdh0X/1CeC yVM1j5hmq3BpE+J7hhF9nJz/vtBD4DUSU++ltZqVF2GzKyJbob5VZCtFotSy2KV0Im32 0rEJWixBIRAg3tiDipdgt2UZCpbh4aJev6rXAUmhGSJyVts2MZ4zLAMuqfHad2YmDnO+ GNhjgE9bbkpqYWqzcPqoV1Jq2/g2/AnEinoAVFDr6z/ouRtY2ze+WT331xVkyAOld3G4 rOEHi2bw871/hMMwei2C84aalcY/MLwqpKtdrJcJ3tbmJgOFxfEFpgEkpYeyZfcU3jhp iOWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=f64vzvUYp/6BIz2bYRDqXZcELW1TUj1vEHLZdr8FG/k=; b=Fd4j4e7uuAqtCjz9vfnh1bsLnQBl2OEgyb6qPVcUH9MBDqgShXhMy5hpkQJqKiOG8C 3pdd9xCY+hlf6lXnOGaFAo+F5/GVXDSH3SsOPIiIwGIYPhUjUOudikIY8rVl5OmdCqVL Vj7yd4+jZHE2TWzvs0QCLsKqPJ3eBw8064YUxhcbf4xBjtcdzFhqgHqDQgPJAiNqxmHz RfDDZckuoua8ERnBG8+Z+LXztrCDdjKXGtClczP4azYTH9W8XoDFxHjSyJs+A2aEXF5y 6QUqs/H7O6dZaKFj0HE3CqhRlw8jvAUn5peOi3GLNGkDwqzYBmo0l6dZxTCe4nQEv3uY kZhw== X-Gm-Message-State: AOAM532SINjm6/2qle9eNnTZkUpf9pOqI77KBOC6myLLB/lX9ZLhvAmc e+JV5W0lE8zWZqY8+gFy90RITw== X-Google-Smtp-Source: ABdhPJxO61PIGnoxcBeQJyEnYhOvEWnAdYMi1tSgdINEd2Cfr9brs/PTheL2dopelRb2FfdPi77nCw== X-Received: by 2002:a5d:5047:: with SMTP id h7mr22548425wrt.111.1615195381875; Mon, 08 Mar 2021 01:23:01 -0800 (PST) Received: from localhost.localdomain ([2a01:e0a:90c:e290:5985:2622:fd0e:9316]) by smtp.gmail.com with ESMTPSA id 9sm15888113wmf.13.2021.03.08.01.23.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Mar 2021 01:23:01 -0800 (PST) From: Neil Armstrong To: stable@vger.kernel.org Cc: linux-amlogic@lists.infradead.org, Neil Armstrong , Corentin Labbe , =?utf-8?b?SsOpcsO0bWUgQnJ1bmV0?= , Kevin Hilman Subject: [PATCH stable 5.10] Revert "arm64: dts: amlogic: add missing ethernet reset ID" Date: Mon, 8 Mar 2021 10:22:41 +0100 Message-Id: <20210308092241.17058-1-narmstrong@baylibre.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210308_092302_910800_94B57886 X-CRM114-Status: GOOD ( 10.69 ) X-BeenThere: linux-amlogic@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-amlogic" Errors-To: linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org It has been reported on IRC and in KernelCI boot tests, this change breaks internal PHY support on the Amlogic G12A/SM1 Based boards. We suspect the added signal to reset more than the Ethernet MAC but also the MDIO/(RG)MII mux used to redirect the MAC signals to the internal PHY. This reverts commit f3362f0c18174a1f334a419ab7d567a36bd1b3f3 while we find and acceptable solution to cleanly reset the Ethernet MAC. commit 19f6fe976a61f9afc289b062b7ef67f99b72e7b9 upstream. Cc: stable@vger.kernel.org # 5.10.x Reported-by: Corentin Labbe Acked-by: Jérôme Brunet Signed-off-by: Neil Armstrong Signed-off-by: Kevin Hilman Link: https://lore.kernel.org/r/20210126080951.2383740-1-narmstrong@baylibre.com --- arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 2 -- arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 2 -- arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 3 --- 3 files changed, 7 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi index 724ee179b316..fae48efae83e 100644 --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi @@ -227,8 +227,6 @@ ethmac: ethernet@ff3f0000 { "timing-adjustment"; rx-fifo-depth = <4096>; tx-fifo-depth = <2048>; - resets = <&reset RESET_ETHERNET>; - reset-names = "stmmaceth"; status = "disabled"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi index a6127002573b..959b299344e5 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi @@ -224,8 +224,6 @@ ethmac: ethernet@ff3f0000 { "timing-adjustment"; rx-fifo-depth = <4096>; tx-fifo-depth = <2048>; - resets = <&reset RESET_ETHERNET>; - reset-names = "stmmaceth"; status = "disabled"; mdio0: mdio { diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi index 726b91d3a905..0edd137151f8 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi @@ -13,7 +13,6 @@ #include #include #include -#include #include / { @@ -576,8 +575,6 @@ ethmac: ethernet@c9410000 { interrupt-names = "macirq"; rx-fifo-depth = <4096>; tx-fifo-depth = <2048>; - resets = <&reset RESET_ETHERNET>; - reset-names = "stmmaceth"; power-domains = <&pwrc PWRC_GXBB_ETHERNET_MEM_ID>; status = "disabled"; };