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 6554D3F8F4; Mon, 1 Apr 2024 16:07:30 +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=1711987650; cv=none; b=TW6kl04PskcXHEbwUpGp22x3UeSAUqeuYdxvhi2BzZ4tgEo9E7ZFtbd/R/ei0M017B7OG/YdJREJp6OKiRSTeHQm5MOMXcUG2HICwEEcjGwYJG9De7t3oAN547tJKiQ/mSTG7QimxM5ptMYuRoCzMjmiF8nEHPm5oQu9EntXgQA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711987650; c=relaxed/simple; bh=jwHgzki3euLYO6v0/Sm40/q0li6fXmYjytOa1OZvTGI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CNt8aU5OknqxvEBprJhpjGtmcHIRD1D8FgEnaSvkDiGo7jOrKSty9HOTK40mBohJ1yqxFSJqb33O+vT8UjFB24IWnU8Va/50kxwP6mNiABlimJCdtMpRhQSOtrRjWPCdtbcdGnSTbxz9n4zXb9O8/bGGsU56qDAfnOm2yQMyEqM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=JTPv9Oyg; 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="JTPv9Oyg" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DFCE9C433F1; Mon, 1 Apr 2024 16:07:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1711987650; bh=jwHgzki3euLYO6v0/Sm40/q0li6fXmYjytOa1OZvTGI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JTPv9OygQYiqpsFJWoYQc3DCIX/Ulki8YoaVzJVs7JeI+HcVuCEzkh19gA7b27sRe ma2FGbU5lkT+ADxlAvQARCop5dPWNBxF9f8GyeSgDWQ40kT3OBzlFOtK5g3zYAbYV/ fA5ZqdrwLkz3+cK2IPOfaJu0gSrjyUjhqZ6u3FFc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Nitin Rawat , Konrad Dybcio , Manivannan Sadhasivam , Dmitry Baryshkov , "Martin K. Petersen" Subject: [PATCH 6.8 350/399] scsi: ufs: qcom: Provide default cycles_in_1us value Date: Mon, 1 Apr 2024 17:45:16 +0200 Message-ID: <20240401152559.622057590@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240401152549.131030308@linuxfoundation.org> References: <20240401152549.131030308@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.8-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dmitry Baryshkov commit 81e2c1a0f8d3f62f4c9e80b20270aa3481c40524 upstream. The MSM8996 DT doesn't provide frequency limits for the core_clk_unipro clock, which results in miscalculation of the cycles_in_1us value. Provide the backwards-compatible default to support existing MSM8996 DT files. Fixes: b4e13e1ae95e ("scsi: ufs: qcom: Add multiple frequency support for MAX_CORE_CLK_1US_CYCLES") Cc: Nitin Rawat Cc: stable@vger.kernel.org # 6.7.x Reviewed-by: Konrad Dybcio Reviewed-by: Manivannan Sadhasivam Signed-off-by: Dmitry Baryshkov Link: https://lore.kernel.org/r/20240218-msm8996-fix-ufs-v3-1-40aab49899a3@linaro.org Signed-off-by: Martin K. Petersen Signed-off-by: Greg Kroah-Hartman --- drivers/ufs/host/ufs-qcom.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/drivers/ufs/host/ufs-qcom.c +++ b/drivers/ufs/host/ufs-qcom.c @@ -1196,8 +1196,10 @@ static int ufs_qcom_set_core_clk_ctrl(st list_for_each_entry(clki, head, list) { if (!IS_ERR_OR_NULL(clki->clk) && - !strcmp(clki->name, "core_clk_unipro")) { - if (is_scale_up) + !strcmp(clki->name, "core_clk_unipro")) { + if (!clki->max_freq) + cycles_in_1us = 150; /* default for backwards compatibility */ + else if (is_scale_up) cycles_in_1us = ceil(clki->max_freq, (1000 * 1000)); else cycles_in_1us = ceil(clk_get_rate(clki->clk), (1000 * 1000));