From nobody Fri Dec 19 17:42:09 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6572AECAAA1 for ; Mon, 24 Oct 2022 13:55:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236735AbiJXNzh (ORCPT ); Mon, 24 Oct 2022 09:55:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34710 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236437AbiJXNxl (ORCPT ); Mon, 24 Oct 2022 09:53:41 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 37967BC466; Mon, 24 Oct 2022 05:43:40 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 9C575612B3; Mon, 24 Oct 2022 12:43:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B204CC433D6; Mon, 24 Oct 2022 12:43:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666615390; bh=HZaN/LuBXVRxq6KpjERBiJycbpJDZKdsXB0MQGoEFeE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=08TjDNxjNkBCXxfKmMJTCLZF5FrVnozWNReXorZPYJ7M6pXnqSearYuLAGshFNbJo 9mFbyIWKnxe1wlRJMlWA7IUdH8+TR+Zl/WdZ0NV7PqJfTZlq7pnSZ+Na6rJjvVXSYK OMg99vGkYieq7D6YtazYC14aDZDRKtQLGC6vUs5o= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Oleksandr Shamray , Vadim Pasternak , Guenter Roeck , Sasha Levin Subject: [PATCH 5.15 201/530] hwmon: (pmbus/mp2888) Fix sensors readouts for MPS Multi-phase mp2888 controller Date: Mon, 24 Oct 2022 13:29:05 +0200 Message-Id: <20221024113054.151557603@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Oleksandr Shamray [ Upstream commit 525dd5aed67a2f4f7278116fb92a24e6a53e2622 ] Fix scale factors for reading MPS Multi-phase mp2888 controller. Fixed sensors: - PIN/POUT: based on vendor documentation, set bscale factor 0.5W/LSB - IOUT: based on vendor documentation, set scale factor 0.25 A/LSB Fixes: e4db7719d037 ("hwmon: (pmbus) Add support for MPS Multi-phase mp2888= controller") Signed-off-by: Oleksandr Shamray Reviewed-by: Vadim Pasternak Link: https://lore.kernel.org/r/20220929121642.63051-1-oleksandrs@nvidia.com Signed-off-by: Guenter Roeck Signed-off-by: Sasha Levin --- drivers/hwmon/pmbus/mp2888.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/hwmon/pmbus/mp2888.c b/drivers/hwmon/pmbus/mp2888.c index 8ecd4adfef40..24e5194706cf 100644 --- a/drivers/hwmon/pmbus/mp2888.c +++ b/drivers/hwmon/pmbus/mp2888.c @@ -34,7 +34,7 @@ struct mp2888_data { int curr_sense_gain; }; =20 -#define to_mp2888_data(x) container_of(x, struct mp2888_data, info) +#define to_mp2888_data(x) container_of(x, struct mp2888_data, info) =20 static int mp2888_read_byte_data(struct i2c_client *client, int page, int = reg) { @@ -109,7 +109,7 @@ mp2888_read_phase(struct i2c_client *client, struct mp2= 888_data *data, int page, * - Kcs is the DrMOS current sense gain of power stage, which is obtaine= d from the * register MP2888_MFR_VR_CONFIG1, bits 13-12 with the following select= ion of DrMOS * (data->curr_sense_gain): - * 00b - 5=C2=B5A/A, 01b - 8.5=C2=B5A/A, 10b - 9.7=C2=B5A/A, 11b - 10= =C2=B5A/A. + * 00b - 8.5=C2=B5A/A, 01b - 9.7=C2=B5A/A, 1b - 10=C2=B5A/A, 11b - 5=C2= =B5A/A. * - Rcs is the internal phase current sense resistor. This parameter dep= ends on hardware * assembly. By default it is set to 1k=E2=84=A6. In case of different = assembly, user should * scale this parameter by dividing it by Rcs. @@ -118,10 +118,9 @@ mp2888_read_phase(struct i2c_client *client, struct mp= 2888_data *data, int page, * because sampling of current occurrence of bit weight has a big deviati= on, especially for * light load. */ - ret =3D DIV_ROUND_CLOSEST(ret * 100 - 9800, data->curr_sense_gain); - ret =3D (data->phase_curr_resolution) ? ret * 2 : ret; + ret =3D DIV_ROUND_CLOSEST(ret * 200 - 19600, data->curr_sense_gain); /* Scale according to total current resolution. */ - ret =3D (data->total_curr_resolution) ? ret * 8 : ret * 4; + ret =3D (data->total_curr_resolution) ? ret * 2 : ret; return ret; } =20 @@ -212,7 +211,7 @@ static int mp2888_read_word_data(struct i2c_client *cli= ent, int page, int phase, ret =3D pmbus_read_word_data(client, page, phase, reg); if (ret < 0) return ret; - ret =3D data->total_curr_resolution ? ret * 2 : ret; + ret =3D data->total_curr_resolution ? ret : DIV_ROUND_CLOSEST(ret, 2); break; case PMBUS_POUT_OP_WARN_LIMIT: ret =3D pmbus_read_word_data(client, page, phase, reg); @@ -223,7 +222,7 @@ static int mp2888_read_word_data(struct i2c_client *cli= ent, int page, int phase, * set 1. Actual power is reported with 0.5W or 1W respectively resoluti= on. Scaling * is needed to match both. */ - ret =3D data->total_curr_resolution ? ret * 4 : ret * 2; + ret =3D data->total_curr_resolution ? ret * 2 : ret; break; /* * The below registers are not implemented by device or implemented not a= ccording to the --=20 2.35.1