From d629e433dddeff040260e9ca309525cbf47a7601 Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Fri, 9 Jun 2017 17:54:00 -0700 Subject: [PATCH] soc/intel/common/block/i2c: Ignore disabled I2C devices MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Id9a790e338a0e6f32c199f5f437203e1525df208 Signed-off-by: Furquan Shaikh Reviewed-on: https://review.coreboot.org/20140 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Martin Roth Reviewed-by: Aaron Durbin Reviewed-by: Philippe Mathieu-Daudé --- 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);