drivers/intel/ish: Allow adding DmaProperty to _DSD
On nissa, the ISH is running closed source firmware, so the ChromeOS
security requirements specify it must be behind an IOMMU. Allow adding
DmaProperty to the _DSD of the ISH device. This will result in the
kernel marking the device as untrusted.
BUG=b:249846505
TEST=Check SSDT is correct, and kernel detects the DmaProperty and
firmware-name properties.
SSDT entry on yaviks with both add_acpi_dma_property and firmware_name
set in devictree:
Scope (\_SB.PCI0.ISHB)
{
Name (_DSD, Package (0x04) // _DSD: Device-Specific Data
{
ToUUID ("daffd814-6eba-4d8c-8a91-bc9bbf4aa301") /* Device Properties for _DSD */,
Package (0x01)
{
Package (0x02)
{
"firmware-name",
"adl_ish_lite.bin"
}
},
ToUUID ("70d24161-6dd5-4c9e-8070-705531292865"),
Package (0x01)
{
Package (0x02)
{
"DmaProperty",
One
}
}
})
}
Change-Id: Ie1539fc757e72e995e98c3ecf83e705e3bede8c0
Signed-off-by: Reka Norman <rekanorman@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/70632
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Subrata Banik <subratabanik@google.com>
Reviewed-by: Kangheui Won <khwon@chromium.org>
Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>
diff --git a/src/drivers/intel/ish/ish.c b/src/drivers/intel/ish/ish.c
index 2403333..5dbb26e 100644
--- a/src/drivers/intel/ish/ish.c
+++ b/src/drivers/intel/ish/ish.c
@@ -13,19 +13,25 @@
struct device *root = dev->bus->dev;
struct acpi_dp *dsd;
- if (!config || !config->firmware_name)
+ if (!config)
return;
acpigen_write_scope(acpi_device_path(root));
dsd = acpi_dp_new_table("_DSD");
- acpi_dp_add_string(dsd, "firmware-name", config->firmware_name);
+
+ if (config->firmware_name) {
+ acpi_dp_add_string(dsd, "firmware-name", config->firmware_name);
+ printk(BIOS_INFO, "%s: Set firmware-name: %s\n",
+ acpi_device_path(root), config->firmware_name);
+ }
+
+ if (config->add_acpi_dma_property)
+ acpi_device_add_dma_property(dsd);
+
acpi_dp_write(dsd);
acpigen_pop_len(); /* Scope */
-
- printk(BIOS_INFO, "%s: Set firmware-name: %s\n",
- acpi_device_path(root), config->firmware_name);
}
static struct device_operations intel_ish_ops = {