Re: [PATCH v3 1/3] PCI: qcom: Use clk_bulk API for 2.4.0 controllers

[Stanimir Varbanov]

Hi Lorenzo,

On 28.05.19 Ð. 18:13 Ñ., Lorenzo Pieralisi wrote:
> On Thu, May 16, 2019 at 12:14:04PM +0300, Stanimir Varbanov wrote:
> > Hi Bjorn,
> >
> > On 5/2/19 3:19 AM, Bjorn Andersson wrote:
> > > Before introducing the QCS404 platform, which uses the same PCIe
> > > controller as IPQ4019, migrate this to use the bulk clock API, in order
> > > to make the error paths slighly cleaner.
> > >
> > > Acked-by: Stanimir Varbanov <svarbanov@xxxxxxxxxx>
> > > Reviewed-by: Niklas Cassel <niklas.cassel@xxxxxxxxxx>
> > > Signed-off-by: Bjorn Andersson <bjorn.andersson@xxxxxxxxxx>
> > > ---
> > >
> > > Changes since v2:
> > > - Defined QCOM_PCIE_2_4_0_MAX_CLOCKS
> > >
> > >   drivers/pci/controller/dwc/pcie-qcom.c | 49 ++++++++------------------
> > >   1 file changed, 14 insertions(+), 35 deletions(-)
> > >
> > > diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c
> > > index 0ed235d560e3..d740cbe0e56d 100644
> > > --- a/drivers/pci/controller/dwc/pcie-qcom.c
> > > +++ b/drivers/pci/controller/dwc/pcie-qcom.c
> > > @@ -112,10 +112,10 @@ struct qcom_pcie_resources_2_3_2 {
> > >   	struct regulator_bulk_data supplies[QCOM_PCIE_2_3_2_MAX_SUPPLY];
> > >   };
> > >   
> > > +#define QCOM_PCIE_2_4_0_MAX_CLOCKS	3
> > >   struct qcom_pcie_resources_2_4_0 {
> > > -	struct clk *aux_clk;
> > > -	struct clk *master_clk;
> > > -	struct clk *slave_clk;
> > > +	struct clk_bulk_data clks[QCOM_PCIE_2_4_0_MAX_CLOCKS];
> > > +	int num_clks;
> > >   	struct reset_control *axi_m_reset;
> > >   	struct reset_control *axi_s_reset;
> > >   	struct reset_control *pipe_reset;
> > > @@ -638,18 +638,17 @@ static int qcom_pcie_get_resources_2_4_0(struct qcom_pcie *pcie)
> > >   	struct qcom_pcie_resources_2_4_0 *res = &pcie->res.v2_4_0;
> > >   	struct dw_pcie *pci = pcie->pci;
> > >   	struct device *dev = pci->dev;
> > > +	int ret;
> > >   
> > > -	res->aux_clk = devm_clk_get(dev, "aux");
> > > -	if (IS_ERR(res->aux_clk))
> > > -		return PTR_ERR(res->aux_clk);
> > > +	res->clks[0].id = "aux";
> > > +	res->clks[1].id = "master_bus";
> > > +	res->clks[2].id = "slave_bus";
> > >   
> > > -	res->master_clk = devm_clk_get(dev, "master_bus");
> > > -	if (IS_ERR(res->master_clk))
> > > -		return PTR_ERR(res->master_clk);
> > > +	res->num_clks = 3;
> >
> > Use the new fresh define QCOM_PCIE_2_4_0_MAX_CLOCKS?
> >
> > >   
> > > -	res->slave_clk = devm_clk_get(dev, "slave_bus");
> > > -	if (IS_ERR(res->slave_clk))
> > > -		return PTR_ERR(res->slave_clk);
> > > +	ret = devm_clk_bulk_get(dev, res->num_clks, res->clks);
> > > +	if (ret < 0)
> > > +		return ret;
> > >   
> > >   	res->axi_m_reset = devm_reset_control_get_exclusive(dev, "axi_m");
> > >   	if (IS_ERR(res->axi_m_reset))
> > > @@ -719,9 +718,7 @@ static void qcom_pcie_deinit_2_4_0(struct qcom_pcie *pcie)
> > >   	reset_control_assert(res->axi_m_sticky_reset);
> > >   	reset_control_assert(res->pwr_reset);
> > >   	reset_control_assert(res->ahb_reset);
> > > -	clk_disable_unprepare(res->aux_clk);
> > > -	clk_disable_unprepare(res->master_clk);
> > > -	clk_disable_unprepare(res->slave_clk);
> > > +	clk_bulk_disable_unprepare(res->num_clks, res->clks);
> > >   }
> > >   
> > >   static int qcom_pcie_init_2_4_0(struct qcom_pcie *pcie)
> > > @@ -850,23 +847,9 @@ static int qcom_pcie_init_2_4_0(struct qcom_pcie *pcie)
> > >   
> > >   	usleep_range(10000, 12000);
> > >   
> > > -	ret = clk_prepare_enable(res->aux_clk);
> > > -	if (ret) {
> > > -		dev_err(dev, "cannot prepare/enable iface clock\n");
> > > +	ret = clk_bulk_prepare_enable(res->num_clks, res->clks);
> > > +	if (ret)
> > >   		goto err_clk_aux;
> >
> > Maybe you have to change the name of the label too?
> >
> > > -	}
> > > -
> > > -	ret = clk_prepare_enable(res->master_clk);
> > > -	if (ret) {
> > > -		dev_err(dev, "cannot prepare/enable core clock\n");
> > > -		goto err_clk_axi_m;
> > > -	}
> > > -
> > > -	ret = clk_prepare_enable(res->slave_clk);
> > > -	if (ret) {
> > > -		dev_err(dev, "cannot prepare/enable phy clock\n");
> > > -		goto err_clk_axi_s;
> > > -	}
> > >   
> > >   	/* enable PCIe clocks and resets */
> > >   	val = readl(pcie->parf + PCIE20_PARF_PHY_CTRL);
> > > @@ -891,10 +874,6 @@ static int qcom_pcie_init_2_4_0(struct qcom_pcie *pcie)
> > >   
> > >   	return 0;
> > >   
> > > -err_clk_axi_s:
> > > -	clk_disable_unprepare(res->master_clk);
> > > -err_clk_axi_m:
> > > -	clk_disable_unprepare(res->aux_clk);
> > >   err_clk_aux:
> > >   	reset_control_assert(res->ahb_reset);
> > >   err_rst_ahb:
>
> Hi Bjorn, Stanimir,
>
> can I merge the series as-is or we need a v4 for the requested
> updates ? Please let me know.

I'm fine with either way:

Acked-by: Stanimir Varbanov <svarbanov@xxxxxxxxxx>

regards,
Stan