From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-858731-1516767717-2-4940023012350173686 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES rocaen, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1516767717; b=ifTOA0kvsOtrOUomOqjgFpka7UcD1w4HPYbwDxsJPlPCZ20 xhjMx7e27ple6r+fvoxjt4vpyo6OBS2Bz0vYnPFu3Q1mcW+qMTL0cNmc4l2KyfVn aHNgvOMg3kx+0rMGrOIKYC5o57vGBVR3qM6dyw7HQlrIcjo8aFimDn5RoojEKgCQ Yx2eR5vS1ZBeCo9qWjjurw5c4R+jKQr9eodMER9U+xOhEukO/oUlMckgBPA1Wt8h dv6vfEaUTXoHoZD9J36gfqT6RKYXzL/RuHo6MjZDCFZRStil0b6FefSpvyN/YHw6 R3K4nd9LIufZY1u1ohzKCpKiREsSq/Rfmyv5dgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1516767717; bh=pJX+Ky GHxGGPqmFaQpz7w1h9AJgEWxDkmumJ7lSmtEo=; b=xFJFTHG4pOlAp6nbeefqOf e/In9rAIFPFhlfAIPfzkYPFEdsKnOQzbcLr+Jp3zY0qhL8pawFF9NYApgPNzb6SG YnGPYZA3SXRfcS+8hy2w05pJwy7Fd8Gto41vUcidR3U/kEndwMAnX5bN/9xN9648 Wcx++012PcA9rZX8lJlQXrMPr9DRNAu5Sk01uSxCCj5ZtSizP+TKYtqE+csEa8eM PoakwljS//W7r+5m9pKauWVTQd0XCkIbk09llY4BM9AgEL7+xYQxtSAki7Spy7e9 ATksCuGhysPGMB8Nub0uSnLflC3Kk5OqqTfUUwanHy3ShNuZPgiNcLTJwcQrLfBw == ARC-Authentication-Results: i=1; mx5.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=DAreaW0v x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx5.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=DAreaW0v x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933028AbeAXEVn (ORCPT ); Tue, 23 Jan 2018 23:21:43 -0500 Received: from mail-cys01nam02on0093.outbound.protection.outlook.com ([104.47.37.93]:46352 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933317AbeAXEUJ (ORCPT ); Tue, 23 Jan 2018 23:20:09 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Robert Lippert , Robert Lippert , Guenter Roeck , Sasha Levin Subject: [PATCH AUTOSEL for 3.18 10/16] hwmon: (pmbus) Use 64bit math for DIRECT format values Thread-Topic: [PATCH AUTOSEL for 3.18 10/16] hwmon: (pmbus) Use 64bit math for DIRECT format values Thread-Index: AQHTlMo+e5szrh7W3kW/B78K+zo0+Q== Date: Wed, 24 Jan 2018 04:17:27 +0000 Message-ID: <20180124041716.32520-10-alexander.levin@microsoft.com> References: <20180124041716.32520-1-alexander.levin@microsoft.com> In-Reply-To: <20180124041716.32520-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;DM5PR2101MB0872;7:WK0A6ZSNvjYvolmb8H49m2UbkdD/sMf141aOEEBh/yGYAJJslJrggC/y/E1dkB+RPv8aQC3FP3cw2s0ijYkiYUKd7Anp+iKWMoVYcnu9FGVchrx2wy3uan1tsh4/PxPGHkH+i1/0DYXOzbKoXSAyvO9/HR0/utGsvIJSueOIOT5eGxGa+Q8K/WgttS9CD8MHQRiJameWv6vKIIZRIZRf25/lGe1LCwux7rS8qbzlDXICFtq0oNdGzLMJ7rf/j2kg x-ms-office365-filtering-correlation-id: 8f7efc47-2980-404e-1d1f-08d562e1beb7 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(2017052603307)(7193020);SRVR:DM5PR2101MB0872; x-ms-traffictypediagnostic: DM5PR2101MB0872: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(85827821059158)(211936372134217)(153496737603132); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(10201501046)(3231046)(2400081)(944501161)(6055026)(61426038)(61427038)(6041288)(20161123564045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011);SRVR:DM5PR2101MB0872;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB0872; x-forefront-prvs: 056297E276 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(39380400002)(396003)(366004)(346002)(376002)(39860400002)(199004)(189003)(5660300001)(106356001)(72206003)(3280700002)(5250100002)(66066001)(3660700001)(105586002)(14454004)(86612001)(478600001)(53936002)(2900100001)(10290500003)(2501003)(6512007)(10090500001)(6436002)(6506007)(36756003)(6116002)(39060400002)(3846002)(6486002)(2906002)(22452003)(107886003)(316002)(54906003)(4326008)(110136005)(6346003)(81166006)(25786009)(26005)(2950100002)(6666003)(86362001)(1076002)(8676002)(7736002)(81156014)(99286004)(305945005)(76176011)(68736007)(97736004)(102836004)(8936002)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB0872;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: nL5T/WLl/eHli3i+t1Nxab4XzBSI1GKOKJvNcTnS8IGoMhiAEneURvyqfZbouw/A+0l4u1hGQmjhG+o0Cj4CeA== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8f7efc47-2980-404e-1d1f-08d562e1beb7 X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jan 2018 04:17:27.9428 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0872 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Robert Lippert [ Upstream commit bd467e4eababe4c04272c1e646f066db02734c79 ] Power values in the 100s of watt range can easily blow past 32bit math limits when processing everything in microwatts. Use 64bit math instead to avoid these issues on common 32bit ARM BMC platforms. Fixes: 442aba78728e ("hwmon: PMBus device driver") Signed-off-by: Robert Lippert Signed-off-by: Guenter Roeck Signed-off-by: Sasha Levin --- drivers/hwmon/pmbus/pmbus_core.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_c= ore.c index 291d11fe93e7..6f3fabb5350f 100644 --- a/drivers/hwmon/pmbus/pmbus_core.c +++ b/drivers/hwmon/pmbus/pmbus_core.c @@ -20,6 +20,7 @@ */ =20 #include +#include #include #include #include @@ -443,8 +444,8 @@ static long pmbus_reg2data_linear(struct pmbus_data *da= ta, static long pmbus_reg2data_direct(struct pmbus_data *data, struct pmbus_sensor *sensor) { - long val =3D (s16) sensor->data; - long m, b, R; + s64 b, val =3D (s16)sensor->data; + s32 m, R; =20 m =3D data->info->m[sensor->class]; b =3D data->info->b[sensor->class]; @@ -472,11 +473,12 @@ static long pmbus_reg2data_direct(struct pmbus_data *= data, R--; } while (R < 0) { - val =3D DIV_ROUND_CLOSEST(val, 10); + val =3D div_s64(val + 5LL, 10L); /* round closest */ R++; } =20 - return (val - b) / m; + val =3D div_s64(val - b, m); + return clamp_val(val, LONG_MIN, LONG_MAX); } =20 /* @@ -588,7 +590,8 @@ static u16 pmbus_data2reg_linear(struct pmbus_data *dat= a, static u16 pmbus_data2reg_direct(struct pmbus_data *data, struct pmbus_sensor *sensor, long val) { - long m, b, R; + s64 b, val64 =3D val; + s32 m, R; =20 m =3D data->info->m[sensor->class]; b =3D data->info->b[sensor->class]; @@ -605,18 +608,18 @@ static u16 pmbus_data2reg_direct(struct pmbus_data *d= ata, R -=3D 3; /* Adjust R and b for data in milli-units */ b *=3D 1000; } - val =3D val * m + b; + val64 =3D val64 * m + b; =20 while (R > 0) { - val *=3D 10; + val64 *=3D 10; R--; } while (R < 0) { - val =3D DIV_ROUND_CLOSEST(val, 10); + val64 =3D div_s64(val64 + 5LL, 10L); /* round closest */ R++; } =20 - return val; + return (u16)clamp_val(val64, S16_MIN, S16_MAX); } =20 static u16 pmbus_data2reg_vid(struct pmbus_data *data, --=20 2.11.0