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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 540E0C7618B for ; Fri, 26 Jul 2019 15:32:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2A6A922BF5 for ; Fri, 26 Jul 2019 15:32:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564155136; bh=B2G43BUIL/B67yn5SSx5k31Rhc5SJkFskrrpC5iyrJQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=1bqN+UWnAs14cMIAaMgjuUwigF+e+e30b/Y58A1VVXTke2ranlLsJkciW1QSpYXNZ 6O8K5sFG25BZWYQeqedNHDoyCp29FO1a+WegdeRdP0DNcCZUpgcyvgsvRhR2Vfwx7/ JWjWi0vF5TxYqTTIkI3f7rJnhR3pl6a4bsRdIkA0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389431AbfGZPcP (ORCPT ); Fri, 26 Jul 2019 11:32:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:47282 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389007AbfGZPcL (ORCPT ); Fri, 26 Jul 2019 11:32:11 -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 A1FBE2054F; Fri, 26 Jul 2019 15:32:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564155130; bh=B2G43BUIL/B67yn5SSx5k31Rhc5SJkFskrrpC5iyrJQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d6GAbXaYUXV6mOt0y/2R1duUBTL0kg7boDHopJS/rR0KiWKlSBnsNhN2HzTsY1bYM oDpnPqn5Esl1tUQqrZJ3WI+zxwW4ASzAEG2ibV0HEQcElQPYLWRZmMNS7vtLAT2Yld eqr80npMBFXona3n6aL0SvB5b1Ix9qIFikUClH4E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, chris.healy@zii.aero, Andrew Lunn , "David S. Miller" Subject: [PATCH 4.19 13/50] net: phy: sfp: hwmon: Fix scaling of RX power Date: Fri, 26 Jul 2019 17:24:48 +0200 Message-Id: <20190726152301.937711203@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190726152300.760439618@linuxfoundation.org> References: <20190726152300.760439618@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: Andrew Lunn [ Upstream commit 0cea0e1148fe134a4a3aaf0b1496f09241fb943a ] The RX power read from the SFP uses units of 0.1uW. This must be scaled to units of uW for HWMON. This requires a divide by 10, not the current 100. With this change in place, sensors(1) and ethtool -m agree: sff2-isa-0000 Adapter: ISA adapter in0: +3.23 V temp1: +33.1 C power1: 270.00 uW power2: 200.00 uW curr1: +0.01 A Laser output power : 0.2743 mW / -5.62 dBm Receiver signal average optical power : 0.2014 mW / -6.96 dBm Reported-by: chris.healy@zii.aero Signed-off-by: Andrew Lunn Fixes: 1323061a018a ("net: phy: sfp: Add HWMON support for module sensors") Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/phy/sfp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c @@ -514,7 +514,7 @@ static int sfp_hwmon_read_sensor(struct static void sfp_hwmon_to_rx_power(long *value) { - *value = DIV_ROUND_CLOSEST(*value, 100); + *value = DIV_ROUND_CLOSEST(*value, 10); } static void sfp_hwmon_calibrate(struct sfp *sfp, unsigned int slope, int offset,