* [PATCH i2c-next v2 0/2] i2c: aspeed: Add bus idle waiting logic for multi-master use cases
@ 2018-09-24 23:04 Jae Hyun Yoo
2018-09-24 23:04 ` [PATCH i2c-next v2 1/2] dt-bindings: i2c: aspeed: Add 'idle-wait-timeout-ms' property Jae Hyun Yoo
2018-09-24 23:04 ` [PATCH i2c-next v2 2/2] i2c: aspeed: Add bus idle waiting logic for multi-master use cases Jae Hyun Yoo
0 siblings, 2 replies; 3+ messages in thread
From: Jae Hyun Yoo @ 2018-09-24 23:04 UTC (permalink / raw)
To: Brendan Higgins, Benjamin Herrenschmidt, Joel Stanley,
Rob Herring, Mark Rutland, Andrew Jeffery, linux-i2c, openbmc,
devicetree, linux-arm-kernel, linux-aspeed, linux-kernel
Cc: Jarkko Nikula, James Feist, Vernon Mauery, Jae Hyun Yoo
In multi-master environment, this driver's master cannot know
exactly when peer master sends data to this driver's slave so a
case can be happened that this master tries to send data through
the master_xfer function but slave data from peer master is still
being processed by this driver.
To prevent state corruption in the case, this patch adds checking
if any slave operation is ongoing and it waits up to the timeout
duration before starting a master_xfer operation.
Please review this patch set.
Thanks,
-Jae
Changes since v1:
- Changed define names of timeout related.
Jae Hyun Yoo (2):
dt-bindings: i2c: aspeed: Add 'idle-wait-timeout-ms' setting
i2c: aspeed: Add bus idle waiting logic for multi-master use cases
.../devicetree/bindings/i2c/i2c-aspeed.txt | 10 ++-
drivers/i2c/busses/i2c-aspeed.c | 70 +++++++++++++++----
2 files changed, 62 insertions(+), 18 deletions(-)
--
2.18.0
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH i2c-next v2 1/2] dt-bindings: i2c: aspeed: Add 'idle-wait-timeout-ms' property
2018-09-24 23:04 [PATCH i2c-next v2 0/2] i2c: aspeed: Add bus idle waiting logic for multi-master use cases Jae Hyun Yoo
@ 2018-09-24 23:04 ` Jae Hyun Yoo
2018-09-24 23:04 ` [PATCH i2c-next v2 2/2] i2c: aspeed: Add bus idle waiting logic for multi-master use cases Jae Hyun Yoo
1 sibling, 0 replies; 3+ messages in thread
From: Jae Hyun Yoo @ 2018-09-24 23:04 UTC (permalink / raw)
To: Brendan Higgins, Benjamin Herrenschmidt, Joel Stanley,
Rob Herring, Mark Rutland, Andrew Jeffery, linux-i2c, openbmc,
devicetree, linux-arm-kernel, linux-aspeed, linux-kernel
Cc: Jarkko Nikula, James Feist, Vernon Mauery, Jae Hyun Yoo
This commit adds 'idle-wait-timeout-ms' property which can be used
for bus idle waiting logic in multi-master environment.
Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com>
---
Documentation/devicetree/bindings/i2c/i2c-aspeed.txt | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/Documentation/devicetree/bindings/i2c/i2c-aspeed.txt b/Documentation/devicetree/bindings/i2c/i2c-aspeed.txt
index 8fbd8633a387..42ecaaf67172 100644
--- a/Documentation/devicetree/bindings/i2c/i2c-aspeed.txt
+++ b/Documentation/devicetree/bindings/i2c/i2c-aspeed.txt
@@ -13,9 +13,13 @@ Required Properties:
- interrupts : interrupt number
Optional Properties:
-- bus-frequency : frequency of the bus clock in Hz defaults to 100 kHz when not
- specified
-- multi-master : states that there is another master active on this bus.
+- bus-frequency : frequency of the bus clock in Hz defaults to 100 kHz
+ when not specified
+- multi-master : states that there is another master active on this
+ bus.
+- idle-wait-timeout-ms : bus idle waiting timeout in milliseconds when
+ multi-master is set, defaults to 100 ms when not
+ specified.
Example:
--
2.18.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH i2c-next v2 2/2] i2c: aspeed: Add bus idle waiting logic for multi-master use cases
2018-09-24 23:04 [PATCH i2c-next v2 0/2] i2c: aspeed: Add bus idle waiting logic for multi-master use cases Jae Hyun Yoo
2018-09-24 23:04 ` [PATCH i2c-next v2 1/2] dt-bindings: i2c: aspeed: Add 'idle-wait-timeout-ms' property Jae Hyun Yoo
@ 2018-09-24 23:04 ` Jae Hyun Yoo
1 sibling, 0 replies; 3+ messages in thread
From: Jae Hyun Yoo @ 2018-09-24 23:04 UTC (permalink / raw)
To: Brendan Higgins, Benjamin Herrenschmidt, Joel Stanley,
Rob Herring, Mark Rutland, Andrew Jeffery, linux-i2c, openbmc,
devicetree, linux-arm-kernel, linux-aspeed, linux-kernel
Cc: Jarkko Nikula, James Feist, Vernon Mauery, Jae Hyun Yoo
In multi-master environment, this driver's master cannot know
exactly when peer master sends data to this driver's slave so a
case can be happened that this master tries to send data through
the master_xfer function but slave data from peer master is still
being processed by this driver.
To prevent state corruption in the case, this patch adds checking
if any slave operation is ongoing and it waits up to the timeout
duration before starting a master_xfer operation.
Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com>
---
drivers/i2c/busses/i2c-aspeed.c | 70 ++++++++++++++++++++++++++-------
1 file changed, 55 insertions(+), 15 deletions(-)
diff --git a/drivers/i2c/busses/i2c-aspeed.c b/drivers/i2c/busses/i2c-aspeed.c
index 8dc9161ced38..acc26e2a8866 100644
--- a/drivers/i2c/busses/i2c-aspeed.c
+++ b/drivers/i2c/busses/i2c-aspeed.c
@@ -12,6 +12,7 @@
#include <linux/clk.h>
#include <linux/completion.h>
+#include <linux/delay.h>
#include <linux/err.h>
#include <linux/errno.h>
#include <linux/i2c.h>
@@ -99,6 +100,7 @@
ASPEED_I2CD_INTR_TX_ACK)
/* 0x14 : I2CD Command/Status Register */
+#define ASPEED_I2CD_XFER_MODE_STS_MASK GENMASK(22, 19)
#define ASPEED_I2CD_SCL_LINE_STS BIT(18)
#define ASPEED_I2CD_SDA_LINE_STS BIT(17)
#define ASPEED_I2CD_BUS_BUSY_STS BIT(16)
@@ -115,6 +117,10 @@
/* 0x18 : I2CD Slave Device Address Register */
#define ASPEED_I2CD_DEV_ADDR_MASK GENMASK(6, 0)
+/* Bus busy checking */
+#define ASPEED_I2C_IDLE_WAIT_TIMEOUT_MS_DEFAULT 100 /* 100 ms */
+#define ASPEED_I2C_BUS_BUSY_CHECK_INTERVAL_US 10000 /* 10 ms */
+
enum aspeed_i2c_master_state {
ASPEED_I2C_MASTER_INACTIVE,
ASPEED_I2C_MASTER_START,
@@ -156,6 +162,9 @@ struct aspeed_i2c_bus {
int cmd_err;
/* Protected only by i2c_lock_bus */
int master_xfer_result;
+ /* Multi-master */
+ bool multi_master;
+ u32 idle_wait_timeout_ms;
#if IS_ENABLED(CONFIG_I2C_SLAVE)
struct i2c_client *slave;
enum aspeed_i2c_slave_state slave_state;
@@ -596,27 +605,49 @@ static irqreturn_t aspeed_i2c_bus_irq(int irq, void *dev_id)
return irq_remaining ? IRQ_NONE : IRQ_HANDLED;
}
+static int aspeed_i2c_check_bus_busy(struct aspeed_i2c_bus *bus)
+{
+ u32 status_check_mask = ASPEED_I2CD_BUS_BUSY_STS;
+ ktime_t timeout;
+
+ if (bus->multi_master) {
+ might_sleep();
+ timeout = ktime_add_ms(ktime_get(), bus->idle_wait_timeout_ms);
+ /*
+ * ASPEED_I2CD_XFER_MODE_STS_MASK is marked as
+ * 'for debugging purpose only' in datasheet but ASPEED
+ * confirmed that this reflects real information and good to be
+ * used in practical code. It will be used only in multi-master
+ * use cases.
+ */
+ status_check_mask |= ASPEED_I2CD_XFER_MODE_STS_MASK;
+ }
+
+ for (;;) {
+ if (!(readl(bus->base + ASPEED_I2C_CMD_REG) &
+ status_check_mask))
+ return 0;
+ if (!bus->multi_master)
+ break;
+ if (ktime_compare(ktime_get(), timeout) > 0)
+ break;
+ usleep_range((ASPEED_I2C_BUS_BUSY_CHECK_INTERVAL_US >> 2) + 1,
+ ASPEED_I2C_BUS_BUSY_CHECK_INTERVAL_US);
+ }
+
+ return aspeed_i2c_recover_bus(bus);
+}
+
static int aspeed_i2c_master_xfer(struct i2c_adapter *adap,
struct i2c_msg *msgs, int num)
{
struct aspeed_i2c_bus *bus = i2c_get_adapdata(adap);
unsigned long time_left, flags;
- int ret = 0;
-
- spin_lock_irqsave(&bus->lock, flags);
- bus->cmd_err = 0;
- /* If bus is busy, attempt recovery. We assume a single master
- * environment.
- */
- if (readl(bus->base + ASPEED_I2C_CMD_REG) & ASPEED_I2CD_BUS_BUSY_STS) {
- spin_unlock_irqrestore(&bus->lock, flags);
- ret = aspeed_i2c_recover_bus(bus);
- if (ret)
- return ret;
- spin_lock_irqsave(&bus->lock, flags);
- }
+ if (aspeed_i2c_check_bus_busy(bus))
+ return -EAGAIN;
+ spin_lock_irqsave(&bus->lock, flags);
bus->cmd_err = 0;
bus->msgs = msgs;
bus->msgs_index = 0;
@@ -827,8 +858,17 @@ static int aspeed_i2c_init(struct aspeed_i2c_bus *bus,
if (ret < 0)
return ret;
- if (!of_property_read_bool(pdev->dev.of_node, "multi-master"))
+ if (of_property_read_bool(pdev->dev.of_node, "multi-master")) {
+ bus->multi_master = true;
+ ret = of_property_read_u32(pdev->dev.of_node,
+ "idle-wait-timeout-ms",
+ &bus->idle_wait_timeout_ms);
+ if (ret)
+ bus->idle_wait_timeout_ms =
+ ASPEED_I2C_IDLE_WAIT_TIMEOUT_MS_DEFAULT;
+ } else {
fun_ctrl_reg |= ASPEED_I2CD_MULTI_MASTER_DIS;
+ }
/* Enable Master Mode */
writel(readl(bus->base + ASPEED_I2C_FUN_CTRL_REG) | fun_ctrl_reg,
--
2.18.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-09-24 23:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-09-24 23:04 [PATCH i2c-next v2 0/2] i2c: aspeed: Add bus idle waiting logic for multi-master use cases Jae Hyun Yoo
2018-09-24 23:04 ` [PATCH i2c-next v2 1/2] dt-bindings: i2c: aspeed: Add 'idle-wait-timeout-ms' property Jae Hyun Yoo
2018-09-24 23:04 ` [PATCH i2c-next v2 2/2] i2c: aspeed: Add bus idle waiting logic for multi-master use cases Jae Hyun Yoo
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).