From nobody Mon Feb 9 20:10:51 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 AEE8130E83B for ; Fri, 17 Oct 2025 05:06:20 +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=1760677582; cv=none; b=l2/REckvfB15aJNpLf8FneeHii8HmamixmAnuIjTG1U6HpyAvxeyRM4iU+CrDh/no/1WXUigcYxpHUIU8l3kOnLvK/Na2Av9s9l53fjyDv0Zdfhh5nyu7wrIB94o4cu72PRUYXTqZfDF4OmAG3JapkVuxr/T9+GSoei4SErZcts= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760677582; c=relaxed/simple; bh=gcL/fGPQekLTQNIGUzZcdgTs72eyqB3Ncf8Yq2nY0h4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=RP7mtIvbs9m8w9Ov/GjuBghUxIy7MfRyvZUarnth6ct3ohbjTKbZd28yeGCeuHegMWJBtnnt82KCqiTpBTgqAmjndX9HCxVl7xZULZjacrib/f0wLE67oQ++EB3jqUWiq2t0OjtXWUJM0cmdoEWdxLl4mZHECmURqvoIblSuFjI= 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=cHiQ2Fo2; 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="cHiQ2Fo2" Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 59GKLZ25009578 for ; Fri, 17 Oct 2025 05:06: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= 25vQWjik0NkorLXRn5b4wPZ1S82r4D/v+C/waXiEV9Q=; b=cHiQ2Fo2xS7+oPKa NY5FJacszjQdOVgS44VvvuEy8IfPAPINeNIkQnehgP0b9mQvuOLO1aR9cvOR6V4T nyhPm60JdrtHIV58I1hTZ1JNkhOFLjF3ZHhQZgenA2n+HzXJFxkAxYzKhO4L3QfC gl2Rn+7bC4BGqrc5Fuu8DWyTRYHKNjaNkLMTztNGH6Vw1weQ8fVoG3IC5rw3nZ36 Uu1DndDm+6qPpu3aVSr1ffWX4t3Eq9z0Qbkr2+/vnPszVLniFf13XPIkMI+jiozI 6d7uwrbrNCAr/oAPxaBQpXaELCtbsqPhCBs/wzKHHHzd/fza5TALc5kuskqPQ4KD S2dg9A== Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 49qg0caste-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 17 Oct 2025 05:06:19 +0000 (GMT) Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-87c14264340so26222536d6.2 for ; Thu, 16 Oct 2025 22:06:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760677578; x=1761282378; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=25vQWjik0NkorLXRn5b4wPZ1S82r4D/v+C/waXiEV9Q=; b=RkcpcGPHZ0KBMJpT38C6majC14Tbe4Qpk5sYuSmkmqFM968IMRnhuoiGu50gsTBbFY Jj6EfadnrcP+DU4CUTyps1rNHmGxfccb/JXxJMMz7NW5uPtpBXqHifrMP805RKpfJIFK RsLYoUKJcnaRSRn6mxVCvabEJrZ4tl+bHe0AEAlVWIJQO67tgo1mcvZdQRAXuHTX7jyL kjBNdsBWQjfBAfQ8X0Pjmrqju5xUBpyUFhJmZxzDcI66xtRoAuKX9YjpgTLyd/L42Rwo uwdWsnNgCqrPaa53SOhIHKritMTjmZsevzgQbg/ygvOXdn+R+ygIvXXyP2EyrQmBB6+e /mkw== X-Gm-Message-State: AOJu0YwaeaeX2BMDgmiQzuvJgF/GfDNgDv4rYIOVsbShgV/dhvNvb5X/ pDnvfOi/e43ugOXMzKvOdTwhYolcu/CF6u8lHs3ZctgN9H8FSTfkfJhE8CRHngUhHtNuizw6jhc gFgg5/xNulTcuZGg4czlbChswL1sn/vThKSHRcMrZn6GbSQAbOd0Esj+AjJOzMj08dXM= X-Gm-Gg: ASbGncv2J6ogEyZhoEywoFFVeTu4klf07Z0Fc8kIAY1qkP95Y5Y2x0PfDzpzp/nIPx+ 756tYo4yg5bx9RSZfHh+yJ1ixAz5bWDh0iOAusS5bJf6MrG+yr4c+zi5T2mMGbvhY62smbHbqf5 zVx00pECXuu7V1dWaLI+6CD6YTSCVLpFwukZuAPyZXOC/QEvmUWtVh9dWU8SPOzmeUb6fY2E7Ik gqaz25xs3Eukn2Kfz0d35TcMvRbZcGLYQDxxDsfhdDSbsEKNkaH6E8ewYRcFwymJUQH1g8NOw3G WKcdZeDyB7ByMYGvchH1x+wCbL3q6Q0Ek42vzmfDYlOf3Obj0piKCWTUym6xOyEAHeJ+1LQgYBN Nshlx0/z4R1HUDXGB1KGGse73EOqDZWt5jLHj/FI0MbecSzlXh9KRZJvhquTcaw6CAQ== X-Received: by 2002:ac8:578b:0:b0:4e5:6c5e:430a with SMTP id d75a77b69052e-4e89d3a47c8mr36061821cf.64.1760677578241; Thu, 16 Oct 2025 22:06:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGWoFJ0er3XmNA2MfPambnFGk+UHtKnSzrmBzbda9gHXA03fZsIi/ofXmuuwW4bOSbI87KnLg== X-Received: by 2002:ac8:578b:0:b0:4e5:6c5e:430a with SMTP id d75a77b69052e-4e89d3a47c8mr36061541cf.64.1760677577565; Thu, 16 Oct 2025 22:06:17 -0700 (PDT) Received: from WENMLIU-LAB01.ap.qualcomm.com (Global_NAT1_IAD_FW.qualcomm.com. [129.46.232.65]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-87c0128c9d8sm57641916d6.33.2025.10.16.22.06.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Oct 2025 22:06:17 -0700 (PDT) From: Wenmeng Liu Date: Fri, 17 Oct 2025 13:06:02 +0800 Subject: [PATCH v5 2/3] media: qcom: camss: Add link support for TPG 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: <20251017-camss_tpg-v5-2-cafe3ad42163@oss.qualcomm.com> References: <20251017-camss_tpg-v5-0-cafe3ad42163@oss.qualcomm.com> In-Reply-To: <20251017-camss_tpg-v5-0-cafe3ad42163@oss.qualcomm.com> To: Robert Foss , Todor Tomov , Bryan O'Donoghue , Vladimir Zapolskiy , Mauro Carvalho Chehab Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, Wenmeng Liu X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1760677563; l=7448; i=wenmeng.liu@oss.qualcomm.com; s=20250925; h=from:subject:message-id; bh=gcL/fGPQekLTQNIGUzZcdgTs72eyqB3Ncf8Yq2nY0h4=; b=Heo9ljOtLQ/JcSwEKehl45lcRkeQ9+98sYsrLAB3G/8XiHBm9U+DwtH61jDTyI40g6e7sT+wo 8OwvzboEzMbA7s6sM5EwqbQ3iH2aUibjcUR5/u2OjohrU5/ysKmnPW5 X-Developer-Key: i=wenmeng.liu@oss.qualcomm.com; a=ed25519; pk=fQJjf9C3jGDjE1zj2kO3NQLTbQEaZObVcXAzx5WLPX0= X-Proofpoint-GUID: l3rIh5RbszEBhmH7tBit6O-8J353Nozj X-Proofpoint-ORIG-GUID: l3rIh5RbszEBhmH7tBit6O-8J353Nozj X-Authority-Analysis: v=2.4 cv=eaIwvrEH c=1 sm=1 tr=0 ts=68f1cecb cx=c_pps a=UgVkIMxJMSkC9lv97toC5g==:117 a=C3Dk8TwHQYyIj7nOf9RCJw==:17 a=IkcTkHD0fZMA:10 a=x6icFKpwvdMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=D-OMaI2VJto731AKaP4A:9 a=QEXdDO2ut3YA:10 a=1HOtulTD9v-eNWfpl4qZ:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMDExMDAyMiBTYWx0ZWRfX1AD7gLncPDqL ckFrPk/82gGaOSbl5tndrgKHjuImzECgfckj2p88iDBoxRgE/mizYa12bH+Ka4CGLUXaLWbuYRl /sOfSUNSsnEG3KmZDTw3yGHdjYF7A/nAuO1km34AkLubIeHZCtNrMld1w6CJ3lNEKBs5XExWRiN loJ1ET5qujQzrM3ViL9xwqrrY/p7rm2CREUjlDB8u+G1LDy+BgQcKpgd5coFVghcdscqyGpOVea ci5vD3vjmPe3UnAhBUCn0Nfxs3K5qldvV7ri85esg9yJ7Np1R8jCZgZRRFenbt6Dz0r/GXrH785 ZTcUdqZ5eNg7fpzh8uccZLPXHYEeklT8CYIfN6QpHI1psVmgogYTaPoBkCK2I0Qic4Q4d70Xp6L v0XongX6nB3PngnbXMRfvaZy5hB1Ug== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-10-17_02,2025-10-13_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 priorityscore=1501 spamscore=0 impostorscore=0 phishscore=0 adultscore=0 lowpriorityscore=0 clxscore=1015 suspectscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2510020000 definitions=main-2510110022 TPG is connected to the csid as an entity, the link needs to be adapted. Signed-off-by: Wenmeng Liu --- drivers/media/platform/qcom/camss/camss-csid.c | 43 +++++++++++++------- drivers/media/platform/qcom/camss/camss-csiphy.c | 1 + drivers/media/platform/qcom/camss/camss-csiphy.h | 2 + drivers/media/platform/qcom/camss/camss.c | 52 ++++++++++++++++++++= ++++ 4 files changed, 84 insertions(+), 14 deletions(-) diff --git a/drivers/media/platform/qcom/camss/camss-csid.c b/drivers/media= /platform/qcom/camss/camss-csid.c index 5284b5857368c37c202cd89dad6ae8042b637537..196cbc0b60e9bf95a06b053c69c= 967e345ffcd4b 100644 --- a/drivers/media/platform/qcom/camss/camss-csid.c +++ b/drivers/media/platform/qcom/camss/camss-csid.c @@ -35,6 +35,8 @@ #define HW_VERSION_REVISION 16 #define HW_VERSION_GENERATION 28 =20 +#define LANE_CFG_BITWIDTH 4 + #define MSM_CSID_NAME "msm_csid" =20 const char * const csid_testgen_modes[] =3D { @@ -1227,18 +1229,22 @@ void msm_csid_get_csid_id(struct media_entity *enti= ty, u8 *id) } =20 /* - * csid_get_lane_assign - Calculate CSI2 lane assign configuration paramet= er - * @lane_cfg - CSI2 lane configuration + * csid_get_lane_assign - Calculate lane assign by csiphy/tpg lane num + * @num: lane num + * @pos_array: Array of lane positions * * Return lane assign */ -static u32 csid_get_lane_assign(struct csiphy_lanes_cfg *lane_cfg) +static u32 csid_get_lane_assign(int num, struct csiphy_lanes_cfg *lane_cfg) { u32 lane_assign =3D 0; + int pos; int i; =20 - for (i =3D 0; i < lane_cfg->num_data; i++) - lane_assign |=3D lane_cfg->data[i].pos << (i * 4); + for (i =3D 0; i < num; i++) { + pos =3D lane_cfg ? lane_cfg->data[i].pos : i; + lane_assign |=3D pos << (i * LANE_CFG_BITWIDTH); + } =20 return lane_assign; } @@ -1266,6 +1272,7 @@ static int csid_link_setup(struct media_entity *entit= y, struct csid_device *csid; struct csiphy_device *csiphy; struct csiphy_lanes_cfg *lane_cfg; + struct tpg_device *tpg; =20 sd =3D media_entity_to_v4l2_subdev(entity); csid =3D v4l2_get_subdevdata(sd); @@ -1277,18 +1284,26 @@ static int csid_link_setup(struct media_entity *ent= ity, return -EBUSY; =20 sd =3D media_entity_to_v4l2_subdev(remote->entity); - csiphy =3D v4l2_get_subdevdata(sd); + if (sd->grp_id =3D=3D TPG_GUP_ID) { + tpg =3D v4l2_get_subdevdata(sd); =20 - /* If a sensor is not linked to CSIPHY */ - /* do no allow a link from CSIPHY to CSID */ - if (!csiphy->cfg.csi2) - return -EPERM; + csid->phy.lane_cnt =3D tpg->res->lane_cnt; + csid->phy.csiphy_id =3D tpg->id; + csid->phy.lane_assign =3D csid_get_lane_assign(csid->phy.lane_cnt, NULL= ); + } else { + csiphy =3D v4l2_get_subdevdata(sd); =20 - csid->phy.csiphy_id =3D csiphy->id; + /* If a sensor is not linked to CSIPHY */ + /* do no allow a link from CSIPHY to CSID */ + if (!csiphy->cfg.csi2) + return -EPERM; =20 - lane_cfg =3D &csiphy->cfg.csi2->lane_cfg; - csid->phy.lane_cnt =3D lane_cfg->num_data; - csid->phy.lane_assign =3D csid_get_lane_assign(lane_cfg); + csid->phy.csiphy_id =3D csiphy->id; + + lane_cfg =3D &csiphy->cfg.csi2->lane_cfg; + csid->phy.lane_cnt =3D lane_cfg->num_data; + csid->phy.lane_assign =3D csid_get_lane_assign(lane_cfg->num_data, lane= _cfg); + } } /* Decide which virtual channels to enable based on which source pads are= enabled */ if (local->flags & MEDIA_PAD_FL_SOURCE) { diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.c b/drivers/med= ia/platform/qcom/camss/camss-csiphy.c index 2de97f58f9ae4f91e8bba39dcadf92bea8cf6f73..680580d7fe46a215777f3fa1b34= 7f4297deea024 100644 --- a/drivers/media/platform/qcom/camss/camss-csiphy.c +++ b/drivers/media/platform/qcom/camss/camss-csiphy.c @@ -799,6 +799,7 @@ int msm_csiphy_register_entity(struct csiphy_device *cs= iphy, sd->flags |=3D V4L2_SUBDEV_FL_HAS_DEVNODE; snprintf(sd->name, ARRAY_SIZE(sd->name), "%s%d", MSM_CSIPHY_NAME, csiphy->id); + sd->grp_id =3D CSIPHY_GUP_ID; v4l2_set_subdevdata(sd, csiphy); =20 ret =3D csiphy_init_formats(sd, NULL); diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.h b/drivers/med= ia/platform/qcom/camss/camss-csiphy.h index 895f80003c441dcacf98435f91567f90afa29279..b7bcf2bdd2124f77b5354b15b33= aa1e0983143e8 100644 --- a/drivers/media/platform/qcom/camss/camss-csiphy.h +++ b/drivers/media/platform/qcom/camss/camss-csiphy.h @@ -21,6 +21,8 @@ #define MSM_CSIPHY_PAD_SRC 1 #define MSM_CSIPHY_PADS_NUM 2 =20 +#define CSIPHY_GUP_ID 1 + struct csiphy_lane { u8 pos; u8 pol; diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/plat= form/qcom/camss/camss.c index 2fbcd0e343aac9620a5a30719c42e1b887cf34ed..2ede19e1347ae32f2f6919905b5= 35352bcd134be 100644 --- a/drivers/media/platform/qcom/camss/camss.c +++ b/drivers/media/platform/qcom/camss/camss.c @@ -3691,6 +3691,19 @@ static int camss_init_subdevices(struct camss *camss) } } =20 + if (camss->tpg) { + for (i =3D 0; i < camss->res->tpg_num; i++) { + ret =3D msm_tpg_subdev_init(camss, &camss->tpg[i], + &res->tpg_res[i], i); + if (ret < 0) { + dev_err(camss->dev, + "Failed to init tpg%d sub-device: %d\n", + i, ret); + return ret; + } + } + } + /* note: SM8250 requires VFE to be initialized before CSID */ for (i =3D 0; i < camss->res->vfe_num; i++) { ret =3D msm_vfe_subdev_init(camss, &camss->vfe[i], @@ -3779,6 +3792,23 @@ static int camss_link_entities(struct camss *camss) } } =20 + for (i =3D 0; i < camss->res->tpg_num; i++) { + for (j =3D 0; j < camss->res->csid_num; j++) { + ret =3D media_create_pad_link(&camss->tpg[i].subdev.entity, + MSM_TPG_PAD_SRC, + &camss->csid[j].subdev.entity, + MSM_CSID_PAD_SINK, + 0); + if (ret < 0) { + camss_link_err(camss, + camss->tpg[i].subdev.entity.name, + camss->csid[j].subdev.entity.name, + ret); + return ret; + } + } + } + if (camss->ispif) { for (i =3D 0; i < camss->res->csid_num; i++) { for (j =3D 0; j < camss->ispif->line_num; j++) { @@ -3883,6 +3913,19 @@ static int camss_register_entities(struct camss *cam= ss) } } =20 + if (camss->tpg) { + for (i =3D 0; i < camss->res->tpg_num; i++) { + ret =3D msm_tpg_register_entity(&camss->tpg[i], + &camss->v4l2_dev); + if (ret < 0) { + dev_err(camss->dev, + "Failed to register tpg%d entity: %d\n", + i, ret); + goto err_reg_tpg; + } + } + } + for (i =3D 0; i < camss->res->csid_num; i++) { ret =3D msm_csid_register_entity(&camss->csid[i], &camss->v4l2_dev); @@ -3926,6 +3969,10 @@ static int camss_register_entities(struct camss *cam= ss) for (i--; i >=3D 0; i--) msm_csid_unregister_entity(&camss->csid[i]); =20 + i =3D camss->res->tpg_num; +err_reg_tpg: + for (i--; i >=3D 0; i--) + msm_tpg_unregister_entity(&camss->tpg[i]); i =3D camss->res->csiphy_num; err_reg_csiphy: for (i--; i >=3D 0; i--) @@ -3947,6 +3994,11 @@ static void camss_unregister_entities(struct camss *= camss) for (i =3D 0; i < camss->res->csiphy_num; i++) msm_csiphy_unregister_entity(&camss->csiphy[i]); =20 + if (camss->tpg) { + for (i =3D 0; i < camss->res->tpg_num; i++) + msm_tpg_unregister_entity(&camss->tpg[i]); + } + for (i =3D 0; i < camss->res->csid_num; i++) msm_csid_unregister_entity(&camss->csid[i]); =20 --=20 2.34.1