diff for duplicates of <63e99afc-17b4-e63d-f00a-d8fd29b8e735@linux.intel.com>

diff --git a/a/1.txt b/N1/1.txt
index ba08601..e5f77db 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -12,39 +12,39 @@ On 10/8/2019 4:15 PM, Tao Ren wrote:
 >>>>
 >>>> Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com>
 >>>> ---
->>>>  ? drivers/i2c/busses/i2c-aspeed.c | 9 +++++----
->>>>  ? 1 file changed, 5 insertions(+), 4 deletions(-)
+>>>>    drivers/i2c/busses/i2c-aspeed.c | 9 +++++----
+>>>>    1 file changed, 5 insertions(+), 4 deletions(-)
 >>>>
 >>>> diff --git a/drivers/i2c/busses/i2c-aspeed.c b/drivers/i2c/busses/i2c-aspeed.c
 >>>> index fa66951b05d0..40f6cf98d32e 100644
 >>>> --- a/drivers/i2c/busses/i2c-aspeed.c
 >>>> +++ b/drivers/i2c/busses/i2c-aspeed.c
 >>>> @@ -336,18 +336,19 @@ static void aspeed_i2c_do_start(struct aspeed_i2c_bus *bus)
->>>>  ????? struct i2c_msg *msg = &bus->msgs[bus->msgs_index];
->>>>  ????? u8 slave_addr = i2c_8bit_addr_from_msg(msg);
->>>>  ? -??? bus->master_state = ASPEED_I2C_MASTER_START;
+>>>>        struct i2c_msg *msg = &bus->msgs[bus->msgs_index];
+>>>>        u8 slave_addr = i2c_8bit_addr_from_msg(msg);
+>>>>    -    bus->master_state = ASPEED_I2C_MASTER_START;
 >>>> -
->>>>  ? #if IS_ENABLED(CONFIG_I2C_SLAVE)
->>>>  ????? /*
->>>>  ?????? * If it's requested in the middle of a slave session, set the master
->>>>  ?????? * state to 'pending' then H/W will continue handling this master
->>>>  ?????? * command when the bus comes back to the idle state.
->>>>  ?????? */
->>>> -??? if (bus->slave_state != ASPEED_I2C_SLAVE_INACTIVE)
->>>> +??? if (bus->slave_state != ASPEED_I2C_SLAVE_INACTIVE) {
->>>>  ????????? bus->master_state = ASPEED_I2C_MASTER_PENDING;
->>>> +??????? return;
->>>> +??? }
->>>>  ? #endif /* CONFIG_I2C_SLAVE */
->>>>  ? +??? bus->master_state = ASPEED_I2C_MASTER_START;
->>>>  ????? bus->buf_index = 0;
->>>>  ? ????? if (msg->flags & I2C_M_RD) {
+>>>>    #if IS_ENABLED(CONFIG_I2C_SLAVE)
+>>>>        /*
+>>>>         * If it's requested in the middle of a slave session, set the master
+>>>>         * state to 'pending' then H/W will continue handling this master
+>>>>         * command when the bus comes back to the idle state.
+>>>>         */
+>>>> -    if (bus->slave_state != ASPEED_I2C_SLAVE_INACTIVE)
+>>>> +    if (bus->slave_state != ASPEED_I2C_SLAVE_INACTIVE) {
+>>>>            bus->master_state = ASPEED_I2C_MASTER_PENDING;
+>>>> +        return;
+>>>> +    }
+>>>>    #endif /* CONFIG_I2C_SLAVE */
+>>>>    +    bus->master_state = ASPEED_I2C_MASTER_START;
+>>>>        bus->buf_index = 0;
+>>>>          if (msg->flags & I2C_M_RD) {
 >>>> @@ -432,7 +433,7 @@ static u32 aspeed_i2c_master_irq(struct aspeed_i2c_bus *bus, u32 irq_status)
->>>>  ????????? if (bus->slave_state != ASPEED_I2C_SLAVE_INACTIVE)
->>>>  ????????????? goto out_no_complete;
->>>>  ? -??????? bus->master_state = ASPEED_I2C_MASTER_START;
->>>> +??????? aspeed_i2c_do_start(bus);
->>>>  ????? }
+>>>>            if (bus->slave_state != ASPEED_I2C_SLAVE_INACTIVE)
+>>>>                goto out_no_complete;
+>>>>    -        bus->master_state = ASPEED_I2C_MASTER_START;
+>>>> +        aspeed_i2c_do_start(bus);
+>>>>        }
 >>>
 >>> Shall we move the restart-master logic from master_irq to bus_irq? The reason being:
 >>> master transaction cannot be restarted when aspeed-i2c is running in slave state and
@@ -65,3 +65,8 @@ Will fix the issue in the next round.
 Thanks,
 
 Jae
+
+_______________________________________________
+linux-arm-kernel mailing list
+linux-arm-kernel@lists.infradead.org
+http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff --git a/a/content_digest b/N1/content_digest
index ffef370..0d02024 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -4,9 +4,20 @@
  "ref\06f280195-eef7-1fe7-ac42-ad6879ca9838@linux.intel.com\0"
  "ref\0bba604eb-4cca-257e-01d7-b2d9471e6455@fb.com\0"
  "From\0Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com>\0"
- "Subject\0[PATCH 3/5] i2c: aspeed: fix master pending state handling\0"
+ "Subject\0Re: [PATCH 3/5] i2c: aspeed: fix master pending state handling\0"
  "Date\0Tue, 8 Oct 2019 16:28:30 -0700\0"
- "To\0linux-aspeed@lists.ozlabs.org\0"
+ "To\0Tao Ren <taoren@fb.com>"
+  Brendan Higgins <brendanhiggins@google.com>
+  Benjamin Herrenschmidt <benh@kernel.crashing.org>
+  Joel Stanley <joel@jms.id.au>
+  Rob Herring <robh+dt@kernel.org>
+  Mark Rutland <mark.rutland@arm.com>
+ " Andrew Jeffery <andrew@aj.id.au>\0"
+ "Cc\0devicetree@vger.kernel.org <devicetree@vger.kernel.org>"
+  linux-aspeed@lists.ozlabs.org <linux-aspeed@lists.ozlabs.org>
+  linux-i2c@vger.kernel.org <linux-i2c@vger.kernel.org>
+  linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>
+ " openbmc@lists.ozlabs.org <openbmc@lists.ozlabs.org>\0"
  "\00:1\0"
  "b\0"
  "On 10/8/2019 4:15 PM, Tao Ren wrote:\n"
@@ -23,39 +34,39 @@
  ">>>>\n"
  ">>>> Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com>\n"
  ">>>> ---\n"
- ">>>>  ? drivers/i2c/busses/i2c-aspeed.c | 9 +++++----\n"
- ">>>>  ? 1 file changed, 5 insertions(+), 4 deletions(-)\n"
+ ">>>>  \302\240 drivers/i2c/busses/i2c-aspeed.c | 9 +++++----\n"
+ ">>>>  \302\240 1 file changed, 5 insertions(+), 4 deletions(-)\n"
  ">>>>\n"
  ">>>> diff --git a/drivers/i2c/busses/i2c-aspeed.c b/drivers/i2c/busses/i2c-aspeed.c\n"
  ">>>> index fa66951b05d0..40f6cf98d32e 100644\n"
  ">>>> --- a/drivers/i2c/busses/i2c-aspeed.c\n"
  ">>>> +++ b/drivers/i2c/busses/i2c-aspeed.c\n"
  ">>>> @@ -336,18 +336,19 @@ static void aspeed_i2c_do_start(struct aspeed_i2c_bus *bus)\n"
- ">>>>  ????? struct i2c_msg *msg = &bus->msgs[bus->msgs_index];\n"
- ">>>>  ????? u8 slave_addr = i2c_8bit_addr_from_msg(msg);\n"
- ">>>>  ? -??? bus->master_state = ASPEED_I2C_MASTER_START;\n"
+ ">>>>  \302\240\302\240\302\240\302\240\302\240 struct i2c_msg *msg = &bus->msgs[bus->msgs_index];\n"
+ ">>>>  \302\240\302\240\302\240\302\240\302\240 u8 slave_addr = i2c_8bit_addr_from_msg(msg);\n"
+ ">>>>  \302\240 -\302\240\302\240\302\240 bus->master_state = ASPEED_I2C_MASTER_START;\n"
  ">>>> -\n"
- ">>>>  ? #if IS_ENABLED(CONFIG_I2C_SLAVE)\n"
- ">>>>  ????? /*\n"
- ">>>>  ?????? * If it's requested in the middle of a slave session, set the master\n"
- ">>>>  ?????? * state to 'pending' then H/W will continue handling this master\n"
- ">>>>  ?????? * command when the bus comes back to the idle state.\n"
- ">>>>  ?????? */\n"
- ">>>> -??? if (bus->slave_state != ASPEED_I2C_SLAVE_INACTIVE)\n"
- ">>>> +??? if (bus->slave_state != ASPEED_I2C_SLAVE_INACTIVE) {\n"
- ">>>>  ????????? bus->master_state = ASPEED_I2C_MASTER_PENDING;\n"
- ">>>> +??????? return;\n"
- ">>>> +??? }\n"
- ">>>>  ? #endif /* CONFIG_I2C_SLAVE */\n"
- ">>>>  ? +??? bus->master_state = ASPEED_I2C_MASTER_START;\n"
- ">>>>  ????? bus->buf_index = 0;\n"
- ">>>>  ? ????? if (msg->flags & I2C_M_RD) {\n"
+ ">>>>  \302\240 #if IS_ENABLED(CONFIG_I2C_SLAVE)\n"
+ ">>>>  \302\240\302\240\302\240\302\240\302\240 /*\n"
+ ">>>>  \302\240\302\240\302\240\302\240\302\240\302\240 * If it's requested in the middle of a slave session, set the master\n"
+ ">>>>  \302\240\302\240\302\240\302\240\302\240\302\240 * state to 'pending' then H/W will continue handling this master\n"
+ ">>>>  \302\240\302\240\302\240\302\240\302\240\302\240 * command when the bus comes back to the idle state.\n"
+ ">>>>  \302\240\302\240\302\240\302\240\302\240\302\240 */\n"
+ ">>>> -\302\240\302\240\302\240 if (bus->slave_state != ASPEED_I2C_SLAVE_INACTIVE)\n"
+ ">>>> +\302\240\302\240\302\240 if (bus->slave_state != ASPEED_I2C_SLAVE_INACTIVE) {\n"
+ ">>>>  \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 bus->master_state = ASPEED_I2C_MASTER_PENDING;\n"
+ ">>>> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240 return;\n"
+ ">>>> +\302\240\302\240\302\240 }\n"
+ ">>>>  \302\240 #endif /* CONFIG_I2C_SLAVE */\n"
+ ">>>>  \302\240 +\302\240\302\240\302\240 bus->master_state = ASPEED_I2C_MASTER_START;\n"
+ ">>>>  \302\240\302\240\302\240\302\240\302\240 bus->buf_index = 0;\n"
+ ">>>>  \302\240 \302\240\302\240\302\240\302\240\302\240 if (msg->flags & I2C_M_RD) {\n"
  ">>>> @@ -432,7 +433,7 @@ static u32 aspeed_i2c_master_irq(struct aspeed_i2c_bus *bus, u32 irq_status)\n"
- ">>>>  ????????? if (bus->slave_state != ASPEED_I2C_SLAVE_INACTIVE)\n"
- ">>>>  ????????????? goto out_no_complete;\n"
- ">>>>  ? -??????? bus->master_state = ASPEED_I2C_MASTER_START;\n"
- ">>>> +??????? aspeed_i2c_do_start(bus);\n"
- ">>>>  ????? }\n"
+ ">>>>  \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 if (bus->slave_state != ASPEED_I2C_SLAVE_INACTIVE)\n"
+ ">>>>  \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 goto out_no_complete;\n"
+ ">>>>  \302\240 -\302\240\302\240\302\240\302\240\302\240\302\240\302\240 bus->master_state = ASPEED_I2C_MASTER_START;\n"
+ ">>>> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240 aspeed_i2c_do_start(bus);\n"
+ ">>>>  \302\240\302\240\302\240\302\240\302\240 }\n"
  ">>>\n"
  ">>> Shall we move the restart-master logic from master_irq to bus_irq? The reason being:\n"
  ">>> master transaction cannot be restarted when aspeed-i2c is running in slave state and\n"
@@ -75,6 +86,11 @@
  "\n"
  "Thanks,\n"
  "\n"
- Jae
+ "Jae\n"
+ "\n"
+ "_______________________________________________\n"
+ "linux-arm-kernel mailing list\n"
+ "linux-arm-kernel@lists.infradead.org\n"
+ http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
 
-53103285b29ec0debd09ec7cf9ab9a5541cf52c5f9c6a16a2f9cee70b807a9d7
+8c88b923cb3a2166ee76018c085cd117baa4b073559659ca5cb480389314f34f
