From afaee235fa0b35ac7272c3dab3a74d272bc1bd8c Mon Sep 17 00:00:00 2001 From: Tim Wawrzynczak Date: Wed, 23 Feb 2022 10:17:21 -0700 Subject: [PATCH] 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 Change-Id: Id70e916532e3d3d70305fc61473da28c702fc397 Reviewed-on: https://review.coreboot.org/c/coreboot/+/62435 Tested-by: build bot (Jenkins) Reviewed-by: EricR Lai --- src/drivers/pcie/generic/Kconfig | 7 +++---- src/drivers/pcie/generic/generic.c | 2 +- src/drivers/wifi/generic/acpi.c | 4 ++-- src/drivers/wifi/generic/chip.h | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/drivers/pcie/generic/Kconfig b/src/drivers/pcie/generic/Kconfig index 2a68708f61..f41f37ddd7 100644 --- a/src/drivers/pcie/generic/Kconfig +++ b/src/drivers/pcie/generic/Kconfig @@ -5,7 +5,6 @@ config DRIVERS_PCIE_GENERIC 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 2daebdae04..c14628f65b 100644 --- a/src/drivers/pcie/generic/generic.c +++ b/src/drivers/pcie/generic/generic.c @@ -34,7 +34,7 @@ static void pcie_generic_fill_ssdt(const struct device *dev) 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 7c606f9099..16c1839c23 100644 --- a/src/drivers/wifi/generic/acpi.c +++ b/src/drivers/wifi/generic/acpi.c @@ -515,13 +515,13 @@ static void wifi_ssdt_write_properties(const struct device *dev, const char *sco /* 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 35726f2171..907b260fa3 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; };