Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Quan Nguyen <quan@os.amperecomputing.com>
To:     Quan Nguyen <quan@os.amperecomputing.com>,
        Corey Minyard <minyard@acm.org>,
        Rob Herring <robh+dt@kernel.org>,
        Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
        Brendan Higgins <brendanhiggins@google.com>,
        Benjamin Herrenschmidt <benh@kernel.crashing.org>,
        Joel Stanley <joel@jms.id.au>,
        Andrew Jeffery <andrew@aj.id.au>,
        Wolfram Sang <wsa@kernel.org>,
        openipmi-developer@lists.sourceforge.net,
        devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
        linux-i2c@vger.kernel.org, openbmc@lists.ozlabs.org,
        linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org
Cc:     Open Source Submission <patches@amperecomputing.com>,
        Phong Vo <phong@os.amperecomputing.com>,
        "Thang Q . Nguyen" <thang@os.amperecomputing.com>
Subject: [PATCH v8 3/3] i2c: aspeed: Assert NAK when slave is busy
Date:   Wed, 15 Jun 2022 16:02:59 +0700
Message-Id: <20220615090259.1121405-4-quan@os.amperecomputing.com>
In-Reply-To: <20220615090259.1121405-1-quan@os.amperecomputing.com>
References: <20220615090259.1121405-1-quan@os.amperecomputing.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Zcci+qM+7J2sVgi3h54Oih7Oq+rN5lVdzvUOr/kyWCarCse62Di1djmOM1iC?=
 =?us-ascii?Q?ifaNrX9uPR6iMIF9/MAMEC57BOEK6towWofbJ5cBDRmnis9etiUxyyiVumET?=
 =?us-ascii?Q?LzbB6wbSY0mexH7fS9dMd9wHR8rXCXBE0z1TtzJdVulus7v/upEshzJrqTCO?=
 =?us-ascii?Q?4cy7NlcqZI6CUnLNJ8yn6I59Ul9NHr8Z/d6MOhNph/g6T4G4UZfRYTcwFYep?=
 =?us-ascii?Q?0QaXhU8oafmlE4V3EUx0b2chSEbDmZUSVyGHURyZCfE9Alne+tv6E+cx42z2?=
 =?us-ascii?Q?qImWqlopt1XNcvM1zPOzKkRQslf8+AQnMmX0RbjR6Y5MFxqY/cnbPaL9DpcC?=
 =?us-ascii?Q?L6QYWuzbr9BvDtlQvp13P//tZ6dE9/UjVJnteHI6Kh5Ud8z73vhQXFqDxyBg?=
 =?us-ascii?Q?Ssu2b6PxvTji083cVrklqcQFUWDFQSBA5EeGMt2CA4BmaiyZ7QgqR7gBca8R?=
 =?us-ascii?Q?qHRliE0qh5ItkI4PPkydcfp6r5IBj26wJwW57qQ2ZKsUY5qfqEpDCsZIBaJu?=
 =?us-ascii?Q?0lI5rM+jKs/oWri81S3eKwva7qQBh0LxIq3ROoWHOGqSv+nvaUgkxg/Ti+fO?=
 =?us-ascii?Q?yGdixSR2653HoC2GGd58vZdnL2xxY+5xBjlRDPmgfOqigw0idwsGp6JqIgdZ?=
 =?us-ascii?Q?K75ftgxnookqTCPsOIvH2EwAQBOPlqvMYoME+R5+3zeEnEJO8/zV7r/CSvVp?=
 =?us-ascii?Q?/kZk6Kml5vNOhYoczOuJ1osv3iAc4RF7vpaejUzlt4DZ9ON07jQbjF+KXlPe?=
 =?us-ascii?Q?HIBHIFaPFiM9F4v+od6EtbfRsJIs5YS0k3+dERVz46MtdOZjV4VsUfkXREnN?=
 =?us-ascii?Q?RLtWv+LZZOFckf9atTNEhTD3Oy9iLcWgWnJx+qq6I/fciGEd3Ko1tbKoQo6S?=
 =?us-ascii?Q?YwKPyZlUXQf/2AW+Fhr/MXnIzA+wBuO+XqwWwSAyTWEwsUqcZHqlKdivTxMU?=
 =?us-ascii?Q?HVWqs3CumbUMyTF6+i54k2BssqeRcasUMI2PcnkqhxCUyxWHNSxm+SUEQIsC?=
 =?us-ascii?Q?PjubgL7PsjhjA39SIv5ClFa0qVHkiKvbCz7ihmDNi7vWjqtmAAe97CUIie5w?=
 =?us-ascii?Q?hMj92KrL2/UlsT93aGjtY3WQRdpyJ/LpJFSnI1T4Asay1Gly1jqbNuMPwxEU?=
 =?us-ascii?Q?JikipQqtcdCunm3QhSxJbJo6b/hVPXQ/G63jRDjgppYDEKqH8GUcPPiWkeSR?=
 =?us-ascii?Q?AmP+NOtyV4lfDZYaoTEeC2fbAqdIkmWHMqYnPAM3S9OirZSrbivmiHpOanbT?=
 =?us-ascii?Q?3OGNbF1F1uEg72coxRuGl98yN6N+1t1VVAtEM7YG+W+d2TMgIOLzAoWnw5C6?=
 =?us-ascii?Q?NlcOrbU94khQSKnw7pUXdcZjGFZWvhb7ENbeex99C0YIurZmtf41IeREC4gA?=
 =?us-ascii?Q?eyIfLXpH1Eu7FV/UM3LJssWxa9a2yXKI4BtSVJsCiXJuf9WztcL/ZNGcm7PI?=
 =?us-ascii?Q?FhczAa6PnC50blJ6EgMfqqa0I20PxnnbgkY6zik6lLFqe+euwz+ZSySO3+oY?=
 =?us-ascii?Q?YnrwSGoKPoDwPGMg8vbKbXze5dBtdXCIRfwxz0/W2XM+aTjqfsGwLadFZHTu?=
 =?us-ascii?Q?osz7zCmn8Mja2nDii5RZap/1aiR/DndGAeJpn5StyI+n477BLiXJvCwS0LGN?=
 =?us-ascii?Q?GoN9hJbDF8wtqF3VetwObQUZJTEdBwbC2MRwDlslfQjWy21dgR+1eqTaQGY7?=
 =?us-ascii?Q?Ztky2l0HDe3JkNfPABaZqBNoXG7pQ6yd/mvgy0Mf0G0B8LUPwEi97J5ep4W0?=
 =?us-ascii?Q?OI7hGAqYKzoC+ceN5lDRrCfVmMLwrgJjJCSZcwvlsJleN7HW7ZEa?=
X-OriginatorOrg: os.amperecomputing.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ba968699-d8d6-4ff9-4d5c-08da4eadf120
X-MS-Exchange-CrossTenant-AuthSource: SJ0PR01MB7282.prod.exchangelabs.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2022 09:03:42.0110
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3bc2b170-fd94-476d-b0ce-4229bdc904a7
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: +4LE9NuCeXTGzIR8NWYgChCT08uhXibQpey3CXP7Rdo/+Ra1PGN8vhNraZZiRstATqkvM4WfrjRnbnvxERQfTuwpw692UfJdazTaetsv2MU=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR01MB6049
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,
        SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

When processing I2C_SLAVE_WRITE_REQUESTED event, if slave returns
-EBUSY, i2c controller should issue RxCmdLast command to assert NAK
on the bus.

Signed-off-by: Quan Nguyen <quan@os.amperecomputing.com>
---
v7 -> v8:
  + None

v6:
  + New introduced in v6                      [Quan]

 drivers/i2c/busses/i2c-aspeed.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/i2c/busses/i2c-aspeed.c b/drivers/i2c/busses/i2c-aspeed.c
index 771e53d3d197..ebc2b92656c8 100644
--- a/drivers/i2c/busses/i2c-aspeed.c
+++ b/drivers/i2c/busses/i2c-aspeed.c
@@ -244,6 +244,7 @@ static u32 aspeed_i2c_slave_irq(struct aspeed_i2c_bus *bus, u32 irq_status)
 	u32 command, irq_handled = 0;
 	struct i2c_client *slave = bus->slave;
 	u8 value;
+	int ret;
 
 	if (!slave)
 		return 0;
@@ -311,7 +312,9 @@ static u32 aspeed_i2c_slave_irq(struct aspeed_i2c_bus *bus, u32 irq_status)
 		break;
 	case ASPEED_I2C_SLAVE_WRITE_REQUESTED:
 		bus->slave_state = ASPEED_I2C_SLAVE_WRITE_RECEIVED;
-		i2c_slave_event(slave, I2C_SLAVE_WRITE_REQUESTED, &value);
+		ret = i2c_slave_event(slave, I2C_SLAVE_WRITE_REQUESTED, &value);
+		if (ret == -EBUSY)
+			writel(ASPEED_I2CD_M_S_RX_CMD_LAST, bus->base + ASPEED_I2C_CMD_REG);
 		break;
 	case ASPEED_I2C_SLAVE_WRITE_RECEIVED:
 		i2c_slave_event(slave, I2C_SLAVE_WRITE_RECEIVED, &value);
-- 
2.35.1