| 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: <20250916200817.GA1814336@bhelgaas>
Date: Tue, 16 Sep 2025 15:08:17 -0500
From: Bjorn Helgaas <helgaas@...nel.org>
To: manivannan.sadhasivam@....qualcomm.com
Cc: Manivannan Sadhasivam <mani@...nel.org>,
Lorenzo Pieralisi <lpieralisi@...nel.org>,
Krzysztof Wilczyński <kwilczynski@...nel.org>,
Rob Herring <robh@...nel.org>, Bjorn Helgaas <bhelgaas@...gle.com>,
Bartosz Golaszewski <brgl@...ev.pl>,
Saravana Kannan <saravanak@...gle.com>, linux-pci@...r.kernel.org,
linux-arm-msm@...r.kernel.org, linux-kernel@...r.kernel.org,
devicetree@...r.kernel.org,
Krishna Chaitanya Chundru <krishna.chundru@....qualcomm.com>,
Brian Norris <briannorris@...omium.org>
Subject: Re: [PATCH v3 2/4] PCI: qcom: Move host bridge 'phy' and 'reset'
pointers to struct qcom_pcie_port
On Fri, Sep 12, 2025 at 02:05:02PM +0530, Manivannan Sadhasivam via B4 Relay wrote:
> From: Manivannan Sadhasivam <manivannan.sadhasivam@....qualcomm.com>
>
> DT binding allows specifying 'phy' and 'reset' properties in both host
> bridge and Root Port nodes, though specifying in the host bridge node is
> marked as deprecated. Still, the pcie-qcom driver should support both
> combinations for maintaining the DT backwards compatibility. For this
> purpose, the driver is holding the relevant pointers of these properties in
> two structs: struct qcom_pcie_port and struct qcom_pcie.
>
> However, this causes confusion and increases the driver complexity. Hence,
> move the pointers from struct qcom_pcie to struct qcom_pcie_port. As a
> result, even if these properties are specified in the host bridge node,
> the pointers will be stored in struct qcom_pcie_port as if the properties
> are specified in a single Root Port node. This logic simplifies the driver
> a lot.
>
> Suggested-by: Bjorn Helgaas <helgaas@...nel.org>
> Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@....qualcomm.com>
Reviewed-by: Bjorn Helgaas <bhelgaas@...gle.com>
I would put this patch by itself on pci/controller/qcom immediately
because it's not related to the rest of the series, and we should make
sure it's in v6.18 regardless of the rest.
> ---
> drivers/pci/controller/dwc/pcie-qcom.c | 87 ++++++++++++++--------------------
> 1 file changed, 36 insertions(+), 51 deletions(-)
>
> diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c
> index 294babe1816e4d0c2b2343fe22d89af72afcd6cd..6170c86f465f43f980f5b2f88bd8799c3c152e68 100644
> --- a/drivers/pci/controller/dwc/pcie-qcom.c
> +++ b/drivers/pci/controller/dwc/pcie-qcom.c
> @@ -279,8 +279,6 @@ struct qcom_pcie {
> void __iomem *elbi; /* DT elbi */
> void __iomem *mhi;
> union qcom_pcie_resources res;
> - struct phy *phy;
> - struct gpio_desc *reset;
> struct icc_path *icc_mem;
> struct icc_path *icc_cpu;
> const struct qcom_pcie_cfg *cfg;
> @@ -297,11 +295,8 @@ static void qcom_perst_assert(struct qcom_pcie *pcie, bool assert)
> struct qcom_pcie_port *port;
> int val = assert ? 1 : 0;
>
> - if (list_empty(&pcie->ports))
> - gpiod_set_value_cansleep(pcie->reset, val);
> - else
> - list_for_each_entry(port, &pcie->ports, list)
> - gpiod_set_value_cansleep(port->reset, val);
> + list_for_each_entry(port, &pcie->ports, list)
> + gpiod_set_value_cansleep(port->reset, val);
>
> usleep_range(PERST_DELAY_US, PERST_DELAY_US + 500);
> }
> @@ -1253,57 +1248,32 @@ static bool qcom_pcie_link_up(struct dw_pcie *pci)
> return val & PCI_EXP_LNKSTA_DLLLA;
> }
>
> -static void qcom_pcie_phy_exit(struct qcom_pcie *pcie)
> -{
> - struct qcom_pcie_port *port;
> -
> - if (list_empty(&pcie->ports))
> - phy_exit(pcie->phy);
> - else
> - list_for_each_entry(port, &pcie->ports, list)
> - phy_exit(port->phy);
> -}
> -
> static void qcom_pcie_phy_power_off(struct qcom_pcie *pcie)
> {
> struct qcom_pcie_port *port;
>
> - if (list_empty(&pcie->ports)) {
> - phy_power_off(pcie->phy);
> - } else {
> - list_for_each_entry(port, &pcie->ports, list)
> - phy_power_off(port->phy);
> - }
> + list_for_each_entry(port, &pcie->ports, list)
> + phy_power_off(port->phy);
> }
>
> static int qcom_pcie_phy_power_on(struct qcom_pcie *pcie)
> {
> struct qcom_pcie_port *port;
> - int ret = 0;
> + int ret;
>
> - if (list_empty(&pcie->ports)) {
> - ret = phy_set_mode_ext(pcie->phy, PHY_MODE_PCIE, PHY_MODE_PCIE_RC);
> + list_for_each_entry(port, &pcie->ports, list) {
> + ret = phy_set_mode_ext(port->phy, PHY_MODE_PCIE, PHY_MODE_PCIE_RC);
> if (ret)
> return ret;
>
> - ret = phy_power_on(pcie->phy);
> - if (ret)
> + ret = phy_power_on(port->phy);
> + if (ret) {
> + qcom_pcie_phy_power_off(pcie);
> return ret;
> - } else {
> - list_for_each_entry(port, &pcie->ports, list) {
> - ret = phy_set_mode_ext(port->phy, PHY_MODE_PCIE, PHY_MODE_PCIE_RC);
> - if (ret)
> - return ret;
> -
> - ret = phy_power_on(port->phy);
> - if (ret) {
> - qcom_pcie_phy_power_off(pcie);
> - return ret;
> - }
> }
> }
>
> - return ret;
> + return 0;
> }
>
> static int qcom_pcie_host_init(struct dw_pcie_rp *pp)
> @@ -1748,8 +1718,10 @@ static int qcom_pcie_parse_ports(struct qcom_pcie *pcie)
> return ret;
>
> err_port_del:
> - list_for_each_entry_safe(port, tmp, &pcie->ports, list)
> + list_for_each_entry_safe(port, tmp, &pcie->ports, list) {
> + phy_exit(port->phy);
> list_del(&port->list);
> + }
>
> return ret;
> }
> @@ -1757,20 +1729,32 @@ static int qcom_pcie_parse_ports(struct qcom_pcie *pcie)
> static int qcom_pcie_parse_legacy_binding(struct qcom_pcie *pcie)
> {
> struct device *dev = pcie->pci->dev;
> + struct qcom_pcie_port *port;
> + struct gpio_desc *reset;
> + struct phy *phy;
> int ret;
>
> - pcie->phy = devm_phy_optional_get(dev, "pciephy");
> - if (IS_ERR(pcie->phy))
> - return PTR_ERR(pcie->phy);
> + phy = devm_phy_optional_get(dev, "pciephy");
> + if (IS_ERR(phy))
> + return PTR_ERR(phy);
>
> - pcie->reset = devm_gpiod_get_optional(dev, "perst", GPIOD_OUT_HIGH);
> - if (IS_ERR(pcie->reset))
> - return PTR_ERR(pcie->reset);
> + reset = devm_gpiod_get_optional(dev, "perst", GPIOD_OUT_HIGH);
> + if (IS_ERR(reset))
> + return PTR_ERR(reset);
>
> - ret = phy_init(pcie->phy);
> + ret = phy_init(phy);
> if (ret)
> return ret;
>
> + port = devm_kzalloc(dev, sizeof(*port), GFP_KERNEL);
> + if (!port)
> + return -ENOMEM;
> +
> + port->reset = reset;
> + port->phy = phy;
> + INIT_LIST_HEAD(&port->list);
> + list_add_tail(&port->list, &pcie->ports);
> +
> return 0;
> }
>
> @@ -1984,9 +1968,10 @@ static int qcom_pcie_probe(struct platform_device *pdev)
> err_host_deinit:
> dw_pcie_host_deinit(pp);
> err_phy_exit:
> - qcom_pcie_phy_exit(pcie);
> - list_for_each_entry_safe(port, tmp, &pcie->ports, list)
> + list_for_each_entry_safe(port, tmp, &pcie->ports, list) {
> + phy_exit(port->phy);
> list_del(&port->list);
> + }
> err_pm_runtime_put:
> pm_runtime_put(dev);
> pm_runtime_disable(dev);
>
> --
> 2.45.2
>
>
Powered by blists - more mailing lists