GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-06 22:58:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

i2c: aspeed: Adjust spinlock scope in the irq handler

Browse source 
This patch adjusts spinlock scope to make it wrap the whole irq
handler using a single lock/unlock which covers both master and
slave handlers.

Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com>
Reviewed-by: Brendan Higgins <brendanhiggins@google.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
This commit is contained in:
Jae Hyun Yoo 2018-07-02 14:40:11 -07:00 • committed by Wolfram Sang
parent 517fde0eb5
commit 263fe5d45d
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/i2c/busses/i2c-aspeed.c
View file

@ -234,7 +234,6 @@ static bool aspeed_i2c_slave_irq(struct aspeed_i2c_bus *bus)
bool irq_handled = true; bool irq_handled = true;
u8 value; u8 value;
spin_lock(&bus->lock);
if (!slave) { if (!slave) {
irq_handled = false; irq_handled = false;
goto out; goto out;
@ -325,7 +324,6 @@ static bool aspeed_i2c_slave_irq(struct aspeed_i2c_bus *bus)
writel(status_ack, bus->base + ASPEED_I2C_INTR_STS_REG); writel(status_ack, bus->base + ASPEED_I2C_INTR_STS_REG);
out: out:
spin_unlock(&bus->lock);
return irq_handled; return irq_handled;
} }
#endif /* CONFIG_I2C_SLAVE */ #endif /* CONFIG_I2C_SLAVE */
@ -389,7 +387,6 @@ static bool aspeed_i2c_master_irq(struct aspeed_i2c_bus *bus)
u8 recv_byte; u8 recv_byte;
int ret; int ret;
spin_lock(&bus->lock);
irq_status = readl(bus->base + ASPEED_I2C_INTR_STS_REG); irq_status = readl(bus->base + ASPEED_I2C_INTR_STS_REG);
/* Ack all interrupt bits. */ /* Ack all interrupt bits. */
writel(irq_status, bus->base + ASPEED_I2C_INTR_STS_REG); writel(irq_status, bus->base + ASPEED_I2C_INTR_STS_REG);
@ -547,22 +544,29 @@ out_no_complete:
dev_err(bus->dev, dev_err(bus->dev,
"irq handled != irq. expected 0x%08x, but was 0x%08x\n", "irq handled != irq. expected 0x%08x, but was 0x%08x\n",
irq_status, status_ack); irq_status, status_ack);
spin_unlock(&bus->lock);
return !!irq_status; return !!irq_status;
} }
static irqreturn_t aspeed_i2c_bus_irq(int irq, void *dev_id) static irqreturn_t aspeed_i2c_bus_irq(int irq, void *dev_id)
{ {
struct aspeed_i2c_bus *bus = dev_id; struct aspeed_i2c_bus *bus = dev_id;
bool ret;
spin_lock(&bus->lock);
#if IS_ENABLED(CONFIG_I2C_SLAVE) #if IS_ENABLED(CONFIG_I2C_SLAVE)
if (aspeed_i2c_slave_irq(bus)) { if (aspeed_i2c_slave_irq(bus)) {
dev_dbg(bus->dev, "irq handled by slave.\n"); dev_dbg(bus->dev, "irq handled by slave.\n");
return IRQ_HANDLED; ret = true;
goto out;
} }
#endif /* CONFIG_I2C_SLAVE */ #endif /* CONFIG_I2C_SLAVE */
return aspeed_i2c_master_irq(bus) ? IRQ_HANDLED : IRQ_NONE; ret = aspeed_i2c_master_irq(bus);
out:
spin_unlock(&bus->lock);
return ret ? IRQ_HANDLED : IRQ_NONE;
} }
static int aspeed_i2c_master_xfer(struct i2c_adapter *adap, static int aspeed_i2c_master_xfer(struct i2c_adapter *adap,