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 B489F168AD for ; Mon, 8 May 2023 10:29:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 36704C433EF; Mon, 8 May 2023 10:29:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1683541788; bh=azGbbQEulxIH67EX9WHACidebc1MNeevVtf+OG9YJdQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ICSXmNCNCa3sOqzVgdvSHuthZqsZ/wFklVEsoE7gnAvoiCnJUkX2SpzEd1GgX9Wv/ kHmPhGel/TZDOK4AAnU8O/x3/gqOb/sMChTVcJSOPWjG7Tqs5jr7DauAdYp/HuJjPR xzgJ/QOX3ab5qK+QKj8XSnbXzKo2IjIyOQtHFVAI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Tushar Nimkar , Bjorn Andersson , Sasha Levin Subject: [PATCH 6.2 226/663] soc: qcom: rpmh-rsc: Support RSC v3 minor versions Date: Mon, 8 May 2023 11:40:52 +0200 Message-Id: <20230508094435.646169162@linuxfoundation.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230508094428.384831245@linuxfoundation.org> References: <20230508094428.384831245@linuxfoundation.org> User-Agent: quilt/0.67 Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Tushar Nimkar [ Upstream commit 88704a0cd71909c3107561261412a5d5beb23358 ] RSC v3 register offsets are same for all minor versions of v3. Fix a minor version check to pick correct offsets for all v3 minor versions. Fixes: 40482e4f7364 ("soc: qcom: rpmh-rsc: Add support for RSC v3 register offsets") Signed-off-by: Tushar Nimkar Signed-off-by: Bjorn Andersson Link: https://lore.kernel.org/r/20230406115732.9293-1-quic_tnimkar@quicinc.com Signed-off-by: Sasha Levin --- drivers/soc/qcom/rpmh-rsc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/soc/qcom/rpmh-rsc.c b/drivers/soc/qcom/rpmh-rsc.c index 0f8b2249f8894..f93544f6d7961 100644 --- a/drivers/soc/qcom/rpmh-rsc.c +++ b/drivers/soc/qcom/rpmh-rsc.c @@ -1073,7 +1073,7 @@ static int rpmh_rsc_probe(struct platform_device *pdev) drv->ver.minor = rsc_id & (MINOR_VER_MASK << MINOR_VER_SHIFT); drv->ver.minor >>= MINOR_VER_SHIFT; - if (drv->ver.major == 3 && drv->ver.minor == 0) + if (drv->ver.major == 3 && drv->ver.minor >= 0) drv->regs = rpmh_rsc_reg_offset_ver_3_0; else drv->regs = rpmh_rsc_reg_offset_ver_2_7; -- 2.39.2