Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp2239753ybg; Sun, 27 Oct 2019 14:09:18 -0700 (PDT) X-Google-Smtp-Source: APXvYqxyZ7KanIQTAAL55RZDqK9naXI5o6OJS9JBAhnwRvbhWgqoRokxE0+yvobvQpyNVw7zSQVH X-Received: by 2002:a50:cbc2:: with SMTP id l2mr16338000edi.304.1572210558585; Sun, 27 Oct 2019 14:09:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572210558; cv=none; d=google.com; s=arc-20160816; b=jBrK73wlVkJ2KDeIYHiFtmUSERh5CQ8VJW7+XmIeAiLhh3mrtD90LPK+HACgTqHL2x fM4q2VBYyYJrdzLpPtZ2gP/iKRF8gWgMnx4NVMW3wFIdn8a0HKwE6DZtg1T41/FpqRyV nq/QsZQO13BP4O2z5B4Mn+F/FpRK4DTWdSxqihXt9VpVsLDyN5okFIs5St6FOtSJq0ZT gJWgqkergCQ8Y2/JO1VIKJm3FUhZu9WnRTPR9oCYZ7zA4ng1sa9Yw8tACj5y4U71Do10 PKn+ceV8pcKfQLsOf0zKKas5OrG6776ZPI3y7C3XOA+R+nVAaRpSPTCuamggDePWL2qk 1fEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=WmqhPP3yGBd4rb4gH2gbKD9GUQBrRUCGG4pEOaLPIh4=; b=F6MIpDvCKRDIdI7LP+IzRc5TvdiNWhc/XVCivykEuV+348nQdyWdnNxydEXjz8lKK3 789JWylxypGrqjdelfxsjUKrGDJ1nJM1DYpIvyA4eOZX2N1nqeq96pnopB87eOaj7fDL /U9j/WLRUy29zzOpx61oRpqB9DleDTJLGp+8ydMs2vAUxKtf4io1BvaRIOCFOFmQH5zL As92Z+Y4L5QbwzLzSEEMxV9/7RAJYndd99hG35lsaJwAzQDAHOD4VfLjCeerNL0wYw25 ykXy1mT0H/yexmaTWo2NXvaBTHC7onfQhjRT9GR6dFvIkppdqmAHu2JDB6Br78NyejDi ++iw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=xCtejVnq; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y64si6475480edy.434.2019.10.27.14.08.55; Sun, 27 Oct 2019 14:09:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=xCtejVnq; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728746AbfJ0VFA (ORCPT + 99 others); Sun, 27 Oct 2019 17:05:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:50734 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728723AbfJ0VE6 (ORCPT ); Sun, 27 Oct 2019 17:04:58 -0400 Received: from localhost (100.50.158.77.rev.sfr.net [77.158.50.100]) (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 744D320B7C; Sun, 27 Oct 2019 21:04:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572210298; bh=OCtxOBfUNqUfdyo4QTi6W5P3JVdilBukGXrbpspuus8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xCtejVnq2C+HbpJ58dcLWiD/q0k2kFn93JqT4iXn1+Nu8ZRfYvJ4V/efs1Dlx44/f yb8/lAYbl1eEP1CKqYGbaCtsILfunfAgQqN4aHE9421dwZiGO4RkhNFxBZHocGU+rr WdTmn82A7n0B2bWxX+BP0NdhvRBJeKGlmBmsLDlU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Florian Fainelli , Doug Berger , "David S. Miller" Subject: [PATCH 4.9 17/49] net: bcmgenet: Fix RGMII_MODE_EN value for GENET v1/2/3 Date: Sun, 27 Oct 2019 22:00:55 +0100 Message-Id: <20191027203131.963597767@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203119.468466356@linuxfoundation.org> References: <20191027203119.468466356@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Florian Fainelli [ Upstream commit efb86fede98cdc70b674692ff617b1162f642c49 ] The RGMII_MODE_EN bit value was 0 for GENET versions 1 through 3, and became 6 for GENET v4 and above, account for that difference. Fixes: aa09677cba42 ("net: bcmgenet: add MDIO routines") Signed-off-by: Florian Fainelli Acked-by: Doug Berger Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/broadcom/genet/bcmgenet.h | 1 + drivers/net/ethernet/broadcom/genet/bcmmii.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.h +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.h @@ -362,6 +362,7 @@ struct bcmgenet_mib_counters { #define EXT_ENERGY_DET_MASK (1 << 12) #define EXT_RGMII_OOB_CTRL 0x0C +#define RGMII_MODE_EN_V123 (1 << 0) #define RGMII_LINK (1 << 4) #define OOB_DISABLE (1 << 5) #define RGMII_MODE_EN (1 << 6) --- a/drivers/net/ethernet/broadcom/genet/bcmmii.c +++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c @@ -328,7 +328,11 @@ int bcmgenet_mii_config(struct net_devic */ if (priv->ext_phy) { reg = bcmgenet_ext_readl(priv, EXT_RGMII_OOB_CTRL); - reg |= RGMII_MODE_EN | 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; + else + reg |= RGMII_MODE_EN; bcmgenet_ext_writel(priv, reg, EXT_RGMII_OOB_CTRL); }