From nobody Sun Feb 8 22:18:08 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 D0E4C33C1B3 for ; Mon, 12 Jan 2026 08:11:18 +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=1768205480; cv=none; b=ZwgYPWnTEn82YMFtWjrFvhehClaBrCTHSKjN/g1gYgv2uTjECUtaCXAW6TiBj8DmE2IyxrpAk1Dr2DTNLvI0Xqf5POLQQdcDJZ04LJrgFs6qrLp/qmdI2bbv+ONjvqkskw6C3/pkhINGFCPeKXQiHCV982gzI80wMBP1l0Sajx8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768205480; c=relaxed/simple; bh=7T8vgAkN1iRq56eTJtnuXnjThKJcOshuvvlIvEcslgA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=pI9GqpwVKNbzCpGfwRUhE/VG6WLxtDbbEC3uRymjjXlNJKQ1MCjVGipDf/1cr6w1jZZbuO5tTuCI0chhugBhB7lf610TSCvgpbCKjLram+AuXlbcfh7zHlTp5TptOb+SwT0z7NITxFSumHjPx8WUSVs3MdPYSRbppG1eKA2Dm/o= 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=FbX4B3ZH; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=Ds02Nuk+; 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="FbX4B3ZH"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Ds02Nuk+" Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 60C7OfXR555266 for ; Mon, 12 Jan 2026 08:11:18 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:message-id :mime-version:subject:to; s=qcppdkim1; bh=+aW01MHjFglmw8m1Dm+eiQ DA4p0GQEOO6R0QXAKCp4Q=; b=FbX4B3ZHvD2bjnnLPBhvwioZD1ZCSXhFMAtxst ClB4AZVq6feErliqVKQGWE1a7VZQ/XAgxPukbkG8Fc0XORkq19kmKrfUMdt+N3wk ezvMxhsndhcEsTAqxfOvJa22N0RAVv9gS/yOqC65GX6eLzry/+m9h33fTEtbC2Ki 8GLBWD3rz5U+WsaY9UAMONnNTjKKC9TR90AY6j3o3h+mzJ2mpoI/JIM8CHj0P4Yj pAk9gf9lMNhKN4j9XHtEOwglNxzehYpWnGytMwGZCOzIwj+Xlch2DW/LGmirNxUW ipNEkS974NVv4n7JPTHP264CtJiAyVUi9uWxTxjWMiSP9czw== Received: from mail-dy1-f200.google.com (mail-dy1-f200.google.com [74.125.82.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4bmvhw05yn-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 12 Jan 2026 08:11:18 +0000 (GMT) Received: by mail-dy1-f200.google.com with SMTP id 5a478bee46e88-2ae56205588so7434038eec.1 for ; Mon, 12 Jan 2026 00:11:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1768205477; x=1768810277; darn=vger.kernel.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=+aW01MHjFglmw8m1Dm+eiQDA4p0GQEOO6R0QXAKCp4Q=; b=Ds02Nuk+CRDSBrMi+Iq2sEK9WU2p8BIQTS0+0utdNoKGULmpZA0wM2K4MPThNb8IxZ 73ge3N6pwbxhrdYLdAoUkL1iRXRuf1H61UR/uI4j6XkNTJbAC0j23CE9GSuxjmQwsf5/ TZO2uDhSSeC0QsgDNSJi52o1/4O3lQKzzm85xY1a7nkLdoU21ifU1G8wGZ0W61znBjo4 wBvlpyPyxs6NqPLeWfGeDhKyYrdMI/vdNL8Xsd+1fPHsFUrIR4CN+bcEGKXLII1rtrQ4 Av6nK3gnuC48N6nkX7naBgCofYTPG36Qsbfk8jKeSnanKOH0Uvb9kEit9w6T3T8K/C1U yGsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768205477; x=1768810277; h=cc:to: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=+aW01MHjFglmw8m1Dm+eiQDA4p0GQEOO6R0QXAKCp4Q=; b=px5eq76Fs57tcI71/Tc/ALMVJeXPyBmlGmaR7MerHULbrONeCOk87NGTt52HPsWQ/3 Q2xivHzsG730VIUmxgr+EI4pZv1+AhSha1nPIhfI819nYc5v8c/jx8Nl4RTM4KgcjlN5 lIm/Qh+NI0hKFIpwNzbwyjsVJ3QgfRLSCnhGoKPRo3tnmetJR3zOce4EOQi/0CNPm8yO 08stZIhGW+KbS5qQPtAEQ86oXYAEjyhzfAeHzpwY6LlT+qsc7i8JE8Bu5joRMxglxVKO srBAjzYcEcX77rK8ph52RbpAYQp4fACKzXp8NWKKvdi+ADmBYo6vB5u1h+ugU4fanEG/ XiBQ== X-Forwarded-Encrypted: i=1; AJvYcCXjNBaHpgKQsXLp8RdhpWVoM6xdxqD83jkyvA09UbT99lGnNzOtXt5zbz9WqiirUGqXPvrorO6v9a2oT3E=@vger.kernel.org X-Gm-Message-State: AOJu0YzEPOHgbIhJ6mGkqtj6xg+mA5o9+usURAvCGb7cGh5fHnYBX/ZM Sl3MVxvcUKjmxD8LBbBGGc+rEDY7R1DumRM5LWac6RDjzkbdn5pYjtSR8QwkB3MsB2zdsqf4be2 XjL2zB2TGVNwQCTiyC17OuepY30rqnEgO2xTNDLWnWG0ofMcOHUdCvt3Hd5FFvNyw8PM= X-Gm-Gg: AY/fxX4KTNWqDnlJcz4KuyP8Tm0bPBauO72flqZ6Bs4cQSXvrpET41mHbs0fjisStVg TFl+OjFDShkgWbotfekqs1pOZ8bkW0ZIcDGNuKQopTfuRpfNvK//yYvZz9JBzEz4bgLhphUshou XfytSuv546CkxSgdr2dYHmnbh5+XV+b3mX3DhF3oQd/tyGyfs8roP8uhKKq85FeL9KEN6ZMl8vx 6qTc7xo1UXtjETGkN4FNcz1xhQn5osxpyEtjhMwEAfU0lBy+M4m36x7tNc1vVnh/rhaisihCTfS 1Xt0AUVQpwxBM7vAU7ESrza9R03SY2oq97I8r0/Fx7KTXswHyzS3XFo4QbnYZ3X7KAlso3B4Sln MP/gf7nXu7yR2UZv8PFT34kMRwN5Qwv2rJVAZDSL0PI9tViMQsuNcwwm2xAoiz70k X-Received: by 2002:a05:7022:41a8:b0:11e:3e9:3ea2 with SMTP id a92af1059eb24-121f8b9ff28mr16780791c88.49.1768205477217; Mon, 12 Jan 2026 00:11:17 -0800 (PST) X-Google-Smtp-Source: AGHT+IH0dh1tKE35w+qhEQZR0WEWIHO46+PK3rynuF8rypSXo2l6vQvT+YkeZQSk6zTDK210PtB9ug== X-Received: by 2002:a05:7022:41a8:b0:11e:3e9:3ea2 with SMTP id a92af1059eb24-121f8b9ff28mr16780777c88.49.1768205476586; Mon, 12 Jan 2026 00:11:16 -0800 (PST) Received: from hu-hangxian-lv.qualcomm.com (Global_NAT1.qualcomm.com. [129.46.96.20]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-121f24985d1sm23991992c88.16.2026.01.12.00.11.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jan 2026 00:11:16 -0800 (PST) From: Hangxiang Ma Date: Mon, 12 Jan 2026 00:11:09 -0800 Subject: [PATCH v2] media: camss: csiphy: Make CSIPHY status macro cross-platform 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: <20260112-camss-extended-csiphy-macro-v2-1-ee7342f2aaf5@oss.qualcomm.com> X-B4-Tracking: v=1; b=H4sIAJysZGkC/zWP3Q7CIAyFX2Xh2hqYG7pd+R7GCwbFEWVMyozG+ O42/ly0yUnb7/Q8BWEOSKKvniLjLVBIE4t6VQk7mumEEBxrUctaS6UUWBOJAO8FJ4cOLIV5fEA 0Nidodnro/GboWukFE+aMPtw/9MORtc8pQhkzmj+zVbLe8PUZ/yQqpiz0A3Kx2Xwxxacc4aZAQ bttdNNo553Vex6vr4u52BTjmtvPNeN14Sjlay0GQ8znlVD6auLf4RtHduL4er0BNn8A4AQBAAA = X-Change-ID: 20260111-camss-extended-csiphy-macro-486b9f3b950f To: Robert Foss , Todor Tomov , Bryan O'Donoghue , Vladimir Zapolskiy , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Hangxiang Ma X-Mailer: b4 0.14.3 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTEyMDA2MyBTYWx0ZWRfX3jNKnbq94JUM tQyJ/P8ET6GolJ1ueAuaLpuLNmoTuY48mC6u3ZUYMiRZmKet+vcEVGbKkB5xNiN0bnimQgRAl3r 4L2CP/mk/gYtSnhZ6SJ6m69S4MxcT4K1M9S9NEe4cFKl526E0wecJ/eyrLoOOmng/tHtB9LvsOY 29O6JUys3CGwAVfUpub9hs/Y5G3VFovyquVa7nXVL22x4Ql1F041+84xOtg8wldi/GiXZ9NXRBv N2F2D6CfrAQsP/rOhS6c/AZisl6Uq0KYdGkZPrgOvVnCvMwl3v3R6iIq/VBpPFJUj5CJCSNWEnH DAfF5wOqUoV7djAfHLh63faG01iklo0InO2UG75ZKUKrkMOrjQyeHRtZpG63bK4SSzn9QBqinev 7qyCisdVfZVCnTG40D7WPDj4+RE77g7yu3YkGJ8BCA4qQNkg4xTSRZDwhkcny0HzvpFbtlot6U1 UWHS8kbkwsR5crIUxSg== X-Authority-Analysis: v=2.4 cv=JP02csKb c=1 sm=1 tr=0 ts=6964aca6 cx=c_pps a=PfFC4Oe2JQzmKTvty2cRDw==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=IkcTkHD0fZMA:10 a=vUbySO9Y5rIA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=VwQbUJbxAAAA:8 a=EUspDBNiAAAA:8 a=9Q_BnDspRnD-vgfqZOIA:9 a=QEXdDO2ut3YA:10 a=6Ab_bkdmUrQuMsNx7PHu:22 X-Proofpoint-GUID: pQnJKwFmTwRbcKh67K1dGLRMpuqkU2cz X-Proofpoint-ORIG-GUID: pQnJKwFmTwRbcKh67K1dGLRMpuqkU2cz X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2026-01-12_02,2026-01-09_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 bulkscore=0 priorityscore=1501 impostorscore=0 suspectscore=0 clxscore=1015 malwarescore=0 adultscore=0 spamscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2512120000 definitions=main-2601120063 The current value of '0xb0' that represents the offset to the status registers within the common registers of the CSIPHY has been changed on the newer SOCs and it requires generalizing the macro using a new variable 'common_status_offset'. This variable is initialized in the csiphy_init() function. Signed-off-by: Hangxiang Ma Reviewed-by: Bryan O'Donoghue --- This change introduces common_status_offset to replace the hardcoded offset in CSIPHY_3PH_CMN_CSI_COMMON_STATUSn. --- Changes in v2: - Rebase this series due to conflict - bod - Link to v1: https://lore.kernel.org/r/20251023-make-csiphy-status-macro-c= ross-platform-v1-1-5746446dfdc6@oss.qualcomm.com --- .../media/platform/qcom/camss/camss-csiphy-3ph-1-0.c | 19 +++++++++++++--= ---- drivers/media/platform/qcom/camss/camss-csiphy.h | 1 + 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c b/dri= vers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c index 619abbf60781..d70d4f611798 100644 --- a/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c +++ b/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c @@ -46,7 +46,8 @@ #define CSIPHY_3PH_CMN_CSI_COMMON_CTRL5_CLK_ENABLE BIT(7) #define CSIPHY_3PH_CMN_CSI_COMMON_CTRL6_COMMON_PWRDN_B BIT(0) #define CSIPHY_3PH_CMN_CSI_COMMON_CTRL6_SHOW_REV_ID BIT(1) -#define CSIPHY_3PH_CMN_CSI_COMMON_STATUSn(offset, n) ((offset) + 0xb0 + 0x= 4 * (n)) +#define CSIPHY_3PH_CMN_CSI_COMMON_STATUSn(offset, common_status_offset, n)= \ + ((offset) + (common_status_offset) + 0x4 * (n)) =20 #define CSIPHY_DEFAULT_PARAMS 0 #define CSIPHY_LANE_ENABLE 1 @@ -810,13 +811,17 @@ static void csiphy_hw_version_read(struct csiphy_devi= ce *csiphy, CSIPHY_3PH_CMN_CSI_COMMON_CTRLn(regs->offset, 6)); =20 hw_version =3D readl_relaxed(csiphy->base + - CSIPHY_3PH_CMN_CSI_COMMON_STATUSn(regs->offset, 12)); + CSIPHY_3PH_CMN_CSI_COMMON_STATUSn(regs->offset, + regs->common_status_offset, 12)); hw_version |=3D readl_relaxed(csiphy->base + - CSIPHY_3PH_CMN_CSI_COMMON_STATUSn(regs->offset, 13)) << 8; + CSIPHY_3PH_CMN_CSI_COMMON_STATUSn(regs->offset, + regs->common_status_offset, 13)) << 8; hw_version |=3D readl_relaxed(csiphy->base + - CSIPHY_3PH_CMN_CSI_COMMON_STATUSn(regs->offset, 14)) << 16; + CSIPHY_3PH_CMN_CSI_COMMON_STATUSn(regs->offset, + regs->common_status_offset, 14)) << 16; hw_version |=3D readl_relaxed(csiphy->base + - CSIPHY_3PH_CMN_CSI_COMMON_STATUSn(regs->offset, 15)) << 24; + CSIPHY_3PH_CMN_CSI_COMMON_STATUSn(regs->offset, + regs->common_status_offset, 15)) << 24; =20 dev_dbg(dev, "CSIPHY 3PH HW Version =3D 0x%08x\n", hw_version); } @@ -845,7 +850,8 @@ static irqreturn_t csiphy_isr(int irq, void *dev) for (i =3D 0; i < 11; i++) { int c =3D i + 22; u8 val =3D readl_relaxed(csiphy->base + - CSIPHY_3PH_CMN_CSI_COMMON_STATUSn(regs->offset, i)); + CSIPHY_3PH_CMN_CSI_COMMON_STATUSn(regs->offset, + regs->common_status_offset, i)); =20 writel_relaxed(val, csiphy->base + CSIPHY_3PH_CMN_CSI_COMMON_CTRLn(regs->offset, c)); @@ -1086,6 +1092,7 @@ static int csiphy_init(struct csiphy_device *csiphy) =20 csiphy->regs =3D regs; regs->offset =3D 0x800; + regs->common_status_offset =3D 0xb0; =20 switch (csiphy->camss->res->version) { case CAMSS_845: diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.h b/drivers/med= ia/platform/qcom/camss/camss-csiphy.h index 895f80003c44..2d5054819df7 100644 --- a/drivers/media/platform/qcom/camss/camss-csiphy.h +++ b/drivers/media/platform/qcom/camss/camss-csiphy.h @@ -90,6 +90,7 @@ struct csiphy_device_regs { const struct csiphy_lane_regs *lane_regs; int lane_array_size; u32 offset; + u32 common_status_offset; }; =20 struct csiphy_device { --- base-commit: 31d167f54de93f14fa8e4bc6cbc4adaf7019fd94 change-id: 20260111-camss-extended-csiphy-macro-486b9f3b950f Best regards, --=20 Hangxiang Ma