Received: by 2002:a05:6a10:9e8c:0:0:0:0 with SMTP id y12csp269317pxx; Wed, 28 Oct 2020 04:36:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxIbMoAvkYHZjZx817GXqvT67kiuMBT3DrXMi+HhQ9z76+S6uTRuWPDZbrB+pvvVZec0ZST X-Received: by 2002:a17:906:5651:: with SMTP id v17mr7104271ejr.2.1603884967242; Wed, 28 Oct 2020 04:36:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603884967; cv=none; d=google.com; s=arc-20160816; b=EEUl0Gw6qrUSeiQB+5sJGEc3z2sAn0r5W7U4ms+jb1WRbMi05VpuaAQJS2eTKIKPnN aINV4T4Tfr8gTwAdlBCL4mJsh8oqpH61pm3j9901ri48Batb+obrRod+PvmUUcZeKyEV ehVrD7AY5Upau9GOfO6uhj31ua/PuwRAnDascpTcHOQxHBzFMJuxg96Oc2OByVfUw7rg cyQbwuVmEaxE3msk+key7PjD4CSRW5AHguUSIPiAB2wjhSBXPfwWB/4aPT/QZ8sVlLyN UQDChqfjY1Dx1qayOmsrxA2bsOvZkfnVKcAk0e/Ppb7m9zjjBmSvfM/T17jeArxa6nbY mQlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=1fsz1kOXMv6/TJhoPCYQCqN+bdjl0KiiYz7HRLaEGfI=; b=d3gMMcCoe5o7uPnqlC6QNgnDP+VEs73S7HVC2cMYyheKBUaadjrih27qyWxLHOaAHv InpbTajRjlex52s3lCchY0yT3ZYBgij7HbPtRHnhR9WXDR4CXiIcnQNGIL0BKftJ9Wbs m1DBtxiUtQym/qtH6lRVIAzS6gAcsWS8gWYO371K5cbVv9vCvF05HbKgUsyLMaiaYabj 3C2SI5ahy7zA7PcZxQgFRiMxd34FoPs8pK+JA8pMnOi89Xw2poS8aJNAR9y1UOKiLtk5 kL/JZQ1TaV9z1Od3JrGPKTeJAgYG1N3BljNVG2O/Nh7bzA5QweRpav8N2xDyZXPtEAGi veuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Ng4UYI0n; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s16si2897729edy.300.2020.10.28.04.35.45; Wed, 28 Oct 2020 04:36:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Ng4UYI0n; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1793956AbgJ0PJY (ORCPT + 99 others); Tue, 27 Oct 2020 11:09:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:39194 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1790448AbgJ0PEg (ORCPT ); Tue, 27 Oct 2020 11:04:36 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 8D7DD2071A; Tue, 27 Oct 2020 15:04:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603811075; bh=NBWrKiOKLvc1rcrG2hn1zvGYfhmSjU7XGLJMBk+FY9c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ng4UYI0nM5IpWvpZrbMPje3uL1IjDm6M1k8bWMbkTJ1O4G60BBXV/o4gNZJAO2czz F3Rf+d2N4yVrrmtcjZLu/ESSe9w0NHlXFbsPwmIEfxJukOA14IbrQg/md58b7O7Vw5 XJm6aYTigyBKCH1mAwB4yJiDCHnr07dZREkRMXUc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Finn Thain , Stan Johnson , Michael Ellerman , Sasha Levin Subject: [PATCH 5.8 364/633] powerpc/tau: Use appropriate temperature sample interval Date: Tue, 27 Oct 2020 14:51:47 +0100 Message-Id: <20201027135539.771956755@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135522.655719020@linuxfoundation.org> References: <20201027135522.655719020@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Finn Thain [ Upstream commit 66943005cc41f48e4d05614e8f76c0ca1812f0fd ] According to the MPC750 Users Manual, the SITV value in Thermal Management Register 3 is 13 bits long. The present code calculates the SITV value as 60 * 500 cycles. This would overflow to give 10 us on a 500 MHz CPU rather than the intended 60 us. (But according to the Microprocessor Datasheet, there is also a factor of 266 that has to be applied to this value on certain parts i.e. speed sort above 266 MHz.) Always use the maximum cycle count, as recommended by the Datasheet. Fixes: 1da177e4c3f41 ("Linux-2.6.12-rc2") Signed-off-by: Finn Thain Tested-by: Stan Johnson Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/896f542e5f0f1d6cf8218524c2b67d79f3d69b3c.1599260540.git.fthain@telegraphics.com.au Signed-off-by: Sasha Levin --- arch/powerpc/include/asm/reg.h | 2 +- arch/powerpc/kernel/tau_6xx.c | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h index 88e6c78100d9b..c750afc62887c 100644 --- a/arch/powerpc/include/asm/reg.h +++ b/arch/powerpc/include/asm/reg.h @@ -815,7 +815,7 @@ #define THRM1_TIN (1 << 31) #define THRM1_TIV (1 << 30) #define THRM1_THRES(x) ((x&0x7f)<<23) -#define THRM3_SITV(x) ((x&0x3fff)<<1) +#define THRM3_SITV(x) ((x & 0x1fff) << 1) #define THRM1_TID (1<<2) #define THRM1_TIE (1<<1) #define THRM1_V (1<<0) diff --git a/arch/powerpc/kernel/tau_6xx.c b/arch/powerpc/kernel/tau_6xx.c index e2ab8a111b693..976d5bc1b5176 100644 --- a/arch/powerpc/kernel/tau_6xx.c +++ b/arch/powerpc/kernel/tau_6xx.c @@ -178,15 +178,11 @@ static void tau_timeout(void * info) * complex sleep code needs to be added. One mtspr every time * tau_timeout is called is probably not a big deal. * - * Enable thermal sensor and set up sample interval timer - * need 20 us to do the compare.. until a nice 'cpu_speed' function - * call is implemented, just assume a 500 mhz clock. It doesn't really - * matter if we take too long for a compare since it's all interrupt - * driven anyway. - * - * use a extra long time.. (60 us @ 500 mhz) + * The "PowerPC 740 and PowerPC 750 Microprocessor Datasheet" + * recommends that "the maximum value be set in THRM3 under all + * conditions." */ - mtspr(SPRN_THRM3, THRM3_SITV(500*60) | THRM3_E); + mtspr(SPRN_THRM3, THRM3_SITV(0x1fff) | THRM3_E); local_irq_restore(flags); } -- 2.25.1