summaryrefslogtreecommitdiff
path: root/src/ec/google
diff options
context:
space:
mode:
authorKarthikeyan Ramasubramanian <kramasub@google.com>2020-11-02 16:26:52 -0700
committerPatrick Georgi <pgeorgi@google.com>2020-11-09 07:24:13 +0000
commitd1c0f958d1986a94ac55ae1d196ba286c311b90f (patch)
tree2dbba3c69328215132f5eeaa32cc221007bb9dec /src/ec/google
parent04582e900102357056aa218e5a413edb52409e87 (diff)
downloadcoreboot-d1c0f958d1986a94ac55ae1d196ba286c311b90f.tar.xz
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>
Diffstat (limited to 'src/ec/google')
-rw-r--r--src/ec/google/chromeec/audio_codec/audio_codec.c2
-rw-r--r--src/ec/google/chromeec/ec_acpi.c3
-rw-r--r--src/ec/google/chromeec/i2c_tunnel/i2c_tunnel.c2
-rw-r--r--src/ec/google/wilco/chip.c3
4 files changed, 2 insertions, 8 deletions
diff --git a/src/ec/google/chromeec/audio_codec/audio_codec.c b/src/ec/google/chromeec/audio_codec/audio_codec.c
index 612b1f6995..53037eb01b 100644
--- a/src/ec/google/chromeec/audio_codec/audio_codec.c
+++ b/src/ec/google/chromeec/audio_codec/audio_codec.c
@@ -15,7 +15,7 @@ static void crosec_audio_codec_fill_ssdt(const struct device *dev)
const char *scope = acpi_device_scope(dev);
struct ec_google_chromeec_audio_codec_config *cfg = dev->chip_info;
- if (!dev->enabled || !scope || !cfg)
+ if (!scope || !cfg)
return;
acpigen_write_scope(scope);
diff --git a/src/ec/google/chromeec/ec_acpi.c b/src/ec/google/chromeec/ec_acpi.c
index 448ea4dadd..fff395411c 100644
--- a/src/ec/google/chromeec/ec_acpi.c
+++ b/src/ec/google/chromeec/ec_acpi.c
@@ -223,9 +223,6 @@ void google_chromeec_fill_ssdt_generator(const struct device *dev)
struct device_path path;
struct device *ec;
- if (!dev->enabled)
- return;
-
/* Set up a minimal EC0 device to pass to the DPTF helpers */
path.type = DEVICE_PATH_GENERIC;
path.generic.id = 0;
diff --git a/src/ec/google/chromeec/i2c_tunnel/i2c_tunnel.c b/src/ec/google/chromeec/i2c_tunnel/i2c_tunnel.c
index ec8bdfc2bf..e61ecfd8c1 100644
--- a/src/ec/google/chromeec/i2c_tunnel/i2c_tunnel.c
+++ b/src/ec/google/chromeec/i2c_tunnel/i2c_tunnel.c
@@ -17,7 +17,7 @@ static void crosec_i2c_tunnel_fill_ssdt(const struct device *dev)
struct ec_google_chromeec_i2c_tunnel_config *cfg = dev->chip_info;
struct acpi_dp *dsd;
- if (!dev->enabled || !scope || !cfg)
+ if (!scope || !cfg)
return;
acpigen_write_scope(scope);
diff --git a/src/ec/google/wilco/chip.c b/src/ec/google/wilco/chip.c
index dccaa23d01..911eb25074 100644
--- a/src/ec/google/wilco/chip.c
+++ b/src/ec/google/wilco/chip.c
@@ -184,9 +184,6 @@ static void wilco_ec_fill_ssdt_generator(const struct device *dev)
void *region_ptr;
size_t ucsi_alloc_region_len;
- if (!dev->enabled)
- return;
-
ucsi_alloc_region_len = ucsi_region_len < UCSI_MIN_ALLOC_REGION_LEN ?
UCSI_MIN_ALLOC_REGION_LEN : ucsi_region_len;
region_ptr = cbmem_add(CBMEM_ID_ACPI_UCSI, ucsi_alloc_region_len);