PCI: qcom: Use bulk reset APIs for handling resets for IP rev 2.3.3

All the resets are asserted and deasserted at the same time. So the bulk
reset APIs can be used to handle them together. This simplifies the code
a lot.

Link: https://lore.kernel.org/r/20230316081117.14288-12-manivannan.sadhasivam@linaro.org
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: Lorenzo Pieralisi <lpieralisi@kernel.org>

diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c
index 42b851b..d673cb2 100644 (file)
--- a/drivers/pci/controller/dwc/pcie-qcom.c
+++ b/drivers/pci/controller/dwc/pcie-qcom.c
@@ -170,9 +170,10 @@ struct qcom_pcie_resources_2_3_2 {
 };
 
 #define QCOM_PCIE_2_3_3_MAX_CLOCKS             5
+#define QCOM_PCIE_2_3_3_MAX_RESETS             7
 struct qcom_pcie_resources_2_3_3 {
        struct clk_bulk_data clks[QCOM_PCIE_2_3_3_MAX_CLOCKS];
-       struct reset_control *rst[7];
+       struct reset_control_bulk_data rst[QCOM_PCIE_2_3_3_MAX_RESETS];
 };
 
 #define QCOM_PCIE_2_4_0_MAX_CLOCKS     4
@@ -889,10 +890,6 @@ static int qcom_pcie_get_resources_2_3_3(struct qcom_pcie *pcie)
        struct qcom_pcie_resources_2_3_3 *res = &pcie->res.v2_3_3;
        struct dw_pcie *pci = pcie->pci;
        struct device *dev = pci->dev;
-       int i;
-       const char *rst_names[] = { "axi_m", "axi_s", "pipe",
-                                   "axi_m_sticky", "sticky",
-                                   "ahb", "sleep", };
        int ret;
 
        res->clks[0].id = "iface";
@@ -905,11 +902,17 @@ static int qcom_pcie_get_resources_2_3_3(struct qcom_pcie *pcie)
        if (ret < 0)
                return ret;
 
-       for (i = 0; i < ARRAY_SIZE(rst_names); i++) {
-               res->rst[i] = devm_reset_control_get(dev, rst_names[i]);
-               if (IS_ERR(res->rst[i]))
-                       return PTR_ERR(res->rst[i]);
-       }
+       res->rst[0].id = "axi_m";
+       res->rst[1].id = "axi_s";
+       res->rst[2].id = "pipe";
+       res->rst[3].id = "axi_m_sticky";
+       res->rst[4].id = "sticky";
+       res->rst[5].id = "ahb";
+       res->rst[6].id = "sleep";
+
+       ret = devm_reset_control_bulk_get_exclusive(dev, ARRAY_SIZE(res->rst), res->rst);
+       if (ret < 0)
+               return ret;
 
        return 0;
 }
@@ -926,25 +929,20 @@ static int qcom_pcie_init_2_3_3(struct qcom_pcie *pcie)
        struct qcom_pcie_resources_2_3_3 *res = &pcie->res.v2_3_3;
        struct dw_pcie *pci = pcie->pci;
        struct device *dev = pci->dev;
-       int i, ret;
+       int ret;
 
-       for (i = 0; i < ARRAY_SIZE(res->rst); i++) {
-               ret = reset_control_assert(res->rst[i]);
-               if (ret) {
-                       dev_err(dev, "reset #%d assert failed (%d)\n", i, ret);
-                       return ret;
-               }
+       ret = reset_control_bulk_assert(ARRAY_SIZE(res->rst), res->rst);
+       if (ret < 0) {
+               dev_err(dev, "cannot assert resets\n");
+               return ret;
        }
 
        usleep_range(2000, 2500);
 
-       for (i = 0; i < ARRAY_SIZE(res->rst); i++) {
-               ret = reset_control_deassert(res->rst[i]);
-               if (ret) {
-                       dev_err(dev, "reset #%d deassert failed (%d)\n", i,
-                               ret);
-                       return ret;
-               }
+       ret = reset_control_bulk_deassert(ARRAY_SIZE(res->rst), res->rst);
+       if (ret < 0) {
+               dev_err(dev, "cannot deassert resets\n");
+               return ret;
        }
 
        /*
@@ -966,8 +964,7 @@ err_assert_resets:
         * Not checking for failure, will anyway return
         * the original failure in 'ret'.
         */
-       for (i = 0; i < ARRAY_SIZE(res->rst); i++)
-               reset_control_assert(res->rst[i]);
+       reset_control_bulk_assert(ARRAY_SIZE(res->rst), res->rst);
 
        return ret;
 }