From nobody@FreeBSD.org  Mon Mar  3 15:14:51 2014
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id 3659151F
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  3 Mar 2014 15:14:51 +0000 (UTC)
Received: from cgiserv.freebsd.org (cgiserv.freebsd.org [IPv6:2001:1900:2254:206a::50:4])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 227C72FF
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  3 Mar 2014 15:14:51 +0000 (UTC)
Received: from cgiserv.freebsd.org ([127.0.1.6])
	by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s23FEoNe083769
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 3 Mar 2014 15:14:50 GMT
	(envelope-from nobody@cgiserv.freebsd.org)
Received: (from nobody@localhost)
	by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s23FEoUS083764;
	Mon, 3 Mar 2014 15:14:50 GMT
	(envelope-from nobody)
Message-Id: <201403031514.s23FEoUS083764@cgiserv.freebsd.org>
Date: Mon, 3 Mar 2014 15:14:50 GMT
From: Svatopluk Kraus <onwahe@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: omap4 clock frequency computation overflow
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         187223
>Category:       arm
>Synopsis:       omap4 clock frequency computation overflow
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-arm
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 03 15:20:00 UTC 2014
>Closed-Date:    
>Last-Modified:  Thu Mar  6 22:40:01 UTC 2014
>Originator:     Svatopluk Kraus
>Release:        FreeBSD  11.0-CURRENT
>Organization:
>Environment:
Pandaboard ES
>Description:
uint32_t is not enough. See patch.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: sys/arm/ti/omap4/omap4_prcm_clks.c
===================================================================
--- sys/arm/ti/omap4/omap4_prcm_clks.c	(revision 262153)
+++ sys/arm/ti/omap4/omap4_prcm_clks.c	(working copy)
@@ -984,13 +984,11 @@
 	pll_mult = ((clksel >> 8) & 0x7ff);
 	pll_div = (clksel & 0x7f) + 1;

-
 	/* Get the system clock freq */
 	omap4_clk_get_sysclk_freq(NULL, &sysclk);

-
 	/* Calculate the MPU freq */
-	mpuclk = (sysclk * pll_mult) / pll_div;
+	mpuclk = ((uint64_t)sysclk * pll_mult) / pll_div;

 	/* Return the value */
 	if (freq)

>Release-Note:
>Audit-Trail:

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: arm/187223: commit references a PR
Date: Thu,  6 Mar 2014 22:32:18 +0000 (UTC)

 Author: cognet
 Date: Thu Mar  6 21:07:13 2014
 New Revision: 262870
 URL: http://svnweb.freebsd.org/changeset/base/262870
 
 Log:
   When calculating the MPU freq, make sure not to overflow by using a uint64_t.
   
   PR:	arm/187223
   Submitted by:	Svatopluk Kraus <onwahe@gmail.com>
 
 Modified:
   head/sys/arm/ti/omap4/omap4_prcm_clks.c
 
 Modified: head/sys/arm/ti/omap4/omap4_prcm_clks.c
 ==============================================================================
 --- head/sys/arm/ti/omap4/omap4_prcm_clks.c	Thu Mar  6 21:02:16 2014	(r262869)
 +++ head/sys/arm/ti/omap4/omap4_prcm_clks.c	Thu Mar  6 21:07:13 2014	(r262870)
 @@ -990,7 +990,7 @@ omap4_clk_get_arm_fclk_freq(struct ti_cl
  
  
  	/* Calculate the MPU freq */
 -	mpuclk = (sysclk * pll_mult) / pll_div;
 +	mpuclk = ((uint64_t)sysclk * pll_mult) / pll_div;
  
  	/* Return the value */
  	if (freq)
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
>Unformatted:
