diff mbox series

[6/8] hw/i386/acpi-build: Determine SMI command port just once

Message ID 20230828073609.5710-7-shentey@gmail.com (mailing list archive)
State New, archived
Headers show
Series ACPI: X86 AML generation and GPE tracing cleanup | expand

Commit Message

Bernhard Beschow Aug. 28, 2023, 7:36 a.m. UTC 
The SMI command port is currently hardcoded by means of the ACPI_PORT_SMI_CMD
macro. This hardcoding is Intel specific and doesn't match VIA, for example.
There is already the AcpiFadtData::smi_cmd attribute which is used when building
the FADT. Let's also use it when building the DSDT which confines SMI command
port determination to just one place. This allows it to become a property later,
thus resolving the Intel assumption.

Signed-off-by: Bernhard Beschow <shentey@gmail.com>
---
 hw/i386/acpi-build.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Philippe Mathieu-Daudé Aug. 28, 2023, 12:10 p.m. UTC | #1 
On 28/8/23 09:36, Bernhard Beschow wrote:
> The SMI command port is currently hardcoded by means of the ACPI_PORT_SMI_CMD
> macro. This hardcoding is Intel specific and doesn't match VIA, for example.
> There is already the AcpiFadtData::smi_cmd attribute which is used when building
> the FADT. Let's also use it when building the DSDT which confines SMI command
> port determination to just one place. This allows it to become a property later,
> thus resolving the Intel assumption.
> 
> Signed-off-by: Bernhard Beschow <shentey@gmail.com>
> ---
>   hw/i386/acpi-build.c | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
diff mbox series

Patch

diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index c8ac665d36..f9e7291150 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1495,14 +1495,14 @@  build_dsdt(GArray *table_data, BIOSLinker *linker,
             aml_append(crs,
                 aml_io(
                        AML_DECODE16,
-                       ACPI_PORT_SMI_CMD,
-                       ACPI_PORT_SMI_CMD,
+                       pm->fadt.smi_cmd,
+                       pm->fadt.smi_cmd,
                        1,
                        2)
             );
             aml_append(dev, aml_name_decl("_CRS", crs));
             aml_append(dev, aml_operation_region("SMIR", AML_SYSTEM_IO,
-                aml_int(ACPI_PORT_SMI_CMD), 2));
+                aml_int(pm->fadt.smi_cmd), 2));
             field = aml_field("SMIR", AML_BYTE_ACC, AML_NOLOCK,
                               AML_WRITE_AS_ZEROS);
             aml_append(field, aml_named_field("SMIC", 8));