Commit 126a66ca authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Wolfram Sang

i2c: omap: drop the lock hard irq context

The lock is taken while reading two registers. On RT the first lock is
taken in hard irq where it might sleep and in the threaded irq.
The threaded irq runs in oneshot mode so the hard irq does not run until
the thread the completes so there is no reason to grab the lock.
Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
[grygorii.strashko@ti.com: drop locking from isr completely and remove
lock field from struct omap_i2c_dev]
Signed-off-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent afc34be0
...@@ -185,7 +185,6 @@ enum { ...@@ -185,7 +185,6 @@ enum {
#define OMAP_I2C_IP_V2_INTERRUPTS_MASK 0x6FFF #define OMAP_I2C_IP_V2_INTERRUPTS_MASK 0x6FFF
struct omap_i2c_dev { struct omap_i2c_dev {
spinlock_t lock; /* IRQ synchronization */
struct device *dev; struct device *dev;
void __iomem *base; /* virtual */ void __iomem *base; /* virtual */
int irq; int irq;
...@@ -995,15 +994,12 @@ omap_i2c_isr(int irq, void *dev_id) ...@@ -995,15 +994,12 @@ omap_i2c_isr(int irq, void *dev_id)
u16 mask; u16 mask;
u16 stat; u16 stat;
spin_lock(&omap->lock);
mask = omap_i2c_read_reg(omap, OMAP_I2C_IE_REG);
stat = omap_i2c_read_reg(omap, OMAP_I2C_STAT_REG); stat = omap_i2c_read_reg(omap, OMAP_I2C_STAT_REG);
mask = omap_i2c_read_reg(omap, OMAP_I2C_IE_REG);
if (stat & mask) if (stat & mask)
ret = IRQ_WAKE_THREAD; ret = IRQ_WAKE_THREAD;
spin_unlock(&omap->lock);
return ret; return ret;
} }
...@@ -1011,12 +1007,10 @@ static irqreturn_t ...@@ -1011,12 +1007,10 @@ static irqreturn_t
omap_i2c_isr_thread(int this_irq, void *dev_id) omap_i2c_isr_thread(int this_irq, void *dev_id)
{ {
struct omap_i2c_dev *omap = dev_id; struct omap_i2c_dev *omap = dev_id;
unsigned long flags;
u16 bits; u16 bits;
u16 stat; u16 stat;
int err = 0, count = 0; int err = 0, count = 0;
spin_lock_irqsave(&omap->lock, flags);
do { do {
bits = omap_i2c_read_reg(omap, OMAP_I2C_IE_REG); bits = omap_i2c_read_reg(omap, OMAP_I2C_IE_REG);
stat = omap_i2c_read_reg(omap, OMAP_I2C_STAT_REG); stat = omap_i2c_read_reg(omap, OMAP_I2C_STAT_REG);
...@@ -1142,8 +1136,6 @@ omap_i2c_isr_thread(int this_irq, void *dev_id) ...@@ -1142,8 +1136,6 @@ omap_i2c_isr_thread(int this_irq, void *dev_id)
omap_i2c_complete_cmd(omap, err); omap_i2c_complete_cmd(omap, err);
out: out:
spin_unlock_irqrestore(&omap->lock, flags);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
...@@ -1330,8 +1322,6 @@ omap_i2c_probe(struct platform_device *pdev) ...@@ -1330,8 +1322,6 @@ omap_i2c_probe(struct platform_device *pdev)
omap->dev = &pdev->dev; omap->dev = &pdev->dev;
omap->irq = irq; omap->irq = irq;
spin_lock_init(&omap->lock);
platform_set_drvdata(pdev, omap); platform_set_drvdata(pdev, omap);
init_completion(&omap->cmd_complete); init_completion(&omap->cmd_complete);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment