From patchwork Tue Apr 27 09:48:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Roese X-Patchwork-Id: 1470604 X-Patchwork-Delegate: sr@denx.de Return-Path: 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=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=HLRb1zYj; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FTxmW6fz9z9sWp for ; Tue, 27 Apr 2021 19:48:59 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4B26582B2B; Tue, 27 Apr 2021 11:48:44 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1619516924; bh=oyQ85VCqmwSBCNpJH7Hk5duZPB80Gwll/BCAfeNNxcE=; h=From:To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=HLRb1zYjoOhWWPU/Rzj8hrWoPDyhcYR2Ywd5tEz4Ym9qeJpIRsbCdZEEOJNOWBwtY Uq9mG25y0hJyvvBkB7ZUuF+jLg4TXQRLgY6n0aU0tNShaEdUSVnn5Id9U4OQSUu/Pc m27OrRA6KabCYbAH4MbZ2rTgXepfJEytvB/ENKWkmy3DrlLFw9FhNi8Uj22TzN+qNQ WUWK77BTTOggWW5a2rL48xORqEBSnmy7rljXLjz2F7Y9z8W9mgdOwt8Ch3RxjBYr3k +9aaesXSdtYV+4hhat9P0M4Abf+TFVx2D+GO6BY0HpbES5nfa+4eIjlVe6yW83p0sQ y+/VzNIJIZHYQ== Received: by phobos.denx.de (Postfix, from userid 109) id E68F982B47; Tue, 27 Apr 2021 11:48:38 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mout-u-204.mailbox.org (mout-u-204.mailbox.org [91.198.250.253]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 1BDCC81D3B for ; Tue, 27 Apr 2021 11:48:36 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=fail smtp.mailfrom=sr@denx.de Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:105:465:1:2:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-u-204.mailbox.org (Postfix) with ESMTPS id 4FTxm30qXxzQjp5; Tue, 27 Apr 2021 11:48:35 +0200 (CEST) Received: from smtp2.mailbox.org ([80.241.60.241]) by hefe.heinlein-support.de (hefe.heinlein-support.de [91.198.250.172]) (amavisd-new, port 10030) with ESMTP id ctIASf4Dy-_c; Tue, 27 Apr 2021 11:48:32 +0200 (CEST) From: Stefan Roese To: u-boot@lists.denx.de Cc: Jakov Petrina , Vladimir Vid , Luka Perkov Subject: [PATCH 1/4] arm: mvebu: armada-3720-uDPU.dts: Change back to phy-mode "2500base-x" Date: Tue, 27 Apr 2021 11:48:28 +0200 Message-Id: <20210427094831.545521-1-sr@denx.de> MIME-Version: 1.0 X-MBO-SPAM-Probability: * X-Rspamd-Score: 1.47 / 15.00 / 15.00 X-Rspamd-Queue-Id: 11D5B1806 X-Rspamd-UID: cb55bc X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean With commit 8678776df6f5 (arm: mvebu: armada-3720-uDPU: fix PHY mode definition to sgmii-2500) the PHY mode was switch to "sgmii-2500", even when this is functionally incorrect since "2500base-x" was not supported in U-Boot at that time. As this mode is now supported (at least present in the headers), this patch moves back to the orinal version. Signed-off-by: Stefan Roese Cc: Jakov Petrina Cc: Vladimir Vid Cc: Luka Perkov --- Jakov, Vladimir: This is completely untested. Could you please review and let me know, if this works for you? Thanks, Stefan arch/arm/dts/armada-3720-uDPU.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/dts/armada-3720-uDPU.dts b/arch/arm/dts/armada-3720-uDPU.dts index 4b30f3cea8c7..4bf6d2eac798 100644 --- a/arch/arm/dts/armada-3720-uDPU.dts +++ b/arch/arm/dts/armada-3720-uDPU.dts @@ -126,14 +126,14 @@ ð0 { pinctrl-0 = <&pcie_pins>; status = "okay"; - phy-mode = "sgmii-2500"; + phy-mode = "2500base-x"; managed = "in-band-status"; phy = <ðphy0>; }; ð1 { status = "okay"; - phy-mode = "sgmii-2500"; + phy-mode = "2500base-x"; managed = "in-band-status"; phy = <ðphy1>; }; From patchwork Tue Apr 27 09:48:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Roese X-Patchwork-Id: 1470603 X-Patchwork-Delegate: sr@denx.de Return-Path: 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=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=CmpvgITu; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FTxmH30ZPz9sWp for ; Tue, 27 Apr 2021 19:48:47 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0E88C82AF1; Tue, 27 Apr 2021 11:48:41 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1619516921; bh=0RlU9BGk/oJy/GLy3mjdRLY3ZMsxb4VzXSwAr29JEsE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=CmpvgITudf6kseHdq5wBLUv+1/ZA1hnecssQ2hVFuvN2LRZlHUSJgjgW5dKfjfQ7G mHV3aFXPQg3tCdGmkebNCbCTBeOQPNZ0yKr5G1K3R1bjSV1Msq9wms+sQLh4Hb0qam P3MfDigXc4RFAXhmeELqDs5tD1glKXsdYwMB5U40yvtmIhvz9lwktB4+X1sdzueVYQ 2BCGmy1ovG32K7QRL0kY6tT2A5WCG/8aT859ZFRFd7ARrm9t+ZAMgfE07mQncEPlki XL5XpEbXghox1+FEk582e4Y+5XfhqxgiFy+6dJOy+LKJ1dqD953RNEdaK/MDp3icmh vYJl1aTFW16sg== Received: by phobos.denx.de (Postfix, from userid 109) id 2E2C382B05; Tue, 27 Apr 2021 11:48:39 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mout-u-204.mailbox.org (mout-u-204.mailbox.org [IPv6:2001:67c:2050:1::465:204]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 47A6082AF1 for ; Tue, 27 Apr 2021 11:48:36 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=fail smtp.mailfrom=sr@denx.de Received: from smtp2.mailbox.org (smtp2.mailbox.org [80.241.60.241]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-u-204.mailbox.org (Postfix) with ESMTPS id 4FTxm32kMMzQjxH; Tue, 27 Apr 2021 11:48:35 +0200 (CEST) Received: from smtp2.mailbox.org ([80.241.60.241]) by gerste.heinlein-support.de (gerste.heinlein-support.de [91.198.250.173]) (amavisd-new, port 10030) with ESMTP id 8u3PiXqH4Fmx; Tue, 27 Apr 2021 11:48:32 +0200 (CEST) From: Stefan Roese To: u-boot@lists.denx.de Cc: Konstantin Porotchkin , Stefan Chulski , Nadav Haklai , Marek Behun Subject: [PATCH 2/4] arm: octeontx2: cn9130-crb.dtsi: Disable eth2 for now Date: Tue, 27 Apr 2021 11:48:29 +0200 Message-Id: <20210427094831.545521-2-sr@denx.de> In-Reply-To: <20210427094831.545521-1-sr@denx.de> References: <20210427094831.545521-1-sr@denx.de> MIME-Version: 1.0 X-MBO-SPAM-Probability: X-Rspamd-Score: -0.24 / 15.00 / 15.00 X-Rspamd-Queue-Id: 73A6E17E5 X-Rspamd-UID: f81bec X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean Because of the incorrectly supported SGMII_2500 mode, this patch disables eth2 for now until this issue will be fixed in mainline. Also fix an incorrect comment. Signed-off-by: Stefan Roese Cc: Konstantin Porotchkin Cc: Stefan Chulski Cc: Nadav Haklai Cc: Marek Behun --- This patch is targeted on-top of the latest Marvell SERDES, mvpp2 and PHY patches to resolve the ongoing discussion of the incorrect usage of SGMII_2500 for now. arch/arm/dts/cn9130-crb.dtsi | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/arm/dts/cn9130-crb.dtsi b/arch/arm/dts/cn9130-crb.dtsi index 657a934764ae..78b43b449b3e 100644 --- a/arch/arm/dts/cn9130-crb.dtsi +++ b/arch/arm/dts/cn9130-crb.dtsi @@ -232,7 +232,6 @@ }; &cp0_eth0 { - /* Disable it for now, as mainline does not support this IF yet */ status = "okay"; phy-mode = "sfi"; }; @@ -247,7 +246,6 @@ &cp0_eth2 { /* Disable it for now, as mainline does not support this IF yet */ - status = "okay"; + status = "disabled"; phy = <&nbaset_phy0>; - phy-mode = "sgmii-2500"; }; From patchwork Tue Apr 27 09:48:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Roese X-Patchwork-Id: 1470605 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=coRYVYYL; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FTxml751Rz9sV5 for ; Tue, 27 Apr 2021 19:49:11 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8481282B95; Tue, 27 Apr 2021 11:48:52 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1619516933; bh=GvNR1AtMxQrz71K5g3xnu9F4bLDV98gviRCZDLDaEM0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=coRYVYYLdG2vpxKdFLY0QHp8y+VrWfoC4wWaGd8lvyl0JDDlwzgdtcate7g+F4Yf8 NG1WIFkAQxti7hzxg6EolxVlCNO44rYQD8jr8M+VcYVE3WeppvnBwrnI0CAvJnPeSu tYV4ZqGFVupRSgAvSfUptBcM7qAZlJ+5Ljb6mSKthiW1JA6n7w8sFCF//I8hN7X+VL oMGUNTnQPix04Q8Bim5M+YlrZDj1JtXUAIx/oSyt4Qo2Db6oGVrTZGDlkAxKtB/NsQ FHbQX8GIIH4Atxr3u48l1OP0k6kTvB9gkoInVufARl0U17AcyyIfL2ybo3XiHgr4F0 71Q4kBBQw8gHQ== Received: by phobos.denx.de (Postfix, from userid 109) id 2818582B7C; Tue, 27 Apr 2021 11:48:43 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mout-u-107.mailbox.org (mout-u-107.mailbox.org [IPv6:2001:67c:2050:1::465:107]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 8610982AFB for ; Tue, 27 Apr 2021 11:48:36 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=fail smtp.mailfrom=sr@denx.de Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:105:465:1:2:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-u-107.mailbox.org (Postfix) with ESMTPS id 4FTxm423VMzQjVL; Tue, 27 Apr 2021 11:48:36 +0200 (CEST) Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter03.heinlein-hosting.de (spamfilter03.heinlein-hosting.de [80.241.56.117]) (amavisd-new, port 10030) with ESMTP id 7zHHfnqozq8J; Tue, 27 Apr 2021 11:48:32 +0200 (CEST) From: Stefan Roese To: u-boot@lists.denx.de Cc: Konstantin Porotchkin , Stefan Chulski , Nadav Haklai , Marek Behun Subject: [PATCH 3/4] net: phy: marvell: Remove PHY_INTERFACE_MODE_SGMII_2500 Date: Tue, 27 Apr 2021 11:48:30 +0200 Message-Id: <20210427094831.545521-3-sr@denx.de> In-Reply-To: <20210427094831.545521-1-sr@denx.de> References: <20210427094831.545521-1-sr@denx.de> MIME-Version: 1.0 X-MBO-SPAM-Probability: X-Rspamd-Score: -0.24 / 15.00 / 15.00 X-Rspamd-Queue-Id: 5B2CC181E X-Rspamd-UID: fc33c8 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean As was discussed on the list, PHY_INTERFACE_MODE_SGMII_2500 is used incorrectly in the Marvell mvpp2 network driver and the Marvell PHY code. This patch removes the references to this macro in the Marvell PHY driver for now. The correct support shall be implemented at a later time. Signed-off-by: Stefan Roese Cc: Konstantin Porotchkin Cc: Stefan Chulski Cc: Nadav Haklai Cc: Marek Behun Reviewed-by: Ramon Fried --- This patch is targeted on-top of the latest Marvell SERDES, mvpp2 and PHY patches to resolve the ongoing discussion of the incorrect usage of SGMII_2500 for now. drivers/net/phy/marvell.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index 3bcb0033b391..8850b604ef47 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -634,8 +634,7 @@ static int m88e2110_config(struct phy_device *phydev) /* Disabled 10G advertisement */ phy_write(phydev, 7, 0x20, 0x1e1); } else { - if (phydev->interface == PHY_INTERFACE_MODE_SGMII_2500 || - phydev->interface == PHY_INTERFACE_MODE_2500BASEX) { + if (phydev->interface == PHY_INTERFACE_MODE_2500BASEX) { /* Disabled 10G/5G advertisements */ phy_write(phydev, 7, 0x20, 0xa1); } else { From patchwork Tue Apr 27 09:48:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Roese X-Patchwork-Id: 1470606 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=srjKGFbG; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FTxn02B8Yz9sV5 for ; Tue, 27 Apr 2021 19:49:24 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 17EFF82B98; Tue, 27 Apr 2021 11:48:56 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1619516936; bh=UqC7cr0hrkQRoD8Xe06rJ8Dkx1Wag/kUhOJVppah9r0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=srjKGFbGaqIF3UARry8w9E7Bj6V+sfR8qa2IS8dQKH/aaenf2elrdHJINVYTU5C0k RYTQXThl2c4nvWwE8jY8pTHSUQ+WobROWL3xPAlAFch0vOBWzL2XN4C2idgAT6eBF0 BfLgyjIxrWl+FnhnlHdPdYTwM1udK+jqiHa8++g0NQX1NPEgjj2Iz/bu+4nJR8IxnH kM8IjAVXkoYhgFkgXQxN346lSkWvn24/zpXFs4FFHFdbsiHQ6mut7tdcGqOr9twWcs QBHUzsBV+dF2HGk1FfcBqBymT2D9rkolCpKHjE3dFCkteqWCwQ/K+GCC29tLe38P4e FKm3iHqmJRu2g== Received: by phobos.denx.de (Postfix, from userid 109) id 6F89982B7B; Tue, 27 Apr 2021 11:48:43 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mout-u-107.mailbox.org (mout-u-107.mailbox.org [IPv6:2001:67c:2050:1::465:107]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id ACC5C82B12 for ; Tue, 27 Apr 2021 11:48:36 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=fail smtp.mailfrom=sr@denx.de Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:105:465:1:2:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-u-107.mailbox.org (Postfix) with ESMTPS id 4FTxm43JjczQjnm; Tue, 27 Apr 2021 11:48:36 +0200 (CEST) Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter05.heinlein-hosting.de (spamfilter05.heinlein-hosting.de [80.241.56.123]) (amavisd-new, port 10030) with ESMTP id IaseqWRkpl8V; Tue, 27 Apr 2021 11:48:32 +0200 (CEST) From: Stefan Roese To: u-boot@lists.denx.de Cc: Konstantin Porotchkin , Stefan Chulski , Nadav Haklai , Marek Behun Subject: [PATCH 4/4] net: mvpp2: Remove PHY_INTERFACE_MODE_SGMII_2500 Date: Tue, 27 Apr 2021 11:48:31 +0200 Message-Id: <20210427094831.545521-4-sr@denx.de> In-Reply-To: <20210427094831.545521-1-sr@denx.de> References: <20210427094831.545521-1-sr@denx.de> MIME-Version: 1.0 X-MBO-SPAM-Probability: ***** X-Rspamd-Score: 6.76 / 15.00 / 15.00 X-Rspamd-Queue-Id: 81C00181F X-Rspamd-UID: 15487b X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean As was discussed on the list, PHY_INTERFACE_MODE_SGMII_2500 is used incorrectly in the Marvell mvpp2 network driver and the Marvell PHY code. This patch removes the references to this macro in the mvpp2 network driver for now. The correct support shall be implemented at a later time. Signed-off-by: Stefan Roese Cc: Konstantin Porotchkin Cc: Stefan Chulski Cc: Nadav Haklai Cc: Marek Behun Reviewed-by: Ramon Fried --- This patch is targeted on-top of the latest Marvell SERDES, mvpp2 and PHY patches to resolve the ongoing discussion of the incorrect usage of SGMII_2500 for now. drivers/net/mvpp2.c | 53 --------------------------------------------- 1 file changed, 53 deletions(-) diff --git a/drivers/net/mvpp2.c b/drivers/net/mvpp2.c index 4c0a7b0a9f5c..b0287f561e2e 100644 --- a/drivers/net/mvpp2.c +++ b/drivers/net/mvpp2.c @@ -2873,7 +2873,6 @@ static void mvpp2_port_mii_set(struct mvpp2_port *port) switch (port->phy_interface) { case PHY_INTERFACE_MODE_SGMII: - case PHY_INTERFACE_MODE_SGMII_2500: val |= MVPP2_GMAC_INBAND_AN_MASK; break; case PHY_INTERFACE_MODE_1000BASEX: @@ -2941,7 +2940,6 @@ static void mvpp2_port_loopback_set(struct mvpp2_port *port) val &= ~MVPP2_GMAC_GMII_LB_EN_MASK; if (port->phy_interface == PHY_INTERFACE_MODE_SGMII || - port->phy_interface == PHY_INTERFACE_MODE_SGMII_2500 || port->phy_interface == PHY_INTERFACE_MODE_1000BASEX || port->phy_interface == PHY_INTERFACE_MODE_2500BASEX) val |= MVPP2_GMAC_PCS_LB_EN_MASK; @@ -3029,48 +3027,6 @@ static int gop_bypass_clk_cfg(struct mvpp2_port *port, int en) return 0; } -static void gop_gmac_sgmii2_5_cfg(struct mvpp2_port *port) -{ - u32 val, thresh; - - /* - * Configure minimal level of the Tx FIFO before the lower part - * starts to read a packet - */ - thresh = MVPP2_SGMII2_5_TX_FIFO_MIN_TH; - val = readl(port->base + MVPP2_GMAC_PORT_FIFO_CFG_1_REG); - val &= ~MVPP2_GMAC_TX_FIFO_MIN_TH_ALL_MASK; - val |= MVPP2_GMAC_TX_FIFO_MIN_TH_MASK(thresh); - writel(val, port->base + MVPP2_GMAC_PORT_FIFO_CFG_1_REG); - - /* Disable bypass of sync module */ - val = readl(port->base + MVPP2_GMAC_CTRL_4_REG); - val |= MVPP2_GMAC_CTRL4_SYNC_BYPASS_MASK; - /* configure DP clock select according to mode */ - val |= MVPP2_GMAC_CTRL4_DP_CLK_SEL_MASK; - /* configure QSGMII bypass according to mode */ - val |= MVPP2_GMAC_CTRL4_QSGMII_BYPASS_ACTIVE_MASK; - writel(val, port->base + MVPP2_GMAC_CTRL_4_REG); - - val = readl(port->base + MVPP2_GMAC_CTRL_0_REG); - /* - * Configure GIG MAC to SGMII mode connected to a fiber - * transceiver - */ - val &= ~MVPP2_GMAC_PORT_TYPE_MASK; - writel(val, port->base + MVPP2_GMAC_CTRL_0_REG); - - /* configure AN 0x9268 */ - val = MVPP2_GMAC_EN_PCS_AN | - MVPP2_GMAC_AN_BYPASS_EN | - MVPP2_GMAC_CONFIG_MII_SPEED | - MVPP2_GMAC_CONFIG_GMII_SPEED | - MVPP2_GMAC_FC_ADV_EN | - MVPP2_GMAC_CONFIG_FULL_DUPLEX | - MVPP2_GMAC_CHOOSE_SAMPLE_TX_CONFIG; - writel(val, port->base + MVPP2_GMAC_AUTONEG_CONFIG); -} - static void gop_gmac_sgmii_cfg(struct mvpp2_port *port) { u32 val, thresh; @@ -3241,9 +3197,6 @@ static int gop_gmac_mode_cfg(struct mvpp2_port *port) case PHY_INTERFACE_MODE_SGMII: gop_gmac_sgmii_cfg(port); break; - case PHY_INTERFACE_MODE_SGMII_2500: - gop_gmac_sgmii2_5_cfg(port); - break; case PHY_INTERFACE_MODE_1000BASEX: gop_gmac_1000basex_cfg(port); break; @@ -3424,7 +3377,6 @@ static int gop_port_init(struct mvpp2_port *port) break; case PHY_INTERFACE_MODE_SGMII: - case PHY_INTERFACE_MODE_SGMII_2500: case PHY_INTERFACE_MODE_1000BASEX: case PHY_INTERFACE_MODE_2500BASEX: /* configure PCS */ @@ -3484,7 +3436,6 @@ static void gop_port_enable(struct mvpp2_port *port, int enable) case PHY_INTERFACE_MODE_RGMII: case PHY_INTERFACE_MODE_RGMII_ID: case PHY_INTERFACE_MODE_SGMII: - case PHY_INTERFACE_MODE_SGMII_2500: case PHY_INTERFACE_MODE_1000BASEX: case PHY_INTERFACE_MODE_2500BASEX: if (enable) @@ -3521,7 +3472,6 @@ static u32 mvpp2_netc_cfg_create(int gop_id, phy_interface_t phy_type) if (gop_id == 2) { if (phy_type == PHY_INTERFACE_MODE_SGMII || - phy_type == PHY_INTERFACE_MODE_SGMII_2500 || phy_type == PHY_INTERFACE_MODE_1000BASEX || phy_type == PHY_INTERFACE_MODE_2500BASEX) val |= MV_NETC_GE_MAC2_SGMII; @@ -3532,7 +3482,6 @@ static u32 mvpp2_netc_cfg_create(int gop_id, phy_interface_t phy_type) if (gop_id == 3) { if (phy_type == PHY_INTERFACE_MODE_SGMII || - phy_type == PHY_INTERFACE_MODE_SGMII_2500 || phy_type == PHY_INTERFACE_MODE_1000BASEX || phy_type == PHY_INTERFACE_MODE_2500BASEX) val |= MV_NETC_GE_MAC3_SGMII; @@ -4531,7 +4480,6 @@ static void mvpp2_start_dev(struct mvpp2_port *port) case PHY_INTERFACE_MODE_RGMII: case PHY_INTERFACE_MODE_RGMII_ID: case PHY_INTERFACE_MODE_SGMII: - case PHY_INTERFACE_MODE_SGMII_2500: case PHY_INTERFACE_MODE_1000BASEX: case PHY_INTERFACE_MODE_2500BASEX: mvpp2_gmac_max_rx_size_set(port); @@ -5270,7 +5218,6 @@ static int mvpp2_start(struct udevice *dev) case PHY_INTERFACE_MODE_RGMII: case PHY_INTERFACE_MODE_RGMII_ID: case PHY_INTERFACE_MODE_SGMII: - case PHY_INTERFACE_MODE_SGMII_2500: case PHY_INTERFACE_MODE_1000BASEX: case PHY_INTERFACE_MODE_2500BASEX: mvpp2_port_power_up(port);