Skip to contentSkip to conversation

HiSilicon STB PCIe host use bulk API for clock

PATCH In review Anand Moon 4 participants 13 messages Aug 26, 2025 – Sep 8, 2025

Subsystems (3)
lore
Share & tools
lore

Anand Moon

author
#0 lore raw

cover HiSilicon STB PCIe host use bulk API for clock

Simplify the code using the clk_bulk*() and reset_control_bulk() APIs

Thanks
-Anand

Anand Moon (2):
PCI: dwc: histb: Simplify clock handling by using clk_bulk*()
functions
PCI: dwc: histb: Simplify reset control handling by using
reset_control_bulk*() function

 drivers/pci/controller/dwc/pcie-histb.c | 119 +++++++-----------------
 1 file changed, 35 insertions(+), 84 deletions(-)

base-commit: fab1beda7597fac1cecc01707d55eadb6bbe773c

Signature · 1 line
2.50.1
author
#1 lore raw

PATCH 1/2 PCI: dwc: histb: Simplify clock handling by using clk_bulk*() functions

Currently, the driver acquires clocks and prepare/enable/disable/unprepare the clocks individually thereby making the driver complex to read.

The driver can be simplified by using the clk_bulk*() APIs.

Use:
- devm_clk_bulk_get_all() API to acquire all the clocks
- clk_bulk_prepare_enable() to prepare/enable clocks
- clk_bulk_disable_unprepare() APIs to disable/unprepare them in bulk

---
 drivers/pci/controller/dwc/pcie-histb.c | 70 ++++---------------------
 1 file changed, 11 insertions(+), 59 deletions(-)
drivers/pci/controller/dwc/pcie-histb.c +11 -59
index a52071589377..4022349e85d2 100644
@@ -51,10 +51,8 @@
 
 struct histb_pcie {
 	struct dw_pcie *pci;
-	struct clk *aux_clk;
-	struct clk *pipe_clk;
-	struct clk *sys_clk;
-	struct clk *bus_clk;
+	struct  clk_bulk_data *clks;
+	int     num_clks;
 	struct phy *phy;
 	struct reset_control *soft_reset;
 	struct reset_control *sys_reset;
@@ -204,10 +202,7 @@ static void histb_pcie_host_disable(struct histb_pcie *hipcie)
 	reset_control_assert(hipcie->sys_reset);
 	reset_control_assert(hipcie->bus_reset);
 
-	clk_disable_unprepare(hipcie->aux_clk);
-	clk_disable_unprepare(hipcie->pipe_clk);
-	clk_disable_unprepare(hipcie->sys_clk);
-	clk_disable_unprepare(hipcie->bus_clk);
+	clk_bulk_disable_unprepare(hipcie->num_clks, hipcie->clks);
 
 	if (hipcie->reset_gpio)
 		gpiod_set_value_cansleep(hipcie->reset_gpio, 1);
@@ -235,28 +230,10 @@ static int histb_pcie_host_enable(struct dw_pcie_rp *pp)
 	if (hipcie->reset_gpio)
 		gpiod_set_value_cansleep(hipcie->reset_gpio, 0);
 
-	ret = clk_prepare_enable(hipcie->bus_clk);
+	ret = clk_bulk_prepare_enable(hipcie->num_clks, hipcie->clks);
 	if (ret) {
-		dev_err(dev, "cannot prepare/enable bus clk\n");
-		goto err_bus_clk;
-	}
-
-	ret = clk_prepare_enable(hipcie->sys_clk);
-	if (ret) {
-		dev_err(dev, "cannot prepare/enable sys clk\n");
-		goto err_sys_clk;
-	}
-
-	ret = clk_prepare_enable(hipcie->pipe_clk);
-	if (ret) {
-		dev_err(dev, "cannot prepare/enable pipe clk\n");
-		goto err_pipe_clk;
-	}
-
-	ret = clk_prepare_enable(hipcie->aux_clk);
-	if (ret) {
-		dev_err(dev, "cannot prepare/enable aux clk\n");
-		goto err_aux_clk;
+		ret = dev_err_probe(dev, ret, "failed to enable clocks\n");
+		goto reg_dis;
 	}
 
 	reset_control_assert(hipcie->soft_reset);
@@ -270,13 +247,7 @@ static int histb_pcie_host_enable(struct dw_pcie_rp *pp)
 
 	return 0;
 
-err_aux_clk:
-	clk_disable_unprepare(hipcie->pipe_clk);
-err_pipe_clk:
-	clk_disable_unprepare(hipcie->sys_clk);
-err_sys_clk:
-	clk_disable_unprepare(hipcie->bus_clk);
-err_bus_clk:
+reg_dis:
 	if (hipcie->vpcie)
 		regulator_disable(hipcie->vpcie);
 
@@ -345,29 +316,10 @@ static int histb_pcie_probe(struct platform_device *pdev)
 		return ret;
 	}
 
-	hipcie->aux_clk = devm_clk_get(dev, "aux");
-	if (IS_ERR(hipcie->aux_clk)) {
-		dev_err(dev, "Failed to get PCIe aux clk\n");
-		return PTR_ERR(hipcie->aux_clk);
-	}
-
-	hipcie->pipe_clk = devm_clk_get(dev, "pipe");
-	if (IS_ERR(hipcie->pipe_clk)) {
-		dev_err(dev, "Failed to get PCIe pipe clk\n");
-		return PTR_ERR(hipcie->pipe_clk);
-	}
-
-	hipcie->sys_clk = devm_clk_get(dev, "sys");
-	if (IS_ERR(hipcie->sys_clk)) {
-		dev_err(dev, "Failed to get PCIEe sys clk\n");
-		return PTR_ERR(hipcie->sys_clk);
-	}
-
-	hipcie->bus_clk = devm_clk_get(dev, "bus");
-	if (IS_ERR(hipcie->bus_clk)) {
-		dev_err(dev, "Failed to get PCIe bus clk\n");
-		return PTR_ERR(hipcie->bus_clk);
-	}
+	hipcie->num_clks = devm_clk_bulk_get_all(dev, &hipcie->clks);
+	if (hipcie->num_clks < 0)
+		return dev_err_probe(dev, hipcie->num_clks,
+				     "failed to get clocks\n");
 
 	hipcie->soft_reset = devm_reset_control_get(dev, "soft");
 	if (IS_ERR(hipcie->soft_reset)) {
Signature · 1 line
2.50.1
author
#6 lore raw

PATCH 2/2 PCI: dwc: histb: Simplify reset control handling by using reset_control_bulk*() function

In reply to Anand Moon

Currently, the driver acquires and asserts/deasserts the resets individually thereby making the driver complex to read.

This can be simplified by using the reset_control_bulk() APIs.

Use devm_reset_control_bulk_get_exclusive() API to acquire all the resets and use reset_control_bulk_{assert/deassert}() APIs to assert/deassert them in bulk.

---
 drivers/pci/controller/dwc/pcie-histb.c | 57 ++++++++++++-------------
 1 file changed, 28 insertions(+), 29 deletions(-)
drivers/pci/controller/dwc/pcie-histb.c +28 -29
index 4022349e85d2..4ba5c9af63a0 100644
@@ -49,14 +49,20 @@
 #define PCIE_LTSSM_STATE_MASK		GENMASK(5, 0)
 #define PCIE_LTSSM_STATE_ACTIVE		0x11
 
+#define PCIE_HISTB_NUM_RESETS   ARRAY_SIZE(histb_pci_rsts)
+
+static const char * const histb_pci_rsts[] = {
+	"soft",
+	"sys",
+	"bus",
+};
+
 struct histb_pcie {
 	struct dw_pcie *pci;
 	struct  clk_bulk_data *clks;
 	int     num_clks;
 	struct phy *phy;
-	struct reset_control *soft_reset;
-	struct reset_control *sys_reset;
-	struct reset_control *bus_reset;
+	struct  reset_control_bulk_data reset[PCIE_HISTB_NUM_RESETS];
 	void __iomem *ctrl;
 	struct gpio_desc *reset_gpio;
 	struct regulator *vpcie;
@@ -198,9 +204,8 @@ static const struct dw_pcie_host_ops histb_pcie_host_ops = {
 
 static void histb_pcie_host_disable(struct histb_pcie *hipcie)
 {
-	reset_control_assert(hipcie->soft_reset);
-	reset_control_assert(hipcie->sys_reset);
-	reset_control_assert(hipcie->bus_reset);
+	reset_control_bulk_assert(PCIE_HISTB_NUM_RESETS,
+				  hipcie->reset);
 
 	clk_bulk_disable_unprepare(hipcie->num_clks, hipcie->clks);
 
@@ -236,14 +241,19 @@ static int histb_pcie_host_enable(struct dw_pcie_rp *pp)
 		goto reg_dis;
 	}
 
-	reset_control_assert(hipcie->soft_reset);
-	reset_control_deassert(hipcie->soft_reset);
-
-	reset_control_assert(hipcie->sys_reset);
-	reset_control_deassert(hipcie->sys_reset);
+	ret = reset_control_bulk_assert(PCIE_HISTB_NUM_RESETS,
+					hipcie->reset);
+	if (ret) {
+		dev_err(dev, "Couldn't assert reset %d\n", ret);
+		goto reg_dis;
+	}
 
-	reset_control_assert(hipcie->bus_reset);
-	reset_control_deassert(hipcie->bus_reset);
+	ret = reset_control_bulk_deassert(PCIE_HISTB_NUM_RESETS,
+					  hipcie->reset);
+	if (ret) {
+		dev_err(dev, "Couldn't dessert reset %d\n", ret);
+		goto reg_dis;
+	}
 
 	return 0;
 
@@ -321,23 +331,12 @@ static int histb_pcie_probe(struct platform_device *pdev)
 		return dev_err_probe(dev, hipcie->num_clks,
 				     "failed to get clocks\n");
 
-	hipcie->soft_reset = devm_reset_control_get(dev, "soft");
-	if (IS_ERR(hipcie->soft_reset)) {
-		dev_err(dev, "couldn't get soft reset\n");
-		return PTR_ERR(hipcie->soft_reset);
-	}
+	ret = devm_reset_control_bulk_get_exclusive(dev,
+						    PCIE_HISTB_NUM_RESETS,
+						    hipcie->reset);
+	if (ret)
+		return dev_err_probe(dev, ret, "Cannot get the Core resets\n");
 
-	hipcie->sys_reset = devm_reset_control_get(dev, "sys");
-	if (IS_ERR(hipcie->sys_reset)) {
-		dev_err(dev, "couldn't get sys reset\n");
-		return PTR_ERR(hipcie->sys_reset);
-	}
-
-	hipcie->bus_reset = devm_reset_control_get(dev, "bus");
-	if (IS_ERR(hipcie->bus_reset)) {
-		dev_err(dev, "couldn't get bus reset\n");
-		return PTR_ERR(hipcie->bus_reset);
-	}
 
 	hipcie->phy = devm_phy_get(dev, "phy");
 	if (IS_ERR(hipcie->phy)) {
Signature · 1 line
2.50.1
Reviewed-by on v1 2/2
#7 lore raw

Re: [PATCH v1 2/2] PCI: dwc: histb: Simplify reset control handling by using reset_control_bulk*() function

Quoted 30 lines · Anand Moon

Currently, the driver acquires and asserts/deasserts the resets individually thereby making the driver complex to read.

This can be simplified by using the reset_control_bulk() APIs.

Use devm_reset_control_bulk_get_exclusive() API to acquire all the resets and use reset_control_bulk_{assert/deassert}() APIs to assert/deassert them in bulk.

---
 drivers/pci/controller/dwc/pcie-histb.c | 57 ++++++++++++-------------
 1 file changed, 28 insertions(+), 29 deletions(-)
drivers/pci/controller/dwc/pcie-histb.c +8 -0
index 4022349e85d2..4ba5c9af63a0 100644
@@ -49,14 +49,20 @@
 #define PCIE_LTSSM_STATE_MASK		GENMASK(5, 0)
 #define PCIE_LTSSM_STATE_ACTIVE		0x11
 
+#define PCIE_HISTB_NUM_RESETS   ARRAY_SIZE(histb_pci_rsts)
+
+static const char * const histb_pci_rsts[] = {
+	"soft",
+	"sys",
+	"bus",
+};
+

[...]

Quoted 9 lines
drivers/pci/controller/dwc/pcie-histb.c +0 -5
@@ -236,14 +241,19 @@ static int histb_pcie_host_enable(struct dw_pcie_rp *pp)
 		goto reg_dis;
 	}
 
-	reset_control_assert(hipcie->soft_reset);
-	reset_control_deassert(hipcie->soft_reset);
-
-	reset_control_assert(hipcie->sys_reset);
-	reset_control_deassert(hipcie->sys_reset);

drivers/pci/controller/dwc/pcie-histb.c static int histb_pcie_host_enable(struct dw_pcie_rp *pp) · line 251

Quoted 10 lines
drivers/pci/controller/dwc/pcie-histb.c +7 -2
+	ret = reset_control_bulk_assert(PCIE_HISTB_NUM_RESETS,
+					hipcie->reset);
+	if (ret) {
+		dev_err(dev, "Couldn't assert reset %d\n", ret);
+		goto reg_dis;
+	}
 
-	reset_control_assert(hipcie->bus_reset);
-	reset_control_deassert(hipcie->bus_reset);
+	ret = reset_control_bulk_deassert(PCIE_HISTB_NUM_RESETS,

Note that this changes the order of assertion/deassertion, not only because resets lines are now switched in bulk, but also because reset_control_bulk_deassert() deasserts the reset lines in reverse order. So this does

If the three resets are independent and order doesn't matter,

regards
Philipp

author
#8 lore raw

Re: [PATCH v1 2/2] PCI: dwc: histb: Simplify reset control handling by using reset_control_bulk*() function

Hi Philipp,

Thanks for your review comments.

Quoted 58 lines · Philipp Zabel
Quoted 30 lines · Anand Moon

Currently, the driver acquires and asserts/deasserts the resets individually thereby making the driver complex to read.

This can be simplified by using the reset_control_bulk() APIs.

Use devm_reset_control_bulk_get_exclusive() API to acquire all the resets and use reset_control_bulk_{assert/deassert}() APIs to assert/deassert them in bulk.

---
 drivers/pci/controller/dwc/pcie-histb.c | 57 ++++++++++++-------------
 1 file changed, 28 insertions(+), 29 deletions(-)
drivers/pci/controller/dwc/pcie-histb.c +8 -0
index 4022349e85d2..4ba5c9af63a0 100644
@@ -49,14 +49,20 @@
 #define PCIE_LTSSM_STATE_MASK                GENMASK(5, 0)
 #define PCIE_LTSSM_STATE_ACTIVE              0x11
 
+#define PCIE_HISTB_NUM_RESETS   ARRAY_SIZE(histb_pci_rsts)
+
+static const char * const histb_pci_rsts[] = {
+     "soft",
+     "sys",
+     "bus",
+};
+

[...]

Quoted 9 lines
drivers/pci/controller/dwc/pcie-histb.c +0 -5
@@ -236,14 +241,19 @@ static int histb_pcie_host_enable(struct dw_pcie_rp *pp)
              goto reg_dis;
      }
 
-     reset_control_assert(hipcie->soft_reset);
-     reset_control_deassert(hipcie->soft_reset);
-
-     reset_control_assert(hipcie->sys_reset);
-     reset_control_deassert(hipcie->sys_reset);

drivers/pci/controller/dwc/pcie-histb.c static int histb_pcie_host_enable(struct dw_pcie_rp *pp) · line 251

Quoted 10 lines
drivers/pci/controller/dwc/pcie-histb.c +7 -2
+     ret = reset_control_bulk_assert(PCIE_HISTB_NUM_RESETS,
+                                     hipcie->reset);
+     if (ret) {
+             dev_err(dev, "Couldn't assert reset %d\n", ret);
+             goto reg_dis;
+     }
 
-     reset_control_assert(hipcie->bus_reset);
-     reset_control_deassert(hipcie->bus_reset);
+     ret = reset_control_bulk_deassert(PCIE_HISTB_NUM_RESETS,

Note that this changes the order of assertion/deassertion, not only because resets lines are now switched in bulk, but also because reset_control_bulk_deassert() deasserts the reset lines in reverse order. So this does

Quoted 2 lines

If the three resets are independent and order doesn't matter,

I followed the expected reset flow as part of the initialization probe process.

Quoted 4 lines

regards
Philipp

Thanks
-Anand

#2 lore raw

Re: [PATCH v1 1/2] PCI: dwc: histb: Simplify clock handling by using clk_bulk*() functions

In reply to Anand Moon

In subject, remove "dwc: " to follow historical convention. (See "git log --oneline")

Quoted 9 lines · Anand Moon

Currently, the driver acquires clocks and prepare/enable/disable/unprepare the clocks individually thereby making the driver complex to read.

The driver can be simplified by using the clk_bulk*() APIs.

Use:
- devm_clk_bulk_get_all() API to acquire all the clocks
- clk_bulk_prepare_enable() to prepare/enable clocks
- clk_bulk_disable_unprepare() APIs to disable/unprepare them in bulk

I assume this means the order in which we prepare/enable and disable/unprepare will now depend on the order the clocks appear in the device tree instead of the order in the code? If so, please mention that here and verify that all upstream device trees have the correct order.

Quoted 118 lines
---
 drivers/pci/controller/dwc/pcie-histb.c | 70 ++++---------------------
 1 file changed, 11 insertions(+), 59 deletions(-)
drivers/pci/controller/dwc/pcie-histb.c +11 -59
index a52071589377..4022349e85d2 100644
@@ -51,10 +51,8 @@
 
 struct histb_pcie {
 	struct dw_pcie *pci;
-	struct clk *aux_clk;
-	struct clk *pipe_clk;
-	struct clk *sys_clk;
-	struct clk *bus_clk;
+	struct  clk_bulk_data *clks;
+	int     num_clks;
 	struct phy *phy;
 	struct reset_control *soft_reset;
 	struct reset_control *sys_reset;
@@ -204,10 +202,7 @@ static void histb_pcie_host_disable(struct histb_pcie *hipcie)
 	reset_control_assert(hipcie->sys_reset);
 	reset_control_assert(hipcie->bus_reset);
 
-	clk_disable_unprepare(hipcie->aux_clk);
-	clk_disable_unprepare(hipcie->pipe_clk);
-	clk_disable_unprepare(hipcie->sys_clk);
-	clk_disable_unprepare(hipcie->bus_clk);
+	clk_bulk_disable_unprepare(hipcie->num_clks, hipcie->clks);
 
 	if (hipcie->reset_gpio)
 		gpiod_set_value_cansleep(hipcie->reset_gpio, 1);
@@ -235,28 +230,10 @@ static int histb_pcie_host_enable(struct dw_pcie_rp *pp)
 	if (hipcie->reset_gpio)
 		gpiod_set_value_cansleep(hipcie->reset_gpio, 0);
 
-	ret = clk_prepare_enable(hipcie->bus_clk);
+	ret = clk_bulk_prepare_enable(hipcie->num_clks, hipcie->clks);
 	if (ret) {
-		dev_err(dev, "cannot prepare/enable bus clk\n");
-		goto err_bus_clk;
-	}
-
-	ret = clk_prepare_enable(hipcie->sys_clk);
-	if (ret) {
-		dev_err(dev, "cannot prepare/enable sys clk\n");
-		goto err_sys_clk;
-	}
-
-	ret = clk_prepare_enable(hipcie->pipe_clk);
-	if (ret) {
-		dev_err(dev, "cannot prepare/enable pipe clk\n");
-		goto err_pipe_clk;
-	}
-
-	ret = clk_prepare_enable(hipcie->aux_clk);
-	if (ret) {
-		dev_err(dev, "cannot prepare/enable aux clk\n");
-		goto err_aux_clk;
+		ret = dev_err_probe(dev, ret, "failed to enable clocks\n");
+		goto reg_dis;
 	}
 
 	reset_control_assert(hipcie->soft_reset);
@@ -270,13 +247,7 @@ static int histb_pcie_host_enable(struct dw_pcie_rp *pp)
 
 	return 0;
 
-err_aux_clk:
-	clk_disable_unprepare(hipcie->pipe_clk);
-err_pipe_clk:
-	clk_disable_unprepare(hipcie->sys_clk);
-err_sys_clk:
-	clk_disable_unprepare(hipcie->bus_clk);
-err_bus_clk:
+reg_dis:
 	if (hipcie->vpcie)
 		regulator_disable(hipcie->vpcie);
 
@@ -345,29 +316,10 @@ static int histb_pcie_probe(struct platform_device *pdev)
 		return ret;
 	}
 
-	hipcie->aux_clk = devm_clk_get(dev, "aux");
-	if (IS_ERR(hipcie->aux_clk)) {
-		dev_err(dev, "Failed to get PCIe aux clk\n");
-		return PTR_ERR(hipcie->aux_clk);
-	}
-
-	hipcie->pipe_clk = devm_clk_get(dev, "pipe");
-	if (IS_ERR(hipcie->pipe_clk)) {
-		dev_err(dev, "Failed to get PCIe pipe clk\n");
-		return PTR_ERR(hipcie->pipe_clk);
-	}
-
-	hipcie->sys_clk = devm_clk_get(dev, "sys");
-	if (IS_ERR(hipcie->sys_clk)) {
-		dev_err(dev, "Failed to get PCIEe sys clk\n");
-		return PTR_ERR(hipcie->sys_clk);
-	}
-
-	hipcie->bus_clk = devm_clk_get(dev, "bus");
-	if (IS_ERR(hipcie->bus_clk)) {
-		dev_err(dev, "Failed to get PCIe bus clk\n");
-		return PTR_ERR(hipcie->bus_clk);
-	}
+	hipcie->num_clks = devm_clk_bulk_get_all(dev, &hipcie->clks);
+	if (hipcie->num_clks < 0)
+		return dev_err_probe(dev, hipcie->num_clks,
+				     "failed to get clocks\n");
 
 	hipcie->soft_reset = devm_reset_control_get(dev, "soft");
 	if (IS_ERR(hipcie->soft_reset)) {
Signature · 1 line
2.50.1
#9 lore raw

Re: [PATCH v1 2/2] PCI: dwc: histb: Simplify reset control handling by using reset_control_bulk*() function

In reply to Anand Moon

In subject, remove "dwc: " to follow historical convention.

Quoted 8 lines · Anand Moon

Currently, the driver acquires and asserts/deasserts the resets individually thereby making the driver complex to read.

This can be simplified by using the reset_control_bulk() APIs.

Use devm_reset_control_bulk_get_exclusive() API to acquire all the resets and use reset_control_bulk_{assert/deassert}() APIs to assert/deassert them in bulk.

Please include a note that this changes the order of reset assert and deassert and explain why this is safe.

Quoted 57 lines
---
 drivers/pci/controller/dwc/pcie-histb.c | 57 ++++++++++++-------------
 1 file changed, 28 insertions(+), 29 deletions(-)
drivers/pci/controller/dwc/pcie-histb.c +14 -11
index 4022349e85d2..4ba5c9af63a0 100644
@@ -49,14 +49,20 @@
 #define PCIE_LTSSM_STATE_MASK		GENMASK(5, 0)
 #define PCIE_LTSSM_STATE_ACTIVE		0x11
 
+#define PCIE_HISTB_NUM_RESETS   ARRAY_SIZE(histb_pci_rsts)
+
+static const char * const histb_pci_rsts[] = {
+	"soft",
+	"sys",
+	"bus",
+};
+
 struct histb_pcie {
 	struct dw_pcie *pci;
 	struct  clk_bulk_data *clks;
 	int     num_clks;
 	struct phy *phy;
-	struct reset_control *soft_reset;
-	struct reset_control *sys_reset;
-	struct reset_control *bus_reset;
+	struct  reset_control_bulk_data reset[PCIE_HISTB_NUM_RESETS];
 	void __iomem *ctrl;
 	struct gpio_desc *reset_gpio;
 	struct regulator *vpcie;
@@ -198,9 +204,8 @@ static const struct dw_pcie_host_ops histb_pcie_host_ops = {
 
 static void histb_pcie_host_disable(struct histb_pcie *hipcie)
 {
-	reset_control_assert(hipcie->soft_reset);
-	reset_control_assert(hipcie->sys_reset);
-	reset_control_assert(hipcie->bus_reset);
+	reset_control_bulk_assert(PCIE_HISTB_NUM_RESETS,
+				  hipcie->reset);
 
 	clk_bulk_disable_unprepare(hipcie->num_clks, hipcie->clks);
 
@@ -236,14 +241,19 @@ static int histb_pcie_host_enable(struct dw_pcie_rp *pp)
 		goto reg_dis;
 	}
 
-	reset_control_assert(hipcie->soft_reset);
-	reset_control_deassert(hipcie->soft_reset);
-
-	reset_control_assert(hipcie->sys_reset);
-	reset_control_deassert(hipcie->sys_reset);
+	ret = reset_control_bulk_assert(PCIE_HISTB_NUM_RESETS,
+					hipcie->reset);
+	if (ret) {

drivers/pci/controller/dwc/pcie-histb.c static int histb_pcie_host_enable(struct dw_pcie_rp *pp) · line 254

Quoted 10 lines
drivers/pci/controller/dwc/pcie-histb.c +7 -2
+		dev_err(dev, "Couldn't assert reset %d\n", ret);
+		goto reg_dis;
+	}
 
-	reset_control_assert(hipcie->bus_reset);
-	reset_control_deassert(hipcie->bus_reset);
+	ret = reset_control_bulk_deassert(PCIE_HISTB_NUM_RESETS,
+					  hipcie->reset);
+	if (ret) {
+		dev_err(dev, "Couldn't dessert reset %d\n", ret);

s/dessert/deassert/

Quoted 37 lines
drivers/pci/controller/dwc/pcie-histb.c +7 -16
+		goto reg_dis;
+	}
 
 	return 0;
 
@@ -321,23 +331,12 @@ static int histb_pcie_probe(struct platform_device *pdev)
 		return dev_err_probe(dev, hipcie->num_clks,
 				     "failed to get clocks\n");
 
-	hipcie->soft_reset = devm_reset_control_get(dev, "soft");
-	if (IS_ERR(hipcie->soft_reset)) {
-		dev_err(dev, "couldn't get soft reset\n");
-		return PTR_ERR(hipcie->soft_reset);
-	}
+	ret = devm_reset_control_bulk_get_exclusive(dev,
+						    PCIE_HISTB_NUM_RESETS,
+						    hipcie->reset);
+	if (ret)
+		return dev_err_probe(dev, ret, "Cannot get the Core resets\n");
 
-	hipcie->sys_reset = devm_reset_control_get(dev, "sys");
-	if (IS_ERR(hipcie->sys_reset)) {
-		dev_err(dev, "couldn't get sys reset\n");
-		return PTR_ERR(hipcie->sys_reset);
-	}
-
-	hipcie->bus_reset = devm_reset_control_get(dev, "bus");
-	if (IS_ERR(hipcie->bus_reset)) {
-		dev_err(dev, "couldn't get bus reset\n");
-		return PTR_ERR(hipcie->bus_reset);
-	}
 
 	hipcie->phy = devm_phy_get(dev, "phy");
 	if (IS_ERR(hipcie->phy)) {
Signature · 1 line
2.50.1
author
#3 lore raw

Re: [PATCH v1 1/2] PCI: dwc: histb: Simplify clock handling by using clk_bulk*() functions

In reply to Bjorn Helgaas

Hi Bjorn,

Thanks for your review comments.

Quoted 4 lines · Bjorn Helgaas

In subject, remove "dwc: " to follow historical convention. (See "git log --oneline")

Ok I will keep it as per the git history.

Quoted 11 lines · Anand Moon
Quoted 9 lines

Currently, the driver acquires clocks and prepare/enable/disable/unprepare the clocks individually thereby making the driver complex to read.

The driver can be simplified by using the clk_bulk*() APIs.

Use:
- devm_clk_bulk_get_all() API to acquire all the clocks
- clk_bulk_prepare_enable() to prepare/enable clocks
- clk_bulk_disable_unprepare() APIs to disable/unprepare them in bulk

Quoted 6 lines

I assume this means the order in which we prepare/enable and disable/unprepare will now depend on the order the clocks appear in the device tree instead of the order in the code? If so, please mention that here and verify that all upstream device trees have the correct order.

Following is the order in the device tree

       clocks = <&crg HISTB_PCIE_AUX_CLK>,
                                 <&crg HISTB_PCIE_PIPE_CLK>,
                                 <&crg HISTB_PCIE_SYS_CLK>,
                                 <&crg HISTB_PCIE_BUS_CLK>;
                        clock-names = "aux", "pipe", "sys", "bus";

Ok I will update this in the commit message.

Thanks
-Anand

author
#10 lore raw

Re: [PATCH v1 2/2] PCI: dwc: histb: Simplify reset control handling by using reset_control_bulk*() function

In reply to Bjorn Helgaas

Hi Bjorn,

Thanks for your review comments.

Quoted 3 lines · Bjorn Helgaas

In subject, remove "dwc: " to follow historical convention.

Ok

Quoted 13 lines · Anand Moon
Quoted 8 lines

Currently, the driver acquires and asserts/deasserts the resets individually thereby making the driver complex to read.

This can be simplified by using the reset_control_bulk() APIs.

Use devm_reset_control_bulk_get_exclusive() API to acquire all the resets and use reset_control_bulk_{assert/deassert}() APIs to assert/deassert them in bulk.

Please include a note that this changes the order of reset assert and deassert and explain why this is safe.

I feel the device tree follows the same order as defined in the array.

     resets = <&crg 0x18c 6>, <&crg 0x18c 5>, <&crg 0x18c 4>;
     reset-names = "soft", "sys", "bus";

Ok I will update this in the commit message.

Thanks
-Anand

#4 lore raw

Re: [PATCH v1 1/2] PCI: dwc: histb: Simplify clock handling by using clk_bulk*() functions

In reply to Anand Moon
Quoted 27 lines · Anand Moon

Hi Bjorn,

Thanks for your review comments.

Quoted 4 lines · Bjorn Helgaas

In subject, remove "dwc: " to follow historical convention. (See "git log --oneline")

Ok I will keep it as per the git history.

Quoted 11 lines · Anand Moon
Quoted 9 lines

Currently, the driver acquires clocks and prepare/enable/disable/unprepare the clocks individually thereby making the driver complex to read.

The driver can be simplified by using the clk_bulk*() APIs.

Use:
- devm_clk_bulk_get_all() API to acquire all the clocks
- clk_bulk_prepare_enable() to prepare/enable clocks
- clk_bulk_disable_unprepare() APIs to disable/unprepare them in bulk

Quoted 6 lines

I assume this means the order in which we prepare/enable and disable/unprepare will now depend on the order the clocks appear in the device tree instead of the order in the code? If so, please mention that here and verify that all upstream device trees have the correct order.

Quoted 7 lines

Following is the order in the device tree

       clocks = <&crg HISTB_PCIE_AUX_CLK>,
                                 <&crg HISTB_PCIE_PIPE_CLK>,
                                 <&crg HISTB_PCIE_SYS_CLK>,
                                 <&crg HISTB_PCIE_BUS_CLK>;
                        clock-names = "aux", "pipe", "sys", "bus";

The current order in the code is:

  histb_pcie_host_enable
    clk_prepare_enable(hipcie->bus_clk);
    clk_prepare_enable(hipcie->sys_clk);
    clk_prepare_enable(hipcie->pipe_clk);
    clk_prepare_enable(hipcie->aux_clk);

  histb_pcie_host_disable
    clk_disable_unprepare(hipcie->aux_clk);
    clk_disable_unprepare(hipcie->pipe_clk);
    clk_disable_unprepare(hipcie->sys_clk);
    clk_disable_unprepare(hipcie->bus_clk);

After this patch, it looks like we'll have:

histb_pcie_host_enable
clk_bulk_prepare_enable
aux
pipe
sys
bus

histb_pcie_host_disable
clk_bulk_disable_unprepare
bus
sys
pipe
aux

So it looks like this patch will reverse the ordering both for enabling and disabling, right? I'm totally fine with this as long as it works.

Bjorn

#11 lore raw

Re: [PATCH v1 2/2] PCI: dwc: histb: Simplify reset control handling by using reset_control_bulk*() function

In reply to Anand Moon

[cc->to: Shawn]

Quoted 14 lines · Anand Moon
Quoted 4 lines · Bjorn Helgaas
Quoted 3 lines · Anand Moon

Currently, the driver acquires and asserts/deasserts the resets individually thereby making the driver complex to read.

Quoted 9 lines
Quoted 5 lines

This can be simplified by using the reset_control_bulk() APIs.

Use devm_reset_control_bulk_get_exclusive() API to acquire all the resets and use reset_control_bulk_{assert/deassert}() APIs to assert/deassert them in bulk.

Please include a note that this changes the order of reset assert and deassert and explain why this is safe.

Quoted 6 lines

I feel the device tree follows the same order as defined in the array.

     resets = <&crg 0x18c 6>, <&crg 0x18c 5>, <&crg 0x18c 4>;
     reset-names = "soft", "sys", "bus";

Ok I will update this in the commit message.

Following the device tree order doesn't necessarily mean that this is safe. We know the current order in the code works. We don't know that a different order works until that's tested and verified.

These will both need acks from Shawn (pcie-histb.c maintainer).

author
#5 lore raw

Re: [PATCH v1 1/2] PCI: dwc: histb: Simplify clock handling by using clk_bulk*() functions

In reply to Bjorn Helgaas

Hi Bjorn,

Quoted 67 lines · Bjorn Helgaas
Quoted 27 lines · Anand Moon

Hi Bjorn,

Thanks for your review comments.

Quoted 4 lines · Bjorn Helgaas

In subject, remove "dwc: " to follow historical convention. (See "git log --oneline")

Ok I will keep it as per the git history.

Quoted 11 lines · Anand Moon
Quoted 9 lines

Currently, the driver acquires clocks and prepare/enable/disable/unprepare the clocks individually thereby making the driver complex to read.

The driver can be simplified by using the clk_bulk*() APIs.

Use:
- devm_clk_bulk_get_all() API to acquire all the clocks
- clk_bulk_prepare_enable() to prepare/enable clocks
- clk_bulk_disable_unprepare() APIs to disable/unprepare them in bulk

Quoted 6 lines

I assume this means the order in which we prepare/enable and disable/unprepare will now depend on the order the clocks appear in the device tree instead of the order in the code? If so, please mention that here and verify that all upstream device trees have the correct order.

Quoted 7 lines

Following is the order in the device tree

       clocks = <&crg HISTB_PCIE_AUX_CLK>,
                                 <&crg HISTB_PCIE_PIPE_CLK>,
                                 <&crg HISTB_PCIE_SYS_CLK>,
                                 <&crg HISTB_PCIE_BUS_CLK>;
                        clock-names = "aux", "pipe", "sys", "bus";

The current order in the code is:

  histb_pcie_host_enable
    clk_prepare_enable(hipcie->bus_clk);
    clk_prepare_enable(hipcie->sys_clk);
    clk_prepare_enable(hipcie->pipe_clk);
    clk_prepare_enable(hipcie->aux_clk);

  histb_pcie_host_disable
    clk_disable_unprepare(hipcie->aux_clk);
    clk_disable_unprepare(hipcie->pipe_clk);
    clk_disable_unprepare(hipcie->sys_clk);
    clk_disable_unprepare(hipcie->bus_clk);

After this patch, it looks like we'll have:

histb_pcie_host_enable
clk_bulk_prepare_enable
aux
pipe
sys
bus

histb_pcie_host_disable
clk_bulk_disable_unprepare
bus
sys
pipe
aux

Quoted 4 lines

So it looks like this patch will reverse the ordering both for enabling and disabling, right? I'm totally fine with this as long as it works.

Thank you for the input. Let's wait for additional feedback regarding the changes.

Quoted 1 line

Bjorn

Thanks
-Anand

#12 lore raw
In reply to Anand Moon
Quoted 2 lines · Anand Moon

Simplify the code using the clk_bulk*() and reset_control_bulk() APIs

We need either an Ack from Shawn or the Tested-by tag from anyone having access to the HiSTB boards.

Also, as others explained, you need to mention the potential order reversing while switching to these APIs as they may break the driver.

- Mani

Quoted 17 lines

Thanks
-Anand

Anand Moon (2):
PCI: dwc: histb: Simplify clock handling by using clk_bulk*()
functions
PCI: dwc: histb: Simplify reset control handling by using
reset_control_bulk*() function

 drivers/pci/controller/dwc/pcie-histb.c | 119 +++++++-----------------
 1 file changed, 35 insertions(+), 84 deletions(-)

base-commit: fab1beda7597fac1cecc01707d55eadb6bbe773c

Signature · 1 line
2.50.1
Signature · 1 line
மணிவண்ணன் சதாசிவம்