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 79D3112B72; Tue, 16 Jul 2024 15:46:29 +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=1721144789; cv=none; b=ZMG9TvoZckkGiOhuLttYeLhXicuTBmwKA528gOYvBqTLUouov8H6UdRP1A+RLU/ay53I72pCBZruH574557MkchRpNXJrrTCfZuFD4KhoK5+bhXLKSkbezs7q/m5In/KRW0dFhuWZr5JY/zNs9qwOJD0T7K+evx39QYciHyyWdk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721144789; c=relaxed/simple; bh=XnNRtOfTHeMXLs9Btr9kDbNdULX2o1r7pBRqSitEeNo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bSifbTqtJOZYRd5G1eVc35bb4wz7q7ym1M0UIASBGHbVkxq+OLiIYneafgwZd7uh5o2eUccu5/eMXcEsLR7DlE9gmLnsi6npGuHzUi8IpPSTARngjawFNxbuCToFnOfNZZZrz8BChWHl7QJbgJ60ij8QZ5T5Xc+DPiTsVM90Wac= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Bz1cr27f; 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="Bz1cr27f" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EB218C116B1; Tue, 16 Jul 2024 15:46:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1721144789; bh=XnNRtOfTHeMXLs9Btr9kDbNdULX2o1r7pBRqSitEeNo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Bz1cr27fRckwIURTyT7mtEPToiXpK1smKzh6NbgpghxzidO/VZv6FeRNpw0HeHL/s G0O8gf4CijB3oz8X62hMJifZa9nrgYW9r1kVNV8ZadHsGaj+cAW2OrtEEzJ50yuWA3 vPdFA8EGpil5msyVqfu1xkzRTpQtC1GHh9sNlV+E= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Wolfram Sang , Andi Shyti , Sasha Levin Subject: [PATCH 5.10 107/108] i2c: rcar: clear NO_RXDMA flag after resetting Date: Tue, 16 Jul 2024 17:32:02 +0200 Message-ID: <20240716152750.106601433@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240716152745.988603303@linuxfoundation.org> References: <20240716152745.988603303@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.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Wolfram Sang [ Upstream commit fea6b5ebb71a2830b042e42de7ae255017ac3ce8 ] We should allow RXDMA only if the reset was really successful, so clear the flag after the reset call. Fixes: 0e864b552b23 ("i2c: rcar: reset controller is mandatory for Gen3+") Signed-off-by: Wolfram Sang Signed-off-by: Andi Shyti Signed-off-by: Sasha Levin --- drivers/i2c/busses/i2c-rcar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c index db3a5b80f1aa8..8a8c2403641b0 100644 --- a/drivers/i2c/busses/i2c-rcar.c +++ b/drivers/i2c/busses/i2c-rcar.c @@ -826,10 +826,10 @@ static int rcar_i2c_master_xfer(struct i2c_adapter *adap, /* Gen3+ needs a reset. That also allows RXDMA once */ if (priv->devtype >= I2C_RCAR_GEN3) { - priv->flags &= ~ID_P_NO_RXDMA; ret = rcar_i2c_do_reset(priv); if (ret) goto out; + priv->flags &= ~ID_P_NO_RXDMA; } rcar_i2c_init(priv); -- 2.43.0