From nobody Thu Apr 9 18:03:03 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 AA0854611C1 for ; Fri, 6 Mar 2026 16:47:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772815676; cv=none; b=WPhI9ek+nuGPMp0UjPxAajPE7mRYJOknGU2SUz00VFDuVGcy/p78XxBaDjmjLEhGVFGdnxqCpLNUOKpJzArHvdB+IBLcmyQ9IvHRBycN7jYB0lkmq6aDrSWpYKu3JA7rf2sX6Jq0tEFnNEhSloDcyvdkOUBm5vZo7lIHfgpZupk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772815676; c=relaxed/simple; bh=8WidFnFU6pX9ecJLzeiZrTJ8KzhlV2H6Mjpf2nc28Pk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=g2Luh2m3nDS89M1UGHhos5HOMMxCm2F5zwqEscL0FVf/063p4vKNv3YbHiEmPAbNkbMOr/DPKUcFUdC6VatRUTSbJb0j4Atj6xO/MmesB6xhZONyC7QKffPYwNmgKbvDIAZ5wbqfXq8bdpeae9veHSW4UF0UyEM3gzVfZtG8Qf0= 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=LiZ2bxYL; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=Btth3Huk; arc=none smtp.client-ip=205.220.180.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="LiZ2bxYL"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Btth3Huk" Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 626FrBeZ082793 for ; Fri, 6 Mar 2026 16:47:53 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= cZb8eZw+Q83o+RlHHgWXaiw17CCH07r6st3FY/t2sq8=; b=LiZ2bxYLzVssMrjQ dwtQ6ZtcQ4t6ddMaCjo4d7gdEsCbn9iR82OtxuasTZtEIhnfQY6/RIGT/N2yEFNp 6qj2VIFaMWgAEnYoJfW9rxw3lerXUmkrEziC0DTWV28eBoOEz4U4lhYiXHKj3ArS csoLIY5O3spFkHqNw9RwO/8rtViW7PAU9CAjVps/YGg0t6zMTx49zH1RCCgfbBfD KyiFo2rHTC9KwlwMjWE1JRCaZHn02tYfSOM7OiPGlhq/Si5lW5FJ4Nj2gluxSNuq Z9RBMxl/QfP3gtdafRSldV+SAuWtsGVhi4AiA0Ejo3IX1HH8b/3p5kG6vyv9Okla BFIFDw== Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cqv98hc2g-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 06 Mar 2026 16:47:53 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-8cd722c1a69so171394585a.0 for ; Fri, 06 Mar 2026 08:47:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1772815672; x=1773420472; 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=cZb8eZw+Q83o+RlHHgWXaiw17CCH07r6st3FY/t2sq8=; b=Btth3Huk6PP6u6jrttFC0OKNDOCWAGjiQ6Xyi9MbsL2QPtYuqYAZ+HxdvhIW6CGyNL 8n1lToT6BWfa9seEYIbMrZvcV44qnOZilXZmihKKuG/rojnCriLcntphwjPA6JuYdGxa SnrVuHIvm58hQ4Acinto4Mrkka3IaYrT/Tq7CUTUt1XvZP11rzAJ4iOnKxi1t4hmuxRx 3SiGTEmV20UFE+XC5QBoXEoVs/qfV7+lFOJCPPUjj23ad97uu1hnL8/jwSzMIH0EN0/W xRIRcS3syc2S68Y4jpCWGlnrTB3VXULwimFbJhZw7DkvH4cfkbQQ+U7ZJnsLavLXby1j E9zA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772815672; x=1773420472; 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=cZb8eZw+Q83o+RlHHgWXaiw17CCH07r6st3FY/t2sq8=; b=jPJCEvHioIIbtaC5N1JXiAkVPnzNYb+v5SJyRd/R292hr0yoelttsOxjjWfwVA93pg 1wLF9NryJ1DtEBzUCdOdJEI+tALY4mqHmxY+aNfldr+1d1+yIAdpimIdAX3WSOnymk9K RHnuRYEv5hRewZNjMUclQz4+aTIK08C7XRN8gjXFNkm0eVeZeCR3feJjY//MfzasisP9 jb52FDVKiUf96AXn1Ts3KM+wvMKt1nWa/IjOfh78fgq+cXEOg3ef4hv0WeZzOYu5DToj 3Z9hK6tLtitSAz4Lzo0a98S5cLfL5PEzEdM7hDyt9M4cXBlJsGVv1dH6fpYj9VBKrJHn y+Bg== X-Forwarded-Encrypted: i=1; AJvYcCVTkwkd3kk2C9N8oLkCgWZQOTQAzTAJdvY4hlslENPMS5AIksN1eHA8NpBtKeUPe6VIritbVc342JG1CSU=@vger.kernel.org X-Gm-Message-State: AOJu0YzUAMga+eMZgfgGUDEt7IMlGWlyfK3bujD88IhcpU+1m6sgmGot JVD5UGRQCcQyzmAb/3bm473Lau5XjU8vPddUUeirq1rJZVQmjVP1gpdEPJCz7g7KT59Of8fD8M5 YEw94B7q2+1xZN346havh9rUs/0ENRfWyiO7uRw0zuRw01wIHQG/zKaf8IrBcI2qOUIWwIXVPNS c= X-Gm-Gg: ATEYQzye6pU8lD7V35w/Rum7JT+92hcwiVF7wOj9wHc8qawO+HuWQiaHXWsdZR/osUS 9Wj6VLb8JlOXqZEmRSiwWMEnhOagwTanUc6sYVlMkvekwjeMRVdg3GI0TtK4VU0EobRhP7fa2lP dUIn+l8q0PirRfLtD9/dfdPSJyjmh2eiOYy4+6bZ9rp4xDOJjslr0w9sw3CHVXem6g19lpGlkUM y3h7VTgYFFSOAX/w8UUe3En/K4yNlhGdyJ+uvRHpdsdLPdRe3fBTaSOKF492ykinUKWevCJd60a Z2m1PsA/1M7kbBectXleNzfmCxdkEK2Zp3couoCFuUbGBcPn7Mj9xPIHvPKBeOixt1uY548jJ2y JpJbbenb8da2H6V0DMNBElr573otg4F0+9ALpenhlCdPpOKZ569asIztf91zlD3RUylO9dXmEsG pXZF88RZMurseTQJS+nKIWF+Ib34FHV8NYO8o= X-Received: by 2002:a05:620a:450e:b0:8c7:19f4:b585 with SMTP id af79cd13be357-8cd6d437e12mr357961885a.43.1772815671545; Fri, 06 Mar 2026 08:47:51 -0800 (PST) X-Received: by 2002:a05:620a:450e:b0:8c7:19f4:b585 with SMTP id af79cd13be357-8cd6d437e12mr357957685a.43.1772815671045; Fri, 06 Mar 2026 08:47:51 -0800 (PST) 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 2adb3069b0e04-5a13eaebd0asm213804e87.51.2026.03.06.08.47.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Mar 2026 08:47:50 -0800 (PST) From: Dmitry Baryshkov Date: Fri, 06 Mar 2026 18:47:29 +0200 Subject: [PATCH 23/24] 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: <20260306-ubwc-rework-v1-23-9cfdff12f2bb@oss.qualcomm.com> References: <20260306-ubwc-rework-v1-0-9cfdff12f2bb@oss.qualcomm.com> In-Reply-To: <20260306-ubwc-rework-v1-0-9cfdff12f2bb@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 X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=4110; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=8WidFnFU6pX9ecJLzeiZrTJ8KzhlV2H6Mjpf2nc28Pk=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpqwUQAZ+0aWPY3IVYykrhRri6p7g+LTvnjvKP6 ufdhY52g+yJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaasFEAAKCRCLPIo+Aiko 1WrJB/0eS0DHsvjpFfzh4DNP0t5Gk/kPiCgl8jnqQExo+9O/doJAZffcqd/dT4qe22aibnWMn6E VTgdGYhjRrKycFpmz/JpnDz+5YABXYX6ABlXi55nugrW1JVtxQUmhRSDsRn3aCEtf2zafBZlBq7 OuDu67brybndsSHN4tV/NERdu/ww2CF8HaQmPBM+6Kv741dx8X0pMWWcI3ImuhE4uzGwai3iMuH +9aWnuJUYxjrHaHKO7fT4UFV/HFFVx1gD9EyMTr9/khOokC8QlQZXRbiSQPbLDxVrtLqqbRYQho vD2z9Fi+LabuDcuYVkaLHIm3RpLEmgyqoPGuQa6BjuTNAVs6 X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: qbMLUEH6oy8Dw_qosUVXd2OMb4K0ilek X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzA2MDE1OSBTYWx0ZWRfXyccLeH6DG3tP AYRr+7ifLM5vh35Y2aUS2mk53GpqTyYa53qXZKweSAKLrqO4yKNbwEed9kUbrztFMwkws3tYPJp +I/NrVh9Fo5nw23FdC0gcPIlgO+XbuLN5m8joGINHV1VthGCtAvQD9lJAjxRhY4HpE0sg75VdcD 2aTdW/Y1srrVG/9k5FA3sFh+dQ1t7m3WLeJianfHXQGoFAbZaKgUVFweWo05LWr1yUMcnx8ne6K emBrRZFWibTbo8zdcFrkEqjUV08/ERKndAIZFZ+Uzr9nKEb3TToBpMwArG/Zn7dCPekcoQpwkDs VNbZVhKYpTox233LoG/obsobWyiEwu/HdE3wHKpNk7VFvfkvK4HpF5apKFB3IbbriETiQx6wwnz k04/YOMD9j9dnE8nke+Tnr71wRUlLUj1GlyjPmXiCQiCvCd17EL377lt0SXGsrPFgBqTmguE4RV 2wKLadm8eUtRqfGF4nA== X-Authority-Analysis: v=2.4 cv=LbcxKzfi c=1 sm=1 tr=0 ts=69ab0539 cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=3WHJM1ZQz_JShphwDgj5:22 a=EUspDBNiAAAA:8 a=SdgSTUjA-qPM3NZmnp0A:9 a=QEXdDO2ut3YA:10 a=IoWCM6iH3mJn3m4BftBB:22 X-Proofpoint-ORIG-GUID: qbMLUEH6oy8Dw_qosUVXd2OMb4K0ilek 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-06_05,2026-03-06_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 spamscore=0 priorityscore=1501 bulkscore=0 clxscore=1015 phishscore=0 adultscore=0 malwarescore=0 impostorscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603060159 Sort out the remaining UBWC swizzle values, using flags to control whether level 2 and level 3 swizzling are enabled or not. 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