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 X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 B8300C4332D for ; Thu, 19 Mar 2020 13:28:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 85F45207FC for ; Thu, 19 Mar 2020 13:28:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584624527; bh=1dSUJg0oKYYNWkqUqhi26j4u7MPwVcWmQRJ7yr6Z41E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=iNiMaie04LzwCoy/ALC8OkO6uQj5l9BRyEx/9G37OxWXE1xQpsa9QDA9qd5EXJ7qD hYPb5aw3UB0b/S+McP2zNsLWiCWOEuG9NHHdll2qmYol6rIrTPH0q3J20Z8ga8TRSv LEgNF4HHUXtJFKPj8hzseEpdIdhyiuBNI7ssj87s= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730572AbgCSN0Q (ORCPT ); Thu, 19 Mar 2020 09:26:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:54118 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728795AbgCSN0O (ORCPT ); Thu, 19 Mar 2020 09:26:14 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E0776207FC; Thu, 19 Mar 2020 13:26:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584624373; bh=1dSUJg0oKYYNWkqUqhi26j4u7MPwVcWmQRJ7yr6Z41E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qmOqPyQ63xOZcYaIzUnDXS0eiUb2xOLxDGjfdvffY9L69zAwrtj5gnSmtrsaA1y4f +YaFPBLJAsQKnOCrHH2EELNtEEj5xxtjCwzZF5N69vHGyDK4kkejVAok5HTQprlkDs ymFZj3R2DyqmPw0POh7d8GA21CpAY6UCmt5bIJ7M= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nicolas Saenz Julienne , Florian Fainelli , "David S. Miller" , Sasha Levin Subject: [PATCH 5.5 40/65] net: bcmgenet: Clear ID_MODE_DIS in EXT_RGMII_OOB_CTRL when not needed Date: Thu, 19 Mar 2020 14:04:22 +0100 Message-Id: <20200319123939.199190560@linuxfoundation.org> X-Mailer: git-send-email 2.25.2 In-Reply-To: <20200319123926.466988514@linuxfoundation.org> References: <20200319123926.466988514@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Nicolas Saenz Julienne [ Upstream commit 402482a6a78e5c61d8a2ec6311fc5b4aca392cd6 ] Outdated Raspberry Pi 4 firmware might configure the external PHY as rgmii although the kernel currently sets it as rgmii-rxid. This makes connections unreliable as ID_MODE_DIS is left enabled. To avoid this, explicitly clear that bit whenever we don't need it. Fixes: da38802211cc ("net: bcmgenet: Add RGMII_RXID support") Signed-off-by: Nicolas Saenz Julienne Acked-by: Florian Fainelli Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/broadcom/genet/bcmmii.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/broadcom/genet/bcmmii.c b/drivers/net/ethernet/broadcom/genet/bcmmii.c index 6392a25301838..10244941a7a60 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmmii.c +++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c @@ -294,6 +294,7 @@ int bcmgenet_mii_config(struct net_device *dev, bool init) */ if (priv->ext_phy) { reg = bcmgenet_ext_readl(priv, EXT_RGMII_OOB_CTRL); + reg &= ~ID_MODE_DIS; reg |= id_mode_dis; if (GENET_IS_V1(priv) || GENET_IS_V2(priv) || GENET_IS_V3(priv)) reg |= RGMII_MODE_EN_V123; -- 2.20.1