From patchwork Tue May 9 10:04:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98901 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp1739506qge; Tue, 9 May 2017 03:05:31 -0700 (PDT) X-Received: by 10.84.141.168 with SMTP id 37mr92159385plv.75.1494324331908; Tue, 09 May 2017 03:05:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494324331; cv=none; d=google.com; s=arc-20160816; b=0CEr3GJQibR4xMdAcdAllc48XdscbC5ftsHCoe+heTsogv7ueP3JOiti1jxsR1nKci 8xjf6oNhFcj3NcHiKk3BRnyHj6TB84vxkqHqMmTnt/bHyaRoO20r72+OHfJs4+MUM089 HWELXc08EEM4l3glDiVg+MHp8CLJsTkfXDrBJj7xvLdqGcR3aHVL4RVi6gMBYSosUxa+ tnvKjeMaBKpJxkwggr9TfhfY+Frz9NG6P+WAd7u3zbJywviwAtl1UG67a1FrHrS+UxAl JfM6FK6QDxLerix6+rRo5PT+QNztkmK3X3TAU4Rqma9pgrAe2ZFNuAMU6Zye0/6GJSKf V7Hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=BVsJ4FkuOMbwM6EK7hSOujci4gxvQ4bG1W6MPy8t71A=; b=q7V3aGqmIv99zYPrCk9k6Usp/lpdWxQ7QIsM4xmGQU2867wQGZnKe/NU9t1Cbc7vqN nlEZ9yrQl6HmrSD8IgXRTrDIZD6Tv2Z/4tHR8tTQ9SJ6K4xtBeZiL5LjiqysbwXLzafe ymMooPER9apRkdH7dpLJREO4gWWpgQLLzY85+0Sgg4jqrpJk/fIQ+FrG7NxRSrlNJT7B Atq6mFOmGs2NiQt7xqClz6D8i42BcO5RODgv9cMR09qERNoADMDYNgshDDavjq/se+Bz nJsk8YPwrbBYTafUlHV5hnQWfcKNUc0iM5mChHAhttX+3mTNcp45VejGK9FHgMzIDjeR ayuw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h13si12805392pgn.51.2017.05.09.03.05.31; Tue, 09 May 2017 03:05:31 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752199AbdEIKFb (ORCPT + 6 others); Tue, 9 May 2017 06:05:31 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:49558 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752009AbdEIKFa (ORCPT ); Tue, 9 May 2017 06:05:30 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.129]) with ESMTPA (Nemesis) id 0M5cCK-1dwYEP2Xcm-00xZKy; Tue, 09 May 2017 12:05:17 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Jeff Kirsher , Yanjiang Jin , Yanir Lubetkin , Arnd Bergmann Subject: [PATCH 3.16-stable 10/14] e1000e: fix call to do_div() to use u64 arg Date: Tue, 9 May 2017 12:04:58 +0200 Message-Id: <20170509100502.1358298-11-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170509100502.1358298-1-arnd@arndb.de> References: <20170509100502.1358298-1-arnd@arndb.de> X-Provags-ID: V03:K0:va6qzrLZM9pT96CsZPpKXhebAC8gfwdE4/yM8VJL+2aqkSLRNS9 VXepPYzh9jXcvopt1V63KnTFvCBzjKd2HQMqtKdX8wMqM2WkE/FtqG4Q+bj2trq4x7JgJ/y 0M7e8XD2aURC7Nv9EakC2jOVC3BKjopltuis1bqAvGRzABjVMfCsQr4MvyLVd/cafVoV08j zh1bYD8utMQAicDmKza+A== X-UI-Out-Filterresults: notjunk:1; V01:K0:9AuluDfWXcY=:F2xBi0hoJ4HpGg+GFKHdNA +WYWddijMN1pRsg8iBMZVDsnvlD2uRTuz4cktILMn+vfHh4ZGayExU+4FFqUBm4lfifT/p2ea JxFblJn0hgFq5U8EWTaDaYtRWGerLVniuw9EvhdKWZNUdXqjSDSkAB49rkYziIJf2ornRhusH lXt5a4SS6pBGrKrC+L8k8VjFNAApvezfh6DrCG5RAzF/35JAXptqHUZtFFMf+BHJNin9X5UEr KgKnrKXGw+UKZiHXFE7GIWhll/dtBtggeIuNXn/EIAWFKeooHTQJMsY6Uychl3+HYjt3uXXj6 Zcm+xhwgxEU54jC6DcMqsOrkNw3tABkyAdRVKGS8XV8UTL/5d0mkWg5f1lr4941XJ2r/VSb5L dxt96AVXFZmt0Zxxvkn6PUbRpQp+D+g9mTCHLjftpayS42uN9mb9ZcJzQpQ1EroNg/aaSXUNA ANDl9mAfrKTYDui7vFt7xbrLCu1xtKKRWnXSLamjmTHDqhl7wgUcTcv6y0x/qgBi0yaM3Eg/g dBCwLIoGiavD3BVa3yzamsVQZhyTCe3iRiQnYCiIeTybV182l7NY84a4esZrZHH8LpCbGBWR5 Kt1tv97xtRYx3eSdlZDcspLmJn7axz32X/3T4Eialtl6YL45Lg7I4DSJWovzwrA+0cOevPtUw swgyxYkYLm920adgBqBHa1ECKFPSK0dB3DylikByHsDIHDwG+DI+MAmpiyWA7qSqsJDQ= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jeff Kirsher Commit 30544af5483755b11bb5924736e9e0b45ef0644a upstream. We were using s64 for lat_ns (latency nano-second value) since in our calculations a negative value could be a resultant. For negative values, we then assign lat_ns to be zero, so the value passed to do_div() was never negative, but do_div() expects the argument type to be u64, so do a cast to resolve a compile warning seen on PowerPC. CC: Yanjiang Jin CC: Yanir Lubetkin Reported-by: Yanjiang Jin Signed-off-by: Jeff Kirsher Tested-by: Aaron Brown Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/intel/e1000e/ich8lan.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) -- 2.9.0 diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c index 060c5510b0c4..05e42d3d8a63 100644 --- a/drivers/net/ethernet/intel/e1000e/ich8lan.c +++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c @@ -984,7 +984,7 @@ static s32 e1000_platform_pm_pch_lpt(struct e1000_hw *hw, bool link) u16 max_snoop, max_nosnoop; u16 max_ltr_enc; /* max LTR latency encoded */ s64 lat_ns; /* latency (ns) */ - s64 value; + u64 value; u32 rxa; if (!hw->adapter->max_frame_size) { @@ -1011,12 +1011,13 @@ static s32 e1000_platform_pm_pch_lpt(struct e1000_hw *hw, bool link) */ lat_ns = ((s64)rxa * 1024 - (2 * (s64)hw->adapter->max_frame_size)) * 8 * 1000; - if (lat_ns < 0) - lat_ns = 0; - else - do_div(lat_ns, speed); + if (lat_ns < 0) { + value = 0; + } else { + value = lat_ns; + do_div(value, speed); + } - value = lat_ns; while (value > PCI_LTR_VALUE_MASK) { scale++; value = DIV_ROUND_UP(value, (1 << 5));