Skip to content

Commit 60a1f9f

Browse files
Shyam Sundar S Kwsakernel
authored andcommitted
i2c: designware: add a new bit check for IC_CON control
On some AMD platforms, based on the new designware datasheet, BIOS sets the BIT(11) within the IC_CON register to advertise the "bus clear feature capability". AMD/Designware datasheet says: Bit(11) BUS_CLEAR_FEATURE_CTRL. Read-write,Volatile. Reset: 0. Description: In Master mode: - 1'b1: Bus Clear Feature is enabled. - 1'b0: Bus Clear Feature is Disabled. In Slave mode, this register bit is not applicable. On AMD platform designs: 1. BIOS programs the BUS_CLEAR_FEATURE_CTRL and enables the detection of SCL/SDA stuck low. 2. Whenever the stuck low is detected, the SMU FW shall do the bus recovery procedure. Currently, the way in which the "master_cfg" is built in the driver, it overrides the BUS_CLEAR_FEATURE_CTRL advertised by BIOS and the SMU FW cannot initiate the bus recovery if the stuck low is detected. Hence add a check in i2c_dw_probe_master() that if the BIOS advertises the bus clear feature, let driver not ignore it and adapt accordingly. Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com> Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> Signed-off-by: Wolfram Sang <wsa@kernel.org>
1 parent 8786b09 commit 60a1f9f

File tree

2 files changed

+21
-0
lines changed

2 files changed

+21
-0
lines changed

drivers/i2c/busses/i2c-designware-core.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
#define DW_IC_CON_STOP_DET_IFADDRESSED BIT(7)
3838
#define DW_IC_CON_TX_EMPTY_CTRL BIT(8)
3939
#define DW_IC_CON_RX_FIFO_FULL_HLD_CTRL BIT(9)
40+
#define DW_IC_CON_BUS_CLEAR_CTRL BIT(11)
4041

4142
#define DW_IC_DATA_CMD_DAT GENMASK(7, 0)
4243

drivers/i2c/busses/i2c-designware-master.c

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -865,6 +865,7 @@ int i2c_dw_probe_master(struct dw_i2c_dev *dev)
865865
{
866866
struct i2c_adapter *adap = &dev->adapter;
867867
unsigned long irq_flags;
868+
unsigned int ic_con;
868869
int ret;
869870

870871
init_completion(&dev->cmd_complete);
@@ -884,6 +885,25 @@ int i2c_dw_probe_master(struct dw_i2c_dev *dev)
884885
if (ret)
885886
return ret;
886887

888+
/* Lock the bus for accessing DW_IC_CON */
889+
ret = i2c_dw_acquire_lock(dev);
890+
if (ret)
891+
return ret;
892+
893+
/*
894+
* On AMD platforms BIOS advertises the bus clear feature
895+
* and enables the SCL/SDA stuck low. SMU FW does the
896+
* bus recovery process. Driver should not ignore this BIOS
897+
* advertisement of bus clear feature.
898+
*/
899+
ret = regmap_read(dev->map, DW_IC_CON, &ic_con);
900+
i2c_dw_release_lock(dev);
901+
if (ret)
902+
return ret;
903+
904+
if (ic_con & DW_IC_CON_BUS_CLEAR_CTRL)
905+
dev->master_cfg |= DW_IC_CON_BUS_CLEAR_CTRL;
906+
887907
ret = dev->init(dev);
888908
if (ret)
889909
return ret;

0 commit comments

Comments
 (0)