summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2020-05-14 10:56:12 +0100
committerPeter Robinson <pbrobinson@gmail.com>2020-05-14 10:56:12 +0100
commitbb9e0f92948ac1d0885b5417604aec2633c741c1 (patch)
tree2fba6a44f0053fb008b61fb0cfe470eddad59a0a
parent5cd9a1b23bbbec24f24fc08fb3d84de6846db72b (diff)
downloadkernel-bb9e0f92948ac1d0885b5417604aec2633c741c1.tar.gz
kernel-bb9e0f92948ac1d0885b5417604aec2633c741c1.tar.xz
kernel-bb9e0f92948ac1d0885b5417604aec2633c741c1.zip
Fix for NIC issues on Jetson Xavier AGX
-rw-r--r--arm64-tegra-Fix-ethernet-phy-mode-for-Jetson-Xavier.patch102
-rw-r--r--kernel.spec5
2 files changed, 107 insertions, 0 deletions
diff --git a/arm64-tegra-Fix-ethernet-phy-mode-for-Jetson-Xavier.patch b/arm64-tegra-Fix-ethernet-phy-mode-for-Jetson-Xavier.patch
new file mode 100644
index 000000000..860d64763
--- /dev/null
+++ b/arm64-tegra-Fix-ethernet-phy-mode-for-Jetson-Xavier.patch
@@ -0,0 +1,102 @@
+From patchwork Fri May 1 07:27:56 2020
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+X-Patchwork-Submitter: Jon Hunter <jonathanh@nvidia.com>
+X-Patchwork-Id: 1281134
+Return-Path: <linux-tegra-owner@vger.kernel.org>
+X-Original-To: incoming@patchwork.ozlabs.org
+Delivered-To: patchwork-incoming@bilbo.ozlabs.org
+Authentication-Results: ozlabs.org;
+ spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org
+ (client-ip=23.128.96.18; helo=vger.kernel.org;
+ envelope-from=linux-tegra-owner@vger.kernel.org; receiver=<UNKNOWN>)
+Authentication-Results: ozlabs.org;
+ dmarc=pass (p=none dis=none) header.from=nvidia.com
+Authentication-Results: ozlabs.org; dkim=pass (2048-bit key;
+ unprotected) header.d=nvidia.com header.i=@nvidia.com header.a=rsa-sha256
+ header.s=n1 header.b=jaB3BsED; dkim-atps=neutral
+Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
+ by ozlabs.org (Postfix) with ESMTP id 49D3l15Pl7z9sTP
+ for <incoming@patchwork.ozlabs.org>; Fri, 1 May 2020 17:28:29 +1000 (AEST)
+Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
+ id S1728212AbgEAH20 (ORCPT <rfc822;incoming@patchwork.ozlabs.org>);
+ Fri, 1 May 2020 03:28:26 -0400
+Received: from hqnvemgate26.nvidia.com ([216.228.121.65]:1347 "EHLO
+ hqnvemgate26.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
+ with ESMTP id S1726452AbgEAH20 (ORCPT
+ <rfc822;linux-tegra@vger.kernel.org>); Fri, 1 May 2020 03:28:26 -0400
+Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by
+ hqnvemgate26.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA)
+ id <B5eabcf8d0000>; Fri, 01 May 2020 00:28:13 -0700
+Received: from hqmail.nvidia.com ([172.20.161.6])
+ by hqpgpgate101.nvidia.com (PGP Universal service);
+ Fri, 01 May 2020 00:28:25 -0700
+X-PGP-Universal: processed;
+ by hqpgpgate101.nvidia.com on Fri, 01 May 2020 00:28:25 -0700
+Received: from HQMAIL109.nvidia.com (172.20.187.15) by HQMAIL109.nvidia.com
+ (172.20.187.15) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Fri, 1 May
+ 2020 07:28:25 +0000
+Received: from hqnvemgw03.nvidia.com (10.124.88.68) by HQMAIL109.nvidia.com
+ (172.20.187.15) with Microsoft SMTP Server (TLS) id 15.0.1473.3 via Frontend
+ Transport; Fri, 1 May 2020 07:28:25 +0000
+Received: from moonraker.nvidia.com (Not Verified[10.26.73.165]) by
+ hqnvemgw03.nvidia.com with Trustwave SEG (v7,5,8,10121)
+ id <B5eabcf980000>; Fri, 01 May 2020 00:28:25 -0700
+From: Jon Hunter <jonathanh@nvidia.com>
+To: Thierry Reding <thierry.reding@gmail.com>
+CC: <devicetree@vger.kernel.org>, <linux-tegra@vger.kernel.org>,
+ Peter Robinson <pbrobinson@redhat.com>,
+ Jon Hunter <jonathanh@nvidia.com>, <stable@vger.kernel.org>
+Subject: [PATCH] arm64: tegra: Fix ethernet phy-mode for Jetson Xavier
+Date: Fri, 1 May 2020 08:27:56 +0100
+Message-ID: <20200501072756.25348-1-jonathanh@nvidia.com>
+X-Mailer: git-send-email 2.17.1
+X-NVConfidentiality: public
+MIME-Version: 1.0
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1;
+ t=1588318093; bh=d+dYuOUYYG3jFlbXdN72xXUr16sgw2ePdUeUPoMzbSo=;
+ h=X-PGP-Universal:From:To:CC:Subject:Date:Message-ID:X-Mailer:
+ X-NVConfidentiality:MIME-Version:Content-Type;
+ b=jaB3BsEDf3Fc0WN6kwJrPRalITORiFw8jh6J6ICTotAIsVMyxupddkxZxvK2bpOpK
+ dw771EHWsja2buZgJ1YGA4ZmleyqFnlXDrl/r6f/yyEoBYvTDJEBlggHz1zyZ2cCSe
+ AemmvCRR7KOLMYq9AUpQSVz5u8zuQVezob0pIQjVZRZ1FxjXbiDILaI5mFrAnRzpg9
+ IxzEPnPtX6nAMz/IM5oCiUpUCSRwSLtIQtyvQMeOgCbeINMsGMg3AuPYxohlF1QqkZ
+ fRZWpiuhT4RclVX+ga7roOMUpumX0hmQPA61LmkPwdd373pOsGjBOPZWwZ9GCoq1mT
+ EXSJdwyKZLJvQ==
+Sender: linux-tegra-owner@vger.kernel.org
+Precedence: bulk
+List-ID: <linux-tegra.vger.kernel.org>
+X-Mailing-List: linux-tegra@vger.kernel.org
+
+The 'phy-mode' property is currently defined as 'rgmii' for Jetson
+Xavier. This indicates that the RGMII RX and TX delays are set by the
+MAC and the internal delays set by the PHY are not used.
+
+If the Marvell PHY driver is enabled, such that it is used and not the
+generic PHY, ethernet failures are seen (DHCP is failing to obtain an
+IP address) and this is caused because the Marvell PHY driver is
+disabling the internal RX and TX delays. For Jetson Xavier the internal
+PHY RX and TX delay should be used and so fix this by setting the
+'phy-mode' to 'rgmii-id' and not 'rgmii'.
+
+Cc: stable@vger.kernel.org
+
+Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
+---
+ arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi b/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi
+index 623f7d7d216b..8e3136dfdd62 100644
+--- a/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi
++++ b/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi
+@@ -33,7 +33,7 @@
+
+ phy-reset-gpios = <&gpio TEGRA194_MAIN_GPIO(G, 5) GPIO_ACTIVE_LOW>;
+ phy-handle = <&phy>;
+- phy-mode = "rgmii";
++ phy-mode = "rgmii-id";
+
+ mdio {
+ #address-cells = <1>;
diff --git a/kernel.spec b/kernel.spec
index a89cbc5ab..ce66ad47a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -849,6 +849,8 @@ Patch325: backlight-lp855x-Ensure-regulators-are-disabled-on-probe-failure.patch
Patch326: arm64-drm-tegra-Fix-SMMU-support-on-Tegra124-and-Tegra210.patch
# http://patchwork.ozlabs.org/patch/1221384/
Patch327: PCI-Add-MCFG-quirks-for-Tegra194-host-controllers.patch
+# https://patchwork.ozlabs.org/patch/1281134/
+Patch328: arm64-tegra-Fix-ethernet-phy-mode-for-Jetson-Xavier.patch
# Coral
Patch330: arm64-dts-imx8mq-phanbell-Add-support-for-ethernet.patch
@@ -3005,6 +3007,9 @@ fi
#
#
%changelog
+* Thu May 12 2020 Peter Robinson <pbrobinson@fedoraproject.org>
+- Fix for NIC issues on Jetson Xavier AGX
+
* Tue May 12 2020 Justin M. Forbes <jforbes@fedoraproject.org>
- Fix CVE-2020-10711 (rhbz 1825116 1834778)