From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9F2F61D4154; Tue, 15 Oct 2024 11:54:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728993294; cv=none; b=r916InTVu3HMjOLUfKUv8LISNM0yQtPrh/oQcll4p738vHAYz0BFsiSLk0i4bUiVyPETKiyzx0h3M+HYuxEyWDXdDGJh2u4Eu7Ef3i5q7+INuBJHraBdLY1grqNjKqTysS6nqmQy9HbMvH++6VIJugMpceEMDPGc3em9Nfy6anI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728993294; c=relaxed/simple; bh=Stg2hl1mO4OiL6y/SUbSIbCLg8Z6clGbVUmmsQV4A+Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CFibTIhzA+D0mLcgk4FN6uidSKMf0ZLlRP00b/8n6azZSSeFWx0Uzu/Q/TOoIvlzGmKCsjqx1GNCBl963pp049KvwwAPRkMMdODd2s2hoGoCDBxBLrdd4ytzRXvoN/BTJ1ng9UTObRoClZUiVr5cwYlplK2NAXmI+0I8CLJzTOY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=O5kl0D+p; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="O5kl0D+p" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BF802C4CEC6; Tue, 15 Oct 2024 11:54:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1728993294; bh=Stg2hl1mO4OiL6y/SUbSIbCLg8Z6clGbVUmmsQV4A+Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O5kl0D+pmxMIxuJK+waCfS8NSU87tSacxxv4q2tSOmN5POWZg45hkCjK5jmnfOeFt 0Ycsv4Z2NfRMKAPv4VnzWqxmro0aUHM8U8g62vQAJpzpAzQLO942gmRbWG2BPenGbI 5ttwW0aTd6gWha0aycfXYECjoFqJv0HeKFlvtLX8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Tommy Huang , Andi Shyti Subject: [PATCH 5.15 368/691] i2c: aspeed: Update the stop sw state when the bus recovery occurs Date: Tue, 15 Oct 2024 13:25:16 +0200 Message-ID: <20241015112454.951889811@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241015112440.309539031@linuxfoundation.org> References: <20241015112440.309539031@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Tommy Huang commit 93701d3b84ac5f3ea07259d4ced405c53d757985 upstream. When the i2c bus recovery occurs, driver will send i2c stop command in the scl low condition. In this case the sw state will still keep original situation. Under multi-master usage, i2c bus recovery will be called when i2c transfer timeout occurs. Update the stop command calling with aspeed_i2c_do_stop function to update master_state. Fixes: f327c686d3ba ("i2c: aspeed: added driver for Aspeed I2C") Cc: stable@vger.kernel.org # v4.13+ Signed-off-by: Tommy Huang Signed-off-by: Andi Shyti Signed-off-by: Greg Kroah-Hartman --- drivers/i2c/busses/i2c-aspeed.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) --- a/drivers/i2c/busses/i2c-aspeed.c +++ b/drivers/i2c/busses/i2c-aspeed.c @@ -172,6 +172,13 @@ struct aspeed_i2c_bus { static int aspeed_i2c_reset(struct aspeed_i2c_bus *bus); +/* precondition: bus.lock has been acquired. */ +static void aspeed_i2c_do_stop(struct aspeed_i2c_bus *bus) +{ + bus->master_state = ASPEED_I2C_MASTER_STOP; + writel(ASPEED_I2CD_M_STOP_CMD, bus->base + ASPEED_I2C_CMD_REG); +} + static int aspeed_i2c_recover_bus(struct aspeed_i2c_bus *bus) { unsigned long time_left, flags; @@ -189,7 +196,7 @@ static int aspeed_i2c_recover_bus(struct command); reinit_completion(&bus->cmd_complete); - writel(ASPEED_I2CD_M_STOP_CMD, bus->base + ASPEED_I2C_CMD_REG); + aspeed_i2c_do_stop(bus); spin_unlock_irqrestore(&bus->lock, flags); time_left = wait_for_completion_timeout( @@ -386,13 +393,6 @@ static void aspeed_i2c_do_start(struct a } /* precondition: bus.lock has been acquired. */ -static void aspeed_i2c_do_stop(struct aspeed_i2c_bus *bus) -{ - bus->master_state = ASPEED_I2C_MASTER_STOP; - writel(ASPEED_I2CD_M_STOP_CMD, bus->base + ASPEED_I2C_CMD_REG); -} - -/* precondition: bus.lock has been acquired. */ static void aspeed_i2c_next_msg_or_stop(struct aspeed_i2c_bus *bus) { if (bus->msgs_index + 1 < bus->msgs_count) {