From d1c0f958d1986a94ac55ae1d196ba286c311b90f Mon Sep 17 00:00:00 2001 From: Karthikeyan Ramasubramanian Date: Mon, 2 Nov 2020 16:26:52 -0700 Subject: acpi: Call acpi_fill_ssdt() only for enabled devices Individual drivers check whether the concerned device is enabled before filling in the SSDT. Move the check before calling acpi_fill_ssdt() and remove the check in the individual drivers. BUG=None TEST=util/abuild/abuild Change-Id: Ib042bec7e8c68b38fafa60a8e965d781bddcd1f0 Signed-off-by: Karthikeyan Ramasubramanian Reviewed-on: https://review.coreboot.org/c/coreboot/+/47148 Tested-by: build bot (Jenkins) Reviewed-by: Furquan Shaikh Reviewed-by: Sumeet R Pawnikar Reviewed-by: Tim Wawrzynczak Reviewed-by: Angel Pons Reviewed-by: Christian Walter --- src/soc/intel/common/block/scs/sd.c | 3 --- src/soc/intel/common/block/usb4/pcie.c | 2 +- src/soc/intel/common/block/usb4/usb4.c | 3 --- 3 files changed, 1 insertion(+), 7 deletions(-) (limited to 'src/soc/intel/common/block') diff --git a/src/soc/intel/common/block/scs/sd.c b/src/soc/intel/common/block/scs/sd.c index 04ebb1305d..be59a3db72 100644 --- a/src/soc/intel/common/block/scs/sd.c +++ b/src/soc/intel/common/block/scs/sd.c @@ -12,9 +12,6 @@ static void sd_fill_ssdt(const struct device *dev) struct acpi_gpio default_gpio = { 0 }; struct acpi_dp *dp; - if (!dev->enabled) - return; - if (sd_fill_soc_gpio_info(&default_gpio, dev) != 0) return; diff --git a/src/soc/intel/common/block/usb4/pcie.c b/src/soc/intel/common/block/usb4/pcie.c index eae9027511..81496ce70a 100644 --- a/src/soc/intel/common/block/usb4/pcie.c +++ b/src/soc/intel/common/block/usb4/pcie.c @@ -26,7 +26,7 @@ static void usb4_pcie_acpi_fill_ssdt(const struct device *dev) return; } - if (!dev->enabled || !parent->enabled) + if (!parent->enabled) return; config = config_of(dev); diff --git a/src/soc/intel/common/block/usb4/usb4.c b/src/soc/intel/common/block/usb4/usb4.c index df2dfdde37..a8ab7364a8 100644 --- a/src/soc/intel/common/block/usb4/usb4.c +++ b/src/soc/intel/common/block/usb4/usb4.c @@ -28,9 +28,6 @@ static void tbt_dma_fill_ssdt(const struct device *dev) { struct acpi_dp *dsd, *pkg; - if (!dev->enabled) - return; - acpigen_write_scope(acpi_device_path(dev)); dsd = acpi_dp_new_table("_DSD"); -- cgit v1.2.3