* [PATCH 1/3] acpi: Allow pxb DSDT acpi table changes
2021-02-05 1:56 [PATCH 0/3] acpi: Add _CCA support for pxb devices Wang Xingang
@ 2021-02-05 1:56 ` Wang Xingang
2021-02-10 14:22 ` Igor Mammedov
2021-02-05 1:56 ` [PATCH 2/3] acpi/gpex: Fix cca attribute check for pxb device Wang Xingang
2021-02-05 1:56 ` [PATCH 3/3] acpi: Update _CCA attribute in DSDT.pxb Wang Xingang
2 siblings, 1 reply; 6+ messages in thread
From: Wang Xingang @ 2021-02-05 1:56 UTC (permalink / raw)
To: qemu-devel, mst, imammedo; +Cc: xieyingtai, cenjiahui
From: Xingang Wang <wangxingang5@huawei.com>
Signed-off-by: Jiahui Cen <cenjiahui@huawei.com>
Signed-off-by: Xingang Wang <wangxingang5@huawei.com>
---
tests/qtest/bios-tables-test-allowed-diff.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index dfb8523c8b..90c53925fc 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1 +1,2 @@
/* List of comma-separated changed AML files to ignore */
+"tests/data/acpi/virt/DSDT.pxb",
--
2.19.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/3] acpi: Allow pxb DSDT acpi table changes
2021-02-05 1:56 ` [PATCH 1/3] acpi: Allow pxb DSDT acpi table changes Wang Xingang
@ 2021-02-10 14:22 ` Igor Mammedov
0 siblings, 0 replies; 6+ messages in thread
From: Igor Mammedov @ 2021-02-10 14:22 UTC (permalink / raw)
To: Wang Xingang; +Cc: xieyingtai, cenjiahui, qemu-devel, mst
On Fri, 5 Feb 2021 01:56:43 +0000
Wang Xingang <wangxingang5@huawei.com> wrote:
> From: Xingang Wang <wangxingang5@huawei.com>
>
> Signed-off-by: Jiahui Cen <cenjiahui@huawei.com>
> Signed-off-by: Xingang Wang <wangxingang5@huawei.com>
> ---
> tests/qtest/bios-tables-test-allowed-diff.h | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
> index dfb8523c8b..90c53925fc 100644
> --- a/tests/qtest/bios-tables-test-allowed-diff.h
> +++ b/tests/qtest/bios-tables-test-allowed-diff.h
> @@ -1 +1,2 @@
> /* List of comma-separated changed AML files to ignore */
> +"tests/data/acpi/virt/DSDT.pxb",
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/3] acpi/gpex: Fix cca attribute check for pxb device
2021-02-05 1:56 [PATCH 0/3] acpi: Add _CCA support for pxb devices Wang Xingang
2021-02-05 1:56 ` [PATCH 1/3] acpi: Allow pxb DSDT acpi table changes Wang Xingang
@ 2021-02-05 1:56 ` Wang Xingang
2021-02-10 14:24 ` Igor Mammedov
2021-02-05 1:56 ` [PATCH 3/3] acpi: Update _CCA attribute in DSDT.pxb Wang Xingang
2 siblings, 1 reply; 6+ messages in thread
From: Wang Xingang @ 2021-02-05 1:56 UTC (permalink / raw)
To: qemu-devel, mst, imammedo; +Cc: xieyingtai, cenjiahui
From: Xingang Wang <wangxingang5@huawei.com>
When check DMA support for device attached to pxb,
the cache coherency attribute need to be set.
This add _CCA attribute for pxb DSDT.
Fixes: 6f9765fbad ("acpi/gpex: Build tables for pxb")
Signed-off-by: Jiahui Cen <cenjiahui@huawei.com>
Signed-off-by: Xingang Wang <wangxingang5@huawei.com>
---
hw/pci-host/gpex-acpi.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/hw/pci-host/gpex-acpi.c b/hw/pci-host/gpex-acpi.c
index 446912d771..0f01f13a6e 100644
--- a/hw/pci-host/gpex-acpi.c
+++ b/hw/pci-host/gpex-acpi.c
@@ -175,6 +175,7 @@ void acpi_dsdt_add_gpex(Aml *scope, struct GPEXConfig *cfg)
aml_append(dev, aml_name_decl("_BBN", aml_int(bus_num)));
aml_append(dev, aml_name_decl("_UID", aml_int(bus_num)));
aml_append(dev, aml_name_decl("_STR", aml_unicode("pxb Device")));
+ aml_append(dev, aml_name_decl("_CCA", aml_int(1)));
if (numa_node != NUMA_NODE_UNASSIGNED) {
aml_append(dev, aml_name_decl("_PXM", aml_int(numa_node)));
}
--
2.19.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 2/3] acpi/gpex: Fix cca attribute check for pxb device
2021-02-05 1:56 ` [PATCH 2/3] acpi/gpex: Fix cca attribute check for pxb device Wang Xingang
@ 2021-02-10 14:24 ` Igor Mammedov
0 siblings, 0 replies; 6+ messages in thread
From: Igor Mammedov @ 2021-02-10 14:24 UTC (permalink / raw)
To: Wang Xingang; +Cc: xieyingtai, Peter Maydell, cenjiahui, mst, Drew, qemu-devel
On Fri, 5 Feb 2021 01:56:44 +0000
Wang Xingang <wangxingang5@huawei.com> wrote:
> From: Xingang Wang <wangxingang5@huawei.com>
>
> When check DMA support for device attached to pxb,
> the cache coherency attribute need to be set.
> This add _CCA attribute for pxb DSDT.
>
> Fixes: 6f9765fbad ("acpi/gpex: Build tables for pxb")
>
> Signed-off-by: Jiahui Cen <cenjiahui@huawei.com>
> Signed-off-by: Xingang Wang <wangxingang5@huawei.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
I'm not sure about if ARM side if fine with the change, CCed.
> ---
> hw/pci-host/gpex-acpi.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/hw/pci-host/gpex-acpi.c b/hw/pci-host/gpex-acpi.c
> index 446912d771..0f01f13a6e 100644
> --- a/hw/pci-host/gpex-acpi.c
> +++ b/hw/pci-host/gpex-acpi.c
> @@ -175,6 +175,7 @@ void acpi_dsdt_add_gpex(Aml *scope, struct GPEXConfig *cfg)
> aml_append(dev, aml_name_decl("_BBN", aml_int(bus_num)));
> aml_append(dev, aml_name_decl("_UID", aml_int(bus_num)));
> aml_append(dev, aml_name_decl("_STR", aml_unicode("pxb Device")));
> + aml_append(dev, aml_name_decl("_CCA", aml_int(1)));
> if (numa_node != NUMA_NODE_UNASSIGNED) {
> aml_append(dev, aml_name_decl("_PXM", aml_int(numa_node)));
> }
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 3/3] acpi: Update _CCA attribute in DSDT.pxb
2021-02-05 1:56 [PATCH 0/3] acpi: Add _CCA support for pxb devices Wang Xingang
2021-02-05 1:56 ` [PATCH 1/3] acpi: Allow pxb DSDT acpi table changes Wang Xingang
2021-02-05 1:56 ` [PATCH 2/3] acpi/gpex: Fix cca attribute check for pxb device Wang Xingang
@ 2021-02-05 1:56 ` Wang Xingang
2 siblings, 0 replies; 6+ messages in thread
From: Wang Xingang @ 2021-02-05 1:56 UTC (permalink / raw)
To: qemu-devel, mst, imammedo; +Cc: xieyingtai, cenjiahui
From: Xingang Wang <wangxingang5@huawei.com>
A new _CCA attribute is added.
Update expected DSDT files accordingly, and re-enable their testing.
Full diff of changed files disassembly:
*
* Disassembling to symbolic ASL+ operators
*
- * Disassembly of DSDT.pxb, Thu Feb 4 21:07:42 2021
+ * Disassembly of DSDT.pxb, Thu Feb 4 21:06:59 2021
*
* Original Table Header:
* Signature "DSDT"
- * Length 0x00001E09 (7689)
+ * Length 0x00001E0F (7695)
* Revision 0x02
- * Checksum 0x30
+ * Checksum 0xEF
* OEM ID "BOCHS "
* OEM Table ID "BXPCDSDT"
* OEM Revision 0x00000001 (1)
@@ -642,6 +642,7 @@ DefinitionBlock ("", "DSDT", 2, "BOCHS ", "BXPCDSDT", 0x00000001)
Name (_BBN, 0x80) // _BBN: BIOS Bus Number
Name (_UID, 0x80) // _UID: Unique ID
Name (_STR, Unicode ("pxb Device")) // _STR: Description String
+ Name (_CCA, One) // _CCA: Cache Coherency Attribute
Name (_PRT, Package (0x80) // _PRT: PCI Routing Table
{
Package (0x04)
Signed-off-by: Jiahui Cen <cenjiahui@huawei.com>
Signed-off-by: Xingang Wang <wangxingang5@huawei.com>
---
tests/data/acpi/virt/DSDT.pxb | Bin 7689 -> 7695 bytes
tests/qtest/bios-tables-test-allowed-diff.h | 1 -
2 files changed, 1 deletion(-)
diff --git a/tests/data/acpi/virt/DSDT.pxb b/tests/data/acpi/virt/DSDT.pxb
index ce3b67dff277e23f43925b1adcbb55c9d0b4eee3..b060a90dcdd6e067195c0db6a48a7ceab366f6de 100644
GIT binary patch
delta 40
wcmeCQ>9^r>33dtLmt$aHdOwj%nz3u6nj|Nq=VS-YfX)8GB^;ao33BrQ0Nh#&0ssI2
delta 40
vcmeCT>9pZ;33dtLlw)9EGMLCE&DgS0O_Gz*d9nj%z~*S-JdVvQLfkw6!^;Ui
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index 90c53925fc..dfb8523c8b 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1,2 +1 @@
/* List of comma-separated changed AML files to ignore */
-"tests/data/acpi/virt/DSDT.pxb",
--
2.19.1
^ permalink raw reply related [flat|nested] 6+ messages in thread