PCI: tegra194: Handle errors in BPMP response
PATCH 1/1 PCI: tegra194: Handle errors in BPMP response
From: Vidya Sagar <[email protected]>
The return value from tegra_bpmp_transfer() indicates the success or failure of the IPC transaction with BPMP. If the transaction succeeded, we also need to check the actual command's result code.
If a host deasserts PERST without providing a refclock, enabling the PHY (via a tegra_bpmp_transfer() call) will silently fail, however, because we are lacking error handling, pex_ep_event_pex_rst_deassert() will still set pcie->ep_state = EP_STATE_ENABLED.
Because of this, any succeeding PERST deassertion will incorrectly be a no-op (because of the pcie->ep_state == EP_STATE_ENABLED check in pex_ep_event_pex_rst_deassert()), even if the host does provide a refclock during the succeeding PERST deassertion.
Add error handling to tegra_bpmp_transfer(), such that the pcie->ep_state can not get out of sync with reality, which will incorrectly cause the driver to think that it has been successfully initialized, which incorrectly makes future calls to pex_ep_event_pex_rst_deassert() a no-op.
--- drivers/pci/controller/dwc/pcie-tegra194.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)
drivers/pci/controller/dwc/pcie-tegra194.c +16 -2
@@ -1214,6 +1214,7 @@ static int tegra_pcie_bpmp_set_ctrl_state(struct tegra_pcie_dw *pcie,struct mrq_uphy_response resp;struct tegra_bpmp_message msg;struct mrq_uphy_request req; +int err;/* * Controller-5 doesn't need to have its state set by BPMP-FW in
@@ -1236,7 +1237,13 @@ static int tegra_pcie_bpmp_set_ctrl_state(struct tegra_pcie_dw *pcie, msg.rx.data = &resp; msg.rx.size =sizeof (resp); -return tegra_bpmp_transfer (pcie->bpmp, &msg); + err =tegra_bpmp_transfer (pcie->bpmp, &msg); +if (err) +return err; +if (msg.rx.ret) +return -EINVAL ; + +return 0 ; } static int tegra_pcie_bpmp_set_pll_state(struct tegra_pcie_dw *pcie,
@@ -1245,6 +1252,7 @@ static int tegra_pcie_bpmp_set_pll_state(struct tegra_pcie_dw *pcie,struct mrq_uphy_response resp;struct tegra_bpmp_message msg;struct mrq_uphy_request req; +int err;memset (&req,0 ,sizeof (req));memset (&resp,0 ,sizeof (resp));
@@ -1264,7 +1272,13 @@ static int tegra_pcie_bpmp_set_pll_state(struct tegra_pcie_dw *pcie, msg.rx.data = &resp; msg.rx.size =sizeof (resp); -return tegra_bpmp_transfer (pcie->bpmp, &msg); + err =tegra_bpmp_transfer (pcie->bpmp, &msg); +if (err) +return err; +if (msg.rx.ret) +return -EINVAL ; + +return 0 ; }static void tegra_pcie_downstream_dev_to_D0 (struct tegra_pcie_dw *pcie)
Signature · 1 line
2.51.0
Quoted 68 lines · Niklas Cassel
From: Vidya Sagar <[email protected]>
The return value from
tegra_bpmp_transfer()indicates the success or failure of the IPC transaction with BPMP. If the transaction succeeded, we also need to check the actual command's result code.If a host deasserts PERST without providing a refclock, enabling the PHY (via a
tegra_bpmp_transfer()call) will silently fail, however, because we are lacking error handling,pex_ep_event_pex_rst_deassert()will still setpcie->ep_state=EP_STATE_ENABLED.Because of this, any succeeding PERST deassertion will incorrectly be a no-op (because of the
pcie->ep_state==EP_STATE_ENABLEDcheck inpex_ep_event_pex_rst_deassert()), even if the host does provide a refclock during the succeeding PERST deassertion.Add error handling to
tegra_bpmp_transfer(), such that thepcie->ep_statecan not get out of sync with reality, which will incorrectly cause the driver to think that it has been successfully initialized, which incorrectly makes future calls topex_ep_event_pex_rst_deassert()a no-op.Signed-off-by Vidya Sagar <[email protected]>[cassel: improve commit log]Signed-off-by Niklas Cassel <[email protected]>--- drivers/pci/controller/dwc/pcie-tegra194.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)drivers/pci/controller/dwc/pcie-tegra194.c +9
-2@@ -1214,6 +1214,7 @@ static int tegra_pcie_bpmp_set_ctrl_state(struct tegra_pcie_dw *pcie,struct mrq_uphy_response resp;struct tegra_bpmp_message msg;struct mrq_uphy_request req; +int err;/* * Controller-5 doesn't need to have its state set by BPMP-FW in @@ -1236,7 +1237,13 @@ static int tegra_pcie_bpmp_set_ctrl_state(struct tegra_pcie_dw *pcie, msg.rx.data = &resp; msg.rx.size =sizeof (resp); -return tegra_bpmp_transfer (pcie->bpmp, &msg); + err =tegra_bpmp_transfer (pcie->bpmp, &msg); +if (err) +return err; +if (msg.rx.ret) +return -EINVAL ; + +return 0 ; } static int tegra_pcie_bpmp_set_pll_state(struct tegra_pcie_dw *pcie,@@ -1245,6 +1252,7 @@ static int tegra_pcie_bpmp_set_pll_state(struct tegra_pcie_dw *pcie,struct mrq_uphy_response resp;struct tegra_bpmp_message msg;struct mrq_uphy_request req; +int err;memset (&req,0 ,sizeof (req));memset (&resp,0 ,sizeof (resp));@@ -1264,7 +1272,13 @@ static int tegra_pcie_bpmp_set_pll_state(struct tegra_pcie_dw *pcie, msg.rx.data = &resp; msg.rx.size =sizeof (resp); -return tegra_bpmp_transfer (pcie->bpmp, &msg);
drivers/pci/controller/dwc/pcie-tegra194.c static int tegra_pcie_bpmp_set_pll_state(struct tegra_pcie_dw *pcie, · line 1284
Quoted 10 lines
drivers/pci/controller/dwc/pcie-tegra194.c +7
-0+ err =tegra_bpmp_transfer (pcie->bpmp, &msg); +if (err) +return err; +if (msg.rx.ret) +return -EINVAL ; + +return 0 ; }static void tegra_pcie_downstream_dev_to_D0 (struct tegra_pcie_dw *pcie)
Looks good to me!
Cheers
Jon
Signature · 1 line
nvpublic
Manivannan Sadhasivam
maintainerQuoted 11 lines · Niklas Cassel
From: Vidya Sagar <[email protected]>
The return value from
tegra_bpmp_transfer()indicates the success or failure of the IPC transaction with BPMP. If the transaction succeeded, we also need to check the actual command's result code.If a host deasserts PERST without providing a refclock, enabling the PHY (via a
tegra_bpmp_transfer()call) will silently fail, however, because we are lacking error handling,pex_ep_event_pex_rst_deassert()will still setpcie->ep_state=EP_STATE_ENABLED.
How can a host deassert PERST# without providing refclk? As per the CEM spec r4.0, sec 2.2, refclk should be active at least TPERST-CLK before PERST# is deasserted.
So does this controller violate the spec? Even so, I don't know how an endpoint could function if it relies on the host for refclk.
- Mani
Quoted 70 lines
Because of this, any succeeding PERST deassertion will incorrectly be a no-op (because of the
pcie->ep_state==EP_STATE_ENABLEDcheck inpex_ep_event_pex_rst_deassert()), even if the host does provide a refclock during the succeeding PERST deassertion.Add error handling to
tegra_bpmp_transfer(), such that thepcie->ep_statecan not get out of sync with reality, which will incorrectly cause the driver to think that it has been successfully initialized, which incorrectly makes future calls topex_ep_event_pex_rst_deassert()a no-op.Signed-off-by Vidya Sagar <[email protected]>[cassel: improve commit log]Signed-off-by Niklas Cassel <[email protected]>--- drivers/pci/controller/dwc/pcie-tegra194.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)drivers/pci/controller/dwc/pcie-tegra194.c +16
-2@@ -1214,6 +1214,7 @@ static int tegra_pcie_bpmp_set_ctrl_state(struct tegra_pcie_dw *pcie,struct mrq_uphy_response resp;struct tegra_bpmp_message msg;struct mrq_uphy_request req; +int err;/* * Controller-5 doesn't need to have its state set by BPMP-FW in @@ -1236,7 +1237,13 @@ static int tegra_pcie_bpmp_set_ctrl_state(struct tegra_pcie_dw *pcie, msg.rx.data = &resp; msg.rx.size =sizeof (resp); -return tegra_bpmp_transfer (pcie->bpmp, &msg); + err =tegra_bpmp_transfer (pcie->bpmp, &msg); +if (err) +return err; +if (msg.rx.ret) +return -EINVAL ; + +return 0 ; } static int tegra_pcie_bpmp_set_pll_state(struct tegra_pcie_dw *pcie,@@ -1245,6 +1252,7 @@ static int tegra_pcie_bpmp_set_pll_state(struct tegra_pcie_dw *pcie,struct mrq_uphy_response resp;struct tegra_bpmp_message msg;struct mrq_uphy_request req; +int err;memset (&req,0 ,sizeof (req));memset (&resp,0 ,sizeof (resp));@@ -1264,7 +1272,13 @@ static int tegra_pcie_bpmp_set_pll_state(struct tegra_pcie_dw *pcie, msg.rx.data = &resp; msg.rx.size =sizeof (resp); -return tegra_bpmp_transfer (pcie->bpmp, &msg); + err =tegra_bpmp_transfer (pcie->bpmp, &msg); +if (err) +return err; +if (msg.rx.ret) +return -EINVAL ; + +return 0 ; }static void tegra_pcie_downstream_dev_to_D0 (struct tegra_pcie_dw *pcie)Signature · 1 line
2.51.0
Signature · 1 line
மணிவண்ணன் சதாசிவம்
Quoted 13 lines · Manivannan Sadhasivam
Quoted 11 lines · Niklas Cassel
From: Vidya Sagar <[email protected]>
The return value from
tegra_bpmp_transfer()indicates the success or failure of the IPC transaction with BPMP. If the transaction succeeded, we also need to check the actual command's result code.If a host deasserts PERST without providing a refclock, enabling the PHY (via a
tegra_bpmp_transfer()call) will silently fail, however, because we are lacking error handling,pex_ep_event_pex_rst_deassert()will still setpcie->ep_state=EP_STATE_ENABLED.
Quoted 6 lines
How can a host deassert PERST# without providing refclk? As per the CEM spec r4.0, sec 2.2, refclk should be active at least TPERST-CLK before PERST# is deasserted.
So does this controller violate the spec? Even so, I don't know how an endpoint could function if it relies on the host for refclk.
Hello Mani,
I apologize for my poor commit message.
What happens is this:
I use a rock5b as host. I use a jetson orin nano (Tegra234 based board).
When uboot starts on rock5b, it initializes the PCIe root complex, this asserts+deasserts PERST#, and I can see the PERST GPIO handler being triggered on the jetson board.
However, for some unknown reason, the PHY init fails.
I have no idea why. My guess is that perhaps the uboot driver does not provide the refclock for very long after deasserting PERST, before deasserting PERST again and booting linux.
The problem is that the tegra PCIe endpoint driver has no error handling for the PHY init (which is done using a tegra_bpmp_transfer() command to firmware).
So the tegra PCIe endpoint driver will incorrectly set pcie->ep_state to EP_STATE_ENABLED.
So when linux eventually boots on the rock5b, and the DWC based PCIe driver asserts+deasserts PERST, it will be a no-op, because the tegra driver will think that the pcie->ep_state is already EP_STATE_ENABLED.
This means that the driver will not try to initialize the PHY during this second PERST assert+deassert.
By simply adding error handling to tegra_bpmp_transfer(), when the first PERST assert+deassert (make by uboot) fails, the pcie->ep_state will not incorrectly be set to EP_STATE_ENABLED.
Thus, when the second PERST assert+deassert (made by the linux driver) is done, we will try to initialize the PHY again. For some reason, the PHY init works this second time. Why? I don't really know, but we know that the DWC based driver has the proper sleeps before/after asserting PERST, and that it will not disable the reflock suddently, because it is loading some other OS.
I will try to improve the commit message to be more specific in V2.
Kind regards,
Niklas
Quoted 74 lines
Quoted 71 lines
Because of this, any succeeding PERST deassertion will incorrectly be a no-op (because of the
pcie->ep_state==EP_STATE_ENABLEDcheck inpex_ep_event_pex_rst_deassert()), even if the host does provide a refclock during the succeeding PERST deassertion.Add error handling to
tegra_bpmp_transfer(), such that thepcie->ep_statecan not get out of sync with reality, which will incorrectly cause the driver to think that it has been successfully initialized, which incorrectly makes future calls topex_ep_event_pex_rst_deassert()a no-op.Signed-off-by Vidya Sagar <[email protected]>[cassel: improve commit log]Signed-off-by Niklas Cassel <[email protected]>--- drivers/pci/controller/dwc/pcie-tegra194.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)drivers/pci/controller/dwc/pcie-tegra194.c +16
-2@@ -1214,6 +1214,7 @@ static int tegra_pcie_bpmp_set_ctrl_state(struct tegra_pcie_dw *pcie,struct mrq_uphy_response resp;struct tegra_bpmp_message msg;struct mrq_uphy_request req; +int err;/* * Controller-5 doesn't need to have its state set by BPMP-FW in @@ -1236,7 +1237,13 @@ static int tegra_pcie_bpmp_set_ctrl_state(struct tegra_pcie_dw *pcie, msg.rx.data = &resp; msg.rx.size =sizeof (resp); -return tegra_bpmp_transfer (pcie->bpmp, &msg); + err =tegra_bpmp_transfer (pcie->bpmp, &msg); +if (err) +return err; +if (msg.rx.ret) +return -EINVAL ; + +return 0 ; } static int tegra_pcie_bpmp_set_pll_state(struct tegra_pcie_dw *pcie,@@ -1245,6 +1252,7 @@ static int tegra_pcie_bpmp_set_pll_state(struct tegra_pcie_dw *pcie,struct mrq_uphy_response resp;struct tegra_bpmp_message msg;struct mrq_uphy_request req; +int err;memset (&req,0 ,sizeof (req));memset (&resp,0 ,sizeof (resp));@@ -1264,7 +1272,13 @@ static int tegra_pcie_bpmp_set_pll_state(struct tegra_pcie_dw *pcie, msg.rx.data = &resp; msg.rx.size =sizeof (resp); -return tegra_bpmp_transfer (pcie->bpmp, &msg); + err =tegra_bpmp_transfer (pcie->bpmp, &msg); +if (err) +return err; +if (msg.rx.ret) +return -EINVAL ; + +return 0 ; }static void tegra_pcie_downstream_dev_to_D0 (struct tegra_pcie_dw *pcie)Signature · 1 line
2.51.0Signature · 1 line
மணிவண்ணன் சதாசிவம்