commit d1c0f958d1986a94ac55ae1d196ba286c311b90f
author Karthikeyan Ramasubramanian <kramasub@google.com> Mon Nov 02 16:26:52 2020 -0700
committer Patrick Georgi <pgeorgi@google.com> Mon Nov 09 07:24:13 2020 +0000
tree 2dbba3c69328215132f5eeaa32cc221007bb9dec
parent 04582e900102357056aa218e5a413edb52409e87

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 <kramasub@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/47148
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Reviewed-by: Sumeet R Pawnikar <sumeet.r.pawnikar@intel.com>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Christian Walter <christian.walter@9elements.com>

src/drivers/intel/ish/ish.c

diff --git a/src/drivers/intel/ish/ish.c b/src/drivers/intel/ish/ish.c
index f82f7fc..19cbd82 100644
--- a/src/drivers/intel/ish/ish.c
+++ b/src/drivers/intel/ish/ish.c
@@ -13,7 +13,7 @@
 	struct device *root = dev->bus->dev;
 	struct acpi_dp *dsd;
 
-	if (!dev->enabled || !config || !config->firmware_name)
+	if (!config || !config->firmware_name)
 		return;
 
 	acpigen_write_scope(acpi_device_path(root));

src/drivers/intel/mipi_camera/camera.c

diff --git a/src/drivers/intel/mipi_camera/camera.c b/src/drivers/intel/mipi_camera/camera.c
index d4cf33d..7dfd650 100644
--- a/src/drivers/intel/mipi_camera/camera.c
+++ b/src/drivers/intel/mipi_camera/camera.c
@@ -909,9 +909,6 @@
 	const char *scope = NULL;
 	const struct device *pdev;
 
-	if (!dev->enabled)
-		return;
-
 	if (config->has_power_resource) {
 		pdev = dev->bus->dev;
 		if (!pdev || !pdev->enabled)

src/drivers/intel/pmc_mux/conn/conn.c

diff --git a/src/drivers/intel/pmc_mux/conn/conn.c b/src/drivers/intel/pmc_mux/conn/conn.c
index 16d113b..9fd8543 100644
--- a/src/drivers/intel/pmc_mux/conn/conn.c
+++ b/src/drivers/intel/pmc_mux/conn/conn.c
@@ -32,9 +32,6 @@
 	const char *scope;
 	const char *name;
 
-	if (!dev->enabled)
-		return;
-
 	/* Reference the existing scope and write CONx device */
 	scope = acpi_device_scope(dev);
 	name = acpi_device_name(dev);

src/drivers/intel/soundwire/soundwire.c

diff --git a/src/drivers/intel/soundwire/soundwire.c b/src/drivers/intel/soundwire/soundwire.c
index 34ecd86..c7e84a5 100644
--- a/src/drivers/intel/soundwire/soundwire.c
+++ b/src/drivers/intel/soundwire/soundwire.c
@@ -50,7 +50,7 @@
 	struct intel_soundwire_controller *controller;
 	const char *scope = acpi_device_scope(dev);
 
-	if (!dev->enabled || !scope)
+	if (!scope)
 		return;
 
 	if (soc_fill_soundwire_controller(&controller) < 0 || !controller)

src/drivers/intel/usb4/retimer/retimer.c

diff --git a/src/drivers/intel/usb4/retimer/retimer.c b/src/drivers/intel/usb4/retimer/retimer.c
index be9ec35..7a693ff 100644
--- a/src/drivers/intel/usb4/retimer/retimer.c
+++ b/src/drivers/intel/usb4/retimer/retimer.c
@@ -101,7 +101,7 @@
 	const struct drivers_intel_usb4_retimer_config *config = dev->chip_info;
 	const char *scope = acpi_device_scope(dev);
 
-	if (!dev->enabled || !scope || !config)
+	if (!scope || !config)
 		return;
 
 	if (!config->power_gpio.pin_count) {