diff mbox

[04/33] pc: acpi: remove AML for empty/not used GPE handlers

Message ID 1463496205-251412-5-git-send-email-imammedo@redhat.com
State New
Headers show

Commit Message

Igor Mammedov May 17, 2016, 2:42 p.m. UTC
ACPI spec requires GPE handlers only for GPE events
that hardware implements.
So remove AML for not supported by QEMU device model
events.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
 hw/i386/acpi-build.c | 17 -----------------
 1 file changed, 17 deletions(-)

Comments

Marcel Apfelbaum May 25, 2016, 9:11 a.m. UTC | #1
On 05/17/2016 05:42 PM, Igor Mammedov wrote:
> ACPI spec requires GPE handlers only for GPE events
> that hardware implements.
> So remove AML for not supported by QEMU device model
> events.
>
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> ---
>   hw/i386/acpi-build.c | 17 -----------------
>   1 file changed, 17 deletions(-)
>
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index 279f0d7..ff98ad8 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -2051,8 +2051,6 @@ build_dsdt(GArray *table_data, GArray *linker,
>       {
>           aml_append(scope, aml_name_decl("_HID", aml_string("ACPI0006")));
>
> -        aml_append(scope, aml_method("_L00", 0, AML_NOTSERIALIZED));
> -
>           if (misc->is_piix4) {
>               method = aml_method("_E01", 0, AML_NOTSERIALIZED);
>               aml_append(method,
> @@ -2060,8 +2058,6 @@ build_dsdt(GArray *table_data, GArray *linker,
>               aml_append(method, aml_call0("\\_SB.PCI0.PCNT"));
>               aml_append(method, aml_release(aml_name("\\_SB.PCI0.BLCK")));
>               aml_append(scope, method);
> -        } else {
> -            aml_append(scope, aml_method("_L01", 0, AML_NOTSERIALIZED));
>           }
>
>           method = aml_method("_E02", 0, AML_NOTSERIALIZED);
> @@ -2071,19 +2067,6 @@ build_dsdt(GArray *table_data, GArray *linker,
>           method = aml_method("_E03", 0, AML_NOTSERIALIZED);
>           aml_append(method, aml_call0(MEMORY_HOTPLUG_HANDLER_PATH));
>           aml_append(scope, method);
> -
> -        aml_append(scope, aml_method("_L04", 0, AML_NOTSERIALIZED));
> -        aml_append(scope, aml_method("_L05", 0, AML_NOTSERIALIZED));
> -        aml_append(scope, aml_method("_L06", 0, AML_NOTSERIALIZED));
> -        aml_append(scope, aml_method("_L07", 0, AML_NOTSERIALIZED));
> -        aml_append(scope, aml_method("_L08", 0, AML_NOTSERIALIZED));
> -        aml_append(scope, aml_method("_L09", 0, AML_NOTSERIALIZED));
> -        aml_append(scope, aml_method("_L0A", 0, AML_NOTSERIALIZED));
> -        aml_append(scope, aml_method("_L0B", 0, AML_NOTSERIALIZED));
> -        aml_append(scope, aml_method("_L0C", 0, AML_NOTSERIALIZED));
> -        aml_append(scope, aml_method("_L0D", 0, AML_NOTSERIALIZED));
> -        aml_append(scope, aml_method("_L0E", 0, AML_NOTSERIALIZED));
> -        aml_append(scope, aml_method("_L0F", 0, AML_NOTSERIALIZED));
>       }
>       aml_append(dsdt, scope);
>
>


Is this patch related to the series? Or is it a cleanup opportunity?
Thanks,
Marcel
Igor Mammedov May 25, 2016, 1:19 p.m. UTC | #2
On Wed, 25 May 2016 12:11:33 +0300
Marcel Apfelbaum <marcel@redhat.com> wrote:

> On 05/17/2016 05:42 PM, Igor Mammedov wrote:
> > ACPI spec requires GPE handlers only for GPE events
> > that hardware implements.
> > So remove AML for not supported by QEMU device model
> > events.
> >
> > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > ---
> >   hw/i386/acpi-build.c | 17 -----------------
> >   1 file changed, 17 deletions(-)
> >
> > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> > index 279f0d7..ff98ad8 100644
> > --- a/hw/i386/acpi-build.c
> > +++ b/hw/i386/acpi-build.c
> > @@ -2051,8 +2051,6 @@ build_dsdt(GArray *table_data, GArray *linker,
> >       {
> >           aml_append(scope, aml_name_decl("_HID", aml_string("ACPI0006")));
> >
> > -        aml_append(scope, aml_method("_L00", 0, AML_NOTSERIALIZED));
> > -
> >           if (misc->is_piix4) {
> >               method = aml_method("_E01", 0, AML_NOTSERIALIZED);
> >               aml_append(method,
> > @@ -2060,8 +2058,6 @@ build_dsdt(GArray *table_data, GArray *linker,
> >               aml_append(method, aml_call0("\\_SB.PCI0.PCNT"));
> >               aml_append(method, aml_release(aml_name("\\_SB.PCI0.BLCK")));
> >               aml_append(scope, method);
> > -        } else {
> > -            aml_append(scope, aml_method("_L01", 0, AML_NOTSERIALIZED));
> >           }
> >
> >           method = aml_method("_E02", 0, AML_NOTSERIALIZED);
> > @@ -2071,19 +2067,6 @@ build_dsdt(GArray *table_data, GArray *linker,
> >           method = aml_method("_E03", 0, AML_NOTSERIALIZED);
> >           aml_append(method, aml_call0(MEMORY_HOTPLUG_HANDLER_PATH));
> >           aml_append(scope, method);
> > -
> > -        aml_append(scope, aml_method("_L04", 0, AML_NOTSERIALIZED));
> > -        aml_append(scope, aml_method("_L05", 0, AML_NOTSERIALIZED));
> > -        aml_append(scope, aml_method("_L06", 0, AML_NOTSERIALIZED));
> > -        aml_append(scope, aml_method("_L07", 0, AML_NOTSERIALIZED));
> > -        aml_append(scope, aml_method("_L08", 0, AML_NOTSERIALIZED));
> > -        aml_append(scope, aml_method("_L09", 0, AML_NOTSERIALIZED));
> > -        aml_append(scope, aml_method("_L0A", 0, AML_NOTSERIALIZED));
> > -        aml_append(scope, aml_method("_L0B", 0, AML_NOTSERIALIZED));
> > -        aml_append(scope, aml_method("_L0C", 0, AML_NOTSERIALIZED));
> > -        aml_append(scope, aml_method("_L0D", 0, AML_NOTSERIALIZED));
> > -        aml_append(scope, aml_method("_L0E", 0, AML_NOTSERIALIZED));
> > -        aml_append(scope, aml_method("_L0F", 0, AML_NOTSERIALIZED));
> >       }
> >       aml_append(dsdt, scope);
> >
> >  
> 
> 
> Is this patch related to the series? Or is it a cleanup opportunity?
It's a cleanup, I'm posting it here as it's missed its merge chance at 2.6
and Michael suggested to respin it later when 2.7 dev window is open

> Thanks,
> Marcel
>
Marcel Apfelbaum May 31, 2016, 10:06 a.m. UTC | #3
On 05/25/2016 04:19 PM, Igor Mammedov wrote:
> On Wed, 25 May 2016 12:11:33 +0300
> Marcel Apfelbaum <marcel@redhat.com> wrote:
>
>> On 05/17/2016 05:42 PM, Igor Mammedov wrote:
>>> ACPI spec requires GPE handlers only for GPE events
>>> that hardware implements.
>>> So remove AML for not supported by QEMU device model
>>> events.
>>>
>>> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
>>> ---
>>>    hw/i386/acpi-build.c | 17 -----------------
>>>    1 file changed, 17 deletions(-)
>>>
>>> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
>>> index 279f0d7..ff98ad8 100644
>>> --- a/hw/i386/acpi-build.c
>>> +++ b/hw/i386/acpi-build.c
>>> @@ -2051,8 +2051,6 @@ build_dsdt(GArray *table_data, GArray *linker,
>>>        {
>>>            aml_append(scope, aml_name_decl("_HID", aml_string("ACPI0006")));
>>>
>>> -        aml_append(scope, aml_method("_L00", 0, AML_NOTSERIALIZED));
>>> -
>>>            if (misc->is_piix4) {
>>>                method = aml_method("_E01", 0, AML_NOTSERIALIZED);
>>>                aml_append(method,
>>> @@ -2060,8 +2058,6 @@ build_dsdt(GArray *table_data, GArray *linker,
>>>                aml_append(method, aml_call0("\\_SB.PCI0.PCNT"));
>>>                aml_append(method, aml_release(aml_name("\\_SB.PCI0.BLCK")));
>>>                aml_append(scope, method);
>>> -        } else {
>>> -            aml_append(scope, aml_method("_L01", 0, AML_NOTSERIALIZED));
>>>            }
>>>
>>>            method = aml_method("_E02", 0, AML_NOTSERIALIZED);
>>> @@ -2071,19 +2067,6 @@ build_dsdt(GArray *table_data, GArray *linker,
>>>            method = aml_method("_E03", 0, AML_NOTSERIALIZED);
>>>            aml_append(method, aml_call0(MEMORY_HOTPLUG_HANDLER_PATH));
>>>            aml_append(scope, method);
>>> -
>>> -        aml_append(scope, aml_method("_L04", 0, AML_NOTSERIALIZED));
>>> -        aml_append(scope, aml_method("_L05", 0, AML_NOTSERIALIZED));
>>> -        aml_append(scope, aml_method("_L06", 0, AML_NOTSERIALIZED));
>>> -        aml_append(scope, aml_method("_L07", 0, AML_NOTSERIALIZED));
>>> -        aml_append(scope, aml_method("_L08", 0, AML_NOTSERIALIZED));
>>> -        aml_append(scope, aml_method("_L09", 0, AML_NOTSERIALIZED));
>>> -        aml_append(scope, aml_method("_L0A", 0, AML_NOTSERIALIZED));
>>> -        aml_append(scope, aml_method("_L0B", 0, AML_NOTSERIALIZED));
>>> -        aml_append(scope, aml_method("_L0C", 0, AML_NOTSERIALIZED));
>>> -        aml_append(scope, aml_method("_L0D", 0, AML_NOTSERIALIZED));
>>> -        aml_append(scope, aml_method("_L0E", 0, AML_NOTSERIALIZED));
>>> -        aml_append(scope, aml_method("_L0F", 0, AML_NOTSERIALIZED));
>>>        }
>>>        aml_append(dsdt, scope);
>>>
>>>
>>
>>
>> Is this patch related to the series? Or is it a cleanup opportunity?
> It's a cleanup, I'm posting it here as it's missed its merge chance at 2.6
> and Michael suggested to respin it later when 2.7 dev window is open
>

Sure,

Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>

Thanks,
Marcel

>> Thanks,
>> Marcel
>>
>
diff mbox

Patch

diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 279f0d7..ff98ad8 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -2051,8 +2051,6 @@  build_dsdt(GArray *table_data, GArray *linker,
     {
         aml_append(scope, aml_name_decl("_HID", aml_string("ACPI0006")));
 
-        aml_append(scope, aml_method("_L00", 0, AML_NOTSERIALIZED));
-
         if (misc->is_piix4) {
             method = aml_method("_E01", 0, AML_NOTSERIALIZED);
             aml_append(method,
@@ -2060,8 +2058,6 @@  build_dsdt(GArray *table_data, GArray *linker,
             aml_append(method, aml_call0("\\_SB.PCI0.PCNT"));
             aml_append(method, aml_release(aml_name("\\_SB.PCI0.BLCK")));
             aml_append(scope, method);
-        } else {
-            aml_append(scope, aml_method("_L01", 0, AML_NOTSERIALIZED));
         }
 
         method = aml_method("_E02", 0, AML_NOTSERIALIZED);
@@ -2071,19 +2067,6 @@  build_dsdt(GArray *table_data, GArray *linker,
         method = aml_method("_E03", 0, AML_NOTSERIALIZED);
         aml_append(method, aml_call0(MEMORY_HOTPLUG_HANDLER_PATH));
         aml_append(scope, method);
-
-        aml_append(scope, aml_method("_L04", 0, AML_NOTSERIALIZED));
-        aml_append(scope, aml_method("_L05", 0, AML_NOTSERIALIZED));
-        aml_append(scope, aml_method("_L06", 0, AML_NOTSERIALIZED));
-        aml_append(scope, aml_method("_L07", 0, AML_NOTSERIALIZED));
-        aml_append(scope, aml_method("_L08", 0, AML_NOTSERIALIZED));
-        aml_append(scope, aml_method("_L09", 0, AML_NOTSERIALIZED));
-        aml_append(scope, aml_method("_L0A", 0, AML_NOTSERIALIZED));
-        aml_append(scope, aml_method("_L0B", 0, AML_NOTSERIALIZED));
-        aml_append(scope, aml_method("_L0C", 0, AML_NOTSERIALIZED));
-        aml_append(scope, aml_method("_L0D", 0, AML_NOTSERIALIZED));
-        aml_append(scope, aml_method("_L0E", 0, AML_NOTSERIALIZED));
-        aml_append(scope, aml_method("_L0F", 0, AML_NOTSERIALIZED));
     }
     aml_append(dsdt, scope);