From: Adrian Reber <adrian@lisas.de>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: linuxppc-dev@ozlabs.org, Utz Bacher <utz.bacher@de.ibm.com>
Subject: Re: [PATCH v2] Fix RTAS watchdog driver temperature read functionality
Date: Thu, 11 Jun 2009 12:52:17 +0200 [thread overview]
Message-ID: <20090611105216.GG8358@lisas.de> (raw)
In-Reply-To: <20090326120542.GD24889@lisas.de>
I forgot about this patch. Can this still be merged?
On Thu, Mar 26, 2009 at 01:05:42PM +0100, Adrian Reber wrote:
> Using the RTAS watchdog driver to read out the temperature crashes
> on a PXCAB:
>
> Unable to handle kernel paging request for data at address 0xfe347b50
> Faulting instruction address: 0xc00000000001af64
> Oops: Kernel access of bad area, sig: 11 [#1]
>
> The wrong usage of "(void *)__pa(&temperature)" in rtas_call() is
> removed by using the function rtas_get_sensor() which does the
> right thing.
>
> Signed-off-by: Adrian Reber <adrian@lisas.de>
> ---
> v2: use rtas_get_sensor(); typo fixed
> ---
> drivers/watchdog/wdrtas.c | 8 +++-----
> 1 files changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/watchdog/wdrtas.c b/drivers/watchdog/wdrtas.c
> index 5d3b1a8..a9f00dc 100644
> --- a/drivers/watchdog/wdrtas.c
> +++ b/drivers/watchdog/wdrtas.c
> @@ -214,16 +214,14 @@ static void wdrtas_timer_keepalive(void)
> */
> static int wdrtas_get_temperature(void)
> {
> - long result;
> + int result;
> int temperature = 0;
>
> - result = rtas_call(wdrtas_token_get_sensor_state, 2, 2,
> - (void *)__pa(&temperature),
> - WDRTAS_THERMAL_SENSOR, 0);
> + result = rtas_get_sensor(WDRTAS_THERMAL_SENSOR, 0, &temperature);
>
> if (result < 0)
> printk(KERN_WARNING "wdrtas: reading the thermal sensor "
> - "faild: %li\n", result);
> + "failed: %i\n", result);
> else
> temperature = ((temperature * 9) / 5) + 32; /* fahrenheit */
>
> --
> 1.5.6.6
next prev parent reply other threads:[~2009-06-11 10:58 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-16 12:35 [PATCH] Fix RTAS watchdog driver temperature read functionality Adrian Reber
2009-03-24 4:27 ` Benjamin Herrenschmidt
2009-03-24 11:45 ` Adrian Reber
2009-03-24 21:00 ` Benjamin Herrenschmidt
2009-03-25 3:49 ` Segher Boessenkool
2009-03-26 12:05 ` [PATCH v2] " Adrian Reber
2009-06-11 10:52 ` Adrian Reber [this message]
2009-06-25 11:22 ` Utz Bacher
2009-06-25 11:28 ` Benjamin Herrenschmidt
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=20090611105216.GG8358@lisas.de \
--to=adrian@lisas.de \
--cc=benh@kernel.crashing.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=utz.bacher@de.ibm.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).