From patchwork Sun Sep 20 18:58:24 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Luca Tettamanti X-Patchwork-Id: 48952 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n8KIw8Rf024219 for ; Sun, 20 Sep 2009 18:58:08 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754723AbZITS6D (ORCPT ); Sun, 20 Sep 2009 14:58:03 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755491AbZITS6D (ORCPT ); Sun, 20 Sep 2009 14:58:03 -0400 Received: from fg-out-1718.google.com ([72.14.220.154]:61182 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754723AbZITS6A (ORCPT ); Sun, 20 Sep 2009 14:58:00 -0400 Received: by fg-out-1718.google.com with SMTP id 22so941571fge.1 for ; Sun, 20 Sep 2009 11:58:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:received:date:from:to:cc :subject:message-id:references:mime-version:content-type :content-disposition:content-transfer-encoding:in-reply-to :user-agent; bh=12dqnvpYOs/WICLaLoSO55XwLIgVNY9J6selkTvQ/2w=; b=E1SpfkqS7CzkYrwFOi+8D1I7AjXoeGccGqNLb5UZfp5P+oTfMJkZhOVMgn2/Ay8kju kbn17fnmrl42Ml5j3XI9ew/jk0Awt2sJRdi6NgT0PBeWc2JvbU1NVxDhH4m7nCd9ci6A UpYmnjRr61qhKeXUFDvNxMu47B2ZXGWLdYmbw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:content-transfer-encoding :in-reply-to:user-agent; b=gu7wfmBjcH1UvIVNxQHOkO43zi/l62pry/zK9W3qApGRcMg9UKMt25DSfJyt2r6dVR nKqHq/YI/0X1XFnZCOyYyAcLV/G4sHc+4CmO+bbLmtsEMwr8VQEkRVQL6wDIqaCeVuT7 xZEoL7kRoNIratbF5DC4xveu6Nok3a1nj7CdA= Received: by 10.86.174.2 with SMTP id w2mr3913662fge.0.1253473083313; Sun, 20 Sep 2009 11:58:03 -0700 (PDT) Received: from dreamland.darkstar.lan (host-78-14-229-128.cust-adsl.tiscali.it [78.14.229.128]) by mx.google.com with ESMTPS id 4sm5339449fge.9.2009.09.20.11.58.01 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 20 Sep 2009 11:58:02 -0700 (PDT) Received: by dreamland.darkstar.lan (Postfix, from userid 1000) id 9D2F66C53C; Sun, 20 Sep 2009 20:58:24 +0200 (CEST) Date: Sun, 20 Sep 2009 20:58:24 +0200 From: Luca Tettamanti To: Robert Hancock Cc: linux-kernel , linux-acpi Subject: Re: asus_atk0110 not working on Asus P7P55D PRO Message-ID: <20090920185824.GA23206@dreamland.darkstar.lan> References: <4AB1C907.1070503@gmail.com> <20090920162306.GA18214@dreamland.darkstar.lan> <51f3faa70909201047x56313d99q7cdc49bcc4634b01@mail.gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <51f3faa70909201047x56313d99q7cdc49bcc4634b01@mail.gmail.com> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Il Sun, Sep 20, 2009 at 11:47:25AM -0600, Robert Hancock ha scritto: > On Sun, Sep 20, 2009 at 10:23 AM, Luca Tettamanti wrote: > > Il Wed, Sep 16, 2009 at 11:28:39PM -0600, Robert Hancock ha scritto: > >> Just built a new system with an Asus P7P55D PRO motherboard. The > >> ATK0110 driver doesn't seem to be able to retrieve any hardware > >> monitoring parameters successfully, sensors gives: > >> > >> atk0110-acpi-0 > >> Adapter: ACPI interface > >> ERROR: Can't get value of subfeature in0_input: I/O error > >> Vcore Voltage:      +0.00 V  (min =  +0.80 V, max =  +1.60 V) > >> ERROR: Can't get value of subfeature in1_input: I/O error > >> +3.3V Voltage:      +0.00 V  (min =  +2.97 V, max =  +3.63 V) > >> ERROR: Can't get value of subfeature in2_input: I/O error > >> +5V Voltage:        +0.00 V  (min =  +4.50 V, max =  +5.50 V) > >> > >> etc. and dmesg spits out a bunch of these: > >> > >> ATK0110 ATK0110:00: atk_read_value_new: ACPI exception: AE_BUFFER_OVERFLOW > >> > >> 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 ;) Luca diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c index fe4fa29..f1056cf 100644 --- a/drivers/hwmon/asus_atk0110.c +++ b/drivers/hwmon/asus_atk0110.c @@ -75,6 +75,13 @@ enum atk_pack_member { #define _HWMON_OLD_PACK_ENABLE 4 +struct atk_acpi_out_buffer { + union acpi_object buf; + u32 flags; + u32 value; + u8 data[]; +}; + struct atk_data { struct device *hwmon_dev; acpi_handle atk_handle; @@ -94,6 +101,10 @@ struct atk_data { int temperature_count; int fan_count; struct list_head sensor_list; + + struct atk_acpi_out_buffer *buffer; + size_t buffer_size; + struct mutex buffer_lock; }; @@ -129,11 +140,6 @@ struct atk_sensor_data { char const *acpi_name; }; -struct atk_acpi_buffer_u64 { - union acpi_object buf; - u64 value; -}; - static int atk_add(struct acpi_device *device); static int atk_remove(struct acpi_device *device, int type); static void atk_print_sensor(struct atk_data *data, union acpi_object *obj); @@ -446,8 +452,8 @@ 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; acpi_status status; + int err = 0; id.type = ACPI_TYPE_INTEGER; id.integer.value = sensor->id; @@ -455,36 +461,35 @@ 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; + mutex_lock(&data->buffer_lock); + + ret.length = data->buffer_size; + ret.pointer = data->buffer; status = acpi_evaluate_object_typed(data->read_handle, NULL, ¶ms, &ret, ACPI_TYPE_BUFFER); if (status != AE_OK) { dev_warn(dev, "%s: ACPI exception: %s\n", __func__, acpi_format_exception(status)); - return -EIO; + err = -EIO; + goto out; } - /* Return buffer format: - * [0-3] "value" is valid flag - * [4-7] value - */ - if (!(tmp.value & 0xffffffff)) { + if (!data->buffer->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_info(dev, "Failure: %#x\n", data->buffer->flags); - *value = (tmp.value & 0xffffffff00000000ULL) >> 32; + err = -EIO; + goto out; + } - return 0; + *value = data->buffer->value; +out: + mutex_unlock(&data->buffer_lock); + return err; } static int atk_read_value(struct atk_sensor_data *sensor, u64 *value) @@ -721,11 +726,40 @@ static int atk_enumerate_new_hwmon(struct atk_data *data) struct acpi_object_list params; union acpi_object id; union acpi_object *pack; + union acpi_object *asbf; int err; int i; dev_dbg(dev, "Enumerating hwmon sensors\n"); + /* Probe ASBF */ + buf.length = ACPI_ALLOCATE_BUFFER; + ret = acpi_evaluate_object_typed(data->atk_handle, "ASBF", NULL, &buf, + ACPI_TYPE_BUFFER); + if (ret != AE_OK) { + dev_warn(dev, "Failed to evaluate ASBF: %s\n", + acpi_format_exception(ret)); + return -ENODEV; + } + asbf = buf.pointer; + data->buffer_size = asbf->buffer.length; + ACPI_FREE(buf.pointer); + buf.pointer = NULL; + + dev_dbg(dev, "ASBF buffer size: %zu\n", data->buffer_size); + /* Sanity check */ + if (data->buffer_size < 8 || data->buffer_size > 512) { + dev_warn(dev, "Invalid ASBF buffer size: %zu\n", + data->buffer_size); + return -EINVAL; + } + data->buffer_size += sizeof(union acpi_object); + + data->buffer = kzalloc(data->buffer_size, GFP_KERNEL); + if (!data->buffer) + return -ENOMEM; + mutex_init(&data->buffer_lock); + id.type = ACPI_TYPE_INTEGER; id.integer.value = ATK_MUX_HWMON; params.count = 1; @@ -737,7 +771,8 @@ static int atk_enumerate_new_hwmon(struct atk_data *data) if (ret != AE_OK) { dev_warn(dev, METHOD_ENUMERATE ": ACPI exception: %s\n", acpi_format_exception(ret)); - return -ENODEV; + err = -ENODEV; + goto out; } /* Result must be a package */ @@ -759,6 +794,8 @@ static int atk_enumerate_new_hwmon(struct atk_data *data) err = data->voltage_count + data->temperature_count + data->fan_count; out: + if (err < 0) + kfree(data->buffer); ACPI_FREE(buf.pointer); return err; } @@ -988,6 +1025,7 @@ static int atk_remove(struct acpi_device *device, int type) atk_free_sensors(data); hwmon_device_unregister(data->hwmon_dev); + kfree(data->buffer); kfree(data); return 0;