From: Heiner Kallweit <hkallweit1@gmail.com> To: Wolfram Sang <wsa@the-dreams.de>, Jerome Brunet <jbrunet@baylibre.com> Cc: "linux-i2c@vger.kernel.org" <linux-i2c@vger.kernel.org>, linux-amlogic@lists.infradead.org Subject: [PATCH v2 07/10] i2c: meson: improve interrupt handler and detect spurious interrupts Date: Thu, 9 Mar 2017 07:53:26 +0100 [thread overview] Message-ID: <372c966f-253d-fdd0-9675-6f928e02d401@gmail.com> (raw) In-Reply-To: <f39c9314-4314-3d98-aef2-3bc3c815e63b@gmail.com> If state is STATE_IDLE no interrupt should occur. Detect this case and warn. In addition move resetting REG_CTRL_START bit to the start of the interrupt handler and remove a unneeded REG_CTRL_START bit reset in meson_i2c_xfer_msg. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> --- v2: - don't print an error if spurious interrupt is detected --- drivers/i2c/busses/i2c-meson.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/i2c/busses/i2c-meson.c b/drivers/i2c/busses/i2c-meson.c index 56e15a74..74d433cd 100644 --- a/drivers/i2c/busses/i2c-meson.c +++ b/drivers/i2c/busses/i2c-meson.c @@ -228,12 +228,18 @@ static irqreturn_t meson_i2c_irq(int irqno, void *dev_id) spin_lock(&i2c->lock); meson_i2c_reset_tokens(i2c); + meson_i2c_set_mask(i2c, REG_CTRL, REG_CTRL_START, 0); ctrl = readl(i2c->regs + REG_CTRL); dev_dbg(i2c->dev, "irq: state %d, pos %d, count %d, ctrl %08x\n", i2c->state, i2c->pos, i2c->count, ctrl); - if (ctrl & REG_CTRL_ERROR && i2c->state != STATE_IDLE) { + if (i2c->state == STATE_IDLE) { + spin_unlock(&i2c->lock); + return IRQ_NONE; + } + + if (ctrl & REG_CTRL_ERROR) { /* * The bit is set when the IGNORE_NAK bit is cleared * and the device didn't respond. In this case, the @@ -276,15 +282,12 @@ static irqreturn_t meson_i2c_irq(int irqno, void *dev_id) i2c->state = STATE_IDLE; complete(&i2c->done); break; - case STATE_IDLE: - break; } out: if (i2c->state != STATE_IDLE) { /* Restart the processing */ meson_i2c_write_tokens(i2c); - meson_i2c_set_mask(i2c, REG_CTRL, REG_CTRL_START, 0); meson_i2c_set_mask(i2c, REG_CTRL, REG_CTRL_START, REG_CTRL_START); } @@ -344,9 +347,6 @@ static int meson_i2c_xfer_msg(struct meson_i2c *i2c, struct i2c_msg *msg, */ spin_lock_irqsave(&i2c->lock, flags); - /* Abort any active operation */ - meson_i2c_set_mask(i2c, REG_CTRL, REG_CTRL_START, 0); - if (!time_left) { i2c->state = STATE_IDLE; ret = -ETIMEDOUT; -- 2.12.0
WARNING: multiple messages have this Message-ID (diff)
From: hkallweit1@gmail.com (Heiner Kallweit) To: linus-amlogic@lists.infradead.org Subject: [PATCH v2 07/10] i2c: meson: improve interrupt handler and detect spurious interrupts Date: Thu, 9 Mar 2017 07:53:26 +0100 [thread overview] Message-ID: <372c966f-253d-fdd0-9675-6f928e02d401@gmail.com> (raw) In-Reply-To: <f39c9314-4314-3d98-aef2-3bc3c815e63b@gmail.com> If state is STATE_IDLE no interrupt should occur. Detect this case and warn. In addition move resetting REG_CTRL_START bit to the start of the interrupt handler and remove a unneeded REG_CTRL_START bit reset in meson_i2c_xfer_msg. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> --- v2: - don't print an error if spurious interrupt is detected --- drivers/i2c/busses/i2c-meson.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/i2c/busses/i2c-meson.c b/drivers/i2c/busses/i2c-meson.c index 56e15a74..74d433cd 100644 --- a/drivers/i2c/busses/i2c-meson.c +++ b/drivers/i2c/busses/i2c-meson.c @@ -228,12 +228,18 @@ static irqreturn_t meson_i2c_irq(int irqno, void *dev_id) spin_lock(&i2c->lock); meson_i2c_reset_tokens(i2c); + meson_i2c_set_mask(i2c, REG_CTRL, REG_CTRL_START, 0); ctrl = readl(i2c->regs + REG_CTRL); dev_dbg(i2c->dev, "irq: state %d, pos %d, count %d, ctrl %08x\n", i2c->state, i2c->pos, i2c->count, ctrl); - if (ctrl & REG_CTRL_ERROR && i2c->state != STATE_IDLE) { + if (i2c->state == STATE_IDLE) { + spin_unlock(&i2c->lock); + return IRQ_NONE; + } + + if (ctrl & REG_CTRL_ERROR) { /* * The bit is set when the IGNORE_NAK bit is cleared * and the device didn't respond. In this case, the @@ -276,15 +282,12 @@ static irqreturn_t meson_i2c_irq(int irqno, void *dev_id) i2c->state = STATE_IDLE; complete(&i2c->done); break; - case STATE_IDLE: - break; } out: if (i2c->state != STATE_IDLE) { /* Restart the processing */ meson_i2c_write_tokens(i2c); - meson_i2c_set_mask(i2c, REG_CTRL, REG_CTRL_START, 0); meson_i2c_set_mask(i2c, REG_CTRL, REG_CTRL_START, REG_CTRL_START); } @@ -344,9 +347,6 @@ static int meson_i2c_xfer_msg(struct meson_i2c *i2c, struct i2c_msg *msg, */ spin_lock_irqsave(&i2c->lock, flags); - /* Abort any active operation */ - meson_i2c_set_mask(i2c, REG_CTRL, REG_CTRL_START, 0); - if (!time_left) { i2c->state = STATE_IDLE; ret = -ETIMEDOUT; -- 2.12.0
next prev parent reply other threads:[~2017-03-09 7:10 UTC|newest] Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-03-09 6:33 [PATCH v2 00/10] i2c: meson: series with improvements Heiner Kallweit 2017-03-09 6:33 ` Heiner Kallweit 2017-03-09 6:35 ` [PATCH v2 01/10] i2c: meson: i2c: meson: use min instead of min_t where min_t isn't needed Heiner Kallweit 2017-03-09 6:35 ` Heiner Kallweit 2017-03-09 6:37 ` [PATCH v2 02/10] i2c: meson: remove member irq from struct meson_i2c Heiner Kallweit 2017-03-09 6:37 ` Heiner Kallweit 2017-03-09 6:39 ` [PATCH v2 03/10] i2c: meson: use i2c core for DT clock-frequency parsing Heiner Kallweit 2017-03-09 6:39 ` Heiner Kallweit 2017-03-09 8:26 ` Neil Armstrong 2017-03-09 8:26 ` Neil Armstrong 2017-03-09 20:13 ` Heiner Kallweit 2017-03-09 20:13 ` Heiner Kallweit 2017-03-09 6:40 ` [PATCH v2 04/10] i2c: meson: use full 12 bits for clock divider Heiner Kallweit 2017-03-09 6:40 ` Heiner Kallweit 2017-03-09 6:42 ` [PATCH v2 05/10] i2c: meson: set clock divider in probe instead of setting it for each transfer Heiner Kallweit 2017-03-09 6:42 ` Heiner Kallweit 2017-03-10 23:17 ` Kevin Hilman 2017-03-10 23:17 ` Kevin Hilman 2017-03-10 23:36 ` Heiner Kallweit 2017-03-10 23:36 ` Heiner Kallweit 2017-03-09 6:43 ` [PATCH v2 06/10] i2c: meson: remove variable count from meson_i2c_xfer Heiner Kallweit 2017-03-09 6:43 ` Heiner Kallweit 2017-03-09 6:53 ` Heiner Kallweit [this message] 2017-03-09 6:53 ` [PATCH v2 07/10] i2c: meson: improve interrupt handler and detect spurious interrupts Heiner Kallweit 2017-03-09 6:56 ` [PATCH v2 08/10] i2c: meson: don't create separate token chain just for the stop command Heiner Kallweit 2017-03-09 6:56 ` Heiner Kallweit 2017-03-09 6:58 ` [PATCH v2 09/10] i2c: meson: remove meson_i2c_write_tokens Heiner Kallweit 2017-03-09 6:58 ` Heiner Kallweit 2017-03-09 7:01 ` [PATCH v2 10/10] i2c: meson: improve and simplify interrupt handler Heiner Kallweit 2017-03-09 7:01 ` Heiner Kallweit
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=372c966f-253d-fdd0-9675-6f928e02d401@gmail.com \ --to=hkallweit1@gmail.com \ --cc=jbrunet@baylibre.com \ --cc=linux-amlogic@lists.infradead.org \ --cc=linux-i2c@vger.kernel.org \ --cc=wsa@the-dreams.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.