From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 83E77C433F5 for ; Tue, 18 Jan 2022 03:34:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351996AbiARDeV (ORCPT ); Mon, 17 Jan 2022 22:34:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39016 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235935AbiARDGm (ORCPT ); Mon, 17 Jan 2022 22:06:42 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CE8FBC06127C; Mon, 17 Jan 2022 18:48:58 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6CE25611B4; Tue, 18 Jan 2022 02:48:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C8F9AC36AF2; Tue, 18 Jan 2022 02:48:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1642474137; bh=CEdO8M38elb+TwdxQlBYqa49sSc8fF+qL7qx0yZugNY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MiVxVvq7Ll3jlUqHsrz0ACo5Jsk471U8QBuFcyTyVqyq75RoYTuEl4jG5ymQUhVz1 Q0pjJoKEj2Duds9K92qC2hIm5ek+o4l1m2sIoGG8WgcmID+CRwqcDKEcGLyovJX2C1 KlB1GwT6Jot4wrzTRja8bctD9Ph6agttTHs82W4KixF3EcIKw6ZgwPQLlc2IWEf3sH ZHzU6FlgZeDLpvRNwfvA9qK0NGyypK5H3R9AeOmrgRiNQ5nGHtpAT2H7a4/L6y1G1H vtl1JLYcrz0saCePYmucqv39WakY1GHSAY+OAe7fEwtvY8wCObj01vlpQp1Pxdv/NE dxRrEttFpKQig== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Russell King (Oracle)" , Corentin Labbe , Andrew Lunn , Jakub Kicinski , Sasha Levin , hkallweit1@gmail.com, davem@davemloft.net, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 54/59] net: phy: marvell: configure RGMII delays for 88E1118 Date: Mon, 17 Jan 2022 21:46:55 -0500 Message-Id: <20220118024701.1952911-54-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220118024701.1952911-1-sashal@kernel.org> References: <20220118024701.1952911-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Russell King (Oracle)" [ Upstream commit f22725c95ececb703c3f741e8f946d23705630b7 ] Corentin Labbe reports that the SSI 1328 does not work when allowing the PHY to operate at gigabit speeds, but does work with the generic PHY driver. This appears to be because m88e1118_config_init() writes a fixed value to the MSCR register, claiming that this is to enable 1G speeds. However, this always sets bits 4 and 5, enabling RGMII transmit and receive delays. The suspicion is that the original board this was added for required the delays to make 1G speeds work. Add the necessary configuration for RGMII delays for the 88E1118 to bring this into line with the requirements for RGMII support, and thus make the SSI 1328 work. Corentin Labbe has tested this on gemini-ssi1328 and gemini-ns2502. Reported-by: Corentin Labbe Tested-by: Corentin Labbe Signed-off-by: Russell King (Oracle) Reviewed-by: Andrew Lunn Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/phy/marvell.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index 832a401c5fa56..484f6691b9c9f 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -930,6 +930,12 @@ static int m88e1118_config_init(struct phy_device *phydev) if (err < 0) return err; + if (phy_interface_is_rgmii(phydev)) { + err = m88e1121_config_aneg_rgmii_delays(phydev); + if (err < 0) + return err; + } + /* Adjust LED Control */ if (phydev->dev_flags & MARVELL_PHY_M1118_DNS323_LEDS) err = phy_write(phydev, 0x10, 0x1100); -- 2.34.1