Skip to content

Commit f8c9ad4

Browse files
Vidya Sagarbjorn-helgaas
authored andcommitted
PCI: tegra194: Handle errors in BPMP response
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 we don't have error handling for tegra_bpmp_transfer(), we will set the pcie->ep_state to EP_STATE_ENABLED even when the tegra_bpmp_transfer() command fails. Thus, the pcie->ep_state will get out of sync with reality, and any further PERST# assert + deassert will be a no-op and will not trigger the hardware initialization sequence. This is because pex_ep_event_pex_rst_deassert() checks the current pcie->ep_state, and does nothing if the current state is already EP_STATE_ENABLED. Thus, it is important to have error handling for tegra_bpmp_transfer(), such that the pcie->ep_state can not get out of sync with reality, so that we will try to initialize the hardware not only during the first PERST# assert + deassert, but also during any succeeding PERST# assert + deassert. One example where this fix is needed is when using a rock5b as host. During the initial PERST# assert + deassert (triggered by the bootloader on the rock5b) pex_ep_event_pex_rst_deassert() will get called, but for some unknown reason, the tegra_bpmp_transfer() call to initialize the PHY fails. Once Linux has been loaded on the rock5b, the PCIe driver will once again assert + deassert PERST#. However, without tegra_bpmp_transfer() error handling, this second PERST# assert + deassert will not trigger the hardware initialization sequence. With tegra_bpmp_transfer() error handling, the second PERST# assert + deassert will once again trigger the hardware to be initialized and this time the tegra_bpmp_transfer() succeeds. Fixes: c57247f ("PCI: tegra: Add support for PCIe endpoint mode in Tegra194") Signed-off-by: Vidya Sagar <[email protected]> [cassel: improve commit log] Signed-off-by: Niklas Cassel <[email protected]> Signed-off-by: Manivannan Sadhasivam <[email protected]> Signed-off-by: Bjorn Helgaas <[email protected]> Reviewed-by: Jon Hunter <[email protected]> Acked-by: Thierry Reding <[email protected]> Cc: [email protected] Link: https://patch.msgid.link/[email protected]
1 parent 42f9c66 commit f8c9ad4

File tree

1 file changed

+16
-2
lines changed

1 file changed

+16
-2
lines changed

drivers/pci/controller/dwc/pcie-tegra194.c

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1214,6 +1214,7 @@ static int tegra_pcie_bpmp_set_ctrl_state(struct tegra_pcie_dw *pcie,
12141214
struct mrq_uphy_response resp;
12151215
struct tegra_bpmp_message msg;
12161216
struct mrq_uphy_request req;
1217+
int err;
12171218

12181219
/*
12191220
* 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,
12361237
msg.rx.data = &resp;
12371238
msg.rx.size = sizeof(resp);
12381239

1239-
return tegra_bpmp_transfer(pcie->bpmp, &msg);
1240+
err = tegra_bpmp_transfer(pcie->bpmp, &msg);
1241+
if (err)
1242+
return err;
1243+
if (msg.rx.ret)
1244+
return -EINVAL;
1245+
1246+
return 0;
12401247
}
12411248

12421249
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,
12451252
struct mrq_uphy_response resp;
12461253
struct tegra_bpmp_message msg;
12471254
struct mrq_uphy_request req;
1255+
int err;
12481256

12491257
memset(&req, 0, sizeof(req));
12501258
memset(&resp, 0, sizeof(resp));
@@ -1264,7 +1272,13 @@ static int tegra_pcie_bpmp_set_pll_state(struct tegra_pcie_dw *pcie,
12641272
msg.rx.data = &resp;
12651273
msg.rx.size = sizeof(resp);
12661274

1267-
return tegra_bpmp_transfer(pcie->bpmp, &msg);
1275+
err = tegra_bpmp_transfer(pcie->bpmp, &msg);
1276+
if (err)
1277+
return err;
1278+
if (msg.rx.ret)
1279+
return -EINVAL;
1280+
1281+
return 0;
12681282
}
12691283

12701284
static void tegra_pcie_downstream_dev_to_D0(struct tegra_pcie_dw *pcie)

0 commit comments

Comments
 (0)