From nobody Wed Apr 8 02:51:49 2026 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (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 5200C37CD5C for ; Wed, 11 Mar 2026 03:24:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773199466; cv=none; b=M3FM+ATWPLBMSEuhsRmhSOuM+LFTeJLZsq4ap+Z+x3P3lAWGlDRIi/6l4r/ueS4m99k8HVhfLGPRAvdspOpDlQ31s48+S8PxbiGDhQOKLLkda6G1/g2XdfKwYlMqC4qK38OwgwiswKW6nc6U9kipD8ZFOIKcQoaHxOD1+mlNW7o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773199466; c=relaxed/simple; bh=rZmnsFdkocnUxt7VbPT73DnNFvP09IpO1PBS81ZmI4A=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=VEgdDNDsNkeqZYPMrcKNnH96GYV4zTE6yMDrx4j1IB4jGKibgnngkaCzP8IiEsbkV1PFV8W6FzAbJZ/ALT+SKV74ls02bcAYgW70Zsg3N765Nfxf5NnZ8gC1hzZxiwOzBptlVw59czVykxlVE4yAbmHnI5Mpd7j+xdRY77o2c1I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=b9sg6/ej; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=HOBQajYt; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="b9sg6/ej"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="HOBQajYt" Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62B0gJt21265992 for ; Wed, 11 Mar 2026 03:24:21 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= qxOVi+p8tkfxl+UNAqXIN85eEkQSmSuaIBeAod9N/YM=; b=b9sg6/ejnYGlWitk ob0Q/k2XhaTUdTTvxmMnnq7enUKbS9zQbfYg2DQca01QrHbWuO7r/nGHq/yRKTiC eQxw/9r573yqZQ08dCxjH7ietigafP8tak7fb2APGzPgq4RCwf2a3l8mUYdtQwYi O4ek7xys+tLbPHuuyaWyDxEBGOiuBR4gbAfzsXq+kew/5JK9i0a99c4b9lQL8Ezp VubrtkE1oZyhnw/q6SOsAdIbzP5GNRVpcY2BqFG/kXUhzIKCtDkStsJqaNglCA1/ 0kLY/j1PS450W8EA4WzFajur/M3b7yFDbjjQhqb12IcFjqFEsY8xNhPy27btu3O1 NJCVxQ== Received: from mail-vs1-f70.google.com (mail-vs1-f70.google.com [209.85.217.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ctpkfj3w0-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 11 Mar 2026 03:24:21 +0000 (GMT) Received: by mail-vs1-f70.google.com with SMTP id ada2fe7eead31-5ffb295babbso8848500137.1 for ; Tue, 10 Mar 2026 20:24:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773199460; x=1773804260; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=qxOVi+p8tkfxl+UNAqXIN85eEkQSmSuaIBeAod9N/YM=; b=HOBQajYtE6mrqXp3/fabGEDrwWkvlhPp6AWGKijPzV6XYkKBiSInogk2APl00nzAbJ Q8sbJOttZE2C20k3hHMkkDcCOTmEpEslVL89BbFXuwawPnUuwmnFeJVKvIub42yN8+Yb XZ3AmT3/9KpFR3aRQFl6sAiJpmkWFcKp266evHskMPTE+vbHJuiHogguByibiRtNoDxX r7ruxvi0/fT/ddGoLdb1hPQipYdveTTAh9jISvNWg8aAcC+d3cAceeLOj5nZjGH1OCee rhiheXe/eWcoLXGkzT1XkuwC/Jx1O2Luvp5fT0STNFcmXfxB8blIeLAP1kjKoOu85TFK s/RQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773199460; x=1773804260; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=qxOVi+p8tkfxl+UNAqXIN85eEkQSmSuaIBeAod9N/YM=; b=oP+/b2EBLSJIxVuAl8LQb49ENCa7mI3HVS+xHr/HWPx/fDNgoSNQo4gljymKCPB+XN +5+jofHWD8qAw5Uhs8nOpo7C4ZRDxiOkbyIli2TAEtE4Hk1FUbzY7cZ2DwZ50iKovE/5 pvE0bDQDMu3g55fW1TV7pPvruYFqGr/pRXQDIaxTiY0lxMzEBwn+7eQDtS49Ek6P6HnO voUYJ9wsGsa+HFp9B4GRhB99ctFBSanwNSZnR1CtJpA4MHKDXSpLj21y/9db9qWjZYml KaLKuacUJm25wBViNDcHAhTIkgAg52gGsBDN841QrFYirj4pce0za/PpDAYj6zMTUw2d Yh6w== X-Forwarded-Encrypted: i=1; AJvYcCVr4eRq14EBYM+ZXKceFXVeNGmKmnwfRTQTH0yVQD/jvD+2Et9Omd85fNSJ2EfT7RhdOOxft1GNuxnPy5Q=@vger.kernel.org X-Gm-Message-State: AOJu0YwH+fcxf9FZkv1nrhnagjy7iZjjun6zJH9bw73NgDASGi4ojIdE nCeYh4EP1APAtbxwSzgayUYJvhkwZZDOQi/PxKwOLMO5iE1WTd324rYQgknG2zzh8VmxhnMbRuw KV6q4y5Amy6pXHxuXSgBDWhUF1K3ztTtX8GGgaGXEbXa3wrX2RlaobKGk+CRUGkSOwrE= X-Gm-Gg: ATEYQzxsAegx1kpNwikSo4l1/L1MRW58qpDOvKYOsoxoi4W8cocEp6SIIQzA/q2IZUB OKf0MjrTxwcHx4puZd/C8hRVo/PNU6Qup3n+a+ZJbZXG3rHyMsKWg0vsNkcZFoBLgzXm2cPo1J7 VpRo7G4WaJpw4lLF/f9VGaUETJv2/S86JHMQ42Rl61Q0HT7wYAC/9GJceVXfJfiOZaCUkI2TpCN BbLpWjr+65y6t6ngKIgWNYDiwUEWOYV/iRuaPh/9PK3HAmi9ZYb8QuQQMHK5CTnrIftWPwjVrBY XUAn1SlK/MSUqaQw4HKrKNXs6/397uwqRXsNkoYQYluxLYKCHnwZTnStvfm+KJ54GHhNpKENlck I127+jbdo+zAgFm+Ena5H7rt48r5/K73ncLZiLmtDDaRt38WRZF34OA2pjYbnTcspPhVP5No8/f CVMwuIgQ7nU8h9HqOu9RYLw/QYL8MlH6vr0ZA= X-Received: by 2002:a05:6102:3053:b0:5ff:2391:45c0 with SMTP id ada2fe7eead31-601deffccb1mr474917137.31.1773199460128; Tue, 10 Mar 2026 20:24:20 -0700 (PDT) X-Received: by 2002:a05:6102:3053:b0:5ff:2391:45c0 with SMTP id ada2fe7eead31-601deffccb1mr474903137.31.1773199459716; Tue, 10 Mar 2026 20:24:19 -0700 (PDT) Received: from umbar.lan (2001-14ba-a073-af00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a073:af00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-38a67e5ed41sm1422721fa.25.2026.03.10.20.24.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2026 20:24:17 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 11 Mar 2026 05:23:18 +0200 Subject: [PATCH v2 24/25] soc: qcom: ubwc: sort out the rest of the UBWC swizzle settings Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260311-ubwc-rework-v2-24-69f718f2a1c9@oss.qualcomm.com> References: <20260311-ubwc-rework-v2-0-69f718f2a1c9@oss.qualcomm.com> In-Reply-To: <20260311-ubwc-rework-v2-0-69f718f2a1c9@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Bjorn Andersson , Konrad Dybcio , Akhil P Oommen Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=4171; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=rZmnsFdkocnUxt7VbPT73DnNFvP09IpO1PBS81ZmI4A=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpsOAgCp5vPo5lPfgY/a+NRe9fCRVoydL1AAgKW nhmt/UqKmGJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCabDgIAAKCRCLPIo+Aiko 1QMpCACJIqjA9rqNRCAygAgbljoGTNrWeFT9pT53UF/x4UqPf8c6nTaNfKnBttzdt0aGxxXvqnX I+W5ih3r0P/E1MyVg4btzJbKMAcSRje0pff9egrm44STJPmpZxog9V2AklT5QCEMWoTnwLJydFa Cu3KwqH+ybQHbKVIUvCIZnvMsrdTtVofugnBTY6lRjjYEFScc1ie2PPQYPXeFqmKPLUzRg8q213 xddPtDiBb2bhY6KSwiYX6DoSYRCcCR5fXQ4NscR4n7THC+sND3eAnCNGyhI4YD1eJankuQ6pqr9 x95NOGZNwg2anaC58R7eSStkhJnJ7EjP6Ptzkcx1jloQaZ6B X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: sqCx9PLbBFkMjru_J-ReK7LyqRFOyrAE X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzExMDAyNiBTYWx0ZWRfXzo58RmX0Qwli kU98+E/THYI1goDQ1JueM+G1fS9Nkki+5zHJPUh8WiyD7+aZ+jxkPgE351l+fuU0GXwtWghNtGF nMOB4/7uYiy2X9BaetIVk83jk/vOfG43D8+ehSWMinpQUgnZrIzS9cyRyClEcxQRBl9Fcm53WdP +ou15H4LKw+A8fX7vpAC+NAxiBZIXpdUYw0hAmkl6LH9nI8O5n/EE6rH6fKmgyw51Gv/dvOjWeU maGZDx4A8Z1gf22Eso44bsEadWbu5ZyO+M/wMmGng77bkjgzB1InF+WV4Zk3d5pgLGzqGwja9xx tGdKS9brV/3N5hpr0WVf2h9y3/89lcTbFRROrBQRTRNA3DVgVuB3BtysoWv6d1uJJ2MGEKVASKC 4QFCv2ExPwaxMNpshvSrvZmhEtAR/FeF0KkOwatrQuYG636gwfSKYF8begNUHkS4jKJ4lwO5eBK 0j8C9CsCEkxr8IK/gfw== X-Proofpoint-ORIG-GUID: sqCx9PLbBFkMjru_J-ReK7LyqRFOyrAE X-Authority-Analysis: v=2.4 cv=Gq5PO01C c=1 sm=1 tr=0 ts=69b0e065 cx=c_pps a=N1BjEkVkxJi3uNfLdpvX3g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=DJpcGTmdVt4CTyJn9g5Z:22 a=EUspDBNiAAAA:8 a=3htL6sknLGLhwEng4zIA:9 a=QEXdDO2ut3YA:10 a=crWF4MFLhNY0qMRaF8an:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-10_05,2026-03-09_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 malwarescore=0 bulkscore=0 lowpriorityscore=0 spamscore=0 adultscore=0 clxscore=1015 priorityscore=1501 impostorscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603110026 Sort out the remaining UBWC swizzle values, using flags to control whether level 2 and level 3 swizzling are enabled or not. Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- drivers/soc/qcom/ubwc_config.c | 14 +++----------- include/linux/soc/qcom/ubwc.h | 26 +++++++++++++------------- 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/drivers/soc/qcom/ubwc_config.c b/drivers/soc/qcom/ubwc_config.c index 49edfabb5e18..ccee20913115 100644 --- a/drivers/soc/qcom/ubwc_config.c +++ b/drivers/soc/qcom/ubwc_config.c @@ -18,8 +18,6 @@ static const struct qcom_ubwc_cfg_data no_ubwc_data =3D { =20 static const struct qcom_ubwc_cfg_data kaanapali_data =3D { .ubwc_enc_version =3D UBWC_6_0, - .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 16, }; =20 @@ -40,7 +38,7 @@ static const struct qcom_ubwc_cfg_data qcm2290_data =3D { =20 static const struct qcom_ubwc_cfg_data sa8775p_data =3D { .ubwc_enc_version =3D UBWC_4_0, - .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL3, + .flags =3D UBWC_FLAG_DISABLE_SWIZZLE_LVL2, .highest_bank_bit =3D 13, }; =20 @@ -111,38 +109,32 @@ static const struct qcom_ubwc_cfg_data sm8150_data = =3D { =20 static const struct qcom_ubwc_cfg_data sm8250_data =3D { .ubwc_enc_version =3D UBWC_4_0, - .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ .highest_bank_bit =3D 16, }; =20 static const struct qcom_ubwc_cfg_data sm8350_data =3D { .ubwc_enc_version =3D UBWC_4_0, - .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ .highest_bank_bit =3D 16, }; =20 static const struct qcom_ubwc_cfg_data sm8550_data =3D { .ubwc_enc_version =3D UBWC_4_0, - .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ .highest_bank_bit =3D 16, }; =20 static const struct qcom_ubwc_cfg_data sm8750_data =3D { .ubwc_enc_version =3D UBWC_5_0, - .ubwc_swizzle =3D 6, /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ .highest_bank_bit =3D 16, }; =20 static const struct qcom_ubwc_cfg_data glymur_data =3D { .ubwc_enc_version =3D UBWC_5_0, - .ubwc_swizzle =3D 0, + .flags =3D UBWC_FLAG_DISABLE_SWIZZLE_LVL2 | + UBWC_FLAG_DISABLE_SWIZZLE_LVL3, /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ .highest_bank_bit =3D 16, }; diff --git a/include/linux/soc/qcom/ubwc.h b/include/linux/soc/qcom/ubwc.h index 0cbd20078ada..953094b73459 100644 --- a/include/linux/soc/qcom/ubwc.h +++ b/include/linux/soc/qcom/ubwc.h @@ -14,15 +14,6 @@ struct qcom_ubwc_cfg_data { u32 ubwc_enc_version; =20 - /** - * @ubwc_swizzle: Whether to enable level 1, 2 & 3 bank swizzling. - * - * UBWC 1.0 always enables all three levels. - * UBWC 2.0 removes level 1 bank swizzling, leaving levels 2 & 3. - * UBWC 4.0 adds the optional ability to disable levels 2 & 3. - */ - u32 ubwc_swizzle; - /** * @highest_bank_bit: Highest Bank Bit * @@ -30,6 +21,10 @@ struct qcom_ubwc_cfg_data { * DDR bank. This should ideally use DRAM type detection. */ int highest_bank_bit; + + unsigned int flags; +#define UBWC_FLAG_DISABLE_SWIZZLE_LVL2 BIT(0) +#define UBWC_FLAG_DISABLE_SWIZZLE_LVL3 BIT(1) }; =20 #define UBWC_1_0 0x10000000 @@ -101,11 +96,16 @@ static inline u32 qcom_ubwc_swizzle(const struct qcom_= ubwc_cfg_data *cfg) UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3; =20 - if (cfg->ubwc_enc_version < UBWC_4_0) - return UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3; + u32 ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | + UBWC_SWIZZLE_ENABLE_LVL3; + + if (cfg->flags & UBWC_FLAG_DISABLE_SWIZZLE_LVL2) + ubwc_swizzle &=3D ~UBWC_SWIZZLE_ENABLE_LVL2; + + if (cfg->flags & UBWC_FLAG_DISABLE_SWIZZLE_LVL3) + ubwc_swizzle &=3D ~UBWC_SWIZZLE_ENABLE_LVL3; =20 - return cfg->ubwc_swizzle; + return ubwc_swizzle; } =20 static inline u32 qcom_ubwc_version_tag(const struct qcom_ubwc_cfg_data *c= fg) --=20 2.47.3