From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 2C7563FB05A; Wed, 20 May 2026 18:11:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779300676; cv=none; b=lzviKXwJTFKjdEGKjfGZc6gCXBQhpQY8ojpERqubxIX58SNWciLg4IZb3abipu1Po71829/F6tw2Q/Ecj6lRTaUR0UeQmo6hujt2mAlAol+R/z24+/9TTbTZ9VmcCOwjBETEUx55D5A3QPh9FeDYgOBlbUzyEI5Sm2SXj19VwL0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779300676; c=relaxed/simple; bh=T9oCTFebI3AtMIdoaVVRHnMwCskgszOmZtNzs8beuFM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BAETb2sNjkw51HTxib3QaHU2NHziI/0+u8jo/hMkrrriX4GoHBq8itWe8cJd9VZxZ5zmmmK7BdxXTia3icWi/eQwEw3Fy8regnviW0opxW3ByusZIcZVN66pOWfwkPjDkmAw83KbJLbzx/Zv2OtdJw5KgO//tFFCNmjyGJvaas8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Jl8a9lys; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Jl8a9lys" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8FDB51F00898; Wed, 20 May 2026 18:11:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1779300675; bh=zGyOBfn4bZCEwt3KZlwG7jwJO+RBmI9yAkKO+ownHDo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Jl8a9lyswoUYl86nXsX97ikaNl9gJPDkIO81dl9JE7gWvAlKquKYY7KHEQnwlwsGu H3M4OkwJw7l0am1JoIxnhWjzAZ9vuw8B24yLOQEqgWo8WeNY811AnNboKhQv3iPF+B WfHaISoEytBOm15ZkD/sjcacYE2iRTYqXdwaK7U4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Mikko Perttunen , Krzysztof Kozlowski , Sasha Levin Subject: [PATCH 6.12 266/666] memory: tegra30-emc: Fix dll_change check Date: Wed, 20 May 2026 18:17:57 +0200 Message-ID: <20260520162116.980883937@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260520162111.222830634@linuxfoundation.org> References: <20260520162111.222830634@linuxfoundation.org> User-Agent: quilt/0.69 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 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mikko Perttunen [ Upstream commit 0a93f2355cf4922ad2399dbef5ea1049fef116d4 ] The code checking whether the specified memory timing enables DLL in the EMRS register was reversed. DLL is enabled if bit A0 is low. Fix the check. Fixes: e34212c75a68 ("memory: tegra: Introduce Tegra30 EMC driver") Signed-off-by: Mikko Perttunen Link: https://patch.msgid.link/20260126-fix-emc-dllchange-v1-2-47ad3bb63262@nvidia.com Signed-off-by: Krzysztof Kozlowski Signed-off-by: Sasha Levin --- drivers/memory/tegra/tegra30-emc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/memory/tegra/tegra30-emc.c b/drivers/memory/tegra/tegra30-emc.c index 921dce1b8bc63..4981b7fa0f780 100644 --- a/drivers/memory/tegra/tegra30-emc.c +++ b/drivers/memory/tegra/tegra30-emc.c @@ -554,14 +554,14 @@ static int emc_prepare_timing_change(struct tegra_emc *emc, unsigned long rate) emc->emc_cfg = readl_relaxed(emc->regs + EMC_CFG); emc_dbg = readl_relaxed(emc->regs + EMC_DBG); - if (emc->dll_on == !!(timing->emc_mode_1 & 0x1)) + if (emc->dll_on == !(timing->emc_mode_1 & 0x1)) dll_change = DLL_CHANGE_NONE; - else if (timing->emc_mode_1 & 0x1) + else if (!(timing->emc_mode_1 & 0x1)) dll_change = DLL_CHANGE_ON; else dll_change = DLL_CHANGE_OFF; - emc->dll_on = !!(timing->emc_mode_1 & 0x1); + emc->dll_on = !(timing->emc_mode_1 & 0x1); if (timing->data[80] && !readl_relaxed(emc->regs + EMC_ZCAL_INTERVAL)) emc->zcal_long = true; -- 2.53.0