| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20250911-add-displayport-support-for-qcs615-platform-v4-6-2702bdda14ed@oss.qualcomm.com>
Date: Thu, 11 Sep 2025 22:55:03 +0800
From: Xiangxu Yin <xiangxu.yin@....qualcomm.com>
To: Vinod Koul <vkoul@...nel.org>, Kishon Vijay Abraham I <kishon@...nel.org>,
Rob Herring <robh@...nel.org>,
Krzysztof Kozlowski <krzk+dt@...nel.org>,
Conor Dooley <conor+dt@...nel.org>,
Philipp Zabel <p.zabel@...gutronix.de>,
Rob Clark <robin.clark@....qualcomm.com>,
Dmitry Baryshkov <lumag@...nel.org>,
Abhinav Kumar <abhinav.kumar@...ux.dev>,
Jessica Zhang <jessica.zhang@....qualcomm.com>,
Sean Paul <sean@...rly.run>,
Marijn Suijten <marijn.suijten@...ainline.org>,
David Airlie <airlied@...il.com>, Simona Vetter <simona@...ll.ch>
Cc: linux-arm-msm@...r.kernel.org, linux-phy@...ts.infradead.org,
devicetree@...r.kernel.org, linux-kernel@...r.kernel.org,
dri-devel@...ts.freedesktop.org, freedreno@...ts.freedesktop.org,
fange.zhang@....qualcomm.com, yongxing.mou@....qualcomm.com,
li.liu@....qualcomm.com, tingwei.zhang@....qualcomm.com,
Dmitry Baryshkov <dmitry.baryshkov@....qualcomm.com>,
Bjorn Andersson <andersson@...nel.org>,
Konrad Dybcio <konradybcio@...nel.org>,
Xiangxu Yin <xiangxu.yin@....qualcomm.com>
Subject: [PATCH v4 06/13] phy: qcom: qmp-usbc: Move reset config into PHY
cfg
Move reset configuration to be managed via qmp_phy_cfg instead of
hardcoded lists. This enables per-PHY customization and simplifies
initialization logic for USB-only and USB/DP switchable PHYs.
Signed-off-by: Xiangxu Yin <xiangxu.yin@....qualcomm.com>
---
drivers/phy/qualcomm/phy-qcom-qmp-usbc.c | 56 ++++++++++++++++++--------------
1 file changed, 31 insertions(+), 25 deletions(-)
diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-usbc.c b/drivers/phy/qualcomm/phy-qcom-qmp-usbc.c
index 23a0efa7fc4418f379ac4c02fd92080c7755dead..663024b8c09124f2991b8e0537a9feb60baaa686 100644
--- a/drivers/phy/qualcomm/phy-qcom-qmp-usbc.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-usbc.c
@@ -415,7 +415,8 @@ struct qmp_phy_cfg {
int (*configure_dp_phy)(struct qmp_usbc *qmp);
int (*calibrate_dp_phy)(struct qmp_usbc *qmp);
- /* regulators to be requested */
+ const char * const *reset_list;
+ int num_resets;
const struct regulator_bulk_data *vreg_list;
int num_vregs;
@@ -447,7 +448,6 @@ struct qmp_usbc {
struct clk_hw dp_pixel_hw;
struct clk_bulk_data *clks;
int num_clks;
- int num_resets;
struct reset_control_bulk_data *resets;
struct regulator_bulk_data *vregs;
@@ -508,6 +508,10 @@ static const char * const usb3phy_reset_l[] = {
"phy_phy", "phy",
};
+static const char * const usb3dpphy_reset_l[] = {
+ "phy_phy", "dp_phy",
+};
+
static const struct regulator_bulk_data qmp_phy_msm8998_vreg_l[] = {
{ .supply = "vdda-phy", .init_load_uA = 68600 },
{ .supply = "vdda-pll", .init_load_uA = 14200 },
@@ -572,6 +576,8 @@ static const struct qmp_phy_cfg msm8998_usb3phy_cfg = {
.rx_tbl_num = ARRAY_SIZE(msm8998_usb3_rx_tbl),
.pcs_tbl = msm8998_usb3_pcs_tbl,
.pcs_tbl_num = ARRAY_SIZE(msm8998_usb3_pcs_tbl),
+ .reset_list = usb3phy_reset_l,
+ .num_resets = ARRAY_SIZE(usb3phy_reset_l),
.vreg_list = qmp_phy_msm8998_vreg_l,
.num_vregs = ARRAY_SIZE(qmp_phy_msm8998_vreg_l),
.regs = qmp_v3_usb3phy_regs_layout,
@@ -588,6 +594,8 @@ static const struct qmp_phy_cfg qcm2290_usb3phy_cfg = {
.rx_tbl_num = ARRAY_SIZE(qcm2290_usb3_rx_tbl),
.pcs_tbl = qcm2290_usb3_pcs_tbl,
.pcs_tbl_num = ARRAY_SIZE(qcm2290_usb3_pcs_tbl),
+ .reset_list = usb3phy_reset_l,
+ .num_resets = ARRAY_SIZE(usb3phy_reset_l),
.vreg_list = qmp_phy_sm2290_vreg_l,
.num_vregs = ARRAY_SIZE(qmp_phy_sm2290_vreg_l),
.regs = qmp_v3_usb3phy_regs_layout_qcm2290,
@@ -604,6 +612,8 @@ static const struct qmp_phy_cfg sdm660_usb3phy_cfg = {
.rx_tbl_num = ARRAY_SIZE(sdm660_usb3_rx_tbl),
.pcs_tbl = qcm2290_usb3_pcs_tbl,
.pcs_tbl_num = ARRAY_SIZE(qcm2290_usb3_pcs_tbl),
+ .reset_list = usb3phy_reset_l,
+ .num_resets = ARRAY_SIZE(usb3phy_reset_l),
.vreg_list = qmp_phy_msm8998_vreg_l,
.num_vregs = ARRAY_SIZE(qmp_phy_msm8998_vreg_l),
.regs = qmp_v3_usb3phy_regs_layout_qcm2290,
@@ -620,6 +630,8 @@ static const struct qmp_phy_cfg qcs615_usb3phy_cfg = {
.rx_tbl_num = ARRAY_SIZE(qcm2290_usb3_rx_tbl),
.pcs_tbl = qcm2290_usb3_pcs_tbl,
.pcs_tbl_num = ARRAY_SIZE(qcm2290_usb3_pcs_tbl),
+ .reset_list = usb3phy_reset_l,
+ .num_resets = ARRAY_SIZE(usb3phy_reset_l),
.vreg_list = qmp_phy_qcs615_vreg_l,
.num_vregs = ARRAY_SIZE(qmp_phy_qcs615_vreg_l),
.regs = qmp_v3_usb3phy_regs_layout_qcm2290,
@@ -653,6 +665,9 @@ static const struct qmp_phy_cfg qcs615_usb3dp_phy_cfg = {
.swing_tbl = &qmp_dp_voltage_swing_hbr2_rbr,
.pre_emphasis_tbl = &qmp_dp_pre_emphasis_hbr2_rbr,
+
+ .reset_list = usb3dpphy_reset_l,
+ .num_resets = ARRAY_SIZE(usb3dpphy_reset_l),
.vreg_list = qmp_phy_qcs615_vreg_l,
.num_vregs = ARRAY_SIZE(qmp_phy_qcs615_vreg_l),
};
@@ -671,13 +686,13 @@ static int qmp_usbc_com_init(struct phy *phy)
return ret;
}
- ret = reset_control_bulk_assert(qmp->num_resets, qmp->resets);
+ ret = reset_control_bulk_assert(cfg->num_resets, qmp->resets);
if (ret) {
dev_err(qmp->dev, "reset assert failed\n");
goto err_disable_regulators;
}
- ret = reset_control_bulk_deassert(qmp->num_resets, qmp->resets);
+ ret = reset_control_bulk_deassert(cfg->num_resets, qmp->resets);
if (ret) {
dev_err(qmp->dev, "reset deassert failed\n");
goto err_disable_regulators;
@@ -700,7 +715,7 @@ static int qmp_usbc_com_init(struct phy *phy)
return 0;
err_assert_reset:
- reset_control_bulk_assert(qmp->num_resets, qmp->resets);
+ reset_control_bulk_assert(cfg->num_resets, qmp->resets);
err_disable_regulators:
regulator_bulk_disable(cfg->num_vregs, qmp->vregs);
@@ -712,7 +727,7 @@ static int qmp_usbc_com_exit(struct phy *phy)
struct qmp_usbc *qmp = phy_get_drvdata(phy);
const struct qmp_phy_cfg *cfg = qmp->cfg;
- reset_control_bulk_assert(qmp->num_resets, qmp->resets);
+ reset_control_bulk_assert(cfg->num_resets, qmp->resets);
clk_bulk_disable_unprepare(qmp->num_clks, qmp->clks);
@@ -939,25 +954,22 @@ static const struct dev_pm_ops qmp_usbc_pm_ops = {
qmp_usbc_runtime_resume, NULL)
};
-static int qmp_usbc_reset_init(struct qmp_usbc *qmp,
- const char *const *reset_list,
- int num_resets)
+static int qmp_usbc_reset_init(struct qmp_usbc *qmp)
{
+ const struct qmp_phy_cfg *cfg = qmp->cfg;
struct device *dev = qmp->dev;
int i;
int ret;
- qmp->resets = devm_kcalloc(dev, num_resets,
+ qmp->resets = devm_kcalloc(dev, cfg->num_resets,
sizeof(*qmp->resets), GFP_KERNEL);
if (!qmp->resets)
return -ENOMEM;
- for (i = 0; i < num_resets; i++)
- qmp->resets[i].id = reset_list[i];
+ for (i = 0; i < cfg->num_resets; i++)
+ qmp->resets[i].id = cfg->reset_list[i];
- qmp->num_resets = num_resets;
-
- ret = devm_reset_control_bulk_get_exclusive(dev, num_resets, qmp->resets);
+ ret = devm_reset_control_bulk_get_exclusive(dev, cfg->num_resets, qmp->resets);
if (ret)
return dev_err_probe(dev, ret, "failed to get resets\n");
@@ -1147,11 +1159,6 @@ static int qmp_usbc_parse_dt_legacy(struct qmp_usbc *qmp, struct device_node *np
qmp->num_clks = ret;
- ret = qmp_usbc_reset_init(qmp, usb3phy_legacy_reset_l,
- ARRAY_SIZE(usb3phy_legacy_reset_l));
- if (ret)
- return ret;
-
return 0;
}
@@ -1191,11 +1198,6 @@ static int qmp_usbc_parse_dt(struct qmp_usbc *qmp)
"failed to get pipe clock\n");
}
- ret = qmp_usbc_reset_init(qmp, usb3phy_reset_l,
- ARRAY_SIZE(usb3phy_reset_l));
- if (ret)
- return ret;
-
return 0;
}
@@ -1246,6 +1248,10 @@ static int qmp_usbc_probe(struct platform_device *pdev)
mutex_init(&qmp->phy_mutex);
+ ret = qmp_usbc_reset_init(qmp);
+ if (ret)
+ return ret;
+
ret = devm_regulator_bulk_get_const(qmp->dev, qmp->cfg->num_vregs,
qmp->cfg->vreg_list, &qmp->vregs);
if (ret)
--
2.34.1
Powered by blists - more mailing lists