acpi: Add addr_trans in build_crs
PATCH 1/1 acpi: Add addr_trans in build_crs
AML needs Address Translation offset to describe how a bridge translates addresses accross the bridge when using an address descriptor, and especially on ARM, the translation offset of pio resource is usually non zero.
Therefore, it's necessary to pass addr_trans for pio, mmio32 and mmio64 into build_crs.
--- hw/acpi/aml-build.c | 15 ++++++++------- hw/i386/acpi-build.c | 3 ++- hw/pci-host/gpex-acpi.c | 3 ++- include/hw/acpi/aml-build.h | 4 +++- 4 files changed, 15 insertions(+), 10 deletions(-)
hw/acpi/aml-build.c +8 -7
@@ -2076,7 +2076,8 @@ void build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog) tpm2_ptr, "TPM2", table_data->len - tpm2_start, 4, NULL, NULL); } -Aml *build_crs (PCIHostState *host,CrsRangeSet *range_set) +Aml *build_crs (PCIHostState *host,CrsRangeSet *range_set, +hwaddr io_trans,hwaddr mmio32_trans,hwaddr mmio64_trans) {Aml *crs =aml_resource_template ();CrsRangeSet temp_range_set;
@@ -2189,10 +2190,10 @@ Aml *build_crs(PCIHostState *host, CrsRangeSet *range_set)for (i =0 ; i < temp_range_set.io_ranges->len; i++) { entry =g_ptr_array_index (temp_range_set.io_ranges, i);aml_append (crs, -aml_word_io (AML_MIN_FIXED ,AML_MAX_FIXED , -AML_POS_DECODE ,AML_ENTIRE_RANGE , -0 , entry->base, entry->limit,0 , - entry->limit - entry->base +1 )); +aml_dword_io (AML_MIN_FIXED ,AML_MAX_FIXED , +AML_POS_DECODE ,AML_ENTIRE_RANGE , +0 , entry->base, entry->limit, io_trans, + entry->limit - entry->base +1 ));crs_range_insert (range_set->io_ranges, entry->base, entry->limit); }
@@ -2205,7 +2206,7 @@ Aml *build_crs(PCIHostState *host, CrsRangeSet *range_set)aml_dword_memory (AML_POS_DECODE ,AML_MIN_FIXED ,AML_MAX_FIXED ,AML_NON_CACHEABLE ,AML_READ_WRITE , -0 , entry->base, entry->limit,0 , +0 , entry->base, entry->limit, mmio32_trans, entry->limit - entry->base + 1));crs_range_insert (range_set->mem_ranges, entry->base, entry->limit); }
@@ -2217,7 +2218,7 @@ Aml *build_crs(PCIHostState *host, CrsRangeSet *range_set)aml_qword_memory (AML_POS_DECODE ,AML_MIN_FIXED ,AML_MAX_FIXED ,AML_NON_CACHEABLE ,AML_READ_WRITE , -0 , entry->base, entry->limit,0 , +0 , entry->base, entry->limit, mmio64_trans, entry->limit - entry->base + 1));crs_range_insert (range_set->mem_64bit_ranges, entry->base, entry->limit);
hw/i386/acpi-build.c +2 -1
@@ -1360,7 +1360,8 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, }aml_append (dev,build_prt (false)); - crs =build_crs (PCI_HOST_BRIDGE (BUS (bus)->parent), &crs_range_set); + crs =build_crs (PCI_HOST_BRIDGE (BUS (bus)->parent), &crs_range_set, +0 ,0 ,0 );aml_append (dev,aml_name_decl ("_CRS" , crs));aml_append (scope, dev);aml_append (dsdt, scope);
hw/pci-host/gpex-acpi.c +2 -1
@@ -168,7 +168,8 @@ void acpi_dsdt_add_gpex(Aml *scope, struct GPEXConfig *cfg)* 1. The resources the pci-brige/pcie-root-port need. * 2. The resources the devices behind pxb need. */ - crs =build_crs (PCI_HOST_BRIDGE (BUS (bus)->parent), &crs_range_set); + crs =build_crs (PCI_HOST_BRIDGE (BUS (bus)->parent), &crs_range_set, + cfg->pio.base,0 ,0 );aml_append (dev,aml_name_decl ("_CRS" , crs));acpi_dsdt_add_pci_osc (dev);
include/hw/acpi/aml-build.h +3 -1
@@ -1,6 +1,7 @@#ifndef HW_ACPI_AML_BUILD_H #define HW_ACPI_AML_BUILD_H +#include "exec/hwaddr.h" #include "hw/acpi/acpi-defs.h" #include "hw/acpi/bios-linker-loader.h"
@@ -452,7 +453,8 @@ void crs_replace_with_free_ranges(GPtrArray *ranges,void crs_range_set_init (CrsRangeSet *range_set);void crs_range_set_free (CrsRangeSet *range_set); -Aml *build_crs (PCIHostState *host,CrsRangeSet *range_set); +Aml *build_crs (PCIHostState *host,CrsRangeSet *range_set, +hwaddr io_trans,hwaddr mmio32_trans,hwaddr mmio64_trans);void build_srat_memory (AcpiSratMemoryAffinity *numamem,uint64_t base,uint64_t len,int node,MemoryAffinityFlags flags);
Signature · 1 line
2.28.0
Quoted 8 lines · Jiahui Cen
AML needs Address Translation offset to describe how a bridge translates addresses accross the bridge when using an address descriptor, and especially on ARM, the translation offset of pio resource is usually non zero.
Therefore, it's necessary to pass
addr_transfor pio, mmio32 and mmio64 intobuild_crs.
Quoted 7 lines
Signed-off-by Jiahui Cen <[email protected]>--- hw/acpi/aml-build.c | 15 ++++++++------- hw/i386/acpi-build.c | 3 ++- hw/pci-host/gpex-acpi.c | 3 ++- include/hw/acpi/aml-build.h | 4 +++- 4 files changed, 15 insertions(+), 10 deletions(-)
Doesn't this result in any changes to expected files for tests?
hw/acpi/aml-build.c void build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog) · line 2080
Quoted 11 lines
hw/acpi/aml-build.c +2
-1@@ -2076,7 +2076,8 @@ void build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog) tpm2_ptr, "TPM2", table_data->len - tpm2_start, 4, NULL, NULL); } -Aml *build_crs (PCIHostState *host,CrsRangeSet *range_set) +Aml *build_crs (PCIHostState *host,CrsRangeSet *range_set, +hwaddr io_trans,hwaddr mmio32_trans,hwaddr mmio64_trans)
More of io_offset etc I think.
Quoted 88 lines
hw/acpi/aml-build.c +6
-6{Aml *crs =aml_resource_template ();CrsRangeSet temp_range_set;@@ -2189,10 +2190,10 @@ Aml *build_crs(PCIHostState *host, CrsRangeSet *range_set)for (i =0 ; i < temp_range_set.io_ranges->len; i++) { entry =g_ptr_array_index (temp_range_set.io_ranges, i);aml_append (crs, -aml_word_io (AML_MIN_FIXED ,AML_MAX_FIXED , -AML_POS_DECODE ,AML_ENTIRE_RANGE , -0 , entry->base, entry->limit,0 , - entry->limit - entry->base +1 )); +aml_dword_io (AML_MIN_FIXED ,AML_MAX_FIXED , +AML_POS_DECODE ,AML_ENTIRE_RANGE , +0 , entry->base, entry->limit, io_trans, + entry->limit - entry->base +1 ));crs_range_insert (range_set->io_ranges, entry->base, entry->limit); }@@ -2205,7 +2206,7 @@ Aml *build_crs(PCIHostState *host, CrsRangeSet *range_set)aml_dword_memory (AML_POS_DECODE ,AML_MIN_FIXED ,AML_MAX_FIXED ,AML_NON_CACHEABLE ,AML_READ_WRITE , -0 , entry->base, entry->limit,0 , +0 , entry->base, entry->limit, mmio32_trans, entry->limit - entry->base + 1));crs_range_insert (range_set->mem_ranges, entry->base, entry->limit); }@@ -2217,7 +2218,7 @@ Aml *build_crs(PCIHostState *host, CrsRangeSet *range_set)aml_qword_memory (AML_POS_DECODE ,AML_MIN_FIXED ,AML_MAX_FIXED ,AML_NON_CACHEABLE ,AML_READ_WRITE , -0 , entry->base, entry->limit,0 , +0 , entry->base, entry->limit, mmio64_trans, entry->limit - entry->base + 1));crs_range_insert (range_set->mem_64bit_ranges, entry->base, entry->limit);hw/i386/acpi-build.c +2
-1@@ -1360,7 +1360,8 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, }aml_append (dev,build_prt (false)); - crs =build_crs (PCI_HOST_BRIDGE (BUS (bus)->parent), &crs_range_set); + crs =build_crs (PCI_HOST_BRIDGE (BUS (bus)->parent), &crs_range_set, +0 ,0 ,0 );aml_append (dev,aml_name_decl ("_CRS" , crs));aml_append (scope, dev);aml_append (dsdt, scope);hw/pci-host/gpex-acpi.c +2
-1@@ -168,7 +168,8 @@ void acpi_dsdt_add_gpex(Aml *scope, struct GPEXConfig *cfg)* 1. The resources the pci-brige/pcie-root-port need. * 2. The resources the devices behind pxb need. */ - crs =build_crs (PCI_HOST_BRIDGE (BUS (bus)->parent), &crs_range_set); + crs =build_crs (PCI_HOST_BRIDGE (BUS (bus)->parent), &crs_range_set, + cfg->pio.base,0 ,0 );aml_append (dev,aml_name_decl ("_CRS" , crs));acpi_dsdt_add_pci_osc (dev);include/hw/acpi/aml-build.h +3
-1@@ -1,6 +1,7 @@#ifndef HW_ACPI_AML_BUILD_H #define HW_ACPI_AML_BUILD_H +#include "exec/hwaddr.h" #include "hw/acpi/acpi-defs.h" #include "hw/acpi/bios-linker-loader.h" @@ -452,7 +453,8 @@ void crs_replace_with_free_ranges(GPtrArray *ranges,void crs_range_set_init (CrsRangeSet *range_set);void crs_range_set_free (CrsRangeSet *range_set); -Aml *build_crs (PCIHostState *host,CrsRangeSet *range_set); +Aml *build_crs (PCIHostState *host,CrsRangeSet *range_set, +hwaddr io_trans,hwaddr mmio32_trans,hwaddr mmio64_trans);void build_srat_memory (AcpiSratMemoryAffinity *numamem,uint64_t base,uint64_t len,int node,MemoryAffinityFlags flags);Signature · 1 line
2.28.0
Hi Michael,
Quoted 18 lines · Michael S. Tsirkin
Quoted 8 lines · Jiahui Cen
AML needs Address Translation offset to describe how a bridge translates addresses accross the bridge when using an address descriptor, and especially on ARM, the translation offset of pio resource is usually non zero.
Therefore, it's necessary to pass
addr_transfor pio, mmio32 and mmio64 intobuild_crs.Quoted 7 lines
Signed-off-by Jiahui Cen <[email protected]>--- hw/acpi/aml-build.c | 15 ++++++++------- hw/i386/acpi-build.c | 3 ++- hw/pci-host/gpex-acpi.c | 3 ++- include/hw/acpi/aml-build.h | 4 +++- 4 files changed, 15 insertions(+), 10 deletions(-)
Quoted 1 line
Doesn't this result in any changes to expected files for tests?
Right, I'll update the expected file for test.
BTW, another patch that introduces _DSM #5 also seems to need changes to expected files. Should I put them in one patch series and update expected files once?
Quoted 9 lines
Quoted 9 lines
hw/acpi/aml-build.c +0
-0@@ -2076,7 +2076,8 @@ void build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog) tpm2_ptr, "TPM2", table_data->len - tpm2_start, 4, NULL, NULL); }
Quoted 6 lines
hw/acpi/aml-build.c void build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog) · line 2080
Quoted 3 lines
hw/acpi/aml-build.c +2
-1-Aml *build_crs (PCIHostState *host,CrsRangeSet *range_set) +Aml *build_crs (PCIHostState *host,CrsRangeSet *range_set, +hwaddr io_trans,hwaddr mmio32_trans,hwaddr mmio64_trans)More of
io_offsetetc I think.
IIUC, io_trans is just the io_offset. Would it be better to rename io_trans to io_offset? And seems I forgot to add bus number trans.
Thanks,
Jiahui
Quoted 92 lines
Quoted 89 lines
hw/acpi/aml-build.c +6
-6{Aml *crs =aml_resource_template ();CrsRangeSet temp_range_set;@@ -2189,10 +2190,10 @@ Aml *build_crs(PCIHostState *host, CrsRangeSet *range_set)for (i =0 ; i < temp_range_set.io_ranges->len; i++) { entry =g_ptr_array_index (temp_range_set.io_ranges, i);aml_append (crs, -aml_word_io (AML_MIN_FIXED ,AML_MAX_FIXED , -AML_POS_DECODE ,AML_ENTIRE_RANGE , -0 , entry->base, entry->limit,0 , - entry->limit - entry->base +1 )); +aml_dword_io (AML_MIN_FIXED ,AML_MAX_FIXED , +AML_POS_DECODE ,AML_ENTIRE_RANGE , +0 , entry->base, entry->limit, io_trans, + entry->limit - entry->base +1 ));crs_range_insert (range_set->io_ranges, entry->base, entry->limit); }@@ -2205,7 +2206,7 @@ Aml *build_crs(PCIHostState *host, CrsRangeSet *range_set)aml_dword_memory (AML_POS_DECODE ,AML_MIN_FIXED ,AML_MAX_FIXED ,AML_NON_CACHEABLE ,AML_READ_WRITE , -0 , entry->base, entry->limit,0 , +0 , entry->base, entry->limit, mmio32_trans, entry->limit - entry->base + 1));crs_range_insert (range_set->mem_ranges, entry->base, entry->limit); }@@ -2217,7 +2218,7 @@ Aml *build_crs(PCIHostState *host, CrsRangeSet *range_set)aml_qword_memory (AML_POS_DECODE ,AML_MIN_FIXED ,AML_MAX_FIXED ,AML_NON_CACHEABLE ,AML_READ_WRITE , -0 , entry->base, entry->limit,0 , +0 , entry->base, entry->limit, mmio64_trans, entry->limit - entry->base + 1));crs_range_insert (range_set->mem_64bit_ranges, entry->base, entry->limit);hw/i386/acpi-build.c +2
-1@@ -1360,7 +1360,8 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, }aml_append (dev,build_prt (false)); - crs =build_crs (PCI_HOST_BRIDGE (BUS (bus)->parent), &crs_range_set); + crs =build_crs (PCI_HOST_BRIDGE (BUS (bus)->parent), &crs_range_set, +0 ,0 ,0 );aml_append (dev,aml_name_decl ("_CRS" , crs));aml_append (scope, dev);aml_append (dsdt, scope);hw/pci-host/gpex-acpi.c +2
-1@@ -168,7 +168,8 @@ void acpi_dsdt_add_gpex(Aml *scope, struct GPEXConfig *cfg)* 1. The resources the pci-brige/pcie-root-port need. * 2. The resources the devices behind pxb need. */ - crs =build_crs (PCI_HOST_BRIDGE (BUS (bus)->parent), &crs_range_set); + crs =build_crs (PCI_HOST_BRIDGE (BUS (bus)->parent), &crs_range_set, + cfg->pio.base,0 ,0 );aml_append (dev,aml_name_decl ("_CRS" , crs));acpi_dsdt_add_pci_osc (dev);include/hw/acpi/aml-build.h +3
-1@@ -1,6 +1,7 @@#ifndef HW_ACPI_AML_BUILD_H #define HW_ACPI_AML_BUILD_H +#include "exec/hwaddr.h" #include "hw/acpi/acpi-defs.h" #include "hw/acpi/bios-linker-loader.h" @@ -452,7 +453,8 @@ void crs_replace_with_free_ranges(GPtrArray *ranges,void crs_range_set_init (CrsRangeSet *range_set);void crs_range_set_free (CrsRangeSet *range_set); -Aml *build_crs (PCIHostState *host,CrsRangeSet *range_set); +Aml *build_crs (PCIHostState *host,CrsRangeSet *range_set, +hwaddr io_trans,hwaddr mmio32_trans,hwaddr mmio64_trans);void build_srat_memory (AcpiSratMemoryAffinity *numamem,uint64_t base,uint64_t len,int node,MemoryAffinityFlags flags);Signature · 1 line
2.28.0.