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=-8.1 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham 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 B067CC54FCB for ; Thu, 23 Apr 2020 13:39:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8AF802077D for ; Thu, 23 Apr 2020 13:39:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=armlinux.org.uk header.i=@armlinux.org.uk header.b="YREeJu6p" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728517AbgDWNjl (ORCPT ); Thu, 23 Apr 2020 09:39:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35986 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1728427AbgDWNjl (ORCPT ); Thu, 23 Apr 2020 09:39:41 -0400 Received: from pandora.armlinux.org.uk (pandora.armlinux.org.uk [IPv6:2001:4d48:ad52:3201:214:fdff:fe10:1be6]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E5F9DC08E934 for ; Thu, 23 Apr 2020 06:39:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2019; h=Sender:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=JwnCqDaMPWZamccsD4nh4325CLpyWCIRplqildZmsTs=; b=YREeJu6peDGqyTkregkI1pDWW /bnCrh+OMFRj1F09Hjzea3VXxVExCBJDvIPahIwvP7EA5yFOBdQUw2cdsYDUZ5DYRwugeInUTh24Y jK9MhvhCu8GM/sF9zF482RgpCbeEN82pcJaXJ0KS4ZaCzPbOgj02j2ipXWuL5uU2JxWnJQdhZH7Pw X3QXb+kU8qXkn8cRV5b/RG+vOpqh0LPSigT59gUIq10CwGJSxnllDsMwVik8SoCOT1DN9N91P84GI O0dHKEztRZB2jqLk4gEfW+e1K/Qrnoxs63Sv+noIgvxrJnCRtPaZ8XoyYXvba6K7gdvdQLcZ157TX S1mcHiYTg==; Received: from shell.armlinux.org.uk ([2001:4d48:ad52:3201:5054:ff:fe00:4ec]:42604) by pandora.armlinux.org.uk with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jRc4m-0006Z0-ML; Thu, 23 Apr 2020 14:39:36 +0100 Received: from linux by shell.armlinux.org.uk with local (Exim 4.92) (envelope-from ) id 1jRc4m-0000kY-6R; Thu, 23 Apr 2020 14:39:36 +0100 Date: Thu, 23 Apr 2020 14:39:36 +0100 From: Russell King - ARM Linux admin To: Baruch Siach Cc: netdev@vger.kernel.org, Andrew Lunn , Florian Fainelli , Heiner Kallweit Subject: Re: [PATCH net v3 2/2] net: phy: marvell10g: hwmon support for 2110 Message-ID: <20200423133936.GS25745@shell.armlinux.org.uk> References: <99771ceabb63b6a6a7d112197f639084f11e4aa4.1587618482.git.baruch@tkos.co.il> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Thu, Apr 23, 2020 at 08:08:02AM +0300, Baruch Siach wrote: > Read the temperature sensor register from the correct location for the > 88E2110 PHY. There is no enable/disable bit, so leave > mv3310_hwmon_config() for 88X3310 only. > > Signed-off-by: Baruch Siach > --- > v3: Split temperature register read routine per variant (Andrew Lunn) > > v2: Fix indentation (Andrew Lunn) > --- > drivers/net/phy/marvell10g.c | 25 +++++++++++++++++++++++-- > 1 file changed, 23 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c > index 69530a84450f..e14b9c2e5efe 100644 > --- a/drivers/net/phy/marvell10g.c > +++ b/drivers/net/phy/marvell10g.c > @@ -66,6 +66,8 @@ enum { > MV_PCS_CSSR1_SPD2_2500 = 0x0004, > MV_PCS_CSSR1_SPD2_10000 = 0x0000, > > + MV_PCS_TEMP = 0x8042, Please add a comment mentioning that this is for the 88E2110, and it would probably be a good idea to document the MV_V2_TEMP definition as 88X3310 specific as well. > + > /* These registers appear at 0x800X and 0xa00X - the 0xa00X control > * registers appear to set themselves to the 0x800X when AN is > * restarted, but status registers appear readable from either. > @@ -104,6 +106,24 @@ static umode_t mv3310_hwmon_is_visible(const void *data, > return 0; > } > > +static int mv3310_hwmon_read_temp_reg(struct phy_device *phydev) > +{ > + return phy_read_mmd(phydev, MDIO_MMD_VEND2, MV_V2_TEMP); > +} > + > +static int mv2110_hwmon_read_temp_reg(struct phy_device *phydev) > +{ > + return phy_read_mmd(phydev, MDIO_MMD_PCS, MV_PCS_TEMP); > +} > + > +static int mv10g_hwmon_read_temp_reg(struct phy_device *phydev) > +{ > + if (phydev->drv->phy_id == MARVELL_PHY_ID_88X3310) > + return mv3310_hwmon_read_temp_reg(phydev); > + else /* MARVELL_PHY_ID_88E2110 */ > + return mv2110_hwmon_read_temp_reg(phydev); > +} > + > static int mv3310_hwmon_read(struct device *dev, enum hwmon_sensor_types type, > u32 attr, int channel, long *value) > { > @@ -116,7 +136,7 @@ static int mv3310_hwmon_read(struct device *dev, enum hwmon_sensor_types type, > } > > if (type == hwmon_temp && attr == hwmon_temp_input) { > - temp = phy_read_mmd(phydev, MDIO_MMD_VEND2, MV_V2_TEMP); > + temp = mv10g_hwmon_read_temp_reg(phydev); > if (temp < 0) > return temp; > > @@ -196,7 +216,8 @@ static int mv3310_hwmon_probe(struct phy_device *phydev) > struct mv3310_priv *priv = dev_get_drvdata(&phydev->mdio.dev); > int i, j, ret; > > - if (phydev->drv->phy_id != MARVELL_PHY_ID_88X3310) > + if (phydev->drv->phy_id != MARVELL_PHY_ID_88X3310 && > + phydev->drv->phy_id != MARVELL_PHY_ID_88E2110) > return 0; Doesn't that mean this condition can be removed, as this can only be reached when one of those conditions is true? > > priv->hwmon_name = devm_kstrdup(dev, dev_name(dev), GFP_KERNEL); > -- > 2.26.1 > > -- RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line in suburbia: sync at 10.2Mbps down 587kbps up