Kapil Porwal has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/69937 )
Change subject: drivers/wifi, mb/google: Rename is_untrusted to add_acpi_dma_property ......................................................................
drivers/wifi, mb/google: Rename is_untrusted to add_acpi_dma_property
Rename is_untrusted to add_acpi_dma_property.
BUG=b:259716145 TEST=Verified that the _DSD object is still present in the SSDT.
Signed-off-by: Kapil Porwal kapilporwal@google.com Change-Id: I4e0829a76a193b0a1e1e0f2b7ce2119bb00dd696 --- M src/drivers/wifi/generic/acpi.c M src/drivers/wifi/generic/chip.h M src/mainboard/google/brya/variants/baseboard/brask/devicetree.cb M src/mainboard/google/brya/variants/baseboard/brya/devicetree.cb M src/mainboard/google/brya/variants/baseboard/nissa/devicetree.cb M src/mainboard/google/brya/variants/baseboard/skolas/devicetree.cb M src/mainboard/google/brya/variants/joxer/overridetree.cb M src/mainboard/google/brya/variants/nereid/overridetree.cb M src/mainboard/google/brya/variants/pujjo/overridetree.cb M src/mainboard/google/brya/variants/xivu/overridetree.cb M src/mainboard/google/brya/variants/yaviks/overridetree.cb M src/mainboard/google/rex/variants/rex0/overridetree.cb 12 files changed, 27 insertions(+), 12 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/37/69937/1
diff --git a/src/drivers/wifi/generic/acpi.c b/src/drivers/wifi/generic/acpi.c index 869b92a..57b7f5f 100644 --- a/src/drivers/wifi/generic/acpi.c +++ b/src/drivers/wifi/generic/acpi.c @@ -522,7 +522,7 @@ acpigen_write_PRW(config->wake, ACPI_S3);
/* Add _DSD for DmaProperty property. */ - if (config->is_untrusted) { + if (config->add_acpi_dma_property) { struct acpi_dp *dsd, *pkg;
dsd = acpi_dp_new_table("_DSD"); diff --git a/src/drivers/wifi/generic/chip.h b/src/drivers/wifi/generic/chip.h index 56a4afc..2729a35 100644 --- a/src/drivers/wifi/generic/chip.h +++ b/src/drivers/wifi/generic/chip.h @@ -11,7 +11,7 @@ unsigned int wake; /* When set to true, this will add a _DSD which contains a single property, `DmaProperty`, set to 1, under the ACPI Device. */ - bool is_untrusted; + bool add_acpi_dma_property;
/* * Applicable for Intel chipsets that use CNVi WiFi only. Set this to 1 diff --git a/src/mainboard/google/brya/variants/baseboard/brask/devicetree.cb b/src/mainboard/google/brya/variants/baseboard/brask/devicetree.cb index 29fb5d0..38535a4 100644 --- a/src/mainboard/google/brya/variants/baseboard/brask/devicetree.cb +++ b/src/mainboard/google/brya/variants/baseboard/brask/devicetree.cb @@ -119,7 +119,7 @@ device ref cnvi_wifi on chip drivers/wifi/generic register "wake" = "GPE0_PME_B0" - register "is_untrusted" = "true" + register "add_acpi_dma_property" = "true" device generic 0 on end end end diff --git a/src/mainboard/google/brya/variants/baseboard/brya/devicetree.cb b/src/mainboard/google/brya/variants/baseboard/brya/devicetree.cb index b6ede38..70e7779 100644 --- a/src/mainboard/google/brya/variants/baseboard/brya/devicetree.cb +++ b/src/mainboard/google/brya/variants/baseboard/brya/devicetree.cb @@ -136,7 +136,7 @@ device ref cnvi_wifi on chip drivers/wifi/generic register "wake" = "GPE0_PME_B0" - register "is_untrusted" = "true" + register "add_acpi_dma_property" = "true" device generic 0 on end end end diff --git a/src/mainboard/google/brya/variants/baseboard/nissa/devicetree.cb b/src/mainboard/google/brya/variants/baseboard/nissa/devicetree.cb index 24b5b70..16c7ce0 100644 --- a/src/mainboard/google/brya/variants/baseboard/nissa/devicetree.cb +++ b/src/mainboard/google/brya/variants/baseboard/nissa/devicetree.cb @@ -161,7 +161,7 @@ device ref cnvi_wifi on chip drivers/wifi/generic register "wake" = "GPE0_PME_B0" - register "is_untrusted" = "true" + register "add_acpi_dma_property" = "true" device generic 0 on end end end diff --git a/src/mainboard/google/brya/variants/baseboard/skolas/devicetree.cb b/src/mainboard/google/brya/variants/baseboard/skolas/devicetree.cb index c861c9b..6ca0c9e 100644 --- a/src/mainboard/google/brya/variants/baseboard/skolas/devicetree.cb +++ b/src/mainboard/google/brya/variants/baseboard/skolas/devicetree.cb @@ -140,7 +140,7 @@ device ref cnvi_wifi on chip drivers/wifi/generic register "wake" = "GPE0_PME_B0" - register "is_untrusted" = "true" + register "add_acpi_dma_property" = "true" device generic 0 on end end end diff --git a/src/mainboard/google/brya/variants/joxer/overridetree.cb b/src/mainboard/google/brya/variants/joxer/overridetree.cb index 0aaeda2..5ae8a2f 100644 --- a/src/mainboard/google/brya/variants/joxer/overridetree.cb +++ b/src/mainboard/google/brya/variants/joxer/overridetree.cb @@ -176,7 +176,7 @@ }" chip drivers/wifi/generic register "wake" = "GPE0_DW1_03" - register "is_untrusted" = "true" + register "add_acpi_dma_property" = "true" device pci 00.0 on end end end diff --git a/src/mainboard/google/brya/variants/nereid/overridetree.cb b/src/mainboard/google/brya/variants/nereid/overridetree.cb index 4baca1d..ef9bca7 100644 --- a/src/mainboard/google/brya/variants/nereid/overridetree.cb +++ b/src/mainboard/google/brya/variants/nereid/overridetree.cb @@ -208,7 +208,7 @@ }" chip drivers/wifi/generic register "wake" = "GPE0_DW1_03" - register "is_untrusted" = "true" + register "add_acpi_dma_property" = "true" device pci 00.0 on end end end diff --git a/src/mainboard/google/brya/variants/pujjo/overridetree.cb b/src/mainboard/google/brya/variants/pujjo/overridetree.cb index 4bc96f9..e3d8acc 100644 --- a/src/mainboard/google/brya/variants/pujjo/overridetree.cb +++ b/src/mainboard/google/brya/variants/pujjo/overridetree.cb @@ -528,7 +528,7 @@ }" chip drivers/wifi/generic register "wake" = "GPE0_DW1_03" - register "is_untrusted" = "true" + register "add_acpi_dma_property" = "true" device pci 00.0 on end end end diff --git a/src/mainboard/google/brya/variants/xivu/overridetree.cb b/src/mainboard/google/brya/variants/xivu/overridetree.cb index 3c45ff4..0c8ed39 100644 --- a/src/mainboard/google/brya/variants/xivu/overridetree.cb +++ b/src/mainboard/google/brya/variants/xivu/overridetree.cb @@ -328,7 +328,7 @@ }" chip drivers/wifi/generic register "wake" = "GPE0_DW1_03" - register "is_untrusted" = "true" + register "add_acpi_dma_property" = "true" device pci 00.0 on end end end diff --git a/src/mainboard/google/brya/variants/yaviks/overridetree.cb b/src/mainboard/google/brya/variants/yaviks/overridetree.cb index 6b57ada..6c58e4e 100644 --- a/src/mainboard/google/brya/variants/yaviks/overridetree.cb +++ b/src/mainboard/google/brya/variants/yaviks/overridetree.cb @@ -207,7 +207,7 @@ }" chip drivers/wifi/generic register "wake" = "GPE0_DW1_03" - register "is_untrusted" = "true" + register "add_acpi_dma_property" = "true" device pci 00.0 on end end end diff --git a/src/mainboard/google/rex/variants/rex0/overridetree.cb b/src/mainboard/google/rex/variants/rex0/overridetree.cb index f3b0fab..a1baf0a 100644 --- a/src/mainboard/google/rex/variants/rex0/overridetree.cb +++ b/src/mainboard/google/rex/variants/rex0/overridetree.cb @@ -228,7 +228,7 @@ device ref cnvi_wifi on chip drivers/wifi/generic register "wake" = "GPE0_PME_B0" - register "is_untrusted" = "true" + register "add_acpi_dma_property" = "true" register "enable_cnvi_ddr_rfim" = "true" device generic 0 on end end