Prev: [PATCH 0/3] usb console: 2.6.32 regression fixes
Next: performance counter for linux question.
From: Robert Hancock on 20 Sep 2009 19:00
On Sun, Sep 20, 2009 at 12:58 PM, Luca Tettamanti <kronos.it(a)gmail.com> wrote:
>> >> I'm guessing this board uses a different format than what the driver
>> >> is expecting. I'm attaching the gzipped decompiled DSDT from the
>> >> board, hopefully it's useful to somebody..
>> >
>> > Please try the following patch, it should detect the proper buffer size.
>> >
>>
>> Obviously something not quite right:
>
> Ah yes, the pointer for the output buffer was pointing to the wrong
> variable. Sorry for that ;)

Cool, seems to be working. Though the high and critical temperatures
seem a bit odd, but maybe that's what the BIOS actually reports:

atk0110-acpi-0
Adapter: ACPI interface
Vcore Voltage: +1.18 V (min = +0.80 V, max = +1.60 V)
+3.3V Voltage: +3.44 V (min = +2.97 V, max = +3.63 V)
+5V Voltage: +5.18 V (min = +4.50 V, max = +5.50 V)
+12V Voltage: +12.21 V (min = +10.20 V, max = +13.80 V)
CPU Fan Speed: 1080 RPM (min = 600 RPM)
Chassis1 Fan Speed: 0 RPM (min = 600 RPM)
Chassis2 Fan Speed:1464 RPM (min = 600 RPM)
Power Fan Speed: 0 RPM (min = 0 RPM)
CPU Temperature: +32.5�C (high = +45.0�C, crit = +45.5�C)
MB Temperature: +31.0�C (high = +45.0�C, crit = +46.0�C)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Luca Tettamanti on 21 Sep 2009 15:10
Il Sun, Sep 20, 2009 at 04:51:10PM -0600, Robert Hancock ha scritto:
> On Sun, Sep 20, 2009 at 12:58 PM, Luca Tettamanti <kronos.it(a)gmail.com> wrote:
> >> >> I'm guessing this board uses a different format than what the driver
> >> >> is expecting. I'm attaching the gzipped decompiled DSDT from the
> >> >> board, hopefully it's useful to somebody..
> >> >
> >> > Please try the following patch, it should detect the proper buffer size.
> >> >
> >>
> >> Obviously something not quite right:
> >
> > Ah yes, the pointer for the output buffer was pointing to the wrong
> > variable. Sorry for that ;)
>
> Cool, seems to be working.

Excellent :)

> Though the high and critical temperatures
> seem a bit odd, but maybe that's what the BIOS actually reports:
[...]
> CPU Temperature: +32.5�C (high = +45.0�C, crit = +45.5�C)
> MB Temperature: +31.0�C (high = +45.0�C, crit = +46.0�C)

The limits are declared in the DSDT, the driver doesn't do any
calculation.
It's possible that Asus changed the encoding (again); so far I've been
unable to locate a "version" field that would allow the driver to detect
a change in the data structures.

I've got a new patch for you: instead of probing and preallocating the
buffer this version lets ACPI code do the allocation; the return value
is cached anyway, so there won't be a big number of allocations.
Can you please test and see if it works?

diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c
index fe4fa29..aed6e90 100644
--- a/drivers/hwmon/asus_atk0110.c
+++ b/drivers/hwmon/asus_atk0110.c
@@ -129,9 +129,15 @@ struct atk_sensor_data {
char const *acpi_name;
};

-struct atk_acpi_buffer_u64 {
- union acpi_object buf;
- u64 value;
+/* Return buffer format:
+ * [0-3] "value" is valid flag
+ * [4-7] value
+ * [8- ] unknown stuff on newer mobos
+ */
+struct atk_acpi_ret_buffer {
+ u32 flags;
+ u32 value;
+ u8 data[];
};

static int atk_add(struct acpi_device *device);
@@ -446,8 +452,10 @@ static int atk_read_value_new(struct atk_sensor_data *sensor, u64 *value)
struct acpi_object_list params;
struct acpi_buffer ret;
union acpi_object id;
- struct atk_acpi_buffer_u64 tmp;
+ union acpi_object *obj;
+ struct atk_acpi_ret_buffer *buf;
acpi_status status;
+ int err = 0;

id.type = ACPI_TYPE_INTEGER;
id.integer.value = sensor->id;
@@ -455,11 +463,7 @@ static int atk_read_value_new(struct atk_sensor_data *sensor, u64 *value)
params.count = 1;
params.pointer = &id;

- tmp.buf.type = ACPI_TYPE_BUFFER;
- tmp.buf.buffer.pointer = (u8 *)&tmp.value;
- tmp.buf.buffer.length = sizeof(u64);
- ret.length = sizeof(tmp);
- ret.pointer = &tmp;
+ ret.length = ACPI_ALLOCATE_BUFFER;

status = acpi_evaluate_object_typed(data->read_handle, NULL, &params,
&ret, ACPI_TYPE_BUFFER);
@@ -468,23 +472,31 @@ static int atk_read_value_new(struct atk_sensor_data *sensor, u64 *value)
acpi_format_exception(status));
return -EIO;
}
+ obj = ret.pointer;

- /* Return buffer format:
- * [0-3] "value" is valid flag
- * [4-7] value
- */
- if (!(tmp.value & 0xffffffff)) {
+ /* Sanity check */
+ if (obj->buffer.length < 8) {
+ dev_warn(dev, "Unexpected ASBF length: %u\n",
+ obj->buffer.length);
+ err = -EIO;
+ goto out;
+ }
+ buf = (struct atk_acpi_ret_buffer *)obj->buffer.pointer;
+
+ if (!buf->flags) {
/* The reading is not valid, possible causes:
* - sensor failure
* - enumeration was FUBAR (and we didn't notice)
*/
- dev_info(dev, "Failure: %#llx\n", tmp.value);
- return -EIO;
+ dev_warn(dev, "Failure: %#x\n", buf->flags);
+ err = -EIO;
+ goto out;
}

- *value = (tmp.value & 0xffffffff00000000ULL) >> 32;
-
- return 0;
+ *value = buf->value;
+out:
+ ACPI_FREE(ret.pointer);
+ return err;
}

static int atk_read_value(struct atk_sensor_data *sensor, u64 *value)


thanks,
Luca
--
"Perch� � cos� che ti frega, la vita. Ti piglia quando hai ancora l'anima
addormentata e ti semina dentro un'immagine, o un odore, o un suono che
poi non te lo togli pi�. E quella l� era la felicit�."
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Robert Hancock on 21 Sep 2009 21:20
On Mon, Sep 21, 2009 at 1:04 PM, Luca Tettamanti <kronos.it(a)gmail.com> wrote:
> Il Sun, Sep 20, 2009 at 04:51:10PM -0600, Robert Hancock ha scritto:
>> On Sun, Sep 20, 2009 at 12:58 PM, Luca Tettamanti <kronos.it(a)gmail.com> wrote:
>> >> >> I'm guessing this board uses a different format than what the driver
>> >> >> is expecting. I'm attaching the gzipped decompiled DSDT from the
>> >> >> board, hopefully it's useful to somebody..
>> >> >
>> >> > Please try the following patch, it should detect the proper buffer size.
>> >> >
>> >>
>> >> Obviously something not quite right:
>> >
>> > Ah yes, the pointer for the output buffer was pointing to the wrong
>> > variable. Sorry for that ;)
>>
>> Cool, seems to be working.
>
> Excellent :)
>
>> Though the high and critical temperatures
>> seem a bit odd, but maybe that's what the BIOS actually reports:
> [...]
>> CPU Temperature: � �+32.5�C �(high = +45.0�C, crit = +45.5�C)
>> MB Temperature: � � +31.0�C �(high = +45.0�C, crit = +46.0�C)
>
> The limits are declared in the DSDT, the driver doesn't do any
> calculation.
> It's possible that Asus changed the encoding (again); so far I've been
> unable to locate a "version" field that would allow the driver to detect
> a change in the data structures.
>
> I've got a new patch for you: instead of probing and preallocating the
> buffer this version lets ACPI code do the allocation; the return value
> is cached anyway, so there won't be a big number of allocations.
> Can you please test and see if it works?

Yes, this version still works..
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
First  |  Prev  | 
Pages: 1 2
Prev: [PATCH 0/3] usb console: 2.6.32 regression fixes
Next: performance counter for linux question.