From 46f2add6c01817210c5b5c9e65cdc93d04079293 Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Fri, 9 Jun 2017 17:54:00 -0700 Subject: [PATCH] UPSTREAM: soc/intel/common/block/i2c: Ignore disabled I2C devices If I2C device is disabled: 1. BAR for the device will be 0 2. There is no need to generate ACPI tables for the device TEST=Verified that if an i2c device is disabled statically in devicetree or dynamically in mainboard, then coreboot does not die looking for missing resources. Change-Id: I3617894691853f18b1ebb6f1fe26202d8d3ff502 Signed-off-by: Patrick Georgi Original-Commit-Id: d629e433dddeff040260e9ca309525cbf47a7601 Original-Change-Id: Id9a790e338a0e6f32c199f5f437203e1525df208 Original-Signed-off-by: Furquan Shaikh Original-Reviewed-on: https://review.coreboot.org/20140 Original-Tested-by: build bot (Jenkins) Original-Reviewed-by: Paul Menzel Original-Reviewed-by: Martin Roth Original-Reviewed-by: Aaron Durbin Original-Reviewed-by: Philippe Mathieu-Daud Reviewed-on: https://chromium-review.googlesource.com/539205 Commit-Ready: Patrick Georgi Tested-by: Patrick Georgi Reviewed-by: Patrick Georgi --- src/soc/intel/common/block/i2c/i2c.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/soc/intel/common/block/i2c/i2c.c b/src/soc/intel/common/block/i2c/i2c.c index fe220b58fb..6debe88eeb 100644 --- a/src/soc/intel/common/block/i2c/i2c.c +++ b/src/soc/intel/common/block/i2c/i2c.c @@ -41,7 +41,7 @@ uintptr_t lpss_i2c_base_address(unsigned int bus) /* devfn -> dev */ dev = dev_find_slot(0, devfn); - if (!dev) + if (!dev || !dev->enabled) return (uintptr_t)NULL; /* dev -> bar0 */ @@ -119,7 +119,12 @@ static void lpss_i2c_acpi_fill_ssdt(struct device *dev) I2C_SPEED_FAST_PLUS, I2C_SPEED_HIGH, }; - int i, bus = lpss_i2c_dev_to_bus(dev); + int i, bus; + + if (!dev->enabled) + return; + + bus = lpss_i2c_dev_to_bus(dev); bcfg = i2c_get_soc_cfg(bus, dev);