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 E3FBB335BDD; Mon, 18 Aug 2025 13:52:15 +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=1755525137; cv=none; b=mhkIfgcQ+uqA/zZ3FbzX3rQTHT+9NdBxIMUON21qJ/SF/xAbJXiXdddMRgJLginbX7SePHTfT6YJxLk3JbLhyKSqz7bZRb+/+au6LHYmR9NfiHPam7Lo2I+pgwSva0EmbrezOSi7sd2PwsWnqXX6KiW3VhBUDZWXuUmVKdU0Rn8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755525137; c=relaxed/simple; bh=mNmrYshrmP/MUXVLkA+VsDviXwAajcDfQu1euoxEpQI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dOvho9LrzbfmYfuyjxVixki8qkfaAB/Fv/LcNDQe+1gRZS04p/1I60JvqPNGIhFy1b1yF38xkyL9RSDLoPFkl1/2AV3CxS4d72artpKP0HkwdyT04raBJSG/jCtAiU8OWx6ktTmEbLFAG0/gWpe2bL+YsjwqoCd9Y0ldAKppsH0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=SnMPD5BB; 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="SnMPD5BB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1BD69C4CEEB; Mon, 18 Aug 2025 13:52:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1755525135; bh=mNmrYshrmP/MUXVLkA+VsDviXwAajcDfQu1euoxEpQI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SnMPD5BBvui1ZN3qbdhTDMsMbqUqzGU/WX/ZBWohURB+OGd5IQoUdvgtQZ3HSO1BU SMrTyhLy2UwiWF6oF3CrUDtAb6ry0Q9rmRtYEcnDsmheWhNILpvaMKFTWj/aiUffL4 vkQFqn3P8NqA/8sO/TnA8FIloccgC4vxdDHt1dPY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Maulik Shah , Konrad Dybcio , Neil Armstrong , Bjorn Andersson , Sasha Levin Subject: [PATCH 6.16 137/570] soc: qcom: rpmh-rsc: Add RSC version 4 support Date: Mon, 18 Aug 2025 14:42:04 +0200 Message-ID: <20250818124511.100546347@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250818124505.781598737@linuxfoundation.org> References: <20250818124505.781598737@linuxfoundation.org> User-Agent: quilt/0.68 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.16-stable review patch. If anyone has any objections, please let me know. ------------------ From: Maulik Shah [ Upstream commit 84684c57c9cd47b86c883a7170dd68222d97ef13 ] Register offsets for v3 and v4 versions are backward compatible. Assign v3 offsets for v4 and all higher versions to avoid end up using v2 offsets. Signed-off-by: Maulik Shah Reviewed-by: Konrad Dybcio Reviewed-by: Neil Armstrong Link: https://lore.kernel.org/r/20250623-rsc_v4-v1-1-275b27bc5e3c@oss.qualcomm.com Signed-off-by: Bjorn Andersson 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 cb82e887b51d..fdab2b1067db 100644 --- a/drivers/soc/qcom/rpmh-rsc.c +++ b/drivers/soc/qcom/rpmh-rsc.c @@ -1072,7 +1072,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) + if (drv->ver.major >= 3) drv->regs = rpmh_rsc_reg_offset_ver_3_0; else drv->regs = rpmh_rsc_reg_offset_ver_2_7; -- 2.39.5