From: Guenter Roeck <linux@roeck-us.net>
To: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com>
Cc: "Joel Stanley" <joel@jms.id.au>,
linux-aspeed@lists.ozlabs.org,
"Vernon Mauery" <vernon.mauery@linux.intel.com>,
"OpenBMC Maillist" <openbmc@lists.ozlabs.org>,
"Brendan Higgins" <brendanhiggins@google.com>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
linux-i2c@vger.kernel.org, jarkko.nikula@linux.intel.com,
"Cédric Le Goater" <clg@kaod.org>,
"Linux ARM" <linux-arm-kernel@lists.infradead.org>,
"James Feist" <james.feist@linux.intel.com>
Subject: Re: [PATCH i2c-next v6] i2c: aspeed: Handle master/slave combined irq events properly
Date: Wed, 12 Sep 2018 16:30:35 -0700 [thread overview]
Message-ID: <20180912233035.GA10713@roeck-us.net> (raw)
In-Reply-To: <6a99dc09-b06d-88ee-2843-3bd88f883dc2@linux.intel.com>
On Wed, Sep 12, 2018 at 03:31:06PM -0700, Jae Hyun Yoo wrote:
> >
> >I played with the code on both sides. I had to make changes in both
> >the linux kernel and in qemu to get the code to work again.
> >See attached.
> >
> >Guenter
> >
> >---
> >Linux:
> >
> >diff --git a/drivers/i2c/busses/i2c-aspeed.c b/drivers/i2c/busses/i2c-aspeed.c
> >index c258c4d9a4c0..3d518e09369f 100644
> >--- a/drivers/i2c/busses/i2c-aspeed.c
> >+++ b/drivers/i2c/busses/i2c-aspeed.c
> >@@ -552,6 +552,9 @@ static irqreturn_t aspeed_i2c_bus_irq(int irq, void *dev_id)
> > spin_lock(&bus->lock);
> > irq_received = readl(bus->base + ASPEED_I2C_INTR_STS_REG);
> >+ /* Ack all interrupts except for Rx done */
> >+ writel(irq_received & ~ASPEED_I2CD_INTR_RX_DONE,
> >+ bus->base + ASPEED_I2C_INTR_STS_REG);
> > irq_remaining = irq_received;
> > #if IS_ENABLED(CONFIG_I2C_SLAVE)
> >@@ -584,8 +587,10 @@ static irqreturn_t aspeed_i2c_bus_irq(int irq, void *dev_id)
> > "irq handled != irq. expected 0x%08x, but was 0x%08x\n",
> > irq_received, irq_handled);
> >- /* Ack all interrupt bits. */
> >- writel(irq_received, bus->base + ASPEED_I2C_INTR_STS_REG);
> >+ /* Ack Rx done */
> >+ if (irq_received & ASPEED_I2CD_INTR_RX_DONE)
> >+ writel(ASPEED_I2CD_INTR_RX_DONE,
> >+ bus->base + ASPEED_I2C_INTR_STS_REG);
> > spin_unlock(&bus->lock);
> > return irq_remaining ? IRQ_NONE : IRQ_HANDLED;
> > }
> >
> >---
> >qemu:
> >
> >diff --git a/hw/i2c/aspeed_i2c.c b/hw/i2c/aspeed_i2c.c
> >index c762c73..0d4aa08 100644
> >--- a/hw/i2c/aspeed_i2c.c
> >+++ b/hw/i2c/aspeed_i2c.c
> >@@ -180,6 +180,33 @@ static uint8_t aspeed_i2c_get_state(AspeedI2CBus *bus)
> > return (bus->cmd >> I2CD_TX_STATE_SHIFT) & I2CD_TX_STATE_MASK;
> > }
> >+static void aspeed_i2c_handle_rx_cmd(AspeedI2CBus *bus)
> >+{
> >+ int ret;
> >+
> >+ if (!(bus->cmd & (I2CD_M_RX_CMD | I2CD_M_S_RX_CMD_LAST))) {
> >+ return;
> >+ }
> >+ if (bus->intr_status & I2CD_INTR_RX_DONE) {
> >+ return;
> >+ }
> >+
> >+ aspeed_i2c_set_state(bus, I2CD_MRXD);
> >+ ret = i2c_recv(bus->bus);
> >+ if (ret < 0) {
> >+ qemu_log_mask(LOG_GUEST_ERROR, "%s: read failed\n", __func__);
> >+ ret = 0xff;
> >+ } else {
> >+ bus->intr_status |= I2CD_INTR_RX_DONE;
> >+ }
> >+ bus->buf = (ret & I2CD_BYTE_BUF_RX_MASK) << I2CD_BYTE_BUF_RX_SHIFT;
> >+ if (bus->cmd & I2CD_M_S_RX_CMD_LAST) {
> >+ i2c_nack(bus->bus);
> >+ }
> >+ bus->cmd &= ~(I2CD_M_RX_CMD | I2CD_M_S_RX_CMD_LAST);
> >+ aspeed_i2c_set_state(bus, I2CD_MACTIVE);
> >+}
> >+
> > /*
> > * The state machine needs some refinement. It is only used to track
> > * invalid STOP commands for the moment.
> >@@ -188,7 +215,7 @@ static void aspeed_i2c_bus_handle_cmd(AspeedI2CBus *bus, uint64_t value)
> > {
> > bus->cmd &= ~0xFFFF;
> > bus->cmd |= value & 0xFFFF;
> >- bus->intr_status = 0;
> >+ bus->intr_status &= I2CD_INTR_RX_DONE;
> > if (bus->cmd & I2CD_M_START_CMD) {
> > uint8_t state = aspeed_i2c_get_state(bus) & I2CD_MACTIVE ?
> >@@ -227,22 +254,7 @@ static void aspeed_i2c_bus_handle_cmd(AspeedI2CBus *bus, uint64_t value)
> > }
> > if (bus->cmd & (I2CD_M_RX_CMD | I2CD_M_S_RX_CMD_LAST)) {
> >- int ret;
> >-
> >- aspeed_i2c_set_state(bus, I2CD_MRXD);
> >- ret = i2c_recv(bus->bus);
> >- if (ret < 0) {
> >- qemu_log_mask(LOG_GUEST_ERROR, "%s: read failed\n", __func__);
> >- ret = 0xff;
> >- } else {
> >- bus->intr_status |= I2CD_INTR_RX_DONE;
> >- }
> >- bus->buf = (ret & I2CD_BYTE_BUF_RX_MASK) << I2CD_BYTE_BUF_RX_SHIFT;
> >- if (bus->cmd & I2CD_M_S_RX_CMD_LAST) {
> >- i2c_nack(bus->bus);
> >- }
> >- bus->cmd &= ~(I2CD_M_RX_CMD | I2CD_M_S_RX_CMD_LAST);
> >- aspeed_i2c_set_state(bus, I2CD_MACTIVE);
> >+ aspeed_i2c_handle_rx_cmd(bus);
> > }
> > if (bus->cmd & I2CD_M_STOP_CMD) {
> >@@ -263,6 +275,7 @@ static void aspeed_i2c_bus_write(void *opaque, hwaddr offset,
> > uint64_t value, unsigned size)
> > {
> > AspeedI2CBus *bus = opaque;
> >+ int status;
> > switch (offset) {
> > case I2CD_FUN_CTRL_REG:
> >@@ -283,9 +296,16 @@ static void aspeed_i2c_bus_write(void *opaque, hwaddr offset,
> > bus->intr_ctrl = value & 0x7FFF;
> > break;
> > case I2CD_INTR_STS_REG:
> >+ status = bus->intr_status;
> > bus->intr_status &= ~(value & 0x7FFF);
> >- bus->controller->intr_status &= ~(1 << bus->id);
> >- qemu_irq_lower(bus->controller->irq);
> >+ if (!bus->intr_status) {
> >+ bus->controller->intr_status &= ~(1 << bus->id);
> >+ qemu_irq_lower(bus->controller->irq);
> >+ }
> >+ if ((status & I2CD_INTR_RX_DONE) && !(bus->intr_status & I2CD_INTR_RX_DONE)) {
> >+ aspeed_i2c_handle_rx_cmd(bus);
> >+ aspeed_i2c_bus_raise_interrupt(bus);
> >+ }
> > break;
> > case I2CD_DEV_ADDR_REG:
> > qemu_log_mask(LOG_UNIMP, "%s: slave mode not implemented\n",
> >
>
> Nice fix! LGTM. I've tested the new patch and checked that it works well
> on both low and high bus speed environments. Thanks a lot!
>
> Can you please submit this patch?
>
Assuming you mean both patches, sure, can do. I'll need to clean up
the qemu patch a bit, though; it looks too messy for my liking.
Guenter
next prev parent reply other threads:[~2018-09-12 23:30 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-23 22:57 [PATCH i2c-next v6] i2c: aspeed: Handle master/slave combined irq events properly Jae Hyun Yoo
2018-09-06 17:26 ` Brendan Higgins
2018-09-06 17:32 ` Jae Hyun Yoo
2018-09-06 18:08 ` Wolfram Sang
2018-09-06 18:33 ` Jae Hyun Yoo
2018-09-06 18:40 ` Wolfram Sang
2018-09-11 18:37 ` Guenter Roeck
2018-09-11 18:45 ` Cédric Le Goater
2018-09-11 20:30 ` Jae Hyun Yoo
2018-09-11 20:41 ` Guenter Roeck
2018-09-11 22:18 ` Jae Hyun Yoo
2018-09-11 22:53 ` Joel Stanley
2018-09-11 23:33 ` Guenter Roeck
2018-09-11 23:58 ` Jae Hyun Yoo
2018-09-12 1:34 ` Guenter Roeck
2018-09-12 16:54 ` Jae Hyun Yoo
2018-09-12 19:58 ` Guenter Roeck
2018-09-12 20:10 ` Jae Hyun Yoo
2018-09-12 20:30 ` Guenter Roeck
2018-09-12 22:31 ` Jae Hyun Yoo
2018-09-12 23:30 ` Guenter Roeck [this message]
2018-09-13 5:45 ` Cédric Le Goater
2018-09-13 13:33 ` Guenter Roeck
2018-09-13 15:48 ` Cédric Le Goater
2018-09-13 15:57 ` Guenter Roeck
2018-09-13 16:35 ` Cédric Le Goater
2018-09-14 3:48 ` Guenter Roeck
2018-09-14 5:38 ` Cédric Le Goater
2018-09-14 13:23 ` Guenter Roeck
2018-09-14 16:52 ` Jae Hyun Yoo
2018-09-13 5:47 ` Cédric Le Goater
2018-09-13 16:31 ` Jae Hyun Yoo
2018-09-13 16:51 ` Cédric Le Goater
2018-09-13 17:01 ` Jae Hyun Yoo
2018-09-12 5:57 ` Cédric Le Goater
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=20180912233035.GA10713@roeck-us.net \
--to=linux@roeck-us.net \
--cc=brendanhiggins@google.com \
--cc=clg@kaod.org \
--cc=jae.hyun.yoo@linux.intel.com \
--cc=james.feist@linux.intel.com \
--cc=jarkko.nikula@linux.intel.com \
--cc=joel@jms.id.au \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-aspeed@lists.ozlabs.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=openbmc@lists.ozlabs.org \
--cc=vernon.mauery@linux.intel.com \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).