From patchwork Mon May 8 23:17:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 91318 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2509044vqo; Mon, 8 May 2023 16:58:46 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5jPToO7280G0BS7ycrEGf7wpbNwl/B0+2BW4GvWBbX3Lt5y6A3v+PyTR0d0r7HfOxuadBY X-Received: by 2002:a05:6a20:2451:b0:f0:3917:5b19 with SMTP id t17-20020a056a20245100b000f039175b19mr15566595pzc.40.1683590326556; Mon, 08 May 2023 16:58:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683590326; cv=none; d=google.com; s=arc-20160816; b=hoTWCwybkbnxesDO8rDrf15d/uu5G+beMzgjZOB1SKLEtwvYjPCr5jFoB0HusgknzQ Q/JPDwWsSdCT5oGqm0KNjunw1lX+r05msE0ogASI5lDeCBgVIaxI+NfOymYDXQG+YedW Ccf0bKGNsjKXkj5fz53djOT1bU/kZFj+xZgYJFuHyzW/DTqD+3ErvgZEtl4jbmzL5+94 4UpCEYgTOeWqVkyjJ4NmQEgB6nxMy5JrK51EGzyLTKtvSmCVq/Qsy0LI28Hv4PCxkk2h bK3DzSdIFcjnbo2RRy7EUpaEbAHjyeTUV3QBUFR1L+SX4jI2rDUdCJaoCjnH6hmNxOUL QbXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=untJNAyHEtCOqPSu4bMCDqJTO16k2riA5x50pJ7uqas=; b=eMuTQlevH8V/CD1CtccuUS45eoY6z83StVY9qGpig4emGYSJ7xAaxiv8oopJ+goJBG JwHiynHCkCqESOW4iiwiD1iZBHZsmN/5BtFbEmR2Nelju720AHx75WXz6YOBkSz9AAa6 nSm4o+w8LHvCk33lJt4+FscGaZ1NjD6/au0GalsWZ3DgmoF1hXHQKlcaXGFMugHmZEbb I5cCotDmQwAJhotdq5qrx+jIWwPFgpW7uHx/1nXdllpQZv9+BatwF+e22CK+2U+x16K1 9EfSk5ARoPWpSB7zKXFmPGJVjvlcRe/0O5Le6O1oTw8DmqeqAbl9/5au2TUR83cLIzJa k+hw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=ONpAAB48; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j5-20020a63b605000000b00524d6d12581si83786pgf.691.2023.05.08.16.58.34; Mon, 08 May 2023 16:58:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=ONpAAB48; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233459AbjEHXSD (ORCPT + 99 others); Mon, 8 May 2023 19:18:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44220 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230022AbjEHXSB (ORCPT ); Mon, 8 May 2023 19:18:01 -0400 Received: from mail-pf1-x435.google.com (mail-pf1-x435.google.com [IPv6:2607:f8b0:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8466555B2; Mon, 8 May 2023 16:18:00 -0700 (PDT) Received: by mail-pf1-x435.google.com with SMTP id d2e1a72fcca58-6439e6f5a33so2694570b3a.2; Mon, 08 May 2023 16:18:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683587879; x=1686179879; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=untJNAyHEtCOqPSu4bMCDqJTO16k2riA5x50pJ7uqas=; b=ONpAAB48NLP2jniOxsNfwNbyMLbswMoj8u8jV/XbEicERzgcaetI0bUKXkn7UnebiZ KWwYzoNQ8j5v8bSs7SfXmEqXFEfS7kvOhF9M3CGrnPcYTLXjS9D6abng/Hqr8pWLVQbD /sAi0CTbkunO1sJdYlxN0VU0OR67ru3Z5jhepnhCik4NT/8FNDeIX3ecAlH8XOrsHElI pLzliNG+8Pzn1FNEanEwD8b7YOeR9ZEfXlVdDlEbghzBdeJSLtHq8oWjQxHjuD/9Mgei fwbTMJGRQImVySxIlq+P2n/lH6fa/ys2nHJ0ahUDMFXsG8bTmQIryH0i7KODY8rMB7ZP A+cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683587879; x=1686179879; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=untJNAyHEtCOqPSu4bMCDqJTO16k2riA5x50pJ7uqas=; b=F5vvY5rM1cqIz/B/BxmdBMN+vMASipLXBPZP6CMc7SrwgeHT4Lc4REYxavhX4yqd41 Kw9XCCKyrNfCzE9vvFSEe/JhqS7543zhD3/Pbz4Z3PKTlrbgBEJcD4pUTctJQQV68vm5 rr3f6jIjm6+i8xiPSXPxsa3CIhH0sbUwCvbSpYd0l2sH40nYvICDAhsfCSLWZosN2ic2 p5d7pWN1pkiJKkC9+8vtwt7TOb1xsU98q4/FNhBqF3n9dCf5pZaKrpLKgKJfODd49Qpt aMpsleQ8bQEtDcniJVOFguoiXkrRB0e+22iYEOp5uTC1MyXS9XCPmnIUpSwC7fnkKLf9 5vRQ== X-Gm-Message-State: AC+VfDyQI+2U/ZjMFPYF/0uyne03I0oFVWQt8NSz0Xan3MrLvhhQMtWb S0cZMxXgQ6/1+rR5aMQStlXHESBC87o= X-Received: by 2002:a05:6a00:1496:b0:643:857d:879a with SMTP id v22-20020a056a00149600b00643857d879amr17311223pfu.24.1683587879397; Mon, 08 May 2023 16:17:59 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id f17-20020aa78b11000000b00642ea56f06fsm531922pfd.0.2023.05.08.16.17.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 May 2023 16:17:58 -0700 (PDT) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , Broadcom internal kernel review list , Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-kernel@vger.kernel.org (open list) Subject: [PATCH net] net: phy: bcm7xx: Correct read from expansion register Date: Mon, 8 May 2023 16:17:49 -0700 Message-Id: <20230508231749.1681169-1-f.fainelli@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1765372410094748651?= X-GMAIL-MSGID: =?utf-8?q?1765372410094748651?= Since the driver works in the "legacy" addressing mode, we need to write to the expansion register (0x17) with bits 11:8 set to 0xf to properly select the expansion register passed as argument. Fixes: f68d08c437f9 ("net: phy: bcm7xxx: Add EPHY entry for 72165") Signed-off-by: Florian Fainelli Reviewed-by: Simon Horman --- drivers/net/phy/bcm-phy-lib.h | 5 +++++ drivers/net/phy/bcm7xxx.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/phy/bcm-phy-lib.h b/drivers/net/phy/bcm-phy-lib.h index 9902fb182099..729db441797a 100644 --- a/drivers/net/phy/bcm-phy-lib.h +++ b/drivers/net/phy/bcm-phy-lib.h @@ -40,6 +40,11 @@ static inline int bcm_phy_write_exp_sel(struct phy_device *phydev, return bcm_phy_write_exp(phydev, reg | MII_BCM54XX_EXP_SEL_ER, val); } +static inline int bcm_phy_read_exp_sel(struct phy_device *phydev, u16 reg) +{ + return bcm_phy_read_exp(phydev, reg | MII_BCM54XX_EXP_SEL_ER); +} + int bcm54xx_auxctl_write(struct phy_device *phydev, u16 regnum, u16 val); int bcm54xx_auxctl_read(struct phy_device *phydev, u16 regnum); diff --git a/drivers/net/phy/bcm7xxx.c b/drivers/net/phy/bcm7xxx.c index 06be71ecd2f8..f8c17a253f8b 100644 --- a/drivers/net/phy/bcm7xxx.c +++ b/drivers/net/phy/bcm7xxx.c @@ -486,7 +486,7 @@ static int bcm7xxx_16nm_ephy_afe_config(struct phy_device *phydev) bcm_phy_write_misc(phydev, 0x0038, 0x0002, 0xede0); /* Read CORE_EXPA9 */ - tmp = bcm_phy_read_exp(phydev, 0x00a9); + tmp = bcm_phy_read_exp_sel(phydev, 0x00a9); /* CORE_EXPA9[6:1] is rcalcode[5:0] */ rcalcode = (tmp & 0x7e) / 2; /* Correct RCAL code + 1 is -1% rprogr, LP: +16 */