From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id ACD6BFD88EB for ; Wed, 11 Mar 2026 03:24:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 20D3310E7F6; Wed, 11 Mar 2026 03:24:24 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=qualcomm.com header.i=@qualcomm.com header.b="b9sg6/ej"; dkim=pass (2048-bit key; unprotected) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="d/17Vagz"; dkim-atps=neutral Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9D03D10E7ED for ; Wed, 11 Mar 2026 03:24:21 +0000 (UTC) Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62B2qwGC2179297 for ; Wed, 11 Mar 2026 03:24:20 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-ua1-f70.google.com (mail-ua1-f70.google.com [209.85.222.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ctqvsspet-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 11 Mar 2026 03:24:20 +0000 (GMT) Received: by mail-ua1-f70.google.com with SMTP id a1e0cc1a2514c-948df60cec6so19448917241.3 for ; Tue, 10 Mar 2026 20:24:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773199460; x=1773804260; darn=lists.freedesktop.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=d/17VagzOueYLlB+neqeeYtzWsWXdJuqxThYCLbHKrWfrleCxFl47PpnvqJR50jsbE P25dW66FZ8GEB4Isk5cd8IjSMhd8an8yrb5rO9v9GFj9QdzjiKQDjy8uNMfMB0qECgRH cEGg6/dn7ZcN6XFBMEh6/LDeOZ9x/Ltvc+Ovw9T+66Ik47Z++0n6KrZ5MKlKkl/H+WSK rB543PaIVjVjNH3t1DQ8JOuBe3nzEMPDWjb0QcbR88zYaZZbsdZuDuSSn6rBGy7YkXDr XV3tt723sip/LBGv0t0ySo4j0+9NkIDDnCvPL9sFMZvwdC4bAnc0ZP9BoJG55TgUY6pK 0HQw== 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=pK0+cSY/oyDdbk1HdlzG0oudhrfCH3zxrahDG41iRi/F3RY3QAkJAkwzDxm9z9P4+g xFq9hbMJ5ZOJNMn8XxjTYrJv74QchyQ8b90JW13Vj4Tw/FRT/dtyBNdIQiev4hPHw82x t+TP9kYfrgqm+p277MshqVTUc99TdEA09HPr6UvZd6k2YAIWHRrd42VjwUu2POB63z3B f67EAst0QLDtrAeRST8dD4K+dgYAikIb2vh0SYDkzJEMCCMamrU0xxfjAyHTfJETTXOl 1DFWH+2p08Y99pUGRC4Eve1uyXN1LWnXAi3O5UvmB6Xkq0wItUyBZyOrzU310tmqXezC A/Uw== X-Forwarded-Encrypted: i=1; AJvYcCW5Np2EAhK0LCHdlNwXn/p4E+p9L4Tba9x12mx9z0g0G0zpnyhZvUvDSUR8/EnZ0vjpyox9eMyxIsw=@lists.freedesktop.org X-Gm-Message-State: AOJu0Yz5MJYv5fAtPY7teURsXwfE1zNKA1JIZOHLwvrKyaH3w1M2ue2g VjuxIDGfpFIqiidoWI8SWfNa7bP1u15JUzWxuis2skWs+THiJKK9ECZxrmfYSReb7/9n9nguRto FGDsDyueBR6j0W/xFodHGNWHpGtDqu/P8BE9UAOdo7qykboBelUZl/27Y9Aal7jXDzJBG/B8= X-Gm-Gg: ATEYQzyQ/alwf1rAY7fTDoyJ/BnwNkj9dzPDk3gyvjByTSGawHAbVP7m8Yabu4rNiAV Eaa3LsTd0oAl1LMCT0ec/PH8UJsDxmRue7FxEzJDsPk+xndTu6loCYaDMYoZnc2Gw7ploiUdMUe eaDnZjQFlzB++dGzpLv41plKA+6s5xzxck4zU9VveAlCt9ZkVXypaczhc4ZAig6Y7QndkBFh92a gjHru/osNXRBNhc3AtcWDFsrI7zfpj58DhNRY4IXNrIKo+16r0nGrZbmSMWT3jBMLhCmqmiyI6d m6br1IAjI6xEmDr7wXO2ZwJc3KC7x/H81gns+CLmLP0mgeB3uJO06LrSucBOldsdkldxm7mZ7AO onJsv0a6RJw9a4SOUtgwFhvGEX8X7kJZP3Bnj6ysPYIOOSyfgy1Gckr34Uvrz4pKiA2z2PChkDy 4fPsFxYF0y4Ns5mvzkHTjCoq9bdwb1szsnwTA= X-Received: by 2002:a05:6102:3053:b0:5ff:2391:45c0 with SMTP id ada2fe7eead31-601deffccb1mr474916137.31.1773199460126; 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 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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-Spam-Details-Enc: AW1haW4tMjYwMzExMDAyNiBTYWx0ZWRfX/VW4ucunQCtH rCaBqyBDeewnqu0SDNnI/ZTMOB/wo2mwEcyFHXOiEPTYBQh7YlgVesF7pRhyueJ+REsJujtSAs7 fp3N81p8441VQPm7kSKIg4VgkqP/NYBelivLC0s2H4wdcr5GxtiZ8GwN5BuAVoPTwhxcpGggRHN BAcmfmeeq7u2uJxYeTRSe5kO/jMV4FKU/FmWz1aVI34uxXGjNDrHMq2vp3T5mIa3QlcwsxjIuwF FfzyYVanKA/My0LOWzpmZHbR6dIJ8D60DvQnxXXqxIafOpB5PxnOgweFn4wK945w5LpvGXGbmFx OrKIRjbOdk2grrHiVAQslGOv7xgNVTAtGpTGA2pjSLxBf2KtVRtML6zCXIHSJThW7vtupFJvaTQ E8UA+IFKkAk4HKXtKxnJDKHcfrdMv1uktLuHkY3OnEN7k/xrxoYfB3dyX0xyWfndhF/r+fGbAyv 5Xr3vOGKm5+wMC3KosQ== X-Proofpoint-ORIG-GUID: JPg2WhkzRwg8dlAltM9HPun5IxNMZQfc X-Authority-Analysis: v=2.4 cv=Lo2fC3dc c=1 sm=1 tr=0 ts=69b0e064 cx=c_pps a=R6oCqFB+Yf/t2GF8e0/dFg==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_glEPmIy2e8OvE2BGh3C:22 a=EUspDBNiAAAA:8 a=3htL6sknLGLhwEng4zIA:9 a=QEXdDO2ut3YA:10 a=TD8TdBvy0hsOASGTdmB-:22 X-Proofpoint-GUID: JPg2WhkzRwg8dlAltM9HPun5IxNMZQfc 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 priorityscore=1501 clxscore=1015 impostorscore=0 bulkscore=0 malwarescore=0 phishscore=0 lowpriorityscore=0 adultscore=0 spamscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603110026 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 = { static const struct qcom_ubwc_cfg_data kaanapali_data = { .ubwc_enc_version = UBWC_6_0, - .ubwc_swizzle = UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit = 16, }; @@ -40,7 +38,7 @@ static const struct qcom_ubwc_cfg_data qcm2290_data = { static const struct qcom_ubwc_cfg_data sa8775p_data = { .ubwc_enc_version = UBWC_4_0, - .ubwc_swizzle = UBWC_SWIZZLE_ENABLE_LVL3, + .flags = UBWC_FLAG_DISABLE_SWIZZLE_LVL2, .highest_bank_bit = 13, }; @@ -111,38 +109,32 @@ static const struct qcom_ubwc_cfg_data sm8150_data = { static const struct qcom_ubwc_cfg_data sm8250_data = { .ubwc_enc_version = UBWC_4_0, - .ubwc_swizzle = UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, /* TODO: highest_bank_bit = 15 for LP_DDR4 */ .highest_bank_bit = 16, }; static const struct qcom_ubwc_cfg_data sm8350_data = { .ubwc_enc_version = UBWC_4_0, - .ubwc_swizzle = UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, /* TODO: highest_bank_bit = 15 for LP_DDR4 */ .highest_bank_bit = 16, }; static const struct qcom_ubwc_cfg_data sm8550_data = { .ubwc_enc_version = UBWC_4_0, - .ubwc_swizzle = UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, /* TODO: highest_bank_bit = 15 for LP_DDR4 */ .highest_bank_bit = 16, }; static const struct qcom_ubwc_cfg_data sm8750_data = { .ubwc_enc_version = UBWC_5_0, - .ubwc_swizzle = 6, /* TODO: highest_bank_bit = 15 for LP_DDR4 */ .highest_bank_bit = 16, }; static const struct qcom_ubwc_cfg_data glymur_data = { .ubwc_enc_version = UBWC_5_0, - .ubwc_swizzle = 0, + .flags = UBWC_FLAG_DISABLE_SWIZZLE_LVL2 | + UBWC_FLAG_DISABLE_SWIZZLE_LVL3, /* TODO: highest_bank_bit = 15 for LP_DDR4 */ .highest_bank_bit = 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; - /** - * @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) }; #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; - if (cfg->ubwc_enc_version < UBWC_4_0) - return UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3; + u32 ubwc_swizzle = UBWC_SWIZZLE_ENABLE_LVL2 | + UBWC_SWIZZLE_ENABLE_LVL3; + + if (cfg->flags & UBWC_FLAG_DISABLE_SWIZZLE_LVL2) + ubwc_swizzle &= ~UBWC_SWIZZLE_ENABLE_LVL2; + + if (cfg->flags & UBWC_FLAG_DISABLE_SWIZZLE_LVL3) + ubwc_swizzle &= ~UBWC_SWIZZLE_ENABLE_LVL3; - return cfg->ubwc_swizzle; + return ubwc_swizzle; } static inline u32 qcom_ubwc_version_tag(const struct qcom_ubwc_cfg_data *cfg) -- 2.47.3