From nobody Sat Oct 4 06:35:20 2025 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 77C922E2EE0 for ; Wed, 20 Aug 2025 09:36:55 +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=1755682616; cv=none; b=snRbcjZVauC1w4kpQRBEJ9bSvlfxO1QEt+BFP7rKBy04SBE4o3d+xZycY77lROvK4YRc5B3rYrVHu0+UsuRzo3mqE+ypjXLB+PHWORcuWl3I3UfKNovDxsjKpVax/cSanSAwqaMEjlRoFp6MUF9FIPss6fSmpRnofzFTq0g5vr0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755682616; c=relaxed/simple; bh=8SfAQGpi+yUv2dTRnynA3znbrVsz13vaL37uOPN+CiE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=t3/nfHZ9C0u2nPEbrqbDMlQgi8WtE+O6X4C9LlRnzEngR/ujVdOJa3EEte1LywG7ru84ig+FWrUOz8B9Mg6wQstbPTmbyJJh5Jqv5MPwYJRq3+aTHXeoOdOUDFooQTUp4P+eiZckTgjAXqbCQ/PbFt2YpbUWYRbkw7sewlBXeKY= 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=i5i5K51V; 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="i5i5K51V" Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 57K1p1LA021225 for ; Wed, 20 Aug 2025 09:36:55 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= EiqMoI4JzvXNo2OI+vMv9/E2sr+3B1BPWFAmLWZP5+Y=; b=i5i5K51VzY3VjdIJ aS94w234CiSxu8WBqcM8K8tHRM9nkPNobo14VgGiiRVieIY8Lru0jaIgiOj37Gte hsc6iTqyIeUqgs3TsH3gtfDptsrCPZvOdtMtM7zIm1d4eNwFHw+djTixIsnHG1W4 CJnT4b9aD1ZmbpIojN0gd88Mk3KqhSnfd91da/2nenq2j3Zv+VPVhI+ttjYz2MV/ TmGbnAVmlsEIbMPUMiF31Dwq+rShi0LdbScbRp0xssLr/vdWWtPOOnspO6+dKZJd GqGm3K3rtefD9gYUzIe18m2IDYsyqbe+8pD2axC+mUqBhgaZiYQa0hS/uTSqnRjR WRg9/A== Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 48n529175h-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 20 Aug 2025 09:36:54 +0000 (GMT) Received: by mail-pj1-f72.google.com with SMTP id 98e67ed59e1d1-324e4dd1237so102088a91.3 for ; Wed, 20 Aug 2025 02:36:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755682614; x=1756287414; 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=EiqMoI4JzvXNo2OI+vMv9/E2sr+3B1BPWFAmLWZP5+Y=; b=IeT+Ok1Q/A2sbprLYm1PzNZEDTf58Q7VpYDYeXTRLOQgdHVkJ3oWG+6FAo7JiMcMw9 CHEPR4N4CjmbM7LYlsDx9wOMFKf+pz4uoaABIbBKES3r0DFFoJeO4iO3tpXU8/nOQ+3Q ITDQ+YDLJtfCS8ZWrwAxzVlU9wMRzK4gTfDtJ8ul2iPnZHqIwlMI+m5V3P3+RqVVFDGW /ZMK2eSGF2D5Mh64JtIxs0jisJyK9pF7Zhm+1M71Gz2IIe5L/GEOQW1LrV0WdWsybBCQ h29VJRQ+15c6OSUb7ImQQJ+9oOg+rZSJKrREKkfvSlBaulCmecPafjmndNbM51hDe076 IxJw== X-Forwarded-Encrypted: i=1; AJvYcCXR6wApwkMx4Wtg9viVl/o++d7NoY8j2iCyEZT7m7utRERz/AUQjzhSR2AGFxl2eRNPgf1icUBa5xmhGqs=@vger.kernel.org X-Gm-Message-State: AOJu0YzXXyEhtzjAtAd5pRCBatCQwx9qjGhH1L0vjA/Z39gM2e+rdYBG 7mmznDgeV5wnBfMJ/E1pJjuRpNCybgRkQZrlUNAkYlk8Bkam0emSD5Q+aPr62X+e6O8kQjLrdPm pES7vY+Nn4XdTVJCEJJbPDM7vsz5AaG9yqRgmrngtskoLL6BXoQnKQ1hdeA7vSKus2Mo= X-Gm-Gg: ASbGncszwp07YFJP00C0y8Jz/w3Da4bZbPSq396S7LNFoQLKWBTNQzWd/8Gokg43YLY 3ip8YwwGKDeS1yZOxHAaAeRJkWa295xUIsG2WvxfrfulCC2AE2YT5ILnnQmGRuuHNk0bLerPUc5 ECWutUD4OdjxUrlMlYy0c9lKf8M8kSDFAynGrVukHnE/XSYWsrqXyNpVKKaz3H7eRjt7wz4kikP DiQfbWIgLcduK63n0UFnmwavTH9T0AHUjGD0u5ZGNqdAg2f9L/gWS1SeHSHFXGQEoRVPBl1sU56 St5oAY8ZxTbpx8Frp8t0cxCSxfy6q+36hJiRGjsCFwgl4MQhg5mAzRKvohCip+tICB9/GfS30yf NJoJkm0WhXb7mUfJLHZwyFxTmcKCBerg3CUo6+UITblpwHRCs2+uWnTsg X-Received: by 2002:a17:902:daca:b0:234:a734:4abe with SMTP id d9443c01a7336-245ef1194b6mr14859775ad.1.1755682613864; Wed, 20 Aug 2025 02:36:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEV7XczXGg+baMxpdPCDKJVe4daNFvXZ8uriv0ZV0NgSr3ufsFfCG+bU3sovl88l80hbl3fxQ== X-Received: by 2002:a17:902:daca:b0:234:a734:4abe with SMTP id d9443c01a7336-245ef1194b6mr14859415ad.1.1755682613297; Wed, 20 Aug 2025 02:36:53 -0700 (PDT) Received: from sziotdisp01-gv.qualcomm.com.ap.qualcomm.com (tpe-colo-wan-fw-bordernet.qualcomm.com. [103.229.16.4]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-245ed4ec100sm20954305ad.116.2025.08.20.02.36.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Aug 2025 02:36:53 -0700 (PDT) From: Xiangxu Yin Date: Wed, 20 Aug 2025 17:34:52 +0800 Subject: [PATCH v3 10/14] phy: qcom: qmp-usbc: Add TCSR parsing and USB/DP mode mutex handling 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: <20250820-add-displayport-support-for-qcs615-platform-v3-10-a43bd25ec39c@oss.qualcomm.com> References: <20250820-add-displayport-support-for-qcs615-platform-v3-0-a43bd25ec39c@oss.qualcomm.com> In-Reply-To: <20250820-add-displayport-support-for-qcs615-platform-v3-0-a43bd25ec39c@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Kuogee Hsieh , Vinod Koul , Kishon Vijay Abraham I , Philipp Zabel Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-phy@lists.infradead.org, fange.zhang@oss.qualcomm.com, yongxing.mou@oss.qualcomm.com, tingwei.zhang@oss.qualcomm.com, Bjorn Andersson , Konrad Dybcio , Dmitry Baryshkov , quic_lliu6@quicinc.com, Xiangxu Yin X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1755682521; l=4819; i=xiangxu.yin@oss.qualcomm.com; s=20241125; h=from:subject:message-id; bh=8SfAQGpi+yUv2dTRnynA3znbrVsz13vaL37uOPN+CiE=; b=NZbfeQ7MIews2c994APJqTp1cKp2WwFGhQ9P3iCZ9j30J14hF6JXR77pmUSBHOcaZgXBF4Iut APGQfDl0cyiDRdS4epEMP/Xd4Y2x5f3zQA8w1SnQupEMTBo2cBLsRgy X-Developer-Key: i=xiangxu.yin@oss.qualcomm.com; a=ed25519; pk=F1TwipJzpywfbt3n/RPi4l/A4AVF+QC89XzCHgZYaOc= X-Proofpoint-GUID: VdSFfgkIr7F7pwM0gxIyLiUBXny7vV2X X-Proofpoint-ORIG-GUID: VdSFfgkIr7F7pwM0gxIyLiUBXny7vV2X X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwODIwMDAxMyBTYWx0ZWRfX7PDhv19nfUaS XZKtAZV7npiOVEJPRKnhvqpnIAcDG0FDUsOnV8XbDjzVj03Fz/gTZt99XJt5tJ/iGTNKGgPhJJy RKdgeadfh+P4ilOktXm0EQmnWTA/tt3y1lI7zmVTf4hldICuFaa8M2EBoJz3cAKA9tJWarARU6U yf+xQHsnxA6g2w2XqSMADnS22Q5FxO5qcLKmv7MHrshcO2bRTDO9juegrgXsYT7LMdOVN5A79eT g6TS0qqK0e1oi21zOUUXOLUOO/XYxSpSdTr/H0KnrezdLuGTU8uDEi+9OW1rYUR2iz7c1B0Ne09 6Ipy7q1DyD8z/UyqXgn6oDye84dKP+WKQiivM1TWuQZGf8OaVTZoYw5qq8S8z497WwGtZtfScfB 2A5AZz38nIAG+15DiP43nJAJL8299w== X-Authority-Analysis: v=2.4 cv=SPkblOvH c=1 sm=1 tr=0 ts=68a59736 cx=c_pps a=RP+M6JBNLl+fLTcSJhASfg==:117 a=nuhDOHQX5FNHPW3J6Bj6AA==:17 a=IkcTkHD0fZMA:10 a=2OwXVqhp2XgA:10 a=EUspDBNiAAAA:8 a=tJYjrKaco4gsmSPR8FUA:9 a=QEXdDO2ut3YA:10 a=iS9zxrgQBfv6-_F4QbHw:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-08-20_03,2025-08-20_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 priorityscore=1501 bulkscore=0 spamscore=0 phishscore=0 impostorscore=0 adultscore=0 malwarescore=0 lowpriorityscore=0 clxscore=1015 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2508110000 definitions=main-2508200013 Parse TCSR registers to support DP mode signaling via dp_phy_mode_reg. Introduce mutual exclusion between USB and DP PHY modes to prevent simultaneous activation. Also update com_init/com_exit to reflect DP mode initialization and cleanup. Signed-off-by: Xiangxu Yin --- drivers/phy/qualcomm/phy-qcom-qmp-usbc.c | 60 +++++++++++++++++++++++++---= ---- 1 file changed, 47 insertions(+), 13 deletions(-) diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-usbc.c b/drivers/phy/qualcom= m/phy-qcom-qmp-usbc.c index a1495a2029cf038bb65c36e42d0a4f633e544558..821398653bef23e1915d9d3a3a2= 950b0bfbefb9a 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp-usbc.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp-usbc.c @@ -674,7 +674,7 @@ static const struct qmp_phy_cfg qcs615_usb3dp_phy_cfg = =3D { .num_vregs =3D ARRAY_SIZE(qmp_phy_usbdp_vreg_l), }; =20 -static int qmp_usbc_com_init(struct phy *phy) +static int qmp_usbc_com_init(struct phy *phy, bool is_dp) { struct qmp_usbc *qmp =3D phy_get_drvdata(phy); const struct qmp_phy_cfg *cfg =3D qmp->cfg; @@ -704,15 +704,20 @@ static int qmp_usbc_com_init(struct phy *phy) if (ret) goto err_assert_reset; =20 - qphy_setbits(pcs, cfg->regs[QPHY_PCS_POWER_DOWN_CONTROL], SW_PWRDN); + if (!is_dp) { + qphy_setbits(pcs, cfg->regs[QPHY_PCS_POWER_DOWN_CONTROL], SW_PWRDN); =20 #define SW_PORTSELECT_VAL BIT(0) #define SW_PORTSELECT_MUX BIT(1) - /* Use software based port select and switch on typec orientation */ - val =3D SW_PORTSELECT_MUX; - if (qmp->orientation =3D=3D TYPEC_ORIENTATION_REVERSE) - val |=3D SW_PORTSELECT_VAL; - writel(val, qmp->pcs_misc); + /* Use software based port select and switch on typec orientation */ + val =3D SW_PORTSELECT_MUX; + if (qmp->orientation =3D=3D TYPEC_ORIENTATION_REVERSE) + val |=3D SW_PORTSELECT_VAL; + writel(val, qmp->pcs_misc); + } + + if (qmp->tcsr_map && qmp->dp_phy_mode_reg) + regmap_write(qmp->tcsr_map, qmp->dp_phy_mode_reg, is_dp); =20 return 0; =20 @@ -733,6 +738,9 @@ static int qmp_usbc_com_exit(struct phy *phy) =20 clk_bulk_disable_unprepare(qmp->num_clks, qmp->clks); =20 + if (qmp->tcsr_map && qmp->dp_phy_mode_reg) + regmap_write(qmp->tcsr_map, qmp->dp_phy_mode_reg, 0); + regulator_bulk_disable(cfg->num_vregs, qmp->vregs); =20 return 0; @@ -1045,6 +1053,17 @@ static int qmp_usbc_usb_power_off(struct phy *phy) return 0; } =20 +static int qmp_check_mutex_phy(struct qmp_usbc *qmp, bool is_dp) +{ + if ((is_dp && qmp->usb_init_count) || + (!is_dp && qmp->dp_init_count)) { + dev_err(qmp->dev, "%s PHY busy\n", is_dp ? "USB" : "DP"); + return -EBUSY; + } + + return 0; +} + static int qmp_usbc_usb_enable(struct phy *phy) { struct qmp_usbc *qmp =3D phy_get_drvdata(phy); @@ -1052,7 +1071,11 @@ static int qmp_usbc_usb_enable(struct phy *phy) =20 mutex_lock(&qmp->phy_mutex); =20 - ret =3D qmp_usbc_com_init(phy); + ret =3D qmp_check_mutex_phy(qmp, false); + if (ret) + goto out_unlock; + + ret =3D qmp_usbc_com_init(phy, false); if (ret) goto out_unlock; =20 @@ -1103,7 +1126,11 @@ static int qmp_usbc_dp_enable(struct phy *phy) =20 mutex_lock(&qmp->phy_mutex); =20 - ret =3D qmp_usbc_com_init(phy); + ret =3D qmp_check_mutex_phy(qmp, true); + if (ret) + goto dp_init_unlock; + + ret =3D qmp_usbc_com_init(phy, true); if (ret) goto dp_init_unlock; =20 @@ -1467,7 +1494,7 @@ static int qmp_usbc_typec_switch_set(struct typec_swi= tch_dev *sw, qmp_usbc_usb_power_off(qmp->usb_phy); qmp_usbc_com_exit(qmp->usb_phy); =20 - qmp_usbc_com_init(qmp->usb_phy); + qmp_usbc_com_init(qmp->usb_phy, false); qmp_usbc_usb_power_on(qmp->usb_phy); } =20 @@ -1602,13 +1629,13 @@ static int qmp_usbc_parse_usb_dt(struct qmp_usbc *q= mp) return 0; } =20 -static int qmp_usbc_parse_vls_clamp(struct qmp_usbc *qmp) +static int qmp_usbc_parse_tcsr(struct qmp_usbc *qmp) { struct of_phandle_args tcsr_args; struct device *dev =3D qmp->dev; int ret; =20 - /* for backwards compatibility ignore if there is no property */ + /* for backwards compatibility ignore if there is 1 or no property */ ret =3D of_parse_phandle_with_fixed_args(dev->of_node, "qcom,tcsr-reg", 1= , 0, &tcsr_args); if (ret =3D=3D -ENOENT) @@ -1623,6 +1650,13 @@ static int qmp_usbc_parse_vls_clamp(struct qmp_usbc = *qmp) =20 qmp->vls_clamp_reg =3D tcsr_args.args[0]; =20 + ret =3D of_parse_phandle_with_fixed_args(dev->of_node, "qcom,tcsr-reg", 1= , 1, + &tcsr_args); + if (ret =3D=3D -ENOENT) + return 0; + + qmp->dp_phy_mode_reg =3D tcsr_args.args[0]; + return 0; } =20 @@ -1665,7 +1699,7 @@ static int qmp_usbc_probe(struct platform_device *pde= v) if (ret) return ret; =20 - ret =3D qmp_usbc_parse_vls_clamp(qmp); + ret =3D qmp_usbc_parse_tcsr(qmp); if (ret) return ret; =20 --=20 2.34.1