| Message ID | 20240625104039.48311-2-linux.amoon@gmail.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [v4,1/3] PCI: rockchip: Simplify clock handling by using clk_bulk*() function | expand |
On Tue, Jun 25, 2024 at 04:10:33PM +0530, Anand Moon wrote: > Refactor the reset control handling in the Rockchip PCIe driver, > introducing a more robust and efficient method for assert and > deassert reset controller using reset_control_bulk*() API. Using the > reset_control_bulk APIs, the reset handling for the core clocks reset > unit becomes much simpler. > > As per rockchip rk3399 TRM SOFTRST_CON8 soft reset controller > have clock reset unit value set to 0x1 for example "pcie_pipe", > "pcie_mgmt_sticky", "pcie_mgmt" and "pci_core", hence group then under > one reset bulk controller. > > Where as "pcie_pm", "presetn_pcie", "aresetn_pcie" have reset value > set to 0x0, hence group them under reset control bulk controller. > > Signed-off-by: Anand Moon <linux.amoon@gmail.com> > --- > v4: use dev_err_probe in error path. > v3: Fix typo in commit message, dropped reported by. > v2: Fix compilation error reported by Intel test robot > fixed checkpatch warning > --- > drivers/pci/controller/pcie-rockchip.c | 149 +++++-------------------- > drivers/pci/controller/pcie-rockchip.h | 25 +++-- > 2 files changed, 47 insertions(+), 127 deletions(-) > > diff --git a/drivers/pci/controller/pcie-rockchip.c b/drivers/pci/controller/pcie-rockchip.c > index 804135511528..024308bb6ac8 100644 > --- a/drivers/pci/controller/pcie-rockchip.c > +++ b/drivers/pci/controller/pcie-rockchip.c > @@ -69,55 +69,23 @@ int rockchip_pcie_parse_dt(struct rockchip_pcie *rockchip) > if (rockchip->link_gen < 0 || rockchip->link_gen > 2) > rockchip->link_gen = 2; > > - rockchip->core_rst = devm_reset_control_get_exclusive(dev, "core"); > - if (IS_ERR(rockchip->core_rst)) { > - if (PTR_ERR(rockchip->core_rst) != -EPROBE_DEFER) > - dev_err(dev, "missing core reset property in node\n"); > - return PTR_ERR(rockchip->core_rst); > - } > - > - rockchip->mgmt_rst = devm_reset_control_get_exclusive(dev, "mgmt"); > - if (IS_ERR(rockchip->mgmt_rst)) { > - if (PTR_ERR(rockchip->mgmt_rst) != -EPROBE_DEFER) > - dev_err(dev, "missing mgmt reset property in node\n"); > - return PTR_ERR(rockchip->mgmt_rst); > - } > - > - rockchip->mgmt_sticky_rst = devm_reset_control_get_exclusive(dev, > - "mgmt-sticky"); > - if (IS_ERR(rockchip->mgmt_sticky_rst)) { > - if (PTR_ERR(rockchip->mgmt_sticky_rst) != -EPROBE_DEFER) > - dev_err(dev, "missing mgmt-sticky reset property in node\n"); > - return PTR_ERR(rockchip->mgmt_sticky_rst); > - } > - > - rockchip->pipe_rst = devm_reset_control_get_exclusive(dev, "pipe"); > - if (IS_ERR(rockchip->pipe_rst)) { > - if (PTR_ERR(rockchip->pipe_rst) != -EPROBE_DEFER) > - dev_err(dev, "missing pipe reset property in node\n"); > - return PTR_ERR(rockchip->pipe_rst); > - } > + for (i = 0; i < ROCKCHIP_NUM_PM_RSTS; i++) > + rockchip->pm_rsts[i].id = rockchip_pci_pm_rsts[i]; > > - rockchip->pm_rst = devm_reset_control_get_exclusive(dev, "pm"); > - if (IS_ERR(rockchip->pm_rst)) { > - if (PTR_ERR(rockchip->pm_rst) != -EPROBE_DEFER) > - dev_err(dev, "missing pm reset property in node\n"); > - return PTR_ERR(rockchip->pm_rst); > - } > + err = devm_reset_control_bulk_get_optional_exclusive(dev, > + ROCKCHIP_NUM_PM_RSTS, > + rockchip->pm_rsts); > + if (err) > + return dev_err_probe(dev, err, "cannot get the reset control\n"); > > - rockchip->pclk_rst = devm_reset_control_get_exclusive(dev, "pclk"); > - if (IS_ERR(rockchip->pclk_rst)) { > - if (PTR_ERR(rockchip->pclk_rst) != -EPROBE_DEFER) > - dev_err(dev, "missing pclk reset property in node\n"); > - return PTR_ERR(rockchip->pclk_rst); > - } > + for (i = 0; i < ROCKCHIP_NUM_CORE_RSTS; i++) > + rockchip->core_rsts[i].id = rockchip_pci_core_rsts[i]; > > - rockchip->aclk_rst = devm_reset_control_get_exclusive(dev, "aclk"); > - if (IS_ERR(rockchip->aclk_rst)) { > - if (PTR_ERR(rockchip->aclk_rst) != -EPROBE_DEFER) > - dev_err(dev, "missing aclk reset property in node\n"); > - return PTR_ERR(rockchip->aclk_rst); > - } > + err = devm_reset_control_bulk_get_optional_exclusive(dev, > + ROCKCHIP_NUM_CORE_RSTS, > + rockchip->core_rsts); > + if (err) > + return dev_err_probe(dev, err, "cannot get the reset control\n"); > > if (rockchip->is_rc) { > rockchip->ep_gpio = devm_gpiod_get_optional(dev, "ep", > @@ -150,23 +118,10 @@ int rockchip_pcie_init_port(struct rockchip_pcie *rockchip) > int err, i; > u32 regs; > > - err = reset_control_assert(rockchip->aclk_rst); > - if (err) { > - dev_err(dev, "assert aclk_rst err %d\n", err); > - return err; > - } > - > - err = reset_control_assert(rockchip->pclk_rst); > - if (err) { > - dev_err(dev, "assert pclk_rst err %d\n", err); > - return err; > - } > - > - err = reset_control_assert(rockchip->pm_rst); > - if (err) { > - dev_err(dev, "assert pm_rst err %d\n", err); > - return err; > - } > + err = reset_control_bulk_assert(ROCKCHIP_NUM_PM_RSTS, > + rockchip->pm_rsts); > + if (err) > + return dev_err_probe(dev, err, "reset bulk assert pm reset\n"); > > for (i = 0; i < MAX_LANE_NUM; i++) { > err = phy_init(rockchip->phys[i]); > @@ -176,47 +131,17 @@ int rockchip_pcie_init_port(struct rockchip_pcie *rockchip) > } > } > > - err = reset_control_assert(rockchip->core_rst); > - if (err) { > - dev_err(dev, "assert core_rst err %d\n", err); > - goto err_exit_phy; > - } > - > - err = reset_control_assert(rockchip->mgmt_rst); > - if (err) { > - dev_err(dev, "assert mgmt_rst err %d\n", err); > - goto err_exit_phy; > - } > - > - err = reset_control_assert(rockchip->mgmt_sticky_rst); > - if (err) { > - dev_err(dev, "assert mgmt_sticky_rst err %d\n", err); > - goto err_exit_phy; > - } > - > - err = reset_control_assert(rockchip->pipe_rst); > - if (err) { > - dev_err(dev, "assert pipe_rst err %d\n", err); > - goto err_exit_phy; > - } > + err = reset_control_bulk_assert(ROCKCHIP_NUM_CORE_RSTS, > + rockchip->core_rsts); > + if (err) > + return dev_err_probe(dev, err, "reset bulk assert core reset\n"); > > udelay(10); > > - err = reset_control_deassert(rockchip->pm_rst); > - if (err) { > - dev_err(dev, "deassert pm_rst err %d\n", err); > - goto err_exit_phy; > - } > - > - err = reset_control_deassert(rockchip->aclk_rst); > - if (err) { > - dev_err(dev, "deassert aclk_rst err %d\n", err); > - goto err_exit_phy; > - } > - > - err = reset_control_deassert(rockchip->pclk_rst); > + err = reset_control_bulk_deassert(ROCKCHIP_NUM_PM_RSTS, > + rockchip->pm_rsts); > if (err) { > - dev_err(dev, "deassert pclk_rst err %d\n", err); > + dev_err(dev, "reset bulk deassert pm err %d\n", err); > goto err_exit_phy; > } > > @@ -259,31 +184,15 @@ int rockchip_pcie_init_port(struct rockchip_pcie *rockchip) > * Please don't reorder the deassert sequence of the following > * four reset pins. > */ The comment above says that the resets should not be reordered. But you have reordered the resets. - Mani > - err = reset_control_deassert(rockchip->mgmt_sticky_rst); > - if (err) { > - dev_err(dev, "deassert mgmt_sticky_rst err %d\n", err); > - goto err_power_off_phy; > - } > - > - err = reset_control_deassert(rockchip->core_rst); > + err = reset_control_bulk_deassert(ROCKCHIP_NUM_CORE_RSTS, > + rockchip->core_rsts); > if (err) { > - dev_err(dev, "deassert core_rst err %d\n", err); > - goto err_power_off_phy; > - } > - > - err = reset_control_deassert(rockchip->mgmt_rst); > - if (err) { > - dev_err(dev, "deassert mgmt_rst err %d\n", err); > - goto err_power_off_phy; > - } > - > - err = reset_control_deassert(rockchip->pipe_rst); > - if (err) { > - dev_err(dev, "deassert pipe_rst err %d\n", err); > + dev_err(dev, "reset bulk deassert core err %d\n", err); > goto err_power_off_phy; > } > > return 0; > + > err_power_off_phy: > while (i--) > phy_power_off(rockchip->phys[i]); > diff --git a/drivers/pci/controller/pcie-rockchip.h b/drivers/pci/controller/pcie-rockchip.h > index 72346e17e45e..27e951b41b80 100644 > --- a/drivers/pci/controller/pcie-rockchip.h > +++ b/drivers/pci/controller/pcie-rockchip.h > @@ -15,6 +15,7 @@ > #include <linux/kernel.h> > #include <linux/pci.h> > #include <linux/pci-ecam.h> > +#include <linux/reset.h> > > /* > * The upper 16 bits of PCIE_CLIENT_CONFIG are a write mask for the lower 16 > @@ -289,6 +290,8 @@ > ROCKCHIP_PCIE_CORE_EP_FUNC_BAR_CFG_BAR_CTRL_MASK(b)) > > #define ROCKCHIP_NUM_CLKS ARRAY_SIZE(rockchip_pci_clks) > +#define ROCKCHIP_NUM_PM_RSTS ARRAY_SIZE(rockchip_pci_pm_rsts) > +#define ROCKCHIP_NUM_CORE_RSTS ARRAY_SIZE(rockchip_pci_core_rsts) > > static const char * const rockchip_pci_clks[] = { > "aclk", > @@ -297,18 +300,26 @@ static const char * const rockchip_pci_clks[] = { > "pm", > }; > > +static const char * const rockchip_pci_pm_rsts[] = { > + "pm", > + "pclk", > + "aclk", > +}; > + > +static const char * const rockchip_pci_core_rsts[] = { > + "core", > + "mgmt", > + "mgmt-sticky", > + "pipe", > +}; > + > struct rockchip_pcie { > void __iomem *reg_base; /* DT axi-base */ > void __iomem *apb_base; /* DT apb-base */ > bool legacy_phy; > struct phy *phys[MAX_LANE_NUM]; > - struct reset_control *core_rst; > - struct reset_control *mgmt_rst; > - struct reset_control *mgmt_sticky_rst; > - struct reset_control *pipe_rst; > - struct reset_control *pm_rst; > - struct reset_control *aclk_rst; > - struct reset_control *pclk_rst; > + struct reset_control_bulk_data pm_rsts[ROCKCHIP_NUM_PM_RSTS]; > + struct reset_control_bulk_data core_rsts[ROCKCHIP_NUM_CORE_RSTS]; > struct clk_bulk_data clks[ROCKCHIP_NUM_CLKS]; > struct regulator *vpcie12v; /* 12V power supply */ > struct regulator *vpcie3v3; /* 3.3V power supply */ > -- > 2.44.0 > >
Hi Manivannan, On Thu, 15 Aug 2024 at 21:50, Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> wrote: > > On Tue, Jun 25, 2024 at 04:10:33PM +0530, Anand Moon wrote: > > Refactor the reset control handling in the Rockchip PCIe driver, > > introducing a more robust and efficient method for assert and > > deassert reset controller using reset_control_bulk*() API. Using the > > reset_control_bulk APIs, the reset handling for the core clocks reset > > unit becomes much simpler. > > > > As per rockchip rk3399 TRM SOFTRST_CON8 soft reset controller > > have clock reset unit value set to 0x1 for example "pcie_pipe", > > "pcie_mgmt_sticky", "pcie_mgmt" and "pci_core", hence group then under > > one reset bulk controller. > > > > Where as "pcie_pm", "presetn_pcie", "aresetn_pcie" have reset value > > set to 0x0, hence group them under reset control bulk controller. > > > > Signed-off-by: Anand Moon <linux.amoon@gmail.com> > > --- > > v4: use dev_err_probe in error path. > > v3: Fix typo in commit message, dropped reported by. > > v2: Fix compilation error reported by Intel test robot > > fixed checkpatch warning > > --- > > drivers/pci/controller/pcie-rockchip.c | 149 +++++-------------------- > > drivers/pci/controller/pcie-rockchip.h | 25 +++-- > > 2 files changed, 47 insertions(+), 127 deletions(-) > > > > diff --git a/drivers/pci/controller/pcie-rockchip.c b/drivers/pci/controller/pcie-rockchip.c > > index 804135511528..024308bb6ac8 100644 > > --- a/drivers/pci/controller/pcie-rockchip.c > > +++ b/drivers/pci/controller/pcie-rockchip.c > > @@ -69,55 +69,23 @@ int rockchip_pcie_parse_dt(struct rockchip_pcie *rockchip) > > if (rockchip->link_gen < 0 || rockchip->link_gen > 2) > > rockchip->link_gen = 2; > > > > - rockchip->core_rst = devm_reset_control_get_exclusive(dev, "core"); > > - if (IS_ERR(rockchip->core_rst)) { > > - if (PTR_ERR(rockchip->core_rst) != -EPROBE_DEFER) > > - dev_err(dev, "missing core reset property in node\n"); > > - return PTR_ERR(rockchip->core_rst); > > - } > > - > > - rockchip->mgmt_rst = devm_reset_control_get_exclusive(dev, "mgmt"); > > - if (IS_ERR(rockchip->mgmt_rst)) { > > - if (PTR_ERR(rockchip->mgmt_rst) != -EPROBE_DEFER) > > - dev_err(dev, "missing mgmt reset property in node\n"); > > - return PTR_ERR(rockchip->mgmt_rst); > > - } > > - > > - rockchip->mgmt_sticky_rst = devm_reset_control_get_exclusive(dev, > > - "mgmt-sticky"); > > - if (IS_ERR(rockchip->mgmt_sticky_rst)) { > > - if (PTR_ERR(rockchip->mgmt_sticky_rst) != -EPROBE_DEFER) > > - dev_err(dev, "missing mgmt-sticky reset property in node\n"); > > - return PTR_ERR(rockchip->mgmt_sticky_rst); > > - } > > - > > - rockchip->pipe_rst = devm_reset_control_get_exclusive(dev, "pipe"); > > - if (IS_ERR(rockchip->pipe_rst)) { > > - if (PTR_ERR(rockchip->pipe_rst) != -EPROBE_DEFER) > > - dev_err(dev, "missing pipe reset property in node\n"); > > - return PTR_ERR(rockchip->pipe_rst); > > - } > > + for (i = 0; i < ROCKCHIP_NUM_PM_RSTS; i++) > > + rockchip->pm_rsts[i].id = rockchip_pci_pm_rsts[i]; > > > > - rockchip->pm_rst = devm_reset_control_get_exclusive(dev, "pm"); > > - if (IS_ERR(rockchip->pm_rst)) { > > - if (PTR_ERR(rockchip->pm_rst) != -EPROBE_DEFER) > > - dev_err(dev, "missing pm reset property in node\n"); > > - return PTR_ERR(rockchip->pm_rst); > > - } > > + err = devm_reset_control_bulk_get_optional_exclusive(dev, > > + ROCKCHIP_NUM_PM_RSTS, > > + rockchip->pm_rsts); > > + if (err) > > + return dev_err_probe(dev, err, "cannot get the reset control\n"); > > > > - rockchip->pclk_rst = devm_reset_control_get_exclusive(dev, "pclk"); > > - if (IS_ERR(rockchip->pclk_rst)) { > > - if (PTR_ERR(rockchip->pclk_rst) != -EPROBE_DEFER) > > - dev_err(dev, "missing pclk reset property in node\n"); > > - return PTR_ERR(rockchip->pclk_rst); > > - } > > + for (i = 0; i < ROCKCHIP_NUM_CORE_RSTS; i++) > > + rockchip->core_rsts[i].id = rockchip_pci_core_rsts[i]; > > > > - rockchip->aclk_rst = devm_reset_control_get_exclusive(dev, "aclk"); > > - if (IS_ERR(rockchip->aclk_rst)) { > > - if (PTR_ERR(rockchip->aclk_rst) != -EPROBE_DEFER) > > - dev_err(dev, "missing aclk reset property in node\n"); > > - return PTR_ERR(rockchip->aclk_rst); > > - } > > + err = devm_reset_control_bulk_get_optional_exclusive(dev, > > + ROCKCHIP_NUM_CORE_RSTS, > > + rockchip->core_rsts); > > + if (err) > > + return dev_err_probe(dev, err, "cannot get the reset control\n"); > > > > if (rockchip->is_rc) { > > rockchip->ep_gpio = devm_gpiod_get_optional(dev, "ep", > > @@ -150,23 +118,10 @@ int rockchip_pcie_init_port(struct rockchip_pcie *rockchip) > > int err, i; > > u32 regs; > > > > - err = reset_control_assert(rockchip->aclk_rst); > > - if (err) { > > - dev_err(dev, "assert aclk_rst err %d\n", err); > > - return err; > > - } > > - > > - err = reset_control_assert(rockchip->pclk_rst); > > - if (err) { > > - dev_err(dev, "assert pclk_rst err %d\n", err); > > - return err; > > - } > > - > > - err = reset_control_assert(rockchip->pm_rst); > > - if (err) { > > - dev_err(dev, "assert pm_rst err %d\n", err); > > - return err; > > - } > > + err = reset_control_bulk_assert(ROCKCHIP_NUM_PM_RSTS, > > + rockchip->pm_rsts); > > + if (err) > > + return dev_err_probe(dev, err, "reset bulk assert pm reset\n"); > > > > for (i = 0; i < MAX_LANE_NUM; i++) { > > err = phy_init(rockchip->phys[i]); > > @@ -176,47 +131,17 @@ int rockchip_pcie_init_port(struct rockchip_pcie *rockchip) > > } > > } > > > > - err = reset_control_assert(rockchip->core_rst); > > - if (err) { > > - dev_err(dev, "assert core_rst err %d\n", err); > > - goto err_exit_phy; > > - } > > - > > - err = reset_control_assert(rockchip->mgmt_rst); > > - if (err) { > > - dev_err(dev, "assert mgmt_rst err %d\n", err); > > - goto err_exit_phy; > > - } > > - > > - err = reset_control_assert(rockchip->mgmt_sticky_rst); > > - if (err) { > > - dev_err(dev, "assert mgmt_sticky_rst err %d\n", err); > > - goto err_exit_phy; > > - } > > - > > - err = reset_control_assert(rockchip->pipe_rst); > > - if (err) { > > - dev_err(dev, "assert pipe_rst err %d\n", err); > > - goto err_exit_phy; > > - } > > + err = reset_control_bulk_assert(ROCKCHIP_NUM_CORE_RSTS, > > + rockchip->core_rsts); > > + if (err) > > + return dev_err_probe(dev, err, "reset bulk assert core reset\n"); > > > > udelay(10); > > > > - err = reset_control_deassert(rockchip->pm_rst); > > - if (err) { > > - dev_err(dev, "deassert pm_rst err %d\n", err); > > - goto err_exit_phy; > > - } > > - > > - err = reset_control_deassert(rockchip->aclk_rst); > > - if (err) { > > - dev_err(dev, "deassert aclk_rst err %d\n", err); > > - goto err_exit_phy; > > - } > > - > > - err = reset_control_deassert(rockchip->pclk_rst); > > + err = reset_control_bulk_deassert(ROCKCHIP_NUM_PM_RSTS, > > + rockchip->pm_rsts); > > if (err) { > > - dev_err(dev, "deassert pclk_rst err %d\n", err); > > + dev_err(dev, "reset bulk deassert pm err %d\n", err); > > goto err_exit_phy; > > } > > > > @@ -259,31 +184,15 @@ int rockchip_pcie_init_port(struct rockchip_pcie *rockchip) > > * Please don't reorder the deassert sequence of the following > > * four reset pins. > > */ > > The comment above says that the resets should not be reordered. But you have > reordered the resets. > As per the TRM [1], CRU_SOFTRST_CON8 clock reset unit has two groups one with reset value 0x1 and the other 0x0, so this patch groups them accordingly. [1] https://opensource.rock-chips.com/images/e/ee/Rockchip_RK3399TRM_V1.4_Part1-20170408.pdf If I only use reset_control_bulk_assert and reset_control_bulk_deassert for all the reset I get the below reset warning. [ 6.116766] rockchip-pcie f8000000.pcie: host bridge /pcie@f8000000 ranges: [ 6.117439] rockchip-pcie f8000000.pcie: MEM 0x00fa000000..0x00fbdfffff -> 0x00fa000000 [ 6.118200] rockchip-pcie f8000000.pcie: IO 0x00fbe00000..0x00fbefffff -> 0x00fbe00000 [ 6.119420] ------------[ cut here ]------------ [ 6.119843] WARNING: CPU: 3 PID: 48 at drivers/reset/core.c:792 __reset_control_get_internal+0x68/0x17c [ 6.120681] Modules linked in: phy_rockchip_pcie snd_soc_rockchip_i2s videobuf2_common drm_display_helper drm_dma_helper mc rockchip_thermal cfg80211 rtc_rk808 drm_kms_helper rfkill coresight_cpu_debug coresight pcie_rockchip_host fuse drm dm_mod backlight ip_tables x_tables ipv6 [ 6.122895] CPU: 3 UID: 0 PID: 48 Comm: kworker/u24:1 Not tainted 6.11.0-rc3-00282-g17c3afeb956a #1 [ 6.123699] Hardware name: 96boards Rock960 (DT) [ 6.124122] Workqueue: events_unbound deferred_probe_work_func [ 6.124648] pstate: 20000005 (nzCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 6.125260] pc : __reset_control_get_internal+0x68/0x17c [ 6.125733] lr : __of_reset_control_get+0x1e4/0x280 [ 6.126167] sp : ffff8000803038c0 [ 6.126459] x29: ffff8000803038c0 x28: ffffa2f1c22479c0 x27: 0000000000000004 [ 6.127092] x26: 0000000000000001 x25: ffffa2f1c25cd080 x24: 0000000000000001 [ 6.127723] x23: 0000000000000000 x22: ffff237bc05b4080 x21: 0000000000000082 [ 6.128353] x20: ffff237bc05b40a0 x19: ffff237bc7fe0f80 x18: 0000000000000001 [ 6.128984] x17: 6666666666656266 x16: ffffa2f1c0298b2c x15: 0000000000000000 [ 6.129615] x14: 0000000000000000 x13: 0000000000000002 x12: 000000000006fb2a [ 6.130246] x11: 7379732e30303030 x10: ffffa2f1c20c2398 x9 : 0000000000000020 [ 6.130877] x8 : 0101010101010101 x7 : 0000737465736573 x6 : 0000000080627436 [ 6.131507] x5 : ffffffffff5ff198 x4 : 0000000000000000 x3 : 0000000000000001 [ 6.132137] x2 : 0000000000000082 x1 : 0000000000000082 x0 : 0000000000000000 [ 6.132767] Call trace: [ 6.132986] __reset_control_get_internal+0x68/0x17c [ 6.133429] __of_reset_control_get+0x1e4/0x280 [ 6.133832] __reset_control_get+0x48/0x1d8 [ 6.134205] __reset_control_bulk_get+0x74/0x114 [ 6.134615] __devm_reset_control_bulk_get+0x78/0xe8 [ 6.135056] rockchip_pcie_parse_dt+0x120/0x1f0 [ 6.135461] rockchip_pcie_probe+0x60/0x59c [pcie_rockchip_host] [ 6.135997] platform_probe+0x68/0xdc [ 6.136324] really_probe+0xbc/0x298 [ 6.136646] __driver_probe_device+0x78/0x12c [ 6.137034] driver_probe_device+0xdc/0x160 [ 6.137406] __device_attach_driver+0xb8/0x134 [ 6.137803] bus_for_each_drv+0x80/0xdc [ 6.138146] __device_attach+0xa8/0x1b0 [ 6.138490] device_initial_probe+0x14/0x20 [ 6.138862] bus_probe_device+0xa8/0xac [ 6.139204] deferred_probe_work_func+0x88/0xc0 [ 6.139606] process_one_work+0x150/0x294 [ 6.139963] worker_thread+0x2e4/0x3ec [ 6.140308] kthread+0x118/0x11c [ 6.140624] ret_from_fork+0x10/0x20 [ 6.140946] ---[ end trace 0000000000000000 ]--- [ 6.146403] rockchip-pcie f8000000.pcie: error -EBUSY: cannot get the reset control [ 6.147085] rockchip-pcie f8000000.pcie: probe with driver rockchip-pcie failed with error -16 [ 6.149348] rockchip-pcie f8000000.pcie: host bridge /pcie@f8000000 ranges: [ 6.149982] rockchip-pcie f8000000.pcie: MEM 0x00fa000000..0x00fbdfffff -> 0x00fa000000 [ 6.150722] rockchip-pcie f8000000.pcie: IO 0x00fbe00000..0x00fbefffff -> 0x00fbe00000 [ 6.151717] ------------[ cut here ]------------ [ 6.152122] WARNING: CPU: 5 PID: 48 at drivers/reset/core.c:792 __reset_control_get_internal+0x68/0x17c [ 6.152954] Modules linked in: phy_rockchip_pcie snd_soc_rockchip_i2s videobuf2_common drm_display_helper drm_dma_helper mc rockchip_thermal cfg80211 rtc_rk808 drm_kms_helper rfkill coresight_cpu_debug coresight pcie_rockchip_host fuse drm dm_mod backlight ip_tables x_tables ipv6 [ 6.155144] CPU: 5 UID: 0 PID: 48 Comm: kworker/u24:1 Tainted: G W 6.11.0-rc3-00282-g17c3afeb956a #1 [ 6.156061] Tainted: [W]=WARN [ 6.156321] Hardware name: 96boards Rock960 (DT) [ 6.156726] Workqueue: events_unbound deferred_probe_work_func [ 6.157242] pstate: 20000005 (nzCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 6.157850] pc : __reset_control_get_internal+0x68/0x17c [ 6.158318] lr : __of_reset_control_get+0x1e4/0x280 [ 6.158748] sp : ffff8000803038c0 [ 6.159039] x29: ffff8000803038c0 x28: ffffa2f1c22479c0 x27: 0000000000000004 [ 6.159665] x26: 0000000000000001 x25: ffffa2f1c25cd080 x24: 0000000000000001 [ 6.160292] x23: 0000000000000000 x22: ffff237bc05b4080 x21: 0000000000000082 [ 6.160918] x20: ffff237bc05b40a0 x19: ffff237bc64edb00 x18: ffffffffffffffff [ 6.161544] x17: 6666666666656266 x16: ffffa2f1c0298b2c x15: 6674616c702d2d32 [ 6.162170] x14: 0000000000000000 x13: 0032312e7968702d x12: 656963703a6e6f63 [ 6.162796] x11: 7379732e30303030 x10: ffffa2f1c20c2398 x9 : 0000000000000020 [ 6.163423] x8 : 0101010101010101 x7 : 0000737465736573 x6 : 0000000080627436 [ 6.164049] x5 : ffffffffff5ff198 x4 : 0000000000000000 x3 : 0000000000000001 [ 6.164675] x2 : 0000000000000082 x1 : 0000000000000082 x0 : 0000000000000000 [ 6.165301] Call trace: [ 6.165517] __reset_control_get_internal+0x68/0x17c [ 6.165954] __of_reset_control_get+0x1e4/0x280 [ 6.166353] __reset_control_get+0x48/0x1d8 [ 6.166722] __reset_control_bulk_get+0x74/0x114 [ 6.167129] __devm_reset_control_bulk_get+0x78/0xe8 [ 6.167566] rockchip_pcie_parse_dt+0x120/0x1f0 [ 6.167965] rockchip_pcie_probe+0x60/0x59c [pcie_rockchip_host] [ 6.168494] platform_probe+0x68/0xdc [ 6.168815] really_probe+0xbc/0x298 [ 6.169132] __driver_probe_device+0x78/0x12c [ 6.169516] driver_probe_device+0xdc/0x160 [ 6.169886] __device_attach_driver+0xb8/0x134 [ 6.170278] bus_for_each_drv+0x80/0xdc [ 6.170617] __device_attach+0xa8/0x1b0 [ 6.170956] device_initial_probe+0x14/0x20 [ 6.171326] bus_probe_device+0xa8/0xac [ 6.171665] deferred_probe_work_func+0x88/0xc0 [ 6.172064] process_one_work+0x150/0x294 [ 6.172419] worker_thread+0x2e4/0x3ec [ 6.172749] kthread+0x118/0x11c [ 6.173036] ret_from_fork+0x10/0x20 [ 6.173353] ---[ end trace 0000000000000000 ]--- [ 6.173817] rockchip-pcie f8000000.pcie: error -EBUSY: cannot get the reset control [ 6.174494] rockchip-pcie f8000000.pcie: probe with driver rockchip-pcie failed with error -16 > - Mani Thanks -Anand > > > - err = reset_control_deassert(rockchip->mgmt_sticky_rst); > > - if (err) { > > - dev_err(dev, "deassert mgmt_sticky_rst err %d\n", err); > > - goto err_power_off_phy; > > - } > > - > > - err = reset_control_deassert(rockchip->core_rst); > > + err = reset_control_bulk_deassert(ROCKCHIP_NUM_CORE_RSTS, > > + rockchip->core_rsts); > > if (err) { > > - dev_err(dev, "deassert core_rst err %d\n", err); > > - goto err_power_off_phy; > > - } > > - > > - err = reset_control_deassert(rockchip->mgmt_rst); > > - if (err) { > > - dev_err(dev, "deassert mgmt_rst err %d\n", err); > > - goto err_power_off_phy; > > - } > > - > > - err = reset_control_deassert(rockchip->pipe_rst); > > - if (err) { > > - dev_err(dev, "deassert pipe_rst err %d\n", err); > > + dev_err(dev, "reset bulk deassert core err %d\n", err); > > goto err_power_off_phy; > > } > > > > return 0; > > + > > err_power_off_phy: > > while (i--) > > phy_power_off(rockchip->phys[i]); > > diff --git a/drivers/pci/controller/pcie-rockchip.h b/drivers/pci/controller/pcie-rockchip.h > > index 72346e17e45e..27e951b41b80 100644 > > --- a/drivers/pci/controller/pcie-rockchip.h > > +++ b/drivers/pci/controller/pcie-rockchip.h > > @@ -15,6 +15,7 @@ > > #include <linux/kernel.h> > > #include <linux/pci.h> > > #include <linux/pci-ecam.h> > > +#include <linux/reset.h> > > > > /* > > * The upper 16 bits of PCIE_CLIENT_CONFIG are a write mask for the lower 16 > > @@ -289,6 +290,8 @@ > > ROCKCHIP_PCIE_CORE_EP_FUNC_BAR_CFG_BAR_CTRL_MASK(b)) > > > > #define ROCKCHIP_NUM_CLKS ARRAY_SIZE(rockchip_pci_clks) > > +#define ROCKCHIP_NUM_PM_RSTS ARRAY_SIZE(rockchip_pci_pm_rsts) > > +#define ROCKCHIP_NUM_CORE_RSTS ARRAY_SIZE(rockchip_pci_core_rsts) > > > > static const char * const rockchip_pci_clks[] = { > > "aclk", > > @@ -297,18 +300,26 @@ static const char * const rockchip_pci_clks[] = { > > "pm", > > }; > > > > +static const char * const rockchip_pci_pm_rsts[] = { > > + "pm", > > + "pclk", > > + "aclk", > > +}; > > + > > +static const char * const rockchip_pci_core_rsts[] = { > > + "core", > > + "mgmt", > > + "mgmt-sticky", > > + "pipe", > > +}; > > + > > struct rockchip_pcie { > > void __iomem *reg_base; /* DT axi-base */ > > void __iomem *apb_base; /* DT apb-base */ > > bool legacy_phy; > > struct phy *phys[MAX_LANE_NUM]; > > - struct reset_control *core_rst; > > - struct reset_control *mgmt_rst; > > - struct reset_control *mgmt_sticky_rst; > > - struct reset_control *pipe_rst; > > - struct reset_control *pm_rst; > > - struct reset_control *aclk_rst; > > - struct reset_control *pclk_rst; > > + struct reset_control_bulk_data pm_rsts[ROCKCHIP_NUM_PM_RSTS]; > > + struct reset_control_bulk_data core_rsts[ROCKCHIP_NUM_CORE_RSTS]; > > struct clk_bulk_data clks[ROCKCHIP_NUM_CLKS]; > > struct regulator *vpcie12v; /* 12V power supply */ > > struct regulator *vpcie3v3; /* 3.3V power supply */ > > -- > > 2.44.0 > > > > > > -- > மணிவண்ணன் சதாசிவம்
On Sat, Aug 17, 2024 at 06:52:47PM +0530, Anand Moon wrote: > Hi Manivannan, > > On Thu, 15 Aug 2024 at 21:50, Manivannan Sadhasivam > <manivannan.sadhasivam@linaro.org> wrote: > > > > On Tue, Jun 25, 2024 at 04:10:33PM +0530, Anand Moon wrote: > > > Refactor the reset control handling in the Rockchip PCIe driver, > > > introducing a more robust and efficient method for assert and > > > deassert reset controller using reset_control_bulk*() API. Using the > > > reset_control_bulk APIs, the reset handling for the core clocks reset > > > unit becomes much simpler. > > > > > > As per rockchip rk3399 TRM SOFTRST_CON8 soft reset controller > > > have clock reset unit value set to 0x1 for example "pcie_pipe", > > > "pcie_mgmt_sticky", "pcie_mgmt" and "pci_core", hence group then under > > > one reset bulk controller. > > > > > > Where as "pcie_pm", "presetn_pcie", "aresetn_pcie" have reset value > > > set to 0x0, hence group them under reset control bulk controller. > > > > > > Signed-off-by: Anand Moon <linux.amoon@gmail.com> > > > --- > > > v4: use dev_err_probe in error path. > > > v3: Fix typo in commit message, dropped reported by. > > > v2: Fix compilation error reported by Intel test robot > > > fixed checkpatch warning > > > --- > > > drivers/pci/controller/pcie-rockchip.c | 149 +++++-------------------- > > > drivers/pci/controller/pcie-rockchip.h | 25 +++-- > > > 2 files changed, 47 insertions(+), 127 deletions(-) > > > > > > diff --git a/drivers/pci/controller/pcie-rockchip.c b/drivers/pci/controller/pcie-rockchip.c > > > index 804135511528..024308bb6ac8 100644 > > > --- a/drivers/pci/controller/pcie-rockchip.c > > > +++ b/drivers/pci/controller/pcie-rockchip.c > > > @@ -69,55 +69,23 @@ int rockchip_pcie_parse_dt(struct rockchip_pcie *rockchip) > > > if (rockchip->link_gen < 0 || rockchip->link_gen > 2) > > > rockchip->link_gen = 2; > > > > > > - rockchip->core_rst = devm_reset_control_get_exclusive(dev, "core"); > > > - if (IS_ERR(rockchip->core_rst)) { > > > - if (PTR_ERR(rockchip->core_rst) != -EPROBE_DEFER) > > > - dev_err(dev, "missing core reset property in node\n"); > > > - return PTR_ERR(rockchip->core_rst); > > > - } > > > - > > > - rockchip->mgmt_rst = devm_reset_control_get_exclusive(dev, "mgmt"); > > > - if (IS_ERR(rockchip->mgmt_rst)) { > > > - if (PTR_ERR(rockchip->mgmt_rst) != -EPROBE_DEFER) > > > - dev_err(dev, "missing mgmt reset property in node\n"); > > > - return PTR_ERR(rockchip->mgmt_rst); > > > - } > > > - > > > - rockchip->mgmt_sticky_rst = devm_reset_control_get_exclusive(dev, > > > - "mgmt-sticky"); > > > - if (IS_ERR(rockchip->mgmt_sticky_rst)) { > > > - if (PTR_ERR(rockchip->mgmt_sticky_rst) != -EPROBE_DEFER) > > > - dev_err(dev, "missing mgmt-sticky reset property in node\n"); > > > - return PTR_ERR(rockchip->mgmt_sticky_rst); > > > - } > > > - > > > - rockchip->pipe_rst = devm_reset_control_get_exclusive(dev, "pipe"); > > > - if (IS_ERR(rockchip->pipe_rst)) { > > > - if (PTR_ERR(rockchip->pipe_rst) != -EPROBE_DEFER) > > > - dev_err(dev, "missing pipe reset property in node\n"); > > > - return PTR_ERR(rockchip->pipe_rst); > > > - } > > > + for (i = 0; i < ROCKCHIP_NUM_PM_RSTS; i++) > > > + rockchip->pm_rsts[i].id = rockchip_pci_pm_rsts[i]; > > > > > > - rockchip->pm_rst = devm_reset_control_get_exclusive(dev, "pm"); > > > - if (IS_ERR(rockchip->pm_rst)) { > > > - if (PTR_ERR(rockchip->pm_rst) != -EPROBE_DEFER) > > > - dev_err(dev, "missing pm reset property in node\n"); > > > - return PTR_ERR(rockchip->pm_rst); > > > - } > > > + err = devm_reset_control_bulk_get_optional_exclusive(dev, > > > + ROCKCHIP_NUM_PM_RSTS, > > > + rockchip->pm_rsts); > > > + if (err) > > > + return dev_err_probe(dev, err, "cannot get the reset control\n"); > > > > > > - rockchip->pclk_rst = devm_reset_control_get_exclusive(dev, "pclk"); > > > - if (IS_ERR(rockchip->pclk_rst)) { > > > - if (PTR_ERR(rockchip->pclk_rst) != -EPROBE_DEFER) > > > - dev_err(dev, "missing pclk reset property in node\n"); > > > - return PTR_ERR(rockchip->pclk_rst); > > > - } > > > + for (i = 0; i < ROCKCHIP_NUM_CORE_RSTS; i++) > > > + rockchip->core_rsts[i].id = rockchip_pci_core_rsts[i]; > > > > > > - rockchip->aclk_rst = devm_reset_control_get_exclusive(dev, "aclk"); > > > - if (IS_ERR(rockchip->aclk_rst)) { > > > - if (PTR_ERR(rockchip->aclk_rst) != -EPROBE_DEFER) > > > - dev_err(dev, "missing aclk reset property in node\n"); > > > - return PTR_ERR(rockchip->aclk_rst); > > > - } > > > + err = devm_reset_control_bulk_get_optional_exclusive(dev, > > > + ROCKCHIP_NUM_CORE_RSTS, > > > + rockchip->core_rsts); > > > + if (err) > > > + return dev_err_probe(dev, err, "cannot get the reset control\n"); > > > > > > if (rockchip->is_rc) { > > > rockchip->ep_gpio = devm_gpiod_get_optional(dev, "ep", > > > @@ -150,23 +118,10 @@ int rockchip_pcie_init_port(struct rockchip_pcie *rockchip) > > > int err, i; > > > u32 regs; > > > > > > - err = reset_control_assert(rockchip->aclk_rst); > > > - if (err) { > > > - dev_err(dev, "assert aclk_rst err %d\n", err); > > > - return err; > > > - } > > > - > > > - err = reset_control_assert(rockchip->pclk_rst); > > > - if (err) { > > > - dev_err(dev, "assert pclk_rst err %d\n", err); > > > - return err; > > > - } > > > - > > > - err = reset_control_assert(rockchip->pm_rst); > > > - if (err) { > > > - dev_err(dev, "assert pm_rst err %d\n", err); > > > - return err; > > > - } > > > + err = reset_control_bulk_assert(ROCKCHIP_NUM_PM_RSTS, > > > + rockchip->pm_rsts); > > > + if (err) > > > + return dev_err_probe(dev, err, "reset bulk assert pm reset\n"); > > > > > > for (i = 0; i < MAX_LANE_NUM; i++) { > > > err = phy_init(rockchip->phys[i]); > > > @@ -176,47 +131,17 @@ int rockchip_pcie_init_port(struct rockchip_pcie *rockchip) > > > } > > > } > > > > > > - err = reset_control_assert(rockchip->core_rst); > > > - if (err) { > > > - dev_err(dev, "assert core_rst err %d\n", err); > > > - goto err_exit_phy; > > > - } > > > - > > > - err = reset_control_assert(rockchip->mgmt_rst); > > > - if (err) { > > > - dev_err(dev, "assert mgmt_rst err %d\n", err); > > > - goto err_exit_phy; > > > - } > > > - > > > - err = reset_control_assert(rockchip->mgmt_sticky_rst); > > > - if (err) { > > > - dev_err(dev, "assert mgmt_sticky_rst err %d\n", err); > > > - goto err_exit_phy; > > > - } > > > - > > > - err = reset_control_assert(rockchip->pipe_rst); > > > - if (err) { > > > - dev_err(dev, "assert pipe_rst err %d\n", err); > > > - goto err_exit_phy; > > > - } > > > + err = reset_control_bulk_assert(ROCKCHIP_NUM_CORE_RSTS, > > > + rockchip->core_rsts); > > > + if (err) > > > + return dev_err_probe(dev, err, "reset bulk assert core reset\n"); > > > > > > udelay(10); > > > > > > - err = reset_control_deassert(rockchip->pm_rst); > > > - if (err) { > > > - dev_err(dev, "deassert pm_rst err %d\n", err); > > > - goto err_exit_phy; > > > - } > > > - > > > - err = reset_control_deassert(rockchip->aclk_rst); > > > - if (err) { > > > - dev_err(dev, "deassert aclk_rst err %d\n", err); > > > - goto err_exit_phy; > > > - } > > > - > > > - err = reset_control_deassert(rockchip->pclk_rst); > > > + err = reset_control_bulk_deassert(ROCKCHIP_NUM_PM_RSTS, > > > + rockchip->pm_rsts); > > > if (err) { > > > - dev_err(dev, "deassert pclk_rst err %d\n", err); > > > + dev_err(dev, "reset bulk deassert pm err %d\n", err); > > > goto err_exit_phy; > > > } > > > > > > @@ -259,31 +184,15 @@ int rockchip_pcie_init_port(struct rockchip_pcie *rockchip) > > > * Please don't reorder the deassert sequence of the following > > > * four reset pins. > > > */ > > > > The comment above says that the resets should not be reordered. But you have > > reordered the resets. > > > As per the TRM [1], CRU_SOFTRST_CON8 clock reset unit has two groups > one with reset value 0x1 and the other 0x0, so this patch groups them > accordingly. > > [1] https://opensource.rock-chips.com/images/e/ee/Rockchip_RK3399TRM_V1.4_Part1-20170408.pdf > > If I only use reset_control_bulk_assert and > reset_control_bulk_deassert for all the reset > I get the below reset warning. > I think you misunderstood what I asked for. The comment says that the 4 resets (mgmt-sticky, core, mgmt, pipe) should not be reordered. In your new group rockchip_pci_core_rsts(), you have reordered them. I was just asking you to keep the 4 resets sorted as per the comment. - Mani
Hi Manivannan On Wed, 21 Aug 2024 at 12:35, Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> wrote: > > On Sat, Aug 17, 2024 at 06:52:47PM +0530, Anand Moon wrote: > > Hi Manivannan, > > > > On Thu, 15 Aug 2024 at 21:50, Manivannan Sadhasivam > > <manivannan.sadhasivam@linaro.org> wrote: > > > Trim the message. > > > > > > > > @@ -259,31 +184,15 @@ int rockchip_pcie_init_port(struct rockchip_pcie *rockchip) > > > > * Please don't reorder the deassert sequence of the following > > > > * four reset pins. > > > > */ > > > > > > The comment above says that the resets should not be reordered. But you have > > > reordered the resets. > > > > > As per the TRM [1], CRU_SOFTRST_CON8 clock reset unit has two groups > > one with reset value 0x1 and the other 0x0, so this patch groups them > > accordingly. > > > > [1] https://opensource.rock-chips.com/images/e/ee/Rockchip_RK3399TRM_V1.4_Part1-20170408.pdf > > > > If I only use reset_control_bulk_assert and > > reset_control_bulk_deassert for all the reset > > I get the below reset warning. > > > > I think you misunderstood what I asked for. The comment says that the 4 resets > (mgmt-sticky, core, mgmt, pipe) should not be reordered. In your new group > rockchip_pci_core_rsts(), you have reordered them. I was just asking you to keep > the 4 resets sorted as per the comment. > Ok, I understood thanks. Actually as per TRM [1] 17.5.2.2.2 System Reset The PCIe has the following distinct reset, all of these are configurable through software driver. This section describes the function of each of the reset inputs and the recommended sequences in which these should be activated. All in all, after power up, the software driver should de-assert the reset of PCIe PHY, then wait the PLL locked by polling the status, if PLL has locked, then can de-assert the rest reset simultaneously. [1] https://www.rockchip.fr/Rockchip%20RK3399%20TRM%20V1.3%20Part2.pdf So I was trying to move all the reset to the common function for the asset and then call the de-assert once the phy comes up it is not working at this moment. [ 7.084698] rockchip-pcie f8000000.pcie: no vpcie12v regulator found [ 7.281392] NET: Registered PF_ALG protocol family [ 7.372972] 8021q: 802.1Q VLAN Support v1.8 [ 7.830860] rockchip-pcie f8000000.pcie: PCIe link training gen1 timeout! [ 7.831528] rockchip-pcie f8000000.pcie: probe with driver rockchip-pcie failed with error -110 Meanwhile, I found PCIe GRF from the TRM Part 1 is missing for this so, I will add this to this series in the next version, let see if there is improvement #define GRF_SOC_CON_5_PCIE 0x0e214 #define GRF_SOC_CON_9_PCIE 0x0e224 > - Mani > > -- > மணிவண்ணன் சதாசிவம் Thanks -Anand
diff --git a/drivers/pci/controller/pcie-rockchip.c b/drivers/pci/controller/pcie-rockchip.c index 804135511528..024308bb6ac8 100644 --- a/drivers/pci/controller/pcie-rockchip.c +++ b/drivers/pci/controller/pcie-rockchip.c @@ -69,55 +69,23 @@ int rockchip_pcie_parse_dt(struct rockchip_pcie *rockchip) if (rockchip->link_gen < 0 || rockchip->link_gen > 2) rockchip->link_gen = 2; - rockchip->core_rst = devm_reset_control_get_exclusive(dev, "core"); - if (IS_ERR(rockchip->core_rst)) { - if (PTR_ERR(rockchip->core_rst) != -EPROBE_DEFER) - dev_err(dev, "missing core reset property in node\n"); - return PTR_ERR(rockchip->core_rst); - } - - rockchip->mgmt_rst = devm_reset_control_get_exclusive(dev, "mgmt"); - if (IS_ERR(rockchip->mgmt_rst)) { - if (PTR_ERR(rockchip->mgmt_rst) != -EPROBE_DEFER) - dev_err(dev, "missing mgmt reset property in node\n"); - return PTR_ERR(rockchip->mgmt_rst); - } - - rockchip->mgmt_sticky_rst = devm_reset_control_get_exclusive(dev, - "mgmt-sticky"); - if (IS_ERR(rockchip->mgmt_sticky_rst)) { - if (PTR_ERR(rockchip->mgmt_sticky_rst) != -EPROBE_DEFER) - dev_err(dev, "missing mgmt-sticky reset property in node\n"); - return PTR_ERR(rockchip->mgmt_sticky_rst); - } - - rockchip->pipe_rst = devm_reset_control_get_exclusive(dev, "pipe"); - if (IS_ERR(rockchip->pipe_rst)) { - if (PTR_ERR(rockchip->pipe_rst) != -EPROBE_DEFER) - dev_err(dev, "missing pipe reset property in node\n"); - return PTR_ERR(rockchip->pipe_rst); - } + for (i = 0; i < ROCKCHIP_NUM_PM_RSTS; i++) + rockchip->pm_rsts[i].id = rockchip_pci_pm_rsts[i]; - rockchip->pm_rst = devm_reset_control_get_exclusive(dev, "pm"); - if (IS_ERR(rockchip->pm_rst)) { - if (PTR_ERR(rockchip->pm_rst) != -EPROBE_DEFER) - dev_err(dev, "missing pm reset property in node\n"); - return PTR_ERR(rockchip->pm_rst); - } + err = devm_reset_control_bulk_get_optional_exclusive(dev, + ROCKCHIP_NUM_PM_RSTS, + rockchip->pm_rsts); + if (err) + return dev_err_probe(dev, err, "cannot get the reset control\n"); - rockchip->pclk_rst = devm_reset_control_get_exclusive(dev, "pclk"); - if (IS_ERR(rockchip->pclk_rst)) { - if (PTR_ERR(rockchip->pclk_rst) != -EPROBE_DEFER) - dev_err(dev, "missing pclk reset property in node\n"); - return PTR_ERR(rockchip->pclk_rst); - } + for (i = 0; i < ROCKCHIP_NUM_CORE_RSTS; i++) + rockchip->core_rsts[i].id = rockchip_pci_core_rsts[i]; - rockchip->aclk_rst = devm_reset_control_get_exclusive(dev, "aclk"); - if (IS_ERR(rockchip->aclk_rst)) { - if (PTR_ERR(rockchip->aclk_rst) != -EPROBE_DEFER) - dev_err(dev, "missing aclk reset property in node\n"); - return PTR_ERR(rockchip->aclk_rst); - } + err = devm_reset_control_bulk_get_optional_exclusive(dev, + ROCKCHIP_NUM_CORE_RSTS, + rockchip->core_rsts); + if (err) + return dev_err_probe(dev, err, "cannot get the reset control\n"); if (rockchip->is_rc) { rockchip->ep_gpio = devm_gpiod_get_optional(dev, "ep", @@ -150,23 +118,10 @@ int rockchip_pcie_init_port(struct rockchip_pcie *rockchip) int err, i; u32 regs; - err = reset_control_assert(rockchip->aclk_rst); - if (err) { - dev_err(dev, "assert aclk_rst err %d\n", err); - return err; - } - - err = reset_control_assert(rockchip->pclk_rst); - if (err) { - dev_err(dev, "assert pclk_rst err %d\n", err); - return err; - } - - err = reset_control_assert(rockchip->pm_rst); - if (err) { - dev_err(dev, "assert pm_rst err %d\n", err); - return err; - } + err = reset_control_bulk_assert(ROCKCHIP_NUM_PM_RSTS, + rockchip->pm_rsts); + if (err) + return dev_err_probe(dev, err, "reset bulk assert pm reset\n"); for (i = 0; i < MAX_LANE_NUM; i++) { err = phy_init(rockchip->phys[i]); @@ -176,47 +131,17 @@ int rockchip_pcie_init_port(struct rockchip_pcie *rockchip) } } - err = reset_control_assert(rockchip->core_rst); - if (err) { - dev_err(dev, "assert core_rst err %d\n", err); - goto err_exit_phy; - } - - err = reset_control_assert(rockchip->mgmt_rst); - if (err) { - dev_err(dev, "assert mgmt_rst err %d\n", err); - goto err_exit_phy; - } - - err = reset_control_assert(rockchip->mgmt_sticky_rst); - if (err) { - dev_err(dev, "assert mgmt_sticky_rst err %d\n", err); - goto err_exit_phy; - } - - err = reset_control_assert(rockchip->pipe_rst); - if (err) { - dev_err(dev, "assert pipe_rst err %d\n", err); - goto err_exit_phy; - } + err = reset_control_bulk_assert(ROCKCHIP_NUM_CORE_RSTS, + rockchip->core_rsts); + if (err) + return dev_err_probe(dev, err, "reset bulk assert core reset\n"); udelay(10); - err = reset_control_deassert(rockchip->pm_rst); - if (err) { - dev_err(dev, "deassert pm_rst err %d\n", err); - goto err_exit_phy; - } - - err = reset_control_deassert(rockchip->aclk_rst); - if (err) { - dev_err(dev, "deassert aclk_rst err %d\n", err); - goto err_exit_phy; - } - - err = reset_control_deassert(rockchip->pclk_rst); + err = reset_control_bulk_deassert(ROCKCHIP_NUM_PM_RSTS, + rockchip->pm_rsts); if (err) { - dev_err(dev, "deassert pclk_rst err %d\n", err); + dev_err(dev, "reset bulk deassert pm err %d\n", err); goto err_exit_phy; } @@ -259,31 +184,15 @@ int rockchip_pcie_init_port(struct rockchip_pcie *rockchip) * 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 mgmt_sticky_rst err %d\n", err); - goto err_power_off_phy; - } - - err = reset_control_deassert(rockchip->core_rst); + err = reset_control_bulk_deassert(ROCKCHIP_NUM_CORE_RSTS, + rockchip->core_rsts); if (err) { - dev_err(dev, "deassert core_rst err %d\n", err); - goto err_power_off_phy; - } - - err = reset_control_deassert(rockchip->mgmt_rst); - if (err) { - dev_err(dev, "deassert mgmt_rst err %d\n", err); - goto err_power_off_phy; - } - - err = reset_control_deassert(rockchip->pipe_rst); - if (err) { - dev_err(dev, "deassert pipe_rst err %d\n", err); + dev_err(dev, "reset bulk deassert core err %d\n", err); goto err_power_off_phy; } return 0; + err_power_off_phy: while (i--) phy_power_off(rockchip->phys[i]); diff --git a/drivers/pci/controller/pcie-rockchip.h b/drivers/pci/controller/pcie-rockchip.h index 72346e17e45e..27e951b41b80 100644 --- a/drivers/pci/controller/pcie-rockchip.h +++ b/drivers/pci/controller/pcie-rockchip.h @@ -15,6 +15,7 @@ #include <linux/kernel.h> #include <linux/pci.h> #include <linux/pci-ecam.h> +#include <linux/reset.h> /* * The upper 16 bits of PCIE_CLIENT_CONFIG are a write mask for the lower 16 @@ -289,6 +290,8 @@ ROCKCHIP_PCIE_CORE_EP_FUNC_BAR_CFG_BAR_CTRL_MASK(b)) #define ROCKCHIP_NUM_CLKS ARRAY_SIZE(rockchip_pci_clks) +#define ROCKCHIP_NUM_PM_RSTS ARRAY_SIZE(rockchip_pci_pm_rsts) +#define ROCKCHIP_NUM_CORE_RSTS ARRAY_SIZE(rockchip_pci_core_rsts) static const char * const rockchip_pci_clks[] = { "aclk", @@ -297,18 +300,26 @@ static const char * const rockchip_pci_clks[] = { "pm", }; +static const char * const rockchip_pci_pm_rsts[] = { + "pm", + "pclk", + "aclk", +}; + +static const char * const rockchip_pci_core_rsts[] = { + "core", + "mgmt", + "mgmt-sticky", + "pipe", +}; + struct rockchip_pcie { void __iomem *reg_base; /* DT axi-base */ void __iomem *apb_base; /* DT apb-base */ bool legacy_phy; struct phy *phys[MAX_LANE_NUM]; - struct reset_control *core_rst; - struct reset_control *mgmt_rst; - struct reset_control *mgmt_sticky_rst; - struct reset_control *pipe_rst; - struct reset_control *pm_rst; - struct reset_control *aclk_rst; - struct reset_control *pclk_rst; + struct reset_control_bulk_data pm_rsts[ROCKCHIP_NUM_PM_RSTS]; + struct reset_control_bulk_data core_rsts[ROCKCHIP_NUM_CORE_RSTS]; struct clk_bulk_data clks[ROCKCHIP_NUM_CLKS]; struct regulator *vpcie12v; /* 12V power supply */ struct regulator *vpcie3v3; /* 3.3V power supply */
Refactor the reset control handling in the Rockchip PCIe driver, introducing a more robust and efficient method for assert and deassert reset controller using reset_control_bulk*() API. Using the reset_control_bulk APIs, the reset handling for the core clocks reset unit becomes much simpler. As per rockchip rk3399 TRM SOFTRST_CON8 soft reset controller have clock reset unit value set to 0x1 for example "pcie_pipe", "pcie_mgmt_sticky", "pcie_mgmt" and "pci_core", hence group then under one reset bulk controller. Where as "pcie_pm", "presetn_pcie", "aresetn_pcie" have reset value set to 0x0, hence group them under reset control bulk controller. Signed-off-by: Anand Moon <linux.amoon@gmail.com> --- v4: use dev_err_probe in error path. v3: Fix typo in commit message, dropped reported by. v2: Fix compilation error reported by Intel test robot fixed checkpatch warning --- drivers/pci/controller/pcie-rockchip.c | 149 +++++-------------------- drivers/pci/controller/pcie-rockchip.h | 25 +++-- 2 files changed, 47 insertions(+), 127 deletions(-)