Skip to content

Commit

Permalink
PCI: rockchip: Improve the deassert sequence of four reset pins
Browse files Browse the repository at this point in the history
Per TRM, we need to deassert the four reset pins simultaneously.  Currently
the reset framework doesn't support that so we did it one by one.  It seems
no side effect found but it does impact the state machine of controller, so
sometimes the change speed bit is not set when sending training sequence
from recover state.  After the silicon RTL review from SoC guys, we don't
need to do the sequence recommended by TRM, and could just move the
deassert of mgmt_sticky_rst to the first place.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
  • Loading branch information
Shawn Lin authored and Bjorn Helgaas committed Oct 4, 2016
1 parent 277743e commit 58c6990
Showing 1 changed file with 10 additions and 6 deletions.
16 changes: 10 additions & 6 deletions drivers/pci/host/pcie-rockchip.c
Original file line number Diff line number Diff line change
Expand Up @@ -449,21 +449,25 @@ static int rockchip_pcie_init_port(struct rockchip_pcie *rockchip)
return err;
}

err = reset_control_deassert(rockchip->core_rst);
/*
* Please don't reorder the deassert sequence of the following
* four reset pins.
*/
err = reset_control_deassert(rockchip->mgmt_sticky_rst);
if (err) {
dev_err(dev, "deassert core_rst err %d\n", err);
dev_err(dev, "deassert mgmt_sticky_rst err %d\n", err);
return err;
}

err = reset_control_deassert(rockchip->mgmt_rst);
err = reset_control_deassert(rockchip->core_rst);
if (err) {
dev_err(dev, "deassert mgmt_rst err %d\n", err);
dev_err(dev, "deassert core_rst err %d\n", err);
return err;
}

err = reset_control_deassert(rockchip->mgmt_sticky_rst);
err = reset_control_deassert(rockchip->mgmt_rst);
if (err) {
dev_err(dev, "deassert mgmt_sticky_rst err %d\n", err);
dev_err(dev, "deassert mgmt_rst err %d\n", err);
return err;
}

Expand Down

0 comments on commit 58c6990

Please sign in to comment.