Tim Wawrzynczak submitted this change.
drivers/{pcie,wifi}/generic: Update untrusted property name
In order to align with established standards for establishing DMA
boundaries[1] from ACPI, the UntrustedDevice property has been renamed
to DmaProperty, which follows Microsoft's implementation. After
discussions with Microsoft, they have agreed to make the `UID` property
optional, so it is left out here, and instead it can be applied to:
1) Internal PCI devices
2) PCIe root ports
3) Downstream PCI(e) devices
[1]: https://docs.microsoft.com/en-us/windows-hardware/drivers/pci/dsd-for-pcie-root-ports
BUG=b:215424986
Signed-off-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Change-Id: Id70e916532e3d3d70305fc61473da28c702fc397
Reviewed-on: https://review.coreboot.org/c/coreboot/+/62435
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: EricR Lai <ericr_lai@compal.corp-partner.google.com>
---
M src/drivers/pcie/generic/Kconfig
M src/drivers/pcie/generic/generic.c
M src/drivers/wifi/generic/acpi.c
M src/drivers/wifi/generic/chip.h
4 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/drivers/pcie/generic/Kconfig b/src/drivers/pcie/generic/Kconfig
index 2a68708..f41f37d 100644
--- a/src/drivers/pcie/generic/Kconfig
+++ b/src/drivers/pcie/generic/Kconfig
@@ -5,7 +5,6 @@
help
This driver allows attaching arbitrary ACPI properties to
arbitrary PCI root ports or devices. Currently it supports one
- property, "UntrustedDevice". This property indicates to the
- operating system that the PCIe device may be considered
- untrusted, and appropriate policies, e.g. IOMMU isolation,
- should take place.
+ property, "DmaProperty", which indicates to the operating system that
+ the PCIe device may be considered untrusted, and appropriate policies,
+ e.g. IOMMU isolation, should take place.
diff --git a/src/drivers/pcie/generic/generic.c b/src/drivers/pcie/generic/generic.c
index 2daebda..c14628f 100644
--- a/src/drivers/pcie/generic/generic.c
+++ b/src/drivers/pcie/generic/generic.c
@@ -34,7 +34,7 @@
acpigen_write_ADR_pci_device(dev);
dsd = acpi_dp_new_table("_DSD");
- acpi_dp_add_integer(dsd, "UntrustedDevice", 1);
+ acpi_dp_add_integer(dsd, "DmaProperty", 1);
acpi_dp_write(dsd);
acpigen_write_device_end();
diff --git a/src/drivers/wifi/generic/acpi.c b/src/drivers/wifi/generic/acpi.c
index 7c606f9..16c1839 100644
--- a/src/drivers/wifi/generic/acpi.c
+++ b/src/drivers/wifi/generic/acpi.c
@@ -515,13 +515,13 @@
/* Wake capabilities */
acpigen_write_PRW(config->wake, ACPI_S3);
- /* Add _DSD for UntrustedDevice property. */
+ /* Add _DSD for DmaProperty property. */
if (config->is_untrusted) {
struct acpi_dp *dsd, *pkg;
dsd = acpi_dp_new_table("_DSD");
pkg = acpi_dp_new_table(ACPI_DSD_UNTRUSTED_UUID);
- acpi_dp_add_integer(pkg, "UntrustedDevice", 1);
+ acpi_dp_add_integer(pkg, "DmaProperty", 1);
acpi_dp_add_package(dsd, pkg);
acpi_dp_write(dsd);
}
diff --git a/src/drivers/wifi/generic/chip.h b/src/drivers/wifi/generic/chip.h
index 35726f2..907b260 100644
--- a/src/drivers/wifi/generic/chip.h
+++ b/src/drivers/wifi/generic/chip.h
@@ -10,7 +10,7 @@
struct drivers_wifi_generic_config {
unsigned int wake;
/* When set to true, this will add a _DSD which contains a single
- property, `UntrustedDevice`, set to 1, to the ACPI Device. */
+ property, `DmaProperty`, set to 1, under the ACPI Device. */
bool is_untrusted;
};
To view, visit change 62435. To unsubscribe, or for help writing mail filters, visit settings.