Skip to content

Commit c850ecf

Browse files
mszyprowwsakernel
authored andcommitted
i2c: brcmstb: Add support for atomic transfers
Add support for atomic transfers using polling mode with interrupts intentionally disabled to get rid of the warning introduced by commit 63b9698 ("i2c: core: introduce callbacks for atomic transfers") during system reboot and power-off. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com> Reviewed-by: Andi Shyti <andi.shyti@kernel.org> Signed-off-by: Wolfram Sang <wsa@kernel.org>
1 parent 8c56f9e commit c850ecf

File tree

1 file changed

+21
-2
lines changed

1 file changed

+21
-2
lines changed

drivers/i2c/busses/i2c-brcmstb.c

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ struct brcmstb_i2c_dev {
160160
struct completion done;
161161
u32 clk_freq_hz;
162162
int data_regsz;
163+
bool atomic;
163164
};
164165

165166
/* register accessors for both be and le cpu arch */
@@ -240,7 +241,7 @@ static int brcmstb_i2c_wait_for_completion(struct brcmstb_i2c_dev *dev)
240241
int ret = 0;
241242
unsigned long timeout = msecs_to_jiffies(I2C_TIMEOUT);
242243

243-
if (dev->irq >= 0) {
244+
if (dev->irq >= 0 && !dev->atomic) {
244245
if (!wait_for_completion_timeout(&dev->done, timeout))
245246
ret = -ETIMEDOUT;
246247
} else {
@@ -287,7 +288,7 @@ static int brcmstb_send_i2c_cmd(struct brcmstb_i2c_dev *dev,
287288
return rc;
288289

289290
/* only if we are in interrupt mode */
290-
if (dev->irq >= 0)
291+
if (dev->irq >= 0 && !dev->atomic)
291292
reinit_completion(&dev->done);
292293

293294
/* enable BSC CTL interrupt line */
@@ -520,6 +521,23 @@ static int brcmstb_i2c_xfer(struct i2c_adapter *adapter,
520521

521522
}
522523

524+
static int brcmstb_i2c_xfer_atomic(struct i2c_adapter *adapter,
525+
struct i2c_msg msgs[], int num)
526+
{
527+
struct brcmstb_i2c_dev *dev = i2c_get_adapdata(adapter);
528+
int ret;
529+
530+
if (dev->irq >= 0)
531+
disable_irq(dev->irq);
532+
dev->atomic = true;
533+
ret = brcmstb_i2c_xfer(adapter, msgs, num);
534+
dev->atomic = false;
535+
if (dev->irq >= 0)
536+
enable_irq(dev->irq);
537+
538+
return ret;
539+
}
540+
523541
static u32 brcmstb_i2c_functionality(struct i2c_adapter *adap)
524542
{
525543
return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL | I2C_FUNC_10BIT_ADDR
@@ -528,6 +546,7 @@ static u32 brcmstb_i2c_functionality(struct i2c_adapter *adap)
528546

529547
static const struct i2c_algorithm brcmstb_i2c_algo = {
530548
.master_xfer = brcmstb_i2c_xfer,
549+
.master_xfer_atomic = brcmstb_i2c_xfer_atomic,
531550
.functionality = brcmstb_i2c_functionality,
532551
};
533552

0 commit comments

Comments
 (0)