Skip to content

Commit c7540e5

Browse files
911gt3Mani-Sadhasivam
authored andcommitted
PCI: rockchip: Fix order of rockchip_pci_core_rsts
The order of rockchip_pci_core_rsts introduced in the offending commit followed the previous comment that warned not to reorder them. But the commit failed to take into account that reset_control_bulk_deassert() deasserts the resets in reverse order. So this leads to the link getting downgraded to 2.5 GT/s. Hence, restore the deassert order and also add back the comments for rockchip_pci_core_rsts. Tested on NanoPC-T4 with Samsung 970 Pro. Fixes: 1871593 ("PCI: rockchip: Simplify reset control handling by using reset_control_bulk*() function") Signed-off-by: Jensen Huang <[email protected]> [mani: reworded the commit message and the comment above rockchip_pci_core_rsts] Signed-off-by: Manivannan Sadhasivam <[email protected]> Reviewed-by: Manivannan Sadhasivam <[email protected]> Acked-by: Shawn Lin <[email protected]> Link: https://patch.msgid.link/[email protected]
1 parent 0af2f6b commit c7540e5

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

drivers/pci/controller/pcie-rockchip.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -319,11 +319,12 @@ static const char * const rockchip_pci_pm_rsts[] = {
319319
"aclk",
320320
};
321321

322+
/* NOTE: Do not reorder the deassert sequence of the following reset pins */
322323
static const char * const rockchip_pci_core_rsts[] = {
323-
"mgmt-sticky",
324-
"core",
325-
"mgmt",
326324
"pipe",
325+
"mgmt",
326+
"core",
327+
"mgmt-sticky",
327328
};
328329

329330
struct rockchip_pcie {

0 commit comments

Comments
 (0)