Commit f94c35e0 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Lorenzo Pieralisi
Browse files

PCI: qcom: Remove redundancy between qcom_pcie and qcom_pcie_cfg 

In preparation to adding more flags to configuration data, use pointer
to struct qcom_pcie_cfg directly inside struct qcom_pcie, rather than
duplicating all its fields. This would save us from the boilerplate code
that just copies flag values from one struct to another one.

Link: https://lore.kernel.org/r/20220223101435.447839-3-dmitry.baryshkov@linaro.org


Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reviewed-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Acked-by: default avatarStanimir Varbanov <svarbanov@mm-sol.com>
parent dddb4efa

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

+16 −18
Original line number Diff line number Diff line
@@ -204,8 +204,7 @@ struct qcom_pcie { 
	union qcom_pcie_resources res;

	struct phy *phy;

	struct gpio_desc *reset;

	const struct qcom_pcie_ops *ops;

	unsigned int pipe_clk_need_muxing:1;

	const struct qcom_pcie_cfg *cfg;

};



#define to_qcom_pcie(x)		dev_get_drvdata((x)->dev)
@@ -229,8 +228,8 @@ static int qcom_pcie_start_link(struct dw_pcie *pci) 
	struct qcom_pcie *pcie = to_qcom_pcie(pci);



	/* Enable Link Training state machine */

	if (pcie->ops->ltssm_enable)

		pcie->ops->ltssm_enable(pcie);

	if (pcie->cfg->ops->ltssm_enable)

		pcie->cfg->ops->ltssm_enable(pcie);



	return 0;

}
@@ -1176,7 +1175,7 @@ static int qcom_pcie_get_resources_2_7_0(struct qcom_pcie *pcie) 
	if (ret < 0)

		return ret;



	if (pcie->pipe_clk_need_muxing) {

	if (pcie->cfg->pipe_clk_need_muxing) {

		res->pipe_clk_src = devm_clk_get(dev, "pipe_mux");

		if (IS_ERR(res->pipe_clk_src))

			return PTR_ERR(res->pipe_clk_src);
@@ -1209,7 +1208,7 @@ static int qcom_pcie_init_2_7_0(struct qcom_pcie *pcie) 
	}



	/* Set TCXO as clock source for pcie_pipe_clk_src */

	if (pcie->pipe_clk_need_muxing)

	if (pcie->cfg->pipe_clk_need_muxing)

		clk_set_parent(res->pipe_clk_src, res->ref_clk_src);



	ret = clk_bulk_prepare_enable(res->num_clks, res->clks);
@@ -1284,7 +1283,7 @@ static int qcom_pcie_post_init_2_7_0(struct qcom_pcie *pcie) 
	struct qcom_pcie_resources_2_7_0 *res = &pcie->res.v2_7_0;



	/* Set pipe clock as clock source for pcie_pipe_clk_src */

	if (pcie->pipe_clk_need_muxing)

	if (pcie->cfg->pipe_clk_need_muxing)

		clk_set_parent(res->pipe_clk_src, res->phy_pipe_clk);



	return clk_prepare_enable(res->pipe_clk);
@@ -1384,7 +1383,7 @@ static int qcom_pcie_host_init(struct pcie_port *pp) 


	qcom_ep_reset_assert(pcie);



	ret = pcie->ops->init(pcie);

	ret = pcie->cfg->ops->init(pcie);

	if (ret)

		return ret;
@@ -1392,16 +1391,16 @@ static int qcom_pcie_host_init(struct pcie_port *pp) 
	if (ret)

		goto err_deinit;



	if (pcie->ops->post_init) {

		ret = pcie->ops->post_init(pcie);

	if (pcie->cfg->ops->post_init) {

		ret = pcie->cfg->ops->post_init(pcie);

		if (ret)

			goto err_disable_phy;

	}



	qcom_ep_reset_deassert(pcie);



	if (pcie->ops->config_sid) {

		ret = pcie->ops->config_sid(pcie);

	if (pcie->cfg->ops->config_sid) {

		ret = pcie->cfg->ops->config_sid(pcie);

		if (ret)

			goto err;

	}
@@ -1410,12 +1409,12 @@ static int qcom_pcie_host_init(struct pcie_port *pp) 


err:

	qcom_ep_reset_assert(pcie);

	if (pcie->ops->post_deinit)

		pcie->ops->post_deinit(pcie);

	if (pcie->cfg->ops->post_deinit)

		pcie->cfg->ops->post_deinit(pcie);

err_disable_phy:

	phy_power_off(pcie->phy);

err_deinit:

	pcie->ops->deinit(pcie);

	pcie->cfg->ops->deinit(pcie);



	return ret;

}
@@ -1559,8 +1558,7 @@ static int qcom_pcie_probe(struct platform_device *pdev) 


	pcie->pci = pci;



	pcie->ops = pcie_cfg->ops;

	pcie->pipe_clk_need_muxing = pcie_cfg->pipe_clk_need_muxing;

	pcie->cfg = pcie_cfg;



	pcie->reset = devm_gpiod_get_optional(dev, "perst", GPIOD_OUT_HIGH);

	if (IS_ERR(pcie->reset)) {
@@ -1586,7 +1584,7 @@ static int qcom_pcie_probe(struct platform_device *pdev) 
		goto err_pm_runtime_put;

	}



	ret = pcie->ops->get_resources(pcie);

	ret = pcie->cfg->ops->get_resources(pcie);

	if (ret)

		goto err_pm_runtime_put;