From nobody Thu Apr 9 18:03:01 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 04D4D439015 for ; Fri, 6 Mar 2026 16:47:50 +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=1772815674; cv=none; b=ZQGQffbMhzWaSb1PbWvw1bqJK+blQE++s8QWg5sfNrFAVYSmZZWNhrsYQoI/Up7wkxaLgiwii4sivqM9Nva/foeTy/G4Yc0XjOH2VAvOk9aNXjSOYjK9LEbeUjYm+kFXHRe5H37MXW2mL/vvZpuwgcEW42GcqkDvsbJrw3JVsqE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772815674; c=relaxed/simple; bh=v7QXktkShy+wyahjFgEkbZoSxJ/5hj9cJD9SDRJzeIA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ab9U0Zg7iVvrbdsviPuq+bJVLe93JT76J0gt5CPH1pGXP8On/bGjjNJcFauLsI+MZy3HRbp3l49i1dY8l6Psu2Ip027ITCbYFXz1dCJGFeYLl6XEFod6pZiqUYwTN65te+xDXp4jEUCR59jLB9ec3ZyUbUHNn+lCBiIBnnSVbs8= 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=J9vrYKmO; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=XhWqmELI; 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="J9vrYKmO"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="XhWqmELI" Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 626Fr4lh3959760 for ; Fri, 6 Mar 2026 16:47:50 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= qJ6Ex/AAn1uIE82cXCit/bkBSE8pPV30Id+vTgVPV2k=; b=J9vrYKmOpF8vAjb6 rPQvnradRPJjIzoN6HQ5mybVzIeyN38qibCV8fZ4NxdzlvFgEdAieL50o3JnhlW2 QXOjeEpI4nE9F33/BDfQlsqTlmvg+voePvZPZytd6HR/7GmUvuyxYQrvrsSKplfi YzebplJhuaIunDpNXUN1EgIkmcJeiYlKu/WTJ1k1Zyom90uBWRL9+RW4+5CPMlfO Kc5LYz9qjL36vrDGs+FkCUqzry3+O2ZLJGcsaf0z+rgWj5dIBgEhZfeBKBQKNLvg 4WchuuexcRAL33Amt252zUgn8z+el3Ascttq0AwgVKzT9A5ZS4mXSWYKDfqd2v25 f0QHow== Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cqv9u9cbs-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 06 Mar 2026 16:47:49 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-8cb52a9c0eeso6931302885a.2 for ; Fri, 06 Mar 2026 08:47:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1772815669; x=1773420469; 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=qJ6Ex/AAn1uIE82cXCit/bkBSE8pPV30Id+vTgVPV2k=; b=XhWqmELI3L7zAIPWpKKiK1lwIlFwSUwEnTFNdTyV7+/DbORdRFATJoGk5+HF/Scu+O xgP+zM/83Hf44jqnE0zRE1PO17N8KVhINqdYz4PvVKgaOqiq5YQ+87yccf70lO2OLz3E Omi2LwZHcm/3T6dGri6nuWudbcdrYYSj7kdAgVDlBECT0oknT/5XCYKQyLYuExSPSVUu b0R+EdebCr2oLQQ9ZiJNV0vKD26Nn1QwjxQSJIXeP5GnPF3oSuKOyAQASBekMV8YUgPc ipjA06hVOZUqUu3TV/ni8/JowDE3xuGJJnFOB3cXQdWISLriLGFzjWeeN6R4+Xtbgi+F LR/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772815669; x=1773420469; 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=qJ6Ex/AAn1uIE82cXCit/bkBSE8pPV30Id+vTgVPV2k=; b=Cy747+u7SXUBHtlWxEmgec1z9gM5poYk7LOEWAkub2K0iIbzKUvSWTzq5IbFf7VyFY +iQx22nwec9VYX258VnxRyg4yK6Mkl8yaUosuv0omreyQBkMQJpZKe+wLHoSfpTKDiVM KJ8nrN/US20A0C4VLCgidHekyXFMVkbU9iUsJhblYvvQ7KthMyBagXd05d2jfyOTMRLH FW64fzhBltDhoutr2PZRP1IlylfDwBohqKJGOQUrAwx23e3wdY40HgLYfWu30o+04oif 1cGcRzQhnFlaKrl7buupmo6wl7uDlmni6C/9jV4QDWpM2djist+4RA5wx8Wilx4r89UW e1cQ== X-Forwarded-Encrypted: i=1; AJvYcCVAXmjmcM87Laku/p6OHd5nHArI66ppAqVKNQExDKD00uDWux91xjOxMRm9CzLt0sFoX1kXsNj7Qu9ArUY=@vger.kernel.org X-Gm-Message-State: AOJu0YxIZGkDW5fvhZJdPL5Vce/Nsq5qyT3Bv67IGzPt/jJygbU4kDDM f+sxcp6Qk+erw8i7wBijsOFsOzzsRRzCHFl4wt6T4BPcqZdUZAg21FGEEGxmE5MOSqvUV8EZSDE pU/VTOQ7cTlgc5Ew8we67HFeYul7c5BumsMIitulZ6bAwPb80wF3V3wQ486VvtBA82N0LzKCNmF U= X-Gm-Gg: ATEYQzwTEt4s0giKLrWM04IhQvJTdJczjpp4IIgCoQTi5t+sqS5kdODY69ezl182NXw pRSKzlFirBVOhS3hi820A8buSnbqAYV5bOEQGIIh+f+cd51kYu/V9MELTfKLbr9RJwtGoX8/GDY oMCgf/P4UeRbGBq1ciH+rlS1pyZT5VcKBMF+DUi5VoGBPjdP/it7RlTqJAHWKwo+B2iSSx8YXPu UXliLEBXHrzaRvidyn852duGt6t/8OU8idzQjGdiHaXzJEyiOh2UBnIAXjH+CWXXo7M4IxvVGHI Z78/BXVL2A5S6b33cfeOYFT+2NaO7vb3QT8b5I9u7IqoQtt2Ybr/Rlvo9YrYbADLi36cEbA2eoB eQgpPLpA/Bhzg7XwBXHEr675AQvz3aGT3bHLvywvds7k4EVH1ImLFAHet4SKea5B5y4nTtUvT8r N8Ptx3nWRpZenjzFZuITrT77cGHxOtCpdbyOw= X-Received: by 2002:a05:620a:29c1:b0:8cb:55cc:6245 with SMTP id af79cd13be357-8cd6d3ed360mr340183785a.12.1772815668550; Fri, 06 Mar 2026 08:47:48 -0800 (PST) X-Received: by 2002:a05:620a:29c1:b0:8cb:55cc:6245 with SMTP id af79cd13be357-8cd6d3ed360mr340178785a.12.1772815668030; Fri, 06 Mar 2026 08:47:48 -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.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Mar 2026 08:47:46 -0800 (PST) From: Dmitry Baryshkov Date: Fri, 06 Mar 2026 18:47:27 +0200 Subject: [PATCH 21/24] soc: qcom: ubwc: drop macrotile_mode from the database 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-21-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=5167; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=v7QXktkShy+wyahjFgEkbZoSxJ/5hj9cJD9SDRJzeIA=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpqwUPRKAvBaKiSIudQZ6xcRbzFB5Ni1CIbhtqf LAVbZ5TkD+JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaasFDwAKCRCLPIo+Aiko 1duWB/9x/MZJSqKyKCvfl+tFrH5M2zgQzGC5zoXk01bxR5/XZp1OqdW6dAkklTyaVff+nePOaZk ZvV9hZnsPlfBZvPs0pPseyE69Hn83m0sL4a9Pj3NJITfWfMM7T1QDGHU9jF+A5lt6Oi0iXJiJMC PhzPdMROuMJ4ESsMZO7HPohhGAViLefRSlQnI0/htVQF7JaVnb6U324uAu4vInd8Rq0/+UNjheu BVANPv2Qdgds1ErPS7t4qZ9EnkQeq5goawF+DLORk52IBPdJGzTkxVdiTbeEgc4RAeTGNumI+aw g2WI6UsKDZrdvxuyuk9sww+UT8Q3ujOcI5uoPlxBB8ldn8xF X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzA2MDE1OSBTYWx0ZWRfXwOoddNRLp3H+ zAEhpj2PrAC5sGVzmYK93TJWzel0hdUuPn0UNOQ/+mPNuMsJSY6uWlVHowLgwL8fK87XDRtr72A B4KeejqxlUtCY47/oM5z8DNsdy9WedLRKrY5SnRkwq3oDhDWxBsKCF3AIjtEhBASVkgF5KIfxnU MyaRCmEWdMEZXHW9s34zgGKAa4Ztp8myNL+U+K4kOWiVm/7g2wIu2XKT2O8KzKacCzl06BjLCFD aXyOt2c0ADYy6PQDky0dNt8LAmPm5Zj8S+WTH935t/OauP+TcIGvHBQWre+Ag+F8xRSIgyeyItP Rb98bObSCMon2X0QM4CAVT7ylOzZicVgWxb28JoIQxMesqtytd2H58huXoJEWT1YY4lz4hcO0vS IEAagYmAoDYVkB1P+seUhkVWGK1jSlAWN1JpWhj1pPw0VxuHiGpNUXbzk7VHQQtAqUzlaa4G+Pk 2wYAE+in6RlmVdzzZPA== X-Proofpoint-ORIG-GUID: dlJ-YQu7Ck99p5pW2Pr-ddjPvi-fT50v X-Proofpoint-GUID: dlJ-YQu7Ck99p5pW2Pr-ddjPvi-fT50v X-Authority-Analysis: v=2.4 cv=eJoeTXp1 c=1 sm=1 tr=0 ts=69ab0535 cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=EUspDBNiAAAA:8 a=lOjMx_-Oxa8n0LcNG1gA:9 a=QEXdDO2ut3YA:10 a=bTQJ7kPSJx9SKPbeHEYW: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-06_05,2026-03-06_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 spamscore=0 adultscore=0 lowpriorityscore=0 suspectscore=0 priorityscore=1501 malwarescore=0 impostorscore=0 bulkscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603060159 All the users have been migrated to using qcom_ubwc_macrotile_mode() instead of reading the raw value from the config structure. Drop the field from struct qcom_ubwc_cfg_data and replace it with the calculated value. Split single UBWC_3_0 into UBWC_3_0 (no macrotile mode) and UBWC_3_1 (with macrotile mode). Signed-off-by: Dmitry Baryshkov --- drivers/soc/qcom/ubwc_config.c | 15 ++------------- include/linux/soc/qcom/ubwc.h | 18 ++++++++---------- 2 files changed, 10 insertions(+), 23 deletions(-) diff --git a/drivers/soc/qcom/ubwc_config.c b/drivers/soc/qcom/ubwc_config.c index 070bf97e134e..51de36f5f40b 100644 --- a/drivers/soc/qcom/ubwc_config.c +++ b/drivers/soc/qcom/ubwc_config.c @@ -21,7 +21,6 @@ static const struct qcom_ubwc_cfg_data kaanapali_data =3D= { .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 16, - .macrotile_mode =3D true, }; =20 static const struct qcom_ubwc_cfg_data msm8937_data =3D { @@ -49,15 +48,13 @@ static const struct qcom_ubwc_cfg_data sa8775p_data =3D= { .ubwc_enc_version =3D UBWC_4_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 13, - .macrotile_mode =3D true, }; =20 static const struct qcom_ubwc_cfg_data sar2130p_data =3D { - .ubwc_enc_version =3D UBWC_3_0, /* 4.0.2 in hw */ + .ubwc_enc_version =3D UBWC_3_1, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 13, - .macrotile_mode =3D true, }; =20 static const struct qcom_ubwc_cfg_data sc7180_data =3D { @@ -68,11 +65,10 @@ static const struct qcom_ubwc_cfg_data sc7180_data =3D { }; =20 static const struct qcom_ubwc_cfg_data sc7280_data =3D { - .ubwc_enc_version =3D UBWC_3_0, + .ubwc_enc_version =3D UBWC_3_1, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 14, - .macrotile_mode =3D true, }; =20 static const struct qcom_ubwc_cfg_data sc8180x_data =3D { @@ -80,7 +76,6 @@ static const struct qcom_ubwc_cfg_data sc8180x_data =3D { .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 16, - .macrotile_mode =3D true, }; =20 static const struct qcom_ubwc_cfg_data sc8280xp_data =3D { @@ -88,7 +83,6 @@ static const struct qcom_ubwc_cfg_data sc8280xp_data =3D { .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 16, - .macrotile_mode =3D true, }; =20 static const struct qcom_ubwc_cfg_data sdm670_data =3D { @@ -155,7 +149,6 @@ static const struct qcom_ubwc_cfg_data sm8250_data =3D { UBWC_SWIZZLE_ENABLE_LVL3, /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ .highest_bank_bit =3D 16, - .macrotile_mode =3D true, }; =20 static const struct qcom_ubwc_cfg_data sm8350_data =3D { @@ -164,7 +157,6 @@ static const struct qcom_ubwc_cfg_data sm8350_data =3D { UBWC_SWIZZLE_ENABLE_LVL3, /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ .highest_bank_bit =3D 16, - .macrotile_mode =3D true, }; =20 static const struct qcom_ubwc_cfg_data sm8550_data =3D { @@ -173,7 +165,6 @@ static const struct qcom_ubwc_cfg_data sm8550_data =3D { UBWC_SWIZZLE_ENABLE_LVL3, /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ .highest_bank_bit =3D 16, - .macrotile_mode =3D true, }; =20 static const struct qcom_ubwc_cfg_data sm8750_data =3D { @@ -181,7 +172,6 @@ static const struct qcom_ubwc_cfg_data sm8750_data =3D { .ubwc_swizzle =3D 6, /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ .highest_bank_bit =3D 16, - .macrotile_mode =3D true, }; =20 static const struct qcom_ubwc_cfg_data glymur_data =3D { @@ -189,7 +179,6 @@ static const struct qcom_ubwc_cfg_data glymur_data =3D { .ubwc_swizzle =3D 0, /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ .highest_bank_bit =3D 16, - .macrotile_mode =3D true, }; =20 static const struct of_device_id qcom_ubwc_configs[] __maybe_unused =3D { diff --git a/include/linux/soc/qcom/ubwc.h b/include/linux/soc/qcom/ubwc.h index 405d83f8d95b..d4a0cfb133fa 100644 --- a/include/linux/soc/qcom/ubwc.h +++ b/include/linux/soc/qcom/ubwc.h @@ -33,15 +33,6 @@ struct qcom_ubwc_cfg_data { * DDR bank. This should ideally use DRAM type detection. */ int highest_bank_bit; - - /** - * @macrotile_mode: Macrotile Mode - * - * Whether to use 4-channel macrotiling mode or the newer - * 8-channel macrotiling mode introduced in UBWC 3.1. 0 is - * 4-channel and 1 is 8-channel. - */ - bool macrotile_mode; }; =20 #define UBWC_1_0 0x10000000 @@ -80,9 +71,16 @@ static inline bool qcom_ubwc_min_acc_length_64b(const st= ruct qcom_ubwc_cfg_data return cfg->ubwc_enc_version =3D=3D UBWC_1_0; } =20 +/* + * @qcom_ubwc_macrotile_mode: whether to use 4-channel or 8-channel macrot= iling + * + * The 8-channel macrotiling mode was introduced in UBWC 3.1. + * + * Returns: false for the 4-channel and true for 8-channel. + */ static inline bool qcom_ubwc_macrotile_mode(const struct qcom_ubwc_cfg_dat= a *cfg) { - return cfg->macrotile_mode; + return cfg->ubwc_enc_version >=3D UBWC_3_1; } =20 static inline bool qcom_ubwc_bank_spread(const struct qcom_ubwc_cfg_data *= cfg) --=20 2.47.3