Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp4675622ybz; Tue, 28 Apr 2020 16:12:18 -0700 (PDT) X-Google-Smtp-Source: APiQypI9+eXvlqyfSmBaGpC9jhOv0hm6T+JUJFSWVsSkkMDtViuW3SNLiDc/ytTEvpQydc21E05A X-Received: by 2002:a17:906:a441:: with SMTP id cb1mr121344ejb.242.1588115538532; Tue, 28 Apr 2020 16:12:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588115538; cv=none; d=google.com; s=arc-20160816; b=fv+ts7glLmRnxfLktsxnBy7Ay7yOm948068/YM0ybacyqlwqohLBPB81PbDDpsoFmf 9s8X6XPfTMsNyR8RtcehNkOEME9zWLoB63lsWdvio2RBb7mEZj62x7BnAtnujTqpAlae wCgiyfbTRI8yHKcPvWt9xEoiQIMYKyzpQCR8Ho/9y/Br4+OiKX27Z5UmUH1TnLPfa4k7 sAv2CI9YNp4k9JD2PJbe26HZOUPMJ9eOxjnwtom93xEEqbNM5FpvAXgpJtHHYeJF1aEI HiikOmqhhLvsyygBlnLC7iSAeu49SdtMVAZnm7wP7BYqX0p94oLp+yeBU76wjZhWUZZY mX9A== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ZkflxXpr0dsNrdbqBGov68Tf8zOBc5YBuWVsFJT38C0=; b=JzSnrE0RNfHOy9am4+rxFDwprOELGtxY4mKQb5kiTiwtR14hH0e9EBd1hmS/OJpu7Z 7VnVyVt10NwsQDEFjhPlqZinH/AAR9iIJBGlNEDEpek7sHFh2VLQSumxCdxPsSLUTpom E0ZlXfFiHUeS8mDqcvZn6A4h9z669GMf5RWtNHc49D9yUzcwQH5cP+2Ke9wAUUZQx0bZ IRqgCMoFToMmPpAZfbCvzPtl/t1rbC7/2H5FY43ImVHMQ3H+hKt8LXm74rwRPFVnOE2F nupTrJv60i9pi++3+BIm2VaCGipYeEX4o5lnrETRomc3pS8yQaRiEOW7G+AwokGnu6ea YI+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@walle.cc header.s=mail2016061301 header.b=gCtQeldr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z5si1565735edj.29.2020.04.28.16.11.50; Tue, 28 Apr 2020 16:12:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@walle.cc header.s=mail2016061301 header.b=gCtQeldr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726797AbgD1XH3 (ORCPT + 99 others); Tue, 28 Apr 2020 19:07:29 -0400 Received: from ssl.serverraum.org ([176.9.125.105]:36521 "EHLO ssl.serverraum.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726042AbgD1XHS (ORCPT ); Tue, 28 Apr 2020 19:07:18 -0400 Received: from apollo.fritz.box (unknown [IPv6:2a02:810c:c200:2e91:6257:18ff:fec4:ca34]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by ssl.serverraum.org (Postfix) with ESMTPSA id 57E5722727; Wed, 29 Apr 2020 01:07:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walle.cc; s=mail2016061301; t=1588115236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZkflxXpr0dsNrdbqBGov68Tf8zOBc5YBuWVsFJT38C0=; b=gCtQeldr5pqk8SwRwTik787T5y1b6MmnK9Wu7D4T+/hc+QeD0Iqu4n+TrPAgHH3UN9FN5c hEvrIvgiO8usp21aeT97epxF+d/y7jhzDE8BinO+LXG+vU/36w0Y784bmbkIOMSYoAlxy4 AGUhls2B52lcGptyCPYjsCUrF36bz88= From: Michael Walle To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Andrew Lunn , Florian Fainelli , Heiner Kallweit , Russell King , "David S . Miller" , Michael Walle Subject: [PATCH net-next v2 3/4] net: phy: bcm54140: apply the workaround on b0 chips Date: Wed, 29 Apr 2020 01:06:58 +0200 Message-Id: <20200428230659.7754-3-michael@walle.cc> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200428230659.7754-1-michael@walle.cc> References: <20200428230659.7754-1-michael@walle.cc> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: ++++++ X-Spam-Level: ****** X-Rspamd-Server: web X-Spam-Status: Yes, score=6.40 X-Spam-Score: 6.40 X-Rspamd-Queue-Id: 57E5722727 X-Spamd-Result: default: False [6.40 / 15.00]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_MISSING_CHARSET(2.50)[]; FREEMAIL_ENVRCPT(0.00)[gmail.com]; TAGGED_RCPT(0.00)[]; MIME_GOOD(-0.10)[text/plain]; BROKEN_CONTENT_TYPE(1.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DKIM_SIGNED(0.00)[]; RCPT_COUNT_SEVEN(0.00)[8]; MID_CONTAINS_FROM(1.00)[]; RCVD_COUNT_ZERO(0.00)[0]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:31334, ipnet:2a02:810c:8000::/33, country:DE]; FREEMAIL_CC(0.00)[lunn.ch,gmail.com,armlinux.org.uk,davemloft.net,walle.cc]; SUSPICIOUS_RECIPS(1.50)[] X-Spam: Yes Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The lower three bits of the phy_id specifies the chip stepping. The workaround is specifically for the B0 stepping. Apply it only on these chips. Signed-off-by: Michael Walle Reviewed-by: Andrew Lunn Reviewed-by: Florian Fainelli --- changes since v1: - added reviewed-by tags drivers/net/phy/bcm54140.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/net/phy/bcm54140.c b/drivers/net/phy/bcm54140.c index edafc9dc2f63..d73cbddbc69b 100644 --- a/drivers/net/phy/bcm54140.c +++ b/drivers/net/phy/bcm54140.c @@ -115,6 +115,9 @@ #define BCM54140_HWMON_IN_ALARM_BIT(ch) ((ch) ? BCM54140_RDB_MON_ISR_3V3 \ : BCM54140_RDB_MON_ISR_1V0) +#define BCM54140_PHY_ID_REV(phy_id) ((phy_id) & 0x7) +#define BCM54140_REV_B0 1 + #define BCM54140_DEFAULT_DOWNSHIFT 5 #define BCM54140_MAX_DOWNSHIFT 9 @@ -632,9 +635,11 @@ static int bcm54140_config_init(struct phy_device *phydev) int ret; /* Apply hardware errata */ - ret = bcm54140_b0_workaround(phydev); - if (ret) - return ret; + if (BCM54140_PHY_ID_REV(phydev->phy_id) == BCM54140_REV_B0) { + ret = bcm54140_b0_workaround(phydev); + if (ret) + return ret; + } /* Unmask events we are interested in. */ reg &= ~(BCM54140_RDB_INT_DUPLEX | -- 2.20.1