Revert adf411b819adc9fa96e9b3e638c7480d5e71d270.
The commit adf411b819adc9fa96e9b3e638c7480d5e71d270 was based on the
improper assumption that queried result was not updated when _OSC
support field was changed. But, in fact, queried result is updated
whenever _OSC support field was changed through __acpi_query_osc().
As a result, the commit adf411b819adc9fa96e9b3e638c7480d5e71d270 only
introduced unnecessary additional _OSC evaluation...
Signed-off-by: Kenji Kaneshige <kaneshige.kenji@xxxxxxxxxxxxxx>
Signed-off-by: Taku Izumi <izumi.taku@xxxxxxxxxxxxxx>
drivers/pci/pci-acpi.c | 30 +++++++++++++++++-------------
1 file changed, 17 insertions(+), 13 deletions(-)
Index: linux-next.28rc4/drivers/pci/pci-acpi.c
===================================================================
--- linux-next.28rc4.orig/drivers/pci/pci-acpi.c
+++ linux-next.28rc4/drivers/pci/pci-acpi.c
@@ -24,13 +24,15 @@ struct acpi_osc_data {
acpi_handle handle;
u32 support_set;
u32 control_set;
+ int is_queried;
+ u32 query_result;
struct list_head sibiling;
};
static LIST_HEAD(acpi_osc_data_list);
struct acpi_osc_args {
u32 capbuf[3];
- u32 ctrl_result;
+ u32 query_result;
};
static DEFINE_MUTEX(pci_acpi_lock);
@@ -111,8 +113,9 @@ static acpi_status acpi_run_osc(acpi_han
goto out_kfree;
}
out_success:
- osc_args->ctrl_result =
- *((u32 *)(out_obj->buffer.pointer + 8));
+ if (flags & OSC_QUERY_ENABLE)
+ osc_args->query_result =
+ *((u32 *)(out_obj->buffer.pointer + 8));
status = AE_OK;
out_kfree:
@@ -120,8 +123,7 @@ out_kfree:
return status;
}
-static acpi_status __acpi_query_osc(u32 flags, struct acpi_osc_data *osc_data,
- u32 *result)
+static acpi_status __acpi_query_osc(u32 flags, struct acpi_osc_data *osc_data)
{
acpi_status status;
u32 support_set;
@@ -136,7 +138,8 @@ static acpi_status __acpi_query_osc(u32
status = acpi_run_osc(osc_data->handle, &osc_args);
if (ACPI_SUCCESS(status)) {
osc_data->support_set = support_set;
- *result = osc_args.ctrl_result;
+ osc_data->query_result = osc_args.query_result;
+ osc_data->is_queried = 1;
}
return status;
@@ -150,7 +153,6 @@ static acpi_status __acpi_query_osc(u32
*/
int pci_acpi_osc_support(acpi_handle handle, u32 flags)
{
- u32 dummy;
acpi_status status;
acpi_handle tmp;
struct acpi_osc_data *osc_data;
@@ -168,7 +170,7 @@ int pci_acpi_osc_support(acpi_handle han
goto out;
}
- __acpi_query_osc(flags, osc_data, &dummy);
+ __acpi_query_osc(flags, osc_data);
out:
mutex_unlock(&pci_acpi_lock);
return rc;
@@ -184,7 +186,7 @@ out:
acpi_status pci_osc_control_set(acpi_handle handle, u32 flags)
{
acpi_status status;
- u32 ctrlset, control_set, result;
+ u32 ctrlset, control_set;
acpi_handle tmp;
struct acpi_osc_data *osc_data;
struct acpi_osc_args osc_args;
@@ -207,11 +209,13 @@ acpi_status pci_osc_control_set(acpi_han
goto out;
}
- status = __acpi_query_osc(osc_data->support_set, osc_data, &result);
- if (ACPI_FAILURE(status))
- goto out;
+ if (!osc_data->is_queried) {
+ status = __acpi_query_osc(osc_data->support_set, osc_data);
+ if (ACPI_FAILURE(status))
+ goto out;
+ }
- if ((result & ctrlset) != ctrlset) {
+ if ((osc_data->query_result & ctrlset) != ctrlset) {
status = AE_SUPPORT;
goto out;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
