[PATCH] PCI: tegra194: Fix duplicate pll disable

[PATCH] PCI: tegra194: Fix duplicate pll disable

[Niklas Cassel]

From: Nagarjuna Kristam <nkristam@nvidia.com>

During PERST# assertion tegra_pcie_bpmp_set_pll_state() is currently
called twice.

pex_ep_event_pex_rst_assert() should do the opposite of
pex_ep_event_pex_rst_deassert(), so it is obvious that the duplicate
tegra_pcie_bpmp_set_pll_state() is a mistake, and that the duplicate
tegra_pcie_bpmp_set_pll_state() call should instead be a call to
tegra_pcie_bpmp_set_ctrl_state().

With this, the uninitialization sequence also matches that of
tegra_pcie_unconfig_controller().

Signed-off-by: Nagarjuna Kristam <nkristam@nvidia.com>
[cassel: improve commit log]
Signed-off-by: Niklas Cassel <cassel@kernel.org>
---
 drivers/pci/controller/dwc/pcie-tegra194.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c
index 4f26086f25daf..0c0734aa14b68 100644
--- a/drivers/pci/controller/dwc/pcie-tegra194.c
+++ b/drivers/pci/controller/dwc/pcie-tegra194.c
@@ -1722,9 +1722,9 @@ static void pex_ep_event_pex_rst_assert(struct tegra_pcie_dw *pcie)
 				ret);
 	}
 
-	ret = tegra_pcie_bpmp_set_pll_state(pcie, false);
+	ret = tegra_pcie_bpmp_set_ctrl_state(pcie, false);
 	if (ret)
-		dev_err(pcie->dev, "Failed to turn off UPHY: %d\n", ret);
+		dev_err(pcie->dev, "Failed to disable controller: %d\n", ret);
 
 	pcie->ep_state = EP_STATE_DISABLED;
 	dev_dbg(pcie->dev, "Uninitialization of endpoint is completed\n");
-- 
2.51.0

Re: [PATCH] PCI: tegra194: Fix duplicate pll disable

[Manivannan Sadhasivam]

On Thu, 11 Sep 2025 11:30:22 +0200, Niklas Cassel wrote:
> During PERST# assertion tegra_pcie_bpmp_set_pll_state() is currently
> called twice.
> 
> pex_ep_event_pex_rst_assert() should do the opposite of
> pex_ep_event_pex_rst_deassert(), so it is obvious that the duplicate
> tegra_pcie_bpmp_set_pll_state() is a mistake, and that the duplicate
> tegra_pcie_bpmp_set_pll_state() call should instead be a call to
> tegra_pcie_bpmp_set_ctrl_state().
> 
> [...]

Applied, thanks!

[1/1] PCI: tegra194: Fix duplicate pll disable
      commit: 3fab9e8102f7f7c5099d69f8e00f478e8795f528

Note: I've added the Fixes tag a54e19073718, which added the duplicate
tegra_pcie_bpmp_set_pll_state() call.

Best regards,
-- 
Manivannan Sadhasivam <mani@kernel.org>

Re: [PATCH] PCI: tegra194: Fix duplicate pll disable

[Niklas Cassel]

On Sat, Sep 20, 2025 at 09:10:19PM +0530, Manivannan Sadhasivam wrote:
> 
> On Thu, 11 Sep 2025 11:30:22 +0200, Niklas Cassel wrote:
> > During PERST# assertion tegra_pcie_bpmp_set_pll_state() is currently
> > called twice.
> > 
> > pex_ep_event_pex_rst_assert() should do the opposite of
> > pex_ep_event_pex_rst_deassert(), so it is obvious that the duplicate
> > tegra_pcie_bpmp_set_pll_state() is a mistake, and that the duplicate
> > tegra_pcie_bpmp_set_pll_state() call should instead be a call to
> > tegra_pcie_bpmp_set_ctrl_state().
> > 
> > [...]
> 
> Applied, thanks!
> 
> [1/1] PCI: tegra194: Fix duplicate pll disable
>       commit: 3fab9e8102f7f7c5099d69f8e00f478e8795f528
> 
> Note: I've added the Fixes tag a54e19073718, which added the duplicate
> tegra_pcie_bpmp_set_pll_state() call.

Thank you Mani,

However, I don't see 3fab9e8102f7f7c5099d69f8e00f478e8795f528 on any branch:
https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git/

Did you perhaps forget to push?


Kind regards,
Niklas

Re: [PATCH] PCI: tegra194: Fix duplicate pll disable

[Manivannan Sadhasivam]

On Mon, Sep 22, 2025 at 08:51:03AM +0200, Niklas Cassel wrote:
> On Sat, Sep 20, 2025 at 09:10:19PM +0530, Manivannan Sadhasivam wrote:
> > 
> > On Thu, 11 Sep 2025 11:30:22 +0200, Niklas Cassel wrote:
> > > During PERST# assertion tegra_pcie_bpmp_set_pll_state() is currently
> > > called twice.
> > > 
> > > pex_ep_event_pex_rst_assert() should do the opposite of
> > > pex_ep_event_pex_rst_deassert(), so it is obvious that the duplicate
> > > tegra_pcie_bpmp_set_pll_state() is a mistake, and that the duplicate
> > > tegra_pcie_bpmp_set_pll_state() call should instead be a call to
> > > tegra_pcie_bpmp_set_ctrl_state().
> > > 
> > > [...]
> > 
> > Applied, thanks!
> > 
> > [1/1] PCI: tegra194: Fix duplicate pll disable
> >       commit: 3fab9e8102f7f7c5099d69f8e00f478e8795f528
> > 
> > Note: I've added the Fixes tag a54e19073718, which added the duplicate
> > tegra_pcie_bpmp_set_pll_state() call.
> 
> Thank you Mani,
> 
> However, I don't see 3fab9e8102f7f7c5099d69f8e00f478e8795f528 on any branch:
> https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git/
> 
> Did you perhaps forget to push?
> 

Sorry, yes. Pushed now!

- Mani

-- 
மணிவண்ணன் சதாசிவம்