All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Heiko Stübner" <heiko@sntech.de>
To: Kukjin Kim <kgene.kim@samsung.com>, 'Ben Dooks' <ben-linux@fluff.org>
Cc: linux-arm-kernel@lists.infradead.org,
	linux-samsung-soc@vger.kernel.org, heiko@sntech.de
Subject: [PATCH 6/8] S3C2443: handle unset armdiv values gracefully
Date: Wed, 28 Sep 2011 12:22:16 +0200	[thread overview]
Message-ID: <201109281222.17432.heiko@sntech.de> (raw)
In-Reply-To: <201109281217.33813.heiko@sntech.de>

The armdiv array may contain unset divider values. Check the
relevant value to prevent division by zero errors.
Also check for set nr_armdiv and armdivmask before
meddling with clkdiv0.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
 arch/arm/plat-s3c24xx/s3c2443-clock.c |   27 ++++++++++++++++++++-------
 1 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/arch/arm/plat-s3c24xx/s3c2443-clock.c b/arch/arm/plat-s3c24xx/s3c2443-clock.c
index fea3d5c..31f97f1 100644
--- a/arch/arm/plat-s3c24xx/s3c2443-clock.c
+++ b/arch/arm/plat-s3c24xx/s3c2443-clock.c
@@ -179,11 +179,16 @@ static unsigned long s3c2443_armclk_roundrate(struct clk *clk,
 	unsigned div;
 	int ptr;
 
+	if (!nr_armdiv)
+		return -EINVAL;
+
 	for (ptr = 0; ptr < nr_armdiv; ptr++) {
 		div = armdiv[ptr];
-		calc = parent / div;
-		if (calc <= rate && div < best)
-			best = div;
+		if (div) {
+			calc = parent / div;
+			if (calc <= rate && div < best)
+				best = div;
+		}
 	}
 
 	return parent / best;
@@ -195,6 +200,9 @@ static unsigned long s3c2443_armclk_getrate(struct clk *clk)
 	unsigned long clkcon0;
 	int val;
 
+	if (!nr_armdiv || !armdivmask)
+		return -EINVAL;
+
 	clkcon0 = __raw_readl(S3C2443_CLKDIV0);
 	clkcon0 &= armdivmask;
 	val = clkcon0 >> S3C2443_CLKDIV0_ARMDIV_SHIFT;
@@ -211,12 +219,17 @@ static int s3c2443_armclk_setrate(struct clk *clk, unsigned long rate)
 	int ptr;
 	int val = -1;
 
+	if (!nr_armdiv || !armdivmask)
+		return -EINVAL;
+
 	for (ptr = 0; ptr < nr_armdiv; ptr++) {
 		div = armdiv[ptr];
-		calc = parent / div;
-		if (calc <= rate && div < best) {
-			best = div;
-			val = ptr;
+		if (div) {
+			calc = parent / div;
+			if (calc <= rate && div < best) {
+				best = div;
+				val = ptr;
+			}
 		}
 	}
 
-- 
1.7.5.4

WARNING: multiple messages have this Message-ID (diff)
From: heiko@sntech.de (Heiko Stübner)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 6/8] S3C2443: handle unset armdiv values gracefully
Date: Wed, 28 Sep 2011 12:22:16 +0200	[thread overview]
Message-ID: <201109281222.17432.heiko@sntech.de> (raw)
In-Reply-To: <201109281217.33813.heiko@sntech.de>

The armdiv array may contain unset divider values. Check the
relevant value to prevent division by zero errors.
Also check for set nr_armdiv and armdivmask before
meddling with clkdiv0.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
 arch/arm/plat-s3c24xx/s3c2443-clock.c |   27 ++++++++++++++++++++-------
 1 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/arch/arm/plat-s3c24xx/s3c2443-clock.c b/arch/arm/plat-s3c24xx/s3c2443-clock.c
index fea3d5c..31f97f1 100644
--- a/arch/arm/plat-s3c24xx/s3c2443-clock.c
+++ b/arch/arm/plat-s3c24xx/s3c2443-clock.c
@@ -179,11 +179,16 @@ static unsigned long s3c2443_armclk_roundrate(struct clk *clk,
 	unsigned div;
 	int ptr;
 
+	if (!nr_armdiv)
+		return -EINVAL;
+
 	for (ptr = 0; ptr < nr_armdiv; ptr++) {
 		div = armdiv[ptr];
-		calc = parent / div;
-		if (calc <= rate && div < best)
-			best = div;
+		if (div) {
+			calc = parent / div;
+			if (calc <= rate && div < best)
+				best = div;
+		}
 	}
 
 	return parent / best;
@@ -195,6 +200,9 @@ static unsigned long s3c2443_armclk_getrate(struct clk *clk)
 	unsigned long clkcon0;
 	int val;
 
+	if (!nr_armdiv || !armdivmask)
+		return -EINVAL;
+
 	clkcon0 = __raw_readl(S3C2443_CLKDIV0);
 	clkcon0 &= armdivmask;
 	val = clkcon0 >> S3C2443_CLKDIV0_ARMDIV_SHIFT;
@@ -211,12 +219,17 @@ static int s3c2443_armclk_setrate(struct clk *clk, unsigned long rate)
 	int ptr;
 	int val = -1;
 
+	if (!nr_armdiv || !armdivmask)
+		return -EINVAL;
+
 	for (ptr = 0; ptr < nr_armdiv; ptr++) {
 		div = armdiv[ptr];
-		calc = parent / div;
-		if (calc <= rate && div < best) {
-			best = div;
-			val = ptr;
+		if (div) {
+			calc = parent / div;
+			if (calc <= rate && div < best) {
+				best = div;
+				val = ptr;
+			}
 		}
 	}
 
-- 
1.7.5.4

  parent reply	other threads:[~2011-09-28 10:22 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-28 10:17 [PATCH 0/8] S3C2416: Enable armdiv and armclk Heiko Stübner
2011-09-28 10:17 ` Heiko Stübner
2011-09-28 10:18 ` [PATCH 1/8] S3C2416: Add armdiv_mask constant Heiko Stübner
2011-09-28 10:18   ` Heiko Stübner
2011-09-28 10:19 ` [PATCH 2/8] S3C2443: Add infrastructure to transmit armdiv to common code Heiko Stübner
2011-09-28 10:19   ` Heiko Stübner
2011-09-28 10:20 ` [PATCH 3/8] S3C2443: Move clk_arm and clk_armdiv " Heiko Stübner
2011-09-28 10:20   ` Heiko Stübner
2011-09-28 10:20 ` [PATCH 4/8] S3C2416: Add comment describing the armdiv/armclk Heiko Stübner
2011-09-28 10:20   ` Heiko Stübner
2011-09-28 10:21 ` [PATCH 5/8] S3C2443: Add get_rate operation for clk_armdiv Heiko Stübner
2011-09-28 10:21   ` Heiko Stübner
2011-09-28 10:22 ` Heiko Stübner [this message]
2011-09-28 10:22   ` [PATCH 6/8] S3C2443: handle unset armdiv values gracefully Heiko Stübner
2011-09-28 10:22 ` [PATCH 7/8] S3C2443: Accommodate cpufreq frequency scheme in armdiv Heiko Stübner
2011-09-28 10:22   ` Heiko Stübner
2011-09-28 10:23 ` [PATCH 8/8] S3C2443: use clk_get_rate to init fclk in common_setup_clocks Heiko Stübner
2011-09-28 10:23   ` Heiko Stübner
2011-10-14  7:14 ` [PATCH 0/8] S3C2416: Enable armdiv and armclk Kukjin Kim
2011-10-14  7:14   ` Kukjin Kim
2011-10-14  7:27   ` Heiko Stübner
2011-10-14  7:27     ` Heiko Stübner
2011-10-14  7:44     ` Kukjin Kim
2011-10-14  7:44       ` Kukjin Kim

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=201109281222.17432.heiko@sntech.de \
    --to=heiko@sntech.de \
    --cc=ben-linux@fluff.org \
    --cc=kgene.kim@samsung.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-samsung-soc@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.