From: Johan Hovold <johan+linaro@kernel.org> To: Vinod Koul <vkoul@kernel.org> Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>, Andy Gross <agross@kernel.org>, Bjorn Andersson <andersson@kernel.org>, Konrad Dybcio <konrad.dybcio@somainline.org>, Kishon Vijay Abraham I <kishon@ti.com>, linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org, linux-kernel@vger.kernel.org, Johan Hovold <johan+linaro@kernel.org> Subject: [PATCH v2 01/11] phy: qcom-qmp-pcie: add pcs_misc sanity check Date: Fri, 16 Sep 2022 12:23:30 +0200 [thread overview] Message-ID: <20220916102340.11520-2-johan+linaro@kernel.org> (raw) In-Reply-To: <20220916102340.11520-1-johan+linaro@kernel.org> Make sure that the (otherwise) optional pcs_misc IO region has been provided in case the configuration specifies a corresponding initialisation table to avoid crashing with malformed device trees. Note that the related debug message is now superfluous as the region is only used when the configuration has a pcs_misc table. Fixes: 421c9a0e9731 ("phy: qcom: qmp: Add SDM845 PCIe QMP PHY support") Signed-off-by: Johan Hovold <johan+linaro@kernel.org> --- drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c b/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c index e6bffb0e2da3..05e73625a619 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c @@ -2300,8 +2300,10 @@ static int qmp_pcie_create(struct device *dev, struct device_node *np, int id, of_device_is_compatible(dev->of_node, "qcom,ipq6018-qmp-pcie-phy")) qphy->pcs_misc = qphy->pcs + 0x400; - if (!qphy->pcs_misc) - dev_vdbg(dev, "PHY pcs_misc-reg not used\n"); + if (!qphy->pcs_misc) { + if (cfg->pcs_misc_tbl || cfg->pcs_misc_tbl_sec) + return -EINVAL; + } qphy->pipe_clk = devm_get_clk_from_child(dev, np, NULL); if (IS_ERR(qphy->pipe_clk)) { -- 2.35.1 -- linux-phy mailing list linux-phy@lists.infradead.org https://lists.infradead.org/mailman/listinfo/linux-phy
WARNING: multiple messages have this Message-ID (diff)
From: Johan Hovold <johan+linaro@kernel.org> To: Vinod Koul <vkoul@kernel.org> Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>, Andy Gross <agross@kernel.org>, Bjorn Andersson <andersson@kernel.org>, Konrad Dybcio <konrad.dybcio@somainline.org>, Kishon Vijay Abraham I <kishon@ti.com>, linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org, linux-kernel@vger.kernel.org, Johan Hovold <johan+linaro@kernel.org> Subject: [PATCH v2 01/11] phy: qcom-qmp-pcie: add pcs_misc sanity check Date: Fri, 16 Sep 2022 12:23:30 +0200 [thread overview] Message-ID: <20220916102340.11520-2-johan+linaro@kernel.org> (raw) In-Reply-To: <20220916102340.11520-1-johan+linaro@kernel.org> Make sure that the (otherwise) optional pcs_misc IO region has been provided in case the configuration specifies a corresponding initialisation table to avoid crashing with malformed device trees. Note that the related debug message is now superfluous as the region is only used when the configuration has a pcs_misc table. Fixes: 421c9a0e9731 ("phy: qcom: qmp: Add SDM845 PCIe QMP PHY support") Signed-off-by: Johan Hovold <johan+linaro@kernel.org> --- drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c b/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c index e6bffb0e2da3..05e73625a619 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c @@ -2300,8 +2300,10 @@ static int qmp_pcie_create(struct device *dev, struct device_node *np, int id, of_device_is_compatible(dev->of_node, "qcom,ipq6018-qmp-pcie-phy")) qphy->pcs_misc = qphy->pcs + 0x400; - if (!qphy->pcs_misc) - dev_vdbg(dev, "PHY pcs_misc-reg not used\n"); + if (!qphy->pcs_misc) { + if (cfg->pcs_misc_tbl || cfg->pcs_misc_tbl_sec) + return -EINVAL; + } qphy->pipe_clk = devm_get_clk_from_child(dev, np, NULL); if (IS_ERR(qphy->pipe_clk)) { -- 2.35.1
next prev parent reply other threads:[~2022-09-16 10:26 UTC|newest] Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-09-16 10:23 [PATCH v2 00/11] phy: qcom-qmp: more fixes and cleanups Johan Hovold 2022-09-16 10:23 ` Johan Hovold 2022-09-16 10:23 ` Johan Hovold [this message] 2022-09-16 10:23 ` [PATCH v2 01/11] phy: qcom-qmp-pcie: add pcs_misc sanity check Johan Hovold 2022-09-16 10:23 ` [PATCH v2 02/11] phy: qcom-qmp-pcie: fix memleak on probe deferral Johan Hovold 2022-09-16 10:23 ` Johan Hovold 2022-09-16 10:23 ` [PATCH v2 03/11] phy: qcom-qmp-pcie-msm8996: " Johan Hovold 2022-09-16 10:23 ` Johan Hovold 2022-09-16 10:23 ` [PATCH v2 04/11] phy: qcom-qmp-combo: " Johan Hovold 2022-09-16 10:23 ` Johan Hovold 2022-09-16 10:23 ` [PATCH v2 05/11] phy: qcom-qmp-ufs: " Johan Hovold 2022-09-16 10:23 ` Johan Hovold 2022-09-16 10:23 ` [PATCH v2 06/11] phy: qcom-qmp-usb: " Johan Hovold 2022-09-16 10:23 ` Johan Hovold 2022-09-16 10:23 ` [PATCH v2 07/11] phy: qcom-qmp-pcie-msm8996: drop unused pcs_misc handling Johan Hovold 2022-09-16 10:23 ` Johan Hovold 2022-09-16 10:23 ` [PATCH v2 08/11] phy: qcom-qmp-pcie: drop unused legacy DT workaround Johan Hovold 2022-09-16 10:23 ` Johan Hovold 2022-09-16 10:23 ` [PATCH v2 09/11] phy: qcom-qmp-combo: " Johan Hovold 2022-09-16 10:23 ` Johan Hovold 2022-09-16 10:23 ` [PATCH v2 10/11] phy: qcom-qmp-ufs: drop " Johan Hovold 2022-09-16 10:23 ` Johan Hovold 2022-09-16 10:23 ` [PATCH v2 11/11] phy: qcom-qmp-usb: " Johan Hovold 2022-09-16 10:23 ` Johan Hovold 2022-09-20 6:01 ` [PATCH v2 00/11] phy: qcom-qmp: more fixes and cleanups Vinod Koul 2022-09-20 6:01 ` Vinod Koul
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220916102340.11520-2-johan+linaro@kernel.org \ --to=johan+linaro@kernel.org \ --cc=agross@kernel.org \ --cc=andersson@kernel.org \ --cc=dmitry.baryshkov@linaro.org \ --cc=kishon@ti.com \ --cc=konrad.dybcio@somainline.org \ --cc=linux-arm-msm@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-phy@lists.infradead.org \ --cc=vkoul@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.