[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 14/34] pcihp: move PCI _DSM function 0 prolog into separate fu
From: |
Igor Mammedov |
Subject: |
[PATCH v2 14/34] pcihp: move PCI _DSM function 0 prolog into separate function |
Date: |
Thu, 2 Mar 2023 17:15:23 +0100 |
it will be reused by follow up patches that will implement
static _DSM for non-hotpluggable devices.
no functional AML change, only context one, where 'cap' (Local1)
initialization is moved after UUID/revision checks.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
hw/i386/acpi-build.c | 54 ++++++++++++++++++++++++--------------------
1 file changed, 30 insertions(+), 24 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index c691104d47..d8ec91b8e3 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -373,6 +373,33 @@ Aml *aml_pci_device_dsm(void)
return method;
}
+static void build_append_pci_dsm_func0_common(Aml *ctx, Aml *retvar)
+{
+ Aml *UUID, *ifctx1;
+ uint8_t byte_list[1] = { 0 }; /* nothing supported yet */
+
+ aml_append(ctx, aml_store(aml_buffer(1, byte_list), retvar));
+ /*
+ * PCI Firmware Specification 3.1
+ * 4.6. _DSM Definitions for PCI
+ */
+ UUID = aml_touuid("E5C937D0-3553-4D7A-9117-EA4D19C3434D");
+ ifctx1 = aml_if(aml_lnot(aml_equal(aml_arg(0), UUID)));
+ {
+ /* call is for unsupported UUID, bail out */
+ aml_append(ifctx1, aml_return(retvar));
+ }
+ aml_append(ctx, ifctx1);
+
+ ifctx1 = aml_if(aml_lless(aml_arg(1), aml_int(2)));
+ {
+ /* call is for unsupported REV, bail out */
+ aml_append(ifctx1, aml_return(retvar));
+ }
+ aml_append(ctx, ifctx1);
+}
+
+
static void build_append_pcihp_notify_entry(Aml *method, int slot)
{
Aml *if_ctx;
@@ -570,14 +597,13 @@ static bool build_append_notfication_callback(Aml
*parent_scope,
static Aml *aml_pci_pdsm(void)
{
- Aml *method, *UUID, *ifctx, *ifctx1;
+ Aml *method, *ifctx, *ifctx1;
Aml *ret = aml_local(0);
Aml *caps = aml_local(1);
Aml *acpi_index = aml_local(2);
Aml *zero = aml_int(0);
Aml *one = aml_int(1);
Aml *func = aml_arg(2);
- Aml *rev = aml_arg(1);
Aml *params = aml_arg(4);
Aml *bnum = aml_derefof(aml_index(params, aml_int(0)));
Aml *sunum = aml_derefof(aml_index(params, aml_int(1)));
@@ -587,29 +613,9 @@ static Aml *aml_pci_pdsm(void)
/* get supported functions */
ifctx = aml_if(aml_equal(func, zero));
{
- uint8_t byte_list[1] = { 0 }; /* nothing supported yet */
- aml_append(ifctx, aml_store(aml_buffer(1, byte_list), ret));
- aml_append(ifctx, aml_store(zero, caps));
-
- /*
- * PCI Firmware Specification 3.1
- * 4.6. _DSM Definitions for PCI
- */
- UUID = aml_touuid("E5C937D0-3553-4D7A-9117-EA4D19C3434D");
- ifctx1 = aml_if(aml_lnot(aml_equal(aml_arg(0), UUID)));
- {
- /* call is for unsupported UUID, bail out */
- aml_append(ifctx1, aml_return(ret));
- }
- aml_append(ifctx, ifctx1);
-
- ifctx1 = aml_if(aml_lless(rev, aml_int(2)));
- {
- /* call is for unsupported REV, bail out */
- aml_append(ifctx1, aml_return(ret));
- }
- aml_append(ifctx, ifctx1);
+ build_append_pci_dsm_func0_common(ifctx, ret);
+ aml_append(ifctx, aml_store(zero, caps));
aml_append(ifctx,
aml_store(aml_call2("AIDX", bnum, sunum), acpi_index));
/*
--
2.39.1
- [PATCH v2 19/34] tests: acpi: whitelist DSDT before adding device with acpi-index to testcases, (continued)
- [PATCH v2 19/34] tests: acpi: whitelist DSDT before adding device with acpi-index to testcases, Igor Mammedov, 2023/03/02
- [PATCH v2 10/34] tests: acpi: update expected blobs, Igor Mammedov, 2023/03/02
- [PATCH v2 21/34] acpi: pci: support acpi-index for non-hotpluggable devices, Igor Mammedov, 2023/03/02
- [PATCH v2 27/34] tests: acpi: add non zero function device with acpi-index on non-hotpluggble bus, Igor Mammedov, 2023/03/02
- [PATCH v2 06/34] tests: acpi: extend multi-bridge case with case 'root-port, id=HOHP, hotplug=off root-port, bus=NOHP', Igor Mammedov, 2023/03/02
- [PATCH v2 15/34] tests: acpi: update expected blobs, Igor Mammedov, 2023/03/02
- [PATCH v2 11/34] pcihp: piix4: do not redirect hotplug controller to piix4 when ACPI hotplug is disabled, Igor Mammedov, 2023/03/02
- [PATCH v2 23/34] tests: acpi: whitelist DSDT before exposing non zero functions, Igor Mammedov, 2023/03/02
- [PATCH v2 26/34] tests: acpi: whitelist DSDT before adding non-0 function device with acpi-index to testcases, Igor Mammedov, 2023/03/02
- [PATCH v2 13/34] tests: acpi: whitelist DSDT blobs before isolating PCI _DSM func 0 prolog, Igor Mammedov, 2023/03/02
- [PATCH v2 14/34] pcihp: move PCI _DSM function 0 prolog into separate function,
Igor Mammedov <=
- [PATCH v2 18/34] tests: acpi: update expected blobs, Igor Mammedov, 2023/03/02
- [PATCH v2 04/34] tests: acpi: update expected blobs, Igor Mammedov, 2023/03/02
- [PATCH v2 22/34] tests: acpi: update expected blobs, Igor Mammedov, 2023/03/02
- [PATCH v2 28/34] tests: acpi: update expected blobs, Igor Mammedov, 2023/03/02
- [PATCH v2 29/34] pci: move acpi-index uniqueness check to generic PCI device code, Igor Mammedov, 2023/03/02
- [PATCH v2 33/34] pcihp: move fields enabling hotplug into AcpiPciHpState, Igor Mammedov, 2023/03/02
- [PATCH v2 34/34] pcihp: add ACPI PCI hotplug specific is_hotpluggable_bus() callback, Igor Mammedov, 2023/03/02
- [PATCH v2 20/34] tests: acpi: add device with acpi-index on non-hotpluggble bus, Igor Mammedov, 2023/03/02
- [PATCH v2 07/34] x86: pcihp: fix missing PCNT callchain when intermediate root-port has 'hotplug=off' set, Igor Mammedov, 2023/03/02
- [PATCH v2 12/34] pci: fix 'hotplugglable' property behavior, Igor Mammedov, 2023/03/02