On Sat 18 Dec 06:10 PST 2021, Dmitry Baryshkov wrote:
> 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.
>
Reviewed-by: Bjorn Andersson <bjorn.andersson@xxxxxxxxxx>
Regards,
Bjorn
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
> ---
> drivers/pci/controller/dwc/pcie-qcom.c | 31 +++++++++++---------------
> 1 file changed, 13 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c
> index 4e668da96ef4..1204011c96ee 100644
> --- a/drivers/pci/controller/dwc/pcie-qcom.c
> +++ b/drivers/pci/controller/dwc/pcie-qcom.c
> @@ -200,8 +200,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)
> @@ -225,8 +224,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;
> }
> @@ -1145,7 +1144,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);
> @@ -1180,7 +1179,7 @@ static int qcom_pcie_init_2_7_0(struct qcom_pcie *pcie)
> }
>
> /* 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);
>
> ret = clk_bulk_prepare_enable(res->num_clks, res->clks);
> @@ -1243,7 +1242,7 @@ static void qcom_pcie_deinit_2_7_0(struct qcom_pcie *pcie)
> clk_bulk_disable_unprepare(res->num_clks, res->clks);
>
> /* 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);
>
> regulator_bulk_disable(ARRAY_SIZE(res->supplies), res->supplies);
> @@ -1336,7 +1335,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;
>
> @@ -1346,8 +1345,8 @@ static int qcom_pcie_host_init(struct pcie_port *pp)
>
> 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;
> }
> @@ -1358,7 +1357,7 @@ static int qcom_pcie_host_init(struct pcie_port *pp)
> qcom_ep_reset_assert(pcie);
> phy_power_off(pcie->phy);
> err_deinit:
> - pcie->ops->deinit(pcie);
> + pcie->cfg->ops->deinit(pcie);
>
> return ret;
> }
> @@ -1468,7 +1467,6 @@ static int qcom_pcie_probe(struct platform_device *pdev)
> struct pcie_port *pp;
> struct dw_pcie *pci;
> struct qcom_pcie *pcie;
> - const struct qcom_pcie_cfg *pcie_cfg;
> int ret;
>
> pcie = devm_kzalloc(dev, sizeof(*pcie), GFP_KERNEL);
> @@ -1485,15 +1483,12 @@ static int qcom_pcie_probe(struct platform_device *pdev)
>
> pcie->pci = pci;
>
> - pcie_cfg = of_device_get_match_data(dev);
> - if (!pcie_cfg || !pcie_cfg->ops) {
> + pcie->cfg = of_device_get_match_data(dev);
> + if (!pcie->cfg || !pcie->cfg->ops) {
> dev_err(dev, "Invalid platform data\n");
> return -EINVAL;
> }
>
> - pcie->ops = pcie_cfg->ops;
> - pcie->pipe_clk_need_muxing = pcie_cfg->pipe_clk_need_muxing;
> -
> pcie->reset = devm_gpiod_get_optional(dev, "perst", GPIOD_OUT_HIGH);
> if (IS_ERR(pcie->reset))
> return PTR_ERR(pcie->reset);
> @@ -1510,7 +1505,7 @@ static int qcom_pcie_probe(struct platform_device *pdev)
> if (IS_ERR(pcie->phy))
> return PTR_ERR(pcie->phy);
>
> - ret = pcie->ops->get_resources(pcie);
> + ret = pcie->cfg->ops->get_resources(pcie);
> if (ret)
> return ret;
>
> --
> 2.34.1
>
