From patchwork Sat Dec 27 22:35:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Machek X-Patchwork-Id: 5545221 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B43D49F1BF for ; Sat, 27 Dec 2014 22:36:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B53F72010C for ; Sat, 27 Dec 2014 22:36:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C9DDD2017E for ; Sat, 27 Dec 2014 22:35:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751315AbaL0WfU (ORCPT ); Sat, 27 Dec 2014 17:35:20 -0500 Received: from atrey.karlin.mff.cuni.cz ([195.113.26.193]:39287 "EHLO atrey.karlin.mff.cuni.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751112AbaL0WfT (ORCPT ); Sat, 27 Dec 2014 17:35:19 -0500 Received: by atrey.karlin.mff.cuni.cz (Postfix, from userid 512) id D164D81D5E; Sat, 27 Dec 2014 23:35:16 +0100 (CET) Date: Sat, 27 Dec 2014 23:35:16 +0100 From: Pavel Machek To: Sebastian Reichel Cc: Pali Rohar , Jean Delvare , Guenter Roeck , Tony Lindgren , =?iso-8859-1?Q?Beno=EEt?= Cousson , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, lm-sensors@lm-sensors.org, devicetree@vger.kernel.org, Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala Subject: Re: [PATCH 2/3] hwmon: Driver for OMAP3 temperature sensor Message-ID: <20141227223516.GA18455@amd> References: <20141226102933.GA28778@amd> <1419597294-21487-1-git-send-email-sre@kernel.org> <1419597294-21487-3-git-send-email-sre@kernel.org> <20141227195825.GF10007@amd> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20141227195825.GF10007@amd> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Sat 2014-12-27 20:58:25, Pavel Machek wrote: > On Fri 2014-12-26 13:34:53, Sebastian Reichel wrote: > > OMAP34xx and OMAP36xx processors contain a register in the syscon area, > > which can be used to determine the SoCs temperature. This patch provides > > a DT based driver for the temperature sensor based on an older driver > > written by Peter De Schrijver for the Nokia N900 and N9. > > > > Signed-off-by: Sebastian Reichel > > --- > > drivers/hwmon/Kconfig | 8 ++ > > drivers/hwmon/Makefile | 1 + > > drivers/hwmon/omap3-temp.c | 307 +++++++++++++++++++++++++++++++++++++++++++++ > > 3 files changed, 316 insertions(+) > > create mode 100644 drivers/hwmon/omap3-temp.c > > When it hangs, it loops here: > > do { > regmap_read(data->syscon, SYSCON_TEMP_REG,&temp_sensor_reg); > if ((temp_sensor_reg & eocz_mask) == level) > return true; > printk("="); > } > while (ktime_us_delta(expire, ktime_get()) > 0); And this fixes the hang, and makes level handling more readable. Fix the timeout code, now it actually works. Driver still fails after a while. Signed-off-by: Pavel Machek diff --git a/drivers/hwmon/omap3-temp.c b/drivers/hwmon/omap3-temp.c index 8a69604..1b8c768 100644 --- a/drivers/hwmon/omap3-temp.c +++ b/drivers/hwmon/omap3-temp.c @@ -130,9 +130,7 @@ static inline bool wait_for_eocz(struct omap3_temp_data *data, ktime_t timeout, expire; u32 temp_sensor_reg, eocz_mask; eocz_mask = BIT(data->hwdata->eocz_bit); - level &= 1; - level *= eocz_mask; expire = ktime_add_ns(ktime_get(), max_delay); timeout = ktime_set(0, min_delay); @@ -140,9 +141,9 @@ static inline bool wait_for_eocz(struct omap3_temp_data *data, schedule_hrtimeout(&timeout, HRTIMER_MODE_REL); do { regmap_read(data->syscon, SYSCON_TEMP_REG, &temp_sensor_reg); - if ((temp_sensor_reg & eocz_mask) == level) + if (!!(temp_sensor_reg & eocz_mask) == level) return true; - } while (ktime_us_delta(expire, ktime_get()) > 0); + } while (ktime_after(expire, ktime_get())); return false; }